dataverse-sdk 2.4.2__tar.gz → 2.4.3__tar.gz

{dataverse_sdk-2.4.2 → dataverse_sdk-2.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dataverse-sdk
-Version: 2.4.2
+Version: 2.4.3
 Summary: Dataverse SDK For Python
 Home-page: 
 Author: LinkerVision

{dataverse_sdk-2.4.2 → dataverse_sdk-2.4.3}/dataverse_sdk/apis/backend.py

@@ -17,13 +17,26 @@ from ..utils.utils import chunks
 logger = logging.getLogger(__name__)
 
 
-class BackendAPI:
-    adapter = HTTPAdapter(
-        max_retries=Retry(
-            total=10, backoff_factor=15, status_forcelist=[500, 502, 503, 504]
-        )
-    )
+class LoggingRetry(Retry):
+    def __init__(self, host=None, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self._host = host
+
+    def increment(self, method=None, url=None, *args, **kwargs):
+        if self.total is not None and self.total > 0:
+            full_url = f"{self._host}{url}" if self._host and url else url
+            attempt = len(self.history) + 1
+            print(
+                f"Retrying request to {full_url} (attempt {attempt} of {(self.total + attempt - 1)})"
+            )
+
+        new_retry = super().increment(method, url, *args, **kwargs)
+        # Preserve host in the new retry instance
+        new_retry._host = self._host
+        return new_retry
+
 
+class BackendAPI:
     def __init__(
         self,
         host: str,
@@ -34,6 +47,14 @@ class BackendAPI:
     ):
         # TODO: Support api versioning
         self.host = host
+        self.adapter = HTTPAdapter(
+            max_retries=LoggingRetry(
+                host=host,
+                total=10,
+                backoff_factor=15,
+                status_forcelist=[500, 502, 503, 504],
+            )
+        )
         self.headers = {
             "Content-Type": "application/json",
             "X-Request-Service-Id": service_id,
@@ -82,6 +103,9 @@ class BackendAPI:
             raise
         if resp.status_code in (401, 403, 404):
             logger.exception(f"[{parent_func}] request forbidden.")
+            logger.exception(
+                f"Invalid response from {self.host} (HTTP {resp.status_code}). Host may not be a valid Dataverse API endpoint."
+            )
             raise DataverseExceptionBase(status_code=resp.status_code, **resp.json())
 
         if resp.status_code == 400:

{dataverse_sdk-2.4.2 → dataverse_sdk-2.4.3}/dataverse_sdk/client.py

@@ -1568,13 +1568,6 @@ of this project OR has been added before"
             client=client, client_alias=client_alias, is_async=True
         )
 
-        host = api.get_host()
-        if data_source != DataSource.LOCAL:
-            if host not in DataverseHost:
-                raise ValueError(
-                    "Import data source must be LOCAL if host is not in DataverseHost."
-                )
-
         project_id = project.id
         try:
             raw_dataset_data: dict = DatasetAPISchema(

{dataverse_sdk-2.4.2 → dataverse_sdk-2.4.3}/dataverse_sdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dataverse-sdk
-Version: 2.4.2
+Version: 2.4.3
 Summary: Dataverse SDK For Python
 Home-page: 
 Author: LinkerVision

{dataverse_sdk-2.4.2 → dataverse_sdk-2.4.3}/setup.py

@@ -2,7 +2,7 @@ from setuptools import find_packages, setup
 
 AUTHOR = "LinkerVision"
 PACKAGE_NAME = "dataverse-sdk"
-PACKAGE_VERSION = "2.4.2"
+PACKAGE_VERSION = "2.4.3"
 DESC = "Dataverse SDK For Python"
 with open("README.md", encoding="utf-8") as fh:
     long_description = fh.read()