Merge branch 'f-simple-schema-export' into 'dev'

Refactor get_list_datatype

See merge request !118

src/linkahead/common/datatype.py

@@ -43,16 +43,27 @@ def LIST(datatype):
     return "LIST<" + str(datatype) + ">"
 
 
-def get_list_datatype(datatype):
+def get_list_datatype(datatype: str, strict: bool = False):
     """ returns the datatype of the elements in the list """
-    if not isinstance(datatype, str):
-        return None
-    match = re.match("LIST(<|&lt;)(?P<datatype>.*)(>|&gt;)", datatype)
+    if not isinstance(datatype, str) or not datatype.lower().startswith("list"):
+        if strict:
+            raise ValueError(f"Not a list dtype: {datatype}")
+        else:
+            return None
+    pattern = r"^[Ll][Ii][Ss][Tt]((<|&lt;)(?P<dtype1>.*)(>|&gt;)|\((?P<dtype2>.*)\))$"
+    match = re.match(pattern, datatype)
+
+    if match and "dtype1" in match.groupdict() and match.groupdict()["dtype1"] is not None:
+        return match.groupdict()["dtype1"]
+
+    elif match and "dtype2" in match.groupdict() and match.groupdict()["dtype2"] is not None:
+        return match.groupdict()["dtype2"]
 
-    if match is not None:
-        return match.group("datatype")
     else:
-        return None
+        if strict:
+            raise ValueError(f"Not a list dtype: {datatype}")
+        else:
+            return None
 
 
 def is_list_datatype(datatype):

unittests/test_datatype.py

@@ -33,6 +33,17 @@ def test_list_utilites():
     """Test for example if get_list_datatype works."""
     dtype = db.LIST(db.INTEGER)
     assert datatype.get_list_datatype(dtype) == db.INTEGER
+    assert datatype.get_list_datatype("LIST(Person)") == "Person"
+    assert datatype.get_list_datatype("Person") is None
+    assert datatype.get_list_datatype("LIST[]") is None
+    with raises(ValueError):
+        datatype.get_list_datatype("LIST[]", strict=True)
+    with raises(ValueError):
+        datatype.get_list_datatype("Person", strict=True)
+    with raises(ValueError):
+        datatype.get_list_datatype(5, strict=True)
+    with raises(ValueError):
+        datatype.get_list_datatype("listlol", strict=True)
 
 
 def test_parsing_of_intger_list_values():