2024.7.3 (#122194)

CODEOWNERS

@@ -777,6 +777,8 @@ build.json @home-assistant/supervisor
 /tests/components/lg_netcast/ @Drafteed @splinter98
 /homeassistant/components/lidarr/ @tkdrob
 /tests/components/lidarr/ @tkdrob
+/homeassistant/components/lifx/ @Djelibeybi
+/tests/components/lifx/ @Djelibeybi
 /homeassistant/components/light/ @home-assistant/core
 /tests/components/light/ @home-assistant/core
 /homeassistant/components/linear_garage_door/ @IceBotYT

homeassistant/components/alexa/handlers.py

@@ -1497,7 +1497,7 @@ async def async_api_adjust_range(
     if instance == f"{cover.DOMAIN}.{cover.ATTR_POSITION}":
         range_delta = int(range_delta * 20) if range_delta_default else int(range_delta)
         service = SERVICE_SET_COVER_POSITION
-        if not (current := entity.attributes.get(cover.ATTR_POSITION)):
+        if not (current := entity.attributes.get(cover.ATTR_CURRENT_POSITION)):
             msg = f"Unable to determine {entity.entity_id} current position"
             raise AlexaInvalidValueError(msg)
         position = response_value = min(100, max(0, range_delta + current))

homeassistant/components/bring/config_flow.py

@@ -58,7 +58,7 @@ class BringConfigFlow(ConfigFlow, domain=DOMAIN):
         ):
             self._abort_if_unique_id_configured()
             return self.async_create_entry(
-                title=self.info["name"] or user_input[CONF_EMAIL], data=user_input
+                title=self.info.get("name") or user_input[CONF_EMAIL], data=user_input
             )
 
         return self.async_show_form(

homeassistant/components/enigma2/__init__.py

@@ -16,6 +16,8 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_create_clientsession
 
+from .const import CONF_SOURCE_BOUQUET
+
 type Enigma2ConfigEntry = ConfigEntry[OpenWebIfDevice]
 
 PLATFORMS = [Platform.MEDIA_PLAYER]
@@ -35,7 +37,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: Enigma2ConfigEntry) -> b
         hass, verify_ssl=entry.data[CONF_VERIFY_SSL], base_url=base_url
     )
 
-    entry.runtime_data = OpenWebIfDevice(session)
+    entry.runtime_data = OpenWebIfDevice(
+        session, source_bouquet=entry.options.get(CONF_SOURCE_BOUQUET)
+    )
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
     return True
 

homeassistant/components/enigma2/manifest.json

@@ -7,5 +7,5 @@
   "integration_type": "device",
   "iot_class": "local_polling",
   "loggers": ["openwebif"],
-  "requirements": ["openwebifpy==4.2.4"]
+  "requirements": ["openwebifpy==4.2.5"]
 }

homeassistant/components/enigma2/media_player.py

@@ -199,7 +199,8 @@ class Enigma2Device(MediaPlayerEntity):
 
     async def async_mute_volume(self, mute: bool) -> None:
         """Mute or unmute."""
-        await self._device.toggle_mute()
+        if mute != self._device.status.muted:
+            await self._device.toggle_mute()
 
     async def async_select_source(self, source: str) -> None:
         """Select input source."""

homeassistant/components/hive/climate.py

@@ -142,10 +142,10 @@ class HiveClimateEntity(HiveEntity, ClimateEntity):
         self.device = await self.hive.heating.getClimate(self.device)
         self._attr_available = self.device["deviceData"].get("online")
         if self._attr_available:
-            self._attr_hvac_mode = HIVE_TO_HASS_STATE[self.device["status"]["mode"]]
+            self._attr_hvac_mode = HIVE_TO_HASS_STATE.get(self.device["status"]["mode"])
-            self._attr_hvac_action = HIVE_TO_HASS_HVAC_ACTION[
+            self._attr_hvac_action = HIVE_TO_HASS_HVAC_ACTION.get(
                 self.device["status"]["action"]
-            ]
+            )
             self._attr_current_temperature = self.device["status"][
                 "current_temperature"
             ]
@@ -154,5 +154,6 @@ class HiveClimateEntity(HiveEntity, ClimateEntity):
             self._attr_max_temp = self.device["max_temp"]
             if self.device["status"]["boost"] == "ON":
                 self._attr_preset_mode = PRESET_BOOST
+                self._attr_hvac_mode = HVACMode.HEAT
             else:
                 self._attr_preset_mode = PRESET_NONE

homeassistant/components/holiday/manifest.json

@@ -5,5 +5,5 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/holiday",
   "iot_class": "local_polling",
-  "requirements": ["holidays==0.52", "babel==2.15.0"]
+  "requirements": ["holidays==0.53", "babel==2.15.0"]
 }

homeassistant/components/idasen_desk/manifest.json

@@ -12,5 +12,5 @@
   "documentation": "https://www.home-assistant.io/integrations/idasen_desk",
   "iot_class": "local_push",
   "quality_scale": "silver",
-  "requirements": ["idasen-ha==2.6.1"]
+  "requirements": ["idasen-ha==2.6.2"]
 }

homeassistant/components/ista_ecotrend/coordinator.py

@@ -8,6 +8,7 @@ from typing import Any
 
 from pyecotrend_ista import KeycloakError, LoginError, PyEcotrendIsta, ServerError
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_EMAIL
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
@@ -21,6 +22,8 @@ _LOGGER = logging.getLogger(__name__)
 class IstaCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     """Ista EcoTrend data update coordinator."""
 
+    config_entry: ConfigEntry
+
     def __init__(self, hass: HomeAssistant, ista: PyEcotrendIsta) -> None:
         """Initialize ista EcoTrend data update coordinator."""
         super().__init__(
@@ -35,11 +38,14 @@ class IstaCoordinator(DataUpdateCoordinator[dict[str, Any]]):
     async def _async_update_data(self):
         """Fetch ista EcoTrend data."""
 
-        if not self.details:
-            self.details = await self.async_get_details()
-
         try:
+            await self.hass.async_add_executor_job(self.ista.login)
+
+            if not self.details:
+                self.details = await self.async_get_details()
+
             return await self.hass.async_add_executor_job(self.get_consumption_data)
+
         except ServerError as e:
             raise UpdateFailed(
                 "Unable to connect and retrieve data from ista EcoTrend, try again later"
@@ -48,7 +54,9 @@ class IstaCoordinator(DataUpdateCoordinator[dict[str, Any]]):
             raise ConfigEntryAuthFailed(
                 translation_domain=DOMAIN,
                 translation_key="authentication_exception",
-                translation_placeholders={CONF_EMAIL: self.ista._email},  # noqa: SLF001
+                translation_placeholders={
+                    CONF_EMAIL: self.config_entry.data[CONF_EMAIL]
+                },
             ) from e
 
     def get_consumption_data(self) -> dict[str, Any]:
@@ -61,26 +69,16 @@ class IstaCoordinator(DataUpdateCoordinator[dict[str, Any]]):
 
     async def async_get_details(self) -> dict[str, Any]:
         """Retrieve details of consumption units."""
-        try:
+
-            result = await self.hass.async_add_executor_job(
+        result = await self.hass.async_add_executor_job(
-                self.ista.get_consumption_unit_details
+            self.ista.get_consumption_unit_details
+        )
+
+        return {
+            consumption_unit: next(
+                details
+                for details in result["consumptionUnits"]
+                if details["id"] == consumption_unit
             )
-        except ServerError as e:
+            for consumption_unit in self.ista.get_uuids()
-            raise UpdateFailed(
+        }
-                "Unable to connect and retrieve data from ista EcoTrend, try again later"
-            ) from e
-        except (LoginError, KeycloakError) as e:
-            raise ConfigEntryAuthFailed(
-                translation_domain=DOMAIN,
-                translation_key="authentication_exception",
-                translation_placeholders={CONF_EMAIL: self.ista._email},  # noqa: SLF001
-            ) from e
-        else:
-            return {
-                consumption_unit: next(
-                    details
-                    for details in result["consumptionUnits"]
-                    if details["id"] == consumption_unit
-                )
-                for consumption_unit in self.ista.get_uuids()
-            }

homeassistant/components/jellyfin/config_flow.py

@@ -97,7 +97,11 @@ class JellyfinConfigFlow(ConfigFlow, domain=DOMAIN):
                 )
 
         return self.async_show_form(
-            step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=errors
+            step_id="user",
+            data_schema=self.add_suggested_values_to_schema(
+                STEP_USER_DATA_SCHEMA, user_input
+            ),
+            errors=errors,
         )
 
     async def async_step_reauth(

homeassistant/components/knocki/config_flow.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from typing import Any
 
-from knocki import KnockiClient, KnockiConnectionError
+from knocki import KnockiClient, KnockiConnectionError, KnockiInvalidAuthError
 import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
@@ -45,6 +45,8 @@ class KnockiConfigFlow(ConfigFlow, domain=DOMAIN):
                 raise
             except KnockiConnectionError:
                 errors["base"] = "cannot_connect"
+            except KnockiInvalidAuthError:
+                errors["base"] = "invalid_auth"
             except Exception:  # noqa: BLE001
                 LOGGER.exception("Error logging into the Knocki API")
                 errors["base"] = "unknown"

homeassistant/components/knocki/manifest.json

@@ -7,5 +7,5 @@
   "integration_type": "device",
   "iot_class": "cloud_push",
   "loggers": ["knocki"],
-  "requirements": ["knocki==0.2.0"]
+  "requirements": ["knocki==0.3.1"]
 }

homeassistant/components/lifx/manifest.json

@@ -1,7 +1,7 @@
 {
   "domain": "lifx",
   "name": "LIFX",
-  "codeowners": [],
+  "codeowners": ["@Djelibeybi"],
   "config_flow": true,
   "dependencies": ["network"],
   "dhcp": [
@@ -48,7 +48,7 @@
   "iot_class": "local_polling",
   "loggers": ["aiolifx", "aiolifx_effects", "bitstring"],
   "requirements": [
-    "aiolifx==1.0.2",
+    "aiolifx==1.0.5",
     "aiolifx-effects==0.3.2",
     "aiolifx-themes==0.4.15"
   ]

homeassistant/components/media_extractor/manifest.json

@@ -8,6 +8,6 @@
   "iot_class": "calculated",
   "loggers": ["yt_dlp"],
   "quality_scale": "internal",
-  "requirements": ["yt-dlp==2024.07.01"],
+  "requirements": ["yt-dlp==2024.07.16"],
   "single_config_entry": true
 }

homeassistant/components/opentherm_gw/__init__.py

@@ -470,3 +470,8 @@ class OpenThermGatewayDevice:
             async_dispatcher_send(self.hass, self.update_signal, status)
 
         self.gateway.subscribe(handle_report)
+
+    @property
+    def connected(self):
+        """Report whether or not we are connected to the gateway."""
+        return self.gateway.connection.connected

homeassistant/components/opentherm_gw/binary_sensor.py

@@ -48,6 +48,7 @@ class OpenThermBinarySensor(BinarySensorEntity):
 
     _attr_should_poll = False
     _attr_entity_registry_enabled_default = False
+    _attr_available = False
 
     def __init__(self, gw_dev, var, source, device_class, friendly_name_format):
         """Initialize the binary sensor."""
@@ -85,14 +86,10 @@ class OpenThermBinarySensor(BinarySensorEntity):
         _LOGGER.debug("Removing OpenTherm Gateway binary sensor %s", self._attr_name)
         self._unsub_updates()
 
-    @property
-    def available(self):
-        """Return availability of the sensor."""
-        return self._attr_is_on is not None
-
     @callback
     def receive_report(self, status):
         """Handle status updates from the component."""
+        self._attr_available = self._gateway.connected
         state = status[self._source].get(self._var)
         self._attr_is_on = None if state is None else bool(state)
         self.async_write_ha_state()

homeassistant/components/opentherm_gw/climate.py

@@ -138,7 +138,7 @@ class OpenThermClimate(ClimateEntity):
     @callback
     def receive_report(self, status):
         """Receive and handle a new report from the Gateway."""
-        self._attr_available = status != gw_vars.DEFAULT_STATUS
+        self._attr_available = self._gateway.connected
         ch_active = status[gw_vars.BOILER].get(gw_vars.DATA_SLAVE_CH_ACTIVE)
         flame_on = status[gw_vars.BOILER].get(gw_vars.DATA_SLAVE_FLAME_ON)
         cooling_active = status[gw_vars.BOILER].get(gw_vars.DATA_SLAVE_COOLING_ACTIVE)

homeassistant/components/opentherm_gw/sensor.py

@@ -45,6 +45,7 @@ class OpenThermSensor(SensorEntity):
 
     _attr_should_poll = False
     _attr_entity_registry_enabled_default = False
+    _attr_available = False
 
     def __init__(
         self,
@@ -94,14 +95,10 @@ class OpenThermSensor(SensorEntity):
         _LOGGER.debug("Removing OpenTherm Gateway sensor %s", self._attr_name)
         self._unsub_updates()
 
-    @property
-    def available(self):
-        """Return availability of the sensor."""
-        return self._attr_native_value is not None
-
     @callback
     def receive_report(self, status):
         """Handle status updates from the component."""
+        self._attr_available = self._gateway.connected
         value = status[self._source].get(self._var)
         self._attr_native_value = value
         self.async_write_ha_state()

homeassistant/components/opower/manifest.json

@@ -7,5 +7,5 @@
   "documentation": "https://www.home-assistant.io/integrations/opower",
   "iot_class": "cloud_polling",
   "loggers": ["opower"],
-  "requirements": ["opower==0.4.7"]
+  "requirements": ["opower==0.5.2"]
 }

homeassistant/components/pyload/coordinator.py

@@ -30,7 +30,7 @@ class PyLoadData:
     speed: float
     download: bool
     reconnect: bool
-    captcha: bool
+    captcha: bool | None = None
     free_space: int
 
 

homeassistant/components/pyload/manifest.json

@@ -8,5 +8,5 @@
   "iot_class": "local_polling",
   "loggers": ["pyloadapi"],
   "quality_scale": "platinum",
-  "requirements": ["PyLoadAPI==1.2.0"]
+  "requirements": ["PyLoadAPI==1.3.2"]
 }

homeassistant/components/rainforest_raven/coordinator.py

@@ -167,7 +167,7 @@ class RAVEnDataCoordinator(DataUpdateCoordinator):
                 await device.synchronize()
                 self._device_info = await device.get_device_info()
         except:
-            await device.close()
+            await device.abort()
             raise
 
         self._raven_device = device

homeassistant/components/rainforest_raven/manifest.json

@@ -6,7 +6,7 @@
   "dependencies": ["usb"],
   "documentation": "https://www.home-assistant.io/integrations/rainforest_raven",
   "iot_class": "local_polling",
-  "requirements": ["aioraven==0.6.0"],
+  "requirements": ["aioraven==0.7.0"],
   "usb": [
     {
       "vid": "0403",

homeassistant/components/recorder/core.py

@@ -1178,7 +1178,15 @@ class Recorder(threading.Thread):
 
     def _handle_database_error(self, err: Exception) -> bool:
         """Handle a database error that may result in moving away the corrupt db."""
-        if isinstance(err.__cause__, sqlite3.DatabaseError):
+        if (
+            (cause := err.__cause__)
+            and isinstance(cause, sqlite3.DatabaseError)
+            and (cause_str := str(cause))
+            # Make sure we do not move away a database when its only locked
+            # externally by another process. sqlite does not give us a named
+            # exception for this so we have to check the error message.
+            and ("malformed" in cause_str or "not a database" in cause_str)
+        ):
             _LOGGER.exception(
                 "Unrecoverable sqlite3 database corruption detected: %s", err
             )

homeassistant/components/recorder/migration.py

@@ -313,11 +313,9 @@ def _create_index(
     index = index_list[0]
     _LOGGER.debug("Creating %s index", index_name)
     _LOGGER.warning(
-        (
+        "Adding index `%s` to table `%s`. Note: this can take several "
-            "Adding index `%s` to table `%s`. Note: this can take several "
+        "minutes on large databases and slow computers. Please "
-            "minutes on large databases and slow computers. Please "
+        "be patient!",
-            "be patient!"
-        ),
         index_name,
         table_name,
     )
@@ -331,7 +329,7 @@ def _create_index(
                 "Index %s already exists on %s, continuing", index_name, table_name
             )
 
-    _LOGGER.debug("Finished creating %s", index_name)
+    _LOGGER.warning("Finished adding index `%s` to table `%s`", index_name, table_name)
 
 
 def _execute_or_collect_error(
@@ -364,11 +362,9 @@ def _drop_index(
     DO NOT USE THIS FUNCTION IN ANY OPERATION THAT TAKES USER INPUT.
     """
     _LOGGER.warning(
-        (
+        "Dropping index `%s` from table `%s`. Note: this can take several "
-            "Dropping index `%s` from table `%s`. Note: this can take several "
+        "minutes on large databases and slow computers. Please "
-            "minutes on large databases and slow computers. Please "
+        "be patient!",
-            "be patient!"
-        ),
         index_name,
         table_name,
     )
@@ -377,8 +373,8 @@ def _drop_index(
         index_to_drop = get_index_by_name(session, table_name, index_name)
 
     if index_to_drop is None:
-        _LOGGER.debug(
+        _LOGGER.warning(
-            "The index %s on table %s no longer exists", index_name, table_name
+            "The index `%s` on table `%s` no longer exists", index_name, table_name
         )
         return
 
@@ -395,18 +391,16 @@ def _drop_index(
         f"DROP INDEX {index_to_drop}",
     ):
         if _execute_or_collect_error(session_maker, query, errors):
-            _LOGGER.debug(
+            _LOGGER.warning(
-                "Finished dropping index %s from table %s", index_name, table_name
+                "Finished dropping index `%s` from table `%s`", index_name, table_name
             )
             return
 
     if not quiet:
         _LOGGER.warning(
-            (
+            "Failed to drop index `%s` from table `%s`. Schema "
-                "Failed to drop index `%s` from table `%s`. Schema "
+            "Migration will continue; this is not a "
-                "Migration will continue; this is not a "
+            "critical operation: %s",
-                "critical operation: %s"
-            ),
             index_name,
             table_name,
             errors,

homeassistant/components/reolink/media_source.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 import datetime as dt
 import logging
 
+from reolink_aio.api import DUAL_LENS_MODELS
 from reolink_aio.enums import VodRequestType
 
 from homeassistant.components.camera import DOMAIN as CAM_DOMAIN, DynamicStreamSettings
@@ -184,6 +185,9 @@ class ReolinkVODMediaSource(MediaSource):
                 if device.name_by_user is not None:
                     device_name = device.name_by_user
 
+                if host.api.model in DUAL_LENS_MODELS:
+                    device_name = f"{device_name} lens {ch}"
+
                 children.append(
                     BrowseMediaSource(
                         domain=DOMAIN,

homeassistant/components/roborock/strings.json

@@ -214,7 +214,8 @@
           "unknown": "Unknown",
           "locked": "Locked",
           "air_drying_stopping": "Air drying stopping",
-          "egg_attack": "Cupid mode"
+          "egg_attack": "Cupid mode",
+          "mapping": "Mapping"
         }
       },
       "total_cleaning_time": {
@@ -282,7 +283,8 @@
           "deep": "Deep",
           "deep_plus": "Deep+",
           "custom": "Custom",
-          "fast": "Fast"
+          "fast": "Fast",
+          "smart_mode": "SmartPlan"
         }
       },
       "mop_intensity": {
@@ -293,10 +295,12 @@
           "mild": "Mild",
           "medium": "Medium",
           "moderate": "Moderate",
+          "max": "Max",
           "high": "High",
           "intense": "Intense",
           "custom": "[%key:component::roborock::entity::select::mop_mode::state::custom%]",
-          "custom_water_flow": "Custom water flow"
+          "custom_water_flow": "Custom water flow",
+          "smart_mode": "[%key:component::roborock::entity::select::mop_mode::state::smart_mode%]"
         }
       }
     },
@@ -338,13 +342,14 @@
               "custom": "[%key:component::roborock::entity::select::mop_mode::state::custom%]",
               "gentle": "Gentle",
               "off": "[%key:common::state::off%]",
-              "max": "Max",
+              "max": "[%key:component::roborock::entity::select::mop_intensity::state::max%]",
               "max_plus": "Max plus",
               "medium": "Medium",
               "quiet": "Quiet",
               "silent": "Silent",
               "standard": "[%key:component::roborock::entity::select::mop_mode::state::standard%]",
-              "turbo": "Turbo"
+              "turbo": "Turbo",
+              "smart_mode": "[%key:component::roborock::entity::select::mop_mode::state::smart_mode%]"
             }
           }
         }

homeassistant/components/shelly/coordinator.py

@@ -61,6 +61,7 @@ from .utils import (
     async_create_issue_unsupported_firmware,
     get_block_device_sleep_period,
     get_device_entry_gen,
+    get_host,
     get_http_port,
     get_rpc_device_wakeup_period,
     update_device_fw_info,
@@ -147,7 +148,7 @@ class ShellyCoordinatorBase[_DeviceT: BlockDevice | RpcDevice](
             model=MODEL_NAMES.get(self.model, self.model),
             sw_version=self.sw_version,
             hw_version=f"gen{get_device_entry_gen(self.entry)} ({self.model})",
-            configuration_url=f"http://{self.entry.data[CONF_HOST]}:{get_http_port(self.entry.data)}",
+            configuration_url=f"http://{get_host(self.entry.data[CONF_HOST])}:{get_http_port(self.entry.data)}",
         )
         self.device_id = device_entry.id
 
@@ -667,6 +668,9 @@ class ShellyRpcCoordinator(ShellyCoordinatorBase[RpcDevice]):
         """Handle device update."""
         LOGGER.debug("Shelly %s handle update, type: %s", self.name, update_type)
         if update_type is RpcUpdateType.ONLINE:
+            if self.device.connected:
+                LOGGER.debug("Device %s already connected", self.name)
+                return
             self.entry.async_create_background_task(
                 self.hass,
                 self._async_device_connect_task(),

homeassistant/components/shelly/utils.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from datetime import datetime, timedelta
-from ipaddress import IPv4Address
+from ipaddress import IPv4Address, IPv6Address, ip_address
 from types import MappingProxyType
 from typing import Any, cast
 
@@ -482,6 +482,20 @@ def get_http_port(data: MappingProxyType[str, Any]) -> int:
     return cast(int, data.get(CONF_PORT, DEFAULT_HTTP_PORT))
 
 
+def get_host(host: str) -> str:
+    """Get the device IP address or hostname."""
+    try:
+        ip_object = ip_address(host)
+    except ValueError:
+        # host contains hostname
+        return host
+
+    if isinstance(ip_object, IPv6Address):
+        return f"[{host}]"
+
+    return host
+
+
 @callback
 def async_remove_shelly_rpc_entities(
     hass: HomeAssistant, domain: str, mac: str, keys: list[str]

homeassistant/components/sunweg/manifest.json

@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/sunweg/",
   "iot_class": "cloud_polling",
   "loggers": ["sunweg"],
-  "requirements": ["sunweg==3.0.1"]
+  "requirements": ["sunweg==3.0.2"]
 }

homeassistant/components/supla/cover.py

@@ -71,7 +71,9 @@ class SuplaCoverEntity(SuplaEntity, CoverEntity):
 
     async def async_set_cover_position(self, **kwargs: Any) -> None:
         """Move the cover to a specific position."""
-        await self.async_action("REVEAL", percentage=kwargs.get(ATTR_POSITION))
+        await self.async_action(
+            "REVEAL_PARTIALLY", percentage=kwargs.get(ATTR_POSITION)
+        )
 
     @property
     def is_closed(self) -> bool | None:

homeassistant/components/switchbot/manifest.json

@@ -39,5 +39,5 @@
   "documentation": "https://www.home-assistant.io/integrations/switchbot",
   "iot_class": "local_push",
   "loggers": ["switchbot"],
-  "requirements": ["PySwitchbot==0.48.0"]
+  "requirements": ["PySwitchbot==0.48.1"]
 }

homeassistant/components/tedee/manifest.json

@@ -8,5 +8,5 @@
   "iot_class": "local_push",
   "loggers": ["pytedee_async"],
   "quality_scale": "platinum",
-  "requirements": ["pytedee-async==0.2.17"]
+  "requirements": ["pytedee-async==0.2.20"]
 }

homeassistant/components/tplink/config_flow.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from collections.abc import Mapping
+import logging
 from typing import Any
 
 from kasa import (
@@ -52,6 +53,8 @@ from .const import (
     DOMAIN,
 )
 
+_LOGGER = logging.getLogger(__name__)
+
 STEP_AUTH_DATA_SCHEMA = vol.Schema(
     {vol.Required(CONF_USERNAME): str, vol.Required(CONF_PASSWORD): str}
 )
@@ -88,15 +91,10 @@ class TPLinkConfigFlow(ConfigFlow, domain=DOMAIN):
         )
 
     @callback
-    def _update_config_if_entry_in_setup_error(
+    def _get_config_updates(
         self, entry: ConfigEntry, host: str, config: dict
-    ) -> ConfigFlowResult | None:
+    ) -> dict | None:
-        """If discovery encounters a device that is in SETUP_ERROR or SETUP_RETRY update the device config."""
+        """Return updates if the host or device config has changed."""
-        if entry.state not in (
-            ConfigEntryState.SETUP_ERROR,
-            ConfigEntryState.SETUP_RETRY,
-        ):
-            return None
         entry_data = entry.data
         entry_config_dict = entry_data.get(CONF_DEVICE_CONFIG)
         if entry_config_dict == config and entry_data[CONF_HOST] == host:
@@ -110,11 +108,31 @@ class TPLinkConfigFlow(ConfigFlow, domain=DOMAIN):
             != config.get(CONF_CONNECTION_TYPE)
         ):
             updates.pop(CONF_CREDENTIALS_HASH, None)
-        return self.async_update_reload_and_abort(
+            _LOGGER.debug(
-            entry,
+                "Connection type changed for %s from %s to: %s",
-            data=updates,
+                host,
-            reason="already_configured",
+                entry_config_dict.get(CONF_CONNECTION_TYPE),
-        )
+                config.get(CONF_CONNECTION_TYPE),
+            )
+        return updates
+
+    @callback
+    def _update_config_if_entry_in_setup_error(
+        self, entry: ConfigEntry, host: str, config: dict
+    ) -> ConfigFlowResult | None:
+        """If discovery encounters a device that is in SETUP_ERROR or SETUP_RETRY update the device config."""
+        if entry.state not in (
+            ConfigEntryState.SETUP_ERROR,
+            ConfigEntryState.SETUP_RETRY,
+        ):
+            return None
+        if updates := self._get_config_updates(entry, host, config):
+            return self.async_update_reload_and_abort(
+                entry,
+                data=updates,
+                reason="already_configured",
+            )
+        return None
 
     async def _async_handle_discovery(
         self, host: str, formatted_mac: str, config: dict | None = None
@@ -454,7 +472,7 @@ class TPLinkConfigFlow(ConfigFlow, domain=DOMAIN):
             password = user_input[CONF_PASSWORD]
             credentials = Credentials(username, password)
             try:
-                await self._async_try_discover_and_update(
+                device = await self._async_try_discover_and_update(
                     host,
                     credentials=credentials,
                     raise_on_progress=True,
@@ -467,6 +485,11 @@ class TPLinkConfigFlow(ConfigFlow, domain=DOMAIN):
                 placeholders["error"] = str(ex)
             else:
                 await set_credentials(self.hass, username, password)
+                config = device.config.to_dict(exclude_credentials=True)
+                if updates := self._get_config_updates(reauth_entry, host, config):
+                    self.hass.config_entries.async_update_entry(
+                        reauth_entry, data=updates
+                    )
                 self.hass.async_create_task(
                     self._async_reload_requires_auth_entries(), eager_start=False
                 )

homeassistant/components/tplink/light.py

@@ -392,11 +392,11 @@ class TPLinkLightEffectEntity(TPLinkLightEntity):
                 kwargs[ATTR_EFFECT], brightness=brightness, transition=transition
             )
         elif ATTR_COLOR_TEMP_KELVIN in kwargs:
-            if self.effect:
+            if self.effect and self.effect != EFFECT_OFF:
                 # If there is an effect in progress
                 # we have to clear the effect
                 # before we can set a color temp
-                await self._light_module.set_hsv(0, 0, brightness)
+                await self._effect_module.set_effect(LightEffect.LIGHT_EFFECTS_OFF)
             await self._async_set_color_temp(
                 kwargs[ATTR_COLOR_TEMP_KELVIN], brightness, transition
             )

homeassistant/components/tplink/manifest.json

@@ -181,7 +181,7 @@
       "macaddress": "1C61B4*"
     },
     {
-      "hostname": "l5*",
+      "hostname": "l[59]*",
       "macaddress": "5CE931*"
     },
     {
@@ -189,9 +189,13 @@
       "macaddress": "3C52A1*"
     },
     {
-      "hostname": "l5*",
+      "hostname": "l[59]*",
       "macaddress": "5C628B*"
     },
+    {
+      "hostname": "l[59]*",
+      "macaddress": "14EBB6*"
+    },
     {
       "hostname": "tp*",
       "macaddress": "5C628B*"
@@ -297,5 +301,5 @@
   "iot_class": "local_polling",
   "loggers": ["kasa"],
   "quality_scale": "platinum",
-  "requirements": ["python-kasa[speedups]==0.7.0.3"]
+  "requirements": ["python-kasa[speedups]==0.7.0.5"]
 }

homeassistant/components/unifi/button.py

@@ -8,7 +8,7 @@ from __future__ import annotations
 from collections.abc import Callable, Coroutine
 from dataclasses import dataclass
 import secrets
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 import aiounifi
 from aiounifi.interfaces.api_handlers import ItemEvent
@@ -44,6 +44,17 @@ from .entity import (
     async_wlan_device_info_fn,
 )
 
+if TYPE_CHECKING:
+    from .hub import UnifiHub
+
+
+@callback
+def async_port_power_cycle_available_fn(hub: UnifiHub, obj_id: str) -> bool:
+    """Check if port allows power cycle action."""
+    if not async_device_available_fn(hub, obj_id):
+        return False
+    return bool(hub.api.ports[obj_id].poe_enable)
+
 
 async def async_restart_device_control_fn(
     api: aiounifi.Controller, obj_id: str
@@ -96,7 +107,7 @@ ENTITY_DESCRIPTIONS: tuple[UnifiButtonEntityDescription, ...] = (
         entity_category=EntityCategory.CONFIG,
         device_class=ButtonDeviceClass.RESTART,
         api_handler_fn=lambda api: api.ports,
-        available_fn=async_device_available_fn,
+        available_fn=async_port_power_cycle_available_fn,
         control_fn=async_power_cycle_port_control_fn,
         device_info_fn=async_device_device_info_fn,
         name_fn=lambda port: f"{port.name} Power Cycle",

homeassistant/components/unifi/config_flow.py

@@ -164,13 +164,12 @@ class UnifiFlowHandler(ConfigFlow, domain=UNIFI_DOMAIN):
                 config_entry = self.reauth_config_entry
                 abort_reason = "reauth_successful"
 
-            if (
+            if config_entry:
-                config_entry is not None
+                if (
-                and config_entry.state is not ConfigEntryState.NOT_LOADED
+                    config_entry.state is ConfigEntryState.LOADED
-            ):
+                    and (hub := config_entry.runtime_data)
-                hub = config_entry.runtime_data
+                    and hub.available
-
+                ):
-                if hub and hub.available:
                     return self.async_abort(reason="already_configured")
 
                 return self.async_update_reload_and_abort(

homeassistant/components/unifiprotect/entity.py

@@ -189,7 +189,6 @@ class BaseProtectEntity(Entity):
                 self._async_get_ufp_enabled = description.get_ufp_enabled
 
         self._async_set_device_info()
-        self._async_update_device_from_protect(device)
         self._state_getters = tuple(
             partial(attrgetter(attr), self) for attr in self._state_attrs
         )
@@ -264,6 +263,7 @@ class BaseProtectEntity(Entity):
         self.async_on_remove(
             self.data.async_subscribe(self.device.mac, self._async_updated_event)
         )
+        self._async_update_device_from_protect(self.device)
 
 
 class ProtectDeviceEntity(BaseProtectEntity):

homeassistant/components/upb/__init__.py

@@ -26,7 +26,7 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
     file = config_entry.data[CONF_FILE_PATH]
 
     upb = upb_lib.UpbPim({"url": url, "UPStartExportFile": file})
-    upb.connect()
+    await upb.async_connect()
     hass.data.setdefault(DOMAIN, {})
     hass.data[DOMAIN][config_entry.entry_id] = {"upb": upb}
 

homeassistant/components/upb/config_flow.py

@@ -40,7 +40,7 @@ async def _validate_input(data):
 
     upb = upb_lib.UpbPim({"url": url, "UPStartExportFile": file_path})
 
-    upb.connect(_connected_callback)
+    await upb.async_connect(_connected_callback)
 
     if not upb.config_ok:
         _LOGGER.error("Missing or invalid UPB file: %s", file_path)

homeassistant/components/upb/manifest.json

@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/upb",
   "iot_class": "local_push",
   "loggers": ["upb_lib"],
-  "requirements": ["upb-lib==0.5.7"]
+  "requirements": ["upb-lib==0.5.8"]
 }

homeassistant/components/workday/manifest.json

@@ -7,5 +7,5 @@
   "iot_class": "local_polling",
   "loggers": ["holidays"],
   "quality_scale": "internal",
-  "requirements": ["holidays==0.52"]
+  "requirements": ["holidays==0.53"]
 }

homeassistant/const.py

@@ -24,7 +24,7 @@ if TYPE_CHECKING:
 APPLICATION_NAME: Final = "HomeAssistant"
 MAJOR_VERSION: Final = 2024
 MINOR_VERSION: Final = 7
-PATCH_VERSION: Final = "2"
+PATCH_VERSION: Final = "3"
 __short_version__: Final = f"{MAJOR_VERSION}.{MINOR_VERSION}"
 __version__: Final = f"{__short_version__}.{PATCH_VERSION}"
 REQUIRED_PYTHON_VER: Final[tuple[int, int, int]] = (3, 12, 0)

homeassistant/generated/dhcp.py

@@ -827,7 +827,7 @@ DHCP: Final[list[dict[str, str | bool]]] = [
     },
     {
         "domain": "tplink",
-        "hostname": "l5*",
+        "hostname": "l[59]*",
         "macaddress": "5CE931*",
     },
     {
@@ -837,9 +837,14 @@ DHCP: Final[list[dict[str, str | bool]]] = [
     },
     {
         "domain": "tplink",
-        "hostname": "l5*",
+        "hostname": "l[59]*",
         "macaddress": "5C628B*",
     },
+    {
+        "domain": "tplink",
+        "hostname": "l[59]*",
+        "macaddress": "14EBB6*",
+    },
     {
         "domain": "tplink",
         "hostname": "tp*",

homeassistant/package_constraints.txt

@@ -136,6 +136,9 @@ backoff>=2.0
 # v2 has breaking changes (#99218).
 pydantic==1.10.17
 
+# Required for Python 3.12.4 compatibility (#119223).
+mashumaro>=3.13.1
+
 # Breaks asyncio
 # https://github.com/pubnub/python/issues/130
 pubnub!=6.4.0

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name        = "homeassistant"
-version     = "2024.7.2"
+version     = "2024.7.3"
 license     = {text = "Apache-2.0"}
 description = "Open-source home automation platform running on Python 3."
 readme      = "README.rst"

requirements_all.txt

@@ -60,7 +60,7 @@ PyFlume==0.6.5
 PyFronius==0.7.3
 
 # homeassistant.components.pyload
-PyLoadAPI==1.2.0
+PyLoadAPI==1.3.2
 
 # homeassistant.components.mvglive
 PyMVGLive==1.1.4
@@ -90,7 +90,7 @@ PyQRCode==1.2.1
 PyRMVtransport==0.3.3
 
 # homeassistant.components.switchbot
-PySwitchbot==0.48.0
+PySwitchbot==0.48.1
 
 # homeassistant.components.switchmate
 PySwitchmate==0.5.1
@@ -282,7 +282,7 @@ aiolifx-effects==0.3.2
 aiolifx-themes==0.4.15
 
 # homeassistant.components.lifx
-aiolifx==1.0.2
+aiolifx==1.0.5
 
 # homeassistant.components.livisi
 aiolivisi==0.0.19
@@ -344,7 +344,7 @@ aiopyarr==23.4.0
 aioqsw==0.3.5
 
 # homeassistant.components.rainforest_raven
-aioraven==0.6.0
+aioraven==0.7.0
 
 # homeassistant.components.recollect_waste
 aiorecollect==2023.09.0
@@ -1087,7 +1087,7 @@ hole==0.8.0
 
 # homeassistant.components.holiday
 # homeassistant.components.workday
-holidays==0.52
+holidays==0.53
 
 # homeassistant.components.frontend
 home-assistant-frontend==20240710.0
@@ -1137,7 +1137,7 @@ ical==8.1.1
 icmplib==3.0
 
 # homeassistant.components.idasen_desk
-idasen-ha==2.6.1
+idasen-ha==2.6.2
 
 # homeassistant.components.network
 ifaddr==0.2.0
@@ -1203,7 +1203,7 @@ kegtron-ble==0.4.0
 kiwiki-client==0.1.1
 
 # homeassistant.components.knocki
-knocki==0.2.0
+knocki==0.3.1
 
 # homeassistant.components.knx
 knx-frontend==2024.1.20.105944
@@ -1492,7 +1492,7 @@ openhomedevice==2.2.0
 opensensemap-api==0.2.0
 
 # homeassistant.components.enigma2
-openwebifpy==4.2.4
+openwebifpy==4.2.5
 
 # homeassistant.components.luci
 openwrt-luci-rpc==1.1.17
@@ -1501,7 +1501,7 @@ openwrt-luci-rpc==1.1.17
 openwrt-ubus-rpc==0.0.2
 
 # homeassistant.components.opower
-opower==0.4.7
+opower==0.5.2
 
 # homeassistant.components.oralb
 oralb-ble==0.17.6
@@ -2209,7 +2209,7 @@ pyswitchbee==1.8.0
 pytautulli==23.1.1
 
 # homeassistant.components.tedee
-pytedee-async==0.2.17
+pytedee-async==0.2.20
 
 # homeassistant.components.tfiac
 pytfiac==0.4
@@ -2275,7 +2275,7 @@ python-join-api==0.0.9
 python-juicenet==1.1.0
 
 # homeassistant.components.tplink
-python-kasa[speedups]==0.7.0.3
+python-kasa[speedups]==0.7.0.5
 
 # homeassistant.components.lirc
 # python-lirc==1.2.3
@@ -2662,7 +2662,7 @@ stringcase==1.2.0
 subarulink==0.7.11
 
 # homeassistant.components.sunweg
-sunweg==3.0.1
+sunweg==3.0.2
 
 # homeassistant.components.surepetcare
 surepy==0.9.0
@@ -2807,7 +2807,7 @@ unifiled==0.11
 universal-silabs-flasher==0.0.20
 
 # homeassistant.components.upb
-upb-lib==0.5.7
+upb-lib==0.5.8
 
 # homeassistant.components.upcloud
 upcloud-api==2.5.1
@@ -2951,7 +2951,7 @@ youless-api==2.1.2
 youtubeaio==1.1.5
 
 # homeassistant.components.media_extractor
-yt-dlp==2024.07.01
+yt-dlp==2024.07.16
 
 # homeassistant.components.zamg
 zamg==0.3.6

requirements_test_all.txt

@@ -51,7 +51,7 @@ PyFlume==0.6.5
 PyFronius==0.7.3
 
 # homeassistant.components.pyload
-PyLoadAPI==1.2.0
+PyLoadAPI==1.3.2
 
 # homeassistant.components.met_eireann
 PyMetEireann==2021.8.0
@@ -78,7 +78,7 @@ PyQRCode==1.2.1
 PyRMVtransport==0.3.3
 
 # homeassistant.components.switchbot
-PySwitchbot==0.48.0
+PySwitchbot==0.48.1
 
 # homeassistant.components.syncthru
 PySyncThru==0.7.10
@@ -255,7 +255,7 @@ aiolifx-effects==0.3.2
 aiolifx-themes==0.4.15
 
 # homeassistant.components.lifx
-aiolifx==1.0.2
+aiolifx==1.0.5
 
 # homeassistant.components.livisi
 aiolivisi==0.0.19
@@ -317,7 +317,7 @@ aiopyarr==23.4.0
 aioqsw==0.3.5
 
 # homeassistant.components.rainforest_raven
-aioraven==0.6.0
+aioraven==0.7.0
 
 # homeassistant.components.recollect_waste
 aiorecollect==2023.09.0
@@ -892,7 +892,7 @@ hole==0.8.0
 
 # homeassistant.components.holiday
 # homeassistant.components.workday
-holidays==0.52
+holidays==0.53
 
 # homeassistant.components.frontend
 home-assistant-frontend==20240710.0
@@ -933,7 +933,7 @@ ical==8.1.1
 icmplib==3.0
 
 # homeassistant.components.idasen_desk
-idasen-ha==2.6.1
+idasen-ha==2.6.2
 
 # homeassistant.components.network
 ifaddr==0.2.0
@@ -981,7 +981,7 @@ justnimbus==0.7.4
 kegtron-ble==0.4.0
 
 # homeassistant.components.knocki
-knocki==0.2.0
+knocki==0.3.1
 
 # homeassistant.components.knx
 knx-frontend==2024.1.20.105944
@@ -1207,10 +1207,10 @@ openerz-api==0.3.0
 openhomedevice==2.2.0
 
 # homeassistant.components.enigma2
-openwebifpy==4.2.4
+openwebifpy==4.2.5
 
 # homeassistant.components.opower
-opower==0.4.7
+opower==0.5.2
 
 # homeassistant.components.oralb
 oralb-ble==0.17.6
@@ -1742,7 +1742,7 @@ pyswitchbee==1.8.0
 pytautulli==23.1.1
 
 # homeassistant.components.tedee
-pytedee-async==0.2.17
+pytedee-async==0.2.20
 
 # homeassistant.components.motionmount
 python-MotionMount==2.0.0
@@ -1775,7 +1775,7 @@ python-izone==1.2.9
 python-juicenet==1.1.0
 
 # homeassistant.components.tplink
-python-kasa[speedups]==0.7.0.3
+python-kasa[speedups]==0.7.0.5
 
 # homeassistant.components.matter
 python-matter-server==6.2.2
@@ -2081,7 +2081,7 @@ stringcase==1.2.0
 subarulink==0.7.11
 
 # homeassistant.components.sunweg
-sunweg==3.0.1
+sunweg==3.0.2
 
 # homeassistant.components.surepetcare
 surepy==0.9.0
@@ -2181,7 +2181,7 @@ unifi-discovery==1.2.0
 universal-silabs-flasher==0.0.20
 
 # homeassistant.components.upb
-upb-lib==0.5.7
+upb-lib==0.5.8
 
 # homeassistant.components.upcloud
 upcloud-api==2.5.1
@@ -2307,7 +2307,7 @@ youless-api==2.1.2
 youtubeaio==1.1.5
 
 # homeassistant.components.media_extractor
-yt-dlp==2024.07.01
+yt-dlp==2024.07.16
 
 # homeassistant.components.zamg
 zamg==0.3.6

script/gen_requirements_all.py

@@ -157,6 +157,9 @@ backoff>=2.0
 # v2 has breaking changes (#99218).
 pydantic==1.10.17
 
+# Required for Python 3.12.4 compatibility (#119223).
+mashumaro>=3.13.1
+
 # Breaks asyncio
 # https://github.com/pubnub/python/issues/130
 pubnub!=6.4.0

tests/components/alexa/test_smart_home.py

@@ -1979,7 +1979,7 @@ async def test_cover_position(
             "friendly_name": "Test cover range",
             "device_class": "blind",
             "supported_features": supported_features,
-            "position": position,
+            "current_position": position,
         },
     )
     appliance = await discovery_test(device, hass)
@@ -2296,7 +2296,7 @@ async def test_cover_position_range(
             "friendly_name": "Test cover range",
             "device_class": "blind",
             "supported_features": 7,
-            "position": 30,
+            "current_position": 30,
         },
     )
     appliance = await discovery_test(device, hass)
@@ -4658,7 +4658,7 @@ async def test_cover_semantics_position_and_tilt(hass: HomeAssistant) -> None:
             "friendly_name": "Test cover semantics",
             "device_class": "blind",
             "supported_features": 255,
-            "position": 30,
+            "current_position": 30,
             "tilt_position": 30,
         },
     )

tests/components/knocki/test_config_flow.py

@@ -2,7 +2,7 @@
 
 from unittest.mock import AsyncMock
 
-from knocki import KnockiConnectionError
+from knocki import KnockiConnectionError, KnockiInvalidAuthError
 import pytest
 
 from homeassistant.components.knocki.const import DOMAIN
@@ -72,7 +72,11 @@ async def test_duplcate_entry(
 @pytest.mark.parametrize(("field"), ["login", "link"])
 @pytest.mark.parametrize(
     ("exception", "error"),
-    [(KnockiConnectionError, "cannot_connect"), (Exception, "unknown")],
+    [
+        (KnockiConnectionError, "cannot_connect"),
+        (KnockiInvalidAuthError, "invalid_auth"),
+        (Exception, "unknown"),
+    ],
 )
 async def test_exceptions(
     hass: HomeAssistant,

tests/components/pyload/test_sensor.py

@@ -157,3 +157,25 @@ async def test_deprecated_yaml(
     assert issue_registry.async_get_issue(
         domain=HOMEASSISTANT_DOMAIN, issue_id=f"deprecated_yaml_{DOMAIN}"
     )
+
+
+async def test_pyload_pre_0_5_0(
+    hass: HomeAssistant,
+    config_entry: MockConfigEntry,
+    mock_pyloadapi: AsyncMock,
+) -> None:
+    """Test setup of the pyload sensor platform."""
+    mock_pyloadapi.get_status.return_value = {
+        "pause": False,
+        "active": 1,
+        "queue": 6,
+        "total": 37,
+        "speed": 5405963.0,
+        "download": True,
+        "reconnect": False,
+    }
+    config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert config_entry.state is ConfigEntryState.LOADED

tests/components/recorder/test_init.py

@@ -1707,7 +1707,9 @@ async def test_database_corruption_while_running(
     hass.states.async_set("test.lost", "on", {})
 
     sqlite3_exception = DatabaseError("statement", {}, [])
-    sqlite3_exception.__cause__ = sqlite3.DatabaseError()
+    sqlite3_exception.__cause__ = sqlite3.DatabaseError(
+        "database disk image is malformed"
+    )
 
     await async_wait_recording_done(hass)
     with patch.object(

tests/components/recorder/test_migrate.py

@@ -165,7 +165,9 @@ async def test_database_migration_encounters_corruption(
     assert recorder.util.async_migration_in_progress(hass) is False
 
     sqlite3_exception = DatabaseError("statement", {}, [])
-    sqlite3_exception.__cause__ = sqlite3.DatabaseError()
+    sqlite3_exception.__cause__ = sqlite3.DatabaseError(
+        "database disk image is malformed"
+    )
 
     with (
         patch("homeassistant.components.recorder.ALLOW_IN_MEMORY_DB", True),

tests/components/recorder/test_purge.py

@@ -210,7 +210,7 @@ async def test_purge_old_states_encouters_database_corruption(
     await async_wait_recording_done(hass)
 
     sqlite3_exception = DatabaseError("statement", {}, [])
-    sqlite3_exception.__cause__ = sqlite3.DatabaseError()
+    sqlite3_exception.__cause__ = sqlite3.DatabaseError("not a database")
 
     with (
         patch(

tests/components/recorder/test_purge_v32_schema.py

@@ -173,7 +173,7 @@ async def test_purge_old_states_encouters_database_corruption(
     await async_wait_recording_done(hass)
 
     sqlite3_exception = DatabaseError("statement", {}, [])
-    sqlite3_exception.__cause__ = sqlite3.DatabaseError()
+    sqlite3_exception.__cause__ = sqlite3.DatabaseError("not a database")
 
     with (
         patch(

tests/components/reolink/test_media_source.py

@@ -54,6 +54,7 @@ TEST_FILE_NAME = f"{TEST_YEAR}{TEST_MONTH}{TEST_DAY}{TEST_HOUR}{TEST_MINUTE}00"
 TEST_FILE_NAME_MP4 = f"{TEST_YEAR}{TEST_MONTH}{TEST_DAY}{TEST_HOUR}{TEST_MINUTE}00.mp4"
 TEST_STREAM = "main"
 TEST_CHANNEL = "0"
+TEST_CAM_NAME = "Cam new name"
 
 TEST_MIME_TYPE = "application/x-mpegURL"
 TEST_MIME_TYPE_MP4 = "video/mp4"
@@ -130,6 +131,7 @@ async def test_browsing(
     """Test browsing the Reolink three."""
     entry_id = config_entry.entry_id
     reolink_connect.api_version.return_value = 1
+    reolink_connect.model = "Reolink TrackMix PoE"
 
     with patch("homeassistant.components.reolink.PLATFORMS", [Platform.CAMERA]):
         assert await hass.config_entries.async_setup(entry_id) is True
@@ -137,7 +139,7 @@ async def test_browsing(
 
     entries = dr.async_entries_for_config_entry(device_registry, entry_id)
     assert len(entries) > 0
-    device_registry.async_update_device(entries[0].id, name_by_user="Cam new name")
+    device_registry.async_update_device(entries[0].id, name_by_user=TEST_CAM_NAME)
 
     caplog.set_level(logging.DEBUG)
 
@@ -149,6 +151,7 @@ async def test_browsing(
     assert browse.title == "Reolink"
     assert browse.identifier is None
     assert browse.children[0].identifier == browse_root_id
+    assert browse.children[0].title == f"{TEST_CAM_NAME} lens 0"
 
     # browse resolution select
     browse = await async_browse_media(hass, f"{URI_SCHEME}{DOMAIN}/{browse_root_id}")

tests/components/shelly/conftest.py

@@ -359,6 +359,7 @@ def _mock_rpc_device(version: str | None = None):
         status=MOCK_STATUS_RPC,
         firmware_version="some fw string",
         initialized=True,
+        connected=True,
     )
     type(device).name = PropertyMock(return_value="Test name")
     return device

tests/components/shelly/test_binary_sensor.py

@@ -263,6 +263,7 @@ async def test_rpc_sleeping_binary_sensor(
 ) -> None:
     """Test RPC online sleeping binary sensor."""
     entity_id = f"{BINARY_SENSOR_DOMAIN}.test_name_cloud"
+    monkeypatch.setattr(mock_rpc_device, "connected", False)
     monkeypatch.setitem(mock_rpc_device.status["sys"], "wakeup_period", 1000)
     config_entry = await init_integration(hass, 2, sleep_period=1000)
 

tests/components/shelly/test_config_flow.py

@@ -1114,6 +1114,7 @@ async def test_zeroconf_sleeping_device_not_triggers_refresh(
     caplog: pytest.LogCaptureFixture,
 ) -> None:
     """Test zeroconf discovery does not triggers refresh for sleeping device."""
+    monkeypatch.setattr(mock_rpc_device, "connected", False)
     monkeypatch.setitem(mock_rpc_device.status["sys"], "wakeup_period", 1000)
     entry = MockConfigEntry(
         domain="shelly",

tests/components/shelly/test_coordinator.py

@@ -545,6 +545,7 @@ async def test_rpc_update_entry_sleep_period(
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
     """Test RPC update entry sleep period."""
+    monkeypatch.setattr(mock_rpc_device, "connected", False)
     monkeypatch.setitem(mock_rpc_device.status["sys"], "wakeup_period", 600)
     entry = await init_integration(hass, 2, sleep_period=600)
     register_entity(
@@ -578,6 +579,7 @@ async def test_rpc_sleeping_device_no_periodic_updates(
 ) -> None:
     """Test RPC sleeping device no periodic updates."""
     entity_id = f"{SENSOR_DOMAIN}.test_name_temperature"
+    monkeypatch.setattr(mock_rpc_device, "connected", False)
     monkeypatch.setitem(mock_rpc_device.status["sys"], "wakeup_period", 1000)
     entry = await init_integration(hass, 2, sleep_period=1000)
     register_entity(
@@ -609,6 +611,7 @@ async def test_rpc_sleeping_device_firmware_unsupported(
     issue_registry: ir.IssueRegistry,
 ) -> None:
     """Test RPC sleeping device firmware not supported."""
+    monkeypatch.setattr(mock_rpc_device, "connected", False)
     monkeypatch.setattr(mock_rpc_device, "firmware_supported", False)
     entry = await init_integration(hass, 2, sleep_period=3600)
 
@@ -912,6 +915,7 @@ async def test_rpc_sleeping_device_connection_error(
         hass, BINARY_SENSOR_DOMAIN, "test_name_cloud", "cloud-cloud", entry
     )
     mock_restore_cache(hass, [State(entity_id, STATE_ON)])
+    monkeypatch.setattr(mock_rpc_device, "connected", False)
     monkeypatch.setattr(mock_rpc_device, "initialized", False)
     await hass.config_entries.async_setup(entry.entry_id)
     await hass.async_block_till_done()
@@ -939,3 +943,19 @@ async def test_rpc_sleeping_device_connection_error(
 
     assert "Sleeping device did not update" in caplog.text
     assert get_entity_state(hass, entity_id) == STATE_UNAVAILABLE
+
+
+async def test_rpc_already_connected(
+    hass: HomeAssistant,
+    freezer: FrozenDateTimeFactory,
+    mock_rpc_device: Mock,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test RPC ignore connect event if already connected."""
+    await init_integration(hass, 2)
+
+    mock_rpc_device.mock_online()
+    await hass.async_block_till_done(wait_background_tasks=True)
+
+    assert "already connected" in caplog.text
+    mock_rpc_device.initialize.assert_called_once()

tests/components/shelly/test_init.py

@@ -279,6 +279,7 @@ async def test_sleeping_rpc_device_online(
     caplog: pytest.LogCaptureFixture,
 ) -> None:
     """Test sleeping RPC device online."""
+    monkeypatch.setattr(mock_rpc_device, "connected", False)
     monkeypatch.setitem(mock_rpc_device.status["sys"], "wakeup_period", device_sleep)
     entry = await init_integration(hass, 2, sleep_period=entry_sleep)
     assert "will resume when device is online" in caplog.text
@@ -297,6 +298,7 @@ async def test_sleeping_rpc_device_online_new_firmware(
     caplog: pytest.LogCaptureFixture,
 ) -> None:
     """Test sleeping device Gen2 with firmware 1.0.0 or later."""
+    monkeypatch.setattr(mock_rpc_device, "connected", False)
     entry = await init_integration(hass, 2, sleep_period=None)
     assert "will resume when device is online" in caplog.text
 

tests/components/shelly/test_sensor.py

@@ -449,6 +449,7 @@ async def test_rpc_sleeping_sensor(
 ) -> None:
     """Test RPC online sleeping sensor."""
     entity_id = f"{SENSOR_DOMAIN}.test_name_temperature"
+    monkeypatch.setattr(mock_rpc_device, "connected", False)
     monkeypatch.setitem(mock_rpc_device.status["sys"], "wakeup_period", 1000)
     entry = await init_integration(hass, 2, sleep_period=1000)
 
@@ -600,6 +601,7 @@ async def test_rpc_sleeping_update_entity_service(
     await async_setup_component(hass, "homeassistant", {})
 
     entity_id = f"{SENSOR_DOMAIN}.test_name_temperature"
+    monkeypatch.setattr(mock_rpc_device, "connected", False)
     monkeypatch.setitem(mock_rpc_device.status["sys"], "wakeup_period", 1000)
     await init_integration(hass, 2, sleep_period=1000)
 

tests/components/shelly/test_update.py

@@ -334,6 +334,7 @@ async def test_rpc_sleeping_update(
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
     """Test RPC sleeping device update entity."""
+    monkeypatch.setattr(mock_rpc_device, "connected", False)
     monkeypatch.setitem(mock_rpc_device.status["sys"], "wakeup_period", 1000)
     monkeypatch.setitem(mock_rpc_device.shelly, "ver", "1")
     monkeypatch.setitem(

tests/components/shelly/test_utils.py

@@ -23,6 +23,7 @@ from homeassistant.components.shelly.utils import (
     get_block_device_sleep_period,
     get_block_input_triggers,
     get_device_uptime,
+    get_host,
     get_number_of_channels,
     get_release_url,
     get_rpc_channel_name,
@@ -274,3 +275,19 @@ def test_get_release_url(
     result = get_release_url(gen, model, beta)
 
     assert result is expected
+
+
+@pytest.mark.parametrize(
+    ("host", "expected"),
+    [
+        ("shelly_device.local", "shelly_device.local"),
+        ("192.168.178.12", "192.168.178.12"),
+        (
+            "2001:0db8:85a3:0000:0000:8a2e:0370:7334",
+            "[2001:0db8:85a3:0000:0000:8a2e:0370:7334]",
+        ),
+    ],
+)
+def test_get_host(host: str, expected: str) -> None:
+    """Test get_host function."""
+    assert get_host(host) == expected

tests/components/tplink/__init__.py

@@ -57,25 +57,26 @@ CREDENTIALS_HASH_LEGACY = ""
 DEVICE_CONFIG_LEGACY = DeviceConfig(IP_ADDRESS)
 DEVICE_CONFIG_DICT_LEGACY = DEVICE_CONFIG_LEGACY.to_dict(exclude_credentials=True)
 CREDENTIALS = Credentials("foo", "bar")
-CREDENTIALS_HASH_AUTH = "abcdefghijklmnopqrstuv=="
+CREDENTIALS_HASH_AES = "AES/abcdefghijklmnopqrstuvabcdefghijklmnopqrstuv=="
-DEVICE_CONFIG_AUTH = DeviceConfig(
+CREDENTIALS_HASH_KLAP = "KLAP/abcdefghijklmnopqrstuv=="
+DEVICE_CONFIG_KLAP = DeviceConfig(
     IP_ADDRESS,
     credentials=CREDENTIALS,
     connection_type=DeviceConnectionParameters(
-        DeviceFamily.IotSmartPlugSwitch, DeviceEncryptionType.Klap
+        DeviceFamily.SmartTapoPlug, DeviceEncryptionType.Klap
     ),
     uses_http=True,
 )
-DEVICE_CONFIG_AUTH2 = DeviceConfig(
+DEVICE_CONFIG_AES = DeviceConfig(
     IP_ADDRESS2,
     credentials=CREDENTIALS,
     connection_type=DeviceConnectionParameters(
-        DeviceFamily.IotSmartPlugSwitch, DeviceEncryptionType.Klap
+        DeviceFamily.SmartTapoPlug, DeviceEncryptionType.Aes
     ),
     uses_http=True,
 )
-DEVICE_CONFIG_DICT_AUTH = DEVICE_CONFIG_AUTH.to_dict(exclude_credentials=True)
+DEVICE_CONFIG_DICT_KLAP = DEVICE_CONFIG_KLAP.to_dict(exclude_credentials=True)
-DEVICE_CONFIG_DICT_AUTH2 = DEVICE_CONFIG_AUTH2.to_dict(exclude_credentials=True)
+DEVICE_CONFIG_DICT_AES = DEVICE_CONFIG_AES.to_dict(exclude_credentials=True)
 
 CREATE_ENTRY_DATA_LEGACY = {
     CONF_HOST: IP_ADDRESS,
@@ -84,24 +85,28 @@ CREATE_ENTRY_DATA_LEGACY = {
     CONF_DEVICE_CONFIG: DEVICE_CONFIG_DICT_LEGACY,
 }
 
-CREATE_ENTRY_DATA_AUTH = {
+CREATE_ENTRY_DATA_KLAP = {
     CONF_HOST: IP_ADDRESS,
     CONF_ALIAS: ALIAS,
     CONF_MODEL: MODEL,
-    CONF_CREDENTIALS_HASH: CREDENTIALS_HASH_AUTH,
+    CONF_CREDENTIALS_HASH: CREDENTIALS_HASH_KLAP,
-    CONF_DEVICE_CONFIG: DEVICE_CONFIG_DICT_AUTH,
+    CONF_DEVICE_CONFIG: DEVICE_CONFIG_DICT_KLAP,
 }
-CREATE_ENTRY_DATA_AUTH2 = {
+CREATE_ENTRY_DATA_AES = {
     CONF_HOST: IP_ADDRESS2,
     CONF_ALIAS: ALIAS,
     CONF_MODEL: MODEL,
-    CONF_CREDENTIALS_HASH: CREDENTIALS_HASH_AUTH,
+    CONF_CREDENTIALS_HASH: CREDENTIALS_HASH_AES,
-    CONF_DEVICE_CONFIG: DEVICE_CONFIG_DICT_AUTH2,
+    CONF_DEVICE_CONFIG: DEVICE_CONFIG_DICT_AES,
 }
-NEW_CONNECTION_TYPE = DeviceConnectionParameters(
+CONNECTION_TYPE_KLAP = DeviceConnectionParameters(
-    DeviceFamily.IotSmartPlugSwitch, DeviceEncryptionType.Aes
+    DeviceFamily.SmartTapoPlug, DeviceEncryptionType.Klap
 )
-NEW_CONNECTION_TYPE_DICT = NEW_CONNECTION_TYPE.to_dict()
+CONNECTION_TYPE_KLAP_DICT = CONNECTION_TYPE_KLAP.to_dict()
+CONNECTION_TYPE_AES = DeviceConnectionParameters(
+    DeviceFamily.SmartTapoPlug, DeviceEncryptionType.Aes
+)
+CONNECTION_TYPE_AES_DICT = CONNECTION_TYPE_AES.to_dict()
 
 
 def _load_feature_fixtures():
@@ -187,7 +192,7 @@ def _mocked_device(
     device_id=DEVICE_ID,
     alias=ALIAS,
     model=MODEL,
-    ip_address=IP_ADDRESS,
+    ip_address: str | None = None,
     modules: list[str] | None = None,
     children: list[Device] | None = None,
     features: list[str | Feature] | None = None,
@@ -202,12 +207,17 @@ def _mocked_device(
     device.mac = mac
     device.alias = alias
     device.model = model
-    device.host = ip_address
     device.device_id = device_id
     device.hw_info = {"sw_ver": "1.0.0", "hw_ver": "1.0.0"}
     device.modules = {}
     device.features = {}
 
+    if not ip_address:
+        ip_address = IP_ADDRESS
+    else:
+        device_config.host = ip_address
+    device.host = ip_address
+
     if modules:
         device.modules = {
             module_name: MODULE_TO_MOCK_GEN[module_name](device)

tests/components/tplink/conftest.py

@@ -11,8 +11,10 @@ from homeassistant.core import HomeAssistant
 
 from . import (
     CREATE_ENTRY_DATA_LEGACY,
-    CREDENTIALS_HASH_AUTH,
+    CREDENTIALS_HASH_AES,
-    DEVICE_CONFIG_AUTH,
+    CREDENTIALS_HASH_KLAP,
+    DEVICE_CONFIG_AES,
+    DEVICE_CONFIG_KLAP,
     IP_ADDRESS,
     IP_ADDRESS2,
     MAC_ADDRESS,
@@ -32,14 +34,14 @@ def mock_discovery():
         discover_single=DEFAULT,
     ) as mock_discovery:
         device = _mocked_device(
-            device_config=copy.deepcopy(DEVICE_CONFIG_AUTH),
+            device_config=copy.deepcopy(DEVICE_CONFIG_KLAP),
-            credentials_hash=CREDENTIALS_HASH_AUTH,
+            credentials_hash=CREDENTIALS_HASH_KLAP,
             alias=None,
         )
         devices = {
             "127.0.0.1": _mocked_device(
-                device_config=copy.deepcopy(DEVICE_CONFIG_AUTH),
+                device_config=copy.deepcopy(DEVICE_CONFIG_KLAP),
-                credentials_hash=CREDENTIALS_HASH_AUTH,
+                credentials_hash=CREDENTIALS_HASH_KLAP,
                 alias=None,
             )
         }
@@ -55,12 +57,15 @@ def mock_connect():
     with patch("homeassistant.components.tplink.Device.connect") as mock_connect:
         devices = {
             IP_ADDRESS: _mocked_device(
-                device_config=DEVICE_CONFIG_AUTH, credentials_hash=CREDENTIALS_HASH_AUTH
+                device_config=DEVICE_CONFIG_KLAP,
+                credentials_hash=CREDENTIALS_HASH_KLAP,
+                ip_address=IP_ADDRESS,
             ),
             IP_ADDRESS2: _mocked_device(
-                device_config=DEVICE_CONFIG_AUTH,
+                device_config=DEVICE_CONFIG_AES,
-                credentials_hash=CREDENTIALS_HASH_AUTH,
+                credentials_hash=CREDENTIALS_HASH_AES,
                 mac=MAC_ADDRESS2,
+                ip_address=IP_ADDRESS2,
             ),
         }
 

tests/components/tplink/test_config_flow.py

@@ -1,5 +1,6 @@
 """Test the tplink config flow."""
 
+import logging
 from unittest.mock import AsyncMock, patch
 
 from kasa import TimeoutError
@@ -11,6 +12,7 @@ from homeassistant.components.tplink import (
     DOMAIN,
     AuthenticationError,
     Credentials,
+    Device,
     DeviceConfig,
     KasaException,
 )
@@ -33,19 +35,21 @@ from homeassistant.data_entry_flow import FlowResultType
 
 from . import (
     ALIAS,
-    CREATE_ENTRY_DATA_AUTH,
+    CONNECTION_TYPE_KLAP_DICT,
-    CREATE_ENTRY_DATA_AUTH2,
+    CREATE_ENTRY_DATA_AES,
+    CREATE_ENTRY_DATA_KLAP,
     CREATE_ENTRY_DATA_LEGACY,
-    CREDENTIALS_HASH_AUTH,
+    CREDENTIALS_HASH_AES,
+    CREDENTIALS_HASH_KLAP,
     DEFAULT_ENTRY_TITLE,
-    DEVICE_CONFIG_DICT_AUTH,
+    DEVICE_CONFIG_DICT_AES,
+    DEVICE_CONFIG_DICT_KLAP,
     DEVICE_CONFIG_DICT_LEGACY,
     DHCP_FORMATTED_MAC_ADDRESS,
     IP_ADDRESS,
     MAC_ADDRESS,
     MAC_ADDRESS2,
     MODULE,
-    NEW_CONNECTION_TYPE_DICT,
     _mocked_device,
     _patch_connect,
     _patch_discovery,
@@ -135,7 +139,7 @@ async def test_discovery_auth(
             CONF_HOST: IP_ADDRESS,
             CONF_MAC: MAC_ADDRESS,
             CONF_ALIAS: ALIAS,
-            CONF_DEVICE_CONFIG: DEVICE_CONFIG_DICT_AUTH,
+            CONF_DEVICE_CONFIG: DEVICE_CONFIG_DICT_KLAP,
         },
     )
     await hass.async_block_till_done()
@@ -154,7 +158,7 @@ async def test_discovery_auth(
 
     assert result2["type"] is FlowResultType.CREATE_ENTRY
     assert result2["title"] == DEFAULT_ENTRY_TITLE
-    assert result2["data"] == CREATE_ENTRY_DATA_AUTH
+    assert result2["data"] == CREATE_ENTRY_DATA_KLAP
     assert result2["context"]["unique_id"] == MAC_ADDRESS
 
 
@@ -187,7 +191,7 @@ async def test_discovery_auth_errors(
             CONF_HOST: IP_ADDRESS,
             CONF_MAC: MAC_ADDRESS,
             CONF_ALIAS: ALIAS,
-            CONF_DEVICE_CONFIG: DEVICE_CONFIG_DICT_AUTH,
+            CONF_DEVICE_CONFIG: DEVICE_CONFIG_DICT_KLAP,
         },
     )
     await hass.async_block_till_done()
@@ -218,7 +222,7 @@ async def test_discovery_auth_errors(
         },
     )
     assert result3["type"] is FlowResultType.CREATE_ENTRY
-    assert result3["data"] == CREATE_ENTRY_DATA_AUTH
+    assert result3["data"] == CREATE_ENTRY_DATA_KLAP
     assert result3["context"]["unique_id"] == MAC_ADDRESS
 
 
@@ -238,7 +242,7 @@ async def test_discovery_new_credentials(
             CONF_HOST: IP_ADDRESS,
             CONF_MAC: MAC_ADDRESS,
             CONF_ALIAS: ALIAS,
-            CONF_DEVICE_CONFIG: DEVICE_CONFIG_DICT_AUTH,
+            CONF_DEVICE_CONFIG: DEVICE_CONFIG_DICT_KLAP,
         },
     )
     await hass.async_block_till_done()
@@ -267,7 +271,7 @@ async def test_discovery_new_credentials(
         {},
     )
     assert result3["type"] is FlowResultType.CREATE_ENTRY
-    assert result3["data"] == CREATE_ENTRY_DATA_AUTH
+    assert result3["data"] == CREATE_ENTRY_DATA_KLAP
     assert result3["context"]["unique_id"] == MAC_ADDRESS
 
 
@@ -290,7 +294,7 @@ async def test_discovery_new_credentials_invalid(
             CONF_HOST: IP_ADDRESS,
             CONF_MAC: MAC_ADDRESS,
             CONF_ALIAS: ALIAS,
-            CONF_DEVICE_CONFIG: DEVICE_CONFIG_DICT_AUTH,
+            CONF_DEVICE_CONFIG: DEVICE_CONFIG_DICT_KLAP,
         },
     )
     await hass.async_block_till_done()
@@ -323,7 +327,7 @@ async def test_discovery_new_credentials_invalid(
         },
     )
     assert result3["type"] is FlowResultType.CREATE_ENTRY
-    assert result3["data"] == CREATE_ENTRY_DATA_AUTH
+    assert result3["data"] == CREATE_ENTRY_DATA_KLAP
     assert result3["context"]["unique_id"] == MAC_ADDRESS
 
 
@@ -543,7 +547,7 @@ async def test_manual_auth(
     await hass.async_block_till_done()
     assert result3["type"] is FlowResultType.CREATE_ENTRY
     assert result3["title"] == DEFAULT_ENTRY_TITLE
-    assert result3["data"] == CREATE_ENTRY_DATA_AUTH
+    assert result3["data"] == CREATE_ENTRY_DATA_KLAP
     assert result3["context"]["unique_id"] == MAC_ADDRESS
 
 
@@ -607,7 +611,7 @@ async def test_manual_auth_errors(
         },
     )
     assert result4["type"] is FlowResultType.CREATE_ENTRY
-    assert result4["data"] == CREATE_ENTRY_DATA_AUTH
+    assert result4["data"] == CREATE_ENTRY_DATA_KLAP
     assert result4["context"]["unique_id"] == MAC_ADDRESS
 
     await hass.async_block_till_done()
@@ -791,16 +795,16 @@ async def test_integration_discovery_with_ip_change(
             CONF_HOST: "127.0.0.2",
             CONF_MAC: MAC_ADDRESS,
             CONF_ALIAS: ALIAS,
-            CONF_DEVICE_CONFIG: DEVICE_CONFIG_DICT_AUTH,
+            CONF_DEVICE_CONFIG: DEVICE_CONFIG_DICT_KLAP,
         },
     )
     await hass.async_block_till_done()
     assert discovery_result["type"] is FlowResultType.ABORT
     assert discovery_result["reason"] == "already_configured"
-    assert mock_config_entry.data[CONF_DEVICE_CONFIG] == DEVICE_CONFIG_DICT_AUTH
+    assert mock_config_entry.data[CONF_DEVICE_CONFIG] == DEVICE_CONFIG_DICT_KLAP
     assert mock_config_entry.data[CONF_HOST] == "127.0.0.2"
 
-    config = DeviceConfig.from_dict(DEVICE_CONFIG_DICT_AUTH)
+    config = DeviceConfig.from_dict(DEVICE_CONFIG_DICT_KLAP)
 
     mock_connect["connect"].reset_mock(side_effect=True)
     bulb = _mocked_device(
@@ -832,8 +836,8 @@ async def test_integration_discovery_with_connection_change(
     mock_config_entry = MockConfigEntry(
         title="TPLink",
         domain=DOMAIN,
-        data=CREATE_ENTRY_DATA_AUTH,
+        data=CREATE_ENTRY_DATA_AES,
-        unique_id=MAC_ADDRESS,
+        unique_id=MAC_ADDRESS2,
     )
     mock_config_entry.add_to_hass(hass)
     with patch("homeassistant.components.tplink.Discover.discover", return_value={}):
@@ -849,13 +853,15 @@ async def test_integration_discovery_with_connection_change(
         )
         == 0
     )
-    assert mock_config_entry.data[CONF_DEVICE_CONFIG] == DEVICE_CONFIG_DICT_AUTH
+    assert mock_config_entry.data[CONF_HOST] == "127.0.0.2"
-    assert mock_config_entry.data[CONF_DEVICE_CONFIG].get(CONF_HOST) == "127.0.0.1"
+    assert mock_config_entry.data[CONF_DEVICE_CONFIG] == DEVICE_CONFIG_DICT_AES
-    assert mock_config_entry.data[CONF_CREDENTIALS_HASH] == CREDENTIALS_HASH_AUTH
+    assert mock_config_entry.data[CONF_DEVICE_CONFIG].get(CONF_HOST) == "127.0.0.2"
+    assert mock_config_entry.data[CONF_CREDENTIALS_HASH] == CREDENTIALS_HASH_AES
 
     NEW_DEVICE_CONFIG = {
-        **DEVICE_CONFIG_DICT_AUTH,
+        **DEVICE_CONFIG_DICT_KLAP,
-        CONF_CONNECTION_TYPE: NEW_CONNECTION_TYPE_DICT,
+        CONF_CONNECTION_TYPE: CONNECTION_TYPE_KLAP_DICT,
+        CONF_HOST: "127.0.0.2",
     }
     config = DeviceConfig.from_dict(NEW_DEVICE_CONFIG)
     # Reset the connect mock so when the config flow reloads the entry it succeeds
@@ -870,8 +876,8 @@ async def test_integration_discovery_with_connection_change(
         DOMAIN,
         context={"source": config_entries.SOURCE_INTEGRATION_DISCOVERY},
         data={
-            CONF_HOST: "127.0.0.1",
+            CONF_HOST: "127.0.0.2",
-            CONF_MAC: MAC_ADDRESS,
+            CONF_MAC: MAC_ADDRESS2,
             CONF_ALIAS: ALIAS,
             CONF_DEVICE_CONFIG: NEW_DEVICE_CONFIG,
         },
@@ -880,8 +886,8 @@ async def test_integration_discovery_with_connection_change(
     assert discovery_result["type"] is FlowResultType.ABORT
     assert discovery_result["reason"] == "already_configured"
     assert mock_config_entry.data[CONF_DEVICE_CONFIG] == NEW_DEVICE_CONFIG
-    assert mock_config_entry.data[CONF_HOST] == "127.0.0.1"
+    assert mock_config_entry.data[CONF_HOST] == "127.0.0.2"
-    assert CREDENTIALS_HASH_AUTH not in mock_config_entry.data
+    assert CREDENTIALS_HASH_AES not in mock_config_entry.data
 
     assert mock_config_entry.state is ConfigEntryState.LOADED
 
@@ -953,6 +959,77 @@ async def test_reauth(
     await hass.async_block_till_done()
 
 
+async def test_reauth_update_with_encryption_change(
+    hass: HomeAssistant,
+    mock_discovery: AsyncMock,
+    mock_connect: AsyncMock,
+    caplog: pytest.LogCaptureFixture,
+) -> None:
+    """Test reauth flow."""
+    orig_side_effect = mock_connect["connect"].side_effect
+    mock_connect["connect"].side_effect = AuthenticationError()
+    mock_config_entry = MockConfigEntry(
+        title="TPLink",
+        domain=DOMAIN,
+        data={**CREATE_ENTRY_DATA_AES},
+        unique_id=MAC_ADDRESS2,
+    )
+    mock_config_entry.add_to_hass(hass)
+    assert mock_config_entry.data[CONF_DEVICE_CONFIG] == DEVICE_CONFIG_DICT_AES
+    assert mock_config_entry.data[CONF_CREDENTIALS_HASH] == CREDENTIALS_HASH_AES
+
+    with patch("homeassistant.components.tplink.Discover.discover", return_value={}):
+        await hass.config_entries.async_setup(mock_config_entry.entry_id)
+        await hass.async_block_till_done()
+    assert mock_config_entry.state is ConfigEntryState.SETUP_ERROR
+
+    caplog.set_level(logging.DEBUG)
+    flows = hass.config_entries.flow.async_progress()
+    assert len(flows) == 1
+    [result] = flows
+    assert result["step_id"] == "reauth_confirm"
+    assert mock_config_entry.data[CONF_DEVICE_CONFIG] == DEVICE_CONFIG_DICT_AES
+    assert CONF_CREDENTIALS_HASH not in mock_config_entry.data
+
+    new_config = DeviceConfig(
+        "127.0.0.2",
+        credentials=None,
+        connection_type=Device.ConnectionParameters(
+            Device.Family.SmartTapoPlug, Device.EncryptionType.Klap
+        ),
+        uses_http=True,
+    )
+    mock_discovery["mock_device"].host = "127.0.0.2"
+    mock_discovery["mock_device"].config = new_config
+    mock_discovery["mock_device"].credentials_hash = None
+    mock_connect["mock_devices"]["127.0.0.2"].config = new_config
+    mock_connect["mock_devices"]["127.0.0.2"].credentials_hash = CREDENTIALS_HASH_KLAP
+
+    mock_connect["connect"].side_effect = orig_side_effect
+    result2 = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        user_input={
+            CONF_USERNAME: "fake_username",
+            CONF_PASSWORD: "fake_password",
+        },
+    )
+    await hass.async_block_till_done(wait_background_tasks=True)
+    assert "Connection type changed for 127.0.0.2" in caplog.text
+    credentials = Credentials("fake_username", "fake_password")
+    mock_discovery["discover_single"].assert_called_once_with(
+        "127.0.0.2", credentials=credentials
+    )
+    mock_discovery["mock_device"].update.assert_called_once_with()
+    assert result2["type"] is FlowResultType.ABORT
+    assert result2["reason"] == "reauth_successful"
+    assert mock_config_entry.state is ConfigEntryState.LOADED
+    assert mock_config_entry.data[CONF_DEVICE_CONFIG] == {
+        **DEVICE_CONFIG_DICT_KLAP,
+        CONF_HOST: "127.0.0.2",
+    }
+    assert mock_config_entry.data[CONF_CREDENTIALS_HASH] == CREDENTIALS_HASH_KLAP
+
+
 async def test_reauth_update_from_discovery(
     hass: HomeAssistant,
     mock_config_entry: MockConfigEntry,
@@ -981,13 +1058,13 @@ async def test_reauth_update_from_discovery(
             CONF_HOST: IP_ADDRESS,
             CONF_MAC: MAC_ADDRESS,
             CONF_ALIAS: ALIAS,
-            CONF_DEVICE_CONFIG: DEVICE_CONFIG_DICT_AUTH,
+            CONF_DEVICE_CONFIG: DEVICE_CONFIG_DICT_KLAP,
         },
     )
     await hass.async_block_till_done()
     assert discovery_result["type"] is FlowResultType.ABORT
     assert discovery_result["reason"] == "already_configured"
-    assert mock_config_entry.data[CONF_DEVICE_CONFIG] == DEVICE_CONFIG_DICT_AUTH
+    assert mock_config_entry.data[CONF_DEVICE_CONFIG] == DEVICE_CONFIG_DICT_KLAP
 
 
 async def test_reauth_update_from_discovery_with_ip_change(
@@ -1017,13 +1094,13 @@ async def test_reauth_update_from_discovery_with_ip_change(
             CONF_HOST: "127.0.0.2",
             CONF_MAC: MAC_ADDRESS,
             CONF_ALIAS: ALIAS,
-            CONF_DEVICE_CONFIG: DEVICE_CONFIG_DICT_AUTH,
+            CONF_DEVICE_CONFIG: DEVICE_CONFIG_DICT_KLAP,
         },
     )
     await hass.async_block_till_done()
     assert discovery_result["type"] is FlowResultType.ABORT
     assert discovery_result["reason"] == "already_configured"
-    assert mock_config_entry.data[CONF_DEVICE_CONFIG] == DEVICE_CONFIG_DICT_AUTH
+    assert mock_config_entry.data[CONF_DEVICE_CONFIG] == DEVICE_CONFIG_DICT_KLAP
     assert mock_config_entry.data[CONF_HOST] == "127.0.0.2"
 
 
@@ -1040,7 +1117,7 @@ async def test_reauth_no_update_if_config_and_ip_the_same(
         mock_config_entry,
         data={
             **mock_config_entry.data,
-            CONF_DEVICE_CONFIG: DEVICE_CONFIG_DICT_AUTH,
+            CONF_DEVICE_CONFIG: DEVICE_CONFIG_DICT_KLAP,
         },
     )
     await hass.config_entries.async_setup(mock_config_entry.entry_id)
@@ -1051,7 +1128,7 @@ async def test_reauth_no_update_if_config_and_ip_the_same(
     assert len(flows) == 1
     [result] = flows
     assert result["step_id"] == "reauth_confirm"
-    assert mock_config_entry.data[CONF_DEVICE_CONFIG] == DEVICE_CONFIG_DICT_AUTH
+    assert mock_config_entry.data[CONF_DEVICE_CONFIG] == DEVICE_CONFIG_DICT_KLAP
 
     discovery_result = await hass.config_entries.flow.async_init(
         DOMAIN,
@@ -1060,13 +1137,13 @@ async def test_reauth_no_update_if_config_and_ip_the_same(
             CONF_HOST: IP_ADDRESS,
             CONF_MAC: MAC_ADDRESS,
             CONF_ALIAS: ALIAS,
-            CONF_DEVICE_CONFIG: DEVICE_CONFIG_DICT_AUTH,
+            CONF_DEVICE_CONFIG: DEVICE_CONFIG_DICT_KLAP,
         },
     )
     await hass.async_block_till_done()
     assert discovery_result["type"] is FlowResultType.ABORT
     assert discovery_result["reason"] == "already_configured"
-    assert mock_config_entry.data[CONF_DEVICE_CONFIG] == DEVICE_CONFIG_DICT_AUTH
+    assert mock_config_entry.data[CONF_DEVICE_CONFIG] == DEVICE_CONFIG_DICT_KLAP
     assert mock_config_entry.data[CONF_HOST] == IP_ADDRESS
 
 
@@ -1214,15 +1291,20 @@ async def test_discovery_timeout_connect(
 
 async def test_reauth_update_other_flows(
     hass: HomeAssistant,
-    mock_config_entry: MockConfigEntry,
     mock_discovery: AsyncMock,
     mock_connect: AsyncMock,
 ) -> None:
     """Test reauth updates other reauth flows."""
+    mock_config_entry = MockConfigEntry(
+        title="TPLink",
+        domain=DOMAIN,
+        data={**CREATE_ENTRY_DATA_KLAP},
+        unique_id=MAC_ADDRESS,
+    )
     mock_config_entry2 = MockConfigEntry(
         title="TPLink",
         domain=DOMAIN,
-        data={**CREATE_ENTRY_DATA_AUTH2},
+        data={**CREATE_ENTRY_DATA_AES},
         unique_id=MAC_ADDRESS2,
     )
     default_side_effect = mock_connect["connect"].side_effect
@@ -1244,7 +1326,7 @@ async def test_reauth_update_other_flows(
     flows_by_entry_id = {flow["context"]["entry_id"]: flow for flow in flows}
     result = flows_by_entry_id[mock_config_entry.entry_id]
     assert result["step_id"] == "reauth_confirm"
-    assert mock_config_entry.data[CONF_DEVICE_CONFIG] == DEVICE_CONFIG_DICT_LEGACY
+    assert mock_config_entry.data[CONF_DEVICE_CONFIG] == DEVICE_CONFIG_DICT_KLAP
     result2 = await hass.config_entries.flow.async_configure(
         result["flow_id"],
         user_input={

tests/components/tplink/test_init.py

@@ -33,9 +33,9 @@ from homeassistant.setup import async_setup_component
 from homeassistant.util import dt as dt_util
 
 from . import (
-    CREATE_ENTRY_DATA_AUTH,
+    CREATE_ENTRY_DATA_KLAP,
     CREATE_ENTRY_DATA_LEGACY,
-    DEVICE_CONFIG_AUTH,
+    DEVICE_CONFIG_KLAP,
     DEVICE_ID,
     DEVICE_ID_MAC,
     IP_ADDRESS,
@@ -178,7 +178,7 @@ async def test_config_entry_device_config(
     mock_config_entry = MockConfigEntry(
         title="TPLink",
         domain=DOMAIN,
-        data={**CREATE_ENTRY_DATA_AUTH},
+        data={**CREATE_ENTRY_DATA_KLAP},
         unique_id=MAC_ADDRESS,
     )
     mock_config_entry.add_to_hass(hass)
@@ -197,7 +197,7 @@ async def test_config_entry_with_stored_credentials(
     mock_config_entry = MockConfigEntry(
         title="TPLink",
         domain=DOMAIN,
-        data={**CREATE_ENTRY_DATA_AUTH},
+        data={**CREATE_ENTRY_DATA_KLAP},
         unique_id=MAC_ADDRESS,
     )
     auth = {
@@ -210,7 +210,7 @@ async def test_config_entry_with_stored_credentials(
     await hass.config_entries.async_setup(mock_config_entry.entry_id)
     await hass.async_block_till_done()
     assert mock_config_entry.state is ConfigEntryState.LOADED
-    config = DEVICE_CONFIG_AUTH
+    config = DEVICE_CONFIG_KLAP
     assert config.credentials != stored_credentials
     config.credentials = stored_credentials
     mock_connect["connect"].assert_called_once_with(config=config)
@@ -223,7 +223,7 @@ async def test_config_entry_device_config_invalid(
     caplog: pytest.LogCaptureFixture,
 ) -> None:
     """Test that an invalid device config logs an error and loads the config entry."""
-    entry_data = copy.deepcopy(CREATE_ENTRY_DATA_AUTH)
+    entry_data = copy.deepcopy(CREATE_ENTRY_DATA_KLAP)
     entry_data[CONF_DEVICE_CONFIG] = {"foo": "bar"}
     mock_config_entry = MockConfigEntry(
         title="TPLink",
@@ -263,7 +263,7 @@ async def test_config_entry_errors(
     mock_config_entry = MockConfigEntry(
         title="TPLink",
         domain=DOMAIN,
-        data={**CREATE_ENTRY_DATA_AUTH},
+        data={**CREATE_ENTRY_DATA_KLAP},
         unique_id=MAC_ADDRESS,
     )
     mock_config_entry.add_to_hass(hass)
@@ -520,11 +520,11 @@ async def test_move_credentials_hash(
     from the device.
     """
     device_config = {
-        **DEVICE_CONFIG_AUTH.to_dict(
+        **DEVICE_CONFIG_KLAP.to_dict(
             exclude_credentials=True, credentials_hash="theHash"
         )
     }
-    entry_data = {**CREATE_ENTRY_DATA_AUTH, CONF_DEVICE_CONFIG: device_config}
+    entry_data = {**CREATE_ENTRY_DATA_KLAP, CONF_DEVICE_CONFIG: device_config}
 
     entry = MockConfigEntry(
         title="TPLink",
@@ -567,11 +567,11 @@ async def test_move_credentials_hash_auth_error(
     in async_setup_entry.
     """
     device_config = {
-        **DEVICE_CONFIG_AUTH.to_dict(
+        **DEVICE_CONFIG_KLAP.to_dict(
             exclude_credentials=True, credentials_hash="theHash"
         )
     }
-    entry_data = {**CREATE_ENTRY_DATA_AUTH, CONF_DEVICE_CONFIG: device_config}
+    entry_data = {**CREATE_ENTRY_DATA_KLAP, CONF_DEVICE_CONFIG: device_config}
 
     entry = MockConfigEntry(
         title="TPLink",
@@ -610,11 +610,11 @@ async def test_move_credentials_hash_other_error(
     at the end of the test.
     """
     device_config = {
-        **DEVICE_CONFIG_AUTH.to_dict(
+        **DEVICE_CONFIG_KLAP.to_dict(
             exclude_credentials=True, credentials_hash="theHash"
         )
     }
-    entry_data = {**CREATE_ENTRY_DATA_AUTH, CONF_DEVICE_CONFIG: device_config}
+    entry_data = {**CREATE_ENTRY_DATA_KLAP, CONF_DEVICE_CONFIG: device_config}
 
     entry = MockConfigEntry(
         title="TPLink",
@@ -647,9 +647,9 @@ async def test_credentials_hash(
     hass: HomeAssistant,
 ) -> None:
     """Test credentials_hash used to call connect."""
-    device_config = {**DEVICE_CONFIG_AUTH.to_dict(exclude_credentials=True)}
+    device_config = {**DEVICE_CONFIG_KLAP.to_dict(exclude_credentials=True)}
     entry_data = {
-        **CREATE_ENTRY_DATA_AUTH,
+        **CREATE_ENTRY_DATA_KLAP,
         CONF_DEVICE_CONFIG: device_config,
         CONF_CREDENTIALS_HASH: "theHash",
     }
@@ -684,9 +684,9 @@ async def test_credentials_hash_auth_error(
     hass: HomeAssistant,
 ) -> None:
     """Test credentials_hash is deleted after an auth failure."""
-    device_config = {**DEVICE_CONFIG_AUTH.to_dict(exclude_credentials=True)}
+    device_config = {**DEVICE_CONFIG_KLAP.to_dict(exclude_credentials=True)}
     entry_data = {
-        **CREATE_ENTRY_DATA_AUTH,
+        **CREATE_ENTRY_DATA_KLAP,
         CONF_DEVICE_CONFIG: device_config,
         CONF_CREDENTIALS_HASH: "theHash",
     }
@@ -710,7 +710,7 @@ async def test_credentials_hash_auth_error(
         await hass.async_block_till_done()
 
     expected_config = DeviceConfig.from_dict(
-        DEVICE_CONFIG_AUTH.to_dict(exclude_credentials=True, credentials_hash="theHash")
+        DEVICE_CONFIG_KLAP.to_dict(exclude_credentials=True, credentials_hash="theHash")
     )
     connect_mock.assert_called_with(config=expected_config)
     assert entry.state is ConfigEntryState.SETUP_ERROR

tests/components/tplink/test_light.py

@@ -533,16 +533,16 @@ async def test_smart_strip_effects(hass: HomeAssistant) -> None:
     assert state.attributes[ATTR_EFFECT_LIST] == ["Off", "Effect1", "Effect2"]
 
     # Ensure setting color temp when an effect
-    # is in progress calls set_hsv to clear the effect
+    # is in progress calls set_effect to clear the effect
     await hass.services.async_call(
         LIGHT_DOMAIN,
         "turn_on",
         {ATTR_ENTITY_ID: entity_id, ATTR_COLOR_TEMP_KELVIN: 4000},
         blocking=True,
     )
-    light.set_hsv.assert_called_once_with(0, 0, None)
+    light_effect.set_effect.assert_called_once_with(LightEffect.LIGHT_EFFECTS_OFF)
     light.set_color_temp.assert_called_once_with(4000, brightness=None, transition=None)
-    light.set_hsv.reset_mock()
+    light_effect.set_effect.reset_mock()
     light.set_color_temp.reset_mock()
 
     await hass.services.async_call(

tests/components/unifi/test_button.py

@@ -1,9 +1,11 @@
 """UniFi Network button platform tests."""
 
+from copy import deepcopy
 from datetime import timedelta
 from typing import Any
 from unittest.mock import patch
 
+from aiounifi.models.message import MessageKey
 import pytest
 
 from homeassistant.components.button import DOMAIN as BUTTON_DOMAIN, ButtonDeviceClass
@@ -319,3 +321,33 @@ async def test_wlan_button_entities(
         request_data,
         call,
     )
+
+
+@pytest.mark.parametrize("device_payload", [DEVICE_POWER_CYCLE_POE])
+@pytest.mark.usefixtures("config_entry_setup")
+async def test_power_cycle_availability(
+    hass: HomeAssistant,
+    mock_websocket_message,
+    device_payload: dict[str, Any],
+) -> None:
+    """Verify that disabling PoE marks entity as unavailable."""
+    entity_id = "button.switch_port_1_power_cycle"
+
+    assert hass.states.get(entity_id).state != STATE_UNAVAILABLE
+
+    # PoE disabled
+
+    device_1 = deepcopy(device_payload[0])
+    device_1["port_table"][0]["poe_enable"] = False
+    mock_websocket_message(message=MessageKey.DEVICE, data=device_1)
+    await hass.async_block_till_done()
+
+    assert hass.states.get(entity_id).state == STATE_UNAVAILABLE
+
+    # PoE enabled
+    device_1 = deepcopy(device_payload[0])
+    device_1["port_table"][0]["poe_enable"] = True
+    mock_websocket_message(message=MessageKey.DEVICE, data=device_1)
+    await hass.async_block_till_done()
+
+    assert hass.states.get(entity_id).state != STATE_UNAVAILABLE

tests/components/unifi/test_config_flow.py

@@ -1,5 +1,6 @@
 """Test UniFi Network config flow."""
 
+from collections.abc import Callable
 import socket
 from unittest.mock import PropertyMock, patch
 
@@ -338,6 +339,44 @@ async def test_reauth_flow_update_configuration(
     assert config_entry.data[CONF_PASSWORD] == "new_pass"
 
 
+async def test_reauth_flow_update_configuration_on_not_loaded_entry(
+    hass: HomeAssistant, config_entry_factory: Callable[[], ConfigEntry]
+) -> None:
+    """Verify reauth flow can update hub configuration on a not loaded entry."""
+    with patch("aiounifi.Controller.login", side_effect=aiounifi.errors.RequestError):
+        config_entry = await config_entry_factory()
+
+    result = await hass.config_entries.flow.async_init(
+        UNIFI_DOMAIN,
+        context={
+            "source": SOURCE_REAUTH,
+            "unique_id": config_entry.unique_id,
+            "entry_id": config_entry.entry_id,
+        },
+        data=config_entry.data,
+    )
+
+    assert result["type"] is FlowResultType.FORM
+    assert result["step_id"] == "user"
+
+    result = await hass.config_entries.flow.async_configure(
+        result["flow_id"],
+        user_input={
+            CONF_HOST: "1.2.3.4",
+            CONF_USERNAME: "new_name",
+            CONF_PASSWORD: "new_pass",
+            CONF_PORT: 1234,
+            CONF_VERIFY_SSL: True,
+        },
+    )
+
+    assert result["type"] is FlowResultType.ABORT
+    assert result["reason"] == "reauth_successful"
+    assert config_entry.data[CONF_HOST] == "1.2.3.4"
+    assert config_entry.data[CONF_USERNAME] == "new_name"
+    assert config_entry.data[CONF_PASSWORD] == "new_pass"
+
+
 @pytest.mark.parametrize("client_payload", [CLIENTS])
 @pytest.mark.parametrize("device_payload", [DEVICES])
 @pytest.mark.parametrize("wlan_payload", [WLANS])

tests/components/upb/test_config_flow.py

@@ -1,7 +1,7 @@
 """Test the UPB Control config flow."""
 
 from asyncio import TimeoutError
-from unittest.mock import MagicMock, PropertyMock, patch
+from unittest.mock import AsyncMock, PropertyMock, patch
 
 from homeassistant import config_entries
 from homeassistant.components.upb.const import DOMAIN
@@ -15,11 +15,11 @@ def mocked_upb(sync_complete=True, config_ok=True):
     def _upb_lib_connect(callback):
         callback()
 
-    upb_mock = MagicMock()
+    upb_mock = AsyncMock()
     type(upb_mock).network_id = PropertyMock(return_value="42")
     type(upb_mock).config_ok = PropertyMock(return_value=config_ok)
     if sync_complete:
-        upb_mock.connect.side_effect = _upb_lib_connect
+        upb_mock.async_connect.side_effect = _upb_lib_connect
     return patch(
         "homeassistant.components.upb.config_flow.upb_lib.UpbPim", return_value=upb_mock
     )