From 63c68c12e9c97120bc4e775295bc3340f27b2cc1 Mon Sep 17 00:00:00 2001
From: kqlio67 <>
Date: Fri, 3 Jan 2025 08:34:37 +0200
Subject: Fix conflicts

---
 g4f/models.py | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

(limited to 'g4f/models.py')

diff --git a/g4f/models.py b/g4f/models.py
index fcd9ce78..f6eeea75 100644
--- a/g4f/models.py
+++ b/g4f/models.py
@@ -68,7 +68,6 @@ default = Model(
     best_provider = IterListProvider([
         DDG,
         Pizzagpt,
-        BlackboxCreateAgent,
         Blackbox,
         Copilot,
         DeepInfraChat,
@@ -78,7 +77,7 @@ default = Model(
         ChatGptEs,
         OpenaiChat,
         Mhystical,
-        RubiksAI,
+        ClaudeSon,
     ])
 )
 
@@ -101,12 +100,6 @@ gpt_4 = Model(
     best_provider = IterListProvider([DDG, Blackbox, ChatGptEs, PollinationsAI, Copilot, OpenaiChat, Liaobots, Mhystical])
 )
 
-gpt_4_turbo = Model(
-    name          = 'gpt-4-turbo',
-    base_provider = 'OpenAI',
-    best_provider = None
-)
-
 # gpt-4o
 gpt_4o = Model(
     name          = 'gpt-4o',
@@ -136,7 +129,7 @@ o1_preview = Model(
 o1_mini = Model(
     name          = 'o1-mini',
     base_provider = 'OpenAI',
-    best_provider = IterListProvider([Liaobots])
+    best_provider = Liaobots
 )
 
 ### GigaChat ###
@@ -179,12 +172,6 @@ llama_3_1_70b = Model(
     best_provider = IterListProvider([DDG, DeepInfraChat, Blackbox, BlackboxCreateAgent, TeachAnything, PollinationsAI, DarkAI, Airforce, RubiksAI, PerplexityLabs])
 )
 
-llama_3_1_405b = Model(
-    name          = "llama-3.1-405b",
-    base_provider = "Meta Llama",
-    best_provider = Blackbox
-)
-
 # llama 3.2
 llama_3_2_1b = Model(
     name          = "llama-3.2-1b",
@@ -661,7 +648,6 @@ class ModelUtils:
 
         # gpt-4
         gpt_4.name: gpt_4,
-        gpt_4_turbo.name: gpt_4_turbo,
         
         # gpt-4o
         gpt_4o.name: gpt_4o,
@@ -684,7 +670,6 @@ class ModelUtils:
         # llama-3.1
         llama_3_1_8b.name: llama_3_1_8b,
         llama_3_1_70b.name: llama_3_1_70b,
-        llama_3_1_405b.name: llama_3_1_405b,
 
         # llama-3.2
         llama_3_2_1b.name: llama_3_2_1b,
-- 
cgit v1.2.3