log response content in case of HTTPError

DANS-KNAW · Dec 21, 2023 · ddc8a63 · ddc8a63
1 parent ed4e982
commit ddc8a63
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 48 deletions.
diff --git a/src/datastation/common/utils.py b/src/datastation/common/utils.py
@@ -1,4 +1,5 @@
 import json as jsonlib
+import logging
 import os
 import shutil
 import argparse
@@ -19,6 +20,12 @@ def add_batch_processor_args(parser, report: bool = True):
                             dest='report_file')
 
 
+def raise_for_status(r):
+    if r.status_code >= 400:
+        logging.error(f"{r.status_code} {r.reason} {r.json()}")
+    r.raise_for_status()
+
+
 def positive_int_argument_converter(value):
     try:
         ivalue = int(value)

diff --git a/src/datastation/dataverse/banner_api.py b/src/datastation/dataverse/banner_api.py
@@ -18,7 +18,7 @@ def list(self, dry_run: bool = False):
             print(f"Would have sent the following request: {url}")
             return
         r = requests.get(url, headers=headers, params={'unblock-key': self.unblock_key})
-        r.raise_for_status()
+        raise_for_status(r)()
         return r
 
     def add(self, msg: str, dismissible_by_user: bool = False, lang: str = 'en', dry_run: bool = False):
@@ -39,7 +39,7 @@ def add(self, msg: str, dismissible_by_user: bool = False, lang: str = 'en', dry
             print(json.dumps(banner, indent=4))
             return
         r = requests.post(url, headers=headers, params={'unblock-key': self.unblock_key}, json=banner)
-        r.raise_for_status()
+        raise_for_status(r)()
         return r
 
     def remove(self, banner_id: int, dry_run: bool = False):
@@ -50,5 +50,5 @@ def remove(self, banner_id: int, dry_run: bool = False):
             print(f"Would have sent the following request: {url}")
             return
         r = requests.delete(url, headers=headers, params={'unblock-key': self.unblock_key})
-        r.raise_for_status()
+        raise_for_status(r)()
         return r
diff --git a/src/datastation/dataverse/dataset_api.py b/src/datastation/dataverse/dataset_api.py
@@ -1,9 +1,10 @@
 import json
+import logging
 import time
 
 import requests
 
-from datastation.common.utils import print_dry_run_message
+from datastation.common.utils import print_dry_run_message, raise_for_status
 
 
 class DatasetApi:
@@ -28,7 +29,7 @@ def get(self, version=":latest", dry_run=False):
             return None
 
         dv_resp = requests.get(url, headers=headers, params=params)
-        dv_resp.raise_for_status()
+        raise_for_status(dv_resp)
 
         resp_data = dv_resp.json()['data']
         return resp_data
@@ -44,7 +45,7 @@ def edit_metadata(self, data: dict, dry_run=False, replace: bool = False):
             return None
         else:
             r = requests.put(url, headers=headers, params=params, data=data)
-            r.raise_for_status()
+            raise_for_status(r)
             return r
 
     def get_role_assignments(self, dry_run=False):
@@ -56,7 +57,7 @@ def get_role_assignments(self, dry_run=False):
             return None
         else:
             r = requests.get(url, headers=headers, params=params)
-        r.raise_for_status()
+        raise_for_status(r)
         return r.json()['data']
 
     def add_role_assignment(self, assignee, role, dry_run=False):
@@ -70,7 +71,7 @@ def add_role_assignment(self, assignee, role, dry_run=False):
             return None
         else:
             r = requests.post(url, headers=headers, params=params, json=role_assignment)
-            r.raise_for_status()
+            raise_for_status(r)
             return r
 
     def remove_role_assignment(self, assignment_id, dry_run=False):
@@ -82,7 +83,7 @@ def remove_role_assignment(self, assignment_id, dry_run=False):
             return None
         else:
             r = requests.delete(url, headers=headers, params=params)
-        r.raise_for_status()
+        raise_for_status(r)
         return r
 
     def is_draft(self, dry_run=False):
@@ -94,7 +95,7 @@ def is_draft(self, dry_run=False):
             return None
         else:
             r = requests.get(url, headers=headers, params=params)
-        r.raise_for_status()
+        raise_for_status(r)
         return r.json()['data']['latestVersion']['versionState'] == 'DRAFT'
 
     def delete_draft(self, dry_run=False):
@@ -106,7 +107,7 @@ def delete_draft(self, dry_run=False):
             return None
         else:
             r = requests.delete(url, headers=headers, params=params)
-        r.raise_for_status()
+        raise_for_status(r)
         return r.json()
 
     def destroy(self, dry_run=False):
@@ -122,7 +123,7 @@ def destroy(self, dry_run=False):
                 print_dry_run_message(method='DELETE', url=url, headers=headers, params=params)
                 return None
             r = requests.delete(url, headers=headers, params=params)
-        r.raise_for_status()
+        raise_for_status(r)
         return r.json()
 
     def get_metadata(self, version=':latest', dry_run=False):
@@ -139,7 +140,7 @@ def get_metadata(self, version=':latest', dry_run=False):
             return None
         else:
             r = requests.get(url, headers=headers, params=params)
-        r.raise_for_status()
+        raise_for_status(r)
         return r.json()['data']
 
     def get_metadata_export(self, exporter='dataverse_json', dry_run=False):
@@ -155,7 +156,7 @@ def get_metadata_export(self, exporter='dataverse_json', dry_run=False):
             return None
         else:
             r = requests.get(url, headers=headers, params=params)
-        r.raise_for_status()
+        raise_for_status(r)
         return r.text
 
     def get_locks(self, lock_type=None, dry_run=False):
@@ -169,7 +170,7 @@ def get_locks(self, lock_type=None, dry_run=False):
             return None
         else:
             r = requests.get(url, headers=headers, params=params)
-        r.raise_for_status()
+        raise_for_status(r)
         return r.json()['data']
 
     def add_lock(self, lock_type, dry_run=False):
@@ -181,7 +182,7 @@ def add_lock(self, lock_type, dry_run=False):
             return None
         else:
             r = requests.post(url, headers=headers, params=params)
-            r.raise_for_status()
+            raise_for_status(r)
             return r.json()
 
     def remove_lock(self, lock_type=None, dry_run=False):
@@ -195,7 +196,7 @@ def remove_lock(self, lock_type=None, dry_run=False):
             return None
         else:
             r = requests.delete(url, headers=headers, params=params)
-        r.raise_for_status()
+        raise_for_status(r)
         return r.json()
 
     def remove_all_locks(self, dry_run=False):
@@ -209,7 +210,7 @@ def publish(self, update_type='major', dry_run=False):
             print_dry_run_message(method='POST', url=url, headers=headers, params=params)
             return None
         r = requests.post(url, headers=headers, params=params)
-        r.raise_for_status()
+        raise_for_status(r)
         return r.json()
 
     def reindex(self, dry_run=False):
@@ -223,7 +224,7 @@ def reindex(self, dry_run=False):
             return None
         else:
             r = requests.get(url, headers=headers, params=params)
-        r.raise_for_status()
+        raise_for_status(r)
         return r.json()
 
     def modify_registration_metadata(self, dry_run=False):
@@ -235,7 +236,7 @@ def modify_registration_metadata(self, dry_run=False):
             return None
         else:
             r = requests.post(url, headers=headers, params=params)
-        r.raise_for_status()
+        raise_for_status(r)
         return r.json()
 
     def get_files(self, version=':latest', dry_run=False):
@@ -247,7 +248,7 @@ def get_files(self, version=':latest', dry_run=False):
             return None
         else:
             r = requests.get(url, headers=headers, params=params)
-        r.raise_for_status()
+        raise_for_status(r)
         return r.json()['data']
 
     def await_unlock(self, lock_type=None, sleep_time=5, max_tries=10):

diff --git a/src/datastation/dataverse/dataverse_api.py b/src/datastation/dataverse/dataverse_api.py
@@ -18,7 +18,7 @@ def get_contents(self, alias="root", dry_run=False):
             return None
 
         dv_resp = requests.get(url, headers=headers)
-        dv_resp.raise_for_status()
+        raise_for_status(dv_resp)
 
         resp_data = dv_resp.json()["data"]
         return resp_data
@@ -32,5 +32,5 @@ def get_storage_size(self, alias="root", dry_run=False):
             return None
         else:
             r = requests.get(url, headers=headers)
-        r.raise_for_status()
+        raise_for_status(r)()
         return r.json()['data']['message']
diff --git a/src/datastation/dataverse/file_api.py b/src/datastation/dataverse/file_api.py
@@ -20,5 +20,5 @@ def reingest(self, dry_run=False):
             print_dry_run_message(method='POST', url=url, headers=headers, params=params)
             return None
         r = requests.post(url, headers=headers, params=params)
-        r.raise_for_status()
+        raise_for_status(r)()
         return r
diff --git a/src/datastation/dataverse/metrics_api.py b/src/datastation/dataverse/metrics_api.py
@@ -14,5 +14,5 @@ def get_tree(self, dry_run: bool = False):
             print(f"Would have sent the following request: {url}")
             return
         r = requests.get(url)
-        r.raise_for_status()
+        raise_for_status(r)()
         return r.json()['data']
diff --git a/src/datastation/dataverse/search_api.py b/src/datastation/dataverse/search_api.py
@@ -54,7 +54,7 @@ def search(self, query="*", subtree="root", object_type="dataset", dry_run=False
 
         while True:
             dv_resp = requests.get(self.url, headers=headers, params=params)
-            dv_resp.raise_for_status()
+            raise_for_status(dv_resp)
 
             data = dv_resp.json()["data"]
             items = data["items"]