Fix: Solved code-quality issue.

Author: Andres D. Molins

src/aleph_client/commands/aggregate.py

@@ -11,7 +11,6 @@
 from aleph.sdk.account import _load_account
 from aleph.sdk.client import AuthenticatedAlephHttpClient
 from aleph.sdk.conf import settings
-from aleph.sdk.types import AccountFromPrivateKey
 from aleph.sdk.utils import extended_json_encoder
 from aleph_message.models import Chain, MessageType
 from aleph_message.status import MessageStatus
@@ -59,7 +58,7 @@ async def forget(
 
     setup_logging(debug)
 
-    account: AccountFromPrivateKey = _load_account(private_key, private_key_file)
+    account = _load_account(private_key, private_key_file)
     address = account.get_address() if address is None else address
 
     if key == "security" and not is_same_context():
@@ -132,7 +131,7 @@ async def post(
 
     setup_logging(debug)
 
-    account: AccountFromPrivateKey = _load_account(private_key, private_key_file)
+    account = _load_account(private_key, private_key_file)
     address = account.get_address() if address is None else address
 
     if key == "security" and not is_same_context():
@@ -194,7 +193,7 @@ async def get(
 
     setup_logging(debug)
 
-    account: AccountFromPrivateKey = _load_account(private_key, private_key_file)
+    account = _load_account(private_key, private_key_file)
     address = account.get_address() if address is None else address
 
     async with AuthenticatedAlephHttpClient(account=account, api_server=settings.API_HOST) as client:
@@ -230,7 +229,7 @@ async def list_aggregates(
 
     setup_logging(debug)
 
-    account: AccountFromPrivateKey = _load_account(private_key, private_key_file)
+    account = _load_account(private_key, private_key_file)
     address = account.get_address() if address is None else address
 
     aggr_link = f"{sanitize_url(settings.API_HOST)}/api/v0/aggregates/{address}.json"
@@ -304,7 +303,7 @@ async def authorize(
 
     setup_logging(debug)
 
-    account: AccountFromPrivateKey = _load_account(private_key, private_key_file)
+    account = _load_account(private_key, private_key_file)
 
     data = await get(
         key="security",
@@ -378,7 +377,7 @@ async def revoke(
 
     setup_logging(debug)
 
-    account: AccountFromPrivateKey = _load_account(private_key, private_key_file)
+    account = _load_account(private_key, private_key_file)
 
     data = await get(
         key="security",
@@ -433,7 +432,7 @@ async def permissions(
 
     setup_logging(debug)
 
-    account: AccountFromPrivateKey = _load_account(private_key, private_key_file)
+    account = _load_account(private_key, private_key_file)
     address = account.get_address() if address is None else address
 
     data = await get(

src/aleph_client/commands/domain.py

@@ -3,7 +3,7 @@
 import logging
 from pathlib import Path
 from time import sleep
-from typing import Annotated, Optional, cast
+from typing import Annotated, Optional, Union, cast
 
 import typer
 from aleph.sdk.account import _load_account
@@ -19,6 +19,7 @@
 from aleph.sdk.exceptions import DomainConfigurationError
 from aleph.sdk.query.filters import MessageFilter
 from aleph.sdk.types import AccountFromPrivateKey
+from aleph.sdk.wallets.ledger import LedgerETHAccount
 from aleph_message.models import AggregateMessage
 from aleph_message.models.base import MessageType
 from rich.console import Console
@@ -65,7 +66,7 @@ async def check_domain_records(fqdn, target, owner):
 
 
 async def attach_resource(
-    account: AccountFromPrivateKey,
+    account,
     fqdn: Hostname,
     item_hash: Optional[str] = None,
     catch_all_path: Optional[str] = None,
@@ -137,7 +138,9 @@ async def attach_resource(
             )
 
 
-async def detach_resource(account: AccountFromPrivateKey, fqdn: Hostname, interactive: Optional[bool] = None):
+async def detach_resource(
+    account: Union[AccountFromPrivateKey, LedgerETHAccount], fqdn: Hostname, interactive: Optional[bool] = None
+):
     domain_info = await get_aggregate_domain_info(account, fqdn)
     interactive = is_environment_interactive() if interactive is None else interactive
 
@@ -187,7 +190,7 @@ async def add(
     ] = settings.PRIVATE_KEY_FILE,
 ):
     """Add and link a Custom Domain."""
-    account: AccountFromPrivateKey = _load_account(private_key, private_key_file)
+    account = _load_account(private_key, private_key_file)
     interactive = False if (not ask) else is_environment_interactive()
 
     console = Console()
@@ -272,7 +275,7 @@ async def attach(
     ] = settings.PRIVATE_KEY_FILE,
 ):
     """Attach resource to a Custom Domain."""
-    account: AccountFromPrivateKey = _load_account(private_key, private_key_file)
+    account = _load_account(private_key, private_key_file)
 
     await attach_resource(
         account,
@@ -294,7 +297,7 @@ async def detach(
     ] = settings.PRIVATE_KEY_FILE,
 ):
     """Unlink Custom Domain."""
-    account: AccountFromPrivateKey = _load_account(private_key, private_key_file)
+    account = _load_account(private_key, private_key_file)
 
     await detach_resource(account, Hostname(fqdn), interactive=False if (not ask) else None)
     raise typer.Exit()
@@ -309,7 +312,7 @@ async def info(
     ] = settings.PRIVATE_KEY_FILE,
 ):
     """Show Custom Domain Details."""
-    account: AccountFromPrivateKey = _load_account(private_key, private_key_file)
+    account = _load_account(private_key, private_key_file)
 
     console = Console()
     domain_validator = DomainValidator()

src/aleph_client/commands/files.py

@@ -12,7 +12,7 @@
 from aleph.sdk import AlephHttpClient, AuthenticatedAlephHttpClient
 from aleph.sdk.account import _load_account
 from aleph.sdk.conf import settings
-from aleph.sdk.types import AccountFromPrivateKey, StorageEnum, StoredContent
+from aleph.sdk.types import StorageEnum, StoredContent
 from aleph.sdk.utils import safe_getattr
 from aleph_message.models import ItemHash, StoreMessage
 from aleph_message.status import MessageStatus
@@ -44,7 +44,7 @@ async def pin(
 
     setup_logging(debug)
 
-    account: AccountFromPrivateKey = _load_account(private_key, private_key_file)
+    account = _load_account(private_key, private_key_file)
 
     async with AuthenticatedAlephHttpClient(account=account, api_server=settings.API_HOST) as client:
         result: StoreMessage
@@ -75,7 +75,7 @@ async def upload(
 
     setup_logging(debug)
 
-    account: AccountFromPrivateKey = _load_account(private_key, private_key_file)
+    account = _load_account(private_key, private_key_file)
 
     async with AuthenticatedAlephHttpClient(account=account, api_server=settings.API_HOST) as client:
         if not path.is_file():
@@ -181,7 +181,7 @@ async def forget(
 
     setup_logging(debug)
 
-    account: AccountFromPrivateKey = _load_account(private_key, private_key_file)
+    account = _load_account(private_key, private_key_file)
 
     hashes = [ItemHash(item_hash) for item_hash in item_hash.split(",")]
 
@@ -270,7 +270,7 @@ async def list_files(
     json: Annotated[bool, typer.Option(help="Print as json instead of rich table")] = False,
 ):
     """List all files for a given address"""
-    account: AccountFromPrivateKey = _load_account(private_key, private_key_file)
+    account = _load_account(private_key, private_key_file)
 
     if account and not address:
         address = account.get_address()

src/aleph_client/commands/message.py

@@ -20,7 +20,7 @@
 )
 from aleph.sdk.query.filters import MessageFilter
 from aleph.sdk.query.responses import MessagesResponse
-from aleph.sdk.types import AccountFromPrivateKey, StorageEnum
+from aleph.sdk.types import StorageEnum
 from aleph.sdk.utils import extended_json_encoder
 from aleph_message.models import AlephMessage, ProgramMessage
 from aleph_message.models.base import MessageType
@@ -138,7 +138,7 @@ async def post(
 
     setup_logging(debug)
 
-    account: AccountFromPrivateKey = _load_account(private_key, private_key_file)
+    account = _load_account(private_key, private_key_file)
     storage_engine: StorageEnum
     content: dict
 
@@ -188,7 +188,7 @@ async def amend(
 
     setup_logging(debug)
 
-    account: AccountFromPrivateKey = _load_account(private_key, private_key_file)
+    account = _load_account(private_key, private_key_file)
 
     async with AlephHttpClient(api_server=settings.API_HOST) as client:
         existing_message: Optional[AlephMessage] = None
@@ -253,7 +253,7 @@ async def forget(
 
     hash_list: list[ItemHash] = [ItemHash(h) for h in hashes.split(",")]
 
-    account: AccountFromPrivateKey = _load_account(private_key, private_key_file)
+    account = _load_account(private_key, private_key_file)
     async with AuthenticatedAlephHttpClient(account=account, api_server=settings.API_HOST) as client:
         await client.forget(hashes=hash_list, reason=reason, channel=channel)
 
@@ -296,7 +296,7 @@ def sign(
 
     setup_logging(debug)
 
-    account: AccountFromPrivateKey = _load_account(private_key, private_key_file)
+    account = _load_account(private_key, private_key_file)
 
     if message is None:
         message = input_multiline()

src/aleph_client/commands/program.py

@@ -24,7 +24,7 @@
 )
 from aleph.sdk.query.filters import MessageFilter
 from aleph.sdk.query.responses import PriceResponse
-from aleph.sdk.types import AccountFromPrivateKey, StorageEnum, TokenType
+from aleph.sdk.types import StorageEnum, TokenType
 from aleph.sdk.utils import displayable_amount, make_program_content, safe_getattr
 from aleph_message.models import (
     Chain,
@@ -127,7 +127,7 @@ async def upload(
         typer.echo("No such file or directory")
         raise typer.Exit(code=4) from error
 
-    account: AccountFromPrivateKey = _load_account(private_key, private_key_file, chain=payment_chain)
+    account = _load_account(private_key, private_key_file, chain=payment_chain)
     address = address or settings.ADDRESS_TO_USE or account.get_address()
 
     # Loads default configuration if no chain is set
@@ -339,7 +339,7 @@ async def update(
         typer.echo("No such file or directory")
         raise typer.Exit(code=4) from error
 
-    account: AccountFromPrivateKey = _load_account(private_key, private_key_file, chain=chain)
+    account = _load_account(private_key, private_key_file, chain=chain)
 
     async with AuthenticatedAlephHttpClient(account=account, api_server=settings.API_HOST) as client:
         try: