Add decorator to define Python tools from Python functions

2025-10-11 20:59:34 +00:00 · 2025-08-17 20:59:10 +00:00
1681 changed files with 16938 additions and 101849 deletions
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -8,8 +8,6 @@
    "PYTHONASYNCIODEBUG": "1"
  },
  "features": {
-    // Node feature required for Claude Code until fixed https://github.com/anthropics/devcontainer-features/issues/28
-    "ghcr.io/devcontainers/features/node:1": {},
    "ghcr.io/anthropics/devcontainer-features/claude-code:1.0": {},
    "ghcr.io/devcontainers/features/github-cli:1": {}
  },
--- a/.dockerignore
+++ b/.dockerignore
@@ -14,8 +14,7 @@ tests

 # Other virtualization methods
 venv
-.venv
 .vagrant

 # Temporary files
-**/__pycache__
+**/__pycache__
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -1073,11 +1073,7 @@ async def test_flow_connection_error(hass, mock_api_error):

 ### Entity Testing Patterns
 ```python
-@pytest.fixture 
-def platforms() -> list[Platform]: 
-    """Overridden fixture to specify platforms to test.""" 
-    return [Platform.SENSOR]  # Or another specific platform as needed.
-
+@pytest.mark.parametrize("init_integration", [Platform.SENSOR], indirect=True)
@pytest.mark.usefixtures("entity_registry_enabled_by_default", "init_integration")
 async def test_entities(
    hass: HomeAssistant,
@@ -1124,25 +1120,16 @@ def mock_device_api() -> Generator[MagicMock]:
        )
        yield api

-@pytest.fixture 
-def platforms() -> list[Platform]: 
-    """Fixture to specify platforms to test.""" 
-    return PLATFORMS
-
@pytest.fixture
 async def init_integration(
    hass: HomeAssistant,
    mock_config_entry: MockConfigEntry,
    mock_device_api: MagicMock,
-    platforms: list[Platform],
 ) -> MockConfigEntry:
    """Set up the integration for testing."""
    mock_config_entry.add_to_hass(hass)
-    
-    with patch("homeassistant.components.my_integration.PLATFORMS", platforms):
-        await hass.config_entries.async_setup(mock_config_entry.entry_id)
-        await hass.async_block_till_done()
-
+    await hass.config_entries.async_setup(mock_config_entry.entry_id)
+    await hass.async_block_till_done()
    return mock_config_entry
 ```

--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@@ -27,12 +27,12 @@ jobs:
      publish: ${{ steps.version.outputs.publish }}
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
        with:
          fetch-depth: 0

      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v5.6.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}

