connection_timeout option (#127)

* `connection_timeout` tunable

* Fix timeout

Author: droserasprout

src/dipdup/config.py

@@ -79,6 +79,7 @@ class PostgresDatabaseConfig:
     schema_name: str = 'public'
     password: str = ''
     immune_tables: List[str] = Field(default_factory=list)
+    connection_timeout: int = 60
 
     @property
     def connection_string(self) -> str:
@@ -102,7 +103,8 @@ class HTTPConfig:
     retry_multiplier: Optional[float] = None
     ratelimit_rate: Optional[int] = None
     ratelimit_period: Optional[int] = None
-    connection_limit: Optional[int] = None
+    connection_limit: Optional[int] = None  # default 100
+    connection_timeout: Optional[int] = None  # default 60
     batch_size: Optional[int] = None
 
     def merge(self, other: Optional['HTTPConfig']) -> 'HTTPConfig':
@@ -151,7 +153,7 @@ def module_name(self) -> str:
     @validator('address', allow_reuse=True)
     def valid_address(cls, v):
         # NOTE: Wallet addresses are allowed for debugging purposes (source field). Do we need a separate section?
-        if not (v.startswith('KT1') or v.startswith('tz1')) or len(v) != 36:
+        if not (v.startswith('KT') or v.startswith('tz')) or len(v) != 36:
             raise ConfigurationError(f'`{v}` is not a valid contract address')
         return v
 
@@ -755,7 +757,6 @@ class HasuraConfig:
     select_limit: int = 100
     allow_aggregations: bool = True
     camel_case: bool = False
-    connection_timeout: int = 5
     rest: bool = True
     http: Optional[HTTPConfig] = None
 

src/dipdup/dipdup.py

@@ -290,8 +290,9 @@ async def _set_up_database(self, stack: AsyncExitStack, reindex: bool) -> None:
         validate_models(self._config.package)
 
         url = self._config.database.connection_string
+        timeout = self._config.database.connection_timeout if isinstance(self._config.database, PostgresDatabaseConfig) else None
         models = f'{self._config.package}.models'
-        await stack.enter_async_context(tortoise_wrapper(url, models))
+        await stack.enter_async_context(tortoise_wrapper(url, models, timeout or 60))
 
         if reindex:
             await self._ctx.reindex(reason='run with `--reindex` option')

src/dipdup/hasura.py

@@ -143,14 +143,15 @@ async def _hasura_request(self, endpoint: str, json: Dict[str, Any]) -> Dict[str
 
     async def _healthcheck(self) -> None:
         self._logger.info('Waiting for Hasura instance to be ready')
-        for _ in range(self._hasura_config.connection_timeout):
+        timeout = self._http_config.connection_timeout or 60
+        for _ in range(timeout):
             with suppress(ClientConnectorError, ClientOSError):
                 response = await self._http._session.get(f'{self._hasura_config.url}/healthz')
                 if response.status == 200:
                     break
             await asyncio.sleep(1)
         else:
-            raise HasuraError(f'Hasura instance not responding for {self._hasura_config.connection_timeout} seconds')
+            raise HasuraError(f'Hasura instance not responding for {timeout} seconds')
 
         version_json = await (
             await self._http._session.get(

src/dipdup/http.py

@@ -65,6 +65,7 @@ async def __aenter__(self) -> None:
         """Create underlying aiohttp session"""
         self.__session = aiohttp.ClientSession(
             connector=aiohttp.TCPConnector(limit=self._config.connection_limit or 100),
+            timeout=aiohttp.ClientTimeout(self._config.connection_timeout or 60),
         )
 
     async def __aexit__(self, exc_type, exc, tb):

src/dipdup/utils/database.py

@@ -22,23 +22,21 @@
 
 
 @asynccontextmanager
-async def tortoise_wrapper(url: str, models: Optional[str] = None) -> AsyncIterator:
+async def tortoise_wrapper(url: str, models: Optional[str] = None, timeout: int = 60) -> AsyncIterator:
     """Initialize Tortoise with internal and project models, close connections when done"""
-    # TODO: Fail fast
-    attempts = 60
+    modules = {'int_models': ['dipdup.models']}
+    if models:
+        modules['models'] = [models]
     try:
-        modules = {'int_models': ['dipdup.models']}
-        if models:
-            modules['models'] = [models]
-        for attempt in range(attempts):
+        for attempt in range(timeout):
             try:
                 await Tortoise.init(
                     db_url=url,
                     modules=modules,  # type: ignore
                 )
             except (OSError, ConnectionRefusedError):
-                _logger.warning('Can\'t establish database connection, attempt %s/%s', attempt, attempts)
-                if attempt == attempts - 1:
+                _logger.warning('Can\'t establish database connection, attempt %s/%s', attempt, timeout)
+                if attempt == timeout - 1:
                     raise
                 await asyncio.sleep(1)
             else: