From 4c885e7ce894ff62e3998fddcc32276ee0fcc61e Mon Sep 17 00:00:00 2001
From: TheJulianJES <TheJulianJES@users.noreply.github.com>
Date: Mon, 23 Feb 2026 18:53:58 +0100
Subject: [PATCH] Fix ZHA number entity not using device class and mode
 (#163827)

---
 homeassistant/components/zha/number.py | 12 ++++-
 tests/components/zha/test_number.py    | 66 +++++++++++++++++++++++---
 2 files changed, 71 insertions(+), 7 deletions(-)

diff --git a/homeassistant/components/zha/number.py b/homeassistant/components/zha/number.py
index 7a6e40af7e7..4df9c7611bc 100644
--- a/homeassistant/components/zha/number.py
+++ b/homeassistant/components/zha/number.py
@@ -4,8 +4,9 @@ from __future__ import annotations
 
 import functools
 import logging
+from typing import Any
 
-from homeassistant.components.number import RestoreNumber
+from homeassistant.components.number import NumberDeviceClass, NumberMode, RestoreNumber
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
@@ -15,6 +16,7 @@ from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from .entity import ZHAEntity
 from .helpers import (
     SIGNAL_ADD_ENTITIES,
+    EntityData,
     async_add_entities as zha_async_add_entities,
     convert_zha_error_to_ha_error,
     get_zha_data,
@@ -45,6 +47,14 @@ async def async_setup_entry(
 class ZhaNumber(ZHAEntity, RestoreNumber):
     """Representation of a ZHA Number entity."""
 
+    def __init__(self, entity_data: EntityData, **kwargs: Any) -> None:
+        """Initialize the ZHA number entity."""
+        super().__init__(entity_data, **kwargs)
+        entity = entity_data.entity
+        if entity.device_class is not None:
+            self._attr_device_class = NumberDeviceClass(entity.device_class)
+        self._attr_mode = NumberMode(entity.mode)
+
     @property
     def native_value(self) -> float | None:
         """Return the current value."""
diff --git a/tests/components/zha/test_number.py b/tests/components/zha/test_number.py
index 4f6d0afecc2..94c9a3898ce 100644
--- a/tests/components/zha/test_number.py
+++ b/tests/components/zha/test_number.py
@@ -6,6 +6,8 @@ from unittest.mock import call, patch
 import pytest
 from zigpy.device import Device
 from zigpy.profiles import zha
+from zigpy.quirks.v2 import QuirkBuilder
+from zigpy.quirks.v2.homeassistant.number import NumberDeviceClass
 from zigpy.typing import UNDEFINED
 from zigpy.zcl.clusters import general
 import zigpy.zcl.foundation as zcl_f
@@ -92,14 +94,18 @@ async def test_number(
     entity_id = find_entity_id(Platform.NUMBER, zha_device_proxy, hass)
     assert entity_id is not None
 
-    assert hass.states.get(entity_id).state == "15.0"
+    hass_state = hass.states.get(entity_id)
+    assert hass_state is not None
+    assert hass_state.state == "15.0"
 
     # test attributes
-    assert hass.states.get(entity_id).attributes.get("min") == 1.0
-    assert hass.states.get(entity_id).attributes.get("max") == 100.0
-    assert hass.states.get(entity_id).attributes.get("step") == 1.1
-    assert hass.states.get(entity_id).attributes.get("icon") == "mdi:percent"
-    assert hass.states.get(entity_id).attributes.get("unit_of_measurement") == "%"
+    assert hass_state.attributes.get("min") == 1.0
+    assert hass_state.attributes.get("max") == 100.0
+    assert hass_state.attributes.get("step") == 1.1
+    assert hass_state.attributes.get("icon") == "mdi:percent"
+    assert hass_state.attributes.get("unit_of_measurement") == "%"
+    assert hass_state.attributes.get("mode") == "auto"
+    assert hass_state.attributes.get("device_class") is None
 
     assert (
         hass.states.get(entity_id).attributes.get("friendly_name")
@@ -145,3 +151,51 @@ async def test_number(
     )
     assert hass.states.get(entity_id).state == "40.0"
     assert "present_value" in cluster.read_attributes.call_args[0][0]
+
+
+async def test_number_quirks_v2_metadata(
+    hass: HomeAssistant,
+    setup_zha: Callable[..., Coroutine[None]],
+    zigpy_device_mock: Callable[..., Device],
+) -> None:
+    """Test that mode and device_class from quirks v2 metadata are passed through."""
+    (
+        QuirkBuilder("Test Manf", "Test Number Model")
+        .number(
+            attribute_name="current_level",
+            cluster_id=general.LevelControl.cluster_id,
+            min_value=0,
+            max_value=254,
+            mode="box",
+            device_class=NumberDeviceClass.TEMPERATURE,
+            fallback_name="Level",
+        )
+        .add_to_registry()
+    )
+
+    await setup_zha()
+    gateway = get_zha_gateway(hass)
+
+    zigpy_device = zigpy_device_mock(
+        {
+            1: {
+                SIG_EP_INPUT: [general.LevelControl.cluster_id],
+                SIG_EP_OUTPUT: [],
+                SIG_EP_TYPE: zha.DeviceType.ON_OFF_SWITCH,
+                SIG_EP_PROFILE: zha.PROFILE_ID,
+            }
+        },
+        manufacturer="Test Manf",
+        model="Test Number Model",
+    )
+
+    gateway.get_or_create_device(zigpy_device)
+    await gateway.async_device_initialized(zigpy_device)
+    await hass.async_block_till_done(wait_background_tasks=True)
+
+    entity_id = "number.test_manf_test_number_model"
+    hass_state = hass.states.get(entity_id)
+    assert hass_state is not None
+
+    assert hass_state.attributes.get("mode") == "box"
+    assert hass_state.attributes.get("device_class") == "temperature"