Merge branch 'xtekky:main' into main

README.md

@@ -32,26 +32,17 @@ docker pull hlohaus789/g4f
    - **For comprehensive details on new features and updates, please refer to our** [Releases](https://github.com/xtekky/gpt4free/releases) **page**
    - **Installation Guide for Windows (.exe):** 💻 [Installation Guide for Windows (.exe)](#installation-guide-for-windows-exe)
    - **Join our Telegram Channel:** 📨 [telegram.me/g4f_channel](https://telegram.me/g4f_channel)
-   - **Join our Discord Group:** 💬🆕️ [discord.gg/6yrm7H4B](https://discord.gg/6yrm7H4B)
+   - **Join our Discord Group:** 💬🆕️ [discord.gg/vE7gCvss](https://discord.gg/vE7gCvss)
 
 
 ## 🔻 Site Takedown
 
 Is your site on this repository and you want to take it down? Send an email to [email protected] with proof it is yours and it will be removed as fast as possible. To prevent reproduction please secure your API. 😉
 
-## 🚀 Feedback and Todo
-**You can always leave some feedback here:** https://forms.gle/FeWV9RLEedfdkmFN6
-
-**As per the survey, here is a list of improvements to come**
-   - [x] Update the repository to include the new openai library syntax (ex: `Openai()` class) | completed, use `g4f.client.Client`
-   - [ ] Golang implementation
-   - [ ] 🚧 Improve Documentation (in /docs & Guides, Howtos, & Do video tutorials)
-   - [x] Improve the provider status list & updates
-   - [ ] Tutorials on how to reverse sites to write your own wrapper (PoC only ofc)
-   - [x] Improve the Bing wrapper. (Wait and Retry or reuse conversation)
-   - [ ] 🚧 Write a standard provider performance test to improve the stability
-   - [ ] Potential support and development of local models
-   - [ ] 🚧 Improve compatibility and error handling
+## 🚀 Preview
+**Take a look at our GUI on the mobile device. We connect to ChatGPT and generate an image.** 
+
+[![Preview image](https://github.com/user-attachments/assets/9da24a87-a591-4da4-a80f-8fc7c222c92f)](https://github.com/user-attachments/assets/56c02389-61b1-4849-be7d-50b173b84ce6)
 
 ## 📚 Table of Contents
    - [🆕 What's New](#-whats-new)

docker/Dockerfile-armv7

@@ -13,7 +13,7 @@ ENV G4F_DIR /app
 RUN apt-get update && apt-get upgrade -y \
   && apt-get install -y git \
   && apt-get install --quiet --yes --no-install-recommends \
-      build-essential \
+      build-essential libffi-dev zlib1g-dev libjpeg-dev \
 # Add user and user group
   && groupadd -g $G4F_USER_ID $G4F_USER \
   && useradd -rm -G sudo -u $G4F_USER_ID -g $G4F_USER_ID $G4F_USER \
@@ -64,4 +64,4 @@ RUN apt-get purge --auto-remove --yes \
 USER $G4F_USER_ID
 
 # Copy the entire package into the container.
-ADD --chown=$G4F_USER:$G4F_USER g4f $G4F_DIR/g4f
+ADD --chown=$G4F_USER:$G4F_USER g4f $G4F_DIR/g4f

docs/async_client.md

@@ -292,7 +292,7 @@ client = AsyncClient(provider=g4f.Provider.OpenaiChat)
 
 response = await client.chat.completions.create(
     model="gpt-4",
-    provider=g4f.Provider.Bing,
+    provider=g4f.Provider.CopilotAccount,
     messages=[
         {
             "role": "user",

docs/legacy.md

@@ -7,7 +7,7 @@ import g4f
 
 g4f.debug.logging = True  # Enable debug logging
 g4f.debug.version_check = False  # Disable automatic version checking
-print(g4f.Provider.Bing.params)  # Print supported args for Bing
+print(g4f.Provider.Gemini.params)  # Print supported args for Bing
 
 # Using automatic a provider for the given model
 ## Streamed completion
@@ -78,7 +78,7 @@ for message in response:
 
 Image upload and generation are supported by three main providers:
 
-- **Bing & Other GPT-4 Providers:** Utilizes Microsoft's Image Creator.
+- **Microsoft Copilot & Other GPT-4 Providers:** Utilizes Microsoft's Image Creator.
 - **Google Gemini:** Available for free accounts with IP addresses outside Europe.
 - **OpenaiChat with GPT-4:** Accessible for users with a Plus subscription.
 

etc/unittest/client.py

@@ -2,7 +2,10 @@
 
 import unittest
 
-from g4f.client import Client, AsyncClient, ChatCompletion, ChatCompletionChunk
+from g4f.errors import ModelNotFoundError
+from g4f.client import Client, AsyncClient, ChatCompletion, ChatCompletionChunk, get_model_and_provider
+from g4f.Provider.Copilot import Copilot
+from g4f.models import gpt_4o
 from .mocks import AsyncGeneratorProviderMock, ModelProviderMock, YieldProviderMock
 
 DEFAULT_MESSAGES = [{'role': 'user', 'content': 'Hello'}]
@@ -104,5 +107,35 @@ def test_stop(self):
         self.assertIsInstance(response, ChatCompletion)
         self.assertEqual("How are you?", response.choices[0].message.content)
 
+    def test_model_not_found(self):
+        def run_exception():
+            client = Client()
+            client.chat.completions.create(DEFAULT_MESSAGES, "Hello")
+        self.assertRaises(ModelNotFoundError, run_exception)
+
+    def test_best_provider(self):
+        not_default_model = "gpt-4o"
+        model, provider = get_model_and_provider(not_default_model, None, False)
+        self.assertTrue(hasattr(provider, "create_completion"))
+        self.assertEqual(model, not_default_model)
+
+    def test_default_model(self):
+        default_model = ""
+        model, provider = get_model_and_provider(default_model, None, False)
+        self.assertTrue(hasattr(provider, "create_completion"))
+        self.assertEqual(model, default_model)
+
+    def test_provider_as_model(self):
+        provider_as_model = Copilot.__name__
+        model, provider = get_model_and_provider(provider_as_model, None, False)
+        self.assertTrue(hasattr(provider, "create_completion"))
+        self.assertIsInstance(model, str)
+        self.assertEqual(model, Copilot.default_model)
+
+    def test_get_model(self):
+        model, provider = get_model_and_provider(gpt_4o.name, None, False)
+        self.assertTrue(hasattr(provider, "create_completion"))
+        self.assertEqual(model, gpt_4o.name)
+
 if __name__ == '__main__':
     unittest.main()

etc/unittest/main.py

@@ -1,7 +1,9 @@
 import unittest
 import asyncio
+
 import g4f
 from g4f import ChatCompletion, get_last_provider
+from g4f.errors import VersionNotFoundError
 from g4f.Provider import RetryProvider
 from .mocks import ProviderMock
 
@@ -27,4 +29,11 @@ def test_get_last_provider_as_dict(self):
         last_provider_dict = get_last_provider(True)
         self.assertIsInstance(last_provider_dict, dict)
         self.assertIn('name', last_provider_dict)
-        self.assertEqual(ProviderMock.__name__, last_provider_dict['name'])
+        self.assertEqual(ProviderMock.__name__, last_provider_dict['name'])
+
+    def test_get_latest_version(self):
+        try:
+            self.assertIsInstance(g4f.version.utils.current_version, str)
+        except VersionNotFoundError:
+            pass
+        self.assertIsInstance(g4f.version.utils.latest_version, str)

g4f/Provider/ChatGpt.py

@@ -205,6 +205,7 @@ def create_completion(
 
         response = session.post('https://chatgpt.com/backend-anon/conversation',
                                  headers=headers, json=json_data, stream=True)
+        response.raise_for_status()
 
         replace = ''
         for line in response.iter_lines():

g4f/Provider/Copilot.py

@@ -23,10 +23,9 @@
 from ..errors import MissingRequirementsError
 from ..requests.raise_for_status import raise_for_status
 from ..providers.asyncio import get_running_loop
-from ..Provider.openai.har_file import NoValidHarFileError, get_headers
+from ..Provider.openai.har_file import NoValidHarFileError, get_headers, get_har_files
 from ..requests import get_nodriver
 from ..image import ImageResponse, to_bytes, is_accepted_format
-from ..cookies import get_cookies_dir
 from .. import debug
 
 class Conversation(BaseConversation):
@@ -188,16 +187,9 @@ async def get_access_token_and_cookies(cls, proxy: str = None):
         return access_token, cookies
 
 def readHAR():
-    harPath = []
-    for root, _, files in os.walk(get_cookies_dir()):
-        for file in files:
-            if file.endswith(".har"):
-                harPath.append(os.path.join(root, file))
-    if not harPath:
-        raise NoValidHarFileError("No .har file found")
     api_key = None
     cookies = None
-    for path in harPath:
+    for path in get_har_files():
         with open(path, 'rb') as file:
             try:
                 harFile = json.loads(file.read())

g4f/Provider/needs_auth/OpenaiChat.py

@@ -424,10 +424,10 @@ async def iter_messages_line(cls, session: StreamSession, line: bytes, fields: C
                         for element in c.get("parts"):
                             if isinstance(element, dict) and element.get("content_type") == "image_asset_pointer":
                                 image = cls.get_generated_image(session, cls._headers, element)
-                                if image is not None:
-                                    generated_images.append(image)
+                                generated_images.append(image)
                         for image_response in await asyncio.gather(*generated_images):
-                            yield image_response
+                            if image_response is not None:
+                                yield image_response
                     if m.get("author", {}).get("role") == "assistant":
                         fields.message_id = v.get("message", {}).get("id")
             return

g4f/Provider/openai/har_file.py

@@ -45,15 +45,19 @@ def __init__(self, arkURL, arkBx, arkHeader, arkBody, arkCookies, userAgent):
         self.arkCookies = arkCookies
         self.userAgent = userAgent
 
-def readHAR():
+def get_har_files():
     harPath = []
     for root, _, files in os.walk(get_cookies_dir()):
         for file in files:
             if file.endswith(".har"):
                 harPath.append(os.path.join(root, file))
     if not harPath:
         raise NoValidHarFileError("No .har file found")
-    for path in harPath:
+    harPath.sort(key=lambda x: os.path.getmtime(x))
+    return harPath
+
+def readHAR():
+    for path in get_har_files():
         with open(path, 'rb') as file:
             try:
                 harFile = json.loads(file.read())

g4f/api/__init__.py

@@ -104,6 +104,9 @@ class ChatCompletionsConfig(BaseModel):
     web_search: Optional[bool] = None
     proxy: Optional[str] = None
     conversation_id: Optional[str] = None
+    history_disabled: Optional[bool] = None
+    auto_continue: Optional[bool] = None
+    timeout: Optional[int] = None
 
 class ImageGenerationConfig(BaseModel):
     prompt: str

g4f/client/__init__.py

@@ -8,9 +8,8 @@
 import base64
 from typing import Union, AsyncIterator, Iterator, Coroutine, Optional
 
-from ..providers.base_provider import AsyncGeneratorProvider
 from ..image import ImageResponse, copy_images, images_dir
-from ..typing import Messages, Image, ImageType
+from ..typing import Messages, ImageType
 from ..providers.types import ProviderType
 from ..providers.response import ResponseType, FinishReason, BaseConversation, SynthesizeData
 from ..errors import NoImageResponseError, ModelNotFoundError
@@ -58,7 +57,7 @@ def iter_response(
         elif isinstance(chunk, BaseConversation):
             yield chunk
             continue
-        elif isinstance(chunk, SynthesizeData):
+        elif isinstance(chunk, SynthesizeData) or chunk is None:
             continue
 
         chunk = str(chunk)
@@ -121,7 +120,7 @@ async def async_iter_response(
             elif isinstance(chunk, BaseConversation):
                 yield chunk
                 continue
-            elif isinstance(chunk, SynthesizeData):
+            elif isinstance(chunk, SynthesizeData) or chunk is None:
                 continue
 
             chunk = str(chunk)
@@ -292,6 +291,7 @@ async def async_generate(
         **kwargs
     ) -> ImagesResponse:
         provider_handler = await self.get_provider_handler(model, provider, BingCreateImages)
+        provider_name = provider.__name__ if hasattr(provider, "__name__") else type(provider).__name__
         if proxy is None:
             proxy = self.client.proxy
 
@@ -317,22 +317,22 @@ async def async_generate(
                     response = item
                     break
         else:
-            raise ValueError(f"Provider {getattr(provider_handler, '__name__')} does not support image generation")
+            raise ValueError(f"Provider {provider_name} does not support image generation")
         if isinstance(response, ImageResponse):
             return await self._process_image_response(
                 response,
                 response_format,
                 proxy,
                 model,
-                getattr(provider_handler, "__name__", None)
+                provider_name
             )
         if response is None:
-            raise NoImageResponseError(f"No image response from {getattr(provider_handler, '__name__')}")
+            raise NoImageResponseError(f"No image response from {provider_name}")
         raise NoImageResponseError(f"Unexpected response type: {type(response)}")
 
     def create_variation(
         self,
-        image: Union[str, bytes],
+        image: ImageType,
         model: str = None,
         provider: Optional[ProviderType] = None,
         response_format: str = "url",
@@ -352,6 +352,7 @@ async def async_create_variation(
         **kwargs
     ) -> ImagesResponse:
         provider_handler = await self.get_provider_handler(model, provider, OpenaiAccount)
+        provider_name = provider.__name__ if hasattr(provider, "__name__") else type(provider).__name__
         if proxy is None:
             proxy = self.client.proxy
 
@@ -372,14 +373,14 @@ async def async_create_variation(
             else:
                 response = provider_handler.create_variation(image, model=model, response_format=response_format, proxy=proxy, **kwargs)
         else:
-            raise NoImageResponseError(f"Provider {provider} does not support image variation")
-    
+            raise NoImageResponseError(f"Provider {provider_name} does not support image variation")
+
         if isinstance(response, str):
             response = ImageResponse([response])
         if isinstance(response, ImageResponse):
-            return self._process_image_response(response, response_format, proxy, model, getattr(provider, "__name__", None))
+            return self._process_image_response(response, response_format, proxy, model, provider_name)
         if response is None:
-            raise NoImageResponseError(f"No image response from {getattr(provider, '__name__')}")
+            raise NoImageResponseError(f"No image response from {provider_name}")
         raise NoImageResponseError(f"Unexpected response type: {type(response)}")
 
     async def _process_image_response(

g4f/client/service.py

@@ -61,18 +61,27 @@ def get_model_and_provider(model    : Union[Model, str],
     if not provider:
         if not model:
             model = default
+            provider = model.best_provider
         elif isinstance(model, str):
-            raise ModelNotFoundError(f'Model not found: {model}')
-        provider = model.best_provider
-
+            if model in ProviderUtils.convert:
+                provider = ProviderUtils.convert[model]
+                model = provider.default_model if hasattr(provider, "default_model") else ""
+            else:
+                raise ModelNotFoundError(f'Model not found: {model}')
+        elif isinstance(model, Model):
+            provider = model.best_provider
+        else:
+            raise ValueError(f"Unexpected type: {type(model)}")
     if not provider:
         raise ProviderNotFoundError(f'No provider found for model: {model}')
 
+    provider_name = provider.__name__ if hasattr(provider, "__name__") else type(provider).__name__
+
     if isinstance(model, Model):
         model = model.name
 
     if not ignore_working and not provider.working:
-        raise ProviderNotWorkingError(f'{provider.__name__} is not working')
+        raise ProviderNotWorkingError(f"{provider_name} is not working")
 
     if isinstance(provider, BaseRetryProvider):
         if not ignore_working:
@@ -81,12 +90,12 @@ def get_model_and_provider(model    : Union[Model, str],
             provider.providers = [p for p in provider.providers if p.__name__ not in ignored]
 
     if not ignore_stream and not provider.supports_stream and stream:
-        raise StreamNotSupportedError(f'{provider.__name__} does not support "stream" argument')
+        raise StreamNotSupportedError(f'{provider_name} does not support "stream" argument')
 
     if model:
-        debug.log(f'Using {provider.__name__} provider and {model} model')
+        debug.log(f'Using {provider_name} provider and {model} model')
     else:
-        debug.log(f'Using {provider.__name__} provider')
+        debug.log(f'Using {provider_name} provider')
 
     debug.last_provider = provider
     debug.last_model = model
@@ -109,7 +118,7 @@ def get_last_provider(as_dict: bool = False) -> Union[ProviderType, dict[str, st
     if as_dict:
         if last:
             return {
-                "name": last.__name__,
+                "name": last.__name__ if hasattr(last, "__name__") else type(last).__name__,
                 "url": last.url,
                 "model": debug.last_model,
                 "label": getattr(last, "label", None) if hasattr(last, "label") else None

g4f/client/stubs.py

@@ -147,4 +147,4 @@ def model_construct(cls, data: List[Image], created: int = None, model: str = No
             model=model,
             provider=provider,
             created=created
-        )
+        )