Fixed waiting for response indefinitely when IPFS hash is not available (#690)

droserasprout · web-flow · commit 2338cd11ca89 · 2023-05-03T03:06:10.000+04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,11 +8,13 @@ The format is based on [Keep a Changelog], and this project adheres to [Semantic
 
 ### Fixed
 
-- config: Fixed crash on `event` index definitions.
+- config: Fixed crash due to incorrect parsing of `event` index definitions.
+- http: Fixed waiting for response indefinitely when IPFS hash is not available.
 
 ### Other
 
 - ci: Slim Docker image updated to Alpine 3.17.
+- metadata: Added `nairobinet` to supported networks.
 
 ## [6.5.5] - 2022-04-17
 
diff --git a/poetry.lock b/poetry.lock
diff --git a/requirements.dev.txt b/requirements.dev.txt
@@ -17,7 +17,7 @@ chardet==5.1.0 ; python_version >= "3.10" and python_version < "3.11"
 charset-normalizer==3.1.0 ; python_version >= "3.10" and python_version < "3.11"
 click==8.1.3 ; python_version >= "3.10" and python_version < "3.11"
 colorama==0.4.6 ; python_version >= "3.10" and python_version < "3.11" and platform_system == "Windows" or python_version >= "3.10" and python_version < "3.11" and sys_platform == "win32"
-coverage[toml]==7.2.3 ; python_version >= "3.10" and python_version < "3.11"
+coverage[toml]==7.2.5 ; python_version >= "3.10" and python_version < "3.11"
 datamodel-code-generator==0.18.1 ; python_version >= "3.10" and python_version < "3.11"
 diff-cover==7.5.0 ; python_version >= "3.10" and python_version < "3.11"
 dnspython==2.3.0 ; python_version >= "3.10" and python_version < "3.11"
@@ -47,7 +47,7 @@ mypy-extensions==1.0.0 ; python_version >= "3.10" and python_version < "3.11"
 mypy==1.2.0 ; python_version >= "3.10" and python_version < "3.11"
 openapi-schema-validator==0.3.4 ; python_version >= "3.10" and python_version < "3.11"
 openapi-spec-validator==0.5.1 ; python_version >= "3.10" and python_version < "3.11"
-orjson==3.8.10 ; python_version >= "3.10" and python_version < "3.11"
+orjson==3.8.11 ; python_version >= "3.10" and python_version < "3.11"
 packaging==23.1 ; python_version >= "3.10" and python_version < "3.11"
 pathable==0.4.3 ; python_version >= "3.10" and python_version < "3.11"
 pathspec==0.11.1 ; python_version >= "3.10" and python_version < "3.11"
@@ -76,16 +76,16 @@ pywin32==306 ; python_version >= "3.10" and python_version < "3.11" and sys_plat
 pyyaml==6.0 ; python_version >= "3.10" and python_version < "3.11"
 requests==2.29.0 ; python_version >= "3.10" and python_version < "3.11"
 ruamel-yaml-clib==0.2.7 ; platform_python_implementation == "CPython" and python_version < "3.11" and python_version >= "3.10"
-ruamel-yaml==0.17.21 ; python_version >= "3.10" and python_version < "3.11"
-ruff==0.0.263 ; python_version >= "3.10" and python_version < "3.11"
-sentry-sdk==1.21.0 ; python_version >= "3.10" and python_version < "3.11"
+ruamel-yaml==0.17.22 ; python_version >= "3.10" and python_version < "3.11"
+ruff==0.0.264 ; python_version >= "3.10" and python_version < "3.11"
+sentry-sdk==1.21.1 ; python_version >= "3.10" and python_version < "3.11"
 setuptools==67.7.2 ; python_version >= "3.10" and python_version < "3.11"
 six==1.16.0 ; python_version >= "3.10" and python_version < "3.11"
 sniffio==1.3.0 ; python_version >= "3.10" and python_version < "3.11"
 snowballstemmer==2.2.0 ; python_version >= "3.10" and python_version < "3.11"
 sphinx-click==4.4.0 ; python_version >= "3.10" and python_version < "3.11"
 sphinx-markdown-builder==0.5.5 ; python_version >= "3.10" and python_version < "3.11"
-sphinx==6.2.1 ; python_version >= "3.10" and python_version < "3.11"
+sphinx==7.0.0 ; python_version >= "3.10" and python_version < "3.11"
 sphinxcontrib-applehelp==1.0.4 ; python_version >= "3.10" and python_version < "3.11"
 sphinxcontrib-devhelp==1.0.2 ; python_version >= "3.10" and python_version < "3.11"
 sphinxcontrib-htmlhelp==2.0.1 ; python_version >= "3.10" and python_version < "3.11"
diff --git a/requirements.pytezos.txt b/requirements.pytezos.txt
@@ -53,7 +53,7 @@ importlib-resources==5.12.0 ; python_version >= "3.10" and python_version < "3.1
 inflect==5.6.2 ; python_version >= "3.10" and python_version < "3.11"
 ipykernel==6.22.0 ; python_version >= "3.10" and python_version < "3.11"
 ipython-genutils==0.2.0 ; python_version >= "3.10" and python_version < "3.11"
-ipython==8.12.0 ; python_version >= "3.10" and python_version < "3.11"
+ipython==8.13.1 ; python_version >= "3.10" and python_version < "3.11"
 iso8601==1.1.0 ; python_version >= "3.10" and python_version < "3.11"
 isoduration==20.11.0 ; python_version >= "3.10" and python_version < "3.11"
 isort==5.12.0 ; python_version >= "3.10" and python_version < "3.11"
@@ -87,7 +87,7 @@ notebook-shim==0.2.3 ; python_version >= "3.10" and python_version < "3.11"
 notebook==6.5.4 ; python_version >= "3.10" and python_version < "3.11"
 openapi-schema-validator==0.3.4 ; python_version >= "3.10" and python_version < "3.11"
 openapi-spec-validator==0.5.1 ; python_version >= "3.10" and python_version < "3.11"
-orjson==3.8.10 ; python_version >= "3.10" and python_version < "3.11"
+orjson==3.8.11 ; python_version >= "3.10" and python_version < "3.11"
 packaging==23.1 ; python_version >= "3.10" and python_version < "3.11"
 pandocfilters==1.5.0 ; python_version >= "3.10" and python_version < "3.11"
 parso==0.8.3 ; python_version >= "3.10" and python_version < "3.11"
@@ -128,10 +128,10 @@ requests==2.29.0 ; python_version >= "3.10" and python_version < "3.11"
 rfc3339-validator==0.1.4 ; python_version >= "3.10" and python_version < "3.11"
 rfc3986-validator==0.1.1 ; python_version >= "3.10" and python_version < "3.11"
 ruamel-yaml-clib==0.2.7 ; platform_python_implementation == "CPython" and python_version < "3.11" and python_version >= "3.10"
-ruamel-yaml==0.17.21 ; python_version >= "3.10" and python_version < "3.11"
+ruamel-yaml==0.17.22 ; python_version >= "3.10" and python_version < "3.11"
 secp256k1==0.14.0 ; python_version >= "3.10" and python_version < "3.11"
 send2trash==1.8.2 ; python_version >= "3.10" and python_version < "3.11"
-sentry-sdk==1.21.0 ; python_version >= "3.10" and python_version < "3.11"
+sentry-sdk==1.21.1 ; python_version >= "3.10" and python_version < "3.11"
 setuptools==67.7.2 ; python_version >= "3.10" and python_version < "3.11"
 simple-bson==0.0.3 ; python_version >= "3.10" and python_version < "3.11"
 simplejson==3.19.1 ; python_version >= "3.10" and python_version < "3.11"
diff --git a/requirements.slim.txt b/requirements.slim.txt
@@ -16,7 +16,7 @@ idna==3.4 ; python_version >= "3.10" and python_version < "3.11"
 iso8601==1.1.0 ; python_version >= "3.10" and python_version < "3.11"
 msgpack==1.0.5 ; python_version >= "3.10" and python_version < "3.11"
 multidict==6.0.4 ; python_version >= "3.10" and python_version < "3.11"
-orjson==3.8.10 ; python_version >= "3.10" and python_version < "3.11"
+orjson==3.8.11 ; python_version >= "3.10" and python_version < "3.11"
 prometheus-client==0.16.0 ; python_version >= "3.10" and python_version < "3.11"
 pydantic==1.10.7 ; python_version >= "3.10" and python_version < "3.11"
 pyhumps==3.8.0 ; python_version >= "3.10" and python_version < "3.11"
@@ -26,8 +26,8 @@ python-dotenv==0.19.2 ; python_version >= "3.10" and python_version < "3.11"
 pytz-deprecation-shim==0.1.0.post0 ; python_version >= "3.10" and python_version < "3.11"
 pytz==2023.3 ; python_version >= "3.10" and python_version < "3.11"
 ruamel-yaml-clib==0.2.7 ; platform_python_implementation == "CPython" and python_version < "3.11" and python_version >= "3.10"
-ruamel-yaml==0.17.21 ; python_version >= "3.10" and python_version < "3.11"
-sentry-sdk==1.21.0 ; python_version >= "3.10" and python_version < "3.11"
+ruamel-yaml==0.17.22 ; python_version >= "3.10" and python_version < "3.11"
+sentry-sdk==1.21.1 ; python_version >= "3.10" and python_version < "3.11"
 setuptools==67.7.2 ; python_version >= "3.10" and python_version < "3.11"
 six==1.16.0 ; python_version >= "3.10" and python_version < "3.11"
 sniffio==1.3.0 ; python_version >= "3.10" and python_version < "3.11"
diff --git a/requirements.txt b/requirements.txt
@@ -35,7 +35,7 @@ multidict==6.0.4 ; python_version >= "3.10" and python_version < "3.11"
 mypy-extensions==1.0.0 ; python_version >= "3.10" and python_version < "3.11"
 openapi-schema-validator==0.3.4 ; python_version >= "3.10" and python_version < "3.11"
 openapi-spec-validator==0.5.1 ; python_version >= "3.10" and python_version < "3.11"
-orjson==3.8.10 ; python_version >= "3.10" and python_version < "3.11"
+orjson==3.8.11 ; python_version >= "3.10" and python_version < "3.11"
 packaging==23.1 ; python_version >= "3.10" and python_version < "3.11"
 pathable==0.4.3 ; python_version >= "3.10" and python_version < "3.11"
 pathspec==0.11.1 ; python_version >= "3.10" and python_version < "3.11"
@@ -55,8 +55,8 @@ pytz==2023.3 ; python_version >= "3.10" and python_version < "3.11"
 pyyaml==6.0 ; python_version >= "3.10" and python_version < "3.11"
 requests==2.29.0 ; python_version >= "3.10" and python_version < "3.11"
 ruamel-yaml-clib==0.2.7 ; platform_python_implementation == "CPython" and python_version < "3.11" and python_version >= "3.10"
-ruamel-yaml==0.17.21 ; python_version >= "3.10" and python_version < "3.11"
-sentry-sdk==1.21.0 ; python_version >= "3.10" and python_version < "3.11"
+ruamel-yaml==0.17.22 ; python_version >= "3.10" and python_version < "3.11"
+sentry-sdk==1.21.1 ; python_version >= "3.10" and python_version < "3.11"
 setuptools==67.7.2 ; python_version >= "3.10" and python_version < "3.11"
 six==1.16.0 ; python_version >= "3.10" and python_version < "3.11"
 sniffio==1.3.0 ; python_version >= "3.10" and python_version < "3.11"
diff --git a/src/dipdup/config.py b/src/dipdup/config.py
@@ -19,7 +19,6 @@
 import json
 import logging.config
 import re
-import sys
 from abc import ABC
 from abc import abstractmethod
 from collections import Counter
@@ -204,8 +203,8 @@ class HTTPConfig:
 class ResolvedHTTPConfig:
     """HTTP client configuration with defaults"""
 
-    retry_count: int = sys.maxsize
-    retry_sleep: float = 0.0
+    retry_count: int = 10
+    retry_sleep: float = 1.0
     retry_multiplier: float = 1.0
     ratelimit_rate: int = 0
     ratelimit_period: int = 0
@@ -1286,6 +1285,7 @@ def import_objects(self, package: str) -> None:
             if isinstance(handler_config, EventHandlerConfig):
                 handler_config.initialize_event_type(package)
 
+
 ResolvedIndexConfigU = (
     OperationIndexConfig
     | BigMapIndexConfig
diff --git a/src/dipdup/datasources/metadata/enums.py b/src/dipdup/datasources/metadata/enums.py
@@ -4,5 +4,5 @@
 class MetadataNetwork(Enum):
     mainnet = 'mainnet'
     ghostnet = 'ghostnet'
-    limanet = 'limanet'
     mumbainet = 'mumbainet'
+    nairobinet = 'nairobinet'
diff --git a/src/dipdup/http.py b/src/dipdup/http.py
@@ -95,7 +95,7 @@ async def __aenter__(self) -> None:
             base_url=self._url,
             json_serialize=lambda *a, **kw: orjson.dumps(*a, **kw).decode(),
             connector=aiohttp.TCPConnector(limit=self._config.connection_limit),
-            timeout=aiohttp.ClientTimeout(connect=self._config.connection_timeout),
+            timeout=aiohttp.ClientTimeout(total=self._config.connection_timeout),
         )
 
     async def __aexit__(self, exc_type: type[BaseException] | None, exc_val: BaseException | None, exc_tb: Any) -> None:

Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ async def __aenter__(self) -> None:`
`95`	`95`	`base_url=self._url,`
`96`	`96`	`json_serialize=lambda a, kw: orjson.dumps(a, **kw).decode(),`
`97`	`97`	`connector=aiohttp.TCPConnector(limit=self._config.connection_limit),`
`98`		`- timeout=aiohttp.ClientTimeout(connect=self._config.connection_timeout),`
	`98`	`+ timeout=aiohttp.ClientTimeout(total=self._config.connection_timeout),`
`99`	`99`	`)`
`100`	`100`
`101`	`101`	`async def __aexit__(self, exc_type: type[BaseException] \| None, exc_val: BaseException \| None, exc_tb: Any) -> None:`