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

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")

mm_balance/output.py

@@ -25,18 +25,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,7 +48,7 @@ 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:

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.8.dist-info}/METADATA

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

{mm_balance-0.1.7.dist-info → mm_balance-0.1.8.dist-info}/RECORD

@@ -1,16 +1,16 @@
 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/cli.py,sha256=VpiNJdwels7qWuklpV7kNEYm0lhsN4NJ7yENIsQLdK8,1250
+mm_balance/config.py,sha256=VGw8f9oQbu5qUJD5lcMnd6kKtXzyX5-CEqcRNd8mgVo,5914
 mm_balance/eth.py,sha256=wFpbqo4wHupTeMc9ybCPUkBBaJWxiWCBYJO3LvvU39s,1066
-mm_balance/output.py,sha256=j-kxENWcYEtv56UvEl_uKDF-92ALPZPJkvXqYmlBojs,2125
+mm_balance/output.py,sha256=hCLq-hynO0c_MJrKSzOoY0p8yFGDZOb5_mE_pqGaBrc,2144
 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/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-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,,
+mm_balance-0.1.8.dist-info/METADATA,sha256=3fUpPe2SujgWG7zghwkJAkXOMDY0g4EYIP7KOChheUs,197
+mm_balance-0.1.8.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+mm_balance-0.1.8.dist-info/entry_points.txt,sha256=rSnP0ZW1a3ACNwTWM7T53CmOycKbzhG43m2_wseENng,50
+mm_balance-0.1.8.dist-info/RECORD,,