eth-portfolio-temp 0.2.2.dev0__cp311-cp311-macosx_11_0_arm64.whl → 0.2.4.dev0__cp311-cp311-macosx_11_0_arm64.whl

eth_portfolio/_utils.py

@@ -136,10 +136,11 @@ async def _get_price(token: AddressOrContract, block: Optional[int] = None) -> _
             elif isinstance(e.exception, NonStandardERC20):
                 # Can't get symbol for handling like other excs
                 logger.warning(f"NonStandardERC20 while fetching price for {token}")
-            elif isinstance(e.exception, PriceError) and token not in SUPPRESS_ERROR_LOGS:
-                logger.warning(
-                    f"PriceError while fetching price for {await _describe_err(token, block)}"
-                )
+            elif isinstance(e.exception, PriceError):
+                if token not in SUPPRESS_ERROR_LOGS:
+                    logger.warning(
+                        f"PriceError while fetching price for {await _describe_err(token, block)}"
+                    )
             else:
                 logger.warning(f"{e} while fetching price for {await _describe_err(token, block)}")
                 logger.warning(e, exc_info=True)

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 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_scripts/balances.py

@@ -34,9 +34,8 @@ async def export_balances(args: Namespace) -> None:
     )
 
     if export_start_block := args.export_start_block or args.first_tx_block:
-        start = datetime.fromtimestamp(
-            await dank_mids.eth.get_block_timestamp(args.export_start_block), tz=timezone.utc
-        )
+        start_ts = await dank_mids.eth.get_block_timestamp(export_start_block)
+        start = datetime.fromtimestamp(start_ts, tz=timezone.utc)
     else:
         start = None
 

{eth_portfolio_temp-0.2.2.dev0.dist-info → eth_portfolio_temp-0.2.4.dev0.dist-info}/METADATA

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: eth_portfolio_temp
-Version: 0.2.2.dev0
+Version: 0.2.4.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.2.dev0.dist-info → eth_portfolio_temp-0.2.4.dev0.dist-info}/RECORD

@@ -1,39 +1,39 @@
-295eace8438df6ec133b__mypyc.cpython-311-darwin.so,sha256=Z1qDJVa1N3Z9C6e1tAXbinljmmnz0ak1twRXkY4FY8E,652256
-eth_portfolio_temp-0.2.2.dev0.dist-info/RECORD,,
-eth_portfolio_temp-0.2.2.dev0.dist-info/WHEEL,sha256=sunMa2yiYbrNLGeMVDqEA0ayyJbHlex7SCn1TZrEq60,136
-eth_portfolio_temp-0.2.2.dev0.dist-info/entry_points.txt,sha256=yqoC6X3LU1NA_-oJ6mloEYEPNmS-0hPS9OtEwgIeDGU,66
-eth_portfolio_temp-0.2.2.dev0.dist-info/top_level.txt,sha256=CmTLi8Lvs3RulV5ZNdziaDVvF_WRsgRpM17GSMECxrg,64
-eth_portfolio_temp-0.2.2.dev0.dist-info/METADATA,sha256=O5Y4EOxRYl5K1a1VJU_lRk_Ak1bEn-shaJLH3whBfB4,779
+295eace8438df6ec133b__mypyc.cpython-311-darwin.so,sha256=MruJK4-HE4QkL3ajEhc5lJdpUcuCgJYCRU46tQzPjtw,676608
+eth_portfolio_temp-0.2.4.dev0.dist-info/RECORD,,
+eth_portfolio_temp-0.2.4.dev0.dist-info/WHEEL,sha256=sunMa2yiYbrNLGeMVDqEA0ayyJbHlex7SCn1TZrEq60,136
+eth_portfolio_temp-0.2.4.dev0.dist-info/entry_points.txt,sha256=yqoC6X3LU1NA_-oJ6mloEYEPNmS-0hPS9OtEwgIeDGU,66
+eth_portfolio_temp-0.2.4.dev0.dist-info/top_level.txt,sha256=CmTLi8Lvs3RulV5ZNdziaDVvF_WRsgRpM17GSMECxrg,64
+eth_portfolio_temp-0.2.4.dev0.dist-info/METADATA,sha256=0kQAF2-wNUm6w-Nsltq8QzF3j4ojBziq1LGqhE8Vhio,779
 eth_portfolio/address.py,sha256=LvBh4Vp2DBC3gQ0WD-TZ6jfe9s6FZbET1krYG9_KMAA,14139
 eth_portfolio/_cache.py,sha256=PYkR-yExjuwd_t7swv4euxL2daJ-VFwh3EMb3MciRJE,4745
 eth_portfolio/_argspec.py,sha256=VzUZkbDkmOSgNUZBGbGblqtxBfDcmBAB89dY2OX0j-U,1595
