homeassistant 2025.8.0b5__py3-none-any.whl → 2025.8.2__py3-none-any.whl

homeassistant/components/tuya/models.py

@@ -99,8 +99,22 @@ class EnumTypeData:
         return cls(dpcode, **parsed)
 
 
+class ComplexTypeData:
+    """Complex Type Data (for JSON/RAW parsing)."""
+
+    @classmethod
+    def from_json(cls, data: str) -> Self:
+        """Load JSON string and return a ComplexTypeData object."""
+        raise NotImplementedError("from_json is not implemented for this type")
+
+    @classmethod
+    def from_raw(cls, data: str) -> Self | None:
+        """Decode base64 string and return a ComplexTypeData object."""
+        raise NotImplementedError("from_raw is not implemented for this type")
+
+
 @dataclass
-class ElectricityTypeData:
+class ElectricityTypeData(ComplexTypeData):
     """Electricity Type Data."""
 
     electriccurrent: str | None = None
@@ -113,9 +127,11 @@ class ElectricityTypeData:
         return cls(**json.loads(data.lower()))
 
     @classmethod
-    def from_raw(cls, data: str) -> Self:
+    def from_raw(cls, data: str) -> Self | None:
         """Decode base64 string and return a ElectricityTypeData object."""
         raw = base64.b64decode(data)
+        if len(raw) == 0:
+            return None
         voltage = struct.unpack(">H", raw[0:2])[0] / 10.0
         electriccurrent = struct.unpack(">L", b"\x00" + raw[2:5])[0] / 1000.0
         power = struct.unpack(">L", b"\x00" + raw[5:8])[0] / 1000.0

homeassistant/components/tuya/sensor.py

@@ -40,13 +40,14 @@ from .const import (
     UnitOfMeasurement,
 )
 from .entity import TuyaEntity
-from .models import ElectricityTypeData, EnumTypeData, IntegerTypeData
+from .models import ComplexTypeData, ElectricityTypeData, EnumTypeData, IntegerTypeData
 
 
 @dataclass(frozen=True)
 class TuyaSensorEntityDescription(SensorEntityDescription):
     """Describes Tuya sensor entity."""
 
+    complex_type: type[ComplexTypeData] | None = None
     subkey: str | None = None
 
 
@@ -368,6 +369,7 @@ SENSORS: dict[str, tuple[TuyaSensorEntityDescription, ...]] = {
             device_class=SensorDeviceClass.CURRENT,
             native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
             state_class=SensorStateClass.MEASUREMENT,
+            complex_type=ElectricityTypeData,
             subkey="electriccurrent",
         ),
         TuyaSensorEntityDescription(
@@ -376,6 +378,7 @@ SENSORS: dict[str, tuple[TuyaSensorEntityDescription, ...]] = {
             device_class=SensorDeviceClass.POWER,
             state_class=SensorStateClass.MEASUREMENT,
             native_unit_of_measurement=UnitOfPower.KILO_WATT,
+            complex_type=ElectricityTypeData,
             subkey="power",
         ),
         TuyaSensorEntityDescription(
@@ -384,6 +387,7 @@ SENSORS: dict[str, tuple[TuyaSensorEntityDescription, ...]] = {
             device_class=SensorDeviceClass.VOLTAGE,
             state_class=SensorStateClass.MEASUREMENT,
             native_unit_of_measurement=UnitOfElectricPotential.VOLT,
+            complex_type=ElectricityTypeData,
             subkey="voltage",
         ),
         TuyaSensorEntityDescription(
@@ -392,6 +396,7 @@ SENSORS: dict[str, tuple[TuyaSensorEntityDescription, ...]] = {
             device_class=SensorDeviceClass.CURRENT,
             native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
             state_class=SensorStateClass.MEASUREMENT,
+            complex_type=ElectricityTypeData,
             subkey="electriccurrent",
         ),
         TuyaSensorEntityDescription(
@@ -400,6 +405,7 @@ SENSORS: dict[str, tuple[TuyaSensorEntityDescription, ...]] = {
             device_class=SensorDeviceClass.POWER,
             state_class=SensorStateClass.MEASUREMENT,
             native_unit_of_measurement=UnitOfPower.KILO_WATT,
+            complex_type=ElectricityTypeData,
             subkey="power",
         ),
         TuyaSensorEntityDescription(
@@ -408,6 +414,7 @@ SENSORS: dict[str, tuple[TuyaSensorEntityDescription, ...]] = {
             device_class=SensorDeviceClass.VOLTAGE,
             state_class=SensorStateClass.MEASUREMENT,
             native_unit_of_measurement=UnitOfElectricPotential.VOLT,
+            complex_type=ElectricityTypeData,
             subkey="voltage",
         ),
         TuyaSensorEntityDescription(
@@ -416,6 +423,7 @@ SENSORS: dict[str, tuple[TuyaSensorEntityDescription, ...]] = {
             device_class=SensorDeviceClass.CURRENT,
             native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
             state_class=SensorStateClass.MEASUREMENT,
+            complex_type=ElectricityTypeData,
             subkey="electriccurrent",
         ),
         TuyaSensorEntityDescription(
@@ -424,6 +432,7 @@ SENSORS: dict[str, tuple[TuyaSensorEntityDescription, ...]] = {
             device_class=SensorDeviceClass.POWER,
             state_class=SensorStateClass.MEASUREMENT,
             native_unit_of_measurement=UnitOfPower.KILO_WATT,
+            complex_type=ElectricityTypeData,
             subkey="power",
         ),
         TuyaSensorEntityDescription(
@@ -432,6 +441,7 @@ SENSORS: dict[str, tuple[TuyaSensorEntityDescription, ...]] = {
             device_class=SensorDeviceClass.VOLTAGE,
             state_class=SensorStateClass.MEASUREMENT,
             native_unit_of_measurement=UnitOfElectricPotential.VOLT,
+            complex_type=ElectricityTypeData,
             subkey="voltage",
         ),
         TuyaSensorEntityDescription(
@@ -1254,6 +1264,7 @@ SENSORS: dict[str, tuple[TuyaSensorEntityDescription, ...]] = {
             translation_key="total_power",
             device_class=SensorDeviceClass.POWER,
             state_class=SensorStateClass.MEASUREMENT,
+            complex_type=ElectricityTypeData,
             subkey="power",
         ),
         TuyaSensorEntityDescription(
@@ -1262,6 +1273,7 @@ SENSORS: dict[str, tuple[TuyaSensorEntityDescription, ...]] = {
             device_class=SensorDeviceClass.CURRENT,
             native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
             state_class=SensorStateClass.MEASUREMENT,
+            complex_type=ElectricityTypeData,
             subkey="electriccurrent",
         ),
         TuyaSensorEntityDescription(
@@ -1270,6 +1282,7 @@ SENSORS: dict[str, tuple[TuyaSensorEntityDescription, ...]] = {
             device_class=SensorDeviceClass.POWER,
             state_class=SensorStateClass.MEASUREMENT,
             native_unit_of_measurement=UnitOfPower.KILO_WATT,
+            complex_type=ElectricityTypeData,
             subkey="power",
         ),
         TuyaSensorEntityDescription(
@@ -1278,6 +1291,7 @@ SENSORS: dict[str, tuple[TuyaSensorEntityDescription, ...]] = {
             device_class=SensorDeviceClass.VOLTAGE,
             state_class=SensorStateClass.MEASUREMENT,
             native_unit_of_measurement=UnitOfElectricPotential.VOLT,
+            complex_type=ElectricityTypeData,
             subkey="voltage",
         ),
         TuyaSensorEntityDescription(
@@ -1286,6 +1300,7 @@ SENSORS: dict[str, tuple[TuyaSensorEntityDescription, ...]] = {
             device_class=SensorDeviceClass.CURRENT,
             native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
             state_class=SensorStateClass.MEASUREMENT,
+            complex_type=ElectricityTypeData,
             subkey="electriccurrent",
         ),
         TuyaSensorEntityDescription(
@@ -1294,6 +1309,7 @@ SENSORS: dict[str, tuple[TuyaSensorEntityDescription, ...]] = {
             device_class=SensorDeviceClass.POWER,
             state_class=SensorStateClass.MEASUREMENT,
             native_unit_of_measurement=UnitOfPower.KILO_WATT,
+            complex_type=ElectricityTypeData,
             subkey="power",
         ),
         TuyaSensorEntityDescription(
@@ -1302,6 +1318,7 @@ SENSORS: dict[str, tuple[TuyaSensorEntityDescription, ...]] = {
             device_class=SensorDeviceClass.VOLTAGE,
             state_class=SensorStateClass.MEASUREMENT,
             native_unit_of_measurement=UnitOfElectricPotential.VOLT,
+            complex_type=ElectricityTypeData,
             subkey="voltage",
         ),
         TuyaSensorEntityDescription(
@@ -1310,6 +1327,7 @@ SENSORS: dict[str, tuple[TuyaSensorEntityDescription, ...]] = {
             device_class=SensorDeviceClass.CURRENT,
             native_unit_of_measurement=UnitOfElectricCurrent.AMPERE,
             state_class=SensorStateClass.MEASUREMENT,
+            complex_type=ElectricityTypeData,
             subkey="electriccurrent",
         ),
         TuyaSensorEntityDescription(
@@ -1318,6 +1336,7 @@ SENSORS: dict[str, tuple[TuyaSensorEntityDescription, ...]] = {
             device_class=SensorDeviceClass.POWER,
             state_class=SensorStateClass.MEASUREMENT,
             native_unit_of_measurement=UnitOfPower.KILO_WATT,
+            complex_type=ElectricityTypeData,
             subkey="power",
         ),
         TuyaSensorEntityDescription(
@@ -1326,6 +1345,7 @@ SENSORS: dict[str, tuple[TuyaSensorEntityDescription, ...]] = {
             device_class=SensorDeviceClass.VOLTAGE,
             state_class=SensorStateClass.MEASUREMENT,
             native_unit_of_measurement=UnitOfElectricPotential.VOLT,
+            complex_type=ElectricityTypeData,
             subkey="voltage",
         ),
     ),
@@ -1424,7 +1444,7 @@ class TuyaSensorEntity(TuyaEntity, SensorEntity):
 
     _status_range: DeviceStatusRange | None = None
     _type: DPType | None = None
-    _type_data: IntegerTypeData | EnumTypeData | None = None
+    _type_data: IntegerTypeData | EnumTypeData | ComplexTypeData | None = None
     _uom: UnitOfMeasurement | None = None
 
     def __init__(
@@ -1476,6 +1496,7 @@ class TuyaSensorEntity(TuyaEntity, SensorEntity):
                     self.unique_id,
                 )
                 self._attr_device_class = None
+                self._attr_suggested_unit_of_measurement = None
                 return
 
             uoms = DEVICE_CLASS_UNITS[self.device_class]
@@ -1486,6 +1507,7 @@ class TuyaSensorEntity(TuyaEntity, SensorEntity):
             # Unknown unit of measurement, device class should not be used.
             if uom is None:
                 self._attr_device_class = None
+                self._attr_suggested_unit_of_measurement = None
                 return
 
             # Found unit of measurement, use the standardized Unit
@@ -1523,16 +1545,23 @@ class TuyaSensorEntity(TuyaEntity, SensorEntity):
 
         # Get subkey value from Json string.
         if self._type is DPType.JSON:
-            if self.entity_description.subkey is None:
+            if (
+                self.entity_description.complex_type is None
+                or self.entity_description.subkey is None
+            ):
                 return None
-            values = ElectricityTypeData.from_json(value)
+            values = self.entity_description.complex_type.from_json(value)
             return getattr(values, self.entity_description.subkey)
 
         if self._type is DPType.RAW:
-            if self.entity_description.subkey is None:
+            if (
+                self.entity_description.complex_type is None
+                or self.entity_description.subkey is None
+                or (raw_values := self.entity_description.complex_type.from_raw(value))
+                is None
+            ):
                 return None
-            values = ElectricityTypeData.from_raw(value)
-            return getattr(values, self.entity_description.subkey)
+            return getattr(raw_values, self.entity_description.subkey)
 
         # Valid string or enum value
         return value

homeassistant/components/tuya/translations/bg.json

@@ -133,8 +133,6 @@
             },
             "blanket_level": {
                 "state": {
-                    "level_1": "\u041d\u0438\u0441\u043a\u043e",
-                    "level_10": "\u0412\u0438\u0441\u043e\u043a\u043e",
                     "level_2": "\u041d\u0438\u0432\u043e 2",
                     "level_3": "\u041d\u0438\u0432\u043e 3",
                     "level_4": "\u041d\u0438\u0432\u043e 4",

homeassistant/components/tuya/translations/ca.json

@@ -127,6 +127,12 @@
                     "2": "ON"
                 }
             },
+            "blanket_level": {
+                "state": {
+                    "level_1": "Baix/a",
+                    "level_10": "Alt/a"
+                }
+            },
             "brightness": {
                 "name": "Lluminositat"
             },
@@ -218,6 +224,13 @@
                     "work": "Feina"
                 }
             },
+            "indexed_led_type": {
+                "state": {
+                    "halogen": "Halogen",
+                    "incandescent": "Incandescent",
+                    "led": "LED"
+                }
+            },
             "ipc_work_mode": {
                 "name": "Mode IPC",
                 "state": {
@@ -248,7 +261,12 @@
                 "name": "Mode"
             },
             "motion_sensitivity": {
-                "name": "Sensibilitat de detecci\u00f3 de moviment"
+                "name": "Sensibilitat de detecci\u00f3 de moviment",
+                "state": {
+                    "0": "Baix/a",
+                    "1": "Mitj\u00e0/na",
+                    "2": "Alt/a"
+                }
             },
             "record_mode": {
                 "state": {
@@ -276,6 +294,8 @@
                 "name": "Ajust del dip\u00f2sit d'aigua",
                 "state": {
                     "closed": "Tancat/ada",
+                    "high": "Alt/a",
+                    "low": "Baix/a",
                     "middle": "Mitj\u00e0"
                 }
             },
@@ -494,6 +514,13 @@
             },
             "water_level": {
                 "name": "Nivell d'aigua"
+            },
+            "water_level_state": {
+                "state": {
+                    "level_1": "Baix/a",
+                    "level_2": "Mitj\u00e0/na",
+                    "level_3": "Ple/na"
+                }
             }
         },
         "switch": {

homeassistant/components/tuya/translations/cs.json

@@ -234,8 +234,8 @@
             },
             "blanket_level": {
                 "state": {
-                    "level_1": "N\u00edzk\u00e1",
-                    "level_10": "Vysok\u00e1",
+                    "level_1": "N\u00edzk\u00fd",
+                    "level_10": "Vysok\u00fd",
                     "level_2": "\u00darove\u0148 2",
                     "level_3": "\u00darove\u0148 3",
                     "level_4": "\u00darove\u0148 4",

homeassistant/components/tuya/translations/de.json

@@ -669,7 +669,7 @@
                 "name": "Betriebszeit insgesamt"
             },
             "total_production": {
-                "name": "Gesamtproduktion"
+                "name": "Gesamterzeugung"
             },
             "total_volatile_organic_compound": {
                 "name": "Gesamte fl\u00fcchtige organische Verbindungen"

homeassistant/components/tuya/translations/el.json

@@ -234,8 +234,6 @@
             },
             "blanket_level": {
                 "state": {
-                    "level_1": "\u03a7\u03b1\u03bc\u03b7\u03bb\u03cc",
-                    "level_10": "\u03a5\u03c8\u03b7\u03bb\u03cc",
                     "level_2": "\u0395\u03c0\u03af\u03c0\u03b5\u03b4\u03bf 2",
                     "level_3": "\u0395\u03c0\u03af\u03c0\u03b5\u03b4\u03bf 3",
                     "level_4": "\u0395\u03c0\u03af\u03c0\u03b5\u03b4\u03bf 4",

homeassistant/components/tuya/translations/es.json

@@ -234,8 +234,6 @@
             },
             "blanket_level": {
                 "state": {
-                    "level_1": "Bajo",
-                    "level_10": "Alto",
                     "level_2": "Nivel 2",
                     "level_3": "Nivel 3",
                     "level_4": "Nivel 4",