v1.4.6 Добавлен новый провайдер API: DakuWorks

neurogen-dev · neurogen-dev · commit 1dfe793438d3 · 2023-09-17T10:25:27.000+08:00
Поддерживаемые модели:

gpt-3.5-turbo-16k
gpt-4
gpt-4-32k
claude-2
claude-2-100k
codellama-34b
llama-2-70b
diff --git a/config.json b/config.json
@@ -1,8 +1,8 @@
 {
     "openai_api_key": "",
-    "purgpt_api_key": "purgpt-b2vrs9w13oiyf14a7v4lt",
+    "purgpt_api_key": "",
     "chatty_api_key": "",
-    "pawan_api_key": " ",
+    "daku_api_key": "",
     "usage_limit": 999,
     "language": "ru_RU",
     "users": [],
diff --git a/g4f/models.py b/g4f/models.py
@@ -25,6 +25,13 @@ class Model:
     best_provider=Wewordle,
 )
 
+# GPT-3.5 / GPT-4
+gpt_35_turbo_0613 = Model(
+    name="gpt-3.5-turbo-0613",
+    base_provider="openai",
+    best_provider=Wewordle,
+)
+
 
 gpt_4 = Model(
     name="gpt-4",
@@ -165,6 +172,7 @@ class ModelUtils:
     convert: dict[str, Model] = {
         # GPT-3.5 / GPT-4
         "gpt-3.5-turbo": gpt_35_turbo,
+        "gpt-3.5-turbo-0613": gpt_35_turbo_0613,
         "gpt-3.5-turbo-16k": gpt_35_turbo_16k,
         "gpt-3.5-turbo-16k_0613": gpt_35_turbo_16k_0613,
         "gpt-4": gpt_4,
diff --git a/modules/config.py b/modules/config.py
@@ -29,8 +29,6 @@
     "default_chuanhu_assistant_model"
 ]
 
-# 添加一个统一的config文件，避免文件过多造成的疑惑（优先级最低）
-# 同时，也可以为后续支持自定义功能提供config的帮助
 if os.path.exists("config.json"):
     with open("config.json", "r") as f:
         config = json.load(f)
diff --git a/modules/models/models.py b/modules/models/models.py
@@ -115,6 +115,8 @@ def _get_api_url(self):
             url = "https://api.naga.ac/v1/completions"
         elif "chatty" in self.model_name:
             url = "https://chattyapi.tech/v1/chat/completions"
+        elif "daku" in self.model_name:
+            url = "https://api.daku.tech/v1/chat/completions"
         elif "neuro" in self.model_name:
             url = "https://neuroapi.host/v1/chat/completions"
         else:
@@ -134,6 +136,12 @@ def _get_headers(self):
                 "Content-Type": "application/json",
                 "Authorization": f"Bearer {chatty_api_key}",
             }
+        elif "daku" in self.model_name:
+            daku_api_key = self.configuration_json["daku_api_key"]
+            headers = {
+                "Content-Type": "application/json",
+                "Authorization": f"Bearer {daku_api_key}",
+            }
         else:
             headers = {
                 "Content-Type": "application/json",
@@ -150,30 +158,7 @@ def _get_history(self):
         return history
 
     def _get_payload(self, history, stream): 
-        model_names = {
-            'naga-gpt-4': 'gpt-4',
-            'naga-gpt-4-0314': 'gpt-4-0314',
-            'naga-text-davinci-003': 'text-davinci-003',
-            'naga-claude-2': 'claude-2',
-            'naga-llama-2-70b-chat': 'llama-2-70b-chat',
-            'naga-gpt-3.5-turbo-16k': 'gpt-3.5-turbo-16k',
-            'chatty-gpt-3.5-turbo-16k': 'gpt-3.5-turbo-16k',
-            'gpt-3.5-turbo-chatty-api': 'gpt-3.5-turbo',
-            'chatty-gpt-4': 'gpt-4',
-            'neuro-gpt-3.5-turbo': 'gpt-3.5-turbo',
-            'neuro-gpt-3.5-turbo-0613': 'gpt-3.5-turbo-0613',
-            'neuro-gpt-3.5-turbo-16k': 'gpt-3.5-turbo-16k',
-            'neuro-gpt-3.5-turbo-0613': 'gpt-3.5-turbo-0613',
-            'neuro-gpt-3.5-turbo_0613': 'gpt-3.5-turbo_0613',
-            'neuro-gpt-4': 'gpt-4',
-            'neuro-gpt-4-0613': 'gpt-4-0613',
-            'neuro-gpt-4-32k': 'gpt-4-32k',
-            'neuro-gpt-4-32k-0613': 'gpt-4-32k-0613',
-            'neuro-claude-2': 'claude-2',
-            'neuro-text-curie-001': 'text-curie-001'
-
-        }
-        model = model_names.get(self.model_name, self.model_name)
+        model = self.model_name.replace("naga-", "").replace("chatty-", "").replace("neuro-", "").replace("daku-", "")
         if "naga-text" in self.model_name:
             last_msg = self.history[-1]
             last_user_input = last_msg["role"] == "user"
@@ -212,7 +197,7 @@ def _make_request(self, headers, payload, stream):
         else:
             timeout = TIMEOUT_ALL
         try: #Заготовочка для переписания системы отправки запросов
-            if self.model_name == "purgpt" or self.model_name == "naga" or self.model_name == "chatty":
+            if any(substring in self.model_name for substring in ["purgpt", "naga", "chatty"]):
                 response = requests.post(
                     shared.state.completion_url,
                     headers = headers,
diff --git a/modules/presets.py b/modules/presets.py
@@ -4,14 +4,15 @@
 import requests
 import json
 
-VERSION = "v 1.4.5"
+VERSION = "v 1.4.6"
 
 CHATGLM_MODEL = None
 CHATGLM_TOKENIZER = None
 LLAMA_MODEL = None
 LLAMA_INFERENCER = None
 
 # ChatGPT 设置
+
 INITIAL_SYSTEM_PROMPT = "You are a helpful assistant. You follow all of the user's instructions and answer all of their questions without going out of your way to answer them. Respond using markdown."
 API_HOST = "http://127.0.0.0.1:1337"
 COMPLETION_URL = "http://127.0.0.0.1:1337/v1/chat/completions"
@@ -86,8 +87,6 @@ def get_online_gpt3_models():
 
 ONLINE_MODELS = [
     'gpt-3.5-turbo',
-    'gpt-3.5-turbo-16k',
-    'gpt-3.5-turbo-16k-0613',
 ]
 
 NAGA_MODELS = [
@@ -111,17 +110,27 @@ def get_online_gpt3_models():
     'purgpt-text-davinci-003'
 ]
 
+DAKU_MODELS = [
+    'daku-gpt-3.5-turbo-16k',
+    'daku-gpt-4',
+    'daku-gpt-4-32k',
+    'daku-claude-2',
+    'daku-claude-2-100k',
+    'daku-codellama-34b',
+    'daku-llama-2-70b'
+]
+
 NEURO_MODELS = get_online_gpt4_models()
 
 if os.environ.get('HIDE_OTHER_PROVIDERS', 'false') == 'true':
     MODELS = ONLINE_MODELS + NEURO_MODELS
 else:
-    MODELS = ONLINE_MODELS + NEURO_MODELS + NAGA_MODELS
+    MODELS = ONLINE_MODELS + NEURO_MODELS + DAKU_MODELS
 
 if os.environ.get('SHOW_ALL_PROVIDERS', 'false') == 'true':
-    MODELS = ONLINE_MODELS + NEURO_MODELS + NAGA_MODELS + PURGPT_MODELS
+    MODELS = ONLINE_MODELS + NEURO_MODELS + NAGA_MODELS + DAKU_MODELS+ PURGPT_MODELS
 else:
-    MODELS = ONLINE_MODELS + NEURO_MODELS + NAGA_MODELS
+    MODELS = ONLINE_MODELS + NEURO_MODELS + DAKU_MODELS
 
 DEFAULT_MODEL = 0
 
@@ -160,6 +169,12 @@ def get_online_gpt3_models():
     'purgpt-text-davinci-003': 4096,
     'naga-text-davinci-003': 4096,
     'text-davinci-003': 4096,
+    'daku-gpt-4': 8192,
+    'daku-gpt-4-32k': 32768,
+    'daku-claude-2': 100000,
+    'daku-claude-2-100k': 100000,
+    'daku-codellama-34b': 4096,
+    'daku-llama-2-70b': 4096,
 }
 
 TOKEN_OFFSET = 1000 
diff --git a/test.py b/test.py
@@ -0,0 +1,19 @@
+import sys
+import time
+from pathlib import Path
+import threading
+
+sys.path.append(str(Path(__file__).parent.parent))
+
+import g4f
+
+
+stream = False
+response = g4f.ChatCompletion.create(
+    model="gpt-3.5-turbo-16k-0613",
+    messages=[{"role": "user", "content": "hello"}],
+    provider=g4f.Provider.Vercel,
+    stream=stream,
+)
+
+print(response)
diff --git a/testing/test.py b/testing/test.py
@@ -1,7 +1,6 @@
 import sys
 import time
 from pathlib import Path
-from auto_proxy import get_random_proxy, update_working_proxies
 import threading
 
 sys.path.append(str(Path(__file__).parent.parent))
@@ -11,9 +10,9 @@
 
 stream = False
 response = g4f.ChatCompletion.create(
-    model="gpt-3.5-turbo-16k",
+    model="gpt-3.5-turbo",
     messages=[{"role": "user", "content": "hello"}],
-    provider=g4f.Provider.Vercel,
+    provider=g4f.Provider.Lucascool,
     stream=stream,
 )
 

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,6 @@`
`29`	`29`	`"default_chuanhu_assistant_model"`
`30`	`30`	`]`
`31`	`31`
`32`		`-# 添加一个统一的config文件，避免文件过多造成的疑惑（优先级最低）`
`33`		`-# 同时，也可以为后续支持自定义功能提供config的帮助`
`34`	`32`	`if os.path.exists("config.json"):`
`35`	`33`	`with open("config.json", "r") as f:`
`36`	`34`	`config = json.load(f)`