Some adjustments to the API providers

g4f/Provider/Providers/Bing.py

@@ -24,7 +24,6 @@ def _create_completion(model: str, messages: list, stream: bool, **kwargs):
     p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
 
     for line in iter(p.stdout.readline, b''):
-        #print(line)
         yield line.decode('utf-8', errors='ignore') #[:-1]
 
         

g4f/Provider/Providers/Forefront.py

@@ -7,6 +7,7 @@ url = 'forefront.com'
 model = ['gpt-3.5-turbo']
 supports_stream = True
 
+
 def _create_completion(model: str, messages: list, stream: bool, **kwargs):
     json_data = {
         'text': messages[-1]['content'],
@@ -19,18 +20,17 @@ def _create_completion(model: str, messages: list, stream: bool, **kwargs):
         'messages': messages[:-1] if len(messages) > 1 else [],
         'internetMode': 'auto'
     }
-    print(json_data)
-    response = requests.post( 'https://streaming.tenant-forefront-default.knative.chi.coreweave.com/free-chat',
-        json=json_data, stream=True)
 
-    for token in response.iter_lines(): 
+    response = requests.post('https://streaming.tenant-forefront-default.knative.chi.coreweave.com/free-chat',
+                             json=json_data, stream=True)
+
+    for token in response.iter_lines():
         if b'delta' in token:
             token = json.loads(token.decode().split('data: ')[1])['delta']
             yield (token)
 
-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]])
-
-
-
 
+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/Openai.py

@@ -14,19 +14,19 @@ def _create_completion(model: str, messages: list, stream: bool, **kwargs):
 
     path = os.path.dirname(os.path.realpath(__file__))
     config = json.dumps({
-        'messages': messages,
-        'model': model}, separators=(',', ':'))
+        'model': model,
+        'messages': messages[:-1] if len(messages) > 1 else [],
+    })
     
     try:
         subprocess.run(["python3", "--version"], capture_output=True, check=True)
-        cmd = ["python3", f"{path}/helpers/bing.py", config]
+        cmd = ["python3", f"{path}/helpers/openai.py", config]
     except subprocess.CalledProcessError:
-        cmd = ["python", f"{path}/helpers/bing.py", config]
+        cmd = ["python", f"{path}/helpers/openai.py", config]
 
     p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
 
     for line in iter(p.stdout.readline, b''):
-        #print(line)
         yield line.decode('utf-8', errors='ignore') #[:-1]
 
 params = f'g4f.Providers.{os.path.basename(__file__)[:-3]} supports: ' + \

g4f/Provider/Providers/Phind.py

@@ -9,14 +9,21 @@ url = 'https://phind.com'
 model = ['gpt-3.5-turbo', 'gpt-4']
 supports_stream = True
 
+
 def _create_completion(model: str, messages: list, stream: bool, **kwargs):
 
     path = os.path.dirname(os.path.realpath(__file__))
     config = json.dumps({
         'model': model,
-        'messages': messages}, separators=(',', ':'))
+        'messages': messages[:-1] if len(messages) > 1 else [],
+    })
 
-    cmd = ['python', f'{path}/helpers/phind.py', config]
+    try:
+        subprocess.run(["python3", "--version"],
+                       capture_output=True, check=True)
+        cmd = ["python3", f"{path}/helpers/phind.py", config]
+    except subprocess.CalledProcessError:
+        cmd = ["python", f"{path}/helpers/phind.py", config]
 
     p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
 
@@ -25,13 +32,13 @@ def _create_completion(model: str, messages: list, stream: bool, **kwargs):
             os.system('clear' if os.name == 'posix' else 'cls')
             yield 'Clouflare error, please try again...'
             os._exit(0)
-        
+
         else:
             if b'ping - 2023-' in line:
                 continue
-            
-            yield line.decode('utf-8', errors='ignore') #[:-1]
+            yield line.decode('utf-8', errors='ignore')  # [:-1]
+
 
-            
 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]])
+    '(%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/Theb.py

@@ -13,19 +13,19 @@ def _create_completion(model: str, messages: list, stream: bool, **kwargs):
 
     path = os.path.dirname(os.path.realpath(__file__))
     config = json.dumps({
-        'messages': messages,
-        'model': model}, separators=(',', ':'))
+        'model': model,
+        'messages': messages[:-1] if len(messages) > 1 else [],
+    })
     
     try:
         subprocess.run(["python3", "--version"], capture_output=True, check=True)
-        cmd = ["python3", f"{path}/helpers/bing.py", config]
+        cmd = ["python3", f"{path}/helpers/theb.py", config]
     except subprocess.CalledProcessError:
-        cmd = ["python", f"{path}/helpers/bing.py", config]
+        cmd = ["python", f"{path}/helpers/theb.py", config]
 
     p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
 
     for line in iter(p.stdout.readline, b''):
-        #print(line)
         yield line.decode('utf-8', errors='ignore') #[:-1]
 
         

g4f/Provider/Providers/You.py

@@ -9,15 +9,22 @@ url = 'https://you.com'
 model = 'gpt-3.5-turbo'
 supports_stream = True
 
+
 def _create_completion(model: str, messages: list, stream: bool, **kwargs):
 
     path = os.path.dirname(os.path.realpath(__file__))
     config = json.dumps({
-        'messages': messages}, separators=(',', ':'))
-    
-    cmd = ['python3', f'{path}/helpers/you.py', config]
+        'messages': messages[:-1] if len(messages) > 1 else [],
+    })
+
+    try:
+        subprocess.run(["python3", "--version"],
+                       capture_output=True, check=True)
+        cmd = ["python3", f"{path}/helpers/you.py", config]
+    except subprocess.CalledProcessError:
+        cmd = ["python", f"{path}/helpers/you.py", config]
 
     p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
 
     for line in iter(p.stdout.readline, b''):
-        yield line.decode('utf-8') #[:-1]
+        yield line.decode('utf-8', errors='ignore')  # [:-1]

g4f/Provider/Providers/helpers/bing.py

@@ -198,7 +198,6 @@ class AsyncCompletion:
                     continue
                 
                 response = json.loads(obj)
-                #print(response, flush=True, end='')
                 if response.get('type') == 1 and response['arguments'][0].get('messages',):
                     response_text = response['arguments'][0]['messages'][0]['adaptiveCards'][0]['body'][0].get('text')
                     

server/backend.py

@@ -9,8 +9,6 @@ from requests import get
 from server.auto_proxy import get_random_proxy, update_working_proxies
 from server.config import special_instructions
 
-# Backend_Api class definition
-
 
 class Backend_Api:
     def __init__(self, app, config: dict) -> None:
@@ -47,7 +45,7 @@ class Backend_Api:
 
             # Generate response
             response = ChatCompletion.create(model=model, stream=True,
-                                             messages=messages, provider=g4f.Provider.Forefront)
+                                             messages=messages, provider=g4f.Provider.Yqcloud)
 
             return self.app.response_class(generate_stream(response, jailbreak), mimetype='text/event-stream')