From 4a3b663ccd44735d77c372b5f629a728f0b90591 Mon Sep 17 00:00:00 2001 From: abc <98614666+xtekky@users.noreply.github.com> Date: Mon, 16 Oct 2023 00:47:10 +0100 Subject: ~ | remove non-working providers --- g4f/Provider/AItianhu.py | 51 ++++++++++++++++++++++++++++--------------- g4f/Provider/AItianhuSpace.py | 2 ++ g4f/Provider/Acytoo.py | 2 +- g4f/Provider/Aibn.py | 2 +- g4f/Provider/Ails.py | 2 +- g4f/Provider/ChatgptDuo.py | 2 +- g4f/Provider/ChatgptFree.py | 11 +++++++--- g4f/Provider/Cromicle.py | 2 +- g4f/Provider/GptChatly.py | 15 +++++++++---- g4f/Provider/Myshell.py | 48 ++++++++++++++++++++++++++++++++++++++-- g4f/Provider/Ylokh.py | 2 +- 11 files changed, 107 insertions(+), 32 deletions(-) diff --git a/g4f/Provider/AItianhu.py b/g4f/Provider/AItianhu.py index 56d9a9ab..0105c89a 100644 --- a/g4f/Provider/AItianhu.py +++ b/g4f/Provider/AItianhu.py @@ -1,6 +1,7 @@ from __future__ import annotations import json +import browser_cookie3 from ..typing import AsyncResult, Messages from ..requests import StreamSession @@ -9,7 +10,7 @@ from .base_provider import AsyncGeneratorProvider, format_prompt, get_cookies class AItianhu(AsyncGeneratorProvider): url = "https://www.aitianhu.com" - working = True + working = False supports_gpt_35_turbo = True @classmethod @@ -19,11 +20,13 @@ class AItianhu(AsyncGeneratorProvider): messages: Messages, proxy: str = None, cookies: dict = None, - timeout: int = 120, - **kwargs - ) -> AsyncResult: + timeout: int = 120, **kwargs) -> AsyncResult: + if not cookies: - cookies = get_cookies("www.aitianhu.com") + cookies = browser_cookie3.chrome(domain_name='www.aitianhu.com') + if not cookies: + raise RuntimeError(f"g4f.provider.{cls.__name__} requires cookies") + data = { "prompt": format_prompt(messages), "options": {}, @@ -32,28 +35,42 @@ class AItianhu(AsyncGeneratorProvider): "top_p": 1, **kwargs } + headers = { - "Authority": cls.url, - "Accept": "application/json, text/plain, */*", - "Origin": cls.url, - "Referer": f"{cls.url}/" + 'authority': 'www.aitianhu.com', + 'accept': 'application/json, text/plain, */*', + '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://www.aitianhu.com', + 'referer': 'https://www.aitianhu.com/', + 'sec-ch-ua': '"Chromium";v="118", "Google Chrome";v="118", "Not=A?Brand";v="99"', + '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/118.0.0.0 Safari/537.36', } - async with StreamSession( - headers=headers, - cookies=cookies, - timeout=timeout, - proxies={"https": proxy}, - impersonate="chrome107", - verify=False - ) as session: + + async with StreamSession(headers=headers, + cookies=cookies, + timeout=timeout, + proxies={"https": proxy}, + impersonate="chrome107", verify=False) as session: + async with session.post(f"{cls.url}/api/chat-process", json=data) as response: response.raise_for_status() + async for line in response.iter_lines(): if line == b"