Merge pull request #2207 from kqlio67/main

Enhance and expand provider support, update models, and improve overall functionality

etc/testing/_providers.py

@@ -35,7 +35,6 @@ def get_providers() -> list[ProviderType]:
         provider
         for provider in __providers__
         if provider.__name__ not in dir(Provider.deprecated)
-        and provider.__name__ not in dir(Provider.unfinished)
         and provider.url is not None
     ]
 
@@ -59,4 +58,4 @@ def test(provider: ProviderType) -> bool:
 
 if __name__ == "__main__":
     main()
-
+

etc/testing/test_all.py

@@ -38,21 +38,11 @@ async def test(model: g4f.Model):
 
 async def start_test():
     models_to_test = [
-        # GPT-3.5 4K Context
+        # GPT-3.5
         g4f.models.gpt_35_turbo,
-        g4f.models.gpt_35_turbo_0613,
 
-        # GPT-3.5 16K Context
-        g4f.models.gpt_35_turbo_16k,
-        g4f.models.gpt_35_turbo_16k_0613,
-
-        # GPT-4 8K Context
+        # GPT-4
         g4f.models.gpt_4,
-        g4f.models.gpt_4_0613,
-
-        # GPT-4 32K Context
-        g4f.models.gpt_4_32k,
-        g4f.models.gpt_4_32k_0613,
     ]
 
     models_working = []

etc/testing/test_chat_completion.py

@@ -8,7 +8,7 @@
 print("create:", end=" ", flush=True)
 for response in g4f.ChatCompletion.create(
     model=g4f.models.default,
-    provider=g4f.Provider.Bing,
+    #provider=g4f.Provider.Bing,
     messages=[{"role": "user", "content": "write a poem about a tree"}],
     stream=True
 ):
@@ -18,7 +18,7 @@
 async def run_async():
     response = await g4f.ChatCompletion.create_async(
         model=g4f.models.default,
-        provider=g4f.Provider.Bing,
+        #provider=g4f.Provider.Bing,
         messages=[{"role": "user", "content": "hello!"}],
     )
     print("create_async:", response)

etc/tool/create_provider.py

