Merge pull request #48 from Better-Boy/patch-2

Datasource name validation

Author: ZoranPandovski

minds/datasources/datasources.py

@@ -1,7 +1,7 @@
 from typing import List, Optional, Union
 
 from pydantic import BaseModel, Field
-
+import minds.utils as utils
 import minds.exceptions as exc
 
 class DatabaseConfig(BaseModel):
@@ -37,6 +37,8 @@ def create(self, ds_config: DatabaseConfig, update=False):
 
         name = ds_config.name
 
+        utils.validate_datasource_name(name)
+
         if update:
             self.api.put(f'/datasources/{name}', data=ds_config.model_dump())
         else:

minds/exceptions.py

@@ -20,4 +20,8 @@ class UnknownError(Exception):
 
 
 class MindNameInvalid(Exception):
+    ...
+
+
+class DatasourceNameInvalid(Exception):
     ...

minds/utils.py

@@ -38,3 +38,27 @@ def validate_mind_name(mind_name):
     # Check if the Mind name matches the pattern
     if not re.match(pattern, mind_name):
         raise exc.MindNameInvalid("Mind name should start with a letter and contain only letters, numbers or underscore, with a maximum of 32 characters. Spaces are not allowed.")
+
+
+def validate_datasource_name(ds_name):
+    """
+    Validate the datasource name.
+
+    A valid datasource name should:
+    - Start with a letter
+    - Contain only letters, numbers, or underscores
+    - Have a maximum length of 62 characters
+    - Not contain spaces
+
+    Parameters:
+    ds_name (str): The datasource name to validate.
+
+    Returns:
+    bool: True if valid, False otherwise.
+    """
+    # Regular expression pattern
+    pattern = r'^[a-zA-Z][a-zA-Z0-9_]{0,61}$'
+
+    # Check if the datasource name matches the pattern
+    if not re.match(pattern, ds_name):
+        raise exc.DatasourceNameInvalid("Datasource name should start with a letter and contain only letters, numbers or underscore, with a maximum of 62 characters. Spaces are not allowed.")

tests/integration/test_base_flow.py

@@ -8,8 +8,9 @@
 logging.basicConfig(level=logging.DEBUG)
 
 from minds.datasources.examples import example_ds
+from minds.datasources import DatabaseConfig
 
-from minds.exceptions import ObjectNotFound, MindNameInvalid
+from minds.exceptions import ObjectNotFound, MindNameInvalid, DatasourceNameInvalid
 
 
 def get_client():
@@ -41,6 +42,14 @@ def test_datasources():
     ds = client.datasources.create(example_ds, update=True)
     assert ds.name == example_ds.name
 
+    valid_ds_name = example_ds.name
+
+    with pytest.raises(DatasourceNameInvalid):
+        example_ds.name = "invalid-ds-name"
+        client.datasources.create(example_ds)
+
+    example_ds.name = valid_ds_name
+
     # get
     ds = client.datasources.get(example_ds.name)