diff options
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/testing/log_time.py | 8 | ||||
| -rw-r--r-- | etc/testing/test_providers.py | 12 | ||||
| -rw-r--r-- | etc/tool/create_provider.py | 8 | ||||
| -rw-r--r-- | etc/tool/improve_code.py | 6 | ||||
| -rw-r--r-- | etc/tool/readme_table.py | 2 | ||||
| -rw-r--r-- | etc/tool/vercel.py | 6 |
6 files changed, 16 insertions, 26 deletions
diff --git a/etc/testing/log_time.py b/etc/testing/log_time.py index 376ab86d..79997a61 100644 --- a/etc/testing/log_time.py +++ b/etc/testing/log_time.py @@ -5,9 +5,7 @@ async def log_time_async(method: callable, **kwargs): start = time() result = await method(**kwargs) secs = f"{round(time() - start, 2)} secs" - if result: - return " ".join([result, secs]) - return secs + return " ".join([result, secs]) if result else secs def log_time_yield(method: callable, **kwargs): @@ -20,6 +18,4 @@ def log_time(method: callable, **kwargs): start = time() result = method(**kwargs) secs = f"{round(time() - start, 2)} secs" - if result: - return " ".join([result, secs]) - return secs
\ No newline at end of file + return " ".join([result, secs]) if result else secs
\ No newline at end of file diff --git a/etc/testing/test_providers.py b/etc/testing/test_providers.py index 0eaad3e8..8c444d34 100644 --- a/etc/testing/test_providers.py +++ b/etc/testing/test_providers.py @@ -22,11 +22,11 @@ def test_provider(provider): return None with concurrent.futures.ThreadPoolExecutor() as executor: - futures = [] - for provider in __all__: - if provider not in _: - futures.append(executor.submit(test_provider, provider)) + futures = [ + executor.submit(test_provider, provider) + for provider in __all__ + if provider not in _ + ] for future in concurrent.futures.as_completed(futures): - result = future.result() - if result: + if result := future.result(): print(f'{result[1]} | {result[0]}')
\ No newline at end of file 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<code>[\S\s]+?)\n```", text) - if match: + if match := re.search(r"```(python|py|)\n(?P<code>[\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<code>[\S\s]+?)\n```", text) - if match: + if match := re.search(r"```(python|py|)\n(?P<code>[\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(?<!\])" models_str = re.sub( |