chore(ruff): run ruff check --fix

Autofixed the following violations:

- examples/get_tenant_token.py:
    1 × I001 (unsorted-imports)
- examples/upload_firmware.py:
    1 × I001 (unsorted-imports)
- onekey_client/__init__.py:
    1 × I001 (unsorted-imports)
- onekey_client/cli/ci.py:
    2 × RET502 (implicit-return-value)
    2 × RUF010 (explicit-f-string-type-conversion)
    1 × F401 (unused-import)
    1 × D202 (blank-line-after-function)
    1 × I001 (unsorted-imports)
    1 × UP032 (f-string)
    1 × UP045 (non-pep604-annotation-optional)
- onekey_client/cli/cli.py:
    1 × I001 (unsorted-imports)
- onekey_client/cli/firmware_upload.py:
    2 × UP045 (non-pep604-annotation-optional)
    1 × D202 (blank-line-after-function)
    1 × I001 (unsorted-imports)
    1 × F401 (unused-import)
- onekey_client/cli/misc.py:
    2 × D202 (blank-line-after-function)
- onekey_client/client.py:
    7 × UP045 (non-pep604-annotation-optional)
    4 × UP006 (non-pep585-annotation)
    3 × F401 (unused-import)
    2 × RET505 (superfluous-else-return)
    1 × I001 (unsorted-imports)
- onekey_client/errors.py:
    1 × F401 (unused-import)
    1 × UP045 (non-pep604-annotation-optional)
- onekey_client/models.py:
    4 × UP045 (non-pep604-annotation-optional)
    1 × I001 (unsorted-imports)
    1 × F401 (unused-import)
- onekey_client/queries/utils.py:
    1 × I001 (unsorted-imports)
    1 × UP011 (lru-cache-without-parameters)

Author: vlaci

examples/get_tenant_token.py

@@ -1,6 +1,7 @@
 import json
 import sys
 from getpass import getpass
+
 from onekey_client import Client
 
 API_URL = "https://app.eu.onekey.com/api"

examples/upload_firmware.py

@@ -1,5 +1,4 @@
 import sys
-
 from getpass import getpass
 from pathlib import Path
 

onekey_client/__init__.py

@@ -1,2 +1,3 @@
 from .client import Client as Client
-from .models import Tenant as Tenant, FirmwareMetadata as FirmwareMetadata
+from .models import FirmwareMetadata as FirmwareMetadata
+from .models import Tenant as Tenant

onekey_client/cli/ci.py

@@ -1,13 +1,11 @@
 import sys
 import time
 from pathlib import Path
-from typing import Optional
 from uuid import UUID
 
 import click
 import httpx
-
-from junit_xml import TestSuite, TestCase
+from junit_xml import TestCase, TestSuite
 
 from onekey_client import Client
 from onekey_client.queries import load_query
@@ -42,9 +40,7 @@ def get_result(self):
             except httpx.HTTPError as e:
                 if error_count <= self.retry_count:
                     click.echo(
-                        "Error communicating with ONEKEY platform, retrying; error='{}'".format(
-                            str(e)
-                        )
+                        f"Error communicating with ONEKEY platform, retrying; error='{e!s}'"
                     )
                     time.sleep(self.retry_wait * error_count)
                     error_count += 1
@@ -138,7 +134,7 @@ def wait_for_analysis_finish(self):
                     )
                     break
             except Exception as e:
-                click.echo(f"Error fetching results {str(e)}")
+                click.echo(f"Error fetching results {e!s}")
                 sys.exit(10)
 
     def get_recent_firmware_id(self):
@@ -156,11 +152,11 @@ def get_recent_firmware_id(self):
             click.echo(
                 f"Latest firmware upload is not the current firmware, skipping comparison with previous, latest={latest_id}"
             )
-            return
+            return None
 
         if not firmware_ids:
             click.echo("No previous firmware")
-            return
+            return None
 
         return firmware_ids[0]
 
@@ -303,10 +299,9 @@ def ci_result(
     retry_count: int,
     retry_wait: int,
     check_interval: int,
-    junit_path: Optional[Path],
+    junit_path: Path | None,
 ):
     """Fetch analysis results for CI"""
-
     handler = ResultHandler(
         client,
         firmware_id,

onekey_client/cli/cli.py

@@ -4,9 +4,10 @@
 import httpx
 
 from onekey_client import Client
-from .firmware_upload import upload_firmware
-from .misc import list_tenants, get_tenant_token
+
 from .ci import ci_result
+from .firmware_upload import upload_firmware
+from .misc import get_tenant_token, list_tenants
 
 
 @click.group()

onekey_client/cli/firmware_upload.py

@@ -1,10 +1,9 @@
 import sys
 from pathlib import Path
-from typing import Optional
 
 import click
 
-from onekey_client import FirmwareMetadata, Client
+from onekey_client import Client, FirmwareMetadata
 from onekey_client.errors import QueryError
 
 
@@ -41,12 +40,11 @@ def upload_firmware(
     vendor_name: str,
     product_group_name: str,
     analysis_configuration_name: str,
-    version: Optional[str],
-    name: Optional[str],
+    version: str | None,
+    name: str | None,
     filename: Path,
 ):
     """Uploads a firmware to the ONEKEY platform"""
-
     product_group_id = _get_product_group_id_by_name(client, product_group_name)
     analysis_configuration_id = _get_analysis_configuration_id_by_name(
         client, analysis_configuration_name

onekey_client/cli/misc.py

@@ -9,7 +9,6 @@
 @click.pass_obj
 def list_tenants(client: Client):
     """List available tenants"""
-
     tenants = client.get_all_tenants()
     for tenant in tenants:
         click.echo(f"{tenant.name} ({tenant.id}")
@@ -19,5 +18,4 @@ def list_tenants(client: Client):
 @click.pass_obj
 def get_tenant_token(client: Client):
     """Get tenant specific Bearer token"""
-
     click.echo(json.dumps(client.get_auth_headers()))

onekey_client/client.py

@@ -2,24 +2,21 @@
 import gc
 import secrets
 from pathlib import Path
-from typing import Optional, List, Dict
-
-from httpx import URL
 
 try:
     from importlib import resources
 except ImportError:
     import importlib_resources as resources
 
 import httpx
-from pydantic import parse_obj_as
-from authlib.oidc.core import IDToken
 from authlib.jose import jwt
-from .queries import load_query
-from . import errors
-from . import models as m
-from . import keys
+from authlib.oidc.core import IDToken
+from httpx import URL
+from pydantic import parse_obj_as
 
+from . import errors, keys
+from . import models as m
+from .queries import load_query
 
 CLIENT_ID = "ONEKEY Python SDK"
 TOKEN_NAMESPACE = "https://www.onekey.com/"
@@ -51,8 +48,8 @@ class Client:
     def __init__(
         self,
         api_url: str,
-        ca_bundle: Optional[Path] = None,
-        disable_tls_verify: Optional[bool] = False,
+        ca_bundle: Path | None = None,
+        disable_tls_verify: bool | None = False,
     ):
         self._api_url = URL(api_url)
         self._client = self._setup_httpx_client(api_url, ca_bundle, disable_tls_verify)
@@ -66,8 +63,8 @@ def __init__(
     def _setup_httpx_client(
         self,
         api_url: str,
-        ca_bundle: Optional[Path] = None,
-        disable_tls_verify: Optional[bool] = False,
+        ca_bundle: Path | None = None,
+        disable_tls_verify: bool | None = False,
     ):
         if disable_tls_verify:
             return httpx.Client(base_url=api_url, verify=False)
@@ -78,17 +75,15 @@ def _setup_httpx_client(
                 raise errors.InvalidCABundle
 
             return httpx.Client(base_url=api_url, verify=str(ca))
-        else:
-            with resources.path(keys, "ca.pem") as ca:
-                return httpx.Client(base_url=api_url, verify=str(ca))
+        with resources.path(keys, "ca.pem") as ca:
+            return httpx.Client(base_url=api_url, verify=str(ca))
 
-    def _load_key(self, key_name: str, path: Optional[Path] = None):
+    def _load_key(self, key_name: str, path: Path | None = None):
         if path is not None:
             return path.read_bytes()
-        else:
-            response = self._client.get(f"/{key_name}.pem")
-            response.raise_for_status()
-            return response.read()
+        response = self._client.get(f"/{key_name}.pem")
+        response.raise_for_status()
+        return response.read()
 
     @property
     def api_url(self) -> URL:
@@ -111,7 +106,7 @@ def login(self, email: str, password: str):
             claims_cls=IDToken,
         )
         tenants = id_token[TOKEN_NAMESPACE + "tenants"]
-        tenants = parse_obj_as(List[m.Tenant], tenants)
+        tenants = parse_obj_as(list[m.Tenant], tenants)
         self._state.tenants = {e.name: e for e in tenants}
         self._state.email = email
         self._state.raw_id_token = json_res["id_token"]
@@ -131,7 +126,7 @@ def use_token(self, token: str):
         self._state.tenants = {tenant.name: tenant}
         self._state.tenant = tenant
 
-    def _post(self, path: str, headers: Optional[Dict] = None, **kwargs):
+    def _post(self, path: str, headers: dict | None = None, **kwargs):
         response = self._client.post(path, headers=headers, **kwargs)
         response.raise_for_status()
         return response.json()
@@ -152,7 +147,7 @@ def get_tenant(self, name: str):
         return self._state.tenants[name]
 
     @_login_required
-    def get_all_tenants(self) -> List[m.Tenant]:
+    def get_all_tenants(self) -> list[m.Tenant]:
         """Get the list of Tenants you have access to."""
         return list(self._state.tenants.values())
 
@@ -182,7 +177,7 @@ def refresh_tenant_token(self):
             self.use_tenant(self._state.tenant)
 
     @_tenant_required
-    def query(self, query: str, variables: Optional[Dict] = None, timeout=60):
+    def query(self, query: str, variables: dict | None = None, timeout=60):
         """Issues a GraphQL query and returns the results"""
         res = self._post_with_token(
             "/graphql", json={"query": query, "variables": variables}, timeout=timeout

onekey_client/errors.py

@@ -1,11 +1,10 @@
 import json
-from typing import Optional
 
 
 class ClientError(Exception):
     """Base class for all Client errors."""
 
-    def __init__(self, message: Optional[str] = None):
+    def __init__(self, message: str | None = None):
         super().__init__(message or self.MESSAGE)
 
 

onekey_client/models.py

@@ -1,6 +1,6 @@
 import datetime as dt
-from typing import Optional
 from uuid import UUID
+
 from pydantic import BaseModel
 
 
@@ -11,11 +11,11 @@ class Tenant(BaseModel):
 
 class FirmwareMetadata(BaseModel):
     name: str
-    version: Optional[str] = None
-    release_date: Optional[dt.datetime] = None
-    notes: Optional[str] = None
+    version: str | None = None
+    release_date: dt.datetime | None = None
+    notes: str | None = None
     vendor_name: str
     product_name: str
-    product_category: Optional[str] = None
+    product_category: str | None = None
     product_group_id: UUID
     analysis_configuration_id: UUID