From 3e491c63d7443a6c312986324f8f1390bede48d1 Mon Sep 17 00:00:00 2001
From: kqlio67 <kqlio67@users.noreply.github.com>
Date: Fri, 13 Sep 2024 17:09:31 +0300
Subject: feat(providers): unify Rocks and FluxAirforce into Airforce provider

---
 g4f/models.py | 180 +++++++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 140 insertions(+), 40 deletions(-)

(limited to 'g4f/models.py')

diff --git a/g4f/models.py b/g4f/models.py
index 2b5f11d0..6547d38c 100644
--- a/g4f/models.py
+++ b/g4f/models.py
@@ -5,6 +5,7 @@ from dataclasses import dataclass
 from .Provider import IterListProvider, ProviderType
 from .Provider import (
     AiChatOnline,
+    Airforce,
     Allyfy,
     Bing,
     Binjie,
@@ -18,7 +19,6 @@ from .Provider import (
     DDG,
     DeepInfra,
     DeepInfraImage,
-    FluxAirforce,
     Free2GPT,
     FreeChatgpt,
     FreeGpt,
@@ -105,7 +105,7 @@ gpt_35_turbo = Model(
     name          = 'gpt-3.5-turbo',
     base_provider = 'OpenAI',
     best_provider = IterListProvider([
-        Allyfy, TwitterBio, Nexra, Bixin123, CodeNews,
+        Allyfy, TwitterBio, Nexra, Bixin123, CodeNews, Airforce,
     ])
 )
 
@@ -114,7 +114,8 @@ gpt_4o = Model(
     name          = 'gpt-4o',
     base_provider = 'OpenAI',
     best_provider = IterListProvider([
-        Liaobots, Chatgpt4o, OpenaiChat,
+        Liaobots, Chatgpt4o, Airforce, 
+        OpenaiChat,
     ])
 )
 
@@ -122,8 +123,8 @@ gpt_4o_mini = Model(
     name          = 'gpt-4o-mini',
     base_provider = 'OpenAI',
     best_provider = IterListProvider([
-        DDG, Liaobots, You, FreeNetfly, Pizzagpt, ChatgptFree, AiChatOnline, CodeNews, 
-        MagickPen, OpenaiChat, Koala,       
+        DDG, Liaobots, You, FreeNetfly, Pizzagpt, ChatgptFree, AiChatOnline, CodeNews, MagickPen, Airforce,  
+        OpenaiChat, Koala,       
     ])
 )
 
@@ -131,7 +132,7 @@ gpt_4_turbo = Model(
     name          = 'gpt-4-turbo',
     base_provider = 'OpenAI',
     best_provider = IterListProvider([
-        Nexra, Bixin123, Liaobots, Bing
+        Nexra, Bixin123, Liaobots, Airforce, Bing
     ])
 )
 
@@ -139,7 +140,7 @@ gpt_4 = Model(
     name          = 'gpt-4',
     base_provider = 'OpenAI',
     best_provider = IterListProvider([
-        Chatgpt4Online, Nexra, Binjie, Bing,
+        Chatgpt4Online, Nexra, Binjie, Airforce, Bing,
         gpt_4_turbo.best_provider, gpt_4o.best_provider, gpt_4o_mini.best_provider
     ])
 )
@@ -159,48 +160,60 @@ meta = Model(
     best_provider = MetaAI
 )
 
+llama_2_13b = Model(
+    name          = "llama-2-13b",
+    base_provider = "Meta",
+    best_provider = IterListProvider([Airforce])
+)
+
 llama_3_8b = Model(
     name          = "llama-3-8b",
     base_provider = "Meta",
-    best_provider = IterListProvider([DeepInfra, Replicate])
+    best_provider = IterListProvider([Airforce, DeepInfra, Replicate])
 )
 
 llama_3_70b = Model(
     name          = "llama-3-70b",
     base_provider = "Meta",
-    best_provider = IterListProvider([ReplicateHome, DeepInfra, Replicate])
+    best_provider = IterListProvider([ReplicateHome, Airforce, DeepInfra, Replicate])
 )
 
 llama_3_1_8b = Model(
     name          = "llama-3.1-8b",
     base_provider = "Meta",
-    best_provider = IterListProvider([Blackbox, PerplexityLabs])
+    best_provider = IterListProvider([Blackbox, Airforce, PerplexityLabs])
 )
 
 llama_3_1_70b = Model(
     name          = "llama-3.1-70b",
     base_provider = "Meta",
-    best_provider = IterListProvider([DDG, HuggingChat, FreeGpt, Blackbox, TeachAnything, Free2GPT, HuggingFace, PerplexityLabs])
+    best_provider = IterListProvider([DDG, HuggingChat, FreeGpt, Blackbox, TeachAnything, Free2GPT, Airforce, HuggingFace, PerplexityLabs])
 )
 
 llama_3_1_405b = Model(
     name          = "llama-3.1-405b",
     base_provider = "Meta",
-    best_provider = IterListProvider([Blackbox])
+    best_provider = IterListProvider([Blackbox, Airforce])
 )
 
 
 ### Mistral ###
+mistral_7b = Model(
+    name          = "mistral-7b",
+    base_provider = "Mistral",
+    best_provider = IterListProvider([HuggingChat, Airforce, HuggingFace, DeepInfra])
+)
+
 mixtral_8x7b = Model(
     name          = "mixtral-8x7b",
     base_provider = "Mistral",
-    best_provider = IterListProvider([HuggingChat, DDG, ReplicateHome, TwitterBio, DeepInfra, HuggingFace,])
+    best_provider = IterListProvider([HuggingChat, DDG, ReplicateHome, TwitterBio, Airforce, DeepInfra, HuggingFace])
 )
 
-mistral_7b = Model(
-    name          = "mistral-7b",
+mixtral_8x22b = Model(
+    name          = "mixtral-8x22b",
     base_provider = "Mistral",
-    best_provider = IterListProvider([HuggingChat, HuggingFace, DeepInfra])
+    best_provider = IterListProvider([Airforce])
 )
 
 
@@ -208,7 +221,13 @@ mistral_7b = Model(
 mixtral_8x7b_dpo = Model(
     name          = "mixtral-8x7b-dpo",
     base_provider = "NousResearch",
-    best_provider = IterListProvider([HuggingChat, HuggingFace,])
+    best_provider = IterListProvider([HuggingChat, Airforce, HuggingFace])
+)
+
+yi_34b = Model(
+    name = 'yi-34b',
+    base_provider = 'NousResearch',
+    best_provider = IterListProvider([Airforce])
 )
 
 
@@ -222,29 +241,45 @@ phi_3_mini_4k = Model(
 
 ### Google ###
 # gemini
-gemini = Model(
-    name          = 'gemini',
-    base_provider = 'Google',
-    best_provider = Gemini
-)
-
 gemini_pro = Model(
     name          = 'gemini-pro',
     base_provider = 'Google',
-    best_provider = IterListProvider([GeminiPro, ChatGot, Liaobots])
+    best_provider = IterListProvider([GeminiPro, ChatGot, Liaobots, Airforce])
 )
 
 gemini_flash = Model(
     name          = 'gemini-flash',
     base_provider = 'Google',
-    best_provider = IterListProvider([Liaobots, Blackbox])
+    best_provider = IterListProvider([Blackbox, Liaobots, Airforce])
 )
 
+gemini = Model(
+    name          = 'gemini',
+    base_provider = 'Google',
+    best_provider = IterListProvider([
+        Gemini, 
+        gemini_flash.best_provider, gemini_pro.best_provider
+   ])
+)
+
+
 # gemma
 gemma_2b = Model(
     name          = 'gemma-2b',
     base_provider = 'Google',
-    best_provider = IterListProvider([ReplicateHome])
+    best_provider = IterListProvider([ReplicateHome, Airforce])
+)
+
+gemma_2b_9b = Model(
+    name          = 'gemma-2b-9b',
+    base_provider = 'Google',
+    best_provider = IterListProvider([Airforce])
+)
+
+gemma_2b_27b = Model(
+    name          = 'gemma-2b-27b',
+    base_provider = 'Google',
+    best_provider = IterListProvider([Airforce])
 )
 
 ### Anthropic ###
@@ -311,7 +346,7 @@ blackbox = Model(
 dbrx_instruct = Model(
     name = 'dbrx-instruct',
     base_provider = 'Databricks',
-    best_provider = IterListProvider([DeepInfra])
+    best_provider = IterListProvider([Airforce, DeepInfra])
 )
 
 
@@ -327,7 +362,7 @@ command_r_plus = Model(
 sparkdesk_v1_1 = Model(
     name = 'sparkdesk-v1.1',
     base_provider = 'iFlytek',
-    best_provider = IterListProvider([FreeChatgpt])
+    best_provider = IterListProvider([FreeChatgpt, Airforce])
 )
 
 ### Qwen ###
@@ -337,6 +372,24 @@ qwen_1_5_14b = Model(
     best_provider = IterListProvider([FreeChatgpt])
 )
 
+qwen_1_5_72b = Model(
+    name = 'qwen-1.5-72b',
+    base_provider = 'Qwen',
+    best_provider = IterListProvider([Airforce])
+)
+
+qwen_1_5_110b = Model(
+    name = 'qwen-1.5-110b',
+    base_provider = 'Qwen',
+    best_provider = IterListProvider([Airforce])
+)
+
+qwen_2_72b = Model(
+    name = 'qwen-2-72b',
+    base_provider = 'Qwen',
+    best_provider = IterListProvider([Airforce])
+)
+
 qwen_turbo = Model(
     name = 'qwen-turbo',
     base_provider = 'Qwen',
@@ -360,7 +413,10 @@ glm_4_9b = Model(
 glm_4 = Model(
     name = 'glm-4',
     base_provider = 'Zhipu AI',
-    best_provider = IterListProvider([CodeNews, glm_4_9b.best_provider,])
+    best_provider = IterListProvider([
+        CodeNews, 
+        glm_3_6b.best_provider, glm_4_9b.best_provider
+    ])
 )
 
 ### 01-ai ###
@@ -370,14 +426,20 @@ yi_1_5_9b = Model(
     best_provider = IterListProvider([FreeChatgpt])
 )
 
-
-### Pi ###
+### Upstage ###
 solar_1_mini = Model(
     name = 'solar-1-mini',
     base_provider = 'Upstage',
     best_provider = IterListProvider([Upstage])
 )
 
+solar_10_7b = Model(
+    name = 'solar-10-7b',
+    base_provider = 'Upstage',
+    best_provider = Airforce
+)
+
+
 ### Pi ###
 pi = Model(
     name = 'pi',
@@ -410,10 +472,22 @@ westlake_7b_v2 = Model(
 deepseek = Model(
     name = 'deepseek',
     base_provider = 'DeepSeek',
-    best_provider = CodeNews
+    best_provider = IterListProvider([CodeNews, Airforce])
 )
 
+### WizardLM ###
+wizardlm_2_8x22b = Model(
+    name = 'wizardlm-2-8x22b',
+    base_provider = 'WizardLM',
+    best_provider = Airforce
+)
 
+### Together ###
+sh_n_7b = Model(
+    name = 'sh-n-7b',
+    base_provider = 'Together',
+    best_provider = Airforce
+)
 
 #############
 ### Image ###
@@ -446,35 +520,42 @@ playground_v2_5 = Model(
 flux = Model(
     name = 'flux',
     base_provider = 'Flux AI',
-    best_provider = IterListProvider([FluxAirforce])
+    best_provider = IterListProvider([Airforce])
     
 )
 
 flux_realism = Model(
     name = 'flux-realism',
     base_provider = 'Flux AI',
-    best_provider = IterListProvider([FluxAirforce])
+    best_provider = IterListProvider([Airforce])
     
 )
 
 flux_anime = Model(
     name = 'flux-anime',
     base_provider = 'Flux AI',
-    best_provider = IterListProvider([FluxAirforce])
+    best_provider = IterListProvider([Airforce])
     
 )
 
 flux_3d = Model(
     name = 'flux-3d',
     base_provider = 'Flux AI',
-    best_provider = IterListProvider([FluxAirforce])
+    best_provider = IterListProvider([Airforce])
     
 )
 
 flux_disney = Model(
     name = 'flux-disney',
     base_provider = 'Flux AI',
-    best_provider = IterListProvider([FluxAirforce])
+    best_provider = IterListProvider([Airforce])
+    
+)
+
+flux_pixel = Model(
+    name = 'flux-pixel',
+    base_provider = 'Flux AI',
+    best_provider = IterListProvider([Airforce])
     
 )
 
@@ -537,6 +618,9 @@ class ModelUtils:
 ### Meta ###
 "meta-ai": meta,
 
+# llama-2
+'llama-2-13b': llama_2_13b,
+
 # llama-3
 'llama-3-8b': llama_3_8b,
 'llama-3-70b': llama_3_70b,
@@ -545,14 +629,19 @@ class ModelUtils:
 'llama-3.1-8b': llama_3_1_8b,
 'llama-3.1-70b': llama_3_1_70b,
 'llama-3.1-405b': llama_3_1_405b,
+      
         
 ### Mistral ###
-'mixtral-8x7b': mixtral_8x7b,
 'mistral-7b': mistral_7b,
+'mixtral-8x7b': mixtral_8x7b,
+'mixtral-8x22b': mixtral_8x22b,
      
      
 ### NousResearch ###
-'mixtral-8x7b-dpo': mixtral_8x7b_dpo,   
+'mixtral-8x7b-dpo': mixtral_8x7b_dpo,  
+ 
+'yi-34b': yi_34b,   
+        
         
 ### Microsoft ###
 'phi-3-mini-4k': phi_3_mini_4k,
@@ -566,6 +655,8 @@ class ModelUtils:
         
 # gemma
 'gemma-2b': gemma_2b,
+'gemma-2b-9b': gemma_2b_9b,
+'gemma-2b-27b': gemma_2b_27b,
 
 
 ### Anthropic ###
@@ -575,8 +666,8 @@ class ModelUtils:
         
 'claude-3-opus': claude_3_opus,
 'claude-3-sonnet': claude_3_sonnet,
-'claude-3-5-sonnet': claude_3_5_sonnet,
 'claude-3-haiku': claude_3_haiku,
+'claude-3-5-sonnet': claude_3_5_sonnet,
         
         
 ### Reka AI ###
@@ -605,6 +696,9 @@ class ModelUtils:
         
 ### Qwen ###
 'qwen-1.5-14b': qwen_1_5_14b,
+'qwen-1.5-72b': qwen_1_5_72b,
+'qwen-1.5-110b': qwen_1_5_110b,
+'qwen-2-72b': qwen_2_72b,
 'qwen-turbo': qwen_turbo,
         
         
@@ -620,6 +714,7 @@ class ModelUtils:
         
 ### Upstage ###
 'solar-1-mini': solar_1_mini,
+'solar-10-7b': solar_10_7b,
 
 
 ### Pi ###
@@ -640,6 +735,10 @@ class ModelUtils:
 
 ### DeepSeek ###
 'deepseek': deepseek,
+
+
+### Together ###
+'sh-n-7b': sh_n_7b,
         
         
         
@@ -662,6 +761,7 @@ class ModelUtils:
 'flux-anime': flux_anime,
 'flux-3d': flux_3d,
 'flux-disney': flux_disney,
+'flux-pixel': flux_pixel,
 
 
 ###  ###
-- 
cgit v1.2.3