[pull] dev from home-assistant:dev

homeassistant/components/braviatv/coordinator.py

@@ -23,6 +23,7 @@
 from homeassistant.exceptions import ConfigEntryAuthFailed, HomeAssistantError
 from homeassistant.helpers.debounce import Debouncer
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+from homeassistant.util import dt as dt_util
 
 from .const import (
     CONF_NICKNAME,
@@ -240,11 +241,13 @@ async def async_update_playing(self) -> None:
         self.source = None
         if start_datetime := playing_info.get("startDateTime"):
             start_datetime = datetime.fromisoformat(start_datetime)
-            current_datetime = datetime.now().replace(tzinfo=start_datetime.tzinfo)  # pylint: disable=home-assistant-enforce-naive-now
-            self.media_position = int(
-                (current_datetime - start_datetime).total_seconds()
-            )
-            self.media_position_updated_at = datetime.now()  # pylint: disable=home-assistant-enforce-naive-now
+            if start_datetime.tzinfo is None:
+                start_datetime = start_datetime.replace(
+                    tzinfo=dt_util.get_default_time_zone()
+                )
+            now = dt_util.utcnow()
+            self.media_position = int((now - start_datetime).total_seconds())
+            self.media_position_updated_at = now
         else:
             self.media_position = None
             self.media_position_updated_at = None

homeassistant/components/midea/__init__.py

@@ -20,7 +20,11 @@
 from .const import CONF_KEY, CONF_SUBTYPE
 from .entity import MideaConfigEntry
 
-_PLATFORMS: list[Platform] = [Platform.CLIMATE, Platform.HUMIDIFIER]
+_PLATFORMS: list[Platform] = [
+    Platform.CLIMATE,
+    Platform.HUMIDIFIER,
+    Platform.SELECT,
+]
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: MideaConfigEntry) -> bool:

homeassistant/components/midea/device_catalog.py

@@ -8,6 +8,9 @@
     DeviceType.CC: "MDV Wi-Fi Controller",
     DeviceType.CF: "Heat Pump",
     DeviceType.FB: "Electric Heater",
+    DeviceType.X40: "Integrated Ceiling Fan",
     DeviceType.A1: "Dehumidifier",
+    DeviceType.FA: "Fan",
+    DeviceType.FC: "Air Purifier",
     DeviceType.FD: "Humidifier",
 }

homeassistant/components/midea/select.py

@@ -0,0 +1,148 @@
+"""Select for Midea."""
+
+from dataclasses import dataclass
+from typing import override
+
+from midealocal.const import DeviceType
+
+from homeassistant.components.select import SelectEntity, SelectEntityDescription
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from .entity import MideaConfigEntry, MideaEntity, midea_api_call
+
+PARALLEL_UPDATES = 0
+
+
+@dataclass(kw_only=True, frozen=True)
+class MideaSelectEntityDescription(SelectEntityDescription):
+    """Description for a Midea select entity."""
+
+    models: list[DeviceType]
+    options_attribute: str
+    """Device property name returning the list of valid option strings."""
+
+
+SELECTS: list[MideaSelectEntityDescription] = [
+    MideaSelectEntityDescription(
+        key="direction",
+        translation_key="direction",
+        models=[DeviceType.X40],
+        options_attribute="directions",
+    ),
+    MideaSelectEntityDescription(
+        key="fan_speed",
+        translation_key="fan_speed",
+        models=[DeviceType.A1, DeviceType.FC, DeviceType.FD],
+        options_attribute="fan_speeds",
+    ),
+    MideaSelectEntityDescription(
+        key="water_level_set",
+        translation_key="water_level_set",
+        models=[DeviceType.A1],
+        options_attribute="water_level_sets",
+    ),
+    MideaSelectEntityDescription(
+        key="wind_lr_angle",
+        translation_key="wind_lr_angle",
+        models=[DeviceType.AC],
+        options_attribute="wind_lr_angles",
+    ),
+    MideaSelectEntityDescription(
+        key="wind_ud_angle",
+        translation_key="wind_ud_angle",
+        models=[DeviceType.AC],
+        options_attribute="wind_ud_angles",
+    ),
+    MideaSelectEntityDescription(
+        key="rate_select",
+        translation_key="rate_select",
+        models=[DeviceType.AC],
+        options_attribute="rate_selects",
+    ),
+    MideaSelectEntityDescription(
+        key="silent_level",
+        translation_key="silent_level",
+        models=[DeviceType.C3],
+        options_attribute="silent_modes",
+    ),
+    MideaSelectEntityDescription(
+        key="oscillation_mode",
+        translation_key="oscillation_mode",
+        models=[DeviceType.FA],
+        options_attribute="oscillation_modes",
+    ),
+    MideaSelectEntityDescription(
+        key="oscillation_angle",
+        translation_key="oscillation_angle",
+        models=[DeviceType.FA],
+        options_attribute="oscillation_angles",
+    ),
+    MideaSelectEntityDescription(
+        key="tilting_angle",
+        translation_key="tilting_angle",
+        models=[DeviceType.FA],
+        options_attribute="tilting_angles",
+    ),
+    MideaSelectEntityDescription(
+        key="detect_mode",
+        translation_key="detect_mode",
+        models=[DeviceType.FC],
+        options_attribute="detect_modes",
+    ),
+    MideaSelectEntityDescription(
+        key="mode",
+        translation_key="mode",
+        models=[DeviceType.FC],
+        options_attribute="modes",
+    ),
+    MideaSelectEntityDescription(
+        key="screen_display",
+        translation_key="screen_display",
+        models=[DeviceType.FC, DeviceType.FD],
+        options_attribute="screen_displays",
+    ),
+]
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: MideaConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up selects for device."""
+    device = config_entry.runtime_data
+
+    async_add_entities(
+        MideaSelect(device, description)
+        for description in SELECTS
+        if device.device_type in description.models
+        and description.key in device.attributes
+    )
+
+
+class MideaSelect(MideaEntity, SelectEntity):
+    """Represent a Midea select."""
+
+    entity_description: MideaSelectEntityDescription
+
+    @property
+    @override
+    def options(self) -> list[str]:
+        """Return the list of valid options."""
+        return getattr(self._device, self.entity_description.options_attribute)
+
+    @property
+    @override
+    def current_option(self) -> str | None:
+        """Return the currently selected option."""
+        value = self._device.get_attribute(self.entity_description.key)
+        if not isinstance(value, str):
+            return None
+        return value
+
+    @override
+    def select_option(self, option: str) -> None:
+        """Select an option."""
+        with midea_api_call():
+            self._device.set_attribute(attr=self.entity_description.key, value=option)

homeassistant/components/midea/strings.json

@@ -105,6 +105,115 @@
       "climate_zone2": {
         "name": "Zone 2 thermostat"
       }
+    },
+    "select": {
+      "detect_mode": {
+        "name": "Detect mode",
+        "state": {
+          "methanal": "Formaldehyde",
+          "off": "Off",
+          "pm_25": "PM2.5"
+        }
+      },
+      "direction": {
+        "name": "Direction",
+        "state": {
+          "oscillate": "Oscillate"
+        }
+      },
+      "fan_speed": {
+        "name": "Fan speed",
+        "state": {
+          "auto": "Auto",
+          "high": "High",
+          "low": "Low",
+          "lowest": "Lowest",
+          "medium": "Medium",
+          "off": "Off",
+          "standby": "Standby"
+        }
+      },
+      "mode": {
+        "name": "Mode",
+        "state": {
+          "auto": "Auto",
+          "fast": "Fast",
+          "manual": "Manual",
+          "sleep": "Sleep",
+          "smoke": "Smoke",
+          "standby": "Standby"
+        }
+      },
+      "oscillation_angle": {
+        "name": "Oscillation angle",
+        "state": {
+          "off": "Off"
+        }
+      },
+      "oscillation_mode": {
+        "name": "Oscillation mode",
+        "state": {
+          "both": "Both",
+          "curve_8": "Curve 8",
+          "curve_w": "Curve W",
+          "off": "Off",
+          "oscillation": "Oscillation",
+          "reserved": "Reserved",
+          "tilting": "Tilting"
+        }
+      },
+      "rate_select": {
+        "name": "Power rate limit"
+      },
+      "screen_display": {
+        "name": "Screen display",
+        "state": {
+          "bright": "Bright",
+          "dim": "Dim",
+          "off": "Off"
+        }
+      },
+      "silent_level": {
+        "name": "Silent level",
+        "state": {
+          "off": "Off",
+          "silent": "Silent",
+          "super_silent": "Super silent"
+        }
+      },
+      "tilting_angle": {
+        "name": "Tilting angle",
+        "state": {
+          "minus_60": "Minus 60",
+          "off": "Off",
+          "plus_60": "Plus 60"
+        }
+      },
+      "water_level_set": {
+        "name": "Water level setting"
+      },
+      "wind_lr_angle": {
+        "name": "Airflow horizontal",
+        "state": {
+          "left": "Left",
+          "left_mid": "Left middle",
+          "middle": "Middle",
+          "off": "Off",
+          "right": "Right",
+          "right_mid": "Right middle"
+        }
+      },
+      "wind_ud_angle": {
+        "name": "Airflow vertical",
+        "state": {
+          "down": "Down",
+          "down_mid": "Down middle",
+          "middle": "Middle",
+          "off": "Off",
+          "up": "Up",
+          "up_mid": "Up middle"
+        }
+      }
     }
   },
   "exceptions": {

homeassistant/components/shelly/__init__.py

@@ -64,6 +64,7 @@
     async_manage_deprecated_firmware_issue,
     async_manage_open_wifi_ap_issue,
     async_manage_outbound_websocket_incorrectly_enabled_issue,
+    async_manage_rtsp_disabled_issue,
 )
 from .services import async_setup_services
 from .utils import (
@@ -393,6 +394,7 @@ async def _async_setup_rpc_entry(hass: HomeAssistant, entry: ShellyConfigEntry)
             entry,
         )
         async_manage_open_wifi_ap_issue(hass, entry)
+        async_manage_rtsp_disabled_issue(hass, entry)
         remove_empty_sub_devices(hass, entry)
     elif (
         sleep_period is None

homeassistant/components/shelly/camera.py

@@ -37,13 +37,15 @@ class RpcCameraEntityDescription(RpcEntityDescription, CameraEntityDescription):
         stream=0,
         translation_key="stream",
         translation_placeholders={"stream_id": "0"},
+        removal_condition=lambda config, _, key: not config[key]["rtsp"]["enable"],
     ),
     "stream_1": RpcCameraEntityDescription(
         key="camera",
         stream=1,
         translation_key="stream",
         translation_placeholders={"stream_id": "1"},
         entity_registry_enabled_default=False,
+        removal_condition=lambda config, _, key: not config[key]["rtsp"]["enable"],
     ),
 }
 
@@ -94,8 +96,7 @@ def available(self) -> bool:
         if not available:
             return False
 
-        config = self.coordinator.device.config[self.key]
-        return not self.status["privacy"] and config["rtsp"]["enable"]
+        return not self.status["privacy"]
 
     @override
     @property

homeassistant/components/shelly/const.py

@@ -247,6 +247,7 @@ class BLEScannerMode(StrEnum):
 )
 DEPRECATED_FIRMWARE_ISSUE_ID = "deprecated_firmware_{unique}"
 OPEN_WIFI_AP_ISSUE_ID = "open_wifi_ap_{unique}"
+RTSP_DISABLED_ISSUE_ID = "rtsp_disabled_{unique}"
 COIOT_UNCONFIGURED_ISSUE_ID = "coiot_unconfigured_{unique}"