[pull] dev from home-assistant:dev

CONTRIBUTING.md

@@ -14,5 +14,8 @@ Still interested? Then you should take a peek at the [developer documentation](h
 
 ## Feature suggestions
 
-If you want to suggest a new feature for Home Assistant (e.g., new integrations), please open a thread in our [Community Forum: Feature Requests](https://community.home-assistant.io/c/feature-requests).
-We use [GitHub for tracking issues](https://github.com/home-assistant/core/issues), not for tracking feature requests.
+If you want to suggest a new feature for Home Assistant (e.g. new integrations), please [start a discussion](https://github.com/orgs/home-assistant/discussions) on GitHub.
+
+## Issue Tracker
+
+If you want to report an issue, please [create an issue](https://github.com/home-assistant/core/issues) on GitHub.

homeassistant/components/auth/login_flow.py

@@ -199,23 +199,19 @@ async def get(self, request: web.Request) -> web.Response:
         )
 
 
-def _prepare_result_json(
-    result: AuthFlowResult,
-) -> AuthFlowResult:
-    """Convert result to JSON."""
+def _prepare_result_json(result: AuthFlowResult) -> dict[str, Any]:
+    """Convert result to JSON serializable dict."""
     if result["type"] == data_entry_flow.FlowResultType.CREATE_ENTRY:
-        data = result.copy()
-        data.pop("result")
-        data.pop("data")
-        return data
+        return {
+            key: val for key, val in result.items() if key not in ("result", "data")
+        }
 
     if result["type"] != data_entry_flow.FlowResultType.FORM:
-        return result
+        return result  # type: ignore[return-value]
 
-    data = result.copy()
-
-    if (schema := data["data_schema"]) is None:
-        data["data_schema"] = []  # type: ignore[typeddict-item]  # json result type
+    data = dict(result)
+    if (schema := result["data_schema"]) is None:
+        data["data_schema"] = []
     else:
         data["data_schema"] = voluptuous_serialize.convert(schema)
 

homeassistant/components/auth/mfa_setup_flow.py

@@ -149,20 +149,16 @@ async def async_depose(msg: dict[str, Any]) -> None:
     hass.async_create_task(async_depose(msg))
 
 
-def _prepare_result_json(
-    result: data_entry_flow.FlowResult,
-) -> data_entry_flow.FlowResult:
-    """Convert result to JSON."""
+def _prepare_result_json(result: data_entry_flow.FlowResult) -> dict[str, Any]:
+    """Convert result to JSON serializable dict."""
     if result["type"] == data_entry_flow.FlowResultType.CREATE_ENTRY:
-        return result.copy()
-
+        return dict(result)
     if result["type"] != data_entry_flow.FlowResultType.FORM:
-        return result
-
-    data = result.copy()
+        return result  # type: ignore[return-value]
 
-    if (schema := data["data_schema"]) is None:
-        data["data_schema"] = []  # type: ignore[typeddict-item]  # json result type
+    data = dict(result)
+    if (schema := result["data_schema"]) is None:
+        data["data_schema"] = []
     else:
         data["data_schema"] = voluptuous_serialize.convert(schema)
 

homeassistant/components/config/config_entries.py

@@ -137,20 +137,16 @@ async def post(self, request: web.Request, entry_id: str) -> web.Response:
 
 def _prepare_config_flow_result_json(
     result: data_entry_flow.FlowResult,
-    prepare_result_json: Callable[
-        [data_entry_flow.FlowResult], data_entry_flow.FlowResult
-    ],
-) -> data_entry_flow.FlowResult:
+    prepare_result_json: Callable[[data_entry_flow.FlowResult], dict[str, Any]],
+) -> dict[str, Any]:
     """Convert result to JSON."""
     if result["type"] != data_entry_flow.FlowResultType.CREATE_ENTRY:
         return prepare_result_json(result)
 
-    data = result.copy()
-    entry: config_entries.ConfigEntry = data["result"]  # type: ignore[typeddict-item]
+    data = {key: val for key, val in result.items() if key not in ("data", "context")}
+    entry: config_entries.ConfigEntry = result["result"]  # type: ignore[typeddict-item]
     # We overwrite the ConfigEntry object with its json representation.
-    data["result"] = entry.as_json_fragment  # type: ignore[typeddict-unknown-key]
-    data.pop("data")
-    data.pop("context")
+    data["result"] = entry.as_json_fragment
     return data
 
 
@@ -204,8 +200,8 @@ def get_context(self, data: dict[str, Any]) -> dict[str, Any]:
 
     def _prepare_result_json(
         self, result: data_entry_flow.FlowResult
-    ) -> data_entry_flow.FlowResult:
-        """Convert result to JSON."""
+    ) -> dict[str, Any]:
+        """Convert result to JSON serializable dict."""
         return _prepare_config_flow_result_json(result, super()._prepare_result_json)
 
 
@@ -229,8 +225,8 @@ async def post(self, request: web.Request, flow_id: str) -> web.Response:
 
     def _prepare_result_json(
         self, result: data_entry_flow.FlowResult
-    ) -> data_entry_flow.FlowResult:
-        """Convert result to JSON."""
+    ) -> dict[str, Any]:
+        """Convert result to JSON serializable dict."""
         return _prepare_config_flow_result_json(result, super()._prepare_result_json)
 
 

homeassistant/components/daikin/manifest.json

@@ -6,6 +6,6 @@
   "documentation": "https://www.home-assistant.io/integrations/daikin",
   "iot_class": "local_polling",
   "loggers": ["pydaikin"],
-  "requirements": ["pydaikin==2.15.0"],
+  "requirements": ["pydaikin==2.16.0"],
   "zeroconf": ["_dkapi._tcp.local."]
 }

homeassistant/components/emoncms_history/__init__.py

@@ -1,10 +1,11 @@
 """Support for sending data to Emoncms."""
 
-from datetime import timedelta
-from http import HTTPStatus
+from datetime import datetime, timedelta
+from functools import partial
 import logging
 
-import requests
+import aiohttp
+from pyemoncms import EmoncmsClient
 import voluptuous as vol
 
 from homeassistant.const import (
@@ -17,9 +18,9 @@
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv, state as state_helper
-from homeassistant.helpers.event import track_point_in_time
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.event import async_track_time_interval
 from homeassistant.helpers.typing import ConfigType
-from homeassistant.util import dt as dt_util
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -42,61 +43,51 @@
 )
 
 
-def setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the Emoncms history component."""
-    conf = config[DOMAIN]
-    whitelist = conf.get(CONF_WHITELIST)
-
-    def send_data(url, apikey, node, payload):
-        """Send payload data to Emoncms."""
+async def async_send_to_emoncms(
+    hass: HomeAssistant,
+    emoncms_client: EmoncmsClient,
+    whitelist: list[str],
+    node: str | int,
+    _: datetime,
+) -> None:
+    """Send data to Emoncms."""
+    payload_dict = {}
+
+    for entity_id in whitelist:
+        state = hass.states.get(entity_id)
+        if state is None or state.state in (STATE_UNKNOWN, "", STATE_UNAVAILABLE):
+            continue
         try:
-            fullurl = f"{url}/input/post.json"
-            data = {"apikey": apikey, "data": payload}
-            parameters = {"node": node}
-            req = requests.post(
-                fullurl, params=parameters, data=data, allow_redirects=True, timeout=5
-            )
-
-        except requests.exceptions.RequestException:
-            _LOGGER.error("Error saving data '%s' to '%s'", payload, fullurl)
+            payload_dict[entity_id] = state_helper.state_as_number(state)
+        except ValueError:
+            continue
 
+    if payload_dict:
+        try:
+            await emoncms_client.async_input_post(data=payload_dict, node=node)
+        except (aiohttp.ClientError, TimeoutError) as err:
+            _LOGGER.warning("Network error when sending data to Emoncms: %s", err)
+        except ValueError as err:
+            _LOGGER.warning("Value error when preparing data for Emoncms: %s", err)
         else:
-            if req.status_code != HTTPStatus.OK:
-                _LOGGER.error(
-                    "Error saving data %s to %s (http status code = %d)",
-                    payload,
-                    fullurl,
-                    req.status_code,
-                )
-
-    def update_emoncms(time):
-        """Send whitelisted entities states regularly to Emoncms."""
-        payload_dict = {}
-
-        for entity_id in whitelist:
-            state = hass.states.get(entity_id)
+            _LOGGER.debug("Sent data to Emoncms: %s", payload_dict)
 
-            if state is None or state.state in (STATE_UNKNOWN, "", STATE_UNAVAILABLE):
-                continue
 
-            try:
-                payload_dict[entity_id] = state_helper.state_as_number(state)
-            except ValueError:
-                continue
-
-        if payload_dict:
-            payload = ",".join(f"{key}:{val}" for key, val in payload_dict.items())
-
-            send_data(
-                conf.get(CONF_URL),
-                conf.get(CONF_API_KEY),
-                str(conf.get(CONF_INPUTNODE)),
-                f"{{{payload}}}",
-            )
-
-        track_point_in_time(
-            hass, update_emoncms, time + timedelta(seconds=conf.get(CONF_SCAN_INTERVAL))
-        )
+async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
+    """Set up the Emoncms history component."""
+    conf = config[DOMAIN]
+    whitelist = conf.get(CONF_WHITELIST)
+    input_node = str(conf.get(CONF_INPUTNODE))
+
+    emoncms_client = EmoncmsClient(
+        url=conf.get(CONF_URL),
+        api_key=conf.get(CONF_API_KEY),
+        session=async_get_clientsession(hass),
+    )
+    async_track_time_interval(
+        hass,
+        partial(async_send_to_emoncms, hass, emoncms_client, whitelist, input_node),
+        timedelta(seconds=conf.get(CONF_SCAN_INTERVAL)),
+    )
 
-    update_emoncms(dt_util.utcnow())
     return True

homeassistant/components/emoncms_history/manifest.json

@@ -1,8 +1,9 @@
 {
   "domain": "emoncms_history",
   "name": "Emoncms History",
-  "codeowners": [],
+  "codeowners": ["@alexandrecuer"],
   "documentation": "https://www.home-assistant.io/integrations/emoncms_history",
   "iot_class": "local_polling",
-  "quality_scale": "legacy"
+  "quality_scale": "legacy",
+  "requirements": ["pyemoncms==0.1.2"]
 }

homeassistant/components/frontend/__init__.py

@@ -50,7 +50,7 @@
 CONF_FRONTEND_REPO = "development_repo"
 CONF_JS_VERSION = "javascript_version"
 
-DEFAULT_THEME_COLOR = "#03A9F4"
+DEFAULT_THEME_COLOR = "#2980b9"
 
 
 DATA_PANELS: HassKey[dict[str, Panel]] = HassKey("frontend_panels")

homeassistant/components/hassio/issues.py

@@ -61,25 +61,27 @@
 
 UNSUPPORTED_REASONS = {
     "apparmor",
+    "cgroup_version",
     "connectivity_check",
     "content_trust",
     "dbus",
     "dns_server",
     "docker_configuration",
     "docker_version",
-    "cgroup_version",
     "job_conditions",
     "lxc",
     "network_manager",
     "os",
     "os_agent",
+    "os_version",
     "restart_policy",
     "software",
     "source_mods",
     "supervisor_version",
     "systemd",
     "systemd_journal",
     "systemd_resolved",
+    "virtualization_image",
 }
 # Some unsupported reasons also mark the system as unhealthy. If the unsupported reason
 # provides no additional information beyond the unhealthy one then skip that repair.

homeassistant/components/hassio/manifest.json

@@ -6,6 +6,6 @@
   "documentation": "https://www.home-assistant.io/integrations/hassio",
   "iot_class": "local_polling",
   "quality_scale": "internal",
-  "requirements": ["aiohasupervisor==0.3.1"],
+  "requirements": ["aiohasupervisor==0.3.2b0"],
   "single_config_entry": true
 }

homeassistant/components/icloud/services.py

@@ -8,7 +8,7 @@
 from homeassistant.helpers import config_validation as cv
 from homeassistant.util import slugify
 
-from .account import IcloudAccount
+from .account import IcloudAccount, IcloudConfigEntry
 from .const import (
     ATTR_ACCOUNT,
     ATTR_DEVICE_NAME,
@@ -92,8 +92,10 @@ def lost_device(service: ServiceCall) -> None:
 def update_account(service: ServiceCall) -> None:
     """Call the update function of an iCloud account."""
     if (account := service.data.get(ATTR_ACCOUNT)) is None:
-        for account in service.hass.data[DOMAIN].values():
-            account.keep_alive()
+        # Update all accounts when no specific account is provided
+        entry: IcloudConfigEntry
+        for entry in service.hass.config_entries.async_loaded_entries(DOMAIN):
+            entry.runtime_data.keep_alive()
     else:
         _get_account(service.hass, account).keep_alive()
 
@@ -102,17 +104,12 @@ def _get_account(hass: HomeAssistant, account_identifier: str) -> IcloudAccount:
     if account_identifier is None:
         return None
 
-    icloud_account: IcloudAccount | None = hass.data[DOMAIN].get(account_identifier)
-    if icloud_account is None:
-        for account in hass.data[DOMAIN].values():
-            if account.username == account_identifier:
-                icloud_account = account
-
-    if icloud_account is None:
-        raise ValueError(
-            f"No iCloud account with username or name {account_identifier}"
-        )
-    return icloud_account
+    entry: IcloudConfigEntry
+    for entry in hass.config_entries.async_loaded_entries(DOMAIN):
+        if entry.runtime_data.username == account_identifier:
+            return entry.runtime_data
+
+    raise ValueError(f"No iCloud account with username or name {account_identifier}")
 
 
 @callback

homeassistant/components/imeon_inverter/const.py

@@ -7,3 +7,26 @@
 PLATFORMS = [
     Platform.SENSOR,
 ]
+ATTR_BATTERY_STATUS = ["charging", "discharging", "charged"]
+ATTR_INVERTER_STATE = [
+    "unsynchronized",
+    "grid_consumption",
+    "grid_injection",
+    "grid_synchronised_but_not_used",
+]
+ATTR_TIMELINE_STATUS = [
+    "com_lost",
+    "warning_grid",
+    "warning_pv",
+    "warning_bat",
+    "error_ond",
+    "error_soft",
+    "error_pv",
+    "error_grid",
+    "error_bat",
+    "good_1",
+    "info_soft",
+    "info_ond",
+    "info_bat",
+    "info_smartlo",
+]