dao-treasury 0.0.60__cp311-cp311-win_amd64.whl → 0.0.62__cp311-cp311-win_amd64.whl

dao_treasury/_docker.py

@@ -14,17 +14,16 @@ 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 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 +54,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 +71,7 @@ def down() -> None:
     See Also:
         :func:`up`
     """
+    print("stopping all dao-treasury containers")
     _exec_command(["down"])
 
 
@@ -90,10 +90,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 +188,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
+    eth_portfolio_scripts.docker._exec_command(
+        command, compose_file=COMPOSE_FILE, compose_options=compose_options
+    )

{dao_treasury-0.0.60.dist-info → dao_treasury-0.0.62.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dao_treasury
-Version: 0.0.60
+Version: 0.0.62
 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.14
 Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type

{dao_treasury-0.0.60.dist-info → dao_treasury-0.0.62.dist-info}/RECORD

@@ -1,20 +1,20 @@
-dao_treasury__mypyc.cp311-win_amd64.pyd,sha256=vpg_UVbB6dhrJwygnMTe27Y4DIdZ4R2-A3auXHvZMhA,453632
+dao_treasury__mypyc.cp311-win_amd64.pyd,sha256=o5sS5_jvy1PkiAVgX4vxSDdmy1zn7NUkl3sGlFjLx3E,453120
 dao_treasury/ENVIRONMENT_VARIABLES.py,sha256=LS_D4ALB3BO-vYKyh1tzRHi10QBE6f654Zy8pmJ_xPY,656
 dao_treasury/__init__.py,sha256=ai8iALE_Zv43O9cH1jkNJ39bzhr60kBDX6L7C4Nj9FA,1539
-dao_treasury/_docker.cp311-win_amd64.pyd,sha256=b2TdXBk8zAPcseTsI8kn_vsYoY6aJBu3t3T6GfSIpYY,10752
-dao_treasury/_docker.py,sha256=UFMN-TIBUQBheMIhIhSMhaq7UFgt6ubUcfzwPNap_6o,6098
-dao_treasury/_nicknames.cp311-win_amd64.pyd,sha256=FHCyvqwdnVrlUdDKqzQSp4Lz8gKttKrmUroFQpYFzjc,10752
+dao_treasury/_docker.cp311-win_amd64.pyd,sha256=O6i4y1OBwlAX9enr-8487SIMoBAghwJ-9AOoeyyzkh8,10752
+dao_treasury/_docker.py,sha256=_kYZn_cIdHbAbyHujUFBxZy_Eu_DwTtLCzQoYNyHQhk,6075
+dao_treasury/_nicknames.cp311-win_amd64.pyd,sha256=yFhOM1jvf2EzCNQubaLOeC-V4GYVt65zlDzGY-xchUQ,10752
 dao_treasury/_nicknames.py,sha256=n8c-JZhORYymCMv6jsC96IthAzAhpslyEn-KCk_YiSM,1049
-dao_treasury/_wallet.cp311-win_amd64.pyd,sha256=wtirU32pOX3jCCHh_YwNNZAiuXkd3EquDUlSPoiSg7g,10752
+dao_treasury/_wallet.cp311-win_amd64.pyd,sha256=cMKc57x6EpQVl-M3-v32QKMGWXHiLyvmMIaRip1jz34,10752
 dao_treasury/_wallet.py,sha256=nHBAKFJstdKuYbvpskGVx2KU80YrZHGHsEh5V3TwIHs,10712
-dao_treasury/constants.cp311-win_amd64.pyd,sha256=sTiTMLqju3s28mRHBCcNoMvK5YaOmVcK511qelUz8gA,10752
+dao_treasury/constants.cp311-win_amd64.pyd,sha256=gzMvK-zPPEp1lrCNodReCXIH3HwIHRGC4IgKqerGQIc,10752
 dao_treasury/constants.py,sha256=-T0oPw7lC5YeaiplHAtYL-2ss7knvKrJKQ1LCc8kX8g,1483
 dao_treasury/db.py,sha256=3_-nm8vD92ECaHxjMYf0eaXfsBRC2ojGcm-AFz2ZLAQ,50625
 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.cp311-win_amd64.pyd,sha256=_b8VbP8zU3Dr8p--rF1NRpbqlV1MPNxQHlhFM6L6mUc,10752
+dao_treasury/types.cp311-win_amd64.pyd,sha256=uhk-Rz9Rz8PxflUlzFQqEJSMjG5RwzLPRvR3JbQNI1E,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__.cp311-win_amd64.pyd,sha256=7G4WTVOtHE90BwacsFSVA0b2oLnLuHyL5lTdflO8r5Y,10752
+dao_treasury/sorting/__init__.cp311-win_amd64.pyd,sha256=fll9Idws7bK6VfXxHwmf9B4g58rMPHZpeewwCjuRnwg,10752
 dao_treasury/sorting/__init__.py,sha256=_uxM_FE1paM8oDAhDdHSyhDwnrlxCYX_lGn2DOqCaHU,10666
-dao_treasury/sorting/_matchers.cp311-win_amd64.pyd,sha256=OlDwh8zIAl-6chzvXgeRJuboYuPvmttlLapsN5KQa_c,10752
+dao_treasury/sorting/_matchers.cp311-win_amd64.pyd,sha256=ku3XQ--_TV6Q03X5iRTgCkMctjCQlxqcFgQ0Y1P-LLA,10752
 dao_treasury/sorting/_matchers.py,sha256=ACi6aXZCKW5OTiztsID7CXCGJounj5c6ivhOCg2436M,14392
-dao_treasury/sorting/_rules.cp311-win_amd64.pyd,sha256=UOO2ruc8f8ynKzI0Vb0nUZOXFlImBRDAva81sAYhTFY,10752
+dao_treasury/sorting/_rules.cp311-win_amd64.pyd,sha256=qmju1eOCtoo7BmOS04q_tf6MIoRxqqE6TqYapno0fCk,10752
 dao_treasury/sorting/_rules.py,sha256=DxhdUgpS0q0LWeLl9W1Bjn5LZz9z4OLA03vQllPMH9k,9229
-dao_treasury/sorting/factory.cp311-win_amd64.pyd,sha256=vjd3UoBnIpN0rWZpoknIOx9ptd0jV77G-En0OjBcpbw,10752
+dao_treasury/sorting/factory.cp311-win_amd64.pyd,sha256=Jv__KR7U8bgDbFtHf2iIbRDe0W37aHdX5WbS_jmIr0M,10752
 dao_treasury/sorting/factory.py,sha256=zlJ18xlMTxv8ACV6_MimCVIDsw3K5AZcyvKaNYY7R14,10484
-dao_treasury/sorting/rule.cp311-win_amd64.pyd,sha256=7xCjlfbFBDH7nnOpr28hMmO2E35TbIKPITov33_fxDo,10752
+dao_treasury/sorting/rule.cp311-win_amd64.pyd,sha256=ErQQ_Rje42FPqxmbkmnwDX8ABZIw7BRHmEIkBQUIFn4,10752
 dao_treasury/sorting/rule.py,sha256=wbL8s0-6dxcCKghUtEDSkLDBnyvggsJ3gt_RawQ6kB4,11972
-dao_treasury/sorting/rules/__init__.cp311-win_amd64.pyd,sha256=qPpjGXr-p-HIfFTm3ozhkvvQ5I7UZZ-WlhBT3NmOGw4,10752
+dao_treasury/sorting/rules/__init__.cp311-win_amd64.pyd,sha256=IvsSJrszGm4JMYHVGF8BeybsuxUVyro2Jsi7xK-xTGY,10752
 dao_treasury/sorting/rules/__init__.py,sha256=hcLfejOEwD8RaM2RE-38Ej6_WkvL9BVGvIIGY848E6E,49
-dao_treasury/sorting/rules/ignore/__init__.cp311-win_amd64.pyd,sha256=CSB_diEc-p6ul_FzArDUnR091YDhAdLMyBlBR6Jh8hc,10752
+dao_treasury/sorting/rules/ignore/__init__.cp311-win_amd64.pyd,sha256=hgoNaGtOG-U7VwHfN1ZOYL8lNva-D4TD0vNs5Lo0cpo,10752
 dao_treasury/sorting/rules/ignore/__init__.py,sha256=16THKoGdj6qfkkytuCFVG_R1M6KSErMI4AVE1p0ukS4,58
-dao_treasury/sorting/rules/ignore/llamapay.cp311-win_amd64.pyd,sha256=8sEfLRcaa4C4iSVi1zClxsvlAdTDmvqvmSheLyk8JL8,10752
+dao_treasury/sorting/rules/ignore/llamapay.cp311-win_amd64.pyd,sha256=WwAdzBN8Ukg3bU3qv6BSkRHaDMi-08wpufqg3_3QLO4,10752
 dao_treasury/sorting/rules/ignore/llamapay.py,sha256=aYyAJRlmv419IeaqkcV5o3ffx0UVfteU0lTl80j0BGo,783
-dao_treasury/streams/__init__.cp311-win_amd64.pyd,sha256=EvGpPU5c24-jKL1jK8PtswSyUPPknGI60iOn83OftaU,10752
+dao_treasury/streams/__init__.cp311-win_amd64.pyd,sha256=m6vmpXiLRs1pOdhl-28OG9D4uqmi7skZ3nqCofN2NdA,10752
 dao_treasury/streams/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dao_treasury/streams/llamapay.cp311-win_amd64.pyd,sha256=6XOlvxGQRube7NNkqDSpcQUJjPhOv2wKf4yIqX8l4K8,10752
+dao_treasury/streams/llamapay.cp311-win_amd64.pyd,sha256=cRePcgmb__mhNGHFrxE1zrwFew1niPiEPTpUTCI9qYQ,10752
 dao_treasury/streams/llamapay.py,sha256=rO1Mh2ndTziR6pnRkKHnQ22a_Yx9PM_-BG7I4dspEZ8,13535
-dao_treasury-0.0.60.dist-info/METADATA,sha256=Ufkev7h0V31lvudy9p5vpX_EtSeVE51ehJwbH2CX-Uw,7274
-dao_treasury-0.0.60.dist-info/WHEEL,sha256=JLOMsP7F5qtkAkINx5UnzbFguf8CqZeraV8o04b0I8I,101
-dao_treasury-0.0.60.dist-info/top_level.txt,sha256=CV8aYytuSYplDhLVY4n0GphckdysXCd1lHmbqfsPxNk,33
-dao_treasury-0.0.60.dist-info/RECORD,,
+dao_treasury-0.0.62.dist-info/METADATA,sha256=CmeorCRt5rBz3Be-8RPW6-NsI1FFbVtXLDtomS72GrY,7233
+dao_treasury-0.0.62.dist-info/WHEEL,sha256=JLOMsP7F5qtkAkINx5UnzbFguf8CqZeraV8o04b0I8I,101
+dao_treasury-0.0.62.dist-info/top_level.txt,sha256=CV8aYytuSYplDhLVY4n0GphckdysXCd1lHmbqfsPxNk,33
+dao_treasury-0.0.62.dist-info/RECORD,,