0.3.1.5

6 files changed, 48 insertions, 133 deletions

diff --git a/g4f/Provider/BingCreateImages.py b/g4f/Provider/BingCreateImages.py
index 79dc5665..7a206c8f 100644
--- a/g4f/Provider/BingCreateImages.py
+++ b/g4f/Provider/BingCreateImages.py
@@ -1,18 +1,14 @@
 from __future__ import annotations
 
-import asyncio
-import os
-from typing import Iterator, Union
-
 from ..cookies import get_cookies
 from ..image import ImageResponse
-from ..errors import MissingRequirementsError, MissingAuthError
+from ..errors import MissingAuthError
 from ..typing import AsyncResult, Messages, Cookies
 from .base_provider import AsyncGeneratorProvider, ProviderModelMixin
-from .bing.create_images import create_images, create_session, get_cookies_from_browser
+from .bing.create_images import create_images, create_session
 
 class BingCreateImages(AsyncGeneratorProvider, ProviderModelMixin):
-    label = "Microsoft Designer"
+    label = "Microsoft Designer in Bing"
     parent = "Bing"
     url = "https://www.bing.com/images/create"
     working = True
@@ -38,30 +34,9 @@ class BingCreateImages(AsyncGeneratorProvider, ProviderModelMixin):
         **kwargs
     ) -> AsyncResult:
         session = BingCreateImages(cookies, proxy, api_key)
-        yield await session.create_async(messages[-1]["content"])
-
-    def create(self, prompt: str) -> Iterator[Union[ImageResponse, str]]:
-        """
-        Generator for creating imagecompletion based on a prompt.
-
-        Args:
-            prompt (str): Prompt to generate images.
-
-        Yields:
-            Generator[str, None, None]: The final output as markdown formatted string with images.
-        """
-        cookies = self.cookies or get_cookies(".bing.com", False)
-        if cookies is None or "_U" not in cookies:
-            login_url = os.environ.get("G4F_LOGIN_URL")
-            if login_url:
-                yield f"Please login: [Bing]({login_url})\n\n"
-            try:
-                self.cookies = get_cookies_from_browser(self.proxy)
-            except MissingRequirementsError as e:
-                raise MissingAuthError(f'Missing "_U" cookie. {e}')
-        yield asyncio.run(self.create_async(prompt))
+        yield await session.generate(messages[-1]["content"])
 
-    async def create_async(self, prompt: str) -> ImageResponse:
+    async def generate(self, prompt: str) -> ImageResponse:
         """
         Asynchronously creates a markdown formatted string with images based on the prompt.
 
@@ -74,7 +49,6 @@ class BingCreateImages(AsyncGeneratorProvider, ProviderModelMixin):
         cookies = self.cookies or get_cookies(".bing.com", False)
         if cookies is None or "_U" not in cookies:
             raise MissingAuthError('Missing "_U" cookie')
-        proxy = self.proxy or os.environ.get("G4F_PROXY")
-        async with create_session(cookies, proxy) as session:
-            images = await create_images(session, prompt, proxy)
+        async with create_session(cookies, self.proxy) as session:
+            images = await create_images(session, prompt)
             return ImageResponse(images, prompt, {"preview": "{image}?w=200&h=200"} if len(images) > 1 else {})
\ No newline at end of file
diff --git a/g4f/Provider/Blackbox.py b/g4f/Provider/Blackbox.py
index 6e43a7a4..6e1e3949 100644
--- a/g4f/Provider/Blackbox.py
+++ b/g4f/Provider/Blackbox.py
@@ -4,7 +4,8 @@ import uuid
 import secrets
 from aiohttp import ClientSession
 
-from ..typing import AsyncResult, Messages
+from ..typing import AsyncResult, Messages, ImageType
+from ..image import to_data_uri
 from .base_provider import AsyncGeneratorProvider
 
 class Blackbox(AsyncGeneratorProvider):
@@ -17,8 +18,15 @@ class Blackbox(AsyncGeneratorProvider):
         model: str,
         messages: Messages,
         proxy: str = None,
+        image: ImageType = None,
+        image_name: str = None,
         **kwargs
     ) -> AsyncResult:
+        if image is not None:
+            messages[-1]["data"] = {
+                "fileText":	image_name,
+                "imageBase64": to_data_uri(image)
+            }
         headers = {
             "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36",
             "Accept": "*/*",
diff --git a/g4f/Provider/bing/create_images.py b/g4f/Provider/bing/create_images.py
index 44303c21..7a08ddfe 100644
--- a/g4f/Provider/bing/create_images.py
+++ b/g4f/Provider/bing/create_images.py
@@ -1,7 +1,3 @@
-"""
-This module provides functionalities for creating and managing images using Bing's service.
-It includes functions for user login, session creation, image creation, and processing.
-"""
 from __future__ import annotations
 
 import asyncio
@@ -17,9 +13,7 @@ try:
 except ImportError:
     has_requirements = False
 
-from ...providers.create_images import CreateImagesProvider
 from ..helper import get_connector
-from ...providers.types import ProviderType
 from ...errors import MissingRequirementsError, RateLimitError
 from ...webdriver import WebDriver, get_driver_cookies, get_browser
 
@@ -101,7 +95,7 @@ def create_session(cookies: Dict[str, str], proxy: str = None, connector: BaseCo
         headers["Cookie"] = "; ".join(f"{k}={v}" for k, v in cookies.items())
     return ClientSession(headers=headers, connector=get_connector(connector, proxy))
 
-async def create_images(session: ClientSession, prompt: str, proxy: str = None, timeout: int = TIMEOUT_IMAGE_CREATION) -> List[str]:
+async def create_images(session: ClientSession, prompt: str, timeout: int = TIMEOUT_IMAGE_CREATION) -> List[str]:
     """
     Creates images based on a given prompt using Bing's service.
 
