homeassistant-stubs 2025.9.0b0__py3-none-any.whl → 2026.1.0b0__py3-none-any.whl

homeassistant-stubs/components/shelly/coordinator.pyi

@@ -1,7 +1,7 @@
 import asyncio
 from .bluetooth import async_connect_scanner as async_connect_scanner
 from .const import ATTR_CHANNEL as ATTR_CHANNEL, ATTR_CLICK_TYPE as ATTR_CLICK_TYPE, ATTR_DEVICE as ATTR_DEVICE, ATTR_GENERATION as ATTR_GENERATION, BATTERY_DEVICES_WITH_PERMANENT_CONNECTION as BATTERY_DEVICES_WITH_PERMANENT_CONNECTION, BLEScannerMode as BLEScannerMode, CONF_BLE_SCANNER_MODE as CONF_BLE_SCANNER_MODE, CONF_SLEEP_PERIOD as CONF_SLEEP_PERIOD, DOMAIN as DOMAIN, DUAL_MODE_LIGHT_MODELS as DUAL_MODE_LIGHT_MODELS, ENTRY_RELOAD_COOLDOWN as ENTRY_RELOAD_COOLDOWN, EVENT_SHELLY_CLICK as EVENT_SHELLY_CLICK, INPUTS_EVENTS_DICT as INPUTS_EVENTS_DICT, LOGGER as LOGGER, MAX_PUSH_UPDATE_FAILURES as MAX_PUSH_UPDATE_FAILURES, MODELS_SUPPORTING_LIGHT_EFFECTS as MODELS_SUPPORTING_LIGHT_EFFECTS, OTA_BEGIN as OTA_BEGIN, OTA_ERROR as OTA_ERROR, OTA_PROGRESS as OTA_PROGRESS, OTA_SUCCESS as OTA_SUCCESS, PUSH_UPDATE_ISSUE_ID as PUSH_UPDATE_ISSUE_ID, REST_SENSORS_UPDATE_INTERVAL as REST_SENSORS_UPDATE_INTERVAL, RPC_INPUTS_EVENTS_TYPES as RPC_INPUTS_EVENTS_TYPES, RPC_RECONNECT_INTERVAL as RPC_RECONNECT_INTERVAL, RPC_SENSORS_POLLING_INTERVAL as RPC_SENSORS_POLLING_INTERVAL, SHBTN_MODELS as SHBTN_MODELS, UPDATE_PERIOD_MULTIPLIER as UPDATE_PERIOD_MULTIPLIER
-from .utils import async_create_issue_unsupported_firmware as async_create_issue_unsupported_firmware, get_block_device_sleep_period as get_block_device_sleep_period, get_device_entry_gen as get_device_entry_gen, get_host as get_host, get_http_port as get_http_port, get_rpc_device_wakeup_period as get_rpc_device_wakeup_period, get_rpc_ws_url as get_rpc_ws_url, get_shelly_model_name as get_shelly_model_name, update_device_fw_info as update_device_fw_info
+from .utils import async_create_issue_unsupported_firmware as async_create_issue_unsupported_firmware, get_block_device_sleep_period as get_block_device_sleep_period, get_device_entry_gen as get_device_entry_gen, get_host as get_host, get_http_port as get_http_port, get_rpc_device_wakeup_period as get_rpc_device_wakeup_period, get_rpc_ws_url as get_rpc_ws_url, get_shelly_model_name as get_shelly_model_name, is_rpc_ble_scanner_supported as is_rpc_ble_scanner_supported, update_device_fw_info as update_device_fw_info
 from _typeshed import Incomplete
 from aioshelly.block_device import BlockDevice, BlockUpdateType
 from aioshelly.rpc_device import RpcDevice, RpcUpdateType

homeassistant-stubs/components/shelly/cover.pyi

@@ -1,26 +1,40 @@
+import asyncio
+from .const import RPC_COVER_UPDATE_TIME_SEC as RPC_COVER_UPDATE_TIME_SEC
 from .coordinator import ShellyBlockCoordinator as ShellyBlockCoordinator, ShellyConfigEntry as ShellyConfigEntry, ShellyRpcCoordinator as ShellyRpcCoordinator
-from .entity import ShellyBlockEntity as ShellyBlockEntity, ShellyRpcEntity as ShellyRpcEntity
-from .utils import get_device_entry_gen as get_device_entry_gen, get_rpc_key_ids as get_rpc_key_ids
+from .entity import BlockEntityDescription as BlockEntityDescription, RpcEntityDescription as RpcEntityDescription, ShellyBlockAttributeEntity as ShellyBlockAttributeEntity, ShellyRpcAttributeEntity as ShellyRpcAttributeEntity, async_setup_entry_block as async_setup_entry_block, async_setup_entry_rpc as async_setup_entry_rpc, rpc_call as rpc_call
+from .utils import get_device_entry_gen as get_device_entry_gen, get_rpc_channel_name as get_rpc_channel_name
 from _typeshed import Incomplete
 from aioshelly.block_device import Block as Block
-from homeassistant.components.cover import ATTR_POSITION as ATTR_POSITION, ATTR_TILT_POSITION as ATTR_TILT_POSITION, CoverDeviceClass as CoverDeviceClass, CoverEntity as CoverEntity, CoverEntityFeature as CoverEntityFeature
+from dataclasses import dataclass
+from homeassistant.components.cover import ATTR_POSITION as ATTR_POSITION, ATTR_TILT_POSITION as ATTR_TILT_POSITION, CoverDeviceClass as CoverDeviceClass, CoverEntity as CoverEntity, CoverEntityDescription as CoverEntityDescription, CoverEntityFeature as CoverEntityFeature
 from homeassistant.core import HomeAssistant as HomeAssistant, callback as callback
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback as AddConfigEntryEntitiesCallback
 from typing import Any
 
 PARALLEL_UPDATES: int
 
+@dataclass(frozen=True, kw_only=True)
+class BlockCoverDescription(BlockEntityDescription, CoverEntityDescription): ...
+@dataclass(frozen=True, kw_only=True)
+class RpcCoverDescription(RpcEntityDescription, CoverEntityDescription): ...
+
+BLOCK_COVERS: Incomplete
+RPC_COVERS: Incomplete
+
 async def async_setup_entry(hass: HomeAssistant, config_entry: ShellyConfigEntry, async_add_entities: AddConfigEntryEntitiesCallback) -> None: ...
 @callback
-def async_setup_block_entry(hass: HomeAssistant, config_entry: ShellyConfigEntry, async_add_entities: AddConfigEntryEntitiesCallback) -> None: ...
+def _async_setup_block_entry(hass: HomeAssistant, config_entry: ShellyConfigEntry, async_add_entities: AddConfigEntryEntitiesCallback) -> None: ...
 @callback
-def async_setup_rpc_entry(hass: HomeAssistant, config_entry: ShellyConfigEntry, async_add_entities: AddConfigEntryEntitiesCallback) -> None: ...
+def _async_setup_rpc_entry(hass: HomeAssistant, config_entry: ShellyConfigEntry, async_add_entities: AddConfigEntryEntitiesCallback) -> None: ...
 
-class BlockShellyCover(ShellyBlockEntity, CoverEntity):
+class BlockShellyCover(ShellyBlockAttributeEntity, CoverEntity):
+    entity_description: BlockCoverDescription
     _attr_device_class: Incomplete
     _attr_supported_features: CoverEntityFeature
     control_result: dict[str, Any] | None
-    def __init__(self, coordinator: ShellyBlockCoordinator, block: Block) -> None: ...
+    _attr_name: Incomplete
+    _attr_unique_id: str
+    def __init__(self, coordinator: ShellyBlockCoordinator, block: Block, attribute: str, description: BlockCoverDescription) -> None: ...
     @property
     def is_closed(self) -> bool: ...
     @property
@@ -36,11 +50,15 @@ class BlockShellyCover(ShellyBlockEntity, CoverEntity):
     @callback
     def _update_callback(self) -> None: ...
 
-class RpcShellyCover(ShellyRpcEntity, CoverEntity):
+class RpcShellyCover(ShellyRpcAttributeEntity, CoverEntity):
+    entity_description: RpcCoverDescription
     _attr_device_class: Incomplete
     _attr_supported_features: CoverEntityFeature
-    _id: Incomplete
-    def __init__(self, coordinator: ShellyRpcCoordinator, id_: int) -> None: ...
+    _id: int
+    _attr_name: Incomplete
+    _attr_unique_id: str
+    _update_task: asyncio.Task | None
+    def __init__(self, coordinator: ShellyRpcCoordinator, key: str, attribute: str, description: RpcCoverDescription) -> None: ...
     @property
     def is_closed(self) -> bool | None: ...
     @property
@@ -51,11 +69,22 @@ class RpcShellyCover(ShellyRpcEntity, CoverEntity):
     def is_closing(self) -> bool: ...
     @property
     def is_opening(self) -> bool: ...
+    def launch_update_task(self) -> None: ...
+    async def update_position(self) -> None: ...
+    def _update_callback(self) -> None: ...
+    @rpc_call
     async def async_close_cover(self, **kwargs: Any) -> None: ...
+    @rpc_call
     async def async_open_cover(self, **kwargs: Any) -> None: ...
+    @rpc_call
     async def async_set_cover_position(self, **kwargs: Any) -> None: ...
+    @rpc_call
     async def async_stop_cover(self, **_kwargs: Any) -> None: ...
+    @rpc_call
     async def async_open_cover_tilt(self, **kwargs: Any) -> None: ...
+    @rpc_call
     async def async_close_cover_tilt(self, **kwargs: Any) -> None: ...
+    @rpc_call
     async def async_set_cover_tilt_position(self, **kwargs: Any) -> None: ...
+    @rpc_call
     async def async_stop_cover_tilt(self, **kwargs: Any) -> None: ...

homeassistant-stubs/components/shelly/entity.pyi

@@ -1,6 +1,6 @@
-from .const import CONF_SLEEP_PERIOD as CONF_SLEEP_PERIOD, DOMAIN as DOMAIN, LOGGER as LOGGER
+from .const import CONF_SLEEP_PERIOD as CONF_SLEEP_PERIOD, DOMAIN as DOMAIN, LOGGER as LOGGER, ROLE_GENERIC as ROLE_GENERIC
 from .coordinator import ShellyBlockCoordinator as ShellyBlockCoordinator, ShellyConfigEntry as ShellyConfigEntry, ShellyRpcCoordinator as ShellyRpcCoordinator
-from .utils import async_remove_shelly_entity as async_remove_shelly_entity, get_block_device_info as get_block_device_info, get_block_entity_name as get_block_entity_name, get_rpc_device_info as get_rpc_device_info, get_rpc_entity_name as get_rpc_entity_name, get_rpc_key_instances as get_rpc_key_instances
+from .utils import async_remove_shelly_entity as async_remove_shelly_entity, get_block_device_info as get_block_device_info, get_rpc_channel_name as get_rpc_channel_name, get_rpc_device_info as get_rpc_device_info, get_rpc_key as get_rpc_key, get_rpc_key_instances as get_rpc_key_instances, get_rpc_role_by_key as get_rpc_role_by_key
 from _typeshed import Incomplete
 from aioshelly.block_device import Block as Block
 from collections.abc import Awaitable, Callable as Callable, Coroutine, Mapping
@@ -16,7 +16,7 @@ from homeassistant.helpers.update_coordinator import CoordinatorEntity as Coordi
 from typing import Any, Concatenate
 
 @callback
-def async_setup_entry_attribute_entities(hass: HomeAssistant, config_entry: ShellyConfigEntry, async_add_entities: AddEntitiesCallback, sensors: Mapping[tuple[str, str], BlockEntityDescription], sensor_class: Callable) -> None: ...
+def async_setup_entry_block(hass: HomeAssistant, config_entry: ShellyConfigEntry, async_add_entities: AddEntitiesCallback, sensors: Mapping[tuple[str, str], BlockEntityDescription], sensor_class: Callable) -> None: ...
 @callback
 def async_setup_block_attribute_entities(hass: HomeAssistant, async_add_entities: AddEntitiesCallback, coordinator: ShellyBlockCoordinator, sensors: Mapping[tuple[str, str], BlockEntityDescription], sensor_class: Callable) -> None: ...
 @callback
@@ -32,29 +32,27 @@ def async_setup_entry_rest(hass: HomeAssistant, config_entry: ShellyConfigEntry,
 
 @dataclass(frozen=True)
 class BlockEntityDescription(EntityDescription):
-    name: str = ...
     unit_fn: Callable[[dict], str] | None = ...
     value: Callable[[Any], Any] = ...
     available: Callable[[Block], bool] | None = ...
     removal_condition: Callable[[dict, Block], bool] | None = ...
-    extra_state_attributes: Callable[[Block], dict | None] | None = ...
+    models: set[str] | None = ...
 
 @dataclass(frozen=True, kw_only=True)
 class RpcEntityDescription(EntityDescription):
-    name: str = ...
-    sub_key: str
+    sub_key: str | None = ...
     value: Callable[[Any, Any], Any] | None = ...
     available: Callable[[dict], bool] | None = ...
     removal_condition: Callable[[dict, dict, str], bool] | None = ...
     use_polling_coordinator: bool = ...
     supported: Callable = ...
     unit: Callable[[dict], str | None] | None = ...
-    options_fn: Callable[[dict], list[str]] | None = ...
     entity_class: Callable | None = ...
+    role: str | None = ...
+    models: set[str] | None = ...
 
 @dataclass(frozen=True)
 class RestEntityDescription(EntityDescription):
-    name: str = ...
     value: Callable[[dict, Any], Any] | None = ...
 
 def rpc_call[_T: ShellyRpcEntity, **_P](func: Callable[Concatenate[_T, _P], Awaitable[None]]) -> Callable[Concatenate[_T, _P], Coroutine[Any, Any, None]]: ...
@@ -62,7 +60,6 @@ def rpc_call[_T: ShellyRpcEntity, **_P](func: Callable[Concatenate[_T, _P], Awai
 class ShellyBlockEntity(CoordinatorEntity[ShellyBlockCoordinator]):
     _attr_has_entity_name: bool
     block: Incomplete
-    _attr_name: Incomplete
     _attr_device_info: Incomplete
     _attr_unique_id: Incomplete
     def __init__(self, coordinator: ShellyBlockCoordinator, block: Block) -> None: ...
@@ -76,7 +73,6 @@ class ShellyRpcEntity(CoordinatorEntity[ShellyRpcCoordinator]):
     key: Incomplete
     _attr_device_info: Incomplete
     _attr_unique_id: Incomplete
-    _attr_name: Incomplete
     def __init__(self, coordinator: ShellyRpcCoordinator, key: str) -> None: ...
     @property
     def available(self) -> bool: ...
@@ -86,27 +82,23 @@ class ShellyRpcEntity(CoordinatorEntity[ShellyRpcCoordinator]):
     @callback
     def _update_callback(self) -> None: ...
     @rpc_call
-    async def call_rpc(self, method: str, params: Any, timeout: float | None = None) -> Any: ...
+    async def call_rpc(self, method: str, params: Any) -> Any: ...
 
 class ShellyBlockAttributeEntity(ShellyBlockEntity, Entity):
     entity_description: BlockEntityDescription
     attribute: Incomplete
     _attr_unique_id: str
-    _attr_name: Incomplete
     def __init__(self, coordinator: ShellyBlockCoordinator, block: Block, attribute: str, description: BlockEntityDescription) -> None: ...
     @property
     def attribute_value(self) -> StateType: ...
     @property
     def available(self) -> bool: ...
-    @property
-    def extra_state_attributes(self) -> dict[str, Any] | None: ...
 
 class ShellyRestAttributeEntity(CoordinatorEntity[ShellyBlockCoordinator]):
     _attr_has_entity_name: bool
     entity_description: RestEntityDescription
     block_coordinator: Incomplete
     attribute: Incomplete
-    _attr_name: Incomplete
     _attr_unique_id: Incomplete
     _attr_device_info: Incomplete
     _last_value: Incomplete
@@ -119,8 +111,8 @@ class ShellyRestAttributeEntity(CoordinatorEntity[ShellyBlockCoordinator]):
 class ShellyRpcAttributeEntity(ShellyRpcEntity, Entity):
     entity_description: RpcEntityDescription
     attribute: Incomplete
-    _attr_unique_id: Incomplete
     _attr_name: Incomplete
+    _attr_unique_id: Incomplete
     _last_value: Incomplete
     _id: Incomplete
     _attr_native_unit_of_measurement: Incomplete
@@ -133,6 +125,9 @@ class ShellyRpcAttributeEntity(ShellyRpcEntity, Entity):
     def attribute_value(self) -> StateType: ...
     @property
     def available(self) -> bool: ...
+    _attr_translation_placeholders: Incomplete
+    _attr_translation_key: Incomplete
+    def configure_translation_attributes(self) -> None: ...
 
 class ShellySleepingBlockAttributeEntity(ShellyBlockAttributeEntity):
     last_state: State | None
@@ -142,7 +137,6 @@ class ShellySleepingBlockAttributeEntity(ShellyBlockAttributeEntity):
     entity_description: Incomplete
     _attr_device_info: Incomplete
     _attr_unique_id: Incomplete
-    _attr_name: Incomplete
     def __init__(self, coordinator: ShellyBlockCoordinator, block: Block | None, attribute: str, description: BlockEntityDescription, entry: RegistryEntry | None = None) -> None: ...
     @callback
     def _update_callback(self) -> None: ...

homeassistant-stubs/components/shelly/event.pyi

@@ -1,7 +1,7 @@
 from .const import BASIC_INPUTS_EVENTS_TYPES as BASIC_INPUTS_EVENTS_TYPES, RPC_INPUTS_EVENTS_TYPES as RPC_INPUTS_EVENTS_TYPES, SHIX3_1_INPUTS_EVENTS_TYPES as SHIX3_1_INPUTS_EVENTS_TYPES
 from .coordinator import ShellyBlockCoordinator as ShellyBlockCoordinator, ShellyConfigEntry as ShellyConfigEntry, ShellyRpcCoordinator as ShellyRpcCoordinator
-from .entity import ShellyBlockEntity as ShellyBlockEntity, get_entity_rpc_device_info as get_entity_rpc_device_info
-from .utils import async_remove_orphaned_entities as async_remove_orphaned_entities, async_remove_shelly_entity as async_remove_shelly_entity, get_device_entry_gen as get_device_entry_gen, get_rpc_entity_name as get_rpc_entity_name, get_rpc_key_instances as get_rpc_key_instances, is_block_momentary_input as is_block_momentary_input, is_rpc_momentary_input as is_rpc_momentary_input
+from .entity import ShellyBlockEntity as ShellyBlockEntity, ShellyRpcEntity as ShellyRpcEntity
+from .utils import async_remove_orphaned_entities as async_remove_orphaned_entities, async_remove_shelly_entity as async_remove_shelly_entity, get_block_channel as get_block_channel, get_block_custom_name as get_block_custom_name, get_block_number_of_channels as get_block_number_of_channels, get_device_entry_gen as get_device_entry_gen, get_rpc_custom_name as get_rpc_custom_name, get_rpc_key as get_rpc_key, get_rpc_key_id as get_rpc_key_id, get_rpc_key_instances as get_rpc_key_instances, get_rpc_number_of_channels as get_rpc_number_of_channels, is_block_momentary_input as is_block_momentary_input, is_block_single_device as is_block_single_device, is_rpc_momentary_input as is_rpc_momentary_input
 from _typeshed import Incomplete
 from aioshelly.block_device import Block as Block
 from collections.abc import Callable as Callable
@@ -9,7 +9,6 @@ from dataclasses import dataclass
 from homeassistant.components.event import EventDeviceClass as EventDeviceClass, EventEntity as EventEntity, EventEntityDescription as EventEntityDescription
 from homeassistant.core import HomeAssistant as HomeAssistant, callback as callback
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback as AddConfigEntryEntitiesCallback
-from homeassistant.helpers.update_coordinator import CoordinatorEntity as CoordinatorEntity
 from typing import Any, Final
 
 PARALLEL_UPDATES: int
@@ -27,33 +26,41 @@ RPC_EVENT: Final[Incomplete]
 SCRIPT_EVENT: Final[Incomplete]
 
 async def async_setup_entry(hass: HomeAssistant, config_entry: ShellyConfigEntry, async_add_entities: AddConfigEntryEntitiesCallback) -> None: ...
+@callback
+def _async_setup_block_entry(hass: HomeAssistant, config_entry: ShellyConfigEntry, async_add_entities: AddConfigEntryEntitiesCallback) -> None: ...
+@callback
+def _async_setup_rpc_entry(hass: HomeAssistant, config_entry: ShellyConfigEntry, async_add_entities: AddConfigEntryEntitiesCallback) -> None: ...
 
 class ShellyBlockEvent(ShellyBlockEntity, EventEntity):
     entity_description: ShellyBlockEventDescription
     channel: Incomplete
     _attr_unique_id: Incomplete
     _attr_event_types: Incomplete
+    _attr_translation_placeholders: Incomplete
+    _attr_name: Incomplete
     def __init__(self, coordinator: ShellyBlockCoordinator, block: Block, description: ShellyBlockEventDescription) -> None: ...
     async def async_added_to_hass(self) -> None: ...
     @callback
     def _async_handle_event(self, event: dict[str, Any]) -> None: ...
 
-class ShellyRpcEvent(CoordinatorEntity[ShellyRpcCoordinator], EventEntity):
+class ShellyRpcEvent(ShellyRpcEntity, EventEntity):
     _attr_has_entity_name: bool
     entity_description: ShellyRpcEventDescription
-    event_id: Incomplete
-    _attr_device_info: Incomplete
-    _attr_unique_id: Incomplete
     _attr_name: Incomplete
+    _attr_translation_placeholders: Incomplete
+    event_id: Incomplete
     def __init__(self, coordinator: ShellyRpcCoordinator, key: str, description: ShellyRpcEventDescription) -> None: ...
     async def async_added_to_hass(self) -> None: ...
     @callback
     def _async_handle_event(self, event: dict[str, Any]) -> None: ...
 
-class ShellyRpcScriptEvent(ShellyRpcEvent):
-    component: Incomplete
+class ShellyRpcScriptEvent(ShellyRpcEntity, EventEntity):
+    _attr_has_entity_name: bool
+    entity_description: ShellyRpcEventDescription
     _attr_event_types: Incomplete
-    def __init__(self, coordinator: ShellyRpcCoordinator, key: str, event_types: list[str]) -> None: ...
+    _attr_name: Incomplete
+    event_id: Incomplete
+    def __init__(self, coordinator: ShellyRpcCoordinator, key: str, description: ShellyRpcEventDescription, event_types: list[str]) -> None: ...
     async def async_added_to_hass(self) -> None: ...
     @callback
     def _async_handle_event(self, event: dict[str, Any]) -> None: ...

homeassistant-stubs/components/shelly/light.pyi

@@ -1,28 +1,35 @@
 from .const import BLOCK_MAX_TRANSITION_TIME_MS as BLOCK_MAX_TRANSITION_TIME_MS, DUAL_MODE_LIGHT_MODELS as DUAL_MODE_LIGHT_MODELS, KELVIN_MAX_VALUE as KELVIN_MAX_VALUE, KELVIN_MIN_VALUE_COLOR as KELVIN_MIN_VALUE_COLOR, KELVIN_MIN_VALUE_WHITE as KELVIN_MIN_VALUE_WHITE, LOGGER as LOGGER, MODELS_SUPPORTING_LIGHT_TRANSITION as MODELS_SUPPORTING_LIGHT_TRANSITION, RGBW_MODELS as RGBW_MODELS, RPC_MIN_TRANSITION_TIME_SEC as RPC_MIN_TRANSITION_TIME_SEC, SHBLB_1_RGB_EFFECTS as SHBLB_1_RGB_EFFECTS, STANDARD_RGB_EFFECTS as STANDARD_RGB_EFFECTS
 from .coordinator import ShellyBlockCoordinator as ShellyBlockCoordinator, ShellyConfigEntry as ShellyConfigEntry, ShellyRpcCoordinator as ShellyRpcCoordinator
-from .entity import ShellyBlockEntity as ShellyBlockEntity, ShellyRpcEntity as ShellyRpcEntity
-from .utils import async_remove_orphaned_entities as async_remove_orphaned_entities, async_remove_shelly_entity as async_remove_shelly_entity, brightness_to_percentage as brightness_to_percentage, get_device_entry_gen as get_device_entry_gen, get_rpc_key_ids as get_rpc_key_ids, is_block_channel_type_light as is_block_channel_type_light, is_rpc_channel_type_light as is_rpc_channel_type_light, percentage_to_brightness as percentage_to_brightness
+from .entity import BlockEntityDescription as BlockEntityDescription, RpcEntityDescription as RpcEntityDescription, ShellyBlockAttributeEntity as ShellyBlockAttributeEntity, ShellyRpcAttributeEntity as ShellyRpcAttributeEntity, async_setup_entry_block as async_setup_entry_block, async_setup_entry_rpc as async_setup_entry_rpc
+from .utils import async_remove_orphaned_entities as async_remove_orphaned_entities, brightness_to_percentage as brightness_to_percentage, get_device_entry_gen as get_device_entry_gen, get_rpc_channel_name as get_rpc_channel_name, get_rpc_key_id as get_rpc_key_id, is_block_channel_type_light as is_block_channel_type_light, is_rpc_channel_type_light as is_rpc_channel_type_light, percentage_to_brightness as percentage_to_brightness
 from _typeshed import Incomplete
 from aioshelly.block_device import Block as Block
-from homeassistant.components.light import ATTR_BRIGHTNESS as ATTR_BRIGHTNESS, ATTR_COLOR_TEMP_KELVIN as ATTR_COLOR_TEMP_KELVIN, ATTR_EFFECT as ATTR_EFFECT, ATTR_RGBW_COLOR as ATTR_RGBW_COLOR, ATTR_RGB_COLOR as ATTR_RGB_COLOR, ATTR_TRANSITION as ATTR_TRANSITION, ColorMode as ColorMode, LightEntity as LightEntity, LightEntityFeature as LightEntityFeature, brightness_supported as brightness_supported
+from dataclasses import dataclass
+from homeassistant.components.light import ATTR_BRIGHTNESS as ATTR_BRIGHTNESS, ATTR_COLOR_TEMP_KELVIN as ATTR_COLOR_TEMP_KELVIN, ATTR_EFFECT as ATTR_EFFECT, ATTR_RGBW_COLOR as ATTR_RGBW_COLOR, ATTR_RGB_COLOR as ATTR_RGB_COLOR, ATTR_TRANSITION as ATTR_TRANSITION, ColorMode as ColorMode, LightEntity as LightEntity, LightEntityDescription as LightEntityDescription, LightEntityFeature as LightEntityFeature, brightness_supported as brightness_supported
 from homeassistant.core import HomeAssistant as HomeAssistant, callback as callback
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback as AddConfigEntryEntitiesCallback
-from typing import Any
+from typing import Any, Final
 
 PARALLEL_UPDATES: int
 
+@dataclass(frozen=True, kw_only=True)
+class BlockLightDescription(BlockEntityDescription, LightEntityDescription): ...
+
+BLOCK_LIGHTS: Incomplete
+
 async def async_setup_entry(hass: HomeAssistant, config_entry: ShellyConfigEntry, async_add_entities: AddConfigEntryEntitiesCallback) -> None: ...
 @callback
-def async_setup_block_entry(hass: HomeAssistant, config_entry: ShellyConfigEntry, async_add_entities: AddConfigEntryEntitiesCallback) -> None: ...
-@callback
-def async_setup_rpc_entry(hass: HomeAssistant, config_entry: ShellyConfigEntry, async_add_entities: AddConfigEntryEntitiesCallback) -> None: ...
+def _async_setup_block_entry(hass: HomeAssistant, config_entry: ShellyConfigEntry, async_add_entities: AddConfigEntryEntitiesCallback) -> None: ...
 
-class BlockShellyLight(ShellyBlockEntity, LightEntity):
+class BlockShellyLight(ShellyBlockAttributeEntity, LightEntity):
+    entity_description: BlockLightDescription
     _attr_supported_color_modes: set[str]
     control_result: dict[str, Any] | None
+    _attr_name: Incomplete
+    _attr_unique_id: str
     _attr_min_color_temp_kelvin: Incomplete
     _attr_max_color_temp_kelvin: Incomplete
-    def __init__(self, coordinator: ShellyBlockCoordinator, block: Block) -> None: ...
+    def __init__(self, coordinator: ShellyBlockCoordinator, block: Block, attribute: str, description: BlockLightDescription) -> None: ...
     @property
     def is_on(self) -> bool: ...
     @property
@@ -46,10 +53,15 @@ class BlockShellyLight(ShellyBlockEntity, LightEntity):
     @callback
     def _update_callback(self) -> None: ...
 
-class RpcShellyLightBase(ShellyRpcEntity, LightEntity):
+@dataclass(frozen=True, kw_only=True)
+class RpcLightDescription(RpcEntityDescription, LightEntityDescription): ...
+
+class RpcShellyLightBase(ShellyRpcAttributeEntity, LightEntity):
+    entity_description: RpcLightDescription
     _component: str
-    _id: Incomplete
-    def __init__(self, coordinator: ShellyRpcCoordinator, id_: int) -> None: ...
+    _attr_name: Incomplete
+    _attr_unique_id: Incomplete
+    def __init__(self, coordinator: ShellyRpcCoordinator, key: str, attribute: str, description: RpcEntityDescription) -> None: ...
     @property
     def is_on(self) -> bool: ...
     @property
@@ -58,6 +70,8 @@ class RpcShellyLightBase(ShellyRpcEntity, LightEntity):
     def rgb_color(self) -> tuple[int, int, int]: ...
     @property
     def rgbw_color(self) -> tuple[int, int, int, int]: ...
+    @property
+    def color_temp_kelvin(self) -> int: ...
     async def async_turn_on(self, **kwargs: Any) -> None: ...
     async def async_turn_off(self, **kwargs: Any) -> None: ...
 
@@ -79,9 +93,16 @@ class RpcShellyCctLight(RpcShellyLightBase):
     _attr_supported_features: Incomplete
     _attr_min_color_temp_kelvin: Incomplete
     _attr_max_color_temp_kelvin: Incomplete
-    def __init__(self, coordinator: ShellyRpcCoordinator, id_: int) -> None: ...
+    def __init__(self, coordinator: ShellyRpcCoordinator, key: str, attribute: str, description: RpcEntityDescription) -> None: ...
+
+class RpcShellyRgbCctLight(RpcShellyLightBase):
+    _component: str
+    _attr_supported_color_modes: Incomplete
+    _attr_supported_features: Incomplete
+    _attr_min_color_temp_kelvin = KELVIN_MIN_VALUE_WHITE
+    _attr_max_color_temp_kelvin = KELVIN_MAX_VALUE
     @property
-    def color_temp_kelvin(self) -> int: ...
+    def color_mode(self) -> ColorMode: ...
 
 class RpcShellyRgbLight(RpcShellyLightBase):
     _component: str
@@ -94,3 +115,8 @@ class RpcShellyRgbwLight(RpcShellyLightBase):
     _attr_color_mode: Incomplete
     _attr_supported_color_modes: Incomplete
     _attr_supported_features: Incomplete
+
+LIGHTS: Final[Incomplete]
+
+@callback
+def _async_setup_rpc_entry(hass: HomeAssistant, config_entry: ShellyConfigEntry, async_add_entities: AddConfigEntryEntitiesCallback) -> None: ...

homeassistant-stubs/components/shelly/logbook.pyi

@@ -1,6 +1,6 @@
 from .const import ATTR_CHANNEL as ATTR_CHANNEL, ATTR_CLICK_TYPE as ATTR_CLICK_TYPE, ATTR_DEVICE as ATTR_DEVICE, BLOCK_INPUTS_EVENTS_TYPES as BLOCK_INPUTS_EVENTS_TYPES, DOMAIN as DOMAIN, EVENT_SHELLY_CLICK as EVENT_SHELLY_CLICK, RPC_INPUTS_EVENTS_TYPES as RPC_INPUTS_EVENTS_TYPES
 from .coordinator import get_block_coordinator_by_device_id as get_block_coordinator_by_device_id, get_rpc_coordinator_by_device_id as get_rpc_coordinator_by_device_id
-from .utils import get_rpc_entity_name as get_rpc_entity_name
+from .utils import get_rpc_channel_name as get_rpc_channel_name
 from collections.abc import Callable as Callable
 from homeassistant.components.logbook import LOGBOOK_ENTRY_MESSAGE as LOGBOOK_ENTRY_MESSAGE, LOGBOOK_ENTRY_NAME as LOGBOOK_ENTRY_NAME
 from homeassistant.const import ATTR_DEVICE_ID as ATTR_DEVICE_ID

homeassistant-stubs/components/shelly/number.pyi

@@ -1,25 +1,23 @@
-from .const import CONF_SLEEP_PERIOD as CONF_SLEEP_PERIOD, DOMAIN as DOMAIN, LOGGER as LOGGER, VIRTUAL_NUMBER_MODE_MAP as VIRTUAL_NUMBER_MODE_MAP
+from .const import CONF_SLEEP_PERIOD as CONF_SLEEP_PERIOD, DOMAIN as DOMAIN, LOGGER as LOGGER, MODEL_FRANKEVER_WATER_VALVE as MODEL_FRANKEVER_WATER_VALVE, MODEL_LINKEDGO_ST1820_THERMOSTAT as MODEL_LINKEDGO_ST1820_THERMOSTAT, MODEL_LINKEDGO_ST802_THERMOSTAT as MODEL_LINKEDGO_ST802_THERMOSTAT, MODEL_TOP_EV_CHARGER_EVE01 as MODEL_TOP_EV_CHARGER_EVE01, ROLE_GENERIC as ROLE_GENERIC, TRV_CHANNEL as TRV_CHANNEL, VIRTUAL_NUMBER_MODE_MAP as VIRTUAL_NUMBER_MODE_MAP
 from .coordinator import ShellyBlockCoordinator as ShellyBlockCoordinator, ShellyConfigEntry as ShellyConfigEntry, ShellyRpcCoordinator as ShellyRpcCoordinator
-from .entity import BlockEntityDescription as BlockEntityDescription, RpcEntityDescription as RpcEntityDescription, ShellyRpcAttributeEntity as ShellyRpcAttributeEntity, ShellySleepingBlockAttributeEntity as ShellySleepingBlockAttributeEntity, async_setup_entry_attribute_entities as async_setup_entry_attribute_entities, async_setup_entry_rpc as async_setup_entry_rpc, rpc_call as rpc_call
-from .utils import async_remove_orphaned_entities as async_remove_orphaned_entities, get_blu_trv_device_info as get_blu_trv_device_info, get_device_entry_gen as get_device_entry_gen, get_virtual_component_ids as get_virtual_component_ids
+from .entity import BlockEntityDescription as BlockEntityDescription, RpcEntityDescription as RpcEntityDescription, ShellyRpcAttributeEntity as ShellyRpcAttributeEntity, ShellySleepingBlockAttributeEntity as ShellySleepingBlockAttributeEntity, async_setup_entry_block as async_setup_entry_block, async_setup_entry_rpc as async_setup_entry_rpc, rpc_call as rpc_call
+from .utils import async_remove_orphaned_entities as async_remove_orphaned_entities, get_blu_trv_device_info as get_blu_trv_device_info, get_device_entry_gen as get_device_entry_gen, get_virtual_component_ids as get_virtual_component_ids, get_virtual_component_unit as get_virtual_component_unit, is_view_for_platform as is_view_for_platform
 from _typeshed import Incomplete
 from aioshelly.block_device import Block as Block
 from collections.abc import Callable as Callable
 from dataclasses import dataclass
-from homeassistant.components.number import NumberEntity as NumberEntity, NumberEntityDescription as NumberEntityDescription, NumberExtraStoredData as NumberExtraStoredData, NumberMode as NumberMode, RestoreNumber as RestoreNumber
+from homeassistant.components.number import NumberDeviceClass as NumberDeviceClass, NumberEntity as NumberEntity, NumberEntityDescription as NumberEntityDescription, NumberExtraStoredData as NumberExtraStoredData, NumberMode as NumberMode, RestoreNumber as RestoreNumber
 from homeassistant.const import EntityCategory as EntityCategory, PERCENTAGE as PERCENTAGE, UnitOfTemperature as UnitOfTemperature
-from homeassistant.core import HomeAssistant as HomeAssistant
+from homeassistant.core import HomeAssistant as HomeAssistant, callback as callback
 from homeassistant.exceptions import HomeAssistantError as HomeAssistantError
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback as AddConfigEntryEntitiesCallback
 from homeassistant.helpers.entity_registry import RegistryEntry as RegistryEntry
-from typing import Any, Final
+from typing import Final
 
 PARALLEL_UPDATES: int
 
 @dataclass(frozen=True, kw_only=True)
-class BlockNumberDescription(BlockEntityDescription, NumberEntityDescription):
-    rest_path: str = ...
-    rest_arg: str = ...
+class BlockNumberDescription(BlockEntityDescription, NumberEntityDescription): ...
 
 @dataclass(frozen=True, kw_only=True)
 class RpcNumberDescription(RpcEntityDescription, NumberEntityDescription):
@@ -27,6 +25,7 @@ class RpcNumberDescription(RpcEntityDescription, NumberEntityDescription):
     min_fn: Callable[[dict], float] | None = ...
     step_fn: Callable[[dict], float] | None = ...
     mode_fn: Callable[[dict], NumberMode] | None = ...
+    slot: str | None = ...
     method: str
 
 class RpcNumber(ShellyRpcAttributeEntity, NumberEntity):
@@ -43,6 +42,10 @@ class RpcNumber(ShellyRpcAttributeEntity, NumberEntity):
     @rpc_call
     async def async_set_native_value(self, value: float) -> None: ...
 
+class RpcCuryIntensityNumber(RpcNumber):
+    @rpc_call
+    async def async_set_native_value(self, value: float) -> None: ...
+
 class RpcBluTrvNumber(RpcNumber):
     _attr_device_info: Incomplete
     def __init__(self, coordinator: ShellyRpcCoordinator, key: str, attribute: str, description: RpcNumberDescription) -> None: ...
@@ -53,10 +56,14 @@ class RpcBluTrvExtTempNumber(RpcBluTrvNumber):
     def native_value(self) -> float | None: ...
     async def async_set_native_value(self, value: float) -> None: ...
 
-NUMBERS: dict[tuple[str, str], BlockNumberDescription]
+BLOCK_NUMBERS: dict[tuple[str, str], BlockNumberDescription]
 RPC_NUMBERS: Final[Incomplete]
 
 async def async_setup_entry(hass: HomeAssistant, config_entry: ShellyConfigEntry, async_add_entities: AddConfigEntryEntitiesCallback) -> None: ...
+@callback
+def _async_setup_block_entry(hass: HomeAssistant, config_entry: ShellyConfigEntry, async_add_entities: AddConfigEntryEntitiesCallback) -> None: ...
+@callback
+def _async_setup_rpc_entry(hass: HomeAssistant, config_entry: ShellyConfigEntry, async_add_entities: AddConfigEntryEntitiesCallback) -> None: ...
 
 class BlockSleepingNumber(ShellySleepingBlockAttributeEntity, RestoreNumber):
     entity_description: BlockNumberDescription
@@ -66,4 +73,3 @@ class BlockSleepingNumber(ShellySleepingBlockAttributeEntity, RestoreNumber):
     @property
     def native_value(self) -> float | None: ...
     async def async_set_native_value(self, value: float) -> None: ...
-    async def _set_state_full_path(self, path: str, params: Any) -> Any: ...

homeassistant-stubs/components/shelly/repairs.pyi

@@ -1,4 +1,4 @@
-from .const import BLEScannerMode as BLEScannerMode, BLE_SCANNER_FIRMWARE_UNSUPPORTED_ISSUE_ID as BLE_SCANNER_FIRMWARE_UNSUPPORTED_ISSUE_ID, BLE_SCANNER_MIN_FIRMWARE as BLE_SCANNER_MIN_FIRMWARE, CONF_BLE_SCANNER_MODE as CONF_BLE_SCANNER_MODE, DOMAIN as DOMAIN, OUTBOUND_WEBSOCKET_INCORRECTLY_ENABLED_ISSUE_ID as OUTBOUND_WEBSOCKET_INCORRECTLY_ENABLED_ISSUE_ID
+from .const import BLEScannerMode as BLEScannerMode, BLE_SCANNER_FIRMWARE_UNSUPPORTED_ISSUE_ID as BLE_SCANNER_FIRMWARE_UNSUPPORTED_ISSUE_ID, BLE_SCANNER_MIN_FIRMWARE as BLE_SCANNER_MIN_FIRMWARE, CONF_BLE_SCANNER_MODE as CONF_BLE_SCANNER_MODE, DEPRECATED_FIRMWARES as DEPRECATED_FIRMWARES, DEPRECATED_FIRMWARE_ISSUE_ID as DEPRECATED_FIRMWARE_ISSUE_ID, DOMAIN as DOMAIN, OPEN_WIFI_AP_ISSUE_ID as OPEN_WIFI_AP_ISSUE_ID, OUTBOUND_WEBSOCKET_INCORRECTLY_ENABLED_ISSUE_ID as OUTBOUND_WEBSOCKET_INCORRECTLY_ENABLED_ISSUE_ID
 from .coordinator import ShellyConfigEntry as ShellyConfigEntry
 from .utils import get_rpc_ws_url as get_rpc_ws_url
 from _typeshed import Incomplete
@@ -10,7 +10,11 @@ from homeassistant.core import HomeAssistant as HomeAssistant, callback as callb
 @callback
 def async_manage_ble_scanner_firmware_unsupported_issue(hass: HomeAssistant, entry: ShellyConfigEntry) -> None: ...
 @callback
+def async_manage_deprecated_firmware_issue(hass: HomeAssistant, entry: ShellyConfigEntry) -> None: ...
+@callback
 def async_manage_outbound_websocket_incorrectly_enabled_issue(hass: HomeAssistant, entry: ShellyConfigEntry) -> None: ...
+@callback
+def async_manage_open_wifi_ap_issue(hass: HomeAssistant, entry: ShellyConfigEntry) -> None: ...
 
 class ShellyRpcRepairsFlow(RepairsFlow):
     _device: Incomplete
@@ -19,7 +23,7 @@ class ShellyRpcRepairsFlow(RepairsFlow):
     async def async_step_confirm(self, user_input: dict[str, str] | None = None) -> data_entry_flow.FlowResult: ...
     async def _async_step_confirm(self) -> data_entry_flow.FlowResult: ...
 
-class BleScannerFirmwareUpdateFlow(ShellyRpcRepairsFlow):
+class FirmwareUpdateFlow(ShellyRpcRepairsFlow):
     async def _async_step_confirm(self) -> data_entry_flow.FlowResult: ...
     async def async_step_update_firmware(self, user_input: dict[str, str] | None = None) -> data_entry_flow.FlowResult: ...
 
@@ -27,4 +31,12 @@ class DisableOutboundWebSocketFlow(ShellyRpcRepairsFlow):
     async def _async_step_confirm(self) -> data_entry_flow.FlowResult: ...
     async def async_step_disable_outbound_websocket(self, user_input: dict[str, str] | None = None) -> data_entry_flow.FlowResult: ...
 
+class DisableOpenWiFiApFlow(RepairsFlow):
+    _device: Incomplete
+    issue_id: Incomplete
+    def __init__(self, device: RpcDevice, issue_id: str) -> None: ...
+    async def async_step_init(self, user_input: dict[str, str] | None = None) -> data_entry_flow.FlowResult: ...
+    async def async_step_confirm(self, user_input: dict[str, str] | None = None) -> data_entry_flow.FlowResult: ...
+    async def async_step_ignore(self, user_input: dict[str, str] | None = None) -> data_entry_flow.FlowResult: ...
+
 async def async_create_fix_flow(hass: HomeAssistant, issue_id: str, data: dict[str, str] | None) -> RepairsFlow: ...

homeassistant-stubs/components/shelly/select.pyi

@@ -1,21 +1,19 @@
+from .const import ROLE_GENERIC as ROLE_GENERIC
 from .coordinator import ShellyConfigEntry as ShellyConfigEntry, ShellyRpcCoordinator as ShellyRpcCoordinator
 from .entity import RpcEntityDescription as RpcEntityDescription, ShellyRpcAttributeEntity as ShellyRpcAttributeEntity, async_setup_entry_rpc as async_setup_entry_rpc, rpc_call as rpc_call
-from .utils import async_remove_orphaned_entities as async_remove_orphaned_entities, get_device_entry_gen as get_device_entry_gen, get_virtual_component_ids as get_virtual_component_ids
+from .utils import async_remove_orphaned_entities as async_remove_orphaned_entities, get_device_entry_gen as get_device_entry_gen, get_virtual_component_ids as get_virtual_component_ids, is_view_for_platform as is_view_for_platform
 from _typeshed import Incomplete
 from dataclasses import dataclass
 from homeassistant.components.select import SelectEntity as SelectEntity, SelectEntityDescription as SelectEntityDescription
-from homeassistant.core import HomeAssistant as HomeAssistant
+from homeassistant.core import HomeAssistant as HomeAssistant, callback as callback
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback as AddConfigEntryEntitiesCallback
 from typing import Final
 
 PARALLEL_UPDATES: int
 
 @dataclass(frozen=True, kw_only=True)
-class RpcSelectDescription(RpcEntityDescription, SelectEntityDescription): ...
-
-RPC_SELECT_ENTITIES: Final[Incomplete]
-
-async def async_setup_entry(hass: HomeAssistant, config_entry: ShellyConfigEntry, async_add_entities: AddConfigEntryEntitiesCallback) -> None: ...
+class RpcSelectDescription(RpcEntityDescription, SelectEntityDescription):
+    method: str
 
 class RpcSelect(ShellyRpcAttributeEntity, SelectEntity):
     entity_description: RpcSelectDescription
@@ -26,3 +24,13 @@ class RpcSelect(ShellyRpcAttributeEntity, SelectEntity):
     def current_option(self) -> str | None: ...
     @rpc_call
     async def async_select_option(self, option: str) -> None: ...
+
+class RpcCuryModeSelect(RpcSelect):
+    @property
+    def current_option(self) -> str | None: ...
+
+RPC_SELECT_ENTITIES: Final[Incomplete]
+
+async def async_setup_entry(hass: HomeAssistant, config_entry: ShellyConfigEntry, async_add_entities: AddConfigEntryEntitiesCallback) -> None: ...
+@callback
+def _async_setup_rpc_entry(hass: HomeAssistant, config_entry: ShellyConfigEntry, async_add_entities: AddConfigEntryEntitiesCallback) -> None: ...

homeassistant-stubs/components/shelly/sensor.pyi

@@ -1,14 +1,13 @@
-from .const import CONF_SLEEP_PERIOD as CONF_SLEEP_PERIOD, ROLE_TO_DEVICE_CLASS_MAP as ROLE_TO_DEVICE_CLASS_MAP
+from .const import CONF_SLEEP_PERIOD as CONF_SLEEP_PERIOD, ROLE_GENERIC as ROLE_GENERIC
 from .coordinator import ShellyBlockCoordinator as ShellyBlockCoordinator, ShellyConfigEntry as ShellyConfigEntry, ShellyRpcCoordinator as ShellyRpcCoordinator
-from .entity import BlockEntityDescription as BlockEntityDescription, RestEntityDescription as RestEntityDescription, RpcEntityDescription as RpcEntityDescription, ShellyBlockAttributeEntity as ShellyBlockAttributeEntity, ShellyRestAttributeEntity as ShellyRestAttributeEntity, ShellyRpcAttributeEntity as ShellyRpcAttributeEntity, ShellySleepingBlockAttributeEntity as ShellySleepingBlockAttributeEntity, ShellySleepingRpcAttributeEntity as ShellySleepingRpcAttributeEntity, async_setup_entry_attribute_entities as async_setup_entry_attribute_entities, async_setup_entry_rest as async_setup_entry_rest, async_setup_entry_rpc as async_setup_entry_rpc, get_entity_rpc_device_info as get_entity_rpc_device_info
-from .utils import async_remove_orphaned_entities as async_remove_orphaned_entities, get_blu_trv_device_info as get_blu_trv_device_info, get_device_entry_gen as get_device_entry_gen, get_device_uptime as get_device_uptime, get_shelly_air_lamp_life as get_shelly_air_lamp_life, get_virtual_component_ids as get_virtual_component_ids, is_rpc_wifi_stations_disabled as is_rpc_wifi_stations_disabled
+from .entity import BlockEntityDescription as BlockEntityDescription, RestEntityDescription as RestEntityDescription, RpcEntityDescription as RpcEntityDescription, ShellyBlockAttributeEntity as ShellyBlockAttributeEntity, ShellyRestAttributeEntity as ShellyRestAttributeEntity, ShellyRpcAttributeEntity as ShellyRpcAttributeEntity, ShellySleepingBlockAttributeEntity as ShellySleepingBlockAttributeEntity, ShellySleepingRpcAttributeEntity as ShellySleepingRpcAttributeEntity, async_setup_entry_block as async_setup_entry_block, async_setup_entry_rest as async_setup_entry_rest, async_setup_entry_rpc as async_setup_entry_rpc, get_entity_rpc_device_info as get_entity_rpc_device_info
+from .utils import async_remove_orphaned_entities as async_remove_orphaned_entities, get_blu_trv_device_info as get_blu_trv_device_info, get_device_entry_gen as get_device_entry_gen, get_device_uptime as get_device_uptime, get_shelly_air_lamp_life as get_shelly_air_lamp_life, get_virtual_component_unit as get_virtual_component_unit, is_rpc_wifi_stations_disabled as is_rpc_wifi_stations_disabled, is_view_for_platform as is_view_for_platform
 from _typeshed import Incomplete
 from aioshelly.block_device import Block as Block
-from collections.abc import Callable as Callable
 from dataclasses import dataclass
 from homeassistant.components.sensor import RestoreSensor as RestoreSensor, SensorDeviceClass as SensorDeviceClass, SensorEntity as SensorEntity, SensorEntityDescription as SensorEntityDescription, SensorExtraStoredData as SensorExtraStoredData, SensorStateClass as SensorStateClass
-from homeassistant.const import CONCENTRATION_PARTS_PER_MILLION as CONCENTRATION_PARTS_PER_MILLION, DEGREE as DEGREE, EntityCategory as EntityCategory, LIGHT_LUX as LIGHT_LUX, PERCENTAGE as PERCENTAGE, SIGNAL_STRENGTH_DECIBELS_MILLIWATT as SIGNAL_STRENGTH_DECIBELS_MILLIWATT, UnitOfApparentPower as UnitOfApparentPower, UnitOfElectricCurrent as UnitOfElectricCurrent, UnitOfElectricPotential as UnitOfElectricPotential, UnitOfEnergy as UnitOfEnergy, UnitOfFrequency as UnitOfFrequency, UnitOfPower as UnitOfPower, UnitOfTemperature as UnitOfTemperature
-from homeassistant.core import HomeAssistant as HomeAssistant
+from homeassistant.const import CONCENTRATION_PARTS_PER_MILLION as CONCENTRATION_PARTS_PER_MILLION, DEGREE as DEGREE, EntityCategory as EntityCategory, LIGHT_LUX as LIGHT_LUX, PERCENTAGE as PERCENTAGE, SIGNAL_STRENGTH_DECIBELS_MILLIWATT as SIGNAL_STRENGTH_DECIBELS_MILLIWATT, UnitOfApparentPower as UnitOfApparentPower, UnitOfElectricCurrent as UnitOfElectricCurrent, UnitOfElectricPotential as UnitOfElectricPotential, UnitOfEnergy as UnitOfEnergy, UnitOfFrequency as UnitOfFrequency, UnitOfPower as UnitOfPower, UnitOfPressure as UnitOfPressure, UnitOfTemperature as UnitOfTemperature, UnitOfTime as UnitOfTime, UnitOfVolume as UnitOfVolume, UnitOfVolumeFlowRate as UnitOfVolumeFlowRate, UnitOfVolumetricFlux as UnitOfVolumetricFlux
+from homeassistant.core import HomeAssistant as HomeAssistant, callback as callback
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback as AddConfigEntryEntitiesCallback
 from homeassistant.helpers.entity_registry import RegistryEntry as RegistryEntry
 from homeassistant.helpers.typing import StateType as StateType
@@ -21,7 +20,6 @@ class BlockSensorDescription(BlockEntityDescription, SensorEntityDescription): .
 
 @dataclass(frozen=True, kw_only=True)
 class RpcSensorDescription(RpcEntityDescription, SensorEntityDescription):
-    device_class_fn: Callable[[dict], SensorDeviceClass | None] | None = ...
     emeter_phase: str | None = ...
 
 @dataclass(frozen=True, kw_only=True)
@@ -30,11 +28,18 @@ class RestSensorDescription(RestEntityDescription, SensorEntityDescription): ...
 class RpcSensor(ShellyRpcAttributeEntity, SensorEntity):
     entity_description: RpcSensorDescription
     _attr_options: Incomplete
-    _attr_device_class: Incomplete
     def __init__(self, coordinator: ShellyRpcCoordinator, key: str, attribute: str, description: RpcSensorDescription) -> None: ...
     @property
     def native_value(self) -> StateType: ...
 
+class RpcEnergyConsumedSensor(RpcSensor):
+    @property
+    def native_value(self) -> StateType: ...
+
+class RpcPresenceSensor(RpcSensor):
+    @property
+    def available(self) -> bool: ...
+
 class RpcEmeterPhaseSensor(RpcSensor):
     entity_description: RpcSensorDescription
     _attr_device_info: Incomplete
@@ -44,11 +49,15 @@ class RpcBluTrvSensor(RpcSensor):
     _attr_device_info: Incomplete
     def __init__(self, coordinator: ShellyRpcCoordinator, key: str, attribute: str, description: RpcSensorDescription) -> None: ...
 
-SENSORS: dict[tuple[str, str], BlockSensorDescription]
+BLOCK_SENSORS: dict[tuple[str, str], BlockSensorDescription]
 REST_SENSORS: Final[Incomplete]
 RPC_SENSORS: Final[Incomplete]
 
 async def async_setup_entry(hass: HomeAssistant, config_entry: ShellyConfigEntry, async_add_entities: AddConfigEntryEntitiesCallback) -> None: ...
+@callback
+def _async_setup_block_entry(hass: HomeAssistant, config_entry: ShellyConfigEntry, async_add_entities: AddConfigEntryEntitiesCallback) -> None: ...
+@callback
+def _async_setup_rpc_entry(hass: HomeAssistant, config_entry: ShellyConfigEntry, async_add_entities: AddConfigEntryEntitiesCallback) -> None: ...
 
 class BlockSensor(ShellyBlockAttributeEntity, SensorEntity):
     entity_description: BlockSensorDescription
@@ -75,7 +84,7 @@ class BlockSleepingSensor(ShellySleepingBlockAttributeEntity, RestoreSensor):
 class RpcSleepingSensor(ShellySleepingRpcAttributeEntity, RestoreSensor):
     entity_description: RpcSensorDescription
     restored_data: SensorExtraStoredData | None
-    def __init__(self, coordinator: ShellyRpcCoordinator, key: str, attribute: str, description: RpcEntityDescription, entry: RegistryEntry | None = None) -> None: ...
+    def __init__(self, coordinator: ShellyRpcCoordinator, key: str, attribute: str, description: RpcSensorDescription, entry: RegistryEntry | None = None) -> None: ...
     async def async_added_to_hass(self) -> None: ...
     @property
     def native_value(self) -> StateType: ...