Merge branch 'main' of https://github.com/ramonvc/freegpt-webui

client/html/index.html

@@ -74,8 +74,8 @@
 									<option value="gpt-3.5-turbo">GPT-3.5</option>
 									<option value="gpt-3.5-turbo-0613">GPT-3.5-0613</option>
 									<option value="gpt-3.5-turbo-16k">GPT-3.5-turbo-16k</option>
-									<option value="gpt-3.5-turbo-16k-0613">GPT-3.5-turbo-16k-0613</option>
-									<option value="gpt-4-0613" selected>GPT-4</option>
+									<option value="gpt-3.5-turbo-16k-0613" selected>GPT-3.5-turbo-16k-0613</option>
+									<option value="gpt-4-0613">GPT-4 (unstable)</option>
 								</select>
 							</div>
 							<div class="field">

g4f/Provider/Providers/Xiaor.py

@@ -0,0 +1,39 @@
+import requests
+import os
+import json
+from ...typing import sha256, Dict, get_type_hints
+
+url = 'https://xiaor.eu.org'
+model = ['gpt-3.5-turbo', 'gpt-3.5-turbo-16k',
+         'gpt-3.5-turbo-16k-0613', 'gpt-3.5-turbo-0613']
+supports_stream = True
+needs_auth = False
+
+
+def _create_completion(model: str, messages: list, stream: bool, temperature: float = 0.7, **kwargs):
+    headers = {
+        'Content-Type': 'application/json',
+    }
+    data = {
+        'model': model,
+        'temperature': 0.7,
+        'presence_penalty': 0,
+        'messages': messages,
+    }
+    response = requests.post(url + '/p1/v1/chat/completions',
+                             json=data, stream=True)
+
+    if stream:
+        for chunk in response.iter_content(chunk_size=None):
+            chunk = chunk.decode('utf-8')
+            if chunk.strip():
+                message = json.loads(chunk)['choices'][0]['message']['content']
+                yield message
+    else:
+        message = response.json()['choices'][0]['message']['content']
+        yield message
+
+
+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/__init__.py

@@ -24,6 +24,7 @@ from .Providers import (
     Theb,
     Vercel,
     Weuseing,
+    Xiaor,
     Yqcloud,
     You,
 )

g4f/models.py

@@ -1,5 +1,5 @@
 from g4f import Provider
-
+import random
 
 class Model:
     class model:
@@ -10,24 +10,22 @@ class Model:
     class gpt_35_turbo:
         name: str = 'gpt-3.5-turbo'
         base_provider: str = 'openai'
-        best_provider: Provider.Provider = Provider.Better
-        best_providers: list = [Provider.Better,  Provider.Lockchat, Provider.Yqcloud, Provider.Forefront,]
+        best_provider: Provider.Provider = random.choice([Provider.DeepAi, Provider.Easychat])
 
     class gpt_35_turbo_0613:
         name: str = 'gpt-3.5-turbo-0613'
         base_provider: str = 'openai'
-        best_provider: Provider.Provider = Provider.Better
+        best_provider: Provider.Provider = random.choice([Provider.Easychat])
 
     class gpt_35_turbo_16k_0613:
         name: str = 'gpt-3.5-turbo-16k-0613'
         base_provider: str = 'openai'
-        best_provider: Provider.Provider = Provider.Gravityengine
-        best_providers: list = [Provider.Easychat, Provider.Ezcht, Provider.Better]
+        best_provider: Provider.Provider = random.choice([Provider.Easychat])
 
     class gpt_35_turbo_16k:
         name: str = 'gpt-3.5-turbo-16k'
         base_provider: str = 'openai'
-        best_provider: Provider.Provider = Provider.Better
+        best_provider: Provider.Provider = random.choice([Provider.Easychat])
 
     class gpt_4_dev:
         name: str = 'gpt-4-for-dev'