From 06874c6ea59b851ebbdf9128a2cf039cb7553c55 Mon Sep 17 00:00:00 2001
From: Fran Algaba <f.algaba@outlook.es>
Date: Tue, 12 Dec 2023 17:45:14 +0100
Subject: [PATCH] Formatting and linting
---
giza/commands/prove.py | 4 ++--
giza/commands/version.py | 11 ++++++-----
giza/commands/versions.py | 5 ++---
giza/frameworks/cairo.py | 4 +---
giza/frameworks/ezkl.py | 6 +++---
giza/utils/echo.py | 7 ++++---
6 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/giza/commands/prove.py b/giza/commands/prove.py
index 7c487f7..849ec42 100644
--- a/giza/commands/prove.py
+++ b/giza/commands/prove.py
@@ -11,8 +11,8 @@
def prove(
data: str = typer.Argument(None),
- model_id: Optional[str] = typer.Option(None, "--model-id", "-m"),
- version_id: Optional[str] = typer.Option(None, "--version-id", "-v"),
+ model_id: Optional[int] = typer.Option(None, "--model-id", "-m"),
+ version_id: Optional[int] = typer.Option(None, "--version-id", "-v"),
size: JobSize = typer.Option(JobSize.S, "--size", "-s"),
framework: Framework = typer.Option(Framework.CAIRO, "--framework", "-f"),
output_path: str = typer.Option("zk.proof", "--output-path", "-o"),
diff --git a/giza/commands/version.py b/giza/commands/version.py
index e788471..c2d4909 100644
--- a/giza/commands/version.py
+++ b/giza/commands/version.py
@@ -1,7 +1,6 @@
-import typer
import requests
+import typer
-from giza.callbacks import version_callback
from giza import __version__
from giza.utils.echo import Echo
@@ -11,10 +10,12 @@ def check_version(ctx: typer.Context):
Check if there is a new version available of the cli in pypi to suggest upgrade
"""
current_version = __version__
- response = requests.get('https://pypi.org/pypi/giza/json')
- latest_version = response.json()['info']['version']
+ response = requests.get("https://pypi.org/pypi/giza/json")
+ latest_version = response.json()["info"]["version"]
if latest_version > current_version:
echo = Echo()
echo.warning(f"Current version of Giza CLI: {current_version}")
- echo.warning(f"A new version ({latest_version}) is available. Please upgrade :bell:")
\ No newline at end of file
+ echo.warning(
+ f"A new version ({latest_version}) is available. Please upgrade :bell:"
+ )
diff --git a/giza/commands/versions.py b/giza/commands/versions.py
index fdaf7f5..4b6c890 100644
--- a/giza/commands/versions.py
+++ b/giza/commands/versions.py
@@ -1,5 +1,4 @@
import sys
-import os
import zipfile
from io import BytesIO
from typing import Optional
@@ -69,7 +68,7 @@ def transpile(
None, help="The ID of the model where a new version will be created"
),
desc: str = typer.Option(None, help="Description of the version"),
- model_desc: int = typer.Option(
+ model_desc: str = typer.Option(
None, help="Description of the Model to create if model_id is not provided"
),
framework: Framework = typer.Option(Framework.CAIRO, "--framework", "-f"),
@@ -320,7 +319,7 @@ def download_original(
echo("ONNX model is ready, downloading! ✅")
onnx_model = client.download_original(model_id, version.version)
- with open(output_path, 'wb') as f:
+ with open(output_path, "wb") as f:
f.write(onnx_model)
echo(f"ONNX model saved at: {output_path}")
diff --git a/giza/frameworks/cairo.py b/giza/frameworks/cairo.py
index 76ef2a1..2dd6924 100644
--- a/giza/frameworks/cairo.py
+++ b/giza/frameworks/cairo.py
@@ -134,9 +134,7 @@ def transpile(
"""
echo = Echo(debug=debug)
if model_path is None:
- echo.error(
- "No model name provided, please provide a model path ⛔️"
- )
+ echo.error("No model name provided, please provide a model path ⛔️")
sys.exit(1)
if model_id is None:
model_name = model_path.split("/")[-1].split(".")[0]
diff --git a/giza/frameworks/ezkl.py b/giza/frameworks/ezkl.py
index 043d179..02b9b0e 100644
--- a/giza/frameworks/ezkl.py
+++ b/giza/frameworks/ezkl.py
@@ -30,7 +30,7 @@ def setup(
model_path: str,
model_id: int,
desc: str,
- model_desc: int,
+ model_desc: str,
input_data: str,
debug: Optional[bool],
size: JobSize = JobSize.S,
@@ -229,8 +229,8 @@ def verify(
proof_id: Optional[int],
model_id: Optional[int],
version_id: Optional[int],
- proof: str = None,
- debug: bool = False,
+ proof: Optional[str] = None,
+ debug: Optional[bool] = False,
size: JobSize = JobSize.S,
):
"""
diff --git a/giza/utils/echo.py b/giza/utils/echo.py
index d848ec6..e5a75cf 100644
--- a/giza/utils/echo.py
+++ b/giza/utils/echo.py
@@ -62,7 +62,7 @@ def format_error(self, message: str) -> str:
str: error formatted message
"""
return self.format_message(rf"[red]{message}[/red]", "ERROR", "red")
-
+
def format_warning(self, message: str) -> str:
"""
Specific format for warning purposes
@@ -74,8 +74,9 @@ def format_warning(self, message: str) -> str:
str: error formatted message
"""
yellow = typer.colors.YELLOW
- return self.format_message(rf"[{yellow}]{message}[/{yellow}]", "WARNING", f"{yellow}")
-
+ return self.format_message(
+ rf"[{yellow}]{message}[/{yellow}]", "WARNING", f"{yellow}"
+ )
def echo(self, message: str, formatted: str) -> None:
"""