-eth_portfolio/_argspec.cpython-311-darwin.so,sha256=WrI3FvMHNtc_eXshwkxfrK9bI-_7kmn9_TpKYvjPaeA,50640
-eth_portfolio/_config.cpython-311-darwin.so,sha256=-ComUA65XV1I3x7u9hBtYsKwM9hhf2bxMyhoR-jfZrI,50640
+eth_portfolio/_argspec.cpython-311-darwin.so,sha256=rSIUVq_ko6CHGqOObm0tXKUMBnaS_de-7NgzgiZ4V4M,50640
+eth_portfolio/_config.cpython-311-darwin.so,sha256=1OSwtKCKL33u8oQkTFmrTG9W3tE8nFgOczTilNTJ-vM,50640
 eth_portfolio/_submodules.py,sha256=J8ht9bAAvblUXqwOGN7UIOXUPxrTiq7m1RWiB0-ObaE,2190
 eth_portfolio/constants.py,sha256=LS9H2P_Qfcreb6z6NknErxvq6OAtIHbHykXy0spol9E,3659
-eth_portfolio/_stableish.cpython-311-darwin.so,sha256=Xwklwlcx_At7coVMDUZsJ4w_A21gLJf9gObEVQF-088,50656
+eth_portfolio/_stableish.cpython-311-darwin.so,sha256=sNmO8RuBMoXYVOONH0mJqbZT0tnNePEBrOw8eakieLo,50656
 eth_portfolio/__init__.py,sha256=0sO4cSJaLYwJfnfVOJRFw7p5_Lzhsr95YuJ1aNQM83A,500
 eth_portfolio/_decimal.py,sha256=nuUl6DZHCtrbBN7snwvs4LLaoJ5k7mn3dt4qmlFCkTU,4731
 eth_portfolio/buckets.py,sha256=QwdqWzW9iWBmRcJ2aktRtL-obvtBnND179krY5ISbhY,6695
-eth_portfolio/constants.cpython-311-darwin.so,sha256=iw81wCF-VgtPhuxpVtZIY8Nf48ygMZjtXzuVFp5qbg4,50656
+eth_portfolio/constants.cpython-311-darwin.so,sha256=K1VUXqjmvvzUhTU6Ob__UEpCFFDaRa4xP3OuQdCqSc4,50656
 eth_portfolio/_decorators.py,sha256=_ZSurUFEIwZRiMFMhLcIXkD-Ey1CqfBqGaE24hLzOuA,2815
 eth_portfolio/_stableish.py,sha256=VTv69Q91AHxbNbbY0LB4PFwKEseHdkE4_6fLPKH1uW0,2021
 eth_portfolio/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 eth_portfolio/_shitcoins.py,sha256=FrqttZzQdheTAabdIK0oVHayqHF0UkLQLEiMz8njQe0,15563
 eth_portfolio/_config.py,sha256=mw-OA3M8rUA2hqy5wNt30AZRHkWFgR8K2sJg0o5Baxg,98
-eth_portfolio/_shitcoins.cpython-311-darwin.so,sha256=BnJCYfPThWFPE8f5byozB8Hw8r_jlOi_kd3fnzOUuGA,50656
+eth_portfolio/_shitcoins.cpython-311-darwin.so,sha256=WH-vsFHhcmDNKqxSpRN-X3-71CZo_6S1iMsm-Wc8zJs,50656
 eth_portfolio/_exceptions.py,sha256=bw3IdXhqrWxeFqYLm7pJZqRHKZas_cCg8A5Ih1WQEqQ,2433
