0.2.4.1

2 files changed, 12 insertions, 34 deletions

diff --git a/g4f/Provider/bing/conversation.py b/g4f/Provider/bing/conversation.py
index 03f17ee7..da842808 100644
--- a/g4f/Provider/bing/conversation.py
+++ b/g4f/Provider/bing/conversation.py
@@ -1,8 +1,6 @@
 from __future__ import annotations
 
-import uuid
 from aiohttp import ClientSession
-from ...errors import ResponseStatusError
 from ...requests import raise_for_status
 
 class Conversation:
@@ -22,7 +20,7 @@ class Conversation:
         self.clientId = clientId
         self.conversationSignature = conversationSignature
 
-async def create_conversation(session: ClientSession, proxy: str = None) -> Conversation:
+async def create_conversation(session: ClientSession, headers: dict) -> Conversation:
     """
     Create a new conversation asynchronously.
 
@@ -33,33 +31,15 @@ async def create_conversation(session: ClientSession, proxy: str = None) -> Conv
     Returns:
     Conversation: An instance representing the created conversation.
     """
-    url = 'https://www.bing.com/search?toncp=0&FORM=hpcodx&q=Bing+AI&showconv=1&cc=en'
-    headers = {
-        "cookie": "; ".join(f"{c.key}={c.value}" for c in session.cookie_jar)
-    }
+    url = "https://www.bing.com/turing/conversation/create?bundleVersion=1.1626.1"
     async with session.get(url, headers=headers) as response:
-        await raise_for_status(response)
-    headers = {
-        "accept": "application/json",
-        "sec-fetch-dest": "empty",
-        "sec-fetch-mode": "cors",
-        "sec-fetch-site": "same-origin",
-        "x-ms-client-request-id": str(uuid.uuid4()),
-        "x-ms-useragent": "azsdk-js-api-client-factory/1.0.0-beta.1 core-rest-pipeline/1.12.3 OS/Windows",
-        "referer": "https://www.bing.com/search?toncp=0&FORM=hpcodx&q=Bing+AI&showconv=1&cc=en",
-        "cookie": "; ".join(f"{c.key}={c.value}" for c in session.cookie_jar)
-    }
-    url = "https://www.bing.com/turing/conversation/create?bundleVersion=1.1634.0-service-contracts"
-    async with session.get(url, headers=headers, proxy=proxy) as response:
-        if response.status == 404:
-            raise ResponseStatusError(f"Response {response.status}: Can't create a new chat")
-        await raise_for_status(response)
+        await raise_for_status(response, "Failed to create conversation")
         data = await response.json()
     conversationId = data.get('conversationId')
     clientId = data.get('clientId')
     conversationSignature = response.headers.get('X-Sydney-Encryptedconversationsignature')
     if not conversationId or not clientId or not conversationSignature:
-        raise Exception('Failed to create conversation.')
+        raise RuntimeError('Empty fields: Failed to create conversation')
     return Conversation(conversationId, clientId, conversationSignature)
         
 async def list_conversations(session: ClientSession) -> list:
@@ -76,8 +56,8 @@ async def list_conversations(session: ClientSession) -> list:
     async with session.get(url) as response:
         response = await response.json()
         return response["chats"]
-        
-async def delete_conversation(session: ClientSession, conversation: Conversation, proxy: str = None) -> bool:
+
+async def delete_conversation(session: ClientSession, conversation: Conversation, headers: dict) -> bool:
     """
     Delete a conversation asynchronously.
 
@@ -98,7 +78,7 @@ async def delete_conversation(session: ClientSession, conversation: Conversation
         "optionsSets": ["autosave"]
     }
     try:
-        async with session.post(url, json=json, proxy=proxy) as response:
+        async with session.post(url, json=json, headers=headers) as response:
             response = await response.json()
             return response["result"]["value"] == "Success"
     except:
diff --git a/g4f/Provider/bing/upload_image.py b/g4f/Provider/bing/upload_image.py
index 6d51aba0..c517e493 100644
--- a/g4f/Provider/bing/upload_image.py
+++ b/g4f/Provider/bing/upload_image.py
@@ -9,6 +9,7 @@ from aiohttp import ClientSession, FormData
 
 from ...typing import ImageType, Tuple
 from ...image import to_image, process_image, to_base64_jpg, ImageRequest, Image
+from ...requests import raise_for_status
 
 IMAGE_CONFIG = {
     "maxImagePixels": 360000,
@@ -20,7 +21,7 @@ async def upload_image(
     session: ClientSession, 
     image_data: ImageType, 
     tone: str, 
-    proxy: str = None
+    headers: dict
 ) -> ImageRequest:
     """
     Uploads an image to Bing's AI service and returns the image response.
@@ -43,11 +44,9 @@ async def upload_image(
     img_binary_data = to_base64_jpg(image, IMAGE_CONFIG['imageCompressionRate'])
 
     data = build_image_upload_payload(img_binary_data, tone)
-    headers = prepare_headers(session)
 
-    async with session.post("https://www.bing.com/images/kblob", data=data, headers=headers, proxy=proxy) as response:
-        if response.status != 200:
-            raise RuntimeError("Failed to upload image.")
+    async with session.post("https://www.bing.com/images/kblob", data=data, headers=prepare_headers(headers)) as response:
+        await raise_for_status(response, "Failed to upload image")
         return parse_image_response(await response.json())
 
 def calculate_new_dimensions(image: Image) -> Tuple[int, int]:
@@ -109,7 +108,7 @@ def build_knowledge_request(tone: str) -> dict:
         }
     }
 
-def prepare_headers(session: ClientSession) -> dict:
+def prepare_headers(headers: dict) -> dict:
     """
     Prepares the headers for the image upload request.
 
@@ -120,7 +119,6 @@ def prepare_headers(session: ClientSession) -> dict:
     Returns:
         dict: The headers for the request.
     """
-    headers = session.headers.copy()
     headers["Referer"] = 'https://www.bing.com/search?q=Bing+AI&showconv=1&FORM=hpcodx'
     headers["Origin"] = 'https://www.bing.com'
     return headers