chore: fix broken-tests

For #225

Author: tstorek

filip/models/base.py

@@ -58,9 +58,11 @@ class DataType(str, Enum):
         "hh:mm:ss[Z|(+|-)hh:mm] (see XML schema for details).",
     )
     RELATIONSHIP = "Relationship", "Reference to another context entity"
-    STRUCTUREDVALUE = "StructuredValue", ("Structured datatype must be "
+    STRUCTUREDVALUE = "StructuredValue", ("Structured datatype must be an "
+                                          "array or object"
                                           "serializable")
     ARRAY = "Array", "Array of the types above"
+    OBJECT = "Object", "JSON-Object of the types above, i.e. a dictionary"
     COMMAND = "command", "A command for IoT Devices"
     COMMAND_RESULT = (
         "commandResult",
@@ -74,6 +76,7 @@ class DataType(str, Enum):
         "contains an autogenerated attribute "
         "of this type",
     )
+    GEOJSON = "geo:json", "GeoJson object"
 
 
 class PaginationMethod(str, Enum):

filip/models/ngsi_v2/base.py

@@ -420,12 +420,14 @@ def validate_value_type(cls, value, info: ValidationInfo):
                 return int(value)
             if type_ == DataType.DATETIME:
                 return value
+            # allows list
             if type_ == DataType.ARRAY:
                 if isinstance(value, list):
                     return value
                 raise TypeError(f"{type(value)} does not match "
                                 f"{DataType.ARRAY}")
-            if type_ == DataType.STRUCTUREDVALUE:
+            # allows dict and BaseModel as object
+            if type_ == DataType.OBJECT:
                 if isinstance(value, dict):
                     value = json.dumps(value)
                     return json.loads(value)
@@ -435,11 +437,25 @@ def validate_value_type(cls, value, info: ValidationInfo):
                 raise TypeError(
                     f"{type(value)} does not match " f"{DataType.STRUCTUREDVALUE}"
                 )
+            # allows list, dict and BaseModel as structured value
+            if type_ == DataType.STRUCTUREDVALUE:
+                if isinstance(value, (dict, list)):
+                    value = json.dumps(value)
+                    return json.loads(value)
+                elif isinstance(value, BaseModel):
+                    value.model_dump_json()
+                    return value
+                raise TypeError(
+                    f"{type(value)} does not match " f"{DataType.STRUCTUREDVALUE}"
+                )
 
+            # if none of the above, check if it is a pydantic model
             if isinstance(value, BaseModel):
                 value.model_dump_json()
                 return value
 
+            # if none of the above, check if serializable. Hence, no further
+            # type check is performed
             value = json.dumps(value)
             return json.loads(value)