diff options
| -rw-r--r-- | g4f/Provider/Bixin123.py | 89 | ||||
| -rw-r--r-- | g4f/Provider/__init__.py | 1 | ||||
| -rw-r--r-- | g4f/models.py | 13 |
3 files changed, 101 insertions, 2 deletions
diff --git a/g4f/Provider/Bixin123.py b/g4f/Provider/Bixin123.py new file mode 100644 index 00000000..694a2eff --- /dev/null +++ b/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 "" diff --git a/g4f/Provider/__init__.py b/g4f/Provider/__init__.py index 6488a814..4f30b2be 100644 --- a/g4f/Provider/__init__.py +++ b/g4f/Provider/__init__.py @@ -16,6 +16,7 @@ from .AiChats import AiChats from .Aura import Aura from .Bing import Bing from .BingCreateImages import BingCreateImages +from .Bixin123 import Bixin123 from .Blackbox import Blackbox from .ChatGot import ChatGot from .Chatgpt4Online import Chatgpt4Online diff --git a/g4f/models.py b/g4f/models.py index 9cf70a14..fd50009c 100644 --- a/g4f/models.py +++ b/g4f/models.py @@ -7,6 +7,7 @@ from .Provider import ( AiChatOnline, Allyfy, Bing, + Bixin123, Blackbox, ChatGot, Chatgpt4Online, @@ -81,6 +82,7 @@ default = Model( ReplicateHome, Upstage, Blackbox, + Bixin123, ]) ) @@ -103,7 +105,7 @@ gpt_35_turbo = Model( name = 'gpt-3.5-turbo', base_provider = 'OpenAI', best_provider = IterListProvider([ - Allyfy, TwitterBio, Nexra, + Allyfy, TwitterBio, Nexra, Bixin123, ]) ) @@ -128,7 +130,7 @@ gpt_4_turbo = Model( name = 'gpt-4-turbo', base_provider = 'OpenAI', best_provider = IterListProvider([ - Nexra, Liaobots, Bing + Nexra, Bixin123, Liaobots, Bing ]) ) @@ -332,6 +334,12 @@ qwen_1_5_14b = Model( best_provider = IterListProvider([FreeChatgpt]) ) +qwen_turbo = Model( + name = 'qwen-turbo', + base_provider = 'Qwen', + best_provider = IterListProvider([Bixin123]) +) + ### Zhipu AI ### glm4_9b = Model( @@ -584,6 +592,7 @@ class ModelUtils: ### Qwen ### 'qwen-1.5-14b': qwen_1_5_14b, +'qwen-turbo': qwen_turbo, ### Zhipu AI ### |