mm-balance 0.1.17__py3-none-any.whl → 0.1.19__py3-none-any.whl

mm_balance/cli.py

@@ -46,7 +46,7 @@ def cli(
     zip_password = ""  # nosec
     if config_path.name.endswith(".zip"):
         zip_password = getpass.getpass("zip password")
-    config = Config.read_config(config_path, zip_password=zip_password)
+    config = Config.read_config_or_exit(config_path, zip_password=zip_password)
 
     if print_format is not None:
         config.print_format = print_format

mm_balance/constants.py

@@ -1,5 +1,3 @@
-from typing import Any
-
 from pydantic import GetCoreSchemaHandler
 from pydantic_core import CoreSchema, core_schema
 
@@ -11,11 +9,13 @@ TIMEOUT_DECIMALS = 5
 
 
 class Network(str):
+    __slots__ = ()
+
     def is_evm_network(self) -> bool:
         return self in [NETWORK_ETHEREUM, NETWORK_ARBITRUM_ONE, NETWORK_OP_MAINNET] or self.startswith("evm-")
 
     @classmethod
-    def __get_pydantic_core_schema__(cls, _source_type: Any, handler: GetCoreSchemaHandler) -> CoreSchema:
+    def __get_pydantic_core_schema__(cls, _source_type: object, handler: GetCoreSchemaHandler) -> CoreSchema:
         return core_schema.no_info_after_validator_function(cls, handler(str))
 
 

mm_balance/output/utils.py

@@ -7,7 +7,7 @@ def format_number(value: Decimal, separator: str, extra: str | None = None) -> s
     str_value = f"{value:,}".replace(",", separator)
     if extra == "$":
         return "$" + str_value
-    elif extra == "%":
+    if extra == "%":
         return str_value + "%"
     return str_value
 

mm_balance/price.py

@@ -1,14 +1,15 @@
+from collections import defaultdict
 from decimal import Decimal
 
 import pydash
-from mm_std import fatal, hr
+from mm_std import hr
 from mm_std.random_ import random_str_choice
 
 from mm_balance.config import Config, Group
 from mm_balance.constants import RETRIES_COINGECKO_PRICES, TICKER_TO_COINGECKO_ID
 
 
-class Prices(dict[str, Decimal]):
+class Prices(defaultdict[str, Decimal]):
     """
     A Prices class representing a mapping from coin names to their prices.
 
@@ -20,29 +21,28 @@ class Prices(dict[str, Decimal]):
 def get_prices(config: Config) -> Prices:
     result = Prices()
 
-    coins = pydash.uniq([group.ticker for group in config.groups])
-    coingecko_ids = pydash.uniq([get_coingecko_id(group) for group in config.groups])
+    coingecko_map: dict[str, str] = {}  # ticker -> coingecko_id
 
-    url = f"https://api.coingecko.com/api/v3/simple/price?ids={",".join(coingecko_ids)}&vs_currencies=usd"
+    for group in config.groups:
+        coingecko_id = get_coingecko_id(group)
+        if coingecko_id:
+            coingecko_map[group.ticker] = coingecko_id
+
+    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 = hr(url, proxy=random_str_choice(config.proxies))
         if res.code != 200:
             continue
 
-        for idx, coin in enumerate(coins):
-            if coingecko_ids[idx] in res.json:
-                result[coin] = Decimal(str(pydash.get(res.json, f"{coingecko_ids[idx]}.usd")))
-            else:
-                fatal("Can't get price for {coin} from coingecko, coingecko_id={coingecko_ids[idx]}")
+        for ticker, coingecko_id in coingecko_map.items():
+            if coingecko_id in res.json:
+                result[ticker] = Decimal(str(pydash.get(res.json, f"{coingecko_id}.usd")))
+        break
 
     return result
 
 
-def get_coingecko_id(group: Group) -> str:
+def get_coingecko_id(group: Group) -> str | None:
     if group.coingecko_id:
         return group.coingecko_id
-    coingecko_id = TICKER_TO_COINGECKO_ID.get(group.ticker)
-    if coingecko_id:
-        return coingecko_id
-
-    fatal(f"Can't get coingecko_id for {group.ticker}. Please add coingecko_id to the config.")
+    return TICKER_TO_COINGECKO_ID.get(group.ticker)

mm_balance/result.py

@@ -102,17 +102,16 @@ def _create_group_result(config: Config, group: Group, tasks: list[Task], prices
         balance: Balance | str
         if task.balance is None:
             balance = "balance is None! Something went wrong."
+        elif isinstance(task.balance, Ok):
+            coin_value = task.balance.ok
+            usd_value = Decimal(0)
+            if group.ticker in prices:
+                usd_value = round(coin_value * prices[group.ticker], config.round_ndigits)
+            balance = Balance(balance=coin_value, usd_value=usd_value)
+            balance_sum += balance.balance
+            usd_sum += balance.usd_value
         else:
-            if isinstance(task.balance, Ok):
-                coin_value = task.balance.ok
-                usd_value = Decimal(0)
-                if group.ticker in prices:
-                    usd_value = round(coin_value * prices[group.ticker], config.round_ndigits)
-                balance = Balance(balance=coin_value, usd_value=usd_value)
-                balance_sum += balance.balance
-                usd_sum += balance.usd_value
-            else:
-                balance = task.balance.err
+            balance = task.balance.err
         addresses.append(AddressBalance(address=task.wallet_address, balance=balance))
 
     balance_sum_share = balance_sum * group.share

mm_balance/rpc/aptos.py

@@ -10,7 +10,7 @@ def get_balance(
     nodes: list[str], wallet: str, token: str | None, decimals: int, proxies: list[str], round_ndigits: int
 ) -> Result[Decimal]:
     if token is None:
-        token = "0x1::aptos_coin::AptosCoin"  # nosec
+        token = "0x1::aptos_coin::AptosCoin"  # noqa: S105 # nosec
     return balance.get_decimal_balance_with_retries(
         RETRIES_BALANCE,
         nodes,

mm_balance/token_decimals.py

@@ -28,9 +28,7 @@ def get_token_decimals(config: Config) -> TokenDecimals:
                 result[group.network][None] = 18
             elif group.network == NETWORK_SOLANA:
                 result[group.network][None] = 9
-            elif group.network == NETWORK_BITCOIN:
-                result[group.network][None] = 8
-            elif group.network == NETWORK_APTOS:
+            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_balance/utils.py

@@ -5,6 +5,6 @@ def fnumber(value: Decimal, separator: str, extra: str | None = None) -> str:
     str_value = f"{value:,}".replace(",", separator)
     if extra == "$":
         return "$" + str_value
-    elif extra == "%":
+    if extra == "%":
         return str_value + "%"
     return str_value

mm_balance/workers.py

@@ -1,8 +1,8 @@
 from dataclasses import dataclass
 from decimal import Decimal
+from typing import TYPE_CHECKING
 
 from mm_std import ConcurrentTasks, PrintFormat, Result
-from rich.progress import TaskID
 
 from mm_balance.config import Config
 from mm_balance.constants import NETWORK_APTOS, NETWORK_BITCOIN, NETWORK_SOLANA, Network
@@ -10,6 +10,9 @@ from mm_balance.output import utils
 from mm_balance.rpc import aptos, btc, evm, solana
 from mm_balance.token_decimals import TokenDecimals
 
+if TYPE_CHECKING:
+    from rich.progress import TaskID
+
 
 @dataclass
 class Task:
@@ -20,7 +23,7 @@ class Task:
 
 
 class Workers:
-    def __init__(self, config: Config, token_decimals: TokenDecimals):
+    def __init__(self, config: Config, token_decimals: TokenDecimals) -> None:
         self.config = config
         self.token_decimals = token_decimals
         self.tasks: dict[Network, list[Task]] = {network: [] for network in config.networks()}
@@ -49,9 +52,7 @@ class Workers:
     def get_errors(self) -> list[Task]:
         result = []
         for network in self.tasks:
-            for task in self.tasks[network]:
-                if task.balance is not None and task.balance.is_err():
-                    result.append(task)
+            result.extend([task for task in self.tasks[network] if task.balance is not None and task.balance.is_err()])
         return result
 
     def _process_network(self, network: Network) -> None:

mm_balance-0.1.19.dist-info/METADATA

@@ -0,0 +1,9 @@
+Metadata-Version: 2.4
+Name: mm-balance
+Version: 0.1.19
+Requires-Python: >=3.12
+Requires-Dist: mm-aptos==0.1.5
+Requires-Dist: mm-btc==0.2.1
+Requires-Dist: mm-eth==0.2.3
+Requires-Dist: mm-solana==0.2.3
+Requires-Dist: typer>=0.15.1

mm_balance-0.1.19.dist-info/RECORD

@@ -0,0 +1,24 @@
+mm_balance/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mm_balance/cli.py,sha256=7yQ0DiSDVYeG9lFav-PJnVswncWIfpZsj1G7CZvMDmc,3119
+mm_balance/config.py,sha256=LsmfluUFpTfXMvXUUzGQtiZlz1gliiDrDx4c4SqgPws,5383
+mm_balance/constants.py,sha256=kqG2zuwv0l-PzDHIrMJVQpfQWiXjr2DsqGPcKmqNJLo,2334
+mm_balance/price.py,sha256=9pK2Iy44zTcHIlrja5wC_jV03Q7bJr-S8joNzEsyUl0,1485
+mm_balance/result.py,sha256=rwCSnuyK-u4mz1QmQucFKLC2-vpkSoXfFxbu0MScp9g,4524
+mm_balance/token_decimals.py,sha256=5VZyx29euGtE2KIStQjh6xCcVg1qQweFAykUZU6vkRU,2268
+mm_balance/utils.py,sha256=bngYS2WFIakGZO31_ey4MPsllvDhgOxkAnGiXqom3J4,286
+mm_balance/workers.py,sha256=HujTVy_XxXbFLnZdLh1RjN0q9ziwaRRrQspffBSSLQU,3795
+mm_balance/config/example.yml,sha256=7n72tHsnUbZ64q856IeKHlmt-7PvtAgZlB8t4AS0NzI,1899
+mm_balance/output/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mm_balance/output/utils.py,sha256=WUFwshFMKZKdcwRtO21nhxqW78JeLAatDyHPZhdV96A,716
+mm_balance/output/formats/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mm_balance/output/formats/json_format.py,sha256=yMkZTA6vOUpLSixF7H4H4lVZKShRs4B9qmUR8L-CRvw,866
+mm_balance/output/formats/table_format.py,sha256=qN1uMF1cyAVOH31Gohoc_a4l9-pWTSZ8WRxBBSAwj54,4539
+mm_balance/rpc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mm_balance/rpc/aptos.py,sha256=1JCYCqDim4tk1axXscaAJRXPd4J6vV1ABFbwMbPgrL0,641
+mm_balance/rpc/btc.py,sha256=ugp90H7YW0kiXIh98bQWk9mQTW20yE-jBiCpRvfoH-U,481
+mm_balance/rpc/evm.py,sha256=ewlMmRrcXKlky3DPNbnUBTVwnvyw7N9iCZLsCX2V14w,1007
+mm_balance/rpc/solana.py,sha256=Lwl5Otqy48g4LWfz9uN7_rkICKUIYJvf88PbIAnfMdc,1051
+mm_balance-0.1.19.dist-info/METADATA,sha256=V4gmUFJZqkwrVTWctBPk0Ocs8sZ4xRMw3dUhDKn_i6o,229
+mm_balance-0.1.19.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mm_balance-0.1.19.dist-info/entry_points.txt,sha256=rSnP0ZW1a3ACNwTWM7T53CmOycKbzhG43m2_wseENng,50
+mm_balance-0.1.19.dist-info/RECORD,,

mm_balance-0.1.17.dist-info/METADATA

@@ -1,9 +0,0 @@
-Metadata-Version: 2.4
-Name: mm-balance
-Version: 0.1.17
-Requires-Python: >=3.12
-Requires-Dist: mm-aptos==0.1.4
-Requires-Dist: mm-btc==0.2.0
-Requires-Dist: mm-eth==0.2.0
-Requires-Dist: mm-solana==0.2.0
-Requires-Dist: typer>=0.15.1

mm_balance-0.1.17.dist-info/RECORD

@@ -1,23 +0,0 @@
-mm_balance/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_balance/cli.py,sha256=LbOyGiF3IFCl2oBJzAzR-CE7QZWiR-Q-p9wIgfqv_r8,3111
-mm_balance/config.py,sha256=LsmfluUFpTfXMvXUUzGQtiZlz1gliiDrDx4c4SqgPws,5383
-mm_balance/constants.py,sha256=4C2BxYRY_i83Rba5NOXeLLeA0ZTWR9WD6BeyQwiCj_U,2335
-mm_balance/price.py,sha256=f6fYhpPVqZE9hH22ypfYb9m-nfE41LeVIvksEvqmz54,1615
-mm_balance/result.py,sha256=fG63HrHXWS3kBLHmefxKsRh9tj53dloamO_nv3xFboM,4576
-mm_balance/token_decimals.py,sha256=WAz9wbvwjPJEcQnrLyPAf23eGp89t9oP_xBmaEecEG0,2348
-mm_balance/utils.py,sha256=YjQMfyAaLiiprjt9CuNbDQSJrLbRoTkb2rurAb6bHDc,288
-mm_balance/workers.py,sha256=PGhLVhYYVm2jIAzIiJQYby_UqW0xsRv-wQJURqOUYxg,3767
-mm_balance/config/example.yml,sha256=7n72tHsnUbZ64q856IeKHlmt-7PvtAgZlB8t4AS0NzI,1899
-mm_balance/output/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_balance/output/utils.py,sha256=Vp-6ev-9YIa3kGZxKzMdoJZQB_KLUaAdQGvgOxmZtrc,718
-mm_balance/output/formats/json_format.py,sha256=yMkZTA6vOUpLSixF7H4H4lVZKShRs4B9qmUR8L-CRvw,866
-mm_balance/output/formats/table_format.py,sha256=qN1uMF1cyAVOH31Gohoc_a4l9-pWTSZ8WRxBBSAwj54,4539
-mm_balance/rpc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_balance/rpc/aptos.py,sha256=6hKGKTs2DPQMa4RmPXzfvjCFjPjN8wjJhRRI6HdI9GM,628
-mm_balance/rpc/btc.py,sha256=ugp90H7YW0kiXIh98bQWk9mQTW20yE-jBiCpRvfoH-U,481
-mm_balance/rpc/evm.py,sha256=ewlMmRrcXKlky3DPNbnUBTVwnvyw7N9iCZLsCX2V14w,1007
-mm_balance/rpc/solana.py,sha256=Lwl5Otqy48g4LWfz9uN7_rkICKUIYJvf88PbIAnfMdc,1051
-mm_balance-0.1.17.dist-info/METADATA,sha256=_CWyma3tHq5bD3f8tbimQLwiysvZzUG3TKwWtHNj4a4,229
-mm_balance-0.1.17.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mm_balance-0.1.17.dist-info/entry_points.txt,sha256=rSnP0ZW1a3ACNwTWM7T53CmOycKbzhG43m2_wseENng,50
-mm_balance-0.1.17.dist-info/RECORD,,