mm-balance 0.1.14__py3-none-any.whl → 0.1.16__py3-none-any.whl

mm_balance/cli.py

@@ -4,13 +4,15 @@ import pkgutil
 from typing import Annotated
 
 import typer
+from mm_std import PrintFormat, fatal
 
-from mm_balance import output
-from mm_balance.balances import Balances
 from mm_balance.config import Config
 from mm_balance.constants import NETWORKS
+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.workers import Workers
 
 app = typer.Typer(no_args_is_help=True, pretty_exceptions_enable=False, add_completion=False)
 
@@ -32,6 +34,10 @@ def networks_callback(value: bool) -> None:
 @app.command()
 def cli(
     config_path: Annotated[pathlib.Path, typer.Argument()],
+    print_format: Annotated[PrintFormat | None, typer.Option("--format", "-f", help="Print format.")] = None,
+    skip_empty: Annotated[bool | None, typer.Option("--skip-empty", "-s", help="Skip empty balances.")] = None,
+    debug: Annotated[bool | None, typer.Option("--debug", "-d", help="Print debug info.")] = None,
+    price: Annotated[bool | None, typer.Option("--price/--no-price", help="Print prices.")] = None,
     _example: Annotated[bool | None, typer.Option("--example", callback=example_callback, help="Print a config example.")] = None,
     _networks: Annotated[
         bool | None, typer.Option("--networks", callback=networks_callback, help="Print supported networks.")
@@ -42,22 +48,37 @@ def cli(
         zip_password = getpass.getpass("zip password")
     config = Config.read_config(config_path, zip_password=zip_password)
 
-    if config.print_debug:
-        output.print_nodes(config)
+    if print_format is not None:
+        config.print_format = print_format
+    if debug is not None:
+        config.print_debug = debug
+    if skip_empty is not None:
+        config.skip_empty = skip_empty
+    if price is not None:
+        config.price = price
+
+    if config.print_debug and config.print_format is PrintFormat.TABLE:
+        table_format.print_nodes(config)
+        table_format.print_proxy_count(config)
 
     token_decimals = get_token_decimals(config)
-    if config.print_debug:
-        output.print_token_decimals(token_decimals)
+    if config.print_debug and config.print_format is PrintFormat.TABLE:
+        table_format.print_token_decimals(token_decimals)
 
     prices = get_prices(config) if config.price else Prices()
-    output.print_prices(config, prices)
-
-    balances = Balances(config, token_decimals)
-    balances.process()
-
-    output.print_groups(balances, config, prices)
-    output.print_total(config, balances, prices)
-    output.print_errors(config, balances)
+    if config.print_format is PrintFormat.TABLE:
+        table_format.print_prices(config, prices)
+
+    workers = Workers(config, token_decimals)
+    workers.process()
+
+    result = create_balances_result(config, prices, workers)
+    if config.print_format is PrintFormat.TABLE:
+        table_format.print_result(config, result, workers)
+    elif config.print_format is PrintFormat.JSON:
+        json_format.print_result(config, token_decimals, prices, workers, result)
+    else:
+        fatal("Unsupported print format")
 
 
 if __name__ == "__main__":

mm_balance/config/example.yml

@@ -39,11 +39,11 @@ coins:
     addresses: binance_eth
 
   - ticker: USDC
-    comment: okx aptos
+    comment: swap.thala.apt
     network: aptos
     token_address: 0xf22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa::asset::USDC
     token_decimals: 6
-    addresses: "0x834d639b10d20dcb894728aa4b9b572b2ea2d97073b10eacb111f338b20ea5d7" # for a single line it's necessary to use quotes
+    addresses: "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af" # for a single line it's necessary to use quotes
 
 
 addresses:
@@ -70,4 +70,5 @@ addresses:
 #price: yes
 #skip_empty: no
 #print_debug: no
+#print_format: table # table, json
 #format_number_separator: ","

mm_balance/config.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
+import os
 from decimal import Decimal
 from pathlib import Path
-from typing import Self
+from typing import Self, cast
 
 import pydash
 from mm_std import BaseConfig, PrintFormat, fatal, hr
@@ -97,6 +98,8 @@ class Config(BaseConfig):
         # load from proxies_url
         if self.proxies_url is not None:
             self.proxies = get_proxies(self.proxies_url)
+        elif os.getenv("MM_BALANCE_PROXIES_URL"):
+            self.proxies = get_proxies(cast(str, os.getenv("MM_BALANCE_PROXIES_URL")))
 
         # load addresses from address_group
         for group in self.groups:

mm_balance/output/formats/json_format.py

@@ -0,0 +1,28 @@
+from mm_std import print_json
+
+from mm_balance.config import Config
+from mm_balance.price import Prices
+from mm_balance.result import BalancesResult
+from mm_balance.token_decimals import TokenDecimals
+from mm_balance.workers import Workers
+
+
+def print_result(config: Config, token_decimals: TokenDecimals, prices: Prices, workers: Workers, result: BalancesResult) -> None:
+    data: dict[str, object] = {}
+    if config.print_debug:
+        data["nodes"] = config.nodes
+        data["token_decimals"] = token_decimals
+        data["proxies"] = len(config.proxies)
+    if config.price:
+        data["prices"] = prices
+
+    data["groups"] = result.groups
+    data["total"] = result.total
+    if config.has_share():
+        data["total_share"] = result.total_share
+
+    errors = workers.get_errors()
+    if errors:
+        data["errors"] = errors
+
+    print_json(data)

mm_balance/output/formats/table_format.py

@@ -0,0 +1,119 @@
+from decimal import Decimal
+
+from mm_std import print_table
+
+from mm_balance.config import Config
+from mm_balance.output.utils import format_number
+from mm_balance.price import Prices
+from mm_balance.result import BalancesResult, GroupResult, Total
+from mm_balance.token_decimals import TokenDecimals
+from mm_balance.workers import Workers
+
+
+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)
+
+
+def print_proxy_count(config: Config) -> None:
+    print_table("Proxies", ["count"], [[len(config.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)
+
+
+def print_prices(config: Config, prices: Prices) -> None:
+    if config.price:
+        rows = []
+        for ticker, price in prices.items():
+            rows.append([ticker, format_number(round(price, config.round_ndigits), config.format_number_separator, "$")])
+        print_table("Prices", ["coin", "usd"], rows)
+
+
+def print_result(config: Config, result: BalancesResult, workers: Workers) -> None:
+    for group in result.groups:
+        _print_group(config, group)
+
+    _print_total(config, result.total, False)
+    if config.has_share():
+        _print_total(config, result.total_share, True)
+
+    _print_errors(config, workers)
+
+
+def _print_errors(config: Config, workers: Workers) -> None:
+    error_tasks = workers.get_errors()
+    if not error_tasks:
+        return
+    rows = []
+    for task in error_tasks:
+        group = config.groups[task.group_index]
+        rows.append([group.ticker + " / " + group.network, task.wallet_address, task.balance.err])  # type: ignore[union-attr]
+    print_table("Errors", ["coin", "address", "error"], rows)
+
+
+def _print_total(config: Config, total: Total, is_share_total: bool) -> None:
+    table_name = "Total, share" if is_share_total else "Total"
+    headers = ["coin", "balance"]
+
+    rows = []
+    for ticker, balance in total.coin_balances.items():
+        balance_str = format_number(balance, config.format_number_separator)
+        row = [ticker, balance_str]
+        if config.price:
+            usd_value_str = format_number(total.coin_usd_values[ticker], config.format_number_separator, "$")
+            portfolio_share = total.portfolio_share[ticker]
+            row += [usd_value_str, f"{portfolio_share}%"]
+        rows.append(row)
+
+    if config.price:
+        headers += ["usd", "portfolio_share"]
+        if total.stablecoin_sum > 0:
+            rows.append(["stablecoin_sum", format_number(total.stablecoin_sum, config.format_number_separator, "$")])
+        rows.append(["total_usd_sum", format_number(total.total_usd_sum, config.format_number_separator, "$")])
+
+    print_table(table_name, headers, rows)
+
+
+def _print_group(config: Config, group: GroupResult) -> None:
+    group_name = group.ticker
+    if group.comment:
+        group_name += " / " + group.comment
+    group_name += " / " + group.network
+
+    rows = []
+    for address in group.addresses:
+        if isinstance(address.balance, str):
+            rows.append([address.address, address.balance])
+        else:
+            if config.skip_empty and address.balance.balance == Decimal(0):
+                continue
+            balance_str = format_number(address.balance.balance, config.format_number_separator)
+            row = [address.address, balance_str]
+            if config.price:
+                usd_value_str = format_number(address.balance.usd_value, config.format_number_separator, "$")
+                row.append(usd_value_str)
+            rows.append(row)
+
+    sum_row = ["sum", format_number(group.balance_sum, config.format_number_separator)]
+    if config.price:
+        sum_row.append(format_number(group.usd_sum, config.format_number_separator, "$"))
+    rows.append(sum_row)
+
+    if group.share < Decimal(1):
+        sum_share_str = format_number(group.balance_sum_share, config.format_number_separator)
+        sum_share_row = [f"sum_share, {group.share}", sum_share_str]
+        if config.price:
+            sum_share_row.append(format_number(group.usd_sum_share, config.format_number_separator, "$"))
+        rows.append(sum_share_row)
+
+    table_headers = ["address", "balance"]
+    if config.price:
+        table_headers += ["usd"]
+    print_table(group_name, table_headers, rows)

mm_balance/output/utils.py

@@ -0,0 +1,20 @@
+from decimal import Decimal
+
+from rich.progress import BarColumn, MofNCompleteColumn, Progress, TaskID, TextColumn
+
+
+def format_number(value: Decimal, separator: str, extra: str | None = None) -> str:
+    str_value = f"{value:,}".replace(",", separator)
+    if extra == "$":
+        return "$" + str_value
+    elif extra == "%":
+        return str_value + "%"
+    return str_value
+
+
+def create_progress_bar(disable: bool) -> Progress:
+    return Progress(TextColumn("[progress.description]{task.description}"), BarColumn(), MofNCompleteColumn(), disable=disable)
+
+
+def create_progress_task(progress: Progress, description: str, total: int) -> TaskID:
+    return progress.add_task("[green]" + description, total=total)

mm_balance/result.py

@@ -0,0 +1,131 @@
+from collections import defaultdict
+from dataclasses import dataclass
+from decimal import Decimal
+
+from mm_std import Ok
+
+from mm_balance.config import Config, Group
+from mm_balance.constants import USD_STABLECOINS, Network
+from mm_balance.price import Prices
+from mm_balance.workers import Task, Workers
+
+
+@dataclass
+class Balance:
+    balance: Decimal
+    usd_value: Decimal  # 0 if config.price is False
+
+
+@dataclass
+class AddressBalance:
+    address: str
+    balance: Balance | str  # balance value or error message
+
+
+@dataclass
+class GroupResult:
+    ticker: str
+    network: Network
+    comment: str
+    share: Decimal
+    addresses: list[AddressBalance]
+    balance_sum: Decimal  # sum of all balances in the group
+    usd_sum: Decimal  # sum of all usd values in the group
+    balance_sum_share: Decimal  # sum of all balances in the group multiplied by share
+    usd_sum_share: Decimal  # sum of all usd values in the group multiplied by share
+
+
+@dataclass
+class Total:
+    coin_balances: dict[str, Decimal]
+    coin_usd_values: dict[str, Decimal]
+    portfolio_share: dict[str, Decimal]  # ticker -> usd value % from total usd value
+    stablecoin_sum: Decimal  # sum of usd stablecoins: usdt, usdc, etc..
+    total_usd_sum: Decimal  # sum of all coins in USD
+
+
+@dataclass
+class BalancesResult:
+    groups: list[GroupResult]
+    total: Total
+    total_share: Total
+
+
+def create_balances_result(config: Config, prices: Prices, workers: Workers) -> BalancesResult:
+    groups = []
+    for group_index, group in enumerate(config.groups):
+        tasks = workers.get_group_tasks(group_index, group.network)
+        groups.append(_create_group_result(config, group, tasks, prices))
+
+    total = _create_total(False, groups)
+    total_share = _create_total(True, groups)
+    return BalancesResult(groups=groups, total=total, total_share=total_share)
+
+
+def _create_total(use_share: bool, groups: list[GroupResult]) -> Total:
+    coin_balances: dict[str, Decimal] = defaultdict(Decimal)  # ticker -> balance
+    coin_usd_values: dict[str, Decimal] = defaultdict(Decimal)  # ticker -> usd value
+    portfolio_share: dict[str, Decimal] = defaultdict(Decimal)  # ticker -> usd value % from total usd value
+    total_usd_sum = Decimal(0)
+    stablecoin_sum = Decimal(0)
+
+    for group in groups:
+        balance_value = group.balance_sum_share if use_share else group.balance_sum
+        usd_value = group.usd_sum_share if use_share else group.usd_sum
+        coin_balances[group.ticker] += balance_value
+        coin_usd_values[group.ticker] += usd_value
+        if group.ticker in USD_STABLECOINS:
+            stablecoin_sum += usd_value  # TODO: or balance_value?
+        total_usd_sum += usd_value
+
+    if total_usd_sum > 0:
+        for ticker, usd_value in coin_usd_values.items():
+            if ticker in USD_STABLECOINS:
+                portfolio_share[ticker] = round(stablecoin_sum * 100 / total_usd_sum, 2)
+            else:
+                portfolio_share[ticker] = round(usd_value * 100 / total_usd_sum, 2)
+
+    return Total(
+        coin_balances=coin_balances,
+        coin_usd_values=coin_usd_values,
+        portfolio_share=portfolio_share,
+        stablecoin_sum=stablecoin_sum,
+        total_usd_sum=total_usd_sum,
+    )
+
+
+def _create_group_result(config: Config, group: Group, tasks: list[Task], prices: Prices) -> GroupResult:
+    addresses = []
+    balance_sum = Decimal(0)
+    usd_sum = Decimal(0)
+    for task in tasks:
+        balance: Balance | str
+        if task.balance is None:
+            balance = "balance is None! Something went wrong."
+        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
+        addresses.append(AddressBalance(address=task.wallet_address, balance=balance))
+
+    balance_sum_share = balance_sum * group.share
+    usd_sum_share = usd_sum * group.share
+
+    return GroupResult(
+        ticker=group.ticker,
+        network=group.network,
+        comment=group.comment,
+        share=group.share,
+        addresses=addresses,
+        balance_sum=balance_sum,
+        usd_sum=usd_sum,
+        balance_sum_share=balance_sum_share,
+        usd_sum_share=usd_sum_share,
+    )

mm_balance/{balances.py → workers.py}

@@ -1,41 +1,39 @@
-from __future__ import annotations
-
+from dataclasses import dataclass
 from decimal import Decimal
 
-from mm_std import ConcurrentTasks, Result
-from pydantic import BaseModel
+from mm_std import ConcurrentTasks, PrintFormat, Result
 from rich.progress import TaskID
 
-from mm_balance import output
 from mm_balance.config import Config
 from mm_balance.constants import NETWORK_APTOS, NETWORK_BITCOIN, NETWORK_SOLANA, Network
+from mm_balance.output import utils
 from mm_balance.rpc import aptos, btc, evm, solana
 from mm_balance.token_decimals import TokenDecimals
 
 
-class Balances:
-    class Balance(BaseModel):
-        group_index: int
-        address: str
-        token_address: str | None
-        balance: Result[Decimal] | None = None
+@dataclass
+class Task:
+    group_index: int
+    wallet_address: str
+    token_address: str | None
+    balance: Result[Decimal] | None = None
+
 
+class Workers:
     def __init__(self, config: Config, token_decimals: TokenDecimals):
         self.config = config
         self.token_decimals = token_decimals
-        self.tasks: dict[Network, list[Balances.Balance]] = {network: [] for network in config.networks()}
-        self.progress_bar = output.create_progress_bar()
+        self.tasks: dict[Network, list[Task]] = {network: [] for network in config.networks()}
+        self.progress_bar = utils.create_progress_bar(config.print_format is not PrintFormat.TABLE)
         self.progress_bar_task: dict[Network, TaskID] = {}
 
         for idx, group in enumerate(config.groups):
-            task_list = [Balances.Balance(group_index=idx, address=a, token_address=group.token_address) for a in group.addresses]
+            task_list = [Task(group_index=idx, wallet_address=a, token_address=group.token_address) for a in group.addresses]
             self.tasks[group.network].extend(task_list)
 
         for network in config.networks():
             if self.tasks[network]:
-                self.progress_bar_task[network] = output.create_progress_task(
-                    self.progress_bar, network, len(self.tasks[network])
-                )
+                self.progress_bar_task[network] = utils.create_progress_task(self.progress_bar, network, len(self.tasks[network]))
 
     def process(self) -> None:
         with self.progress_bar:
@@ -44,10 +42,22 @@ class Balances:
                 job.add_task(network, self._process_network, args=(network,))
             job.execute()
 
+    def get_group_tasks(self, group_index: int, network: Network) -> list[Task]:
+        # TODO: can we get network by group_index?
+        return [b for b in self.tasks[network] if b.group_index == group_index]
+
+    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)
+        return result
+
     def _process_network(self, network: Network) -> None:
         job = ConcurrentTasks(max_workers=self.config.workers[network])
         for idx, task in enumerate(self.tasks[network]):
-            job.add_task(str(idx), self._get_balance, args=(network, task.address, task.token_address))
+            job.add_task(str(idx), self._get_balance, args=(network, task.wallet_address, task.token_address))
         job.execute()
         # TODO: print job.exceptions if present
         for idx, _task in enumerate(self.tasks[network]):
@@ -72,15 +82,3 @@ class Balances:
 
         self.progress_bar.update(self.progress_bar_task[network], advance=1)
         return res
-
-    def get_group_balances(self, group_index: int, network: Network) -> list[Balance]:
-        # TODO: can we get network by group_index?
-        return [b for b in self.tasks[network] if b.group_index == group_index]
-
-    def get_errors(self) -> list[Balance]:
-        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)
-        return result

{mm_balance-0.1.14.dist-info → mm_balance-0.1.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mm-balance
-Version: 0.1.14
+Version: 0.1.16
 Requires-Python: >=3.12
 Requires-Dist: mm-aptos==0.1.2
 Requires-Dist: mm-btc==0.1.0

mm_balance-0.1.16.dist-info/RECORD

@@ -0,0 +1,23 @@
+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.16.dist-info/METADATA,sha256=MuArrbQbWKMo5Xx9Auu7YzciGl1oKfjCT1PWnBgyhP0,229
+mm_balance-0.1.16.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+mm_balance-0.1.16.dist-info/entry_points.txt,sha256=rSnP0ZW1a3ACNwTWM7T53CmOycKbzhG43m2_wseENng,50
+mm_balance-0.1.16.dist-info/RECORD,,

{mm_balance-0.1.14.dist-info → mm_balance-0.1.16.dist-info}/WHEEL

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

mm_balance/output.py

@@ -1,109 +0,0 @@
-from decimal import Decimal
-
-from mm_std import Err, Ok, fatal, print_table
-from rich.progress import BarColumn, MofNCompleteColumn, Progress, TaskID, TextColumn
-
-from mm_balance.balances import Balances
-from mm_balance.config import Config, Group
-from mm_balance.price import Prices
-from mm_balance.token_decimals import TokenDecimals
-from mm_balance.total import Total
-from mm_balance.utils import fnumber
-
-
-def print_groups(balances: Balances, config: Config, prices: Prices) -> None:
-    for group_index, group in enumerate(config.groups):
-        group_balances = balances.get_group_balances(group_index, group.network)
-        _print_group(group, group_balances, config, prices)
-
-
-def _print_group(group: Group, group_balances: list[Balances.Balance], config: Config, prices: Prices) -> None:
-    rows = []
-    balance_sum = Decimal(0)
-    usd_sum = Decimal(0)
-    for address_task in group_balances:
-        if isinstance(address_task.balance, Err):
-            row = [address_task.address, address_task.balance.err]
-        elif isinstance(address_task.balance, Ok):
-            balance = address_task.balance.ok
-            balance_sum += balance
-            if config.skip_empty and balance == Decimal(0):
-                continue
-            row = [address_task.address, fnumber(balance, config.format_number_separator)]
-            if config.price:
-                balance_usd = round(balance * prices[group.ticker], config.round_ndigits)
-                usd_sum += balance_usd
-                row.append(fnumber(balance_usd, config.format_number_separator, "$"))
-        else:
-            fatal("address_task is None!")
-        rows.append(row)
-
-    balance_sum_str = fnumber(round(balance_sum, config.round_ndigits), config.format_number_separator)
-    sum_row = ["sum", balance_sum_str]
-    if config.price:
-        usd_sum_str = fnumber(round(usd_sum, config.round_ndigits), config.format_number_separator, "$")
-        sum_row.append(usd_sum_str)
-    rows.append(sum_row)
-
-    if group.share < Decimal(1):
-        sum_share_str = fnumber(round(balance_sum * group.share, config.round_ndigits), config.format_number_separator)
-        sum_share_row = [f"sum_share, {group.share}", sum_share_str]
-        if config.price:
-            usd_sum_share_str = fnumber(round(usd_sum * group.share, config.round_ndigits), config.format_number_separator, "$")
-            sum_share_row.append(usd_sum_share_str)
-        rows.append(sum_share_row)
-
-    table_headers = ["address", "balance"]
-    if config.price:
-        table_headers += ["usd"]
-    print_table(group.name, table_headers, rows)
-
-
-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)
-
-
-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)
-
-
-def print_prices(config: Config, prices: Prices) -> None:
-    if config.price:
-        rows = []
-        for ticker, price in prices.items():
-            rows.append([ticker, fnumber(round(price, config.round_ndigits), config.format_number_separator, "$")])
-        print_table("Prices", ["coin", "usd"], rows)
-
-
-def print_total(config: Config, balances: Balances, prices: Prices) -> None:
-    total = Total.calc(balances, prices, config)
-    total.print()
-
-
-def print_errors(config: Config, balances: Balances) -> None:
-    error_balances = balances.get_errors()
-    if not error_balances:
-        return
-    rows = []
-    for balance in error_balances:
-        group = config.groups[balance.group_index]
-        rows.append([group.ticker + " / " + group.network, balance.address, balance.balance.err])  # type: ignore[union-attr]
-    print_table("Errors", ["coin", "address", "error"], rows)
-
-
-def create_progress_bar() -> Progress:
-    return Progress(
-        TextColumn("[progress.description]{task.description}"),
-        BarColumn(),
-        MofNCompleteColumn(),
-    )
-
-
-def create_progress_task(progress: Progress, description: str, total: int) -> TaskID:
-    return progress.add_task("[green]" + description, total=total)

mm_balance/total.py

@@ -1,122 +0,0 @@
-from collections import defaultdict
-from dataclasses import dataclass
-from decimal import Decimal
-from typing import Self
-
-from mm_std import Ok, PrintFormat, print_table
-
-from mm_balance.balances import Balances
-from mm_balance.config import Config
-from mm_balance.constants import USD_STABLECOINS
-from mm_balance.price import Prices
-from mm_balance.utils import fnumber
-
-
-@dataclass
-class Total:
-    coins: dict[str, Decimal]
-    coins_share: dict[str, Decimal]
-    usd_sum: Decimal  # sum of all coins in USD
-    usd_sum_share: Decimal
-
-    stablecoin_sum: Decimal  # sum of usd stablecoins: usdt, usdc, etc..
-    stablecoin_sum_share: Decimal
-
-    config: Config
-    prices: Prices
-
-    @classmethod
-    def calc(cls, balances: Balances, prices: Prices, config: Config) -> Self:
-        coins: dict[str, Decimal] = defaultdict(Decimal)
-        coins_share: dict[str, Decimal] = defaultdict(Decimal)
-        usd_sum = Decimal(0)
-        usd_sum_share = Decimal(0)
-
-        stablecoin_sum = Decimal(0)
-        stablecoin_sum_share = Decimal(0)
-        for group_index, group in enumerate(config.groups):
-            balance_sum = Decimal(0)
-            for address_task in balances.get_group_balances(group_index, group.network):
-                if isinstance(address_task.balance, Ok):
-                    balance_sum += address_task.balance.ok
-                    if group.ticker in USD_STABLECOINS:
-                        stablecoin_sum += address_task.balance.ok
-                        stablecoin_sum_share += address_task.balance.ok * group.share
-                    if config.price:
-                        balance_usd = round(address_task.balance.ok * prices[group.ticker], config.round_ndigits)
-                        usd_sum += balance_usd
-                        usd_sum_share += group.share * balance_usd
-
-            coins[group.ticker] += balance_sum
-            coins_share[group.ticker] += round(balance_sum * group.share, config.round_ndigits)
-        return cls(
-            coins=coins,
-            coins_share=coins_share,
-            usd_sum=usd_sum,
-            usd_sum_share=usd_sum_share,
-            stablecoin_sum=stablecoin_sum,
-            stablecoin_sum_share=stablecoin_sum_share,
-            config=config,
-            prices=prices,
-        )
-
-    def print(self) -> None:
-        if self.config.print_format == PrintFormat.TABLE:
-            if self.config.price:
-                self._print_total_total_with_price()
-
-                if self.config.has_share():
-                    self._print_share_total_with_price()
-            else:
-                self._print_total_total_without_price()
-
-                if self.config.has_share():
-                    self._print_share_total_without_price()
-
-    def _print_total_total_with_price(self) -> None:
-        if self.config.print_format == PrintFormat.TABLE:
-            rows = []
-            for key, value in self.coins.items():
-                usd_value = round(value * self.prices[key], self.config.round_ndigits)
-                if key in USD_STABLECOINS:
-                    usd_share = round(self.stablecoin_sum * 100 / self.usd_sum, self.config.round_ndigits)
-                else:
-                    usd_share = round(usd_value * 100 / self.usd_sum, self.config.round_ndigits)
-
-                value_str = fnumber(value, self.config.format_number_separator)
-                usd_value_str = fnumber(usd_value, self.config.format_number_separator, "$")
-
-                rows.append([key, value_str, usd_value_str, f"{usd_share}%"])
-
-            rows.append(["stablecoin_sum", fnumber(self.stablecoin_sum, self.config.format_number_separator, "$")])
-            rows.append(["usd_sum", fnumber(self.usd_sum, self.config.format_number_separator, "$")])
-            print_table("Total", ["coin", "balance", "usd", "usd_share"], rows)
-
-    def _print_total_total_without_price(self) -> None:
-        if self.config.print_format == PrintFormat.TABLE:
-            rows = []
-            for key, value in self.coins.items():
-                rows.append([key, fnumber(value, self.config.format_number_separator)])
-            print_table("Total", ["coin", "balance"], rows)
-
-    def _print_share_total_with_price(self) -> None:
-        rows = []
-        for key, _ in self.coins.items():
-            usd_value = round(self.coins_share[key] * self.prices[key], self.config.round_ndigits)
-            if key in USD_STABLECOINS:
-                usd_share = round(self.stablecoin_sum_share * 100 / self.usd_sum_share, self.config.round_ndigits)
-            else:
-                usd_share = round(usd_value * 100 / self.usd_sum_share, self.config.round_ndigits)
-            value = fnumber(self.coins_share[key], self.config.format_number_separator)
-            usd_value_str = fnumber(usd_value, self.config.format_number_separator, "$")
-            rows.append([key, value, usd_value_str, f"{usd_share}%"])
-        rows.append(["stablecoin_sum", fnumber(self.stablecoin_sum_share, self.config.format_number_separator, "$")])
-        rows.append(["usd_sum", fnumber(self.usd_sum_share, self.config.format_number_separator, "$")])
-        print_table("Total, share", ["coin", "balance", "usd", "usd_share"], rows)
-
-    def _print_share_total_without_price(self) -> None:
-        rows = []
-        for key, _ in self.coins.items():
-            value = fnumber(self.coins_share[key], self.config.format_number_separator)
-            rows.append([key, value])
-        print_table("Total, share", ["coin", "balance"], rows)

mm_balance-0.1.14.dist-info/RECORD

@@ -1,20 +0,0 @@
-mm_balance/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_balance/balances.py,sha256=HLIMdhayd59SIjzaYPwJek4PvwGnpTESvUt8SoF1Ktc,3812
-mm_balance/cli.py,sha256=AIIxj7msKD3d5vr6mTT5x-D3-AD7JyU4sxoNCI3Uozk,1887
-mm_balance/config.py,sha256=5qOsU1JjWu2TbH1VgikK4oZpBcuPMqsOe8DOwMRtrWM,5230
-mm_balance/constants.py,sha256=4C2BxYRY_i83Rba5NOXeLLeA0ZTWR9WD6BeyQwiCj_U,2335
-mm_balance/output.py,sha256=ZkYh0gU32OAJIoXz2ExG44ong9mzAgohU9SG3rn3yqg,4281
-mm_balance/price.py,sha256=f6fYhpPVqZE9hH22ypfYb9m-nfE41LeVIvksEvqmz54,1615
-mm_balance/token_decimals.py,sha256=WAz9wbvwjPJEcQnrLyPAf23eGp89t9oP_xBmaEecEG0,2348
-mm_balance/total.py,sha256=FrORCE3_gW9tMh8UCgqLcHK15wQuwOwX3Fp6QhaRrgY,5504
-mm_balance/utils.py,sha256=YjQMfyAaLiiprjt9CuNbDQSJrLbRoTkb2rurAb6bHDc,288
-mm_balance/config/example.yml,sha256=EMWgogMkdxDUkBKDcDStbsCR-fnUD6SFYgCdfl7S2yg,1859
-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.14.dist-info/METADATA,sha256=kZgluU7iJnTzbuLyh-NDAgKOuy0H-5QCzguVia3jQFM,229
-mm_balance-0.1.14.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-mm_balance-0.1.14.dist-info/entry_points.txt,sha256=rSnP0ZW1a3ACNwTWM7T53CmOycKbzhG43m2_wseENng,50
-mm_balance-0.1.14.dist-info/RECORD,,