mm-balance 0.6.0__py3-none-any.whl → 0.6.2__py3-none-any.whl

mm_balance/balance_fetcher.py

@@ -39,7 +39,7 @@ class BalanceFetcher:
 
     async def process(self) -> None:
         with self.progress_bar:
-            runner = AsyncTaskRunner(max_concurrent_tasks=10)
+            runner = AsyncTaskRunner(concurrency=10)
             for network in self.config.networks():
                 runner.add(f"process_{network}", self._process_network(network))
             await runner.run()
@@ -54,7 +54,7 @@ class BalanceFetcher:
         return result
 
     async def _process_network(self, network: Network) -> None:
-        runner = AsyncTaskRunner(max_concurrent_tasks=self.config.workers[network])
+        runner = AsyncTaskRunner(concurrency=self.config.workers[network])
         for idx, task in enumerate(self.tasks[network]):
             runner.add(str(idx), self._get_balance(network, task.wallet_address, task.token_address))
         res = await runner.run()

mm_balance/cli.py

@@ -4,13 +4,13 @@ import pkgutil
 from pathlib import Path
 from typing import Annotated
 
-import mm_print
 import typer
+from mm_print import print_toml
 
 from mm_balance import command_runner
 from mm_balance.command_runner import CommandParameters
 from mm_balance.constants import NETWORKS
-from mm_balance.utils import PrintFormat
+from mm_balance.utils import PrintFormat, fatal
 
 app = typer.Typer(no_args_is_help=True, pretty_exceptions_enable=False, add_completion=False)
 
@@ -25,8 +25,8 @@ def example_callback(value: bool) -> None:
     if value:
         data = pkgutil.get_data(__name__, "config/example.toml")
         if data is None:
-            mm_print.exit_with_error("Example config not found")
-        mm_print.toml(data.decode("utf-8"))
+            fatal("Example config not found")
+        print_toml(data.decode("utf-8"))
         raise typer.Exit
 
 

mm_balance/command_runner.py

@@ -1,7 +1,6 @@
 import getpass
 from pathlib import Path
 
-import mm_print
 from pydantic import BaseModel
 
 from mm_balance.balance_fetcher import BalanceFetcher
@@ -11,7 +10,7 @@ from mm_balance.output.formats import json_format, table_format
 from mm_balance.price import Prices, get_prices
 from mm_balance.result import create_balances_result
 from mm_balance.token_decimals import get_token_decimals
-from mm_balance.utils import PrintFormat
+from mm_balance.utils import PrintFormat, fatal
 
 
 class CommandParameters(BaseModel):
@@ -63,7 +62,7 @@ async def run(params: CommandParameters) -> None:
     elif config.settings.print_format is PrintFormat.JSON:
         json_format.print_result(config, token_decimals, prices, workers, result)
     else:
-        mm_print.exit_with_error("Unsupported print format")
+        fatal("Unsupported print format")
 
     if params.save_balances:
         BalancesDict.from_balances_result(result).save_to_path(params.save_balances)

mm_balance/config.py

@@ -1,16 +1,13 @@
-from __future__ import annotations
-
 from decimal import Decimal
 from pathlib import Path
 from typing import Annotated, Self
 
-import mm_print
 import pydash
 from mm_web3 import ConfigValidators, Web3CliConfig
 from pydantic import BeforeValidator, Field, StringConstraints, model_validator
 
 from mm_balance.constants import DEFAULT_NODES, TOKEN_ADDRESS, Network
-from mm_balance.utils import PrintFormat, evaluate_share_expression
+from mm_balance.utils import PrintFormat, evaluate_share_expression, fatal
 
 
 class Validators(ConfigValidators):
@@ -62,7 +59,7 @@ class AssetGroup(Web3CliConfig):
                 if path.is_file():
                     result += path.read_text().strip().splitlines()
                 else:
-                    mm_print.exit_with_error(f"File with addresses not found: {path}")
+                    fatal(f"File with addresses not found: {path}")
             elif line.startswith("group:"):
                 group_name = line.removeprefix("group:").strip()
                 address_group = next((ag for ag in address_groups if ag.name == group_name), None)

mm_balance/diff.py

@@ -1,12 +1,10 @@
-from __future__ import annotations
-
 import json
 import re
 from decimal import Decimal
 from pathlib import Path
 
-import mm_print
 from deepdiff.diff import DeepDiff
