Use process_raw_value in Tuya JsonTypeInformation (home-assistant#158517)

Author: epenet

homeassistant/components/tuya/light.py

@@ -167,14 +167,6 @@ class _ColorDataWrapper(DPCodeJsonWrapper):
     s_type = DEFAULT_S_TYPE
     v_type = DEFAULT_V_TYPE
 
-    def read_device_status(self, device: CustomerDevice) -> dict[str, Any] | None:
-        """Read the color data for the dpcode."""
-        if (status_data := self._read_device_status_raw(device)) is None or not (
-            status := json_loads_object(status_data)
-        ):
-            return None
-        return status
-
     def read_hs_color(self, device: CustomerDevice) -> tuple[float, float] | None:
         """Get the HS value from this color data."""
         if (status := self.read_device_status(device)) is None:

homeassistant/components/tuya/models.py

@@ -6,8 +6,6 @@
 
 from tuya_sharing import CustomerDevice
 
-from homeassistant.util.json import json_loads
-
 from .type_information import (
     BitmapTypeInformation,
     BooleanTypeInformation,
@@ -137,12 +135,6 @@ class DPCodeJsonWrapper(DPCodeTypeInformationWrapper[JsonTypeInformation]):
 
     _DPTYPE = JsonTypeInformation
 
-    def read_json(self, device: CustomerDevice) -> Any | None:
-        """Read the device value for the dpcode."""
-        if (raw_value := self._read_device_status_raw(device)) is None:
-            return None
-        return json_loads(raw_value)
-
 
 class DPCodeEnumWrapper(DPCodeTypeInformationWrapper[EnumTypeInformation]):
     """Simple wrapper for EnumTypeInformation values."""

homeassistant/components/tuya/sensor.py

@@ -90,9 +90,9 @@ class _JsonElectricityCurrentWrapper(DPCodeJsonWrapper):
 
     def read_device_status(self, device: CustomerDevice) -> float | None:
         """Read the device value for the dpcode."""
-        if (raw_value := super().read_json(device)) is None:
+        if (status := super().read_device_status(device)) is None:
             return None
-        return raw_value.get("electricCurrent")
+        return status.get("electricCurrent")
 
 
 class _JsonElectricityPowerWrapper(DPCodeJsonWrapper):
@@ -102,9 +102,9 @@ class _JsonElectricityPowerWrapper(DPCodeJsonWrapper):
 
     def read_device_status(self, device: CustomerDevice) -> float | None:
         """Read the device value for the dpcode."""
-        if (raw_value := super().read_json(device)) is None:
+        if (status := super().read_device_status(device)) is None:
             return None
-        return raw_value.get("power")
+        return status.get("power")
 
 
 class _JsonElectricityVoltageWrapper(DPCodeJsonWrapper):
@@ -114,9 +114,9 @@ class _JsonElectricityVoltageWrapper(DPCodeJsonWrapper):
 
     def read_device_status(self, device: CustomerDevice) -> float | None:
         """Read the device value for the dpcode."""
-        if (raw_value := super().read_json(device)) is None:
+        if (status := super().read_device_status(device)) is None:
             return None
-        return raw_value.get("voltage")
+        return status.get("voltage")
 
 
 class _RawElectricityDataWrapper(DPCodeRawWrapper):

homeassistant/components/tuya/type_information.py

@@ -286,11 +286,19 @@ def _from_json(cls, dpcode: str, type_data: str) -> Self | None:
 
 
 @dataclass(kw_only=True)
-class JsonTypeInformation(TypeInformation[Any]):
+class JsonTypeInformation(TypeInformation[dict[str, Any]]):
     """Json type information."""
 
     _DPTYPE = DPType.JSON
 
+    def process_raw_value(
+        self, raw_value: Any | None, device: CustomerDevice
+    ) -> dict[str, Any] | None:
+        """Read and process raw value against this type information."""
+        if raw_value is None:
+            return None
+        return json_loads_object(raw_value)
+
 
 @dataclass(kw_only=True)
 class RawTypeInformation(TypeInformation[bytes]):