castor-extractor 0.24.21__py3-none-any.whl → 0.24.22__py3-none-any.whl

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.24.22 - 2025-05-27
+
+* Add retry for `Request.Timeout` on **ApiClient**
+
 ## 0.24.21 - 2025-05-26
 
 * Looker Studio: add option to skip the extraction of view activity logs

castor_extractor/transformation/coalesce/client/client.py

@@ -1,14 +1,11 @@
 from http import HTTPStatus
 from typing import Iterator, Optional
 
-import requests
-
 from ....utils import (
     APIClient,
     BearerAuth,
     RequestSafeMode,
     SerializedAsset,
-    retry,
 )
 from ..assets import CoalesceAsset, CoalesceQualityAsset
 from .credentials import CoalesceCredentials
@@ -20,9 +17,6 @@ from .utils import column_names_per_node, is_test, test_names_per_node
 
 _LIMIT_MAX = 1_000
 _MAX_ERRORS = 50
-_RETRY_BASE_MS = 10 * 60 * 1000  # 10 minutes
-_RETRY_COUNT = 2
-_RETRY_EXCEPTIONS = [requests.exceptions.ConnectTimeout]
 
 
 def _run_result_payload(result: dict, query_result: dict) -> dict:
@@ -75,11 +69,6 @@ class CoalesceClient(APIClient):
         result = self._get(endpoint=endpoint)
         return result["data"]
 