+from mm_print import print_json, print_plain, print_table
 from pydantic import BaseModel, RootModel
 
 from mm_balance.result import Balance, BalancesResult
@@ -21,7 +19,8 @@ class BalancesDict(RootModel[dict[str, dict[str, dict[str, Decimal]]]]):  # netw
         return set(self.model_dump()[network].keys())
 
     def save_to_path(self, balances_file: Path) -> None:
-        json.dump(self.model_dump(), balances_file.open("w"), default=str, indent=2)
+        with balances_file.open("w") as f:
+            json.dump(self.model_dump(), f, default=str, indent=2)
 
     @staticmethod
     def from_balances_result(result: BalancesResult) -> BalancesDict:
@@ -38,7 +37,8 @@ class BalancesDict(RootModel[dict[str, dict[str, dict[str, Decimal]]]]):  # netw
 
     @staticmethod
     def from_file(path: Path) -> BalancesDict:
-        return BalancesDict(json.load(path.open("r")))
+        with path.open("r") as f:
+            return BalancesDict(json.load(f))
 
 
 class Diff(BaseModel):
@@ -72,23 +72,23 @@ class Diff(BaseModel):
             and not self.address_removed
             and not self.balance_changed
         ):
-            mm_print.plain("Diff: no changes")
+            print_plain("Diff: no changes")
             return
 
-        mm_print.plain("\nDiff")
+        print_plain("\nDiff")
 
         if self.network_added:
-            mm_print.plain(f"networks added: {self.network_added}")
+            print_plain(f"networks added: {self.network_added}")
         if self.network_removed:
-            mm_print.plain(f"networks removed: {self.network_removed}")
+            print_plain(f"networks removed: {self.network_removed}")
         if self.ticker_added:
-            mm_print.plain(f"tickers added: {self.ticker_added}")
+            print_plain(f"tickers added: {self.ticker_added}")
         if self.ticker_removed:
-            mm_print.plain(f"tickers removed: {self.ticker_removed}")
+            print_plain(f"tickers removed: {self.ticker_removed}")
         if self.address_added:
-            mm_print.plain(f"addresses added: {self.address_added}")
+            print_plain(f"addresses added: {self.address_added}")
         if self.address_removed:
-            mm_print.plain(f"addresses removed: {self.address_removed}")
+            print_plain(f"addresses removed: {self.address_removed}")
 
         if self.balance_changed:
             rows = []
@@ -97,11 +97,11 @@ class Diff(BaseModel):
                     for address in self.balance_changed[network][ticker]:
                         old_value, new_value = self.balance_changed[network][ticker][address]
                         rows.append([network, ticker, address, old_value, new_value, new_value - old_value])
-            mm_print.table(["Network", "Ticker", "Address", "Old", "New", "Change"], rows)
+            print_table(["Network", "Ticker", "Address", "Old", "New", "Change"], rows)
 
     def _print_json(self) -> None:
-        # mm_print.json(data=self.model_dump(), type_handlers=str) ?? default?
-        mm_print.json(data=self.model_dump())
+        # print_json(data=self.model_dump(), type_handlers=str) ?? default?
+        print_json(data=self.model_dump())
 
     @staticmethod
     def calc(balances1: BalancesDict, balances2: BalancesDict) -> Diff:

mm_balance/output/formats/json_format.py

@@ -1,4 +1,4 @@
-import mm_print
+from mm_print import print_json
 
 from mm_balance.balance_fetcher import BalanceFetcher
 from mm_balance.config import Config
