fix: better error handling related of content exception

aziontech · Aug 8, 2024 · 067d607 · 067d607
1 parent 8191448
commit 067d607
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/edgesql-shell.py b/edgesql-shell.py
@@ -245,7 +245,7 @@ def default(self, line):
                                 utils.write_output(f"{output['error']}")
                                 return
                         except RuntimeError as er:
-                            utils.write_output(f"Error executing SQL command: {er}")
+                            utils.write_output(f"{er}")
                             return
                         if output.get('data'):
                             self.query_output(output['data']['rows'], output['data']['columns'])

diff --git a/edgesql.py b/edgesql.py
@@ -101,10 +101,17 @@ def execute(self, buffer):
 
         try:
             response = requests.post(url, json=data, headers=self.__headers(), timeout=self.timeout)
+
+            # Check if the response content is empty
+            if not response.content:
+                result['error'] = f"Empty response from server. statusCode={response.status_code}"
+                return result
+
             try:
                 json_data = response.json()
             except json.JSONDecodeError as e:
-                raise ValueError(f"Error decoding JSON response: {e}. statusCode={response.status_code}") from e
+                result['error'] = f"Error decoding JSON response: {e}. statusCode={response.status_code}"
+                return result
 
             if response.status_code == HTTPStatus.OK:
                 result_data = json_data.get('data', [])