eth-portfolio-temp 0.2.3.dev0__cp311-cp311-win_amd64.whl → 0.2.5.dev0__cp311-cp311-win_amd64.whl

eth_portfolio/portfolio.py

@@ -37,7 +37,7 @@ from eth_portfolio.typing import Addresses, PortfolioBalances
 logger = logging.getLogger(__name__)
 
 
-class PortfolioWallets(Iterable[PortfolioAddress], Dict[Address, PortfolioAddress]):  # type: ignore [misc]
+class PortfolioWallets(Iterable[PortfolioAddress], Dict[Address, PortfolioAddress]):  # type: ignore [metaclass]
     """
     A container that holds all :class:`~eth_portfolio.address.PortfolioAddress` objects for a specific :class:`~eth_portfolio.Portfolio`.
 

eth_portfolio_scripts/_portfolio.py

@@ -1,3 +1,4 @@
+import asyncio
 from datetime import datetime, timezone
 from logging import getLogger
 from math import floor
@@ -5,10 +6,11 @@ from typing import Awaitable, Callable, Final, Iterator, List, Optional, Tuple
 
 import a_sync
 import eth_retry
+import y
 from a_sync.functools import cached_property_unsafe as cached_property
 from eth_typing import BlockNumber, ChecksumAddress
 from msgspec import ValidationError, json
-from y import ERC20, Network, NonStandardERC20, get_block_at_timestamp
+from y import ERC20, Network, NonStandardERC20
 from y.constants import CHAINID
 from y.time import NoBlockFound
 
@@ -34,6 +36,14 @@ log_debug: Final = logger.debug
 log_error: Final = logger.error
 
 
+async def get_block_at_timestamp(dt: datetime) -> BlockNumber:
+    while True:
+        try:
+            return await y.get_block_at_timestamp(dt, sync=False)
+        except NoBlockFound:
+            await asyncio.sleep(10)
+
+
 class ExportablePortfolio(Portfolio):
     """Adds methods to export full portoflio data."""
 
@@ -77,17 +87,12 @@ class ExportablePortfolio(Portfolio):
     async def export_snapshot(self, dt: datetime) -> None:
         log_debug("checking data at %s for %s", dt, self.label)
         try:
-            if not await self.data_exists(dt, sync=False):
-                while True:
-                    try:
-                        block = await get_block_at_timestamp(dt, sync=False)
-                    except NoBlockFound:
-                        pass
-                    else:
-                        break
-                log_debug("block at %s: %s", dt, block)
-                data = await self.get_data_for_export(block, dt, sync=False)
-                await victoria.post_data(data)
+            if await self.data_exists(dt, sync=False):
+                return
+            block = await get_block_at_timestamp(dt)
+            log_debug("block at %s: %s", dt, block)
+            data = await self.get_data_for_export(block, dt, sync=False)
+            await victoria.post_data(data)
         except Exception as e:
             log_error("Error processing %s:", dt, exc_info=True)
 

eth_portfolio_scripts/_utils.py

@@ -1,18 +1,18 @@
 import re
 from asyncio import Task, create_task, sleep
 from datetime import datetime, timedelta, timezone
-from typing import Any, AsyncGenerator, Dict, List, Optional
+from typing import Any, AsyncGenerator, Dict, Final, List, Optional
 
 from brownie import chain
 
 
-def parse_timedelta(value: str) -> timedelta:
-    regex = re.compile(r"(\d+)([dhms]?)")
-    result = regex.findall(value)
+timedelta_pattern: Final = re.compile(r"(\d+)([dhms]?)")
+
 
+def parse_timedelta(value: str) -> timedelta:
     days, hours, minutes, seconds = 0, 0, 0, 0
 
-    for val, unit in result:
+    for val, unit in timedelta_pattern.findall(value):
         val = int(val)
         if unit == "d":
             days = val
@@ -58,10 +58,24 @@ async def aiter_timestamps(
 
     timestamp = start
 
+    timestamps = []
     while timestamp <= datetime.now(tz=timezone.utc):
-        yield timestamp
+        timestamps.append(timestamp)
         timestamp = timestamp + interval
 
+    # cycle between yielding earliest, latest, and middle from `timestamps` until complete
+    while timestamps:
+        # yield the earliest timestamp
+        yield timestamps.pop(0)
+        # yield the most recent timestamp if there is one
+        if timestamps:
+            yield timestamps.pop(-1)
+            # yield the most middle timestamp if there is one
+            if timestamps:
+                yield timestamps.pop(len(timestamps) // 2)
+
+    del timestamps
+
     while run_forever:
         while timestamp > datetime.now(tz=timezone.utc):
             await _get_waiter(timestamp)

{eth_portfolio_temp-0.2.3.dev0.dist-info → eth_portfolio_temp-0.2.5.dev0.dist-info}/METADATA

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: eth_portfolio_temp
-Version: 0.2.3.dev0
+Version: 0.2.5.dev0
 Summary: eth-portfolio makes it easy to analyze your portfolio.
 Home-page: https://github.com/BobTheBuidler/eth-portfolio
 Author: BobTheBuidler
 Author-email: bobthebuidlerdefi@gmail.com
-Requires-Python: >=3.10,<3.13
+Requires-Python: >=3.10,<3.14
 Requires-Dist: checksum_dict>=2.1.7
 Requires-Dist: dank_mids>=4.20.154
 Requires-Dist: eth-brownie<1.23,>=1.21.0
@@ -16,7 +16,7 @@ Requires-Dist: faster-eth-utils
 Requires-Dist: numpy<3
 Requires-Dist: pandas<3,>=1.4.3
 Requires-Dist: typed-envs>=0.0.9
-Requires-Dist: ypricemagic<5,>=4.6.28.dev0
+Requires-Dist: ypricemagic<5,>=4.6.29.dev0
 Dynamic: author
 Dynamic: author-email
 Dynamic: home-page

{eth_portfolio_temp-0.2.3.dev0.dist-info → eth_portfolio_temp-0.2.5.dev0.dist-info}/RECORD

@@ -1,24 +1,24 @@
-295eace8438df6ec133b__mypyc.cp311-win_amd64.pyd,sha256=rVCV_euys9vLGVWUJ7vXUntm9jpOg9bh3A3nvolYhGc,269312
+295eace8438df6ec133b__mypyc.cp311-win_amd64.pyd,sha256=MkcI6I6MUF7xwfQL1G_lHLb_sQ4KhaiuhGplEVVbPkI,273408
 eth_portfolio/__init__.py,sha256=5GmHYzhUX2gOC4MScgXnqS8x2MawbpWOuWPmqlvCotA,525
-eth_portfolio/_argspec.cp311-win_amd64.pyd,sha256=AZXUR1rD2ji2geUBqCLPCbWNIo-rOQ_iO_gFdy5CfP4,10752
+eth_portfolio/_argspec.cp311-win_amd64.pyd,sha256=tmqzebjnO_fdLVoYqavydI058tU8IuyzSFFo49uTfwA,10752
 eth_portfolio/_argspec.py,sha256=au8ycJ56-7UzbQVzYUOoMX9sToH0QNi2tS1O820xB3A,1637
 eth_portfolio/_cache.py,sha256=H8n8x0Xo-iHQ8Q-NPuk57mmbIG6qDj4Wal6_-tK9Pfs,4866
-eth_portfolio/_config.cp311-win_amd64.pyd,sha256=iOK8mcSbL0Ct2EGWxUwKDv5H8oV73t_T2UVFoCPFX4s,10752
+eth_portfolio/_config.cp311-win_amd64.pyd,sha256=mvDbvzGBti5BkrgR6wiApaYcEk-NKLXjF0lO3EcVUzw,10752
 eth_portfolio/_config.py,sha256=BSOvFS4D0oqgVTtBbtW2g2kpL8Mk6xiP0PipfXs_91A,102
 eth_portfolio/_decimal.py,sha256=XhuxnVTAhJF6OILJ1MpbdwkAiy1D5NuS9jRmDRpCSYg,4886
 eth_portfolio/_decorators.py,sha256=AvB-q69MvaFe0Ykh1os6hSewcUujURQ9onqobMaONOM,2899
 eth_portfolio/_exceptions.py,sha256=xb5VmCtBtXy9WXu_1ofoG4j9BJsMQXMVydCJNUulrNY,2500
-eth_portfolio/_shitcoins.cp311-win_amd64.pyd,sha256=l5IOJk41jVOM24ehawFrFkiI5rAAfscVYLZbBxutdzk,10752
+eth_portfolio/_shitcoins.cp311-win_amd64.pyd,sha256=mIJwbKQZt-mzs30sQedEQuu9_JI8qoO6Ue6UCrH0C1Q,10752
 eth_portfolio/_shitcoins.py,sha256=iKDhRsq0qtSm0nal1zyJp6Ny13UAZEW4C8xU5_lfse0,15866
-eth_portfolio/_stableish.cp311-win_amd64.pyd,sha256=SLAdodhIt9M7WcZIgJN2CeerSu3vWDfkh3oK5XPpBxM,10752
+eth_portfolio/_stableish.cp311-win_amd64.pyd,sha256=RXyLnYjfMmZS-U_wr4XxepcP_AAlVgvkWKeLymQf_5M,10752
 eth_portfolio/_stableish.py,sha256=8pdlYe2YcZ8rTzdCzg-ihRQLPtSFXBNDjtnvuTgPRcQ,2063
 eth_portfolio/_submodules.py,sha256=zne-2YyVFoKHwkLuHx8cdz5lpcwwSDw1edJ9v8G4c1A,2263
 eth_portfolio/_utils.py,sha256=ZOSA_pBR0f_Qfsi-iV9EuScc2WkqV_fx7pBtHvdnz_U,7999
 eth_portfolio/address.py,sha256=RrFIWSx6jSITwh16Hqs6W6S9fz1KEaebQEk1vqL3HwI,14536
 eth_portfolio/buckets.py,sha256=pm2-_8VbGKpe6hHM6eysj17JK7Rhngr9-_gpVi-J1uA,6889
-eth_portfolio/constants.cp311-win_amd64.pyd,sha256=AP7uPeIRECcsA9338aUpdurSkK27jYQXO0LqWkhhLJE,10752
+eth_portfolio/constants.cp311-win_amd64.pyd,sha256=KykkfTeQNm6_7Pa51y1oKaItk40hCyrocvsgG66DkQc,10752
 eth_portfolio/constants.py,sha256=rUXWFaCGrrF_qzIdDvVzakQJsLnrGtFNn2EgRbZh8fQ,3741
-eth_portfolio/portfolio.py,sha256=FVx4QwnJH4llTWcYln9UpDkKridHSEAENbTHCBOSq_o,24904
+eth_portfolio/portfolio.py,sha256=FSJ1_FG120dN5vWSPyhbHfyuFHdmFqTHJ5_Ci-4Rts4,24909
 eth_portfolio/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 eth_portfolio/_db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 eth_portfolio/_db/decorators.py,sha256=RS-RiuOAgbrMKQpCwwAtP3lPRs8vKM6aPhh9LP4SwtI,5308
@@ -28,13 +28,13 @@ eth_portfolio/_ledgers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 eth_portfolio/_ledgers/address.py,sha256=ZI4lVsxtXoffDHFBm0pUrSKU42KleBKThNdDHm1Nqtg,33823
 eth_portfolio/_ledgers/portfolio.py,sha256=rAr5S1tksgLPUOK1J1FbIWgvTQNzTqrRp8oukiP2BTo,13427
 eth_portfolio/_loaders/__init__.py,sha256=YrBeRuA48cN2Bg2R2nXiNt1CsUIG_7N6ENIpY6aISPo,1735
-eth_portfolio/_loaders/_nonce.cp311-win_amd64.pyd,sha256=Kbh0wcBXac_1umuoCQavdvdZ04-2QDdi39R78ISA-10,10752
+eth_portfolio/_loaders/_nonce.cp311-win_amd64.pyd,sha256=Yf4ealAN-mEya3ltRIroiMeLGDz3CwHf2xirKSKmJq8,10752
 eth_portfolio/_loaders/_nonce.py,sha256=bA-5fZG8ALuADgQGrnoxt6p6j7QEwI6vIGnZRF1Zx7M,6481
-eth_portfolio/_loaders/balances.cp311-win_amd64.pyd,sha256=g4P38QjhUGrlQIMtYrzjakOmY_XR9csQALu9sQApDaQ,10752
+eth_portfolio/_loaders/balances.cp311-win_amd64.pyd,sha256=Onj292bSQoWHrMeIAzjod_4ybDnYrrzyBRHgFr5VJvs,10752
 eth_portfolio/_loaders/balances.py,sha256=_v-x1M3lzDHPt8svHmCcpxZKw0BaGHfZimhkwgphY8A,3226
 eth_portfolio/_loaders/token_transfer.py,sha256=58NoMc28CRSjuxP-_kNmXL7jS1oEFZayTZ9VAKQcVow,8741
 eth_portfolio/_loaders/transaction.py,sha256=WXsiNahcb5jNbXCX2-ceao3Cybfi-7_th8bnw9elmP0,9386
-eth_portfolio/_loaders/utils.cp311-win_amd64.pyd,sha256=yAozcvLzgaVW2d0idh4zbEXmZK9E2Zm3Mw3OQhBvqdM,10752
+eth_portfolio/_loaders/utils.cp311-win_amd64.pyd,sha256=MFQiadq_CMp9LcPVKuI96EehW4p2Dm7aaSMr5LwVryg,10752
 eth_portfolio/_loaders/utils.py,sha256=_nhPmGq_h_y_JPU9vXvhzqoKAWtgLRhYy_PdJXbyUdw,2326
 eth_portfolio/_ydb/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 eth_portfolio/_ydb/token_transfers.py,sha256=HUTeWShcQD4IzocTHmBOreml0jbVttLcaed1fNiJ2qg,5297
@@ -58,26 +58,26 @@ eth_portfolio/typing/balance/single.py,sha256=NmtWXqCWMIkaoyvfL67Rh0wWurLf55fVaD
 eth_portfolio_scripts/__init__.py,sha256=DIBnQmjmhmNL1lO9Lq4QptrZmC7u6_N3p9zRjcZ9vbY,281
 eth_portfolio_scripts/_args.py,sha256=M33vPkja62XEJeCZAqacNSBCqbzse07wepwyBOtkvVo,682
 eth_portfolio_scripts/_logging.py,sha256=EgW8ozQZLAgt_cUgqe5BYZLMVQwB6X-0gq0T-BvqlTY,369
-eth_portfolio_scripts/_portfolio.py,sha256=f2o1fNJLsB0Y1Qo-GCIeLaKa3t8H1LwdDjstVX6ByzE,7116
-eth_portfolio_scripts/_utils.py,sha256=7maEWyS5i_Kp7iVaa5puf2ZyefqHDsUOqTDLz-UwIQY,2630
-eth_portfolio_scripts/balances.cp311-win_amd64.pyd,sha256=eadUW5PFtV2cJhZK7_bRodi7h1UPbIP4XyL869NugNk,10752
+eth_portfolio_scripts/_portfolio.py,sha256=7N0jAtgw_a1BgTsoC3eKZK0J0GhrUMcGYAFN6c9t9B0,7150
+eth_portfolio_scripts/_utils.py,sha256=lj2B79G8YX21ATNp_v-onsU_kNFZF3unBclCVp3AIn8,3163
+eth_portfolio_scripts/balances.cp311-win_amd64.pyd,sha256=06M0Yiz_5MCtaKTcTNnRM50ws4H5aDRWTAhuYoHK0I8,10752
 eth_portfolio_scripts/balances.py,sha256=Fr8NGCt5yhvu7LnLH27oOVKcL2XwowmAVezXUOIEzd0,1640
 eth_portfolio_scripts/main.py,sha256=upkr0Vc758qti___5kyDsE0zcfwiZju4xvAQsKsu9iw,3804
 eth_portfolio_scripts/py.typed,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
-eth_portfolio_scripts/docker/__init__.cp311-win_amd64.pyd,sha256=0096DYSj8j8mVsxRHTJK1NMsoB_7e3uMc6aN8Fx_AYw,10752
+eth_portfolio_scripts/docker/__init__.cp311-win_amd64.pyd,sha256=bg-TXXy3RT18JJbkBaVzMsu6Y9r-QZxvDhEfoPhM0Io,10752
 eth_portfolio_scripts/docker/__init__.py,sha256=R27uZPLUEK2--fb9IrxrDUk6R5_IVFJSv7s_ia7p5Xk,409
-eth_portfolio_scripts/docker/check.cp311-win_amd64.pyd,sha256=ULG_Qqa2VcXWsr0DQTKSdjVfLMn0btvlEL_CyKgMyIU,10752
+eth_portfolio_scripts/docker/check.cp311-win_amd64.pyd,sha256=DxyTyOyGTe4M1OgJocNBCzFPG3pF7e6VLGWSKJx_u7s,10752
 eth_portfolio_scripts/docker/check.py,sha256=JFxUxGRSz20EgjKqCLBkCqR4N1ihzO_3ykU3jPzp_UU,1801
 eth_portfolio_scripts/docker/docker-compose.yaml,sha256=P2ZJAQBXRQX-nZ5CoNm__R2KihsA0njoTwJcIWn1_s0,1870
-eth_portfolio_scripts/docker/docker_compose.cp311-win_amd64.pyd,sha256=5h4lrniWyHuPSoH4Mpp8JDTnZUL0_tXjRgFzpEVkCtY,10752
+eth_portfolio_scripts/docker/docker_compose.cp311-win_amd64.pyd,sha256=QD616N9bWZH11z6Q5G0RXDB6Hi6BFZ7dbgXEpckbo4w,10752
 eth_portfolio_scripts/docker/docker_compose.py,sha256=tewgCWZP6g9sVFHbQnGC1au-bTnvuvXMZgTKKgpmeOc,2304
 eth_portfolio_scripts/docker/.grafana/dashboards/dashboards.yaml,sha256=wktTI-OAdF_khhbciZFo4Gt2V9bUjbe7GLqwdzTKf0U,212
 eth_portfolio_scripts/docker/.grafana/dashboards/Portfolio/Balances.json,sha256=XGMV8e4tDak53e9bmymwAB4uqZmAIcU5JlRT3OiwTeU,70750
 eth_portfolio_scripts/docker/.grafana/datasources/datasources.yml,sha256=8PPH_QDhfbRRh3IidskW46rifJejloa1a9I1KCw2FTk,199
 eth_portfolio_scripts/victoria/__init__.py,sha256=R0VvKiAC0e57zZNihcCptVkFO5CBHIbp2trFYuyY01M,2038
 eth_portfolio_scripts/victoria/types.py,sha256=KNq8aIiNXeiDnCKL7xycmouo0YeKI-sbQkIcTymcSYk,745
-eth_portfolio_temp-0.2.3.dev0.dist-info/METADATA,sha256=sWFsNKB0KLboRVvwdG0OpSiIG0GvoyncV2EK0fh8Oxg,804
-eth_portfolio_temp-0.2.3.dev0.dist-info/WHEEL,sha256=JLOMsP7F5qtkAkINx5UnzbFguf8CqZeraV8o04b0I8I,101
-eth_portfolio_temp-0.2.3.dev0.dist-info/entry_points.txt,sha256=yqoC6X3LU1NA_-oJ6mloEYEPNmS-0hPS9OtEwgIeDGU,66
-eth_portfolio_temp-0.2.3.dev0.dist-info/top_level.txt,sha256=CmTLi8Lvs3RulV5ZNdziaDVvF_WRsgRpM17GSMECxrg,64
-eth_portfolio_temp-0.2.3.dev0.dist-info/RECORD,,
+eth_portfolio_temp-0.2.5.dev0.dist-info/METADATA,sha256=XzmHpK_cA-muawHli0vBKkNVtgk8eGsrR6W62q9UH9c,804
+eth_portfolio_temp-0.2.5.dev0.dist-info/WHEEL,sha256=JLOMsP7F5qtkAkINx5UnzbFguf8CqZeraV8o04b0I8I,101
+eth_portfolio_temp-0.2.5.dev0.dist-info/entry_points.txt,sha256=yqoC6X3LU1NA_-oJ6mloEYEPNmS-0hPS9OtEwgIeDGU,66
+eth_portfolio_temp-0.2.5.dev0.dist-info/top_level.txt,sha256=CmTLi8Lvs3RulV5ZNdziaDVvF_WRsgRpM17GSMECxrg,64
+eth_portfolio_temp-0.2.5.dev0.dist-info/RECORD,,