From 6f535ac3e8851fc42beba9cdc68d61d75c771ca7 Mon Sep 17 00:00:00 2001 From: omidima <47784584+omidima@users.noreply.github.com> Date: Tue, 8 Aug 2023 12:19:27 +0330 Subject: Update EasyChat.py Change model address and add proxy & session for pass cloudflare auth on requests. --- g4f/Provider/Providers/EasyChat.py | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) (limited to 'g4f/Provider/Providers') diff --git a/g4f/Provider/Providers/EasyChat.py b/g4f/Provider/Providers/EasyChat.py index 909428fa..b89c183e 100644 --- a/g4f/Provider/Providers/EasyChat.py +++ b/g4f/Provider/Providers/EasyChat.py @@ -10,38 +10,39 @@ working = True def _create_completion(model: str, messages: list, stream: bool, **kwargs): + req = requests.Session() + + proxy = { + "http": "http://159.89.138.130:80" + } + headers = { - 'authority': 'free.easychat.work', + 'authority': 'beta.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', + '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,fa=0.2', 'content-type': 'application/json', - 'endpoint': '', - 'origin': 'https://free.easychat.work', - 'plugins': '0', - 'referer': 'https://free.easychat.work/', + 'origin': 'https://beta.easychat.work', + 'referer': 'https://beta.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', } json_data = { 'messages': messages, 'stream': True, - 'model': model, + 'model': "gpt-3.5-turbo", 'temperature': kwargs.get('temperature', 0.5), 'presence_penalty': kwargs.get('presence_penalty', 0), 'frequency_penalty': kwargs.get('frequency_penalty', 0), 'top_p': kwargs.get('top_p', 1), } - response = requests.post('https://free.easychat.work/api/openai/v1/chat/completions', - headers=headers, json=json_data) + # init cookies from server + req.get("https://site.easygpt.work/", proxies=proxy) + + response = req.post('https://beta.easychat.work/api/openai/v1/chat/completions', + headers=headers, json=json_data, proxies=proxy) for chunk in response.iter_lines(): if b'content' in chunk: @@ -49,4 +50,4 @@ def _create_completion(model: str, messages: list, stream: bool, **kwargs): 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 + '(%s)' % ', '.join([f"{name}: {get_type_hints(_create_completion)[name].__name__}" for name in _create_completion.__code__.co_varnames[:_create_completion.__code__.co_argcount]]) -- cgit v1.2.3 From 17d6a31523de93a4f8e40f3474682bf30cba2655 Mon Sep 17 00:00:00 2001 From: omidima <47784584+omidima@users.noreply.github.com> Date: Fri, 11 Aug 2023 14:33:50 +0330 Subject: Update EasyChat.py update active servers --- g4f/Provider/Providers/EasyChat.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'g4f/Provider/Providers') diff --git a/g4f/Provider/Providers/EasyChat.py b/g4f/Provider/Providers/EasyChat.py index b89c183e..83e27ed9 100644 --- a/g4f/Provider/Providers/EasyChat.py +++ b/g4f/Provider/Providers/EasyChat.py @@ -7,7 +7,14 @@ model = ['gpt-3.5-turbo'] supports_stream = True needs_auth = False working = True - +active_servers = [ + "https://chat10.fastgpt.me", + "https://chat9.fastgpt.me", + "https://chat1.fastgpt.me", + "https://chat2.fastgpt.me", + "https://chat3.fastgpt.me", + "https://chat4.fastgpt.me" +] def _create_completion(model: str, messages: list, stream: bool, **kwargs): req = requests.Session() -- cgit v1.2.3 From c38ac104ead8ce3ff12de8e6fd52ad418bcf109d Mon Sep 17 00:00:00 2001 From: omidima <47784584+omidima@users.noreply.github.com> Date: Sat, 12 Aug 2023 13:19:45 +0330 Subject: Update EasyChat.py Resolve review comments. --- g4f/Provider/Providers/EasyChat.py | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'g4f/Provider/Providers') diff --git a/g4f/Provider/Providers/EasyChat.py b/g4f/Provider/Providers/EasyChat.py index 83e27ed9..c6621f4e 100644 --- a/g4f/Provider/Providers/EasyChat.py +++ b/g4f/Provider/Providers/EasyChat.py @@ -16,20 +16,19 @@ active_servers = [ "https://chat4.fastgpt.me" ] +# Change server if not work current server +server = active_servers[0] + def _create_completion(model: str, messages: list, stream: bool, **kwargs): req = requests.Session() - proxy = { - "http": "http://159.89.138.130:80" - } - headers = { - 'authority': 'beta.easychat.work', + 'authority': f'{server}'.replace("https://",""), '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,fa=0.2', 'content-type': 'application/json', - 'origin': 'https://beta.easychat.work', - 'referer': 'https://beta.easychat.work/', + 'origin': f'{server}', + 'referer': f'{server}/', 'sec-ch-ua': '"Not.A/Brand";v="8", "Chromium";v="114", "Google Chrome";v="114"', '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', @@ -46,10 +45,10 @@ def _create_completion(model: str, messages: list, stream: bool, **kwargs): } # init cookies from server - req.get("https://site.easygpt.work/", proxies=proxy) + req.get(f'{server}/') - response = req.post('https://beta.easychat.work/api/openai/v1/chat/completions', - headers=headers, json=json_data, proxies=proxy) + response = req.post(f'{server}/api/openai/v1/chat/completions', + headers=headers, json=json_data) for chunk in response.iter_lines(): if b'content' in chunk: -- cgit v1.2.3