refactor: simplify assets module

Author: daniel-makerx

src/algokit/cli/tasks/assets.py

@@ -6,7 +6,6 @@
 from algokit.cli.common.constants import AlgorandNetwork, ExplorerEntityType
 from algokit.cli.common.utils import get_explorer_url
 from algokit.cli.tasks.utils import (
-    get_account_info,
     get_account_with_private_key,
     load_algod_client,
     validate_account_balance_to_opt_in,
@@ -22,10 +21,10 @@ def _get_zero_balanced_assets(
 ) -> list[int]:
     asset_ids_list = []
     if all_assets:
-        account_info = get_account_info(algod_client, address)
-        for asset in account_info.get("assets", []):
-            if asset.get("amount", 0) == 0:
-                asset_ids_list.append(int(asset["asset-id"]))
+        account_info = algod_client.account_information(address)
+        for asset in account_info.assets or ():
+            if asset.amount == 0:
+                asset_ids_list.append(asset.asset_id)
     else:
         for asset_id in provided_asset_ids:
             asset_ids_list.append(asset_id)

src/algokit/cli/tasks/utils.py

@@ -12,6 +12,7 @@
 
 import click
 import nacl.signing
+from algokit_algod_client import models as algod
 from algokit_utils import AlgoAmount, ClientManager
 from algokit_utils.algo25 import seed_from_mnemonic
 from algokit_utils.clients import AlgodClient
@@ -24,33 +25,24 @@
 logger = logging.getLogger(__name__)
 
 
-def _get_account_info_dict(algod_client: AlgodClient, address: str) -> dict:
-    """Convert AlgodClient account_information response to a dict format."""
-    response = algod_client.account_information(address)
-    return {
-        "amount": getattr(response, "amount", 0),
-        "assets": [{"asset-id": a.asset_id, "amount": a.amount} for a in getattr(response, "assets", []) or []],
-    }
-
-
-def _validate_asset_balance(account_info: dict, asset_id: int, decimals: int, amount: int = 0) -> None:
-    asset_record = next((asset for asset in account_info.get("assets", []) if asset["asset-id"] == asset_id), None)
-
-    if not asset_record:
-        raise click.ClickException("SigningAccount is not opted into the asset")
+def _validate_asset_balance(account_info: algod.Account, asset_id: int, decimals: int, amount: int = 0) -> None:
+    try:
+        (asset_record,) = (asset for asset in (account_info.assets or ()) if asset.asset_id == asset_id)
+    except ValueError:
+        raise click.ClickException("SigningAccount is not opted into the asset") from None
 
-    if amount > 0 and asset_record["amount"] < amount:
+    if amount > 0 and asset_record.amount < amount:
         required = amount / 10**decimals
-        available = asset_record["amount"] / 10**decimals
+        available = asset_record.amount / 10**decimals
         raise click.ClickException(
             f"Insufficient asset balance in account, required: {required}, available: {available}"
         )
 
 
-def _validate_algo_balance(account_info: dict, amount: int) -> None:
-    if account_info.get("amount", 0) < amount:
+def _validate_algo_balance(account_info: algod.Account, amount: int) -> None:
+    if account_info.amount < amount:
         required = AlgoAmount.from_micro_algo(amount)
-        available = AlgoAmount.from_micro_algo(account_info.get("amount", 0))
+        available = AlgoAmount.from_micro_algo(account_info.amount)
         raise click.ClickException(
             f"Insufficient Algos balance in account, required: {required.algo} Algos, available: {available.algo} Algos"
         )
@@ -144,12 +136,7 @@ def get_asset_decimals(asset_id: int, algod_client: AlgodClient) -> int:
         return 6
 
     asset_response = algod_client.asset_by_id(asset_id)
-    decimals = getattr(getattr(asset_response, "params", None), "decimals", None)
-
-    if decimals is None:
-        raise click.ClickException("Invalid asset info response")
-
-    return int(decimals)
+    return asset_response.params.decimals
 
 
 def validate_balance(algod_client: AlgodClient, account: SigningAccount | str, asset_id: int, amount: int = 0) -> None:
@@ -167,7 +154,7 @@ def validate_balance(algod_client: AlgodClient, account: SigningAccount | str, a
         click.ClickException: If any validation check fails.
     """
     address = account.address if isinstance(account, SigningAccount) else account
-    account_info = _get_account_info_dict(algod_client, address)
+    account_info = algod_client.account_information(address)
 
     if asset_id == 0:
         _validate_algo_balance(account_info, amount)
@@ -289,10 +276,10 @@ def validate_account_balance_to_opt_in(algod_client: AlgodClient, account: Signi
     """
 
     address = account.address if isinstance(account, SigningAccount) else account
-    account_info = _get_account_info_dict(algod_client, address)
+    account_info = algod_client.account_information(address)
 
     required_microalgos = num_assets * AlgoAmount.from_algo(Decimal("0.1")).micro_algo
-    available_microalgos = account_info.get("amount", 0)
+    available_microalgos = account_info.amount
     if available_microalgos < required_microalgos:
         required_algo = AlgoAmount.from_micro_algo(required_microalgos).algo
         available_algos = AlgoAmount.from_micro_algo(available_microalgos).algo
@@ -302,10 +289,6 @@ def validate_account_balance_to_opt_in(algod_client: AlgodClient, account: Signi
         )
 
 
-def get_account_info(algod_client: AlgodClient, account_address: str) -> dict:
-    return _get_account_info_dict(algod_client, account_address)
-
-
 def run_callback_once(callback: Callable) -> Callable:
     """
     Click option callbacks run twice, first to validate the prompt input,

tests/tasks/test_asset.py

@@ -1,5 +1,6 @@
 import json
 
+from algokit_algod_client.models import Account, AssetHolding
 from algokit_utils import BulkAssetOptInOutResult
 from pytest_mock import MockerFixture
 
@@ -125,8 +126,8 @@ def test_opt_out_of_assets_from_account_address_successful(mocker: MockerFixture
 
 
 def test_opt_out_of_all_assets_from_account_address_successful(mocker: MockerFixture) -> None:
-    dummy_account_info = {"assets": [{"asset-id": 1, "amount": 0}]}
-    mocker.patch("algokit.cli.tasks.assets.get_account_info", return_value=dummy_account_info)
+    dummy_account_info = Account(assets=[AssetHolding(asset_id=1)])
+    mocker.patch("algokit_algod_client.client.AlgodClient.account_information", return_value=dummy_account_info)
     algorand_mock = mocker.MagicMock()
     algorand_mock.asset.bulk_opt_out.return_value = [
         BulkAssetOptInOutResult(asset_id=123, transaction_id="dummy_txn_id")