v1.6.2

Author: neurogen-dev

modules/models/models.py

@@ -190,14 +190,14 @@ def _make_request(self, headers, payload, stream):
         else:
             timeout = TIMEOUT_ALL
 
-        max_retry_attempts = 10  # Общее количество попыток
+        max_retry_attempts = 5  # Общее количество попыток
         for attempt in range(max_retry_attempts):
             try: 
                 response = requests.post(
                     shared.state.completion_url,
                     headers=headers,
                     json=payload,
-                    stream=stream,
+                    stream=False,
                     timeout=timeout,
                 )
 
@@ -206,8 +206,9 @@ def _make_request(self, headers, payload, stream):
                 #print(response.text)
                 #print(response_json)
 
-                if response and response.status_code == 200 and not response_json['choices'][0]['message']['content']:
-                    print(f'Попытка {attempt + 1} из {max_retry_attempts} получила пустой ответ, повтор...')
+                # Декодирование ответа и проверка на пустоту или отсутствие 'choices'
+                if response and response.status_code == 200 and ('choices' not in response_json or not response_json['choices']):
+                    print(f'Попытка {attempt + 1} из {max_retry_attempts} получила неверный ответ, повтор...')
                 else:
                     return response
 
@@ -228,17 +229,7 @@ def _refresh_header(self):
         }
 
     def _get_billing_data(self, billing_url):
-        with retrieve_proxy():
-            response = requests.get(
-                billing_url,
-                headers=self.headers,
-                timeout=TIMEOUT_ALL,
-            )
-        if response.status_code == 200:
-            data = response.json()
-            return data
-        else:
-            raise Exception(f"API request failed with status code {response.status_code}: {response.text}")
+        return None
 
     def _decode_chat_response(self, response):
         error_msg = ""

modules/presets.py

@@ -4,7 +4,7 @@
 import requests
 import json
 
-VERSION = "v 1.6.1"
+VERSION = "v 1.6.2"
 
 CHATGLM_MODEL = None
 CHATGLM_TOKENIZER = None
@@ -48,7 +48,6 @@
 CHUANHU_DESCRIPTION = "[ℹ️ Телеграм канал автора](https://t.me/neurogen_news) <br /> [💰 Поддержать автора](https://boosty.to/neurogen) </br>"
 
 ONLINE_MODELS = [
-    'gpt-3.5-turbo',
     'gpt-3.5-turbo',
     'gpt-3.5-turbo-1106',
     'gpt-3.5-turbo-0613',
@@ -57,6 +56,7 @@
     'gpt-4',
     'gpt-4-0613',
     'gpt-4-1106-preview',
+    'gpt-4-32k',
     'chat-agent-beta',
 ]
 
@@ -120,22 +120,8 @@
     'claude-2': 100000,
     "claude-instant-100k": 100000,
     "claude-2-100k": 100000,
-    'naga-gpt-3.5-turbo-16k': 16384,
-    'naga-gpt-4': 8192,
-    'naga-llama-2-70b-chat': 4096,
-    'chatty-gpt-3.5-turbo-16k': 16384,
-    'chatty-gpt-4': 8192,
-    'purgpt-gpt-3.5-turbo-16k': 16384,
-    'purgpt-gpt-3.5-turbo': 4096,
-    '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