Добавлены новые провайдеры

Author: neurogen-dev

g4f/Provider/Providers/AItianhu.py

@@ -2,8 +2,8 @@
 from ...typing import sha256, Dict, get_type_hints
 import json
 
-url = "https://2t2yo.aitianhu.fit/api/chat-process"
-model = ['gpt-3.5-turbo']
+url = "https://ixlc0.aitianhu.site/api/chat-process"
+model = ['gpt-4']
 supports_stream = False
 needs_auth = False
 working = True
@@ -25,14 +25,12 @@ def _create_completion(model: str, messages: list, stream: bool, **kwargs):
         "temperature": 0.8,
         "top_p": 1
     }
-    response = requests.post(url, headers=headers, json=data)
-    if response.status_code == 200:
-        lines = response.text.strip().split('\n')
-        res = json.loads(lines[-1])
-        yield res['text']
-    else:
-        print(f"Error Occurred::{response.status_code}")
-        return None
+    response = requests.post(url, headers=headers, json=data, verify=False)
+
+    for line in response.iter_lines():
+        if b'content' in line:
+            line_json = json.loads(line.decode('utf-8').split('data: ')[1])
+            yield (line_json['choices'][0]['delta']['content'])
 
 params = f'g4f.Providers.{os.path.basename(__file__)[:-3]} supports: ' + \
     '(%s)' % ', '.join([f"{name}: {get_type_hints(_create_completion)[name].__name__}" for name in _create_completion.__code__.co_varnames[:_create_completion.__code__.co_argcount]])

g4f/Provider/Providers/Acytoo.py

@@ -3,7 +3,7 @@
 import json
 
 url = "https://chat.acytoo.com/api/completions"
-model = ['gpt-3.5-turbo']
+model = ['gpt-3.5-turbo', 'gpt-3.5-turbo-16k', 'gpt-4-0613', 'gpt-4-32k']
 supports_stream = False
 needs_auth = False
 working = True
@@ -19,7 +19,7 @@ def _create_completion(model: str, messages: list, stream: bool, **kwargs):
     }
     data = {
         "key": "",
-        "model": "gpt-3.5-turbo",
+        "model": model,
         "messages": [
             {
                 "role": "user",

g4f/Provider/Providers/CoffeCat.py

@@ -4,7 +4,7 @@
 
 url = "https://caffcat.com"
 model = ['gpt-3.5-turbo', 'gpt-3.5-turbo-16k']
-supports_stream = True
+supports_stream = False
 needs_auth = False
 working = True
 
@@ -32,7 +32,7 @@ def _create_completion(model: str, messages: list, stream: bool, **kwargs):
 
     json_data = {
         'messages': messages,
-        'stream': True,
+        'stream': False,
         'model': model,
         'temperature': 0.5,
         'presence_penalty': 0,

g4f/models.py

@@ -102,14 +102,14 @@ class gpt_4_standart:
     class gpt_4_0613:
         name: str = 'gpt-4-0613'
         base_provider: str = 'openai'
-        best_provider: Provider.Provider = Provider.Chatty
-        best_providers: list = [Provider.Chatty]
+        best_provider: Provider.Provider = Provider.Acytoo
+        best_providers: list = [Provider.Acytoo]
 
     class gpt_4_32k:
         name: str = 'gpt-4-32k'
         base_provider: str = 'reversed'
-        best_provider: Provider.Provider = Provider.Chatty
-        best_providers: list = [Provider.Chatty]
+        best_provider: Provider.Provider = Provider.Acytoo
+        best_providers: list = [Provider.Acytoo]
 
     class claude_2:
         name: str = 'claude-2'
@@ -198,6 +198,7 @@ class ModelUtils:
         'gpt-4': Model.gpt_4,
         'gpt-4-standart': Model.gpt_4_standart,
         'gpt-4-0613': Model.gpt_4_0613,
+        'gpt-4-32k': Model.gpt_4_32k,
         'gpt-3.5-turbo-16k': Model.gpt_35_turbo_16k,
         'gpt-3.5-turbo-16k-0613': Model.gpt_35_turbo_16k_0613,
 

test.py

@@ -4,10 +4,10 @@
 from g4f.typing import sha256, Dict, get_type_hints
 import json
 
-#proxy = FreeProxy(country_id=['FL'], timeout=0.5, rand=True).get()
+proxy = FreeProxy(country_id=['FL'], timeout=0.5, rand=True).get()
 stream = False
 #print(proxy)
-response = g4f.ChatCompletion.create(model='gpt-3.5-turbo-16k', provider=g4f.Provider.EasyChat, messages=[
+response = g4f.ChatCompletion.create(model='gpt-3.5-turbo-16k', provider=g4f.Provider.AItianhu, messages=[
                                     {"role": "user", "content": "hello"}], stream=False)