Merge pull request #6 from mindsdb/exceptions

Improvement in exception managing

Author: ZoranPandovski

minds/datasources/datasources.py

@@ -2,6 +2,7 @@
 
 from pydantic import BaseModel, Field
 
+import minds.exceptions as exc
 
 class DatabaseConfig(BaseModel):
 
@@ -15,7 +16,6 @@ class DatabaseConfig(BaseModel):
 class Datasource(DatabaseConfig):
     ...
 
-
 class Datasources:
     def __init__(self, client):
         self.api = client.api
@@ -25,8 +25,9 @@ def create(self, ds_config: DatabaseConfig, replace=False):
 
         if replace:
             try:
+                self.get(name)
                 self.drop(name)
-            except Exception:
+            except exc.ObjectNotFound:
                 ...
 
         self.api.post('/datasources', data=ds_config.model_dump())
@@ -44,9 +45,10 @@ def list(self) -> List[Datasource]:
 
     def get(self, name: str) -> Datasource:
         data = self.api.get(f'/datasources/{name}').json()
+
         # TODO skip not sql skills
         if data.get('engine') is None:
-            raise RuntimeError(f'Datasource {name} is not found')
+            raise exc.ObjectNotSupported(f'Wrong type of datasource: {name}')
         return Datasource(**data)
 
     def drop(self, name: str):

minds/exceptions.py

@@ -0,0 +1,12 @@
+
+class ObjectNotFound(Exception):
+    ...
+
+
+class ObjectNotSupported(Exception):
+    ...
+
+
+class UnknownError(Exception):
+    ...
+

minds/minds.py

@@ -3,6 +3,8 @@
 
 from openai import OpenAI
 
+import minds.exceptions as exc
+
 from minds.datasources import Datasource, DatabaseConfig
 
 DEFAULT_PROMPT_TEMPLATE = 'Use your database tools to answer the user\'s question: {{question}}'
@@ -48,11 +50,12 @@ def update(
                 if isinstance(ds, Datasource):
                     ds = ds.name
                 elif isinstance(ds, DatabaseConfig):
-                    # try to create
+                    # if not exists - create
                     try:
+                        self.client.datasources.get(ds.name)
+                    except exc.ObjectNotFound:
                         self.client.datasources.create(ds)
-                    except Exception:
-                        ...
+
                     ds = ds.name
                 elif not isinstance(ds, str):
                     raise ValueError(f'Unknown type of datasource: {ds}')
@@ -143,8 +146,9 @@ def create(
 
         if replace:
             try:
+                self.get(name)
                 self.drop(name)
-            except Exception:
+            except exc.ObjectNotFound:
                 ...
 
         ds_names = []
@@ -153,11 +157,12 @@ def create(
                 if isinstance(ds, Datasource):
                     ds = ds.name
                 elif isinstance(ds, DatabaseConfig):
-                    # try to create
+                    # if not exists - create
                     try:
+                        self.client.datasources.get(ds.name)
+                    except exc.ObjectNotFound:
                         self.client.datasources.create(ds)
-                    except Exception:
-                        ...
+
                     ds = ds.name
                 elif not isinstance(ds, str):
                     raise ValueError(f'Unknown type of datasource: {ds}')

minds/rest_api.py

@@ -1,10 +1,14 @@
 import requests
 
+import minds.exceptions as exc
+
 
 def _raise_for_status(response):
-    # show response text in error
+    if response.status_code == 404:
+        raise exc.ObjectNotFound(response.text)
+
     if 400 <= response.status_code < 600:
-        raise requests.HTTPError(f'{response.reason}: {response.text}', response=response)
+        raise exc.UnknownError(f'{response.reason}: {response.text}')
 
 
 class RestAPI: