mm-balance 0.4.1__py3-none-any.whl → 0.5.1__py3-none-any.whl

mm_balance/balance_fetcher.py

@@ -1,7 +1,8 @@
 from dataclasses import dataclass
 from decimal import Decimal
 
-from mm_std import AsyncTaskRunner, PrintFormat, Result
+from mm_concurrency import AsyncTaskRunner
+from mm_result import Result
 from rich.progress import TaskID
 
 from mm_balance import rpc
@@ -9,6 +10,7 @@ from mm_balance.config import Config
 from mm_balance.constants import Network
 from mm_balance.output import utils
 from mm_balance.token_decimals import TokenDecimals
+from mm_balance.utils import PrintFormat
 
 
 @dataclass
@@ -39,7 +41,7 @@ class BalanceFetcher:
         with self.progress_bar:
             runner = AsyncTaskRunner(max_concurrent_tasks=10)
             for network in self.config.networks():
-                runner.add_task(f"process_{network}", self._process_network(network))
+                runner.add(f"process_{network}", self._process_network(network))
             await runner.run()
 
     def get_group_tasks(self, group_index: int, network: Network) -> list[Task]:
@@ -54,7 +56,7 @@ class BalanceFetcher:
     async def _process_network(self, network: Network) -> None:
         runner = AsyncTaskRunner(max_concurrent_tasks=self.config.workers[network])
         for idx, task in enumerate(self.tasks[network]):
-            runner.add_task(str(idx), self._get_balance(network, task.wallet_address, task.token_address))
+            runner.add(str(idx), self._get_balance(network, task.wallet_address, task.token_address))
         res = await runner.run()
 
         # TODO: print job.exceptions if present

mm_balance/cli.py

@@ -4,12 +4,13 @@ import pkgutil
 from pathlib import Path
 from typing import Annotated
 
+import mm_print
 import typer
-from mm_std import PrintFormat, fatal, pretty_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
 
 app = typer.Typer(no_args_is_help=True, pretty_exceptions_enable=False, add_completion=False)
 
@@ -24,8 +25,8 @@ def example_callback(value: bool) -> None:
     if value:
         data = pkgutil.get_data(__name__, "config/example.toml")
         if data is None:
-            fatal("Example config not found")
-        pretty_print_toml(data.decode("utf-8"))
+            mm_print.fatal("Example config not found")
+        mm_print.toml(toml=data.decode("utf-8"))
         raise typer.Exit
 
 

mm_balance/command_runner.py

@@ -1,7 +1,7 @@
 import getpass
 from pathlib import Path
 
-from mm_std import PrintFormat, fatal
+import mm_print
 from pydantic import BaseModel
 
 from mm_balance.balance_fetcher import BalanceFetcher
@@ -11,6 +11,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
 
 
 class CommandParameters(BaseModel):
@@ -62,7 +63,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:
-        fatal("Unsupported print format")
+        mm_print.fatal("Unsupported print format")
 
     if params.save_balances:
         BalancesDict.from_balances_result(result).save_to_path(params.save_balances)

mm_balance/config.py

@@ -4,19 +4,20 @@ from decimal import Decimal
 from pathlib import Path
 from typing import Annotated, Self
 
+import mm_print
 import pydash
-from mm_crypto_utils import ConfigValidators
-from mm_std import BaseConfig, PrintFormat, fatal
+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
 
 
 class Validators(ConfigValidators):
     pass
 
 
