2 files changed, 25 insertions, 23 deletions

diff --git a/g4f/Provider/needs_auth/Gemini.py b/g4f/Provider/needs_auth/Gemini.py
index e468f64a..f9b1c4a5 100644
--- a/g4f/Provider/needs_auth/Gemini.py
+++ b/g4f/Provider/needs_auth/Gemini.py
@@ -4,6 +4,7 @@ import os
 import json
 import random
 import re
+import base64
 
 from aiohttp import ClientSession, BaseConnector
 
@@ -22,7 +23,7 @@ from ..base_provider import AsyncGeneratorProvider
 from ..helper import format_prompt, get_cookies
 from ...requests.raise_for_status import raise_for_status
 from ...errors import MissingAuthError, MissingRequirementsError
-from ...image import to_bytes, to_data_uri, ImageResponse
+from ...image import to_bytes, ImageResponse, ImageDataResponse
 from ...webdriver import get_browser, get_driver_cookies
 
 REQUEST_HEADERS = {
@@ -122,6 +123,7 @@ class Gemini(AsyncGeneratorProvider):
         connector: BaseConnector = None,
         image: ImageType = None,
         image_name: str = None,
+        response_format: str = None,
         **kwargs
     ) -> AsyncResult:
         prompt = format_prompt(messages)
@@ -192,22 +194,22 @@ class Gemini(AsyncGeneratorProvider):
                     if image_prompt:
                         images = [image[0][3][3] for image in response_part[4][0][12][7][0]]
                         resolved_images = []
-                        preview = []
-                        for image in images:
-                            async with client.get(image, allow_redirects=False) as fetch:
-                                image = fetch.headers["location"]
-                            async with client.get(image, allow_redirects=False) as fetch:
-                                image = fetch.headers["location"]
-                            resolved_images.append(image)
-                            preview.append(image.replace('=s512', '=s200'))
-                            # preview_url = image.replace('=s512', '=s200')
-                            # async with client.get(preview_url) as fetch:
-                            #     preview_data = to_data_uri(await fetch.content.read())
-                            # async with client.get(image) as fetch:
-                            #     data = to_data_uri(await fetch.content.read())
-                            # preview.append(preview_data)
-                            # resolved_images.append(data)
-                        yield ImageResponse(resolved_images, image_prompt, {"orginal_links": images, "preview": preview})
+                        if response_format == "b64_json":
+                            for image in images:
+                                async with client.get(image) as response:
+                                    data = base64.b64encode(await response.content.read()).decode()
+                                resolved_images.append(data)
+                            yield ImageDataResponse(resolved_images, image_prompt)
+                        else:
+                            preview = []
+                            for image in images:
+                                async with client.get(image, allow_redirects=False) as fetch:
+                                    image = fetch.headers["location"]
+                                async with client.get(image, allow_redirects=False) as fetch:
+                                    image = fetch.headers["location"]
+                                resolved_images.append(image)
+                                preview.append(image.replace('=s512', '=s200'))
+                            yield ImageResponse(resolved_images, image_prompt, {"orginal_links": images, "preview": preview})
 
     def build_request(
         prompt: str,
diff --git a/g4f/Provider/needs_auth/OpenaiChat.py b/g4f/Provider/needs_auth/OpenaiChat.py
index b4b8bb02..28d0558b 100644
--- a/g4f/Provider/needs_auth/OpenaiChat.py
+++ b/g4f/Provider/needs_auth/OpenaiChat.py
@@ -61,7 +61,7 @@ class OpenaiChat(AsyncGeneratorProvider, ProviderModelMixin):
     supports_system_message = True
     default_model = None
     default_vision_model = "gpt-4o"
-    models = ["gpt-3.5-turbo", "gpt-4", "gpt-4-gizmo", "gpt-4o"]
+    models = ["gpt-3.5-turbo", "gpt-4", "gpt-4-gizmo", "gpt-4o", "auto"]
     model_aliases = {
         "text-davinci-002-render-sha": "gpt-3.5-turbo",
         "": "gpt-3.5-turbo",
@@ -394,10 +394,11 @@ class OpenaiChat(AsyncGeneratorProvider, ProviderModelMixin):
                         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 = await getArkoseAndAccessToken(proxy)
+                    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:
@@ -413,17 +414,17 @@ class OpenaiChat(AsyncGeneratorProvider, ProviderModelMixin):
                 if cls._api_key is None else
                 f"{cls.url}/backend-api/sentinel/chat-requirements",
                 json={"conversation_mode_kind": "primary_assistant"},
+                #json={"p": generate_proof_token(True, user_agent=cls._headers["user-agent"], proofTokens=proofTokens)},
                 headers=cls._headers
             ) as response:
                 cls._update_request_args(session)
                 await raise_for_status(response)
                 data = await response.json()
-                blob = data["arkose"]["dx"]
-                need_arkose = data["arkose"]["required"]
+                need_arkose = data.get("arkose", {}).get("required")
                 chat_token = data["token"]
                 proofofwork = ""
                 if "proofofwork" in data:
-                    proofofwork = generate_proof_token(**data["proofofwork"], user_agent=cls._headers["user-agent"])
+                    proofofwork = generate_proof_token(**data["proofofwork"], user_agent=cls._headers["user-agent"], proofTokens=proofTokens)
 
             if need_arkose and arkose_token is None:
                 arkose_token, api_key, cookies, headers = await getArkoseAndAccessToken(proxy)
@@ -435,7 +436,6 @@ class OpenaiChat(AsyncGeneratorProvider, ProviderModelMixin):
             if debug.logging:
                 print(
                     'Arkose:', False if not need_arkose else arkose_token[:12]+"...",
-                    'Turnstile:', data["turnstile"]["required"],
                     'Proofofwork:', False if proofofwork is None else proofofwork[:12]+"...",
                 )