@@ -90,7 +90,7 @@ async def create_async_generator(
     print("Create code...")
     response = []
     for chunk in g4f.ChatCompletion.create(
-        model=g4f.models.gpt_35_long,
+        model=g4f.models.default,
         messages=[{"role": "user", "content": prompt}],
         timeout=300,
         stream=True,

etc/tool/improve_code.py

@@ -30,7 +30,7 @@ def read_code(text):
 print("Create code...")
 response = []
 for chunk in g4f.ChatCompletion.create(
-    model=g4f.models.gpt_35_long,
+    model=g4f.models.default,
     messages=[{"role": "user", "content": prompt}],
     timeout=300,
     stream=True
@@ -42,4 +42,4 @@ def read_code(text):
 
 if code := read_code(response):
     with open(path, "w") as file:
-        file.write(code)
+        file.write(code)

g4f/Provider/AiChats.py

@@ -0,0 +1,106 @@
+from __future__ import annotations
+
+import json
+import base64
+from aiohttp import ClientSession
+from ..typing import AsyncResult, Messages
+from .base_provider import AsyncGeneratorProvider, ProviderModelMixin
+from ..image import ImageResponse
+from .helper import format_prompt
+
+class AiChats(AsyncGeneratorProvider, ProviderModelMixin):
+    url = "https://ai-chats.org"
+    api_endpoint = "https://ai-chats.org/chat/send2/"
+    working = True
+    supports_gpt_4 = True
+    supports_message_history = True
+    default_model = 'gpt-4'
+    models = ['gpt-4', 'dalle']
+
+    @classmethod
+    async def create_async_generator(
+        cls,
+        model: str,
+        messages: Messages,
+        proxy: str = None,
+        **kwargs
+    ) -> AsyncResult:
+        headers = {
+            "accept": "application/json, text/event-stream",
+            "accept-language": "en-US,en;q=0.9",
+            "cache-control": "no-cache",
+            "content-type": "application/json",
+            "origin": cls.url,
+            "pragma": "no-cache",
+            "referer": f"{cls.url}/{'image' if model == 'dalle' else 'chat'}/",
+            "sec-ch-ua": '"Chromium";v="127", "Not)A;Brand";v="99"',
+            "sec-ch-ua-mobile": "?0",
+            "sec-ch-ua-platform": '"Linux"',
+            "sec-fetch-dest": "empty",
+            "sec-fetch-mode": "cors",
+            "sec-fetch-site": "same-origin",
+            "user-agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36",
+            'cookie': 'muVyak=LSFNvUWqdgKkGprbDBsfieIoEMzjOQ; LSFNvUWqdgKkGprbDBsfieIoEMzjOQ=ac28831b98143847e83dbe004404e619-1725548624-1725548621; muVyak_hits=9; ai-chat-front=9d714d5dc46a6b47607c9a55e7d12a95; _csrf-front=76c23dc0a013e5d1e21baad2e6ba2b5fdab8d3d8a1d1281aa292353f8147b057a%3A2%3A%7Bi%3A0%3Bs%3A11%3A%22_csrf-front%22%3Bi%3A1%3Bs%3A32%3A%22K9lz0ezsNPMNnfpd_8gT5yEeh-55-cch%22%3B%7D',
+        }
+
+        async with ClientSession(headers=headers) as session:
+            if model == 'dalle':
+                prompt = messages[-1]['content'] if messages else ""
+            else:
+                prompt = format_prompt(messages)
+
+            data = {
+                "type": "image" if model == 'dalle' else "chat",
+                "messagesHistory": [
+                    {
+                        "from": "you",
+                        "content": prompt
+                    }
+                ]
+            }
+
+            try:
+                async with session.post(cls.api_endpoint, json=data, proxy=proxy) as response:
+                    response.raise_for_status()
+
+                    if model == 'dalle':
+                        response_json = await response.json()
+
+                        if 'data' in response_json and response_json['data']:
+                            image_url = response_json['data'][0].get('url')
+                            if image_url:
+                                async with session.get(image_url) as img_response:
+                                    img_response.raise_for_status()
+                                    image_data = await img_response.read()
+
+                                base64_image = base64.b64encode(image_data).decode('utf-8')
+                                base64_url = f"data:image/png;base64,{base64_image}"
+                                yield ImageResponse(base64_url, prompt)
+                            else:
+                                yield f"Error: No image URL found in the response. Full response: {response_json}"
+                        else:
+                            yield f"Error: Unexpected response format. Full response: {response_json}"
+                    else:
+                        full_response = await response.text()
+                        message = ""
+                        for line in full_response.split('\n'):
+                            if line.startswith('data: ') and line != 'data: ':
+                                message += line[6:]
+
+                        message = message.strip()
+                        yield message
+            except Exception as e:
+                yield f"Error occurred: {str(e)}"
+
+    @classmethod
+    async def create_async(
+        cls,
+        model: str,
+        messages: Messages,
+        proxy: str = None,
+        **kwargs
+    ) -> str:
+        async for response in cls.create_async_generator(model, messages, proxy, **kwargs):
+            if isinstance(response, ImageResponse):
+                return response.images[0]
+            return response

g4f/Provider/Binjie.py

@@ -0,0 +1,65 @@
+from __future__ import annotations
+
+import random
+from ..requests import StreamSession
+
+from ..typing import AsyncResult, Messages
+from .base_provider import AsyncGeneratorProvider, format_prompt
+
+
+class Binjie(AsyncGeneratorProvider):
+    url = "https://chat18.aichatos8.com"
+    working = True
+    supports_gpt_4 = True
+    supports_stream = True
+    supports_system_message = True
+    supports_message_history = True
+
+    @staticmethod
+    async def create_async_generator(
+        model: str,
+        messages: Messages,
+        proxy: str = None,
+        timeout: int = 120,
+        **kwargs,
+    ) -> AsyncResult:
+        async with StreamSession(
+            headers=_create_header(), proxies={"https": proxy}, timeout=timeout
+        ) as session:
+            payload = _create_payload(messages, **kwargs)
+            async with session.post("https://api.binjie.fun/api/generateStream", json=payload) as response:
+                response.raise_for_status()
+                async for chunk in response.iter_content():
+                    if chunk:
+                        chunk = chunk.decode()
+                        if "sorry, 您的ip已由于触发防滥用检测而被封禁" in chunk:
+                            raise RuntimeError("IP address is blocked by abuse detection.")
+                        yield chunk
+
+
+def _create_header():
+    return {
+        "accept"        : "application/json, text/plain, */*",
+        "content-type"  : "application/json",
+        "origin"        : "https://chat18.aichatos8.com",
+        "referer"       : "https://chat18.aichatos8.com/"
+    }
+
+
+def _create_payload(
+    messages: Messages,
+    system_message: str = "",
+    user_id: int = None,
+    **kwargs
+):
+    if not user_id:
+        user_id = random.randint(1690000544336, 2093025544336)
+    return {
+        "prompt": format_prompt(messages),
+        "network": True,
+        "system": system_message,
+        "withoutContext": False,
+        "stream": True,
+        "userId": f"#/chat/{user_id}"
+    }
+

g4f/Provider/Bixin123.py

@@ -0,0 +1,89 @@
+from __future__ import annotations
+
+from aiohttp import ClientSession
+import json
+from .base_provider import AsyncGeneratorProvider, ProviderModelMixin
+from ..typing import AsyncResult, Messages
+from .helper import format_prompt
+
+class Bixin123(AsyncGeneratorProvider, ProviderModelMixin):
+    url = "https://chat.bixin123.com"
+    api_endpoint = "https://chat.bixin123.com/api/chatgpt/chat-process"
+    working = True
+    supports_gpt_35_turbo = True
+    supports_gpt_4 = True
+
+    default_model = 'gpt-3.5-turbo-0125'
+    models = ['gpt-3.5-turbo-0125', 'gpt-3.5-turbo-16k-0613', 'gpt-4-turbo', 'qwen-turbo']
+
+    model_aliases = {
+        "gpt-3.5-turbo": "gpt-3.5-turbo-0125",
+        "gpt-3.5-turbo": "gpt-3.5-turbo-16k-0613",
+    }
+
+    @classmethod
+    def get_model(cls, model: str) -> str:
+        if model in cls.models:
+            return model
+        elif model in cls.model_aliases:
+            return cls.model_aliases[model]
+        else:
+            return cls.default_model
+
+    @classmethod
+    async def create_async_generator(
+        cls,
+        model: str,
+        messages: Messages,
+        proxy: str = None,
+        **kwargs
+    ) -> AsyncResult:
+        model = cls.get_model(model)
+
+        headers = {
+            "accept": "application/json, text/plain, */*",
+            "accept-language": "en-US,en;q=0.9",
+            "cache-control": "no-cache",
+            "content-type": "application/json",
+            "fingerprint": "988148794",
+            "origin": cls.url,
+            "pragma": "no-cache",
+            "priority": "u=1, i",
+            "referer": f"{cls.url}/chat",
+            "sec-ch-ua": '"Chromium";v="127", "Not)A;Brand";v="99"',
+            "sec-ch-ua-mobile": "?0",
+            "sec-ch-ua-platform": '"Linux"',
+            "sec-fetch-dest": "empty",
+            "sec-fetch-mode": "cors",
+            "sec-fetch-site": "same-origin",
+            "user-agent": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36",
+            "x-website-domain": "chat.bixin123.com",
+        }
+
+        async with ClientSession(headers=headers) as session:
+            prompt = format_prompt(messages)
+            data = {
+                "prompt": prompt,
+                "options": {
+                    "usingNetwork": False,
+                    "file": ""
+                }
+            }
+            async with session.post(cls.api_endpoint, json=data, proxy=proxy) as response:
+                response.raise_for_status()
+                response_text = await response.text()
+
+                lines = response_text.strip().split("\n")
+                last_json = None
+                for line in reversed(lines):
+                    try:
+                        last_json = json.loads(line)
+                        break
+                    except json.JSONDecodeError:
+                        pass
+
+                if last_json:
+                    text = last_json.get("text", "")
+                    yield text
+                else:
+                    yield ""