-class AssetGroup(BaseConfig):
+class AssetGroup(Web3CliConfig):
     """
     Represents a group of cryptocurrency assets of the same type.
 
@@ -30,7 +31,7 @@ class AssetGroup(BaseConfig):
     token: str | None = None  # Token address. If None, it's a native token
     decimals: int | None = None
     coingecko_id: str | None = None
-    addresses: Annotated[list[str], BeforeValidator(Validators.addresses(unique=True))]
+    addresses: Annotated[list[str], BeforeValidator(Validators.addresses(deduplicate=True))]
     share: Decimal = Decimal(1)
 
     @property
@@ -57,7 +58,7 @@ class AssetGroup(BaseConfig):
                 if path.is_file():
                     result += path.read_text().strip().splitlines()
                 else:
-                    fatal(f"File with addresses not found: {path}")
+                    mm_print.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)
@@ -72,12 +73,12 @@ class AssetGroup(BaseConfig):
         self.addresses = pydash.uniq(result)
 
 
-class AddressCollection(BaseConfig):
+class AddressCollection(Web3CliConfig):
     name: str
-    addresses: Annotated[list[str], BeforeValidator(ConfigValidators.addresses(unique=True))]
+    addresses: Annotated[list[str], BeforeValidator(Validators.addresses(deduplicate=True))]
 
 
-class Settings(BaseConfig):
+class Settings(Web3CliConfig):
     proxies: Annotated[list[str], Field(default_factory=list), BeforeValidator(Validators.proxies())]
     round_ndigits: int = 4
     print_format: PrintFormat = PrintFormat.TABLE
@@ -87,7 +88,7 @@ class Settings(BaseConfig):
     format_number_separator: str = ","  # as thousands separators
 
 
-class Config(BaseConfig):
+class Config(Web3CliConfig):
     groups: list[AssetGroup] = Field(alias="coins")
     addresses: list[AddressCollection] = Field(default_factory=list)
     nodes: dict[Network, list[str]] = Field(default_factory=dict)

mm_balance/diff.py

@@ -5,11 +5,12 @@ import re
 from decimal import Decimal
 from pathlib import Path
 
+import mm_print
 from deepdiff.diff import DeepDiff
-from mm_std import PrintFormat, print_json, print_plain, print_table
 from pydantic import BaseModel, RootModel
 
 from mm_balance.result import Balance, BalancesResult
+from mm_balance.utils import PrintFormat
 
 
 class BalancesDict(RootModel[dict[str, dict[str, dict[str, Decimal]]]]):  # network->ticker->address->balance
@@ -71,23 +72,23 @@ class Diff(BaseModel):
             and not self.address_removed
             and not self.balance_changed
         ):
-            print_plain("Diff: no changes")
+            mm_print.plain("Diff: no changes")
             return
 
-        print_plain("\nDiff")
+        mm_print.plain("\nDiff")
 
         if self.network_added:
-            print_plain(f"networks added: {self.network_added}")
+            mm_print.plain(f"networks added: {self.network_added}")
         if self.network_removed:
-            print_plain(f"networks removed: {self.network_removed}")
+            mm_print.plain(f"networks removed: {self.network_removed}")
         if self.ticker_added:
-            print_plain(f"tickers added: {self.ticker_added}")
+            mm_print.plain(f"tickers added: {self.ticker_added}")
         if self.ticker_removed:
-            print_plain(f"tickers removed: {self.ticker_removed}")
+            mm_print.plain(f"tickers removed: {self.ticker_removed}")
         if self.address_added:
-            print_plain(f"addresses added: {self.address_added}")
+            mm_print.plain(f"addresses added: {self.address_added}")
         if self.address_removed:
-            print_plain(f"addresses removed: {self.address_removed}")
+            mm_print.plain(f"addresses removed: {self.address_removed}")
 
         if self.balance_changed:
             rows = []
@@ -96,10 +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])
-            print_table("", ["Network", "Ticker", "Address", "Old", "New", "Change"], rows)
+            mm_print.table("", ["Network", "Ticker", "Address", "Old", "New", "Change"], rows)
 
     def _print_json(self) -> None:
-        print_json(data=self.model_dump(), default_serializer=str)
+        # mm_print.json(data=self.model_dump(), type_handlers=str) ?? default?
+        mm_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 @@
-from mm_std import print_json
+import mm_print
 
 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
 
-    print_json(data)
+    mm_print.json(data)

mm_balance/output/formats/table_format.py

@@ -1,6 +1,6 @@
 from decimal import Decimal
 
-from mm_std import print_table
+import mm_print
 
 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)])
-    print_table("Nodes", ["network", "nodes"], rows)
+    mm_print.table("Nodes", ["network", "nodes"], rows)
 
 
 def print_proxy_count(config: Config) -> None:
-    print_table("Proxies", ["count"], [[len(config.settings.proxies)]])
+    mm_print.table("Proxies", ["count"], [[len(config.settings.proxies)]])
 
 
 def print_token_decimals(token_decimals: TokenDecimals) -> None:
     rows = []
     for network, decimals in token_decimals.items():
         rows.append([network, decimals])
-    print_table("Token Decimals", ["network", "decimals"], rows)
+    mm_print.table("Token Decimals", ["network", "decimals"], rows)
 
 
 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)]
             )
-        print_table("Prices", ["coin", "usd"], rows)
+        mm_print.table("Prices", ["coin", "usd"], rows)
 
 
 def print_result(config: Config, result: BalancesResult, workers: BalanceFetcher) -> None:
@@ -57,7 +57,7 @@ def _print_errors(config: Config, workers: BalanceFetcher) -> None:
     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]
-    print_table("Errors", ["coin", "address", "error"], rows)
+    mm_print.table("Errors", ["coin", "address", "error"], rows)
 
 
 def _print_total(config: Config, total: Total, is_share_total: bool) -> None:
@@ -80,7 +80,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, "$")])
 
-    print_table(table_name, headers, rows)
+    mm_print.table(table_name, headers, rows)
 
 
 def _print_group(config: Config, group: GroupResult) -> None:
@@ -118,4 +118,4 @@ def _print_group(config: Config, group: GroupResult) -> None:
     table_headers = ["address", "balance"]
     if config.settings.price:
         table_headers += ["usd"]
-    print_table(group_name, table_headers, rows)
+    mm_print.table(group_name, table_headers, rows)

mm_balance/price.py

@@ -2,7 +2,8 @@ from collections import defaultdict
 from decimal import Decimal
 
 import pydash
-from mm_std import http_request, random_str_choice
+from mm_http import http_request
+from mm_web3 import random_proxy
 
 from mm_balance.config import AssetGroup, Config
 from mm_balance.constants import RETRIES_COINGECKO_PRICES, TICKER_TO_COINGECKO_ID
@@ -29,7 +30,7 @@ async def get_prices(config: Config) -> Prices:
 
     url = f"https://api.coingecko.com/api/v3/simple/price?ids={','.join(coingecko_map.values())}&vs_currencies=usd"
     for _ in range(RETRIES_COINGECKO_PRICES):
-        res = await http_request(url, proxy=random_str_choice(config.settings.proxies))
+        res = await http_request(url, proxy=random_proxy(config.settings.proxies))
         if res.status_code != 200:
             continue
 

mm_balance/result.py

@@ -110,7 +110,7 @@ def _create_group_result(config: Config, group: AssetGroup, tasks: list[Task], p
             balance_sum += balance.balance
             usd_sum += balance.usd_value
         else:
-            balance = task.balance.unwrap_error()
+            balance = task.balance.unwrap_err()
         addresses.append(AddressBalance(address=task.wallet_address, balance=balance))
 
     balance_sum_share = balance_sum * group.share

mm_balance/rpc.py

@@ -2,10 +2,10 @@ from decimal import Decimal
 
 from mm_apt import retry as apt_retry
 from mm_btc.blockstream import BlockstreamClient
-from mm_crypto_utils import Nodes, Proxies
 from mm_eth import retry as eth_retry
+from mm_result import Result
 from mm_sol import retry as sol_retry
-from mm_std import Result
+from mm_web3 import Nodes, Proxies
 
 from mm_balance.constants import (
     NETWORK_APTOS,

mm_balance/token_decimals.py

@@ -1,4 +1,4 @@
-from mm_std import fatal
+import mm_print
 
 from mm_balance import rpc
 from mm_balance.config import Config
@@ -30,7 +30,7 @@ async def get_token_decimals(config: Config) -> TokenDecimals:
             elif group.network in (NETWORK_BITCOIN, NETWORK_APTOS):
                 result[group.network][None] = 8
             else:
-                fatal(f"Can't get token decimals for native token on network: {group.network}")
+                mm_print.fatal(f"Can't get token decimals for native token on network: {group.network}")
             continue
 
         # get token_decimals via RPC
@@ -43,7 +43,11 @@ async def get_token_decimals(config: Config) -> TokenDecimals:
         )
 
         if res.is_err():
-            fatal(f"can't get decimals for token {group.ticker} / {group.token}, error={res.unwrap_error()}")
+            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.fatal(msg)
+
         result[group.network][group.token] = res.unwrap()
 
     return result

mm_balance/utils.py

@@ -1,4 +1,5 @@
 from decimal import Decimal
+from enum import StrEnum, unique
 
 
 def fnumber(value: Decimal, separator: str, extra: str | None = None) -> str:
@@ -20,3 +21,10 @@ def round_decimal(value: Decimal, round_ndigits: int) -> Decimal:
     if value == Decimal(0):
         return Decimal(0)
     return round(value, round_ndigits)
+
+
+@unique
+class PrintFormat(StrEnum):
+    PLAIN = "plain"
+    TABLE = "table"
+    JSON = "json"

mm_balance-0.5.1.dist-info/METADATA

@@ -0,0 +1,10 @@
+Metadata-Version: 2.4
+Name: mm-balance
+Version: 0.5.1
+Requires-Python: >=3.13
+Requires-Dist: deepdiff==8.5.0
+Requires-Dist: mm-apt==0.4.2
+Requires-Dist: mm-btc==0.5.3
+Requires-Dist: mm-concurrency~=0.1.0
+Requires-Dist: mm-eth==0.7.1
+Requires-Dist: mm-sol==0.7.1

mm_balance-0.5.1.dist-info/RECORD

@@ -0,0 +1,22 @@
+mm_balance/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mm_balance/balance_fetcher.py,sha256=OCRQz_8lYxBKIicwXR3ysQOYxbLfYKRfaLWiFLnR0c8,3239
+mm_balance/cli.py,sha256=6qif4QExl4vZDYrasc2MAizmwe1xtvsncbxEdJkqK-M,2709
+mm_balance/command_runner.py,sha256=chA43ZrWBrSKnL7VBuc_gIFs3zgmWm2XK66Vqz_3QKs,2875
+mm_balance/config.py,sha256=CFcVUeibWoqhS5XiRQxiNZAbHv_Tcn1Fw9tgCDiD1Ac,4925
+mm_balance/constants.py,sha256=LhyW1EfNP5E8st-RPvD7p3QoIowFH2W14tkCf6NzveU,2468
+mm_balance/diff.py,sha256=1NLzfzgOR34FTUFulWjOhUxNsMjt3W5u_7106FLBuaY,7172
+mm_balance/price.py,sha256=M9OQuU_krXttRBsMx6uabzw4GuTyK08K8psOoKMqD0E,1578
+mm_balance/result.py,sha256=vBz_V-ZCkEhrf-Utc7VB_3eP0cuL9pAmEkVJbOpdKIc,5173
+mm_balance/rpc.py,sha256=Z-rHJdhD8ScghUchV2M6rb8jyiPfB3nChEWFXjcBQOo,6116
+mm_balance/token_decimals.py,sha256=leLKHJDmQzt8gnLvkARN96pYoEnus20_WNBPKDXDpKw,2067
+mm_balance/utils.py,sha256=9vsm84f5MUp0s3Auy3JAHJ7saSWlLIlXkwoxqsuZrPU,765
+mm_balance/config/example.toml,sha256=f3Jr40ziOCv_Txf-BysS89c9r7uS-IYHuvwbQ-iftUs,1802
+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=sXVoKqDoVQXzt_iNyxfcQwG5lH-l8Ko5bm4_OZGKUfg,4788
+mm_balance-0.5.1.dist-info/METADATA,sha256=-bEyKIfgjnZTgBUhg9SvJy_qXJDtIESUR9YmM1Q5kT8,262
+mm_balance-0.5.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mm_balance-0.5.1.dist-info/entry_points.txt,sha256=rSnP0ZW1a3ACNwTWM7T53CmOycKbzhG43m2_wseENng,50
+mm_balance-0.5.1.dist-info/RECORD,,

mm_balance-0.4.1.dist-info/METADATA

@@ -1,9 +0,0 @@
-Metadata-Version: 2.4
-Name: mm-balance
-Version: 0.4.1
-Requires-Python: >=3.12
-Requires-Dist: deepdiff==8.5.0
-Requires-Dist: mm-apt==0.3.5
-Requires-Dist: mm-btc==0.4.2
-Requires-Dist: mm-eth==0.6.2
-Requires-Dist: mm-sol==0.6.3

mm_balance-0.4.1.dist-info/RECORD

@@ -1,22 +0,0 @@
-mm_balance/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_balance/balance_fetcher.py,sha256=HUYoZkBdRSPb3AQ5MANOf1H9PQEyizaftXM4oCwp0Bs,3192
-mm_balance/cli.py,sha256=0ZD0fEhzEgrBrXyxUVfuMikrcqJ5w9LSJST4U8DlSIE,2699
-mm_balance/command_runner.py,sha256=4l1X3NuNOBZfMV3DOvN2vk84-0vBrrvpLTPKZUh3iI4,2847
-mm_balance/config.py,sha256=yVB-46HR7saXSsGKbHoxsu6cRMUVTSiuoEPSpSSiOv0,4886
-mm_balance/constants.py,sha256=LhyW1EfNP5E8st-RPvD7p3QoIowFH2W14tkCf6NzveU,2468
-mm_balance/diff.py,sha256=GPRbykty2TIBBM8jpYXOV9Itjyd_mz0BTUsQ8KX7cNo,7099
-mm_balance/price.py,sha256=QVnd0PTn-1ylVLJu230zVpGv5Bs8MgBkantU0pq2osE,1568
-mm_balance/result.py,sha256=yx691T0E6FAe-NSiFMnf1KHBgbCAZPBBQ9xLgKs4_1U,5175
-mm_balance/rpc.py,sha256=-alZDHjpcxna3fHDu_qDGCRMBupFU9x2NeOLGoUQM7U,6121
-mm_balance/token_decimals.py,sha256=di4-LVkXmqAFGc9vrXF_Kq1Oqx3YHWZhavjXrXmigC0,1953
-mm_balance/utils.py,sha256=_UMX3TV350Sr222tAnxGUf0R5McpwloNTQC-U-xiuHc,636
-mm_balance/config/example.toml,sha256=f3Jr40ziOCv_Txf-BysS89c9r7uS-IYHuvwbQ-iftUs,1802
-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=ki0AK7Azft5SF9v14_8X_QT-NtyNWqw0MlQmxtV-VH8,921
-mm_balance/output/formats/table_format.py,sha256=aVf34CK0oVyzm5_mYWnV5BG7eFUah4BYE6DJD1-8bRk,4782
-mm_balance-0.4.1.dist-info/METADATA,sha256=Abo_biJsHKB2lloNqln5zQi4uXim2u5Yk8OpIegH9bk,225
-mm_balance-0.4.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mm_balance-0.4.1.dist-info/entry_points.txt,sha256=rSnP0ZW1a3ACNwTWM7T53CmOycKbzhG43m2_wseENng,50
-mm_balance-0.4.1.dist-info/RECORD,,