v 1.4.2 - добавлена модель neuro-gpt-3.5-turbo-16k

Author: neurogen-dev

auto_proxy.py

@@ -0,0 +1,65 @@
+import random
+import requests
+import time
+import threading
+import socket
+import redis
+
+
+# Создаем подключение к redis
+r = redis.StrictRedis(host='localhost', port=6379, db=0)
+
+
+def fetch_proxies():
+    url = "https://api.proxyscrape.com/v2/?request=displayproxies&protocol=http"
+    response = requests.get(url)
+    if response.status_code == 200:
+        return response.text.split("\r\n")[:-1]
+    print(f"Error fetching proxies: {response.status_code}")
+    return [] 
+
+
+def test_proxy(proxy, prompt, timeout):
+    try:
+        ip, port = proxy.split(':') 
+        sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        start_time = time.time()
+        sock.connect((ip, int(port)))
+        end_time = time.time()
+        elapsed_time = end_time - start_time
+        sock.close()
+
+        if elapsed_time < timeout:
+            print(f"proxy: {proxy} ✅ | Elapsed time: {elapsed_time} seconds")
+            r.rpush('working_proxies', proxy)  # Сохраняем рабочего прокси в redis
+    except Exception as e:
+        pass
+
+
+def get_working_proxies(prompt, timeout=1):  
+    proxy_list = fetch_proxies()  
+    threads = []
+    r.delete('working_proxies')  # Очищаем список рабочих прокси в redis перед обновлением
+  
+    for proxy in proxy_list:  
+        thread = threading.Thread(target=test_proxy, args=(proxy, prompt, timeout))  
+        threads.append(thread)  
+        thread.start()  
+  
+    for t in threads:  
+        t.join(timeout)
+
+
+def update_working_proxies():  
+    test_prompt = "What is the capital of France?"  
+ 
+    while True:  
+        get_working_proxies(test_prompt)  
+        print('proxies updated')  
+        time.sleep(1800)  # Обновляем список прокси каждые 30 минут
+  
+  
+def get_random_proxy(): 
+    # Получаем случайного прокси из рабочих 
+    working_proxies = r.lrange('working_proxies', 0, -1)
+    return random.choice(working_proxies)

check.py

@@ -7,6 +7,9 @@
 import concurrent.futures
 import asyncio
 from g4f import ChatCompletion
+from fp.fp import FreeProxy
+import threading  
+import socket  
 
 def process_provider(provider_name, model_name):
     try:
@@ -25,8 +28,10 @@ def process_provider(provider_name, model_name):
             return provider_status
 
         try:
+            
             response = ChatCompletion.create(model=model_name, provider=p,
                                                  messages=[{"role": "user", "content": "Say 'Hello World!'"}], stream=False)
+            print(f"Using proxy: {proxy}")
             if any(word in response for word in ['Hello World', 'Hello', 'hello', 'world']):
                 provider_status['status'] = 'Active'
                 print(f"{provider_name} with {model_name} say: {response}")
@@ -72,7 +77,7 @@ def main():
                 json.dump(status, f)
 
         # Pause for 10 minutes before starting the next cycle
-        time.sleep(600)
+        #time.sleep(600)
 
 if __name__ == "__main__":
     main()

g4f/models.py

@@ -22,13 +22,13 @@ class Model:
 gpt_35_turbo = Model(
     name="gpt-3.5-turbo",
     base_provider="openai",
-    best_provider=Yqcloud
+    best_provider=Wewordle
 )
 
 gpt_35_turbo_16k = Model(
     name="gpt-3.5-turbo-16k",
     base_provider="openai",
-    best_provider=Vercel,
+    best_provider=Freet,
 )
 
 gpt_35_turbo_16k_0613 = Model(

modules/models/models.py

@@ -160,11 +160,15 @@ def _get_payload(self, history, stream):
             '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',
-            
 
         }
         model = model_names.get(self.model_name, self.model_name)

modules/presets.py

@@ -4,7 +4,7 @@
 import requests
 import json
 
-VERSION = "v 1.4.1"
+VERSION = "v 1.4.2"
 
 CHATGLM_MODEL = None
 CHATGLM_TOKENIZER = None
@@ -55,7 +55,7 @@ def get_online_gpt4_models():
         model_info = provider["model"]
         model_status = provider["status"]
 
-        if model_status == "Active" and model_info.startswith('gpt-4'):
+        if model_status == "Active" and model_info.startswith('gpt-4') or model_info.startswith('gpt-3.5-turbo-16k'):
             online_models.add("neuro-" + model_info)  
 
     return list(online_models)
@@ -76,7 +76,9 @@ def get_online_gpt3_models():
 
 
 
-ONLINE_MODELS = get_online_gpt3_models()
+ONLINE_MODELS = [
+    'gpt-3.5-turbo',
+]
 
 CHIMERA_MODELS = [
     'chimera-gpt-3.5-turbo-16k',