homeassistant-stubs 2024.3.3__py3-none-any.whl → 2024.4.0__py3-none-any.whl

homeassistant-stubs/components/sensibo/update.pyi

@@ -13,15 +13,11 @@ from pysensibo.model import SensiboDevice as SensiboDevice
 
 PARALLEL_UPDATES: int
 
-@dataclass(frozen=True)
-class DeviceBaseEntityDescriptionMixin:
+@dataclass(frozen=True, kw_only=True)
+class SensiboDeviceUpdateEntityDescription(UpdateEntityDescription):
     value_version: Callable[[SensiboDevice], str | None]
     value_available: Callable[[SensiboDevice], str | None]
-    def __init__(self, value_version, value_available) -> None: ...
-
-@dataclass(frozen=True)
-class SensiboDeviceUpdateEntityDescription(UpdateEntityDescription, DeviceBaseEntityDescriptionMixin):
-    def __init__(self, value_version, value_available, *, key, device_class, entity_category, entity_registry_enabled_default, entity_registry_visible_default, force_update, icon, has_entity_name, name, translation_key, translation_placeholders, unit_of_measurement) -> None: ...
+    def __init__(self, *, key, device_class, entity_category, entity_registry_enabled_default, entity_registry_visible_default, force_update, icon, has_entity_name, name, translation_key, translation_placeholders, unit_of_measurement, value_version, value_available) -> None: ...
 
 DEVICE_SENSOR_TYPES: tuple[SensiboDeviceUpdateEntityDescription, ...]
 

homeassistant-stubs/components/sensirion_ble/config_flow.pyi

@@ -1,9 +1,8 @@
 from .const import DOMAIN as DOMAIN
 from _typeshed import Incomplete
 from homeassistant.components.bluetooth import BluetoothServiceInfoBleak as BluetoothServiceInfoBleak, async_discovered_service_info as async_discovered_service_info
-from homeassistant.config_entries import ConfigFlow as ConfigFlow
+from homeassistant.config_entries import ConfigFlow as ConfigFlow, ConfigFlowResult as ConfigFlowResult
 from homeassistant.const import CONF_ADDRESS as CONF_ADDRESS
-from homeassistant.data_entry_flow import FlowResult as FlowResult
 from typing import Any
 
 class SensirionConfigFlow(ConfigFlow, domain=DOMAIN):
@@ -12,6 +11,6 @@ class SensirionConfigFlow(ConfigFlow, domain=DOMAIN):
     _discovered_device: Incomplete
     _discovered_devices: Incomplete
     def __init__(self) -> None: ...
-    async def async_step_bluetooth(self, discovery_info: BluetoothServiceInfoBleak) -> FlowResult: ...
-    async def async_step_bluetooth_confirm(self, user_input: dict[str, Any] | None = None) -> FlowResult: ...
-    async def async_step_user(self, user_input: dict[str, Any] | None = None) -> FlowResult: ...
+    async def async_step_bluetooth(self, discovery_info: BluetoothServiceInfoBleak) -> ConfigFlowResult: ...
+    async def async_step_bluetooth_confirm(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
+    async def async_step_user(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...

homeassistant-stubs/components/sfr_box/binary_sensor.pyi

@@ -16,14 +16,10 @@ from typing import Generic, TypeVar
 
 _T = TypeVar('_T')
 
-@dataclass(frozen=True)
-class SFRBoxBinarySensorMixin(Generic[_T]):
+@dataclass(frozen=True, kw_only=True)
+class SFRBoxBinarySensorEntityDescription(BinarySensorEntityDescription, Generic[_T]):
     value_fn: Callable[[_T], bool | None]
-    def __init__(self, value_fn) -> None: ...
-
-@dataclass(frozen=True)
-class SFRBoxBinarySensorEntityDescription(BinarySensorEntityDescription, SFRBoxBinarySensorMixin[_T]):
-    def __init__(self, value_fn, *, key, device_class, entity_category, entity_registry_enabled_default, entity_registry_visible_default, force_update, icon, has_entity_name, name, translation_key, translation_placeholders, unit_of_measurement) -> None: ...
+    def __init__(self, *, key, device_class, entity_category, entity_registry_enabled_default, entity_registry_visible_default, force_update, icon, has_entity_name, name, translation_key, translation_placeholders, unit_of_measurement, value_fn) -> None: ...
 
 DSL_SENSOR_TYPES: tuple[SFRBoxBinarySensorEntityDescription[DslInfo], ...]
 FTTH_SENSOR_TYPES: tuple[SFRBoxBinarySensorEntityDescription[FtthInfo], ...]

homeassistant-stubs/components/sfr_box/button.pyi

@@ -19,14 +19,10 @@ _P = ParamSpec('_P')
 
 def with_error_wrapping(func: Callable[Concatenate[SFRBoxButton, _P], Awaitable[_T]]) -> Callable[Concatenate[SFRBoxButton, _P], Coroutine[Any, Any, _T]]: ...
 
-@dataclass(frozen=True)
-class SFRBoxButtonMixin:
+@dataclass(frozen=True, kw_only=True)
+class SFRBoxButtonEntityDescription(ButtonEntityDescription):
     async_press: Callable[[SFRBox], Coroutine[None, None, None]]
-    def __init__(self, async_press) -> None: ...
-
-@dataclass(frozen=True)
-class SFRBoxButtonEntityDescription(ButtonEntityDescription, SFRBoxButtonMixin):
-    def __init__(self, async_press, *, key, device_class, entity_category, entity_registry_enabled_default, entity_registry_visible_default, force_update, icon, has_entity_name, name, translation_key, translation_placeholders, unit_of_measurement) -> None: ...
+    def __init__(self, *, key, device_class, entity_category, entity_registry_enabled_default, entity_registry_visible_default, force_update, icon, has_entity_name, name, translation_key, translation_placeholders, unit_of_measurement, async_press) -> None: ...
 
 BUTTON_TYPES: tuple[SFRBoxButtonEntityDescription, ...]
 

homeassistant-stubs/components/sfr_box/config_flow.pyi

@@ -1,9 +1,8 @@
 from .const import DEFAULT_HOST as DEFAULT_HOST, DEFAULT_USERNAME as DEFAULT_USERNAME, DOMAIN as DOMAIN
 from _typeshed import Incomplete
 from collections.abc import Mapping
-from homeassistant.config_entries import ConfigEntry as ConfigEntry, ConfigFlow as ConfigFlow
+from homeassistant.config_entries import ConfigEntry as ConfigEntry, ConfigFlow as ConfigFlow, ConfigFlowResult as ConfigFlowResult
 from homeassistant.const import CONF_HOST as CONF_HOST, CONF_PASSWORD as CONF_PASSWORD, CONF_USERNAME as CONF_USERNAME
-from homeassistant.data_entry_flow import FlowResult as FlowResult
 from homeassistant.helpers import selector as selector
 from homeassistant.helpers.httpx_client import get_async_client as get_async_client
 from sfrbox_api.bridge import SFRBox
@@ -17,8 +16,8 @@ class SFRBoxFlowHandler(ConfigFlow, domain=DOMAIN):
     _box: SFRBox
     _config: dict[str, Any]
     _reauth_entry: ConfigEntry | None
-    async def async_step_user(self, user_input: dict[str, str] | None = None) -> FlowResult: ...
-    async def async_step_choose_auth(self, user_input: dict[str, str] | None = None) -> FlowResult: ...
-    async def async_step_auth(self, user_input: dict[str, str] | None = None) -> FlowResult: ...
-    async def async_step_skip_auth(self, user_input: dict[str, str] | None = None) -> FlowResult: ...
-    async def async_step_reauth(self, entry_data: Mapping[str, Any]) -> FlowResult: ...
+    async def async_step_user(self, user_input: dict[str, str] | None = None) -> ConfigFlowResult: ...
+    async def async_step_choose_auth(self, user_input: dict[str, str] | None = None) -> ConfigFlowResult: ...
+    async def async_step_auth(self, user_input: dict[str, str] | None = None) -> ConfigFlowResult: ...
+    async def async_step_skip_auth(self, user_input: dict[str, str] | None = None) -> ConfigFlowResult: ...
+    async def async_step_reauth(self, entry_data: Mapping[str, Any]) -> ConfigFlowResult: ...

homeassistant-stubs/components/sfr_box/sensor.pyi

@@ -17,14 +17,10 @@ from typing import Generic, TypeVar
 
 _T = TypeVar('_T')
 
-@dataclass(frozen=True)
-class SFRBoxSensorMixin(Generic[_T]):
+@dataclass(frozen=True, kw_only=True)
+class SFRBoxSensorEntityDescription(SensorEntityDescription, Generic[_T]):
     value_fn: Callable[[_T], StateType]
-    def __init__(self, value_fn) -> None: ...
-
-@dataclass(frozen=True)
-class SFRBoxSensorEntityDescription(SensorEntityDescription, SFRBoxSensorMixin[_T]):
-    def __init__(self, value_fn, *, key, device_class, entity_category, entity_registry_enabled_default, entity_registry_visible_default, force_update, icon, has_entity_name, name, translation_key, translation_placeholders, unit_of_measurement, last_reset, native_unit_of_measurement, options, state_class, suggested_display_precision, suggested_unit_of_measurement) -> None: ...
+    def __init__(self, *, key, device_class, entity_category, entity_registry_enabled_default, entity_registry_visible_default, force_update, icon, has_entity_name, name, translation_key, translation_placeholders, unit_of_measurement, last_reset, native_unit_of_measurement, options, state_class, suggested_display_precision, suggested_unit_of_measurement, value_fn) -> None: ...
 
 DSL_SENSOR_TYPES: tuple[SFRBoxSensorEntityDescription[DslInfo], ...]
 SYSTEM_SENSOR_TYPES: tuple[SFRBoxSensorEntityDescription[SystemInfo], ...]

homeassistant-stubs/components/shelly/__init__.pyi

@@ -1,6 +1,6 @@
-from .const import BLOCK_EXPECTED_SLEEP_PERIOD as BLOCK_EXPECTED_SLEEP_PERIOD, BLOCK_WRONG_SLEEP_PERIOD as BLOCK_WRONG_SLEEP_PERIOD, CONF_COAP_PORT as CONF_COAP_PORT, CONF_SLEEP_PERIOD as CONF_SLEEP_PERIOD, DATA_CONFIG_ENTRY as DATA_CONFIG_ENTRY, DEFAULT_COAP_PORT as DEFAULT_COAP_PORT, DOMAIN as DOMAIN, FIRMWARE_UNSUPPORTED_ISSUE_ID as FIRMWARE_UNSUPPORTED_ISSUE_ID, LOGGER as LOGGER, MODELS_WITH_WRONG_SLEEP_PERIOD as MODELS_WITH_WRONG_SLEEP_PERIOD, PUSH_UPDATE_ISSUE_ID as PUSH_UPDATE_ISSUE_ID
+from .const import BLOCK_EXPECTED_SLEEP_PERIOD as BLOCK_EXPECTED_SLEEP_PERIOD, BLOCK_WRONG_SLEEP_PERIOD as BLOCK_WRONG_SLEEP_PERIOD, CONF_COAP_PORT as CONF_COAP_PORT, CONF_SLEEP_PERIOD as CONF_SLEEP_PERIOD, DATA_CONFIG_ENTRY as DATA_CONFIG_ENTRY, DOMAIN as DOMAIN, FIRMWARE_UNSUPPORTED_ISSUE_ID as FIRMWARE_UNSUPPORTED_ISSUE_ID, LOGGER as LOGGER, MODELS_WITH_WRONG_SLEEP_PERIOD as MODELS_WITH_WRONG_SLEEP_PERIOD, PUSH_UPDATE_ISSUE_ID as PUSH_UPDATE_ISSUE_ID
 from .coordinator import ShellyBlockCoordinator as ShellyBlockCoordinator, ShellyEntryData as ShellyEntryData, ShellyRestCoordinator as ShellyRestCoordinator, ShellyRpcCoordinator as ShellyRpcCoordinator, ShellyRpcPollingCoordinator as ShellyRpcPollingCoordinator, get_entry_data as get_entry_data
-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_coap_context as get_coap_context, get_device_entry_gen as get_device_entry_gen, get_rpc_device_wakeup_period as get_rpc_device_wakeup_period, get_ws_context as get_ws_context
+from .utils import async_create_issue_unsupported_firmware as async_create_issue_unsupported_firmware, async_shutdown_device as async_shutdown_device, get_block_device_sleep_period as get_block_device_sleep_period, get_coap_context as get_coap_context, get_device_entry_gen as get_device_entry_gen, get_http_port as get_http_port, get_rpc_device_wakeup_period as get_rpc_device_wakeup_period, get_ws_context as get_ws_context
 from _typeshed import Incomplete
 from aioshelly.block_device import BlockUpdateType as BlockUpdateType
 from aioshelly.rpc_device import RpcUpdateType as RpcUpdateType

homeassistant-stubs/components/shelly/binary_sensor.pyi

@@ -11,15 +11,15 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback as AddEnti
 from homeassistant.helpers.restore_state import RestoreEntity as RestoreEntity
 from typing import Final
 
-@dataclass(frozen=True)
+@dataclass(frozen=True, kw_only=True)
 class BlockBinarySensorDescription(BlockEntityDescription, BinarySensorEntityDescription):
     def __init__(self, *, key, device_class, entity_category, entity_registry_enabled_default, entity_registry_visible_default, force_update, icon, has_entity_name, name, translation_key, translation_placeholders, unit_of_measurement, unit_fn, value, available, removal_condition, extra_state_attributes) -> None: ...
 
-@dataclass(frozen=True)
+@dataclass(frozen=True, kw_only=True)
 class RpcBinarySensorDescription(RpcEntityDescription, BinarySensorEntityDescription):
-    def __init__(self, sub_key, *, key, device_class, entity_category, entity_registry_enabled_default, entity_registry_visible_default, force_update, icon, has_entity_name, name, translation_key, translation_placeholders, unit_of_measurement, value, available, removal_condition, extra_state_attributes, use_polling_coordinator, supported) -> None: ...
+    def __init__(self, *, key, device_class, entity_category, entity_registry_enabled_default, entity_registry_visible_default, force_update, icon, has_entity_name, name, translation_key, translation_placeholders, unit_of_measurement, sub_key, value, available, removal_condition, extra_state_attributes, use_polling_coordinator, supported) -> None: ...
 
-@dataclass(frozen=True)
+@dataclass(frozen=True, kw_only=True)
 class RestBinarySensorDescription(RestEntityDescription, BinarySensorEntityDescription):
     def __init__(self, *, key, device_class, entity_category, entity_registry_enabled_default, entity_registry_visible_default, force_update, icon, has_entity_name, name, translation_key, translation_placeholders, unit_of_measurement, value, extra_state_attributes) -> None: ...
 

homeassistant-stubs/components/shelly/button.pyi

@@ -17,15 +17,11 @@ from typing import Any, Final, Generic, TypeVar
 
 _ShellyCoordinatorT = TypeVar('_ShellyCoordinatorT', bound=ShellyBlockCoordinator | ShellyRpcCoordinator)
 
-@dataclass(frozen=True)
-class ShellyButtonDescriptionMixin(Generic[_ShellyCoordinatorT]):
+@dataclass(frozen=True, kw_only=True)
+class ShellyButtonDescription(ButtonEntityDescription, Generic[_ShellyCoordinatorT]):
     press_action: Callable[[_ShellyCoordinatorT], Coroutine[Any, Any, None]]
-    def __init__(self, press_action) -> None: ...
-
-@dataclass(frozen=True)
-class ShellyButtonDescription(ButtonEntityDescription, ShellyButtonDescriptionMixin[_ShellyCoordinatorT]):
     supported: Callable[[_ShellyCoordinatorT], bool] = ...
-    def __init__(self, press_action, *, key, device_class, entity_category, entity_registry_enabled_default, entity_registry_visible_default, force_update, icon, has_entity_name, name, translation_key, translation_placeholders, unit_of_measurement, supported) -> None: ...
+    def __init__(self, *, key, device_class, entity_category, entity_registry_enabled_default, entity_registry_visible_default, force_update, icon, has_entity_name, name, translation_key, translation_placeholders, unit_of_measurement, press_action, supported) -> None: ...
 
 BUTTONS: Final[list[ShellyButtonDescription[Any]]]
 

homeassistant-stubs/components/shelly/config_flow.pyi

@@ -1,37 +1,38 @@
 from .const import BLEScannerMode as BLEScannerMode, CONF_BLE_SCANNER_MODE as CONF_BLE_SCANNER_MODE, CONF_GEN as CONF_GEN, CONF_SLEEP_PERIOD as CONF_SLEEP_PERIOD, DOMAIN as DOMAIN, LOGGER as LOGGER, MODEL_WALL_DISPLAY as MODEL_WALL_DISPLAY
 from .coordinator import async_reconnect_soon as async_reconnect_soon
-from .utils import get_block_device_sleep_period as get_block_device_sleep_period, get_coap_context as get_coap_context, get_device_entry_gen as get_device_entry_gen, get_info_auth as get_info_auth, get_info_gen as get_info_gen, get_model_name as get_model_name, get_rpc_device_wakeup_period as get_rpc_device_wakeup_period, get_ws_context as get_ws_context, mac_address_from_name as mac_address_from_name
+from .utils import get_block_device_sleep_period as get_block_device_sleep_period, get_coap_context as get_coap_context, get_device_entry_gen as get_device_entry_gen, get_http_port as get_http_port, get_info_auth as get_info_auth, get_info_gen as get_info_gen, get_model_name as get_model_name, get_rpc_device_wakeup_period as get_rpc_device_wakeup_period, get_ws_context as get_ws_context, mac_address_from_name as mac_address_from_name
 from _typeshed import Incomplete
 from collections.abc import Mapping
 from homeassistant.components.zeroconf import ZeroconfServiceInfo as ZeroconfServiceInfo
-from homeassistant.config_entries import ConfigEntry as ConfigEntry, ConfigFlow as ConfigFlow, OptionsFlow as OptionsFlow
-from homeassistant.const import CONF_HOST as CONF_HOST, CONF_PASSWORD as CONF_PASSWORD, CONF_USERNAME as CONF_USERNAME
+from homeassistant.config_entries import ConfigEntry as ConfigEntry, ConfigFlow as ConfigFlow, ConfigFlowResult as ConfigFlowResult, OptionsFlow as OptionsFlow
+from homeassistant.const import CONF_HOST as CONF_HOST, CONF_MAC as CONF_MAC, CONF_PASSWORD as CONF_PASSWORD, CONF_PORT as CONF_PORT, CONF_USERNAME as CONF_USERNAME
 from homeassistant.core import HomeAssistant as HomeAssistant, callback as callback
-from homeassistant.data_entry_flow import FlowResult as FlowResult
 from homeassistant.helpers.aiohttp_client import async_get_clientsession as async_get_clientsession
 from homeassistant.helpers.selector import SelectSelector as SelectSelector, SelectSelectorConfig as SelectSelectorConfig
 from typing import Any, Final
 
-HOST_SCHEMA: Final[Incomplete]
+CONFIG_SCHEMA: Final[Incomplete]
 BLE_SCANNER_OPTIONS: Incomplete
 INTERNAL_WIFI_AP_IP: str
 
-async def validate_input(hass: HomeAssistant, host: str, info: dict[str, Any], data: dict[str, Any]) -> dict[str, Any]: ...
+async def validate_input(hass: HomeAssistant, host: str, port: int, info: dict[str, Any], data: dict[str, Any]) -> dict[str, Any]: ...
 
 class ShellyConfigFlow(ConfigFlow, domain=DOMAIN):
     VERSION: int
+    MINOR_VERSION: int
     host: str
+    port: int
     info: dict[str, Any]
     device_info: dict[str, Any]
     entry: ConfigEntry | None
-    async def async_step_user(self, user_input: dict[str, Any] | None = None) -> FlowResult: ...
-    async def async_step_credentials(self, user_input: dict[str, Any] | None = None) -> FlowResult: ...
+    async def async_step_user(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
+    async def async_step_credentials(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
     async def _async_discovered_mac(self, mac: str, host: str) -> None: ...
-    async def async_step_zeroconf(self, discovery_info: ZeroconfServiceInfo) -> FlowResult: ...
-    async def async_step_confirm_discovery(self, user_input: dict[str, Any] | None = None) -> FlowResult: ...
-    async def async_step_reauth(self, entry_data: Mapping[str, Any]) -> FlowResult: ...
-    async def async_step_reauth_confirm(self, user_input: dict[str, Any] | None = None) -> FlowResult: ...
-    async def _async_get_info(self, host: str) -> dict[str, Any]: ...
+    async def async_step_zeroconf(self, discovery_info: ZeroconfServiceInfo) -> ConfigFlowResult: ...
+    async def async_step_confirm_discovery(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
+    async def async_step_reauth(self, entry_data: Mapping[str, Any]) -> ConfigFlowResult: ...
+    async def async_step_reauth_confirm(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
+    async def _async_get_info(self, host: str, port: int) -> dict[str, Any]: ...
     @staticmethod
     def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlowHandler: ...
     @classmethod
@@ -40,4 +41,4 @@ class ShellyConfigFlow(ConfigFlow, domain=DOMAIN):
 class OptionsFlowHandler(OptionsFlow):
     config_entry: Incomplete
     def __init__(self, config_entry: ConfigEntry) -> None: ...
-    async def async_step_init(self, user_input: dict[str, Any] | None = None) -> FlowResult: ...
+    async def async_step_init(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...

homeassistant-stubs/components/shelly/const.pyi

@@ -7,9 +7,9 @@ DOMAIN: Final[str]
 LOGGER: Logger
 DATA_CONFIG_ENTRY: Final[str]
 CONF_COAP_PORT: Final[str]
-DEFAULT_COAP_PORT: Final[int]
 FIRMWARE_PATTERN: Final[Incomplete]
-MAX_TRANSITION_TIME: Final[int]
+BLOCK_MAX_TRANSITION_TIME_MS: Final[int]
+RPC_MIN_TRANSITION_TIME_SEC: float
 RGBW_MODELS: Final[Incomplete]
 MODELS_SUPPORTING_LIGHT_TRANSITION: Final[Incomplete]
 MODELS_SUPPORTING_LIGHT_EFFECTS: Final[Incomplete]
@@ -71,3 +71,4 @@ GEN1_RELEASE_URL: str
 GEN2_RELEASE_URL: str
 DEVICES_WITHOUT_FIRMWARE_CHANGELOG: Incomplete
 CONF_GEN: str
+SHELLY_PLUS_RGBW_CHANNELS: int

homeassistant-stubs/components/shelly/coordinator.pyi

@@ -1,6 +1,6 @@
 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, DATA_CONFIG_ENTRY as DATA_CONFIG_ENTRY, 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, SLEEP_PERIOD_MULTIPLIER as SLEEP_PERIOD_MULTIPLIER, UPDATE_PERIOD_MULTIPLIER as UPDATE_PERIOD_MULTIPLIER
-from .utils import get_device_entry_gen as get_device_entry_gen, get_rpc_device_wakeup_period as get_rpc_device_wakeup_period, update_device_fw_info as update_device_fw_info
+from .utils import async_shutdown_device as async_shutdown_device, get_device_entry_gen as get_device_entry_gen, get_http_port as get_http_port, get_rpc_device_wakeup_period as get_rpc_device_wakeup_period, 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
@@ -43,6 +43,8 @@ class ShellyCoordinatorBase(DataUpdateCoordinator[None], Generic[_DeviceT]):
     def sleep_period(self) -> int: ...
     def async_setup(self) -> None: ...
     async def _async_reload_entry(self) -> None: ...
+    last_update_success: bool
+    async def async_shutdown_device_and_start_reauth(self) -> None: ...
 
 class ShellyBlockCoordinator(ShellyCoordinatorBase[BlockDevice]):
     entry: Incomplete

homeassistant-stubs/components/shelly/entity.pyi

@@ -34,21 +34,17 @@ class BlockEntityDescription(EntityDescription):
     extra_state_attributes: Callable[[Block], dict | None] | None = ...
     def __init__(self, *, key, device_class, entity_category, entity_registry_enabled_default, entity_registry_visible_default, force_update, icon, has_entity_name, name, translation_key, translation_placeholders, unit_of_measurement, unit_fn, value, available, removal_condition, extra_state_attributes) -> None: ...
 
-@dataclass(frozen=True)
-class RpcEntityRequiredKeysMixin:
-    sub_key: str
-    def __init__(self, sub_key) -> None: ...
-
-@dataclass(frozen=True)
-class RpcEntityDescription(EntityDescription, RpcEntityRequiredKeysMixin):
+@dataclass(frozen=True, kw_only=True)
+class RpcEntityDescription(EntityDescription):
     name: str = ...
+    sub_key: str
     value: Callable[[Any, Any], Any] | None = ...
     available: Callable[[dict], bool] | None = ...
     removal_condition: Callable[[dict, dict, str], bool] | None = ...
     extra_state_attributes: Callable[[dict, dict], dict | None] | None = ...
     use_polling_coordinator: bool = ...
     supported: Callable = ...
-    def __init__(self, sub_key, *, key, device_class, entity_category, entity_registry_enabled_default, entity_registry_visible_default, force_update, icon, has_entity_name, name, translation_key, translation_placeholders, unit_of_measurement, value, available, removal_condition, extra_state_attributes, use_polling_coordinator, supported) -> None: ...
+    def __init__(self, *, key, device_class, entity_category, entity_registry_enabled_default, entity_registry_visible_default, force_update, icon, has_entity_name, name, translation_key, translation_placeholders, unit_of_measurement, sub_key, value, available, removal_condition, extra_state_attributes, use_polling_coordinator, supported) -> None: ...
 
 @dataclass(frozen=True)
 class RestEntityDescription(EntityDescription):

homeassistant-stubs/components/shelly/event.pyi

@@ -14,12 +14,12 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback as AddEnti
 from homeassistant.helpers.update_coordinator import CoordinatorEntity as CoordinatorEntity
 from typing import Any, Final
 
-@dataclass(frozen=True)
+@dataclass(frozen=True, kw_only=True)
 class ShellyBlockEventDescription(EventEntityDescription):
     removal_condition: Callable[[dict, Block], bool] | None = ...
     def __init__(self, *, key, device_class, entity_category, entity_registry_enabled_default, entity_registry_visible_default, force_update, icon, has_entity_name, name, translation_key, translation_placeholders, unit_of_measurement, event_types, removal_condition) -> None: ...
 
-@dataclass(frozen=True)
+@dataclass(frozen=True, kw_only=True)
 class ShellyRpcEventDescription(EventEntityDescription):
     removal_condition: Callable[[dict, dict, str], bool] | None = ...
     def __init__(self, *, key, device_class, entity_category, entity_registry_enabled_default, entity_registry_visible_default, force_update, icon, has_entity_name, name, translation_key, translation_placeholders, unit_of_measurement, event_types, removal_condition) -> None: ...

homeassistant-stubs/components/shelly/light.pyi

@@ -1,7 +1,7 @@
-from .const import 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, MAX_TRANSITION_TIME as MAX_TRANSITION_TIME, MODELS_SUPPORTING_LIGHT_TRANSITION as MODELS_SUPPORTING_LIGHT_TRANSITION, RGBW_MODELS as RGBW_MODELS, SHBLB_1_RGB_EFFECTS as SHBLB_1_RGB_EFFECTS, STANDARD_RGB_EFFECTS as STANDARD_RGB_EFFECTS
+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, SHELLY_PLUS_RGBW_CHANNELS as SHELLY_PLUS_RGBW_CHANNELS, STANDARD_RGB_EFFECTS as STANDARD_RGB_EFFECTS
 from .coordinator import ShellyBlockCoordinator as ShellyBlockCoordinator, ShellyRpcCoordinator as ShellyRpcCoordinator, get_entry_data as get_entry_data
 from .entity import ShellyBlockEntity as ShellyBlockEntity, ShellyRpcEntity as ShellyRpcEntity
-from .utils import 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 .utils import async_remove_shelly_entity as async_remove_shelly_entity, async_remove_shelly_rpc_entities as async_remove_shelly_rpc_entities, 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 _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
@@ -42,24 +42,40 @@ class BlockShellyLight(ShellyBlockEntity, LightEntity):
     async def async_turn_off(self, **kwargs: Any) -> None: ...
     def _update_callback(self) -> None: ...
 
-class RpcShellySwitchAsLight(ShellyRpcEntity, LightEntity):
-    _attr_color_mode: Incomplete
-    _attr_supported_color_modes: Incomplete
+class RpcShellyLightBase(ShellyRpcEntity, LightEntity):
+    _component: str
     _id: Incomplete
     def __init__(self, coordinator: ShellyRpcCoordinator, id_: int) -> None: ...
     @property
     def is_on(self) -> bool: ...
+    @property
+    def brightness(self) -> int: ...
+    @property
+    def rgb_color(self) -> tuple[int, int, int]: ...
+    @property
+    def rgbw_color(self) -> tuple[int, int, int, int]: ...
     async def async_turn_on(self, **kwargs: Any) -> None: ...
     async def async_turn_off(self, **kwargs: Any) -> None: ...
 
-class RpcShellyLight(ShellyRpcEntity, LightEntity):
+class RpcShellySwitchAsLight(RpcShellyLightBase):
+    _component: str
     _attr_color_mode: Incomplete
     _attr_supported_color_modes: Incomplete
-    _id: Incomplete
-    def __init__(self, coordinator: ShellyRpcCoordinator, id_: int) -> None: ...
-    @property
-    def is_on(self) -> bool: ...
-    @property
-    def brightness(self) -> int: ...
-    async def async_turn_on(self, **kwargs: Any) -> None: ...
-    async def async_turn_off(self, **kwargs: Any) -> None: ...
+
+class RpcShellyLight(RpcShellyLightBase):
+    _component: str
+    _attr_color_mode: Incomplete
+    _attr_supported_color_modes: Incomplete
+    _attr_supported_features: Incomplete
+
+class RpcShellyRgbLight(RpcShellyLightBase):
+    _component: str
+    _attr_color_mode: Incomplete
+    _attr_supported_color_modes: Incomplete
+    _attr_supported_features: Incomplete
+
+class RpcShellyRgbwLight(RpcShellyLightBase):
+    _component: str
+    _attr_color_mode: Incomplete
+    _attr_supported_color_modes: Incomplete
+    _attr_supported_features: Incomplete

homeassistant-stubs/components/shelly/number.pyi

@@ -13,7 +13,7 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback as AddEnti
 from homeassistant.helpers.entity_registry import RegistryEntry as RegistryEntry
 from typing import Any
 
-@dataclass(frozen=True)
+@dataclass(frozen=True, kw_only=True)
 class BlockNumberDescription(BlockEntityDescription, NumberEntityDescription):
     rest_path: str = ...
     rest_arg: str = ...

homeassistant-stubs/components/shelly/sensor.pyi

@@ -14,15 +14,15 @@ from homeassistant.helpers.entity_registry import RegistryEntry as RegistryEntry
 from homeassistant.helpers.typing import StateType as StateType
 from typing import Final
 
-@dataclass(frozen=True)
+@dataclass(frozen=True, kw_only=True)
 class BlockSensorDescription(BlockEntityDescription, SensorEntityDescription):
     def __init__(self, *, key, device_class, entity_category, entity_registry_enabled_default, entity_registry_visible_default, force_update, icon, has_entity_name, name, translation_key, translation_placeholders, unit_of_measurement, last_reset, native_unit_of_measurement, options, state_class, suggested_display_precision, suggested_unit_of_measurement, unit_fn, value, available, removal_condition, extra_state_attributes) -> None: ...
 
-@dataclass(frozen=True)
+@dataclass(frozen=True, kw_only=True)
 class RpcSensorDescription(RpcEntityDescription, SensorEntityDescription):
-    def __init__(self, sub_key, *, key, device_class, entity_category, entity_registry_enabled_default, entity_registry_visible_default, force_update, icon, has_entity_name, name, translation_key, translation_placeholders, unit_of_measurement, last_reset, native_unit_of_measurement, options, state_class, suggested_display_precision, suggested_unit_of_measurement, value, available, removal_condition, extra_state_attributes, use_polling_coordinator, supported) -> None: ...
+    def __init__(self, *, key, device_class, entity_category, entity_registry_enabled_default, entity_registry_visible_default, force_update, icon, has_entity_name, name, translation_key, translation_placeholders, unit_of_measurement, last_reset, native_unit_of_measurement, options, state_class, suggested_display_precision, suggested_unit_of_measurement, sub_key, value, available, removal_condition, extra_state_attributes, use_polling_coordinator, supported) -> None: ...
 
-@dataclass(frozen=True)
+@dataclass(frozen=True, kw_only=True)
 class RestSensorDescription(RestEntityDescription, SensorEntityDescription):
     def __init__(self, *, key, device_class, entity_category, entity_registry_enabled_default, entity_registry_visible_default, force_update, icon, has_entity_name, name, translation_key, translation_placeholders, unit_of_measurement, last_reset, native_unit_of_measurement, options, state_class, suggested_display_precision, suggested_unit_of_measurement, value, extra_state_attributes) -> None: ...
 

homeassistant-stubs/components/shelly/switch.pyi

@@ -14,7 +14,7 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback as AddEnti
 from homeassistant.helpers.issue_registry import IssueSeverity as IssueSeverity, async_create_issue as async_create_issue
 from typing import Any
 
-@dataclass(frozen=True)
+@dataclass(frozen=True, kw_only=True)
 class BlockSwitchDescription(BlockEntityDescription, SwitchEntityDescription):
     def __init__(self, *, key, device_class, entity_category, entity_registry_enabled_default, entity_registry_visible_default, force_update, icon, has_entity_name, name, translation_key, translation_placeholders, unit_of_measurement, unit_fn, value, available, removal_condition, extra_state_attributes) -> None: ...
 

homeassistant-stubs/components/shelly/update.pyi

@@ -16,25 +16,17 @@ from typing import Any, Final
 
 LOGGER: Incomplete
 
-@dataclass(frozen=True)
-class RpcUpdateRequiredKeysMixin:
+@dataclass(frozen=True, kw_only=True)
+class RpcUpdateDescription(RpcEntityDescription, UpdateEntityDescription):
     latest_version: Callable[[dict], Any]
     beta: bool
-    def __init__(self, latest_version, beta) -> None: ...
+    def __init__(self, *, key, device_class, entity_category, entity_registry_enabled_default, entity_registry_visible_default, force_update, icon, has_entity_name, name, translation_key, translation_placeholders, unit_of_measurement, sub_key, value, available, removal_condition, extra_state_attributes, use_polling_coordinator, supported, latest_version, beta) -> None: ...
 
-@dataclass(frozen=True)
-class RestUpdateRequiredKeysMixin:
+@dataclass(frozen=True, kw_only=True)
+class RestUpdateDescription(RestEntityDescription, UpdateEntityDescription):
     latest_version: Callable[[dict], Any]
     beta: bool
-    def __init__(self, latest_version, beta) -> None: ...
-
-@dataclass(frozen=True)
-class RpcUpdateDescription(RpcEntityDescription, UpdateEntityDescription, RpcUpdateRequiredKeysMixin):
-    def __init__(self, latest_version, beta, sub_key, *, key, device_class, entity_category, entity_registry_enabled_default, entity_registry_visible_default, force_update, icon, has_entity_name, name, translation_key, translation_placeholders, unit_of_measurement, value, available, removal_condition, extra_state_attributes, use_polling_coordinator, supported) -> None: ...
-
-@dataclass(frozen=True)
-class RestUpdateDescription(RestEntityDescription, UpdateEntityDescription, RestUpdateRequiredKeysMixin):
-    def __init__(self, latest_version, beta, *, key, device_class, entity_category, entity_registry_enabled_default, entity_registry_visible_default, force_update, icon, has_entity_name, name, translation_key, translation_placeholders, unit_of_measurement, value, extra_state_attributes) -> None: ...
+    def __init__(self, *, key, device_class, entity_category, entity_registry_enabled_default, entity_registry_visible_default, force_update, icon, has_entity_name, name, translation_key, translation_placeholders, unit_of_measurement, value, extra_state_attributes, latest_version, beta) -> None: ...
 
 REST_UPDATES: Final[Incomplete]
 RPC_UPDATES: Final[Incomplete]
@@ -62,12 +54,13 @@ class RpcUpdateEntity(ShellyRpcAttributeEntity, UpdateEntity):
     _attr_release_url: Incomplete
     def __init__(self, coordinator: ShellyRpcCoordinator, key: str, attribute: str, description: RpcUpdateDescription) -> None: ...
     async def async_added_to_hass(self) -> None: ...
-    _attr_in_progress: int
     def _ota_progress_callback(self, event: dict[str, Any]) -> None: ...
     @property
     def installed_version(self) -> str | None: ...
     @property
     def latest_version(self) -> str | None: ...
+    @property
+    def in_progress(self) -> bool | int: ...
     async def async_install(self, version: str | None, backup: bool, **kwargs: Any) -> None: ...
 
 class RpcSleepingUpdateEntity(ShellySleepingRpcAttributeEntity, UpdateEntity, RestoreEntity):

homeassistant-stubs/components/shelly/utils.pyi

@@ -1,16 +1,18 @@
-from .const import BASIC_INPUTS_EVENTS_TYPES as BASIC_INPUTS_EVENTS_TYPES, CONF_COAP_PORT as CONF_COAP_PORT, CONF_GEN as CONF_GEN, DEFAULT_COAP_PORT as DEFAULT_COAP_PORT, DEVICES_WITHOUT_FIRMWARE_CHANGELOG as DEVICES_WITHOUT_FIRMWARE_CHANGELOG, DOMAIN as DOMAIN, FIRMWARE_UNSUPPORTED_ISSUE_ID as FIRMWARE_UNSUPPORTED_ISSUE_ID, GEN1_RELEASE_URL as GEN1_RELEASE_URL, GEN2_RELEASE_URL as GEN2_RELEASE_URL, LOGGER as LOGGER, RPC_INPUTS_EVENTS_TYPES as RPC_INPUTS_EVENTS_TYPES, SHBTN_INPUTS_EVENTS_TYPES as SHBTN_INPUTS_EVENTS_TYPES, SHBTN_MODELS as SHBTN_MODELS, SHIX3_1_INPUTS_EVENTS_TYPES as SHIX3_1_INPUTS_EVENTS_TYPES, UPTIME_DEVIATION as UPTIME_DEVIATION
+from .const import BASIC_INPUTS_EVENTS_TYPES as BASIC_INPUTS_EVENTS_TYPES, CONF_COAP_PORT as CONF_COAP_PORT, CONF_GEN as CONF_GEN, DEVICES_WITHOUT_FIRMWARE_CHANGELOG as DEVICES_WITHOUT_FIRMWARE_CHANGELOG, DOMAIN as DOMAIN, FIRMWARE_UNSUPPORTED_ISSUE_ID as FIRMWARE_UNSUPPORTED_ISSUE_ID, GEN1_RELEASE_URL as GEN1_RELEASE_URL, GEN2_RELEASE_URL as GEN2_RELEASE_URL, LOGGER as LOGGER, RPC_INPUTS_EVENTS_TYPES as RPC_INPUTS_EVENTS_TYPES, SHBTN_INPUTS_EVENTS_TYPES as SHBTN_INPUTS_EVENTS_TYPES, SHBTN_MODELS as SHBTN_MODELS, SHIX3_1_INPUTS_EVENTS_TYPES as SHIX3_1_INPUTS_EVENTS_TYPES, UPTIME_DEVIATION as UPTIME_DEVIATION
 from _typeshed import Incomplete
 from aiohttp.web import Request as Request, WebSocketResponse as WebSocketResponse
-from aioshelly.block_device import Block as Block, BlockDevice as BlockDevice, COAP
-from aioshelly.rpc_device import RpcDevice as RpcDevice, WsServer
+from aioshelly.block_device import Block as Block, BlockDevice, COAP
+from aioshelly.rpc_device import RpcDevice, WsServer
 from datetime import datetime
+from homeassistant.components import network as network
 from homeassistant.components.http import HomeAssistantView as HomeAssistantView
 from homeassistant.config_entries import ConfigEntry as ConfigEntry
-from homeassistant.const import EVENT_HOMEASSISTANT_STOP as EVENT_HOMEASSISTANT_STOP
+from homeassistant.const import CONF_PORT as CONF_PORT, EVENT_HOMEASSISTANT_STOP as EVENT_HOMEASSISTANT_STOP
 from homeassistant.core import Event as Event, HomeAssistant as HomeAssistant, callback as callback
 from homeassistant.helpers import singleton as singleton
 from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC as CONNECTION_NETWORK_MAC, format_mac as format_mac
 from homeassistant.util.dt import utcnow as utcnow
+from types import MappingProxyType
 from typing import Any
 
 def async_remove_shelly_entity(hass: HomeAssistant, domain: str, unique_id: str) -> None: ...
@@ -54,3 +56,6 @@ def mac_address_from_name(name: str) -> str | None: ...
 def get_release_url(gen: int, model: str, beta: bool) -> str | None: ...
 def async_create_issue_unsupported_firmware(hass: HomeAssistant, entry: ConfigEntry) -> None: ...
 def is_rpc_wifi_stations_disabled(config: dict[str, Any], _status: dict[str, Any], key: str) -> bool: ...
+def get_http_port(data: MappingProxyType[str, Any]) -> int: ...
+async def async_shutdown_device(device: BlockDevice | RpcDevice) -> None: ...
+def async_remove_shelly_rpc_entities(hass: HomeAssistant, domain: str, mac: str, keys: list[str]) -> None: ...

homeassistant-stubs/components/shopping_list/config_flow.pyi

@@ -1,10 +1,9 @@
 from .const import DOMAIN as DOMAIN
-from homeassistant.config_entries import ConfigFlow as ConfigFlow
-from homeassistant.data_entry_flow import FlowResult as FlowResult
+from homeassistant.config_entries import ConfigFlow as ConfigFlow, ConfigFlowResult as ConfigFlowResult
 from typing import Any
 
 class ShoppingListFlowHandler(ConfigFlow, domain=DOMAIN):
     VERSION: int
-    async def async_step_user(self, user_input: dict[str, Any] | None = None) -> FlowResult: ...
+    async def async_step_user(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
     async_step_import = async_step_user
-    async def async_step_onboarding(self, _: dict[str, Any] | None = None) -> FlowResult: ...
+    async def async_step_onboarding(self, _: dict[str, Any] | None = None) -> ConfigFlowResult: ...

homeassistant-stubs/components/shopping_list/todo.pyi

@@ -11,7 +11,6 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry, asyn
 
 class ShoppingTodoListEntity(TodoListEntity):
     _attr_has_entity_name: bool
-    _attr_icon: str
     _attr_translation_key: str
     _attr_should_poll: bool
     _attr_supported_features: Incomplete

homeassistant-stubs/components/simplepush/config_flow.pyi

@@ -1,10 +1,9 @@
 from .const import ATTR_ENCRYPTED as ATTR_ENCRYPTED, CONF_DEVICE_KEY as CONF_DEVICE_KEY, CONF_SALT as CONF_SALT, DEFAULT_NAME as DEFAULT_NAME, DOMAIN as DOMAIN
-from homeassistant import config_entries as config_entries
+from homeassistant.config_entries import ConfigFlow as ConfigFlow, ConfigFlowResult as ConfigFlowResult
 from homeassistant.const import CONF_NAME as CONF_NAME, CONF_PASSWORD as CONF_PASSWORD
-from homeassistant.data_entry_flow import FlowResult as FlowResult
 from typing import Any
 
 def validate_input(entry: dict[str, str]) -> dict[str, str] | None: ...
 
-class SimplePushFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
-    async def async_step_user(self, user_input: dict[str, Any] | None = None) -> FlowResult: ...
+class SimplePushFlowHandler(ConfigFlow, domain=DOMAIN):
+    async def async_step_user(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...

homeassistant-stubs/components/simplisafe/config_flow.pyi

@@ -1,11 +1,9 @@
 from .const import DOMAIN as DOMAIN, LOGGER as LOGGER
 from _typeshed import Incomplete
 from collections.abc import Mapping
-from homeassistant import config_entries as config_entries
-from homeassistant.config_entries import ConfigEntry as ConfigEntry
+from homeassistant.config_entries import ConfigEntry as ConfigEntry, ConfigFlow as ConfigFlow, ConfigFlowResult as ConfigFlowResult, OptionsFlow as OptionsFlow
 from homeassistant.const import CONF_CODE as CONF_CODE, CONF_TOKEN as CONF_TOKEN, CONF_URL as CONF_URL, CONF_USERNAME as CONF_USERNAME
 from homeassistant.core import callback as callback
-from homeassistant.data_entry_flow import FlowResult as FlowResult
 from homeassistant.helpers import aiohttp_client as aiohttp_client
 from typing import Any, NamedTuple
 
@@ -18,17 +16,17 @@ class SimpliSafeOAuthValues(NamedTuple):
 
 def async_get_simplisafe_oauth_values() -> SimpliSafeOAuthValues: ...
 
-class SimpliSafeFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
+class SimpliSafeFlowHandler(ConfigFlow, domain=DOMAIN):
     VERSION: int
     _oauth_values: Incomplete
     _reauth: bool
     def __init__(self) -> None: ...
     @staticmethod
     def async_get_options_flow(config_entry: ConfigEntry) -> SimpliSafeOptionsFlowHandler: ...
-    async def async_step_reauth(self, config: Mapping[str, Any]) -> FlowResult: ...
-    async def async_step_user(self, user_input: dict[str, Any] | None = None) -> FlowResult: ...
+    async def async_step_reauth(self, config: Mapping[str, Any]) -> ConfigFlowResult: ...
+    async def async_step_user(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
 
-class SimpliSafeOptionsFlowHandler(config_entries.OptionsFlow):
+class SimpliSafeOptionsFlowHandler(OptionsFlow):
     config_entry: Incomplete
     def __init__(self, config_entry: ConfigEntry) -> None: ...
-    async def async_step_init(self, user_input: dict[str, Any] | None = None) -> FlowResult: ...
+    async def async_step_init(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...

homeassistant-stubs/components/skybell/config_flow.pyi

@@ -1,14 +1,13 @@
 from .const import DOMAIN as DOMAIN
 from collections.abc import Mapping
-from homeassistant import config_entries as config_entries
+from homeassistant.config_entries import ConfigFlow as ConfigFlow, ConfigFlowResult as ConfigFlowResult
 from homeassistant.const import CONF_EMAIL as CONF_EMAIL, CONF_PASSWORD as CONF_PASSWORD
-from homeassistant.data_entry_flow import FlowResult as FlowResult
 from homeassistant.helpers.aiohttp_client import async_get_clientsession as async_get_clientsession
 from typing import Any
 
-class SkybellFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
+class SkybellFlowHandler(ConfigFlow, domain=DOMAIN):
     reauth_email: str
-    async def async_step_reauth(self, entry_data: Mapping[str, Any]) -> FlowResult: ...
-    async def async_step_reauth_confirm(self, user_input: dict[str, str] | None = None) -> FlowResult: ...
-    async def async_step_user(self, user_input: dict[str, Any] | None = None) -> FlowResult: ...
+    async def async_step_reauth(self, entry_data: Mapping[str, Any]) -> ConfigFlowResult: ...
+    async def async_step_reauth_confirm(self, user_input: dict[str, str] | None = None) -> ConfigFlowResult: ...
+    async def async_step_user(self, user_input: dict[str, Any] | None = None) -> ConfigFlowResult: ...
     async def _async_validate_input(self, email: str, password: str) -> tuple: ...