2023.2.3 (#87652)

* Do not return cached values for state and brightness

* Move building the uncached state dict behind a lru_cache (_build_entity_state_dict)

---------

Co-authored-by: J. Nick Koston <nick@koston.org>

.pre-commit-config.yaml

@@ -20,7 +20,7 @@ repos:
           - --remove-all-unused-imports
         stages: [manual]
   - repo: https://github.com/psf/black
-    rev: 22.12.0
+    rev: 23.1.0
     hooks:
       - id: black
         args:
@@ -60,7 +60,7 @@ repos:
           - --configfile=tests/bandit.yaml
         files: ^(homeassistant|script|tests)/.+\.py$
   - repo: https://github.com/PyCQA/isort
-    rev: 5.11.4
+    rev: 5.12.0
     hooks:
       - id: isort
   - repo: https://github.com/pre-commit/pre-commit-hooks

homeassistant/bootstrap.py

@@ -406,7 +406,6 @@ def async_enable_logging(
     if (err_path_exists and os.access(err_log_path, os.W_OK)) or (
         not err_path_exists and os.access(err_dir, os.W_OK)
     ):
-
         err_handler: (
             logging.handlers.RotatingFileHandler
             | logging.handlers.TimedRotatingFileHandler

homeassistant/components/abode/manifest.json

@@ -3,7 +3,7 @@
   "name": "Abode",
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/abode",
-  "requirements": ["jaraco.abode==3.2.1"],
+  "requirements": ["jaraco.abode==3.3.0"],
   "codeowners": ["@shred86"],
   "homekit": {
     "models": ["Abode", "Iota"]

homeassistant/components/adax/__init__.py

@@ -24,7 +24,6 @@ async def async_migrate_entry(hass: HomeAssistant, config_entry: ConfigEntry) ->
     # convert title and unique_id to string
     if config_entry.version == 1:
         if isinstance(config_entry.unique_id, int):
-
             hass.config_entries.async_update_entry(
                 config_entry,
                 unique_id=str(config_entry.unique_id),

homeassistant/components/aladdin_connect/config_flow.py

@@ -88,7 +88,6 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
                 errors["base"] = "cannot_connect"
 
             else:
-
                 self.hass.config_entries.async_update_entry(
                     self.entry,
                     data={

homeassistant/components/aladdin_connect/manifest.json

@@ -2,7 +2,7 @@
   "domain": "aladdin_connect",
   "name": "Aladdin Connect",
   "documentation": "https://www.home-assistant.io/integrations/aladdin_connect",
-  "requirements": ["AIOAladdinConnect==0.1.53"],
+  "requirements": ["AIOAladdinConnect==0.1.55"],
   "codeowners": ["@mkmer"],
   "iot_class": "cloud_polling",
   "loggers": ["aladdin_connect"],

homeassistant/components/alert/__init__.py

@@ -270,7 +270,6 @@ class Alert(Entity):
         await self._send_notification_message(message)
 
     async def _send_notification_message(self, message: Any) -> None:
-
         if not self._notifiers:
             return
 

homeassistant/components/alexa/auth.py

@@ -103,7 +103,6 @@ class Auth:
         return dt.utcnow() < preemptive_expire_time
 
     async def _async_request_new_token(self, lwa_params):
-
         try:
             session = aiohttp_client.async_get_clientsession(self.hass)
             async with async_timeout.timeout(10):

homeassistant/components/alexa/intent.py

@@ -193,7 +193,6 @@ def resolve_slot_synonyms(key, request):
         and "resolutionsPerAuthority" in request["resolutions"]
         and len(request["resolutions"]["resolutionsPerAuthority"]) >= 1
     ):
-
         # Extract all of the possible values from each authority with a
         # successful match
         possible_values = []

homeassistant/components/asuswrt/router.py

@@ -274,7 +274,6 @@ class AsusWrtRouter:
             entity_reg, self._entry.entry_id
         )
         for entry in track_entries:
-
             if entry.domain != TRACKER_DOMAIN:
                 continue
             device_mac = format_mac(entry.unique_id)

homeassistant/components/aussie_broadband/sensor.py

@@ -78,6 +78,7 @@ SENSOR_DESCRIPTIONS: tuple[SensorValueEntityDescription, ...] = (
         entity_registry_enabled_default=False,
         state_class=SensorStateClass.TOTAL_INCREASING,
         icon="mdi:phone-plus",
+        value=lambda x: x.get("calls"),
     ),
     SensorValueEntityDescription(
         key="sms",
@@ -101,6 +102,7 @@ SENSOR_DESCRIPTIONS: tuple[SensorValueEntityDescription, ...] = (
         entity_registry_enabled_default=False,
         state_class=SensorStateClass.TOTAL_INCREASING,
         icon="mdi:phone",
+        value=lambda x: x.get("calls"),
     ),
     SensorValueEntityDescription(
         key="other",
@@ -108,6 +110,7 @@ SENSOR_DESCRIPTIONS: tuple[SensorValueEntityDescription, ...] = (
         entity_registry_enabled_default=False,
         state_class=SensorStateClass.TOTAL_INCREASING,
         icon="mdi:phone",
+        value=lambda x: x.get("calls"),
     ),
     # Generic sensors
     SensorValueEntityDescription(

homeassistant/components/axis/binary_sensor.py

@@ -112,7 +112,6 @@ class AxisBinarySensor(AxisEventEntity, BinarySensorEntity):
             self._attr_name = self.device.api.vapix.ports[event.id].name
 
         elif event.group == EventGroup.MOTION:
-
             for event_topic, event_data in (
                 (EventTopic.FENCE_GUARD, self.device.api.vapix.fence_guard),
                 (EventTopic.LOITERING_GUARD, self.device.api.vapix.loitering_guard),
@@ -120,7 +119,6 @@ class AxisBinarySensor(AxisEventEntity, BinarySensorEntity):
                 (EventTopic.OBJECT_ANALYTICS, self.device.api.vapix.object_analytics),
                 (EventTopic.MOTION_DETECTION_4, self.device.api.vapix.vmd4),
             ):
-
                 if (
                     event.topic_base == event_topic
                     and event_data

homeassistant/components/bayesian/binary_sensor.py

@@ -399,7 +399,6 @@ class BayesianBinarySensor(BinarySensorEntity):
 
         observations_by_entity: dict[str, list[Observation]] = {}
         for observation in self._observations:
-
             if (key := observation.entity_id) is None:
                 continue
             observations_by_entity.setdefault(key, []).append(observation)

homeassistant/components/bluemaestro/manifest.json

@@ -9,7 +9,7 @@
       "connectable": false
     }
   ],
-  "requirements": ["bluemaestro-ble==0.2.1"],
+  "requirements": ["bluemaestro-ble==0.2.3"],
   "dependencies": ["bluetooth_adapters"],
   "codeowners": ["@bdraco"],
   "iot_class": "local_push"

homeassistant/components/bluesound/media_player.py

@@ -396,7 +396,6 @@ class BluesoundPlayer(MediaPlayerEntity):
         _LOGGER.debug("Calling URL: %s", url)
 
         try:
-
             async with async_timeout.timeout(125):
                 response = await self._polling_session.get(
                     url, headers={CONNECTION: KEEP_ALIVE}

homeassistant/components/bluetooth/models.py

@@ -12,7 +12,6 @@ from home_assistant_bluetooth import BluetoothServiceInfoBleak
 from homeassistant.util.dt import monotonic_time_coarse
 
 if TYPE_CHECKING:
-
     from .manager import BluetoothManager
 
 

homeassistant/components/bmw_connected_drive/manifest.json

@@ -2,7 +2,7 @@
   "domain": "bmw_connected_drive",
   "name": "BMW Connected Drive",
   "documentation": "https://www.home-assistant.io/integrations/bmw_connected_drive",
-  "requirements": ["bimmer_connected==0.12.0"],
+  "requirements": ["bimmer_connected==0.12.1"],
   "codeowners": ["@gerard33", "@rikroe"],
   "config_flow": true,
   "iot_class": "cloud_polling",

homeassistant/components/bosch_shc/switch.py

@@ -95,7 +95,6 @@ async def async_setup_entry(
     session: SHCSession = hass.data[DOMAIN][config_entry.entry_id][DATA_SESSION]
 
     for switch in session.device_helper.smart_plugs:
-
         entities.append(
             SHCSwitch(
                 device=switch,
@@ -113,7 +112,6 @@ async def async_setup_entry(
         )
 
     for switch in session.device_helper.light_switches:
-
         entities.append(
             SHCSwitch(
                 device=switch,
@@ -124,7 +122,6 @@ async def async_setup_entry(
         )
 
     for switch in session.device_helper.smart_plugs_compact:
-
         entities.append(
             SHCSwitch(
                 device=switch,
@@ -135,7 +132,6 @@ async def async_setup_entry(
         )
 
     for switch in session.device_helper.camera_eyes:
-
         entities.append(
             SHCSwitch(
                 device=switch,
@@ -146,7 +142,6 @@ async def async_setup_entry(
         )
 
     for switch in session.device_helper.camera_360:
-
         entities.append(
             SHCSwitch(
                 device=switch,

homeassistant/components/braviatv/coordinator.py

@@ -171,7 +171,7 @@ class BraviaTVCoordinator(DataUpdateCoordinator[None]):
     async def async_update_volume(self) -> None:
         """Update volume information."""
         volume_info = await self.client.get_volume_info()
-        if volume_level := volume_info.get("volume"):
+        if (volume_level := volume_info.get("volume")) is not None:
             self.volume_level = volume_level / 100
             self.volume_muted = volume_info.get("mute", False)
             self.volume_target = volume_info.get("target")

homeassistant/components/bthome/sensor.py

@@ -231,7 +231,10 @@ SENSOR_DESCRIPTIONS = {
         state_class=SensorStateClass.MEASUREMENT,
     ),
     # UV index (-)
-    (BTHomeSensorDeviceClass.UV_INDEX, None,): SensorEntityDescription(
+    (
+        BTHomeSensorDeviceClass.UV_INDEX,
+        None,
+    ): SensorEntityDescription(
         key=f"{BTHomeSensorDeviceClass.UV_INDEX}",
         state_class=SensorStateClass.MEASUREMENT,
     ),
@@ -256,7 +259,10 @@ SENSOR_DESCRIPTIONS = {
         state_class=SensorStateClass.MEASUREMENT,
     ),
     # Volume (L)
-    (BTHomeSensorDeviceClass.VOLUME, Units.VOLUME_LITERS,): SensorEntityDescription(
+    (
+        BTHomeSensorDeviceClass.VOLUME,
+        Units.VOLUME_LITERS,
+    ): SensorEntityDescription(
         key=f"{BTHomeSensorDeviceClass.VOLUME}_{Units.VOLUME_LITERS}",
         device_class=SensorDeviceClass.VOLUME,
         native_unit_of_measurement=UnitOfVolume.LITERS,

homeassistant/components/buienradar/sensor.py

@@ -735,7 +735,6 @@ class BrSensor(SensorEntity):
             or sensor_type.endswith("_4d")
             or sensor_type.endswith("_5d")
         ):
-
             # update forecasting sensors:
             fcday = 0
             if sensor_type.endswith("_2d"):

homeassistant/components/control4/config_flow.py

@@ -96,7 +96,6 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
         """Handle the initial step."""
         errors = {}
         if user_input is not None:
-
             hub = Control4Validator(
                 user_input[CONF_HOST],
                 user_input[CONF_USERNAME],

homeassistant/components/conversation/default_agent.py

@@ -403,16 +403,20 @@ class DefaultAgent(AbstractConversationAgent):
 
             entity = entities.async_get(state.entity_id)
             if entity is not None:
-                if entity.entity_category:
-                    # Skip configuration/diagnostic entities
+                if entity.entity_category or entity.hidden:
+                    # Skip configuration/diagnostic/hidden entities
                     continue
 
                 if entity.aliases:
                     for alias in entity.aliases:
                         names.append((alias, state.entity_id, context))
 
-            # Default name
-            names.append((state.name, state.entity_id, context))
+                # Default name
+                names.append((state.name, state.entity_id, context))
+
+            else:
+                # Default name
+                names.append((state.name, state.entity_id, context))
 
         self._names_list = TextSlotList.from_tuples(names, allow_template=False)
         return self._names_list

homeassistant/components/darksky/weather.py

@@ -188,6 +188,7 @@ class DarkSkyWeather(WeatherEntity):
     @property
     def forecast(self):
         """Return the forecast array."""
+
         # Per conversation with Joshua Reyes of Dark Sky, to get the total
         # forecasted precipitation, you have to multiple the intensity by
         # the hours for the forecast interval

homeassistant/components/deconz/binary_sensor.py

@@ -271,7 +271,6 @@ class DeconzBinarySensor(DeconzDevice[SensorResources], BinarySensorEntity):
             attr[ATTR_TEMPERATURE] = self._device.internal_temperature
 
         if isinstance(self._device, Presence):
-
             if self._device.dark is not None:
                 attr[ATTR_DARK] = self._device.dark
 

homeassistant/components/deconz/config_flow.py

@@ -87,7 +87,6 @@ class DeconzFlowHandler(ConfigFlow, domain=DOMAIN):
         If no bridge is found allow user to manually input configuration.
         """
         if user_input is not None:
-
             if CONF_MANUAL_INPUT == user_input[CONF_HOST]:
                 return await self.async_step_manual_input()
 

homeassistant/components/deconz/sensor.py

@@ -372,7 +372,6 @@ class DeconzSensor(DeconzDevice[SensorResources], SensorEntity):
             attr[ATTR_DAYLIGHT] = self._device.daylight
 
         elif isinstance(self._device, LightLevel):
-
             if self._device.dark is not None:
                 attr[ATTR_DARK] = self._device.dark
 

homeassistant/components/deconz/services.py

@@ -186,10 +186,8 @@ async def async_remove_orphaned_entries_service(gateway: DeconzGateway) -> None:
             devices_to_be_removed.remove(event.device_id)
 
     for entry in entity_entries:
-
         # Don't remove available entities
         if entry.unique_id in gateway.entities[entry.domain]:
-
             # Don't remove devices with available entities
             if entry.device_id in devices_to_be_removed:
                 devices_to_be_removed.remove(entry.device_id)

homeassistant/components/delijn/sensor.py

@@ -121,6 +121,6 @@ class DeLijnPublicTransportSensor(SensorEntity):
             self._attr_extra_state_attributes["next_passages"] = self.line.passages
 
             self._attr_available = True
-        except (KeyError) as error:
+        except KeyError as error:
             _LOGGER.error("Invalid data received from De Lijn: %s", error)
             self._attr_available = False

homeassistant/components/derivative/sensor.py

@@ -245,7 +245,7 @@ class DerivativeSensor(RestoreEntity, SensorEntity):
                 derivative = new_derivative
             else:
                 derivative = Decimal(0)
-                for (start, end, value) in self._state_list:
+                for start, end, value in self._state_list:
                     weight = calculate_weight(start, end, new_state.last_updated)
                     derivative = derivative + (value * Decimal(weight))
 

homeassistant/components/device_sun_light_trigger/__init__.py

@@ -214,7 +214,6 @@ async def activate_automation(  # noqa: C901
         elif start_point and start_point < now < get_astral_event_next(
             hass, SUN_EVENT_SUNSET
         ):
-
             # Check for every light if it would be on if someone was home
             # when the fading in started and turn it on if so
             for index, light_id in enumerate(light_ids):

homeassistant/components/dnsip/config_flow.py

@@ -93,7 +93,6 @@ class DnsIPConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
         errors = {}
 
         if user_input:
-
             hostname = user_input[CONF_HOSTNAME]
             name = DEFAULT_NAME if hostname == DEFAULT_HOSTNAME else hostname
             resolver = user_input.get(CONF_RESOLVER, DEFAULT_RESOLVER)

homeassistant/components/doods/image_processing.py

@@ -255,7 +255,6 @@ class Doods(ImageProcessingEntity):
             )
 
         for label, values in matches.items():
-
             # Draw custom label regions/areas
             if label in self._label_areas and self._label_areas[label] != [0, 0, 1, 1]:
                 box_label = f"{label.capitalize()} Detection Area"

homeassistant/components/ebusd/__init__.py

@@ -66,7 +66,6 @@ def setup(hass: HomeAssistant, config: ConfigType) -> bool:
     server_address = (conf.get(CONF_HOST), conf.get(CONF_PORT))
 
     try:
-
         ebusdpy.init(server_address)
         hass.data[DOMAIN] = EbusdData(server_address, circuit)
 

homeassistant/components/ecovacs/vacuum.py

@@ -160,7 +160,6 @@ class EcovacsVacuum(VacuumEntity):
     def set_fan_speed(self, fan_speed: str, **kwargs: Any) -> None:
         """Set fan speed."""
         if self.is_on:
-
             self.device.run(sucks.Clean(mode=self.device.clean_status, speed=fan_speed))
 
     def send_command(

homeassistant/components/elv/switch.py

@@ -87,7 +87,7 @@ class SmartPlugSwitch(SwitchEntity):
             self._state = self._pca.get_state(self._device_id)
             self._available = True
 
-        except (OSError) as ex:
+        except OSError as ex:
             if self._available:
                 _LOGGER.warning("Could not read state for %s: %s", self.name, ex)
                 self._available = False

homeassistant/components/emoncms/sensor.py

@@ -106,7 +106,6 @@ def setup_platform(
     sensors = []
 
     for elem in data.data:
-
         if exclude_feeds is not None and int(elem["id"]) in exclude_feeds:
             continue
 

homeassistant/components/emulated_hue/hue_api.py

@@ -379,7 +379,7 @@ class HueOneLightChangeView(HomeAssistantView):
         else:
             parsed[STATE_ON] = entity.state != STATE_OFF
 
-        for (key, attr) in (
+        for key, attr in (
             (HUE_API_STATE_BRI, STATE_BRIGHTNESS),
             (HUE_API_STATE_HUE, STATE_HUE),
             (HUE_API_STATE_SAT, STATE_SATURATION),
@@ -587,7 +587,7 @@ class HueOneLightChangeView(HomeAssistantView):
             )
         ]
 
-        for (key, val) in (
+        for key, val in (
             (STATE_BRIGHTNESS, HUE_API_STATE_BRI),
             (STATE_HUE, HUE_API_STATE_HUE),
             (STATE_SATURATION, HUE_API_STATE_SAT),
@@ -634,78 +634,88 @@ def get_entity_state_dict(config: Config, entity: State) -> dict[str, Any]:
             # Remove the now stale cached entry.
             config.cached_states.pop(entity.entity_id)
 
+    if cached_state is None:
+        return _build_entity_state_dict(entity)
+
+    data: dict[str, Any] = cached_state
+    # Make sure brightness is valid
+    if data[STATE_BRIGHTNESS] is None:
+        data[STATE_BRIGHTNESS] = HUE_API_STATE_BRI_MAX if data[STATE_ON] else 0
+
+    # Make sure hue/saturation are valid
+    if (data[STATE_HUE] is None) or (data[STATE_SATURATION] is None):
+        data[STATE_HUE] = 0
+        data[STATE_SATURATION] = 0
+
+    # If the light is off, set the color to off
+    if data[STATE_BRIGHTNESS] == 0:
+        data[STATE_HUE] = 0
+        data[STATE_SATURATION] = 0
+
+    _clamp_values(data)
+    return data
+
+
+@lru_cache(maxsize=512)
+def _build_entity_state_dict(entity: State) -> dict[str, Any]:
+    """Build a state dict for an entity."""
     data: dict[str, Any] = {
-        STATE_ON: False,
+        STATE_ON: entity.state != STATE_OFF,
         STATE_BRIGHTNESS: None,
         STATE_HUE: None,
         STATE_SATURATION: None,
         STATE_COLOR_TEMP: None,
     }
-
-    if cached_state is None:
-        data[STATE_ON] = entity.state != STATE_OFF
-
-        if data[STATE_ON]:
-            data[STATE_BRIGHTNESS] = hass_to_hue_brightness(
-                entity.attributes.get(ATTR_BRIGHTNESS, 0)
-            )
-            hue_sat = entity.attributes.get(ATTR_HS_COLOR)
-            if hue_sat is not None:
-                hue = hue_sat[0]
-                sat = hue_sat[1]
-                # Convert hass hs values back to hue hs values
-                data[STATE_HUE] = int((hue / 360.0) * HUE_API_STATE_HUE_MAX)
-                data[STATE_SATURATION] = int((sat / 100.0) * HUE_API_STATE_SAT_MAX)
-            else:
-                data[STATE_HUE] = HUE_API_STATE_HUE_MIN
-                data[STATE_SATURATION] = HUE_API_STATE_SAT_MIN
-            data[STATE_COLOR_TEMP] = entity.attributes.get(ATTR_COLOR_TEMP, 0)
-
+    if data[STATE_ON]:
+        data[STATE_BRIGHTNESS] = hass_to_hue_brightness(
+            entity.attributes.get(ATTR_BRIGHTNESS, 0)
+        )
+        hue_sat = entity.attributes.get(ATTR_HS_COLOR)
+        if hue_sat is not None:
+            hue = hue_sat[0]
+            sat = hue_sat[1]
+            # Convert hass hs values back to hue hs values
+            data[STATE_HUE] = int((hue / 360.0) * HUE_API_STATE_HUE_MAX)
+            data[STATE_SATURATION] = int((sat / 100.0) * HUE_API_STATE_SAT_MAX)
         else:
-            data[STATE_BRIGHTNESS] = 0
-            data[STATE_HUE] = 0
-            data[STATE_SATURATION] = 0
-            data[STATE_COLOR_TEMP] = 0
+            data[STATE_HUE] = HUE_API_STATE_HUE_MIN
+            data[STATE_SATURATION] = HUE_API_STATE_SAT_MIN
+        data[STATE_COLOR_TEMP] = entity.attributes.get(ATTR_COLOR_TEMP, 0)
 
-        if entity.domain == climate.DOMAIN:
-            temperature = entity.attributes.get(ATTR_TEMPERATURE, 0)
-            # Convert 0-100 to 0-254
-            data[STATE_BRIGHTNESS] = round(temperature * HUE_API_STATE_BRI_MAX / 100)
-        elif entity.domain == humidifier.DOMAIN:
-            humidity = entity.attributes.get(ATTR_HUMIDITY, 0)
-            # Convert 0-100 to 0-254
-            data[STATE_BRIGHTNESS] = round(humidity * HUE_API_STATE_BRI_MAX / 100)
-        elif entity.domain == media_player.DOMAIN:
-            level = entity.attributes.get(
-                ATTR_MEDIA_VOLUME_LEVEL, 1.0 if data[STATE_ON] else 0.0
-            )
-            # Convert 0.0-1.0 to 0-254
-            data[STATE_BRIGHTNESS] = round(min(1.0, level) * HUE_API_STATE_BRI_MAX)
-        elif entity.domain == fan.DOMAIN:
-            percentage = entity.attributes.get(ATTR_PERCENTAGE) or 0
-            # Convert 0-100 to 0-254
-            data[STATE_BRIGHTNESS] = round(percentage * HUE_API_STATE_BRI_MAX / 100)
-        elif entity.domain == cover.DOMAIN:
-            level = entity.attributes.get(ATTR_CURRENT_POSITION, 0)
-            data[STATE_BRIGHTNESS] = round(level / 100 * HUE_API_STATE_BRI_MAX)
     else:
-        data = cached_state
-        # Make sure brightness is valid
-        if data[STATE_BRIGHTNESS] is None:
-            data[STATE_BRIGHTNESS] = HUE_API_STATE_BRI_MAX if data[STATE_ON] else 0
+        data[STATE_BRIGHTNESS] = 0
+        data[STATE_HUE] = 0
+        data[STATE_SATURATION] = 0
+        data[STATE_COLOR_TEMP] = 0
 
-        # Make sure hue/saturation are valid
-        if (data[STATE_HUE] is None) or (data[STATE_SATURATION] is None):
-            data[STATE_HUE] = 0
-            data[STATE_SATURATION] = 0
+    if entity.domain == climate.DOMAIN:
+        temperature = entity.attributes.get(ATTR_TEMPERATURE, 0)
+        # Convert 0-100 to 0-254
+        data[STATE_BRIGHTNESS] = round(temperature * HUE_API_STATE_BRI_MAX / 100)
+    elif entity.domain == humidifier.DOMAIN:
+        humidity = entity.attributes.get(ATTR_HUMIDITY, 0)
+        # Convert 0-100 to 0-254
+        data[STATE_BRIGHTNESS] = round(humidity * HUE_API_STATE_BRI_MAX / 100)
+    elif entity.domain == media_player.DOMAIN:
+        level = entity.attributes.get(
+            ATTR_MEDIA_VOLUME_LEVEL, 1.0 if data[STATE_ON] else 0.0
+        )
+        # Convert 0.0-1.0 to 0-254
+        data[STATE_BRIGHTNESS] = round(min(1.0, level) * HUE_API_STATE_BRI_MAX)
+    elif entity.domain == fan.DOMAIN:
+        percentage = entity.attributes.get(ATTR_PERCENTAGE) or 0
+        # Convert 0-100 to 0-254
+        data[STATE_BRIGHTNESS] = round(percentage * HUE_API_STATE_BRI_MAX / 100)
+    elif entity.domain == cover.DOMAIN:
+        level = entity.attributes.get(ATTR_CURRENT_POSITION, 0)
+        data[STATE_BRIGHTNESS] = round(level / 100 * HUE_API_STATE_BRI_MAX)
+    _clamp_values(data)
+    return data
 
-        # If the light is off, set the color to off
-        if data[STATE_BRIGHTNESS] == 0:
-            data[STATE_HUE] = 0
-            data[STATE_SATURATION] = 0
 
-    # Clamp brightness, hue, saturation, and color temp to valid values
-    for (key, v_min, v_max) in (
+def _clamp_values(data: dict[str, Any]) -> None:
+    """Clamp brightness, hue, saturation, and color temp to valid values."""
+    for key, v_min, v_max in (
         (STATE_BRIGHTNESS, HUE_API_STATE_BRI_MIN, HUE_API_STATE_BRI_MAX),
         (STATE_HUE, HUE_API_STATE_HUE_MIN, HUE_API_STATE_HUE_MAX),
         (STATE_SATURATION, HUE_API_STATE_SAT_MIN, HUE_API_STATE_SAT_MAX),
@@ -714,8 +724,6 @@ def get_entity_state_dict(config: Config, entity: State) -> dict[str, Any]:
         if data[key] is not None:
             data[key] = max(v_min, min(data[key], v_max))
 
-    return data
-
 
 @lru_cache(maxsize=1024)
 def _entity_unique_id(entity_id: str) -> str:
@@ -831,6 +839,7 @@ def create_hue_success_response(
 def create_config_model(config: Config, request: web.Request) -> dict[str, Any]:
     """Create a config resource."""
     return {
+        "name": "HASS BRIDGE",
         "mac": "00:00:00:00:00:00",
         "swversion": "01003542",
         "apiversion": "1.17.0",
@@ -842,10 +851,18 @@ def create_config_model(config: Config, request: web.Request) -> dict[str, Any]:
 
 def create_list_of_entities(config: Config, request: web.Request) -> dict[str, Any]:
     """Create a list of all entities."""
-    json_response: dict[str, Any] = {
-        config.entity_id_to_number(state.entity_id): state_to_json(config, state)
-        for state in config.get_exposed_states()
-    }
+    hass: core.HomeAssistant = request.app["hass"]
+
+    json_response: dict[str, Any] = {}
+    for cached_state in config.get_exposed_states():
+        entity_id = cached_state.entity_id
+        state = hass.states.get(entity_id)
+        assert state is not None
+
+        json_response[config.entity_id_to_number(entity_id)] = state_to_json(
+            config, state
+        )
+
     return json_response
 
 

homeassistant/components/enphase_envoy/const.py

@@ -33,7 +33,7 @@ SENSORS = (
         key="seven_days_production",
         name="Last Seven Days Energy Production",
         native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
-        state_class=SensorStateClass.TOTAL_INCREASING,
+        state_class=SensorStateClass.TOTAL,
         device_class=SensorDeviceClass.ENERGY,
     ),
     SensorEntityDescription(
@@ -61,7 +61,7 @@ SENSORS = (
         key="seven_days_consumption",
         name="Last Seven Days Energy Consumption",
         native_unit_of_measurement=UnitOfEnergy.WATT_HOUR,
-        state_class=SensorStateClass.TOTAL_INCREASING,
+        state_class=SensorStateClass.TOTAL,
         device_class=SensorDeviceClass.ENERGY,
     ),
     SensorEntityDescription(

homeassistant/components/environment_canada/manifest.json

@@ -2,7 +2,7 @@
   "domain": "environment_canada",
   "name": "Environment Canada",
   "documentation": "https://www.home-assistant.io/integrations/environment_canada",
-  "requirements": ["env_canada==0.5.27"],
+  "requirements": ["env_canada==0.5.28"],
   "codeowners": ["@gwww", "@michaeldavie"],
   "config_flow": true,
   "iot_class": "cloud_polling",

homeassistant/components/escea/config_flow.py

@@ -21,7 +21,6 @@ _LOGGER = logging.getLogger(__name__)
 
 
 async def _async_has_devices(hass: HomeAssistant) -> bool:
-
     controller_ready = asyncio.Event()
 
     @callback

homeassistant/components/ezviz/camera.py

@@ -66,7 +66,6 @@ async def async_setup_entry(
     camera_entities = []
 
     for camera, value in coordinator.data.items():
-
         camera_rtsp_entry = [
             item
             for item in hass.config_entries.async_entries(DOMAIN)
@@ -81,7 +80,6 @@ async def async_setup_entry(
         )
 
         if camera_rtsp_entry:
-
             ffmpeg_arguments = camera_rtsp_entry[0].options[CONF_FFMPEG_ARGUMENTS]
             camera_username = camera_rtsp_entry[0].data[CONF_USERNAME]
             camera_password = camera_rtsp_entry[0].data[CONF_PASSWORD]
@@ -96,7 +94,6 @@ async def async_setup_entry(
             )
 
         else:
-
             discovery_flow.async_create_flow(
                 hass,
                 DOMAIN,

homeassistant/components/ezviz/config_flow.py

@@ -182,7 +182,6 @@ class EzvizConfigFlow(ConfigFlow, domain=DOMAIN):
         errors = {}
 
         if user_input is not None:
-
             if user_input[CONF_URL] == CONF_CUSTOMIZE:
                 self.context["data"] = {
                     CONF_USERNAME: user_input[CONF_USERNAME],

homeassistant/components/faa_delays/config_flow.py

@@ -25,7 +25,6 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
         """Handle the initial step."""
         errors = {}
         if user_input is not None:
-
             await self.async_set_unique_id(user_input[CONF_ID])
             self._abort_if_unique_id_configured()
 

homeassistant/components/filesize/sensor.py

@@ -56,7 +56,6 @@ SENSOR_TYPES = (
         icon=ICON,
         name="Last Updated",
         device_class=SensorDeviceClass.TIMESTAMP,
-        state_class=SensorStateClass.MEASUREMENT,
         entity_category=EntityCategory.DIAGNOSTIC,
     ),
 )

homeassistant/components/filter/sensor.py

@@ -507,7 +507,6 @@ class RangeFilter(Filter, SensorEntity):
         new_state_value = cast(float, new_state.state)
 
         if self._upper_bound is not None and new_state_value > self._upper_bound:
-
             self._stats_internal["erasures_up"] += 1
 
             _LOGGER.debug(
@@ -519,7 +518,6 @@ class RangeFilter(Filter, SensorEntity):
             new_state.state = self._upper_bound
 
         elif self._lower_bound is not None and new_state_value < self._lower_bound:
-
             self._stats_internal["erasures_low"] += 1
 
             _LOGGER.debug(
@@ -564,7 +562,6 @@ class OutlierFilter(Filter, SensorEntity):
             len(self.states) == self.states.maxlen
             and abs(new_state_value - median) > self._radius
         ):
-
             self._stats_internal["erasures"] += 1
 
             _LOGGER.debug(

homeassistant/components/fints/sensor.py

@@ -208,7 +208,6 @@ class FinTsClient:
         holdings_accounts = []
 
         for account in self.client.get_sepa_accounts():
-
             if self.is_balance_account(account):
                 balance_accounts.append(account)
 

homeassistant/components/firmata/__init__.py

@@ -213,7 +213,7 @@ async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry) ->
     _LOGGER.debug("Closing Firmata board %s", config_entry.data[CONF_NAME])
 
     unload_entries = []
-    for (conf, platform) in CONF_PLATFORM_MAP.items():
+    for conf, platform in CONF_PLATFORM_MAP.items():
         if conf in config_entry.data:
             unload_entries.append(
                 hass.config_entries.async_forward_entry_unload(config_entry, platform)

homeassistant/components/fleetgo/device_tracker.py

@@ -86,7 +86,6 @@ class FleetGoDeviceScanner:
 
             for device in devices:
                 if not self._include or device.license_plate in self._include:
-
                     if device.active or device.current_address is None:
                         device.get_map_details()
 

homeassistant/components/flipr/__init__.py

@@ -74,7 +74,7 @@ class FliprDataUpdateCoordinator(DataUpdateCoordinator):
             data = await self.hass.async_add_executor_job(
                 self.client.get_pool_measure_latest, self.flipr_id
             )
-        except (FliprError) as error:
+        except FliprError as error:
             raise UpdateFailed(error) from error
 
         return data

homeassistant/components/flo/device.py

@@ -43,7 +43,7 @@ class FloDeviceDataUpdateCoordinator(DataUpdateCoordinator):
                 await self.send_presence_ping()
                 await self._update_device()
                 await self._update_consumption_data()
-        except (RequestError) as error:
+        except RequestError as error:
             raise UpdateFailed(error) from error
 
     @property

homeassistant/components/flume/sensor.py

@@ -97,7 +97,6 @@ async def async_setup_entry(
     ]
     flume_entity_list = []
     for device in flume_devices:
-
         device_id = device[KEY_DEVICE_ID]
         device_timezone = device[KEY_DEVICE_LOCATION][KEY_DEVICE_LOCATION_TIMEZONE]
         device_location_name = device[KEY_DEVICE_LOCATION][KEY_DEVICE_LOCATION_NAME]

homeassistant/components/fritz/switch.py

@@ -102,7 +102,6 @@ async def _async_port_entities_list(
     _LOGGER.debug("IP source for %s is %s", avm_wrapper.host, local_ip)
 
     for i in range(port_forwards_count):
-
         portmap = await avm_wrapper.async_get_port_mapping(
             avm_wrapper.device_conn_type, i
         )
@@ -406,7 +405,6 @@ class FritzBoxPortSwitch(FritzBoxBaseSwitch, SwitchEntity):
             self._attributes[attr] = self.port_mapping[key]
 
     async def _async_switch_on_off_executor(self, turn_on: bool) -> bool:
-
         if self.port_mapping is None:
             return False
 

homeassistant/components/frontend/manifest.json

@@ -2,7 +2,7 @@
   "domain": "frontend",
   "name": "Home Assistant Frontend",
   "documentation": "https://www.home-assistant.io/integrations/frontend",
-  "requirements": ["home-assistant-frontend==20230130.0"],
+  "requirements": ["home-assistant-frontend==20230202.0"],
   "dependencies": [
     "api",
     "auth",

homeassistant/components/glances/sensor.py

@@ -262,7 +262,6 @@ async def async_setup_entry(
         if entity_id := ent_reg.async_get_entity_id(
             Platform.SENSOR, DOMAIN, old_unique_id
         ):
-
             ent_reg.async_update_entity(
                 entity_id, new_unique_id=f"{config_entry.entry_id}-{new_key}"
             )

homeassistant/components/google_assistant/helpers.py

@@ -289,7 +289,6 @@ class AbstractConfig(ABC):
             return
 
         for user_agent_id, _ in self._store.agent_user_ids.items():
-
             if (webhook_id := self.get_local_webhook_id(user_agent_id)) is None:
                 setup_successful = False
                 break

homeassistant/components/group/sensor.py

@@ -244,7 +244,6 @@ class SensorGroup(GroupEntity, SensorEntity):
 
     _attr_available = False
     _attr_should_poll = False
-    _attr_icon = "mdi:calculator"
 
     def __init__(
         self,
@@ -352,6 +351,16 @@ class SensorGroup(GroupEntity, SensorEntity):
             return self._attr_device_class
         return self.calc_device_class
 
+    @property
+    def icon(self) -> str | None:
+        """Return the icon.
+
+        Only override the icon if the device class is not set.
+        """
+        if not self.device_class:
+            return "mdi:calculator"
+        return None
+
     @property
     def state_class(self) -> SensorStateClass | str | None:
         """Return state class."""

homeassistant/components/group/strings.json

@@ -68,7 +68,6 @@
       },
       "sensor": {
         "title": "[%key:component::group::config::step::user::title%]",
-        "description": "If \"ignore non-numeric\" is enabled, the group's state is calculated if at least one member has a numerical value. If \"ignore non-numeric\" is disabled, the group's state is calculated only if all group members have numerical values.",
         "data": {
           "ignore_non_numeric": "Ignore non-numeric",
           "entities": "Members",
@@ -134,7 +133,7 @@
         }
       },
       "sensor": {
-        "description": "[%key:component::group::config::step::sensor::description%]",
+        "description": "If \"ignore non-numeric\" is enabled, the group's state is calculated if at least one member has a numerical value. If \"ignore non-numeric\" is disabled, the group's state is calculated only if all group members have numerical values.",
         "data": {
           "ignore_non_numeric": "[%key:component::group::config::step::sensor::data::ignore_non_numeric%]",
           "entities": "[%key:component::group::config::step::sensor::data::entities%]",

homeassistant/components/group/translations/en.json

@@ -63,7 +63,6 @@
                     "type": "Type",
                     "unit_of_measurement": "Unit of Measurement"
                 },
-                "description": "If \"ignore non-numeric\" is enabled, the group's state is calculated if at least one member has a numerical value. If \"ignore non-numeric\" is disabled, the group's state is calculated only if all group members have numerical values.",
                 "title": "Add Group"
             },
             "switch": {

homeassistant/components/harmony/config_flow.py

@@ -64,7 +64,6 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
         """Handle the initial step."""
         errors = {}
         if user_input is not None:
-
             try:
                 validated = await validate_input(user_input)
             except CannotConnect:

homeassistant/components/homekit_controller/manifest.json

@@ -3,7 +3,7 @@
   "name": "HomeKit Controller",
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/homekit_controller",
-  "requirements": ["aiohomekit==2.4.4"],
+  "requirements": ["aiohomekit==2.4.6"],
   "zeroconf": ["_hap._tcp.local.", "_hap._udp.local."],
   "bluetooth": [{ "manufacturer_id": 76, "manufacturer_data_start": [6] }],
   "dependencies": ["bluetooth_adapters", "zeroconf"],

homeassistant/components/homematicip_cloud/climate.py

@@ -316,7 +316,12 @@ class HomematicipHeatingGroup(HomematicipGenericEntity, ClimateEntity):
     @property
     def _first_radiator_thermostat(
         self,
-    ) -> AsyncHeatingThermostat | AsyncHeatingThermostatCompact | AsyncHeatingThermostatEvo | None:
+    ) -> (
+        AsyncHeatingThermostat
+        | AsyncHeatingThermostatCompact
+        | AsyncHeatingThermostatEvo
+        | None
+    ):
         """Return the first radiator thermostat from the hmip heating group."""
         for device in self._device.devices:
             if isinstance(

homeassistant/components/honeywell/__init__.py

@@ -2,12 +2,12 @@
 import asyncio
 from dataclasses import dataclass
 
-import AIOSomecomfort
+import aiosomecomfort
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME, Platform
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.exceptions import ConfigEntryNotReady
+from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 from .const import (
@@ -50,22 +50,19 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
     username = config_entry.data[CONF_USERNAME]
     password = config_entry.data[CONF_PASSWORD]
 
-    client = AIOSomecomfort.AIOSomeComfort(
+    client = aiosomecomfort.AIOSomeComfort(
         username, password, session=async_get_clientsession(hass)
     )
     try:
         await client.login()
         await client.discover()
 
-    except AIOSomecomfort.AuthError as ex:
-        raise ConfigEntryNotReady(
-            "Failed to initialize the Honeywell client: "
-            "Check your configuration (username, password), "
-        ) from ex
+    except aiosomecomfort.device.AuthError as ex:
+        raise ConfigEntryAuthFailed("Incorrect Password") from ex
 
     except (
-        AIOSomecomfort.ConnectionError,
-        AIOSomecomfort.ConnectionTimeout,
+        aiosomecomfort.device.ConnectionError,
+        aiosomecomfort.device.ConnectionTimeout,
         asyncio.TimeoutError,
     ) as ex:
         raise ConfigEntryNotReady(
@@ -117,5 +114,5 @@ class HoneywellData:
     """Shared data for Honeywell."""
 
     entry_id: str
-    client: AIOSomecomfort.AIOSomeComfort
-    devices: dict[str, AIOSomecomfort.device.Device]
+    client: aiosomecomfort.AIOSomeComfort
+    devices: dict[str, aiosomecomfort.device.Device]

homeassistant/components/honeywell/climate.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 import datetime
 from typing import Any
 
-import AIOSomecomfort
+import aiosomecomfort
 
 from homeassistant.components.climate import (
     ATTR_TARGET_TEMP_HIGH,
@@ -100,7 +100,7 @@ class HoneywellUSThermostat(ClimateEntity):
     def __init__(
         self,
         data: HoneywellData,
-        device: AIOSomecomfort.device.Device,
+        device: aiosomecomfort.device.Device,
         cool_away_temp: int | None,
         heat_away_temp: int | None,
     ) -> None:
@@ -295,7 +295,7 @@ class HoneywellUSThermostat(ClimateEntity):
             if mode == "heat":
                 await self._device.set_setpoint_heat(temperature)
 
-        except AIOSomecomfort.SomeComfortError as err:
+        except aiosomecomfort.SomeComfortError as err:
             _LOGGER.error("Invalid temperature %.1f: %s", temperature, err)
 
     async def async_set_temperature(self, **kwargs: Any) -> None:
@@ -308,7 +308,7 @@ class HoneywellUSThermostat(ClimateEntity):
                 if temperature := kwargs.get(ATTR_TARGET_TEMP_LOW):
                     await self._device.set_setpoint_heat(temperature)
 
-            except AIOSomecomfort.SomeComfortError as err:
+            except aiosomecomfort.SomeComfortError as err:
                 _LOGGER.error("Invalid temperature %.1f: %s", temperature, err)
 
     async def async_set_fan_mode(self, fan_mode: str) -> None:
@@ -330,11 +330,10 @@ class HoneywellUSThermostat(ClimateEntity):
         try:
             # Get current mode
             mode = self._device.system_mode
-        except AIOSomecomfort.SomeComfortError:
+        except aiosomecomfort.SomeComfortError:
             _LOGGER.error("Can not get system mode")
             return
         try:
-
             # Set permanent hold
             # and Set temperature
             if mode in COOLING_MODES:
@@ -344,8 +343,7 @@ class HoneywellUSThermostat(ClimateEntity):
                 await self._device.set_hold_heat(True)
                 await self._device.set_setpoint_heat(self._heat_away_temp)
 
-        except AIOSomecomfort.SomeComfortError:
-
+        except aiosomecomfort.SomeComfortError:
             _LOGGER.error(
                 "Temperature out of range. Mode: %s, Heat Temperature:  %.1f, Cool Temperature: %.1f",
                 mode,
@@ -358,7 +356,7 @@ class HoneywellUSThermostat(ClimateEntity):
         try:
             # Get current mode
             mode = self._device.system_mode
-        except AIOSomecomfort.SomeComfortError:
+        except aiosomecomfort.SomeComfortError:
             _LOGGER.error("Can not get system mode")
             return
         # Check that we got a valid mode back
@@ -370,7 +368,7 @@ class HoneywellUSThermostat(ClimateEntity):
                 if mode in HEATING_MODES:
                     await self._device.set_hold_heat(True)
 
-            except AIOSomecomfort.SomeComfortError:
+            except aiosomecomfort.SomeComfortError:
                 _LOGGER.error("Couldn't set permanent hold")
         else:
             _LOGGER.error("Invalid system mode returned: %s", mode)
@@ -382,7 +380,7 @@ class HoneywellUSThermostat(ClimateEntity):
             # Disabling all hold modes
             await self._device.set_hold_cool(False)
             await self._device.set_hold_heat(False)
-        except AIOSomecomfort.SomeComfortError:
+        except aiosomecomfort.SomeComfortError:
             _LOGGER.error("Can not stop hold mode")
 
     async def async_set_preset_mode(self, preset_mode: str) -> None:
@@ -411,13 +409,13 @@ class HoneywellUSThermostat(ClimateEntity):
         try:
             await self._device.refresh()
         except (
-            AIOSomecomfort.SomeComfortError,
+            aiosomecomfort.SomeComfortError,
             OSError,
         ):
             try:
                 await self._data.client.login()
 
-            except AIOSomecomfort.SomeComfortError:
+            except aiosomecomfort.SomeComfortError:
                 self._attr_available = False
                 await self.hass.async_create_task(
                     self.hass.config_entries.async_reload(self._data.entry_id)

homeassistant/components/honeywell/config_flow.py

@@ -2,8 +2,10 @@
 from __future__ import annotations
 
 import asyncio
+from collections.abc import Mapping
+from typing import Any
 
-import AIOSomecomfort
+import aiosomecomfort
 import voluptuous as vol
 
 from homeassistant import config_entries
@@ -20,11 +22,66 @@ from .const import (
     DOMAIN,
 )
 
+REAUTH_SCHEMA = vol.Schema({vol.Required(CONF_PASSWORD): str})
+
 
 class HoneywellConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
     """Handle a honeywell config flow."""
 
     VERSION = 1
+    entry: config_entries.ConfigEntry | None
+
+    async def async_step_reauth(self, entry_data: Mapping[str, Any]) -> FlowResult:
+        """Handle re-authentication with Honeywell."""
+
+        self.entry = self.hass.config_entries.async_get_entry(self.context["entry_id"])
+        return await self.async_step_reauth_confirm()
+
+    async def async_step_reauth_confirm(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """Confirm re-authentication with Honeywell."""
+        errors: dict[str, str] = {}
+
+        if user_input:
+            assert self.entry is not None
+            password = user_input[CONF_PASSWORD]
+            data = {
+                CONF_USERNAME: self.entry.data[CONF_USERNAME],
+                CONF_PASSWORD: password,
+            }
+
+            try:
+                await self.is_valid(
+                    username=data[CONF_USERNAME], password=data[CONF_PASSWORD]
+                )
+
+            except aiosomecomfort.AuthError:
+                errors["base"] = "invalid_auth"
+
+            except (
+                aiosomecomfort.ConnectionError,
+                aiosomecomfort.ConnectionTimeout,
+                asyncio.TimeoutError,
+            ):
+                errors["base"] = "cannot_connect"
+
+            else:
+                self.hass.config_entries.async_update_entry(
+                    self.entry,
+                    data={
+                        **self.entry.data,
+                        CONF_PASSWORD: password,
+                    },
+                )
+                await self.hass.config_entries.async_reload(self.entry.entry_id)
+                return self.async_abort(reason="reauth_successful")
+
+        return self.async_show_form(
+            step_id="reauth_confirm",
+            data_schema=REAUTH_SCHEMA,
+            errors=errors,
+        )
 
     async def async_step_user(self, user_input=None) -> FlowResult:
         """Create config entry. Show the setup form to the user."""
@@ -32,11 +89,11 @@ class HoneywellConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
         if user_input is not None:
             try:
                 await self.is_valid(**user_input)
-            except AIOSomecomfort.AuthError:
+            except aiosomecomfort.AuthError:
                 errors["base"] = "invalid_auth"
             except (
-                AIOSomecomfort.ConnectionError,
-                AIOSomecomfort.ConnectionTimeout,
+                aiosomecomfort.ConnectionError,
+                aiosomecomfort.ConnectionTimeout,
                 asyncio.TimeoutError,
             ):
                 errors["base"] = "cannot_connect"
@@ -57,7 +114,7 @@ class HoneywellConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
 
     async def is_valid(self, **kwargs) -> bool:
         """Check if login credentials are valid."""
-        client = AIOSomecomfort.AIOSomeComfort(
+        client = aiosomecomfort.AIOSomeComfort(
             kwargs[CONF_USERNAME],
             kwargs[CONF_PASSWORD],
             session=async_get_clientsession(self.hass),

homeassistant/components/honeywell/manifest.json

@@ -3,7 +3,7 @@
   "name": "Honeywell Total Connect Comfort (US)",
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/honeywell",
-  "requirements": ["aiosomecomfort==0.0.3"],
+  "requirements": ["aiosomecomfort==0.0.6"],
   "codeowners": ["@rdfurman", "@mkmer"],
   "iot_class": "cloud_polling",
   "loggers": ["somecomfort"]

homeassistant/components/honeywell/sensor.py

@@ -5,7 +5,7 @@ from collections.abc import Callable
 from dataclasses import dataclass
 from typing import Any
 
-from AIOSomecomfort.device import Device
+from aiosomecomfort.device import Device
 
 from homeassistant.components.sensor import (
     SensorDeviceClass,

homeassistant/components/hue/migration.py

@@ -92,7 +92,6 @@ async def handle_v2_migration(hass: core.HomeAssistant, entry: ConfigEntry) -> N
 
     # initialize bridge connection just for the migration
     async with HueBridgeV2(host, api_key) as api:
-
         sensor_class_mapping = {
             SensorDeviceClass.BATTERY.value: ResourceTypes.DEVICE_POWER,
             BinarySensorDeviceClass.MOTION.value: ResourceTypes.MOTION,
@@ -130,7 +129,6 @@ async def handle_v2_migration(hass: core.HomeAssistant, entry: ConfigEntry) -> N
 
             # loop through all entities for device and find match
             for ent in async_entries_for_device(ent_reg, hass_dev_id, True):
-
                 if ent.entity_id.startswith("light"):
                     # migrate light
                     # should always return one lightid here

homeassistant/components/hvv_departures/binary_sensor.py

@@ -48,7 +48,6 @@ async def async_setup_entry(
 
         for partial_station in station_information.get("partialStations", []):
             for elevator in partial_station.get("elevators", []):
-
                 state = elevator.get("state") != "READY"
                 available = elevator.get("state") != "UNKNOWN"
                 label = elevator.get("label")

homeassistant/components/hvv_departures/config_flow.py

@@ -81,7 +81,6 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
     async def async_step_station(self, user_input=None):
         """Handle the step where the user inputs his/her station."""
         if user_input is not None:
-
             errors = {}
 
             check_name = await self.hub.gti.checkName(
@@ -145,7 +144,6 @@ class OptionsFlowHandler(config_entries.OptionsFlow):
         """Manage the options."""
         errors = {}
         if not self.departure_filters:
-
             departure_list = {}
             hub: GTIHub = self.hass.data[DOMAIN][self.config_entry.entry_id]
 
@@ -172,7 +170,6 @@ class OptionsFlowHandler(config_entries.OptionsFlow):
                 }
 
         if user_input is not None and not errors:
-
             options = {
                 CONF_FILTER: [
                     self.departure_filters[x] for x in user_input[CONF_FILTER]

homeassistant/components/hyperion/__init__.py

@@ -259,7 +259,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         for device_entry in dr.async_entries_for_config_entry(
             device_registry, entry.entry_id
         ):
-            for (kind, key) in device_entry.identifiers:
+            for kind, key in device_entry.identifiers:
                 if kind == DOMAIN and key in known_devices:
                     break
             else:

homeassistant/components/ifttt/__init__.py

@@ -77,7 +77,6 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
             target_keys[target] = api_keys[target]
 
         try:
-
             for target, key in target_keys.items():
                 res = pyfttt.send_event(key, event, value1, value2, value3)
                 if res.status_code != HTTPStatus.OK:

homeassistant/components/inkbird/manifest.json

@@ -10,7 +10,7 @@
     { "local_name": "xBBQ*", "connectable": false },
     { "local_name": "tps", "connectable": false }
   ],
-  "requirements": ["inkbird-ble==0.5.5"],
+  "requirements": ["inkbird-ble==0.5.6"],
   "dependencies": ["bluetooth_adapters"],
   "codeowners": ["@bdraco"],
   "iot_class": "local_push"

homeassistant/components/intellifire/config_flow.py

@@ -119,7 +119,6 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
         )
 
         if user_input is not None:
-
             control_schema = vol.Schema(
                 {
                     vol.Required(

homeassistant/components/intellifire/coordinator.py

@@ -33,7 +33,6 @@ class IntellifireDataUpdateCoordinator(DataUpdateCoordinator[IntellifirePollData
         self._api = api
 
     async def _async_update_data(self) -> IntellifirePollData:
-
         if not self._api.is_polling_in_background:
             LOGGER.info("Starting Intellifire Background Polling Loop")
             await self._api.start_background_polling()

homeassistant/components/isy994/__init__.py

@@ -7,6 +7,7 @@ from urllib.parse import urlparse
 from aiohttp import CookieJar
 import async_timeout
 from pyisy import ISY, ISYConnectionError, ISYInvalidAuthError, ISYResponseParseError
+from pyisy.constants import CONFIG_NETWORKING, CONFIG_PORTAL
 import voluptuous as vol
 
 from homeassistant import config_entries
@@ -43,7 +44,6 @@ from .const import (
     ISY_CONF_FIRMWARE,
     ISY_CONF_MODEL,
     ISY_CONF_NAME,
-    ISY_CONF_NETWORKING,
     MANUFACTURER,
     PLATFORMS,
     SCHEME_HTTP,
@@ -220,9 +220,11 @@ async def async_setup_entry(
         numbers = isy_data.variables[Platform.NUMBER]
         for vtype, _, vid in isy.variables.children:
             numbers.append(isy.variables[vtype][vid])
-    if isy.conf[ISY_CONF_NETWORKING]:
+    if (
+        isy.conf[CONFIG_NETWORKING] or isy.conf[CONFIG_PORTAL]
+    ) and isy.networking.nobjs:
         isy_data.devices[CONF_NETWORK] = _create_service_device_info(
-            isy, name=ISY_CONF_NETWORKING, unique_id=CONF_NETWORK
+            isy, name=CONFIG_NETWORKING, unique_id=CONF_NETWORK
         )
         for resource in isy.networking.nobjs:
             isy_data.net_resources.append(resource)

homeassistant/components/isy994/binary_sensor.py

@@ -95,7 +95,7 @@ async def async_setup_entry(
         entities_by_address[node.address] = entity
 
     # Handle some special child node cases for Insteon Devices
-    for (node, device_class, device_type, device_info) in child_nodes:
+    for node, device_class, device_type, device_info in child_nodes:
         subnode_id = int(node.address.split(" ")[-1], 16)
         # Handle Insteon Thermostats
         if device_type is not None and device_type.startswith(TYPE_CATEGORY_CLIMATE):

homeassistant/components/isy994/const.py

@@ -118,7 +118,6 @@ SUPPORTED_BIN_SENS_CLASSES = ["moisture", "opening", "motion", "climate"]
 # (they can turn off, and report their state)
 ISY_GROUP_PLATFORM = Platform.SWITCH
 
-ISY_CONF_NETWORKING = "Networking Module"
 ISY_CONF_UUID = "uuid"
 ISY_CONF_NAME = "name"
 ISY_CONF_MODEL = "model"
@@ -255,7 +254,7 @@ NODE_FILTERS: dict[Platform, dict[str, list[str]]] = {
         FILTER_STATES: ["open", "closed", "closing", "opening", "stopped"],
         FILTER_NODE_DEF_ID: ["DimmerMotorSwitch_ADV"],
         FILTER_INSTEON_TYPE: [TYPE_CATEGORY_COVER],
-        FILTER_ZWAVE_CAT: [],
+        FILTER_ZWAVE_CAT: ["106", "107"],
     },
     Platform.LIGHT: {
         FILTER_UOM: ["51"],

homeassistant/components/isy994/helpers.py

@@ -109,7 +109,6 @@ def _check_for_insteon_type(
             device_type.startswith(t)
             for t in set(NODE_FILTERS[platform][FILTER_INSTEON_TYPE])
         ):
-
             # Hacky special-cases for certain devices with different platforms
             # included as subnodes. Note that special-cases are not necessary
             # on ISY 5.x firmware as it uses the superior NodeDefs method

homeassistant/components/isy994/manifest.json

@@ -3,7 +3,7 @@
   "name": "Universal Devices ISY/IoX",
   "integration_type": "hub",
   "documentation": "https://www.home-assistant.io/integrations/isy994",
-  "requirements": ["pyisy==3.1.11"],
+  "requirements": ["pyisy==3.1.13"],
   "codeowners": ["@bdraco", "@shbatm"],
   "config_flow": true,
   "ssdp": [

homeassistant/components/isy994/services.py

@@ -23,7 +23,7 @@ import homeassistant.helpers.entity_registry as er
 from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
 from homeassistant.helpers.service import entity_service_call
 
-from .const import _LOGGER, CONF_NETWORK, DOMAIN, ISY_CONF_NAME, ISY_CONF_NETWORKING
+from .const import _LOGGER, CONF_NETWORK, DOMAIN, ISY_CONF_NAME
 from .util import _async_cleanup_registry_entries
 
 # Common Services for All Platforms:
@@ -233,7 +233,7 @@ def async_setup_services(hass: HomeAssistant) -> None:  # noqa: C901
             isy = isy_data.root
             if isy_name and isy_name != isy.conf[ISY_CONF_NAME]:
                 continue
-            if isy.networking is None or not isy.conf[ISY_CONF_NETWORKING]:
+            if isy.networking is None:
                 continue
             command = None
             if address:

homeassistant/components/izone/climate.py

@@ -173,6 +173,7 @@ class ControllerDevice(ClimateEntity):
 
     async def async_added_to_hass(self) -> None:
         """Call on adding to hass."""
+
         # Register for connect/disconnect/update events
         @callback
         def controller_disconnected(ctrl: Controller, ex: Exception) -> None:
@@ -290,7 +291,7 @@ class ControllerDevice(ClimateEntity):
             return HVACMode.OFF
         if (mode := self._controller.mode) == Controller.Mode.FREE_AIR:
             return HVACMode.FAN_ONLY
-        for (key, value) in self._state_to_pizone.items():
+        for key, value in self._state_to_pizone.items():
             if value == mode:
                 return key
         assert False, "Should be unreachable"
@@ -527,7 +528,7 @@ class ZoneDevice(ClimateEntity):
     def hvac_mode(self) -> HVACMode | None:
         """Return current operation ie. heat, cool, idle."""
         mode = self._zone.mode
-        for (key, value) in self._state_to_pizone.items():
+        for key, value in self._state_to_pizone.items():
             if value == mode:
                 return key
         return None

homeassistant/components/izone/config_flow.py

@@ -17,7 +17,6 @@ _LOGGER = logging.getLogger(__name__)
 
 
 async def _async_has_devices(hass: HomeAssistant) -> bool:
-
     controller_ready = asyncio.Event()
 
     @callback

homeassistant/components/juicenet/config_flow.py

@@ -46,7 +46,6 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
         """Handle the initial step."""
         errors = {}
         if user_input is not None:
-
             await self.async_set_unique_id(user_input[CONF_ACCESS_TOKEN])
             self._abort_if_unique_id_configured()
 

homeassistant/components/kitchen_sink/repairs.py

@@ -17,7 +17,7 @@ class DemoFixFlow(RepairsFlow):
     ) -> data_entry_flow.FlowResult:
         """Handle the first step of a fix flow."""
 
-        return await (self.async_step_confirm())
+        return await self.async_step_confirm()
 
     async def async_step_confirm(
         self, user_input: dict[str, str] | None = None

homeassistant/components/landisgyr_heat_meter/__init__.py

@@ -62,7 +62,6 @@ async def async_migrate_entry(hass: HomeAssistant, config_entry: ConfigEntry) ->
 
     # Removing domain name and config entry id from entity unique id's, replacing it with device number
     if config_entry.version == 1:
-
         config_entry.version = 2
 
         device_number = config_entry.data["device_number"]

homeassistant/components/ld2410_ble/manifest.json

@@ -6,7 +6,19 @@
   "requirements": ["bluetooth-data-tools==0.3.1", "ld2410-ble==0.1.1"],
   "dependencies": ["bluetooth_adapters"],
   "codeowners": ["@930913"],
-  "bluetooth": [{ "local_name": "HLK-LD2410B_*" }],
+  "bluetooth": [
+    {
+      "local_name": "HLK-LD2410B_*"
+    },
+    {
+      "local_name": "HLK-LD2410_*"
+    },
+    {
+      "manufacturer_id": 256,
+      "manufacturer_data_start": [7, 1],
+      "service_uuid": "0000af30-0000-1000-8000-00805f9b34fb"
+    }
+  ],
   "integration_type": "device",
   "iot_class": "local_push"
 }

homeassistant/components/lifx/manager.py

@@ -296,7 +296,6 @@ class LIFXManager:
             )
 
         elif service == SERVICE_EFFECT_MORPH:
-
             theme_name = kwargs.get(ATTR_THEME, "exciting")
             palette = kwargs.get(ATTR_PALETTE, None)
 
@@ -336,7 +335,6 @@ class LIFXManager:
             )
 
         elif service == SERVICE_EFFECT_PULSE:
-
             effect = aiolifx_effects.EffectPulse(
                 power_on=kwargs.get(ATTR_POWER_ON),
                 period=kwargs.get(ATTR_PERIOD),
@@ -347,7 +345,6 @@ class LIFXManager:
             await self.effects_conductor.start(effect, bulbs)
 
         elif service == SERVICE_EFFECT_COLORLOOP:
-
             brightness = None
             saturation_max = None
             saturation_min = None
@@ -378,7 +375,6 @@ class LIFXManager:
             await self.effects_conductor.start(effect, bulbs)
 
         elif service == SERVICE_EFFECT_STOP:
-
             await self.effects_conductor.stop(bulbs)
 
             for coordinator in coordinators:

homeassistant/components/london_air/sensor.py

@@ -218,7 +218,6 @@ def parse_api_response(response):
     for authority in AUTHORITIES:
         for entry in response["HourlyAirQualityIndex"]["LocalAuthority"]:
             if entry["@LocalAuthorityName"] == authority:
-
                 if isinstance(entry["Site"], dict):
                     entry_sites_data = [entry["Site"]]
                 else:

homeassistant/components/lovelace/__init__.py

@@ -157,7 +157,6 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
             return
 
         if change_type == collection.CHANGE_ADDED:
-
             existing = hass.data[DOMAIN]["dashboards"].get(url_path)
 
             if existing:

homeassistant/components/lupusec/manifest.json

@@ -2,7 +2,7 @@
   "domain": "lupusec",
   "name": "Lupus Electronics LUPUSEC",
   "documentation": "https://www.home-assistant.io/integrations/lupusec",
-  "requirements": ["lupupy==0.2.5"],
+  "requirements": ["lupupy==0.2.7"],
   "codeowners": ["@majuss"],
   "iot_class": "local_polling",
   "loggers": ["lupupy"]

homeassistant/components/lupusec/switch.py

@@ -31,7 +31,6 @@ def setup_platform(
     devices = []
 
     for device in data.lupusec.get_devices(generic_type=CONST.TYPE_SWITCH):
-
         devices.append(LupusecSwitch(data, device))
 
     add_entities(devices)

homeassistant/components/lutron/binary_sensor.py

@@ -24,7 +24,7 @@ def setup_platform(
     if discovery_info is None:
         return
     devs = []
-    for (area_name, device) in hass.data[LUTRON_DEVICES]["binary_sensor"]:
+    for area_name, device in hass.data[LUTRON_DEVICES]["binary_sensor"]:
         dev = LutronOccupancySensor(area_name, device, hass.data[LUTRON_CONTROLLER])
         devs.append(dev)
 

homeassistant/components/lutron/cover.py

@@ -26,7 +26,7 @@ def setup_platform(
 ) -> None:
     """Set up the Lutron shades."""
     devs = []
-    for (area_name, device) in hass.data[LUTRON_DEVICES]["cover"]:
+    for area_name, device in hass.data[LUTRON_DEVICES]["cover"]:
         dev = LutronCover(area_name, device, hass.data[LUTRON_CONTROLLER])
         devs.append(dev)
 

homeassistant/components/lutron/light.py

@@ -19,7 +19,7 @@ def setup_platform(
 ) -> None:
     """Set up the Lutron lights."""
     devs = []
-    for (area_name, device) in hass.data[LUTRON_DEVICES]["light"]:
+    for area_name, device in hass.data[LUTRON_DEVICES]["light"]:
         dev = LutronLight(area_name, device, hass.data[LUTRON_CONTROLLER])
         devs.append(dev)
 

homeassistant/components/lutron/switch.py

@@ -21,7 +21,7 @@ def setup_platform(
     devs = []
 
     # Add Lutron Switches
-    for (area_name, device) in hass.data[LUTRON_DEVICES]["switch"]:
+    for area_name, device in hass.data[LUTRON_DEVICES]["switch"]:
         dev = LutronSwitch(area_name, device, hass.data[LUTRON_CONTROLLER])
         devs.append(dev)
 

homeassistant/components/lutron_caseta/__init__.py

@@ -256,7 +256,6 @@ def _async_setup_keypads(
     leap_to_keypad_button_names: dict[int, dict[int, str]] = {}
 
     for bridge_button in bridge_buttons.values():
-
         parent_device = cast(str, bridge_button["parent_device"])
         bridge_keypad = bridge_devices[parent_device]
         keypad_lutron_device_id = cast(int, bridge_keypad["device_id"])

homeassistant/components/lutron_caseta/button.py

@@ -29,7 +29,6 @@ async def async_setup_entry(
     entities: list[LutronCasetaButton] = []
 
     for device in button_devices.values():
-
         parent_keypad = keypads[device["parent_device"]]
         parent_device_info = parent_keypad["device_info"]
 

homeassistant/components/lutron_caseta/manifest.json

@@ -2,7 +2,7 @@
   "domain": "lutron_caseta",
   "name": "Lutron Cas\u00e9ta",
   "documentation": "https://www.home-assistant.io/integrations/lutron_caseta",
-  "requirements": ["pylutron-caseta==0.18.0"],
+  "requirements": ["pylutron-caseta==0.18.1"],
   "config_flow": true,
   "zeroconf": [
     {

homeassistant/components/matter/__init__.py

@@ -32,7 +32,7 @@ from .addon import get_addon_manager
 from .api import async_register_api
 from .const import CONF_INTEGRATION_CREATED_ADDON, CONF_USE_ADDON, DOMAIN, LOGGER
 from .device_platform import DEVICE_PLATFORM
-from .helpers import MatterEntryData, get_matter
+from .helpers import MatterEntryData, get_matter, get_node_from_device_entry
 
 CONNECT_TIMEOUT = 10
 LISTEN_READY_TIMEOUT = 30
@@ -192,23 +192,13 @@ async def async_remove_config_entry_device(
     hass: HomeAssistant, config_entry: ConfigEntry, device_entry: dr.DeviceEntry
 ) -> bool:
     """Remove a config entry from a device."""
-    unique_id = None
+    node = await get_node_from_device_entry(hass, device_entry)
 
-    for ident in device_entry.identifiers:
-        if ident[0] == DOMAIN:
-            unique_id = ident[1]
-            break
-
-    if not unique_id:
+    if node is None:
         return True
 
-    matter_entry_data: MatterEntryData = hass.data[DOMAIN][config_entry.entry_id]
-    matter_client = matter_entry_data.adapter.matter_client
-
-    for node in await matter_client.get_nodes():
-        if node.unique_id == unique_id:
-            await matter_client.remove_node(node.node_id)
-            break
+    matter = get_matter(hass)
+    await matter.matter_client.remove_node(node.node_id)
 
     return True