1 files changed, 29 insertions, 12 deletions

diff --git a/g4f/Provider/Copilot.py b/g4f/Provider/Copilot.py
index f10202bf..6e64c714 100644
--- a/g4f/Provider/Copilot.py
+++ b/g4f/Provider/Copilot.py
@@ -23,9 +23,10 @@ except ImportError:
 
 from .base_provider import AbstractProvider, BaseConversation
 from .helper import format_prompt
-from ..typing import CreateResult, Messages
+from ..typing import CreateResult, Messages, ImageType
 from ..errors import MissingRequirementsError
 from ..requests.raise_for_status import raise_for_status
+from ..image import to_bytes, is_accepted_format
 from .. import debug
 
 class Conversation(BaseConversation):
@@ -43,6 +44,7 @@ class Copilot(AbstractProvider):
     url = "https://copilot.microsoft.com"
     working = True
     supports_stream = True
+    default_model = "Copilot"
 
     websocket_url = "wss://copilot.microsoft.com/c/api/chat?api-version=2"
     conversation_url = f"{url}/c/api/conversations"
@@ -55,6 +57,7 @@ class Copilot(AbstractProvider):
         stream: bool = False,
         proxy: str = None,
         timeout: int = 900,
+        image: ImageType = None,
         conversation: Conversation = None,
         return_conversation: bool = False,
         **kwargs
@@ -66,7 +69,7 @@ class Copilot(AbstractProvider):
         access_token = None
         headers = None
         cookies = conversation.cookie_jar if conversation is not None else None
-        if cls.needs_auth:
+        if cls.needs_auth or image is not None:
             if conversation is None or conversation.access_token is None:
                 access_token, cookies = asyncio.run(cls.get_access_token_and_cookies(proxy))
             else:
@@ -98,34 +101,48 @@ class Copilot(AbstractProvider):
                 if debug.logging:
                     print(f"Copilot: Use conversation: {conversation_id}")
 
+            images = []
+            if image is not None:
+                data = to_bytes(image)
+                response = session.post(
+                    "https://copilot.microsoft.com/c/api/attachments",
+                    headers={"content-type": is_accepted_format(data)},
+                    data=data
+                )
+                raise_for_status(response)
+                images.append({"type":"image", "url": response.json().get("url")})
+
             wss = session.ws_connect(cls.websocket_url)
             wss.send(json.dumps({
                 "event": "send",
                 "conversationId": conversation_id,
-                "content": [{
+                "content": [*images, {
                     "type": "text",
                     "text": prompt,
                 }],
                 "mode": "chat"
             }).encode(), CurlWsFlag.TEXT)
+
+            is_started = False
+            msg = None
             while True:
                 try:
-                    msg = json.loads(wss.recv()[0])
+                    msg = wss.recv()[0]
+                    msg = json.loads(msg)
                 except:
                     break
                 if msg.get("event") == "appendText":
                     yield msg.get("text")
                 elif msg.get("event") in ["done", "partCompleted"]:
                     break
+            if not is_started:
+                raise RuntimeError(f"Last message: {msg}")
 
     @classmethod
     async def get_access_token_and_cookies(cls, proxy: str = None):
         if not has_nodriver:
             raise MissingRequirementsError('Install "nodriver" package | pip install -U nodriver')
-        if has_platformdirs:
-            user_data_dir = user_config_dir("g4f-nodriver")
-        else:
-            user_data_dir = None
+        user_data_dir = user_config_dir("g4f-nodriver") if has_platformdirs else None
         if debug.logging:
             print(f"Copilot: Open nodriver with user_dir: {user_data_dir}")
         browser = await nodriver.start(
@@ -133,7 +150,8 @@ class Copilot(AbstractProvider):
             browser_args=None if proxy is None else [f"--proxy-server={proxy}"],
         )
         page = await browser.get(cls.url)
-        while True:
+        access_token = None
+        while access_token is None:
             access_token = await page.evaluate("""
                 (() => {
                     for (var i = 0; i < localStorage.length; i++) {
@@ -146,9 +164,8 @@ class Copilot(AbstractProvider):
                     }
                 })()
             """)
-            if access_token:
-                break
-            asyncio.sleep(1)
+            if access_token is None:
+                asyncio.sleep(1)
         cookies = {}
         for c in await page.send(nodriver.cdp.network.get_cookies([cls.url])):
             cookies[c.name] = c.value