dao-treasury 0.0.59__cp312-cp312-win_amd64.whl → 0.0.66__cp312-cp312-win_amd64.whl

dao_treasury/_docker.py

@@ -14,17 +14,17 @@ This is the main entry for all Docker-based orchestration.
 """
 
 import logging
-from importlib import resources
-import subprocess
 from functools import wraps
-from typing import Any, Callable, Coroutine, Final, Iterable, Tuple, TypeVar, List
+from importlib import resources
+from typing import Any, Callable, Coroutine, Final, Literal, Tuple, TypeVar, List
 
 import eth_portfolio_scripts.docker
+from eth_portfolio_scripts.docker import docker_compose
 from typing_extensions import ParamSpec
 
 logger: Final = logging.getLogger(__name__)
 
-compose_file: Final = str(
+COMPOSE_FILE: Final = str(
     resources.files("dao_treasury").joinpath("docker-compose.yaml")
 )
 """The path of dao-treasury's docker-compose.yaml file on your machine"""
@@ -55,7 +55,7 @@ def up(*services: str) -> None:
     # eth-portfolio containers must be started first so dao-treasury can attach to the eth-portfolio docker network
     eth_portfolio_scripts.docker.up("victoria-metrics")
     build(*services)
-    print(f"starting the {', '.join(services) if services else 'grafana'} container(s)")
+    _print_notice("starting", services)
     _exec_command(["up", "-d", *services])
 
 
@@ -72,6 +72,7 @@ def down() -> None:
     See Also:
         :func:`up`
     """
+    print("stopping all dao-treasury containers")
     _exec_command(["down"])
 
 
@@ -90,10 +91,24 @@ def build(*services: str) -> None:
         :func:`up`
         :func:`_exec_command`
     """
-    print("building the grafana containers")
+    _print_notice("building", services)
     _exec_command(["build", *services])
 
 
+def _print_notice(
+    doing: Literal["building", "starting"], services: Tuple[str, ...]
+) -> None:
+    if len(services) == 1:
+        container = services[0]
+        print(f"{doing} the {container} container")
+    elif len(services) == 2:
+        first, second = services
+        print(f"{doing} the {first} and {second} containers")
+    else:
+        *all_but_last, last = services
+        print(f"{doing} the {', '.join(all_but_last)}, and {last} containers")
+
+
 _P = ParamSpec("_P")
 _T = TypeVar("_T")
 
@@ -174,17 +189,6 @@ def _exec_command(command: List[str], *, compose_options: Tuple[str, ...] = ())
     See Also:
         :func:`check_system`
     """
-    eth_portfolio_scripts.docker.check_system()
-    try:
-        subprocess.check_output(
-            ["docker", "compose", *compose_options, "-f", compose_file, *command]
-        )
-    except (subprocess.CalledProcessError, FileNotFoundError) as e:
-        try:
-            subprocess.check_output(
-                ["docker-compose", *compose_options, "-f", compose_file, *command]
-            )
-        except (subprocess.CalledProcessError, FileNotFoundError) as _e:
-            raise RuntimeError(
-                f"Error occurred while running {' '.join(command)}: {_e}"
-            ) from _e
+    docker_compose._exec_command(
+        command, compose_file=COMPOSE_FILE, compose_options=compose_options
+    )

dao_treasury/db.py

@@ -18,6 +18,7 @@ and creating SQL views for reporting.
 
 import typing
 from asyncio import Semaphore
+from collections import OrderedDict
 from decimal import Decimal, InvalidOperation
 from functools import lru_cache
 from logging import getLogger
@@ -75,6 +76,9 @@ from dao_treasury.constants import CHAINID
 from dao_treasury.types import TxGroupDbid, TxGroupName
 
 
+EventItem = _EventItem[_EventItem[OrderedDict[str, Any]]]
+
+
 SQLITE_DIR = Path(path.expanduser("~")) / ".dao-treasury"
 """Path to the directory in the user's home where the DAO treasury SQLite database is stored."""
 
@@ -250,6 +254,10 @@ class Address(DbEntity):
     def contract(self) -> Contract:
         return Contract(self.address)
 
