retry on httpx.HTTPError, httpx.ReadError, httpx.ConnectError, httpx.ReadTimeout

Author: kudj

src/keboola/http_client/async_client.py

@@ -145,22 +145,37 @@ async def _request(
 
                 return response
 
-            except httpx.HTTPError as e:
-                st_code = response.status_code if response else 0
-                message = response.text if response and response.text else str(e)
-
-                if not isinstance(e, httpx.ReadTimeout):
-                    e.args = (f"Error '{st_code} {message}' for url '{e.request.url}'",)
-
-                if st_code not in self.retry_status_codes:
-                    raise
+            except (httpx.HTTPError, httpx.ReadError, httpx.ConnectError, httpx.ReadTimeout) as e:
+                # For HTTP errors with response
+                if isinstance(e, httpx.HTTPStatusError) and response:
+                    st_code = response.status_code
+                    message = response.text if response.text else str(e)
+                    
+                    # Only retry on specific status codes
+                    if st_code not in self.retry_status_codes:
+                        raise
+                # For connection/read errors
+                else:
+                    message = str(e)
 
+                # Format error message for better debugging
+                if hasattr(e, 'request') and e.request:
+                    error_msg = f"Error '{message}' for url '{e.request.url}'"
+                else:
+                    error_msg = f"Error '{message}' for url '{url}'"
+                
+                # If this is the last retry attempt, raise the exception
                 if retry_attempt == self.retries:
-                    raise
+                    if isinstance(e, httpx.HTTPStatusError):
+                        raise
+                    else:
+                        # Re-raise with the formatted error message
+                        raise type(e)(error_msg) from e
+                
+                # Apply backoff and retry
                 backoff = self.backoff_factor ** retry_attempt
-                await asyncio.sleep(backoff)
-
                 logging.error(f"Retry attempt {retry_attempt + 1} for {method} request to {url}: {message}")
+                await asyncio.sleep(backoff)
 
     async def get(self, endpoint: Optional[str] = None, **kwargs) -> Dict[str, Any]:
         response = await self.get_raw(endpoint, **kwargs)