From 3982f39424ea037aca1086d45c6f657b4bfc457c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=B2=98r=E1=B9=A8h=E0=B8=AA=E2=88=82ow?= <71973368+MrShadowDev@users.noreply.github.com> Date: Mon, 23 Oct 2023 09:46:25 +0200 Subject: 'Refactored by Sourcery' (#1125) Co-authored-by: Sourcery AI <> --- g4f/Provider/unfinished/ChatAiGpt.py | 8 +++++--- g4f/Provider/unfinished/MikuChat.py | 3 +-- g4f/Provider/unfinished/PerplexityAi.py | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) (limited to 'g4f/Provider/unfinished') diff --git a/g4f/Provider/unfinished/ChatAiGpt.py b/g4f/Provider/unfinished/ChatAiGpt.py index c77afb48..9d050093 100644 --- a/g4f/Provider/unfinished/ChatAiGpt.py +++ b/g4f/Provider/unfinished/ChatAiGpt.py @@ -43,10 +43,12 @@ class ChatAiGpt(AsyncGeneratorProvider): async with session.get(f"{cls.url}/", proxy=proxy) as response: response.raise_for_status() response = await response.text() - result = re.search(r'data-nonce=(.*?) data-post-id=([0-9]+)', response) - if not result: + if result := re.search( + r'data-nonce=(.*?) data-post-id=([0-9]+)', response + ): + cls._nonce, cls._post_id = result.group(1), result.group(2) + else: raise RuntimeError("No nonce found") - cls._nonce, cls._post_id = result.group(1), result.group(2) prompt = format_prompt(messages) data = { "_wpnonce": cls._nonce, diff --git a/g4f/Provider/unfinished/MikuChat.py b/g4f/Provider/unfinished/MikuChat.py index bf19631f..970fb0bb 100644 --- a/g4f/Provider/unfinished/MikuChat.py +++ b/g4f/Provider/unfinished/MikuChat.py @@ -48,8 +48,7 @@ class MikuChat(AsyncGeneratorProvider): async for line in response.iter_lines(): if line.startswith(b"data: "): line = json.loads(line[6:]) - chunk = line["choices"][0]["delta"].get("content") - if chunk: + if chunk := line["choices"][0]["delta"].get("content"): yield chunk def k(e: str, t: int): diff --git a/g4f/Provider/unfinished/PerplexityAi.py b/g4f/Provider/unfinished/PerplexityAi.py index 3e096808..e97dbf0d 100644 --- a/g4f/Provider/unfinished/PerplexityAi.py +++ b/g4f/Provider/unfinished/PerplexityAi.py @@ -21,7 +21,7 @@ class PerplexityAi(AsyncProvider): proxy: str = None, **kwargs ) -> str: - url = cls.url + "/socket.io/?EIO=4&transport=polling" + url = f"{cls.url}/socket.io/?EIO=4&transport=polling" headers = { "Referer": f"{cls.url}/" } -- cgit v1.2.3