mm-balance 0.2.4__py3-none-any.whl → 0.3.0__py3-none-any.whl

mm_balance/cli.py

@@ -1,7 +1,7 @@
 import getpass
 import importlib.metadata
-import pathlib
 import pkgutil
+from pathlib import Path
 from typing import Annotated
 
 import typer
@@ -9,6 +9,7 @@ from mm_std import PrintFormat, fatal, pretty_print_toml
 
 from mm_balance.config import Config
 from mm_balance.constants import NETWORKS
+from mm_balance.diff import BalancesDict, Diff
 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
@@ -42,12 +43,16 @@ def networks_callback(value: bool) -> None:
 
 @app.command()
 def cli(
-    config_path: Annotated[pathlib.Path, typer.Argument()],
+    config_path: Annotated[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,
     print_config: Annotated[bool | None, typer.Option("--config", "-c", help="Print config and exit.")] = None,
     price: Annotated[bool | None, typer.Option("--price/--no-price", help="Print prices.")] = None,
+    save_balances_file: Annotated[Path | None, typer.Option("--save-balances-file", help="Save balances file.")] = None,
+    diff_from_balances_file: Annotated[
+        Path | None, typer.Option("--diff-from-balances-file", help="Diff from balances file.")
+    ] = 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.")
@@ -93,6 +98,15 @@ def cli(
     else:
         fatal("Unsupported print format")
 
+    if save_balances_file:
+        BalancesDict.from_balances_result(result).save_to_path(save_balances_file)
+
+    if diff_from_balances_file:
+        old_balances = BalancesDict.from_file(diff_from_balances_file)
+        new_balances = BalancesDict.from_balances_result(result)
+        diff = Diff.calc(old_balances, new_balances)
+        diff.print(config.settings.print_format)
+
 
 if __name__ == "__main__":
     app()

mm_balance/diff.py

@@ -0,0 +1,168 @@
+from __future__ import annotations
+
+import json
+import re
+from decimal import Decimal
+from pathlib import Path
+
+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
+
+
+class BalancesDict(RootModel[dict[str, dict[str, dict[str, Decimal]]]]):  # network->ticker->address->balance
+    def networks(self) -> set[str]:
+        return set(self.model_dump().keys())
+
+    def tickers(self, network: str) -> set[str]:
+        return set(self.model_dump()[network].keys())
+
+    def save_to_path(self, balances_file: Path) -> None:
+        json.dump(self.model_dump(), balances_file.open("w"), default=str, indent=2)
+
+    @staticmethod
+    def from_balances_result(result: BalancesResult) -> BalancesDict:
+        data: dict[str, dict[str, dict[str, Decimal]]] = {}  # network->ticker->address->balance
+        for group in result.groups:
+            if group.network not in data:
+                data[group.network] = {}
+            if group.ticker not in data[group.network]:
+                data[group.network][group.ticker] = {}
+            for address in group.addresses:
+                if isinstance(address.balance, Balance):
+                    data[group.network][group.ticker][address.address] = address.balance.balance
+        return BalancesDict(data)
+
+    @staticmethod
+    def from_file(path: Path) -> BalancesDict:
+        return BalancesDict(json.load(path.open("r")))
+
+
+class Diff(BaseModel):
+    network_added: list[str]
+    network_removed: list[str]
+
+    ticker_added: dict[str, list[str]]  # network -> tickers
+    ticker_removed: dict[str, list[str]]  # network -> tickers
+
+    address_added: dict[str, dict[str, list[str]]]  # network -> ticker -> addresses
+    address_removed: dict[str, dict[str, list[str]]]  # network -> ticker -> addresses
+
+    balance_changed: dict[str, dict[str, dict[str, tuple[Decimal, Decimal]]]]  # network->ticker->address->(old_value,new_value)
+
+    def print(self, print_format: PrintFormat) -> None:
+        match print_format:
+            case PrintFormat.TABLE:
+                self._print_table()
+            case PrintFormat.JSON:
+                self._print_json()
+            case _:
+                raise ValueError(f"Unsupported print format: {print_format}")
+
+    def _print_table(self) -> None:
+        if (
+            not self.network_added
+            and not self.network_removed
+            and not self.ticker_added
+            and not self.ticker_removed
+            and not self.address_added
+            and not self.address_removed
+            and not self.balance_changed
+        ):
+            print_plain("Diff: no changes")
+            return
+
+        print_plain("\nDiff")
+
+        if self.network_added:
+            print_plain(f"networks added: {self.network_added}")
+        if self.network_removed:
+            print_plain(f"networks removed: {self.network_removed}")
+        if self.ticker_added:
+            print_plain(f"tickers added: {self.ticker_added}")
+        if self.ticker_removed:
+            print_plain(f"tickers removed: {self.ticker_removed}")
+        if self.address_added:
+            print_plain(f"addresses added: {self.address_added}")
+        if self.address_removed:
+            print_plain(f"addresses removed: {self.address_removed}")
+
+        if self.balance_changed:
+            rows = []
+            for network in self.balance_changed:
+                for ticker in self.balance_changed[network]:
+                    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)
+
+    def _print_json(self) -> None:
+        print_json(data=self.model_dump(), default_serializer=str)
+
+    @staticmethod
+    def calc(balances1: BalancesDict, balances2: BalancesDict) -> Diff:
+        dd = DeepDiff(balances1.model_dump(), balances2.model_dump(), ignore_order=True)
+        # Initialize empty collections for Diff fields.
+
+        network_added = []
+        network_removed = []
+        ticker_added: dict[str, list[str]] = {}
+        ticker_removed: dict[str, list[str]] = {}
+        address_added: dict[str, dict[str, list[str]]] = {}
+        address_removed: dict[str, dict[str, list[str]]] = {}
+        balance_changed: dict[str, dict[str, dict[str, tuple[Decimal, Decimal]]]] = {}
+
+        # Helper to extract keys from DeepDiff paths.
+        def extract_keys(path: str) -> list[str]:
+            # DeepDiff paths look like "root['network']['ticker']['address']"
+            return re.findall(r"\['([^']+)'\]", path)
+
+        # Process dictionary_item_added
+        for path in dd.get("dictionary_item_added", []):
+            keys = extract_keys(path)
+            if len(keys) == 1:
+                # New network added.
+                network_added.append(keys[0])
+            elif len(keys) == 2:
+                # New ticker added under an existing network.
+                network, ticker = keys
+                ticker_added.setdefault(network, []).append(ticker)
+            elif len(keys) == 3:
+                # New address added under an existing network and ticker.
+                network, ticker, address = keys
+                address_added.setdefault(network, {}).setdefault(ticker, []).append(address)
+
+        # Process dictionary_item_removed
+        for path in dd.get("dictionary_item_removed", []):
+            keys = extract_keys(path)
+            if len(keys) == 1:
+                network_removed.append(keys[0])
+            elif len(keys) == 2:
+                network, ticker = keys
+                ticker_removed.setdefault(network, []).append(ticker)
+            elif len(keys) == 3:
+                network, ticker, address = keys
+                address_removed.setdefault(network, {}).setdefault(ticker, []).append(address)
+
+        # Process values_changed for balance differences.
+        for path, change in dd.get("values_changed", {}).items():
+            keys = extract_keys(path)
+            if len(keys) != 3:
+                continue
+            network, ticker, address = keys
+            balance_changed.setdefault(network, {}).setdefault(ticker, {})[address] = (
+                Decimal(change["old_value"]),
+                Decimal(change["new_value"]),
+            )
+
+        return Diff(
+            network_added=sorted(network_added),
+            network_removed=sorted(network_removed),
+            ticker_added={k: sorted(v) for k, v in ticker_added.items()},
+            ticker_removed={k: sorted(v) for k, v in ticker_removed.items()},
+            address_added={k: {tk: sorted(vv) for tk, vv in v.items()} for k, v in address_added.items()},
+            address_removed={k: {tk: sorted(vv) for tk, vv in v.items()} for k, v in address_removed.items()},
+            balance_changed=balance_changed,
+        )

mm_balance/result.py

@@ -63,6 +63,19 @@ def create_balances_result(config: Config, prices: Prices, workers: Workers) ->
     return BalancesResult(groups=groups, total=total, total_share=total_share)
 
 
+# def save_balances_file(result: BalancesResult, balances_file: Path) -> None:
+#     data = {}
+#     for group in result.groups:
+#         if group.network not in data:
+#             data[group.network] = {}
+#         if group.ticker not in data[group.network]:
+#             data[group.network][group.ticker] = {}
+#         for address in group.addresses:
+#             if isinstance(address.balance, Balance):
+#                 data[group.network][group.ticker][address.address] = float(address.balance.balance)
+#     json.dump(data, balances_file.open("w"), indent=2)
+
+
 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

{mm_balance-0.2.4.dist-info → mm_balance-0.3.0.dist-info}/METADATA

@@ -1,9 +1,10 @@
 Metadata-Version: 2.4
 Name: mm-balance
-Version: 0.2.4
+Version: 0.3.0
 Requires-Python: >=3.12
+Requires-Dist: deepdiff==8.2.0
 Requires-Dist: mm-aptos==0.2.0
 Requires-Dist: mm-btc==0.3.0
 Requires-Dist: mm-eth==0.5.3
 Requires-Dist: mm-sol==0.5.1
-Requires-Dist: typer>=0.15.1
+Requires-Dist: typer==0.15.1

{mm_balance-0.2.4.dist-info → mm_balance-0.3.0.dist-info}/RECORD

@@ -1,9 +1,10 @@
 mm_balance/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_balance/cli.py,sha256=AHaD6w97H8ru8nnQv2dcqh9v-d9BVirnlsClbLyHf6M,3796
+mm_balance/cli.py,sha256=nRDVejN-dnr1iRezBxNk4z0oLa59tiwzIVhgeOGzvbo,4498
 mm_balance/config.py,sha256=gywHNWEQL1xeG778cuca5aBoXElLIfoGle3xxW6m_0U,4564
 mm_balance/constants.py,sha256=kqG2zuwv0l-PzDHIrMJVQpfQWiXjr2DsqGPcKmqNJLo,2334
+mm_balance/diff.py,sha256=GPRbykty2TIBBM8jpYXOV9Itjyd_mz0BTUsQ8KX7cNo,7099
 mm_balance/price.py,sha256=DzvcQngS6wgi_4YWoXxGvOuOkwJvUbN0KI8DeIxbB5A,1494
-mm_balance/result.py,sha256=2bgK4PqS_uFGkYMj6LBiMRh6jRtzsKIkB5csZo0mAEQ,4584
+mm_balance/result.py,sha256=-Ebq07JMLcQAmRs82cA6aYMbsT1qbZSyAOixr9K_wbg,5157
 mm_balance/token_decimals.py,sha256=N3YppB2F3J_OuNkawpAHLVD-4MRCoVjBI01_OoRg5sY,2201
 mm_balance/utils.py,sha256=_UMX3TV350Sr222tAnxGUf0R5McpwloNTQC-U-xiuHc,636
 mm_balance/workers.py,sha256=eg0Ve1xVu3Kd_thfVmPsp6tEdJsYYvs1ipXiu5rKItY,3758
@@ -18,7 +19,7 @@ mm_balance/rpc/aptos.py,sha256=1JCYCqDim4tk1axXscaAJRXPd4J6vV1ABFbwMbPgrL0,641
 mm_balance/rpc/btc.py,sha256=wBMxUjbqdQipVsTFVkj4tk7loErA2czLVfvG8vjFLeE,493
 mm_balance/rpc/evm.py,sha256=LaU2csGL-VlQauCiTX_WFnstvTyZLMP5gDw2LyV53m8,1048
 mm_balance/rpc/solana.py,sha256=10rJ4eEr9sfEfhXx-X2R7bdJ5dL7bVMwHHfJ4R3QR7U,1071
-mm_balance-0.2.4.dist-info/METADATA,sha256=Qw5u6BzDKrcp7ZvP55NIWQx_PjpNVWuZt4wCsenugaM,225
-mm_balance-0.2.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mm_balance-0.2.4.dist-info/entry_points.txt,sha256=rSnP0ZW1a3ACNwTWM7T53CmOycKbzhG43m2_wseENng,50
-mm_balance-0.2.4.dist-info/RECORD,,
+mm_balance-0.3.0.dist-info/METADATA,sha256=Owy1HtXoCk7RhiqeEwijv80KKLuDBHbgQdHOrjAxvEs,256
+mm_balance-0.3.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mm_balance-0.3.0.dist-info/entry_points.txt,sha256=rSnP0ZW1a3ACNwTWM7T53CmOycKbzhG43m2_wseENng,50
+mm_balance-0.3.0.dist-info/RECORD,,