fix: handling json unmarshall errors

commands/db_admin.py

@@ -15,7 +15,7 @@ def do_databases(shell, arg):
         else:
             utils.write_output("No databases found.")
     except Exception as e:
-        raise RuntimeError(f"Error listing databases: {e}") from e
+        raise RuntimeError(f"{e}") from e
 
 #command .use
 def do_use(shell, arg):
@@ -41,7 +41,7 @@ def do_use(shell, arg):
         else:
             utils.write_output(f"Failed to switch to database '{arg}'.")
     except Exception as e:
-        raise RuntimeError(f"Error switching database: {e}") from e
+        raise RuntimeError(f"{e}") from e
 
 #comand .dbinfo
 def do_dbinfo(shell, arg):
@@ -59,7 +59,7 @@ def do_dbinfo(shell, arg):
         else:
             utils.write_output("Error: Unable to fetch database information.")
     except Exception as e:
-        raise RuntimeError(f"Error fetching database info: {e}") from e
+        raise RuntimeError(f"{e}") from e
 
 # Command .dbsize
 def do_dbsize(shell, arg):
@@ -75,7 +75,7 @@ def do_dbsize(shell, arg):
             return
         shell.query_output(output['data']['rows'], output['data']['columns'])
     except Exception as e:
-        raise RuntimeError(f"Error fetching database size: {e}") from e
+        raise RuntimeError(f"{e}") from e
 
 #command .create
 def do_create(shell, arg):
@@ -108,7 +108,7 @@ def do_create(shell, arg):
         shell.edgeSql.create_database(database_name)
         utils.write_output(f"Database '{database_name}' created successfully.")
     except Exception as e:
-        raise RuntimeError(f"Error creating database: {e}") from e
+        raise RuntimeError(f"{e}") from e
 
 #command .destroy
 def do_destroy(shell, arg):
@@ -145,4 +145,4 @@ def do_destroy(shell, arg):
         else:
             utils.write_output(f"Failed to destroy database '{database_name}'.")
     except Exception as e:
-        raise RuntimeError(f"Error destroying database: {e}") from e
+        raise RuntimeError(f"{e}") from e

edgesql.py

@@ -2,6 +2,7 @@
 import utils_sql as sql
 import requests
 from http import HTTPStatus
+import json
 
 BASE_URL = 'https://api.azion.com/v4/edge_sql/databases'
 
@@ -100,7 +101,10 @@ def execute(self, buffer):
 
         try:
             response = requests.post(url, json=data, headers=self.__headers(), timeout=self.timeout)
-            json_data = response.json()
+            try:
+                json_data = response.json()
+            except json.JSONDecodeError as e:
+                raise ValueError(f"Error decoding JSON response: {e}. statusCode={response.status_code}") from e
 
             if response.status_code == HTTPStatus.OK:
                 result_data = json_data.get('data', [])
@@ -137,7 +141,10 @@ def list_databases(self):
         """
         try:
             response = requests.get(self._base_url, headers=self.__headers(), timeout=self.timeout)
-            json_data = response.json()
+            try:
+                json_data = response.json()
+            except json.JSONDecodeError as e:
+                raise ValueError(f"Error decoding JSON response: {e}. statusCode={response.status_code}") from e
 
             if response.status_code == HTTPStatus.OK:  # 200
                 databases = json_data.get('results')
@@ -170,7 +177,10 @@ def set_current_database(self, database_name):
         """
         try:
             response = requests.get(self._base_url, headers=self.__headers(), timeout=self.timeout)
-            json_data = response.json()
+            try:
+                json_data = response.json()
+            except json.JSONDecodeError as e:
+                raise ValueError(f"Error decoding JSON response: {e}. statusCode={response.status_code}") from e
 
             if response.status_code == HTTPStatus.OK:  # 200
                 databases = json_data.get('results')
@@ -201,8 +211,10 @@ def get_database_id(self, database_name):
         """
         try:
             response = requests.get(self._base_url, headers=self.__headers(), timeout=self.timeout)
-            response.raise_for_status()
-            json_data = response.json()
+            try:
+                json_data = response.json()
+            except json.JSONDecodeError as e:
+                raise ValueError(f"Error decoding JSON response: {e}. statusCode={response.status_code}") from e
 
             if response.status_code == HTTPStatus.OK:  # 200
                 databases = json_data.get('results',[])
@@ -233,7 +245,10 @@ def get_database_info(self):
         url = f'{self._base_url}/{self._current_database_id}'
         try:
             response = requests.get(url, headers=self.__headers(), timeout=self.timeout)
-            json_data = response.json()
+            try:
+                json_data = response.json()
+            except json.JSONDecodeError as e:
+                raise ValueError(f"Error decoding JSON response: {e}. statusCode={response.status_code}") from e
 
             if response.status_code == HTTPStatus.OK:  # 200
                 data = json_data.get('data')
@@ -296,7 +311,10 @@ def create_database(self, database_name):
 
         try:
             response = requests.post(self._base_url, json=data, headers=self.__headers(), timeout=self.timeout)
-            json_data = response.json()
+            try:
+                json_data = response.json()
+            except json.JSONDecodeError as e:
+                raise ValueError(f"Error decoding JSON response: {e}. statusCode={response.status_code}") from e
 
             if response.status_code in [HTTPStatus.ACCEPTED, HTTPStatus.CREATED]:  # 201/202
                 data = json_data.get('data')
@@ -345,7 +363,6 @@ def destroy_database(self, database_name):
 
         try:
             response = requests.delete(url, headers=self.__headers(), timeout=self.timeout)
-            #response.raise_for_status()
 
             if response.status_code == HTTPStatus.ACCEPTED:  # 202
                 if self._current_database_name == database_name: