dao-treasury 0.0.58__cp312-cp312-win32.whl → 0.0.60__cp312-cp312-win32.whl

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`.
@@ -755,10 +767,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.58.dist-info → dao_treasury-0.0.60.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dao_treasury
-Version: 0.0.58
+Version: 0.0.60
 Summary: Produce comprehensive financial reports for your on-chain org
 Classifier: Development Status :: 3 - Alpha
 Classifier: Intended Audience :: Developers
@@ -14,7 +14,8 @@ 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.8.dev0
+Requires-Dist: eth-portfolio-temp<0.3,>=0.2.11
+Requires-Dist: ypricemagic>=4.10.0
 Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type

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

@@ -1,20 +1,20 @@
-dao_treasury__mypyc.cp312-win32.pyd,sha256=UdaUMd6GQsGos85u5GmdNNoHgucJUEGaaPnxnf_TPf0,445440
+dao_treasury__mypyc.cp312-win32.pyd,sha256=9C1HlnsqSbzfSpSm-NGBlNC82zsa_o4MT-U5fo1ZTRY,445440
 dao_treasury/ENVIRONMENT_VARIABLES.py,sha256=LS_D4ALB3BO-vYKyh1tzRHi10QBE6f654Zy8pmJ_xPY,656
 dao_treasury/__init__.py,sha256=ai8iALE_Zv43O9cH1jkNJ39bzhr60kBDX6L7C4Nj9FA,1539
-dao_treasury/_docker.cp312-win32.pyd,sha256=auMhCAUoJOXvSfxE5nP6ns1S74Cjmzmf3vI2Po4sUy0,9216
+dao_treasury/_docker.cp312-win32.pyd,sha256=sS8pLlDft5E8b2vrDZySAvvcgjFSyVpbrzC_Snepy74,9216
 dao_treasury/_docker.py,sha256=UFMN-TIBUQBheMIhIhSMhaq7UFgt6ubUcfzwPNap_6o,6098
-dao_treasury/_nicknames.cp312-win32.pyd,sha256=6f2kaXp3zFU4Ar_AFHxQU7Qown1jsYSZVRCxgu7gCyQ,9216
+dao_treasury/_nicknames.cp312-win32.pyd,sha256=NeCUYzzOdELEhl-mXDdomjfBR4srr70FYpJiK5HP4gI,9216
 dao_treasury/_nicknames.py,sha256=n8c-JZhORYymCMv6jsC96IthAzAhpslyEn-KCk_YiSM,1049
-dao_treasury/_wallet.cp312-win32.pyd,sha256=ss9JFgxNsmjTKKEEMOh03YAnpyWgT6GawvB9aqFUz6M,9216
+dao_treasury/_wallet.cp312-win32.pyd,sha256=wvoXkZYVnz_jqE8IQCNM4RZX9yQCP0LfNNExzNdOvmw,9216
 dao_treasury/_wallet.py,sha256=nHBAKFJstdKuYbvpskGVx2KU80YrZHGHsEh5V3TwIHs,10712
-dao_treasury/constants.cp312-win32.pyd,sha256=Z1M8tgXQVsbH6JoUWussBU9K33-5MJKH8DP_3UvIuII,9216
+dao_treasury/constants.cp312-win32.pyd,sha256=0vBsc4XafcRGKxe4rVgpO43GMQYLIjK0kd2zyCeTn4E,9216
 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=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.cp312-win32.pyd,sha256=0TX1oLjgDKEH_yOIcKkSX0yjpbQeY47SbXKJy0tNdk8,9216
+dao_treasury/types.cp312-win32.pyd,sha256=X1WImhXY-YGPZvIQTXerwNjojQ7TE3fLMtzb0JxhYVY,9216
 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-win32.pyd,sha256=-sKfAhdqrPjtVaY8Uj2JYIIx_8_6rrM0gi7PVz4wQeo,9216
+dao_treasury/sorting/__init__.cp312-win32.pyd,sha256=NKFEimpOwrlBSmqTr9ChNM5uGkeRwp0ao5_J6bE2HSc,9216
 dao_treasury/sorting/__init__.py,sha256=_uxM_FE1paM8oDAhDdHSyhDwnrlxCYX_lGn2DOqCaHU,10666
-dao_treasury/sorting/_matchers.cp312-win32.pyd,sha256=K7pFcyCdi09LCZslXSyo78LmajEjllIbK7H2ZA26CGI,9216
+dao_treasury/sorting/_matchers.cp312-win32.pyd,sha256=G0v2xROhErK1I-DpduZRCiSJp13y64wlnoVXHmjGdX8,9216
 dao_treasury/sorting/_matchers.py,sha256=ACi6aXZCKW5OTiztsID7CXCGJounj5c6ivhOCg2436M,14392
-dao_treasury/sorting/_rules.cp312-win32.pyd,sha256=6BLYUB6Ws2_oYiuETgSfgzgrq2uz3Br9R_kUMPHQZSU,9216
+dao_treasury/sorting/_rules.cp312-win32.pyd,sha256=cRTpBunUb6uodFOaFYpZsA1kLFRJdhb32Z1lOcLixiE,9216
 dao_treasury/sorting/_rules.py,sha256=DxhdUgpS0q0LWeLl9W1Bjn5LZz9z4OLA03vQllPMH9k,9229
-dao_treasury/sorting/factory.cp312-win32.pyd,sha256=QnZRSH6NlOx0YQrE_GmClfdigZHsFZx2OsmAzDtMoYI,9216
+dao_treasury/sorting/factory.cp312-win32.pyd,sha256=t4A_98mjbAW1xe0NbISwPgziPb_Qh6AGYRLCq2v7Bso,9216
 dao_treasury/sorting/factory.py,sha256=zlJ18xlMTxv8ACV6_MimCVIDsw3K5AZcyvKaNYY7R14,10484
-dao_treasury/sorting/rule.cp312-win32.pyd,sha256=q08_E3pZN6GoSWcJyCFCVfLippQEEQxNM_VotU812s8,9216
+dao_treasury/sorting/rule.cp312-win32.pyd,sha256=XT3mWpFUd6x4R8zt5E1A_ETgAjz2pD_RSTAgZo1jIww,9216
 dao_treasury/sorting/rule.py,sha256=wbL8s0-6dxcCKghUtEDSkLDBnyvggsJ3gt_RawQ6kB4,11972
-dao_treasury/sorting/rules/__init__.cp312-win32.pyd,sha256=8c04YqF9e3eYbA6l9hRh9-v9mYhcL_Q5iOKiaC85eH0,9216
+dao_treasury/sorting/rules/__init__.cp312-win32.pyd,sha256=yo5UFwiR8QpUjU0pbqmnuVw1cmbgY8vigUQnMxabR0U,9216
 dao_treasury/sorting/rules/__init__.py,sha256=hcLfejOEwD8RaM2RE-38Ej6_WkvL9BVGvIIGY848E6E,49
-dao_treasury/sorting/rules/ignore/__init__.cp312-win32.pyd,sha256=w5npjQz2PxLvmSVRGHIm4C31rsrZMTleQyxNzEPoaZo,9216
+dao_treasury/sorting/rules/ignore/__init__.cp312-win32.pyd,sha256=m_zHc62_OKuujmAZvHQQAOyVtwNJsHJ8dhjqZMbs1dg,9216
 dao_treasury/sorting/rules/ignore/__init__.py,sha256=16THKoGdj6qfkkytuCFVG_R1M6KSErMI4AVE1p0ukS4,58
-dao_treasury/sorting/rules/ignore/llamapay.cp312-win32.pyd,sha256=q0-TPyprfLAxLpGE0V9zD4EXwLRs_de5rqHYidhgx1o,9216
+dao_treasury/sorting/rules/ignore/llamapay.cp312-win32.pyd,sha256=Xj-Nsdezk9DTM8inY3qSJgaAXi_a-8_UNAB74WPFY5s,9216
 dao_treasury/sorting/rules/ignore/llamapay.py,sha256=aYyAJRlmv419IeaqkcV5o3ffx0UVfteU0lTl80j0BGo,783
-dao_treasury/streams/__init__.cp312-win32.pyd,sha256=AcjImh5Fdzr6qdhIeGxYFJwuE8FEfhF-lgCWxuP1R6o,9216
+dao_treasury/streams/__init__.cp312-win32.pyd,sha256=bFul_pUtkIv-N2VQMEZgLcxjY_bndZYd9hydX9yLltk,9216
 dao_treasury/streams/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dao_treasury/streams/llamapay.cp312-win32.pyd,sha256=GF7fvUmteFhJO1cWRbuL9sRKM0F55B5wwNzX9dRhHqA,9216
+dao_treasury/streams/llamapay.cp312-win32.pyd,sha256=7erKuzOJ_xJkOlTI1TaAK1NBkkEAz5m3mLqtrvvKKr8,9216
 dao_treasury/streams/llamapay.py,sha256=rO1Mh2ndTziR6pnRkKHnQ22a_Yx9PM_-BG7I4dspEZ8,13535
-dao_treasury-0.0.58.dist-info/METADATA,sha256=fdAHv_gbvBgjxYMzYLctnui3rGlXTlrcSWt1jMEdXjo,7242
-dao_treasury-0.0.58.dist-info/WHEEL,sha256=LwxTQZ0gyDP_uaeNCLm-ZIktY9hv6x0e22Q-hgFd-po,97
-dao_treasury-0.0.58.dist-info/top_level.txt,sha256=CV8aYytuSYplDhLVY4n0GphckdysXCd1lHmbqfsPxNk,33
-dao_treasury-0.0.58.dist-info/RECORD,,
+dao_treasury-0.0.60.dist-info/METADATA,sha256=Ufkev7h0V31lvudy9p5vpX_EtSeVE51ehJwbH2CX-Uw,7274
+dao_treasury-0.0.60.dist-info/WHEEL,sha256=LwxTQZ0gyDP_uaeNCLm-ZIktY9hv6x0e22Q-hgFd-po,97
+dao_treasury-0.0.60.dist-info/top_level.txt,sha256=CV8aYytuSYplDhLVY4n0GphckdysXCd1lHmbqfsPxNk,33
+dao_treasury-0.0.60.dist-info/RECORD,,