Merge pull request #223 from simvue-io/222-fix-invalid-json-response-handling-in-client

Fix missing invalid JSON response handling

Author: kzscisoft

simvue/client.py

@@ -125,7 +125,10 @@ def get_run_id_from_name(self, name: str) -> str:
         )
 
         if response.status_code != 200:
-            detail = response.json().get("detail", response.text)
+            try:
+                detail = response.json().get("detail", response.text)
+            except requests.exceptions.JSONDecodeError:
+                detail = response.text
             raise RuntimeError(
                 "Retrieval of run ID from name failed with "
                 f"status {response.status_code}: {detail}"
@@ -176,7 +179,10 @@ def get_run(self, run_id: str) -> dict[str, typing.Any]:
         if response.status_code == 200:
             return response.json()
 
-        detail = response.json().get("detail", response.text)
+        try:
+            detail = response.json().get("detail", response.text)
+        except requests.exceptions.JSONDecodeError:
+            detail = response.text
 
         raise RuntimeError(
             f"Retrieval of run '{run_id}' failed with status "
@@ -246,7 +252,10 @@ def get_runs(
             raise ValueError("Invalid format specified")
 
         if response.status_code != 200:
-            detail = response.json().get("detail", response.text)
+            try:
+                detail = response.json().get("detail", response.text)
+            except requests.exceptions.JSONDecodeError:
+                detail = response.text
             raise RuntimeError(
                 f"Run retrieval failed with code {response.status_code}: " f"{detail}"
             )
@@ -285,7 +294,10 @@ def delete_run(self, run_identifier: str) -> typing.Optional[dict]:
             logger.debug(f"Run '{run_identifier}' deleted successfully")
             return response.json()
 
-        error_detail = response.json().get("detail", response.text)
+        try:
+            error_detail = response.json().get("detail", response.text)
+        except requests.exceptions.JSONDecodeError:
+            error_detail = response.text
 
         raise RuntimeError(
             f"Deletion of run '{run_identifier}' failed with code"
@@ -418,7 +430,10 @@ def delete_folder(
             runs: list[dict] = response.json().get("runs", [])
             return runs
 
-        detail = response.json().get("detail", response.text)
+        try:
+            detail = response.json().get("detail", response.text)
+        except requests.exceptions.JSONDecodeError:
+            detail = response.text
 
         raise RuntimeError(
             f"Deletion of folder '{folder_name}' failed with"
@@ -450,7 +465,10 @@ def list_artifacts(self, run_id: str) -> list[dict[str, typing.Any]]:
         )
 
         if response.status_code != 200:
-            detail = response.json().get("detail", response.text)
+            try:
+                detail = response.json().get("detail", response.text)
+            except requests.exceptions.JSONDecodeError:
+                detail = response.text
             raise RuntimeError(
                 f"Retrieval of artifacts for run '{run_id}' failed with "
                 f"status {response.status_code}: {detail}"
@@ -546,7 +564,10 @@ def get_artifact_as_file(
         )
 
         if response.status_code != 200:
-            detail = response.json().get("detail", response.text)
+            try:
+                detail = response.json().get("detail", response.text)
+            except requests.exceptions.JSONDecodeError:
+                detail = response.text
             raise RuntimeError(
                 f"Download of artifacts for run '{run_id}' failed with "
                 f"status {response.status_code}: {detail}"
@@ -653,7 +674,10 @@ def get_artifacts_as_files(
         )
 
         if response.status_code != 200:
-            detail = response.json().get("detail", response.text)
+            try:
+                detail = response.json().get("detail", response.text)
+            except requests.exceptions.JSONDecodeError:
+                detail = response.text
             raise RuntimeError(
                 f"Download of artifacts for run '{run_id}' failed with "
                 f"status {response.status_code}: {detail}"
@@ -703,7 +727,10 @@ def get_folder(self, folder_id: str) -> dict[str, typing.Any]:
         )
 
         if response.status_code != 200:
-            detail = response.json().get("detail", response.text)
+            try:
+                detail = response.json().get("detail", response.text)
+            except requests.exceptions.JSONDecodeError:
+                detail = response.text
             raise RuntimeError(
                 f"Retrieval of folder '{folder_id}' failed with "
                 f"status {response.status_code}: {detail}"
@@ -744,7 +771,10 @@ def get_folders(
         if response.status_code == 200:
             return response.json().get("data", [])
 
-        detail = response.json().get("detail", response.text)
+        try:
+            detail = response.json().get("detail", response.text)
+        except requests.exceptions.JSONDecodeError:
+            detail = response.text
 
         raise RuntimeError(
             "Retrieval of folders failed with status code "
@@ -778,7 +808,10 @@ def get_metrics_names(self, run_id: str) -> dict[str, typing.Any]:
         if response.status_code == 200:
             return response.json()
 
-        detail = response.json().get("detail", response.text)
+        try:
+            detail = response.json().get("detail", response.text)
+        except requests.exceptions.JSONDecodeError:
+            detail = response.text
 
         raise RuntimeError(
             f"Request for metric names for run '{run_id}' failed with "
@@ -955,7 +988,10 @@ def get_metrics_multiple(
         )
 
         if response.status_code != 200:
-            detail = response.json().get("detail", response.text)
+            try:
+                detail = response.json().get("detail", response.text)
+            except requests.exceptions.JSONDecodeError:
+                detail = response.text
             raise RuntimeError(
                 f"Retrieval of metrics '{metric_names}' failed for runs '{run_ids}' "
                 f"with status code {response.status_code}: {detail}"
@@ -1123,7 +1159,10 @@ def get_events(
         if response.status_code == 200:
             return response.json().get("data", [])
 
-        detail = response.json().get("detail", response.text)
+        try:
+            detail = response.json().get("detail", response.text)
+        except requests.exceptions.JSONDecodeError:
+            detail = response.text
 
         raise RuntimeError(
             f"Retrieval of events for run '{run_id}' failed with "
@@ -1157,7 +1196,10 @@ def get_alerts(
         response = requests.get(f"{self._url}/api/runs/{run_id}", headers=self._headers)
 
         if response.status_code != 200:
-            detail = response.json().get("detail", response.text)
+            try:
+                detail = response.json().get("detail", response.text)
+            except requests.exceptions.JSONDecodeError:
+                detail = response.text
             raise RuntimeError(
                 f"Retrieval of alerts for run '{run_id}' failed with "
                 f"status {response.status_code}: {detail}"