From a3af9fac3ee152399ba031e2124149fdcf47bc33 Mon Sep 17 00:00:00 2001
From: Heiner Lohaus <heiner@lohaus.eu>
Date: Sun, 22 Oct 2023 01:22:25 +0200
Subject: Add FakeGpt Provider Update providers in models

---
 g4f/models.py | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

(limited to 'g4f/models.py')

diff --git a/g4f/models.py b/g4f/models.py
index 0ebe7395..22a04ffb 100644
--- a/g4f/models.py
+++ b/g4f/models.py
@@ -4,19 +4,18 @@ from .typing     import Union
 from .Provider   import BaseProvider, RetryProvider
 from .Provider   import (
     ChatgptLogin,
-    ChatgptDemo,
     ChatgptDuo,
     GptForLove,
-    Opchatgpts,
     ChatgptAi,
     GptChatly,
     Liaobots,
     ChatgptX,
+    ChatBase,
     Yqcloud,
     GeekGpt,
+    FakeGpt,
     Myshell,
     FreeGpt,
-    Cromicle,
     NoowAi,
     Vercel, 
     Aichat,
@@ -30,9 +29,6 @@ from .Provider   import (
     Bing,
     You,
     H2o,
-    
-    ChatForAi,
-    ChatBase
 )
 
 @dataclass(unsafe_hash=True)
@@ -50,9 +46,8 @@ default = Model(
     base_provider = "",
     best_provider = RetryProvider([
         Bing,         # Not fully GPT 3 or 4
-        Yqcloud,      # Answers short questions in chinese
-        ChatgptDuo,   # Include search results
-        Aibn, Aichat, ChatgptAi, ChatgptLogin, FreeGpt, GptGo, Myshell, Ylokh, GeekGpt
+        AiAsk, Aichat, ChatgptAi, FreeGpt, GptGo, GeekGpt,
+        Phind, You
     ])
 )
 
@@ -61,9 +56,10 @@ gpt_35_long = Model(
     name          = 'gpt-3.5-turbo',
     base_provider = 'openai',
     best_provider = RetryProvider([
-        AiAsk, Aichat, ChatgptDemo, FreeGpt, Liaobots, You,
-        GPTalk, ChatgptLogin, GptChatly, GptForLove, Opchatgpts,
-        NoowAi, GeekGpt, Phind
+        AiAsk, Aichat, FreeGpt, You,
+        GptChatly, GptForLove,
+        NoowAi, GeekGpt, Phind,
+        FakeGpt
     ])
 )
 
@@ -72,8 +68,8 @@ gpt_35_turbo = Model(
     name          = 'gpt-3.5-turbo',
     base_provider = 'openai',
     best_provider=RetryProvider([
-        ChatgptX, ChatgptDemo, GptGo, You, 
-        NoowAi, GPTalk, GptForLove, Phind, ChatBase, Cromicle
+        ChatgptX, GptGo, You, 
+        NoowAi, GPTalk, GptForLove, Phind, ChatBase
     ])
 )
 
@@ -81,7 +77,7 @@ gpt_4 = Model(
     name          = 'gpt-4',
     base_provider = 'openai',
     best_provider = RetryProvider([
-        Bing, GeekGpt, Liaobots, Phind
+        Bing, GeekGpt, Phind
     ])
 )
 
-- 
cgit v1.2.3


From 13e89d6ab9e3016741fdcbd03cc4996faec54f9a Mon Sep 17 00:00:00 2001
From: Heiner Lohaus <heiner@lohaus.eu>
Date: Sun, 22 Oct 2023 08:57:31 +0200
Subject: Fix MyShell Provider

---
 g4f/models.py | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'g4f/models.py')

diff --git a/g4f/models.py b/g4f/models.py
index 22a04ffb..7eee917a 100644
--- a/g4f/models.py
+++ b/g4f/models.py
@@ -3,18 +3,13 @@ from dataclasses import dataclass
 from .typing     import Union
 from .Provider   import BaseProvider, RetryProvider
 from .Provider   import (
-    ChatgptLogin,
-    ChatgptDuo,
     GptForLove,
     ChatgptAi,
     GptChatly,
-    Liaobots,
     ChatgptX,
     ChatBase,
-    Yqcloud,
     GeekGpt,
     FakeGpt,
-    Myshell,
     FreeGpt,
     NoowAi,
     Vercel, 
@@ -23,9 +18,7 @@ from .Provider   import (
     AiAsk,
     GptGo,
     Phind,
-    Ylokh,
     Bard, 
-    Aibn,
     Bing,
     You,
     H2o,
-- 
cgit v1.2.3