eth-portfolio-temp 0.2.1.dev0__cp310-cp310-win32.whl → 0.2.2.dev0__cp310-cp310-win32.whl

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,7 +26,11 @@ 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:

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.2.dev0.dist-info}/METADATA

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

@@ -1,22 +1,22 @@
-295eace8438df6ec133b__mypyc.cp310-win32.pyd,sha256=lcA1ucFAGUptStOvLSXSHj967IErXimgJkLkQ9CO7_s,227840
+295eace8438df6ec133b__mypyc.cp310-win32.pyd,sha256=mCt9uLS5lPp7Cf-Oa0Tz5SJy4NS63MVBnvSxzX4tODc,227840
 eth_portfolio/__init__.py,sha256=5GmHYzhUX2gOC4MScgXnqS8x2MawbpWOuWPmqlvCotA,525
-eth_portfolio/_argspec.cp310-win32.pyd,sha256=0v3LXc04o8jb1NhW1kWAIL0BmutHTPrha56tXSslqpU,9216
+eth_portfolio/_argspec.cp310-win32.pyd,sha256=n_gdNw_lniOQl8TVUEijJwOzA4DL7NnD0KiLTBt4c3o,9216
 eth_portfolio/_argspec.py,sha256=au8ycJ56-7UzbQVzYUOoMX9sToH0QNi2tS1O820xB3A,1637
 eth_portfolio/_cache.py,sha256=H8n8x0Xo-iHQ8Q-NPuk57mmbIG6qDj4Wal6_-tK9Pfs,4866
-eth_portfolio/_config.cp310-win32.pyd,sha256=UXzlQ9UfFLOKuctlZboTLjfJCZyyqNlO5FpMU2nYJyM,9216
+eth_portfolio/_config.cp310-win32.pyd,sha256=P0UBefU36RWAqaK3h7T4xeDzq-BSbJTF0ZhcHSk3klA,9216
 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.cp310-win32.pyd,sha256=1rzztUBSN9TT98E7rPZinltV6mh9SxwLq8mbAbJoYbE,9216
+eth_portfolio/_shitcoins.cp310-win32.pyd,sha256=OhGf-l1C6oZTnVg26C7yQsTewnSTJHqwNxNZGw5Rc3k,9216
 eth_portfolio/_shitcoins.py,sha256=iKDhRsq0qtSm0nal1zyJp6Ny13UAZEW4C8xU5_lfse0,15866
-eth_portfolio/_stableish.cp310-win32.pyd,sha256=QSLeFeBpTOEQ0bGtM34_mvbfiOBSOmKxYn1WZxZGHI4,9216
+eth_portfolio/_stableish.cp310-win32.pyd,sha256=2rdWMBrG0OUOGy98dc5vSuOh7aC2yLxcbykpyC6PdDE,9216
 eth_portfolio/_stableish.py,sha256=8pdlYe2YcZ8rTzdCzg-ihRQLPtSFXBNDjtnvuTgPRcQ,2063
 eth_portfolio/_submodules.py,sha256=zne-2YyVFoKHwkLuHx8cdz5lpcwwSDw1edJ9v8G4c1A,2263
 eth_portfolio/_utils.py,sha256=PlzMkvrSlR4htROT1sMP11m2A0m-CIcZlXVFfTW272w,7970
 eth_portfolio/address.py,sha256=RrFIWSx6jSITwh16Hqs6W6S9fz1KEaebQEk1vqL3HwI,14536
 eth_portfolio/buckets.py,sha256=pm2-_8VbGKpe6hHM6eysj17JK7Rhngr9-_gpVi-J1uA,6889
-eth_portfolio/constants.cp310-win32.pyd,sha256=9pU3IrTCOtFQcqu1-SpgA-xbQBZwW8R4_X5VB0bAIJQ,9216
+eth_portfolio/constants.cp310-win32.pyd,sha256=3KDdDxo8bL34b4lPiPajqsJ9K5WZUMJy8eVFWxvuJ1k,9216
 eth_portfolio/constants.py,sha256=rUXWFaCGrrF_qzIdDvVzakQJsLnrGtFNn2EgRbZh8fQ,3741
 eth_portfolio/portfolio.py,sha256=FVx4QwnJH4llTWcYln9UpDkKridHSEAENbTHCBOSq_o,24904
 eth_portfolio/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -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.cp310-win32.pyd,sha256=_ARYPSFGrMxf3VWYdqP65Y6QARNgbkoVBjIrJSxSuSk,9216
+eth_portfolio/_loaders/_nonce.cp310-win32.pyd,sha256=zXhG2sCcxvofgVBaVxnUoV7TTkN91C2sDVAxDnzX7_o,9216
 eth_portfolio/_loaders/_nonce.py,sha256=bA-5fZG8ALuADgQGrnoxt6p6j7QEwI6vIGnZRF1Zx7M,6481
