From 81cf5d7c771c4ff1a9d49db754ccef780f8b1d99 Mon Sep 17 00:00:00 2001
From: kqlio67 <166700875+kqlio67@users.noreply.github.com>
Date: Fri, 19 Apr 2024 12:10:56 +0000
Subject: A few small fixes in GUI and Providers (#1861)

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

(limited to 'g4f/models.py')

diff --git a/g4f/models.py b/g4f/models.py
index 4af1c31e..2b7c69f3 100644
--- a/g4f/models.py
+++ b/g4f/models.py
@@ -4,28 +4,33 @@ from dataclasses import dataclass
 
 from .Provider import RetryProvider, ProviderType
 from .Provider import (
+    Aichatos,
+    Bing,
+    Blackbox,
     Chatgpt4Online,
-    PerplexityLabs,
-    GeminiProChat,
-    ChatgptNext,
-    HuggingChat,
-    HuggingFace,
-    OpenaiChat,
     ChatgptAi,
+    ChatgptNext,
+    Cohere,
+    Cnote,
     DeepInfra,
+    Feedough,
+    FreeGpt,
+    Gemini,
+    GeminiProChat,
     GigaChat,
+    HuggingChat,
+    HuggingFace,
+    Koala,
     Liaobots,
-    FreeGpt,
     Llama,
+    OpenaiChat,
+    PerplexityLabs,
+    Pi,
     Vercel,
-    Gemini,
-    Koala,
-    Cohere,
-    Bing,
     You,
-    Pi,
 )
 
+
 @dataclass(unsafe_hash=True)
 class Model:
     """
@@ -79,6 +84,9 @@ gpt_35_turbo = Model(
         ChatgptNext,
         Koala,
         OpenaiChat,
+        Aichatos,
+        Cnote,
+        Feedough,
     ])
 )
 
@@ -132,14 +140,14 @@ llama2_70b = Model(
     best_provider = RetryProvider([Llama, DeepInfra, HuggingChat])
 )
 
-llama3_8b = Model(
-    name          = "meta-llama/Meta-Llama-3-8b",
+llama3_8b_instruct = Model(
+    name          = "meta-llama/Meta-Llama-3-8b-instruct",
     base_provider = "meta",
     best_provider = RetryProvider([Llama])
 )
 
-llama3_70b = Model(
-    name          = "meta-llama/Meta-Llama-3-70b",
+llama3_70b_instruct = Model(
+    name          = "meta-llama/Meta-Llama-3-70b-instruct",
     base_provider = "meta",
     best_provider = RetryProvider([Llama, HuggingChat])
 )
@@ -291,6 +299,12 @@ command_r_plus = Model(
     best_provider = RetryProvider([HuggingChat, Cohere])
 )
 
+blackbox = Model(
+    name = 'blackbox',
+    base_provider = 'blackbox',
+    best_provider = Blackbox
+)
+
 class ModelUtils:
     """
     Utility class for mapping string identifiers to Model instances.
@@ -314,12 +328,12 @@ class ModelUtils:
         'gpt-4-32k-0613' : gpt_4_32k_0613,
         'gpt-4-turbo'    : gpt_4_turbo,
 
-        # Llama 2
+        # Llama
         'llama2-7b' : llama2_7b,
         'llama2-13b': llama2_13b,
         'llama2-70b': llama2_70b,
-        'llama3-8b' : llama3_8b,
-        'llama3-70b': llama3_70b,
+        'llama3-8b-instruct' : llama3_8b_instruct,
+        'llama3-70b-instruct': llama3_70b_instruct,
         'codellama-34b-instruct': codellama_34b_instruct,
         'codellama-70b-instruct': codellama_70b_instruct,
 
@@ -345,6 +359,7 @@ class ModelUtils:
         'claude-3-sonnet': claude_3_sonnet,
         
         # other
+        'blackbox': blackbox,
         'command-r+': command_r_plus,
         'dbrx-instruct': dbrx_instruct,
         'lzlv-70b': lzlv_70b,
-- 
cgit v1.2.3