@@ -132,7 +126,7 @@ async def create_images(session: ClientSession, prompt: str, proxy: str = None,
                 raise RuntimeError(f"Create images failed: {error}")
     if response.status != 302:
         url = f"{BING_URL}/images/create?q={url_encoded_prompt}&rt=3&FORM=GENCRE"
-        async with session.post(url, allow_redirects=False, proxy=proxy, timeout=timeout) as response:
+        async with session.post(url, allow_redirects=False, timeout=timeout) as response:
             if response.status != 302:
                 raise RuntimeError(f"Create images failed. Code: {response.status}")
 
@@ -185,22 +179,4 @@ def read_images(html_content: str) -> List[str]:
         raise RuntimeError("Bad images found")
     if not images:
         raise RuntimeError("No images found")
-    return images
-
-def patch_provider(provider: ProviderType) -> CreateImagesProvider:
-    """
-    Patches a provider to include image creation capabilities.
-
-    Args:
-        provider (ProviderType): The provider to be patched.
-
-    Returns:
-        CreateImagesProvider: The patched provider with image creation capabilities.
-    """
-    from ..BingCreateImages import BingCreateImages
-    service = BingCreateImages()
-    return CreateImagesProvider(
-        provider,
-        service.create,
-        service.create_async
-    )
\ No newline at end of file
+    return images
\ No newline at end of file
diff --git a/g4f/Provider/needs_auth/OpenaiChat.py b/g4f/Provider/needs_auth/OpenaiChat.py
index a202f45e..d8ea4fad 100644
--- a/g4f/Provider/needs_auth/OpenaiChat.py
+++ b/g4f/Provider/needs_auth/OpenaiChat.py
@@ -26,7 +26,7 @@ from ...webdriver import get_browser
 from ...typing import AsyncResult, Messages, Cookies, ImageType, AsyncIterator
 from ...requests import get_args_from_browser, raise_for_status
 from ...requests.aiohttp import StreamSession
-from ...image import to_image, to_bytes, ImageResponse, ImageRequest
+from ...image import ImageResponse, ImageRequest, to_image, to_bytes, is_accepted_format
 from ...errors import MissingAuthError, ResponseError
 from ...providers.conversation import BaseConversation
 from ..helper import format_cookies
@@ -138,23 +138,22 @@ class OpenaiChat(AsyncGeneratorProvider, ProviderModelMixin):
             An ImageRequest object that contains the download URL, file name, and other data
         """
         # Convert the image to a PIL Image object and get the extension
-        image = to_image(image)
-        extension = image.format.lower()
-        # Convert the image to a bytes object and get the size
         data_bytes = to_bytes(image)
+        image = to_image(data_bytes)
+        extension = image.format.lower()
         data = {
-            "file_name": image_name if image_name else f"{image.width}x{image.height}.{extension}",
+            "file_name": "" if image_name is None else image_name,
             "file_size": len(data_bytes),
             "use_case":	"multimodal"
         }
         # Post the image data to the service and get the image data
         async with session.post(f"{cls.url}/backend-api/files", json=data, headers=headers) as response:
-            cls._update_request_args()
+            cls._update_request_args(session)
             await raise_for_status(response)
             image_data = {
                 **data,
                 **await response.json(),
-                "mime_type": f"image/{extension}",
+                "mime_type": is_accepted_format(data_bytes),
                 "extension": extension,
                 "height": image.height,
                 "width": image.width
@@ -275,7 +274,7 @@ class OpenaiChat(AsyncGeneratorProvider, ProviderModelMixin):
         first_part = line["message"]["content"]["parts"][0]
         if "asset_pointer" not in first_part or "metadata" not in first_part:
             return
-        if first_part["metadata"] is None:
+        if first_part["metadata"] is None or first_part["metadata"]["dalle"] is None:
             return
         prompt = first_part["metadata"]["dalle"]["prompt"]
         file_id = first_part["asset_pointer"].split("file-service://", 1)[1]
@@ -365,49 +364,17 @@ class OpenaiChat(AsyncGeneratorProvider, ProviderModelMixin):
         ) as session:
             if cls._expires is not None and cls._expires < time.time():
                 cls._headers = cls._api_key = None
-            if cls._headers is None or cookies is not None:
-                cls._create_request_args(cookies)
-            api_key = kwargs["access_token"] if "access_token" in kwargs else api_key
-            if api_key is not None:
-                cls._set_api_key(api_key)
-
-            if cls.default_model is None and (not cls.needs_auth or cls._api_key is not None):
-                if cls._api_key is None:
-                    cls._create_request_args(cookies)
-                    async with session.get(
-                        f"{cls.url}/",
-                        headers=DEFAULT_HEADERS
-                    ) as response:
-                        cls._update_request_args(session)
-                        await raise_for_status(response)
-                try:
-                    if not model:
-                        cls.default_model = cls.get_model(await cls.get_default_model(session, cls._headers))
-                    else:
-                        cls.default_model = cls.get_model(model)
-                except MissingAuthError:
-                    pass
-                except Exception as e:
-                    api_key = cls._api_key = None
-                    cls._create_request_args()
-                    if debug.logging:
-                        print("OpenaiChat: Load default model failed")
-                        print(f"{e.__class__.__name__}: {e}")
-
             arkose_token = None
             proofTokens = None
-            if cls.default_model is None:
-                error = None
-                try:
-                    arkose_token, api_key, cookies, headers, proofTokens = await getArkoseAndAccessToken(proxy)
-                    cls._create_request_args(cookies, headers)
-                    cls._set_api_key(api_key)
-                except NoValidHarFileError as e:
-                    error = e
-                if cls._api_key is None:
-                    await cls.nodriver_access_token(proxy)
+            try:
+                arkose_token, api_key, cookies, headers, proofTokens = await getArkoseAndAccessToken(proxy)
+                cls._create_request_args(cookies, headers)
+                cls._set_api_key(api_key)
+            except NoValidHarFileError as e:
                 if cls._api_key is None and cls.needs_auth:
-                    raise error
+                    raise e
+
+            if cls.default_model is None:
                 cls.default_model = cls.get_model(await cls.get_default_model(session, cls._headers))
 
             try:
@@ -461,7 +428,7 @@ class OpenaiChat(AsyncGeneratorProvider, ProviderModelMixin):
                     )
                 ws = None
                 if need_arkose:
-                    async with session.post("https://chatgpt.com/backend-api/register-websocket", headers=cls._headers) as response:
+                    async with session.post(f"{cls.url}/backend-api/register-websocket", headers=cls._headers) as response:
                         wss_url = (await response.json()).get("wss_url")
                     if wss_url:
                         ws = await session.ws_connect(wss_url)    
@@ -490,7 +457,8 @@ class OpenaiChat(AsyncGeneratorProvider, ProviderModelMixin):
                 if proofofwork is not None:
                     headers["Openai-Sentinel-Proof-Token"] = proofofwork
                 async with session.post(
-                    f"{cls.url}/backend-anon/conversation" if cls._api_key is None else
+                    f"{cls.url}/backend-anon/conversation"
+                    if cls._api_key is None else
                     f"{cls.url}/backend-api/conversation",
                     json=data,
                     headers=headers
@@ -580,12 +548,9 @@ class OpenaiChat(AsyncGeneratorProvider, ProviderModelMixin):
             raise RuntimeError(line["error"])
         if "message_type" not in line["message"]["metadata"]:
             return
-        try:
-            image_response = await cls.get_generated_image(session, cls._headers, line)
-            if image_response is not None:
-                yield image_response
-        except Exception as e:
-            yield e
+        image_response = await cls.get_generated_image(session, cls._headers, line)
+        if image_response is not None:
+            yield image_response
         if line["message"]["author"]["role"] != "assistant":
             return
         if line["message"]["content"]["content_type"] != "text":
diff --git a/g4f/Provider/openai/har_file.py b/g4f/Provider/openai/har_file.py
index 8dcbe44e..2287d6a6 100644
--- a/g4f/Provider/openai/har_file.py
+++ b/g4f/Provider/openai/har_file.py
@@ -12,6 +12,7 @@ from copy import deepcopy
 
 from .crypt import decrypt, encrypt
 from ...requests import StreamSession
+from ...cookies import get_cookies_dir
 from ... import debug
 
 class NoValidHarFileError(Exception):
@@ -36,17 +37,14 @@ proofTokens: list = []
 
 def readHAR():
     global proofTokens
-    dirPath = "./"
     harPath = []
     chatArks = []
     accessToken = None
     cookies = {}
-    for root, dirs, files in os.walk(dirPath):
+    for root, dirs, files in os.walk(get_cookies_dir()):
         for file in files:
             if file.endswith(".har"):
                 harPath.append(os.path.join(root, file))
-        if harPath:
-            break
     if not harPath:
         raise NoValidHarFileError("No .har file found")
     for path in harPath:
diff --git a/g4f/Provider/you/har_file.py b/g4f/Provider/you/har_file.py
index 870c388e..71d741fd 100644
--- a/g4f/Provider/you/har_file.py
+++ b/g4f/Provider/you/har_file.py
@@ -7,6 +7,7 @@ import random
 import logging
 
 from ...requests import StreamSession, raise_for_status
+from ...cookies import get_cookies_dir
 from ...errors import MissingRequirementsError
 from ... import debug
 
@@ -28,10 +29,9 @@ public_token = "public-token-live-507a52ad-7e69-496b-aee0-1c9863c7c819"
 chatArks: list = None
 
 def readHAR():
-    dirPath = "./"
     harPath = []
     chatArks = []
-    for root, dirs, files in os.walk(dirPath):
+    for root, dirs, files in os.walk(get_cookies_dir()):
         for file in files:
             if file.endswith(".har"):
                 harPath.append(os.path.join(root, file))
@@ -65,16 +65,10 @@ def parseHAREntry(entry) -> arkReq:
     return tmpArk
 
 async def sendRequest(tmpArk: arkReq, proxy: str = None):
-    try:
-        async with StreamSession(headers=tmpArk.arkHeaders, cookies=tmpArk.arkCookies, proxy=proxy) as session:
-            async with session.post(tmpArk.arkURL, data=tmpArk.arkBody) as response:
-                await raise_for_status(response)
-                return await response.text()
-    except RuntimeError as e:
-        if str(e) == "Event loop is closed":
-            print("Event loop is closed error occurred in sendRequest.")
-        else:
-            raise
+    async with StreamSession(headers=tmpArk.arkHeaders, cookies=tmpArk.arkCookies, proxy=proxy) as session:
+        async with session.post(tmpArk.arkURL, data=tmpArk.arkBody) as response:
+            await raise_for_status(response)
+            return await response.text()
 
 async def create_telemetry_id(proxy: str = None):
     global chatArks