@@ -27,4 +27,4 @@ def print_result(
     if errors:
         data["errors"] = errors
 
-    mm_print.json(data)
+    print_json(data)

mm_balance/output/formats/table_format.py

@@ -1,6 +1,6 @@
 from decimal import Decimal
 
-import mm_print
+from mm_print import print_table
 
 from mm_balance.balance_fetcher import BalanceFetcher
 from mm_balance.config import Config
@@ -14,18 +14,18 @@ def print_nodes(config: Config) -> None:
     rows = []
     for network, nodes in config.nodes.items():
         rows.append([network, "\n".join(nodes)])
-    mm_print.table(["network", "nodes"], rows, title="Nodes")
+    print_table(["network", "nodes"], rows, title="Nodes")
 
 
 def print_proxy_count(config: Config) -> None:
-    mm_print.table(["count"], [[len(config.settings.proxies)]], title="Proxies")
+    print_table(["count"], [[len(config.settings.proxies)]], title="Proxies")
 
 
 def print_token_decimals(token_decimals: TokenDecimals) -> None:
     rows = []
     for network, decimals in token_decimals.items():
         rows.append([network, decimals])
-    mm_print.table(["network", "decimals"], rows, title="Token Decimals")
+    print_table(["network", "decimals"], rows, title="Token Decimals")
 
 
 def print_prices(config: Config, prices: Prices) -> None:
@@ -35,7 +35,7 @@ def print_prices(config: Config, prices: Prices) -> None:
             rows.append(
                 [ticker, format_number(price, config.settings.format_number_separator, "$", config.settings.round_ndigits)]
             )
-        mm_print.table(["coin", "usd"], rows, title="Prices")
+        print_table(["coin", "usd"], rows, title="Prices")
 
 
 def print_result(config: Config, result: BalancesResult, workers: BalanceFetcher) -> None:
@@ -56,8 +56,10 @@ def _print_errors(config: Config, workers: BalanceFetcher) -> None:
     rows = []
     for task in error_tasks:
         group = config.groups[task.group_index]
-        rows.append([group.ticker + " / " + group.network, task.wallet_address, task.balance.error])  # type: ignore[union-attr]
-    mm_print.table(["coin", "address", "error"], rows, title="Errors")
+        # task.balance is guaranteed to be non-None ResultErr here since get_errors() filters for is_err()
+        if task.balance is not None:
+            rows.append([group.ticker + " / " + group.network, task.wallet_address, task.balance.unwrap_err()])
+    print_table(["coin", "address", "error"], rows, title="Errors")
 
 
 def _print_total(config: Config, total: Total, is_share_total: bool) -> None:
@@ -80,7 +82,7 @@ def _print_total(config: Config, total: Total, is_share_total: bool) -> None:
             rows.append(["stablecoin_sum", format_number(total.stablecoin_sum, config.settings.format_number_separator, "$")])
         rows.append(["total_usd_sum", format_number(total.total_usd_sum, config.settings.format_number_separator, "$")])
 
-    mm_print.table(headers, rows, title=table_name)
+    print_table(headers, rows, title=table_name)
 
 
 def _print_group(config: Config, group: GroupResult) -> None:
@@ -118,4 +120,4 @@ def _print_group(config: Config, group: GroupResult) -> None:
     table_headers = ["address", "balance"]
     if config.settings.price:
         table_headers += ["usd"]
-    mm_print.table(table_headers, rows, title=group_name)
+    print_table(table_headers, rows, title=group_name)

mm_balance/price.py

@@ -34,7 +34,7 @@ async def get_prices(config: Config) -> Prices:
         if res.status_code != 200:
             continue
 
-        json_body = res.parse_json()
+        json_body = res.json_body().unwrap_or({})
 
         for ticker, coingecko_id in coingecko_map.items():
             if coingecko_id in json_body:

mm_balance/result.py

@@ -80,6 +80,8 @@ def _create_total(use_share: bool, groups: list[GroupResult]) -> Total:
     if total_usd_sum > 0:
         for ticker, usd_value in coin_usd_values.items():
             if ticker in USD_STABLECOINS:
+                # Intentionally show total stablecoin share for all stablecoins.
+                # We care about combined stablecoin allocation, not individual USDT/USDC breakdown.
                 portfolio_share[ticker] = round(stablecoin_sum * 100 / total_usd_sum, 2)
             else:
                 portfolio_share[ticker] = round(usd_value * 100 / total_usd_sum, 2)

mm_balance/token_decimals.py

@@ -1,8 +1,7 @@
-import mm_print
-
 from mm_balance import rpc
 from mm_balance.config import Config
 from mm_balance.constants import NETWORK_APTOS, NETWORK_BITCOIN, NETWORK_SOLANA, Network
+from mm_balance.utils import fatal
 
 
 class TokenDecimals(dict[Network, dict[str | None, int]]):  # {network: {None: 18}} -- None is for native token, ex. ETH
@@ -30,7 +29,7 @@ async def get_token_decimals(config: Config) -> TokenDecimals:
             elif group.network in (NETWORK_BITCOIN, NETWORK_APTOS):
                 result[group.network][None] = 8
             else:
-                mm_print.exit_with_error(f"Can't get token decimals for native token on network: {group.network}")
+                fatal(f"Can't get token decimals for native token on network: {group.network}")
             continue
 
         # get token_decimals via RPC
@@ -45,8 +44,8 @@ async def get_token_decimals(config: Config) -> TokenDecimals:
         if res.is_err():
             msg = f"can't get decimals for token {group.ticker} / {group.token}, error={res.unwrap_err()}"
             if config.settings.print_debug:
-                msg += f"\n{res.extra}"
-            mm_print.exit_with_error(msg)
+                msg += f"\n{res.context}"
+            fatal(msg)
 
         result[group.network][group.token] = res.unwrap()
 

mm_balance/utils.py

@@ -1,6 +1,9 @@
 import re
 from decimal import Decimal
 from enum import StrEnum, unique
+from typing import NoReturn
+
+import typer
 
 
 def fnumber(value: Decimal, separator: str, extra: str | None = None) -> str:
@@ -15,7 +18,7 @@ def fnumber(value: Decimal, separator: str, extra: str | None = None) -> str:
 def scale_and_round(value: int, decimals: int, round_ndigits: int) -> Decimal:
     if value == 0:
         return Decimal(0)
-    return round(Decimal(value / 10**decimals), round_ndigits)
+    return round(Decimal(value) / Decimal(10**decimals), round_ndigits)
 
 
 def round_decimal(value: Decimal, round_ndigits: int) -> Decimal:
@@ -161,3 +164,9 @@ class PrintFormat(StrEnum):
     PLAIN = "plain"
     TABLE = "table"
     JSON = "json"
+
+
+def fatal(message: str) -> NoReturn:
+    """Print an error message and exit with code 1."""
+    typer.echo(message)
+    raise typer.Exit(1)

mm_balance-0.6.2.dist-info/METADATA

@@ -0,0 +1,10 @@
+Metadata-Version: 2.4
+Name: mm-balance
+Version: 0.6.2
+Requires-Python: >=3.14
+Requires-Dist: deepdiff==8.6.1
+Requires-Dist: mm-apt==0.6.0
+Requires-Dist: mm-btc==0.6.0
+Requires-Dist: mm-concurrency~=0.2.0
+Requires-Dist: mm-eth==0.8.0
+Requires-Dist: mm-sol==0.8.0

mm_balance-0.6.2.dist-info/RECORD

@@ -0,0 +1,22 @@
+mm_balance/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mm_balance/balance_fetcher.py,sha256=SbS1jFySKeAzctT7adBTFoTBpTC6ieemscdkAWmBm9M,3221
+mm_balance/cli.py,sha256=Nwef_-FzyX_VkFJ6GIAGYWaR8XOlZFQE8LBGwIpB2yg,2715
+mm_balance/command_runner.py,sha256=271o0dgW66bMPo0xxXTpUrODvHwSw3BROxcbweh-RZk,2857
+mm_balance/config.py,sha256=Y-zUTngIe2RXKaTsgMhaZJu_jLL7t_QJg6GJYQkxJUw,5089
+mm_balance/constants.py,sha256=LhyW1EfNP5E8st-RPvD7p3QoIowFH2W14tkCf6NzveU,2468
+mm_balance/diff.py,sha256=0z0SqY8GBXb__xO1wnhx8BvgL6DGtWEXQE5dauIlFFw,7191
+mm_balance/price.py,sha256=ypdeif9tJRadFv71MYSn-q4-9y7tmoOC1szuMdPZIG4,1580
+mm_balance/result.py,sha256=0GodPzbfLn7YC56yUVNT2yucZayLTssupIPHXdirNp0,5374
+mm_balance/rpc.py,sha256=Z-rHJdhD8ScghUchV2M6rb8jyiPfB3nChEWFXjcBQOo,6116
+mm_balance/token_decimals.py,sha256=X3iS1fvWtOq-w-tE7UVOPoTsVco1pFmSnOLBw0MvetA,2069
+mm_balance/utils.py,sha256=rAa7EETCUiqUvn_GyH5XKQdlYSCz5cXal0M3vkJu21c,5652
+mm_balance/config/example.toml,sha256=tqYx9gxhXYa5uKWFi-MDHYkPOgxqgrO_ZuU7T5tLzLM,1864
+mm_balance/output/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mm_balance/output/utils.py,sha256=zyN9igdaXGY_vKfc-3dJ13mH1T7JDke3AeB4MY_3AsA,842
+mm_balance/output/formats/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mm_balance/output/formats/json_format.py,sha256=jSRVxxt8sVw_6sEdyDSmiMiVNsllQn5oNm8BN3Mwdd0,923
+mm_balance/output/formats/table_format.py,sha256=xw5DiJ3rcOwd-3XRA7AEvmL5Bz3GHv9rEdA6VIAySnY,4951
+mm_balance-0.6.2.dist-info/METADATA,sha256=niNF1sdtEHGoZpLI4h9W8m2ca2cu-RmaCfcVeZN-fVk,262
+mm_balance-0.6.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+mm_balance-0.6.2.dist-info/entry_points.txt,sha256=rSnP0ZW1a3ACNwTWM7T53CmOycKbzhG43m2_wseENng,50
+mm_balance-0.6.2.dist-info/RECORD,,

{mm_balance-0.6.0.dist-info → mm_balance-0.6.2.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.27.0
+Generator: hatchling 1.28.0
 Root-Is-Purelib: true
 Tag: py3-none-any

mm_balance-0.6.0.dist-info/METADATA

@@ -1,10 +0,0 @@
-Metadata-Version: 2.4
-Name: mm-balance
-Version: 0.6.0
-Requires-Python: >=3.13
-Requires-Dist: deepdiff==8.6.1
-Requires-Dist: mm-apt==0.5.0
-Requires-Dist: mm-btc==0.5.5
-Requires-Dist: mm-concurrency~=0.1.0
-Requires-Dist: mm-eth==0.7.3
-Requires-Dist: mm-sol==0.7.3

mm_balance-0.6.0.dist-info/RECORD

@@ -1,22 +0,0 @@
-mm_balance/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_balance/balance_fetcher.py,sha256=OCRQz_8lYxBKIicwXR3ysQOYxbLfYKRfaLWiFLnR0c8,3239
-mm_balance/cli.py,sha256=t_pshfbHEtzkmV9U6HrTAQy9HBVUqdf4jStUJ_s5Omg,2714
-mm_balance/command_runner.py,sha256=JvFHDzG6cEOic648PGlsNa3PwnA_rHRPB940WGPmWZo,2885
-mm_balance/config.py,sha256=eeE44dXnhekN4c4ZYcIpwQZiYr54Lku97RYasoE2IkY,5153
-mm_balance/constants.py,sha256=LhyW1EfNP5E8st-RPvD7p3QoIowFH2W14tkCf6NzveU,2468
-mm_balance/diff.py,sha256=CLaqXvFFZjxv9zJUE0O-rWyvSZNDi-jM1Md0LfgNOf8,7168
-mm_balance/price.py,sha256=jOwjD-7pIdo894iNH4pK-7LPuz6KnHDR23ghfmOedvU,1567
-mm_balance/result.py,sha256=qW2MRNiPt1JlFUSOJCFCcp-dEirZ2RK3RG5wyE1JAGQ,5193
-mm_balance/rpc.py,sha256=Z-rHJdhD8ScghUchV2M6rb8jyiPfB3nChEWFXjcBQOo,6116
-mm_balance/token_decimals.py,sha256=g8z2ahdVY5nlgmHyvlK9Dk9ush6G7eBkp31k74e9rKE,2087
-mm_balance/utils.py,sha256=GElNtCgE5jb2idak8l6_TnL7JhvmK9mdwObjVwdgE9o,5459
-mm_balance/config/example.toml,sha256=tqYx9gxhXYa5uKWFi-MDHYkPOgxqgrO_ZuU7T5tLzLM,1864
-mm_balance/output/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_balance/output/utils.py,sha256=zyN9igdaXGY_vKfc-3dJ13mH1T7JDke3AeB4MY_3AsA,842
-mm_balance/output/formats/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_balance/output/formats/json_format.py,sha256=uNs2P1J6QhxCsHo8TOqG6aQbDfBkVjIwYyo96d2K17Q,910
-mm_balance/output/formats/table_format.py,sha256=2Y-21O7q-ghTrVSVewRPlhM-M86MoKw_arIYP5wALWE,4828
-mm_balance-0.6.0.dist-info/METADATA,sha256=3F0EMDxp6X84Wf1sb4cBnIUJ0QfnAk0K7Orsa6VtLUA,262
-mm_balance-0.6.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mm_balance-0.6.0.dist-info/entry_points.txt,sha256=rSnP0ZW1a3ACNwTWM7T53CmOycKbzhG43m2_wseENng,50
-mm_balance-0.6.0.dist-info/RECORD,,