Merge branch 'dev-testing'

client/html/index.html

@@ -41,7 +41,7 @@
 						<i class="fa-brands fa-github"></i>
 						<span class="conversation-title">
 							Author: @ramonvc<br />
-							Version: 0.0.7-Alpha<br />
+							Version: 0.0.8-Alpha<br />
 						</span>
 					</a>
 				</div>
@@ -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" selected>GPT-3.5-turbo-16k-0613</option>
-									<option value="gpt-4" disabled>GPT-4 (maintenance)</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>
 								</select>
 							</div>
 							<div class="field">

g4f/Provider/Providers/Better.py

@@ -18,8 +18,26 @@ needs_auth = False
 
 def _create_completion(model: str, messages: list, stream: bool, **kwargs):
     headers = {
-        'Content-Type': 'application/json',
-        'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36 Edg/114.0.1823.58',
+        'authority': 'edgeservices.bing.com',
+        'accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7',
+        'accept-language': 'en-US,en;q=0.9',
+        'cache-control': 'max-age=0',
+        'sec-ch-ua': '"Chromium";v="110", "Not A(Brand";v="24", "Microsoft Edge";v="110"',
+        'sec-ch-ua-arch': '"x86"',
+        'sec-ch-ua-bitness': '"64"',
+        'sec-ch-ua-full-version': '"110.0.1587.69"',
+        'sec-ch-ua-full-version-list': '"Chromium";v="110.0.5481.192", "Not A(Brand";v="24.0.0.0", "Microsoft Edge";v="110.0.1587.69"',
+        'sec-ch-ua-mobile': '?0',
+        'sec-ch-ua-model': '""',
+        'sec-ch-ua-platform': '"Windows"',
+        'sec-ch-ua-platform-version': '"15.0.0"',
+        'sec-fetch-dest': 'document',
+        'sec-fetch-mode': 'navigate',
+        'sec-fetch-site': 'none',
+        'sec-fetch-user': '?1',
+        'upgrade-insecure-requests': '1',
+        'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/110.0.0.0 Safari/537.36 Edg/110.0.1587.69',
+        'x-edge-shopping-flag': '1',
         'Referer': 'https://chat.ylokh.xyz/',
         'Origin': 'https://chat.ylokh.xyz',
     }

g4f/Provider/Providers/Fakeopen.py

@@ -22,7 +22,7 @@ def _create_completion(model: str, messages: list, stream: bool, **kwargs):
         'accept': 'text/event-stream',  
         'Cache-Control': 'no-cache',  
         'Proxy-Connection': 'keep-alive',  
-        'Authorization': f"Bearer {os.environ.get('FAKE_OPEN_KEY', 'pk-this-is-a-real-free-api-key-pk-for-everyone')}",  
+        'Authorization': f"Bearer {os.environ.get('FAKE_OPEN_KEY', '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')}",  
     }  
   
     json_data = {  

g4f/Provider/Providers/Lsdev.py

@@ -0,0 +1,54 @@
+import os, uuid, requests
+from ...typing import sha256, Dict, get_type_hints
+
+url = 'https://gpt.free.lsdev.me'
+model = ['gpt-4-0613', 'gpt-4-poe']
+supports_stream = True
+needs_auth = True
+
+models = {
+    'gpt-4-0613': {
+        "id":"gpt-4-0613",
+        "name":"GPT-4-0613",
+        "maxLength":24000,
+        "tokenLimit":8192
+    },
+    'claude-instant-100k': {
+        "id":"claude-instant-100k",
+        "name":"CLAUDE-INSTANT-100K"
+    },
+    'gpt-4-poe': {
+        "id":"gpt-4-poe",
+        "name":"GPT-4-POE"
+    },
+}
+
+def _create_completion(model: str, messages: list, stream: bool, chatId: str, **kwargs):
+
+    print(kwargs)
+
+    headers = {
+        'authority': 'gpt.free.lsdev.me',
+        'content-type': 'application/json',
+        'origin': 'https://gpt.free.lsdev.me',
+        'referer': 'https://gpt.free.lsdev.me/zh',
+        'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/112.0.0.0 Safari/537.36',
+    }
+
+    json_data = {
+        'conversationId': chatId,
+          'model': models[model],
+          'messages': messages,
+          'auth': 'oVy1CLB25mA43',
+          'key': '',
+          'prompt': "You are ChatGPT, a large language model trained by OpenAI. Follow the user's instructions carefully. Respond using markdown.",
+      }
+
+    response = requests.post('https://gpt.free.lsdev.me/api/chat', 
+                             headers=headers, json=json_data, stream=stream)
+
+    for token in response.iter_content(chunk_size=2046):
+        yield (token.decode('utf-8'))
+
+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

@@ -16,6 +16,7 @@ from .Providers import (
     Gravityengine,
     H2o,
     hteyun,
+    Lsdev,
     Liaobots,
     Lockchat,
     Mishalsgpt,

g4f/models.py

@@ -21,7 +21,7 @@ class Model:
     class gpt_35_turbo_16k_0613:
         name: str = 'gpt-3.5-turbo-16k-0613'
         base_provider: str = 'openai'
-        best_provider: Provider.Provider = Provider.Better
+        best_provider: Provider.Provider = Provider.Gravityengine
         best_providers: list = [Provider.Easychat, Provider.Ezcht, Provider.Better]
 
     class gpt_35_turbo_16k:
@@ -43,7 +43,7 @@ class Model:
     class gpt_4_0613:
         name: str = 'gpt-4-0613'
         base_provider: str = 'openai'
-        best_provider: Provider.Provider = Provider.Liaobots
+        best_provider: Provider.Provider = Provider.Lsdev
         best_providers: list = [Provider.Bing, Provider.Lockchat]
 
     class claude_instant_v1_100k: