mm-balance 0.1.7__py3-none-any.whl → 0.1.9__py3-none-any.whl

mm_balance/balances.py

@@ -4,9 +4,11 @@ from decimal import Decimal
 
 from mm_std import ConcurrentTasks, Result
 from pydantic import BaseModel
+from rich.progress import Progress, TaskID
 
-from mm_balance import btc, eth, solana
+from mm_balance import output
 from mm_balance.config import Config
+from mm_balance.rpc import btc, eth, solana
 from mm_balance.types import Network
 
 
@@ -47,32 +49,37 @@ class Balances(BaseModel):
         return [b for b in network_balances if b.group_index == group_index]
 
     def process(self) -> None:
-        job = ConcurrentTasks()
-        job.add_task("btc", self._process_btc)
-        job.add_task("eth", self._process_eth)
-        job.add_task("sol", self._process_sol)
-        job.execute()
+        progress = output.create_progress_bar()
+        task_btc = output.create_progress_task(progress, "btc", len(self.btc))
+        task_eth = output.create_progress_task(progress, "eth", len(self.eth))
+        task_sol = output.create_progress_task(progress, "sol", len(self.sol))
+        with progress:
+            job = ConcurrentTasks()
+            job.add_task("btc", self._process_btc, args=(progress, task_btc))
+            job.add_task("eth", self._process_eth, args=(progress, task_eth))
+            job.add_task("sol", self._process_sol, args=(progress, task_sol))
+            job.execute()
 
-    def _process_btc(self) -> None:
+    def _process_btc(self, progress: Progress, task_id: TaskID) -> None:
         job = ConcurrentTasks(max_workers=self.config.workers.btc)
         for idx, task in enumerate(self.btc):
-            job.add_task(str(idx), btc.get_balance, args=(task.address, self.config))
+            job.add_task(str(idx), btc.get_balance, args=(task.address, self.config, progress, task_id))
         job.execute()
         for idx, _task in enumerate(self.btc):
             self.btc[idx].balance = job.result.get(str(idx))  # type: ignore[assignment]
 
-    def _process_eth(self) -> None:
+    def _process_eth(self, progress: Progress, task_id: TaskID) -> None:
         job = ConcurrentTasks(max_workers=self.config.workers.eth)
         for idx, task in enumerate(self.eth):
-            job.add_task(str(idx), eth.get_balance, args=(task.address, task.token_address, self.config))
+            job.add_task(str(idx), eth.get_balance, args=(task.address, task.token_address, self.config, progress, task_id))
         job.execute()
         for idx, _task in enumerate(self.eth):
             self.eth[idx].balance = job.result.get(str(idx))  # type: ignore[assignment]
 
-    def _process_sol(self) -> None:
+    def _process_sol(self, progress: Progress, task_id: TaskID) -> None:
         job = ConcurrentTasks(max_workers=self.config.workers.sol)
         for idx, task in enumerate(self.sol):
-            job.add_task(str(idx), solana.get_balance, args=(task.address, self.config))
+            job.add_task(str(idx), solana.get_balance, args=(task.address, self.config, progress, task_id))
         job.execute()
         for idx, _task in enumerate(self.sol):
             self.sol[idx].balance = job.result.get(str(idx))  # type: ignore[assignment]

mm_balance/cli.py

@@ -34,8 +34,8 @@ def cli(
     balances = Balances.from_config(config)
     balances.process()
 
-    output.print_groups(balances, config, prices)
     output.print_prices(config, prices)
+    output.print_groups(balances, config, prices)
     output.print_total(config, balances, prices)
 
 

mm_balance/config.py

@@ -98,7 +98,7 @@ class Config(BaseConfig):
     def sol_groups(self) -> list[Group]:
         return [g for g in self.groups if g.network == Network.SOL]
 
-    def has_sum_share(self) -> bool:
+    def has_share(self) -> bool:
         return any(g.share != Decimal(1) for g in self.groups)
 
     @model_validator(mode="after")
@@ -122,7 +122,7 @@ class Config(BaseConfig):
         # load token decimals
         for group in self.groups:
             if group.network == Network.ETH and group.token_address is not None:
-                from mm_balance import eth
+                from mm_balance.rpc import eth
 
                 decimals_res = eth.get_token_decimals(group.token_address, self)
                 if isinstance(decimals_res, Err):

mm_balance/output.py

@@ -1,6 +1,7 @@
 from decimal import Decimal
 
 from mm_std import Ok, print_table
+from rich.progress import BarColumn, MofNCompleteColumn, Progress, TaskID, TextColumn
 
 from mm_balance.balances import Balances
 from mm_balance.config import Config
@@ -25,18 +26,18 @@ def _print_group(group: Config.Group, group_balances: list[Balances.Balance], co
             if config.price:
                 balance_usd = round(address_task.balance.ok * prices[group.coin], config.round_ndigits)
                 usd_sum += balance_usd
-                row.append(balance_usd)
+                row.append(f"${balance_usd}")
         rows.append(row)
 
     sum_row = ["sum", round(balance_sum, config.round_ndigits)]
     if config.price:
-        sum_row.append(round(usd_sum, config.round_ndigits))
+        sum_row.append(f"${round(usd_sum, config.round_ndigits)}")
     rows.append(sum_row)
 
     if group.share < Decimal(1):
         sum_share_row = [f"sum_share, {group.share}", round(balance_sum * group.share, config.round_ndigits)]
         if config.price:
-            sum_share_row.append(round(usd_sum * group.share, config.round_ndigits))
+            sum_share_row.append(f"${round(usd_sum * group.share, config.round_ndigits)}")
         rows.append(sum_share_row)
 
     table_headers = ["address", "balance"]
@@ -48,9 +49,21 @@ def _print_group(group: Config.Group, group_balances: list[Balances.Balance], co
 def print_prices(config: Config, prices: Prices) -> None:
     if config.price:
         rows = [[k, round(v, config.round_ndigits)] for (k, v) in prices.items()]
-        print_table("price", ["coin", "usd"], rows)
+        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 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/price.py

@@ -5,6 +5,7 @@ import pydash
 from mm_std import Err, Ok, Result, fatal, hr
 from mm_std.random_ import random_str_choice
 
+from mm_balance import output
 from mm_balance.config import Config
 from mm_balance.types import EthTokenAddress, Network
 
@@ -20,17 +21,25 @@ class Prices(dict[str, Decimal]):
 
 def get_prices(config: Config) -> Prices:
     result = Prices()
-    for group in config.groups:
-        if group.coin in result:
-            continue
-
-        coingecko_id = get_coingecko_id(group)
-        res = get_asset_price(coingecko_id, config.proxies)
-        if isinstance(res, Ok):
-            result[group.coin] = res.ok
-        else:
-            fatal(res.err)
-            # raise ValueError(res.err)
+    coins_total = len(pydash.uniq([group.coin for group in config.groups]))
+
+    progress = output.create_progress_bar()
+
+    with progress:
+        task_id = output.create_progress_task(progress, "prices", total=coins_total)
+
+        for group in config.groups:
+            if group.coin in result:
+                continue
+
+            coingecko_id = get_coingecko_id(group)
+            res = get_asset_price(coingecko_id, config.proxies)
+            if isinstance(res, Ok):
+                result[group.coin] = res.ok
+                progress.update(task_id, advance=1)
+            else:
+                fatal(res.err)
+                # raise ValueError(res.err)
 
     return result
 

mm_balance/{btc.py → rpc/btc.py}

@@ -2,15 +2,19 @@ from decimal import Decimal
 
 from mm_btc.blockstream import BlockstreamClient
 from mm_std import Ok, Result
+from rich.progress import Progress, TaskID
 
 from mm_balance.config import Config
 
 
-def get_balance(address: str, config: Config) -> Result[Decimal]:
-    return (
+def get_balance(address: str, config: Config, progress: Progress | None = None, task_id: TaskID | None = None) -> Result[Decimal]:
+    res: Result[Decimal] = (
         BlockstreamClient(proxies=config.proxies, attempts=3)
         .get_confirmed_balance(address)
         .and_then(
             lambda b: Ok(round(Decimal(b / 100_000_000), config.round_ndigits)),
         )
     )
+    if task_id is not None and progress is not None:
+        progress.update(task_id, advance=1)
+    return res

mm_balance/{eth.py → rpc/eth.py}

@@ -2,14 +2,19 @@ from decimal import Decimal
 
 from mm_eth import erc20, rpc
 from mm_std import Ok, Result
+from rich.progress import Progress, TaskID
 
 from mm_balance.config import Config
 from mm_balance.types import Network
 
 
-def get_balance(address: str, token_address: str | None, config: Config) -> Result[Decimal]:
+def get_balance(
+    address: str, token_address: str | None, config: Config, progress: Progress | None = None, task_id: TaskID | None = None
+) -> Result[Decimal]:
+    res: Result[Decimal]
+
     if token_address is not None:
-        return erc20.get_balance(
+        res = erc20.get_balance(
             config.nodes[Network.ETH],
             token_address,
             address,
@@ -20,10 +25,14 @@ def get_balance(address: str, token_address: str | None, config: Config) -> Resu
             lambda b: Ok(round(Decimal(b / 10 ** config.token_decimals.eth[token_address]), config.round_ndigits)),
         )
     else:
-        return rpc.eth_get_balance(config.nodes[Network.ETH], address, proxies=config.proxies, attempts=5, timeout=10).and_then(
+        res = rpc.eth_get_balance(config.nodes[Network.ETH], address, proxies=config.proxies, attempts=5, timeout=10).and_then(
             lambda b: Ok(round(Decimal(b / 10**18), config.round_ndigits)),
         )
 
+    if task_id is not None and progress is not None:
+        progress.update(task_id, advance=1)
+    return res
+
 
 def get_token_decimals(token_address: str, config: Config) -> Result[int]:
     return erc20.get_decimals(config.nodes[Network.ETH], token_address, timeout=10, proxies=config.proxies, attempts=5)

mm_balance/rpc/solana.py

@@ -0,0 +1,19 @@
+from decimal import Decimal
+
+from mm_solana.balance import sol_balance
+from mm_std import Ok, Result
+from rich.progress import Progress, TaskID
+
+from mm_balance.config import Config
+from mm_balance.types import Network
+
+
+def get_balance(address: str, config: Config, progress: Progress | None = None, task_id: TaskID | None = None) -> Result[Decimal]:
+    res: Result[Decimal] = sol_balance(
+        address=address, nodes=config.nodes[Network.SOL], proxies=config.proxies, attempts=5, timeout=10
+    ).and_then(
+        lambda b: Ok(round(Decimal(b / 1_000_000_000), config.round_ndigits)),
+    )
+    if task_id is not None and progress is not None:
+        progress.update(task_id, advance=1)
+    return res

mm_balance/total.py

@@ -67,10 +67,14 @@ class Total:
         if self.config.print_format == PrintFormat.TABLE:
             if self.config.price:
                 self._print_total_total_with_price()
-                self._print_share_total_with_price()
+
+                if self.config.has_share():
+                    self._print_share_total_with_price()
             else:
                 self._print_total_total_without_price()
-                self._print_share_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:
@@ -81,16 +85,16 @@ class Total:
                     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)
-                rows.append([key, value, usd_value, usd_share])
-            rows.append(["usd_sum", self.usd_sum])
-            print_table("total", ["coin", "balance", "usd", "usd_share"], rows)
+                rows.append([key, value, f"${usd_value}", f"{usd_share}%"])
+            rows.append(["usd_sum", f"${self.usd_sum}"])
+            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, value])
-            print_table("total", ["coin", "balance"], rows)
+            print_table("Total", ["coin", "balance"], rows)
 
     def _print_share_total_with_price(self) -> None:
         rows = []
@@ -100,12 +104,12 @@ class Total:
                 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)
-            rows.append([key, self.coins_share[key], usd_value, usd_share])
-        rows.append(["usd_sum", self.usd_sum_share])
-        print_table("total / share", ["coin", "balance", "usd", "usd_share"], rows)
+            rows.append([key, self.coins_share[key], f"${usd_value}", f"{usd_share}%"])
+        rows.append(["usd_sum", f"${self.usd_sum_share}"])
+        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():
             rows.append([key, self.coins_share[key]])
-        print_table("total / share", ["coin", "balance"], rows)
+        print_table("Total, share", ["coin", "balance"], rows)

{mm_balance-0.1.7.dist-info → mm_balance-0.1.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mm-balance
-Version: 0.1.7
+Version: 0.1.9
 Requires-Python: >=3.12
 Requires-Dist: mm-btc==0.1.0
 Requires-Dist: mm-eth==0.1.3

mm_balance-0.1.9.dist-info/RECORD

@@ -0,0 +1,17 @@
+mm_balance/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mm_balance/balances.py,sha256=lagu1y8OosgOPnMnp7DpY1vZmaarQZZABvvM3fK8Zjw,4053
+mm_balance/cli.py,sha256=VpiNJdwels7qWuklpV7kNEYm0lhsN4NJ7yENIsQLdK8,1250
+mm_balance/config.py,sha256=WH1YjOJxofv2jgklupd7sCzgz2nZtHDYCYhoSaZTHl0,5918
+mm_balance/output.py,sha256=Sb0pccEBNOCR9fuMigO9GJcyTNw9XPRZXTg8iznJKFQ,2568
+mm_balance/price.py,sha256=KyMx1T57SczKbYmbghpGty9BrPebrZdjBW0_BaabKDk,2926
+mm_balance/total.py,sha256=gdH9BzFgc-akVVrsCJ6NqN6cIS9mkEfp-TTKcn01I0U,4944
+mm_balance/types.py,sha256=8TflwL3KJ8HQW31qa8xrh-gyJT232lN1XznuNnIR6zM,662
+mm_balance/config/example.yml,sha256=6_S0hBdh7gMyO1ZPTGxmL21bBSzzmXuJHB0eWqKGueU,1225
+mm_balance/rpc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+mm_balance/rpc/btc.py,sha256=OozGSF8CzR13jxTYjvBqkC8d0pdKkyEHxM7e7M_WbV0,681
+mm_balance/rpc/eth.py,sha256=yx31pwjvlu6MJUuWxtZtiK1vQvIkfMFwu5cNKaz1Yks,1317
+mm_balance/rpc/solana.py,sha256=tL51r_T1hNUDSB8vdjp9QB4ToLjd6yRLXE1RW0-eauw,710
+mm_balance-0.1.9.dist-info/METADATA,sha256=evs4MY6DDuZgIJKPbuVSqG87m7AguX5ExfdABT1gnk0,197
+mm_balance-0.1.9.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+mm_balance-0.1.9.dist-info/entry_points.txt,sha256=rSnP0ZW1a3ACNwTWM7T53CmOycKbzhG43m2_wseENng,50
+mm_balance-0.1.9.dist-info/RECORD,,

mm_balance/solana.py

@@ -1,13 +0,0 @@
-from decimal import Decimal
-
-from mm_solana.balance import sol_balance
-from mm_std import Ok, Result
-
-from mm_balance.config import Config
-from mm_balance.types import Network
-
-
-def get_balance(address: str, config: Config) -> Result[Decimal]:
-    return sol_balance(address=address, nodes=config.nodes[Network.SOL], proxies=config.proxies, attempts=5, timeout=10).and_then(
-        lambda b: Ok(round(Decimal(b / 1_000_000_000), config.round_ndigits)),
-    )

mm_balance-0.1.7.dist-info/RECORD

@@ -1,16 +0,0 @@
-mm_balance/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_balance/balances.py,sha256=UGhJBecq-2CfNYdXE2EWjDcKkfPG30MERawOtWq5D5E,3399
-mm_balance/btc.py,sha256=h8hjcRk6BM0JwhAnB_V39wzeRO94s_hsOlzG7XpE9nk,445
-mm_balance/cli.py,sha256=GaxqhQ-uPguZRKieNGrIPoye8VZKAqg6-nbOExqtG9g,1250
-mm_balance/config.py,sha256=oeA5Oaru6pumzNws287dXvvj7CmOMQAjjqiRpYCb5PE,5918
-mm_balance/eth.py,sha256=wFpbqo4wHupTeMc9ybCPUkBBaJWxiWCBYJO3LvvU39s,1066
-mm_balance/output.py,sha256=j-kxENWcYEtv56UvEl_uKDF-92ALPZPJkvXqYmlBojs,2125
-mm_balance/price.py,sha256=xKwF0bWySfnryDYxsPTd2c8C82mrm1TXxIRzRmu_0MA,2577
-mm_balance/solana.py,sha256=tK1JHGo9ioIz-jXZ9pRDbACjQh_3vhgqFx1wZKVot6M,460
-mm_balance/total.py,sha256=RLwE_WrlO4TMftscoVuBHATmHXeV08IAukaU76wB75U,4812
-mm_balance/types.py,sha256=8TflwL3KJ8HQW31qa8xrh-gyJT232lN1XznuNnIR6zM,662
-mm_balance/config/example.yml,sha256=6_S0hBdh7gMyO1ZPTGxmL21bBSzzmXuJHB0eWqKGueU,1225
-mm_balance-0.1.7.dist-info/METADATA,sha256=WJLGieTEgyhR3azJl1ifA_hNdOuMnqGZSPAr3FoVlGM,197
-mm_balance-0.1.7.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-mm_balance-0.1.7.dist-info/entry_points.txt,sha256=rSnP0ZW1a3ACNwTWM7T53CmOycKbzhG43m2_wseENng,50
-mm_balance-0.1.7.dist-info/RECORD,,