mm-balance 0.2.0__py3-none-any.whl → 0.2.2__py3-none-any.whl

mm_balance/cli.py

@@ -1,4 +1,5 @@
 import getpass
+import importlib.metadata
 import pathlib
 import pkgutil
 from typing import Annotated
@@ -17,6 +18,12 @@ from mm_balance.workers import Workers
 app = typer.Typer(no_args_is_help=True, pretty_exceptions_enable=False, add_completion=False)
 
 
+def version_callback(value: bool) -> None:
+    if value:
+        typer.echo(f"mm-balance: v{importlib.metadata.version('mm-balance')}")
+        raise typer.Exit
+
+
 def example_callback(value: bool) -> None:
     if value:
         data = pkgutil.get_data(__name__, "config/example.toml")
@@ -43,6 +50,7 @@ def cli(
     _networks: Annotated[
         bool | None, typer.Option("--networks", callback=networks_callback, help="Print supported networks.")
     ] = None,
+    _version: bool = typer.Option(None, "--version", callback=version_callback, is_eager=True),
 ) -> None:
     zip_password = ""  # nosec
     if config_path.name.endswith(".zip"):

mm_balance/config/example.toml

@@ -23,25 +23,25 @@ share = 0.1
 ticker = "ETH"
 network = "ethereum"
 comment = "okx"
-addresses = "okx_eth"
+addresses = "group: okx_eth"
 
 [[coins]]
 ticker = "USDT"
 network = "ethereum"
 comment = "okx"
-addresses = "okx_eth"
+addresses = "group: okx_eth"
 
 [[coins]]
 ticker = "ETH"
 network = "ethereum"
 comment = "binance"
-addresses = "binance_eth"
+addresses = "group: binance_eth"
 
 [[coins]]
 ticker = "USDT"
 network = "ethereum"
 comment = "binance"
-addresses = "binance_eth"
+addresses = "group: binance_eth"
 
 [[coins]]
 ticker = "USDC"
@@ -51,6 +51,7 @@ token_address = "0xf22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b1
 token_decimals = 6
 addresses = "0x48271d39d0b05bd6efca2278f22277d6fcc375504f9839fd73f74ace240861af"
 
+
 [[addresses]]
 name = "okx_eth"
 addresses = """
@@ -76,8 +77,7 @@ print_debug = false
 print_format = "table"  # table, json
 format_number_separator = ","
 proxies = """
