feat(python): Increase timeout on retries (#5857)

Author: eric-zaharia

clients/algoliasearch-client-python/algoliasearch/http/retry.py

@@ -34,6 +34,7 @@ def decide(self, host: Host, response: ApiResponse) -> str:
 
             return RetryOutcome.RETRY
         elif self._is_success(response):
+            host.retry_count = 0
             return RetryOutcome.SUCCESS
 
         return RetryOutcome.FAIL

clients/algoliasearch-client-python/algoliasearch/http/transporter.py

@@ -2,7 +2,7 @@
 from json import loads
 from typing import List, Optional
 
-from aiohttp import ClientSession, TCPConnector
+from aiohttp import ClientSession, ClientTimeout, TCPConnector
 from async_timeout import timeout
 
 from algoliasearch.http.api_response import ApiResponse
@@ -56,27 +56,37 @@ async def request(
             proxy = self.get_proxy(url)
 
             try:
-                async with timeout(self._timeout / 1000):
+                connect_timeout = (
+                    request_options.timeouts["connect"] * (host.retry_count + 1)
+                ) / 1000
+                request_timeout = self._timeout / 1000
+                total_timeout = connect_timeout + request_timeout
+
+                async with timeout(total_timeout):
+                    timeout_config = ClientTimeout(connect=connect_timeout)
+
                     resp = await self._session.request(
                         method=verb,
                         url=url,
                         headers=request_options.headers,
                         data=request_options.data,
                         proxy=proxy,
+                        timeout=timeout_config,
                     )
 
                     _raw_data = await resp.text()
-                    response = ApiResponse(
-                        verb=verb,
-                        path=path,
-                        url=url,
-                        host=host.url,
-                        status_code=resp.status,
-                        headers=resp.headers,  # pyright: ignore # insensitive dict is still a dict
-                        data=_raw_data,
-                        raw_data=_raw_data,
-                        error_message=str(resp.reason),
-                    )
+
+                response = ApiResponse(
+                    verb=verb,
+                    path=path,
+                    url=url,
+                    host=host.url,
+                    status_code=resp.status,
+                    headers=resp.headers,  # pyright: ignore # insensitive dict is still a dict
+                    data=_raw_data,
+                    raw_data=_raw_data,
+                    error_message=str(resp.reason),
+                )
 
             except TimeoutError as e:
                 response = ApiResponse(

clients/algoliasearch-client-python/algoliasearch/http/transporter_sync.py

@@ -74,9 +74,14 @@ def request(
             ).prepare()
 
             try:
+                connect_timeout = (
+                    request_options.timeouts["connect"] * (host.retry_count + 1)
+                ) / 1000
+                read_timeout = self._timeout / 1000
+
                 resp = self._session.send(
                     req,
-                    timeout=self._timeout / 1000,
+                    timeout=(connect_timeout, read_timeout),
                     proxies=proxies,
                 )