Add AnalogInput, MultistateInput, use description attribute for fallback_name

tests/test_binary_sensor.py

@@ -44,6 +44,14 @@
     }
 }
 
+DEVICE_GENERAL = {
+    1: {
+        SIG_EP_PROFILE: zigpy.profiles.zha.PROFILE_ID,
+        SIG_EP_TYPE: zigpy.profiles.zha.DeviceType.ON_OFF_SENSOR,
+        SIG_EP_INPUT: [general.BinaryInput.cluster_id],
+        SIG_EP_OUTPUT: [],
+    }
+}
 
 DEVICE_SMARTTHINGS_MULTI = {
     1: {
@@ -163,13 +171,35 @@ async def test_binary_sensor(
     assert entity is not None
     assert isinstance(entity, entity_type)
     assert entity.PLATFORM == Platform.BINARY_SENSOR
+
+    assert entity.fallback_name is None
     assert entity.is_on is False
 
     # test getting messages that trigger and reset the sensors
     cluster = getattr(zigpy_device.endpoints[1], cluster_name)
     await on_off_test(zha_gateway, cluster, entity, plugs)
 
 
+async def test_binary_sensor_general(
+    zha_gateway: Gateway,
+) -> None:
+    """Test binary sensor general - description."""
+    zigpy_device = create_mock_zigpy_device(
+        zha_gateway, DEVICE_GENERAL, manufacturer="DevManuf", model="DevModel"
+    )
+
+    cluster = getattr(zigpy_device.endpoints[1], "binary_input")
+    cluster.PLUGGED_ATTR_READS = {"description": "Binary Input", "present_value": 1}
+    update_attribute_cache(cluster)
+    zha_device = await join_zigpy_device(zha_gateway, zigpy_device)
+    entity: PlatformEntity = find_entity(zha_device, Platform.BINARY_SENSOR)
+
+    await entity.async_update()
+    await zha_gateway.async_block_till_done()
+    assert entity.fallback_name == "Binary Input"
+    assert entity.translation_key is None
+
+
 async def test_smarttthings_multi(
     zha_gateway: Gateway,
 ) -> None:

tests/test_number.py

@@ -121,6 +121,8 @@ async def test_number(
     assert cluster.read_attributes.call_count == 3
 
     assert entity.description == "PWM1"
+    assert entity.fallback_name == "PWM1"
+    assert entity.translation_key is None
 
     # test that the state is 15.0
     assert entity.state["state"] == 15.0
@@ -179,6 +181,35 @@ async def test_number(
     assert entity.state["state"] == 30.0
 
 
+async def test_number_missing_description_attr(
+    zha_gateway: Gateway,
+) -> None:
+    """Test zha number platform - missing description attribute."""
+    zigpy_analog_output_device = create_mock_zigpy_device(
+        zha_gateway, ZIGPY_ANALOG_OUTPUT_DEVICE
+    )
+    cluster: general.AnalogOutput = zigpy_analog_output_device.endpoints.get(
+        1
+    ).analog_output
+    cluster.PLUGGED_ATTR_READS = {
+        "max_present_value": 100.0,
+        "min_present_value": 1.0,
+        "relinquish_default": 50.0,
+        "resolution": 1.1,
+        "engineering_units": 98,
+        "application_type": 4 * 0x10000,
+    }
+    update_attribute_cache(cluster)
+    zha_device = await join_zigpy_device(zha_gateway, zigpy_analog_output_device)
+
+    entity: PlatformEntity = get_entity(zha_device, platform=Platform.NUMBER)
+    assert isinstance(entity, PlatformEntity)
+
+    assert entity.description is None
+    assert entity.fallback_name is None
+    assert entity.translation_key == "number"
+
+
 @pytest.mark.parametrize(
     ("attr", "initial_value", "new_value", "max_value"),
     (

tests/test_sensor.py

@@ -409,6 +409,65 @@ async def async_test_change_source_timestamp(
     assert entity.state["state"] == datetime(2024, 10, 4, 11, 15, 15, tzinfo=UTC)
 
 
+async def async_test_general_analog_input(
+    zha_gateway: Gateway, cluster: Cluster, entity: PlatformEntity
+):
+    """Test general analog input."""
+    await entity.async_update()
+
+    assert entity.device_class == SensorDeviceClass.HUMIDITY.value
+
+    if entity._cluster_handler.resolution is not None:
+        assert entity.suggested_display_precision == 1
+    else:
+        assert entity.suggested_display_precision is None
+
+    assert entity._cluster_handler.max_present_value == 100.0
+    assert entity._cluster_handler.min_present_value == 1.0
+    assert entity._cluster_handler.out_of_service == 0
+    assert entity._cluster_handler.reliability == 0
+    assert entity._cluster_handler.status_flags == 0
+    assert entity._cluster_handler.application_type == 0x00070100
+    assert entity._cluster_handler.present_value == 1.0
+
+    await send_attributes_report(
+        zha_gateway, cluster, {general.AnalogInput.AttributeDefs.present_value.id: 1.0}
+    )
+    assert_state(entity, 1.0, "%")
+
+
+async def async_test_general_multistate_input(
+    zha_gateway: Gateway, cluster: Cluster, entity: PlatformEntity
+):
+    """Test general multistate input."""
+    await entity.async_update()
+
+    assert entity._cluster_handler.number_of_states == 2
+    assert entity._cluster_handler.out_of_service == 0
+    assert entity._cluster_handler.present_value == 1
+    assert entity._cluster_handler.reliability == 0
+    assert entity._cluster_handler.status_flags == 0
+    assert entity._cluster_handler.application_type == 0x00000009
+
+    if entity._cluster_handler.state_text is None:
+        assert_state(entity, "state_1", None)
+        await send_attributes_report(
+            zha_gateway,
+            cluster,
+            {general.MultistateInput.AttributeDefs.present_value.id: 2},
+        )
+        assert_state(entity, "state_2", None)
+    else:
+        assert entity._cluster_handler.state_text == ["Night", "Day", "Hold"]
+        assert_state(entity, "Night", None)
+        await send_attributes_report(
+            zha_gateway,
+            cluster,
+            {general.MultistateInput.AttributeDefs.present_value.id: 2},
+        )
+        assert_state(entity, "Day", None)
+
+
 @pytest.mark.parametrize(
     "cluster_id, entity_type, test_func, read_plug, unsupported_attrs",
     (
@@ -576,6 +635,72 @@ async def async_test_change_source_timestamp(
             None,
             None,
         ),
+        (
+            general.AnalogInput.cluster_id,
+            sensor.AnalogInputSensor,
+            async_test_general_analog_input,
+            {
+                "present_value": 1.0,
+                "description": "Analog Input",
+                "max_present_value": 100.0,
+                "min_present_value": 1.0,
+                "out_of_service": 0,
+                "reliability": 0,
+                "resolution": 1.1,
+                "status_flags": 0,
+                "engineering_units": 98,
+                "application_type": 0x00070100,
+            },
+            None,
+        ),
+        (
+            general.AnalogInput.cluster_id,
+            sensor.AnalogInputSensor,
+            async_test_general_analog_input,
+            {
+                "present_value": 1.0,
+                "description": "Analog Input",
+                "max_present_value": 100.0,
+                "min_present_value": 1.0,
+                "out_of_service": 0,
+                "reliability": 0,
+                "status_flags": 0,
+                "engineering_units": 98,
+                "application_type": 0x00070100,
+            },
+            None,
+        ),
+        (
+            general.MultistateInput.cluster_id,
+            sensor.MultiStateInputSensor,
+            async_test_general_multistate_input,
+            {
+                "state_text": t.LVList(["Night", "Day", "Hold"]),
+                "description": "Multistate Input",
+                "number_of_states": 2,
+                "out_of_service": 0,
+                "present_value": 1,
+                "reliability": 0,
+                "status_flags": 0,
+                "application_type": 0x00000009,
+            },
+            None,
+        ),
+        (
+            general.MultistateInput.cluster_id,
+            sensor.MultiStateInputSensor,
+            async_test_general_multistate_input,
+            {
+                "description": "Multistate Input",
+                "number_of_states": 2,
+                "out_of_service": 0,
+                "present_value": 1,
+                "reliability": 0,
+                "status_flags": 0,
+                "application_type": 0x00000009,
+            },
+            None,
+        ),
     ),
 )
 async def test_sensor(
@@ -617,6 +742,12 @@ async def test_sensor(
     )
 
     await zha_gateway.async_block_till_done()
+
+    if read_plug and read_plug.get("description", None):
+        assert entity.fallback_name == read_plug.get("description", None)
+        assert entity.translation_key is None
+    else:
+        assert entity.fallback_name is None
     # test sensor associated logic
     await test_func(zha_gateway, cluster, entity)
 

zha/application/platforms/binary_sensor/__init__.py

@@ -77,6 +77,12 @@ def __init__(
             CLUSTER_HANDLER_ATTRIBUTE_UPDATED,
             self.handle_cluster_handler_attribute_updated,
         )
+        if (
+            hasattr(self._cluster_handler, "description")
+            and self._cluster_handler.description is not None
+        ):
+            self._attr_translation_key = None
+            self._attr_fallback_name: str = self._cluster_handler.description
 
     def _init_from_quirks_metadata(self, entity_metadata: BinarySensorMetadata) -> None:
         """Init this entity from the quirks metadata."""

zha/application/platforms/number/__init__.py

@@ -95,6 +95,14 @@ def __init__(
             CLUSTER_HANDLER_ATTRIBUTE_UPDATED,
             self.handle_cluster_handler_attribute_updated,
         )
+        if (
+            hasattr(self._analog_output_cluster_handler, "description")
+            and self._analog_output_cluster_handler.description is not None
+        ):
+            self._attr_translation_key = None
+            self._attr_fallback_name: str = (
+                self._analog_output_cluster_handler.description
+            )
 
     @functools.cached_property
     def info_object(self) -> NumberEntityInfo: