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/EasyChat.py | 63 ++++++++++++++++++++++----------------
 1 file changed, 36 insertions(+), 27 deletions(-)

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

diff --git a/g4f/Provider/Providers/EasyChat.py b/g4f/Provider/Providers/EasyChat.py
index 9f4aa7b2..a59ea072 100644
--- a/g4f/Provider/Providers/EasyChat.py
+++ b/g4f/Provider/Providers/EasyChat.py
@@ -2,42 +2,51 @@ import os, requests
 from ...typing import sha256, Dict, get_type_hints
 import json
 
-url = "https://free.easychat.work/api/openai/v1/chat/completions"
+url = "https://free.easychat.work"
 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):
-    ''' limited to 240 messages/hour'''
-    base = ''
-    for message in messages:
-        base += '%s: %s\n' % (message['role'], message['content'])
-    base += 'assistant:'
-    
     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': 'free.easychat.work',
+        'accept': 'text/event-stream',
+        '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',
+        'endpoint': '',
+        'origin': 'https://free.easychat.work',
+        'plugins': '0',
+        'referer': 'https://free.easychat.work/',
+        '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',
+        'usesearch': 'false',
+        'x-requested-with': 'XMLHttpRequest',
     }
 
-    data = {
-        "messages": [
-            {"role": "system", "content": "You are ChatGPT, a large language model trained by OpenAI."},
-            {"role": "user", "content": base}
-        ],
-        "stream": False,
-        "model": "gpt-3.5-turbo",
-        "temperature": 0.5,
-        "presence_penalty": 0,
-        "frequency_penalty": 0,
-        "top_p": 1
+    json_data = {
+        'messages': messages,
+        'stream': True,
+        'model': model,
+        'temperature': 0.5,
+        'presence_penalty': 0,
+        'frequency_penalty': 0,
+        'top_p': 1,
     }
 
-    response = requests.post(url, headers=headers, json=data)
-    if response.status_code == 200:
-        response = response.json()
-        yield response['choices'][0]['message']['content']
-    else:
-        print(f"Error Occurred::{response.status_code}")
-        return None
+    response = requests.post('https://free.easychat.work/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