From e9467297369dd4f429c084bd1d034f3b1b63e7c2 Mon Sep 17 00:00:00 2001
From: abc <98614666+xtekky@users.noreply.github.com>
Date: Sun, 16 Jul 2023 20:31:51 +0100
Subject: minor fixes

---
 g4f/Provider/Providers/DFEHub.py | 62 +++++++++++++++++++++-------------------
 1 file changed, 33 insertions(+), 29 deletions(-)

(limited to 'g4f/Provider/Providers/DFEHub.py')

diff --git a/g4f/Provider/Providers/DFEHub.py b/g4f/Provider/Providers/DFEHub.py
index 1bbdd01e..d3c12ed0 100644
--- a/g4f/Provider/Providers/DFEHub.py
+++ b/g4f/Provider/Providers/DFEHub.py
@@ -4,41 +4,45 @@ import json
 
 url = "https://chat.dfehub.com/api/chat"
 model = ['gpt-3.5-turbo']
-supports_stream = False
+supports_stream = True
 needs_auth = False
+working = True
 
-def _create_completion(model: str, messages: list, stream: bool, **kwargs):
-    base = ''
-    for message in messages:
-        base += '%s: %s\n' % (message['role'], message['content'])
-    base += 'assistant:'
 
+def _create_completion(model: str, messages: list, stream: bool, **kwargs):
     headers = {
-        "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"
+        'authority': 'chat.dfehub.com',
+        'accept': '*/*',
+        'accept-language': 'en,fr-FR;q=0.9,fr;q=0.8,es-ES;q=0.7,es;q=0.6,en-US;q=0.5,am;q=0.4,de;q=0.3',
+        'content-type': 'application/json',
+        'origin': 'https://chat.dfehub.com',
+        'referer': 'https://chat.dfehub.com/',
+        'sec-ch-ua': '"Not.A/Brand";v="8", "Chromium";v="114", "Google Chrome";v="114"',
+        'sec-ch-ua-mobile': '?0',
+        'sec-ch-ua-platform': '"macOS"',
+        'sec-fetch-dest': 'empty',
+        'sec-fetch-mode': 'cors',
+        'sec-fetch-site': 'same-origin',
+        'user-agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36',
+        'x-requested-with': 'XMLHttpRequest',
     }
-    data = {
-        "model": {
-            "id": "gpt-3.5-turbo",
-            "name": "GPT-3.5",
-            "maxLength": 12000,
-            "tokenLimit": 4000
-        },
-        "messages": [
-            {
-                "role": "user",
-                "content": base
-            }
-        ],
-        "key": "",
-        "prompt": "You are ChatGPT, a large language model trained by OpenAI. Follow the user's instructions carefully. Respond using markdown.",
-        "temperature": 1
+
+    json_data = {
+        'messages': messages,
+        'model': 'gpt-3.5-turbo',
+        'temperature': 0.5,
+        'presence_penalty': 0,
+        'frequency_penalty': 0,
+        'top_p': 1,
     }
-    response = requests.post(url, headers=headers, data=json.dumps(data))
-    if response.status_code == 200:
-        yield response.text
-    else:
-        print(f"Error Occurred::{response.status_code}")
-        return None
+
+    response = requests.post('https://chat.dfehub.com/api/openai/v1/chat/completions',
+        headers=headers, json=json_data)
+    
+    for chunk in response.iter_lines():
+        if b'content' in chunk:
+            data = json.loads(chunk.decode().split('data: ')[1])
+            yield (data['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]])
\ No newline at end of file
-- 
cgit v1.2.3