Merge pull request #24 from openweathermap/feature/fix-schema-error

Empty attributes error fix

deker/tools/array.py

@@ -26,6 +26,7 @@
 from psutil import swap_memory, virtual_memory
 
 from deker.errors import DekerMemoryError, DekerValidationError
+from deker.types.private.enums import ArrayType
 
 
 def calculate_total_cells_in_array(seq: Union[Tuple[int, ...], List[int]]) -> int:
@@ -87,6 +88,18 @@ def check_memory(shape: tuple, dtype: type, mem_limit_from_settings: int) -> Non
         )
 
 
+def generate_uid(array_type: ArrayType) -> str:
+    """Generate uuid5 for given array_type.
+
+    :param array_type: Either array or varray
+    """
+    if not isinstance(array_type, ArrayType):
+        raise TypeError("Invalid argument type. Array type is required")
+
+    namespace = uuid.NAMESPACE_X500 if array_type == ArrayType.array else uuid.NAMESPACE_OID
+    return str(uuid.uuid5(namespace, array_type.value + get_utc().isoformat()))
+
+
 def get_id(array: Any) -> str:
     """Generate unique id by object type and datetime.
 
@@ -108,14 +121,14 @@ def array_id(arr: Array) -> str:  # noqa[ARG001]
 
         :param arr: Array type
         """
-        return str(uuid.uuid5(uuid.NAMESPACE_X500, "array" + get_utc().isoformat()))
+        return generate_uid(ArrayType.array)
 
     @generate_id.register(VArray)
     def varray_id(arr: VArray) -> str:  # noqa[ARG001]
         """Generate id for VArray.
 
         :param arr: VArray type
         """
-        return str(uuid.uuid5(uuid.NAMESPACE_OID, "varray" + get_utc().isoformat()))
+        return generate_uid(ArrayType.varray)
 
     return generate_id(array)

deker/types/private/enums.py

@@ -61,14 +61,14 @@ def get_name(object: "DTypeEnum") -> str:
         return f"numpy.{object.name}"
 
 
-class DimensionType(Enum):
+class DimensionType(str, Enum):
     """Enum of dimensions' types."""
 
     generic = "generic"
     time = "time"
 
 
-class LocksExtensions(Enum):
+class LocksExtensions(str, Enum):
     """Extensions for lock files."""
 
     array_lock = ".arrlock"
@@ -77,10 +77,15 @@ class LocksExtensions(Enum):
     varray_lock = ".varraylock"
 
 
-class LocksTypes(Enum):
+class LocksTypes(str, Enum):
     """Locks enum."""
 
     array_lock = "array creation lock"
     array_read_lock = "array read lock"
     collection_lock = "collection creation lock"
     varray_lock = "varray write lock"
+
+
+class ArrayType(str, Enum):
+    array = "array"
+    varray = "varray"

deker/validators.py

@@ -106,7 +106,7 @@ def process_attributes(
 
     array_type = "VArray" if isinstance(schema, VArraySchema) else "Array"
 
-    attrs_schema = schema.attributes if schema else None
+    attrs_schema = schema.attributes if schema else []
 
     primary_attributes = primary_attributes or {}
     custom_attributes = custom_attributes or {}

tests/test_cases/test_tools/test_tools.py

@@ -6,6 +6,7 @@
 
 from deker_local_adapters import LocalCollectionAdapter
 
+from deker.tools.array import generate_uid
 from tests.parameters.collection_params import CollectionParams
 
 from deker.collection import Collection
@@ -220,5 +221,11 @@ def test_convert_isoformat_attrs_raises(attrs):
         assert convert_iso_attrs_to_datetime(attrs)
 
 
+@pytest.mark.parametrize("array_type_arg", (list(), set(), tuple(), dict(), 1, "2", 3.4))
+def test_generate_id_raises(array_type_arg):
+    with pytest.raises(TypeError):
+        generate_uid(array_type_arg)
+
+
 if __name__ == "__main__":
     pytest.main()

tests/test_cases/test_uri/test_uri.py

@@ -132,6 +132,8 @@ def test_uri_raises_invalid_uri(uri):
         "http://host:8080/data/collections/",
         "https://user:pass@host:8080/data/collections/",
         "http://host:8080/data/collections/",
+        "https://user:pass@host:8080,host:8000/data/collections/",
+        "http://host:8080,host:3000/data/collections/",
         "https://user:pass@host:8080/data/collections/",
     ],
 )
@@ -152,6 +154,8 @@ def test_uri_path_concatenation(string):
         "https://user:pass@host:8080/data/collections/",
         "http://host:8080/data/collections/",
         "https://user:pass@host:8080/data/collections/",
+        "https://user:pass@host:8080,host:8000/data/collections/",
+        "http://host:8080,host:3000/data/collections/",
     ],
 )
 def test_uri_path_concatenation_with_assignment_wrong_expectations(string):
@@ -171,6 +175,8 @@ def test_uri_path_concatenation_with_assignment_wrong_expectations(string):
         "https://user:pass@host:8080/data/collections/",
         "http://host:8080/data/collections/",
         "https://user:pass@host:8080/data/collections/",
+        "https://user:pass@host:8080,host:8000/data/collections/",
+        "http://host:8080,host:3000/data/collections/",
     ],
 )
 def test_uri_path_correct_concatenation_with_assignment(string):

tests/test_cases/test_validators/test_attributes_validator.py

@@ -600,5 +600,22 @@ def test_custom_attributes_schema_attrs_no_attrs_provided(
             collection.delete()
 
 
+class TestNoAttributes:
+    def test_no_attributes(self, client):
+        """Test that it's possible to create array with empty primary and custom attributes schema."""
+        coll_params = ClientParams.ArraySchema.OK.no_vgrid_no_attrs()
+        try:
+            collection: Collection = client.create_collection(**coll_params)
+        except DekerCollectionAlreadyExistsError:
+            coll = client.get_collection(coll_params["name"])
+            coll.delete()
+            collection: Collection = client.create_collection(**coll_params)
+        try:
+            array = collection.create()
+            assert array
+        finally:
+            collection.delete()
+
+
 if __name__ == "__main__":
     pytest.main()