From 7a19a6c941dde9d11bbcdaaab56725be52ef7aa8 Mon Sep 17 00:00:00 2001
From: Heiner Lohaus <hlohaus@users.noreply.github.com>
Date: Thu, 2 Jan 2025 02:59:46 +0100
Subject: Fix unittests

---
 g4f/Provider/needs_auth/GeminiPro.py |  2 +-
 g4f/models.py                        | 10 +++++-----
 g4f/tools/web_search.py              |  4 +++-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/g4f/Provider/needs_auth/GeminiPro.py b/g4f/Provider/needs_auth/GeminiPro.py
index 22c9c015..47636bdd 100644
--- a/g4f/Provider/needs_auth/GeminiPro.py
+++ b/g4f/Provider/needs_auth/GeminiPro.py
@@ -24,7 +24,7 @@ class GeminiPro(AsyncGeneratorProvider, ProviderModelMixin):
 
     default_model = "gemini-1.5-pro"
     default_vision_model = default_model
-    fallback_models = [default_model, "gemini-pro", "gemini-1.5-flash", "gemini-1.5-flash-8b"]
+    fallback_models = [default_model, "gemini-2.0-flash-exp", "gemini-pro", "gemini-1.5-flash", "gemini-1.5-flash-8b"]
     model_aliases = {
         "gemini-flash": "gemini-1.5-flash",
         "gemini-flash": "gemini-1.5-flash-8b",
diff --git a/g4f/models.py b/g4f/models.py
index 4b3286bc..929f63c5 100644
--- a/g4f/models.py
+++ b/g4f/models.py
@@ -98,26 +98,26 @@ gpt_35_turbo = Model(
 gpt_4 = Model(
     name          = 'gpt-4',
     base_provider = 'OpenAI',
-    best_provider = IterListProvider([DDG, Blackbox, ChatGptEs, PollinationsAI, Copilot, OpenaiChat, Liaobots, Airforce, Mhystical])
+    best_provider = IterListProvider([DDG, Blackbox, ChatGptEs, PollinationsAI, Copilot, OpenaiChat, Liaobots, Mhystical])
 )
 
 gpt_4_turbo = Model(
     name          = 'gpt-4-turbo',
     base_provider = 'OpenAI',
-    best_provider = Airforce
+    best_provider = None
 )
 
 # gpt-4o
 gpt_4o = Model(
     name          = 'gpt-4o',
     base_provider = 'OpenAI',
-    best_provider = IterListProvider([Blackbox, ChatGptEs, PollinationsAI, DarkAI, ChatGpt, Airforce, Liaobots, OpenaiChat])
+    best_provider = IterListProvider([Blackbox, ChatGptEs, PollinationsAI, DarkAI, ChatGpt, Liaobots, OpenaiChat])
 )
 
 gpt_4o_mini = Model(
     name          = 'gpt-4o-mini',
     base_provider = 'OpenAI',
-    best_provider = IterListProvider([DDG, ChatGptEs, Pizzagpt, ChatGpt, Airforce, RubiksAI, Liaobots, OpenaiChat])
+    best_provider = IterListProvider([DDG, ChatGptEs, Pizzagpt, ChatGpt, RubiksAI, Liaobots, OpenaiChat])
 )
 
 # o1
@@ -136,7 +136,7 @@ o1_preview = Model(
 o1_mini = Model(
     name          = 'o1-mini',
     base_provider = 'OpenAI',
-    best_provider = IterListProvider([Liaobots, Airforce])
+    best_provider = IterListProvider([Liaobots])
 )
 
 ### GigaChat ###
diff --git a/g4f/tools/web_search.py b/g4f/tools/web_search.py
index 780e45df..314ddf0b 100644
--- a/g4f/tools/web_search.py
+++ b/g4f/tools/web_search.py
@@ -192,7 +192,9 @@ Instruction: {instructions}
 User request:
 {prompt}
 """
-    debug.log(f"Web search: '{query.strip()[:50]}...' {len(search_results.results)} Results {search_results.used_words} Words")
+    debug.log(f"Web search: '{query.strip()[:50]}...'")
+    if isinstance(search_results, SearchResults):
+        debug.log(f"with {len(search_results.results)} Results {search_results.used_words} Words")
     return new_prompt
 
 def get_search_message(prompt: str, raise_search_exceptions=False, **kwargs) -> str:
-- 
cgit v1.2.3