+    @property
+    def contract_coro(self) -> Coroutine[Any, Any, Contract]:
+        return Contract.coroutine(self.address)
+
     @staticmethod
     @lru_cache(maxsize=None)
     def get_dbid(address: HexAddress) -> int:
@@ -420,6 +428,10 @@ class Token(DbEntity):
     def contract(self) -> Contract:
         return Contract(self.address.address)
 
+    @property
+    def contract_coro(self) -> Coroutine[Any, Any, Contract]:
+        return Contract.coroutine(self.address.address)
+
     @property
     def scale(self) -> int:
         """Base for division according to `decimals`, e.g., `10**decimals`.
@@ -734,6 +746,10 @@ class TreasuryTx(DbEntity):
         """Human-readable label for the sender address."""
         return self.from_address.nickname or self.from_address.address  # type: ignore [union-attr]
 
+    @property
+    def token_address(self) -> ChecksumAddress:
+        return self.token.address.address
+
     @property
     def symbol(self) -> str:
         """Ticker symbol for the transferred token."""
@@ -755,10 +771,10 @@ class TreasuryTx(DbEntity):
     @overload
     def get_events(
         self, event_name: str, sync: Literal[False]
-    ) -> Coroutine[Any, Any, _EventItem]: ...
+    ) -> Coroutine[Any, Any, EventItem]: ...
     @overload
-    def get_events(self, event_name: str, sync: bool = True) -> _EventItem: ...
-    def get_events(self, event_name: str, sync: bool = True) -> _EventItem:
+    def get_events(self, event_name: str, sync: bool = True) -> EventItem: ...
+    def get_events(self, event_name: str, sync: bool = True) -> EventItem:
         if not sync:
             return _EVENTS_THREADS.run(self.get_events, event_name)
         try:

dao_treasury/docker-compose.yaml

@@ -5,7 +5,7 @@ networks:
 
 services:
   grafana:
-    image: grafana/grafana:12.2.0
+    image: grafana/grafana:12.2.1
     ports:
       - 127.0.0.1:${DAO_TREASURY_GRAFANA_PORT:-3004}:3000
     environment:

{dao_treasury-0.0.59.dist-info → dao_treasury-0.0.66.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dao_treasury
-Version: 0.0.59
+Version: 0.0.66
 Summary: Produce comprehensive financial reports for your on-chain org
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
@@ -14,8 +14,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Topic :: Software Development :: Libraries
 Requires-Python: >=3.10,<3.13
 Description-Content-Type: text/markdown
-Requires-Dist: eth-portfolio-temp<0.3,>=0.2.11
-Requires-Dist: ypricemagic>=4.10.0
+Requires-Dist: eth-portfolio-temp==0.2.17
 Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
@@ -42,7 +41,7 @@ DAO Treasury is a comprehensive financial reporting and treasury management solu
 - First, you will need to bring your own archive node. This can be one you run yourself, or one from one of the common providers (Tenderly, Alchemy, QuickNode, etc.). Your archive node must have tracing enabled (free-tier Alchemy nodes do not support this option).
 - You must configure a [brownie network](https://eth-brownie.readthedocs.io/en/stable/network-management.html) to use your RPC.
 - You will need an auth token for [Etherscan](https://etherscan.io/)'s API. Follow their [guide](https://docs.etherscan.io/etherscan-v2/getting-an-api-key) to get your key, and set env var `ETHERSCAN_TOKEN` with its value.
-- You'll also need [Docker](https://www.docker.com/get-started/) installed on your system. If on MacOS, you will need to leave Docker Desktop open while Yearn Treasury is running.
+- You'll also need [Docker](https://www.docker.com/get-started/) installed on your system. If on MacOS, you will need to leave Docker Desktop open while DAO Treasury is running.
 
 ## Installation
 

{dao_treasury-0.0.59.dist-info → dao_treasury-0.0.66.dist-info}/RECORD

@@ -1,20 +1,20 @@
-dao_treasury__mypyc.cp312-win_amd64.pyd,sha256=1JupOD2BcDkSfWP4M0QllNrffuKSDyKQSgu1FNj_h6A,480768
+dao_treasury__mypyc.cp312-win_amd64.pyd,sha256=i8e40eRo0ujfcgKSC3_hrXpKfIZDzqpFqBJHeh9YZ-k,480256
 dao_treasury/ENVIRONMENT_VARIABLES.py,sha256=LS_D4ALB3BO-vYKyh1tzRHi10QBE6f654Zy8pmJ_xPY,656
 dao_treasury/__init__.py,sha256=ai8iALE_Zv43O9cH1jkNJ39bzhr60kBDX6L7C4Nj9FA,1539
-dao_treasury/_docker.cp312-win_amd64.pyd,sha256=HVQTiyqbjU1gFF6KWAy8Vgjxu9TQc5WDkkkwins7itI,10752
-dao_treasury/_docker.py,sha256=UFMN-TIBUQBheMIhIhSMhaq7UFgt6ubUcfzwPNap_6o,6098
-dao_treasury/_nicknames.cp312-win_amd64.pyd,sha256=zgBrPdjIfKaBYPZ8sOiSyJOQxY47eWjZ70k0-m0-IiY,10752
+dao_treasury/_docker.cp312-win_amd64.pyd,sha256=Fchwrkc9SqRJWPVs-lBFtjOo8WBqV1iKZuFSMWoz2EY,10752
+dao_treasury/_docker.py,sha256=Rki3eLKOmsNxN3nF-gmbM9UQV49SY7ToEHZboL_HYvA,6118
+dao_treasury/_nicknames.cp312-win_amd64.pyd,sha256=pmFPiO8xqzl1sBIOkQht1W7G0ZCPZychnOUx57v59Q4,10752
 dao_treasury/_nicknames.py,sha256=n8c-JZhORYymCMv6jsC96IthAzAhpslyEn-KCk_YiSM,1049
-dao_treasury/_wallet.cp312-win_amd64.pyd,sha256=bKHcMGx3c6IDvtSpK2SjTmTTVYj4p-EDrf0IFnxbP_k,10752
+dao_treasury/_wallet.cp312-win_amd64.pyd,sha256=B11PP8Q1VHBW6LhkGFbXjLT5ojxxcZInAaX9lkK-lqU,10752
 dao_treasury/_wallet.py,sha256=nHBAKFJstdKuYbvpskGVx2KU80YrZHGHsEh5V3TwIHs,10712
-dao_treasury/constants.cp312-win_amd64.pyd,sha256=C-4dTlluWc67RpH2sXzv997jjHMJl-vwcpH-wcfA43M,10752
+dao_treasury/constants.cp312-win_amd64.pyd,sha256=cgrCvcRHxewrCoTiw9jFKNducSSXpzz6vE1XDIGNeXw,10752
 dao_treasury/constants.py,sha256=-T0oPw7lC5YeaiplHAtYL-2ss7knvKrJKQ1LCc8kX8g,1483
-dao_treasury/db.py,sha256=GhWwFYgSgnySsOLARn1aRBoPoYKxGvY8pInBMeVtogc,50262
-dao_treasury/docker-compose.yaml,sha256=jt1RjPzR3unoBXiCq_2144t7cNXK6NwyiSjjcXbHnLU,1350
+dao_treasury/db.py,sha256=4Vc_U3mmrG8hOpsuDcgCQQuwGyL3pyfYH2jjktDXx48,50734
+dao_treasury/docker-compose.yaml,sha256=wNNE9xmkchcV-nJxzrmUkbUA0CW1qgdGQKJ7uw2P8nU,1350
 dao_treasury/main.py,sha256=w7VBmBwNBYjOkz2LpT4_9FZ1CI8AVcr4vyfr1wZVk5Q,8458
 dao_treasury/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dao_treasury/treasury.py,sha256=wh4wESLbYSHjcfpa-sW5TIqa5pSC9Y_7Id8tzLzJLaw,7414
-dao_treasury/types.cp312-win_amd64.pyd,sha256=kwr8-WoEuDrKl4zzX9VwdB7gpUfvVLwXTfofo98pvgA,10752
+dao_treasury/types.cp312-win_amd64.pyd,sha256=1_LkZf2mnhDc5MDZnfG3YyD4cVpHYEtJ-orrj59B__w,10752
 dao_treasury/types.py,sha256=KFz4WKPp4t_RBwIT6YGwOcgbzw8tdHIOcXTFsUA0pJA,3818
 dao_treasury/.grafana/provisioning/dashboards/dashboards.yaml,sha256=NfmmICGLVfIrI8ulzUTUYc7wFetk2v-x6eaoYHnCvQc,1914
 dao_treasury/.grafana/provisioning/dashboards/breakdowns/Expenses.json,sha256=gxfPI4eO3PDPe70Yx7_dN0Yx5isvgy-MKe-fizBClMw,16879
@@ -28,27 +28,27 @@ dao_treasury/.grafana/provisioning/dashboards/treasury/Current Treasury Assets.j
 dao_treasury/.grafana/provisioning/dashboards/treasury/Historical Treasury Balances.json,sha256=7qVXn2PjeBIp2pFRbVfxA4PeWxhhVKQCr4qIPZoIj90,133963
 dao_treasury/.grafana/provisioning/dashboards/treasury/Operating Cashflow.json,sha256=fYkiZ37Eg2vu9dPJavCZXPPtX6-rTDbJwE_Ougpo2Mk,15828
 dao_treasury/.grafana/provisioning/datasources/datasources.yaml,sha256=gLmJsOkEXNzWRDibShfHFySWeuExW-dSB_U0OSfH868,344
-dao_treasury/sorting/__init__.cp312-win_amd64.pyd,sha256=YuDGCoJ-LeXmBpVXFKZSRFRUf9O9l48nhrrnkGLkdCU,10752
+dao_treasury/sorting/__init__.cp312-win_amd64.pyd,sha256=lFYVYW-2xysU-iUwTUQSblE7EbrqtUOUdYgg-FOwBf4,10752
 dao_treasury/sorting/__init__.py,sha256=_uxM_FE1paM8oDAhDdHSyhDwnrlxCYX_lGn2DOqCaHU,10666
-dao_treasury/sorting/_matchers.cp312-win_amd64.pyd,sha256=pO2cWDGJqSUVLG2BkpYXXS-ZUEr1CPscu97H9xRosY4,10752
+dao_treasury/sorting/_matchers.cp312-win_amd64.pyd,sha256=-KG3_rs4c9I9CCxJ4Azc6SQSqudRVaFtbU2RwbxlqhM,10752
 dao_treasury/sorting/_matchers.py,sha256=ACi6aXZCKW5OTiztsID7CXCGJounj5c6ivhOCg2436M,14392
-dao_treasury/sorting/_rules.cp312-win_amd64.pyd,sha256=ZIe3WrWxKQnh5Bg09AbPcXtHj7Hvhz3JLDWN6HEHHaQ,10752
+dao_treasury/sorting/_rules.cp312-win_amd64.pyd,sha256=QOFmeTctgdPi5JvYYGalmOjHeKt2F6FiCHDADZCwuH0,10752
 dao_treasury/sorting/_rules.py,sha256=DxhdUgpS0q0LWeLl9W1Bjn5LZz9z4OLA03vQllPMH9k,9229
-dao_treasury/sorting/factory.cp312-win_amd64.pyd,sha256=cuXKxGHVtwJcO47prvzcOaegFIf4iQCrHbyyxp7Cgb0,10752
+dao_treasury/sorting/factory.cp312-win_amd64.pyd,sha256=tWKv7Z0qFR6kfk8g6sh2Nf2jZ99zMyZBTLyCVagIW8U,10752
 dao_treasury/sorting/factory.py,sha256=zlJ18xlMTxv8ACV6_MimCVIDsw3K5AZcyvKaNYY7R14,10484
-dao_treasury/sorting/rule.cp312-win_amd64.pyd,sha256=9rzU6I75akpIqJ5Iifne49IwlpRkZ8vwVmuMA_NMVCQ,10752
+dao_treasury/sorting/rule.cp312-win_amd64.pyd,sha256=zwXYAVanJ-IGp_agLp_lc4ATWXD_VgAM0xOUUNebZHA,10752
 dao_treasury/sorting/rule.py,sha256=wbL8s0-6dxcCKghUtEDSkLDBnyvggsJ3gt_RawQ6kB4,11972
-dao_treasury/sorting/rules/__init__.cp312-win_amd64.pyd,sha256=wR2SZBJWKWf4Us5CIokXZG9kU1_R6bpqCQMouyjweRs,10752
+dao_treasury/sorting/rules/__init__.cp312-win_amd64.pyd,sha256=J8bGTfrtdSj6Sy4H3XE12yTiZQ2acHUgSd8BCsGA4vs,10752
 dao_treasury/sorting/rules/__init__.py,sha256=hcLfejOEwD8RaM2RE-38Ej6_WkvL9BVGvIIGY848E6E,49
-dao_treasury/sorting/rules/ignore/__init__.cp312-win_amd64.pyd,sha256=63bXI3XAIv-eXi9GkfHlqusaNzHmebwfCCfo-MiYtrA,10752
+dao_treasury/sorting/rules/ignore/__init__.cp312-win_amd64.pyd,sha256=p3xs71TniuekcrQxpc8exwBvN9W7tyi4w721oW0R9Hg,10752
 dao_treasury/sorting/rules/ignore/__init__.py,sha256=16THKoGdj6qfkkytuCFVG_R1M6KSErMI4AVE1p0ukS4,58
-dao_treasury/sorting/rules/ignore/llamapay.cp312-win_amd64.pyd,sha256=J_lTWxK1pfEjvn-5xOBsAY8RCqomm61bxPTZVNPVSGo,10752
+dao_treasury/sorting/rules/ignore/llamapay.cp312-win_amd64.pyd,sha256=Z6SeCJijOtUAo9z3eMRXoUQIhUuxzLwMVCwTOiX3wnw,10752
 dao_treasury/sorting/rules/ignore/llamapay.py,sha256=aYyAJRlmv419IeaqkcV5o3ffx0UVfteU0lTl80j0BGo,783
-dao_treasury/streams/__init__.cp312-win_amd64.pyd,sha256=hF8_DOw0Ca6XCIwsyEaCcU1bA9cB5YcFZStalC-ia6Q,10752
+dao_treasury/streams/__init__.cp312-win_amd64.pyd,sha256=jI8g2gh-bw1h0YvfD4I3FTLyFZYswayTPXCBsrJCrJ8,10752
 dao_treasury/streams/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dao_treasury/streams/llamapay.cp312-win_amd64.pyd,sha256=TiEyDmDIJMPHuaNIRx0rqvl_nuxX7_VWwZu501mhlZM,10752
+dao_treasury/streams/llamapay.cp312-win_amd64.pyd,sha256=j7OOeq8jqYM-u92Xi9gGgfVvQPlpquTgW2RbzxIWaaM,10752
 dao_treasury/streams/llamapay.py,sha256=rO1Mh2ndTziR6pnRkKHnQ22a_Yx9PM_-BG7I4dspEZ8,13535
-dao_treasury-0.0.59.dist-info/METADATA,sha256=W8MUMmCPB_XjIKmVoMDyszUQbw4dXcAPTT8sj8ZCnms,7274
-dao_treasury-0.0.59.dist-info/WHEEL,sha256=8UP9x9puWI0P1V_d7K2oMTBqfeLNm21CTzZ_Ptr0NXU,101
-dao_treasury-0.0.59.dist-info/top_level.txt,sha256=CV8aYytuSYplDhLVY4n0GphckdysXCd1lHmbqfsPxNk,33
-dao_treasury-0.0.59.dist-info/RECORD,,
+dao_treasury-0.0.66.dist-info/METADATA,sha256=nRELLkqPXQ9txn_xT6V8ozMHyivB-Hr6QrR7eEUXG2o,7231
+dao_treasury-0.0.66.dist-info/WHEEL,sha256=8UP9x9puWI0P1V_d7K2oMTBqfeLNm21CTzZ_Ptr0NXU,101
+dao_treasury-0.0.66.dist-info/top_level.txt,sha256=CV8aYytuSYplDhLVY4n0GphckdysXCd1lHmbqfsPxNk,33
+dao_treasury-0.0.66.dist-info/RECORD,,