From 9140541179e1c2fe855acf1c2743e1800fd5052e Mon Sep 17 00:00:00 2001 From: abc <98614666+xtekky@users.noreply.github.com> Date: Mon, 20 Nov 2023 18:40:55 +0000 Subject: ~ | improve compatibility --- g4f/Provider/Chatgpt4Online.py | 4 +++- g4f/Provider/ChatgptAi.py | 4 +++- g4f/Provider/ChatgptDemo.py | 11 ++++++++--- g4f/Provider/ChatgptFree.py | 3 ++- g4f/Provider/ChatgptLogin.py | 13 ++++++++----- g4f/Provider/ChatgptX.py | 16 +++++++++++----- g4f/Provider/GptGod.py | 7 +++++-- g4f/Provider/Vercel.py | 3 +-- g4f/Provider/deprecated/CodeLinkAva.py | 4 +++- g4f/Provider/deprecated/Equing.py | 4 +++- g4f/Provider/deprecated/FastGpt.py | 6 ++++-- g4f/Provider/deprecated/Lockchat.py | 5 ++++- g4f/Provider/deprecated/Vitalentum.py | 4 +++- g4f/Provider/unfinished/ChatAiGpt.py | 7 +++++-- g4f/Provider/unfinished/MikuChat.py | 3 ++- 15 files changed, 65 insertions(+), 29 deletions(-) (limited to 'g4f') diff --git a/g4f/Provider/Chatgpt4Online.py b/g4f/Provider/Chatgpt4Online.py index 57ab9482..594f54c1 100644 --- a/g4f/Provider/Chatgpt4Online.py +++ b/g4f/Provider/Chatgpt4Online.py @@ -27,7 +27,9 @@ class Chatgpt4Online(AsyncProvider): async with session.get(f"{cls.url}/", proxy=proxy) as response: response.raise_for_status() response = await response.text() - if result := re.search(r'data-nonce="(.*?)"', response): + result = re.search(r'data-nonce="(.*?)"', response) + + if result: cls._wpnonce = result.group(1) else: raise RuntimeError("No nonce found") diff --git a/g4f/Provider/ChatgptAi.py b/g4f/Provider/ChatgptAi.py index 40ad9481..9425dfb0 100644 --- a/g4f/Provider/ChatgptAi.py +++ b/g4f/Provider/ChatgptAi.py @@ -45,7 +45,9 @@ class ChatgptAi(AsyncGeneratorProvider): async with session.get(cls.url, proxy=proxy) as response: response.raise_for_status() text = await response.text() - if result := re.search(r"data-system='(.*?)'", text): + + result = re.search(r"data-system='(.*?)'", text) + if result : cls._system = json.loads(html.unescape(result.group(1))) if not cls._system: raise RuntimeError("System args not found") diff --git a/g4f/Provider/ChatgptDemo.py b/g4f/Provider/ChatgptDemo.py index bc592ca6..666b5753 100644 --- a/g4f/Provider/ChatgptDemo.py +++ b/g4f/Provider/ChatgptDemo.py @@ -37,10 +37,13 @@ class ChatgptDemo(AsyncGeneratorProvider): async with session.get(f"{cls.url}/", proxy=proxy) as response: response.raise_for_status() response = await response.text() - if result := re.search( + + result = re.search( r'