@@ -69,7 +69,7 @@ jobs:
        run: find ./homeassistant/components/*/translations -name "*.json" | tar zcvf translations.tar.gz -T -

      - name: Upload translations
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: translations
          path: translations.tar.gz
@@ -90,11 +90,11 @@ jobs:
        arch: ${{ fromJson(needs.init.outputs.architectures) }}
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0

      - name: Download nightly wheels of frontend
        if: needs.init.outputs.channel == 'dev'
-        uses: dawidd6/action-download-artifact@ac66b43f0e6a346234dd65d4d0c8fbb31cb316e5 # v11
+        uses: dawidd6/action-download-artifact@v11
        with:
          github_token: ${{secrets.GITHUB_TOKEN}}
          repo: home-assistant/frontend
@@ -105,7 +105,7 @@ jobs:

      - name: Download nightly wheels of intents
        if: needs.init.outputs.channel == 'dev'
-        uses: dawidd6/action-download-artifact@ac66b43f0e6a346234dd65d4d0c8fbb31cb316e5 # v11
+        uses: dawidd6/action-download-artifact@v11
        with:
          github_token: ${{secrets.GITHUB_TOKEN}}
          repo: OHF-Voice/intents-package
@@ -116,7 +116,7 @@ jobs:

      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        if: needs.init.outputs.channel == 'dev'
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v5.6.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}

@@ -175,7 +175,7 @@ jobs:
          sed -i "s|pykrakenapi|# pykrakenapi|g" requirements_all.txt

      - name: Download translations
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@v5.0.0
        with:
          name: translations

@@ -190,13 +190,12 @@ jobs:
          echo "${{ github.sha }};${{ github.ref }};${{ github.event_name }};${{ github.actor }}" > rootfs/OFFICIAL_IMAGE

      - name: Login to GitHub Container Registry
-        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+        uses: docker/login-action@v3.5.0
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
          password: ${{ secrets.GITHUB_TOKEN }}

-      # home-assistant/builder doesn't support sha pinning
      - name: Build base image
        uses: home-assistant/builder@2025.03.0
        with:
@@ -243,7 +242,7 @@ jobs:
          - green
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0

      - name: Set build additional args
        run: |
@@ -257,13 +256,12 @@ jobs:
          fi

      - name: Login to GitHub Container Registry
-        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+        uses: docker/login-action@v3.5.0
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
          password: ${{ secrets.GITHUB_TOKEN }}

-      # home-assistant/builder doesn't support sha pinning
      - name: Build base image
        uses: home-assistant/builder@2025.03.0
        with:
@@ -281,7 +279,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0

      - name: Initialize git
        uses: home-assistant/actions/helpers/git-init@master
@@ -323,23 +321,23 @@ jobs:
        registry: ["ghcr.io/home-assistant", "docker.io/homeassistant"]
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0

      - name: Install Cosign
-        uses: sigstore/cosign-installer@d58896d6a1865668819e1d91763c7751a165e159 # v3.9.2
+        uses: sigstore/cosign-installer@v3.9.2
        with:
          cosign-release: "v2.2.3"

      - name: Login to DockerHub
        if: matrix.registry == 'docker.io/homeassistant'
-        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+        uses: docker/login-action@v3.5.0
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}

      - name: Login to GitHub Container Registry
        if: matrix.registry == 'ghcr.io/home-assistant'
-        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
+        uses: docker/login-action@v3.5.0
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
@@ -456,15 +454,15 @@ jobs:
    if: github.repository_owner == 'home-assistant' && needs.init.outputs.publish == 'true'
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0

      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v5.6.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}

      - name: Download translations
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@v5.0.0
        with:
          name: translations

@@ -482,7 +480,7 @@ jobs:
          python -m build

      - name: Upload package to PyPI
-        uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e # v1.13.0
+        uses: pypa/gh-action-pypi-publish@v1.12.4
        with:
          skip-existing: true

@@ -533,7 +531,7 @@ jobs:

      - name: Generate artifact attestation
        if: needs.init.outputs.channel != 'dev' && needs.init.outputs.publish == 'true'
-        uses: actions/attest-build-provenance@977bb373ede98d70efdf65b84cb5f73e068dcc2a # v3.0.0
+        uses: actions/attest-build-provenance@e8998f949152b193b063cb0ec769d69d929409be # v2.4.0
        with:
          subject-name: ${{ env.HASSFEST_IMAGE_NAME }}
          subject-digest: ${{ steps.push.outputs.digest }}
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -37,10 +37,10 @@ on:
        type: boolean

 env:
-  CACHE_VERSION: 8
+  CACHE_VERSION: 5
  UV_CACHE_VERSION: 1
  MYPY_CACHE_VERSION: 1
-  HA_SHORT_VERSION: "2025.10"
+  HA_SHORT_VERSION: "2025.9"
  DEFAULT_PYTHON: "3.13"
  ALL_PYTHON_VERSIONS: "['3.13']"
  # 10.3 is the oldest supported version
@@ -61,9 +61,6 @@ env:
  POSTGRESQL_VERSIONS: "['postgres:12.14','postgres:15.2']"
  PRE_COMMIT_CACHE: ~/.cache/pre-commit
  UV_CACHE_DIR: /tmp/uv-cache
-  APT_CACHE_BASE: /home/runner/work/apt
-  APT_CACHE_DIR: /home/runner/work/apt/cache
-  APT_LIST_CACHE_DIR: /home/runner/work/apt/lists
  SQLALCHEMY_WARN_20: 1
  PYTHONASYNCIODEBUG: 1
  HASS_CI: 1
@@ -81,7 +78,6 @@ jobs:
      core: ${{ steps.core.outputs.changes }}
      integrations_glob: ${{ steps.info.outputs.integrations_glob }}
      integrations: ${{ steps.integrations.outputs.changes }}
-      apt_cache_key: ${{ steps.generate_apt_cache_key.outputs.key }}
      pre-commit_cache_key: ${{ steps.generate_pre-commit_cache_key.outputs.key }}
      python_cache_key: ${{ steps.generate_python_cache_key.outputs.key }}
      requirements: ${{ steps.core.outputs.requirements }}
@@ -98,7 +94,7 @@ jobs:
    runs-on: ubuntu-24.04
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Generate partial Python venv restore key
        id: generate_python_cache_key
        run: |
@@ -115,12 +111,8 @@ jobs:
        run: >-
          echo "key=pre-commit-${{ env.CACHE_VERSION }}-${{
            hashFiles('.pre-commit-config.yaml') }}"  >> $GITHUB_OUTPUT
-      - name: Generate partial apt restore key
-        id: generate_apt_cache_key
-        run: |
-          echo "key=$(lsb_release -rs)-apt-${{ env.CACHE_VERSION }}-${{ env.HA_SHORT_VERSION }}" >> $GITHUB_OUTPUT
      - name: Filter for core changes
-        uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
+        uses: dorny/paths-filter@v3.0.2
        id: core
        with:
          filters: .core_files.yaml
@@ -135,7 +127,7 @@ jobs:
          echo "Result:"
          cat .integration_paths.yaml
      - name: Filter for integration changes
-        uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
+        uses: dorny/paths-filter@v3.0.2
        id: integrations
        with:
          filters: .integration_paths.yaml
@@ -254,16 +246,16 @@ jobs:
      - info
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v5.6.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
          check-latest: true
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache@v4.2.4
        with:
          path: venv
          key: >-
@@ -279,7 +271,7 @@ jobs:
          uv pip install "$(cat requirements_test.txt | grep pre-commit)"
      - name: Restore pre-commit environment from cache
        id: cache-precommit
-        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache@v4.2.4
        with:
          path: ${{ env.PRE_COMMIT_CACHE }}
          lookup-only: true
@@ -300,16 +292,16 @@ jobs:
      - pre-commit
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v5.6.0
        id: python
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
          check-latest: true
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@v4.2.4
        with:
          path: venv
          fail-on-cache-miss: true
@@ -318,7 +310,7 @@ jobs:
              needs.info.outputs.pre-commit_cache_key }}
      - name: Restore pre-commit environment from cache
        id: cache-precommit
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@v4.2.4
        with:
          path: ${{ env.PRE_COMMIT_CACHE }}
          fail-on-cache-miss: true
@@ -340,16 +332,16 @@ jobs:
      - pre-commit
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v5.6.0
        id: python
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
          check-latest: true
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@v4.2.4
        with:
          path: venv
          fail-on-cache-miss: true
@@ -358,7 +350,7 @@ jobs:
              needs.info.outputs.pre-commit_cache_key }}
      - name: Restore pre-commit environment from cache
        id: cache-precommit
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@v4.2.4
        with:
          path: ${{ env.PRE_COMMIT_CACHE }}
          fail-on-cache-miss: true
@@ -380,16 +372,16 @@ jobs:
      - pre-commit
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v5.6.0
        id: python
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
          check-latest: true
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@v4.2.4
        with:
          path: venv
          fail-on-cache-miss: true
@@ -398,7 +390,7 @@ jobs:
              needs.info.outputs.pre-commit_cache_key }}
      - name: Restore pre-commit environment from cache
        id: cache-precommit
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@v4.2.4
        with:
          path: ${{ env.PRE_COMMIT_CACHE }}
          fail-on-cache-miss: true
@@ -470,7 +462,7 @@ jobs:
          - script/hassfest/docker/Dockerfile
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Register hadolint problem matcher
        run: |
          echo "::add-matcher::.github/workflows/matchers/hadolint.json"
@@ -489,10 +481,10 @@ jobs:
        python-version: ${{ fromJSON(needs.info.outputs.python_versions) }}
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ matrix.python-version }}
        id: python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v5.6.0
        with:
          python-version: ${{ matrix.python-version }}
          check-latest: true
@@ -505,7 +497,7 @@ jobs:
            env.HA_SHORT_VERSION }}-$(date -u '+%Y-%m-%dT%H:%M:%s')" >> $GITHUB_OUTPUT
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache@v4.2.4
        with:
          path: venv
          key: >-
@@ -513,7 +505,7 @@ jobs:
            needs.info.outputs.python_cache_key }}
      - name: Restore uv wheel cache
        if: steps.cache-venv.outputs.cache-hit != 'true'
-        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache@v4.2.4
        with:
          path: ${{ env.UV_CACHE_DIR }}
          key: >-
@@ -523,36 +515,15 @@ jobs:
            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-uv-${{
            env.UV_CACHE_VERSION }}-${{ steps.generate-uv-key.outputs.version }}-${{
            env.HA_SHORT_VERSION }}-
-      - name: Restore apt cache
-        if: steps.cache-venv.outputs.cache-hit != 'true'
-        id: cache-apt
-        uses: actions/cache@v4.2.4
-        with:
-          path: |
-            ${{ env.APT_CACHE_DIR }}
-            ${{ env.APT_LIST_CACHE_DIR }}
-          key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ needs.info.outputs.apt_cache_key }}
      - name: Install additional OS dependencies
        if: steps.cache-venv.outputs.cache-hit != 'true'
-        timeout-minutes: 10
        run: |
          sudo rm /etc/apt/sources.list.d/microsoft-prod.list
-          if [[ "${{ steps.cache-apt.outputs.cache-hit }}" != 'true' ]]; then
-            mkdir -p ${{ env.APT_CACHE_DIR }}
-            mkdir -p ${{ env.APT_LIST_CACHE_DIR }}
-          fi
-
-          sudo apt-get update \
-            -o Dir::Cache=${{ env.APT_CACHE_DIR }} \
-            -o Dir::State::Lists=${{ env.APT_LIST_CACHE_DIR }}
+          sudo apt-get update
          sudo apt-get -y install \
-            -o Dir::Cache=${{ env.APT_CACHE_DIR }} \
-            -o Dir::State::Lists=${{ env.APT_LIST_CACHE_DIR }} \
            bluez \
            ffmpeg \
            libturbojpeg \
-            libxml2-utils \
            libavcodec-dev \
            libavdevice-dev \
            libavfilter-dev \
@@ -562,10 +533,6 @@ jobs:
            libswresample-dev \
            libswscale-dev \
            libudev-dev
-
-          if [[ "${{ steps.cache-apt.outputs.cache-hit }}" != 'true' ]]; then
-            sudo chmod -R 755 ${{ env.APT_CACHE_BASE }}
-          fi
      - name: Create Python virtual environment
        if: steps.cache-venv.outputs.cache-hit != 'true'
        run: |
@@ -585,7 +552,7 @@ jobs:
          python --version
          uv pip freeze >> pip_freeze.txt
      - name: Upload pip_freeze artifact
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: pip-freeze-${{ matrix.python-version }}
          path: pip_freeze.txt
@@ -610,37 +577,23 @@ jobs:
      - info
      - base
    steps:
-      - name: Restore apt cache
-        uses: actions/cache/restore@v4.2.4
-        with:
-          path: |
-            ${{ env.APT_CACHE_DIR }}
-            ${{ env.APT_LIST_CACHE_DIR }}
-          fail-on-cache-miss: true
-          key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ needs.info.outputs.apt_cache_key }}
      - name: Install additional OS dependencies
-        timeout-minutes: 10
        run: |
          sudo rm /etc/apt/sources.list.d/microsoft-prod.list
-          sudo apt-get update \
-            -o Dir::Cache=${{ env.APT_CACHE_DIR }} \
-            -o Dir::State::Lists=${{ env.APT_LIST_CACHE_DIR }}
+          sudo apt-get update
          sudo apt-get -y install \
-            -o Dir::Cache=${{ env.APT_CACHE_DIR }} \
-            -o Dir::State::Lists=${{ env.APT_LIST_CACHE_DIR }} \
            libturbojpeg
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v5.6.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
          check-latest: true
      - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
        id: cache-venv
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@v4.2.4
        with:
          path: venv
          fail-on-cache-miss: true
@@ -664,16 +617,16 @@ jobs:
      - base
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v5.6.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
          check-latest: true
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@v4.2.4
        with:
          path: venv
          fail-on-cache-miss: true
@@ -698,9 +651,9 @@ jobs:
      && github.event_name == 'pull_request'
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Dependency review
-        uses: actions/dependency-review-action@595b5aeba73380359d98a5e087f648dbb0edce1b # v4.7.3
+        uses: actions/dependency-review-action@v4.7.1
        with:
          license-check: false # We use our own license audit checks

@@ -721,16 +674,16 @@ jobs:
        python-version: ${{ fromJson(needs.info.outputs.python_versions) }}
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ matrix.python-version }}
        id: python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v5.6.0
        with:
          python-version: ${{ matrix.python-version }}
          check-latest: true
      - name: Restore full Python ${{ matrix.python-version }} virtual environment
        id: cache-venv
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@v4.2.4
        with:
          path: venv
          fail-on-cache-miss: true
@@ -742,7 +695,7 @@ jobs:
          . venv/bin/activate
          python -m script.licenses extract --output-file=licenses-${{ matrix.python-version }}.json
      - name: Upload licenses
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: licenses-${{ github.run_number }}-${{ matrix.python-version }}
          path: licenses-${{ matrix.python-version }}.json
@@ -764,16 +717,16 @@ jobs:
      - base
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v5.6.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
          check-latest: true
      - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
        id: cache-venv
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@v4.2.4
        with:
          path: venv
          fail-on-cache-miss: true
@@ -811,16 +764,16 @@ jobs:
      - base
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v5.6.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
          check-latest: true
      - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
        id: cache-venv
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@v4.2.4
        with:
          path: venv
          fail-on-cache-miss: true
@@ -856,10 +809,10 @@ jobs:
      - base
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v5.6.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
          check-latest: true
@@ -872,7 +825,7 @@ jobs:
            env.HA_SHORT_VERSION }}-$(date -u '+%Y-%m-%dT%H:%M:%s')" >> $GITHUB_OUTPUT
      - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
        id: cache-venv
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@v4.2.4
        with:
          path: venv
          fail-on-cache-miss: true
@@ -880,7 +833,7 @@ jobs:
            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
            needs.info.outputs.python_cache_key }}
      - name: Restore mypy cache
-        uses: actions/cache@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache@v4.2.4
        with:
          path: .mypy_cache
          key: >-
@@ -923,40 +876,26 @@ jobs:
      - mypy
    name: Split tests for full run
    steps:
-      - name: Restore apt cache
-        uses: actions/cache/restore@v4.2.4
-        with:
-          path: |
-            ${{ env.APT_CACHE_DIR }}
-            ${{ env.APT_LIST_CACHE_DIR }}
-          fail-on-cache-miss: true
-          key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ needs.info.outputs.apt_cache_key }}
      - name: Install additional OS dependencies
-        timeout-minutes: 10
        run: |
          sudo rm /etc/apt/sources.list.d/microsoft-prod.list
-          sudo apt-get update \
-            -o Dir::Cache=${{ env.APT_CACHE_DIR }} \
-            -o Dir::State::Lists=${{ env.APT_LIST_CACHE_DIR }}
+          sudo apt-get update
          sudo apt-get -y install \
-            -o Dir::Cache=${{ env.APT_CACHE_DIR }} \
-            -o Dir::State::Lists=${{ env.APT_LIST_CACHE_DIR }} \
            bluez \
            ffmpeg \
            libturbojpeg \
            libgammu-dev
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v5.6.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
          check-latest: true
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@v4.2.4
        with:
          path: venv
          fail-on-cache-miss: true
@@ -968,7 +907,7 @@ jobs:
          . venv/bin/activate
          python -m script.split_tests ${{ needs.info.outputs.test_group_count }} tests
      - name: Upload pytest_buckets
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: pytest_buckets
          path: pytest_buckets.txt
@@ -997,41 +936,27 @@ jobs:
    name: >-
      Run tests Python ${{ matrix.python-version }} (${{ matrix.group }})
    steps:
-      - name: Restore apt cache
-        uses: actions/cache/restore@v4.2.4
-        with:
-          path: |
-            ${{ env.APT_CACHE_DIR }}
-            ${{ env.APT_LIST_CACHE_DIR }}
-          fail-on-cache-miss: true
-          key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ needs.info.outputs.apt_cache_key }}
      - name: Install additional OS dependencies
-        timeout-minutes: 10
        run: |
          sudo rm /etc/apt/sources.list.d/microsoft-prod.list
-          sudo apt-get update \
-            -o Dir::Cache=${{ env.APT_CACHE_DIR }} \
-            -o Dir::State::Lists=${{ env.APT_LIST_CACHE_DIR }}
+          sudo apt-get update
          sudo apt-get -y install \
-            -o Dir::Cache=${{ env.APT_CACHE_DIR }} \
-            -o Dir::State::Lists=${{ env.APT_LIST_CACHE_DIR }} \
            bluez \
            ffmpeg \
            libturbojpeg \
            libgammu-dev \
            libxml2-utils
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ matrix.python-version }}
        id: python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v5.6.0
        with:
          python-version: ${{ matrix.python-version }}
          check-latest: true
      - name: Restore full Python ${{ matrix.python-version }} virtual environment
        id: cache-venv
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@v4.2.4
        with:
          path: venv
          fail-on-cache-miss: true
@@ -1045,7 +970,7 @@ jobs:
        run: |
          echo "::add-matcher::.github/workflows/matchers/pytest-slow.json"
      - name: Download pytest_buckets
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@v5.0.0
        with:
          name: pytest_buckets
      - name: Compile English translations
@@ -1084,14 +1009,14 @@ jobs:
              2>&1 | tee pytest-${{ matrix.python-version }}-${{ matrix.group }}.txt
      - name: Upload pytest output
        if: success() || failure() && steps.pytest-full.conclusion == 'failure'
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: pytest-${{ github.run_number }}-${{ matrix.python-version }}-${{ matrix.group }}
          path: pytest-*.txt
          overwrite: true
      - name: Upload coverage artifact
        if: needs.info.outputs.skip_coverage != 'true'
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: coverage-${{ matrix.python-version }}-${{ matrix.group }}
          path: coverage.xml
@@ -1104,7 +1029,7 @@ jobs:
          mv "junit.xml-tmp" "junit.xml"
      - name: Upload test results artifact
        if: needs.info.outputs.skip_coverage != 'true' && !cancelled()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: test-results-full-${{ matrix.python-version }}-${{ matrix.group }}
          path: junit.xml
@@ -1144,41 +1069,27 @@ jobs:
    name: >-
      Run ${{ matrix.mariadb-group }} tests Python ${{ matrix.python-version }}
    steps:
-      - name: Restore apt cache
-        uses: actions/cache/restore@v4.2.4
-        with:
-          path: |
-            ${{ env.APT_CACHE_DIR }}
-            ${{ env.APT_LIST_CACHE_DIR }}
-          fail-on-cache-miss: true
-          key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ needs.info.outputs.apt_cache_key }}
      - name: Install additional OS dependencies
-        timeout-minutes: 10
        run: |
          sudo rm /etc/apt/sources.list.d/microsoft-prod.list
-          sudo apt-get update \
-            -o Dir::Cache=${{ env.APT_CACHE_DIR }} \
-            -o Dir::State::Lists=${{ env.APT_LIST_CACHE_DIR }}
+          sudo apt-get update
          sudo apt-get -y install \
-            -o Dir::Cache=${{ env.APT_CACHE_DIR }} \
-            -o Dir::State::Lists=${{ env.APT_LIST_CACHE_DIR }} \
            bluez \
            ffmpeg \
            libturbojpeg \
            libmariadb-dev-compat \
            libxml2-utils
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ matrix.python-version }}
        id: python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v5.6.0
        with:
          python-version: ${{ matrix.python-version }}
          check-latest: true
      - name: Restore full Python ${{ matrix.python-version }} virtual environment
        id: cache-venv
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@v4.2.4
        with:
          path: venv
          fail-on-cache-miss: true
@@ -1237,7 +1148,7 @@ jobs:
              2>&1 | tee pytest-${{ matrix.python-version }}-${mariadb}.txt
      - name: Upload pytest output
        if: success() || failure() && steps.pytest-partial.conclusion == 'failure'
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: pytest-${{ github.run_number }}-${{ matrix.python-version }}-${{
            steps.pytest-partial.outputs.mariadb }}
@@ -1245,7 +1156,7 @@ jobs:
          overwrite: true
      - name: Upload coverage artifact
        if: needs.info.outputs.skip_coverage != 'true'
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: coverage-${{ matrix.python-version }}-${{
            steps.pytest-partial.outputs.mariadb }}
@@ -1259,7 +1170,7 @@ jobs:
          mv "junit.xml-tmp" "junit.xml"
      - name: Upload test results artifact
        if: needs.info.outputs.skip_coverage != 'true' && !cancelled()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: test-results-mariadb-${{ matrix.python-version }}-${{
            steps.pytest-partial.outputs.mariadb }}
@@ -1298,25 +1209,11 @@ jobs:
    name: >-
      Run ${{ matrix.postgresql-group }} tests Python ${{ matrix.python-version }}
    steps:
-      - name: Restore apt cache
-        uses: actions/cache/restore@v4.2.4
-        with:
-          path: |
-            ${{ env.APT_CACHE_DIR }}
-            ${{ env.APT_LIST_CACHE_DIR }}
-          fail-on-cache-miss: true
-          key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ needs.info.outputs.apt_cache_key }}
      - name: Install additional OS dependencies
-        timeout-minutes: 10
        run: |
          sudo rm /etc/apt/sources.list.d/microsoft-prod.list
-          sudo apt-get update \
-            -o Dir::Cache=${{ env.APT_CACHE_DIR }} \
-            -o Dir::State::Lists=${{ env.APT_LIST_CACHE_DIR }}
+          sudo apt-get update
          sudo apt-get -y install \
-            -o Dir::Cache=${{ env.APT_CACHE_DIR }} \
-            -o Dir::State::Lists=${{ env.APT_LIST_CACHE_DIR }} \
            bluez \
            ffmpeg \
            libturbojpeg \
@@ -1325,16 +1222,16 @@ jobs:
          sudo apt-get -y install \
            postgresql-server-dev-14
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ matrix.python-version }}
        id: python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v5.6.0
        with:
          python-version: ${{ matrix.python-version }}
          check-latest: true
      - name: Restore full Python ${{ matrix.python-version }} virtual environment
        id: cache-venv
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@v4.2.4
        with:
          path: venv
          fail-on-cache-miss: true
@@ -1394,7 +1291,7 @@ jobs:
              2>&1 | tee pytest-${{ matrix.python-version }}-${postgresql}.txt
      - name: Upload pytest output
        if: success() || failure() && steps.pytest-partial.conclusion == 'failure'
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: pytest-${{ github.run_number }}-${{ matrix.python-version }}-${{
            steps.pytest-partial.outputs.postgresql }}
@@ -1402,7 +1299,7 @@ jobs:
          overwrite: true
      - name: Upload coverage artifact
        if: needs.info.outputs.skip_coverage != 'true'
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: coverage-${{ matrix.python-version }}-${{
            steps.pytest-partial.outputs.postgresql }}
@@ -1416,7 +1313,7 @@ jobs:
          mv "junit.xml-tmp" "junit.xml"
      - name: Upload test results artifact
        if: needs.info.outputs.skip_coverage != 'true' && !cancelled()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: test-results-postgres-${{ matrix.python-version }}-${{
            steps.pytest-partial.outputs.postgresql }}
@@ -1437,14 +1334,14 @@ jobs:
    timeout-minutes: 10
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Download all coverage artifacts
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@v5.0.0
        with:
          pattern: coverage-*
      - name: Upload coverage to Codecov
        if: needs.info.outputs.test_full_suite == 'true'
-        uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
+        uses: codecov/codecov-action@v5.4.3
        with:
          fail_ci_if_error: true
          flags: full-suite
@@ -1473,41 +1370,27 @@ jobs:
    name: >-
      Run tests Python ${{ matrix.python-version }} (${{ matrix.group }})
    steps:
-      - name: Restore apt cache
-        uses: actions/cache/restore@v4.2.4
-        with:
-          path: |
-            ${{ env.APT_CACHE_DIR }}
-            ${{ env.APT_LIST_CACHE_DIR }}
-          fail-on-cache-miss: true
-          key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ needs.info.outputs.apt_cache_key }}
      - name: Install additional OS dependencies
-        timeout-minutes: 10
        run: |
          sudo rm /etc/apt/sources.list.d/microsoft-prod.list
-          sudo apt-get update \
-            -o Dir::Cache=${{ env.APT_CACHE_DIR }} \
-            -o Dir::State::Lists=${{ env.APT_LIST_CACHE_DIR }}
+          sudo apt-get update
          sudo apt-get -y install \
-            -o Dir::Cache=${{ env.APT_CACHE_DIR }} \
-            -o Dir::State::Lists=${{ env.APT_LIST_CACHE_DIR }} \
            bluez \
            ffmpeg \
            libturbojpeg \
            libgammu-dev \
            libxml2-utils
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ matrix.python-version }}
        id: python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v5.6.0
        with:
          python-version: ${{ matrix.python-version }}
          check-latest: true
      - name: Restore full Python ${{ matrix.python-version }} virtual environment
        id: cache-venv
-        uses: actions/cache/restore@0400d5f644dc74513175e3cd8d07132dd4860809 # v4.2.4
+        uses: actions/cache/restore@v4.2.4
        with:
          path: venv
          fail-on-cache-miss: true
@@ -1563,14 +1446,14 @@ jobs:
              2>&1 | tee pytest-${{ matrix.python-version }}-${{ matrix.group }}.txt
      - name: Upload pytest output
        if: success() || failure() && steps.pytest-partial.conclusion == 'failure'
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: pytest-${{ github.run_number }}-${{ matrix.python-version }}-${{ matrix.group }}
          path: pytest-*.txt
          overwrite: true
      - name: Upload coverage artifact
        if: needs.info.outputs.skip_coverage != 'true'
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: coverage-${{ matrix.python-version }}-${{ matrix.group }}
          path: coverage.xml
@@ -1583,7 +1466,7 @@ jobs:
          mv "junit.xml-tmp" "junit.xml"
      - name: Upload test results artifact
        if: needs.info.outputs.skip_coverage != 'true' && !cancelled()
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: test-results-partial-${{ matrix.python-version }}-${{ matrix.group }}
          path: junit.xml
@@ -1601,14 +1484,14 @@ jobs:
    timeout-minutes: 10
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0
      - name: Download all coverage artifacts
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@v5.0.0
        with:
          pattern: coverage-*
      - name: Upload coverage to Codecov
        if: needs.info.outputs.test_full_suite == 'false'
-        uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
+        uses: codecov/codecov-action@v5.4.3
        with:
          fail_ci_if_error: true
          token: ${{ secrets.CODECOV_TOKEN }}
@@ -1628,11 +1511,11 @@ jobs:
    timeout-minutes: 10
    steps:
      - name: Download all coverage artifacts
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@v5.0.0
        with:
          pattern: test-results-*
      - name: Upload test results to Codecov
-        uses: codecov/test-results-action@47f89e9acb64b76debcd5ea40642d25a4adced9f # v1.1.1
+        uses: codecov/test-results-action@v1
        with:
          fail_ci_if_error: true
          verbose: true
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -21,14 +21,14 @@ jobs:

    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0

      - name: Initialize CodeQL
-        uses: github/codeql-action/init@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
+        uses: github/codeql-action/init@v3.29.9
        with:
          languages: python

      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@192325c86100d080feab897ff886c34abd4c83a3 # v3.30.3
+        uses: github/codeql-action/analyze@v3.29.9
        with:
          category: "/language:python"
--- a/.github/workflows/detect-duplicate-issues.yml
+++ b/.github/workflows/detect-duplicate-issues.yml
@@ -16,7 +16,7 @@ jobs:
    steps:
      - name: Check if integration label was added and extract details
        id: extract
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@v7.0.1
        with:
          script: |
            // Debug: Log the event payload
@@ -113,7 +113,7 @@ jobs:
      - name: Fetch similar issues
        id: fetch_similar
        if: steps.extract.outputs.should_continue == 'true'
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@v7.0.1
        env:
          INTEGRATION_LABELS: ${{ steps.extract.outputs.integration_labels }}
          CURRENT_NUMBER: ${{ steps.extract.outputs.current_number }}
@@ -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@a1c11829223a786afe3b5663db904a3aa1eac3a2 # v2.0.1
+        uses: actions/ai-inference@v2.0.0
        with:
          model: openai/gpt-4o
          system-prompt: |
@@ -280,7 +280,7 @@ jobs:
      - name: Post duplicate detection results
        id: post_results
        if: steps.extract.outputs.should_continue == 'true' && steps.fetch_similar.outputs.has_similar == 'true'
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@v7.0.1
        env:
          AI_RESPONSE: ${{ steps.ai_detection.outputs.response }}
          SIMILAR_ISSUES: ${{ steps.fetch_similar.outputs.similar_issues }}
--- a/.github/workflows/detect-non-english-issues.yml
+++ b/.github/workflows/detect-non-english-issues.yml
@@ -16,7 +16,7 @@ jobs:
    steps:
      - name: Check issue language
        id: detect_language
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@v7.0.1
        env:
          ISSUE_NUMBER: ${{ github.event.issue.number }}
          ISSUE_TITLE: ${{ github.event.issue.title }}
@@ -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@a1c11829223a786afe3b5663db904a3aa1eac3a2 # v2.0.1
+        uses: actions/ai-inference@v2.0.0
        with:
          model: openai/gpt-4o-mini
          system-prompt: |
@@ -90,7 +90,7 @@ jobs:

      - name: Process non-English issues
        if: steps.detect_language.outputs.should_continue == 'true'
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@v7.0.1
        env:
          AI_RESPONSE: ${{ steps.ai_language_detection.outputs.response }}
          ISSUE_NUMBER: ${{ steps.detect_language.outputs.issue_number }}
--- a/.github/workflows/lock.yml
+++ b/.github/workflows/lock.yml
@@ -10,7 +10,7 @@ jobs:
    if: github.repository_owner == 'home-assistant'
    runs-on: ubuntu-latest
    steps:
-      - uses: dessant/lock-threads@1bf7ec25051fe7c00bdd17e6a7cf3d7bfb7dc771 # v5.0.1
+      - uses: dessant/lock-threads@v5.0.1
        with:
          github-token: ${{ github.token }}
          issue-inactive-days: "30"
--- a/.github/workflows/restrict-task-creation.yml
+++ b/.github/workflows/restrict-task-creation.yml
@@ -12,7 +12,7 @@ jobs:
    if: github.event.issue.type.name == 'Task'
    steps:
      - name: Check if user is authorized
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        uses: actions/github-script@v7
        with:
          script: |
            const issueAuthor = context.payload.issue.user.login;
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -17,7 +17,7 @@ jobs:
      # - No PRs marked as no-stale
      # - No issues (-1)
      - name: 60 days stale PRs policy
-        uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v10.0.0
+        uses: actions/stale@v9.1.0
        with:
          repo-token: ${{ secrets.GITHUB_TOKEN }}
          days-before-stale: 60
@@ -57,7 +57,7 @@ jobs:
      # - No issues marked as no-stale or help-wanted
      # - No PRs (-1)
      - name: 90 days stale issues
-        uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v10.0.0
+        uses: actions/stale@v9.1.0
        with:
          repo-token: ${{ steps.token.outputs.token }}
          days-before-stale: 90
@@ -87,7 +87,7 @@ jobs:
      # - No Issues marked as no-stale or help-wanted
      # - No PRs (-1)
      - name: Needs more information stale issues policy
-        uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v10.0.0
+        uses: actions/stale@v9.1.0
        with:
          repo-token: ${{ steps.token.outputs.token }}
          only-labels: "needs-more-information"
--- a/.github/workflows/translations.yml
+++ b/.github/workflows/translations.yml
@@ -19,10 +19,10 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0

      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v5.6.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}

--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -32,11 +32,11 @@ jobs:
      architectures: ${{ steps.info.outputs.architectures }}
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0

      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
-        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        uses: actions/setup-python@v5.6.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
          check-latest: true
@@ -91,7 +91,7 @@ jobs:
          ) > build_constraints.txt

      - name: Upload env_file
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: env_file
          path: ./.env_file
@@ -99,14 +99,14 @@ jobs:
          overwrite: true

      - name: Upload build_constraints
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: build_constraints
          path: ./build_constraints.txt
          overwrite: true

      - name: Upload requirements_diff
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: requirements_diff
          path: ./requirements_diff.txt
@@ -118,7 +118,7 @@ jobs:
          python -m script.gen_requirements_all ci

      - name: Upload requirements_all_wheels
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@v4.6.2
        with:
          name: requirements_all_wheels
          path: ./requirements_all_wheels_*.txt
@@ -135,20 +135,20 @@ jobs:
        arch: ${{ fromJson(needs.init.outputs.architectures) }}
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0

      - name: Download env_file
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@v5.0.0
        with:
          name: env_file

      - name: Download build_constraints
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@v5.0.0
        with:
          name: build_constraints

      - name: Download requirements_diff
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@v5.0.0
        with:
          name: requirements_diff

@@ -158,7 +158,6 @@ jobs:
          sed -i "/uv/d" requirements.txt
          sed -i "/uv/d" requirements_diff.txt

-      # home-assistant/wheels doesn't support sha pinning
      - name: Build wheels
        uses: home-assistant/wheels@2025.07.0
        with:
@@ -185,25 +184,25 @@ jobs:
        arch: ${{ fromJson(needs.init.outputs.architectures) }}
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@v5.0.0

      - name: Download env_file
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@v5.0.0
        with:
          name: env_file

      - name: Download build_constraints
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@v5.0.0
        with:
          name: build_constraints

      - name: Download requirements_diff
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@v5.0.0
        with:
          name: requirements_diff

      - name: Download requirements_all_wheels
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@v5.0.0
        with:
          name: requirements_all_wheels

@@ -219,7 +218,6 @@ jobs:
          sed -i "/uv/d" requirements.txt
          sed -i "/uv/d" requirements_diff.txt

-      # home-assistant/wheels doesn't support sha pinning
      - name: Build wheels
        uses: home-assistant/wheels@2025.07.0
        with:
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
  - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.13.0
+    rev: v0.12.1
    hooks:
      - id: ruff-check
        args:
--- a/.strict-typing
+++ b/.strict-typing
@@ -169,7 +169,6 @@ homeassistant.components.dnsip.*
 homeassistant.components.doorbird.*
 homeassistant.components.dormakaba_dkey.*
 homeassistant.components.downloader.*
-homeassistant.components.droplet.*
 homeassistant.components.dsmr.*
 homeassistant.components.duckdns.*
 homeassistant.components.dunehd.*
@@ -308,7 +307,6 @@ homeassistant.components.ld2410_ble.*
 homeassistant.components.led_ble.*
 homeassistant.components.lektrico.*
 homeassistant.components.letpot.*
-homeassistant.components.libre_hardware_monitor.*
 homeassistant.components.lidarr.*
 homeassistant.components.lifx.*
 homeassistant.components.light.*
@@ -384,7 +382,6 @@ homeassistant.components.openai_conversation.*
 homeassistant.components.openexchangerates.*
 homeassistant.components.opensky.*
 homeassistant.components.openuv.*
-homeassistant.components.opnsense.*
 homeassistant.components.opower.*
 homeassistant.components.oralb.*
 homeassistant.components.otbr.*
@@ -402,7 +399,6 @@ homeassistant.components.person.*
 homeassistant.components.pi_hole.*
 homeassistant.components.ping.*
 homeassistant.components.plugwise.*
-homeassistant.components.portainer.*
 homeassistant.components.powerfox.*
 homeassistant.components.powerwall.*
 homeassistant.components.private_ble_device.*
@@ -462,7 +458,6 @@ homeassistant.components.sensorpush_cloud.*
 homeassistant.components.sensoterra.*
 homeassistant.components.senz.*
 homeassistant.components.sfr_box.*
-homeassistant.components.sftp_storage.*
 homeassistant.components.shell_command.*
 homeassistant.components.shelly.*
 homeassistant.components.shopping_list.*
--- a/80
+++ b/80
@@ -87,8 +87,6 @@ build.json @home-assistant/supervisor
 /tests/components/airzone/ @Noltari
 /homeassistant/components/airzone_cloud/ @Noltari
 /tests/components/airzone_cloud/ @Noltari
-/homeassistant/components/aladdin_connect/ @swcloudgenie
-/tests/components/aladdin_connect/ @swcloudgenie
 /homeassistant/components/alarm_control_panel/ @home-assistant/core
 /tests/components/alarm_control_panel/ @home-assistant/core
 /homeassistant/components/alert/ @home-assistant/core @frenck
@@ -154,10 +152,10 @@ build.json @home-assistant/supervisor
 /tests/components/arve/ @ikalnyi
 /homeassistant/components/aseko_pool_live/ @milanmeu
 /tests/components/aseko_pool_live/ @milanmeu
-/homeassistant/components/assist_pipeline/ @synesthesiam @arturpragacz
-/tests/components/assist_pipeline/ @synesthesiam @arturpragacz
-/homeassistant/components/assist_satellite/ @home-assistant/core @synesthesiam @arturpragacz
-/tests/components/assist_satellite/ @home-assistant/core @synesthesiam @arturpragacz
+/homeassistant/components/assist_pipeline/ @balloob @synesthesiam
+/tests/components/assist_pipeline/ @balloob @synesthesiam
+/homeassistant/components/assist_satellite/ @home-assistant/core @synesthesiam
+/tests/components/assist_satellite/ @home-assistant/core @synesthesiam
 /homeassistant/components/asuswrt/ @kennedyshead @ollo69 @Vaskivskyi
 /tests/components/asuswrt/ @kennedyshead @ollo69 @Vaskivskyi
 /homeassistant/components/atag/ @MatsNL
@@ -298,8 +296,8 @@ build.json @home-assistant/supervisor
 /tests/components/configurator/ @home-assistant/core
 /homeassistant/components/control4/ @lawtancool
 /tests/components/control4/ @lawtancool
-/homeassistant/components/conversation/ @home-assistant/core @synesthesiam @arturpragacz
-/tests/components/conversation/ @home-assistant/core @synesthesiam @arturpragacz
+/homeassistant/components/conversation/ @home-assistant/core @synesthesiam
+/tests/components/conversation/ @home-assistant/core @synesthesiam
 /homeassistant/components/cookidoo/ @miaucl
 /tests/components/cookidoo/ @miaucl
 /homeassistant/components/coolmaster/ @OnFreund
@@ -377,8 +375,6 @@ build.json @home-assistant/supervisor
 /tests/components/dremel_3d_printer/ @tkdrob
 /homeassistant/components/drop_connect/ @ChandlerSystems @pfrazer
 /tests/components/drop_connect/ @ChandlerSystems @pfrazer
-/homeassistant/components/droplet/ @sarahseidman
-/tests/components/droplet/ @sarahseidman
 /homeassistant/components/dsmr/ @Robbie1221
 /tests/components/dsmr/ @Robbie1221
 /homeassistant/components/dsmr_reader/ @sorted-bits @glodenox @erwindouna
@@ -426,8 +422,6 @@ build.json @home-assistant/supervisor
 /homeassistant/components/emby/ @mezz64
 /homeassistant/components/emoncms/ @borpin @alexandrecuer
 /tests/components/emoncms/ @borpin @alexandrecuer
-/homeassistant/components/emoncms_history/ @alexandrecuer
-/tests/components/emoncms_history/ @alexandrecuer
 /homeassistant/components/emonitor/ @bdraco
 /tests/components/emonitor/ @bdraco
 /homeassistant/components/emulated_hue/ @bdraco @Tho85
@@ -442,6 +436,8 @@ build.json @home-assistant/supervisor
 /tests/components/energyzero/ @klaasnicolaas
 /homeassistant/components/enigma2/ @autinerd
 /tests/components/enigma2/ @autinerd
+/homeassistant/components/enocean/ @bdurrer
+/tests/components/enocean/ @bdurrer
 /homeassistant/components/enphase_envoy/ @bdraco @cgarwood @catsmanac
 /tests/components/enphase_envoy/ @bdraco @cgarwood @catsmanac
 /homeassistant/components/entur_public_transport/ @hfurubotten
@@ -464,6 +460,8 @@ build.json @home-assistant/supervisor
 /tests/components/eufylife_ble/ @bdr99
 /homeassistant/components/event/ @home-assistant/core
 /tests/components/event/ @home-assistant/core
+/homeassistant/components/evil_genius_labs/ @balloob
+/tests/components/evil_genius_labs/ @balloob
 /homeassistant/components/evohome/ @zxdavb
 /tests/components/evohome/ @zxdavb
 /homeassistant/components/ezviz/ @RenierM26
@@ -513,8 +511,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/forked_daapd/ @uvjustin
 /tests/components/forked_daapd/ @uvjustin
 /homeassistant/components/fortios/ @kimfrellsen
-/homeassistant/components/foscam/ @Foscam-wangzhengyu
-/tests/components/foscam/ @Foscam-wangzhengyu
+/homeassistant/components/foscam/ @krmarien
+/tests/components/foscam/ @krmarien
 /homeassistant/components/freebox/ @hacf-fr @Quentame
 /tests/components/freebox/ @hacf-fr @Quentame
 /homeassistant/components/freedompro/ @stefano055415
@@ -648,8 +646,6 @@ build.json @home-assistant/supervisor
 /tests/components/homeassistant/ @home-assistant/core
 /homeassistant/components/homeassistant_alerts/ @home-assistant/core
 /tests/components/homeassistant_alerts/ @home-assistant/core
-/homeassistant/components/homeassistant_connect_zbt2/ @home-assistant/core
-/tests/components/homeassistant_connect_zbt2/ @home-assistant/core
 /homeassistant/components/homeassistant_green/ @home-assistant/core
 /tests/components/homeassistant_green/ @home-assistant/core
 /homeassistant/components/homeassistant_hardware/ @home-assistant/core
@@ -678,8 +674,8 @@ build.json @home-assistant/supervisor
 /tests/components/http/ @home-assistant/core
 /homeassistant/components/huawei_lte/ @scop @fphammerle
 /tests/components/huawei_lte/ @scop @fphammerle
-/homeassistant/components/hue/ @marcelveldt
-/tests/components/hue/ @marcelveldt
+/homeassistant/components/hue/ @balloob @marcelveldt
+/tests/components/hue/ @balloob @marcelveldt
 /homeassistant/components/huisbaasje/ @dennisschroer
 /tests/components/huisbaasje/ @dennisschroer
 /homeassistant/components/humidifier/ @home-assistant/core @Shulyaka
@@ -751,8 +747,8 @@ build.json @home-assistant/supervisor
 /tests/components/integration/ @dgomes
 /homeassistant/components/intellifire/ @jeeftor
 /tests/components/intellifire/ @jeeftor
-/homeassistant/components/intent/ @home-assistant/core @synesthesiam @arturpragacz
-/tests/components/intent/ @home-assistant/core @synesthesiam @arturpragacz
+/homeassistant/components/intent/ @home-assistant/core @synesthesiam
+/tests/components/intent/ @home-assistant/core @synesthesiam
 /homeassistant/components/intesishome/ @jnimmo
 /homeassistant/components/iometer/ @MaestroOnICe
 /tests/components/iometer/ @MaestroOnICe
@@ -860,8 +856,6 @@ build.json @home-assistant/supervisor
 /tests/components/lg_netcast/ @Drafteed @splinter98
 /homeassistant/components/lg_thinq/ @LG-ThinQ-Integration
 /tests/components/lg_thinq/ @LG-ThinQ-Integration
-/homeassistant/components/libre_hardware_monitor/ @Sab44
-/tests/components/libre_hardware_monitor/ @Sab44
 /homeassistant/components/lidarr/ @tkdrob
 /tests/components/lidarr/ @tkdrob
 /homeassistant/components/lifx/ @Djelibeybi
@@ -968,8 +962,6 @@ build.json @home-assistant/supervisor
 /tests/components/moat/ @bdraco
 /homeassistant/components/mobile_app/ @home-assistant/core
 /tests/components/mobile_app/ @home-assistant/core
-/homeassistant/components/modbus/ @janiversen
-/tests/components/modbus/ @janiversen
 /homeassistant/components/modem_callerid/ @tkdrob
 /tests/components/modem_callerid/ @tkdrob
 /homeassistant/components/modern_forms/ @wonderslug
@@ -1112,6 +1104,8 @@ build.json @home-assistant/supervisor
 /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
 /tests/components/openerz/ @misialq
 /homeassistant/components/openexchangerates/ @MartinHjelmare
@@ -1187,12 +1181,8 @@ build.json @home-assistant/supervisor
 /tests/components/plum_lightpad/ @ColinHarrington @prystupa
 /homeassistant/components/point/ @fredrike
 /tests/components/point/ @fredrike
-/homeassistant/components/pooldose/ @lmaertin
-/tests/components/pooldose/ @lmaertin
 /homeassistant/components/poolsense/ @haemishkyd
 /tests/components/poolsense/ @haemishkyd
-/homeassistant/components/portainer/ @erwindouna
-/tests/components/portainer/ @erwindouna
 /homeassistant/components/powerfox/ @klaasnicolaas
 /tests/components/powerfox/ @klaasnicolaas
 /homeassistant/components/powerwall/ @bdraco @jrester @daniel-simpson
@@ -1212,6 +1202,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/proximity/ @mib1185
 /tests/components/proximity/ @mib1185
 /homeassistant/components/proxmoxve/ @jhollowe @Corbeno
+/homeassistant/components/prusalink/ @balloob
+/tests/components/prusalink/ @balloob
 /homeassistant/components/ps4/ @ktnrg45
 /tests/components/ps4/ @ktnrg45
 /homeassistant/components/pterodactyl/ @elmurato
@@ -1305,8 +1297,8 @@ build.json @home-assistant/supervisor
 /tests/components/rflink/ @javicalle
 /homeassistant/components/rfxtrx/ @danielhiversen @elupus @RobBie1221
 /tests/components/rfxtrx/ @danielhiversen @elupus @RobBie1221
-/homeassistant/components/rhasspy/ @synesthesiam
-/tests/components/rhasspy/ @synesthesiam
+/homeassistant/components/rhasspy/ @balloob @synesthesiam
+/tests/components/rhasspy/ @balloob @synesthesiam
 /homeassistant/components/ridwell/ @bachya
 /tests/components/ridwell/ @bachya
 /homeassistant/components/ring/ @sdb9696
@@ -1394,14 +1386,12 @@ build.json @home-assistant/supervisor
 /tests/components/seventeentrack/ @shaiu
 /homeassistant/components/sfr_box/ @epenet
 /tests/components/sfr_box/ @epenet
-/homeassistant/components/sftp_storage/ @maretodoric
-/tests/components/sftp_storage/ @maretodoric
 /homeassistant/components/sharkiq/ @JeffResc @funkybunch
 /tests/components/sharkiq/ @JeffResc @funkybunch
 /homeassistant/components/shell_command/ @home-assistant/core
 /tests/components/shell_command/ @home-assistant/core
-/homeassistant/components/shelly/ @bieniu @thecode @chemelli74 @bdraco
-/tests/components/shelly/ @bieniu @thecode @chemelli74 @bdraco
+/homeassistant/components/shelly/ @balloob @bieniu @thecode @chemelli74 @bdraco
+/tests/components/shelly/ @balloob @bieniu @thecode @chemelli74 @bdraco
 /homeassistant/components/shodan/ @fabaff
 /homeassistant/components/sia/ @eavanvalkenburg
 /tests/components/sia/ @eavanvalkenburg
@@ -1548,8 +1538,8 @@ build.json @home-assistant/supervisor
 /tests/components/systemmonitor/ @gjohansson-ST
 /homeassistant/components/tado/ @erwindouna
 /tests/components/tado/ @erwindouna
-/homeassistant/components/tag/ @home-assistant/core
-/tests/components/tag/ @home-assistant/core
+/homeassistant/components/tag/ @balloob @dmulcahey
+/tests/components/tag/ @balloob @dmulcahey
 /homeassistant/components/tailscale/ @frenck
 /tests/components/tailscale/ @frenck
 /homeassistant/components/tailwind/ @frenck
@@ -1694,15 +1684,15 @@ build.json @home-assistant/supervisor
 /tests/components/vegehub/ @ghowevege
 /homeassistant/components/velbus/ @Cereal2nd @brefra
 /tests/components/velbus/ @Cereal2nd @brefra
-/homeassistant/components/velux/ @Julius2342 @DeerMaximum @pawlizio @wollew
-/tests/components/velux/ @Julius2342 @DeerMaximum @pawlizio @wollew
+/homeassistant/components/velux/ @Julius2342 @DeerMaximum @pawlizio
+/tests/components/velux/ @Julius2342 @DeerMaximum @pawlizio
 /homeassistant/components/venstar/ @garbled1 @jhollowe
 /tests/components/venstar/ @garbled1 @jhollowe
 /homeassistant/components/versasense/ @imstevenxyz
 /homeassistant/components/version/ @ludeeus
 /tests/components/version/ @ludeeus
-/homeassistant/components/vesync/ @markperdue @webdjoe @thegardenmonkey @cdnninja @iprak @sapuseven
-/tests/components/vesync/ @markperdue @webdjoe @thegardenmonkey @cdnninja @iprak @sapuseven
+/homeassistant/components/vesync/ @markperdue @webdjoe @thegardenmonkey @cdnninja @iprak
+/tests/components/vesync/ @markperdue @webdjoe @thegardenmonkey @cdnninja @iprak
 /homeassistant/components/vicare/ @CFenner
 /tests/components/vicare/ @CFenner
 /homeassistant/components/vilfo/ @ManneW
@@ -1714,14 +1704,16 @@ build.json @home-assistant/supervisor
 /tests/components/vlc_telnet/ @rodripf @MartinHjelmare
 /homeassistant/components/vodafone_station/ @paoloantinori @chemelli74
 /tests/components/vodafone_station/ @paoloantinori @chemelli74
-/homeassistant/components/voip/ @synesthesiam @jaminh
-/tests/components/voip/ @synesthesiam @jaminh
+/homeassistant/components/voip/ @balloob @synesthesiam @jaminh
+/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
+/tests/components/vulcan/ @Antoni-Czaplicki
 /homeassistant/components/wake_on_lan/ @ntilley905
 /tests/components/wake_on_lan/ @ntilley905
 /homeassistant/components/wake_word/ @home-assistant/core @synesthesiam
@@ -1786,8 +1778,8 @@ build.json @home-assistant/supervisor
 /tests/components/worldclock/ @fabaff
 /homeassistant/components/ws66i/ @ssaenger
 /tests/components/ws66i/ @ssaenger
-/homeassistant/components/wyoming/ @synesthesiam
-/tests/components/wyoming/ @synesthesiam
+/homeassistant/components/wyoming/ @balloob @synesthesiam
+/tests/components/wyoming/ @balloob @synesthesiam
 /homeassistant/components/xbox/ @hunterjm
 /tests/components/xbox/ @hunterjm
 /homeassistant/components/xiaomi_aqara/ @danielhiversen @syssi
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -14,8 +14,5 @@ Still interested? Then you should take a peek at the [developer documentation](h

 ## Feature suggestions

-If you want to suggest a new feature for Home Assistant (e.g. new integrations), please [start a discussion](https://github.com/orgs/home-assistant/discussions) on GitHub.
-
-## Issue Tracker
-
-If you want to report an issue, please [create an issue](https://github.com/home-assistant/core/issues) on GitHub.
+If you want to suggest a new feature for Home Assistant (e.g., new integrations), please open a thread in our [Community Forum: Feature Requests](https://community.home-assistant.io/c/feature-requests).
+We use [GitHub for tracking issues](https://github.com/home-assistant/core/issues), not for tracking feature requests.
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -3,7 +3,8 @@ FROM mcr.microsoft.com/vscode/devcontainers/base:debian
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]

 RUN \
-    apt-get update \
+    curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
+    && apt-get update \
    && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
        # Additional library needed by some tests and accordingly by VScode Tests Discovery
        bluez \
--- a/build.yaml
+++ b/build.yaml
@@ -1,10 +1,10 @@
 image: ghcr.io/home-assistant/{arch}-homeassistant
 build_from:
-  aarch64: ghcr.io/home-assistant/aarch64-homeassistant-base:2025.09.1
-  armhf: ghcr.io/home-assistant/armhf-homeassistant-base:2025.09.1
-  armv7: ghcr.io/home-assistant/armv7-homeassistant-base:2025.09.1
-  amd64: ghcr.io/home-assistant/amd64-homeassistant-base:2025.09.1
-  i386: ghcr.io/home-assistant/i386-homeassistant-base:2025.09.1
+  aarch64: ghcr.io/home-assistant/aarch64-homeassistant-base:2025.05.0
+  armhf: ghcr.io/home-assistant/armhf-homeassistant-base:2025.05.0
+  armv7: ghcr.io/home-assistant/armv7-homeassistant-base:2025.05.0
+  amd64: ghcr.io/home-assistant/amd64-homeassistant-base:2025.05.0
+  i386: ghcr.io/home-assistant/i386-homeassistant-base:2025.05.0
 codenotary:
  signer: notary@home-assistant.io
  base_image: notary@home-assistant.io
--- a/homeassistant/main.py
+++ b/homeassistant/main.py
@@ -187,42 +187,36 @@ def main() -> int:

    from . import config, runner  # noqa: PLC0415

-    # Ensure only one instance runs per config directory
-    with runner.ensure_single_execution(config_dir) as single_execution_lock:
-        # Check if another instance is already running
-        if single_execution_lock.exit_code is not None:
-            return single_execution_lock.exit_code
+    safe_mode = config.safe_mode_enabled(config_dir)

-        safe_mode = config.safe_mode_enabled(config_dir)
+    runtime_conf = runner.RuntimeConfig(
+        config_dir=config_dir,
+        verbose=args.verbose,
+        log_rotate_days=args.log_rotate_days,
+        log_file=args.log_file,
+        log_no_color=args.log_no_color,
+        skip_pip=args.skip_pip,
+        skip_pip_packages=args.skip_pip_packages,
+        recovery_mode=args.recovery_mode,
+        debug=args.debug,
+        open_ui=args.open_ui,
+        safe_mode=safe_mode,
+    )

-        runtime_conf = runner.RuntimeConfig(
-            config_dir=config_dir,
-            verbose=args.verbose,
-            log_rotate_days=args.log_rotate_days,
-            log_file=args.log_file,
-            log_no_color=args.log_no_color,
-            skip_pip=args.skip_pip,
-            skip_pip_packages=args.skip_pip_packages,
-            recovery_mode=args.recovery_mode,
-            debug=args.debug,
-            open_ui=args.open_ui,
-            safe_mode=safe_mode,
-        )
+    fault_file_name = os.path.join(config_dir, FAULT_LOG_FILENAME)
+    with open(fault_file_name, mode="a", encoding="utf8") as fault_file:
+        faulthandler.enable(fault_file)
+        exit_code = runner.run(runtime_conf)
+        faulthandler.disable()

-        fault_file_name = os.path.join(config_dir, FAULT_LOG_FILENAME)
-        with open(fault_file_name, mode="a", encoding="utf8") as fault_file:
-            faulthandler.enable(fault_file)
-            exit_code = runner.run(runtime_conf)
-            faulthandler.disable()
+    # It's possible for the fault file to disappear, so suppress obvious errors
+    with suppress(FileNotFoundError):
+        if os.path.getsize(fault_file_name) == 0:
+            os.remove(fault_file_name)

-        # It's possible for the fault file to disappear, so suppress obvious errors
-        with suppress(FileNotFoundError):
-            if os.path.getsize(fault_file_name) == 0:
-                os.remove(fault_file_name)
+    check_threads()

-        check_threads()
-
-        return exit_code
+    return exit_code


 if __name__ == "__main__":
--- a/homeassistant/auth/mfa_modules/notify.py
+++ b/homeassistant/auth/mfa_modules/notify.py
@@ -27,7 +27,7 @@ from . import (
    SetupFlow,
 )

-REQUIREMENTS = ["pyotp==2.9.0"]
+REQUIREMENTS = ["pyotp==2.8.0"]

 CONF_MESSAGE = "message"

--- a/homeassistant/auth/mfa_modules/totp.py
+++ b/homeassistant/auth/mfa_modules/totp.py
@@ -20,7 +20,7 @@ from . import (
    SetupFlow,
 )

-REQUIREMENTS = ["pyotp==2.9.0", "PyQRCode==1.2.1"]
+REQUIREMENTS = ["pyotp==2.8.0", "PyQRCode==1.2.1"]

 CONFIG_SCHEMA = MULTI_FACTOR_AUTH_MODULE_SCHEMA.extend({}, extra=vol.PREVENT_EXTRA)

--- a/homeassistant/brands/fritzbox.json
+++ b/homeassistant/brands/fritzbox.json
@@ -1,5 +1,5 @@
 {
  "domain": "fritzbox",
-  "name": "FRITZ!",
+  "name": "FRITZ!Box",
  "integrations": ["fritz", "fritzbox", "fritzbox_callmonitor"]
 }
--- a/homeassistant/brands/google.json
+++ b/homeassistant/brands/google.json
@@ -6,6 +6,7 @@
    "google_assistant_sdk",
    "google_cloud",
    "google_drive",
+    "google_gemini",
    "google_generative_ai_conversation",
    "google_mail",
    "google_maps",
--- a/homeassistant/components/accuweather/init.py
+++ b/homeassistant/components/accuweather/init.py
@@ -2,23 +2,21 @@

 from __future__ import annotations

-import asyncio
 import logging

 from accuweather import AccuWeather

 from homeassistant.components.sensor import DOMAIN as SENSOR_PLATFORM
-from homeassistant.const import CONF_API_KEY, Platform
+from homeassistant.const import CONF_API_KEY, CONF_NAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.aiohttp_client import async_get_clientsession

-from .const import DOMAIN
+from .const import DOMAIN, UPDATE_INTERVAL_DAILY_FORECAST, UPDATE_INTERVAL_OBSERVATION
 from .coordinator import (
    AccuWeatherConfigEntry,
    AccuWeatherDailyForecastDataUpdateCoordinator,
    AccuWeatherData,
-    AccuWeatherHourlyForecastDataUpdateCoordinator,
    AccuWeatherObservationDataUpdateCoordinator,
 )

@@ -30,6 +28,7 @@ PLATFORMS = [Platform.SENSOR, Platform.WEATHER]
 async def async_setup_entry(hass: HomeAssistant, entry: AccuWeatherConfigEntry) -> bool:
    """Set up AccuWeather as config entry."""
    api_key: str = entry.data[CONF_API_KEY]
+    name: str = entry.data[CONF_NAME]

    location_key = entry.unique_id

@@ -42,28 +41,26 @@ async def async_setup_entry(hass: HomeAssistant, entry: AccuWeatherConfigEntry)
        hass,
        entry,
        accuweather,
+        name,
+        "observation",
+        UPDATE_INTERVAL_OBSERVATION,
    )
+
    coordinator_daily_forecast = AccuWeatherDailyForecastDataUpdateCoordinator(
        hass,
        entry,
        accuweather,
-    )
-    coordinator_hourly_forecast = AccuWeatherHourlyForecastDataUpdateCoordinator(
-        hass,
-        entry,
-        accuweather,
+        name,
+        "daily forecast",
+        UPDATE_INTERVAL_DAILY_FORECAST,
    )

-    await asyncio.gather(
-        coordinator_observation.async_config_entry_first_refresh(),
-        coordinator_daily_forecast.async_config_entry_first_refresh(),
-        coordinator_hourly_forecast.async_config_entry_first_refresh(),
-    )
+    await coordinator_observation.async_config_entry_first_refresh()
+    await coordinator_daily_forecast.async_config_entry_first_refresh()

    entry.runtime_data = AccuWeatherData(
        coordinator_observation=coordinator_observation,
        coordinator_daily_forecast=coordinator_daily_forecast,
-        coordinator_hourly_forecast=coordinator_hourly_forecast,
    )

    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
--- a/homeassistant/components/accuweather/config_flow.py
+++ b/homeassistant/components/accuweather/config_flow.py
@@ -50,7 +50,6 @@ class AccuWeatherFlowHandler(ConfigFlow, domain=DOMAIN):
                await self.async_set_unique_id(
                    accuweather.location_key, raise_on_progress=False
                )
-                self._abort_if_unique_id_configured()

                return self.async_create_entry(
                    title=user_input[CONF_NAME], data=user_input
--- a/homeassistant/components/accuweather/const.py
+++ b/homeassistant/components/accuweather/const.py
@@ -69,6 +69,5 @@ POLLEN_CATEGORY_MAP = {
    4: "very_high",
    5: "extreme",
 }
-UPDATE_INTERVAL_OBSERVATION = timedelta(minutes=10)
+UPDATE_INTERVAL_OBSERVATION = timedelta(minutes=40)
 UPDATE_INTERVAL_DAILY_FORECAST = timedelta(hours=6)
-UPDATE_INTERVAL_HOURLY_FORECAST = timedelta(hours=30)
--- a/homeassistant/components/accuweather/coordinator.py
+++ b/homeassistant/components/accuweather/coordinator.py
@@ -3,7 +3,6 @@
 from __future__ import annotations

 from asyncio import timeout
-from collections.abc import Awaitable, Callable
 from dataclasses import dataclass
 from datetime import timedelta
 import logging
@@ -13,7 +12,6 @@ from accuweather import AccuWeather, ApiError, InvalidApiKeyError, RequestsExcee
 from aiohttp.client_exceptions import ClientConnectorError

 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
 from homeassistant.helpers.update_coordinator import (
@@ -22,13 +20,7 @@ from homeassistant.helpers.update_coordinator import (
    UpdateFailed,
 )

-from .const import (
-    DOMAIN,
-    MANUFACTURER,
-    UPDATE_INTERVAL_DAILY_FORECAST,
-    UPDATE_INTERVAL_HOURLY_FORECAST,
-    UPDATE_INTERVAL_OBSERVATION,
-)
+from .const import DOMAIN, MANUFACTURER

 EXCEPTIONS = (ApiError, ClientConnectorError, InvalidApiKeyError, RequestsExceededError)

@@ -41,7 +33,6 @@ class AccuWeatherData:

    coordinator_observation: AccuWeatherObservationDataUpdateCoordinator
    coordinator_daily_forecast: AccuWeatherDailyForecastDataUpdateCoordinator
-    coordinator_hourly_forecast: AccuWeatherHourlyForecastDataUpdateCoordinator


 type AccuWeatherConfigEntry = ConfigEntry[AccuWeatherData]
@@ -57,11 +48,13 @@ class AccuWeatherObservationDataUpdateCoordinator(
        hass: HomeAssistant,
        config_entry: AccuWeatherConfigEntry,
        accuweather: AccuWeather,
+        name: str,
+        coordinator_type: str,
+        update_interval: timedelta,
    ) -> None:
        """Initialize."""
        self.accuweather = accuweather
        self.location_key = accuweather.location_key
-        name = config_entry.data[CONF_NAME]

        if TYPE_CHECKING:
            assert self.location_key is not None
@@ -72,8 +65,8 @@ class AccuWeatherObservationDataUpdateCoordinator(
            hass,
            _LOGGER,
            config_entry=config_entry,
-            name=f"{name} (observation)",
-            update_interval=UPDATE_INTERVAL_OBSERVATION,
+            name=f"{name} ({coordinator_type})",
+            update_interval=update_interval,
        )

    async def _async_update_data(self) -> dict[str, Any]:
@@ -93,25 +86,23 @@ class AccuWeatherObservationDataUpdateCoordinator(
        return result


-class AccuWeatherForecastDataUpdateCoordinator(
+class AccuWeatherDailyForecastDataUpdateCoordinator(
    TimestampDataUpdateCoordinator[list[dict[str, Any]]]
 ):
-    """Base class for AccuWeather forecast."""
+    """Class to manage fetching AccuWeather data API."""

    def __init__(
        self,
        hass: HomeAssistant,
        config_entry: AccuWeatherConfigEntry,
        accuweather: AccuWeather,
+        name: str,
        coordinator_type: str,
        update_interval: timedelta,
-        fetch_method: Callable[..., Awaitable[list[dict[str, Any]]]],
    ) -> None:
        """Initialize."""
        self.accuweather = accuweather
        self.location_key = accuweather.location_key
-        self._fetch_method = fetch_method
-        name = config_entry.data[CONF_NAME]

        if TYPE_CHECKING:
            assert self.location_key is not None
@@ -127,10 +118,12 @@ class AccuWeatherForecastDataUpdateCoordinator(
        )

    async def _async_update_data(self) -> list[dict[str, Any]]:
-        """Update forecast data via library."""
+        """Update data via library."""
        try:
            async with timeout(10):
-                result = await self._fetch_method(language=self.hass.config.language)
+                result = await self.accuweather.async_get_daily_forecast(
+                    language=self.hass.config.language
+                )
        except EXCEPTIONS as error:
            raise UpdateFailed(
                translation_domain=DOMAIN,
@@ -139,53 +132,10 @@ class AccuWeatherForecastDataUpdateCoordinator(
            ) from error

        _LOGGER.debug("Requests remaining: %d", self.accuweather.requests_remaining)
+
        return result


-class AccuWeatherDailyForecastDataUpdateCoordinator(
-    AccuWeatherForecastDataUpdateCoordinator
-):
-    """Coordinator for daily forecast."""
-
-    def __init__(
-        self,
-        hass: HomeAssistant,
-        config_entry: AccuWeatherConfigEntry,
-        accuweather: AccuWeather,
-    ) -> None:
-        """Initialize."""
-        super().__init__(
-            hass,
-            config_entry,
-            accuweather,
-            "daily forecast",
-            UPDATE_INTERVAL_DAILY_FORECAST,
-            fetch_method=accuweather.async_get_daily_forecast,
-        )
-
-
-class AccuWeatherHourlyForecastDataUpdateCoordinator(
-    AccuWeatherForecastDataUpdateCoordinator
-):
-    """Coordinator for hourly forecast."""
-
-    def __init__(
-        self,
-        hass: HomeAssistant,
-        config_entry: AccuWeatherConfigEntry,
-        accuweather: AccuWeather,
-    ) -> None:
-        """Initialize."""
-        super().__init__(
-            hass,
-            config_entry,
-            accuweather,
-            "hourly forecast",
-            UPDATE_INTERVAL_HOURLY_FORECAST,
-            fetch_method=accuweather.async_get_hourly_forecast,
-        )
-
-
 def _get_device_info(location_key: str, name: str) -> DeviceInfo:
    """Get device info."""
    return DeviceInfo(
--- a/homeassistant/components/accuweather/manifest.json
+++ b/homeassistant/components/accuweather/manifest.json
@@ -7,5 +7,6 @@
  "integration_type": "service",
  "iot_class": "cloud_polling",
  "loggers": ["accuweather"],
-  "requirements": ["accuweather==4.2.1"]
+  "requirements": ["accuweather==4.2.0"],
+  "single_config_entry": true
 }
--- a/homeassistant/components/accuweather/strings.json
+++ b/homeassistant/components/accuweather/strings.json
@@ -17,9 +17,6 @@
      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
      "invalid_api_key": "[%key:common::config_flow::error::invalid_api_key%]",
      "requests_exceeded": "The allowed number of requests to the AccuWeather API has been exceeded. You have to wait or change the API key."
-    },
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_location%]"
    }
  },
  "entity": {
--- a/homeassistant/components/accuweather/weather.py
+++ b/homeassistant/components/accuweather/weather.py
@@ -45,7 +45,6 @@ from .coordinator import (
    AccuWeatherConfigEntry,
    AccuWeatherDailyForecastDataUpdateCoordinator,
    AccuWeatherData,
-    AccuWeatherHourlyForecastDataUpdateCoordinator,
    AccuWeatherObservationDataUpdateCoordinator,
 )

@@ -65,7 +64,6 @@ class AccuWeatherEntity(
    CoordinatorWeatherEntity[
        AccuWeatherObservationDataUpdateCoordinator,
        AccuWeatherDailyForecastDataUpdateCoordinator,
-        AccuWeatherHourlyForecastDataUpdateCoordinator,
    ]
 ):
    """Define an AccuWeather entity."""
@@ -78,7 +76,6 @@ class AccuWeatherEntity(
        super().__init__(
            observation_coordinator=accuweather_data.coordinator_observation,
            daily_coordinator=accuweather_data.coordinator_daily_forecast,
-            hourly_coordinator=accuweather_data.coordinator_hourly_forecast,
        )

        self._attr_native_precipitation_unit = UnitOfPrecipitationDepth.MILLIMETERS
@@ -89,13 +86,10 @@ class AccuWeatherEntity(
        self._attr_unique_id = accuweather_data.coordinator_observation.location_key
        self._attr_attribution = ATTRIBUTION
        self._attr_device_info = accuweather_data.coordinator_observation.device_info
-        self._attr_supported_features = (
-            WeatherEntityFeature.FORECAST_DAILY | WeatherEntityFeature.FORECAST_HOURLY
-        )
+        self._attr_supported_features = WeatherEntityFeature.FORECAST_DAILY

        self.observation_coordinator = accuweather_data.coordinator_observation
        self.daily_coordinator = accuweather_data.coordinator_daily_forecast
-        self.hourly_coordinator = accuweather_data.coordinator_hourly_forecast

    @property
    def condition(self) -> str | None:
@@ -213,32 +207,3 @@ class AccuWeatherEntity(
            }
            for item in self.daily_coordinator.data
        ]
-
-    @callback
-    def _async_forecast_hourly(self) -> list[Forecast] | None:
-        """Return the hourly forecast in native units."""
-        return [
-            {
-                ATTR_FORECAST_TIME: utc_from_timestamp(
-                    item["EpochDateTime"]
-                ).isoformat(),
-                ATTR_FORECAST_CLOUD_COVERAGE: item["CloudCover"],
-                ATTR_FORECAST_HUMIDITY: item["RelativeHumidity"],
-                ATTR_FORECAST_NATIVE_TEMP: item["Temperature"][ATTR_VALUE],
-                ATTR_FORECAST_NATIVE_APPARENT_TEMP: item["RealFeelTemperature"][
-                    ATTR_VALUE
-                ],
-                ATTR_FORECAST_NATIVE_PRECIPITATION: item["TotalLiquid"][ATTR_VALUE],
-                ATTR_FORECAST_PRECIPITATION_PROBABILITY: item[
-                    "PrecipitationProbability"
-                ],
-                ATTR_FORECAST_NATIVE_WIND_SPEED: item["Wind"][ATTR_SPEED][ATTR_VALUE],
-                ATTR_FORECAST_NATIVE_WIND_GUST_SPEED: item["WindGust"][ATTR_SPEED][
-                    ATTR_VALUE
-                ],
-                ATTR_FORECAST_UV_INDEX: item["UVIndex"],
-                ATTR_FORECAST_WIND_BEARING: item["Wind"][ATTR_DIRECTION]["Degrees"],
-                ATTR_FORECAST_CONDITION: CONDITION_MAP.get(item["WeatherIcon"]),
-            }
-            for item in self.hourly_coordinator.data
-        ]
--- a/homeassistant/components/ai_task/init.py
+++ b/homeassistant/components/ai_task/init.py
@@ -29,19 +29,11 @@ from .const import (
    DATA_PREFERENCES,
    DOMAIN,
    SERVICE_GENERATE_DATA,
-    SERVICE_GENERATE_IMAGE,
    AITaskEntityFeature,
 )
 from .entity import AITaskEntity
 from .http import async_setup as async_setup_http
-from .task import (
-    GenDataTask,
-    GenDataTaskResult,
-    GenImageTask,
-    GenImageTaskResult,
-    async_generate_data,
-    async_generate_image,
-)
+from .task import GenDataTask, GenDataTaskResult, async_generate_data

 __all__ = [
    "DOMAIN",
@@ -49,10 +41,7 @@ __all__ = [
    "AITaskEntityFeature",
    "GenDataTask",
    "GenDataTaskResult",
-    "GenImageTask",
-    "GenImageTaskResult",
    "async_generate_data",
-    "async_generate_image",
    "async_setup",
    "async_setup_entry",
    "async_unload_entry",
@@ -112,23 +101,6 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
        supports_response=SupportsResponse.ONLY,
        job_type=HassJobType.Coroutinefunction,
    )
-    hass.services.async_register(
-        DOMAIN,
-        SERVICE_GENERATE_IMAGE,
-        async_service_generate_image,
-        schema=vol.Schema(
-            {
-                vol.Required(ATTR_TASK_NAME): cv.string,
-                vol.Optional(ATTR_ENTITY_ID): cv.entity_id,
-                vol.Required(ATTR_INSTRUCTIONS): cv.string,
-                vol.Optional(ATTR_ATTACHMENTS): vol.All(
-                    cv.ensure_list, [selector.MediaSelector({"accept": ["*/*"]})]
-                ),
-            }
-        ),
-        supports_response=SupportsResponse.ONLY,
-        job_type=HassJobType.Coroutinefunction,
-    )
    return True


