XFE Git
XFE Studio Git
Git 首页 全局搜索
XFE 主站 文档 NuGet
公开
关注 0 Fork 0 Star 1
返回提交历史

XFEstudio/gpt4free

Update docs/providers-and-models.md g4f/models.py g4f/Provider/Blackbox.py g4f/Provider/FreeGpt.py g4f/Provider/GizAI.py g4f/Provider/Liaobots.py g4f/Provider/needs_auth/GeminiPro.py

ee0affd8
kqlio67 <>
提交于

代码差异

7 个文件 +81 -37
Modified docs/providers-and-models.md +10 -8
@@ -22,7 +22,7 @@ This document provides an overview of various AI providers and models, including
22 22 |----------|-------------|--------------|---------------|--------|--------|------|------|
23 23 |[api.airforce](https://api.airforce)|`g4f.Provider.Airforce`|`phi-2, openchat-3.5, deepseek-coder, hermes-2-dpo, hermes-2-pro, openhermes-2.5, lfm-40b, german-7b, llama-2-7b, llama-3.1-8b, llama-3.1-70b, neural-7b, zephyr-7b, evil,`|`sdxl, flux-pro, flux, flux-realism, flux-anime, flux-3d, flux-disney, flux-pixel, flux-4o, any-dark, midjourney, dall-e-3`|❌|✔|![](https://img.shields.io/badge/Active-brightgreen)|❌+✔|
24 24 |[amigochat.io](https://amigochat.io/chat/)|`g4f.Provider.AmigoChat`|✔|✔|❌|✔|![Error](https://img.shields.io/badge/RateLimit-f48d37)|❌|
25 |[blackbox.ai](https://www.blackbox.ai)|`g4f.Provider.Blackbox`|`blackboxai, gpt-4, gpt-4o, gemini-pro, claude-3.5-sonnet, blackboxai-pro, llama-3.1-8b, llama-3.1-70b, llama-3.3-70b, mixtral-7b, deepseek-chat, dbrx-instruct, qwq-32b, hermes-2-dpo`|`flux`|`blackboxai, gpt-4o, gemini-pro, gemini-flash, llama-3.1-8b, llama-3.1-70b, llama-3.1-405b`|✔|![](https://img.shields.io/badge/Active-brightgreen)|❌|
25 |[blackbox.ai](https://www.blackbox.ai)|`g4f.Provider.Blackbox`|`blackboxai, gpt-4, gpt-4o, gemini-1.5-pro, claude-3.5-sonnet, blackboxai-pro, llama-3.1-8b, llama-3.1-70b, llama-3.3-70b, mixtral-7b, deepseek-chat, dbrx-instruct, qwq-32b, hermes-2-dpo`|`flux`|`blackboxai, gpt-4o, gemini-1.5-pro, gemini-1.5-flash, llama-3.1-8b, llama-3.1-70b, llama-3.1-405b`|✔|![](https://img.shields.io/badge/Active-brightgreen)|❌|
26 26 |[blackbox.ai](https://www.blackbox.ai)|`g4f.Provider.BlackboxCreateAgent`|`llama-3.1-70b`|`flux`|❌|✔|![](https://img.shields.io/badge/Active-brightgreen)|❌|
27 27 |[chatgpt.com](https://chatgpt.com)|`g4f.Provider.ChatGpt`|✔|❌|❌|✔|![Error](https://img.shields.io/badge/HTTPError-f48d37)|❌|
28 28 |[chatgpt.es](https://chatgpt.es)|`g4f.Provider.ChatGptEs`|`gpt-4, gpt-4o, gpt-4o-mini`|❌|❌|✔|![](https://img.shields.io/badge/Active-brightgreen)|❌|
@@ -34,9 +34,9 @@ This document provides an overview of various AI providers and models, including
34 34 |[deepinfra.com/chat](https://deepinfra.com/chat)|`g4f.Provider.DeepInfraChat`|`llama-3.1-8b, llama-3.1-70b, qwq-32b, wizardlm-2-8x22b, qwen-2-72b, qwen-2.5-coder-32b, nemotron-70b`|❌|❌|✔|![](https://img.shields.io/badge/Active-brightgreen)|❌|
35 35 |[black-forest-labs-flux-1-dev.hf.space](https://black-forest-labs-flux-1-dev.hf.space)|`g4f.Provider.Flux`|❌|`flux-dev`|❌|✔|![](https://img.shields.io/badge/Active-brightgreen)|❌|
36 36 |[chat10.free2gpt.xyz](https://chat10.free2gpt.xyz)|`g4f.Provider.Free2GPT`|`mistral-7b`|❌|❌|✔|![](https://img.shields.io/badge/Active-brightgreen)|❌|
37 |[freegptsnav.aifree.site](https://freegptsnav.aifree.site)|`g4f.Provider.FreeGpt`|`gemini-pro`|❌|❌|✔|![](https://img.shields.io/badge/Active-brightgreen)|❌|
38 |[app.giz.ai/assistant](https://app.giz.ai/assistant)|`g4f.Provider.GizAI`|`gemini-flash`|❌|❌|✔|![](https://img.shields.io/badge/Active-brightgreen)|❌|
39 |[liaobots.work](https://liaobots.work)|`g4f.Provider.Liaobots`|`grok-beta, gpt-4o-mini, gpt-4o, gpt-4, o1-preview, o1-mini, claude-3-opus, claude-3.5-sonnet, claude-3-sonnet, gemini-flash, gemini-pro`|❌|❌|✔|![](https://img.shields.io/badge/Active-brightgreen)|❌|
37 |[freegptsnav.aifree.site](https://freegptsnav.aifree.site)|`g4f.Provider.FreeGpt`|`gemini-1.5-pro`|❌|❌|✔|![](https://img.shields.io/badge/Active-brightgreen)|❌|
38 |[app.giz.ai/assistant](https://app.giz.ai/assistant)|`g4f.Provider.GizAI`|`gemini-1.5-flash`|❌|❌|✔|![](https://img.shields.io/badge/Active-brightgreen)|❌|
39 |[liaobots.work](https://liaobots.work)|`g4f.Provider.Liaobots`|`grok-2, gpt-4o-mini, gpt-4o, gpt-4, o1-preview, o1-mini, claude-3-opus, claude-3.5-sonnet, claude-3-sonnet, gemini-1.5-flash, gemini-1.5-pro, gemini-2.0-flash, gemini-2.0-flash-thinking`|❌|❌|✔|![](https://img.shields.io/badge/Active-brightgreen)|❌|
40 40 |[mhystical.cc](https://mhystical.cc)|`g4f.Provider.Mhystical`|`gpt-4`|❌|❌|✔|![Error](https://img.shields.io/badge/Active-brightgreen)|❌|
41 41 |[labs.perplexity.ai](https://labs.perplexity.ai)|`g4f.Provider.PerplexityLabs`|`sonar-online, sonar-chat, llama-3.3-70b, llama-3.1-8b, llama-3.1-70b, lfm-40b`|❌|❌|✔|![Error](https://img.shields.io/badge/Active-brightgreen)|❌|
42 42 |[pi.ai/talk](https://pi.ai/talk)|`g4f.Provider.Pi`|`pi`|❌|❌|✔|![Error](https://img.shields.io/badge/Active-brightgreen)|❌|
@@ -64,7 +64,7 @@ This document provides an overview of various AI providers and models, including
64 64 |[deepinfra.com](https://deepinfra.com)|`g4f.Provider.DeepInfra`|✔|❌|❌|✔|![](https://img.shields.io/badge/Active-brightgreen)|✔|
65 65 |[deepinfra.com](https://deepinfra.com)|`g4f.Provider.DeepInfraImage`|❌|✔|❌|❌|![](https://img.shields.io/badge/Active-brightgreen)|✔|
66 66 |[gemini.google.com](https://gemini.google.com)|`g4f.Provider.Gemini`|`gemini`|`gemini`|`gemini`|❌|![](https://img.shields.io/badge/Active-brightgreen)|✔|
67 |[ai.google.dev](https://ai.google.dev)|`g4f.Provider.GeminiPro`|`gemini-pro`|❌|`gemini-pro`|❌|![](https://img.shields.io/badge/Active-brightgreen)|✔|
67 |[ai.google.dev](https://ai.google.dev)|`g4f.Provider.GeminiPro`|`gemini-1.5-flash, gemini-1.5-pro, gemini-2.0-flash`|❌|`gemini-1.5-pro`|❌|![](https://img.shields.io/badge/Active-brightgreen)|✔|
68 68 |[github.com/copilot](https://github.com/copilot)|`g4f.Provider.GithubCopilot`|✔|❌|❌|❌|![](https://img.shields.io/badge/Active-brightgreen)|✔|
69 69 |[glhf.chat](https://glhf.chat)|`g4f.Provider.GlhfChat`|✔|❌|❌|❌|![](https://img.shields.io/badge/Active-brightgreen)|✔|
70 70 |[console.groq.com/playground](https://console.groq.com/playground)|`g4f.Provider.Groq`|✔|❌|✔|❌|![](https://img.shields.io/badge/Active-brightgreen)|✔|
@@ -118,8 +118,10 @@ This document provides an overview of various AI providers and models, including
118 118 |phi-2|Microsoft|1+ Providers|[huggingface.co](https://huggingface.co/microsoft/phi-2)|
119 119 |phi-3.5-mini|Microsoft|2+ Providers|[huggingface.co](https://huggingface.co/microsoft/Phi-3.5-mini-instruct)|
120 120 |gemini|Google DeepMind|1+ Providers|[deepmind.google](http://deepmind.google/technologies/gemini/)|
121 |gemini-flash|Google DeepMind|4+ Providers|[deepmind.google](https://deepmind.google/technologies/gemini/flash/)|
122 |gemini-pro|Google DeepMind|4+ Providers|[deepmind.google](https://deepmind.google/technologies/gemini/pro/)|
121 |gemini-1.5-flash|Google DeepMind|4+ Providers|[deepmind.google](https://deepmind.google/technologies/gemini/flash/)|
122 |gemini-1.5-pro|Google DeepMind|4+ Providers|[deepmind.google](https://deepmind.google/technologies/gemini/pro/)|
123 |gemini-2.0-flash|Google DeepMind|2+ Providers|[deepmind.google](https://deepmind.google/technologies/gemini/flash/)|
124 |gemini-2.0-flash-thinking|Google DeepMind|1+ Providers|[deepmind.google](https://ai.google.dev/gemini-api/docs/thinking-mode)|
123 125 |gemma-2b|Google|1+ Providers|[huggingface.co](https://huggingface.co/google/gemma-2b)|
124 126 |claude-3-haiku|Anthropic|1+ Providers|[anthropic.com](https://www.anthropic.com/news/claude-3-haiku)|
125 127 |claude-3-sonnet|Anthropic|1+ Providers|[anthropic.com](https://www.anthropic.com/news/claude-3-family)|
@@ -140,7 +142,7 @@ This document provides an overview of various AI providers and models, including
140 142 |deepseek-coder|DeepSeek|1+ Providers|[huggingface.co](https://huggingface.co/deepseek-ai/DeepSeek-Coder-V2-Instruct)|
141 143 |wizardlm-2-8x22b|WizardLM|1+ Providers|[huggingface.co](https://huggingface.co/alpindale/WizardLM-2-8x22B)|
142 144 |openchat-3.5|OpenChat|1+ Providers|[huggingface.co](https://huggingface.co/openchat/openchat_3.5)|
143 |grok-beta|x.ai|1+ Providers|[x.ai](https://x.ai/blog/grok-2)|
145 |grok-2|x.ai|1+ Providers|[x.ai](https://x.ai/blog/grok-2)|
144 146 |sonar-online|Perplexity AI|1+ Providers|[docs.perplexity.ai](https://docs.perplexity.ai/)|
145 147 |sonar-chat|Perplexity AI|1+ Providers|[docs.perplexity.ai](https://docs.perplexity.ai/)|
146 148 |nemotron-70b|Nvidia|3+ Providers|[build.nvidia.com](https://build.nvidia.com/nvidia/llama-3_1-nemotron-70b-instruct)|
Modified g4f/Provider/Blackbox.py +2 -1
@@ -151,7 +151,8 @@ class Blackbox(AsyncGeneratorProvider, ProviderModelMixin):
151 151 model_aliases = {
152 152 ### chat ###
153 153 "gpt-4": "gpt-4o",
154 "gemini-flash": "gemini-1.5-flash",
154 "gemini-1.5-flash": "gemini-1.5-flash",
155 "gemini-1.5-pro": "gemini-pro",
155 156 "claude-3.5-sonnet": "claude-sonnet-3.5",
156 157 "llama-3.3-70b": "meta-llama/Llama-3.3-70B-Instruct-Turbo",
157 158 "mixtral-7b": "mistralai/Mistral-7B-Instruct-v0.2",
Modified g4f/Provider/FreeGpt.py +1 -1
@@ -26,7 +26,7 @@ class FreeGpt(AsyncGeneratorProvider, ProviderModelMixin):
26 26 supports_message_history = True
27 27 supports_system_message = True
28 28
29 default_model = 'gemini-pro'
29 default_model = 'gemini-1.5-pro'
30 30
31 31 @classmethod
32 32 async def create_async_generator(
Modified g4f/Provider/GizAI.py +1 -1
@@ -18,7 +18,7 @@ class GizAI(AsyncGeneratorProvider, ProviderModelMixin):
18 18
19 19 default_model = 'chat-gemini-flash'
20 20 models = [default_model]
21 model_aliases = {"gemini-flash": "chat-gemini-flash",}
21 model_aliases = {"gemini-1.5-flash": "chat-gemini-flash",}
22 22
23 23 @classmethod
24 24 def get_model(cls, model: str) -> str:
Modified g4f/Provider/Liaobots.py +34 -15
@@ -18,8 +18,8 @@ models = {
18 18 "tokenLimit": 7800,
19 19 "context": "8K",
20 20 },
21 "gpt-4o-2024-08-06": {
22 "id": "gpt-4o-2024-08-06",
21 "gpt-4o-2024-11-20": {
22 "id": "gpt-4o-2024-11-20",
23 23 "name": "GPT-4o",
24 24 "model": "ChatGPT",
25 25 "provider": "OpenAI",
@@ -54,9 +54,9 @@ models = {
54 54 "tokenLimit": 100000,
55 55 "context": "128K",
56 56 },
57 "grok-beta": {
58 "id": "grok-beta",
59 "name": "Grok-Beta",
57 "grok-2": {
58 "id": "grok-2",
59 "name": "Grok-2",
60 60 "model": "Grok",
61 61 "provider": "x.ai",
62 62 "maxLength": 400000,
@@ -99,7 +99,7 @@ models = {
99 99 "tokenLimit": 200000,
100 100 "context": "200K",
101 101 },
102 "claude-3-opus-20240229-t": {
102 "claude-3-opus-20240229-t": {
103 103 "id": "claude-3-opus-20240229-t",
104 104 "name": "Claude-3-Opus-T",
105 105 "model": "Claude",
@@ -109,7 +109,7 @@ models = {
109 109 "context": "200K",
110 110 },
111 111 "claude-3-5-sonnet-20241022-t": {
112 "id": "claude-3-5-sonnet-20241022-t",
112 "id": "claude-3-5-sonnet-20241022-t",
113 113 "name": "Claude-3.5-Sonnet-V2-T",
114 114 "model": "Claude",
115 115 "provider": "Anthropic",
@@ -117,6 +117,24 @@ models = {
117 117 "tokenLimit": 200000,
118 118 "context": "200K",
119 119 },
120 "gemini-2.0-flash-exp": {
121 "id": "gemini-2.0-flash-exp",
122 "name": "Gemini-2.0-Flash-Exp",
123 "model": "Gemini",
124 "provider": "Google",
125 "maxLength": 4000000,
126 "tokenLimit": 1000000,
127 "context": "1024K",
128 },
129 "gemini-2.0-flash-thinking-exp": {
130 "id": "gemini-2.0-flash-thinking-exp",
131 "name": "Gemini-2.0-Flash-Thinking-Exp",
132 "model": "Gemini",
133 "provider": "Google",
134 "maxLength": 4000000,
135 "tokenLimit": 1000000,
136 "context": "1024K",
137 },
120 138 "gemini-1.5-flash-002": {
121 139 "id": "gemini-1.5-flash-002",
122 140 "name": "Gemini-1.5-Flash-1M",
@@ -128,29 +146,28 @@ models = {
128 146 },
129 147 "gemini-1.5-pro-002": {
130 148 "id": "gemini-1.5-pro-002",
131 "name": "Gemini-1.5-Pro-1M",
149 "name": "Gemini-1.5-Pro-1M",
132 150 "model": "Gemini",
133 151 "provider": "Google",
134 152 "maxLength": 4000000,
135 153 "tokenLimit": 1000000,
136 154 "context": "1024K",
137 }
155 },
138 156 }
139 157
140
141 158 class Liaobots(AsyncGeneratorProvider, ProviderModelMixin):
142 159 url = "https://liaobots.site"
143 160 working = True
144 161 supports_message_history = True
145 162 supports_system_message = True
146 163
147 default_model = "gpt-4o-2024-08-06"
164 default_model = "gpt-4o-2024-11-20"
148 165 models = list(models.keys())
149 166 model_aliases = {
150 167 "gpt-4o-mini": "gpt-4o-mini-free",
151 "gpt-4o": "gpt-4o-2024-08-06",
168 "gpt-4o": default_model,
152 169 "gpt-4o-mini": "gpt-4o-mini-2024-07-18",
153 "gpt-4": "gpt-4o-2024-08-06",
170 "gpt-4": default_model,
154 171
155 172 "o1-preview": "o1-preview-2024-09-12",
156 173 "o1-mini": "o1-mini-2024-09-12",
@@ -162,8 +179,10 @@ class Liaobots(AsyncGeneratorProvider, ProviderModelMixin):
162 179 "claude-3-opus": "claude-3-opus-20240229-t",
163 180 "claude-3.5-sonnet": "claude-3-5-sonnet-20241022-t",
164 181
165 "gemini-flash": "gemini-1.5-flash-002",
166 "gemini-pro": "gemini-1.5-pro-002"
182 "gemini-2.0-flash": "gemini-2.0-flash-exp",
183 "gemini-2.0-flash-thinking": "gemini-2.0-flash-thinking-exp",
184 "gemini-1.5-flash": "gemini-1.5-flash-002",
185 "gemini-1.5-pro": "gemini-1.5-pro-002"
167 186 }
168 187
169 188 _auth_code = ""
Modified g4f/Provider/needs_auth/GeminiPro.py +4 -2
@@ -27,8 +27,10 @@ class GeminiPro(AsyncGeneratorProvider, ProviderModelMixin):
27 27 default_vision_model = default_model
28 28 fallback_models = [default_model, "gemini-2.0-flash-exp", "gemini-pro", "gemini-1.5-flash", "gemini-1.5-flash-8b"]
29 29 model_aliases = {
30 "gemini-flash": "gemini-1.5-flash",
31 "gemini-flash": "gemini-1.5-flash-8b",
30 "gemini-1.5-flash": "gemini-1.5-flash",
31 "gemini-1.5-flash": "gemini-1.5-flash-8b",
32 "gemini-1.5-pro": "gemini-pro",
33 "gemini-2.0-flash": "gemini-2.0-flash-exp",
32 34 }
33 35
34 36 @classmethod
Modified g4f/models.py +29 -9
@@ -252,22 +252,36 @@ phi_3_5_mini = Model(
252 252
253 253 ### Google DeepMind ###
254 254 # gemini
255 gemini_pro = Model(
256 name = 'gemini-pro',
255 gemini = Model(
256 name = 'gemini',
257 base_provider = 'Google',
258 best_provider = Gemini
259 )
260
261 # gemini-1.5
262 gemini_1_5_pro = Model(
263 name = 'gemini-1.5-pro',
257 264 base_provider = 'Google DeepMind',
258 265 best_provider = IterListProvider([Blackbox, Gemini, GeminiPro, Liaobots])
259 266 )
260 267
261 gemini_flash = Model(
262 name = 'gemini-flash',
268 gemini_1_5_flash = Model(
269 name = 'gemini-1.5-flash',
263 270 base_provider = 'Google DeepMind',
264 271 best_provider = IterListProvider([Blackbox, Gemini, GeminiPro, Liaobots])
265 272 )
266 273
267 gemini = Model(
268 name = 'gemini',
274 # gemini-2.0
275 gemini_2_0_flash = Model(
276 name = 'gemini-2.0-flash',
269 277 base_provider = 'Google DeepMind',
270 best_provider = Gemini
278 best_provider = IterListProvider([GeminiPro, Liaobots])
279 )
280
281 gemini_2_0_flash_thinking = Model(
282 name = 'gemini-2.0-flash-thinking',
283 base_provider = 'Google DeepMind',
284 best_provider = Liaobots
271 285 )
272 286
273 287 # gemma
@@ -696,8 +710,14 @@ class ModelUtils:
696 710 ### Google ###
697 711 # gemini
698 712 gemini.name: gemini,
699 gemini_pro.name: gemini_pro,
700 gemini_flash.name: gemini_flash,
713
714 # gemini-1.5
715 gemini_1_5_pro.name: gemini_1_5_pro,
716 gemini_1_5_flash.name: gemini_1_5_flash,
717
718 # gemini-2.0
719 gemini_2_0_flash.name: gemini_2_0_flash,
720 gemini_2_0_flash_thinking.name: gemini_2_0_flash_thinking,
701 721
702 722 # gemma
703 723 gemma_2b.name: gemma_2b,