Add async_move_devices_and_entities_to_subentry helper

.github/ISSUE_TEMPLATE/task.yml

@@ -21,7 +21,7 @@ body:
   - type: textarea
     id: description
     attributes:
-      label: Description
+      label: Task description
       description: |
         Provide a clear and detailed description of the task that needs to be accomplished.
 
@@ -43,11 +43,9 @@ body:
 
         Include links to related issues, research, prototypes, roadmap opportunities etc.
       placeholder: |
-        - Roadmap opportunity: [link]
-        - Epic: [link]
+        - Roadmap opportunity: [links]
         - Feature request: [link]
         - Technical design documents: [link]
         - Prototype/mockup: [link]
-        - Dependencies: [links]
     validations:
       required: false

.github/copilot-instructions.md

@@ -45,12 +45,6 @@ rules:
 
 **When Reviewing/Creating Code**: Always check the integration's quality scale level and exemption status before applying rules.
 
-## Code Review Guidelines
-
-**When reviewing code, do NOT comment on:**
-- **Missing imports** - We use static analysis tooling to catch that
-- **Code formatting** - We have ruff as a formatting tool that will catch those if needed (unless specifically instructed otherwise in these instructions)
-
 ## Python Requirements
 
 - **Compatibility**: Python 3.13+

.github/dependabot.yml

@@ -6,6 +6,3 @@ updates:
       interval: daily
       time: "06:00"
     open-pull-requests-limit: 10
-    labels:
-      - dependency
-      - github_actions

.github/workflows/builder.yml

@@ -324,7 +324,7 @@ jobs:
         uses: actions/checkout@v4.2.2
 
       - name: Install Cosign
-        uses: sigstore/cosign-installer@v3.9.2
+        uses: sigstore/cosign-installer@v3.9.1
         with:
           cosign-release: "v2.2.3"
 

.github/workflows/codeql.yml

@@ -24,11 +24,11 @@ jobs:
         uses: actions/checkout@v4.2.2
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3.29.5
+        uses: github/codeql-action/init@v3.29.2
         with:
           languages: python
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3.29.5
+        uses: github/codeql-action/analyze@v3.29.2
         with:
           category: "/language:python"

.github/workflows/detect-duplicate-issues.yml

@@ -231,7 +231,7 @@ jobs:
       - name: Detect duplicates using AI
         id: ai_detection
         if: steps.extract.outputs.should_continue == 'true' && steps.fetch_similar.outputs.has_similar == 'true'
-        uses: actions/ai-inference@v1.2.3
+        uses: actions/ai-inference@v1.1.0
         with:
           model: openai/gpt-4o
           system-prompt: |

.github/workflows/detect-non-english-issues.yml

@@ -57,7 +57,7 @@ jobs:
       - name: Detect language using AI
         id: ai_language_detection
         if: steps.detect_language.outputs.should_continue == 'true'
-        uses: actions/ai-inference@v1.2.3
+        uses: actions/ai-inference@v1.1.0
         with:
           model: openai/gpt-4o-mini
           system-prompt: |

.strict-typing

@@ -53,7 +53,6 @@ homeassistant.components.air_quality.*
 homeassistant.components.airgradient.*
 homeassistant.components.airly.*
 homeassistant.components.airnow.*
-homeassistant.components.airos.*
 homeassistant.components.airq.*
 homeassistant.components.airthings.*
 homeassistant.components.airthings_ble.*
@@ -378,7 +377,6 @@ homeassistant.components.onedrive.*
 homeassistant.components.onewire.*
 homeassistant.components.onkyo.*
 homeassistant.components.open_meteo.*
-homeassistant.components.open_router.*
 homeassistant.components.openai_conversation.*
 homeassistant.components.openexchangerates.*
 homeassistant.components.opensky.*
@@ -502,7 +500,6 @@ homeassistant.components.tag.*
 homeassistant.components.tailscale.*
 homeassistant.components.tailwind.*
 homeassistant.components.tami4.*
-homeassistant.components.tankerkoenig.*
 homeassistant.components.tautulli.*
 homeassistant.components.tcp.*
 homeassistant.components.technove.*
@@ -538,7 +535,6 @@ homeassistant.components.unifiprotect.*
 homeassistant.components.upcloud.*
 homeassistant.components.update.*
 homeassistant.components.uptime.*
-homeassistant.components.uptime_kuma.*
 homeassistant.components.uptimerobot.*
 homeassistant.components.usb.*
 homeassistant.components.uvc.*
@@ -548,7 +544,6 @@ homeassistant.components.valve.*
 homeassistant.components.velbus.*
 homeassistant.components.vlc_telnet.*
 homeassistant.components.vodafone_station.*
-homeassistant.components.volvo.*
 homeassistant.components.wake_on_lan.*
 homeassistant.components.wake_word.*
 homeassistant.components.wallbox.*

CODEOWNERS

@@ -67,8 +67,6 @@ build.json @home-assistant/supervisor
 /tests/components/airly/ @bieniu
 /homeassistant/components/airnow/ @asymworks
 /tests/components/airnow/ @asymworks
-/homeassistant/components/airos/ @CoMPaTech
-/tests/components/airos/ @CoMPaTech
 /homeassistant/components/airq/ @Sibgatulin @dl2080
 /tests/components/airq/ @Sibgatulin @dl2080
 /homeassistant/components/airthings/ @danielhiversen @LaStrada
@@ -686,8 +684,8 @@ build.json @home-assistant/supervisor
 /tests/components/husqvarna_automower/ @Thomas55555
 /homeassistant/components/husqvarna_automower_ble/ @alistair23
 /tests/components/husqvarna_automower_ble/ @alistair23
-/homeassistant/components/huum/ @frwickst @vincentwolsink
-/tests/components/huum/ @frwickst @vincentwolsink
+/homeassistant/components/huum/ @frwickst
+/tests/components/huum/ @frwickst
 /homeassistant/components/hvv_departures/ @vigonotion
 /tests/components/hvv_departures/ @vigonotion
 /homeassistant/components/hydrawise/ @dknowles2 @thomaskistler @ptcryan
@@ -1104,8 +1102,6 @@ build.json @home-assistant/supervisor
 /tests/components/onvif/ @hunterjm @jterrace
 /homeassistant/components/open_meteo/ @frenck
 /tests/components/open_meteo/ @frenck
-/homeassistant/components/open_router/ @joostlek
-/tests/components/open_router/ @joostlek
 /homeassistant/components/openai_conversation/ @balloob
 /tests/components/openai_conversation/ @balloob
 /homeassistant/components/openerz/ @misialq
@@ -1662,8 +1658,6 @@ build.json @home-assistant/supervisor
 /tests/components/upnp/ @StevenLooman
 /homeassistant/components/uptime/ @frenck
 /tests/components/uptime/ @frenck
-/homeassistant/components/uptime_kuma/ @tr4nt0r
-/tests/components/uptime_kuma/ @tr4nt0r
 /homeassistant/components/uptimerobot/ @ludeeus @chemelli74
 /tests/components/uptimerobot/ @ludeeus @chemelli74
 /homeassistant/components/usb/ @bdraco
@@ -1708,8 +1702,6 @@ build.json @home-assistant/supervisor
 /tests/components/voip/ @balloob @synesthesiam @jaminh
 /homeassistant/components/volumio/ @OnFreund
 /tests/components/volumio/ @OnFreund
-/homeassistant/components/volvo/ @thomasddn
-/tests/components/volvo/ @thomasddn
 /homeassistant/components/volvooncall/ @molobrakos
 /tests/components/volvooncall/ @molobrakos
 /homeassistant/components/vulcan/ @Antoni-Czaplicki
@@ -1764,8 +1756,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/wirelesstag/ @sergeymaysak
 /homeassistant/components/withings/ @joostlek
 /tests/components/withings/ @joostlek
-/homeassistant/components/wiz/ @sbidy @arturpragacz
-/tests/components/wiz/ @sbidy @arturpragacz
+/homeassistant/components/wiz/ @sbidy
+/tests/components/wiz/ @sbidy
 /homeassistant/components/wled/ @frenck
 /tests/components/wled/ @frenck
 /homeassistant/components/wmspro/ @mback2k

homeassistant/bootstrap.py

@@ -332,9 +332,6 @@ async def async_setup_hass(
             if not is_virtual_env():
                 await async_mount_local_lib_path(runtime_config.config_dir)
 
-            if hass.config.safe_mode:
-                _LOGGER.info("Starting in safe mode")
-
             basic_setup_success = (
                 await async_from_config_dict(config_dict, hass) is not None
             )
@@ -387,6 +384,8 @@ async def async_setup_hass(
             {"recovery_mode": {}, "http": http_conf},
             hass,
         )
+    elif hass.config.safe_mode:
+        _LOGGER.info("Starting in safe mode")
 
     if runtime_config.open_ui:
         hass.add_job(open_hass_ui, hass)
@@ -695,10 +694,10 @@ async def async_mount_local_lib_path(config_dir: str) -> str:
 
 def _get_domains(hass: core.HomeAssistant, config: dict[str, Any]) -> set[str]:
     """Get domains of components to set up."""
-    # The common config section [homeassistant] could be filtered here,
-    # but that is not necessary, since it corresponds to the core integration,
-    # that is always unconditionally loaded.
-    domains = {cv.domain_key(key) for key in config}
+    # Filter out the repeating and common config section [homeassistant]
+    domains = {
+        domain for key in config if (domain := cv.domain_key(key)) != core.DOMAIN
+    }
 
     # Add config entry and default domains
     if not hass.config.recovery_mode:
@@ -726,28 +725,34 @@ async def _async_resolve_domains_and_preload(
       together with all their dependencies.
     """
     domains_to_setup = _get_domains(hass, config)
-
-    # Also process all base platforms since we do not require the manifest
-    # to list them as dependencies.
-    # We want to later avoid lock contention when multiple integrations try to load
-    # their manifests at once.
+    platform_integrations = conf_util.extract_platform_integrations(
+        config, BASE_PLATFORMS
+    )
+    # Ensure base platforms that have platform integrations are added to `domains`,
+    # so they can be setup first instead of discovering them later when a config
+    # entry setup task notices that it's needed and there is already a long line
+    # to use the import executor.
     #
-    # Additionally process integrations that are defined under base platforms
-    # to speed things up.
     # For example if we have
     # sensor:
     #   - platform: template
     #
-    # `template` has to be loaded to validate the config for sensor.
-    # The more platforms under `sensor:`, the longer
+    # `template` has to be loaded to validate the config for sensor
+    # so we want to start loading `sensor` as soon as we know
+    # it will be needed. The more platforms under `sensor:`, the longer
     # it will take to finish setup for `sensor` because each of these
     # platforms has to be imported before we can validate the config.
     #
     # Thankfully we are migrating away from the platform pattern
     # so this will be less of a problem in the future.
-    platform_integrations = conf_util.extract_platform_integrations(
-        config, BASE_PLATFORMS
-    )
+    domains_to_setup.update(platform_integrations)
+
+    # Additionally process base platforms since we do not require the manifest
+    # to list them as dependencies.
+    # We want to later avoid lock contention when multiple integrations try to load
+    # their manifests at once.
+    # Also process integrations that are defined under base platforms
+    # to speed things up.
     additional_domains_to_process = {
         *BASE_PLATFORMS,
         *chain.from_iterable(platform_integrations.values()),
@@ -865,9 +870,9 @@ async def _async_set_up_integrations(
     domains = set(integrations) & all_domains
 
     _LOGGER.info(
-        "Domains to be set up: %s\nDependencies: %s",
-        domains or "{}",
-        (all_domains - domains) or "{}",
+        "Domains to be set up: %s | %s",
+        domains,
+        all_domains - domains,
     )
 
     async_set_domains_to_be_loaded(hass, all_domains)
@@ -908,13 +913,12 @@ async def _async_set_up_integrations(
         stage_all_domains = stage_domains | stage_dep_domains
 
         _LOGGER.info(
-            "Setting up stage %s: %s; already set up: %s\n"
-            "Dependencies: %s; already set up: %s",
+            "Setting up stage %s: %s | %s\nDependencies: %s | %s",
             name,
             stage_domains,
-            (stage_domains_unfiltered - stage_domains) or "{}",
-            stage_dep_domains or "{}",
-            (stage_dep_domains_unfiltered - stage_dep_domains) or "{}",
+            stage_domains_unfiltered - stage_domains,
+            stage_dep_domains,
+            stage_dep_domains_unfiltered - stage_dep_domains,
         )
 
         if timeout is None:

homeassistant/brands/frient.json

@@ -1,5 +0,0 @@
-{
-  "domain": "frient",
-  "name": "Frient",
-  "iot_standards": ["zigbee"]
-}

homeassistant/brands/third_reality.json

@@ -1,5 +1,5 @@
 {
   "domain": "third_reality",
   "name": "Third Reality",
-  "iot_standards": ["matter", "zigbee"]
+  "iot_standards": ["zigbee"]
 }

homeassistant/brands/ubiquiti.json

@@ -1,5 +1,5 @@
 {
   "domain": "ubiquiti",
   "name": "Ubiquiti",
-  "integrations": ["airos", "unifi", "unifi_direct", "unifiled", "unifiprotect"]
+  "integrations": ["unifi", "unifi_direct", "unifiled", "unifiprotect"]
 }

homeassistant/components/ai_task/__init__.py

@@ -33,7 +33,7 @@ from .const import (
 )
 from .entity import AITaskEntity
 from .http import async_setup as async_setup_http
-from .task import GenDataTask, GenDataTaskResult, async_generate_data
+from .task import GenDataTask, GenDataTaskResult, PlayMediaWithId, async_generate_data
 
 __all__ = [
     "DOMAIN",
@@ -41,6 +41,7 @@ __all__ = [
     "AITaskEntityFeature",
     "GenDataTask",
     "GenDataTaskResult",
+    "PlayMediaWithId",
     "async_generate_data",
     "async_setup",
     "async_setup_entry",

homeassistant/components/ai_task/entity.py

@@ -13,7 +13,7 @@ from homeassistant.components.conversation import (
 )
 from homeassistant.const import STATE_UNAVAILABLE, STATE_UNKNOWN
 from homeassistant.helpers import llm
-from homeassistant.helpers.chat_session import ChatSession
+from homeassistant.helpers.chat_session import async_get_chat_session
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.util import dt as dt_util
 
@@ -56,12 +56,12 @@ class AITaskEntity(RestoreEntity):
     @contextlib.asynccontextmanager
     async def _async_get_ai_task_chat_log(
         self,
-        session: ChatSession,
         task: GenDataTask,
     ) -> AsyncGenerator[ChatLog]:
         """Context manager used to manage the ChatLog used during an AI Task."""
         # pylint: disable-next=contextmanager-generator-missing-cleanup
         with (
+            async_get_chat_session(self.hass) as session,
             async_get_chat_log(
                 self.hass,
                 session,
@@ -79,22 +79,19 @@ class AITaskEntity(RestoreEntity):
                 user_llm_prompt=DEFAULT_SYSTEM_PROMPT,
             )
 
-            chat_log.async_add_user_content(
-                UserContent(task.instructions, attachments=task.attachments)
-            )
+            chat_log.async_add_user_content(UserContent(task.instructions))
 
             yield chat_log
 
     @final
     async def internal_async_generate_data(
         self,
-        session: ChatSession,
         task: GenDataTask,
     ) -> GenDataTaskResult:
         """Run a gen data task."""
         self.__last_activity = dt_util.utcnow().isoformat()
         self.async_write_ha_state()
-        async with self._async_get_ai_task_chat_log(session, task) as chat_log:
+        async with self._async_get_ai_task_chat_log(task) as chat_log:
             return await self._async_generate_data(task, chat_log)
 
     async def _async_generate_data(

homeassistant/components/ai_task/manifest.json

@@ -1,7 +1,6 @@
 {
   "domain": "ai_task",
   "name": "AI Task",
-  "after_dependencies": ["camera"],
   "codeowners": ["@home-assistant/core"],
   "dependencies": ["conversation", "media_source"],
   "documentation": "https://www.home-assistant.io/integrations/ai_task",

homeassistant/components/ai_task/services.yaml

@@ -10,15 +10,13 @@ generate_data:
       required: true
       selector:
         text:
-          multiline: true
     entity_id:
       required: false
       selector:
         entity:
-          filter:
-            domain: ai_task
-            supported_features:
-              - ai_task.AITaskEntityFeature.GENERATE_DATA
+          domain: ai_task
+          supported_features:
+            - ai_task.AITaskEntityFeature.GENERATE_DATA
     structure:
       advanced: true
       required: false

homeassistant/components/ai_task/task.py

@@ -2,31 +2,28 @@
 
 from __future__ import annotations
 
-from dataclasses import dataclass
-import mimetypes
-from pathlib import Path
-import tempfile
+from dataclasses import dataclass, fields
 from typing import Any
 
 import voluptuous as vol
 
-from homeassistant.components import camera, conversation, media_source
-from homeassistant.core import HomeAssistant, callback
+from homeassistant.components import media_source
+from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.chat_session import async_get_chat_session
 
 from .const import DATA_COMPONENT, DATA_PREFERENCES, AITaskEntityFeature
 
 
-def _save_camera_snapshot(image: camera.Image) -> Path:
-    """Save camera snapshot to temp file."""
-    with tempfile.NamedTemporaryFile(
-        mode="wb",
-        suffix=mimetypes.guess_extension(image.content_type, False),
-        delete=False,
-    ) as temp_file:
-        temp_file.write(image.content)
-        return Path(temp_file.name)
+@dataclass(slots=True)
+class PlayMediaWithId(media_source.PlayMedia):
+    """Play media with a media content ID."""
+
+    media_content_id: str
+    """Media source ID to play."""
+
+    def __str__(self) -> str:
+        """Return media source ID as a string."""
+        return f"<PlayMediaWithId {self.media_content_id}>"
 
 
 async def async_generate_data(
@@ -55,79 +52,38 @@ async def async_generate_data(
         )
 
     # Resolve attachments
-    resolved_attachments: list[conversation.Attachment] = []
-    created_files: list[Path] = []
+    resolved_attachments: list[PlayMediaWithId] | None = None
 
-    if (
-        attachments
-        and AITaskEntityFeature.SUPPORT_ATTACHMENTS not in entity.supported_features
-    ):
-        raise HomeAssistantError(
-            f"AI Task entity {entity_id} does not support attachments"
-        )
-
-    for attachment in attachments or []:
-        media_content_id = attachment["media_content_id"]
-
-        # Special case for camera media sources
-        if media_content_id.startswith("media-source://camera/"):
-            # Extract entity_id from the media content ID
-            entity_id = media_content_id.removeprefix("media-source://camera/")
-
-            # Get snapshot from camera
-            image = await camera.async_get_image(hass, entity_id)
-
-            temp_filename = await hass.async_add_executor_job(
-                _save_camera_snapshot, image
+    if attachments:
+        if AITaskEntityFeature.SUPPORT_ATTACHMENTS not in entity.supported_features:
+            raise HomeAssistantError(
+                f"AI Task entity {entity_id} does not support attachments"
             )
-            created_files.append(temp_filename)
 
+        resolved_attachments = []
+
+        for attachment in attachments:
+            media = await media_source.async_resolve_media(
+                hass, attachment["media_content_id"], None
+            )
             resolved_attachments.append(
-                conversation.Attachment(
-                    media_content_id=media_content_id,
-                    mime_type=image.content_type,
-                    path=temp_filename,
-                )
-            )
-        else:
-            # Handle regular media sources
-            media = await media_source.async_resolve_media(hass, media_content_id, None)
-            if media.path is None:
-                raise HomeAssistantError(
-                    "Only local attachments are currently supported"
-                )
-            resolved_attachments.append(
-                conversation.Attachment(
-                    media_content_id=media_content_id,
-                    mime_type=media.mime_type,
-                    path=media.path,
+                PlayMediaWithId(
+                    **{
+                        field.name: getattr(media, field.name)
+                        for field in fields(media)
+                    },
+                    media_content_id=attachment["media_content_id"],
                 )
             )
 
-    with async_get_chat_session(hass) as session:
-        if created_files:
-
-            def cleanup_files() -> None:
-                """Cleanup temporary files."""
-                for file in created_files:
-                    file.unlink(missing_ok=True)
-
-            @callback
-            def cleanup_files_callback() -> None:
-                """Cleanup temporary files."""
-                hass.async_add_executor_job(cleanup_files)
-
-            session.async_on_cleanup(cleanup_files_callback)
-
-        return await entity.internal_async_generate_data(
-            session,
-            GenDataTask(
-                name=task_name,
-                instructions=instructions,
-                structure=structure,
-                attachments=resolved_attachments or None,
-            ),
+    return await entity.internal_async_generate_data(
+        GenDataTask(
+            name=task_name,
+            instructions=instructions,
+            structure=structure,
+            attachments=resolved_attachments,
         )
+    )
 
 
 @dataclass(slots=True)
@@ -143,7 +99,7 @@ class GenDataTask:
     structure: vol.Schema | None = None
     """Optional structure for the data to be generated."""
 
-    attachments: list[conversation.Attachment] | None = None
+    attachments: list[PlayMediaWithId] | None = None
     """List of attachments to go along the instructions."""
 
     def __str__(self) -> str:

homeassistant/components/airgradient/manifest.json

@@ -6,7 +6,6 @@
   "documentation": "https://www.home-assistant.io/integrations/airgradient",
   "integration_type": "device",
   "iot_class": "local_polling",
-  "quality_scale": "platinum",
   "requirements": ["airgradient==0.9.2"],
   "zeroconf": ["_airgradient._tcp.local."]
 }

homeassistant/components/airgradient/quality_scale.yaml

@@ -14,9 +14,9 @@ rules:
     status: exempt
     comment: |
       This integration does not provide additional actions.
-  docs-high-level-description: done
-  docs-installation-instructions: done
-  docs-removal-instructions: done
+  docs-high-level-description: todo
+  docs-installation-instructions: todo
+  docs-removal-instructions: todo
   entity-event-setup:
     status: exempt
     comment: |
@@ -34,7 +34,7 @@ rules:
   docs-configuration-parameters:
     status: exempt
     comment: No options to configure
-  docs-installation-parameters: done
+  docs-installation-parameters: todo
   entity-unavailable: done
   integration-owner: done
   log-when-unavailable: done
@@ -43,19 +43,23 @@ rules:
     status: exempt
     comment: |
       This integration does not require authentication.
-  test-coverage: done
+  test-coverage: todo
   # Gold
   devices: done
   diagnostics: done
-  discovery-update-info: done
-  discovery: done
-  docs-data-update: done
-  docs-examples: done
-  docs-known-limitations: done
-  docs-supported-devices: done
-  docs-supported-functions: done
-  docs-troubleshooting: done
-  docs-use-cases: done
+  discovery-update-info:
+    status: todo
+    comment: DHCP is still possible
+  discovery:
+    status: todo
+    comment: DHCP is still possible
+  docs-data-update: todo
+  docs-examples: todo
+  docs-known-limitations: todo
+  docs-supported-devices: todo
+  docs-supported-functions: todo
+  docs-troubleshooting: todo
+  docs-use-cases: todo
   dynamic-devices:
     status: exempt
     comment: |

homeassistant/components/airnow/__init__.py

@@ -45,6 +45,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: AirNowConfigEntry) -> bo
     # Store Entity and Initialize Platforms
     entry.runtime_data = coordinator
 
+    # Listen for option changes
+    entry.async_on_unload(entry.add_update_listener(update_listener))
+
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     # Clean up unused device entries with no entities
@@ -85,3 +88,8 @@ async def async_migrate_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 async def async_unload_entry(hass: HomeAssistant, entry: AirNowConfigEntry) -> bool:
     """Unload a config entry."""
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+
+
+async def update_listener(hass: HomeAssistant, entry: ConfigEntry) -> None:
+    """Handle options update."""
+    await hass.config_entries.async_reload(entry.entry_id)

homeassistant/components/airnow/config_flow.py

@@ -13,7 +13,7 @@ from homeassistant.config_entries import (
     ConfigEntry,
     ConfigFlow,
     ConfigFlowResult,
-    OptionsFlowWithReload,
+    OptionsFlow,
 )
 from homeassistant.const import CONF_API_KEY, CONF_LATITUDE, CONF_LONGITUDE, CONF_RADIUS
 from homeassistant.core import HomeAssistant, callback
@@ -126,7 +126,7 @@ class AirNowConfigFlow(ConfigFlow, domain=DOMAIN):
         return AirNowOptionsFlowHandler()
 
 
-class AirNowOptionsFlowHandler(OptionsFlowWithReload):
+class AirNowOptionsFlowHandler(OptionsFlow):
     """Handle an options flow for AirNow."""
 
     async def async_step_init(

homeassistant/components/airos/__init__.py

@@ -1,42 +0,0 @@
-"""The Ubiquiti airOS integration."""
-
-from __future__ import annotations
-
-from airos.airos8 import AirOS
-
-from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME, Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
-
-from .coordinator import AirOSConfigEntry, AirOSDataUpdateCoordinator
-
-_PLATFORMS: list[Platform] = [Platform.SENSOR]
-
-
-async def async_setup_entry(hass: HomeAssistant, entry: AirOSConfigEntry) -> bool:
-    """Set up Ubiquiti airOS from a config entry."""
-
-    # By default airOS 8 comes with self-signed SSL certificates,
-    # with no option in the web UI to change or upload a custom certificate.
-    session = async_get_clientsession(hass, verify_ssl=False)
-
-    airos_device = AirOS(
-        host=entry.data[CONF_HOST],
-        username=entry.data[CONF_USERNAME],
-        password=entry.data[CONF_PASSWORD],
-        session=session,
-    )
-
-    coordinator = AirOSDataUpdateCoordinator(hass, entry, airos_device)
-    await coordinator.async_config_entry_first_refresh()
-
-    entry.runtime_data = coordinator
-
-    await hass.config_entries.async_forward_entry_setups(entry, _PLATFORMS)
-
-    return True
-
-
-async def async_unload_entry(hass: HomeAssistant, entry: AirOSConfigEntry) -> bool:
-    """Unload a config entry."""
-    return await hass.config_entries.async_unload_platforms(entry, _PLATFORMS)

homeassistant/components/airos/config_flow.py

@@ -1,82 +0,0 @@
-"""Config flow for the Ubiquiti airOS integration."""
-
-from __future__ import annotations
-
-import logging
-from typing import Any
-
-from airos.exceptions import (
-    ConnectionAuthenticationError,
-    ConnectionSetupError,
-    DataMissingError,
-    DeviceConnectionError,
-    KeyDataMissingError,
-)
-import voluptuous as vol
-
-from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
-
-from .const import DOMAIN
-from .coordinator import AirOS
-
-_LOGGER = logging.getLogger(__name__)
-
-STEP_USER_DATA_SCHEMA = vol.Schema(
-    {
-        vol.Required(CONF_HOST): str,
-        vol.Required(CONF_USERNAME, default="ubnt"): str,
-        vol.Required(CONF_PASSWORD): str,
-    }
-)
-
-
-class AirOSConfigFlow(ConfigFlow, domain=DOMAIN):
-    """Handle a config flow for Ubiquiti airOS."""
-
-    VERSION = 1
-
-    async def async_step_user(
-        self,
-        user_input: dict[str, Any] | None = None,
-    ) -> ConfigFlowResult:
-        """Handle the initial step."""
-        errors: dict[str, str] = {}
-        if user_input is not None:
-            # By default airOS 8 comes with self-signed SSL certificates,
-            # with no option in the web UI to change or upload a custom certificate.
-            session = async_get_clientsession(self.hass, verify_ssl=False)
-
-            airos_device = AirOS(
-                host=user_input[CONF_HOST],
-                username=user_input[CONF_USERNAME],
-                password=user_input[CONF_PASSWORD],
-                session=session,
-            )
-            try:
-                await airos_device.login()
-                airos_data = await airos_device.status()
-
-            except (
-                ConnectionSetupError,
-                DeviceConnectionError,
-            ):
-                errors["base"] = "cannot_connect"
-            except (ConnectionAuthenticationError, DataMissingError):
-                errors["base"] = "invalid_auth"
-            except KeyDataMissingError:
-                errors["base"] = "key_data_missing"
-            except Exception:
-                _LOGGER.exception("Unexpected exception")
-                errors["base"] = "unknown"
-            else:
-                await self.async_set_unique_id(airos_data.derived.mac)
-                self._abort_if_unique_id_configured()
-                return self.async_create_entry(
-                    title=airos_data.host.hostname, data=user_input
-                )
-
-        return self.async_show_form(
-            step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=errors
-        )

homeassistant/components/airos/const.py

@@ -1,9 +0,0 @@
-"""Constants for the Ubiquiti airOS integration."""
-
-from datetime import timedelta
-
-DOMAIN = "airos"
-
-SCAN_INTERVAL = timedelta(minutes=1)
-
-MANUFACTURER = "Ubiquiti"

homeassistant/components/airos/coordinator.py

@@ -1,66 +0,0 @@
-"""DataUpdateCoordinator for AirOS."""
-
-from __future__ import annotations
-
-import logging
-
-from airos.airos8 import AirOS, AirOSData
-from airos.exceptions import (
-    ConnectionAuthenticationError,
-    ConnectionSetupError,
-    DataMissingError,
-    DeviceConnectionError,
-)
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryError
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-
-from .const import DOMAIN, SCAN_INTERVAL
-
-_LOGGER = logging.getLogger(__name__)
-
-type AirOSConfigEntry = ConfigEntry[AirOSDataUpdateCoordinator]
-
-
-class AirOSDataUpdateCoordinator(DataUpdateCoordinator[AirOSData]):
-    """Class to manage fetching AirOS data from single endpoint."""
-
-    config_entry: AirOSConfigEntry
-
-    def __init__(
-        self, hass: HomeAssistant, config_entry: AirOSConfigEntry, airos_device: AirOS
-    ) -> None:
-        """Initialize the coordinator."""
-        self.airos_device = airos_device
-        super().__init__(
-            hass,
-            _LOGGER,
-            config_entry=config_entry,
-            name=DOMAIN,
-            update_interval=SCAN_INTERVAL,
-        )
-
-    async def _async_update_data(self) -> AirOSData:
-        """Fetch data from AirOS."""
-        try:
-            await self.airos_device.login()
-            return await self.airos_device.status()
-        except (ConnectionAuthenticationError,) as err:
-            _LOGGER.exception("Error authenticating with airOS device")
-            raise ConfigEntryError(
-                translation_domain=DOMAIN, translation_key="invalid_auth"
-            ) from err
-        except (ConnectionSetupError, DeviceConnectionError, TimeoutError) as err:
-            _LOGGER.error("Error connecting to airOS device: %s", err)
-            raise UpdateFailed(
-                translation_domain=DOMAIN,
-                translation_key="cannot_connect",
-            ) from err
-        except (DataMissingError,) as err:
-            _LOGGER.error("Expected data not returned by airOS device: %s", err)
-            raise UpdateFailed(
-                translation_domain=DOMAIN,
-                translation_key="error_data_missing",
-            ) from err

homeassistant/components/airos/entity.py

@@ -1,36 +0,0 @@
-"""Generic AirOS Entity Class."""
-
-from __future__ import annotations
-
-from homeassistant.const import CONF_HOST
-from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC, DeviceInfo
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
-
-from .const import DOMAIN, MANUFACTURER
-from .coordinator import AirOSDataUpdateCoordinator
-
-
-class AirOSEntity(CoordinatorEntity[AirOSDataUpdateCoordinator]):
-    """Represent a AirOS Entity."""
-
-    _attr_has_entity_name = True
-
-    def __init__(self, coordinator: AirOSDataUpdateCoordinator) -> None:
-        """Initialise the gateway."""
-        super().__init__(coordinator)
-
-        airos_data = self.coordinator.data
-
-        configuration_url: str | None = (
-            f"https://{coordinator.config_entry.data[CONF_HOST]}"
-        )
-
-        self._attr_device_info = DeviceInfo(
-            connections={(CONNECTION_NETWORK_MAC, airos_data.derived.mac)},
-            configuration_url=configuration_url,
-            identifiers={(DOMAIN, str(airos_data.host.device_id))},
-            manufacturer=MANUFACTURER,
-            model=airos_data.host.devmodel,
-            name=airos_data.host.hostname,
-            sw_version=airos_data.host.fwversion,
-        )

homeassistant/components/airos/manifest.json

@@ -1,10 +0,0 @@
-{
-  "domain": "airos",
-  "name": "Ubiquiti airOS",
-  "codeowners": ["@CoMPaTech"],
-  "config_flow": true,
-  "documentation": "https://www.home-assistant.io/integrations/airos",
-  "iot_class": "local_polling",
-  "quality_scale": "bronze",
-  "requirements": ["airos==0.2.1"]
-}

homeassistant/components/airos/quality_scale.yaml

@@ -1,72 +0,0 @@
-rules:
-  # Bronze
-  action-setup:
-    status: exempt
-    comment: airOS does not have actions
-  appropriate-polling: done
-  brands: done
-  common-modules: done
-  config-flow-test-coverage: done
-  config-flow: done
-  dependency-transparency: done
-  docs-actions:
-    status: exempt
-    comment: airOS does not have actions
-  docs-high-level-description: done
-  docs-installation-instructions: done
-  docs-removal-instructions: done
-  entity-event-setup:
-    status: exempt
-    comment: local_polling without events
-  entity-unique-id: done
-  has-entity-name: done
-  runtime-data: done
-  test-before-configure: done
-  test-before-setup: done
-  unique-config-entry: done
-
-  # Silver
-  action-exceptions:
-    status: exempt
-    comment: airOS does not have actions
-  config-entry-unloading: done
-  docs-configuration-parameters: done
-  docs-installation-parameters: done
-  entity-unavailable: todo
-  integration-owner: done
-  log-when-unavailable: todo
-  parallel-updates: todo
-  reauthentication-flow: todo
-  test-coverage: done
-
-  # Gold
-  devices: done
-  diagnostics: todo
-  discovery-update-info: todo
-  discovery: todo
-  docs-data-update: done
-  docs-examples: todo
-  docs-known-limitations: done
-  docs-supported-devices: done
-  docs-supported-functions: todo
-  docs-troubleshooting: done
-  docs-use-cases: todo
-  dynamic-devices: todo
-  entity-category: done
-  entity-device-class: done
-  entity-disabled-by-default:
-    status: todo
-    comment: prepared binary_sensors will provide this
-  entity-translations: done
-  exception-translations: done
-  icon-translations:
-    status: exempt
-    comment: no (custom) icons used or envisioned
-  reconfiguration-flow: todo
-  repair-issues: todo
-  stale-devices: todo
-
-  # Platinum
-  async-dependency: done
-  inject-websession: done
-  strict-typing: done

homeassistant/components/airos/sensor.py

@@ -1,152 +0,0 @@
-"""AirOS Sensor component for Home Assistant."""
-
-from __future__ import annotations
-
-from collections.abc import Callable
-from dataclasses import dataclass
-import logging
-
-from airos.data import NetRole, WirelessMode
-
-from homeassistant.components.sensor import (
-    SensorDeviceClass,
-    SensorEntity,
-    SensorEntityDescription,
-    SensorStateClass,
-)
-from homeassistant.const import (
-    PERCENTAGE,
-    SIGNAL_STRENGTH_DECIBELS,
-    UnitOfDataRate,
-    UnitOfFrequency,
-)
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-from homeassistant.helpers.typing import StateType
-
-from .coordinator import AirOSConfigEntry, AirOSData, AirOSDataUpdateCoordinator
-from .entity import AirOSEntity
-
-_LOGGER = logging.getLogger(__name__)
-
-WIRELESS_MODE_OPTIONS = [mode.value.replace("-", "_").lower() for mode in WirelessMode]
-NETROLE_OPTIONS = [mode.value for mode in NetRole]
-
-
-@dataclass(frozen=True, kw_only=True)
-class AirOSSensorEntityDescription(SensorEntityDescription):
-    """Describe an AirOS sensor."""
-
-    value_fn: Callable[[AirOSData], StateType]
-
-
-SENSORS: tuple[AirOSSensorEntityDescription, ...] = (
-    AirOSSensorEntityDescription(
-        key="host_cpuload",
-        translation_key="host_cpuload",
-        native_unit_of_measurement=PERCENTAGE,
-        state_class=SensorStateClass.MEASUREMENT,
-        value_fn=lambda data: data.host.cpuload,
-        entity_registry_enabled_default=False,
-    ),
-    AirOSSensorEntityDescription(
-        key="host_netrole",
-        translation_key="host_netrole",
-        device_class=SensorDeviceClass.ENUM,
-        value_fn=lambda data: data.host.netrole.value,
-        options=NETROLE_OPTIONS,
-    ),
-    AirOSSensorEntityDescription(
-        key="wireless_frequency",
-        translation_key="wireless_frequency",
-        native_unit_of_measurement=UnitOfFrequency.MEGAHERTZ,
-        device_class=SensorDeviceClass.FREQUENCY,
-        state_class=SensorStateClass.MEASUREMENT,
-        value_fn=lambda data: data.wireless.frequency,
-    ),
-    AirOSSensorEntityDescription(
-        key="wireless_essid",
-        translation_key="wireless_essid",
-        value_fn=lambda data: data.wireless.essid,
-    ),
-    AirOSSensorEntityDescription(
-        key="wireless_mode",
-        translation_key="wireless_mode",
-        device_class=SensorDeviceClass.ENUM,
-        value_fn=lambda data: data.wireless.mode.value.replace("-", "_").lower(),
-        options=WIRELESS_MODE_OPTIONS,
-    ),
-    AirOSSensorEntityDescription(
-        key="wireless_antenna_gain",
-        translation_key="wireless_antenna_gain",
-        native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS,
-        device_class=SensorDeviceClass.SIGNAL_STRENGTH,
-        state_class=SensorStateClass.MEASUREMENT,
-        value_fn=lambda data: data.wireless.antenna_gain,
-    ),
-    AirOSSensorEntityDescription(
-        key="wireless_throughput_tx",
-        translation_key="wireless_throughput_tx",
-        native_unit_of_measurement=UnitOfDataRate.KILOBITS_PER_SECOND,
-        device_class=SensorDeviceClass.DATA_RATE,
-        state_class=SensorStateClass.MEASUREMENT,
-        value_fn=lambda data: data.wireless.throughput.tx,
-    ),
-    AirOSSensorEntityDescription(
-        key="wireless_throughput_rx",
-        translation_key="wireless_throughput_rx",
-        native_unit_of_measurement=UnitOfDataRate.KILOBITS_PER_SECOND,
-        device_class=SensorDeviceClass.DATA_RATE,
-        state_class=SensorStateClass.MEASUREMENT,
-        value_fn=lambda data: data.wireless.throughput.rx,
-    ),
-    AirOSSensorEntityDescription(
-        key="wireless_polling_dl_capacity",
-        translation_key="wireless_polling_dl_capacity",
-        native_unit_of_measurement=UnitOfDataRate.KILOBITS_PER_SECOND,
-        device_class=SensorDeviceClass.DATA_RATE,
-        state_class=SensorStateClass.MEASUREMENT,
-        value_fn=lambda data: data.wireless.polling.dl_capacity,
-    ),
-    AirOSSensorEntityDescription(
-        key="wireless_polling_ul_capacity",
-        translation_key="wireless_polling_ul_capacity",
-        native_unit_of_measurement=UnitOfDataRate.KILOBITS_PER_SECOND,
-        device_class=SensorDeviceClass.DATA_RATE,
-        state_class=SensorStateClass.MEASUREMENT,
-        value_fn=lambda data: data.wireless.polling.ul_capacity,
-    ),
-)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: AirOSConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up the AirOS sensors from a config entry."""
-    coordinator = config_entry.runtime_data
-
-    async_add_entities(AirOSSensor(coordinator, description) for description in SENSORS)
-
-
-class AirOSSensor(AirOSEntity, SensorEntity):
-    """Representation of a Sensor."""
-
-    entity_description: AirOSSensorEntityDescription
-
-    def __init__(
-        self,
-        coordinator: AirOSDataUpdateCoordinator,
-        description: AirOSSensorEntityDescription,
-    ) -> None:
-        """Initialize the sensor."""
-        super().__init__(coordinator)
-
-        self.entity_description = description
-        self._attr_unique_id = f"{coordinator.data.derived.mac}_{description.key}"
-
-    @property
-    def native_value(self) -> StateType:
-        """Return the state of the sensor."""
-        return self.entity_description.value_fn(self.coordinator.data)

homeassistant/components/airos/strings.json

@@ -1,87 +0,0 @@
-{
-  "config": {
-    "flow_title": "Ubiquiti airOS device",
-    "step": {
-      "user": {
-        "data": {
-          "host": "[%key:common::config_flow::data::host%]",
-          "username": "[%key:common::config_flow::data::username%]",
-          "password": "[%key:common::config_flow::data::password%]"
-        },
-        "data_description": {
-          "host": "IP address or hostname of the airOS device",
-          "username": "Administrator username for the airOS device, normally 'ubnt'",
-          "password": "Password configured through the UISP app or web interface"
-        }
-      }
-    },
-    "error": {
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
-      "key_data_missing": "Expected data not returned from the device, check the documentation for supported devices",
-      "unknown": "[%key:common::config_flow::error::unknown%]"
-    },
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
-    }
-  },
-  "entity": {
-    "sensor": {
-      "host_cpuload": {
-        "name": "CPU load"
-      },
-      "host_netrole": {
-        "name": "Network role",
-        "state": {
-          "bridge": "Bridge",
-          "router": "Router"
-        }
-      },
-      "wireless_frequency": {
-        "name": "Wireless frequency"
-      },
-      "wireless_essid": {
-        "name": "Wireless SSID"
-      },
-      "wireless_mode": {
-        "name": "Wireless mode",
-        "state": {
-          "ap_ptp": "Access point",
-          "sta_ptp": "Station"
-        }
-      },
-      "wireless_antenna_gain": {
-        "name": "Antenna gain"
-      },
-      "wireless_throughput_tx": {
-        "name": "Throughput transmit (actual)"
-      },
-      "wireless_throughput_rx": {
-        "name": "Throughput receive (actual)"
-      },
-      "wireless_polling_dl_capacity": {
-        "name": "Download capacity"
-      },
-      "wireless_polling_ul_capacity": {
-        "name": "Upload capacity"
-      },
-      "wireless_remote_hostname": {
-        "name": "Remote hostname"
-      }
-    }
-  },
-  "exceptions": {
-    "invalid_auth": {
-      "message": "[%key:common::config_flow::error::invalid_auth%]"
-    },
-    "cannot_connect": {
-      "message": "[%key:common::config_flow::error::cannot_connect%]"
-    },
-    "key_data_missing": {
-      "message": "Key data not returned from device"
-    },
-    "error_data_missing": {
-      "message": "Data incomplete or missing"
-    }
-  }
-}

homeassistant/components/airq/const.py

@@ -6,5 +6,6 @@ CONF_RETURN_AVERAGE: Final = "return_average"
 CONF_CLIP_NEGATIVE: Final = "clip_negatives"
 DOMAIN: Final = "airq"
 MANUFACTURER: Final = "CorantGmbH"
+CONCENTRATION_GRAMS_PER_CUBIC_METER: Final = "g/m³"
 ACTIVITY_BECQUEREL_PER_CUBIC_METER: Final = "Bq/m³"
 UPDATE_INTERVAL: float = 10.0

homeassistant/components/airq/icons.json

@@ -4,6 +4,9 @@
       "health_index": {
         "default": "mdi:heart-pulse"
       },
+      "absolute_humidity": {
+        "default": "mdi:water"
+      },
       "oxygen": {
         "default": "mdi:leaf"
       },

homeassistant/components/airq/sensor.py

@@ -14,7 +14,6 @@ from homeassistant.components.sensor import (
     SensorStateClass,
 )
 from homeassistant.const import (
-    CONCENTRATION_GRAMS_PER_CUBIC_METER,
     CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     CONCENTRATION_MILLIGRAMS_PER_CUBIC_METER,
     CONCENTRATION_PARTS_PER_BILLION,
@@ -29,7 +28,10 @@ from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from . import AirQConfigEntry, AirQCoordinator
-from .const import ACTIVITY_BECQUEREL_PER_CUBIC_METER
+from .const import (
+    ACTIVITY_BECQUEREL_PER_CUBIC_METER,
+    CONCENTRATION_GRAMS_PER_CUBIC_METER,
+)
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -193,7 +195,7 @@ SENSOR_TYPES: list[AirQEntityDescription] = [
     ),
     AirQEntityDescription(
         key="humidity_abs",
-        device_class=SensorDeviceClass.ABSOLUTE_HUMIDITY,
+        translation_key="absolute_humidity",
         native_unit_of_measurement=CONCENTRATION_GRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value=lambda data: data.get("humidity_abs"),

homeassistant/components/airq/strings.json

@@ -93,6 +93,9 @@
       "health_index": {
         "name": "Health index"
       },
+      "absolute_humidity": {
+        "name": "Absolute humidity"
+      },
       "hydrogen": {
         "name": "Hydrogen"
       },

homeassistant/components/airthings/config_flow.py

@@ -45,8 +45,6 @@ class AirthingsConfigFlow(ConfigFlow, domain=DOMAIN):
             )
 
         errors = {}
-        await self.async_set_unique_id(user_input[CONF_ID])
-        self._abort_if_unique_id_configured()
 
         try:
             await airthings.get_token(
@@ -62,6 +60,9 @@ class AirthingsConfigFlow(ConfigFlow, domain=DOMAIN):
             _LOGGER.exception("Unexpected exception")
             errors["base"] = "unknown"
         else:
+            await self.async_set_unique_id(user_input[CONF_ID])
+            self._abort_if_unique_id_configured()
+
             return self.async_create_entry(title="Airthings", data=user_input)
 
         return self.async_show_form(

homeassistant/components/airthings/sensor.py

@@ -150,7 +150,7 @@ async def async_setup_entry(
 
     coordinator = entry.runtime_data
     entities = [
-        AirthingsDeviceSensor(
+        AirthingsHeaterEnergySensor(
             coordinator,
             airthings_device,
             SENSORS[sensor_types],
@@ -162,7 +162,7 @@ async def async_setup_entry(
     async_add_entities(entities)
 
 
-class AirthingsDeviceSensor(
+class AirthingsHeaterEnergySensor(
     CoordinatorEntity[AirthingsDataUpdateCoordinator], SensorEntity
 ):
     """Representation of a Airthings Sensor device."""

homeassistant/components/airzone_cloud/manifest.json

@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/airzone_cloud",
   "iot_class": "cloud_push",
   "loggers": ["aioairzone_cloud"],
-  "requirements": ["aioairzone-cloud==0.7.1"]
+  "requirements": ["aioairzone-cloud==0.6.12"]
 }

homeassistant/components/alexa/entities.py

@@ -505,13 +505,8 @@ class ClimateCapabilities(AlexaEntity):
         ):
             yield AlexaThermostatController(self.hass, self.entity)
             yield AlexaTemperatureSensor(self.hass, self.entity)
-        if (
-            self.entity.domain == water_heater.DOMAIN
-            and (
-                supported_features
-                & water_heater.WaterHeaterEntityFeature.OPERATION_MODE
-            )
-            and self.entity.attributes.get(water_heater.ATTR_OPERATION_LIST)
+        if self.entity.domain == water_heater.DOMAIN and (
+            supported_features & water_heater.WaterHeaterEntityFeature.OPERATION_MODE
         ):
             yield AlexaModeController(
                 self.entity,
@@ -639,9 +634,7 @@ class FanCapabilities(AlexaEntity):
                 self.entity, instance=f"{fan.DOMAIN}.{fan.ATTR_OSCILLATING}"
             )
             force_range_controller = False
-        if supported & fan.FanEntityFeature.PRESET_MODE and self.entity.attributes.get(
-            fan.ATTR_PRESET_MODES
-        ):
+        if supported & fan.FanEntityFeature.PRESET_MODE:
             yield AlexaModeController(
                 self.entity, instance=f"{fan.DOMAIN}.{fan.ATTR_PRESET_MODE}"
             )
@@ -679,11 +672,7 @@ class RemoteCapabilities(AlexaEntity):
         yield AlexaPowerController(self.entity)
         supported = self.entity.attributes.get(ATTR_SUPPORTED_FEATURES, 0)
         activities = self.entity.attributes.get(remote.ATTR_ACTIVITY_LIST) or []
-        if (
-            activities
-            and (supported & remote.RemoteEntityFeature.ACTIVITY)
-            and self.entity.attributes.get(remote.ATTR_ACTIVITY_LIST)
-        ):
+        if activities and supported & remote.RemoteEntityFeature.ACTIVITY:
             yield AlexaModeController(
                 self.entity, instance=f"{remote.DOMAIN}.{remote.ATTR_ACTIVITY}"
             )
@@ -703,9 +692,7 @@ class HumidifierCapabilities(AlexaEntity):
         """Yield the supported interfaces."""
         yield AlexaPowerController(self.entity)
         supported = self.entity.attributes.get(ATTR_SUPPORTED_FEATURES, 0)
-        if (
-            supported & humidifier.HumidifierEntityFeature.MODES
-        ) and self.entity.attributes.get(humidifier.ATTR_AVAILABLE_MODES):
+        if supported & humidifier.HumidifierEntityFeature.MODES:
             yield AlexaModeController(
                 self.entity, instance=f"{humidifier.DOMAIN}.{humidifier.ATTR_MODE}"
             )

homeassistant/components/alexa_devices/__init__.py

@@ -2,12 +2,8 @@
 
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import aiohttp_client, config_validation as cv
-from homeassistant.helpers.typing import ConfigType
 
-from .const import DOMAIN
 from .coordinator import AmazonConfigEntry, AmazonDevicesCoordinator
-from .services import async_setup_services
 
 PLATFORMS = [
     Platform.BINARY_SENSOR,
@@ -16,20 +12,11 @@ PLATFORMS = [
     Platform.SWITCH,
 ]
 
-CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
-
-
-async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the Alexa Devices component."""
-    async_setup_services(hass)
-    return True
-
 
 async def async_setup_entry(hass: HomeAssistant, entry: AmazonConfigEntry) -> bool:
     """Set up Alexa Devices platform."""
 
-    session = aiohttp_client.async_create_clientsession(hass)
-    coordinator = AmazonDevicesCoordinator(hass, entry, session)
+    coordinator = AmazonDevicesCoordinator(hass, entry)
 
     await coordinator.async_config_entry_first_refresh()
 
@@ -42,4 +29,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: AmazonConfigEntry) -> bo
 
 async def async_unload_entry(hass: HomeAssistant, entry: AmazonConfigEntry) -> bool:
     """Unload a config entry."""
-    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+    coordinator = entry.runtime_data
+    if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
+        await coordinator.api.close()
+
+    return unload_ok

homeassistant/components/alexa_devices/config_flow.py

@@ -17,7 +17,6 @@ import voluptuous as vol
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_CODE, CONF_COUNTRY, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import aiohttp_client
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.selector import CountrySelector
 
@@ -34,15 +33,18 @@ STEP_REAUTH_DATA_SCHEMA = vol.Schema(
 async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> dict[str, Any]:
     """Validate the user input allows us to connect."""
 
-    session = aiohttp_client.async_create_clientsession(hass)
     api = AmazonEchoApi(
-        session,
         data[CONF_COUNTRY],
         data[CONF_USERNAME],
         data[CONF_PASSWORD],
     )
 
-    return await api.login_mode_interactive(data[CONF_CODE])
+    try:
+        data = await api.login_mode_interactive(data[CONF_CODE])
+    finally:
+        await api.close()
+
+    return data
 
 
 class AmazonDevicesConfigFlow(ConfigFlow, domain=DOMAIN):

homeassistant/components/alexa_devices/coordinator.py

@@ -8,7 +8,6 @@ from aioamazondevices.exceptions import (
     CannotConnect,
     CannotRetrieveData,
 )
-from aiohttp import ClientSession
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_COUNTRY, CONF_PASSWORD, CONF_USERNAME
@@ -32,7 +31,6 @@ class AmazonDevicesCoordinator(DataUpdateCoordinator[dict[str, AmazonDevice]]):
         self,
         hass: HomeAssistant,
         entry: AmazonConfigEntry,
-        session: ClientSession,
     ) -> None:
         """Initialize the scanner."""
         super().__init__(
@@ -43,7 +41,6 @@ class AmazonDevicesCoordinator(DataUpdateCoordinator[dict[str, AmazonDevice]]):
             update_interval=timedelta(seconds=SCAN_INTERVAL),
         )
         self.api = AmazonEchoApi(
-            session,
             entry.data[CONF_COUNTRY],
             entry.data[CONF_USERNAME],
             entry.data[CONF_PASSWORD],

homeassistant/components/alexa_devices/icons.json

@@ -38,13 +38,5 @@
         }
       }
     }
-  },
-  "services": {
-    "send_sound": {
-      "service": "mdi:cast-audio"
-    },
-    "send_text_command": {
-      "service": "mdi:microphone-message"
-    }
   }
 }

homeassistant/components/alexa_devices/manifest.json

@@ -8,5 +8,5 @@
   "iot_class": "cloud_polling",
   "loggers": ["aioamazondevices"],
   "quality_scale": "silver",
-  "requirements": ["aioamazondevices==4.0.0"]
+  "requirements": ["aioamazondevices==3.2.8"]
 }

homeassistant/components/alexa_devices/quality_scale.yaml

@@ -48,17 +48,17 @@ rules:
     comment: There are a ton of mac address ranges in use, but also by kindles which are not supported by this integration
   docs-data-update: done
   docs-examples: done
-  docs-known-limitations: done
+  docs-known-limitations: todo
   docs-supported-devices: done
   docs-supported-functions: done
-  docs-troubleshooting: done
+  docs-troubleshooting: todo
   docs-use-cases: done
   dynamic-devices: todo
   entity-category: done
   entity-device-class: done
   entity-disabled-by-default: done
   entity-translations: done
-  exception-translations: done
+  exception-translations: todo
   icon-translations: done
   reconfiguration-flow: todo
   repair-issues:
@@ -70,5 +70,5 @@ rules:
 
   # Platinum
   async-dependency: done
-  inject-websession: done
+  inject-websession: todo
   strict-typing: done

homeassistant/components/alexa_devices/services.py

@@ -1,121 +0,0 @@
-"""Support for services."""
-
-from aioamazondevices.sounds import SOUNDS_LIST
-import voluptuous as vol
-
-from homeassistant.config_entries import ConfigEntryState
-from homeassistant.const import ATTR_DEVICE_ID
-from homeassistant.core import HomeAssistant, ServiceCall, callback
-from homeassistant.exceptions import ServiceValidationError
-from homeassistant.helpers import config_validation as cv, device_registry as dr
-
-from .const import DOMAIN
-from .coordinator import AmazonConfigEntry
-
-ATTR_TEXT_COMMAND = "text_command"
-ATTR_SOUND = "sound"
-ATTR_SOUND_VARIANT = "sound_variant"
-SERVICE_TEXT_COMMAND = "send_text_command"
-SERVICE_SOUND_NOTIFICATION = "send_sound"
-
-SCHEMA_SOUND_SERVICE = vol.Schema(
-    {
-        vol.Required(ATTR_SOUND): cv.string,
-        vol.Required(ATTR_SOUND_VARIANT): cv.positive_int,
-        vol.Required(ATTR_DEVICE_ID): cv.string,
-    },
-)
-SCHEMA_CUSTOM_COMMAND = vol.Schema(
-    {
-        vol.Required(ATTR_TEXT_COMMAND): cv.string,
-        vol.Required(ATTR_DEVICE_ID): cv.string,
-    }
-)
-
-
-@callback
-def async_get_entry_id_for_service_call(
-    call: ServiceCall,
-) -> tuple[dr.DeviceEntry, AmazonConfigEntry]:
-    """Get the entry ID related to a service call (by device ID)."""
-    device_registry = dr.async_get(call.hass)
-    device_id = call.data[ATTR_DEVICE_ID]
-    if (device_entry := device_registry.async_get(device_id)) is None:
-        raise ServiceValidationError(
-            translation_domain=DOMAIN,
-            translation_key="invalid_device_id",
-            translation_placeholders={"device_id": device_id},
-        )
-
-    for entry_id in device_entry.config_entries:
-        if (entry := call.hass.config_entries.async_get_entry(entry_id)) is None:
-            continue
-        if entry.domain == DOMAIN:
-            if entry.state is not ConfigEntryState.LOADED:
-                raise ServiceValidationError(
-                    translation_domain=DOMAIN,
-                    translation_key="entry_not_loaded",
-                    translation_placeholders={"entry": entry.title},
-                )
-            return (device_entry, entry)
-
-    raise ServiceValidationError(
-        translation_domain=DOMAIN,
-        translation_key="config_entry_not_found",
-        translation_placeholders={"device_id": device_id},
-    )
-
-
-async def _async_execute_action(call: ServiceCall, attribute: str) -> None:
-    """Execute action on the device."""
-    device, config_entry = async_get_entry_id_for_service_call(call)
-    assert device.serial_number
-    value: str = call.data[attribute]
-
-    coordinator = config_entry.runtime_data
-
-    if attribute == ATTR_SOUND:
-        variant: int = call.data[ATTR_SOUND_VARIANT]
-        pad = "_" if variant > 10 else "_0"
-        file = f"{value}{pad}{variant!s}"
-        if value not in SOUNDS_LIST or variant > SOUNDS_LIST[value]:
-            raise ServiceValidationError(
-                translation_domain=DOMAIN,
-                translation_key="invalid_sound_value",
-                translation_placeholders={"sound": value, "variant": str(variant)},
-            )
-        await coordinator.api.call_alexa_sound(
-            coordinator.data[device.serial_number], file
-        )
-    elif attribute == ATTR_TEXT_COMMAND:
-        await coordinator.api.call_alexa_text_command(
-            coordinator.data[device.serial_number], value
-        )
-
-
-async def async_send_sound_notification(call: ServiceCall) -> None:
-    """Send a sound notification to a AmazonDevice."""
-    await _async_execute_action(call, ATTR_SOUND)
-
-
-async def async_send_text_command(call: ServiceCall) -> None:
-    """Send a custom command to a AmazonDevice."""
-    await _async_execute_action(call, ATTR_TEXT_COMMAND)
-
-
-@callback
-def async_setup_services(hass: HomeAssistant) -> None:
-    """Set up the services for the Amazon Devices integration."""
-    for service_name, method, schema in (
-        (
-            SERVICE_SOUND_NOTIFICATION,
-            async_send_sound_notification,
-            SCHEMA_SOUND_SERVICE,
-        ),
-        (
-            SERVICE_TEXT_COMMAND,
-            async_send_text_command,
-            SCHEMA_CUSTOM_COMMAND,
-        ),
-    ):
-        hass.services.async_register(DOMAIN, service_name, method, schema=schema)

homeassistant/components/alexa_devices/services.yaml

@@ -1,504 +0,0 @@
-send_text_command:
-  fields:
-    device_id:
-      required: true
-      selector:
-        device:
-          integration: alexa_devices
-    text_command:
-      required: true
-      example: "Play B.B.C. on TuneIn"
-      selector:
-        text:
-
-send_sound:
-  fields:
-    device_id:
-      required: true
-      selector:
-        device:
-          integration: alexa_devices
-    sound_variant:
-      required: true
-      example: 1
-      default: 1
-      selector:
-        number:
-          min: 1
-          max: 50
-    sound:
-      required: true
-      example: amzn_sfx_doorbell_chime
-      default: amzn_sfx_doorbell_chime
-      selector:
-        select:
-          options:
-            - air_horn
-            - air_horns
-            - airboat
-            - airport
-            - aliens
-            - amzn_sfx_airplane_takeoff_whoosh
-            - amzn_sfx_army_march_clank_7x
-            - amzn_sfx_army_march_large_8x
-            - amzn_sfx_army_march_small_8x
-            - amzn_sfx_baby_big_cry
-            - amzn_sfx_baby_cry
-            - amzn_sfx_baby_fuss
-            - amzn_sfx_battle_group_clanks
-            - amzn_sfx_battle_man_grunts
-            - amzn_sfx_battle_men_grunts
-            - amzn_sfx_battle_men_horses
-            - amzn_sfx_battle_noisy_clanks
-            - amzn_sfx_battle_yells_men
-            - amzn_sfx_battle_yells_men_run
-            - amzn_sfx_bear_groan_roar
-            - amzn_sfx_bear_roar_grumble
-            - amzn_sfx_bear_roar_small
-            - amzn_sfx_beep_1x
-            - amzn_sfx_bell_med_chime
-            - amzn_sfx_bell_short_chime
-            - amzn_sfx_bell_timer
-            - amzn_sfx_bicycle_bell_ring
-            - amzn_sfx_bird_chickadee_chirp_1x
-            - amzn_sfx_bird_chickadee_chirps
-            - amzn_sfx_bird_forest
-            - amzn_sfx_bird_forest_short
-            - amzn_sfx_bird_robin_chirp_1x
-            - amzn_sfx_boing_long_1x
-            - amzn_sfx_boing_med_1x
-            - amzn_sfx_boing_short_1x
-            - amzn_sfx_bus_drive_past
-            - amzn_sfx_buzz_electronic
-            - amzn_sfx_buzzer_loud_alarm
-            - amzn_sfx_buzzer_small
-            - amzn_sfx_car_accelerate
-            - amzn_sfx_car_accelerate_noisy
-            - amzn_sfx_car_click_seatbelt
-            - amzn_sfx_car_close_door_1x
-            - amzn_sfx_car_drive_past
-            - amzn_sfx_car_honk_1x
-            - amzn_sfx_car_honk_2x
-            - amzn_sfx_car_honk_3x
-            - amzn_sfx_car_honk_long_1x
-            - amzn_sfx_car_into_driveway
-            - amzn_sfx_car_into_driveway_fast
-            - amzn_sfx_car_slam_door_1x
-            - amzn_sfx_car_undo_seatbelt
-            - amzn_sfx_cat_angry_meow_1x
-            - amzn_sfx_cat_angry_screech_1x
-            - amzn_sfx_cat_long_meow_1x
-            - amzn_sfx_cat_meow_1x
-            - amzn_sfx_cat_purr
-            - amzn_sfx_cat_purr_meow
-            - amzn_sfx_chicken_cluck
-            - amzn_sfx_church_bell_1x
-            - amzn_sfx_church_bells_ringing
-            - amzn_sfx_clear_throat_ahem
-            - amzn_sfx_clock_ticking
-            - amzn_sfx_clock_ticking_long
-            - amzn_sfx_copy_machine
-            - amzn_sfx_cough
-            - amzn_sfx_crow_caw_1x
-            - amzn_sfx_crowd_applause
-            - amzn_sfx_crowd_bar
-            - amzn_sfx_crowd_bar_rowdy
-            - amzn_sfx_crowd_boo
-            - amzn_sfx_crowd_cheer_med
-            - amzn_sfx_crowd_excited_cheer
-            - amzn_sfx_dog_med_bark_1x
-            - amzn_sfx_dog_med_bark_2x
-            - amzn_sfx_dog_med_bark_growl
-            - amzn_sfx_dog_med_growl_1x
-            - amzn_sfx_dog_med_woof_1x
-            - amzn_sfx_dog_small_bark_2x
-            - amzn_sfx_door_open
-            - amzn_sfx_door_shut
-            - amzn_sfx_doorbell
-            - amzn_sfx_doorbell_buzz
-            - amzn_sfx_doorbell_chime
-            - amzn_sfx_drinking_slurp
-            - amzn_sfx_drum_and_cymbal
-            - amzn_sfx_drum_comedy
-            - amzn_sfx_earthquake_rumble
-            - amzn_sfx_electric_guitar
-            - amzn_sfx_electronic_beep
-            - amzn_sfx_electronic_major_chord
-            - amzn_sfx_elephant
-            - amzn_sfx_elevator_bell_1x
-            - amzn_sfx_elevator_open_bell
-            - amzn_sfx_fairy_melodic_chimes
-            - amzn_sfx_fairy_sparkle_chimes
-            - amzn_sfx_faucet_drip
-            - amzn_sfx_faucet_running
-            - amzn_sfx_fireplace_crackle
-            - amzn_sfx_fireworks
-            - amzn_sfx_fireworks_firecrackers
-            - amzn_sfx_fireworks_launch
-            - amzn_sfx_fireworks_whistles
-            - amzn_sfx_food_frying
-            - amzn_sfx_footsteps
-            - amzn_sfx_footsteps_muffled
-            - amzn_sfx_ghost_spooky
-            - amzn_sfx_glass_on_table
-            - amzn_sfx_glasses_clink
-            - amzn_sfx_horse_gallop_4x
-            - amzn_sfx_horse_huff_whinny
-            - amzn_sfx_horse_neigh
-            - amzn_sfx_horse_neigh_low
-            - amzn_sfx_horse_whinny
-            - amzn_sfx_human_walking
-            - amzn_sfx_jar_on_table_1x
-            - amzn_sfx_kitchen_ambience
-            - amzn_sfx_large_crowd_cheer
-            - amzn_sfx_large_fire_crackling
-            - amzn_sfx_laughter
-            - amzn_sfx_laughter_giggle
-            - amzn_sfx_lightning_strike
-            - amzn_sfx_lion_roar
-            - amzn_sfx_magic_blast_1x
-            - amzn_sfx_monkey_calls_3x
-            - amzn_sfx_monkey_chimp
-            - amzn_sfx_monkeys_chatter
-            - amzn_sfx_motorcycle_accelerate
-            - amzn_sfx_motorcycle_engine_idle
-            - amzn_sfx_motorcycle_engine_rev
-            - amzn_sfx_musical_drone_intro
-            - amzn_sfx_oars_splashing_rowboat
-            - amzn_sfx_object_on_table_2x
-            - amzn_sfx_ocean_wave_1x
-            - amzn_sfx_ocean_wave_on_rocks_1x
-            - amzn_sfx_ocean_wave_surf
-            - amzn_sfx_people_walking
-            - amzn_sfx_person_running
-            - amzn_sfx_piano_note_1x
-            - amzn_sfx_punch
-            - amzn_sfx_rain
-            - amzn_sfx_rain_on_roof
-            - amzn_sfx_rain_thunder
-            - amzn_sfx_rat_squeak_2x
-            - amzn_sfx_rat_squeaks
-            - amzn_sfx_raven_caw_1x
-            - amzn_sfx_raven_caw_2x
-            - amzn_sfx_restaurant_ambience
-            - amzn_sfx_rooster_crow
-            - amzn_sfx_scifi_air_escaping
-            - amzn_sfx_scifi_alarm
-            - amzn_sfx_scifi_alien_voice
-            - amzn_sfx_scifi_boots_walking
-            - amzn_sfx_scifi_close_large_explosion
-            - amzn_sfx_scifi_door_open
-            - amzn_sfx_scifi_engines_on
-            - amzn_sfx_scifi_engines_on_large
-            - amzn_sfx_scifi_engines_on_short_burst
-            - amzn_sfx_scifi_explosion
-            - amzn_sfx_scifi_explosion_2x
-            - amzn_sfx_scifi_incoming_explosion
-            - amzn_sfx_scifi_laser_gun_battle
-            - amzn_sfx_scifi_laser_gun_fires
-            - amzn_sfx_scifi_laser_gun_fires_large
-            - amzn_sfx_scifi_long_explosion_1x
-            - amzn_sfx_scifi_missile
-            - amzn_sfx_scifi_motor_short_1x
-            - amzn_sfx_scifi_open_airlock
-            - amzn_sfx_scifi_radar_high_ping
-            - amzn_sfx_scifi_radar_low
-            - amzn_sfx_scifi_radar_medium
-            - amzn_sfx_scifi_run_away
-            - amzn_sfx_scifi_sheilds_up
-            - amzn_sfx_scifi_short_low_explosion
-            - amzn_sfx_scifi_small_whoosh_flyby
-            - amzn_sfx_scifi_small_zoom_flyby
-            - amzn_sfx_scifi_sonar_ping_3x
-            - amzn_sfx_scifi_sonar_ping_4x
-            - amzn_sfx_scifi_spaceship_flyby
-            - amzn_sfx_scifi_timer_beep
-            - amzn_sfx_scifi_zap_backwards
-            - amzn_sfx_scifi_zap_electric
-            - amzn_sfx_sheep_baa
-            - amzn_sfx_sheep_bleat
-            - amzn_sfx_silverware_clank
-            - amzn_sfx_sirens
-            - amzn_sfx_sleigh_bells
-            - amzn_sfx_small_stream
-            - amzn_sfx_sneeze
-            - amzn_sfx_stream
-            - amzn_sfx_strong_wind_desert
-            - amzn_sfx_strong_wind_whistling
-            - amzn_sfx_subway_leaving
-            - amzn_sfx_subway_passing
-            - amzn_sfx_subway_stopping
-            - amzn_sfx_swoosh_cartoon_fast
-            - amzn_sfx_swoosh_fast_1x
-            - amzn_sfx_swoosh_fast_6x
-            - amzn_sfx_test_tone
-            - amzn_sfx_thunder_rumble
-            - amzn_sfx_toilet_flush
-            - amzn_sfx_trumpet_bugle
-            - amzn_sfx_turkey_gobbling
-            - amzn_sfx_typing_medium
-            - amzn_sfx_typing_short
-            - amzn_sfx_typing_typewriter
-            - amzn_sfx_vacuum_off
-            - amzn_sfx_vacuum_on
-            - amzn_sfx_walking_in_mud
-            - amzn_sfx_walking_in_snow
-            - amzn_sfx_walking_on_grass
-            - amzn_sfx_water_dripping
-            - amzn_sfx_water_droplets
-            - amzn_sfx_wind_strong_gusting
-            - amzn_sfx_wind_whistling_desert
-            - amzn_sfx_wings_flap_4x
-            - amzn_sfx_wings_flap_fast
-            - amzn_sfx_wolf_howl
-            - amzn_sfx_wolf_young_howl
-            - amzn_sfx_wooden_door
-            - amzn_sfx_wooden_door_creaks_long
-            - amzn_sfx_wooden_door_creaks_multiple
-            - amzn_sfx_wooden_door_creaks_open
-            - amzn_ui_sfx_gameshow_bridge
-            - amzn_ui_sfx_gameshow_countdown_loop_32s_full
-            - amzn_ui_sfx_gameshow_countdown_loop_64s_full
-            - amzn_ui_sfx_gameshow_countdown_loop_64s_minimal
-            - amzn_ui_sfx_gameshow_intro
-            - amzn_ui_sfx_gameshow_negative_response
-            - amzn_ui_sfx_gameshow_neutral_response
-            - amzn_ui_sfx_gameshow_outro
-            - amzn_ui_sfx_gameshow_player1
-            - amzn_ui_sfx_gameshow_player2
-            - amzn_ui_sfx_gameshow_player3
-            - amzn_ui_sfx_gameshow_player4
-            - amzn_ui_sfx_gameshow_positive_response
-            - amzn_ui_sfx_gameshow_tally_negative
-            - amzn_ui_sfx_gameshow_tally_positive
-            - amzn_ui_sfx_gameshow_waiting_loop_30s
-            - anchor
-            - answering_machines
-            - arcs_sparks
-            - arrows_bows
-            - baby
-            - back_up_beeps
-            - bars_restaurants
-            - baseball
-            - basketball
-            - battles
-            - beeps_tones
-            - bell
-            - bikes
-            - billiards
-            - board_games
-            - body
-            - boing
-            - books
-            - bow_wash
-            - box
-            - break_shatter_smash
-            - breaks
-            - brooms_mops
-            - bullets
-            - buses
-            - buzz
-            - buzz_hums
-            - buzzers
-            - buzzers_pistols
-            - cables_metal
-            - camera
-            - cannons
-            - car_alarm
-            - car_alarms
-            - car_cell_phones
-            - carnivals_fairs
-            - cars
-            - casino
-            - casinos
-            - cellar
-            - chimes
-            - chimes_bells
-            - chorus
-            - christmas
-            - church_bells
-            - clock
-            - cloth
-            - concrete
-            - construction
-            - construction_factory
-            - crashes
-            - crowds
-            - debris
-            - dining_kitchens
-            - dinosaurs
-            - dripping
-            - drops
-            - electric
-            - electrical
-            - elevator
-            - evolution_monsters
-            - explosions
-            - factory
-            - falls
-            - fax_scanner_copier
-            - feedback_mics
-            - fight
-            - fire
-            - fire_extinguisher
-            - fireballs
-            - fireworks
-            - fishing_pole
-            - flags
-            - football
-            - footsteps
-            - futuristic
-            - futuristic_ship
-            - gameshow
-            - gear
-            - ghosts_demons
-            - giant_monster
-            - glass
-            - glasses_clink
-            - golf
-            - gorilla
-            - grenade_lanucher
-            - griffen
-            - gyms_locker_rooms
-            - handgun_loading
-            - handgun_shot
-            - handle
-            - hands
-            - heartbeats_ekg
-            - helicopter
-            - high_tech
-            - hit_punch_slap
-            - hits
-            - horns
-            - horror
-            - hot_tub_filling_up
-            - human
-            - human_vocals
-            - hygene # codespell:ignore
-            - ice_skating
-            - ignitions
-            - infantry
-            - intro
-            - jet
-            - juggling
-            - key_lock
-            - kids
-            - knocks
-            - lab_equip
-            - lacrosse
-            - lamps_lanterns
-            - leather
-            - liquid_suction
-            - locker_doors
-            - machine_gun
-            - magic_spells
-            - medium_large_explosions
-            - metal
-            - modern_rings
-            - money_coins
-            - motorcycles
-            - movement
-            - moves
-            - nature
-            - oar_boat
-            - pagers
-            - paintball
-            - paper
-            - parachute
-            - pay_phones
-            - phone_beeps
-            - pigmy_bats
-            - pills
-            - pour_water
-            - power_up_down
-            - printers
-            - prison
-            - public_space
-            - racquetball
-            - radios_static
-            - rain
-            - rc_airplane
-            - rc_car
-            - refrigerators_freezers
-            - regular
-            - respirator
-            - rifle
-            - roller_coaster
-            - rollerskates_rollerblades
-            - room_tones
-            - ropes_climbing
-            - rotary_rings
-            - rowboat_canoe
-            - rubber
-            - running
-            - sails
-            - sand_gravel
-            - screen_doors
-            - screens
-            - seats_stools
-            - servos
-            - shoes_boots
-            - shotgun
-            - shower
-            - sink_faucet
-            - sink_filling_water
-            - sink_run_and_off
-            - sink_water_splatter
-            - sirens
-            - skateboards
-            - ski
-            - skids_tires
-            - sled
-            - slides
-            - small_explosions
-            - snow
-            - snowmobile
-            - soldiers
-            - splash_water
-            - splashes_sprays
-            - sports_whistles
-            - squeaks
-            - squeaky
-            - stairs
-            - steam
-            - submarine_diesel
-            - swing_doors
-            - switches_levers
-            - swords
-            - tape
-            - tape_machine
-            - televisions_shows
-            - tennis_pingpong
-            - textile
-            - throw
-            - thunder
-            - ticks
-            - timer
-            - toilet_flush
-            - tone
-            - tones_noises
-            - toys
-            - tractors
-            - traffic
-            - train
-            - trucks_vans
-            - turnstiles
-            - typing
-            - umbrella
-            - underwater
-            - vampires
-            - various
-            - video_tunes
-            - volcano_earthquake
-            - watches
-            - water
-            - water_running
-            - werewolves
-            - winches_gears
-            - wind
-            - wood
-            - wood_boat
-            - woosh
-            - zap
-            - zippers
-          translation_key: sound

homeassistant/components/alexa_devices/strings.json

@@ -4,8 +4,7 @@
     "data_description_country": "The country where your Amazon account is registered.",
     "data_description_username": "The email address of your Amazon account.",
     "data_description_password": "The password of your Amazon account.",
-    "data_description_code": "The one-time password to log in to your account. Currently, only tokens from OTP applications are supported.",
-    "device_id_description": "The ID of the device to send the command to."
+    "data_description_code": "The one-time password to log in to your account. Currently, only tokens from OTP applications are supported."
   },
   "config": {
     "flow_title": "{username}",
@@ -85,532 +84,12 @@
       }
     }
   },
-  "services": {
-    "send_sound": {
-      "name": "Send sound",
-      "description": "Sends a sound to a device",
-      "fields": {
-        "device_id": {
-          "name": "Device",
-          "description": "[%key:component::alexa_devices::common::device_id_description%]"
-        },
-        "sound": {
-          "name": "Alexa Skill sound file",
-          "description": "The sound file to play."
-        },
-        "sound_variant": {
-          "name": "Sound variant",
-          "description": "The variant of the sound to play."
-        }
-      }
-    },
-    "send_text_command": {
-      "name": "Send text command",
-      "description": "Sends a text command to a device",
-      "fields": {
-        "text_command": {
-          "name": "Alexa text command",
-          "description": "The text command to send."
-        },
-        "device_id": {
-          "name": "Device",
-          "description": "[%key:component::alexa_devices::common::device_id_description%]"
-        }
-      }
-    }
-  },
-  "selector": {
-    "sound": {
-      "options": {
-        "air_horn": "Air Horn",
-        "air_horns": "Air Horns",
-        "airboat": "Airboat",
-        "airport": "Airport",
-        "aliens": "Aliens",
-        "amzn_sfx_airplane_takeoff_whoosh": "Airplane Takeoff Whoosh",
-        "amzn_sfx_army_march_clank_7x": "Army March Clank 7x",
-        "amzn_sfx_army_march_large_8x": "Army March Large 8x",
-        "amzn_sfx_army_march_small_8x": "Army March Small 8x",
-        "amzn_sfx_baby_big_cry": "Baby Big Cry",
-        "amzn_sfx_baby_cry": "Baby Cry",
-        "amzn_sfx_baby_fuss": "Baby Fuss",
-        "amzn_sfx_battle_group_clanks": "Battle Group Clanks",
-        "amzn_sfx_battle_man_grunts": "Battle Man Grunts",
-        "amzn_sfx_battle_men_grunts": "Battle Men Grunts",
-        "amzn_sfx_battle_men_horses": "Battle Men Horses",
-        "amzn_sfx_battle_noisy_clanks": "Battle Noisy Clanks",
-        "amzn_sfx_battle_yells_men": "Battle Yells Men",
-        "amzn_sfx_battle_yells_men_run": "Battle Yells Men Run",
-        "amzn_sfx_bear_groan_roar": "Bear Groan Roar",
-        "amzn_sfx_bear_roar_grumble": "Bear Roar Grumble",
-        "amzn_sfx_bear_roar_small": "Bear Roar Small",
-        "amzn_sfx_beep_1x": "Beep 1x",
-        "amzn_sfx_bell_med_chime": "Bell Med Chime",
-        "amzn_sfx_bell_short_chime": "Bell Short Chime",
-        "amzn_sfx_bell_timer": "Bell Timer",
-        "amzn_sfx_bicycle_bell_ring": "Bicycle Bell Ring",
-        "amzn_sfx_bird_chickadee_chirp_1x": "Bird Chickadee Chirp 1x",
-        "amzn_sfx_bird_chickadee_chirps": "Bird Chickadee Chirps",
-        "amzn_sfx_bird_forest": "Bird Forest",
-        "amzn_sfx_bird_forest_short": "Bird Forest Short",
-        "amzn_sfx_bird_robin_chirp_1x": "Bird Robin Chirp 1x",
-        "amzn_sfx_boing_long_1x": "Boing Long 1x",
-        "amzn_sfx_boing_med_1x": "Boing Med 1x",
-        "amzn_sfx_boing_short_1x": "Boing Short 1x",
-        "amzn_sfx_bus_drive_past": "Bus Drive Past",
-        "amzn_sfx_buzz_electronic": "Buzz Electronic",
-        "amzn_sfx_buzzer_loud_alarm": "Buzzer Loud Alarm",
-        "amzn_sfx_buzzer_small": "Buzzer Small",
-        "amzn_sfx_car_accelerate": "Car Accelerate",
-        "amzn_sfx_car_accelerate_noisy": "Car Accelerate Noisy",
-        "amzn_sfx_car_click_seatbelt": "Car Click Seatbelt",
-        "amzn_sfx_car_close_door_1x": "Car Close Door 1x",
-        "amzn_sfx_car_drive_past": "Car Drive Past",
-        "amzn_sfx_car_honk_1x": "Car Honk 1x",
-        "amzn_sfx_car_honk_2x": "Car Honk 2x",
-        "amzn_sfx_car_honk_3x": "Car Honk 3x",
-        "amzn_sfx_car_honk_long_1x": "Car Honk Long 1x",
-        "amzn_sfx_car_into_driveway": "Car Into Driveway",
-        "amzn_sfx_car_into_driveway_fast": "Car Into Driveway Fast",
-        "amzn_sfx_car_slam_door_1x": "Car Slam Door 1x",
-        "amzn_sfx_car_undo_seatbelt": "Car Undo Seatbelt",
-        "amzn_sfx_cat_angry_meow_1x": "Cat Angry Meow 1x",
-        "amzn_sfx_cat_angry_screech_1x": "Cat Angry Screech 1x",
-        "amzn_sfx_cat_long_meow_1x": "Cat Long Meow 1x",
-        "amzn_sfx_cat_meow_1x": "Cat Meow 1x",
-        "amzn_sfx_cat_purr": "Cat Purr",
-        "amzn_sfx_cat_purr_meow": "Cat Purr Meow",
-        "amzn_sfx_chicken_cluck": "Chicken Cluck",
-        "amzn_sfx_church_bell_1x": "Church Bell 1x",
-        "amzn_sfx_church_bells_ringing": "Church Bells Ringing",
-        "amzn_sfx_clear_throat_ahem": "Clear Throat Ahem",
-        "amzn_sfx_clock_ticking": "Clock Ticking",
-        "amzn_sfx_clock_ticking_long": "Clock Ticking Long",
-        "amzn_sfx_copy_machine": "Copy Machine",
-        "amzn_sfx_cough": "Cough",
-        "amzn_sfx_crow_caw_1x": "Crow Caw 1x",
-        "amzn_sfx_crowd_applause": "Crowd Applause",
-        "amzn_sfx_crowd_bar": "Crowd Bar",
-        "amzn_sfx_crowd_bar_rowdy": "Crowd Bar Rowdy",
-        "amzn_sfx_crowd_boo": "Crowd Boo",
-        "amzn_sfx_crowd_cheer_med": "Crowd Cheer Med",
-        "amzn_sfx_crowd_excited_cheer": "Crowd Excited Cheer",
-        "amzn_sfx_dog_med_bark_1x": "Dog Med Bark 1x",
-        "amzn_sfx_dog_med_bark_2x": "Dog Med Bark 2x",
-        "amzn_sfx_dog_med_bark_growl": "Dog Med Bark Growl",
-        "amzn_sfx_dog_med_growl_1x": "Dog Med Growl 1x",
-        "amzn_sfx_dog_med_woof_1x": "Dog Med Woof 1x",
-        "amzn_sfx_dog_small_bark_2x": "Dog Small Bark 2x",
-        "amzn_sfx_door_open": "Door Open",
-        "amzn_sfx_door_shut": "Door Shut",
-        "amzn_sfx_doorbell": "Doorbell",
-        "amzn_sfx_doorbell_buzz": "Doorbell Buzz",
-        "amzn_sfx_doorbell_chime": "Doorbell Chime",
-        "amzn_sfx_drinking_slurp": "Drinking Slurp",
-        "amzn_sfx_drum_and_cymbal": "Drum And Cymbal",
-        "amzn_sfx_drum_comedy": "Drum Comedy",
-        "amzn_sfx_earthquake_rumble": "Earthquake Rumble",
-        "amzn_sfx_electric_guitar": "Electric Guitar",
-        "amzn_sfx_electronic_beep": "Electronic Beep",
-        "amzn_sfx_electronic_major_chord": "Electronic Major Chord",
-        "amzn_sfx_elephant": "Elephant",
-        "amzn_sfx_elevator_bell_1x": "Elevator Bell 1x",
-        "amzn_sfx_elevator_open_bell": "Elevator Open Bell",
-        "amzn_sfx_fairy_melodic_chimes": "Fairy Melodic Chimes",
-        "amzn_sfx_fairy_sparkle_chimes": "Fairy Sparkle Chimes",
-        "amzn_sfx_faucet_drip": "Faucet Drip",
-        "amzn_sfx_faucet_running": "Faucet Running",
-        "amzn_sfx_fireplace_crackle": "Fireplace Crackle",
-        "amzn_sfx_fireworks": "Fireworks",
-        "amzn_sfx_fireworks_firecrackers": "Fireworks Firecrackers",
-        "amzn_sfx_fireworks_launch": "Fireworks Launch",
-        "amzn_sfx_fireworks_whistles": "Fireworks Whistles",
-        "amzn_sfx_food_frying": "Food Frying",
-        "amzn_sfx_footsteps": "Footsteps",
-        "amzn_sfx_footsteps_muffled": "Footsteps Muffled",
-        "amzn_sfx_ghost_spooky": "Ghost Spooky",
-        "amzn_sfx_glass_on_table": "Glass On Table",
-        "amzn_sfx_glasses_clink": "Glasses Clink",
-        "amzn_sfx_horse_gallop_4x": "Horse Gallop 4x",
-        "amzn_sfx_horse_huff_whinny": "Horse Huff Whinny",
-        "amzn_sfx_horse_neigh": "Horse Neigh",
-        "amzn_sfx_horse_neigh_low": "Horse Neigh Low",
-        "amzn_sfx_horse_whinny": "Horse Whinny",
-        "amzn_sfx_human_walking": "Human Walking",
-        "amzn_sfx_jar_on_table_1x": "Jar On Table 1x",
-        "amzn_sfx_kitchen_ambience": "Kitchen Ambience",
-        "amzn_sfx_large_crowd_cheer": "Large Crowd Cheer",
-        "amzn_sfx_large_fire_crackling": "Large Fire Crackling",
-        "amzn_sfx_laughter": "Laughter",
-        "amzn_sfx_laughter_giggle": "Laughter Giggle",
-        "amzn_sfx_lightning_strike": "Lightning Strike",
-        "amzn_sfx_lion_roar": "Lion Roar",
-        "amzn_sfx_magic_blast_1x": "Magic Blast 1x",
-        "amzn_sfx_monkey_calls_3x": "Monkey Calls 3x",
-        "amzn_sfx_monkey_chimp": "Monkey Chimp",
-        "amzn_sfx_monkeys_chatter": "Monkeys Chatter",
-        "amzn_sfx_motorcycle_accelerate": "Motorcycle Accelerate",
-        "amzn_sfx_motorcycle_engine_idle": "Motorcycle Engine Idle",
-        "amzn_sfx_motorcycle_engine_rev": "Motorcycle Engine Rev",
-        "amzn_sfx_musical_drone_intro": "Musical Drone Intro",
-        "amzn_sfx_oars_splashing_rowboat": "Oars Splashing Rowboat",
-        "amzn_sfx_object_on_table_2x": "Object On Table 2x",
-        "amzn_sfx_ocean_wave_1x": "Ocean Wave 1x",
-        "amzn_sfx_ocean_wave_on_rocks_1x": "Ocean Wave On Rocks 1x",
-        "amzn_sfx_ocean_wave_surf": "Ocean Wave Surf",
-        "amzn_sfx_people_walking": "People Walking",
-        "amzn_sfx_person_running": "Person Running",
-        "amzn_sfx_piano_note_1x": "Piano Note 1x",
-        "amzn_sfx_punch": "Punch",
-        "amzn_sfx_rain": "Rain",
-        "amzn_sfx_rain_on_roof": "Rain On Roof",
-        "amzn_sfx_rain_thunder": "Rain Thunder",
-        "amzn_sfx_rat_squeak_2x": "Rat Squeak 2x",
-        "amzn_sfx_rat_squeaks": "Rat Squeaks",
-        "amzn_sfx_raven_caw_1x": "Raven Caw 1x",
-        "amzn_sfx_raven_caw_2x": "Raven Caw 2x",
-        "amzn_sfx_restaurant_ambience": "Restaurant Ambience",
-        "amzn_sfx_rooster_crow": "Rooster Crow",
-        "amzn_sfx_scifi_air_escaping": "Scifi Air Escaping",
-        "amzn_sfx_scifi_alarm": "Scifi Alarm",
-        "amzn_sfx_scifi_alien_voice": "Scifi Alien Voice",
-        "amzn_sfx_scifi_boots_walking": "Scifi Boots Walking",
-        "amzn_sfx_scifi_close_large_explosion": "Scifi Close Large Explosion",
-        "amzn_sfx_scifi_door_open": "Scifi Door Open",
-        "amzn_sfx_scifi_engines_on": "Scifi Engines On",
-        "amzn_sfx_scifi_engines_on_large": "Scifi Engines On Large",
-        "amzn_sfx_scifi_engines_on_short_burst": "Scifi Engines On Short Burst",
-        "amzn_sfx_scifi_explosion": "Scifi Explosion",
-        "amzn_sfx_scifi_explosion_2x": "Scifi Explosion 2x",
-        "amzn_sfx_scifi_incoming_explosion": "Scifi Incoming Explosion",
-        "amzn_sfx_scifi_laser_gun_battle": "Scifi Laser Gun Battle",
-        "amzn_sfx_scifi_laser_gun_fires": "Scifi Laser Gun Fires",
-        "amzn_sfx_scifi_laser_gun_fires_large": "Scifi Laser Gun Fires Large",
-        "amzn_sfx_scifi_long_explosion_1x": "Scifi Long Explosion 1x",
-        "amzn_sfx_scifi_missile": "Scifi Missile",
-        "amzn_sfx_scifi_motor_short_1x": "Scifi Motor Short 1x",
-        "amzn_sfx_scifi_open_airlock": "Scifi Open Airlock",
-        "amzn_sfx_scifi_radar_high_ping": "Scifi Radar High Ping",
-        "amzn_sfx_scifi_radar_low": "Scifi Radar Low",
-        "amzn_sfx_scifi_radar_medium": "Scifi Radar Medium",
-        "amzn_sfx_scifi_run_away": "Scifi Run Away",
-        "amzn_sfx_scifi_sheilds_up": "Scifi Sheilds Up",
-        "amzn_sfx_scifi_short_low_explosion": "Scifi Short Low Explosion",
-        "amzn_sfx_scifi_small_whoosh_flyby": "Scifi Small Whoosh Flyby",
-        "amzn_sfx_scifi_small_zoom_flyby": "Scifi Small Zoom Flyby",
-        "amzn_sfx_scifi_sonar_ping_3x": "Scifi Sonar Ping 3x",
-        "amzn_sfx_scifi_sonar_ping_4x": "Scifi Sonar Ping 4x",
-        "amzn_sfx_scifi_spaceship_flyby": "Scifi Spaceship Flyby",
-        "amzn_sfx_scifi_timer_beep": "Scifi Timer Beep",
-        "amzn_sfx_scifi_zap_backwards": "Scifi Zap Backwards",
-        "amzn_sfx_scifi_zap_electric": "Scifi Zap Electric",
-        "amzn_sfx_sheep_baa": "Sheep Baa",
-        "amzn_sfx_sheep_bleat": "Sheep Bleat",
-        "amzn_sfx_silverware_clank": "Silverware Clank",
-        "amzn_sfx_sirens": "Sirens",
-        "amzn_sfx_sleigh_bells": "Sleigh Bells",
-        "amzn_sfx_small_stream": "Small Stream",
-        "amzn_sfx_sneeze": "Sneeze",
-        "amzn_sfx_stream": "Stream",
-        "amzn_sfx_strong_wind_desert": "Strong Wind Desert",
-        "amzn_sfx_strong_wind_whistling": "Strong Wind Whistling",
-        "amzn_sfx_subway_leaving": "Subway Leaving",
-        "amzn_sfx_subway_passing": "Subway Passing",
-        "amzn_sfx_subway_stopping": "Subway Stopping",
-        "amzn_sfx_swoosh_cartoon_fast": "Swoosh Cartoon Fast",
-        "amzn_sfx_swoosh_fast_1x": "Swoosh Fast 1x",
-        "amzn_sfx_swoosh_fast_6x": "Swoosh Fast 6x",
-        "amzn_sfx_test_tone": "Test Tone",
-        "amzn_sfx_thunder_rumble": "Thunder Rumble",
-        "amzn_sfx_toilet_flush": "Toilet Flush",
-        "amzn_sfx_trumpet_bugle": "Trumpet Bugle",
-        "amzn_sfx_turkey_gobbling": "Turkey Gobbling",
-        "amzn_sfx_typing_medium": "Typing Medium",
-        "amzn_sfx_typing_short": "Typing Short",
-        "amzn_sfx_typing_typewriter": "Typing Typewriter",
-        "amzn_sfx_vacuum_off": "Vacuum Off",
-        "amzn_sfx_vacuum_on": "Vacuum On",
-        "amzn_sfx_walking_in_mud": "Walking In Mud",
-        "amzn_sfx_walking_in_snow": "Walking In Snow",
-        "amzn_sfx_walking_on_grass": "Walking On Grass",
-        "amzn_sfx_water_dripping": "Water Dripping",
-        "amzn_sfx_water_droplets": "Water Droplets",
-        "amzn_sfx_wind_strong_gusting": "Wind Strong Gusting",
-        "amzn_sfx_wind_whistling_desert": "Wind Whistling Desert",
-        "amzn_sfx_wings_flap_4x": "Wings Flap 4x",
-        "amzn_sfx_wings_flap_fast": "Wings Flap Fast",
-        "amzn_sfx_wolf_howl": "Wolf Howl",
-        "amzn_sfx_wolf_young_howl": "Wolf Young Howl",
-        "amzn_sfx_wooden_door": "Wooden Door",
-        "amzn_sfx_wooden_door_creaks_long": "Wooden Door Creaks Long",
-        "amzn_sfx_wooden_door_creaks_multiple": "Wooden Door Creaks Multiple",
-        "amzn_sfx_wooden_door_creaks_open": "Wooden Door Creaks Open",
-        "amzn_ui_sfx_gameshow_bridge": "Gameshow Bridge",
-        "amzn_ui_sfx_gameshow_countdown_loop_32s_full": "Gameshow Countdown Loop 32s Full",
-        "amzn_ui_sfx_gameshow_countdown_loop_64s_full": "Gameshow Countdown Loop 64s Full",
-        "amzn_ui_sfx_gameshow_countdown_loop_64s_minimal": "Gameshow Countdown Loop 64s Minimal",
-        "amzn_ui_sfx_gameshow_intro": "Gameshow Intro",
-        "amzn_ui_sfx_gameshow_negative_response": "Gameshow Negative Response",
-        "amzn_ui_sfx_gameshow_neutral_response": "Gameshow Neutral Response",
-        "amzn_ui_sfx_gameshow_outro": "Gameshow Outro",
-        "amzn_ui_sfx_gameshow_player1": "Gameshow Player1",
-        "amzn_ui_sfx_gameshow_player2": "Gameshow Player2",
-        "amzn_ui_sfx_gameshow_player3": "Gameshow Player3",
-        "amzn_ui_sfx_gameshow_player4": "Gameshow Player4",
-        "amzn_ui_sfx_gameshow_positive_response": "Gameshow Positive Response",
-        "amzn_ui_sfx_gameshow_tally_negative": "Gameshow Tally Negative",
-        "amzn_ui_sfx_gameshow_tally_positive": "Gameshow Tally Positive",
-        "amzn_ui_sfx_gameshow_waiting_loop_30s": "Gameshow Waiting Loop 30s",
-        "anchor": "Anchor",
-        "answering_machines": "Answering Machines",
-        "arcs_sparks": "Arcs Sparks",
-        "arrows_bows": "Arrows Bows",
-        "baby": "Baby",
-        "back_up_beeps": "Back Up Beeps",
-        "bars_restaurants": "Bars Restaurants",
-        "baseball": "Baseball",
-        "basketball": "Basketball",
-        "battles": "Battles",
-        "beeps_tones": "Beeps Tones",
-        "bell": "Bell",
-        "bikes": "Bikes",
-        "billiards": "Billiards",
-        "board_games": "Board Games",
-        "body": "Body",
-        "boing": "Boing",
-        "books": "Books",
-        "bow_wash": "Bow Wash",
-        "box": "Box",
-        "break_shatter_smash": "Break Shatter Smash",
-        "breaks": "Breaks",
-        "brooms_mops": "Brooms Mops",
-        "bullets": "Bullets",
-        "buses": "Buses",
-        "buzz": "Buzz",
-        "buzz_hums": "Buzz Hums",
-        "buzzers": "Buzzers",
-        "buzzers_pistols": "Buzzers Pistols",
-        "cables_metal": "Cables Metal",
-        "camera": "Camera",
-        "cannons": "Cannons",
-        "car_alarm": "Car Alarm",
-        "car_alarms": "Car Alarms",
-        "car_cell_phones": "Car Cell Phones",
-        "carnivals_fairs": "Carnivals Fairs",
-        "cars": "Cars",
-        "casino": "Casino",
-        "casinos": "Casinos",
-        "cellar": "Cellar",
-        "chimes": "Chimes",
-        "chimes_bells": "Chimes Bells",
-        "chorus": "Chorus",
-        "christmas": "Christmas",
-        "church_bells": "Church Bells",
-        "clock": "Clock",
-        "cloth": "Cloth",
-        "concrete": "Concrete",
-        "construction": "Construction",
-        "construction_factory": "Construction Factory",
-        "crashes": "Crashes",
-        "crowds": "Crowds",
-        "debris": "Debris",
-        "dining_kitchens": "Dining Kitchens",
-        "dinosaurs": "Dinosaurs",
-        "dripping": "Dripping",
-        "drops": "Drops",
-        "electric": "Electric",
-        "electrical": "Electrical",
-        "elevator": "Elevator",
-        "evolution_monsters": "Evolution Monsters",
-        "explosions": "Explosions",
-        "factory": "Factory",
-        "falls": "Falls",
-        "fax_scanner_copier": "Fax Scanner Copier",
-        "feedback_mics": "Feedback Mics",
-        "fight": "Fight",
-        "fire": "Fire",
-        "fire_extinguisher": "Fire Extinguisher",
-        "fireballs": "Fireballs",
-        "fireworks": "Fireworks",
-        "fishing_pole": "Fishing Pole",
-        "flags": "Flags",
-        "football": "Football",
-        "footsteps": "Footsteps",
-        "futuristic": "Futuristic",
-        "futuristic_ship": "Futuristic Ship",
-        "gameshow": "Gameshow",
-        "gear": "Gear",
-        "ghosts_demons": "Ghosts Demons",
-        "giant_monster": "Giant Monster",
-        "glass": "Glass",
-        "glasses_clink": "Glasses Clink",
-        "golf": "Golf",
-        "gorilla": "Gorilla",
-        "grenade_lanucher": "Grenade Lanucher",
-        "griffen": "Griffen",
-        "gyms_locker_rooms": "Gyms Locker Rooms",
-        "handgun_loading": "Handgun Loading",
-        "handgun_shot": "Handgun Shot",
-        "handle": "Handle",
-        "hands": "Hands",
-        "heartbeats_ekg": "Heartbeats EKG",
-        "helicopter": "Helicopter",
-        "high_tech": "High Tech",
-        "hit_punch_slap": "Hit Punch Slap",
-        "hits": "Hits",
-        "horns": "Horns",
-        "horror": "Horror",
-        "hot_tub_filling_up": "Hot Tub Filling Up",
-        "human": "Human",
-        "human_vocals": "Human Vocals",
-        "hygene": "Hygene",
-        "ice_skating": "Ice Skating",
-        "ignitions": "Ignitions",
-        "infantry": "Infantry",
-        "intro": "Intro",
-        "jet": "Jet",
-        "juggling": "Juggling",
-        "key_lock": "Key Lock",
-        "kids": "Kids",
-        "knocks": "Knocks",
-        "lab_equip": "Lab Equip",
-        "lacrosse": "Lacrosse",
-        "lamps_lanterns": "Lamps Lanterns",
-        "leather": "Leather",
-        "liquid_suction": "Liquid Suction",
-        "locker_doors": "Locker Doors",
-        "machine_gun": "Machine Gun",
-        "magic_spells": "Magic Spells",
-        "medium_large_explosions": "Medium Large Explosions",
-        "metal": "Metal",
-        "modern_rings": "Modern Rings",
-        "money_coins": "Money Coins",
-        "motorcycles": "Motorcycles",
-        "movement": "Movement",
-        "moves": "Moves",
-        "nature": "Nature",
-        "oar_boat": "Oar Boat",
-        "pagers": "Pagers",
-        "paintball": "Paintball",
-        "paper": "Paper",
-        "parachute": "Parachute",
-        "pay_phones": "Pay Phones",
-        "phone_beeps": "Phone Beeps",
-        "pigmy_bats": "Pigmy Bats",
-        "pills": "Pills",
-        "pour_water": "Pour Water",
-        "power_up_down": "Power Up Down",
-        "printers": "Printers",
-        "prison": "Prison",
-        "public_space": "Public Space",
-        "racquetball": "Racquetball",
-        "radios_static": "Radios Static",
-        "rain": "Rain",
-        "rc_airplane": "RC Airplane",
-        "rc_car": "RC Car",
-        "refrigerators_freezers": "Refrigerators Freezers",
-        "regular": "Regular",
-        "respirator": "Respirator",
-        "rifle": "Rifle",
-        "roller_coaster": "Roller Coaster",
-        "rollerskates_rollerblades": "RollerSkates RollerBlades",
-        "room_tones": "Room Tones",
-        "ropes_climbing": "Ropes Climbing",
-        "rotary_rings": "Rotary Rings",
-        "rowboat_canoe": "Rowboat Canoe",
-        "rubber": "Rubber",
-        "running": "Running",
-        "sails": "Sails",
-        "sand_gravel": "Sand Gravel",
-        "screen_doors": "Screen Doors",
-        "screens": "Screens",
-        "seats_stools": "Seats Stools",
-        "servos": "Servos",
-        "shoes_boots": "Shoes Boots",
-        "shotgun": "Shotgun",
-        "shower": "Shower",
-        "sink_faucet": "Sink Faucet",
-        "sink_filling_water": "Sink Filling Water",
-        "sink_run_and_off": "Sink Run And Off",
-        "sink_water_splatter": "Sink Water Splatter",
-        "sirens": "Sirens",
-        "skateboards": "Skateboards",
-        "ski": "Ski",
-        "skids_tires": "Skids Tires",
-        "sled": "Sled",
-        "slides": "Slides",
-        "small_explosions": "Small Explosions",
-        "snow": "Snow",
-        "snowmobile": "Snowmobile",
-        "soldiers": "Soldiers",
-        "splash_water": "Splash Water",
-        "splashes_sprays": "Splashes Sprays",
-        "sports_whistles": "Sports Whistles",
-        "squeaks": "Squeaks",
-        "squeaky": "Squeaky",
-        "stairs": "Stairs",
-        "steam": "Steam",
-        "submarine_diesel": "Submarine Diesel",
-        "swing_doors": "Swing Doors",
-        "switches_levers": "Switches Levers",
-        "swords": "Swords",
-        "tape": "Tape",
-        "tape_machine": "Tape Machine",
-        "televisions_shows": "Televisions Shows",
-        "tennis_pingpong": "Tennis PingPong",
-        "textile": "Textile",
-        "throw": "Throw",
-        "thunder": "Thunder",
-        "ticks": "Ticks",
-        "timer": "Timer",
-        "toilet_flush": "Toilet Flush",
-        "tone": "Tone",
-        "tones_noises": "Tones Noises",
-        "toys": "Toys",
-        "tractors": "Tractors",
-        "traffic": "Traffic",
-        "train": "Train",
-        "trucks_vans": "Trucks Vans",
-        "turnstiles": "Turnstiles",
-        "typing": "Typing",
-        "umbrella": "Umbrella",
-        "underwater": "Underwater",
-        "vampires": "Vampires",
-        "various": "Various",
-        "video_tunes": "Video Tunes",
-        "volcano_earthquake": "Volcano Earthquake",
-        "watches": "Watches",
-        "water": "Water",
-        "water_running": "Water Running",
-        "werewolves": "Werewolves",
-        "winches_gears": "Winches Gears",
-        "wind": "Wind",
-        "wood": "Wood",
-        "wood_boat": "Wood Boat",
-        "woosh": "Woosh",
-        "zap": "Zap",
-        "zippers": "Zippers"
-      }
-    }
-  },
   "exceptions": {
     "cannot_connect_with_error": {
       "message": "Error connecting: {error}"
     },
     "cannot_retrieve_data_with_error": {
       "message": "Error retrieving data: {error}"
-    },
-    "device_serial_number_missing": {
-      "message": "Device serial number missing: {device_id}"
-    },
-    "invalid_device_id": {
-      "message": "Invalid device ID specified: {device_id}"
-    },
-    "invalid_sound_value": {
-      "message": "Invalid sound {sound} with variant {variant} specified"
-    },
-    "entry_not_loaded": {
-      "message": "Entry not loaded: {entry}"
     }
   }
 }

homeassistant/components/amberelectric/__init__.py

@@ -2,22 +2,11 @@
 
 import amberelectric
 
-from homeassistant.components.sensor import ConfigType
 from homeassistant.const import CONF_API_TOKEN
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import config_validation as cv
 
-from .const import CONF_SITE_ID, DOMAIN, PLATFORMS
+from .const import CONF_SITE_ID, PLATFORMS
 from .coordinator import AmberConfigEntry, AmberUpdateCoordinator
-from .services import setup_services
-
-CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
-
-
-async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the Amber component."""
-    setup_services(hass)
-    return True
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: AmberConfigEntry) -> bool:

homeassistant/components/amberelectric/const.py

@@ -1,24 +1,14 @@
 """Amber Electric Constants."""
 
 import logging
-from typing import Final
 
 from homeassistant.const import Platform
 
-DOMAIN: Final = "amberelectric"
+DOMAIN = "amberelectric"
 CONF_SITE_NAME = "site_name"
 CONF_SITE_ID = "site_id"
 
-ATTR_CONFIG_ENTRY_ID = "config_entry_id"
-ATTR_CHANNEL_TYPE = "channel_type"
-
 ATTRIBUTION = "Data provided by Amber Electric"
 
 LOGGER = logging.getLogger(__package__)
 PLATFORMS = [Platform.BINARY_SENSOR, Platform.SENSOR]
-
-SERVICE_GET_FORECASTS = "get_forecasts"
-
-GENERAL_CHANNEL = "general"
-CONTROLLED_LOAD_CHANNEL = "controlled_load"
-FEED_IN_CHANNEL = "feed_in"

homeassistant/components/amberelectric/coordinator.py

@@ -10,6 +10,7 @@ from amberelectric.models.actual_interval import ActualInterval
 from amberelectric.models.channel import ChannelType
 from amberelectric.models.current_interval import CurrentInterval
 from amberelectric.models.forecast_interval import ForecastInterval
+from amberelectric.models.price_descriptor import PriceDescriptor
 from amberelectric.rest import ApiException
 
 from homeassistant.config_entries import ConfigEntry
@@ -17,7 +18,6 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import LOGGER
-from .helpers import normalize_descriptor
 
 type AmberConfigEntry = ConfigEntry[AmberUpdateCoordinator]
 
@@ -49,6 +49,27 @@ def is_feed_in(interval: ActualInterval | CurrentInterval | ForecastInterval) ->
     return interval.channel_type == ChannelType.FEEDIN
 
 
+def normalize_descriptor(descriptor: PriceDescriptor | None) -> str | None:
+    """Return the snake case versions of descriptor names. Returns None if the name is not recognized."""
+    if descriptor is None:
+        return None
+    if descriptor.value == "spike":
+        return "spike"
+    if descriptor.value == "high":
+        return "high"
+    if descriptor.value == "neutral":
+        return "neutral"
+    if descriptor.value == "low":
+        return "low"
+    if descriptor.value == "veryLow":
+        return "very_low"
+    if descriptor.value == "extremelyLow":
+        return "extremely_low"
+    if descriptor.value == "negative":
+        return "negative"
+    return None
+
+
 class AmberUpdateCoordinator(DataUpdateCoordinator):
     """AmberUpdateCoordinator - In charge of downloading the data for a site, which all the sensors read."""
 
@@ -82,7 +103,7 @@ class AmberUpdateCoordinator(DataUpdateCoordinator):
             "grid": {},
         }
         try:
-            data = self._api.get_current_prices(self.site_id, next=288)
+            data = self._api.get_current_prices(self.site_id, next=48)
             intervals = [interval.actual_instance for interval in data]
         except ApiException as api_exception:
             raise UpdateFailed("Missing price data, skipping update") from api_exception

homeassistant/components/amberelectric/helpers.py

@@ -1,25 +0,0 @@
-"""Formatting helpers used to convert things."""
-
-from amberelectric.models.price_descriptor import PriceDescriptor
-
-DESCRIPTOR_MAP: dict[str, str] = {
-    PriceDescriptor.SPIKE: "spike",
-    PriceDescriptor.HIGH: "high",
-    PriceDescriptor.NEUTRAL: "neutral",
-    PriceDescriptor.LOW: "low",
-    PriceDescriptor.VERYLOW: "very_low",
-    PriceDescriptor.EXTREMELYLOW: "extremely_low",
-    PriceDescriptor.NEGATIVE: "negative",
-}
-
-
-def normalize_descriptor(descriptor: PriceDescriptor | None) -> str | None:
-    """Return the snake case versions of descriptor names. Returns None if the name is not recognized."""
-    if descriptor in DESCRIPTOR_MAP:
-        return DESCRIPTOR_MAP[descriptor]
-    return None
-
-
-def format_cents_to_dollars(cents: float) -> float:
-    """Return a formatted conversion from cents to dollars."""
-    return round(cents / 100, 2)

homeassistant/components/amberelectric/icons.json

@@ -22,10 +22,5 @@
         }
       }
     }
-  },
-  "services": {
-    "get_forecasts": {
-      "service": "mdi:transmission-tower"
-    }
   }
 }

homeassistant/components/amberelectric/sensor.py

@@ -23,12 +23,16 @@ from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import ATTRIBUTION
-from .coordinator import AmberConfigEntry, AmberUpdateCoordinator
-from .helpers import format_cents_to_dollars, normalize_descriptor
+from .coordinator import AmberConfigEntry, AmberUpdateCoordinator, normalize_descriptor
 
 UNIT = f"{CURRENCY_DOLLAR}/{UnitOfEnergy.KILO_WATT_HOUR}"
 
 
+def format_cents_to_dollars(cents: float) -> float:
+    """Return a formatted conversion from cents to dollars."""
+    return round(cents / 100, 2)
+
+
 def friendly_channel_type(channel_type: str) -> str:
     """Return a human readable version of the channel type."""
     if channel_type == "controlled_load":

homeassistant/components/amberelectric/services.py

@@ -1,121 +0,0 @@
-"""Amber Electric Service class."""
-
-from amberelectric.models.channel import ChannelType
-import voluptuous as vol
-
-from homeassistant.config_entries import ConfigEntryState
-from homeassistant.core import (
-    HomeAssistant,
-    ServiceCall,
-    ServiceResponse,
-    SupportsResponse,
-)
-from homeassistant.exceptions import ServiceValidationError
-from homeassistant.helpers.selector import ConfigEntrySelector
-from homeassistant.util.json import JsonValueType
-
-from .const import (
-    ATTR_CHANNEL_TYPE,
-    ATTR_CONFIG_ENTRY_ID,
-    CONTROLLED_LOAD_CHANNEL,
-    DOMAIN,
-    FEED_IN_CHANNEL,
-    GENERAL_CHANNEL,
-    SERVICE_GET_FORECASTS,
-)
-from .coordinator import AmberConfigEntry
-from .helpers import format_cents_to_dollars, normalize_descriptor
-
-GET_FORECASTS_SCHEMA = vol.Schema(
-    {
-        ATTR_CONFIG_ENTRY_ID: ConfigEntrySelector({"integration": DOMAIN}),
-        ATTR_CHANNEL_TYPE: vol.In(
-            [GENERAL_CHANNEL, CONTROLLED_LOAD_CHANNEL, FEED_IN_CHANNEL]
-        ),
-    }
-)
-
-
-def async_get_entry(hass: HomeAssistant, config_entry_id: str) -> AmberConfigEntry:
-    """Get the Amber config entry."""
-    if not (entry := hass.config_entries.async_get_entry(config_entry_id)):
-        raise ServiceValidationError(
-            translation_domain=DOMAIN,
-            translation_key="integration_not_found",
-            translation_placeholders={"target": config_entry_id},
-        )
-    if entry.state is not ConfigEntryState.LOADED:
-        raise ServiceValidationError(
-            translation_domain=DOMAIN,
-            translation_key="not_loaded",
-            translation_placeholders={"target": entry.title},
-        )
-    return entry
-
-
-def get_forecasts(channel_type: str, data: dict) -> list[JsonValueType]:
-    """Return an array of forecasts."""
-    results: list[JsonValueType] = []
-
-    if channel_type not in data["forecasts"]:
-        raise ServiceValidationError(
-            translation_domain=DOMAIN,
-            translation_key="channel_not_found",
-            translation_placeholders={"channel_type": channel_type},
-        )
-
-    intervals = data["forecasts"][channel_type]
-
-    for interval in intervals:
-        datum = {}
-        datum["duration"] = interval.duration
-        datum["date"] = interval.var_date.isoformat()
-        datum["nem_date"] = interval.nem_time.isoformat()
-        datum["per_kwh"] = format_cents_to_dollars(interval.per_kwh)
-        if interval.channel_type == ChannelType.FEEDIN:
-            datum["per_kwh"] = datum["per_kwh"] * -1
-        datum["spot_per_kwh"] = format_cents_to_dollars(interval.spot_per_kwh)
-        datum["start_time"] = interval.start_time.isoformat()
-        datum["end_time"] = interval.end_time.isoformat()
-        datum["renewables"] = round(interval.renewables)
-        datum["spike_status"] = interval.spike_status.value
-        datum["descriptor"] = normalize_descriptor(interval.descriptor)
-
-        if interval.range is not None:
-            datum["range_min"] = format_cents_to_dollars(interval.range.min)
-            datum["range_max"] = format_cents_to_dollars(interval.range.max)
-
-        if interval.advanced_price is not None:
-            multiplier = -1 if interval.channel_type == ChannelType.FEEDIN else 1
-            datum["advanced_price_low"] = multiplier * format_cents_to_dollars(
-                interval.advanced_price.low
-            )
-            datum["advanced_price_predicted"] = multiplier * format_cents_to_dollars(
-                interval.advanced_price.predicted
-            )
-            datum["advanced_price_high"] = multiplier * format_cents_to_dollars(
-                interval.advanced_price.high
-            )
-
-        results.append(datum)
-
-    return results
-
-
-def setup_services(hass: HomeAssistant) -> None:
-    """Set up the services for the Amber integration."""
-
-    async def handle_get_forecasts(call: ServiceCall) -> ServiceResponse:
-        channel_type = call.data[ATTR_CHANNEL_TYPE]
-        entry = async_get_entry(hass, call.data[ATTR_CONFIG_ENTRY_ID])
-        coordinator = entry.runtime_data
-        forecasts = get_forecasts(channel_type, coordinator.data)
-        return {"forecasts": forecasts}
-
-    hass.services.async_register(
-        DOMAIN,
-        SERVICE_GET_FORECASTS,
-        handle_get_forecasts,
-        GET_FORECASTS_SCHEMA,
-        supports_response=SupportsResponse.ONLY,
-    )

homeassistant/components/amberelectric/services.yaml

@@ -1,16 +0,0 @@
-get_forecasts:
-  fields:
-    config_entry_id:
-      required: true
-      selector:
-        config_entry:
-          integration: amberelectric
-    channel_type:
-      required: true
-      selector:
-        select:
-          options:
-            - general
-            - controlled_load
-            - feed_in
-          translation_key: channel_type

homeassistant/components/amberelectric/strings.json

@@ -1,61 +1,25 @@
 {
   "config": {
-    "error": {
-      "invalid_api_token": "[%key:common::config_flow::error::invalid_api_key%]",
-      "no_site": "No site provided",
-      "unknown_error": "[%key:common::config_flow::error::unknown%]"
-    },
     "step": {
-      "site": {
-        "data": {
-          "site_id": "Site NMI",
-          "site_name": "Site name"
-        },
-        "description": "Select the NMI of the site you would like to add"
-      },
       "user": {
         "data": {
           "api_token": "[%key:common::config_flow::data::api_token%]",
           "site_id": "Site ID"
         },
         "description": "Go to {api_url} to generate an API key"
-      }
-    }
-  },
-  "services": {
-    "get_forecasts": {
-      "name": "Get price forecasts",
-      "description": "Retrieves price forecasts from Amber Electric for a site.",
-      "fields": {
-        "config_entry_id": {
-          "description": "The config entry of the site to get forecasts for.",
-          "name": "Config entry"
+      },
+      "site": {
+        "data": {
+          "site_id": "Site NMI",
+          "site_name": "Site Name"
         },
-        "channel_type": {
-          "name": "Channel type",
-          "description": "The channel to get forecasts for."
-        }
+        "description": "Select the NMI of the site you would like to add"
       }
-    }
-  },
-  "exceptions": {
-    "integration_not_found": {
-      "message": "Config entry \"{target}\" not found in registry."
     },
-    "not_loaded": {
-      "message": "{target} is not loaded."
-    },
-    "channel_not_found": {
-      "message": "There is no {channel_type} channel at this site."
-    }
-  },
-  "selector": {
-    "channel_type": {
-      "options": {
-        "general": "General",
-        "controlled_load": "Controlled load",
-        "feed_in": "Feed-in"
-      }
+    "error": {
+      "invalid_api_token": "[%key:common::config_flow::error::invalid_api_key%]",
+      "no_site": "No site provided",
+      "unknown_error": "[%key:common::config_flow::error::unknown%]"
     }
   }
 }

homeassistant/components/amcrest/manifest.json

@@ -7,5 +7,5 @@
   "iot_class": "local_polling",
   "loggers": ["amcrest"],
   "quality_scale": "legacy",
-  "requirements": ["amcrest==1.9.9"]
+  "requirements": ["amcrest==1.9.8"]
 }

homeassistant/components/analytics/__init__.py

@@ -14,7 +14,6 @@ from homeassistant.util.hass_dict import HassKey
 
 from .analytics import Analytics
 from .const import ATTR_ONBOARDED, ATTR_PREFERENCES, DOMAIN, INTERVAL, PREFERENCE_SCHEMA
-from .http import AnalyticsDevicesView
 
 CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
 
@@ -56,8 +55,6 @@ async def async_setup(hass: HomeAssistant, _: ConfigType) -> bool:
     websocket_api.async_register_command(hass, websocket_analytics)
     websocket_api.async_register_command(hass, websocket_analytics_preferences)
 
-    hass.http.register_view(AnalyticsDevicesView)
-
     hass.data[DATA_COMPONENT] = analytics
     return True
 

homeassistant/components/analytics/analytics.py

@@ -27,7 +27,7 @@ from homeassistant.config_entries import SOURCE_IGNORE
 from homeassistant.const import ATTR_DOMAIN, BASE_PLATFORMS, __version__ as HA_VERSION
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import device_registry as dr, entity_registry as er
+from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.hassio import is_hassio
 from homeassistant.helpers.storage import Store
@@ -77,11 +77,6 @@ from .const import (
 )
 
 
-def gen_uuid() -> str:
-    """Generate a new UUID."""
-    return uuid.uuid4().hex
-
-
 @dataclass
 class AnalyticsData:
     """Analytics data."""
@@ -189,7 +184,7 @@ class Analytics:
             return
 
         if self._data.uuid is None:
-            self._data.uuid = gen_uuid()
+            self._data.uuid = uuid.uuid4().hex
             await self._store.async_save(dataclass_asdict(self._data))
 
         if self.supervisor:
@@ -386,83 +381,3 @@ def _domains_from_yaml_config(yaml_configuration: dict[str, Any]) -> set[str]:
     ).values():
         domains.update(platforms)
     return domains
-
-
-async def async_devices_payload(hass: HomeAssistant) -> dict:
-    """Return the devices payload."""
-    integrations_without_model_id: set[str] = set()
-    devices: list[dict[str, Any]] = []
-    dev_reg = dr.async_get(hass)
-    # Devices that need via device info set
-    new_indexes: dict[str, int] = {}
-    via_devices: dict[str, str] = {}
-
-    seen_integrations = set()
-
-    for device in dev_reg.devices.values():
-        # Ignore services
-        if device.entry_type:
-            continue
-
-        if not device.primary_config_entry:
-            continue
-
-        config_entry = hass.config_entries.async_get_entry(device.primary_config_entry)
-
-        if config_entry is None:
-            continue
-
-        seen_integrations.add(config_entry.domain)
-
-        if not device.model_id:
-            integrations_without_model_id.add(config_entry.domain)
-            continue
-
-        if not device.manufacturer:
-            continue
-
-        new_indexes[device.id] = len(devices)
-        devices.append(
-            {
-                "integration": config_entry.domain,
-                "manufacturer": device.manufacturer,
-                "model_id": device.model_id,
-                "model": device.model,
-                "sw_version": device.sw_version,
-                "hw_version": device.hw_version,
-                "has_suggested_area": device.suggested_area is not None,
-                "has_configuration_url": device.configuration_url is not None,
-                "via_device": None,
-            }
-        )
-        if device.via_device_id:
-            via_devices[device.id] = device.via_device_id
-
-    for from_device, via_device in via_devices.items():
-        if via_device not in new_indexes:
-            continue
-        devices[new_indexes[from_device]]["via_device"] = new_indexes[via_device]
-
-    integrations = {
-        domain: integration
-        for domain, integration in (
-            await async_get_integrations(hass, seen_integrations)
-        ).items()
-        if isinstance(integration, Integration)
-    }
-
-    for device_info in devices:
-        if integration := integrations.get(device_info["integration"]):
-            device_info["is_custom_integration"] = not integration.is_built_in
-
-    return {
-        "version": "home-assistant:1",
-        "no_model_id": sorted(
-            [
-                domain
-                for domain in integrations_without_model_id
-                if domain in integrations and integrations[domain].is_built_in
-            ]
-        ),
-        "devices": devices,
-    }

homeassistant/components/analytics/http.py

@@ -1,27 +0,0 @@
-"""HTTP endpoints for analytics integration."""
-
-from aiohttp import web
-
-from homeassistant.components.http import KEY_HASS, HomeAssistantView, require_admin
-from homeassistant.core import HomeAssistant
-
-from .analytics import async_devices_payload
-
-
-class AnalyticsDevicesView(HomeAssistantView):
-    """View to handle analytics devices payload download requests."""
-
-    url = "/api/analytics/devices"
-    name = "api:analytics:devices"
-
-    @require_admin
-    async def get(self, request: web.Request) -> web.Response:
-        """Return analytics devices payload as JSON."""
-        hass: HomeAssistant = request.app[KEY_HASS]
-        payload = await async_devices_payload(hass)
-        return self.json(
-            payload,
-            headers={
-                "Content-Disposition": "attachment; filename=analytics_devices.json"
-            },
-        )

homeassistant/components/analytics/manifest.json

@@ -3,7 +3,7 @@
   "name": "Analytics",
   "after_dependencies": ["energy", "hassio", "recorder"],
   "codeowners": ["@home-assistant/core", "@ludeeus"],
-  "dependencies": ["api", "websocket_api", "http"],
+  "dependencies": ["api", "websocket_api"],
   "documentation": "https://www.home-assistant.io/integrations/analytics",
   "integration_type": "system",
   "iot_class": "cloud_push",

homeassistant/components/analytics_insights/__init__.py

@@ -55,6 +55,7 @@ async def async_setup_entry(
     entry.runtime_data = AnalyticsInsightsData(coordinator=coordinator, names=names)
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+    entry.async_on_unload(entry.add_update_listener(update_listener))
 
     return True
 
@@ -64,3 +65,10 @@ async def async_unload_entry(
 ) -> bool:
     """Unload a config entry."""
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+
+
+async def update_listener(
+    hass: HomeAssistant, entry: AnalyticsInsightsConfigEntry
+) -> None:
+    """Handle options update."""
+    await hass.config_entries.async_reload(entry.entry_id)

homeassistant/components/analytics_insights/config_flow.py

@@ -11,11 +11,7 @@ from python_homeassistant_analytics import (
 from python_homeassistant_analytics.models import Environment, IntegrationType
 import voluptuous as vol
 
-from homeassistant.config_entries import (
-    ConfigFlow,
-    ConfigFlowResult,
-    OptionsFlowWithReload,
-)
+from homeassistant.config_entries import ConfigFlow, ConfigFlowResult, OptionsFlow
 from homeassistant.core import callback
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.selector import (
@@ -133,7 +129,7 @@ class HomeassistantAnalyticsConfigFlow(ConfigFlow, domain=DOMAIN):
         )
 
 
-class HomeassistantAnalyticsOptionsFlowHandler(OptionsFlowWithReload):
+class HomeassistantAnalyticsOptionsFlowHandler(OptionsFlow):
     """Handle Homeassistant Analytics options."""
 
     async def async_step_init(

homeassistant/components/androidtv_remote/__init__.py

@@ -68,6 +68,7 @@ async def async_setup_entry(
     entry.async_on_unload(
         hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, on_hass_stop)
     )
+    entry.async_on_unload(entry.add_update_listener(async_update_options))
     entry.async_on_unload(api.disconnect)
 
     return True
@@ -79,3 +80,13 @@ async def async_unload_entry(
     """Unload a config entry."""
     _LOGGER.debug("async_unload_entry: %s", entry.data)
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+
+
+async def async_update_options(
+    hass: HomeAssistant, entry: AndroidTVRemoteConfigEntry
+) -> None:
+    """Handle options update."""
+    _LOGGER.debug(
+        "async_update_options: data: %s options: %s", entry.data, entry.options
+    )
+    await hass.config_entries.async_reload(entry.entry_id)

homeassistant/components/androidtv_remote/config_flow.py

@@ -19,7 +19,7 @@ from homeassistant.config_entries import (
     SOURCE_RECONFIGURE,
     ConfigFlow,
     ConfigFlowResult,
-    OptionsFlowWithReload,
+    OptionsFlow,
 )
 from homeassistant.const import CONF_HOST, CONF_MAC, CONF_NAME
 from homeassistant.core import callback
@@ -116,10 +116,10 @@ class AndroidTVRemoteConfigFlow(ConfigFlow, domain=DOMAIN):
                 pin = user_input["pin"]
                 await self.api.async_finish_pairing(pin)
                 if self.source == SOURCE_REAUTH:
-                    return self.async_update_reload_and_abort(
-                        self._get_reauth_entry(), reload_even_if_entry_is_unchanged=True
+                    await self.hass.config_entries.async_reload(
+                        self._get_reauth_entry().entry_id
                     )
-
+                    return self.async_abort(reason="reauth_successful")
                 return self.async_create_entry(
                     title=self.name,
                     data={
@@ -243,7 +243,7 @@ class AndroidTVRemoteConfigFlow(ConfigFlow, domain=DOMAIN):
         return AndroidTVRemoteOptionsFlowHandler(config_entry)
 
 
-class AndroidTVRemoteOptionsFlowHandler(OptionsFlowWithReload):
+class AndroidTVRemoteOptionsFlowHandler(OptionsFlow):
     """Android TV Remote options flow."""
 
     def __init__(self, config_entry: AndroidTVRemoteConfigEntry) -> None:

homeassistant/components/androidtv_remote/helpers.py

@@ -27,4 +27,4 @@ def create_api(hass: HomeAssistant, host: str, enable_ime: bool) -> AndroidTVRem
 
 def get_enable_ime(entry: AndroidTVRemoteConfigEntry) -> bool:
     """Get value of enable_ime option or its default value."""
-    return entry.options.get(CONF_ENABLE_IME, CONF_ENABLE_IME_DEFAULT_VALUE)  # type: ignore[no-any-return]
+    return entry.options.get(CONF_ENABLE_IME, CONF_ENABLE_IME_DEFAULT_VALUE)

homeassistant/components/anthemav/strings.json

@@ -10,7 +10,7 @@
     },
     "error": {
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "cannot_receive_deviceinfo": "Failed to retrieve MAC address. Make sure the device is turned on"
+      "cannot_receive_deviceinfo": "Failed to retrieve MAC Address. Make sure the device is turned on"
     },
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"

homeassistant/components/anthropic/const.py

@@ -10,9 +10,9 @@ DEFAULT_CONVERSATION_NAME = "Claude conversation"
 CONF_RECOMMENDED = "recommended"
 CONF_PROMPT = "prompt"
 CONF_CHAT_MODEL = "chat_model"
-RECOMMENDED_CHAT_MODEL = "claude-3-5-haiku-latest"
+RECOMMENDED_CHAT_MODEL = "claude-3-haiku-20240307"
 CONF_MAX_TOKENS = "max_tokens"
-RECOMMENDED_MAX_TOKENS = 3000
+RECOMMENDED_MAX_TOKENS = 1024
 CONF_TEMPERATURE = "temperature"
 RECOMMENDED_TEMPERATURE = 1.0
 CONF_THINKING_BUDGET = "thinking_budget"

homeassistant/components/anthropic/conversation.py

@@ -6,6 +6,7 @@ from homeassistant.components import conversation
 from homeassistant.config_entries import ConfigSubentry
 from homeassistant.const import CONF_LLM_HASS_API, MATCH_ALL
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import intent
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AnthropicConfigEntry
@@ -71,4 +72,13 @@ class AnthropicConversationEntity(
 
         await self._async_handle_chat_log(chat_log)
 
-        return conversation.async_get_result_from_chat_log(user_input, chat_log)
+        response_content = chat_log.content[-1]
+        if not isinstance(response_content, conversation.AssistantContent):
+            raise TypeError("Last message must be an assistant message")
+        intent_response = intent.IntentResponse(language=user_input.language)
+        intent_response.async_set_speech(response_content.content or "")
+        return conversation.ConversationResult(
+            response=intent_response,
+            conversation_id=chat_log.conversation_id,
+            continue_conversation=chat_log.continue_conversation,
+        )

homeassistant/components/anthropic/entity.py

@@ -311,13 +311,11 @@ def _create_token_stats(
 class AnthropicBaseLLMEntity(Entity):
     """Anthropic base LLM entity."""
 
-    _attr_has_entity_name = True
-    _attr_name = None
-
     def __init__(self, entry: AnthropicConfigEntry, subentry: ConfigSubentry) -> None:
         """Initialize the entity."""
         self.entry = entry
         self.subentry = subentry
+        self._attr_name = subentry.title
         self._attr_unique_id = subentry.subentry_id
         self._attr_device_info = dr.DeviceInfo(
             identifiers={(DOMAIN, subentry.subentry_id)},

homeassistant/components/anthropic/strings.json

@@ -29,7 +29,7 @@
         "set_options": {
           "data": {
             "name": "[%key:common::config_flow::data::name%]",
-            "prompt": "[%key:common::config_flow::data::prompt%]",
+            "prompt": "Instructions",
             "chat_model": "[%key:common::generic::model%]",
             "max_tokens": "Maximum tokens to return in response",
             "temperature": "Temperature",

homeassistant/components/apple_tv/manifest.json

@@ -7,7 +7,7 @@
   "documentation": "https://www.home-assistant.io/integrations/apple_tv",
   "iot_class": "local_push",
   "loggers": ["pyatv", "srptools"],
-  "requirements": ["pyatv==0.16.1"],
+  "requirements": ["pyatv==0.16.0"],
   "zeroconf": [
     "_mediaremotetv._tcp.local.",
     "_companion-link._tcp.local.",

homeassistant/components/arcam_fmj/manifest.json

@@ -6,7 +6,7 @@
   "documentation": "https://www.home-assistant.io/integrations/arcam_fmj",
   "iot_class": "local_polling",
   "loggers": ["arcam"],
-  "requirements": ["arcam-fmj==1.8.2"],
+  "requirements": ["arcam-fmj==1.8.1"],
   "ssdp": [
     {
       "deviceType": "urn:schemas-upnp-org:device:MediaRenderer:1",

homeassistant/components/assist_pipeline/__init__.py

@@ -38,6 +38,8 @@ from .pipeline import (
     async_create_default_pipeline,
     async_get_pipeline,
     async_get_pipelines,
+    async_migrate_engine,
+    async_run_migrations,
     async_setup_pipeline_store,
     async_update_pipeline,
 )
@@ -59,6 +61,7 @@ __all__ = (
     "WakeWordSettings",
     "async_create_default_pipeline",
     "async_get_pipelines",
+    "async_migrate_engine",
     "async_pipeline_from_audio_stream",
     "async_setup",
     "async_update_pipeline",
@@ -84,6 +87,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     hass.data[DATA_LAST_WAKE_UP] = {}
 
     await async_setup_pipeline_store(hass)
+    await async_run_migrations(hass)
     async_register_websocket_api(hass)
 
     return True

homeassistant/components/assist_pipeline/const.py

@@ -3,6 +3,7 @@
 DOMAIN = "assist_pipeline"
 
 DATA_CONFIG = f"{DOMAIN}.config"
+DATA_MIGRATIONS = f"{DOMAIN}_migrations"
 
 DEFAULT_PIPELINE_TIMEOUT = 60 * 5  # seconds
 

homeassistant/components/assist_pipeline/pipeline.py

@@ -13,7 +13,7 @@ from pathlib import Path
 from queue import Empty, Queue
 from threading import Thread
 import time
-from typing import TYPE_CHECKING, Any, cast
+from typing import TYPE_CHECKING, Any, Literal, cast
 import wave
 
 import hass_nabucasa
@@ -49,6 +49,7 @@ from .const import (
     CONF_DEBUG_RECORDING_DIR,
     DATA_CONFIG,
     DATA_LAST_WAKE_UP,
+    DATA_MIGRATIONS,
     DOMAIN,
     MS_PER_CHUNK,
     SAMPLE_CHANNELS,
@@ -2058,6 +2059,50 @@ async def async_setup_pipeline_store(hass: HomeAssistant) -> PipelineData:
     return PipelineData(pipeline_store)
 
 
+@callback
+def async_migrate_engine(
+    hass: HomeAssistant,
+    engine_type: Literal["conversation", "stt", "tts", "wake_word"],
+    old_value: str,
+    new_value: str,
+) -> None:
+    """Register a migration of an engine used in pipelines."""
+    hass.data.setdefault(DATA_MIGRATIONS, {})[engine_type] = (old_value, new_value)
+
+    # Run migrations when config is already loaded
+    if DATA_CONFIG in hass.data:
+        hass.async_create_background_task(
+            async_run_migrations(hass), "assist_pipeline_migration", eager_start=True
+        )
+
+
+async def async_run_migrations(hass: HomeAssistant) -> None:
+    """Run pipeline migrations."""
+    if not (migrations := hass.data.get(DATA_MIGRATIONS)):
+        return
+
+    engine_attr = {
+        "conversation": "conversation_engine",
+        "stt": "stt_engine",
+        "tts": "tts_engine",
+        "wake_word": "wake_word_entity",
+    }
+
+    updates = []
+
+    for pipeline in async_get_pipelines(hass):
+        attr_updates = {}
+        for engine_type, (old_value, new_value) in migrations.items():
+            if getattr(pipeline, engine_attr[engine_type]) == old_value:
+                attr_updates[engine_attr[engine_type]] = new_value
+
+        if attr_updates:
+            updates.append((pipeline, attr_updates))
+
+    for pipeline, attr_updates in updates:
+        await async_update_pipeline(hass, pipeline, **attr_updates)
+
+
 @dataclass
 class PipelineConversationData:
     """Hold data for the duration of a conversation."""

homeassistant/components/assist_satellite/services.yaml

@@ -68,10 +68,9 @@ ask_question:
       required: true
       selector:
         entity:
-          filter:
-            domain: assist_satellite
-            supported_features:
-              - assist_satellite.AssistSatelliteEntityFeature.START_CONVERSATION
+          domain: assist_satellite
+          supported_features:
+            - assist_satellite.AssistSatelliteEntityFeature.START_CONVERSATION
     question:
       required: false
       example: "What kind of music would you like to play?"

homeassistant/components/august/manifest.json

@@ -28,5 +28,5 @@
   "documentation": "https://www.home-assistant.io/integrations/august",
   "iot_class": "cloud_push",
   "loggers": ["pubnub", "yalexs"],
-  "requirements": ["yalexs==8.10.0", "yalexs-ble==3.1.0"]
+  "requirements": ["yalexs==8.10.0", "yalexs-ble==3.0.0"]
 }

homeassistant/components/awair/const.py

@@ -6,7 +6,6 @@ from datetime import timedelta
 import logging
 
 API_CO2 = "carbon_dioxide"
-API_DEW_POINT = "dew_point"
 API_DUST = "dust"
 API_HUMID = "humidity"
 API_LUX = "illuminance"

homeassistant/components/awair/sensor.py

@@ -34,7 +34,6 @@ from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import (
     API_CO2,
-    API_DEW_POINT,
     API_DUST,
     API_HUMID,
     API_LUX,
@@ -111,15 +110,6 @@ SENSOR_TYPES: tuple[AwairSensorEntityDescription, ...] = (
         unique_id_tag="CO2",  # matches legacy format
         state_class=SensorStateClass.MEASUREMENT,
     ),
-    AwairSensorEntityDescription(
-        key=API_DEW_POINT,
-        device_class=SensorDeviceClass.TEMPERATURE,
-        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        translation_key="dew_point",
-        unique_id_tag="dew_point",
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_registry_enabled_default=False,
-    ),
 )
 
 SENSOR_TYPES_DUST: tuple[AwairSensorEntityDescription, ...] = (

homeassistant/components/awair/strings.json

@@ -57,9 +57,6 @@
       },
       "sound_level": {
         "name": "Sound level"
-      },
-      "dew_point": {
-        "name": "Dew point"
       }
     }
   }

homeassistant/components/axis/__init__.py

@@ -30,9 +30,7 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: AxisConfigEntry)
     await hass.config_entries.async_forward_entry_setups(config_entry, PLATFORMS)
     hub.setup()
 
-    config_entry.async_on_unload(
-        config_entry.add_update_listener(hub.async_new_address_callback)
-    )
+    config_entry.add_update_listener(hub.async_new_address_callback)
     config_entry.async_on_unload(hub.teardown)
     config_entry.async_on_unload(
         hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, hub.shutdown)

homeassistant/components/bang_olufsen/strings.json

@@ -93,7 +93,7 @@
         }
       },
       "preset1": {
-        "name": "Favorite 1",
+        "name": "Favourite 1",
         "state_attributes": {
           "event_type": {
             "state": {
@@ -107,7 +107,7 @@
         }
       },
       "preset2": {
-        "name": "Favorite 2",
+        "name": "Favourite 2",
         "state_attributes": {
           "event_type": {
             "state": {
@@ -121,7 +121,7 @@
         }
       },
       "preset3": {
-        "name": "Favorite 3",
+        "name": "Favourite 3",
         "state_attributes": {
           "event_type": {
             "state": {
@@ -135,7 +135,7 @@
         }
       },
       "preset4": {
-        "name": "Favorite 4",
+        "name": "Favourite 4",
         "state_attributes": {
           "event_type": {
             "state": {

homeassistant/components/bauknecht/__init__.py

@@ -1 +0,0 @@
-"""Bauknecht virtual integration."""

homeassistant/components/bauknecht/manifest.json

@@ -1,6 +0,0 @@
-{
-  "domain": "bauknecht",
-  "name": "Bauknecht",
-  "integration_type": "virtual",
-  "supported_by": "whirlpool"
-}

homeassistant/components/blue_current/__init__.py

@@ -15,31 +15,23 @@ from bluecurrent_api.exceptions import (
 )
 
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_API_TOKEN, Platform
+from homeassistant.const import ATTR_NAME, CONF_API_TOKEN, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 
-from .const import (
-    CHARGEPOINT_SETTINGS,
-    CHARGEPOINT_STATUS,
-    DOMAIN,
-    EVSE_ID,
-    LOGGER,
-    PLUG_AND_CHARGE,
-    VALUE,
-)
+from .const import DOMAIN, EVSE_ID, LOGGER, MODEL_TYPE
 
 type BlueCurrentConfigEntry = ConfigEntry[Connector]
 
-PLATFORMS = [Platform.BUTTON, Platform.SENSOR, Platform.SWITCH]
+PLATFORMS = [Platform.BUTTON, Platform.SENSOR]
 CHARGE_POINTS = "CHARGE_POINTS"
 DATA = "data"
 DELAY = 5
 
 GRID = "GRID"
 OBJECT = "object"
-VALUE_TYPES = [CHARGEPOINT_STATUS, CHARGEPOINT_SETTINGS]
+VALUE_TYPES = ["CH_STATUS"]
 
 
 async def async_setup_entry(
@@ -102,7 +94,7 @@ class Connector:
         elif object_name in VALUE_TYPES:
             value_data: dict = message[DATA]
             evse_id = value_data.pop(EVSE_ID)
-            self.update_charge_point(evse_id, object_name, value_data)
+            self.update_charge_point(evse_id, value_data)
 
         # gets grid key / values
         elif GRID in object_name:
@@ -114,37 +106,26 @@ class Connector:
         """Handle incoming chargepoint data."""
         await asyncio.gather(
             *(
-                self.handle_charge_point(entry[EVSE_ID], entry)
+                self.handle_charge_point(
+                    entry[EVSE_ID], entry[MODEL_TYPE], entry[ATTR_NAME]
+                )
                 for entry in charge_points_data
             ),
             self.client.get_grid_status(charge_points_data[0][EVSE_ID]),
         )
 
-    async def handle_charge_point(
-        self, evse_id: str, charge_point: dict[str, Any]
-    ) -> None:
+    async def handle_charge_point(self, evse_id: str, model: str, name: str) -> None:
         """Add the chargepoint and request their data."""
-        self.add_charge_point(evse_id, charge_point)
+        self.add_charge_point(evse_id, model, name)
         await self.client.get_status(evse_id)
 
-    def add_charge_point(self, evse_id: str, charge_point: dict[str, Any]) -> None:
+    def add_charge_point(self, evse_id: str, model: str, name: str) -> None:
         """Add a charge point to charge_points."""
-        self.charge_points[evse_id] = charge_point
+        self.charge_points[evse_id] = {MODEL_TYPE: model, ATTR_NAME: name}
 
-    def update_charge_point(self, evse_id: str, update_type: str, data: dict) -> None:
+    def update_charge_point(self, evse_id: str, data: dict) -> None:
         """Update the charge point data."""
-        charge_point = self.charge_points[evse_id]
-        if update_type == CHARGEPOINT_SETTINGS:
-            # Update the plug and charge object. The library parses this object to a bool instead of an object.
-            plug_and_charge = charge_point.get(PLUG_AND_CHARGE)
-            if plug_and_charge is not None:
-                plug_and_charge[VALUE] = data[PLUG_AND_CHARGE]
-
-            # Remove the plug and charge object from the data list before updating.
-            del data[PLUG_AND_CHARGE]
-
-        charge_point.update(data)
-
+        self.charge_points[evse_id].update(data)
         self.dispatch_charge_point_update_signal(evse_id)
 
     def dispatch_charge_point_update_signal(self, evse_id: str) -> None:

homeassistant/components/blue_current/const.py

@@ -8,14 +8,3 @@ LOGGER = logging.getLogger(__package__)
 
 EVSE_ID = "evse_id"
 MODEL_TYPE = "model_type"
-PLUG_AND_CHARGE = "plug_and_charge"
-VALUE = "value"
-PERMISSION = "permission"
-CHARGEPOINT_STATUS = "CH_STATUS"
-CHARGEPOINT_SETTINGS = "CH_SETTINGS"
-BLOCK = "block"
-UNAVAILABLE = "unavailable"
-AVAILABLE = "available"
-LINKED_CHARGE_CARDS = "linked_charge_cards_only"
-PUBLIC_CHARGING = "public_charging"
-ACTIVITY = "activity"

homeassistant/components/blue_current/icons.json

@@ -30,17 +30,6 @@
       "stop_charge_session": {
         "default": "mdi:stop"
       }
-    },
-    "switch": {
-      "plug_and_charge": {
-        "default": "mdi:ev-plug-type2"
-      },
-      "linked_charge_cards": {
-        "default": "mdi:account-group"
-      },
-      "block": {
-        "default": "mdi:lock"
-      }
     }
   }
 }

homeassistant/components/blue_current/manifest.json

@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/blue_current",
   "iot_class": "cloud_push",
   "loggers": ["bluecurrent_api"],
-  "requirements": ["bluecurrent-api==1.2.4"]
+  "requirements": ["bluecurrent-api==1.2.3"]
 }

homeassistant/components/blue_current/strings.json

@@ -124,17 +124,6 @@
       "reset": {
         "name": "Reset"
       }
-    },
-    "switch": {
-      "plug_and_charge": {
-        "name": "Plug & Charge"
-      },
-      "linked_charge_cards_only": {
-        "name": "Linked charging cards only"
-      },
-      "block": {
-        "name": "Block charge point"
-      }
     }
   }
 }

homeassistant/components/blue_current/switch.py

@@ -1,169 +0,0 @@
-"""Support for Blue Current switches."""
-
-from __future__ import annotations
-
-from collections.abc import Callable
-from dataclasses import dataclass
-from typing import Any
-
-from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-
-from . import PLUG_AND_CHARGE, BlueCurrentConfigEntry, Connector
-from .const import (
-    AVAILABLE,
-    BLOCK,
-    LINKED_CHARGE_CARDS,
-    PUBLIC_CHARGING,
-    UNAVAILABLE,
-    VALUE,
-)
-from .entity import ChargepointEntity
-
-
-@dataclass(kw_only=True, frozen=True)
-class BlueCurrentSwitchEntityDescription(SwitchEntityDescription):
-    """Describes a Blue Current switch entity."""
-
-    function: Callable[[Connector, str, bool], Any]
-
-    turn_on_off_fn: Callable[[str, Connector], tuple[bool, bool]]
-    """Update the switch based on the latest data received from the websocket. The first returned boolean is _attr_is_on, the second one has_value."""
-
-
-def update_on_value_and_activity(
-    key: str, evse_id: str, connector: Connector, reverse_is_on: bool = False
-) -> tuple[bool, bool]:
-    """Return the updated state of the switch based on received chargepoint data and activity."""
-
-    data_object = connector.charge_points[evse_id].get(key)
-    is_on = data_object[VALUE] if data_object is not None else None
-    activity = connector.charge_points[evse_id].get("activity")
-
-    if is_on is not None and activity == AVAILABLE:
-        return is_on if not reverse_is_on else not is_on, True
-    return False, False
-
-
-def update_block_switch(evse_id: str, connector: Connector) -> tuple[bool, bool]:
-    """Return the updated data for a block switch."""
-    activity = connector.charge_points[evse_id].get("activity")
-    return activity == UNAVAILABLE, activity in [AVAILABLE, UNAVAILABLE]
-
-
-def update_charge_point(
-    key: str, evse_id: str, connector: Connector, new_switch_value: bool
-) -> None:
-    """Change charge point data when the state of the switch changes."""
-    data_objects = connector.charge_points[evse_id].get(key)
-    if data_objects is not None:
-        data_objects[VALUE] = new_switch_value
-
-
-async def set_plug_and_charge(connector: Connector, evse_id: str, value: bool) -> None:
-    """Toggle the plug and charge setting for a specific charging point."""
-    await connector.client.set_plug_and_charge(evse_id, value)
-    update_charge_point(PLUG_AND_CHARGE, evse_id, connector, value)
-
-
-async def set_linked_charge_cards(
-    connector: Connector, evse_id: str, value: bool
-) -> None:
-    """Toggle the plug and charge setting for a specific charging point."""
-    await connector.client.set_linked_charge_cards_only(evse_id, value)
-    update_charge_point(PUBLIC_CHARGING, evse_id, connector, not value)
-
-
-SWITCHES = (
-    BlueCurrentSwitchEntityDescription(
-        key=PLUG_AND_CHARGE,
-        translation_key=PLUG_AND_CHARGE,
-        function=set_plug_and_charge,
-        turn_on_off_fn=lambda evse_id, connector: (
-            update_on_value_and_activity(PLUG_AND_CHARGE, evse_id, connector)
-        ),
-    ),
-    BlueCurrentSwitchEntityDescription(
-        key=LINKED_CHARGE_CARDS,
-        translation_key=LINKED_CHARGE_CARDS,
-        function=set_linked_charge_cards,
-        turn_on_off_fn=lambda evse_id, connector: (
-            update_on_value_and_activity(
-                PUBLIC_CHARGING, evse_id, connector, reverse_is_on=True
-            )
-        ),
-    ),
-    BlueCurrentSwitchEntityDescription(
-        key=BLOCK,
-        translation_key=BLOCK,
-        function=lambda connector, evse_id, value: connector.client.block(
-            evse_id, value
-        ),
-        turn_on_off_fn=update_block_switch,
-    ),
-)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: BlueCurrentConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up Blue Current switches."""
-    connector = entry.runtime_data
-
-    async_add_entities(
-        ChargePointSwitch(
-            connector,
-            evse_id,
-            switch,
-        )
-        for evse_id in connector.charge_points
-        for switch in SWITCHES
-    )
-
-
-class ChargePointSwitch(ChargepointEntity, SwitchEntity):
-    """Base charge point switch."""
-
-    has_value = True
-    entity_description: BlueCurrentSwitchEntityDescription
-
-    def __init__(
-        self,
-        connector: Connector,
-        evse_id: str,
-        switch: BlueCurrentSwitchEntityDescription,
-    ) -> None:
-        """Initialize the switch."""
-        super().__init__(connector, evse_id)
-
-        self.key = switch.key
-        self.entity_description = switch
-        self.evse_id = evse_id
-        self._attr_available = True
-        self._attr_unique_id = f"{switch.key}_{evse_id}"
-
-    async def call_function(self, value: bool) -> None:
-        """Call the function to set setting."""
-        await self.entity_description.function(self.connector, self.evse_id, value)
-
-    async def async_turn_on(self, **kwargs: Any) -> None:
-        """Turn the entity on."""
-        await self.call_function(True)
-        self._attr_is_on = True
-        self.async_write_ha_state()
-
-    async def async_turn_off(self, **kwargs: Any) -> None:
-        """Turn the entity on."""
-        await self.call_function(False)
-        self._attr_is_on = False
-        self.async_write_ha_state()
-
-    @callback
-    def update_from_latest_data(self) -> None:
-        """Fetch new state data for the switch."""
-        new_state = self.entity_description.turn_on_off_fn(self.evse_id, self.connector)
-        self._attr_is_on = new_state[0]
-        self.has_value = new_state[1]

homeassistant/components/bluesound/manifest.json

@@ -6,7 +6,7 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/bluesound",
   "iot_class": "local_polling",
-  "requirements": ["pyblu==2.0.4"],
+  "requirements": ["pyblu==2.0.1"],
   "zeroconf": [
     {
       "type": "_musc._tcp.local."

homeassistant/components/bluetooth/manifest.json

@@ -15,12 +15,12 @@
   ],
   "quality_scale": "internal",
   "requirements": [
-    "bleak==1.0.1",
-    "bleak-retry-connector==4.0.0",
-    "bluetooth-adapters==2.0.0",
+    "bleak==0.22.3",
+    "bleak-retry-connector==3.9.0",
+    "bluetooth-adapters==0.21.4",
     "bluetooth-auto-recovery==1.5.2",
     "bluetooth-data-tools==1.28.2",
-    "dbus-fast==2.44.2",
-    "habluetooth==4.0.1"
+    "dbus-fast==2.43.0",
+    "habluetooth==3.49.0"
   ]
 }

homeassistant/components/bring/__init__.py

@@ -8,33 +8,20 @@ from bring_api import Bring
 
 from homeassistant.const import CONF_EMAIL, CONF_PASSWORD, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.typing import ConfigType
 
-from .const import DOMAIN
 from .coordinator import (
     BringActivityCoordinator,
     BringConfigEntry,
     BringCoordinators,
     BringDataUpdateCoordinator,
 )
-from .services import async_setup_services
-
-CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
 
 PLATFORMS: list[Platform] = [Platform.EVENT, Platform.SENSOR, Platform.TODO]
 
 _LOGGER = logging.getLogger(__name__)
 
 
-async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the Bring! services."""
-
-    async_setup_services(hass)
-    return True
-
-
 async def async_setup_entry(hass: HomeAssistant, entry: BringConfigEntry) -> bool:
     """Set up Bring! from a config entry."""
 

homeassistant/components/bring/const.py

@@ -7,8 +7,5 @@ DOMAIN = "bring"
 ATTR_SENDER: Final = "sender"
 ATTR_ITEM_NAME: Final = "item"
 ATTR_NOTIFICATION_TYPE: Final = "message"
-ATTR_REACTION: Final = "reaction"
-ATTR_ACTIVITY: Final = "uuid"
-ATTR_RECEIVER: Final = "publicUserUuid"
+
 SERVICE_PUSH_NOTIFICATION = "send_message"
-SERVICE_ACTIVITY_STREAM_REACTION = "send_reaction"

homeassistant/components/bring/icons.json

@@ -35,9 +35,6 @@
   "services": {
     "send_message": {
       "service": "mdi:cellphone-message"
-    },
-    "send_reaction": {
-      "service": "mdi:thumb-up"
     }
   }
 }

homeassistant/components/bring/services.py

@@ -1,110 +0,0 @@
-"""Actions for Bring! integration."""
-
-import logging
-from typing import TYPE_CHECKING
-
-from bring_api import (
-    ActivityType,
-    BringAuthException,
-    BringNotificationType,
-    BringRequestException,
-    ReactionType,
-)
-import voluptuous as vol
-
-from homeassistant.components.event import ATTR_EVENT_TYPE
-from homeassistant.config_entries import ConfigEntryState
-from homeassistant.const import ATTR_ENTITY_ID
-from homeassistant.core import HomeAssistant, ServiceCall
-from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
-from homeassistant.helpers import config_validation as cv, entity_registry as er
-
-from .const import (
-    ATTR_ACTIVITY,
-    ATTR_REACTION,
-    ATTR_RECEIVER,
-    DOMAIN,
-    SERVICE_ACTIVITY_STREAM_REACTION,
-)
-from .coordinator import BringConfigEntry
-
-_LOGGER = logging.getLogger(__name__)
-
-SERVICE_ACTIVITY_STREAM_REACTION_SCHEMA = vol.Schema(
-    {
-        vol.Required(ATTR_ENTITY_ID): cv.entity_id,
-        vol.Required(ATTR_REACTION): vol.All(
-            vol.Upper,
-            vol.Coerce(ReactionType),
-        ),
-    }
-)
-
-
-def get_config_entry(hass: HomeAssistant, entry_id: str) -> BringConfigEntry:
-    """Return config entry or raise if not found or not loaded."""
-    entry = hass.config_entries.async_get_entry(entry_id)
-    if TYPE_CHECKING:
-        assert entry
-    if entry.state is not ConfigEntryState.LOADED:
-        raise ServiceValidationError(
-            translation_domain=DOMAIN,
-            translation_key="entry_not_loaded",
-        )
-    return entry
-
-
-def async_setup_services(hass: HomeAssistant) -> None:
-    """Set up services for Bring! integration."""
-
-    async def async_send_activity_stream_reaction(call: ServiceCall) -> None:
-        """Send a reaction in response to recent activity of a list member."""
-
-        if (
-            not (state := hass.states.get(call.data[ATTR_ENTITY_ID]))
-            or not (entity := er.async_get(hass).async_get(call.data[ATTR_ENTITY_ID]))
-            or not entity.config_entry_id
-        ):
-            raise ServiceValidationError(
-                translation_domain=DOMAIN,
-                translation_key="entity_not_found",
-                translation_placeholders={
-                    ATTR_ENTITY_ID: call.data[ATTR_ENTITY_ID],
-                },
-            )
-        config_entry = get_config_entry(hass, entity.config_entry_id)
-
-        coordinator = config_entry.runtime_data.data
-
-        list_uuid = entity.unique_id.split("_")[1]
-
-        activity = state.attributes[ATTR_EVENT_TYPE]
-
-        reaction: ReactionType = call.data[ATTR_REACTION]
-
-        if not activity:
-            raise ServiceValidationError(
-                translation_domain=DOMAIN,
-                translation_key="activity_not_found",
-            )
-        try:
-            await coordinator.bring.notify(
-                list_uuid,
-                BringNotificationType.LIST_ACTIVITY_STREAM_REACTION,
-                receiver=state.attributes[ATTR_RECEIVER],
-                activity=state.attributes[ATTR_ACTIVITY],
-                activity_type=ActivityType(activity.upper()),
-                reaction=reaction,
-            )
-        except (BringRequestException, BringAuthException) as e:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="reaction_request_failed",
-            ) from e
-
-    hass.services.async_register(
-        DOMAIN,
-        SERVICE_ACTIVITY_STREAM_REACTION,
-        async_send_activity_stream_reaction,
-        SERVICE_ACTIVITY_STREAM_REACTION_SCHEMA,
-    )

homeassistant/components/bring/services.yaml

@@ -21,28 +21,3 @@ send_message:
       required: false
       selector:
         text:
-send_reaction:
-  fields:
-    entity_id:
-      required: true
-      selector:
-        entity:
-          filter:
-            - integration: bring
-              domain: event
-      example: event.shopping_list
-    reaction:
-      required: true
-      selector:
-        select:
-          options:
-            - label: 👍🏼
-              value: thumbs_up
-            - label: 🧐
-              value: monocle
-            - label: 🤤
-              value: drooling
-            - label: ❤️
-              value: heart
-          mode: dropdown
-      example: thumbs_up

homeassistant/components/bring/strings.json

@@ -144,19 +144,6 @@
     },
     "notify_request_failed": {
       "message": "Failed to send push notification for Bring! due to a connection error, try again later"
-    },
-    "reaction_request_failed": {
-      "message": "Failed to send reaction for Bring! due to a connection error, try again later"
-    },
-    "activity_not_found": {
-      "message": "Failed to send reaction for Bring! — No recent activity found"
-    },
-    "entity_not_found": {
-      "message": "Failed to send reaction for Bring! — Unknown entity {entity_id}"
-    },
-
-    "entry_not_loaded": {
-      "message": "The account associated with this Bring! list is either not loaded or disabled in Home Assistant."
     }
   },
   "services": {
@@ -177,20 +164,6 @@
           "description": "Item name(s) to include in an urgent message e.g. 'Attention! Attention! - We still urgently need: [Items]'"
         }
       }
-    },
-    "send_reaction": {
-      "name": "Send reaction",
-      "description": "Sends a reaction to a recent activity on a Bring! list by a member of the shared list.",
-      "fields": {
-        "entity_id": {
-          "name": "Activities",
-          "description": "Select the Bring! activities event entity for reacting to its most recent event"
-        },
-        "reaction": {
-          "name": "Reaction",
-          "description": "Type of reaction to send in response."
-        }
-      }
     }
   },
   "selector": {