Refactor image response usage and improve caching logic.

kqlio67 · kqlio67 · commit aeae64569cb3 · 2025-04-01T22:14:23.000+03:00
- Switch "images" to "urls"
- Enhance error handling
- Adjust random seed usage
- Tweak conversation logic
- Minor UI functional changes
diff --git a/g4f/Provider/ARTA.py b/g4f/Provider/ARTA.py
@@ -187,7 +187,7 @@ async def create_async_generator(
                         image_urls = [image["url"] for image in status_data.get("response", [])]
                         duration = time.time() - start_time
                         yield Reasoning(label="Generated", status=f"{n} image(s) in {duration:.2f}s")
-                        yield ImageResponse(images=image_urls, alt=prompt)
+                        yield ImageResponse(urls=image_urls, alt=prompt)
                         return
                     elif status in ("IN_QUEUE", "IN_PROGRESS"):
                         if last_status != status:
diff --git a/g4f/Provider/Blackbox.py b/g4f/Provider/Blackbox.py
@@ -639,7 +639,7 @@ async def create_async_generator(
                     image_url_match = re.search(r'!\[.*?\]\((.*?)\)', full_response_text)
                     if image_url_match:
                         image_url = image_url_match.group(1)
-                        yield ImageResponse(images=[image_url], alt=format_image_prompt(messages, prompt))
+                        yield ImageResponse(urls=[image_url], alt=format_image_prompt(messages, prompt))
                         return
                 
                 # Handle conversation history once, in one place
diff --git a/g4f/Provider/ImageLabs.py b/g4f/Provider/ImageLabs.py
@@ -78,7 +78,7 @@ async def create_async_generator(
                     if progress_data.get('status') == 'Done' or progress_data.get('final_image_url'):
                         # Yield ImageResponse with the final image URL
                         yield ImageResponse(
-                            images=[progress_data.get('final_image_url')], 
+                            urls=[progress_data.get('final_image_url')], 
                             alt=prompt
                         )
                         break
diff --git a/g4f/Provider/PollinationsAI.py b/g4f/Provider/PollinationsAI.py
@@ -12,7 +12,7 @@
 from .base_provider import AsyncGeneratorProvider, ProviderModelMixin
 from ..typing import AsyncResult, Messages, MediaListType
 from ..image import is_data_an_audio
-from ..errors import ModelNotFoundError
+from ..errors import ModelNotFoundError, ResponseError
 from ..requests.raise_for_status import raise_for_status
 from ..requests.aiohttp import get_connector
 from ..image.copy_images import save_response_media
@@ -279,7 +279,7 @@ async def _generate_text(
         **kwargs
     ) -> AsyncResult:
         if not cache and seed is None:
-            seed = random.randint(9999, 99999999)
+            seed = random.randint(0, 2**32)
         json_mode = False
         if response_format and response_format.get("type") == "json_object":
             json_mode = True
@@ -318,31 +318,30 @@ async def _generate_text(
                             if line[6:].startswith(b"[DONE]"):
                                 break
                             result = json.loads(line[6:])
+                            if "usage" in result:
+                                yield Usage(**result["usage"])
                             choices = result.get("choices", [{}])
                             choice = choices.pop() if choices else {}
                             content = choice.get("delta", {}).get("content")
                             if content:
                                 yield content
-                            if "usage" in result:
-                                yield Usage(**result["usage"])
                             finish_reason = choice.get("finish_reason")
                             if finish_reason:
                                 yield FinishReason(finish_reason)
                     return
                 result = await response.json()
-                choice = result["choices"][0]
-                message = choice.get("message", {})
-                content = message.get("content", "")
-
-                if "tool_calls" in message:
-                    yield ToolCalls(message["tool_calls"])
-
-                if content:
-                    yield content
-
+                if "choices" in result:
+                    choice = result["choices"][0]
+                    message = choice.get("message", {})
+                    content = message.get("content", "")
+                    if content:
+                        yield content
+                    if "tool_calls" in message:
+                        yield ToolCalls(message["tool_calls"])
+                else:
+                    raise ResponseError(result)
                 if "usage" in result:
                     yield Usage(**result["usage"])
-
                 finish_reason = choice.get("finish_reason")
                 if finish_reason:
                     yield FinishReason(finish_reason)
diff --git a/g4f/Provider/Websim.py b/g4f/Provider/Websim.py
@@ -124,7 +124,7 @@ async def _handle_image_request(
                 response_json = json.loads(response_text)
                 image_url = response_json.get("url")
                 if image_url:
-                    yield ImageResponse(images=[image_url], alt=used_prompt)
+                    yield ImageResponse(urls=[image_url], alt=used_prompt)
 
     @classmethod
     async def _handle_chat_request(
diff --git a/g4f/Provider/hf_space/Voodoohop_Flux1Schnell.py b/g4f/Provider/hf_space/Voodoohop_Flux1Schnell.py
@@ -71,5 +71,5 @@ async def create_async_generator(
                                 elif event_type == b'complete':
                                     json_data = json.loads(data)
                                     image_url = json_data[0]['url']
-                                    yield ImageResponse(images=[image_url], alt=prompt)
+                                    yield ImageResponse(urls=[image_url], alt=prompt)
                                     return
diff --git a/g4f/Provider/needs_auth/Grok.py b/g4f/Provider/needs_auth/Grok.py
@@ -83,7 +83,6 @@ async def create_authed(
         model: str,
         messages: Messages,
         auth_result: AuthResult,
-        cookies: Cookies = None,
         return_conversation: bool = False,
         conversation: Conversation = None,
         **kwargs
@@ -130,7 +129,7 @@ async def create_authed(
                                     yield token
                             generated_images = response_data.get("modelResponse", {}).get("generatedImageUrls", None)
                             if generated_images:
-                                yield ImageResponse([f'{cls.assets_url}/{image}' for image in generated_images], "", {"cookies": cookies, "headers": headers})
+                                yield ImageResponse([f'{cls.assets_url}/{image}' for image in generated_images], "", {"cookies": auth_result.cookies, "headers": auth_result.headers})
                             title = result.get("title", {}).get("newTitle", "")
                             if title:
                                 yield TitleGeneration(title)
diff --git a/g4f/Provider/not_working/AiChats.py b/g4f/Provider/not_working/AiChats.py
@@ -74,7 +74,7 @@ async def create_async_generator(
 
                                 base64_image = base64.b64encode(image_data).decode('utf-8')
                                 base64_url = f"data:image/png;base64,{base64_image}"
-                                yield ImageResponse(base64_url, prompt)
+                                yield ImageResponse(image_url, prompt)
                             else:
                                 yield f"Error: No image URL found in the response. Full response: {response_json}"
                         else:
diff --git a/g4f/Provider/not_working/Airforce.py b/g4f/Provider/not_working/Airforce.py
@@ -170,7 +170,7 @@ async def generate_image(
             async with session.get(cls.api_endpoint_imagine2, params=params, proxy=proxy) as response:
                 if response.status == 200:
                     image_url = str(response.url)
-                    yield ImageResponse(images=image_url, alt=prompt)
+                    yield ImageResponse(urls=image_url, alt=prompt)
                 else:
                     error_text = await response.text()
                     raise RuntimeError(f"Image generation failed: {response.status} - {error_text}")
diff --git a/g4f/cookies.py b/g4f/cookies.py
@@ -77,7 +77,7 @@ def get_cookies(domain_name: str, raise_requirements_error: bool = True, single_
     Returns:
         Dict[str, str]: A dictionary of cookie names and values.
     """
-    if cache_result and domain_name in CookiesConfig.cookies:
+    if domain_name in CookiesConfig.cookies:
         return CookiesConfig.cookies[domain_name]
 
     cookies = load_cookies_from_browsers(domain_name, raise_requirements_error, single_browser)
diff --git a/g4f/gui/client/index.html b/g4f/gui/client/index.html
@@ -400,7 +400,7 @@
         </div>
         <div class="log hidden">
             <div class="log-top-bar">
-                <button class="log-back-button">
+                <button class="log-back-button" onclick="open_settings();">
                     <i class="fa-solid fa-arrow-left"></i>
                 </button>
                 <span>Logs</span>
diff --git a/g4f/gui/client/static/js/chat.v1.js b/g4f/gui/client/static/js/chat.v1.js
@@ -1881,9 +1881,6 @@ async function hide_settings() {
     chat.classList.remove("hidden");
     let provider_forms = document.querySelectorAll(".provider_forms form");
     Array.from(provider_forms).forEach((form) => form.classList.add("hidden"));
-    if (window.location.pathname.endsWith("/settings/")) {
-        history.back();
-    }
 }
 
 window.addEventListener('popstate', hide_sidebar, false);
@@ -2306,7 +2303,7 @@ window.addEventListener('load', async function() {
     if (!appStorage.getItem(`conversation:${window.conversation_id}`) || conversation.id == window.conversation_id) {
         // Copy conversation from share
         if (conversation.id != window.conversation_id) {
-            conversation.id = window.conversation_id;
+            window.conversation_id = conversation.id;
             conversation.updated = Date.now();
             window.share_id = null;
         }
diff --git a/g4f/gui/server/backend_api.py b/g4f/gui/server/backend_api.py
@@ -18,6 +18,7 @@
 
 from ...client.service import convert_to_provider
 from ...providers.asyncio import to_sync_generator
+from ...providers.response import FinishReason
 from ...client.helper import filter_markdown
 from ...tools.files import supports_filename, get_streaming, get_bucket_dir, get_buckets
 from ...tools.run_tools import iter_run_tools
@@ -79,16 +80,12 @@ def qrcode(conversation_id: str = ""):
         @app.route('/backend-api/v2/models', methods=['GET'])
         def jsonify_models(**kwargs):
             response = get_demo_models() if app.demo else self.get_models(**kwargs)
-            if isinstance(response, list):
-                return jsonify(response)
-            return response
+            return jsonify(response)
 
         @app.route('/backend-api/v2/models/<provider>', methods=['GET'])
         def jsonify_provider_models(**kwargs):
             response = self.get_provider_models(**kwargs)
-            if isinstance(response, list):
-                return jsonify(response)
-            return response
+            return jsonify(response)
 
         @app.route('/backend-api/v2/providers', methods=['GET'])
         def jsonify_providers(**kwargs):
@@ -259,17 +256,21 @@ def create():
                     else:
                         response = iter_run_tools(ChatCompletion.create, **parameters)
                         cache_dir.mkdir(parents=True, exist_ok=True)
+                        copy_response = [chunk for chunk in response]
                         with cache_file.open("w") as f:
-                            for chunk in response:
+                            for chunk in copy_response:
                                 f.write(str(chunk))
+                        response = copy_response
                 else:
                     response = iter_run_tools(ChatCompletion.create, **parameters)
 
                 if do_filter_markdown:
                     return Response(filter_markdown("".join([str(chunk) for chunk in response]), do_filter_markdown), mimetype='text/plain')
                 def cast_str():
                     for chunk in response:
-                        if not isinstance(chunk, Exception):
+                        if isinstance(chunk, FinishReason):
+                            yield f"[{chunk.reason}]" if chunk.reason != "stop" else ""
+                        elif not isinstance(chunk, Exception):
                             yield str(chunk)
                 return Response(cast_str(), mimetype='text/plain')
             except Exception as e:
diff --git a/g4f/providers/base_provider.py b/g4f/providers/base_provider.py
@@ -424,7 +424,10 @@ def get_async_create_function(cls) -> callable:
     def write_cache_file(cls, cache_file: Path, auth_result: AuthResult = None):
          if auth_result is not None:
             cache_file.parent.mkdir(parents=True, exist_ok=True)
-            cache_file.write_text(json.dumps(auth_result.get_dict()))
+            try:
+                cache_file.write_text(json.dumps(auth_result.get_dict()))
+            except TypeError:
+                raise RuntimeError(f"Failed to save: {auth_result.get_dict()}")
          elif cache_file.exists():
             cache_file.unlink()
 
@@ -489,5 +492,4 @@ async def create_async_generator(
                     cache_file = None
                 yield chunk
         finally:
-            if cache_file is not None:
-                cls.write_cache_file(cache_file, auth_result)
+            cls.write_cache_file(cache_file, auth_result)

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ async def create_async_generator(`
`78`	`78`	`if progress_data.get('status') == 'Done' or progress_data.get('final_image_url'):`
`79`	`79`	`# Yield ImageResponse with the final image URL`
`80`	`80`	`yield ImageResponse(`
`81`		`- images=[progress_data.get('final_image_url')],`
	`81`	`+ urls=[progress_data.get('final_image_url')],`
`82`	`82`	`alt=prompt`
`83`	`83`	`)`
`84`	`84`	`break`