-env_url: MM_BALANCE_PROXIES_URL
+# env_url: MM_BALANCE_PROXIES_URL
 # socks5://usr:pass@site.com:1234
 # http://site.com:1234
 """
-

mm_balance/config.py

@@ -43,14 +43,24 @@ class Group(BaseConfig):
         return self
 
     def process_addresses(self, address_groups: list[AddressGroup]) -> None:
-        addresses: list[str] = []
-        for address in self.addresses:
-            if address_group := pydash.find(address_groups, lambda g: g.name == address):  # noqa: B023
-                addresses.extend(address_group.addresses)
+        result = []
+        for line in self.addresses:
+            if line.startswith("file:"):
+                path = Path(line.removeprefix("file:").strip()).expanduser()
+                if path.is_file():
+                    result += path.read_text().strip().splitlines()
+                else:
+                    fatal(f"File with addresses not found: {path}")
+            elif line.startswith("group:"):
+                group_name = line.removeprefix("group:").strip()
+                address_group = next((ag for ag in address_groups if ag.name == group_name), None)
+                if address_group is None:
+                    raise ValueError(f"Address group not found: {group_name}")
+                result += address_group.addresses
             else:
-                # TODO: check address is valid
-                addresses.append(address)
-        self.addresses = pydash.uniq(process_file_addresses(addresses))
+                result.append(line)
+        # TODO: check address is valid. There is network info in the group
+        self.addresses = pydash.uniq(result)
 
 
 class AddressGroup(BaseConfig):
@@ -83,6 +93,12 @@ class Config(BaseConfig):
 
     @model_validator(mode="after")
     def final_validator(self) -> Self:
+        # check all addresses has uniq name
+        address_group_names = [ag.name for ag in self.addresses]
+        non_uniq_names = [name for name in address_group_names if address_group_names.count(name) > 1]
+        if non_uniq_names:
+            raise ValueError("There are non-unique address group names: " + ", ".join(non_uniq_names))
+
         # load addresses from address_group
         for group in self.groups:
             group.process_addresses(self.addresses)
@@ -103,21 +119,3 @@ class Config(BaseConfig):
 def detect_token_address(ticker: str, network: Network) -> str | None:
     if network in TOKEN_ADDRESS:
         return TOKEN_ADDRESS[network].get(ticker)
-
-
-def get_address_group_by_name(address_groups: list[AddressGroup], name: str) -> AddressGroup | None:
-    return pydash.find(address_groups, lambda g: g.name == name)
-
-
-def process_file_addresses(addresses: list[str]) -> list[str]:
-    result = []
-    for address in addresses:
-        if address.startswith("file://"):
-            path = Path(address.removeprefix("file://"))
-            if path.is_file():
-                result.extend(path.read_text().strip().splitlines())
-            else:
-                fatal(f"File with addresses not found: {path}")
-        else:
-            result.append(address)
-    return result

{mm_balance-0.2.0.dist-info → mm_balance-0.2.2.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.4
 Name: mm-balance
-Version: 0.2.0
+Version: 0.2.2
 Requires-Python: >=3.12
 Requires-Dist: mm-aptos==0.2.0
 Requires-Dist: mm-btc==0.3.0
-Requires-Dist: mm-eth==0.3.0
-Requires-Dist: mm-sol==0.3.0
+Requires-Dist: mm-eth==0.3.1
+Requires-Dist: mm-sol==0.3.1
 Requires-Dist: typer>=0.15.1

{mm_balance-0.2.0.dist-info → mm_balance-0.2.2.dist-info}/RECORD

@@ -1,13 +1,13 @@
 mm_balance/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mm_balance/cli.py,sha256=glOveB7bhcmuHBZvKZpmO1iMB1S21E6TnIIwuB25jUo,3398
-mm_balance/config.py,sha256=wuNiy8RBoFhisx4ZvT7CAXDvvz4aU52kr4vXFnXNvGI,4381
+mm_balance/cli.py,sha256=KYEfz1ztFpXAxOWlQMJ0rWGnAdkGkvTgVS53pm6YxCw,3683
+mm_balance/config.py,sha256=3qEg9xGCoH6WX91dlmjXVVhkCjJf8KFOmfqE8NgSc64,4603
 mm_balance/constants.py,sha256=kqG2zuwv0l-PzDHIrMJVQpfQWiXjr2DsqGPcKmqNJLo,2334
 mm_balance/price.py,sha256=DzvcQngS6wgi_4YWoXxGvOuOkwJvUbN0KI8DeIxbB5A,1494
 mm_balance/result.py,sha256=WsVLbf54cCJ76rIM2zHaOCQXMfZZMczdg8rlC2tDGWY,4533
 mm_balance/token_decimals.py,sha256=7XL_x_1ZIhp_cr1TvXwnqLqINUWFGo0j5_5lWuxmwpE,2277
 mm_balance/utils.py,sha256=bngYS2WFIakGZO31_ey4MPsllvDhgOxkAnGiXqom3J4,286
 mm_balance/workers.py,sha256=vEmmUI-ioMOv1C_Jcz0rnzI3vn7BaVWFnyXddteJkoA,3766
-mm_balance/config/example.toml,sha256=RuZQfizuPgX0F9MQdVffDfKrCOJxJE48iPbM9HT96wk,1786
+mm_balance/config/example.toml,sha256=15Bjk_zkbhx9CqFgx1kbb2cRSBY9-kPKrej7N_8ulTk,1816
 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
@@ -18,7 +18,7 @@ mm_balance/rpc/aptos.py,sha256=1JCYCqDim4tk1axXscaAJRXPd4J6vV1ABFbwMbPgrL0,641
 mm_balance/rpc/btc.py,sha256=iGDoO7HXP6reLI0bWm0UhEl7-UFZTo5xCWNzFngbITw,458
 mm_balance/rpc/evm.py,sha256=ewlMmRrcXKlky3DPNbnUBTVwnvyw7N9iCZLsCX2V14w,1007
 mm_balance/rpc/solana.py,sha256=c756415rlhQkHsVsqxHcA7wIaSM64IqyxMohjz8IGhY,1031
-mm_balance-0.2.0.dist-info/METADATA,sha256=eG5IbPKRNnqBK_go58psO14Go5FUAAWWsHE4xBjgyak,225
-mm_balance-0.2.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mm_balance-0.2.0.dist-info/entry_points.txt,sha256=rSnP0ZW1a3ACNwTWM7T53CmOycKbzhG43m2_wseENng,50
-mm_balance-0.2.0.dist-info/RECORD,,
+mm_balance-0.2.2.dist-info/METADATA,sha256=Ck93hoOiO3Jq7kIHym9IN0XYMolvaYw6dGrhm_8II7I,225
+mm_balance-0.2.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mm_balance-0.2.2.dist-info/entry_points.txt,sha256=rSnP0ZW1a3ACNwTWM7T53CmOycKbzhG43m2_wseENng,50
+mm_balance-0.2.2.dist-info/RECORD,,