-eth_portfolio/_loaders/balances.cp310-win32.pyd,sha256=zbd5JZX8hLUSV6BvMCNLyW9jyaLfs93DEQ9a022UK-M,9216
+eth_portfolio/_loaders/balances.cp310-win32.pyd,sha256=xpwBJxcgVjUSMzuMgIscmBpwfgoMRWHOYdy9zxzwCRo,9216
 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.cp310-win32.pyd,sha256=gWqEpJFSDsrgsFOamUjq0UWJvzEEAo29FUr_ZDP6_xw,9216
+eth_portfolio/_loaders/utils.cp310-win32.pyd,sha256=EA8INRsldvkUfZEb7sQGyeKSIWIAOvGHSOBcqmAqToY,9216
 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=xa-xNI3w6P54evq0qfRL0Vv2LEZ-6GnNKsSfDVaK-H0,6905
+eth_portfolio_scripts/_portfolio.py,sha256=f2o1fNJLsB0Y1Qo-GCIeLaKa3t8H1LwdDjstVX6ByzE,7116
 eth_portfolio_scripts/_utils.py,sha256=7maEWyS5i_Kp7iVaa5puf2ZyefqHDsUOqTDLz-UwIQY,2630
-eth_portfolio_scripts/balances.cp310-win32.pyd,sha256=M6yJ6j_4ICABbS_kQUMvpqLj5_0C8FPb5l4B6-z7taE,9216
-eth_portfolio_scripts/balances.py,sha256=reli3W6K9-8F8I_n0tIwS9SuUykpPJnbiMsnJgY9N_w,1573
-eth_portfolio_scripts/main.py,sha256=vSYt6Ajq2wZ1ErSoEdLaLQmfpZnFcN6S-kSYaKQ0KEY,3633
+eth_portfolio_scripts/balances.cp310-win32.pyd,sha256=5t7vBi3JxQHD_gl7DzAJyZf_mhkaIqaZRtvZnNHfkyQ,9216
+eth_portfolio_scripts/balances.py,sha256=ApYTA5caujTRAIDxHnYmHk03CqFC9nNpTzJIDWLws8E,1640
+eth_portfolio_scripts/main.py,sha256=upkr0Vc758qti___5kyDsE0zcfwiZju4xvAQsKsu9iw,3804
 eth_portfolio_scripts/py.typed,sha256=frcCV1k9oG9oKj3dpUqdJg1PxRT2RSN_XKdLCPjaYaY,2
-eth_portfolio_scripts/docker/__init__.cp310-win32.pyd,sha256=TBX-pPGoW4gsiTex9z20BbBFtLNpoJur28rFgisCphc,9216
+eth_portfolio_scripts/docker/__init__.cp310-win32.pyd,sha256=UOP_TfZV1PCNVAXb87pJmogYTPqtWNYyvt-e_suJi6I,9216
 eth_portfolio_scripts/docker/__init__.py,sha256=R27uZPLUEK2--fb9IrxrDUk6R5_IVFJSv7s_ia7p5Xk,409
-eth_portfolio_scripts/docker/check.cp310-win32.pyd,sha256=37-lX7MgAVTEkFElpyWorMKdGjyMLwRAjiTF96nAJ-I,9216
+eth_portfolio_scripts/docker/check.cp310-win32.pyd,sha256=U-jZ2M1Ah0hgbzwDwEjHOgkCvywyU3CkTlSIT_Wzxso,9216
 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.cp310-win32.pyd,sha256=-67LgDKNREKmjaMMuHopqoNa5-KyvkhQY1-u7H9gF9c,9216
+eth_portfolio_scripts/docker/docker_compose.cp310-win32.pyd,sha256=AZMMGDUBC56v2ZUBjhomSHYkkPPj7yWjwvMapZgY5Nc,9216
 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.1.dev0.dist-info/METADATA,sha256=zohDJdaFl7C4eZlSsAuCc15f8_8wMRM7Smo9j_o_aYo,804
-eth_portfolio_temp-0.2.1.dev0.dist-info/WHEEL,sha256=GWZF0cboiU4MhsG0baPl8rrtCaXFSLW25384gp3vddM,97
-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/RECORD,,
+eth_portfolio_temp-0.2.2.dev0.dist-info/METADATA,sha256=nszEgqdcwJnICtDLL2x8XAJNfNj4Eo3_b_-EqWwJcfI,804
+eth_portfolio_temp-0.2.2.dev0.dist-info/WHEEL,sha256=GWZF0cboiU4MhsG0baPl8rrtCaXFSLW25384gp3vddM,97
+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/RECORD,,