eth-portfolio-temp 0.2.1.dev0__cp310-cp310-macosx_11_0_arm64.whl → 0.2.3.dev0__cp310-cp310-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_scripts/_portfolio.py

@@ -40,8 +40,10 @@ class ExportablePortfolio(Portfolio):
     def __init__(
         self,
         addresses: Addresses,
+        *,
         start_block: int = 0,
         label: str = _DEFAULT_LABEL,
+        concurrency: int = 60,
         load_prices: bool = True,
         get_bucket: Callable[[ChecksumAddress], Awaitable[str]] = get_token_bucket,
         num_workers_transactions: int = 1000,
@@ -51,6 +53,7 @@ class ExportablePortfolio(Portfolio):
             addresses, start_block, label, load_prices, num_workers_transactions, asynchronous
         )
         self.get_bucket = get_bucket
+        self._semaphore = a_sync.Semaphore(concurrency)
 
     @cached_property
     def _data_queries(self) -> Tuple[str, str]:
@@ -88,36 +91,36 @@ class ExportablePortfolio(Portfolio):
         except Exception as e:
             log_error("Error processing %s:", dt, exc_info=True)
 
-    @a_sync.Semaphore(60)
     async def get_data_for_export(self, block: BlockNumber, ts: datetime) -> List[victoria.Metric]:
-        print(f"exporting {ts} for {self.label}")
-        start = datetime.now(tz=timezone.utc)
-
-        metrics_to_export = []
-        data: PortfolioBalances = await self.describe(block, sync=False)
-
-        for wallet, wallet_data in dict.items(data):
-            for section, section_data in wallet_data.items():
-                if isinstance(section_data, TokenBalances):
-                    for token, bals in dict.items(section_data):
-                        metrics_to_export.extend(
-                            await self.__process_token(ts, section, wallet, token, bals)
-                        )
-                elif isinstance(section_data, RemoteTokenBalances):
-                    if section == "external":
-                        section = "assets"
-                    for protocol, token_bals in section_data.items():
-                        for token, bals in dict.items(token_bals):
+        async with self._semaphore:
+            print(f"exporting {ts} for {self.label}")
+            start = datetime.now(tz=timezone.utc)
+
+            metrics_to_export = []
+            data: PortfolioBalances = await self.describe(block, sync=False)
+
+            for wallet, wallet_data in dict.items(data):
+                for section, section_data in wallet_data.items():
+                    if isinstance(section_data, TokenBalances):
+                        for token, bals in dict.items(section_data):
                             metrics_to_export.extend(
-                                await self.__process_token(
-                                    ts, section, wallet, token, bals, protocol=protocol
-                                )
+                                await self.__process_token(ts, section, wallet, token, bals)
                             )
-                else:
-                    raise NotImplementedError()
+                    elif isinstance(section_data, RemoteTokenBalances):
+                        if section == "external":
+                            section = "assets"
+                        for protocol, token_bals in section_data.items():
+                            for token, bals in dict.items(token_bals):
+                                metrics_to_export.extend(
+                                    await self.__process_token(
+                                        ts, section, wallet, token, bals, protocol=protocol
+                                    )
+                                )
+                    else:
+                        raise NotImplementedError()
 
-        print(f"got data for {ts} in {datetime.now(tz=timezone.utc) - start}")
-        return metrics_to_export
+            print(f"got data for {ts} in {datetime.now(tz=timezone.utc) - start}")
+            return metrics_to_export
 
     def __get_data_exists_coros(self, dt: datetime) -> Iterator[str]:
         for query in self._data_queries:

eth_portfolio_scripts/balances.py

@@ -26,13 +26,16 @@ async def export_balances(args: Namespace) -> None:
 
     interval = parse_timedelta(args.interval)
     portfolio = ExportablePortfolio(
-        args.wallet, label=args.label, start_block=args.first_tx_block, load_prices=False
+        args.wallet,
+        label=args.label,
+        start_block=args.first_tx_block,
+        concurrency=args.concurrency,
+        load_prices=False,
     )
 
     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_scripts/main.py