@@ -143,23 +115,17 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:


 async def async_service_generate_data(call: ServiceCall) -> ServiceResponse:
-    """Run the data task service."""
+    """Run the run task service."""
    result = await async_generate_data(hass=call.hass, **call.data)
    return result.as_dict()


-async def async_service_generate_image(call: ServiceCall) -> ServiceResponse:
-    """Run the image task service."""
-    return await async_generate_image(hass=call.hass, **call.data)
-
-
 class AITaskPreferences:
    """AI Task preferences."""

-    KEYS = ("gen_data_entity_id", "gen_image_entity_id")
+    KEYS = ("gen_data_entity_id",)

    gen_data_entity_id: str | None = None
-    gen_image_entity_id: str | None = None

    def __init__(self, hass: HomeAssistant) -> None:
        """Initialize the preferences."""
@@ -173,21 +139,17 @@ class AITaskPreferences:
        if data is None:
            return
        for key in self.KEYS:
-            setattr(self, key, data.get(key))
+            setattr(self, key, data[key])

    @callback
    def async_set_preferences(
        self,
        *,
        gen_data_entity_id: str | None | UndefinedType = UNDEFINED,
-        gen_image_entity_id: str | None | UndefinedType = UNDEFINED,
    ) -> None:
        """Set the preferences."""
        changed = False
