eth-portfolio-temp 0.2.2.dev0__tar.gz → 0.2.4.dev0__tar.gz

{eth_portfolio_temp-0.2.2.dev0 → eth_portfolio_temp-0.2.4.dev0}/.github/workflows/compile.yaml

@@ -19,10 +19,10 @@ jobs:
           # Check out the PR branch
           ref: ${{ github.head_ref }}
 
-      - name: Set up Python 3.12
+      - name: Set up Python 3.13
         uses: actions/setup-python@v6
         with:
-          python-version: "3.12"
+          python-version: "3.13"
           
       - name: Install Requirements
         run: pip install -r requirements.txt

{eth_portfolio_temp-0.2.2.dev0 → eth_portfolio_temp-0.2.4.dev0}/PKG-INFO

@@ -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 → eth_portfolio_temp-0.2.4.dev0}/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_temp-0.2.2.dev0 → eth_portfolio_temp-0.2.4.dev0}/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_temp-0.2.2.dev0 → eth_portfolio_temp-0.2.4.dev0}/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_temp-0.2.2.dev0 → eth_portfolio_temp-0.2.4.dev0}/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.2.dev0 → eth_portfolio_temp-0.2.4.dev0}/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 → eth_portfolio_temp-0.2.4.dev0}/eth_portfolio_temp.egg-info/PKG-INFO

@@ -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 → eth_portfolio_temp-0.2.4.dev0}/eth_portfolio_temp.egg-info/requires.txt

@@ -8,4 +8,4 @@ faster-eth-utils
 numpy<3
 pandas<3,>=1.4.3
 typed-envs>=0.0.9
-ypricemagic<5,>=4.6.28.dev0
+ypricemagic<5,>=4.6.29.dev0

{eth_portfolio_temp-0.2.2.dev0 → eth_portfolio_temp-0.2.4.dev0}/pyproject.toml

@@ -2,7 +2,7 @@
 requires = [
     "setuptools",
     "wheel",
-    "mypy[mypyc]>=1.17.1,<1.18.0",
+    "mypy[mypyc]>=1.18.1,<1.18.2",
     "types-aiofiles",
     "eth-brownie==1.21.0; sys_platform=='linux'",
     "eth-typing==4.4.0",

{eth_portfolio_temp-0.2.2.dev0 → eth_portfolio_temp-0.2.4.dev0}/requirements.txt

@@ -8,4 +8,4 @@ faster-eth-utils
 numpy<3
 pandas>=1.4.3,<3
 typed-envs>=0.0.9
-ypricemagic>=4.6.28.dev0,<5
+ypricemagic>=4.6.29.dev0,<5

{eth_portfolio_temp-0.2.2.dev0 → eth_portfolio_temp-0.2.4.dev0}/setup.py

@@ -104,7 +104,7 @@ except Exception as e:  # fallback in case build fails
 setup(
     # NOTE: somebody stole our name on pypi, we have this placeholder until we steal it back
     name="eth_portfolio_temp",
-    python_requires=">=3.10,<3.13",
+    python_requires=">=3.10,<3.14",
     # name="eth-portfolio",
     packages=find_packages(),
     use_scm_version={