-eth_portfolio/portfolio.py,sha256=KljK3FZQMtRQLs1D-HHgCN-DVoZ6ZzEdmclmF3__oz0,24243
-eth_portfolio/_utils.py,sha256=10In2lr0QmfiavyeA4Z8wDTuujRVmjcc0cd-o71JEBg,7742
+eth_portfolio/portfolio.py,sha256=MP_0Y6fXw8TNoyoFCPiu-MUA44jnMm0L_33gec6MjKU,24248
+eth_portfolio/_utils.py,sha256=Ab3m6i79U-tnTrc_b_kTmOO4xKjbsX9slf6l0sXzf4c,7770
 eth_portfolio/_loaders/transaction.py,sha256=FEYdoNDCgD6-mqZT9MuyYIEkdhG3iUwyNeMmqjpMGJw,9146
 eth_portfolio/_loaders/__init__.py,sha256=lb45_0ak32Z7N3-Nx1CAoRKiZ1_w-_YGbmSCNuunro8,1702
-eth_portfolio/_loaders/_nonce.cpython-311-darwin.so,sha256=V-astQHvOKNi2iNG8MQ_HtDelf5d-UuEFykmygZkl5E,50656
+eth_portfolio/_loaders/_nonce.cpython-311-darwin.so,sha256=9hcKDUzgjel9_QbA6-v6XVrrnCJlkqu1vlpbWnd3TF0,50656
 eth_portfolio/_loaders/_nonce.py,sha256=cx0EjTAhVU2EudMKSO-7-t1jl3y4dYn6as4XiY6KyS8,6285
-eth_portfolio/_loaders/utils.cpython-311-darwin.so,sha256=YWmV_kr4mjuQsE2gWGhYdPWa1OiamudXKgB_pJC26S8,50648
+eth_portfolio/_loaders/utils.cpython-311-darwin.so,sha256=OiANah3gC6q-1zlfxBkQsMxCmcPHj8H8A2GV2jtdJs4,50648
 eth_portfolio/_loaders/utils.py,sha256=my3Wg2Ip5gSWuzAWcoLQQEmVmAPhIHbBzQQc0iP1iCA,2258
 eth_portfolio/_loaders/balances.py,sha256=BTWfkJIoSraUMe94Wuj8NPyg5EO0OByIjbXu7j6PZEo,3132
 eth_portfolio/_loaders/token_transfer.py,sha256=MEw95D2iKBYa_9vIatCHJGe7zEJuYUEC8P1mTjjRXlo,8524
-eth_portfolio/_loaders/balances.cpython-311-darwin.so,sha256=44hY0CaI1RkZ0ibpFVCUurF5nLesKIQT2gaAtUsjK6I,50656
+eth_portfolio/_loaders/balances.cpython-311-darwin.so,sha256=FLfF6tyhuHjsGz-Dq5kYQwOcGv3XSMuOq-PaH7TVc54,50656
 eth_portfolio/_ydb/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 eth_portfolio/_ydb/token_transfers.py,sha256=aKaYSDnJehEcDb_c6YTmcKZxSfZ1jwHMXMOAmE8XH30,5152
 eth_portfolio/_db/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -63,19 +63,19 @@ eth_portfolio/protocols/lending/unit.py,sha256=7oRvIkoKUm8IOnDv59pILSSJWFNNjwr4C
 eth_portfolio_scripts/_logging.py,sha256=B_rQMYt_1PhpwCOLBRpkKK6M1ljcF0wAIgqfPIsFUGU,354
 eth_portfolio_scripts/_args.py,sha256=k6J6XkRe1VuN1DiyGuXLCR7NBSvzH5jnVChfzodKuB8,656
 eth_portfolio_scripts/__init__.py,sha256=TC5c4WZdzSHhTIBYuwzrAyzFuGzBmHiDX_g6ghO09jQ,261
-eth_portfolio_scripts/_portfolio.py,sha256=36n8DE9OfHvdF0ez12yzWpxI7at6_eo3eno7V_YYu3A,6932
+eth_portfolio_scripts/_portfolio.py,sha256=NUW2wl1MhKa6Y1AW-e7NIXPMTtTRRVttzSKUdVjJm9M,6955
 eth_portfolio_scripts/py.typed,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-eth_portfolio_scripts/balances.py,sha256=m0w2SbFChvOAnxUIKavgdnaq-DS01KimzDqmFV5apJs,1587
+eth_portfolio_scripts/balances.py,sha256=QvpOdXnH1V-tOuEmAOPxH3MrincDExlIP1eEJ2IG2Lk,1588
 eth_portfolio_scripts/main.py,sha256=vafXy4JvNWrP203AgCRcSKHMsOSCC7VVj9zBd_BFYZU,3685
-eth_portfolio_scripts/balances.cpython-311-darwin.so,sha256=OBt3KFX9HAccPvWG9Op1woIf2KosSQmFBp-8gR61WSk,50656
-eth_portfolio_scripts/_utils.py,sha256=qyct1Mwf2-1DYj7BUWt2bocUfGKMap1l9sxUfHAjER0,2538
+eth_portfolio_scripts/balances.cpython-311-darwin.so,sha256=53grYGATF5U-hryIy5uaq4E8Q50A0X1U_JWCkonf7OY,50656
+eth_portfolio_scripts/_utils.py,sha256=-JiZLpSa8P2_ZFXw1AfpVmTO6X65yPeVVdnrDpNFzNQ,3057
 eth_portfolio_scripts/docker/docker-compose.yaml,sha256=pQ4eesSfMtcb9muDFT5TFDqZty15BoC2Rrd8HY0LS04,1809
 eth_portfolio_scripts/docker/docker_compose.py,sha256=K7_Y_8NeN5s0pb9WUamgfi9OppjpaU0Mlz2nDzewcRA,2226
 eth_portfolio_scripts/docker/check.py,sha256=E6_Ar4dr6HfVAgpwoDPcObIolikHKQr8VFkH01sOuIM,1745
-eth_portfolio_scripts/docker/docker_compose.cpython-311-darwin.so,sha256=N7ML3bfrW0e63v2isYRdC5rr6bIS5kTha2p81_sK4qk,50712
+eth_portfolio_scripts/docker/docker_compose.cpython-311-darwin.so,sha256=9fiXcO5P-42ocAuDNZTYDD02deuafxg6V99oh5-4df4,50712
 eth_portfolio_scripts/docker/__init__.py,sha256=ZXSIYcjp94c0O9o39BDGWju3YrCMLl4gtov7YChc9Ig,393
-eth_portfolio_scripts/docker/check.cpython-311-darwin.so,sha256=q1Rk3bHFYEx7gzs5ykrUhuDdAaiJYHi2cGL59rSUFKc,50664
-eth_portfolio_scripts/docker/__init__.cpython-311-darwin.so,sha256=FqHkPK0xrK1c0kRM1sv92jUfdoYBgA8uPtJ29hKhzhw,50656
+eth_portfolio_scripts/docker/check.cpython-311-darwin.so,sha256=4xl87Moe_JP7DOoKb4_mzMIfz8lNcqmVDv6NnUNqdl8,50664
+eth_portfolio_scripts/docker/__init__.cpython-311-darwin.so,sha256=qFOpnNrEGGvtuuWHg9i3RrRxpdVrEPtI_1hfREg_Hes,50656
 eth_portfolio_scripts/docker/.grafana/datasources/datasources.yml,sha256=pBE_0Nh_J7d9Fiy3Xu6vuac_HWCBcFsJJSV-ryjQR1Y,188
 eth_portfolio_scripts/docker/.grafana/dashboards/dashboards.yaml,sha256=MynNDOk69IihoYdd2bL7j8CnRb2Co4gdqW7T4m6AaEU,202
 eth_portfolio_scripts/docker/.grafana/dashboards/Portfolio/Balances.json,sha256=dBmjogLJRuixCHWSs4ROE0_FXb-PUbqWBHEdLoP-1MU,68788