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 <> --- etc/tool/create_provider.py | 8 +++----- etc/tool/improve_code.py | 6 ++---- etc/tool/readme_table.py | 2 +- etc/tool/vercel.py | 6 ++---- 4 files changed, 8 insertions(+), 14 deletions(-) (limited to 'etc/tool') diff --git a/etc/tool/create_provider.py b/etc/tool/create_provider.py index abae8f96..361448e4 100644 --- a/etc/tool/create_provider.py +++ b/etc/tool/create_provider.py @@ -8,8 +8,7 @@ sys.path.append(str(Path(__file__).parent.parent.parent)) import g4f def read_code(text): - match = re.search(r"```(python|py|)\n(?P[\S\s]+?)\n```", text) - if match: + if match := re.search(r"```(python|py|)\n(?P[\S\s]+?)\n```", text): return match.group("code") def input_command(): @@ -99,12 +98,11 @@ And replace "gpt-3.5-turbo" with `model`. print() response = "".join(response) - code = read_code(response) - if code: + if code := read_code(response): with open(provider_path, "w") as file: file.write(code) print("Saved at:", provider_path) - with open(f"g4f/Provider/__init__.py", "a") as file: + with open("g4f/Provider/__init__.py", "a") as file: file.write(f"\nfrom .{name} import {name}") else: with open(provider_path, "r") as file: diff --git a/etc/tool/improve_code.py b/etc/tool/improve_code.py index 9a940b51..b2e36f86 100644 --- a/etc/tool/improve_code.py +++ b/etc/tool/improve_code.py @@ -8,8 +8,7 @@ sys.path.append(str(Path(__file__).parent.parent.parent)) import g4f def read_code(text): - match = re.search(r"```(python|py|)\n(?P[\S\s]+?)\n```", text) - if match: + if match := re.search(r"```(python|py|)\n(?P[\S\s]+?)\n```", text): return match.group("code") path = input("Path: ") @@ -41,7 +40,6 @@ for chunk in g4f.ChatCompletion.create( print() response = "".join(response) -code = read_code(response) -if code: +if code := read_code(response): with open(path, "w") as file: file.write(code) \ No newline at end of file diff --git a/etc/tool/readme_table.py b/etc/tool/readme_table.py index db02f6ec..c7eb3caf 100644 --- a/etc/tool/readme_table.py +++ b/etc/tool/readme_table.py @@ -52,7 +52,7 @@ async def test_async(provider: type[BaseProvider]): response = await provider.create_async(model=model, messages=messages) else: response = provider.create_completion(model=model, messages=messages, stream=False) - return True if response else False + return bool(response) except Exception as e: if logging: print(f"{provider.__name__}: {e.__class__.__name__}: {e}") diff --git a/etc/tool/vercel.py b/etc/tool/vercel.py index 7b87e298..29856bb3 100644 --- a/etc/tool/vercel.py +++ b/etc/tool/vercel.py @@ -22,11 +22,9 @@ def get_model_info() -> dict[str, Any]: urls = [f"{url}/_next/{path}" for path in paths] scripts = [session.get(url).text for url in urls] + models_regex = r'let .="\\n\\nHuman:\",r=(.+?),.=' for script in scripts: - models_regex = r'let .="\\n\\nHuman:\",r=(.+?),.=' - matches = re.findall(models_regex, script) - - if matches: + if matches := re.findall(models_regex, script): models_str = matches[0] stop_sequences_regex = r"(?<=stopSequences:{value:\[)\D(?