Merge branch 'master' into check_study_solver_job_status

Author: wvangeit

packages/service-library/src/servicelib/fastapi/http_client_thin.py

@@ -6,7 +6,7 @@
 from typing import Any
 
 from common_library.errors_classes import OsparcErrorMixin
-from httpx import AsyncClient, ConnectError, HTTPError, PoolTimeout, Response
+from httpx import AsyncClient, HTTPError, PoolTimeout, Response, TransportError
 from httpx._types import TimeoutTypes, URLTypes
 from servicelib.tracing import TracingConfig
 from tenacity import RetryCallState
@@ -134,7 +134,6 @@ def decorator(
 
         @functools.wraps(request_func)
         async def request_wrapper(zelf: "BaseThinClient", *args, **kwargs) -> Response:
-            # pylint: disable=protected-access
             try:
                 async for attempt in AsyncRetrying(
                     stop=stop_after_delay(
@@ -143,7 +142,7 @@ async def request_wrapper(zelf: "BaseThinClient", *args, **kwargs) -> Response:
                         else zelf.total_retry_interval
                     ),
                     wait=wait_exponential(min=1),
-                    retry=retry_if_exception_type((ConnectError, PoolTimeout)),
+                    retry=retry_if_exception_type(TransportError),
                     before_sleep=before_sleep_log(_logger, logging.WARNING),
                     after=_after_log(_logger),
                     reraise=True,