@@ -54,6 +54,12 @@ export_parser.add_argument(
     help="The time interval between datapoints. default: 6h",
     default="6h",
 )
+export_parser.add_argument(
+    "--concurrency",
+    type=int,
+    help="The max number of historical blocks to export concurrently. default: 60",
+    default=60,
+)
 export_parser.add_argument(
     "--first-tx-block",
     type=int,

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eth_portfolio_temp
-Version: 0.2.1.dev0
+Version: 0.2.3.dev0
 Summary: eth-portfolio makes it easy to analyze your portfolio.
 Home-page: https://github.com/BobTheBuidler/eth-portfolio
 Author: BobTheBuidler

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

@@ -1,34 +1,39 @@
-295eace8438df6ec133b__mypyc.cpython-310-darwin.so,sha256=6W2DIXis2XQKSihfz_vibq_BIUKMu3-ClllyxaHzPNw,668304
+295eace8438df6ec133b__mypyc.cpython-310-darwin.so,sha256=lS3hdPVgjh2LJyOK7vd9__IkswkUiXMGrqNvaVuNyMk,669536
+eth_portfolio_temp-0.2.3.dev0.dist-info/RECORD,,
+eth_portfolio_temp-0.2.3.dev0.dist-info/WHEEL,sha256=11kMdE9gzbsaQG30fRcsAYxBLEVRsqJo098Y5iL60Xo,136
+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/METADATA,sha256=orjcH7HsKx696s8BFy30bkvhBHUkC9YgS4H3t20BC6U,779
 eth_portfolio/address.py,sha256=LvBh4Vp2DBC3gQ0WD-TZ6jfe9s6FZbET1krYG9_KMAA,14139
 eth_portfolio/_cache.py,sha256=PYkR-yExjuwd_t7swv4euxL2daJ-VFwh3EMb3MciRJE,4745
-eth_portfolio/_stableish.cpython-310-darwin.so,sha256=8AEIWnmZ5FvKrd-3o4D_I9qidzM_n7saebKA_3fC-tI,50656
+eth_portfolio/_stableish.cpython-310-darwin.so,sha256=B0bMKE_y6UWqYzUHYuhnzG69wg4yIyi5hndFOUubHro,50656
 eth_portfolio/_argspec.py,sha256=VzUZkbDkmOSgNUZBGbGblqtxBfDcmBAB89dY2OX0j-U,1595
 eth_portfolio/_submodules.py,sha256=J8ht9bAAvblUXqwOGN7UIOXUPxrTiq7m1RWiB0-ObaE,2190
 eth_portfolio/constants.py,sha256=LS9H2P_Qfcreb6z6NknErxvq6OAtIHbHykXy0spol9E,3659
 eth_portfolio/__init__.py,sha256=0sO4cSJaLYwJfnfVOJRFw7p5_Lzhsr95YuJ1aNQM83A,500
-eth_portfolio/_argspec.cpython-310-darwin.so,sha256=5L_jjnCERLXXlHYZv6LI7nkfCraIx4n8GqCZjo6Jyck,50640
+eth_portfolio/_argspec.cpython-310-darwin.so,sha256=Lt-AT6ihWTtexbY7oy6B3xpJooQ1nkV8aN3V4TuqDNE,50640
 eth_portfolio/_decimal.py,sha256=nuUl6DZHCtrbBN7snwvs4LLaoJ5k7mn3dt4qmlFCkTU,4731
-eth_portfolio/_config.cpython-310-darwin.so,sha256=gvz5RDSgxWRCxIv5jMNTKL5MdplOwOHf7ncuFalFEJU,50640
+eth_portfolio/_config.cpython-310-darwin.so,sha256=6vEeyU2QpAx2XmtYXu9pYDfpmB2p7rSlb2_sXYYGhlE,50640
 eth_portfolio/buckets.py,sha256=QwdqWzW9iWBmRcJ2aktRtL-obvtBnND179krY5ISbhY,6695
-eth_portfolio/_shitcoins.cpython-310-darwin.so,sha256=Bn4GUwNiqqBtSQv680JTRx8NvbdRvwthTVDKq32Kdbg,50656
+eth_portfolio/_shitcoins.cpython-310-darwin.so,sha256=YUuKqzKzLD0X_seAMVRcar2ck9Yr_K24gJyHi9ZIG3M,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/constants.cpython-310-darwin.so,sha256=sx2_P3l1Gu-o1fAWmDPchuTkSXs0lqPNrlIyxLxiMUQ,50656
+eth_portfolio/constants.cpython-310-darwin.so,sha256=R-9RjzQVbC-iICRGQoN4X1lk459ydSSjo1XMmfEZ6pg,50656
 eth_portfolio/_config.py,sha256=mw-OA3M8rUA2hqy5wNt30AZRHkWFgR8K2sJg0o5Baxg,98
 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/_loaders/_nonce.cpython-310-darwin.so,sha256=ySogFqbDD2XOZrOfjFfzClPySPwj4WTDscmzT10RxrM,50656
+eth_portfolio/_utils.py,sha256=Ab3m6i79U-tnTrc_b_kTmOO4xKjbsX9slf6l0sXzf4c,7770
+eth_portfolio/_loaders/_nonce.cpython-310-darwin.so,sha256=NeMoSkEAMa69B28s7EsO_uua77l875Fm0J1bkadWJrY,50656
 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.py,sha256=cx0EjTAhVU2EudMKSO-7-t1jl3y4dYn6as4XiY6KyS8,6285
 eth_portfolio/_loaders/utils.py,sha256=my3Wg2Ip5gSWuzAWcoLQQEmVmAPhIHbBzQQc0iP1iCA,2258
-eth_portfolio/_loaders/balances.cpython-310-darwin.so,sha256=rT6eNzW3zM4tmvUmXRxVpPmqE1m95epVn99S06xk-3Q,50656
+eth_portfolio/_loaders/balances.cpython-310-darwin.so,sha256=88iLjjef3fDPPv-BIWUvoEhsLUN-6ZlAi4blZIV4k5w,50656
 eth_portfolio/_loaders/balances.py,sha256=BTWfkJIoSraUMe94Wuj8NPyg5EO0OByIjbXu7j6PZEo,3132
 eth_portfolio/_loaders/token_transfer.py,sha256=MEw95D2iKBYa_9vIatCHJGe7zEJuYUEC8P1mTjjRXlo,8524
-eth_portfolio/_loaders/utils.cpython-310-darwin.so,sha256=RwfuPL_Wad9yjxKMF8z3t5QQH9SolglCnvfcQxeq9YU,50648
+eth_portfolio/_loaders/utils.cpython-310-darwin.so,sha256=eiesB53yn8st0A8WtajuZzrmxHAk07VGXfNnymg5D0Q,50648
 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
@@ -55,27 +60,22 @@ eth_portfolio/protocols/lending/__init__.py,sha256=BZtCOglz6R12wqETlECbCEITdtIT9
 eth_portfolio/protocols/lending/README.md,sha256=OhZfsW8e-aD-q02g0maG9QGgW0IietkDRZc7PBakBvc,493
 eth_portfolio/protocols/lending/compound.py,sha256=bqnIevm7NWhk6nMfkMZUKlQuVWr-tXnuntX-4De1YZM,7252
 eth_portfolio/protocols/lending/unit.py,sha256=7oRvIkoKUm8IOnDv59pILSSJWFNNjwr4CR1gg2psW9M,1965
-eth_portfolio_temp-0.2.1.dev0.dist-info/RECORD,,
-eth_portfolio_temp-0.2.1.dev0.dist-info/WHEEL,sha256=11kMdE9gzbsaQG30fRcsAYxBLEVRsqJo098Y5iL60Xo,136
-eth_portfolio_temp-0.2.1.dev0.dist-info/entry_points.txt,sha256=yqoC6X3LU1NA_-oJ6mloEYEPNmS-0hPS9OtEwgIeDGU,66
-eth_portfolio_temp-0.2.1.dev0.dist-info/top_level.txt,sha256=CmTLi8Lvs3RulV5ZNdziaDVvF_WRsgRpM17GSMECxrg,64
-eth_portfolio_temp-0.2.1.dev0.dist-info/METADATA,sha256=5GTbcM4x4Qh82t2ZCdoMIFyvWiUmozo54sjQJxdp4QA,779
 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/balances.cpython-310-darwin.so,sha256=B6HkajIUII1wUi_rKE8yH55skEjYPuy1Rafr4bNgyvw,50656
-eth_portfolio_scripts/_portfolio.py,sha256=cv4Qpb3EdwhO2sZEOnHYFWOHaoFo6wwt3nddyfDBYv0,6724
+eth_portfolio_scripts/balances.cpython-310-darwin.so,sha256=D3Oh_m_Ej19rcEH259GsbkoJCunZ4Whpa147fUqP1I4,50656
+eth_portfolio_scripts/_portfolio.py,sha256=36n8DE9OfHvdF0ez12yzWpxI7at6_eo3eno7V_YYu3A,6932
 eth_portfolio_scripts/py.typed,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-eth_portfolio_scripts/balances.py,sha256=o94uA4FVgPE-chbaoQgQazfXQ0O8k6W_yk9JY2bgRpQ,1524
-eth_portfolio_scripts/main.py,sha256=A7N78d2hxoU-Xu-dITCRqZ7yRL2l5r26WWzXzMdbeYo,3520
+eth_portfolio_scripts/balances.py,sha256=QvpOdXnH1V-tOuEmAOPxH3MrincDExlIP1eEJ2IG2Lk,1588
+eth_portfolio_scripts/main.py,sha256=vafXy4JvNWrP203AgCRcSKHMsOSCC7VVj9zBd_BFYZU,3685
 eth_portfolio_scripts/_utils.py,sha256=qyct1Mwf2-1DYj7BUWt2bocUfGKMap1l9sxUfHAjER0,2538
-eth_portfolio_scripts/docker/docker_compose.cpython-310-darwin.so,sha256=UZ6_f45DjzwfU4ozM7Eyxw601CAx8mwAlSIbZMDk60A,50712
+eth_portfolio_scripts/docker/docker_compose.cpython-310-darwin.so,sha256=9UIARu6T4k0fvB66IKx-Y921LWZKAM4MVa6Ps5Wftws,50712
 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.cpython-310-darwin.so,sha256=RfGVOZB2fe6AmfM09wArZcO-IuRb5JU86wyTspvOJLE,50664
+eth_portfolio_scripts/docker/check.cpython-310-darwin.so,sha256=fKasSAtAH8sPH7bKNLTFhx6civu_QaQInWd5DpFg4BI,50664
 eth_portfolio_scripts/docker/check.py,sha256=E6_Ar4dr6HfVAgpwoDPcObIolikHKQr8VFkH01sOuIM,1745
 eth_portfolio_scripts/docker/__init__.py,sha256=ZXSIYcjp94c0O9o39BDGWju3YrCMLl4gtov7YChc9Ig,393
-eth_portfolio_scripts/docker/__init__.cpython-310-darwin.so,sha256=CGut7DsUpZoethtW0EmR-QuzSP4r9Oe8HdokarembCM,50656
+eth_portfolio_scripts/docker/__init__.cpython-310-darwin.so,sha256=q3TSnxSkyGsBGkL7QQ7DARlDzXX26rtowKpjJkRjhkE,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