-    @retry(
-        exceptions=_RETRY_EXCEPTIONS,
-        max_retries=_RETRY_COUNT,
-        base_ms=_RETRY_BASE_MS,
-    )
     def _node_details(self, environment_id: int, node_id: str) -> dict:
         endpoint = CoalesceEndpointFactory.nodes(
             environment_id=environment_id, node_id=node_id

castor_extractor/utils/client/api/client.py

@@ -5,7 +5,7 @@ from typing import Callable, Literal, Optional
 import requests
 from requests import Response
 
-from ...retry import retry_request
+from ...retry import retry, retry_request
 from .auth import Auth
 from .safe_request import RequestSafeMode, handle_response
 from .utils import build_url
@@ -21,6 +21,10 @@ DEFAULT_TIMEOUT = 60
 RETRY_ON_EXPIRED_TOKEN = 1
 RETRY_ON_GATEWAY_TIMEOUT = 3
 
+_TIMEOUT_RETRY_BASE_MS = 10 * 60 * 1000  # 10 minutes
+_TIMEOUT_RETRY_COUNT = 2
+_TIMEOUT_RETRY_EXCEPTIONS = (requests.exceptions.Timeout,)
+
 
 def _generate_payloads(
     method: HttpMethod,
@@ -72,6 +76,11 @@ class APIClient:
         self._auth = auth
         self._safe_mode = safe_mode
 
+    @retry(
+        exceptions=_TIMEOUT_RETRY_EXCEPTIONS,
+        max_retries=_TIMEOUT_RETRY_COUNT,
+        base_ms=_TIMEOUT_RETRY_BASE_MS,
+    )
     def _call(
         self,
         method: HttpMethod,

castor_extractor/utils/retry.py

@@ -26,6 +26,15 @@ class RetryStrategy(Enum):
 DEFAULT_STRATEGY = RetryStrategy.CONSTANT
 
 
+def _warning(callable: Callable, exception: BaseException) -> None:
+    exception_type = type(exception)
+    exception_path = f"{exception_type.__module__}.{exception_type.__name__}"
+    callable_path = f"{callable.__module__}.{callable.__name__}"
+
+    msg = f"Exception '{exception_path}' occurred within `{callable_path}`"
+    logger.warning(msg)
+
+
 class Retry(BaseModel):
     """
     This class checks if the retry conditions are met, and if so, how long to
@@ -96,7 +105,7 @@ def retry(
             try:
                 return None, callable(*args, **kwargs)
             except exceptions_ as err:
-                logger.warning(f"Exception within {callable.__name__}")
+                _warning(callable, err)
                 return err, None
 
         def _func(*args, **kwargs) -> Any:
@@ -139,7 +148,7 @@ def retry_request(
                 status_code = err.response.status_code
                 if status_code not in exceptions_:
                     raise err
-                logger.warning(f"Exception within {callable.__name__}")
+                _warning(callable, err)
                 return err, None
 
         def _func(*args, **kwargs) -> Any:

{castor_extractor-0.24.21.dist-info → castor_extractor-0.24.22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: castor-extractor
-Version: 0.24.21
+Version: 0.24.22
 Summary: Extract your metadata assets.
 Home-page: https://www.castordoc.com/
 License: EULA
@@ -215,6 +215,10 @@ For any questions or bug report, contact us at [support@coalesce.io](mailto:supp
 
 # Changelog
 
+## 0.24.22 - 2025-05-27
+
+* Add retry for `Request.Timeout` on **ApiClient**
+
 ## 0.24.21 - 2025-05-26
 
 * Looker Studio: add option to skip the extraction of view activity logs

{castor_extractor-0.24.21.dist-info → castor_extractor-0.24.22.dist-info}/RECORD

@@ -1,4 +1,4 @@
-CHANGELOG.md,sha256=tja1IyeA0_DdgOOJLdH8WMTmSRucj5bnvR0G0tg_Nsk,17859
+CHANGELOG.md,sha256=8EyATqcpMtcJ3LhQgQadRhcDiEULwOXYw40137Y5jgs,17936
 Dockerfile,sha256=xQ05-CFfGShT3oUqaiumaldwA288dj9Yb_pxofQpufg,301
 DockerfileUsage.md,sha256=2hkJQF-5JuuzfPZ7IOxgM6QgIQW7l-9oRMFVwyXC4gE,998
 LICENCE,sha256=sL-IGa4hweyya1HgzMskrRdybbIa2cktzxb5qmUgDg8,8254
@@ -76,7 +76,7 @@ castor_extractor/transformation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm
 castor_extractor/transformation/coalesce/__init__.py,sha256=CW_qdtEfwgJRsCyBlk5hNlxwEO-VV6mBXZvkRbND_J8,112
 castor_extractor/transformation/coalesce/assets.py,sha256=pzccYPP66c9PAnVroemx7-6MeRHw7Ft1OlTC6jIamAA,363
 castor_extractor/transformation/coalesce/client/__init__.py,sha256=VRmVpH29rOghtDQnCN7dAdA0dI0Lxseu4BC8rnwM9dU,80
-castor_extractor/transformation/coalesce/client/client.py,sha256=-fFxWtDPPruNmDPc6FXft_6RwRKEee4JM-13d90fms0,6442
+castor_extractor/transformation/coalesce/client/client.py,sha256=o-BlVqdzcQ2RhrmShsNFXVhsmJF4i0pP6DmiWGAE2dY,6172
 castor_extractor/transformation/coalesce/client/credentials.py,sha256=jbJxjbdPspf-dzYKfeb7oqL_8TXd1nvkJrjAcdAnLPc,548
 castor_extractor/transformation/coalesce/client/endpoint.py,sha256=0uLh7dpA1vsR9qr_50SEYV_-heQE4BwED9oNMgYsL-w,1272
 castor_extractor/transformation/coalesce/client/type.py,sha256=oiiVP9NL0ijTXyQmaB8aJVYckc7m-m8ZgMyNIAduUKE,43
@@ -106,7 +106,7 @@ castor_extractor/utils/client/abstract.py,sha256=CWF7_afNpEZ3jor-22wXbKIvM20ukHk
 castor_extractor/utils/client/api/__init__.py,sha256=vlG7WXznYgLTn3XyMGsyUkgRkup8FbKM14EXJ8mv-b0,264
 castor_extractor/utils/client/api/auth.py,sha256=lq0K3UEl1vwIIa_vKTdlpIQPdE5K1-5DXmCwO4dKzng,1890
 castor_extractor/utils/client/api/auth_test.py,sha256=LlyXytnatg6ZzR4Zkvzk0BH99FYhHX7qn_nyr2MSnDI,1305
-castor_extractor/utils/client/api/client.py,sha256=d3I-RbKgy7dqONKj2hAuRxTr9i9U82RklIuRjnVppeM,4574
+castor_extractor/utils/client/api/client.py,sha256=En1V9eglhB71q5jZwi5XhNZanLb7IUKfd4AT-sSexJk,4866
 castor_extractor/utils/client/api/client_test.py,sha256=FM3ZxsLLfMOBn44cXX6FIgnA31-5TTNIyp9D4LBwtXE,1222
 castor_extractor/utils/client/api/pagination.py,sha256=ph5TYqPiyFGgygsIhCATAHPIQ9UJNZyiTcqlyRdGEno,2460
 castor_extractor/utils/client/api/pagination_test.py,sha256=jCOgXFXrH-jrCxe2dfk80ZksJF-EtmpJPU11BGabsqk,1385
@@ -138,7 +138,7 @@ castor_extractor/utils/pager/pager.py,sha256=93Rw7jCz6GnqrS4HfYfKYV2xgEx2esl1qC9
 castor_extractor/utils/pager/pager_on_id.py,sha256=jBvmlEhkJ-sODkNyz1KyyXHobLsNhC4AwhOwYvLyB4E,1967
 castor_extractor/utils/pager/pager_on_id_test.py,sha256=eDGrIYPGffuKPUATgu5fiXIwPKdSwEXGgTtfMiHqoj0,1601
 castor_extractor/utils/pager/pager_test.py,sha256=PQOXQwQD2wOP0xzZfNTuLxcn3Bpa4FCASVklH71GO_s,1699
-castor_extractor/utils/retry.py,sha256=LvfBsE_R6g-U72hkN531rJDMj42zwkUqgIrrjlxctJs,4733
+castor_extractor/utils/retry.py,sha256=xRlAxHRnjmjh2sDUuuUSS-s38pokoAvSgSKjdgWGqbc,5020
 castor_extractor/utils/retry_test.py,sha256=j_6IJStBomEhxmGpIY9IIlESgMxhcDpmIKj24unLqlA,2892
 castor_extractor/utils/safe.py,sha256=gvIMRIoggdVeYMl222IYqXnHVDninDklFMlAHt-WldA,1948
 castor_extractor/utils/safe_test.py,sha256=IHN1Z761tYMFslYC-2HAfkXmFPh4LYSqNLs4QZwykjk,2160
@@ -425,8 +425,8 @@ castor_extractor/warehouse/sqlserver/queries/table.sql,sha256=kbBQP-TdG5px1IVgyx
 castor_extractor/warehouse/sqlserver/queries/user.sql,sha256=gOrZsMVypusR2dc4vwVs4E1a-CliRsr_UjnD2EbXs-A,94
 castor_extractor/warehouse/sqlserver/query.py,sha256=g0hPT-RmeGi2DyenAi3o72cTlQsLToXIFYojqc8E5fQ,533
 castor_extractor/warehouse/synapse/queries/column.sql,sha256=lNcFoIW3Y0PFOqoOzJEXmPvZvfAsY0AP63Mu2LuPzPo,1351
-castor_extractor-0.24.21.dist-info/LICENCE,sha256=sL-IGa4hweyya1HgzMskrRdybbIa2cktzxb5qmUgDg8,8254
-castor_extractor-0.24.21.dist-info/METADATA,sha256=Yg7Sgskg-uUeas31S1Uit1F7L1tPcVCLFy2U3rBlzIY,25312
-castor_extractor-0.24.21.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-castor_extractor-0.24.21.dist-info/entry_points.txt,sha256=_F-qeZCybjoMkNb9ErEhnyqXuG6afHIFQhakdBHZsr4,1803
-castor_extractor-0.24.21.dist-info/RECORD,,
+castor_extractor-0.24.22.dist-info/LICENCE,sha256=sL-IGa4hweyya1HgzMskrRdybbIa2cktzxb5qmUgDg8,8254
+castor_extractor-0.24.22.dist-info/METADATA,sha256=VTqwYHqBEng4wSZ5N88tT1z6Y2OdS9uETv4qIE3CZVw,25389
+castor_extractor-0.24.22.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+castor_extractor-0.24.22.dist-info/entry_points.txt,sha256=_F-qeZCybjoMkNb9ErEhnyqXuG6afHIFQhakdBHZsr4,1803
+castor_extractor-0.24.22.dist-info/RECORD,,