Remove unused import and update sse_stream function signature for consistency

Author: hlohaus

g4f/Provider/Blackbox.py

@@ -8,7 +8,6 @@
 import string
 from pathlib import Path
 from typing import Optional
-from datetime import datetime, timedelta
 
 from ..typing import AsyncResult, Messages, MediaListType
 from ..requests.raise_for_status import raise_for_status

g4f/Provider/Qwen.py

@@ -12,6 +12,7 @@
 from ..typing import AsyncResult, Messages, MediaListType
 from ..providers.response import JsonConversation, Reasoning, Usage, ImageResponse, FinishReason
 from ..requests import sse_stream
+from ..tools.media import merge_media
 from .base_provider import AsyncGeneratorProvider, ProviderModelMixin
 from .helper import get_last_user_message
 from .. import debug
@@ -60,7 +61,6 @@ class Qwen(AsyncGeneratorProvider, ProviderModelMixin):
     supports_message_history = False
 
     _models_loaded = True
-    # Complete list of models, extracted from the API
     image_models = image_models
     text_models = text_models
     vision_models = vision_models
@@ -88,27 +88,29 @@ def get_models(cls) -> list[str]:
                 cls.models = [model["id"] for model in models]
                 cls.default_model = cls.models[0]
                 cls._models_loaded = True
+                cls.live += 1
+                debug.log(f"Loaded {len(cls.models)} models from {cls.url}")
 
             else:
                 debug.log(f"Failed to load models from {cls.url}: {response.status_code} {response.reason}")
         return cls.models
 
     @classmethod
     async def create_async_generator(
-            cls,
-            model: str,
-            messages: Messages,
-            media: MediaListType = None,
-            conversation: JsonConversation = None,
-            proxy: str = None,
-            timeout: int = 120,
-            stream: bool = True,
-            enable_thinking: bool = True,
-            chat_type: Literal[
-                "t2t", "search", "artifacts", "web_dev", "deep_research", "t2i", "image_edit", "t2v"
-            ] = "t2t",
-            image_size: Optional[Literal["1:1", "4:3", "3:4", "16:9", "9:16"]] = None,
-            **kwargs
+        cls,
+        model: str,
+        messages: Messages,
+        media: MediaListType = None,
+        conversation: JsonConversation = None,
+        proxy: str = None,
+        timeout: int = 120,
+        stream: bool = True,
+        enable_thinking: bool = True,
+        chat_type: Literal[
+            "t2t", "search", "artifacts", "web_dev", "deep_research", "t2i", "image_edit", "t2v"
+        ] = "t2t",
+        aspect_ratio: Optional[Literal["1:1", "4:3", "3:4", "16:9", "9:16"]] = None,
+        **kwargs
     ) -> AsyncResult:
         """
         chat_type:
@@ -164,7 +166,6 @@ async def create_async_generator(
                     req_headers['bx-umidtoken'] = cls._midtoken
                     req_headers['bx-v'] = '2.5.31'
                     message_id = str(uuid.uuid4())
-                    parent_id = None
                     if conversation is None:
                         chat_payload = {
                             "title": "New Chat",
@@ -186,8 +187,9 @@ async def create_async_generator(
                             parent_id=None
                         )
                     files = []
+                    media = list(merge_media(media))
                     if media:
-                        for index, (_file, file_name) in enumerate(media):
+                        for _file, file_name in media:
                             file_class: Literal["default", "vision", "video", "audio", "document"] = "vision"
                             _type: Literal["file", "image", "video", "audio"] = "image"
                             file_type = "image/jpeg"
@@ -206,7 +208,7 @@ async def create_async_generator(
                                         "name": file_name,
                                         "file_type": file_type,
                                         "showType": showType,
-                                        "file_class": file_class,  # "document"
+                                        "file_class": file_class,
                                         "url": _file
                                     }
                                 )
@@ -243,8 +245,8 @@ async def create_async_generator(
                             }
                         ]
                     }
-                    if image_size:
-                        msg_payload["size"] = image_size
+                    if aspect_ratio:
+                        msg_payload["size"] = aspect_ratio
 
                     async with session.post(
                             f'{cls.url}/api/v2/chat/completions?chat_id={conversation.chat_id}', json=msg_payload,
@@ -276,11 +278,10 @@ async def create_async_generator(
                                 elif phase == "answer" and thinking_started:
                                     thinking_started = False
                                 elif phase == "image_gen" and status == "typing":
-                                    yield ImageResponse([content], "", extra)
+                                    yield ImageResponse(content, prompt, extra)
                                     continue
                                 elif phase == "image_gen" and status == "finished":
-                                    yield FinishReason(status)
-
+                                    yield FinishReason("stop")
                                 if content:
                                     yield Reasoning(content) if thinking_started else content
                             except (json.JSONDecodeError, KeyError, IndexError):

g4f/requests/__init__.py

@@ -113,7 +113,6 @@ def stop_browser():
             await callback(page)
         for c in await page.send(nodriver.cdp.network.get_cookies([url])):
             cookies[c.name] = c.value
-        await page.close()
         stop_browser()
         return {
             "impersonate": "chrome",
@@ -219,7 +218,7 @@ def on_stop():
     BrowserConfig.stop_browser = on_stop
     return browser, on_stop
 
-async def sse_stream(iter_lines: Iterator[bytes]) -> AsyncIterator[dict]:
+async def sse_stream(iter_lines: AsyncIterator[bytes]) -> AsyncIterator[dict]:
     if hasattr(iter_lines, "content"):
         iter_lines = iter_lines.content
     elif hasattr(iter_lines, "iter_lines"):