-        for key, value in (
-            ("gen_data_entity_id", gen_data_entity_id),
-            ("gen_image_entity_id", gen_image_entity_id),
-        ):
+        for key, value in (("gen_data_entity_id", gen_data_entity_id),):
            if value is not UNDEFINED:
                if getattr(self, key) != value:
                    setattr(self, key, value)
--- a/homeassistant/components/ai_task/const.py
+++ b/homeassistant/components/ai_task/const.py
@@ -8,7 +8,6 @@ from typing import TYPE_CHECKING, Final
 from homeassistant.util.hass_dict import HassKey

 if TYPE_CHECKING:
-    from homeassistant.components.media_source import local_source
    from homeassistant.helpers.entity_component import EntityComponent

    from . import AITaskPreferences
@@ -17,13 +16,8 @@ if TYPE_CHECKING:
 DOMAIN = "ai_task"
 DATA_COMPONENT: HassKey[EntityComponent[AITaskEntity]] = HassKey(DOMAIN)
 DATA_PREFERENCES: HassKey[AITaskPreferences] = HassKey(f"{DOMAIN}_preferences")
-DATA_MEDIA_SOURCE: HassKey[local_source.LocalSource] = HassKey(f"{DOMAIN}_media_source")
-
-IMAGE_DIR: Final = "image"
-IMAGE_EXPIRY_TIME = 60 * 60  # 1 hour

 SERVICE_GENERATE_DATA = "generate_data"
-SERVICE_GENERATE_IMAGE = "generate_image"

 ATTR_INSTRUCTIONS: Final = "instructions"
 ATTR_TASK_NAME: Final = "task_name"
@@ -44,6 +38,3 @@ class AITaskEntityFeature(IntFlag):

    SUPPORT_ATTACHMENTS = 2
    """Support attachments with generate data."""
-
-    GENERATE_IMAGE = 4
-    """Generate images based on instructions."""
--- a/homeassistant/components/ai_task/entity.py
+++ b/homeassistant/components/ai_task/entity.py
@@ -18,7 +18,7 @@ from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.util import dt as dt_util

 from .const import DEFAULT_SYSTEM_PROMPT, DOMAIN, AITaskEntityFeature
-from .task import GenDataTask, GenDataTaskResult, GenImageTask, GenImageTaskResult
+from .task import GenDataTask, GenDataTaskResult


 class AITaskEntity(RestoreEntity):
@@ -57,13 +57,9 @@ class AITaskEntity(RestoreEntity):
    async def _async_get_ai_task_chat_log(
        self,
        session: ChatSession,
-        task: GenDataTask | GenImageTask,
+        task: GenDataTask,
    ) -> AsyncGenerator[ChatLog]:
        """Context manager used to manage the ChatLog used during an AI Task."""
-        user_llm_hass_api: llm.API | None = None
-        if isinstance(task, GenDataTask):
-            user_llm_hass_api = task.llm_api
-
        # pylint: disable-next=contextmanager-generator-missing-cleanup
        with (
            async_get_chat_log(
@@ -81,7 +77,6 @@ class AITaskEntity(RestoreEntity):
                    device_id=None,
                ),
                user_llm_prompt=DEFAULT_SYSTEM_PROMPT,
-                user_llm_hass_api=user_llm_hass_api,
            )

            chat_log.async_add_user_content(
@@ -109,23 +104,3 @@ class AITaskEntity(RestoreEntity):
    ) -> GenDataTaskResult:
        """Handle a gen data task."""
        raise NotImplementedError
-
-    @final
-    async def internal_async_generate_image(
-        self,
-        session: ChatSession,
-        task: GenImageTask,
-    ) -> GenImageTaskResult:
-        """Run a gen image 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:
-            return await self._async_generate_image(task, chat_log)
-
-    async def _async_generate_image(
-        self,
-        task: GenImageTask,
-        chat_log: ChatLog,
-    ) -> GenImageTaskResult:
-        """Handle a gen image task."""
-        raise NotImplementedError
--- a/homeassistant/components/ai_task/http.py
+++ b/homeassistant/components/ai_task/http.py
@@ -37,7 +37,6 @@ def websocket_get_preferences(
    {
        vol.Required("type"): "ai_task/preferences/set",
        vol.Optional("gen_data_entity_id"): vol.Any(str, None),
-        vol.Optional("gen_image_entity_id"): vol.Any(str, None),
    }
 )
@websocket_api.require_admin
--- a/homeassistant/components/ai_task/icons.json
+++ b/homeassistant/components/ai_task/icons.json
@@ -1,15 +1,7 @@
 {
-  "entity_component": {
-    "_": {
-      "default": "mdi:star-four-points"
-    }
-  },
  "services": {
    "generate_data": {
      "service": "mdi:file-star-four-points-outline"
-    },
-    "generate_image": {
-      "service": "mdi:star-four-points-box-outline"
    }
  }
 }
--- a/homeassistant/components/ai_task/manifest.json
+++ b/homeassistant/components/ai_task/manifest.json
@@ -5,6 +5,6 @@
  "codeowners": ["@home-assistant/core"],
  "dependencies": ["conversation", "media_source"],
  "documentation": "https://www.home-assistant.io/integrations/ai_task",
-  "integration_type": "entity",
+  "integration_type": "system",
  "quality_scale": "internal"
 }
--- a/homeassistant/components/ai_task/media_source.py
+++ b/homeassistant/components/ai_task/media_source.py
@@ -1,23 +0,0 @@
-"""Expose images as media sources."""
-
-from __future__ import annotations
-
-from homeassistant.components.media_source import MediaSource, local_source
-from homeassistant.core import HomeAssistant
-
-from .const import DATA_MEDIA_SOURCE, DOMAIN, IMAGE_DIR
-
-
-async def async_get_media_source(hass: HomeAssistant) -> MediaSource:
-    """Set up local media source."""
-    media_dir = hass.config.path(f"{DOMAIN}/{IMAGE_DIR}")
-
-    hass.data[DATA_MEDIA_SOURCE] = source = local_source.LocalSource(
-        hass,
-        DOMAIN,
-        "AI Generated Images",
-        {IMAGE_DIR: media_dir},
-        False,
-        f"/{DOMAIN}",
-    )
-    return source
--- a/homeassistant/components/ai_task/services.yaml
+++ b/homeassistant/components/ai_task/services.yaml
@@ -20,6 +20,7 @@ generate_data:
            supported_features:
              - ai_task.AITaskEntityFeature.GENERATE_DATA
    structure:
+      advanced: true
      required: false
      example: '{ "name": { "selector": { "text": }, "description": "Name of the user", "required": "True" } } }, "age": { "selector": { "number": }, "description": "Age of the user" } }'
      selector:
@@ -30,30 +31,3 @@ generate_data:
        media:
          accept:
            - "*"
-generate_image:
-  fields:
-    task_name:
-      example: "picture of a dog"
-      required: true
-      selector:
-        text:
-    instructions:
-      example: "Generate a high quality square image of a dog on transparent background"
-      required: true
-      selector:
-        text:
-          multiline: true
-    entity_id:
-      required: true
-      selector:
-        entity:
-          filter:
-            domain: ai_task
-            supported_features:
-              - ai_task.AITaskEntityFeature.GENERATE_IMAGE
-    attachments:
-      required: false
-      selector:
-        media:
-          accept:
-            - "*"
--- a/homeassistant/components/ai_task/strings.json
+++ b/homeassistant/components/ai_task/strings.json
@@ -25,28 +25,6 @@
          "description": "List of files to attach for multi-modal AI analysis."
        }
      }
-    },
-    "generate_image": {
-      "name": "Generate image",
-      "description": "Uses AI to generate image.",
-      "fields": {
-        "task_name": {
-          "name": "Task name",
-          "description": "Name of the task."
-        },
-        "instructions": {
-          "name": "Instructions",
-          "description": "Instructions that explains the image to be generated."
-        },
-        "entity_id": {
-          "name": "Entity ID",
-          "description": "Entity ID to run the task on."
-        },
-        "attachments": {
-          "name": "Attachments",
-          "description": "List of files to attach for using as references."
-        }
-      }
    }
  }
 }
--- a/homeassistant/components/ai_task/task.py
+++ b/homeassistant/components/ai_task/task.py
@@ -3,8 +3,6 @@
 from __future__ import annotations

 from dataclasses import dataclass
-from datetime import datetime, timedelta
-import io
 import mimetypes
 from pathlib import Path
 import tempfile
@@ -13,22 +11,11 @@ from typing import Any
 import voluptuous as vol

 from homeassistant.components import camera, conversation, media_source
-from homeassistant.components.http.auth import async_sign_path
-from homeassistant.core import HomeAssistant, ServiceResponse, callback
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import llm
-from homeassistant.helpers.chat_session import ChatSession, async_get_chat_session
-from homeassistant.util import RE_SANITIZE_FILENAME, slugify
+from homeassistant.helpers.chat_session import async_get_chat_session

-from .const import (
-    DATA_COMPONENT,
-    DATA_MEDIA_SOURCE,
-    DATA_PREFERENCES,
-    DOMAIN,
-    IMAGE_DIR,
-    IMAGE_EXPIRY_TIME,
-    AITaskEntityFeature,
-)
+from .const import DATA_COMPONENT, DATA_PREFERENCES, AITaskEntityFeature


 def _save_camera_snapshot(image: camera.Image) -> Path:
@@ -42,15 +29,43 @@ def _save_camera_snapshot(image: camera.Image) -> Path:
        return Path(temp_file.name)


-async def _resolve_attachments(
+async def async_generate_data(
    hass: HomeAssistant,
-    session: ChatSession,
+    *,
+    task_name: str,
+    entity_id: str | None = None,
+    instructions: str,
+    structure: vol.Schema | None = None,
    attachments: list[dict] | None = None,
-) -> list[conversation.Attachment]:
-    """Resolve attachments for a task."""
+) -> GenDataTaskResult:
+    """Run a task in the AI Task integration."""
+    if entity_id is None:
+        entity_id = hass.data[DATA_PREFERENCES].gen_data_entity_id
+
+    if entity_id is None:
+        raise HomeAssistantError("No entity_id provided and no preferred entity set")
+
+    entity = hass.data[DATA_COMPONENT].get_entity(entity_id)
+    if entity is None:
+        raise HomeAssistantError(f"AI Task entity {entity_id} not found")
+
+    if AITaskEntityFeature.GENERATE_DATA not in entity.supported_features:
+        raise HomeAssistantError(
+            f"AI Task entity {entity_id} does not support generating data"
+        )
+
+    # Resolve attachments
    resolved_attachments: list[conversation.Attachment] = []
    created_files: list[Path] = []

+    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"]

@@ -89,60 +104,20 @@ async def _resolve_attachments(
                )
            )

-    if not created_files:
-        return resolved_attachments
-
-    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 resolved_attachments
-
-
-async def async_generate_data(
-    hass: HomeAssistant,
-    *,
-    task_name: str,
-    entity_id: str | None = None,
-    instructions: str,
-    structure: vol.Schema | None = None,
-    attachments: list[dict] | None = None,
-    llm_api: llm.API | None = None,
-) -> GenDataTaskResult:
-    """Run a data generation task in the AI Task integration."""
-    if entity_id is None:
-        entity_id = hass.data[DATA_PREFERENCES].gen_data_entity_id
-
-    if entity_id is None:
-        raise HomeAssistantError("No entity_id provided and no preferred entity set")
-
-    entity = hass.data[DATA_COMPONENT].get_entity(entity_id)
-    if entity is None:
-        raise HomeAssistantError(f"AI Task entity {entity_id} not found")
-
-    if AITaskEntityFeature.GENERATE_DATA not in entity.supported_features:
-        raise HomeAssistantError(
-            f"AI Task entity {entity_id} does not support generating data"
-        )
-
-    if (
-        attachments
-        and AITaskEntityFeature.SUPPORT_ATTACHMENTS not in entity.supported_features
-    ):
-        raise HomeAssistantError(
-            f"AI Task entity {entity_id} does not support attachments"
-        )
-
    with async_get_chat_session(hass) as session:
-        resolved_attachments = await _resolve_attachments(hass, session, attachments)
+        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,
@@ -151,92 +126,10 @@ async def async_generate_data(
                instructions=instructions,
                structure=structure,
                attachments=resolved_attachments or None,
-                llm_api=llm_api,
            ),
        )


-async def async_generate_image(
-    hass: HomeAssistant,
-    *,
-    task_name: str,
-    entity_id: str | None = None,
-    instructions: str,
-    attachments: list[dict] | None = None,
-) -> ServiceResponse:
-    """Run an image generation task in the AI Task integration."""
-    if entity_id is None:
-        entity_id = hass.data[DATA_PREFERENCES].gen_image_entity_id
-
-    if entity_id is None:
-        raise HomeAssistantError("No entity_id provided and no preferred entity set")
-
-    entity = hass.data[DATA_COMPONENT].get_entity(entity_id)
-    if entity is None:
-        raise HomeAssistantError(f"AI Task entity {entity_id} not found")
-
-    if AITaskEntityFeature.GENERATE_IMAGE not in entity.supported_features:
-        raise HomeAssistantError(
-            f"AI Task entity {entity_id} does not support generating images"
-        )
-
-    if (
-        attachments
-        and AITaskEntityFeature.SUPPORT_ATTACHMENTS not in entity.supported_features
-    ):
-        raise HomeAssistantError(
-            f"AI Task entity {entity_id} does not support attachments"
-        )
-
-    with async_get_chat_session(hass) as session:
-        resolved_attachments = await _resolve_attachments(hass, session, attachments)
-
-        task_result = await entity.internal_async_generate_image(
-            session,
-            GenImageTask(
-                name=task_name,
-                instructions=instructions,
-                attachments=resolved_attachments or None,
-            ),
-        )
-
-    service_result = task_result.as_dict()
-    image_data = service_result.pop("image_data")
-    if service_result.get("revised_prompt") is None:
-        service_result["revised_prompt"] = instructions
-
-    source = hass.data[DATA_MEDIA_SOURCE]
-
-    current_time = datetime.now()
-    ext = mimetypes.guess_extension(task_result.mime_type, False) or ".png"
-    sanitized_task_name = RE_SANITIZE_FILENAME.sub("", slugify(task_name))
-
-    image_file = ImageData(
-        filename=f"{current_time.strftime('%Y-%m-%d_%H%M%S')}_{sanitized_task_name}{ext}",
-        file=io.BytesIO(image_data),
-        content_type=task_result.mime_type,
-    )
-
-    target_folder = media_source.MediaSourceItem.from_uri(
-        hass, f"media-source://{DOMAIN}/{IMAGE_DIR}", None
-    )
-
-    service_result["media_source_id"] = await source.async_upload_media(
-        target_folder, image_file
-    )
-
-    item = media_source.MediaSourceItem.from_uri(
-        hass, service_result["media_source_id"], None
-    )
-    service_result["url"] = async_sign_path(
-        hass,
-        (await source.async_resolve_media(item)).url,
-        timedelta(seconds=IMAGE_EXPIRY_TIME),
-    )
-
-    return service_result
-
-
@dataclass(slots=True)
 class GenDataTask:
    """Gen data task to be processed."""
@@ -253,9 +146,6 @@ class GenDataTask:
    attachments: list[conversation.Attachment] | None = None
    """List of attachments to go along the instructions."""

-    llm_api: llm.API | None = None
-    """API to provide to the LLM."""
-
    def __str__(self) -> str:
        """Return task as a string."""
        return f"<GenDataTask {self.name}: {id(self)}>"
@@ -277,68 +167,3 @@ class GenDataTaskResult:
            "conversation_id": self.conversation_id,
            "data": self.data,
        }
-
-
-@dataclass(slots=True)
-class GenImageTask:
-    """Gen image task to be processed."""
-
-    name: str
-    """Name of the task."""
-
-    instructions: str
-    """Instructions on what needs to be done."""
-
-    attachments: list[conversation.Attachment] | None = None
-    """List of attachments to go along the instructions."""
-
-    def __str__(self) -> str:
-        """Return task as a string."""
-        return f"<GenImageTask {self.name}: {id(self)}>"
-
-
-@dataclass(slots=True)
-class GenImageTaskResult:
-    """Result of gen image task."""
-
-    image_data: bytes
-    """Raw image data generated by the model."""
-
-    conversation_id: str
-    """Unique identifier for the conversation."""
-
-    mime_type: str
-    """MIME type of the generated image."""
-
-    width: int | None = None
-    """Width of the generated image, if available."""
-
-    height: int | None = None
-    """Height of the generated image, if available."""
-
-    model: str | None = None
-    """Model used to generate the image, if available."""
-
-    revised_prompt: str | None = None
-    """Revised prompt used to generate the image, if applicable."""
-
-    def as_dict(self) -> dict[str, Any]:
-        """Return result as a dict."""
-        return {
-            "image_data": self.image_data,
-            "conversation_id": self.conversation_id,
-            "mime_type": self.mime_type,
-            "width": self.width,
-            "height": self.height,
-            "model": self.model,
-            "revised_prompt": self.revised_prompt,
-        }
-
-
-@dataclass(slots=True)
-class ImageData:
-    """Implementation of media_source.local_source.UploadedFile protocol."""
-
-    filename: str
-    file: io.IOBase
-    content_type: str
--- a/homeassistant/components/airgradient/strings.json
+++ b/homeassistant/components/airgradient/strings.json
@@ -61,7 +61,7 @@
      "display_pm_standard": {
        "name": "Display PM standard",
        "state": {
-          "ugm3": "μg/m³",
+          "ugm3": "µg/m³",
          "us_aqi": "US AQI"
        }
      },
--- a/homeassistant/components/airos/init.py
+++ b/homeassistant/components/airos/init.py
@@ -2,7 +2,7 @@

 from __future__ import annotations

-from airos.airos8 import AirOS8
+from airos.airos8 import AirOS

 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME, Platform
 from homeassistant.core import HomeAssistant
@@ -23,7 +23,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: AirOSConfigEntry) -> boo
    # with no option in the web UI to change or upload a custom certificate.
    session = async_get_clientsession(hass, verify_ssl=False)

-    airos_device = AirOS8(
+    airos_device = AirOS(
        host=entry.data[CONF_HOST],
        username=entry.data[CONF_USERNAME],
        password=entry.data[CONF_PASSWORD],
--- a/homeassistant/components/airos/binary_sensor.py
+++ b/homeassistant/components/airos/binary_sensor.py
@@ -15,7 +15,7 @@ from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback

-from .coordinator import AirOS8Data, AirOSConfigEntry, AirOSDataUpdateCoordinator
+from .coordinator import AirOSConfigEntry, AirOSData, AirOSDataUpdateCoordinator
 from .entity import AirOSEntity

 _LOGGER = logging.getLogger(__name__)
@@ -27,7 +27,7 @@ PARALLEL_UPDATES = 0
 class AirOSBinarySensorEntityDescription(BinarySensorEntityDescription):
    """Describe an AirOS binary sensor."""

-    value_fn: Callable[[AirOS8Data], bool]
+    value_fn: Callable[[AirOSData], bool]


 BINARY_SENSORS: tuple[AirOSBinarySensorEntityDescription, ...] = (
--- a/homeassistant/components/airos/config_flow.py
+++ b/homeassistant/components/airos/config_flow.py
@@ -19,7 +19,7 @@ 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 AirOS8
+from .coordinator import AirOS

 _LOGGER = logging.getLogger(__name__)

@@ -48,7 +48,7 @@ class AirOSConfigFlow(ConfigFlow, domain=DOMAIN):
            # 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 = AirOS8(
+            airos_device = AirOS(
                host=user_input[CONF_HOST],
                username=user_input[CONF_USERNAME],
                password=user_input[CONF_PASSWORD],
--- a/homeassistant/components/airos/coordinator.py
+++ b/homeassistant/components/airos/coordinator.py
@@ -4,7 +4,7 @@ from __future__ import annotations

 import logging

-from airos.airos8 import AirOS8, AirOS8Data
+from airos.airos8 import AirOS, AirOSData
 from airos.exceptions import (
    AirOSConnectionAuthenticationError,
    AirOSConnectionSetupError,
@@ -24,13 +24,13 @@ _LOGGER = logging.getLogger(__name__)
 type AirOSConfigEntry = ConfigEntry[AirOSDataUpdateCoordinator]


-class AirOSDataUpdateCoordinator(DataUpdateCoordinator[AirOS8Data]):
+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: AirOS8
+        self, hass: HomeAssistant, config_entry: AirOSConfigEntry, airos_device: AirOS
    ) -> None:
        """Initialize the coordinator."""
        self.airos_device = airos_device
@@ -42,7 +42,7 @@ class AirOSDataUpdateCoordinator(DataUpdateCoordinator[AirOS8Data]):
            update_interval=SCAN_INTERVAL,
        )

-    async def _async_update_data(self) -> AirOS8Data:
+    async def _async_update_data(self) -> AirOSData:
        """Fetch data from AirOS."""
        try:
            await self.airos_device.login()
--- a/homeassistant/components/airos/manifest.json
+++ b/homeassistant/components/airos/manifest.json
@@ -6,5 +6,5 @@
  "documentation": "https://www.home-assistant.io/integrations/airos",
  "iot_class": "local_polling",
  "quality_scale": "bronze",
-  "requirements": ["airos==0.5.1"]
+  "requirements": ["airos==0.3.0"]
 }
--- a/homeassistant/components/airos/sensor.py
+++ b/homeassistant/components/airos/sensor.py
@@ -26,7 +26,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType

-from .coordinator import AirOS8Data, AirOSConfigEntry, AirOSDataUpdateCoordinator
+from .coordinator import AirOSConfigEntry, AirOSData, AirOSDataUpdateCoordinator
 from .entity import AirOSEntity

 _LOGGER = logging.getLogger(__name__)
@@ -42,7 +42,7 @@ PARALLEL_UPDATES = 0
 class AirOSSensorEntityDescription(SensorEntityDescription):
    """Describe an AirOS sensor."""

-    value_fn: Callable[[AirOS8Data], StateType]
+    value_fn: Callable[[AirOSData], StateType]


 SENSORS: tuple[AirOSSensorEntityDescription, ...] = (
--- a/homeassistant/components/airzone/manifest.json
+++ b/homeassistant/components/airzone/manifest.json
@@ -11,5 +11,5 @@
  "documentation": "https://www.home-assistant.io/integrations/airzone",
  "iot_class": "local_polling",
  "loggers": ["aioairzone"],
-  "requirements": ["aioairzone==1.0.1"]
+  "requirements": ["aioairzone==1.0.0"]
 }
--- a/homeassistant/components/airzone_cloud/manifest.json
+++ b/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.2"]
+  "requirements": ["aioairzone-cloud==0.7.1"]
 }
--- a/homeassistant/components/aladdin_connect/init.py
+++ b/homeassistant/components/aladdin_connect/init.py
@@ -2,96 +2,39 @@

 from __future__ import annotations

-from genie_partner_sdk.client import AladdinConnectClient
-
-from homeassistant.const import Platform
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import (
-    aiohttp_client,
-    config_entry_oauth2_flow,
-    device_registry as dr,
-)
+from homeassistant.helpers import issue_registry as ir

-from . import api
-from .const import CONFIG_FLOW_MINOR_VERSION, CONFIG_FLOW_VERSION, DOMAIN
-from .coordinator import AladdinConnectConfigEntry, AladdinConnectCoordinator
-
-PLATFORMS: list[Platform] = [Platform.COVER, Platform.SENSOR]
+DOMAIN = "aladdin_connect"


-async def async_setup_entry(
-    hass: HomeAssistant, entry: AladdinConnectConfigEntry
-) -> bool:
-    """Set up Aladdin Connect Genie from a config entry."""
-    implementation = (
-        await config_entry_oauth2_flow.async_get_config_entry_implementation(
-            hass, entry
-        )
+async def async_setup_entry(hass: HomeAssistant, _: ConfigEntry) -> bool:
+    """Set up Aladdin Connect from a config entry."""
+    ir.async_create_issue(
+        hass,
+        DOMAIN,
+        DOMAIN,
+        is_fixable=False,
+        severity=ir.IssueSeverity.ERROR,
+        translation_key="integration_removed",
+        translation_placeholders={
+            "entries": "/config/integrations/integration/aladdin_connect",
+        },
    )

-    session = config_entry_oauth2_flow.OAuth2Session(hass, entry, implementation)
-
-    client = AladdinConnectClient(
-        api.AsyncConfigEntryAuth(aiohttp_client.async_get_clientsession(hass), session)
-    )
-
-    doors = await client.get_doors()
-
-    entry.runtime_data = {
-        door.unique_id: AladdinConnectCoordinator(hass, entry, client, door)
-        for door in doors
-    }
-
-    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
-
-    remove_stale_devices(hass, entry)
-
    return True


-async def async_unload_entry(
-    hass: HomeAssistant, entry: AladdinConnectConfigEntry
-) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
    """Unload a config entry."""
-    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
-
-
-async def async_migrate_entry(
-    hass: HomeAssistant, config_entry: AladdinConnectConfigEntry
-) -> bool:
-    """Migrate old config."""
-    if config_entry.version < CONFIG_FLOW_VERSION:
-        config_entry.async_start_reauth(hass)
-        new_data = {**config_entry.data}
-        hass.config_entries.async_update_entry(
-            config_entry,
-            data=new_data,
-            version=CONFIG_FLOW_VERSION,
-            minor_version=CONFIG_FLOW_MINOR_VERSION,
-        )
-
    return True


-def remove_stale_devices(
-    hass: HomeAssistant,
-    config_entry: AladdinConnectConfigEntry,
-) -> None:
-    """Remove stale devices from device registry."""
-    device_registry = dr.async_get(hass)
-    device_entries = dr.async_entries_for_config_entry(
-        device_registry, config_entry.entry_id
-    )
-    all_device_ids = set(config_entry.runtime_data)
-
-    for device_entry in device_entries:
-        device_id: str | None = None
-        for identifier in device_entry.identifiers:
-            if identifier[0] == DOMAIN:
-                device_id = identifier[1]
-                break
-
-        if device_id and device_id not in all_device_ids:
-            device_registry.async_update_device(
-                device_entry.id, remove_config_entry_id=config_entry.entry_id
-            )
+async def async_remove_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
+    """Remove a config entry."""
+    if not hass.config_entries.async_loaded_entries(DOMAIN):
+        ir.async_delete_issue(hass, DOMAIN, DOMAIN)
+        # Remove any remaining disabled or ignored entries
+        for _entry in hass.config_entries.async_entries(DOMAIN):
+            hass.async_create_task(hass.config_entries.async_remove(_entry.entry_id))
--- a/homeassistant/components/aladdin_connect/api.py
+++ b/homeassistant/components/aladdin_connect/api.py
@@ -1,33 +0,0 @@
-"""API for Aladdin Connect Genie bound to Home Assistant OAuth."""
-
-from typing import cast
-
-from aiohttp import ClientSession
-from genie_partner_sdk.auth import Auth
-
-from homeassistant.helpers import config_entry_oauth2_flow
-
-API_URL = "https://twdvzuefzh.execute-api.us-east-2.amazonaws.com/v1"
-API_KEY = "k6QaiQmcTm2zfaNns5L1Z8duBtJmhDOW8JawlCC3"
-
-
-class AsyncConfigEntryAuth(Auth):
-    """Provide Aladdin Connect Genie authentication tied to an OAuth2 based config entry."""
-
-    def __init__(
-        self,
-        websession: ClientSession,
-        oauth_session: config_entry_oauth2_flow.OAuth2Session,
-    ) -> None:
-        """Initialize Aladdin Connect Genie auth."""
-        super().__init__(
-            websession, API_URL, oauth_session.token["access_token"], API_KEY
-        )
-        self._oauth_session = oauth_session
-
-    async def async_get_access_token(self) -> str:
-        """Return a valid access token."""
-        if not self._oauth_session.valid_token:
-            await self._oauth_session.async_ensure_token_valid()
-
-        return cast(str, self._oauth_session.token["access_token"])
--- a/homeassistant/components/aladdin_connect/application_credentials.py
+++ b/homeassistant/components/aladdin_connect/application_credentials.py
@@ -1,14 +0,0 @@
-"""application_credentials platform the Aladdin Connect Genie integration."""
-
-from homeassistant.components.application_credentials import AuthorizationServer
-from homeassistant.core import HomeAssistant
-
-from .const import OAUTH2_AUTHORIZE, OAUTH2_TOKEN
-
-
-async def async_get_authorization_server(hass: HomeAssistant) -> AuthorizationServer:
-    """Return authorization server."""
-    return AuthorizationServer(
-        authorize_url=OAUTH2_AUTHORIZE,
-        token_url=OAUTH2_TOKEN,
-    )
--- a/homeassistant/components/aladdin_connect/config_flow.py
+++ b/homeassistant/components/aladdin_connect/config_flow.py
@@ -1,63 +1,11 @@
-"""Config flow for Aladdin Connect Genie."""
+"""Config flow for Aladdin Connect integration."""

-from collections.abc import Mapping
-import logging
-from typing import Any
+from homeassistant.config_entries import ConfigFlow

-import jwt
-import voluptuous as vol
-
-from homeassistant.config_entries import SOURCE_REAUTH, ConfigFlowResult
-from homeassistant.helpers import config_entry_oauth2_flow
-
-from .const import CONFIG_FLOW_MINOR_VERSION, CONFIG_FLOW_VERSION, DOMAIN
+from . import DOMAIN


-class OAuth2FlowHandler(
-    config_entry_oauth2_flow.AbstractOAuth2FlowHandler, domain=DOMAIN
-):
-    """Config flow to handle Aladdin Connect Genie OAuth2 authentication."""
+class AladdinConnectConfigFlow(ConfigFlow, domain=DOMAIN):
+    """Handle a config flow for Aladdin Connect."""

-    DOMAIN = DOMAIN
-    VERSION = CONFIG_FLOW_VERSION
-    MINOR_VERSION = CONFIG_FLOW_MINOR_VERSION
-
-    async def async_step_reauth(
-        self, user_input: Mapping[str, Any]
-    ) -> ConfigFlowResult:
-        """Perform reauth upon API auth error or upgrade from v1 to v2."""
-        return await self.async_step_reauth_confirm()
-
-    async def async_step_reauth_confirm(
-        self, user_input: Mapping[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Dialog that informs the user that reauth is required."""
-        if user_input is None:
-            return self.async_show_form(
-                step_id="reauth_confirm",
-                data_schema=vol.Schema({}),
-            )
-        return await self.async_step_user()
-
-    async def async_oauth_create_entry(self, data: dict) -> ConfigFlowResult:
-        """Create an oauth config entry or update existing entry for reauth."""
-        # Extract the user ID from the JWT token's 'sub' field
-        token = jwt.decode(
-            data["token"]["access_token"], options={"verify_signature": False}
-        )
-        user_id = token["sub"]
-        await self.async_set_unique_id(user_id)
-
-        if self.source == SOURCE_REAUTH:
-            self._abort_if_unique_id_mismatch(reason="wrong_account")
-            return self.async_update_reload_and_abort(
-                self._get_reauth_entry(), data=data
-            )
-
-        self._abort_if_unique_id_configured()
-        return self.async_create_entry(title="Aladdin Connect", data=data)
-
-    @property
-    def logger(self) -> logging.Logger:
-        """Return logger."""
-        return logging.getLogger(__name__)
+    VERSION = 1
--- a/homeassistant/components/aladdin_connect/const.py
+++ b/homeassistant/components/aladdin_connect/const.py
@@ -1,14 +0,0 @@
-"""Constants for the Aladdin Connect Genie integration."""
-
-from typing import Final
-
-from homeassistant.components.cover import CoverEntityFeature
-
-DOMAIN = "aladdin_connect"
-CONFIG_FLOW_VERSION = 2
-CONFIG_FLOW_MINOR_VERSION = 1
-
-OAUTH2_AUTHORIZE = "https://app.aladdinconnect.com/login.html"
-OAUTH2_TOKEN = "https://twdvzuefzh.execute-api.us-east-2.amazonaws.com/v1/oauth2/token"
-
-SUPPORTED_FEATURES: Final = CoverEntityFeature.OPEN | CoverEntityFeature.CLOSE
--- a/homeassistant/components/aladdin_connect/coordinator.py
+++ b/homeassistant/components/aladdin_connect/coordinator.py
@@ -1,50 +0,0 @@
-"""Coordinator for Aladdin Connect integration."""
-
-from __future__ import annotations
-
-from datetime import timedelta
-import logging
-
-from genie_partner_sdk.client import AladdinConnectClient
-from genie_partner_sdk.model import GarageDoor
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
-
-_LOGGER = logging.getLogger(__name__)
-type AladdinConnectConfigEntry = ConfigEntry[dict[str, AladdinConnectCoordinator]]
-SCAN_INTERVAL = timedelta(seconds=15)
-
-
-class AladdinConnectCoordinator(DataUpdateCoordinator[GarageDoor]):
-    """Coordinator for Aladdin Connect integration."""
-
-    def __init__(
-        self,
-        hass: HomeAssistant,
-        entry: AladdinConnectConfigEntry,
-        client: AladdinConnectClient,
-        garage_door: GarageDoor,
-    ) -> None:
-        """Initialize the coordinator."""
-        super().__init__(
-            hass,
-            logger=_LOGGER,
-            config_entry=entry,
-            name="Aladdin Connect Coordinator",
-            update_interval=SCAN_INTERVAL,
-        )
-        self.client = client
-        self.data = garage_door
-
-    async def _async_update_data(self) -> GarageDoor:
-        """Fetch data from the Aladdin Connect API."""
-        await self.client.update_door(self.data.device_id, self.data.door_number)
-        self.data.status = self.client.get_door_status(
-            self.data.device_id, self.data.door_number
-        )
-        self.data.battery_level = self.client.get_battery_status(
-            self.data.device_id, self.data.door_number
-        )
-        return self.data
--- a/homeassistant/components/aladdin_connect/cover.py
+++ b/homeassistant/components/aladdin_connect/cover.py
@@ -1,64 +0,0 @@
-"""Cover Entity for Genie Garage Door."""
-
-from __future__ import annotations
-
-from typing import Any
-
-from homeassistant.components.cover import CoverDeviceClass, CoverEntity
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-
-from .const import SUPPORTED_FEATURES
-from .coordinator import AladdinConnectConfigEntry, AladdinConnectCoordinator
-from .entity import AladdinConnectEntity
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: AladdinConnectConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up the cover platform."""
-    coordinators = entry.runtime_data
-
-    async_add_entities(
-        AladdinCoverEntity(coordinator) for coordinator in coordinators.values()
-    )
-
-
-class AladdinCoverEntity(AladdinConnectEntity, CoverEntity):
-    """Representation of Aladdin Connect cover."""
-
-    _attr_device_class = CoverDeviceClass.GARAGE
-    _attr_supported_features = SUPPORTED_FEATURES
-    _attr_name = None
-
-    def __init__(self, coordinator: AladdinConnectCoordinator) -> None:
-        """Initialize the Aladdin Connect cover."""
-        super().__init__(coordinator)
-        self._attr_unique_id = coordinator.data.unique_id
-
-    async def async_open_cover(self, **kwargs: Any) -> None:
-        """Issue open command to cover."""
-        await self.client.open_door(self._device_id, self._number)
-
-    async def async_close_cover(self, **kwargs: Any) -> None:
-        """Issue close command to cover."""
-        await self.client.close_door(self._device_id, self._number)
-
-    @property
-    def is_closed(self) -> bool | None:
-        """Update is closed attribute."""
-        if (status := self.coordinator.data.status) is None:
-            return None
-        return status == "closed"
-
-    @property
-    def is_closing(self) -> bool | None:
-        """Update is closing attribute."""
-        return self.coordinator.data.status == "closing"
-
-    @property
-    def is_opening(self) -> bool | None:
-        """Update is opening attribute."""
-        return self.coordinator.data.status == "opening"
--- a/homeassistant/components/aladdin_connect/entity.py
+++ b/homeassistant/components/aladdin_connect/entity.py
@@ -1,32 +0,0 @@
-"""Base class for Aladdin Connect entities."""
-
-from genie_partner_sdk.client import AladdinConnectClient
-
-from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
-
-from .const import DOMAIN
-from .coordinator import AladdinConnectCoordinator
-
-
-class AladdinConnectEntity(CoordinatorEntity[AladdinConnectCoordinator]):
-    """Defines a base Aladdin Connect entity."""
-
-    _attr_has_entity_name = True
-
-    def __init__(self, coordinator: AladdinConnectCoordinator) -> None:
-        """Initialize Aladdin Connect entity."""
-        super().__init__(coordinator)
-        device = coordinator.data
-        self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, device.unique_id)},
-            manufacturer="Aladdin Connect",
-            name=device.name,
-        )
-        self._device_id = device.device_id
-        self._number = device.door_number
-
-    @property
-    def client(self) -> AladdinConnectClient:
-        """Return the client for this entity."""
-        return self.coordinator.client
--- a/homeassistant/components/aladdin_connect/manifest.json
+++ b/homeassistant/components/aladdin_connect/manifest.json
@@ -1,16 +1,9 @@
 {
  "domain": "aladdin_connect",
  "name": "Aladdin Connect",
-  "codeowners": ["@swcloudgenie"],
-  "config_flow": true,
-  "dependencies": ["application_credentials"],
-  "dhcp": [
-    {
-      "hostname": "gdocntl-*"
-    }
-  ],
+  "codeowners": [],
  "documentation": "https://www.home-assistant.io/integrations/aladdin_connect",
-  "integration_type": "hub",
+  "integration_type": "system",
  "iot_class": "cloud_polling",
-  "requirements": ["genie-partner-sdk==1.0.11"]
+  "requirements": []
 }
--- a/homeassistant/components/aladdin_connect/quality_scale.yaml
+++ b/homeassistant/components/aladdin_connect/quality_scale.yaml
@@ -1,94 +0,0 @@
-rules:
-  # Bronze
-  action-setup:
-    status: exempt
-    comment: Integration does not register any service actions.
-  appropriate-polling: done
-  brands: done
-  common-modules: done
-  config-flow: done
-  config-flow-test-coverage: todo
-  dependency-transparency: done
-  docs-actions:
-    status: exempt
-    comment: Integration does not register any service actions.
-  docs-high-level-description: done
-  docs-installation-instructions:
-    status: todo
-    comment: Documentation needs to be created.
-  docs-removal-instructions:
-    status: todo
-    comment: Documentation needs to be created.
-  entity-event-setup:
-    status: exempt
-    comment: Integration does not subscribe to external events.
-  entity-unique-id: done
-  has-entity-name: done
-  runtime-data: done
-  test-before-configure:
-    status: todo
-    comment: Config flow does not currently test connection during setup.
-  test-before-setup: todo
-  unique-config-entry: done
-
-  # Silver
-  action-exceptions: todo
-  config-entry-unloading: done
-  docs-configuration-parameters:
-    status: todo
-    comment: Documentation needs to be created.
-  docs-installation-parameters:
-    status: todo
-    comment: Documentation needs to be created.
-  entity-unavailable: todo
-  integration-owner: done
-  log-when-unavailable: todo
-  parallel-updates: todo
-  reauthentication-flow: done
-  test-coverage:
-    status: todo
-    comment: Platform tests for cover and sensor need to be implemented to reach 95% coverage.
-
-  # Gold
-  devices: done
-  diagnostics: todo
-  discovery: todo
-  discovery-update-info: todo
-  docs-data-update:
-    status: todo
-    comment: Documentation needs to be created.
-  docs-examples:
-    status: todo
-    comment: Documentation needs to be created.
-  docs-known-limitations:
-    status: todo
-    comment: Documentation needs to be created.
-  docs-supported-devices:
-    status: todo
-    comment: Documentation needs to be created.
-  docs-supported-functions:
-    status: todo
-    comment: Documentation needs to be created.
-  docs-troubleshooting:
-    status: todo
-    comment: Documentation needs to be created.
-  docs-use-cases:
-    status: todo
-    comment: Documentation needs to be created.
-  dynamic-devices: todo
-  entity-category: done
-  entity-device-class: done
-  entity-disabled-by-default: done
-  entity-translations: done
-  exception-translations: todo
-  icon-translations: todo
-  reconfiguration-flow: todo
-  repair-issues: todo
-  stale-devices:
-    status: todo
-    comment: Stale devices can be done dynamically
-
-  # Platinum
-  async-dependency: todo
-  inject-websession: done
-  strict-typing: done
--- a/homeassistant/components/aladdin_connect/sensor.py
+++ b/homeassistant/components/aladdin_connect/sensor.py
@@ -1,77 +0,0 @@
-"""Support for Aladdin Connect Genie sensors."""
-
-from __future__ import annotations
-
-from collections.abc import Callable
-from dataclasses import dataclass
-
-from genie_partner_sdk.model import GarageDoor
-
-from homeassistant.components.sensor import (
-    SensorDeviceClass,
-    SensorEntity,
-    SensorEntityDescription,
-    SensorStateClass,
-)
-from homeassistant.const import PERCENTAGE, EntityCategory
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-
-from .coordinator import AladdinConnectConfigEntry, AladdinConnectCoordinator
-from .entity import AladdinConnectEntity
-
-
-@dataclass(frozen=True, kw_only=True)
-class AladdinConnectSensorEntityDescription(SensorEntityDescription):
-    """Sensor entity description for Aladdin Connect."""
-
-    value_fn: Callable[[GarageDoor], float | None]
-
-
-SENSOR_TYPES: tuple[AladdinConnectSensorEntityDescription, ...] = (
-    AladdinConnectSensorEntityDescription(
-        key="battery_level",
-        device_class=SensorDeviceClass.BATTERY,
-        entity_registry_enabled_default=False,
-        native_unit_of_measurement=PERCENTAGE,
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        value_fn=lambda garage_door: garage_door.battery_level,
-    ),
-)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: AladdinConnectConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up Aladdin Connect sensor devices."""
-    coordinators = entry.runtime_data
-
-    async_add_entities(
-        AladdinConnectSensor(coordinator, description)
-        for coordinator in coordinators.values()
-        for description in SENSOR_TYPES
-    )
-
-
-class AladdinConnectSensor(AladdinConnectEntity, SensorEntity):
-    """A sensor implementation for Aladdin Connect device."""
-
-    entity_description: AladdinConnectSensorEntityDescription
-
-    def __init__(
-        self,
-        coordinator: AladdinConnectCoordinator,
-        entity_description: AladdinConnectSensorEntityDescription,
-    ) -> None:
-        """Initialize the Aladdin Connect sensor."""
-        super().__init__(coordinator)
-        self.entity_description = entity_description
-        self._attr_unique_id = f"{coordinator.data.unique_id}-{entity_description.key}"
-
-    @property
-    def native_value(self) -> float | None:
-        """Return the state of the sensor."""
-        return self.entity_description.value_fn(self.coordinator.data)
--- a/homeassistant/components/aladdin_connect/strings.json
+++ b/homeassistant/components/aladdin_connect/strings.json
@@ -1,33 +1,8 @@
 {
-  "config": {
-    "step": {
-      "pick_implementation": {
-        "title": "[%key:common::config_flow::title::oauth2_pick_implementation%]"
-      },
-      "reauth_confirm": {
-        "title": "[%key:common::config_flow::title::reauth%]",
-        "description": "Aladdin Connect needs to re-authenticate your account"
-      },
-      "oauth_discovery": {
-        "description": "Home Assistant has found an Aladdin Connect device on your network. Press **Submit** to continue setting up Aladdin Connect."
-      }
-    },
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
-      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
-      "oauth_error": "[%key:common::config_flow::abort::oauth2_error%]",
-      "oauth_failed": "[%key:common::config_flow::abort::oauth2_failed%]",
-      "oauth_timeout": "[%key:common::config_flow::abort::oauth2_timeout%]",
-      "oauth_unauthorized": "[%key:common::config_flow::abort::oauth2_unauthorized%]",
-      "missing_configuration": "[%key:common::config_flow::abort::oauth2_missing_configuration%]",
-      "authorize_url_timeout": "[%key:common::config_flow::abort::oauth2_authorize_url_timeout%]",
-      "no_url_available": "[%key:common::config_flow::abort::oauth2_no_url_available%]",
-      "user_rejected_authorize": "[%key:common::config_flow::abort::oauth2_user_rejected_authorize%]",
-      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
-      "wrong_account": "You are authenticated with a different account than the one set up. Please authenticate with the configured account."
-    },
-    "create_entry": {
-      "default": "[%key:common::config_flow::create_entry::authenticated%]"
+  "issues": {
+    "integration_removed": {
+      "title": "The Aladdin Connect integration has been removed",
+      "description": "The Aladdin Connect integration has been removed from Home Assistant.\n\nTo resolve this issue, please remove the (now defunct) integration entries from your Home Assistant setup. [Click here to see your existing Aladdin Connect integration entries]({entries})."
    }
  }
 }
--- a/homeassistant/components/alarm_control_panel/init.py
+++ b/homeassistant/components/alarm_control_panel/init.py
@@ -61,7 +61,7 @@ ALARM_SERVICE_SCHEMA: Final = make_entity_service_schema(


 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the alarm control panel component."""
+    """Track states and offer events for sensors."""
    component = hass.data[DATA_COMPONENT] = EntityComponent[AlarmControlPanelEntity](
        _LOGGER, DOMAIN, hass, SCAN_INTERVAL
    )
--- a/homeassistant/components/alert/init.py
+++ b/homeassistant/components/alert/init.py
@@ -1,7 +1,4 @@
-"""Support for repeating alerts when conditions are met.
-
-DEVELOPMENT OF THE ALERT INTEGRATION IS FROZEN.
-"""
+"""Support for repeating alerts when conditions are met."""

 from __future__ import annotations

@@ -66,10 +63,7 @@ CONFIG_SCHEMA = vol.Schema(


 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the Alert component.
-
-    DEVELOPMENT OF THE ALERT INTEGRATION IS FROZEN.
-    """
+    """Set up the Alert component."""
    component = EntityComponent[AlertEntity](LOGGER, DOMAIN, hass)

    entities: list[AlertEntity] = []
--- a/homeassistant/components/alert/entity.py
+++ b/homeassistant/components/alert/entity.py
@@ -1,7 +1,4 @@
-"""Support for repeating alerts when conditions are met.
-
-DEVELOPMENT OF THE ALERT INTEGRATION IS FROZEN.
-"""
+"""Support for repeating alerts when conditions are met."""

 from __future__ import annotations

@@ -30,10 +27,7 @@ from .const import DOMAIN, LOGGER


 class AlertEntity(Entity):
-    """Representation of an alert.
-
-    DEVELOPMENT OF THE ALERT INTEGRATION IS FROZEN.
-    """
+    """Representation of an alert."""

    _attr_should_poll = False

--- a/homeassistant/components/alert/reproduce_state.py
+++ b/homeassistant/components/alert/reproduce_state.py
@@ -1,7 +1,4 @@
-"""Reproduce an Alert state.
-
-DEVELOPMENT OF THE ALERT INTEGRATION IS FROZEN.
-"""
+"""Reproduce an Alert state."""

 from __future__ import annotations

--- a/homeassistant/components/alexa_devices/init.py
+++ b/homeassistant/components/alexa_devices/init.py
@@ -1,11 +1,11 @@
 """Alexa Devices integration."""

-from homeassistant.const import CONF_COUNTRY, Platform
+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 _LOGGER, CONF_LOGIN_DATA, CONF_SITE, COUNTRY_DOMAINS, DOMAIN
+from .const import DOMAIN
 from .coordinator import AmazonConfigEntry, AmazonDevicesCoordinator
 from .services import async_setup_services

@@ -40,48 +40,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: AmazonConfigEntry) -> bo
    return True


-async def async_migrate_entry(hass: HomeAssistant, entry: AmazonConfigEntry) -> bool:
-    """Migrate old entry."""
-
-    if entry.version == 1 and entry.minor_version < 3:
-        if CONF_SITE in entry.data:
-            # Site in data (wrong place), just move to login data
-            new_data = entry.data.copy()
-            new_data[CONF_LOGIN_DATA][CONF_SITE] = new_data[CONF_SITE]
-            new_data.pop(CONF_SITE)
-            hass.config_entries.async_update_entry(
-                entry, data=new_data, version=1, minor_version=3
-            )
-            return True
-
-        if CONF_SITE in entry.data[CONF_LOGIN_DATA]:
-            # Site is there, just update version to avoid future migrations
-            hass.config_entries.async_update_entry(entry, version=1, minor_version=3)
-            return True
-
-        _LOGGER.debug(
-            "Migrating from version %s.%s", entry.version, entry.minor_version
-        )
-
-        # Convert country in domain
-        country = entry.data[CONF_COUNTRY].lower()
-        domain = COUNTRY_DOMAINS.get(country, country)
-
-        # Add site to login data
-        new_data = entry.data.copy()
-        new_data[CONF_LOGIN_DATA][CONF_SITE] = f"https://www.amazon.{domain}"
-
-        hass.config_entries.async_update_entry(
-            entry, data=new_data, version=1, minor_version=3
-        )
-
-        _LOGGER.info(
-            "Migration to version %s.%s successful", entry.version, entry.minor_version
-        )
-
-    return True
-
-
 async def async_unload_entry(hass: HomeAssistant, entry: AmazonConfigEntry) -> bool:
    """Unload a config entry."""
    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
--- a/homeassistant/components/alexa_devices/config_flow.py
+++ b/homeassistant/components/alexa_devices/config_flow.py
@@ -10,14 +10,16 @@ from aioamazondevices.exceptions import (
    CannotAuthenticate,
    CannotConnect,
    CannotRetrieveData,
+    WrongCountry,
 )
 import voluptuous as vol

 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_CODE, CONF_PASSWORD, CONF_USERNAME
+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

 from .const import CONF_LOGIN_DATA, DOMAIN

@@ -27,12 +29,6 @@ STEP_REAUTH_DATA_SCHEMA = vol.Schema(
        vol.Required(CONF_CODE): cv.string,
    }
 )
-STEP_RECONFIGURE = vol.Schema(
-    {
-        vol.Required(CONF_PASSWORD): cv.string,
-        vol.Required(CONF_CODE): cv.string,
-    }
-)


 async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> dict[str, Any]:
@@ -41,6 +37,7 @@ async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> dict[str,
    session = aiohttp_client.async_create_clientsession(hass)
    api = AmazonEchoApi(
        session,
+        data[CONF_COUNTRY],
        data[CONF_USERNAME],
        data[CONF_PASSWORD],
    )
@@ -51,9 +48,6 @@ async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> dict[str,
 class AmazonDevicesConfigFlow(ConfigFlow, domain=DOMAIN):
    """Handle a config flow for Alexa Devices."""

-    VERSION = 1
-    MINOR_VERSION = 3
-
    async def async_step_user(
        self, user_input: dict[str, Any] | None = None
    ) -> ConfigFlowResult:
@@ -64,10 +58,12 @@ class AmazonDevicesConfigFlow(ConfigFlow, domain=DOMAIN):
                data = await validate_input(self.hass, user_input)
            except CannotConnect:
                errors["base"] = "cannot_connect"
-            except (CannotAuthenticate, TypeError):
+            except CannotAuthenticate:
                errors["base"] = "invalid_auth"
            except CannotRetrieveData:
                errors["base"] = "cannot_retrieve_data"
+            except WrongCountry:
+                errors["base"] = "wrong_country"
            else:
                await self.async_set_unique_id(data["customer_info"]["user_id"])
                self._abort_if_unique_id_configured()
@@ -82,6 +78,9 @@ class AmazonDevicesConfigFlow(ConfigFlow, domain=DOMAIN):
            errors=errors,
            data_schema=vol.Schema(
                {
+                    vol.Required(
+                        CONF_COUNTRY, default=self.hass.config.country
+                    ): CountrySelector(),
                    vol.Required(CONF_USERNAME): cv.string,
                    vol.Required(CONF_PASSWORD): cv.string,
                    vol.Required(CONF_CODE): cv.string,
@@ -107,12 +106,10 @@ class AmazonDevicesConfigFlow(ConfigFlow, domain=DOMAIN):

        if user_input is not None:
            try:
-                data = await validate_input(
-                    self.hass, {**reauth_entry.data, **user_input}
-                )
+                await validate_input(self.hass, {**reauth_entry.data, **user_input})
            except CannotConnect:
                errors["base"] = "cannot_connect"
-            except (CannotAuthenticate, TypeError):
+            except CannotAuthenticate:
                errors["base"] = "invalid_auth"
            except CannotRetrieveData:
                errors["base"] = "cannot_retrieve_data"
@@ -121,9 +118,8 @@ class AmazonDevicesConfigFlow(ConfigFlow, domain=DOMAIN):
                    reauth_entry,
                    data={
                        CONF_USERNAME: entry_data[CONF_USERNAME],
-                        CONF_PASSWORD: user_input[CONF_PASSWORD],
+                        CONF_PASSWORD: entry_data[CONF_PASSWORD],
                        CONF_CODE: user_input[CONF_CODE],
-                        CONF_LOGIN_DATA: data,
                    },
                )

@@ -133,47 +129,3 @@ class AmazonDevicesConfigFlow(ConfigFlow, domain=DOMAIN):
            data_schema=STEP_REAUTH_DATA_SCHEMA,
            errors=errors,
        )
-
-    async def async_step_reconfigure(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle reconfiguration of the device."""
-        reconfigure_entry = self._get_reconfigure_entry()
-        if not user_input:
-            return self.async_show_form(
-                step_id="reconfigure",
-                data_schema=STEP_RECONFIGURE,
-            )
-
-        updated_password = user_input[CONF_PASSWORD]
-
-        self._async_abort_entries_match(
-            {CONF_USERNAME: reconfigure_entry.data[CONF_USERNAME]}
-        )
-
-        errors: dict[str, str] = {}
-
-        try:
-            data = await validate_input(
-                self.hass, {**reconfigure_entry.data, **user_input}
-            )
-        except CannotConnect:
-            errors["base"] = "cannot_connect"
-        except CannotAuthenticate:
-            errors["base"] = "invalid_auth"
-        except CannotRetrieveData:
-            errors["base"] = "cannot_retrieve_data"
-        else:
-            return self.async_update_reload_and_abort(
-                reconfigure_entry,
-                data_updates={
-                    CONF_PASSWORD: updated_password,
-                    CONF_LOGIN_DATA: data,
-                },
-            )
-
-        return self.async_show_form(
-            step_id="reconfigure",
-            data_schema=STEP_RECONFIGURE,
-            errors=errors,
-        )
--- a/homeassistant/components/alexa_devices/const.py
+++ b/homeassistant/components/alexa_devices/const.py
@@ -6,23 +6,3 @@ _LOGGER = logging.getLogger(__package__)

 DOMAIN = "alexa_devices"
 CONF_LOGIN_DATA = "login_data"
-CONF_SITE = "site"
-
-DEFAULT_DOMAIN = "com"
-COUNTRY_DOMAINS = {
-    "ar": DEFAULT_DOMAIN,
-    "at": DEFAULT_DOMAIN,
-    "au": "com.au",
-    "be": "com.be",
-    "br": DEFAULT_DOMAIN,
-    "gb": "co.uk",
-    "il": DEFAULT_DOMAIN,
-    "jp": "co.jp",
-    "mx": "com.mx",
-    "no": DEFAULT_DOMAIN,
-    "nz": "com.au",
-    "pl": DEFAULT_DOMAIN,
-    "tr": "com.tr",
-    "us": DEFAULT_DOMAIN,
-    "za": "co.za",
-}
--- a/homeassistant/components/alexa_devices/coordinator.py
+++ b/homeassistant/components/alexa_devices/coordinator.py
@@ -11,10 +11,9 @@ from aioamazondevices.exceptions import (
 from aiohttp import ClientSession

 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
+from homeassistant.const import CONF_COUNTRY, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
-from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed

 from .const import _LOGGER, CONF_LOGIN_DATA, DOMAIN
@@ -45,17 +44,17 @@ class AmazonDevicesCoordinator(DataUpdateCoordinator[dict[str, AmazonDevice]]):
        )
        self.api = AmazonEchoApi(
            session,
+            entry.data[CONF_COUNTRY],
            entry.data[CONF_USERNAME],
            entry.data[CONF_PASSWORD],
            entry.data[CONF_LOGIN_DATA],
        )
-        self.previous_devices: set[str] = set()

    async def _async_update_data(self) -> dict[str, AmazonDevice]:
        """Update device data."""
        try:
            await self.api.login_mode_stored_data()
-            data = await self.api.get_devices_data()
+            return await self.api.get_devices_data()
        except CannotConnect as err:
            raise UpdateFailed(
                translation_domain=DOMAIN,
@@ -68,37 +67,9 @@ class AmazonDevicesCoordinator(DataUpdateCoordinator[dict[str, AmazonDevice]]):
                translation_key="cannot_retrieve_data_with_error",
                translation_placeholders={"error": repr(err)},
            ) from err
-        except (CannotAuthenticate, TypeError) as err:
+        except CannotAuthenticate as err:
            raise ConfigEntryAuthFailed(
                translation_domain=DOMAIN,
                translation_key="invalid_auth",
                translation_placeholders={"error": repr(err)},
            ) from err
-        else:
-            current_devices = set(data.keys())
-            if stale_devices := self.previous_devices - current_devices:
-                await self._async_remove_device_stale(stale_devices)
-
-            self.previous_devices = current_devices
-            return data
-
-    async def _async_remove_device_stale(
-        self,
-        stale_devices: set[str],
-    ) -> None:
-        """Remove stale device."""
-        device_registry = dr.async_get(self.hass)
-
-        for serial_num in stale_devices:
-            _LOGGER.debug(
-                "Detected change in devices: serial %s removed",
-                serial_num,
-            )
-            device = device_registry.async_get_device(
-                identifiers={(DOMAIN, serial_num)}
-            )
-            if device:
-                device_registry.async_update_device(
-                    device_id=device.id,
-                    remove_config_entry_id=self.config_entry.entry_id,
-                )
--- a/homeassistant/components/alexa_devices/manifest.json
+++ b/homeassistant/components/alexa_devices/manifest.json
@@ -8,5 +8,5 @@
  "iot_class": "cloud_polling",
  "loggers": ["aioamazondevices"],
  "quality_scale": "silver",
-  "requirements": ["aioamazondevices==6.0.0"]
+  "requirements": ["aioamazondevices==4.0.0"]
 }
--- a/homeassistant/components/alexa_devices/quality_scale.yaml
+++ b/homeassistant/components/alexa_devices/quality_scale.yaml
@@ -60,11 +60,13 @@ rules:
  entity-translations: done
  exception-translations: done
  icon-translations: done
-  reconfiguration-flow: done
+  reconfiguration-flow: todo
  repair-issues:
    status: exempt
    comment: no known use cases for repair issues or flows, yet
-  stale-devices: done
+  stale-devices:
+    status: todo
+    comment: automate the cleanup process

  # Platinum
  async-dependency: done
--- a/homeassistant/components/alexa_devices/sensor.py
+++ b/homeassistant/components/alexa_devices/sensor.py
@@ -12,7 +12,6 @@ from homeassistant.components.sensor import (
    SensorDeviceClass,
    SensorEntity,
    SensorEntityDescription,
-    SensorStateClass,
 )
 from homeassistant.const import LIGHT_LUX, UnitOfTemperature
 from homeassistant.core import HomeAssistant
@@ -42,13 +41,11 @@ SENSORS: Final = (
            if device.sensors[_key].scale == "CELSIUS"
            else UnitOfTemperature.FAHRENHEIT
        ),
-        state_class=SensorStateClass.MEASUREMENT,
    ),
    AmazonSensorEntityDescription(
        key="illuminance",
        device_class=SensorDeviceClass.ILLUMINANCE,
        native_unit_of_measurement=LIGHT_LUX,
-        state_class=SensorStateClass.MEASUREMENT,
    ),
 )

--- a/homeassistant/components/alexa_devices/services.py
+++ b/homeassistant/components/alexa_devices/services.py
@@ -14,12 +14,14 @@ 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,
    },
 )
@@ -73,14 +75,17 @@ async def _async_execute_action(call: ServiceCall, attribute: str) -> None:
    coordinator = config_entry.runtime_data

    if attribute == ATTR_SOUND:
-        if value not in SOUNDS_LIST:
+        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},
+                translation_placeholders={"sound": value, "variant": str(variant)},
            )
        await coordinator.api.call_alexa_sound(
-            coordinator.data[device.serial_number], value
+            coordinator.data[device.serial_number], file
        )
    elif attribute == ATTR_TEXT_COMMAND:
        await coordinator.api.call_alexa_text_command(
--- a/homeassistant/components/alexa_devices/services.yaml
+++ b/homeassistant/components/alexa_devices/services.yaml
@@ -18,6 +18,14 @@ send_sound:
      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
@@ -25,45 +33,472 @@ send_sound:
      selector:
        select:
          options:
-            - air_horn_03
-            - amzn_sfx_cat_meow_1x_01
-            - amzn_sfx_church_bell_1x_02
-            - amzn_sfx_crowd_applause_01
-            - amzn_sfx_dog_med_bark_1x_02
-            - amzn_sfx_doorbell_01
-            - amzn_sfx_doorbell_chime_01
-            - amzn_sfx_doorbell_chime_02
-            - amzn_sfx_large_crowd_cheer_01
-            - amzn_sfx_lion_roar_02
-            - amzn_sfx_rooster_crow_01
-            - amzn_sfx_scifi_alarm_01
-            - amzn_sfx_scifi_alarm_04
-            - amzn_sfx_scifi_engines_on_02
-            - amzn_sfx_scifi_sheilds_up_01
-            - amzn_sfx_trumpet_bugle_04
-            - amzn_sfx_wolf_howl_02
-            - bell_02
-            - boing_01
-            - boing_03
-            - buzzers_pistols_01
-            - camera_01
-            - christmas_05
-            - clock_01
-            - futuristic_10
-            - halloween_bats
-            - halloween_crows
-            - halloween_footsteps
-            - halloween_wind
-            - halloween_wolf
-            - holiday_halloween_ghost
-            - horror_10
-            - med_system_alerts_minimal_dragon_short
-            - med_system_alerts_minimal_owl_short
-            - med_system_alerts_minimals_blue_wave_small
-            - med_system_alerts_minimals_galaxy_short
-            - med_system_alerts_minimals_panda_short
-            - med_system_alerts_minimals_tiger_short
-            - med_ui_success_generic_1-1
-            - squeaky_12
-            - zap_01
+            - 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
--- a/homeassistant/components/alexa_devices/strings.json
+++ b/homeassistant/components/alexa_devices/strings.json
@@ -1,6 +1,7 @@
 {
  "common": {
    "data_code": "One-time password (OTP code)",
+    "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.",
@@ -11,11 +12,13 @@
    "step": {
      "user": {
        "data": {
+          "country": "[%key:common::config_flow::data::country%]",
          "username": "[%key:common::config_flow::data::username%]",
          "password": "[%key:common::config_flow::data::password%]",
          "code": "[%key:component::alexa_devices::common::data_code%]"
        },
        "data_description": {
+          "country": "[%key:component::alexa_devices::common::data_description_country%]",
          "username": "[%key:component::alexa_devices::common::data_description_username%]",
          "password": "[%key:component::alexa_devices::common::data_description_password%]",
          "code": "[%key:component::alexa_devices::common::data_description_code%]"
@@ -30,16 +33,6 @@
          "password": "[%key:component::alexa_devices::common::data_description_password%]",
          "code": "[%key:component::alexa_devices::common::data_description_code%]"
        }
-      },
-      "reconfigure": {
-        "data": {
-          "password": "[%key:common::config_flow::data::password%]",
-          "code": "[%key:component::alexa_devices::common::data_code%]"
-        },
-        "data_description": {
-          "password": "[%key:component::alexa_devices::common::data_description_password%]",
-          "code": "[%key:component::alexa_devices::common::data_description_code%]"
-        }
      }
    },
    "abort": {
@@ -47,13 +40,13 @@
      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
-      "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]",
      "unknown": "[%key:common::config_flow::error::unknown%]"
    },
    "error": {
      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
      "cannot_retrieve_data": "Unable to retrieve data from Amazon. Please try again later.",
      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+      "wrong_country": "Wrong country selected. Please select the country where your Amazon account is registered.",
      "unknown": "[%key:common::config_flow::error::unknown%]"
    }
  },
@@ -104,6 +97,10 @@
        "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."
        }
      }
    },
@@ -125,47 +122,474 @@
  "selector": {
    "sound": {
      "options": {
-        "air_horn_03": "Air horn",
-        "amzn_sfx_cat_meow_1x_01": "Cat meow",
-        "amzn_sfx_church_bell_1x_02": "Church bell",
-        "amzn_sfx_crowd_applause_01": "Crowd applause",
-        "amzn_sfx_dog_med_bark_1x_02": "Dog bark",
-        "amzn_sfx_doorbell_01": "Doorbell 1",
-        "amzn_sfx_doorbell_chime_01": "Doorbell 2",
-        "amzn_sfx_doorbell_chime_02": "Doorbell 3",
-        "amzn_sfx_large_crowd_cheer_01": "Crowd cheers",
-        "amzn_sfx_lion_roar_02": "Lion roar",
-        "amzn_sfx_rooster_crow_01": "Rooster",
-        "amzn_sfx_scifi_alarm_01": "Sirens",
-        "amzn_sfx_scifi_alarm_04": "Red alert",
-        "amzn_sfx_scifi_engines_on_02": "Engines on",
-        "amzn_sfx_scifi_sheilds_up_01": "Shields up",
-        "amzn_sfx_trumpet_bugle_04": "Trumpet",
-        "amzn_sfx_wolf_howl_02": "Wolf howl",
-        "bell_02": "Bells",
-        "boing_01": "Boing 1",
-        "boing_03": "Boing 2",
-        "buzzers_pistols_01": "Buzzer",
-        "camera_01": "Camera",
-        "christmas_05": "Christmas bells",
-        "clock_01": "Ticking clock",
-        "futuristic_10": "Aircraft",
-        "halloween_bats": "Halloween bats",
-        "halloween_crows": "Halloween crows",
-        "halloween_footsteps": "Halloween spooky footsteps",
-        "halloween_wind": "Halloween wind",
-        "halloween_wolf": "Halloween wolf",
-        "holiday_halloween_ghost": "Halloween ghost",
-        "horror_10": "Halloween creepy door",
-        "med_system_alerts_minimal_dragon_short": "Friendly dragon",
-        "med_system_alerts_minimal_owl_short": "Happy owl",
-        "med_system_alerts_minimals_blue_wave_small": "Underwater World Sonata",
-        "med_system_alerts_minimals_galaxy_short": "Infinite Galaxy",
-        "med_system_alerts_minimals_panda_short": "Baby panda",
-        "med_system_alerts_minimals_tiger_short": "Playful tiger",
-        "med_ui_success_generic_1-1": "Success 1",
-        "squeaky_12": "Squeaky door",
-        "zap_01": "Zap"
+        "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"
      }
    }
  },
@@ -183,7 +607,7 @@
      "message": "Invalid device ID specified: {device_id}"
    },
    "invalid_sound_value": {
-      "message": "Invalid sound {sound} specified"
+      "message": "Invalid sound {sound} with variant {variant} specified"
    },
    "entry_not_loaded": {
      "message": "Entry not loaded: {entry}"
--- a/homeassistant/components/amberelectric/config_flow.py
+++ b/homeassistant/components/amberelectric/config_flow.py
@@ -16,7 +16,7 @@ from homeassistant.helpers.selector import (
    SelectSelectorMode,
 )

-from .const import CONF_SITE_ID, CONF_SITE_NAME, DOMAIN, REQUEST_TIMEOUT
+from .const import CONF_SITE_ID, CONF_SITE_NAME, DOMAIN

 API_URL = "https://app.amber.com.au/developers"

@@ -64,9 +64,7 @@ class AmberElectricConfigFlow(ConfigFlow, domain=DOMAIN):
        api = amberelectric.AmberApi(api_client)

        try:
-            sites: list[Site] = filter_sites(
-                api.get_sites(_request_timeout=REQUEST_TIMEOUT)
-            )
+            sites: list[Site] = filter_sites(api.get_sites())
        except amberelectric.ApiException as api_exception:
            if api_exception.status == 403:
                self._errors[CONF_API_TOKEN] = "invalid_api_token"
--- a/homeassistant/components/amberelectric/const.py
+++ b/homeassistant/components/amberelectric/const.py
@@ -21,5 +21,3 @@ SERVICE_GET_FORECASTS = "get_forecasts"
 GENERAL_CHANNEL = "general"
 CONTROLLED_LOAD_CHANNEL = "controlled_load"
 FEED_IN_CHANNEL = "feed_in"
-
-REQUEST_TIMEOUT = 15
--- a/homeassistant/components/amberelectric/coordinator.py
+++ b/homeassistant/components/amberelectric/coordinator.py
@@ -16,7 +16,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed

-from .const import LOGGER, REQUEST_TIMEOUT
+from .const import LOGGER
 from .helpers import normalize_descriptor

 type AmberConfigEntry = ConfigEntry[AmberUpdateCoordinator]
@@ -82,11 +82,7 @@ class AmberUpdateCoordinator(DataUpdateCoordinator):
            "grid": {},
        }
        try:
-            data = self._api.get_current_prices(
-                self.site_id,
-                next=288,
-                _request_timeout=REQUEST_TIMEOUT,
-            )
+            data = self._api.get_current_prices(self.site_id, next=288)
            intervals = [interval.actual_instance for interval in data]
        except ApiException as api_exception:
            raise UpdateFailed("Missing price data, skipping update") from api_exception
--- a/homeassistant/components/analytics/analytics.py
+++ b/homeassistant/components/analytics/analytics.py
@@ -24,12 +24,7 @@ from homeassistant.components.recorder import (
    get_instance as get_recorder_instance,
 )
 from homeassistant.config_entries import SOURCE_IGNORE
-from homeassistant.const import (
-    ATTR_ASSUMED_STATE,
-    ATTR_DOMAIN,
-    BASE_PLATFORMS,
-    __version__ as HA_VERSION,
-)
+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
@@ -394,117 +389,65 @@ def _domains_from_yaml_config(yaml_configuration: dict[str, Any]) -> set[str]:


 async def async_devices_payload(hass: HomeAssistant) -> dict:
-    """Return detailed information about entities and devices."""
-    integrations_info: dict[str, dict[str, Any]] = {}
-
+    """Return the devices payload."""
+    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] = {}

-    # We need to refer to other devices, for example in `via_device` field.
-    # We don't however send the original device ids outside of Home Assistant,
-    # instead we refer to devices by (integration_domain, index_in_integration_device_list).
-    device_id_mapping: dict[str, tuple[str, int]] = {}
+    seen_integrations = set()

-    for device_entry in dev_reg.devices.values():
-        if not device_entry.primary_config_entry:
+    for device in dev_reg.devices.values():
+        if not device.primary_config_entry:
            continue

-        config_entry = hass.config_entries.async_get_entry(
-            device_entry.primary_config_entry
-        )
+        config_entry = hass.config_entries.async_get_entry(device.primary_config_entry)

        if config_entry is None:
            continue

-        integration_domain = config_entry.domain
-        integration_info = integrations_info.setdefault(
-            integration_domain, {"devices": [], "entities": []}
-        )
+        seen_integrations.add(config_entry.domain)

-        devices_info = integration_info["devices"]
-
-        device_id_mapping[device_entry.id] = (integration_domain, len(devices_info))
-
-        devices_info.append(
+        new_indexes[device.id] = len(devices)
+        devices.append(
            {
-                "entities": [],
-                "entry_type": device_entry.entry_type,
-                "has_configuration_url": device_entry.configuration_url is not None,
-                "hw_version": device_entry.hw_version,
-                "manufacturer": device_entry.manufacturer,
-                "model": device_entry.model,
-                "model_id": device_entry.model_id,
-                "sw_version": device_entry.sw_version,
-                "via_device": device_entry.via_device_id,
+                "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_configuration_url": device.configuration_url is not None,
+                "via_device": None,
+                "entry_type": device.entry_type.value if device.entry_type else None,
            }
        )

-    # Fill out via_device with new device ids
-    for integration_info in integrations_info.values():
-        for device_info in integration_info["devices"]:
-            if device_info["via_device"] is None:
-                continue
-            device_info["via_device"] = device_id_mapping.get(device_info["via_device"])
+        if device.via_device_id:
+            via_devices[device.id] = device.via_device_id

-    ent_reg = er.async_get(hass)
-
-    for entity_entry in ent_reg.entities.values():
-        integration_domain = entity_entry.platform
-        integration_info = integrations_info.setdefault(
-            integration_domain, {"devices": [], "entities": []}
-        )
-
-        devices_info = integration_info["devices"]
-        entities_info = integration_info["entities"]
-
-        entity_state = hass.states.get(entity_entry.entity_id)
-
-        entity_info = {
-            # LIMITATION: `assumed_state` can be overridden by users;
-            # we should replace it with the original value in the future.
-            # It is also not present, if entity is not in the state machine,
-            # which can happen for disabled entities.
-            "assumed_state": entity_state.attributes.get(ATTR_ASSUMED_STATE, False)
-            if entity_state is not None
-            else None,
-            "capabilities": entity_entry.capabilities,
-            "domain": entity_entry.domain,
-            "entity_category": entity_entry.entity_category,
-            "has_entity_name": entity_entry.has_entity_name,
-            "original_device_class": entity_entry.original_device_class,
-            # LIMITATION: `unit_of_measurement` can be overridden by users;
-            # we should replace it with the original value in the future.
-            "unit_of_measurement": entity_entry.unit_of_measurement,
-        }
-
-        if (
-            ((device_id := entity_entry.device_id) is not None)
-            and ((new_device_id := device_id_mapping.get(device_id)) is not None)
-            and (new_device_id[0] == integration_domain)
-        ):
-            device_info = devices_info[new_device_id[1]]
-            device_info["entities"].append(entity_info)
-        else:
-            entities_info.append(entity_info)
+    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, integrations_info.keys())
+            await async_get_integrations(hass, seen_integrations)
        ).items()
        if isinstance(integration, Integration)
    }

-    for domain, integration_info in integrations_info.items():
-        if integration := integrations.get(domain):
-            integration_info["is_custom_integration"] = not integration.is_built_in
+    for device_info in devices:
+        if integration := integrations.get(device_info["integration"]):
+            device_info["is_custom_integration"] = not integration.is_built_in
            # Include version for custom integrations
            if not integration.is_built_in and integration.version:
-                integration_info["custom_integration_version"] = str(
-                    integration.version
-                )
+                device_info["custom_integration_version"] = str(integration.version)

    return {
        "version": "home-assistant:1",
-        "home_assistant": HA_VERSION,
-        "integrations": integrations_info,
+        "devices": devices,
    }
--- a/homeassistant/components/androidtv/init.py
+++ b/homeassistant/components/androidtv/init.py
@@ -33,11 +33,9 @@ from homeassistant.const import (
 )
 from homeassistant.core import Event, HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
-from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.device_registry import format_mac
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.storage import STORAGE_DIR
-from homeassistant.helpers.typing import ConfigType

 from .const import (
    CONF_ADB_SERVER_IP,
@@ -48,12 +46,10 @@ from .const import (
    DEFAULT_ADB_SERVER_PORT,
    DEVICE_ANDROIDTV,
    DEVICE_FIRETV,
-    DOMAIN,
    PROP_ETHMAC,
    PROP_WIFIMAC,
    SIGNAL_CONFIG_ENTITY,
 )
-from .services import async_setup_services

 ADB_PYTHON_EXCEPTIONS: tuple = (
    AdbTimeoutError,
@@ -67,8 +63,6 @@ ADB_PYTHON_EXCEPTIONS: tuple = (
 )
 ADB_TCP_EXCEPTIONS: tuple = (ConnectionResetError, RuntimeError)

-CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
-
 PLATFORMS = [Platform.MEDIA_PLAYER, Platform.REMOTE]
 RELOAD_OPTIONS = [CONF_STATE_DETECTION_RULES]

@@ -194,12 +188,6 @@ async def async_migrate_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
    return True


-async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the Android TV / Fire TV integration."""
-    async_setup_services(hass)
-    return True
-
-
 async def async_setup_entry(hass: HomeAssistant, entry: AndroidTVConfigEntry) -> bool:
    """Set up Android Debug Bridge platform."""

--- a/homeassistant/components/androidtv/media_player.py
+++ b/homeassistant/components/androidtv/media_player.py
@@ -8,6 +8,7 @@ import logging

 from androidtv.constants import APPS, KEYS
 from androidtv.setup_async import AndroidTVAsync, FireTVAsync
+import voluptuous as vol

 from homeassistant.components import persistent_notification
 from homeassistant.components.media_player import (
@@ -16,7 +17,9 @@ from homeassistant.components.media_player import (
    MediaPlayerEntityFeature,
    MediaPlayerState,
 )
+from homeassistant.const import ATTR_COMMAND
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv, entity_platform
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.dt import utcnow
@@ -36,10 +39,19 @@ from .const import (
    SIGNAL_CONFIG_ENTITY,
 )
 from .entity import AndroidTVEntity, adb_decorator
-from .services import ATTR_ADB_RESPONSE, ATTR_HDMI_INPUT, SERVICE_LEARN_SENDEVENT

 _LOGGER = logging.getLogger(__name__)

+ATTR_ADB_RESPONSE = "adb_response"
+ATTR_DEVICE_PATH = "device_path"
+ATTR_HDMI_INPUT = "hdmi_input"
+ATTR_LOCAL_PATH = "local_path"
+
+SERVICE_ADB_COMMAND = "adb_command"
+SERVICE_DOWNLOAD = "download"
+SERVICE_LEARN_SENDEVENT = "learn_sendevent"
+SERVICE_UPLOAD = "upload"
+
 # Translate from `AndroidTV` / `FireTV` reported state to HA state.
 ANDROIDTV_STATES = {
    "off": MediaPlayerState.OFF,
@@ -65,6 +77,32 @@ async def async_setup_entry(
        ]
    )

+    platform = entity_platform.async_get_current_platform()
+    platform.async_register_entity_service(
+        SERVICE_ADB_COMMAND,
+        {vol.Required(ATTR_COMMAND): cv.string},
+        "adb_command",
+    )
+    platform.async_register_entity_service(
+        SERVICE_LEARN_SENDEVENT, None, "learn_sendevent"
+    )
+    platform.async_register_entity_service(
+        SERVICE_DOWNLOAD,
+        {
+            vol.Required(ATTR_DEVICE_PATH): cv.string,
+            vol.Required(ATTR_LOCAL_PATH): cv.string,
+        },
+        "service_download",
+    )
+    platform.async_register_entity_service(
+        SERVICE_UPLOAD,
+        {
+            vol.Required(ATTR_DEVICE_PATH): cv.string,
+            vol.Required(ATTR_LOCAL_PATH): cv.string,
+        },
+        "service_upload",
+    )
+

 class ADBDevice(AndroidTVEntity, MediaPlayerEntity):
    """Representation of an Android or Fire TV device."""
--- a/homeassistant/components/androidtv/services.py
+++ b/homeassistant/components/androidtv/services.py
@@ -1,66 +0,0 @@
-"""Services for Android/Fire TV devices."""
-
-from __future__ import annotations
-
-import voluptuous as vol
-
-from homeassistant.components.media_player import DOMAIN as MEDIA_PLAYER_DOMAIN
-from homeassistant.const import ATTR_COMMAND
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers import config_validation as cv, service
-
-from .const import DOMAIN
-
-ATTR_ADB_RESPONSE = "adb_response"
-ATTR_DEVICE_PATH = "device_path"
-ATTR_HDMI_INPUT = "hdmi_input"
-ATTR_LOCAL_PATH = "local_path"
-
-SERVICE_ADB_COMMAND = "adb_command"
-SERVICE_DOWNLOAD = "download"
-SERVICE_LEARN_SENDEVENT = "learn_sendevent"
-SERVICE_UPLOAD = "upload"
-
-
-@callback
-def async_setup_services(hass: HomeAssistant) -> None:
-    """Register the Android TV / Fire TV services."""
-
-    service.async_register_platform_entity_service(
-        hass,
-        DOMAIN,
-        SERVICE_ADB_COMMAND,
-        entity_domain=MEDIA_PLAYER_DOMAIN,
-        schema={vol.Required(ATTR_COMMAND): cv.string},
-        func="adb_command",
-    )
-    service.async_register_platform_entity_service(
-        hass,
-        DOMAIN,
-        SERVICE_LEARN_SENDEVENT,
-        entity_domain=MEDIA_PLAYER_DOMAIN,
-        schema=None,
-        func="learn_sendevent",
-    )
-    service.async_register_platform_entity_service(
-        hass,
-        DOMAIN,
-        SERVICE_DOWNLOAD,
-        entity_domain=MEDIA_PLAYER_DOMAIN,
-        schema={
-            vol.Required(ATTR_DEVICE_PATH): cv.string,
-            vol.Required(ATTR_LOCAL_PATH): cv.string,
-        },
-        func="service_download",
-    )
-    service.async_register_platform_entity_service(
-        hass,
-        DOMAIN,
-        SERVICE_UPLOAD,
-        entity_domain=MEDIA_PLAYER_DOMAIN,
-        schema={
-            vol.Required(ATTR_DEVICE_PATH): cv.string,
-            vol.Required(ATTR_LOCAL_PATH): cv.string,
-        },
-        func="service_upload",
-    )
--- a/homeassistant/components/androidtv_remote/config_flow.py
+++ b/homeassistant/components/androidtv_remote/config_flow.py
@@ -37,7 +37,7 @@ from .helpers import AndroidTVRemoteConfigEntry, create_api, get_enable_ime

 _LOGGER = logging.getLogger(__name__)

-APPS_NEW_ID = "add_new"
+APPS_NEW_ID = "NewApp"
 CONF_APP_DELETE = "app_delete"
 CONF_APP_ID = "app_id"

@@ -66,14 +66,9 @@ class AndroidTVRemoteConfigFlow(ConfigFlow, domain=DOMAIN):
        if user_input is not None:
            self.host = user_input[CONF_HOST]
            api = create_api(self.hass, self.host, enable_ime=False)
-            await api.async_generate_cert_if_missing()
            try:
+                await api.async_generate_cert_if_missing()
                self.name, self.mac = await api.async_get_name_and_mac()
-            except CannotConnect:
-                # Likely invalid IP address or device is network unreachable. Stay
-                # in the user step allowing the user to enter a different host.
-                errors["base"] = "cannot_connect"
-            else:
                await self.async_set_unique_id(format_mac(self.mac))
                if self.source == SOURCE_RECONFIGURE:
                    self._abort_if_unique_id_mismatch()
@@ -86,10 +81,11 @@ class AndroidTVRemoteConfigFlow(ConfigFlow, domain=DOMAIN):
                        },
                    )
                self._abort_if_unique_id_configured(updates={CONF_HOST: self.host})
-                try:
-                    return await self._async_start_pair()
-                except (CannotConnect, ConnectionClosed):
-                    errors["base"] = "cannot_connect"
+                return await self._async_start_pair()
+            except (CannotConnect, ConnectionClosed):
+                # Likely invalid IP address or device is network unreachable. Stay
+                # in the user step allowing the user to enter a different host.
+                errors["base"] = "cannot_connect"
        else:
            user_input = {}
        default_host = user_input.get(CONF_HOST, vol.UNDEFINED)
@@ -116,9 +112,22 @@ class AndroidTVRemoteConfigFlow(ConfigFlow, domain=DOMAIN):
        """Handle the pair step."""
        errors: dict[str, str] = {}
        if user_input is not None:
-            pin = user_input["pin"]
            try:
+                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
+                    )
+
+                return self.async_create_entry(
+                    title=self.name,
+                    data={
+                        CONF_HOST: self.host,
+                        CONF_NAME: self.name,
+                        CONF_MAC: self.mac,
+                    },
+                )
            except InvalidAuth:
                # Invalid PIN. Stay in the pair step allowing the user to enter
                # a different PIN.
@@ -136,20 +145,6 @@ class AndroidTVRemoteConfigFlow(ConfigFlow, domain=DOMAIN):
                    # them to enter a new IP address but we cannot do that for the zeroconf
                    # flow. Simpler to abort for both flows.
                    return self.async_abort(reason="cannot_connect")
-            else:
-                if self.source == SOURCE_REAUTH:
-                    return self.async_update_reload_and_abort(
-                        self._get_reauth_entry(), reload_even_if_entry_is_unchanged=True
-                    )
-
-                return self.async_create_entry(
-                    title=self.name,
-                    data={
-                        CONF_HOST: self.host,
-                        CONF_NAME: self.name,
-                        CONF_MAC: self.mac,
-                    },
-                )
        return self.async_show_form(
            step_id="pair",
            data_schema=STEP_PAIR_DATA_SCHEMA,
@@ -287,9 +282,7 @@ class AndroidTVRemoteOptionsFlowHandler(OptionsFlowWithReload):
                {
                    vol.Optional(CONF_APPS): SelectSelector(
                        SelectSelectorConfig(
-                            options=apps,
-                            mode=SelectSelectorMode.DROPDOWN,
-                            translation_key="apps",
+                            options=apps, mode=SelectSelectorMode.DROPDOWN
                        )
                    ),
                    vol.Required(
--- a/homeassistant/components/androidtv_remote/entity.py
+++ b/homeassistant/components/androidtv_remote/entity.py
@@ -6,7 +6,7 @@ from typing import Any

 from androidtvremote2 import AndroidTVRemote, ConnectionClosed

-from homeassistant.const import CONF_MAC, CONF_NAME
+from homeassistant.const import CONF_HOST, CONF_MAC, CONF_NAME
 from homeassistant.core import callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC, DeviceInfo
@@ -28,6 +28,8 @@ class AndroidTVRemoteBaseEntity(Entity):
    ) -> None:
        """Initialize the entity."""
        self._api = api
+        self._host = config_entry.data[CONF_HOST]
+        self._name = config_entry.data[CONF_NAME]
        self._apps: dict[str, Any] = config_entry.options.get(CONF_APPS, {})
        self._attr_unique_id = config_entry.unique_id
        self._attr_is_on = api.is_on
@@ -37,7 +39,7 @@ class AndroidTVRemoteBaseEntity(Entity):
        self._attr_device_info = DeviceInfo(
            connections={(CONNECTION_NETWORK_MAC, config_entry.data[CONF_MAC])},
            identifiers={(DOMAIN, config_entry.unique_id)},
-            name=config_entry.data[CONF_NAME],
+            name=self._name,
            manufacturer=device_info["manufacturer"],
            model=device_info["model"],
        )
--- a/homeassistant/components/androidtv_remote/manifest.json
+++ b/homeassistant/components/androidtv_remote/manifest.json
@@ -7,7 +7,6 @@
  "integration_type": "device",
  "iot_class": "local_push",
  "loggers": ["androidtvremote2"],
-  "quality_scale": "platinum",
  "requirements": ["androidtvremote2==0.2.3"],
  "zeroconf": ["_androidtvremote2._tcp.local."]
 }
--- a/homeassistant/components/androidtv_remote/media_player.py
+++ b/homeassistant/components/androidtv_remote/media_player.py
@@ -175,11 +175,7 @@ class AndroidTVRemoteMediaPlayerEntity(AndroidTVRemoteBaseEntity, MediaPlayerEnt
        """Play a piece of media."""
        if media_type == MediaType.CHANNEL:
            if not media_id.isnumeric():
-                raise HomeAssistantError(
-                    translation_domain=DOMAIN,
-                    translation_key="invalid_channel",
-                    translation_placeholders={"media_id": media_id},
-                )
+                raise ValueError(f"Channel must be numeric: {media_id}")
            if self._channel_set_task:
                self._channel_set_task.cancel()
            self._channel_set_task = asyncio.create_task(
@@ -192,11 +188,7 @@ class AndroidTVRemoteMediaPlayerEntity(AndroidTVRemoteBaseEntity, MediaPlayerEnt
            self._send_launch_app_command(media_id)
            return

-        raise HomeAssistantError(
-            translation_domain=DOMAIN,
-            translation_key="invalid_media_type",
-            translation_placeholders={"media_type": media_type},
-        )
+        raise ValueError(f"Invalid media type: {media_type}")

    async def async_browse_media(
        self,
--- a/homeassistant/components/androidtv_remote/quality_scale.yaml
+++ b/homeassistant/components/androidtv_remote/quality_scale.yaml
@@ -1,78 +0,0 @@
-rules:
-  # Bronze
-  action-setup:
-    status: exempt
-    comment: No integration-specific service actions are defined.
-  appropriate-polling:
-    status: exempt
-    comment: This is a push-based integration.
-  brands: done
-  common-modules: done
-  config-flow-test-coverage: done
-  config-flow: done
-  dependency-transparency: done
-  docs-actions: done
-  docs-high-level-description: done
-  docs-installation-instructions: done
-  docs-removal-instructions: done
-  entity-event-setup: done
-  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: done
-  config-entry-unloading: done
-  docs-configuration-parameters: done
-  docs-installation-parameters: done
-  entity-unavailable: done
-  integration-owner: done
-  log-when-unavailable: done
-  parallel-updates: done
-  reauthentication-flow: done
-  test-coverage: done
-
-  # 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
-  dynamic-devices:
-    status: exempt
-    comment: The integration is configured on a per-device basis, so there are no dynamic devices to add.
-  entity-category:
-    status: exempt
-    comment: All entities are primary and do not require a specific category.
-  entity-device-class: done
-  entity-disabled-by-default:
-    status: exempt
-    comment: The integration provides only primary entities that should be enabled.
-  entity-translations: done
-  exception-translations: done
-  icon-translations:
-    status: exempt
-    comment: Icons are provided by the entity's device class, and no state-based icons are needed.
-  reconfiguration-flow: done
-  repair-issues:
-    status: exempt
-    comment: The integration uses the reauth flow for authentication issues, and no other repairable issues have been identified.
-  stale-devices:
-    status: exempt
-    comment: The integration manages a single device per config entry. Stale device removal is handled by removing the config entry.
-
-  # Platinum
-  async-dependency: done
-  inject-websession:
-    status: exempt
-    comment: The underlying library does not use HTTP for communication.
-  strict-typing: done
--- a/homeassistant/components/androidtv_remote/strings.json
+++ b/homeassistant/components/androidtv_remote/strings.json
@@ -22,7 +22,7 @@
      },
      "zeroconf_confirm": {
        "title": "Discovered Android TV",
-        "description": "Do you want to add the Android TV ({name}) to Home Assistant? It will turn on and a pairing code will be displayed on it that you will need to enter in the next screen."
+        "description": "Do you want to add the Android TV ({name}) to Home Assistant?  It will turn on and a pairing code will be displayed on it that you will need to enter in the next screen."
      },
      "pair": {
        "description": "Enter the pairing code displayed on the Android TV ({name}).",
@@ -85,19 +85,6 @@
  "exceptions": {
    "connection_closed": {
      "message": "Connection to the Android TV device is closed"
-    },
-    "invalid_channel": {
-      "message": "Channel must be numeric: {media_id}"
-    },
-    "invalid_media_type": {
-      "message": "Invalid media type: {media_type}"
-    }
-  },
-  "selector": {
-    "apps": {
-      "options": {
-        "add_new": "Add new"
-      }
    }
  }
 }
--- a/homeassistant/components/anthropic/init.py
+++ b/homeassistant/components/anthropic/init.py
@@ -129,9 +129,9 @@ async def async_migrate_integration(hass: HomeAssistant) -> None:
                entity_disabled_by is er.RegistryEntryDisabler.CONFIG_ENTRY
                and not all_disabled
            ):
-                # Device and entity registries will set the disabled_by flag to None
-                # when moving a device or entity disabled by CONFIG_ENTRY to an enabled
-                # config entry, but we want to set it to DEVICE or USER instead,
+                # Device and entity registries don't update the disabled_by flag
+                # when moving a device or entity from one config entry to another,
+                # so we need to do it manually.
                entity_disabled_by = (
                    er.RegistryEntryDisabler.DEVICE
                    if device
@@ -146,9 +146,9 @@ async def async_migrate_integration(hass: HomeAssistant) -> None:
            )

        if device is not None:
-            # Device and entity registries will set the disabled_by flag to None
-            # when moving a device or entity disabled by CONFIG_ENTRY to an enabled
-            # config entry, but we want to set it to USER instead,
+            # Device and entity registries don't update the disabled_by flag when
+            # moving a device or entity from one config entry to another, so we
+            # need to do it manually.
            device_disabled_by = device.disabled_by
            if (
                device.disabled_by is dr.DeviceEntryDisabler.CONFIG_ENTRY
--- a/homeassistant/components/aosmith/init.py
+++ b/homeassistant/components/aosmith/init.py
@@ -16,7 +16,7 @@ from .coordinator import (
    AOSmithStatusCoordinator,
 )

-PLATFORMS: list[Platform] = [Platform.SELECT, Platform.SENSOR, Platform.WATER_HEATER]
+PLATFORMS: list[Platform] = [Platform.SENSOR, Platform.WATER_HEATER]


 async def async_setup_entry(hass: HomeAssistant, entry: AOSmithConfigEntry) -> bool:
--- a/homeassistant/components/aosmith/icons.json
+++ b/homeassistant/components/aosmith/icons.json
@@ -1,10 +1,5 @@
 {
  "entity": {
-    "select": {
-      "hot_water_plus_level": {
-        "default": "mdi:water-plus"
-      }
-    },
    "sensor": {
      "hot_water_availability": {
        "default": "mdi:water-thermometer"
--- a/homeassistant/components/aosmith/manifest.json
+++ b/homeassistant/components/aosmith/manifest.json
@@ -5,5 +5,5 @@
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/aosmith",
  "iot_class": "cloud_polling",
-  "requirements": ["py-aosmith==1.0.14"]
+  "requirements": ["py-aosmith==1.0.12"]
 }
--- a/homeassistant/components/aosmith/select.py
+++ b/homeassistant/components/aosmith/select.py
@@ -1,70 +0,0 @@
-"""The select platform for the A. O. Smith integration."""
-
-from homeassistant.components.select import SelectEntity
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-
-from . import AOSmithConfigEntry
-from .coordinator import AOSmithStatusCoordinator
-from .entity import AOSmithStatusEntity
-
-HWP_LEVEL_HA_TO_AOSMITH = {
-    "off": 0,
-    "level1": 1,
-    "level2": 2,
-    "level3": 3,
-}
-HWP_LEVEL_AOSMITH_TO_HA = {value: key for key, value in HWP_LEVEL_HA_TO_AOSMITH.items()}
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: AOSmithConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up A. O. Smith select platform."""
-    data = entry.runtime_data
-
-    async_add_entities(
-        AOSmithHotWaterPlusSelectEntity(data.status_coordinator, device.junction_id)
-        for device in data.status_coordinator.data.values()
-        if device.supports_hot_water_plus
-    )
-
-
-class AOSmithHotWaterPlusSelectEntity(AOSmithStatusEntity, SelectEntity):
-    """Class for the Hot Water+ select entity."""
-
-    _attr_translation_key = "hot_water_plus_level"
-    _attr_options = list(HWP_LEVEL_HA_TO_AOSMITH)
-
-    def __init__(self, coordinator: AOSmithStatusCoordinator, junction_id: str) -> None:
-        """Initialize the entity."""
-        super().__init__(coordinator, junction_id)
-        self._attr_unique_id = f"hot_water_plus_level_{junction_id}"
-
-    @property
-    def suggested_object_id(self) -> str | None:
-        """Override the suggested object id to make '+' get converted to 'plus' in the entity id."""
-        return "hot_water_plus_level"
-
-    @property
-    def current_option(self) -> str | None:
-        """Return the current Hot Water+ mode."""
-        hot_water_plus_level = self.device.status.hot_water_plus_level
-        return (
-            None
-            if hot_water_plus_level is None
-            else HWP_LEVEL_AOSMITH_TO_HA.get(hot_water_plus_level)
-        )
-
-    async def async_select_option(self, option: str) -> None:
-        """Set the Hot Water+ mode."""
-        aosmith_hwp_level = HWP_LEVEL_HA_TO_AOSMITH[option]
-        await self.client.update_mode(
-            junction_id=self.junction_id,
-            mode=self.device.status.current_mode,
-            hot_water_plus_level=aosmith_hwp_level,
-        )
-
-        await self.coordinator.async_request_refresh()
--- a/homeassistant/components/aosmith/strings.json
+++ b/homeassistant/components/aosmith/strings.json
@@ -26,17 +26,6 @@
    }
  },
  "entity": {
-    "select": {
-      "hot_water_plus_level": {
-        "name": "Hot Water+ level",
-        "state": {
-          "off": "[%key:common::state::off%]",
-          "level1": "Level 1",
-          "level2": "Level 2",
-          "level3": "Level 3"
-        }
-      }
-    },
    "sensor": {
      "hot_water_availability": {
        "name": "Hot water availability"
--- a/homeassistant/components/apcupsd/init.py
+++ b/homeassistant/components/apcupsd/init.py
@@ -9,7 +9,7 @@ from homeassistant.core import HomeAssistant

 from .coordinator import APCUPSdConfigEntry, APCUPSdCoordinator

-PLATFORMS: Final = [Platform.BINARY_SENSOR, Platform.SENSOR]
+PLATFORMS: Final = (Platform.BINARY_SENSOR, Platform.SENSOR)


 async def async_setup_entry(
--- a/homeassistant/components/apcupsd/binary_sensor.py
+++ b/homeassistant/components/apcupsd/binary_sensor.py
@@ -10,9 +10,9 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.helpers.update_coordinator import CoordinatorEntity

 from .coordinator import APCUPSdConfigEntry, APCUPSdCoordinator
-from .entity import APCUPSdEntity

 PARALLEL_UPDATES = 0

@@ -40,16 +40,22 @@ async def async_setup_entry(
    async_add_entities([OnlineStatus(coordinator, _DESCRIPTION)])


-class OnlineStatus(APCUPSdEntity, BinarySensorEntity):
+class OnlineStatus(CoordinatorEntity[APCUPSdCoordinator], BinarySensorEntity):
    """Representation of a UPS online status."""

+    _attr_has_entity_name = True
+
    def __init__(
        self,
        coordinator: APCUPSdCoordinator,
        description: BinarySensorEntityDescription,
    ) -> None:
        """Initialize the APCUPSd binary device."""
-        super().__init__(coordinator, description)
+        super().__init__(coordinator, context=description.key.upper())
+
+        self.entity_description = description
+        self._attr_unique_id = f"{coordinator.unique_device_id}_{description.key}"
+        self._attr_device_info = coordinator.device_info

    @property
    def is_on(self) -> bool | None:
--- a/homeassistant/components/apcupsd/coordinator.py
+++ b/homeassistant/components/apcupsd/coordinator.py
@@ -100,7 +100,6 @@ class APCUPSdCoordinator(DataUpdateCoordinator[APCUPSdData]):
            name=self.data.name or "APC UPS",
            hw_version=self.data.get("FIRMWARE"),
            sw_version=self.data.get("VERSION"),
-            serial_number=self.data.serial_no,
        )

    async def _async_update_data(self) -> APCUPSdData:
--- a/homeassistant/components/apcupsd/entity.py
+++ b/homeassistant/components/apcupsd/entity.py
@@ -1,26 +0,0 @@
-"""Base entity for APCUPSd integration."""
-
-from __future__ import annotations
-
-from homeassistant.helpers.entity import EntityDescription
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
-
-from .coordinator import APCUPSdCoordinator
-
-
-class APCUPSdEntity(CoordinatorEntity[APCUPSdCoordinator]):
-    """Base entity for APCUPSd integration."""
-
-    _attr_has_entity_name = True
-
-    def __init__(
-        self,
-        coordinator: APCUPSdCoordinator,
-        description: EntityDescription,
-    ) -> None:
-        """Initialize the APCUPSd entity."""
-        super().__init__(coordinator, context=description.key.upper())
-
-        self.entity_description = description
-        self._attr_unique_id = f"{coordinator.unique_device_id}_{description.key}"
-        self._attr_device_info = coordinator.device_info
--- a/homeassistant/components/apcupsd/manifest.json
+++ b/homeassistant/components/apcupsd/manifest.json
@@ -6,6 +6,6 @@
  "documentation": "https://www.home-assistant.io/integrations/apcupsd",
  "iot_class": "local_polling",
  "loggers": ["apcaccess"],
-  "quality_scale": "platinum",
-  "requirements": ["aioapcaccess==1.0.0"]
+  "quality_scale": "bronze",
+  "requirements": ["aioapcaccess==0.4.2"]
 }
--- a/Show More
+++ b/Show More