Fix Nullable values in write attributes procedure (#566)

Co-authored-by: Marcel van der Veldt <m.vanderveldt@outlook.com>

Author: BDeliers

matter_server/common/helpers/util.py

@@ -108,8 +108,13 @@ def parse_value(
     value_type: Any,
     default: Any = MISSING,
     allow_none: bool = True,
+    allow_sdk_types: bool = False,
 ) -> Any:
-    """Try to parse a value from raw (json) data and type annotations."""
+    """
+    Try to parse a value from raw (json) data and type annotations.
+
+    If allow_sdk_types is False, any SDK specific custom data types will be converted.
+    """
     # pylint: disable=too-many-return-statements,too-many-branches
 
     if isinstance(value_type, str):
@@ -131,9 +136,9 @@ def parse_value(
         return default
     if value is None and value_type is NoneType:
         return None
-    if value is None and allow_none:
-        return None
     if value is None and value_type is Nullable:
+        return Nullable() if allow_sdk_types else None
+    if value is None and allow_none:
         return None
     if is_dataclass(value_type) and isinstance(value, dict):
         return dataclass_from_dict(value_type, value)
@@ -220,12 +225,12 @@ def parse_value(
     if value_type is uint and (
         isinstance(value, int) or (isinstance(value, str) and value.isnumeric())
     ):
-        return uint(value)
+        return uint(value) if allow_sdk_types else int(value)
     if value_type is float32 and (
         isinstance(value, (float, int))
         or (isinstance(value, str) and value.isnumeric())
     ):
-        return float32(value)
+        return float32(value) if allow_sdk_types else float(value)
 
     # If we reach this point, we could not match the value with the type and we raise
     if not isinstance(value, value_type):
@@ -236,7 +241,9 @@ def parse_value(
     return value
 
 
-def dataclass_from_dict(cls: type[_T], dict_obj: dict, strict: bool = False) -> _T:
+def dataclass_from_dict(
+    cls: type[_T], dict_obj: dict, strict: bool = False, allow_sdk_types: bool = False
+) -> _T:
     """
     Create (instance of) a dataclass by providing a dict with values.
 
@@ -259,6 +266,7 @@ def dataclass_from_dict(cls: type[_T], dict_obj: dict, strict: bool = False) ->
                 type_hints[field.name],
                 field.default,
                 allow_none=not strict,
+                allow_sdk_types=allow_sdk_types,
             )
             for field in dc_fields
             if field.init

matter_server/server/device_controller.py

@@ -37,6 +37,7 @@
     dataclass_from_dict,
     dataclass_to_dict,
     parse_attribute_path,
+    parse_value,
 )
 from ..common.models import (
     APICommand,
@@ -529,7 +530,7 @@ async def send_device_command(
             raise NodeNotReady(f"Node {node_id} is not (yet) available.")
         cluster_cls: Cluster = ALL_CLUSTERS[cluster_id]
         command_cls = getattr(cluster_cls.Commands, command_name)
-        command = dataclass_from_dict(command_cls, payload)
+        command = dataclass_from_dict(command_cls, payload, allow_sdk_types=True)
         node_lock = self._get_node_lock(node_id)
         async with node_lock:
             return await self.chip_controller.SendCommand(
@@ -592,8 +593,16 @@ async def write_attribute(
         if (node := self._nodes.get(node_id)) is None or not node.available:
             raise NodeNotReady(f"Node {node_id} is not (yet) available.")
         endpoint_id, cluster_id, attribute_id = parse_attribute_path(attribute_path)
-        attribute = ALL_ATTRIBUTES[cluster_id][attribute_id]()
-        attribute.value = Clusters.NullValue if value is None else value
+        attribute = cast(
+            Clusters.ClusterAttributeDescriptor,
+            ALL_ATTRIBUTES[cluster_id][attribute_id](),
+        )
+        attribute.value = parse_value(
+            name=attribute_path,
+            value=value,
+            value_type=attribute.attribute_type.Type,
+            allow_sdk_types=True,
+        )
         return await self.chip_controller.WriteAttribute(
             nodeid=node_id,
             attributes=[(endpoint_id, attribute)],