diff options
| author | Heiner Lohaus <heiner.lohaus@netformic.com> | 2023-09-01 23:39:57 +0200 |
|---|---|---|
| committer | Heiner Lohaus <heiner.lohaus@netformic.com> | 2023-09-01 23:39:57 +0200 |
| commit | 3e6b1d6bef04881d8f46ab06331b5e3c5e2e3471 (patch) | |
| tree | cc45ace1412c64677eba834ba60d73b03973d195 | |
| parent | ~ (diff) | |
| download | gpt4free-3e6b1d6bef04881d8f46ab06331b5e3c5e2e3471.tar gpt4free-3e6b1d6bef04881d8f46ab06331b5e3c5e2e3471.tar.gz gpt4free-3e6b1d6bef04881d8f46ab06331b5e3c5e2e3471.tar.bz2 gpt4free-3e6b1d6bef04881d8f46ab06331b5e3c5e2e3471.tar.lz gpt4free-3e6b1d6bef04881d8f46ab06331b5e3c5e2e3471.tar.xz gpt4free-3e6b1d6bef04881d8f46ab06331b5e3c5e2e3471.tar.zst gpt4free-3e6b1d6bef04881d8f46ab06331b5e3c5e2e3471.zip | |
| -rw-r--r-- | README.md | 105 | ||||
| -rw-r--r-- | g4f/Provider/Bing.py | 21 | ||||
| -rw-r--r-- | g4f/Provider/Liaobots.py | 1 | ||||
| -rw-r--r-- | g4f/Provider/Wuguokai.py | 6 | ||||
| -rw-r--r-- | g4f/Provider/__init__.py | 2 | ||||
| -rw-r--r-- | testing/test_needs_auth.py | 6 | ||||
| -rw-r--r-- | tool/readme_table.py | 48 |
7 files changed, 139 insertions, 50 deletions
@@ -118,25 +118,98 @@ for message in response: print(message) ``` -providers: +##### Providers: ```py from g4f.Provider import ( Acytoo, Aichat, Ails, - AiService, - AItianhu, Bard, Bing, ChatgptAi, ChatgptLogin, DeepAi, - GetGpt + EasyChat, + Equing, + GetGpt, + H2o, + HuggingChat, + Opchatgpts, + OpenAssistant, + OpenaiChat, + Raycast, + Theb, + Vercel, + Wewordle, + Wuguokai, + You, + Yqcloud ) +# Usage: +response = g4f.ChatCompletion.create(..., provider=ProviderName) +``` +##### Needs cookies: -# usage: -response = g4f.ChatCompletion.create(..., provider=ProviderName) +Many providers need cookies to work. +In Bing you need a session, where you have passed the captcha. +And in others providers you have to log-in into your account. +If you run the g4l package locally, +cookies from your browsers are readed with `get_cookies`. +Else you have pass them in the parameter `cookies`: +```py +from g4f.Provider import ( + Bard, + Bing, + H2o, + HuggingChat, + OpenAssistant, + OpenaiChat, + You, +) +# Usage: +response = g4f.ChatCompletion.create( + model=g4f.models.default, + messages=[{"role": "user", "content": "Hello"}], + provider=g4f.Provider.Name, + #cookies=g4f.get_cookies(".google.com"), + cookies={"name": "value", "name1": "value1"}, + auth=True +) +``` + +##### Async support: + +Run providers `async` to improve speed / performance. +The full execution time corresponds to the maximum execution time of a provider. + +```py +import g4f, asyncio + +async def run_async(): + _providers = [ + g4f.Provider.Bard, + g4f.Provider.Bing, + g4f.Provider.H2o, + g4f.Provider.HuggingChat, + g4f.Provider.Liaobots, + g4f.Provider.OpenAssistant, + g4f.Provider.OpenaiChat, + g4f.Provider.You, + g4f.Provider.Yqcloud, + ] + responses = [ + provider.create_async( + model=None, + messages=[{"role": "user", "content": "Hello"}], + ) + for provider in _providers + ] + responses = await asyncio.gather(*responses) + for idx, provider in enumerate(_providers): + print(f"{provider.__name__}:", responses[idx]) + +asyncio.run(run_async()) ``` ### interference openai-proxy api (use with openai python package) @@ -186,30 +259,34 @@ if __name__ == "__main__": | Website| Provider| gpt-3.5 | gpt-4 | Streaming | Status | Auth | | ------ | ------- | ------- | ----- | --------- | ------ | ---- | | [chat.acytoo.com](https://chat.acytoo.com/) | g4f.provider.Acytoo | ✔️ | ❌ | ❌ |  | ❌ | -| [chat-gpt.org](https://chat-gpt.org/chat) | g4f.provider.Aichat | ✔️ | ❌ | ❌ |  | ❌ | -| [ai.ls](https://ai.ls) | g4f.provider.Ails | ✔️ | ❌ | ✔️ |  | ❌ | +| [chat-gpt.org](https://chat-gpt.org/chat) | g4f.provider.Aichat | ✔️ | ❌ | ❌ |  | ❌ | +| [ai.ls](https://ai.ls) | g4f.provider.Ails | ✔️ | ❌ | ✔️ |  | ❌ | | [bard.google.com](https://bard.google.com) | g4f.provider.Bard | ❌ | ❌ | ❌ |  | ✔️ | -| [chatgpt.ai](https://chatgpt.ai/gpt-4/) | g4f.provider.ChatgptAi | ❌ | ✔️ | ❌ |  | ❌ | -| [opchatgpts.net](https://opchatgpts.net) | g4f.provider.ChatgptLogin | ✔️ | ❌ | ❌ |  | ❌ | +| [bing.com](https://bing.com/chat) | g4f.provider.Bing | ❌ | ✔️ | ✔️ |  | ✔️ | +| [chatgpt.ai](https://chatgpt.ai/gpt-4/) | g4f.provider.ChatgptAi | ❌ | ✔️ | ❌ |  | ❌ | +| [opchatgpts.net](https://opchatgpts.net) | g4f.provider.ChatgptLogin | ✔️ | ❌ | ❌ |  | ❌ | | [deepai.org](https://deepai.org) | g4f.provider.DeepAi | ✔️ | ❌ | ✔️ |  | ❌ | | [free.easychat.work](https://free.easychat.work) | g4f.provider.EasyChat | ✔️ | ❌ | ✔️ |  | ❌ | | [next.eqing.tech](https://next.eqing.tech/) | g4f.provider.Equing | ✔️ | ❌ | ✔️ |  | ❌ | | [chat.getgpt.world](https://chat.getgpt.world/) | g4f.provider.GetGpt | ✔️ | ❌ | ✔️ |  | ❌ | | [gpt-gm.h2o.ai](https://gpt-gm.h2o.ai) | g4f.provider.H2o | ❌ | ❌ | ✔️ |  | ❌ | -| [opchatgpts.net](https://opchatgpts.net) | g4f.provider.Opchatgpts | ✔️ | ❌ | ❌ |  | ❌ | +| [huggingface.co](https://huggingface.co/chat/) | g4f.provider.HuggingChat | ❌ | ❌ | ❌ |  | ✔️ | +| [liaobots.com](https://liaobots.com) | g4f.provider.Liaobots | ✔️ | ✔️ | ✔️ |  | ❌ | +| [opchatgpts.net](https://opchatgpts.net) | g4f.provider.Opchatgpts | ✔️ | ❌ | ❌ |  | ❌ | +| [open-assistant.io](https://open-assistant.io/chat) | g4f.provider.OpenAssistant | ❌ | ❌ | ❌ |  | ✔️ | +| [chat.openai.com](https://chat.openai.com) | g4f.provider.OpenaiChat | ✔️ | ✔️ | ✔️ |  | ✔️ | | [raycast.com](https://raycast.com) | g4f.provider.Raycast | ✔️ | ✔️ | ✔️ |  | ✔️ | | [theb.ai](https://theb.ai) | g4f.provider.Theb | ✔️ | ❌ | ✔️ |  | ✔️ | | [play.vercel.ai](https://play.vercel.ai) | g4f.provider.Vercel | ✔️ | ❌ | ❌ |  | ❌ | | [wewordle.org](https://wewordle.org/) | g4f.provider.Wewordle | ✔️ | ❌ | ❌ |  | ❌ | -| [you.com](https://you.com) | g4f.provider.You | ✔️ | ❌ | ❌ |  | ❌ | +| [chat.wuguokai.xyz](https://chat.wuguokai.xyz) | g4f.provider.Wuguokai | ✔️ | ❌ | ❌ |  | ❌ | +| [you.com](https://you.com) | g4f.provider.You | ✔️ | ❌ | ✔️ |  | ❌ | | [chat9.yqcloud.top](https://chat9.yqcloud.top/) | g4f.provider.Yqcloud | ✔️ | ❌ | ❌ |  | ❌ | | [www.aitianhu.com](https://www.aitianhu.com/) | g4f.provider.AItianhu | ✔️ | ❌ | ❌ |  | ❌ | | [aiservice.vercel.app](https://aiservice.vercel.app/) | g4f.provider.AiService | ✔️ | ❌ | ❌ |  | ❌ | -| [bing.com](https://bing.com/chat) | g4f.provider.Bing | ❌ | ✔️ | ❌ |  | ❌ | | [chat.dfehub.com](https://chat.dfehub.com/) | g4f.provider.DfeHub | ✔️ | ❌ | ✔️ |  | ❌ | | [chat9.fastgpt.me](https://chat9.fastgpt.me/) | g4f.provider.FastGpt | ✔️ | ❌ | ✔️ |  | ❌ | | [forefront.com](https://forefront.com) | g4f.provider.Forefront | ✔️ | ❌ | ✔️ |  | ❌ | -| [liaobots.com](https://liaobots.com) | g4f.provider.Liaobots | ✔️ | ✔️ | ✔️ |  | ✔️ | | [supertest.lockchat.app](http://supertest.lockchat.app) | g4f.provider.Lockchat | ✔️ | ✔️ | ✔️ |  | ❌ | | [p5.v50.ltd](https://p5.v50.ltd) | g4f.provider.V50 | ✔️ | ❌ | ❌ |  | ❌ | diff --git a/g4f/Provider/Bing.py b/g4f/Provider/Bing.py index c31ba5a7..48968e39 100644 --- a/g4f/Provider/Bing.py +++ b/g4f/Provider/Bing.py @@ -26,32 +26,15 @@ class Bing(AsyncGeneratorProvider): prompt = messages[-1]["content"] context = create_context(messages[:-1]) - if cookies: + if cookies and "SRCHD" in cookies: #TODO: Will implement proper cookie retrieval later and use a try-except mechanism in 'stream_generate' instead of defaulting the cookie value like this cookies_dict = { - 'MUID' : '', - 'BCP' : '', - 'MUIDB' : '', - 'USRLOC' : '', - 'SRCHD' : 'AF=hpcodx', - 'MMCASM' : '', - '_UR' : '', - 'ANON' : '', - 'NAP' : '', - 'ABDEF' : '', + 'SRCHD' : cookies["SRCHD"], 'PPLState' : '1', 'KievRPSSecAuth': '', - '_U' : '', 'SUID' : '', - '_EDGE_S' : '', - 'WLS' : '', - '_HPVN' : '', - '_SS' : '', - '_clck' : '', 'SRCHUSR' : '', - '_RwBf' : '', 'SRCHHPGUSR' : '', - 'ipv6' : '', } return stream_generate(prompt, context, cookies_dict) diff --git a/g4f/Provider/Liaobots.py b/g4f/Provider/Liaobots.py index e69a565e..95a0ea06 100644 --- a/g4f/Provider/Liaobots.py +++ b/g4f/Provider/Liaobots.py @@ -28,6 +28,7 @@ models = { class Liaobots(AsyncGeneratorProvider): url = "https://liaobots.com" + working = True supports_stream = True supports_gpt_35_turbo = True supports_gpt_4 = True diff --git a/g4f/Provider/Wuguokai.py b/g4f/Provider/Wuguokai.py index 906283ad..8a5aac0d 100644 --- a/g4f/Provider/Wuguokai.py +++ b/g4f/Provider/Wuguokai.py @@ -1,4 +1,4 @@ -import random, requests, json +import random, requests from ..typing import Any, CreateResult from .base_provider import BaseProvider @@ -6,8 +6,6 @@ from .base_provider import BaseProvider class Wuguokai(BaseProvider): url = 'https://chat.wuguokai.xyz' supports_gpt_35_turbo = True - supports_stream = False - needs_auth = False working = True @staticmethod @@ -43,7 +41,7 @@ class Wuguokai(BaseProvider): "userId": f"#/chat/{random.randint(1,99999999)}", "usingContext": True } - response = requests.post("https://ai-api20.wuguokai.xyz/api/chat-process", headers=headers, data=json.dumps(data),proxies=kwargs['proxy'] if 'proxy' in kwargs else {}) + response = requests.post("https://ai-api20.wuguokai.xyz/api/chat-process", headers=headers, timeout=3, json=data, proxies=kwargs['proxy'] if 'proxy' in kwargs else {}) _split = response.text.split("> 若回答失败请重试或多刷新几次界面后重试") if response.status_code == 200: if len(_split) > 1: diff --git a/g4f/Provider/__init__.py b/g4f/Provider/__init__.py index 06643665..fce66d0c 100644 --- a/g4f/Provider/__init__.py +++ b/g4f/Provider/__init__.py @@ -30,7 +30,7 @@ from .FastGpt import FastGpt from .V50 import V50 from .Wuguokai import Wuguokai -from .base_provider import BaseProvider +from .base_provider import BaseProvider, AsyncProvider, AsyncGeneratorProvider __all__ = [ 'BaseProvider', diff --git a/testing/test_needs_auth.py b/testing/test_needs_auth.py index eddb040a..3cef1c61 100644 --- a/testing/test_needs_auth.py +++ b/testing/test_needs_auth.py @@ -36,14 +36,14 @@ Bing: Hello! How can I help you today? 3.28 secs No Stream Total: 10.14 secs """ -print("Yqcloud:", end="") +print("Bing: ", end="") for response in log_time_yield( g4f.ChatCompletion.create, model=g4f.models.gpt_35_turbo, messages=[{"role": "user", "content": _instruct}], - provider=g4f.Provider.Yqcloud, + provider=g4f.Provider.Bing, #cookies=g4f.get_cookies(".huggingface.co"), - stream=True, + #stream=True, auth=True ): print(response, end="") diff --git a/tool/readme_table.py b/tool/readme_table.py index b578b9ca..522c66a7 100644 --- a/tool/readme_table.py +++ b/tool/readme_table.py @@ -6,14 +6,35 @@ from urllib.parse import urlparse sys.path.append(str(Path(__file__).parent.parent)) from g4f import models, Provider -from g4f.Provider.base_provider import BaseProvider +from g4f.Provider.base_provider import BaseProvider, AsyncProvider from testing.test_providers import test -def main(): - print_providers() - print("\n", "-" * 50, "\n") - print_models() +def print_imports(): + print("##### Providers:") + print("```py") + print("from g4f.Provider import (") + for _provider in get_providers(): + if _provider.working: + print(f" {_provider.__name__},") + print(")") + print("# Usage:") + print("response = g4f.ChatCompletion.create(..., provider=ProviderName)") + print("```") + print() + print() + +def print_async(): + print("##### Async support:") + print("```py") + print("from g4f.Provider import (") + for _provider in get_providers(): + if issubclass(_provider, AsyncProvider): + print(f" {_provider.__name__},") + print(")") + print("```") + print() + print() def print_providers(): lines = [ @@ -48,18 +69,23 @@ def print_providers(): print("\n".join(lines)) -def get_providers() -> list[type[BaseProvider]]: +def get_provider_names() -> list[str]: provider_names = dir(Provider) ignore_names = [ "base_provider", "BaseProvider", + "AsyncProvider", + "AsyncGeneratorProvider" ] - provider_names = [ + return [ provider_name for provider_name in provider_names if not provider_name.startswith("__") and provider_name not in ignore_names ] - return [getattr(Provider, provider_name) for provider_name in provider_names] + + +def get_providers() -> list[type[BaseProvider]]: + return [getattr(Provider, provider_name) for provider_name in get_provider_names()] def print_models(): @@ -107,4 +133,8 @@ def get_models(): if __name__ == "__main__": - main() + print_imports() + print_async() + print_providers() + print("\n", "-" * 50, "\n") + print_models()
\ No newline at end of file |