mirrors/gpt4free
1
Fork 0
mirror of https://github.com/xtekky/gpt4free.git synced 2025-12-06 02:30:41 -08:00
Code Issues Projects Releases Packages Wiki Activity

Handle bucket items with name vs plain text content based on user feedback

Browse source 
Co-authored-by: hlohaus <983577+hlohaus@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot] 2025-08-23 09:52:09 +00:00
parent 9c6d2a93a3
commit 37b79b6df8
1 changed files with 70 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

115
g4f/Provider/Copilot.py
View file

@ -30,7 +30,7 @@ from ..requests import get_nodriver
from ..image import to_bytes, is_accepted_format from ..image import to_bytes, is_accepted_format
from .helper import get_last_user_message from .helper import get_last_user_message
from ..files import get_bucket_dir from ..files import get_bucket_dir
from ..tools.files import get_filenames from ..tools.files import get_filenames, read_bucket
from pathlib import Path from pathlib import Path
from .. import debug from .. import debug
@ -40,15 +40,15 @@ class Conversation(JsonConversation):
def __init__(self, conversation_id: str): def __init__(self, conversation_id: str):
self.conversation_id = conversation_id self.conversation_id = conversation_id
def extract_bucket_ids(messages: Messages) -> list[str]: def extract_bucket_items(messages: Messages) -> list[dict]:
"""Extract bucket_ids from messages content.""" """Extract bucket items from messages content."""
bucket_ids = [] bucket_items = []
for message in messages: for message in messages:
if isinstance(message, dict) and isinstance(message.get("content"), list): if isinstance(message, dict) and isinstance(message.get("content"), list):
for content_item in message["content"]: for content_item in message["content"]:
if isinstance(content_item, dict) and "bucket_id" in content_item: if isinstance(content_item, dict) and ("bucket_id" in content_item or "bucket" in content_item):
bucket_ids.append(content_item["bucket_id"]) bucket_items.append(content_item)
return bucket_ids return bucket_items
class Copilot(AsyncAuthedProvider, ProviderModelMixin): class Copilot(AsyncAuthedProvider, ProviderModelMixin):
label = "Microsoft Copilot" label = "Microsoft Copilot"
@ -188,45 +188,70 @@ class Copilot(AsyncAuthedProvider, ProviderModelMixin):
uploaded_attachments.append({"type":"image", "url": media}) uploaded_attachments.append({"type":"image", "url": media})
# Upload bucket files # Upload bucket files
bucket_ids = extract_bucket_ids(messages) bucket_items = extract_bucket_items(messages)
for bucket_id in bucket_ids: for item in bucket_items:
bucket_dir = Path(get_bucket_dir(bucket_id)) try:
if bucket_dir.exists(): if "name" in item:
filenames = get_filenames(bucket_dir) # Handle specific file from bucket with name
for filename in filenames: file_path = Path(get_bucket_dir(item["bucket_id"], "media", item["name"]))
file_path = bucket_dir / filename
if file_path.exists() and file_path.is_file(): if file_path.exists() and file_path.is_file():
try: with open(file_path, "rb") as f:
with open(file_path, "rb") as f: file_data = f.read()
file_data = f.read()
filename = item["name"]
# Determine content type based on file extension # Determine content type based on file extension
content_type = "application/octet-stream" content_type = "application/octet-stream"
if filename.endswith(".pdf"): if filename.endswith(".pdf"):
content_type = "application/pdf" content_type = "application/pdf"
elif filename.endswith(".docx"): elif filename.endswith(".docx"):
content_type = "application/vnd.openxmlformats-officedocument.wordprocessingml.document" content_type = "application/vnd.openxmlformats-officedocument.wordprocessingml.document"
elif filename.endswith(".txt"): elif filename.endswith(".txt"):
content_type = "text/plain" content_type = "text/plain"
elif filename.endswith(".md"): elif filename.endswith(".md"):
content_type = "text/markdown" content_type = "text/markdown"
elif filename.endswith(".json"):
response = await session.post( content_type = "application/json"
"https://copilot.microsoft.com/c/api/attachments",
headers={ response = await session.post(
"content-type": content_type, "https://copilot.microsoft.com/c/api/attachments",
"content-length": str(len(file_data)), headers={
}, "content-type": content_type,
data=file_data "content-length": str(len(file_data)),
) },
response.raise_for_status() data=file_data
file_url = response.json().get("url") )
uploaded_attachments.append({"type": "file", "url": file_url, "name": filename}) response.raise_for_status()
debug.log(f"Copilot: Uploaded bucket file: {filename}") file_url = response.json().get("url")
except Exception as e: uploaded_attachments.append({"type": "file", "url": file_url, "name": filename})
debug.log(f"Copilot: Failed to upload bucket file {filename}: {e}") debug.log(f"Copilot: Uploaded bucket file: {filename}")
else: else:
debug.log(f"Copilot: Bucket directory not found: {bucket_id}") debug.log(f"Copilot: Bucket file not found: {item.get('name')}")
else:
# Handle plain text content from bucket
bucket_path = Path(get_bucket_dir(item["bucket"]))
plain_text_content = ""
for text_chunk in read_bucket(bucket_path):
plain_text_content += text_chunk
if plain_text_content.strip():
# Upload plain text as a text file
text_data = plain_text_content.encode('utf-8')
response = await session.post(
"https://copilot.microsoft.com/c/api/attachments",
headers={
"content-type": "text/plain",
"content-length": str(len(text_data)),
},
data=text_data
)
response.raise_for_status()
file_url = response.json().get("url")
uploaded_attachments.append({"type": "file", "url": file_url, "name": f"bucket_{item['bucket']}.txt"})
debug.log(f"Copilot: Uploaded bucket text content: {item['bucket']}")
else:
debug.log(f"Copilot: No text content found in bucket: {item['bucket']}")
except Exception as e:
debug.log(f"Copilot: Failed to upload bucket item {item}: {e}")
wss = await session.ws_connect(cls.websocket_url, timeout=3) wss = await session.ws_connect(cls.websocket_url, timeout=3)
if "Think" in model: if "Think" in model: