返回提交历史
Modified
g4f/Provider/needs_auth/GeminiPro.py
+1
-1
Modified
g4f/models.py
+5
-5
Modified
g4f/tools/web_search.py
+3
-1
XFEstudio/gpt4free
Fix unittests
7a19a6c9
代码差异
3 个文件
+9
-7
@@ -24,7 +24,7 @@ class GeminiPro(AsyncGeneratorProvider, ProviderModelMixin):
24
24
25
25
default_model = "gemini-1.5-pro"
26
26
default_vision_model = default_model
27
fallback_models = [default_model, "gemini-pro", "gemini-1.5-flash", "gemini-1.5-flash-8b"]
27
fallback_models = [default_model, "gemini-2.0-flash-exp", "gemini-pro", "gemini-1.5-flash", "gemini-1.5-flash-8b"]
28
28
model_aliases = {
29
29
"gemini-flash": "gemini-1.5-flash",
30
30
"gemini-flash": "gemini-1.5-flash-8b",
@@ -98,26 +98,26 @@ gpt_35_turbo = Model(
98
98
gpt_4 = Model(
99
99
name = 'gpt-4',
100
100
base_provider = 'OpenAI',
101
best_provider = IterListProvider([DDG, Blackbox, ChatGptEs, PollinationsAI, Copilot, OpenaiChat, Liaobots, Airforce, Mhystical])
101
best_provider = IterListProvider([DDG, Blackbox, ChatGptEs, PollinationsAI, Copilot, OpenaiChat, Liaobots, Mhystical])
102
102
)
103
103
104
104
gpt_4_turbo = Model(
105
105
name = 'gpt-4-turbo',
106
106
base_provider = 'OpenAI',
107
best_provider = Airforce
107
best_provider = None
108
108
)
109
109
110
110
# gpt-4o
111
111
gpt_4o = Model(
112
112
name = 'gpt-4o',
113
113
base_provider = 'OpenAI',
114
best_provider = IterListProvider([Blackbox, ChatGptEs, PollinationsAI, DarkAI, ChatGpt, Airforce, Liaobots, OpenaiChat])
114
best_provider = IterListProvider([Blackbox, ChatGptEs, PollinationsAI, DarkAI, ChatGpt, Liaobots, OpenaiChat])
115
115
)
116
116
117
117
gpt_4o_mini = Model(
118
118
name = 'gpt-4o-mini',
119
119
base_provider = 'OpenAI',
120
best_provider = IterListProvider([DDG, ChatGptEs, Pizzagpt, ChatGpt, Airforce, RubiksAI, Liaobots, OpenaiChat])
120
best_provider = IterListProvider([DDG, ChatGptEs, Pizzagpt, ChatGpt, RubiksAI, Liaobots, OpenaiChat])
121
121
)
122
122
123
123
# o1
@@ -136,7 +136,7 @@ o1_preview = Model(
136
136
o1_mini = Model(
137
137
name = 'o1-mini',
138
138
base_provider = 'OpenAI',
139
best_provider = IterListProvider([Liaobots, Airforce])
139
best_provider = IterListProvider([Liaobots])
140
140
)
141
141
142
142
### GigaChat ###
@@ -192,7 +192,9 @@ Instruction: {instructions}
192
192
User request:
193
193
{prompt}
194
194
"""
195
debug.log(f"Web search: '{query.strip()[:50]}...' {len(search_results.results)} Results {search_results.used_words} Words")
195
debug.log(f"Web search: '{query.strip()[:50]}...'")
196
if isinstance(search_results, SearchResults):
197
debug.log(f"with {len(search_results.results)} Results {search_results.used_words} Words")
196
198
return new_prompt
197
199
198
200
def get_search_message(prompt: str, raise_search_exceptions=False, **kwargs) -> str: