2025.12.2 (#158274)

Co-authored-by: Norbert Rittel <norbert@rittel.de>

.core_files.yaml

@@ -13,7 +13,6 @@ core: &core
 
 # Our base platforms, that are used by other integrations
 base_platforms: &base_platforms
-  - homeassistant/components/ai_task/**
   - homeassistant/components/air_quality/**
   - homeassistant/components/alarm_control_panel/**
   - homeassistant/components/assist_satellite/**

.devcontainer/devcontainer.json

@@ -27,6 +27,7 @@
         "charliermarsh.ruff",
         "ms-python.pylint",
         "ms-python.vscode-pylance",
+        "visualstudioexptteam.vscodeintellicode",
         "redhat.vscode-yaml",
         "esbenp.prettier-vscode",
         "GitHub.vscode-pull-request-github",

.github/workflows/builder.yml

@@ -30,7 +30,7 @@ jobs:
       architectures: ${{ env.ARCHITECTURES }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
@@ -96,7 +96,7 @@ jobs:
             os: ubuntu-24.04-arm
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Download nightly wheels of frontend
         if: needs.init.outputs.channel == 'dev'
@@ -190,8 +190,7 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - &install_cosign
-        name: Install Cosign
+      - name: Install Cosign
         uses: sigstore/cosign-installer@faadad0cce49287aee09b3a48701e75088a2c6ad # v4.0.0
         with:
           cosign-release: "v2.5.3"
@@ -273,7 +272,7 @@ jobs:
           - green
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Set build additional args
         run: |
@@ -295,7 +294,7 @@ jobs:
 
       # home-assistant/builder doesn't support sha pinning
       - name: Build base image
-        uses: home-assistant/builder@2025.11.0
+        uses: home-assistant/builder@2025.09.0
         with:
           args: |
             $BUILD_ARGS \
@@ -311,7 +310,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Initialize git
         uses: home-assistant/actions/helpers/git-init@master
@@ -354,7 +353,10 @@ jobs:
       matrix:
         registry: ["ghcr.io/home-assistant", "docker.io/homeassistant"]
     steps:
-      - *install_cosign
+      - name: Install Cosign
+        uses: sigstore/cosign-installer@faadad0cce49287aee09b3a48701e75088a2c6ad # v4.0.0
+        with:
+          cosign-release: "v2.2.3"
 
       - name: Login to DockerHub
         if: matrix.registry == 'docker.io/homeassistant'
@@ -391,7 +393,7 @@ jobs:
       #   2025.12.0.dev202511250240 -> tags: 2025.12.0.dev202511250240, dev
       - name: Generate Docker metadata
         id: meta
-        uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5.10.0
+        uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # v5.5.1
         with:
           images: ${{ matrix.registry }}/home-assistant
           sep-tags: ","
@@ -405,7 +407,7 @@ jobs:
             type=semver,pattern={{major}}.{{minor}},value=${{ needs.init.outputs.version }},enable=${{ !contains(needs.init.outputs.version, 'd') && !contains(needs.init.outputs.version, 'b') }}
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.7.1
+        uses: docker/setup-buildx-action@aa33708b10e362ff993539393ff100fa93ed6a27 # v3.7.1
 
       - name: Copy architecture images to DockerHub
         if: matrix.registry == 'docker.io/homeassistant'
@@ -474,7 +476,7 @@ jobs:
     if: github.repository_owner == 'home-assistant' && needs.init.outputs.publish == 'true'
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
@@ -519,7 +521,7 @@ jobs:
       HASSFEST_IMAGE_TAG: ghcr.io/home-assistant/hassfest:${{ needs.init.outputs.version }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0

.github/workflows/ci.yaml

@@ -40,9 +40,9 @@ env:
   CACHE_VERSION: 2
   UV_CACHE_VERSION: 1
   MYPY_CACHE_VERSION: 1
-  HA_SHORT_VERSION: "2026.1"
-  DEFAULT_PYTHON: "3.13.11"
-  ALL_PYTHON_VERSIONS: "['3.13.11', '3.14.2']"
+  HA_SHORT_VERSION: "2025.12"
+  DEFAULT_PYTHON: "3.13.9"
+  ALL_PYTHON_VERSIONS: "['3.13.9', '3.14.0']"
   # 10.3 is the oldest supported version
   # - 10.3.32 is the version currently shipped with Synology (as of 17 Feb 2022)
   # 10.6 is the current long-term-support
@@ -99,7 +99,7 @@ jobs:
     steps:
       - &checkout
         name: Check out code from GitHub
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       - name: Generate partial Python venv restore key
         id: generate_python_cache_key
         run: |
@@ -1188,7 +1188,7 @@ jobs:
           pattern: coverage-*
       - name: Upload coverage to Codecov
         if: needs.info.outputs.test_full_suite == 'true'
-        uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
+        uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
         with:
           fail_ci_if_error: true
           flags: full-suite
@@ -1313,7 +1313,7 @@ jobs:
           pattern: coverage-*
       - name: Upload coverage to Codecov
         if: needs.info.outputs.test_full_suite == 'false'
-        uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # v5.5.2
+        uses: codecov/codecov-action@5a1091511ad55cbe89839c7260b706298ca349f7 # v5.5.1
         with:
           fail_ci_if_error: true
           token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/codeql.yml

@@ -21,14 +21,14 @@ jobs:
 
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
+        uses: github/codeql-action/init@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
         with:
           languages: python
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
+        uses: github/codeql-action/analyze@fdbfb4d2750291e159f0156def62b853c2798ca2 # v4.31.5
         with:
           category: "/language:python"

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

@@ -231,7 +231,7 @@ jobs:
       - name: Detect duplicates using AI
         id: ai_detection
         if: steps.extract.outputs.should_continue == 'true' && steps.fetch_similar.outputs.has_similar == 'true'
-        uses: actions/ai-inference@334892bb203895caaed82ec52d23c1ed9385151e # v2.0.4
+        uses: actions/ai-inference@5022b33bc1431add9b2831934daf8147a2ad9331 # v2.0.2
         with:
           model: openai/gpt-4o
           system-prompt: |

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

@@ -57,7 +57,7 @@ jobs:
       - name: Detect language using AI
         id: ai_language_detection
         if: steps.detect_language.outputs.should_continue == 'true'
-        uses: actions/ai-inference@334892bb203895caaed82ec52d23c1ed9385151e # v2.0.4
+        uses: actions/ai-inference@5022b33bc1431add9b2831934daf8147a2ad9331 # v2.0.2
         with:
           model: openai/gpt-4o-mini
           system-prompt: |

.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@997185467fa4f803885201cee163a9f38240193d # v10.1.1
+        uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10.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@997185467fa4f803885201cee163a9f38240193d # v10.1.1
+        uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10.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@997185467fa4f803885201cee163a9f38240193d # v10.1.1
+        uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10.1.0
         with:
           repo-token: ${{ steps.token.outputs.token }}
           only-labels: "needs-more-information"

.github/workflows/translations.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0

.github/workflows/wheels.yml

@@ -31,7 +31,7 @@ jobs:
     steps:
       - &checkout
         name: Checkout the repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
@@ -136,7 +136,7 @@ jobs:
           sed -i "/uv/d" requirements_diff.txt
 
       - name: Build wheels
-        uses: &home-assistant-wheels home-assistant/wheels@e5742a69d69f0e274e2689c998900c7d19652c21 # 2025.12.0
+        uses: &home-assistant-wheels home-assistant/wheels@6066c17a2a4aafcf7bdfeae01717f63adfcdba98 # 2025.11.0
         with:
           abi: ${{ matrix.abi }}
           tag: musllinux_1_2

CODEOWNERS

@@ -73,8 +73,6 @@ build.json @home-assistant/supervisor
 /tests/components/airobot/ @mettolen
 /homeassistant/components/airos/ @CoMPaTech
 /tests/components/airos/ @CoMPaTech
-/homeassistant/components/airpatrol/ @antondalgren
-/tests/components/airpatrol/ @antondalgren
 /homeassistant/components/airq/ @Sibgatulin @dl2080
 /tests/components/airq/ @Sibgatulin @dl2080
 /homeassistant/components/airthings/ @danielhiversen @LaStrada
@@ -420,8 +418,6 @@ build.json @home-assistant/supervisor
 /homeassistant/components/efergy/ @tkdrob
 /tests/components/efergy/ @tkdrob
 /homeassistant/components/egardia/ @jeroenterheerdt
-/homeassistant/components/egauge/ @neggert
-/tests/components/egauge/ @neggert
 /homeassistant/components/eheimdigital/ @autinerd
 /tests/components/eheimdigital/ @autinerd
 /homeassistant/components/ekeybionyx/ @richardpolzer
@@ -464,7 +460,7 @@ build.json @home-assistant/supervisor
 /tests/components/enigma2/ @autinerd
 /homeassistant/components/enphase_envoy/ @bdraco @cgarwood @catsmanac
 /tests/components/enphase_envoy/ @bdraco @cgarwood @catsmanac
-/homeassistant/components/entur_public_transport/ @hfurubotten @SanderBlom
+/homeassistant/components/entur_public_transport/ @hfurubotten
 /homeassistant/components/environment_canada/ @gwww @michaeldavie
 /tests/components/environment_canada/ @gwww @michaeldavie
 /homeassistant/components/ephember/ @ttroy50 @roberty99
@@ -543,8 +539,6 @@ build.json @home-assistant/supervisor
 /tests/components/freebox/ @hacf-fr @Quentame
 /homeassistant/components/freedompro/ @stefano055415
 /tests/components/freedompro/ @stefano055415
-/homeassistant/components/fressnapf_tracker/ @eifinger
-/tests/components/fressnapf_tracker/ @eifinger
 /homeassistant/components/fritz/ @AaronDavidSchneider @chemelli74 @mib1185
 /tests/components/fritz/ @AaronDavidSchneider @chemelli74 @mib1185
 /homeassistant/components/fritzbox/ @mib1185 @flabbamann
@@ -575,8 +569,6 @@ build.json @home-assistant/supervisor
 /tests/components/generic_hygrostat/ @Shulyaka
 /homeassistant/components/geniushub/ @manzanotti
 /tests/components/geniushub/ @manzanotti
-/homeassistant/components/gentex_homelink/ @niaexa @ryanjones-gentex
-/tests/components/gentex_homelink/ @niaexa @ryanjones-gentex
 /homeassistant/components/geo_json_events/ @exxamalte
 /tests/components/geo_json_events/ @exxamalte
 /homeassistant/components/geo_location/ @home-assistant/core
@@ -1769,7 +1761,6 @@ build.json @home-assistant/supervisor
 /homeassistant/components/vilfo/ @ManneW
 /tests/components/vilfo/ @ManneW
 /homeassistant/components/vivotek/ @HarlemSquirrel
-/tests/components/vivotek/ @HarlemSquirrel
 /homeassistant/components/vizio/ @raman325
 /tests/components/vizio/ @raman325
 /homeassistant/components/vlc_telnet/ @rodripf @MartinHjelmare
@@ -1809,8 +1800,6 @@ build.json @home-assistant/supervisor
 /tests/components/weatherflow_cloud/ @jeeftor
 /homeassistant/components/weatherkit/ @tjhorner
 /tests/components/weatherkit/ @tjhorner
-/homeassistant/components/web_rtc/ @home-assistant/core
-/tests/components/web_rtc/ @home-assistant/core
 /homeassistant/components/webdav/ @jpbede
 /tests/components/webdav/ @jpbede
 /homeassistant/components/webhook/ @home-assistant/core

Dockerfile.dev

@@ -35,22 +35,25 @@ COPY --from=ghcr.io/astral-sh/uv:latest /uv /usr/local/bin/uv
 
 USER vscode
 
+COPY .python-version ./
+RUN uv python install
+
 ENV VIRTUAL_ENV="/home/vscode/.local/ha-venv"
-RUN --mount=type=bind,source=.python-version,target=.python-version \
-    uv python install \
-    && uv venv $VIRTUAL_ENV
+RUN uv venv $VIRTUAL_ENV
 ENV PATH="$VIRTUAL_ENV/bin:$PATH"
 
+WORKDIR /tmp
+
 # Setup hass-release
 RUN git clone --depth 1 https://github.com/home-assistant/hass-release ~/hass-release \
     && uv pip install -e ~/hass-release/
 
 # Install Python dependencies from requirements
-RUN --mount=type=bind,source=requirements.txt,target=requirements.txt \
-    --mount=type=bind,source=homeassistant/package_constraints.txt,target=homeassistant/package_constraints.txt \
-    --mount=type=bind,source=requirements_test.txt,target=requirements_test.txt \
-    --mount=type=bind,source=requirements_test_pre_commit.txt,target=requirements_test_pre_commit.txt \
-    uv pip install -r requirements.txt -r requirements_test.txt
+COPY requirements.txt ./
+COPY homeassistant/package_constraints.txt homeassistant/package_constraints.txt
+RUN uv pip install -r requirements.txt
+COPY requirements_test.txt requirements_test_pre_commit.txt ./
+RUN uv pip install -r requirements_test.txt
 
 WORKDIR /workspaces
 

homeassistant/bootstrap.py

@@ -1000,7 +1000,7 @@ class _WatchPendingSetups:
             # We log every LOG_SLOW_STARTUP_INTERVAL until all integrations are done
             # once we take over LOG_SLOW_STARTUP_INTERVAL (60s) to start up
             _LOGGER.warning(
-                "Waiting for integrations to complete setup: %s",
+                "Waiting on integrations to complete setup: %s",
                 self._setup_started,
             )
 

homeassistant/components/ai_task/__init__.py

@@ -101,8 +101,8 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
                     vol.Schema({str: STRUCTURE_FIELD_SCHEMA}),
                     _validate_structure_fields,
                 ),
-                vol.Optional(ATTR_ATTACHMENTS): selector.MediaSelector(
-                    {"accept": ["*/*"], "multiple": True}
+                vol.Optional(ATTR_ATTACHMENTS): vol.All(
+                    cv.ensure_list, [selector.MediaSelector({"accept": ["*/*"]})]
                 ),
             }
         ),
@@ -118,8 +118,8 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
                 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): selector.MediaSelector(
-                    {"accept": ["*/*"], "multiple": True}
+                vol.Optional(ATTR_ATTACHMENTS): vol.All(
+                    cv.ensure_list, [selector.MediaSelector({"accept": ["*/*"]})]
                 ),
             }
         ),

homeassistant/components/airobot/__init__.py

@@ -7,7 +7,7 @@ from homeassistant.core import HomeAssistant
 
 from .coordinator import AirobotConfigEntry, AirobotDataUpdateCoordinator
 
-PLATFORMS: list[Platform] = [Platform.CLIMATE, Platform.SENSOR]
+PLATFORMS: list[Platform] = [Platform.CLIMATE]
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: AirobotConfigEntry) -> bool:

homeassistant/components/airobot/config_flow.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-from collections.abc import Mapping
 from dataclasses import dataclass
 import logging
 from typing import Any
@@ -175,56 +174,6 @@ class AirobotConfigFlow(BaseConfigFlow, domain=DOMAIN):
             step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=errors
         )
 
-    async def async_step_reauth(
-        self, entry_data: Mapping[str, Any]
-    ) -> ConfigFlowResult:
-        """Handle reauthentication upon an API authentication error."""
-        return await self.async_step_reauth_confirm()
-
-    async def async_step_reauth_confirm(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Confirm reauthentication dialog."""
-        errors: dict[str, str] = {}
-        reauth_entry = self._get_reauth_entry()
-
-        if user_input is not None:
-            # Combine existing data with new password
-            data = {
-                CONF_HOST: reauth_entry.data[CONF_HOST],
-                CONF_USERNAME: reauth_entry.data[CONF_USERNAME],
-                CONF_PASSWORD: user_input[CONF_PASSWORD],
-            }
-
-            try:
-                await validate_input(self.hass, data)
-            except CannotConnect:
-                errors["base"] = "cannot_connect"
-            except InvalidAuth:
-                errors["base"] = "invalid_auth"
-            except Exception:
-                _LOGGER.exception("Unexpected exception")
-                errors["base"] = "unknown"
-            else:
-                return self.async_update_reload_and_abort(
-                    reauth_entry,
-                    data_updates={CONF_PASSWORD: user_input[CONF_PASSWORD]},
-                )
-
-        return self.async_show_form(
-            step_id="reauth_confirm",
-            data_schema=vol.Schema(
-                {
-                    vol.Required(CONF_PASSWORD): str,
-                }
-            ),
-            description_placeholders={
-                "username": reauth_entry.data[CONF_USERNAME],
-                "host": reauth_entry.data[CONF_HOST],
-            },
-            errors=errors,
-        )
-
 
 class CannotConnect(HomeAssistantError):
     """Error to indicate we cannot connect."""

homeassistant/components/airobot/coordinator.py

@@ -11,7 +11,6 @@ from pyairobotrest.exceptions import AirobotAuthError, AirobotConnectionError
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
@@ -54,15 +53,7 @@ class AirobotDataUpdateCoordinator(DataUpdateCoordinator[AirobotData]):
         try:
             status = await self.client.get_statuses()
             settings = await self.client.get_settings()
-        except AirobotAuthError as err:
-            raise ConfigEntryAuthFailed(
-                translation_domain=DOMAIN,
-                translation_key="authentication_failed",
-            ) from err
-        except AirobotConnectionError as err:
-            raise UpdateFailed(
-                translation_domain=DOMAIN,
-                translation_key="connection_failed",
-            ) from err
+        except (AirobotAuthError, AirobotConnectionError) as err:
+            raise UpdateFailed(f"Failed to communicate with device: {err}") from err
 
         return AirobotData(status=status, settings=settings)

homeassistant/components/airobot/diagnostics.py

@@ -1,38 +0,0 @@
-"""Diagnostics support for Airobot."""
-
-from __future__ import annotations
-
-from dataclasses import asdict
-from typing import Any
-
-from homeassistant.components.diagnostics import async_redact_data
-from homeassistant.const import CONF_HOST, CONF_MAC, CONF_PASSWORD, CONF_USERNAME
-from homeassistant.core import HomeAssistant
-
-from .coordinator import AirobotConfigEntry
-
-TO_REDACT_CONFIG = [CONF_HOST, CONF_MAC, CONF_PASSWORD, CONF_USERNAME]
-
-
-async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant, entry: AirobotConfigEntry
-) -> dict[str, Any]:
-    """Return diagnostics for a config entry."""
-    coordinator = entry.runtime_data
-
-    # Build device capabilities info
-    device_capabilities = None
-    if coordinator.data:
-        device_capabilities = {
-            "has_floor_sensor": coordinator.data.status.has_floor_sensor,
-            "has_co2_sensor": coordinator.data.status.has_co2_sensor,
-            "hw_version": coordinator.data.status.hw_version,
-            "fw_version": coordinator.data.status.fw_version,
-        }
-
-    return {
-        "entry_data": async_redact_data(entry.data, TO_REDACT_CONFIG),
-        "device_capabilities": device_capabilities,
-        "status": asdict(coordinator.data.status) if coordinator.data else None,
-        "settings": asdict(coordinator.data.settings) if coordinator.data else None,
-    }

homeassistant/components/airobot/manifest.json

@@ -12,6 +12,6 @@
   "integration_type": "device",
   "iot_class": "local_polling",
   "loggers": ["pyairobotrest"],
-  "quality_scale": "silver",
+  "quality_scale": "bronze",
   "requirements": ["pyairobotrest==0.1.0"]
 }

homeassistant/components/airobot/quality_scale.yaml

@@ -34,17 +34,17 @@ rules:
   integration-owner: done
   log-when-unavailable: done
   parallel-updates: done
-  reauthentication-flow: done
+  reauthentication-flow: todo
   test-coverage: done
 
   # Gold
   devices: done
-  diagnostics: done
+  diagnostics: todo
   discovery-update-info: done
   discovery: done
   docs-data-update: done
   docs-examples: todo
-  docs-known-limitations: done
+  docs-known-limitations: todo
   docs-supported-devices: done
   docs-supported-functions: done
   docs-troubleshooting: done
@@ -54,8 +54,8 @@ rules:
     comment: Single device integration, no dynamic device discovery needed.
   entity-category: done
   entity-device-class: done
-  entity-disabled-by-default: done
-  entity-translations: done
+  entity-disabled-by-default: todo
+  entity-translations: todo
   exception-translations: done
   icon-translations: todo
   reconfiguration-flow: todo

homeassistant/components/airobot/sensor.py

@@ -1,134 +0,0 @@
-"""Sensor platform for Airobot thermostat."""
-
-from __future__ import annotations
-
-from collections.abc import Callable
-from dataclasses import dataclass
-
-from pyairobotrest.models import ThermostatStatus
-
-from homeassistant.components.sensor import (
-    SensorDeviceClass,
-    SensorEntity,
-    SensorEntityDescription,
-    SensorStateClass,
-)
-from homeassistant.const import (
-    CONCENTRATION_PARTS_PER_MILLION,
-    PERCENTAGE,
-    EntityCategory,
-    UnitOfTemperature,
-    UnitOfTime,
-)
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-from homeassistant.helpers.typing import StateType
-
-from . import AirobotConfigEntry
-from .entity import AirobotEntity
-
-PARALLEL_UPDATES = 0
-
-
-@dataclass(frozen=True, kw_only=True)
-class AirobotSensorEntityDescription(SensorEntityDescription):
-    """Describes Airobot sensor entity."""
-
-    value_fn: Callable[[ThermostatStatus], StateType]
-    supported_fn: Callable[[ThermostatStatus], bool] = lambda _: True
-
-
-SENSOR_TYPES: tuple[AirobotSensorEntityDescription, ...] = (
-    AirobotSensorEntityDescription(
-        key="air_temperature",
-        translation_key="air_temperature",
-        device_class=SensorDeviceClass.TEMPERATURE,
-        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        state_class=SensorStateClass.MEASUREMENT,
-        value_fn=lambda status: status.temp_air,
-    ),
-    AirobotSensorEntityDescription(
-        key="humidity",
-        device_class=SensorDeviceClass.HUMIDITY,
-        native_unit_of_measurement=PERCENTAGE,
-        state_class=SensorStateClass.MEASUREMENT,
-        value_fn=lambda status: status.hum_air,
-    ),
-    AirobotSensorEntityDescription(
-        key="floor_temperature",
-        translation_key="floor_temperature",
-        device_class=SensorDeviceClass.TEMPERATURE,
-        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        state_class=SensorStateClass.MEASUREMENT,
-        value_fn=lambda status: status.temp_floor,
-        supported_fn=lambda status: status.has_floor_sensor,
-    ),
-    AirobotSensorEntityDescription(
-        key="co2",
-        device_class=SensorDeviceClass.CO2,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
-        state_class=SensorStateClass.MEASUREMENT,
-        value_fn=lambda status: status.co2,
-        supported_fn=lambda status: status.has_co2_sensor,
-    ),
-    AirobotSensorEntityDescription(
-        key="air_quality_index",
-        device_class=SensorDeviceClass.AQI,
-        state_class=SensorStateClass.MEASUREMENT,
-        value_fn=lambda status: status.aqi,
-        supported_fn=lambda status: status.has_co2_sensor,
-    ),
-    AirobotSensorEntityDescription(
-        key="heating_uptime",
-        translation_key="heating_uptime",
-        device_class=SensorDeviceClass.DURATION,
-        native_unit_of_measurement=UnitOfTime.SECONDS,
-        suggested_unit_of_measurement=UnitOfTime.HOURS,
-        state_class=SensorStateClass.TOTAL_INCREASING,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        value_fn=lambda status: status.heating_uptime,
-        entity_registry_enabled_default=False,
-    ),
-    AirobotSensorEntityDescription(
-        key="errors",
-        translation_key="errors",
-        state_class=SensorStateClass.MEASUREMENT,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        value_fn=lambda status: status.errors,
-    ),
-)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: AirobotConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up Airobot sensor platform."""
-    coordinator = entry.runtime_data
-    async_add_entities(
-        AirobotSensor(coordinator, description)
-        for description in SENSOR_TYPES
-        if description.supported_fn(coordinator.data.status)
-    )
-
-
-class AirobotSensor(AirobotEntity, SensorEntity):
-    """Representation of an Airobot sensor."""
-
-    entity_description: AirobotSensorEntityDescription
-
-    def __init__(
-        self,
-        coordinator,
-        description: AirobotSensorEntityDescription,
-    ) -> None:
-        """Initialize the sensor."""
-        super().__init__(coordinator)
-        self.entity_description = description
-        self._attr_unique_id = f"{coordinator.data.status.device_id}_{description.key}"
-
-    @property
-    def native_value(self) -> StateType:
-        """Return the state of the sensor."""
-        return self.entity_description.value_fn(self.coordinator.data.status)

homeassistant/components/airobot/strings.json

@@ -1,8 +1,7 @@
 {
   "config": {
     "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     },
     "error": {
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
@@ -15,24 +14,15 @@
           "password": "[%key:common::config_flow::data::password%]"
         },
         "data_description": {
-          "password": "[%key:component::airobot::config::step::user::data_description::password%]"
+          "password": "The thermostat password."
         },
         "description": "Airobot thermostat {device_id} discovered at {host}. Enter the password to complete setup. Find the password in the thermostat settings menu under Connectivity → Mobile app."
       },
-      "reauth_confirm": {
-        "data": {
-          "password": "[%key:common::config_flow::data::password%]"
-        },
-        "data_description": {
-          "password": "[%key:component::airobot::config::step::user::data_description::password%]"
-        },
-        "description": "The authentication for Airobot thermostat at {host} (Device ID: {username}) has expired. Please enter the password to reauthenticate. Find the password in the thermostat settings menu under Connectivity → Mobile app."
-      },
       "user": {
         "data": {
           "host": "[%key:common::config_flow::data::host%]",
           "password": "[%key:common::config_flow::data::password%]",
-          "username": "Device ID"
+          "username": "[%key:common::config_flow::data::username%]"
         },
         "data_description": {
           "host": "The hostname or IP address of your Airobot thermostat.",
@@ -43,32 +33,7 @@
       }
     }
   },
-  "entity": {
-    "sensor": {
-      "air_temperature": {
-        "name": "Air temperature"
-      },
-      "device_uptime": {
-        "name": "Device uptime"
-      },
-      "errors": {
-        "name": "Error count"
-      },
-      "floor_temperature": {
-        "name": "Floor temperature"
-      },
-      "heating_uptime": {
-        "name": "Heating uptime"
-      }
-    }
-  },
   "exceptions": {
-    "authentication_failed": {
-      "message": "Authentication failed, please reauthenticate."
-    },
-    "connection_failed": {
-      "message": "Failed to communicate with device."
-    },
     "set_preset_mode_failed": {
       "message": "Failed to set preset mode to {preset_mode}."
     },

homeassistant/components/airpatrol/__init__.py

@@ -1,24 +0,0 @@
-"""The AirPatrol integration."""
-
-from __future__ import annotations
-
-from homeassistant.core import HomeAssistant
-
-from .const import PLATFORMS
-from .coordinator import AirPatrolConfigEntry, AirPatrolDataUpdateCoordinator
-
-
-async def async_setup_entry(hass: HomeAssistant, entry: AirPatrolConfigEntry) -> bool:
-    """Set up AirPatrol from a config entry."""
-    coordinator = AirPatrolDataUpdateCoordinator(hass, entry)
-
-    await coordinator.async_config_entry_first_refresh()
-    entry.runtime_data = coordinator
-
-    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
-    return True
-
-
-async def async_unload_entry(hass: HomeAssistant, entry: AirPatrolConfigEntry) -> bool:
-    """Unload a config entry."""
-    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)

homeassistant/components/airpatrol/climate.py

@@ -1,208 +0,0 @@
-"""Climate platform for AirPatrol integration."""
-
-from __future__ import annotations
-
-from typing import Any
-
-from homeassistant.components.climate import (
-    FAN_AUTO,
-    FAN_HIGH,
-    FAN_LOW,
-    SWING_OFF,
-    SWING_ON,
-    ClimateEntity,
-    ClimateEntityFeature,
-    HVACMode,
-)
-from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-
-from . import AirPatrolConfigEntry
-from .coordinator import AirPatrolDataUpdateCoordinator
-from .entity import AirPatrolEntity
-
-PARALLEL_UPDATES = 0
-
-AP_TO_HA_HVAC_MODES = {
-    "heat": HVACMode.HEAT,
-    "cool": HVACMode.COOL,
-    "off": HVACMode.OFF,
-}
-HA_TO_AP_HVAC_MODES = {value: key for key, value in AP_TO_HA_HVAC_MODES.items()}
-
-AP_TO_HA_FAN_MODES = {
-    "min": FAN_LOW,
-    "max": FAN_HIGH,
-    "auto": FAN_AUTO,
-}
-HA_TO_AP_FAN_MODES = {value: key for key, value in AP_TO_HA_FAN_MODES.items()}
-
-AP_TO_HA_SWING_MODES = {
-    "on": SWING_ON,
-    "off": SWING_OFF,
-}
-HA_TO_AP_SWING_MODES = {value: key for key, value in AP_TO_HA_SWING_MODES.items()}
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: AirPatrolConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up AirPatrol climate entities."""
-    coordinator = config_entry.runtime_data
-    units = coordinator.data
-
-    async_add_entities(
-        AirPatrolClimate(coordinator, unit_id)
-        for unit_id, unit in units.items()
-        if "climate" in unit
-    )
-
-
-class AirPatrolClimate(AirPatrolEntity, ClimateEntity):
-    """AirPatrol climate entity."""
-
-    _attr_name = None
-    _attr_temperature_unit = UnitOfTemperature.CELSIUS
-    _attr_supported_features = (
-        ClimateEntityFeature.TARGET_TEMPERATURE
-        | ClimateEntityFeature.FAN_MODE
-        | ClimateEntityFeature.SWING_MODE
-        | ClimateEntityFeature.TURN_OFF
-        | ClimateEntityFeature.TURN_ON
-    )
-    _attr_hvac_modes = [HVACMode.HEAT, HVACMode.COOL, HVACMode.OFF]
-    _attr_fan_modes = [FAN_LOW, FAN_HIGH, FAN_AUTO]
-    _attr_swing_modes = [SWING_ON, SWING_OFF]
-    _attr_min_temp = 16.0
-    _attr_max_temp = 30.0
-
-    def __init__(
-        self,
-        coordinator: AirPatrolDataUpdateCoordinator,
-        unit_id: str,
-    ) -> None:
-        """Initialize the climate entity."""
-        super().__init__(coordinator, unit_id)
-        self._attr_unique_id = f"{coordinator.config_entry.unique_id}-{unit_id}"
-
-    @property
-    def climate_data(self) -> dict[str, Any]:
-        """Return the climate data."""
-        return self.device_data.get("climate") or {}
-
-    @property
-    def params(self) -> dict[str, Any]:
-        """Return the current parameters for the climate entity."""
-        return self.climate_data.get("ParametersData") or {}
-
-    @property
-    def available(self) -> bool:
-        """Return if entity is available."""
-        return super().available and bool(self.climate_data)
-
-    @property
-    def current_humidity(self) -> float | None:
-        """Return the current humidity."""
-        if humidity := self.climate_data.get("RoomHumidity"):
-            return float(humidity)
-        return None
-
-    @property
-    def current_temperature(self) -> float | None:
-        """Return the current temperature."""
-        if temp := self.climate_data.get("RoomTemp"):
-            return float(temp)
-        return None
-
-    @property
-    def target_temperature(self) -> float | None:
-        """Return the target temperature."""
-        if temp := self.params.get("PumpTemp"):
-            return float(temp)
-        return None
-
-    @property
-    def hvac_mode(self) -> HVACMode | None:
-        """Return the current HVAC mode."""
-        pump_power = self.params.get("PumpPower")
-        pump_mode = self.params.get("PumpMode")
-
-        if pump_power and pump_power == "on" and pump_mode:
-            return AP_TO_HA_HVAC_MODES.get(pump_mode)
-        return HVACMode.OFF
-
-    @property
-    def fan_mode(self) -> str | None:
-        """Return the current fan mode."""
-        fan_speed = self.params.get("FanSpeed")
-        if fan_speed:
-            return AP_TO_HA_FAN_MODES.get(fan_speed)
-        return None
-
-    @property
-    def swing_mode(self) -> str | None:
-        """Return the current swing mode."""
-        swing = self.params.get("Swing")
-        if swing:
-            return AP_TO_HA_SWING_MODES.get(swing)
-        return None
-
-    async def async_set_temperature(self, **kwargs: Any) -> None:
-        """Set new target temperature."""
-        params = self.params.copy()
-
-        if ATTR_TEMPERATURE in kwargs:
-            temp = kwargs[ATTR_TEMPERATURE]
-            params["PumpTemp"] = f"{temp:.3f}"
-
-        await self._async_set_params(params)
-
-    async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
-        """Set new target hvac mode."""
-        params = self.params.copy()
-
-        if hvac_mode == HVACMode.OFF:
-            params["PumpPower"] = "off"
-        else:
-            params["PumpPower"] = "on"
-            params["PumpMode"] = HA_TO_AP_HVAC_MODES.get(hvac_mode)
-
-        await self._async_set_params(params)
-
-    async def async_set_fan_mode(self, fan_mode: str) -> None:
-        """Set new target fan mode."""
-        params = self.params.copy()
-        params["FanSpeed"] = HA_TO_AP_FAN_MODES.get(fan_mode)
-
-        await self._async_set_params(params)
-
-    async def async_set_swing_mode(self, swing_mode: str) -> None:
-        """Set new target swing mode."""
-        params = self.params.copy()
-        params["Swing"] = HA_TO_AP_SWING_MODES.get(swing_mode)
-
-        await self._async_set_params(params)
-
-    async def async_turn_on(self) -> None:
-        """Turn the entity on."""
-        params = self.params.copy()
-        if mode := AP_TO_HA_HVAC_MODES.get(params["PumpMode"]):
-            await self.async_set_hvac_mode(mode)
-
-    async def async_turn_off(self) -> None:
-        """Turn the entity off."""
-        await self.async_set_hvac_mode(HVACMode.OFF)
-
-    async def _async_set_params(self, params: dict[str, Any]) -> None:
-        """Set the unit to dry mode."""
-        new_climate_data = self.climate_data.copy()
-        new_climate_data["ParametersData"] = params
-
-        await self.coordinator.api.set_unit_climate_data(
-            self._unit_id, new_climate_data
-        )
-
-        await self.coordinator.async_request_refresh()

homeassistant/components/airpatrol/config_flow.py

@@ -1,111 +0,0 @@
-"""Config flow for the AirPatrol integration."""
-
-from __future__ import annotations
-
-from collections.abc import Mapping
-from typing import Any
-
-from airpatrol.api import AirPatrolAPI, AirPatrolAuthenticationError, AirPatrolError
-import voluptuous as vol
-
-from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_ACCESS_TOKEN, CONF_EMAIL, CONF_PASSWORD
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.selector import (
-    TextSelector,
-    TextSelectorConfig,
-    TextSelectorType,
-)
-
-from .const import DOMAIN
-
-DATA_SCHEMA = vol.Schema(
-    {
-        vol.Required(CONF_EMAIL): TextSelector(
-            TextSelectorConfig(
-                type=TextSelectorType.EMAIL,
-                autocomplete="email",
-            )
-        ),
-        vol.Required(CONF_PASSWORD): TextSelector(
-            TextSelectorConfig(
-                type=TextSelectorType.PASSWORD,
-                autocomplete="current-password",
-            )
-        ),
-    }
-)
-
-
-async def validate_api(
-    hass: HomeAssistant, user_input: dict[str, str]
-) -> tuple[str | None, str | None, dict[str, str]]:
-    """Validate the API connection."""
-    errors: dict[str, str] = {}
-    session = async_get_clientsession(hass)
-    access_token = None
-    unique_id = None
-    try:
-        api = await AirPatrolAPI.authenticate(
-            session, user_input[CONF_EMAIL], user_input[CONF_PASSWORD]
-        )
-    except AirPatrolAuthenticationError:
-        errors["base"] = "invalid_auth"
-    except AirPatrolError:
-        errors["base"] = "cannot_connect"
-    else:
-        access_token = api.get_access_token()
-        unique_id = api.get_unique_id()
-
-    return (access_token, unique_id, errors)
-
-
-class AirPatrolConfigFlow(ConfigFlow, domain=DOMAIN):
-    """Handle a config flow for AirPatrol."""
-
-    VERSION = 1
-
-    async def async_step_user(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle the initial step."""
-        errors: dict[str, str] = {}
-        if user_input is not None:
-            access_token, unique_id, errors = await validate_api(self.hass, user_input)
-            if access_token and unique_id:
-                user_input[CONF_ACCESS_TOKEN] = access_token
-                await self.async_set_unique_id(unique_id)
-                self._abort_if_unique_id_configured()
-                return self.async_create_entry(
-                    title=user_input[CONF_EMAIL], data=user_input
-                )
-
-        return self.async_show_form(
-            step_id="user", data_schema=DATA_SCHEMA, errors=errors
-        )
-
-    async def async_step_reauth(
-        self, user_input: Mapping[str, Any]
-    ) -> ConfigFlowResult:
-        """Handle reauthentication with new credentials."""
-        return await self.async_step_reauth_confirm()
-
-    async def async_step_reauth_confirm(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle reauthentication confirmation."""
-        errors: dict[str, str] = {}
-
-        if user_input:
-            access_token, unique_id, errors = await validate_api(self.hass, user_input)
-            if access_token and unique_id:
-                await self.async_set_unique_id(unique_id)
-                self._abort_if_unique_id_mismatch()
-                user_input[CONF_ACCESS_TOKEN] = access_token
-                return self.async_update_reload_and_abort(
-                    self._get_reauth_entry(), data_updates=user_input
-                )
-        return self.async_show_form(
-            step_id="reauth_confirm", data_schema=DATA_SCHEMA, errors=errors
-        )

homeassistant/components/airpatrol/const.py

@@ -1,16 +0,0 @@
-"""Constants for the AirPatrol integration."""
-
-from datetime import timedelta
-import logging
-
-from airpatrol.api import AirPatrolAuthenticationError, AirPatrolError
-
-from homeassistant.const import Platform
-
-DOMAIN = "airpatrol"
-
-LOGGER = logging.getLogger(__package__)
-PLATFORMS = [Platform.CLIMATE]
-SCAN_INTERVAL = timedelta(minutes=1)
-
-AIRPATROL_ERRORS = (AirPatrolAuthenticationError, AirPatrolError)

homeassistant/components/airpatrol/coordinator.py

@@ -1,100 +0,0 @@
-"""Data update coordinator for AirPatrol."""
-
-from __future__ import annotations
-
-from typing import Any
-
-from airpatrol.api import AirPatrolAPI, AirPatrolAuthenticationError, AirPatrolError
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_ACCESS_TOKEN, CONF_EMAIL, CONF_PASSWORD
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryAuthFailed
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-
-from .const import DOMAIN, LOGGER, SCAN_INTERVAL
-
-type AirPatrolConfigEntry = ConfigEntry[AirPatrolDataUpdateCoordinator]
-
-
-class AirPatrolDataUpdateCoordinator(DataUpdateCoordinator[dict[str, dict[str, Any]]]):
-    """Class to manage fetching AirPatrol data."""
-
-    config_entry: AirPatrolConfigEntry
-    api: AirPatrolAPI
-
-    def __init__(self, hass: HomeAssistant, config_entry: AirPatrolConfigEntry) -> None:
-        """Initialize."""
-
-        super().__init__(
-            hass,
-            LOGGER,
-            name=f"{DOMAIN.capitalize()} {config_entry.title}",
-            update_interval=SCAN_INTERVAL,
-            config_entry=config_entry,
-        )
-
-    async def _async_setup(self) -> None:
-        try:
-            await self._setup_client()
-        except AirPatrolError as api_err:
-            raise UpdateFailed(
-                f"Error communicating with AirPatrol API: {api_err}"
-            ) from api_err
-
-    async def _async_update_data(self) -> dict[str, dict[str, Any]]:
-        """Update unit data from AirPatrol API."""
-        return {unit_data["unit_id"]: unit_data for unit_data in await self._get_data()}
-
-    async def _get_data(self, retry: bool = False) -> list[dict[str, Any]]:
-        """Fetch data from API."""
-        try:
-            return await self.api.get_data()
-        except AirPatrolAuthenticationError as auth_err:
-            if retry:
-                raise ConfigEntryAuthFailed(
-                    "Authentication with AirPatrol failed"
-                ) from auth_err
-            await self._update_token()
-            return await self._get_data(retry=True)
-        except AirPatrolError as err:
-            raise UpdateFailed(
-                f"Error communicating with AirPatrol API: {err}"
-            ) from err
-
-    async def _update_token(self) -> None:
-        """Refresh the AirPatrol API client and update the access token."""
-        session = async_get_clientsession(self.hass)
-        try:
-            self.api = await AirPatrolAPI.authenticate(
-                session,
-                self.config_entry.data[CONF_EMAIL],
-                self.config_entry.data[CONF_PASSWORD],
-            )
-        except AirPatrolAuthenticationError as auth_err:
-            raise ConfigEntryAuthFailed(
-                "Authentication with AirPatrol failed"
-            ) from auth_err
-
-        self.hass.config_entries.async_update_entry(
-            self.config_entry,
-            data={
-                **self.config_entry.data,
-                CONF_ACCESS_TOKEN: self.api.get_access_token(),
-            },
-        )
-
-    async def _setup_client(self) -> None:
-        """Set up the AirPatrol API client from stored access_token."""
-        session = async_get_clientsession(self.hass)
-        api = AirPatrolAPI(
-            session,
-            self.config_entry.data[CONF_ACCESS_TOKEN],
-            self.config_entry.unique_id,
-        )
-        try:
-            await api.get_data()
-        except AirPatrolAuthenticationError:
-            await self._update_token()
-        self.api = api

homeassistant/components/airpatrol/entity.py

@@ -1,44 +0,0 @@
-"""Base entity for AirPatrol integration."""
-
-from __future__ import annotations
-
-from typing import Any
-
-from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
-
-from .const import DOMAIN
-from .coordinator import AirPatrolDataUpdateCoordinator
-
-
-class AirPatrolEntity(CoordinatorEntity[AirPatrolDataUpdateCoordinator]):
-    """Base entity for AirPatrol devices."""
-
-    _attr_has_entity_name = True
-
-    def __init__(
-        self,
-        coordinator: AirPatrolDataUpdateCoordinator,
-        unit_id: str,
-    ) -> None:
-        """Initialize the AirPatrol entity."""
-        super().__init__(coordinator)
-        self._unit_id = unit_id
-        device = coordinator.data[unit_id]
-        self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, unit_id)},
-            name=device["name"],
-            manufacturer=device["manufacturer"],
-            model=device["model"],
-            serial_number=device["hwid"],
-        )
-
-    @property
-    def device_data(self) -> dict[str, Any]:
-        """Return the device data."""
-        return self.coordinator.data[self._unit_id]
-
-    @property
-    def available(self) -> bool:
-        """Return if entity is available."""
-        return super().available and self._unit_id in self.coordinator.data

homeassistant/components/airpatrol/manifest.json

@@ -1,11 +0,0 @@
-{
-  "domain": "airpatrol",
-  "name": "AirPatrol",
-  "codeowners": ["@antondalgren"],
-  "config_flow": true,
-  "documentation": "https://www.home-assistant.io/integrations/airpatrol",
-  "integration_type": "device",
-  "iot_class": "cloud_polling",
-  "quality_scale": "bronze",
-  "requirements": ["airpatrol==0.1.0"]
-}

homeassistant/components/airpatrol/quality_scale.yaml

@@ -1,65 +0,0 @@
-rules:
-  # Bronze
-  action-setup: done
-  appropriate-polling: done
-  brands: done
-  common-modules: done
-  config-flow-test-coverage: done
-  config-flow: done
-  dependency-transparency: done
-  docs-actions:
-    status: exempt
-    comment: Integration does not provide custom actions
-  docs-high-level-description: done
-  docs-installation-instructions: done
-  docs-removal-instructions: done
-  entity-event-setup:
-    status: exempt
-    comment: |
-      Entities doesn't subscribe to events.
-  entity-unique-id: done
-  has-entity-name: done
-  runtime-data: done
-  test-before-configure: done
-  test-before-setup: done
-  unique-config-entry: done
-
-  # Silver
-  action-exceptions: done
-  config-entry-unloading: done
-  docs-configuration-parameters: done
-  docs-installation-parameters: done
-  entity-unavailable: done
-  integration-owner: done
-  log-when-unavailable: todo
-  parallel-updates: done
-  reauthentication-flow: done
-  test-coverage: done
-
-  # Gold
-  devices: done
-  diagnostics: todo
-  discovery-update-info: todo
-  discovery: todo
-  docs-data-update: todo
-  docs-examples: todo
-  docs-known-limitations: todo
-  docs-supported-devices: todo
-  docs-supported-functions: todo
-  docs-troubleshooting: todo
-  docs-use-cases: todo
-  dynamic-devices: todo
-  entity-category: done
-  entity-device-class: done
-  entity-disabled-by-default: todo
-  entity-translations: done
-  exception-translations: todo
-  icon-translations: todo
-  reconfiguration-flow: todo
-  repair-issues: todo
-  stale-devices: todo
-
-  # Platinum
-  async-dependency: todo
-  inject-websession: todo
-  strict-typing: todo

homeassistant/components/airpatrol/strings.json

@@ -1,38 +0,0 @@
-{
-  "config": {
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
-      "unique_id_mismatch": "Login credentials do not match the configured account"
-    },
-    "error": {
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
-      "unknown": "[%key:common::config_flow::error::unknown%]"
-    },
-    "step": {
-      "reauth_confirm": {
-        "data": {
-          "email": "[%key:common::config_flow::data::email%]",
-          "password": "[%key:common::config_flow::data::password%]"
-        },
-        "data_description": {
-          "email": "[%key:component::airpatrol::config::step::user::data_description::email%]",
-          "password": "[%key:component::airpatrol::config::step::user::data_description::password%]"
-        },
-        "description": "Reauthenticate with AirPatrol"
-      },
-      "user": {
-        "data": {
-          "email": "[%key:common::config_flow::data::email%]",
-          "password": "[%key:common::config_flow::data::password%]"
-        },
-        "data_description": {
-          "email": "Your AirPatrol email address",
-          "password": "Your AirPatrol password"
-        },
-        "description": "Connect to AirPatrol"
-      }
-    }
-  }
-}

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.4"]
+  "requirements": ["aioairzone==1.0.2"]
 }

homeassistant/components/anglian_water/__init__.py

@@ -39,6 +39,7 @@ async def async_setup_entry(
             cookie_jar=CookieJar(quote_cookie=False),
         ),
         refresh_token=entry.data[CONF_ACCESS_TOKEN],
+        account_number=entry.data[CONF_ACCOUNT_NUMBER],
     )
     try:
         await auth.send_refresh_request()
@@ -48,7 +49,7 @@ async def async_setup_entry(
     _aw = AnglianWater(authenticator=auth)
 
     try:
-        await _aw.validate_smart_meter(entry.data[CONF_ACCOUNT_NUMBER])
+        await _aw.validate_smart_meter()
     except SmartMeterUnavailableError as err:
         raise ConfigEntryError(
             translation_domain=DOMAIN, translation_key="smart_meter_unavailable"

homeassistant/components/anglian_water/config_flow.py

@@ -7,7 +7,7 @@ from typing import Any
 
 from aiohttp import CookieJar
 from pyanglianwater import AnglianWater
-from pyanglianwater.auth import MSOB2CAuth
+from pyanglianwater.auth import BaseAuth, MSOB2CAuth
 from pyanglianwater.exceptions import (
     InvalidAccountIdError,
     SelfAssertedError,
@@ -35,9 +35,7 @@ STEP_USER_DATA_SCHEMA = vol.Schema(
 )
 
 
-async def validate_credentials(
-    auth: MSOB2CAuth, account_number: str
-) -> str | MSOB2CAuth:
+async def validate_credentials(auth: MSOB2CAuth) -> str | MSOB2CAuth:
     """Validate the provided credentials."""
     try:
         await auth.send_login_request()
@@ -48,7 +46,7 @@ async def validate_credentials(
         return "unknown"
     _aw = AnglianWater(authenticator=auth)
     try:
-        await _aw.validate_smart_meter(account_number)
+        await _aw.validate_smart_meter()
     except (InvalidAccountIdError, SmartMeterUnavailableError):
         return "smart_meter_unavailable"
     return auth
@@ -71,12 +69,10 @@ class AnglianWaterConfigFlow(ConfigFlow, domain=DOMAIN):
                         self.hass,
                         cookie_jar=CookieJar(quote_cookie=False),
                     ),
-                ),
-                user_input[CONF_ACCOUNT_NUMBER],
+                    account_number=user_input[CONF_ACCOUNT_NUMBER],
+                )
             )
-            if isinstance(validation_response, str):
-                errors["base"] = validation_response
-            else:
+            if isinstance(validation_response, BaseAuth):
                 await self.async_set_unique_id(user_input[CONF_ACCOUNT_NUMBER])
                 self._abort_if_unique_id_configured()
                 return self.async_create_entry(
@@ -86,6 +82,7 @@ class AnglianWaterConfigFlow(ConfigFlow, domain=DOMAIN):
                         CONF_ACCESS_TOKEN: validation_response.refresh_token,
                     },
                 )
+            errors["base"] = validation_response
 
         return self.async_show_form(
             step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=errors

homeassistant/components/anglian_water/coordinator.py

@@ -12,7 +12,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
-from .const import CONF_ACCOUNT_NUMBER, DOMAIN
+from .const import DOMAIN
 
 type AnglianWaterConfigEntry = ConfigEntry[AnglianWaterUpdateCoordinator]
 
@@ -44,6 +44,6 @@ class AnglianWaterUpdateCoordinator(DataUpdateCoordinator[None]):
     async def _async_update_data(self) -> None:
         """Update data from Anglian Water's API."""
         try:
-            return await self.api.update(self.config_entry.data[CONF_ACCOUNT_NUMBER])
+            return await self.api.update()
         except (ExpiredAccessTokenError, UnknownEndpointError) as err:
             raise UpdateFailed from err

homeassistant/components/anglian_water/manifest.json

@@ -7,5 +7,5 @@
   "iot_class": "cloud_polling",
   "loggers": ["pyanglianwater"],
   "quality_scale": "bronze",
-  "requirements": ["pyanglianwater==3.0.0"]
+  "requirements": ["pyanglianwater==2.1.0"]
 }

homeassistant/components/anthropic/config_flow.py

@@ -421,8 +421,6 @@ class ConversationSubentryFlowHandler(ConfigSubentryFlow):
             )
             if short_form.search(model_alias):
                 model_alias += "-0"
-            if model_alias.endswith(("haiku", "opus", "sonnet")):
-                model_alias += "-latest"
             model_options.append(
                 SelectOptionDict(
                     label=model_info.display_name,

homeassistant/components/anthropic/entity.py

@@ -583,7 +583,7 @@ class AnthropicBaseLLMEntity(Entity):
             identifiers={(DOMAIN, subentry.subentry_id)},
             name=subentry.title,
             manufacturer="Anthropic",
-            model=subentry.data.get(CONF_CHAT_MODEL, DEFAULT[CONF_CHAT_MODEL]),
+            model="Claude",
             entry_type=dr.DeviceEntryType.SERVICE,
         )
 

homeassistant/components/anthropic/manifest.json

@@ -8,5 +8,5 @@
   "documentation": "https://www.home-assistant.io/integrations/anthropic",
   "integration_type": "service",
   "iot_class": "cloud_polling",
-  "requirements": ["anthropic==0.75.0"]
+  "requirements": ["anthropic==0.73.0"]
 }

homeassistant/components/assist_pipeline/audio_enhancer.py

@@ -3,9 +3,8 @@
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
 import logging
-import math
 
-from pysilero_vad import SileroVoiceActivityDetector
+from pymicro_vad import MicroVad
 from pyspeex_noise import AudioProcessor
 
 from .const import BYTES_PER_CHUNK
@@ -43,8 +42,8 @@ class AudioEnhancer(ABC):
         """Enhance chunk of PCM audio @ 16Khz with 16-bit mono samples."""
 
 
-class SileroVadSpeexEnhancer(AudioEnhancer):
-    """Audio enhancer that runs Silero VAD and speex."""
+class MicroVadSpeexEnhancer(AudioEnhancer):
+    """Audio enhancer that runs microVAD and speex."""
 
     def __init__(
         self, auto_gain: int, noise_suppression: int, is_vad_enabled: bool
@@ -70,49 +69,21 @@ class SileroVadSpeexEnhancer(AudioEnhancer):
                 self.noise_suppression,
             )
 
-        self.vad: SileroVoiceActivityDetector | None = None
-
-        # We get 10ms chunks but Silero works on 32ms chunks, so we have to
-        # buffer audio. The previous speech probability is used until enough
-        # audio has been buffered.
-        self._vad_buffer: bytearray | None = None
-        self._vad_buffer_chunks = 0
-        self._vad_buffer_chunk_idx = 0
-        self._last_speech_probability: float | None = None
+        self.vad: MicroVad | None = None
 
         if self.is_vad_enabled:
-            self.vad = SileroVoiceActivityDetector()
-
-            # VAD buffer is a multiple of 10ms, but Silero VAD needs 32ms.
-            self._vad_buffer_chunks = int(
-                math.ceil(self.vad.chunk_bytes() / BYTES_PER_CHUNK)
-            )
-            self._vad_leftover_bytes = self.vad.chunk_bytes() - BYTES_PER_CHUNK
-            self._vad_buffer = bytearray(self.vad.chunk_bytes())
-            _LOGGER.debug("Initialized Silero VAD")
+            self.vad = MicroVad()
+            _LOGGER.debug("Initialized microVAD")
 
     def enhance_chunk(self, audio: bytes, timestamp_ms: int) -> EnhancedAudioChunk:
         """Enhance 10ms chunk of PCM audio @ 16Khz with 16-bit mono samples."""
+        speech_probability: float | None = None
+
         assert len(audio) == BYTES_PER_CHUNK
 
         if self.vad is not None:
             # Run VAD
-            assert self._vad_buffer is not None
-            start_idx = self._vad_buffer_chunk_idx * BYTES_PER_CHUNK
-            self._vad_buffer[start_idx : start_idx + BYTES_PER_CHUNK] = audio
-
-            self._vad_buffer_chunk_idx += 1
-            if self._vad_buffer_chunk_idx >= self._vad_buffer_chunks:
-                # We have enough data to run Silero VAD (32 ms)
-                self._last_speech_probability = self.vad.process_chunk(
-                    self._vad_buffer[: self.vad.chunk_bytes()]
-                )
-
-                # Copy leftover audio that wasn't processed to start
-                self._vad_buffer[: self._vad_leftover_bytes] = self._vad_buffer[
-                    -self._vad_leftover_bytes :
-                ]
-                self._vad_buffer_chunk_idx = 0
+            speech_probability = self.vad.Process10ms(audio)
 
         if self.audio_processor is not None:
             # Run noise suppression and auto gain
@@ -121,5 +92,5 @@ class SileroVadSpeexEnhancer(AudioEnhancer):
         return EnhancedAudioChunk(
             audio=audio,
             timestamp_ms=timestamp_ms,
-            speech_probability=self._last_speech_probability,
+            speech_probability=speech_probability,
         )

homeassistant/components/assist_pipeline/manifest.json

@@ -8,5 +8,5 @@
   "integration_type": "system",
   "iot_class": "local_push",
   "quality_scale": "internal",
-  "requirements": ["pysilero-vad==3.0.1", "pyspeex-noise==1.0.2"]
+  "requirements": ["pymicro-vad==1.0.1", "pyspeex-noise==1.0.2"]
 }

homeassistant/components/assist_pipeline/pipeline.py

@@ -55,7 +55,7 @@ from homeassistant.util import (
 from homeassistant.util.hass_dict import HassKey
 from homeassistant.util.limited_size_dict import LimitedSizeDict
 
-from .audio_enhancer import AudioEnhancer, EnhancedAudioChunk, SileroVadSpeexEnhancer
+from .audio_enhancer import AudioEnhancer, EnhancedAudioChunk, MicroVadSpeexEnhancer
 from .const import (
     ACKNOWLEDGE_PATH,
     BYTES_PER_CHUNK,
@@ -633,7 +633,7 @@ class PipelineRun:
         # Initialize with audio settings
         if self.audio_settings.needs_processor and (self.audio_enhancer is None):
             # Default audio enhancer
-            self.audio_enhancer = SileroVadSpeexEnhancer(
+            self.audio_enhancer = MicroVadSpeexEnhancer(
                 self.audio_settings.auto_gain_dbfs,
                 self.audio_settings.noise_suppression_level,
                 self.audio_settings.is_vad_enabled,

homeassistant/components/asuswrt/manifest.json

@@ -7,5 +7,5 @@
   "integration_type": "hub",
   "iot_class": "local_polling",
   "loggers": ["aioasuswrt", "asusrouter", "asyncssh"],
-  "requirements": ["aioasuswrt==1.5.1", "asusrouter==1.21.3"]
+  "requirements": ["aioasuswrt==1.5.1", "asusrouter==1.21.1"]
 }

homeassistant/components/august/manifest.json

@@ -29,5 +29,5 @@
   "documentation": "https://www.home-assistant.io/integrations/august",
   "iot_class": "cloud_push",
   "loggers": ["pubnub", "yalexs"],
-  "requirements": ["yalexs==9.2.0", "yalexs-ble==3.2.2"]
+  "requirements": ["yalexs==9.2.0", "yalexs-ble==3.2.1"]
 }

homeassistant/components/bang_olufsen/__init__.py

@@ -21,29 +21,29 @@ from homeassistant.helpers import device_registry as dr
 from homeassistant.util.ssl import get_default_context
 
 from .const import DOMAIN
-from .websocket import BeoWebsocket
+from .websocket import BangOlufsenWebsocket
 
 
 @dataclass
-class BeoData:
+class BangOlufsenData:
     """Dataclass for API client and WebSocket client."""
 
-    websocket: BeoWebsocket
+    websocket: BangOlufsenWebsocket
     client: MozartClient
 
 
-type BeoConfigEntry = ConfigEntry[BeoData]
+type BangOlufsenConfigEntry = ConfigEntry[BangOlufsenData]
 
 PLATFORMS = [Platform.EVENT, Platform.MEDIA_PLAYER]
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: BeoConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: BangOlufsenConfigEntry) -> bool:
     """Set up from a config entry."""
 
     # Remove casts to str
     assert entry.unique_id
 
-    # Create device now as BeoWebsocket needs a device for debug logging, firing events etc.
+    # Create device now as BangOlufsenWebsocket needs a device for debug logging, firing events etc.
     device_registry = dr.async_get(hass)
     device_registry.async_get_or_create(
         config_entry_id=entry.entry_id,
@@ -68,10 +68,10 @@ async def async_setup_entry(hass: HomeAssistant, entry: BeoConfigEntry) -> bool:
         await client.close_api_client()
         raise ConfigEntryNotReady(f"Unable to connect to {entry.title}") from error
 
-    websocket = BeoWebsocket(hass, entry, client)
+    websocket = BangOlufsenWebsocket(hass, entry, client)
 
     # Add the websocket and API client
-    entry.runtime_data = BeoData(websocket, client)
+    entry.runtime_data = BangOlufsenData(websocket, client)
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
@@ -82,7 +82,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: BeoConfigEntry) -> bool:
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: BeoConfigEntry) -> bool:
+async def async_unload_entry(
+    hass: HomeAssistant, entry: BangOlufsenConfigEntry
+) -> bool:
     """Unload a config entry."""
     # Close the API client and WebSocket notification listener
     entry.runtime_data.client.disconnect_notifications()

homeassistant/components/bang_olufsen/config_flow.py

@@ -47,7 +47,7 @@ _exception_map = {
 }
 
 
-class BeoConfigFlowHandler(ConfigFlow, domain=DOMAIN):
+class BangOlufsenConfigFlowHandler(ConfigFlow, domain=DOMAIN):
     """Handle a config flow."""
 
     _beolink_jid = ""

homeassistant/components/bang_olufsen/const.py

@@ -14,25 +14,21 @@ from homeassistant.components.media_player import (
 )
 
 
-class BeoSource:
+class BangOlufsenSource:
     """Class used for associating device source ids with friendly names. May not include all sources."""
 
-    DEEZER: Final[Source] = Source(name="Deezer", id="deezer")
     LINE_IN: Final[Source] = Source(name="Line-In", id="lineIn")
-    NET_RADIO: Final[Source] = Source(name="B&O Radio", id="netRadio")
     SPDIF: Final[Source] = Source(name="Optical", id="spdif")
-    TIDAL: Final[Source] = Source(name="Tidal", id="tidal")
-    UNKNOWN: Final[Source] = Source(name="Unknown Source", id="unknown")
     URI_STREAMER: Final[Source] = Source(name="Audio Streamer", id="uriStreamer")
 
 
-BEO_STATES: dict[str, MediaPlayerState] = {
+BANG_OLUFSEN_STATES: dict[str, MediaPlayerState] = {
     # Dict used for translating device states to Home Assistant states.
     "started": MediaPlayerState.PLAYING,
     "buffering": MediaPlayerState.PLAYING,
     "idle": MediaPlayerState.IDLE,
     "paused": MediaPlayerState.PAUSED,
-    "stopped": MediaPlayerState.IDLE,
+    "stopped": MediaPlayerState.PAUSED,
     "ended": MediaPlayerState.PAUSED,
     "error": MediaPlayerState.IDLE,
     # A device's initial state is "unknown" and should be treated as "idle"
@@ -40,19 +36,19 @@ BEO_STATES: dict[str, MediaPlayerState] = {
 }
 
 # Dict used for translating Home Assistant settings to device repeat settings.
-BEO_REPEAT_FROM_HA: dict[RepeatMode, str] = {
+BANG_OLUFSEN_REPEAT_FROM_HA: dict[RepeatMode, str] = {
     RepeatMode.ALL: "all",
     RepeatMode.ONE: "track",
     RepeatMode.OFF: "none",
 }
 # Dict used for translating device repeat settings to Home Assistant settings.
-BEO_REPEAT_TO_HA: dict[str, RepeatMode] = {
-    value: key for key, value in BEO_REPEAT_FROM_HA.items()
+BANG_OLUFSEN_REPEAT_TO_HA: dict[str, RepeatMode] = {
+    value: key for key, value in BANG_OLUFSEN_REPEAT_FROM_HA.items()
 }
 
 
 # Media types for play_media
-class BeoMediaType(StrEnum):
+class BangOlufsenMediaType(StrEnum):
     """Bang & Olufsen specific media types."""
 
     FAVOURITE = "favourite"
@@ -63,7 +59,7 @@ class BeoMediaType(StrEnum):
     OVERLAY_TTS = "overlay_tts"
 
 
-class BeoModel(StrEnum):
+class BangOlufsenModel(StrEnum):
     """Enum for compatible model names."""
 
     # Mozart devices
@@ -82,18 +78,8 @@ class BeoModel(StrEnum):
     BEOREMOTE_ONE = "Beoremote One"
 
 
-class BeoAttribute(StrEnum):
-    """Enum for extra_state_attribute keys."""
-
-    BEOLINK = "beolink"
-    BEOLINK_PEERS = "peers"
-    BEOLINK_SELF = "self"
-    BEOLINK_LEADER = "leader"
-    BEOLINK_LISTENERS = "listeners"
-
-
 # Physical "buttons" on devices
-class BeoButtons(StrEnum):
+class BangOlufsenButtons(StrEnum):
     """Enum for device buttons."""
 
     BLUETOOTH = "Bluetooth"
@@ -140,7 +126,7 @@ class WebsocketNotification(StrEnum):
 DOMAIN: Final[str] = "bang_olufsen"
 
 # Default values for configuration.
-DEFAULT_MODEL: Final[str] = BeoModel.BEOSOUND_BALANCE
+DEFAULT_MODEL: Final[str] = BangOlufsenModel.BEOSOUND_BALANCE
 
 # Configuration.
 CONF_SERIAL_NUMBER: Final = "serial_number"
@@ -148,7 +134,7 @@ CONF_BEOLINK_JID: Final = "jid"
 
 # Models to choose from in manual configuration.
 SELECTABLE_MODELS: list[str] = [
-    model.value for model in BeoModel if model != BeoModel.BEOREMOTE_ONE
+    model.value for model in BangOlufsenModel if model != BangOlufsenModel.BEOREMOTE_ONE
 ]
 
 MANUFACTURER: Final[str] = "Bang & Olufsen"
@@ -160,15 +146,15 @@ ATTR_ITEM_NUMBER: Final[str] = "in"
 ATTR_FRIENDLY_NAME: Final[str] = "fn"
 
 # Power states.
-BEO_ON: Final[str] = "on"
+BANG_OLUFSEN_ON: Final[str] = "on"
 
 VALID_MEDIA_TYPES: Final[tuple] = (
-    BeoMediaType.FAVOURITE,
-    BeoMediaType.DEEZER,
-    BeoMediaType.RADIO,
-    BeoMediaType.TTS,
-    BeoMediaType.TIDAL,
-    BeoMediaType.OVERLAY_TTS,
+    BangOlufsenMediaType.FAVOURITE,
+    BangOlufsenMediaType.DEEZER,
+    BangOlufsenMediaType.RADIO,
+    BangOlufsenMediaType.TTS,
+    BangOlufsenMediaType.TIDAL,
+    BangOlufsenMediaType.OVERLAY_TTS,
     MediaType.MUSIC,
     MediaType.URL,
     MediaType.CHANNEL,
@@ -246,7 +232,7 @@ FALLBACK_SOURCES: Final[SourceArray] = SourceArray(
 )
 
 # Device events
-BEO_WEBSOCKET_EVENT: Final[str] = f"{DOMAIN}_websocket_event"
+BANG_OLUFSEN_WEBSOCKET_EVENT: Final[str] = f"{DOMAIN}_websocket_event"
 
 # Dict used to translate native Bang & Olufsen event names to string.json compatible ones
 EVENT_TRANSLATION_MAP: dict[str, str] = {
@@ -263,7 +249,7 @@ EVENT_TRANSLATION_MAP: dict[str, str] = {
 
 CONNECTION_STATUS: Final[str] = "CONNECTION_STATUS"
 
-DEVICE_BUTTONS: Final[list[str]] = [x.value for x in BeoButtons]
+DEVICE_BUTTONS: Final[list[str]] = [x.value for x in BangOlufsenButtons]
 
 
 DEVICE_BUTTON_EVENTS: Final[list[str]] = [

homeassistant/components/bang_olufsen/diagnostics.py

@@ -10,13 +10,13 @@ from homeassistant.const import CONF_MODEL
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 
-from . import BeoConfigEntry
+from . import BangOlufsenConfigEntry
 from .const import DOMAIN
 from .util import get_device_buttons
 
 
 async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant, config_entry: BeoConfigEntry
+    hass: HomeAssistant, config_entry: BangOlufsenConfigEntry
 ) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
 

homeassistant/components/bang_olufsen/entity.py

@@ -24,8 +24,8 @@ from homeassistant.helpers.entity import Entity
 from .const import DOMAIN
 
 
-class BeoBase:
-    """Base class for Bang & Olufsen Home Assistant objects."""
+class BangOlufsenBase:
+    """Base class for BangOlufsen Home Assistant objects."""
 
     def __init__(self, entry: ConfigEntry, client: MozartClient) -> None:
         """Initialize the object."""
@@ -51,8 +51,8 @@ class BeoBase:
         )
 
 
-class BeoEntity(Entity, BeoBase):
-    """Base Entity for Bang & Olufsen entities."""
+class BangOlufsenEntity(Entity, BangOlufsenBase):
+    """Base Entity for BangOlufsen entities."""
 
     _attr_has_entity_name = True
     _attr_should_poll = False

homeassistant/components/bang_olufsen/event.py

@@ -14,7 +14,7 @@ from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from . import BeoConfigEntry
+from . import BangOlufsenConfigEntry
 from .const import (
     BEO_REMOTE_CONTROL_KEYS,
     BEO_REMOTE_KEY_EVENTS,
@@ -25,10 +25,10 @@ from .const import (
     DEVICE_BUTTON_EVENTS,
     DOMAIN,
     MANUFACTURER,
-    BeoModel,
+    BangOlufsenModel,
     WebsocketNotification,
 )
-from .entity import BeoEntity
+from .entity import BangOlufsenEntity
 from .util import get_device_buttons, get_remotes
 
 PARALLEL_UPDATES = 0
@@ -36,14 +36,14 @@ PARALLEL_UPDATES = 0
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: BeoConfigEntry,
+    config_entry: BangOlufsenConfigEntry,
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up Event entities from config entry."""
-    entities: list[BeoEvent] = []
+    entities: list[BangOlufsenEvent] = []
 
     async_add_entities(
-        BeoButtonEvent(config_entry, button_type)
+        BangOlufsenButtonEvent(config_entry, button_type)
         for button_type in get_device_buttons(config_entry.data[CONF_MODEL])
     )
 
@@ -54,7 +54,7 @@ async def async_setup_entry(
         # Add Light keys
         entities.extend(
             [
-                BeoRemoteKeyEvent(
+                BangOlufsenRemoteKeyEvent(
                     config_entry,
                     remote,
                     f"{BEO_REMOTE_SUBMENU_LIGHT}/{key_type}",
@@ -66,7 +66,7 @@ async def async_setup_entry(
         # Add Control keys
         entities.extend(
             [
-                BeoRemoteKeyEvent(
+                BangOlufsenRemoteKeyEvent(
                     config_entry,
                     remote,
                     f"{BEO_REMOTE_SUBMENU_CONTROL}/{key_type}",
@@ -84,9 +84,10 @@ async def async_setup_entry(
         config_entry.entry_id
     )
     for device in devices:
-        if device.model == BeoModel.BEOREMOTE_ONE and device.serial_number not in {
-            remote.serial_number for remote in remotes
-        }:
+        if (
+            device.model == BangOlufsenModel.BEOREMOTE_ONE
+            and device.serial_number not in {remote.serial_number for remote in remotes}
+        ):
             device_registry.async_update_device(
                 device.id, remove_config_entry_id=config_entry.entry_id
             )
@@ -94,13 +95,13 @@ async def async_setup_entry(
     async_add_entities(new_entities=entities)
 
 
-class BeoEvent(BeoEntity, EventEntity):
+class BangOlufsenEvent(BangOlufsenEntity, EventEntity):
     """Base Event class."""
 
     _attr_device_class = EventDeviceClass.BUTTON
     _attr_entity_registry_enabled_default = False
 
-    def __init__(self, config_entry: BeoConfigEntry) -> None:
+    def __init__(self, config_entry: BangOlufsenConfigEntry) -> None:
         """Initialize Event."""
         super().__init__(config_entry, config_entry.runtime_data.client)
 
@@ -111,12 +112,12 @@ class BeoEvent(BeoEntity, EventEntity):
         self.async_write_ha_state()
 
 
-class BeoButtonEvent(BeoEvent):
+class BangOlufsenButtonEvent(BangOlufsenEvent):
     """Event class for Button events."""
 
     _attr_event_types = DEVICE_BUTTON_EVENTS
 
-    def __init__(self, config_entry: BeoConfigEntry, button_type: str) -> None:
+    def __init__(self, config_entry: BangOlufsenConfigEntry, button_type: str) -> None:
         """Initialize Button."""
         super().__init__(config_entry)
 
@@ -145,14 +146,14 @@ class BeoButtonEvent(BeoEvent):
         )
 
 
-class BeoRemoteKeyEvent(BeoEvent):
+class BangOlufsenRemoteKeyEvent(BangOlufsenEvent):
     """Event class for Beoremote One key events."""
 
     _attr_event_types = BEO_REMOTE_KEY_EVENTS
 
     def __init__(
         self,
-        config_entry: BeoConfigEntry,
+        config_entry: BangOlufsenConfigEntry,
         remote: PairedRemote,
         key_type: str,
     ) -> None:
@@ -165,8 +166,8 @@ class BeoRemoteKeyEvent(BeoEvent):
         self._attr_unique_id = f"{remote.serial_number}_{self._unique_id}_{key_type}"
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, f"{remote.serial_number}_{self._unique_id}")},
-            name=f"{BeoModel.BEOREMOTE_ONE}-{remote.serial_number}-{self._unique_id}",
-            model=BeoModel.BEOREMOTE_ONE,
+            name=f"{BangOlufsenModel.BEOREMOTE_ONE}-{remote.serial_number}-{self._unique_id}",
+            model=BangOlufsenModel.BEOREMOTE_ONE,
             serial_number=remote.serial_number,
             sw_version=remote.app_version,
             manufacturer=MANUFACTURER,

homeassistant/components/bang_olufsen/manifest.json

@@ -6,6 +6,6 @@
   "documentation": "https://www.home-assistant.io/integrations/bang_olufsen",
   "integration_type": "device",
   "iot_class": "local_push",
-  "requirements": ["mozart-api==5.3.1.108.0"],
+  "requirements": ["mozart-api==5.1.0.247.1"],
   "zeroconf": ["_bangolufsen._tcp.local."]
 }

homeassistant/components/bang_olufsen/media_player.py

@@ -69,11 +69,11 @@ from homeassistant.helpers.entity_platform import (
 )
 from homeassistant.util.dt import utcnow
 
-from . import BeoConfigEntry
+from . import BangOlufsenConfigEntry
 from .const import (
-    BEO_REPEAT_FROM_HA,
-    BEO_REPEAT_TO_HA,
-    BEO_STATES,
+    BANG_OLUFSEN_REPEAT_FROM_HA,
+    BANG_OLUFSEN_REPEAT_TO_HA,
+    BANG_OLUFSEN_STATES,
     BEOLINK_JOIN_SOURCES,
     BEOLINK_JOIN_SOURCES_TO_UPPER,
     CONF_BEOLINK_JID,
@@ -82,12 +82,11 @@ from .const import (
     FALLBACK_SOURCES,
     MANUFACTURER,
     VALID_MEDIA_TYPES,
-    BeoAttribute,
-    BeoMediaType,
-    BeoSource,
+    BangOlufsenMediaType,
+    BangOlufsenSource,
     WebsocketNotification,
 )
-from .entity import BeoEntity
+from .entity import BangOlufsenEntity
 from .util import get_serial_number_from_jid
 
 PARALLEL_UPDATES = 0
@@ -96,7 +95,7 @@ SCAN_INTERVAL = timedelta(seconds=30)
 
 _LOGGER = logging.getLogger(__name__)
 
-BEO_FEATURES = (
+BANG_OLUFSEN_FEATURES = (
     MediaPlayerEntityFeature.BROWSE_MEDIA
     | MediaPlayerEntityFeature.CLEAR_PLAYLIST
     | MediaPlayerEntityFeature.GROUPING
@@ -119,13 +118,15 @@ BEO_FEATURES = (
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: BeoConfigEntry,
+    config_entry: BangOlufsenConfigEntry,
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up a Media Player entity from config entry."""
     # Add MediaPlayer entity
     async_add_entities(
-        new_entities=[BeoMediaPlayer(config_entry, config_entry.runtime_data.client)],
+        new_entities=[
+            BangOlufsenMediaPlayer(config_entry, config_entry.runtime_data.client)
+        ],
         update_before_add=True,
     )
 
@@ -185,7 +186,7 @@ async def async_setup_entry(
     )
 
 
-class BeoMediaPlayer(BeoEntity, MediaPlayerEntity):
+class BangOlufsenMediaPlayer(BangOlufsenEntity, MediaPlayerEntity):
     """Representation of a media player."""
 
     _attr_name = None
@@ -223,8 +224,7 @@ class BeoMediaPlayer(BeoEntity, MediaPlayerEntity):
         # Beolink compatible sources
         self._beolink_sources: dict[str, bool] = {}
         self._remote_leader: BeolinkLeader | None = None
-        # Extra state attributes:
-        # Beolink: peer(s), listener(s), leader and self
+        # Extra state attributes for showing Beolink: peer(s), listener(s), leader and self
         self._beolink_attributes: dict[str, dict[str, dict[str, str]]] = {}
 
     async def async_added_to_hass(self) -> None:
@@ -286,7 +286,7 @@ class BeoMediaPlayer(BeoEntity, MediaPlayerEntity):
             queue_settings = await self._client.get_settings_queue(_request_timeout=5)
 
             if queue_settings.repeat is not None:
-                self._attr_repeat = BEO_REPEAT_TO_HA[queue_settings.repeat]
+                self._attr_repeat = BANG_OLUFSEN_REPEAT_TO_HA[queue_settings.repeat]
 
             if queue_settings.shuffle is not None:
                 self._attr_shuffle = queue_settings.shuffle
@@ -406,8 +406,8 @@ class BeoMediaPlayer(BeoEntity, MediaPlayerEntity):
 
         # Check if source is line-in or optical and progress should be updated
         if self._source_change.id in (
-            BeoSource.LINE_IN.id,
-            BeoSource.SPDIF.id,
+            BangOlufsenSource.LINE_IN.id,
+            BangOlufsenSource.SPDIF.id,
         ):
             self._playback_progress = PlaybackProgress(progress=0)
 
@@ -436,10 +436,7 @@ class BeoMediaPlayer(BeoEntity, MediaPlayerEntity):
         await self._async_update_beolink()
 
     async def _async_update_beolink(self) -> None:
-        """Update the current Beolink leader, listeners, peers and self.
-
-        Updates Home Assistant state.
-        """
+        """Update the current Beolink leader, listeners, peers and self."""
 
         self._beolink_attributes = {}
 
@@ -448,22 +445,18 @@ class BeoMediaPlayer(BeoEntity, MediaPlayerEntity):
 
         # Add Beolink self
         self._beolink_attributes = {
-            BeoAttribute.BEOLINK: {
-                BeoAttribute.BEOLINK_SELF: {self.device_entry.name: self._beolink_jid}
-            }
+            "beolink": {"self": {self.device_entry.name: self._beolink_jid}}
         }
 
         # Add Beolink peers
         peers = await self._client.get_beolink_peers()
 
         if len(peers) > 0:
-            self._beolink_attributes[BeoAttribute.BEOLINK][
-                BeoAttribute.BEOLINK_PEERS
-            ] = {}
+            self._beolink_attributes["beolink"]["peers"] = {}
             for peer in peers:
-                self._beolink_attributes[BeoAttribute.BEOLINK][
-                    BeoAttribute.BEOLINK_PEERS
-                ][peer.friendly_name] = peer.jid
+                self._beolink_attributes["beolink"]["peers"][peer.friendly_name] = (
+                    peer.jid
+                )
 
         # Add Beolink listeners / leader
         self._remote_leader = self._playback_metadata.remote_leader
@@ -484,9 +477,7 @@ class BeoMediaPlayer(BeoEntity, MediaPlayerEntity):
             # Add self
             group_members.append(self.entity_id)
 
-            self._beolink_attributes[BeoAttribute.BEOLINK][
-                BeoAttribute.BEOLINK_LEADER
-            ] = {
+            self._beolink_attributes["beolink"]["leader"] = {
                 self._remote_leader.friendly_name: self._remote_leader.jid,
             }
 
@@ -523,9 +514,9 @@ class BeoMediaPlayer(BeoEntity, MediaPlayerEntity):
                                 beolink_listener.jid
                             )
                             break
-                self._beolink_attributes[BeoAttribute.BEOLINK][
-                    BeoAttribute.BEOLINK_LISTENERS
-                ] = beolink_listeners_attribute
+                self._beolink_attributes["beolink"]["listeners"] = (
+                    beolink_listeners_attribute
+                )
 
         self._attr_group_members = group_members
 
@@ -583,7 +574,7 @@ class BeoMediaPlayer(BeoEntity, MediaPlayerEntity):
         for sound_mode in sound_modes:
             label = f"{sound_mode.name} ({sound_mode.id})"
 
-            self._sound_modes[label] = cast(int, sound_mode.id)
+            self._sound_modes[label] = sound_mode.id
 
             if sound_mode.id == active_sound_mode.id:
                 self._attr_sound_mode = label
@@ -596,7 +587,7 @@ class BeoMediaPlayer(BeoEntity, MediaPlayerEntity):
     @property
     def supported_features(self) -> MediaPlayerEntityFeature:
         """Flag media player features that are supported."""
-        features = BEO_FEATURES
+        features = BANG_OLUFSEN_FEATURES
 
         # Add seeking if supported by the current source
         if self._source_change.is_seekable is True:
@@ -607,7 +598,7 @@ class BeoMediaPlayer(BeoEntity, MediaPlayerEntity):
     @property
     def state(self) -> MediaPlayerState:
         """Return the current state of the media player."""
-        return BEO_STATES[self._state]
+        return BANG_OLUFSEN_STATES[self._state]
 
     @property
     def volume_level(self) -> float | None:
@@ -624,18 +615,11 @@ class BeoMediaPlayer(BeoEntity, MediaPlayerEntity):
         return None
 
     @property
-    def media_content_type(self) -> MediaType | str | None:
+    def media_content_type(self) -> str:
         """Return the current media type."""
-        content_type = {
-            BeoSource.URI_STREAMER.id: MediaType.URL,
-            BeoSource.DEEZER.id: BeoMediaType.DEEZER,
-            BeoSource.TIDAL.id: BeoMediaType.TIDAL,
-            BeoSource.NET_RADIO.id: BeoMediaType.RADIO,
-        }
-        # Hard to determine content type.
-        if self._source_change.id in content_type:
-            return content_type[self._source_change.id]
-
+        # Hard to determine content type
+        if self._source_change.id == BangOlufsenSource.URI_STREAMER.id:
+            return MediaType.URL
         return MediaType.MUSIC
 
     @property
@@ -648,11 +632,6 @@ class BeoMediaPlayer(BeoEntity, MediaPlayerEntity):
         """Return the current playback progress."""
         return self._playback_progress.progress
 
-    @property
-    def media_content_id(self) -> str | None:
-        """Return internal ID of Deezer, Tidal and radio stations."""
-        return self._playback_metadata.source_internal_id
-
     @property
     def media_image_url(self) -> str | None:
         """Return URL of the currently playing music."""
@@ -761,7 +740,9 @@ class BeoMediaPlayer(BeoEntity, MediaPlayerEntity):
     async def async_set_repeat(self, repeat: RepeatMode) -> None:
         """Set playback queues to repeat."""
         await self._client.set_settings_queue(
-            play_queue_settings=PlayQueueSettings(repeat=BEO_REPEAT_FROM_HA[repeat])
+            play_queue_settings=PlayQueueSettings(
+                repeat=BANG_OLUFSEN_REPEAT_FROM_HA[repeat]
+            )
         )
 
     async def async_set_shuffle(self, shuffle: bool) -> None:
@@ -865,7 +846,7 @@ class BeoMediaPlayer(BeoEntity, MediaPlayerEntity):
                         self._volume.level.level + offset_volume, 100
                     )
 
-            if media_type == BeoMediaType.OVERLAY_TTS:
+            if media_type == BangOlufsenMediaType.OVERLAY_TTS:
                 # Bang & Olufsen cloud TTS
                 overlay_play_request.text_to_speech = (
                     OverlayPlayRequestTextToSpeechTextToSpeech(
@@ -882,14 +863,14 @@ class BeoMediaPlayer(BeoEntity, MediaPlayerEntity):
 
         # The "provider" media_type may not be suitable for overlay all the time.
         # Use it for now.
-        elif media_type == BeoMediaType.TTS:
+        elif media_type == BangOlufsenMediaType.TTS:
             await self._client.post_overlay_play(
                 overlay_play_request=OverlayPlayRequest(
                     uri=Uri(location=media_id),
                 )
             )
 
-        elif media_type == BeoMediaType.RADIO:
+        elif media_type == BangOlufsenMediaType.RADIO:
             await self._client.run_provided_scene(
                 scene_properties=SceneProperties(
                     action_list=[
@@ -901,13 +882,13 @@ class BeoMediaPlayer(BeoEntity, MediaPlayerEntity):
                 )
             )
 
-        elif media_type == BeoMediaType.FAVOURITE:
+        elif media_type == BangOlufsenMediaType.FAVOURITE:
             await self._client.activate_preset(id=int(media_id))
 
-        elif media_type in (BeoMediaType.DEEZER, BeoMediaType.TIDAL):
+        elif media_type in (BangOlufsenMediaType.DEEZER, BangOlufsenMediaType.TIDAL):
             try:
                 # Play Deezer flow.
-                if media_id == "flow" and media_type == BeoMediaType.DEEZER:
+                if media_id == "flow" and media_type == BangOlufsenMediaType.DEEZER:
                     deezer_id = None
 
                     if "id" in kwargs[ATTR_MEDIA_EXTRA]:

homeassistant/components/bang_olufsen/util.py

@@ -11,7 +11,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.device_registry import DeviceEntry
 
-from .const import DEVICE_BUTTONS, DOMAIN, BeoButtons, BeoModel
+from .const import DEVICE_BUTTONS, DOMAIN, BangOlufsenButtons, BangOlufsenModel
 
 
 def get_device(hass: HomeAssistant, unique_id: str) -> DeviceEntry:
@@ -40,27 +40,16 @@ async def get_remotes(client: MozartClient) -> list[PairedRemote]:
     ]
 
 
-def get_device_buttons(model: BeoModel) -> list[str]:
+def get_device_buttons(model: BangOlufsenModel) -> list[str]:
     """Get supported buttons for a given model."""
-    # Beoconnect Core does not have any buttons
-    if model == BeoModel.BEOCONNECT_CORE:
-        return []
-
     buttons = DEVICE_BUTTONS.copy()
 
-    # Models that don't have a microphone button
-    if model in (
-        BeoModel.BEOSOUND_A5,
-        BeoModel.BEOSOUND_A9,
-        BeoModel.BEOSOUND_PREMIERE,
-    ):
-        buttons.remove(BeoButtons.MICROPHONE)
+    # Beosound Premiere does not have a bluetooth button
+    if model == BangOlufsenModel.BEOSOUND_PREMIERE:
+        buttons.remove(BangOlufsenButtons.BLUETOOTH)
 
-    # Models that don't have a Bluetooth button
-    if model in (
-        BeoModel.BEOSOUND_A9,
-        BeoModel.BEOSOUND_PREMIERE,
-    ):
-        buttons.remove(BeoButtons.BLUETOOTH)
+    # Beoconnect Core does not have any buttons
+    elif model == BangOlufsenModel.BEOCONNECT_CORE:
+        buttons = []
 
     return buttons

homeassistant/components/bang_olufsen/websocket.py

@@ -27,20 +27,20 @@ from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.util.enum import try_parse_enum
 
 from .const import (
-    BEO_WEBSOCKET_EVENT,
+    BANG_OLUFSEN_WEBSOCKET_EVENT,
     CONNECTION_STATUS,
     DOMAIN,
     EVENT_TRANSLATION_MAP,
-    BeoModel,
+    BangOlufsenModel,
     WebsocketNotification,
 )
-from .entity import BeoBase
+from .entity import BangOlufsenBase
 from .util import get_device, get_remotes
 
 _LOGGER = logging.getLogger(__name__)
 
 
-class BeoWebsocket(BeoBase):
+class BangOlufsenWebsocket(BangOlufsenBase):
     """The WebSocket listeners."""
 
     def __init__(
@@ -48,7 +48,7 @@ class BeoWebsocket(BeoBase):
     ) -> None:
         """Initialize the WebSocket listeners."""
 
-        BeoBase.__init__(self, entry, client)
+        BangOlufsenBase.__init__(self, entry, client)
 
         self.hass = hass
         self._device = get_device(hass, self._unique_id)
@@ -178,7 +178,7 @@ class BeoWebsocket(BeoBase):
                     self.entry.entry_id
                 )
                 if device.serial_number is not None
-                and device.model == BeoModel.BEOREMOTE_ONE
+                and device.model == BangOlufsenModel.BEOREMOTE_ONE
             ]
             # Get paired remotes from device
             remote_serial_numbers = [
@@ -274,4 +274,4 @@ class BeoWebsocket(BeoBase):
         }
 
         _LOGGER.debug("%s", debug_notification)
-        self.hass.bus.async_fire(BEO_WEBSOCKET_EVENT, debug_notification)
+        self.hass.bus.async_fire(BANG_OLUFSEN_WEBSOCKET_EVENT, debug_notification)

homeassistant/components/blink/manifest.json

@@ -20,5 +20,5 @@
   "documentation": "https://www.home-assistant.io/integrations/blink",
   "iot_class": "cloud_polling",
   "loggers": ["blinkpy"],
-  "requirements": ["blinkpy==0.25.1"]
+  "requirements": ["blinkpy==0.24.1"]
 }

homeassistant/components/bluetooth/manifest.json

@@ -15,12 +15,12 @@
   ],
   "quality_scale": "internal",
   "requirements": [
-    "bleak==2.0.0",
+    "bleak==1.0.1",
     "bleak-retry-connector==4.4.3",
     "bluetooth-adapters==2.1.0",
     "bluetooth-auto-recovery==1.5.3",
     "bluetooth-data-tools==1.28.4",
     "dbus-fast==3.1.2",
-    "habluetooth==5.8.0"
+    "habluetooth==5.7.0"
   ]
 }

homeassistant/components/bsblan/climate.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Any, Final
+from typing import Any
 
 from bsblan import BSBLANError
 
@@ -17,7 +17,7 @@ from homeassistant.components.climate import (
 )
 from homeassistant.const import ATTR_TEMPERATURE
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError
+from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
 from homeassistant.helpers.device_registry import format_mac
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.util.enum import try_parse_enum
@@ -39,22 +39,6 @@ PRESET_MODES = [
     PRESET_NONE,
 ]
 
-# Mapping from Home Assistant HVACMode to BSB-Lan integer values
-# BSB-Lan uses: 0=off, 1=auto, 2=eco/reduced, 3=heat/comfort
-HA_TO_BSBLAN_HVAC_MODE: Final[dict[HVACMode, int]] = {
-    HVACMode.OFF: 0,
-    HVACMode.AUTO: 1,
-    HVACMode.HEAT: 3,
-}
-
-# Mapping from BSB-Lan integer values to Home Assistant HVACMode
-BSBLAN_TO_HA_HVAC_MODE: Final[dict[int, HVACMode]] = {
-    0: HVACMode.OFF,
-    1: HVACMode.AUTO,
-    2: HVACMode.AUTO,  # eco/reduced maps to AUTO with preset
-    3: HVACMode.HEAT,
-}
-
 
 async def async_setup_entry(
     hass: HomeAssistant,
@@ -114,20 +98,17 @@ class BSBLANClimate(BSBLanEntity, ClimateEntity):
     @property
     def hvac_mode(self) -> HVACMode | None:
         """Return hvac operation ie. heat, cool mode."""
-        hvac_mode_value = self.coordinator.data.state.hvac_mode.value
-        if hvac_mode_value is None:
-            return None
-        # BSB-Lan returns integer values: 0=off, 1=auto, 2=eco, 3=heat
-        if isinstance(hvac_mode_value, int):
-            return BSBLAN_TO_HA_HVAC_MODE.get(hvac_mode_value)
-        return try_parse_enum(HVACMode, hvac_mode_value)
+        if self.coordinator.data.state.hvac_mode.value == PRESET_ECO:
+            return HVACMode.AUTO
+        return try_parse_enum(HVACMode, self.coordinator.data.state.hvac_mode.value)
 
     @property
     def preset_mode(self) -> str | None:
         """Return the current preset mode."""
-        hvac_mode_value = self.coordinator.data.state.hvac_mode.value
-        # BSB-Lan mode 2 is eco/reduced mode
-        if hvac_mode_value == 2:
+        if (
+            self.hvac_mode == HVACMode.AUTO
+            and self.coordinator.data.state.hvac_mode.value == PRESET_ECO
+        ):
             return PRESET_ECO
         return PRESET_NONE
 
@@ -137,6 +118,13 @@ class BSBLANClimate(BSBLanEntity, ClimateEntity):
 
     async def async_set_preset_mode(self, preset_mode: str) -> None:
         """Set preset mode."""
+        if self.hvac_mode != HVACMode.AUTO and preset_mode != PRESET_NONE:
+            raise ServiceValidationError(
+                "Preset mode can only be set when HVAC mode is set to 'auto'",
+                translation_domain=DOMAIN,
+                translation_key="set_preset_mode_error",
+                translation_placeholders={"preset_mode": preset_mode},
+            )
         await self.async_set_data(preset_mode=preset_mode)
 
     async def async_set_temperature(self, **kwargs: Any) -> None:
@@ -145,17 +133,16 @@ class BSBLANClimate(BSBLanEntity, ClimateEntity):
 
     async def async_set_data(self, **kwargs: Any) -> None:
         """Set device settings using BSBLAN."""
-        data: dict[str, Any] = {}
+        data = {}
         if ATTR_TEMPERATURE in kwargs:
             data[ATTR_TARGET_TEMPERATURE] = kwargs[ATTR_TEMPERATURE]
         if ATTR_HVAC_MODE in kwargs:
-            data[ATTR_HVAC_MODE] = HA_TO_BSBLAN_HVAC_MODE[kwargs[ATTR_HVAC_MODE]]
+            data[ATTR_HVAC_MODE] = kwargs[ATTR_HVAC_MODE]
         if ATTR_PRESET_MODE in kwargs:
-            # eco preset uses BSB-Lan mode 2, none preset uses mode 1 (auto)
             if kwargs[ATTR_PRESET_MODE] == PRESET_ECO:
-                data[ATTR_HVAC_MODE] = 2
+                data[ATTR_HVAC_MODE] = PRESET_ECO
             elif kwargs[ATTR_PRESET_MODE] == PRESET_NONE:
-                data[ATTR_HVAC_MODE] = 1
+                data[ATTR_HVAC_MODE] = PRESET_NONE
 
         try:
             await self.coordinator.client.thermostat(**data)

homeassistant/components/bsblan/manifest.json

@@ -7,7 +7,7 @@
   "integration_type": "device",
   "iot_class": "local_polling",
   "loggers": ["bsblan"],
-  "requirements": ["python-bsblan==3.1.3"],
+  "requirements": ["python-bsblan==3.1.1"],
   "zeroconf": [
     {
       "name": "bsb-lan*",

homeassistant/components/bsblan/water_heater.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from typing import Any
 
-from bsblan import BSBLANError, SetHotWaterParam
+from bsblan import BSBLANError
 
 from homeassistant.components.water_heater import (
     STATE_ECO,
@@ -131,9 +131,7 @@ class BSBLANWaterHeater(BSBLanDualCoordinatorEntity, WaterHeaterEntity):
         """Set new target temperature."""
         temperature = kwargs.get(ATTR_TEMPERATURE)
         try:
-            await self.coordinator.client.set_hot_water(
-                SetHotWaterParam(nominal_setpoint=temperature)
-            )
+            await self.coordinator.client.set_hot_water(nominal_setpoint=temperature)
         except BSBLANError as err:
             raise HomeAssistantError(
                 translation_domain=DOMAIN,
@@ -146,9 +144,7 @@ class BSBLANWaterHeater(BSBLanDualCoordinatorEntity, WaterHeaterEntity):
         """Set new operation mode."""
         bsblan_mode = OPERATION_MODES_REVERSE.get(operation_mode)
         try:
-            await self.coordinator.client.set_hot_water(
-                SetHotWaterParam(operating_mode=bsblan_mode)
-            )
+            await self.coordinator.client.set_hot_water(operating_mode=bsblan_mode)
         except BSBLANError as err:
             raise HomeAssistantError(
                 translation_domain=DOMAIN,

homeassistant/components/camera/__init__.py

@@ -20,7 +20,7 @@ from aiohttp import hdrs, web
 import attr
 from propcache.api import cached_property, under_cached_property
 import voluptuous as vol
-from webrtc_models import RTCIceCandidateInit
+from webrtc_models import RTCIceCandidateInit, RTCIceServer
 
 from homeassistant.components import websocket_api
 from homeassistant.components.http import KEY_AUTHENTICATED, HomeAssistantView
@@ -37,7 +37,6 @@ from homeassistant.components.stream import (
     Stream,
     create_stream,
 )
-from homeassistant.components.web_rtc import async_get_ice_servers
 from homeassistant.components.websocket_api import ActiveConnection
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
@@ -85,6 +84,7 @@ from .prefs import (
     get_dynamic_camera_stream_settings,
 )
 from .webrtc import (
+    DATA_ICE_SERVERS,
     CameraWebRTCProvider,
     WebRTCAnswer,  # noqa: F401
     WebRTCCandidate,  # noqa: F401
@@ -93,6 +93,7 @@ from .webrtc import (
     WebRTCMessage,  # noqa: F401
     WebRTCSendMessage,
     async_get_supported_provider,
+    async_register_ice_servers,
     async_register_webrtc_provider,  # noqa: F401
     async_register_ws,
 )
@@ -399,6 +400,20 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
         SERVICE_RECORD, CAMERA_SERVICE_RECORD, async_handle_record_service
     )
 
+    @callback
+    def get_ice_servers() -> list[RTCIceServer]:
+        if hass.config.webrtc.ice_servers:
+            return hass.config.webrtc.ice_servers
+        return [
+            RTCIceServer(
+                urls=[
+                    "stun:stun.home-assistant.io:3478",
+                    "stun:stun.home-assistant.io:80",
+                ]
+            ),
+        ]
+
+    async_register_ice_servers(hass, get_ice_servers)
     return True
 
 
@@ -716,7 +731,11 @@ class Camera(Entity, cached_properties=CACHED_PROPERTIES_WITH_ATTR_):
         """Return the WebRTC client configuration and extend it with the registered ice servers."""
         config = self._async_get_webrtc_client_configuration()
 
-        ice_servers = async_get_ice_servers(self.hass)
+        ice_servers = [
+            server
+            for servers in self.hass.data.get(DATA_ICE_SERVERS, [])
+            for server in servers()
+        ]
         config.configuration.ice_servers.extend(ice_servers)
 
         return config

homeassistant/components/camera/manifest.json

@@ -3,7 +3,7 @@
   "name": "Camera",
   "after_dependencies": ["media_player"],
   "codeowners": ["@home-assistant/core"],
-  "dependencies": ["http", "web_rtc"],
+  "dependencies": ["http"],
   "documentation": "https://www.home-assistant.io/integrations/camera",
   "integration_type": "entity",
   "quality_scale": "internal",

homeassistant/components/camera/webrtc.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from abc import ABC, abstractmethod
 import asyncio
-from collections.abc import Awaitable, Callable
+from collections.abc import Awaitable, Callable, Iterable
 from dataclasses import asdict, dataclass, field
 from functools import cache, partial, wraps
 import logging
@@ -12,7 +12,12 @@ from typing import TYPE_CHECKING, Any
 
 from mashumaro import MissingField
 import voluptuous as vol
-from webrtc_models import RTCConfiguration, RTCIceCandidate, RTCIceCandidateInit
+from webrtc_models import (
+    RTCConfiguration,
+    RTCIceCandidate,
+    RTCIceCandidateInit,
+    RTCIceServer,
+)
 
 from homeassistant.components import websocket_api
 from homeassistant.core import HomeAssistant, callback
@@ -33,6 +38,9 @@ _LOGGER = logging.getLogger(__name__)
 DATA_WEBRTC_PROVIDERS: HassKey[set[CameraWebRTCProvider]] = HassKey(
     "camera_webrtc_providers"
 )
+DATA_ICE_SERVERS: HassKey[list[Callable[[], Iterable[RTCIceServer]]]] = HassKey(
+    "camera_webrtc_ice_servers"
+)
 
 
 _WEBRTC = "WebRTC"
@@ -359,3 +367,21 @@ async def async_get_supported_provider(
             return provider
 
     return None
+
+
+@callback
+def async_register_ice_servers(
+    hass: HomeAssistant,
+    get_ice_server_fn: Callable[[], Iterable[RTCIceServer]],
+) -> Callable[[], None]:
+    """Register a ICE server.
+
+    The registering integration is responsible to implement caching if needed.
+    """
+    servers = hass.data.setdefault(DATA_ICE_SERVERS, [])
+
+    def remove() -> None:
+        servers.remove(get_ice_server_fn)
+
+    servers.append(get_ice_server_fn)
+    return remove

homeassistant/components/cloud/client.py

@@ -19,8 +19,8 @@ from homeassistant.components.alexa import (
     errors as alexa_errors,
     smart_home as alexa_smart_home,
 )
+from homeassistant.components.camera import async_register_ice_servers
 from homeassistant.components.google_assistant import smart_home as ga
-from homeassistant.components.web_rtc import async_register_ice_servers
 from homeassistant.const import __version__ as HA_VERSION
 from homeassistant.core import Context, HassJob, HomeAssistant, callback
 from homeassistant.helpers.aiohttp_client import SERVER_SOFTWARE

homeassistant/components/cloud/manifest.json

@@ -8,7 +8,7 @@
     "google_assistant"
   ],
   "codeowners": ["@home-assistant/cloud"],
-  "dependencies": ["auth", "http", "repairs", "webhook", "web_rtc"],
+  "dependencies": ["auth", "http", "repairs", "webhook"],
   "documentation": "https://www.home-assistant.io/integrations/cloud",
   "integration_type": "system",
   "iot_class": "cloud_push",

homeassistant/components/color_extractor/__init__.py

@@ -1,19 +1,157 @@
 """Module for color_extractor (RGB extraction from images) component."""
 
+import asyncio
+import io
+import logging
+
+import aiohttp
+from colorthief import ColorThief
+from PIL import UnidentifiedImageError
+import voluptuous as vol
+
+from homeassistant.components.light import (
+    ATTR_RGB_COLOR,
+    DOMAIN as LIGHT_DOMAIN,
+    LIGHT_TURN_ON_SCHEMA,
+)
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import config_validation as cv
+from homeassistant.const import SERVICE_TURN_ON as LIGHT_SERVICE_TURN_ON
+from homeassistant.core import HomeAssistant, ServiceCall
+from homeassistant.helpers import aiohttp_client, config_validation as cv
 from homeassistant.helpers.typing import ConfigType
 
-from .const import DOMAIN
-from .services import async_setup_services
+from .const import ATTR_PATH, ATTR_URL, DOMAIN, SERVICE_TURN_ON
+
+_LOGGER = logging.getLogger(__name__)
 
 CONFIG_SCHEMA = cv.removed(DOMAIN, raise_if_present=False)
 
+# Extend the existing light.turn_on service schema
+SERVICE_SCHEMA = vol.All(
+    cv.has_at_least_one_key(ATTR_URL, ATTR_PATH),
+    cv.make_entity_service_schema(
+        {
+            **LIGHT_TURN_ON_SCHEMA,
+            vol.Exclusive(ATTR_PATH, "color_extractor"): cv.isfile,
+            vol.Exclusive(ATTR_URL, "color_extractor"): cv.url,
+        }
+    ),
+)
+
+
+def _get_file(file_path):
+    """Get a PIL acceptable input file reference.
+
+    Allows us to mock patch during testing to make BytesIO stream.
+    """
+    return file_path
+
+
+def _get_color(file_handler) -> tuple:
+    """Given an image file, extract the predominant color from it."""
+    color_thief = ColorThief(file_handler)
+
+    # get_color returns a SINGLE RGB value for the given image
+    color = color_thief.get_color(quality=1)
+
+    _LOGGER.debug("Extracted RGB color %s from image", color)
+
+    return color
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Set up the Color extractor component."""
-    async_setup_services(hass)
+
+    async def async_handle_service(service_call: ServiceCall) -> None:
+        """Decide which color_extractor method to call based on service."""
+        service_data = dict(service_call.data)
+
+        try:
+            if ATTR_URL in service_data:
+                image_type = "URL"
+                image_reference = service_data.pop(ATTR_URL)
+                color = await async_extract_color_from_url(image_reference)
+
+            elif ATTR_PATH in service_data:
+                image_type = "file path"
+                image_reference = service_data.pop(ATTR_PATH)
+                color = await hass.async_add_executor_job(
+                    extract_color_from_path, image_reference
+                )
+
+        except UnidentifiedImageError as ex:
+            _LOGGER.error(
+                "Bad image from %s '%s' provided, are you sure it's an image? %s",
+                image_type,
+                image_reference,
+                ex,
+            )
+            return
+
+        if color:
+            service_data[ATTR_RGB_COLOR] = color
+
+            await hass.services.async_call(
+                LIGHT_DOMAIN, LIGHT_SERVICE_TURN_ON, service_data, blocking=True
+            )
+
+    hass.services.async_register(
+        DOMAIN,
+        SERVICE_TURN_ON,
+        async_handle_service,
+        schema=SERVICE_SCHEMA,
+    )
+
+    async def async_extract_color_from_url(url):
+        """Handle call for URL based image."""
+        if not hass.config.is_allowed_external_url(url):
+            _LOGGER.error(
+                (
+                    "External URL '%s' is not allowed, please add to"
+                    " 'allowlist_external_urls'"
+                ),
+                url,
+            )
+            return None
+
+        _LOGGER.debug("Getting predominant RGB from image URL '%s'", url)
+
+        # Download the image into a buffer for ColorThief to check against
+        try:
+            session = aiohttp_client.async_get_clientsession(hass)
+
+            async with asyncio.timeout(10):
+                response = await session.get(url)
+
+        except (TimeoutError, aiohttp.ClientError) as err:
+            _LOGGER.error("Failed to get ColorThief image due to HTTPError: %s", err)
+            return None
+
+        content = await response.content.read()
+
+        with io.BytesIO(content) as _file:
+            _file.name = "color_extractor.jpg"
+            _file.seek(0)
+
+            return _get_color(_file)
+
+    def extract_color_from_path(file_path):
+        """Handle call for local file based image."""
+        if not hass.config.is_allowed_path(file_path):
+            _LOGGER.error(
+                (
+                    "File path '%s' is not allowed, please add to"
+                    " 'allowlist_external_dirs'"
+                ),
+                file_path,
+            )
+            return None
+
+        _LOGGER.debug("Getting predominant RGB from file path '%s'", file_path)
+
+        _file = _get_file(file_path)
+        return _get_color(_file)
+
     return True
 
 

homeassistant/components/color_extractor/services.py

@@ -1,156 +0,0 @@
-"""Module for color_extractor (RGB extraction from images) component."""
-
-import asyncio
-import io
-import logging
-
-import aiohttp
-from colorthief import ColorThief
-from PIL import UnidentifiedImageError
-import voluptuous as vol
-
-from homeassistant.components.light import (
-    ATTR_RGB_COLOR,
-    DOMAIN as LIGHT_DOMAIN,
-    LIGHT_TURN_ON_SCHEMA,
-)
-from homeassistant.const import SERVICE_TURN_ON as LIGHT_SERVICE_TURN_ON
-from homeassistant.core import HomeAssistant, ServiceCall, callback
-from homeassistant.helpers import aiohttp_client, config_validation as cv
-
-from .const import ATTR_PATH, ATTR_URL, DOMAIN, SERVICE_TURN_ON
-
-_LOGGER = logging.getLogger(__name__)
-
-# Extend the existing light.turn_on service schema
-SERVICE_SCHEMA = vol.All(
-    cv.has_at_least_one_key(ATTR_URL, ATTR_PATH),
-    cv.make_entity_service_schema(
-        {
-            **LIGHT_TURN_ON_SCHEMA,
-            vol.Exclusive(ATTR_PATH, "color_extractor"): cv.isfile,
-            vol.Exclusive(ATTR_URL, "color_extractor"): cv.url,
-        }
-    ),
-)
-
-
-def _get_file(file_path: str) -> str:
-    """Get a PIL acceptable input file reference.
-
-    Allows us to mock patch during testing to make BytesIO stream.
-    """
-    return file_path
-
-
-def _get_color(file_handler: io.BytesIO | str) -> tuple[int, int, int]:
-    """Given an image file, extract the predominant color from it."""
-    color_thief = ColorThief(file_handler)
-
-    # get_color returns a SINGLE RGB value for the given image
-    color = color_thief.get_color(quality=1)
-
-    _LOGGER.debug("Extracted RGB color %s from image", color)
-
-    return color
-
-
-async def _async_extract_color_from_url(
-    hass: HomeAssistant, url: str
-) -> tuple[int, int, int] | None:
-    """Handle call for URL based image."""
-    if not hass.config.is_allowed_external_url(url):
-        _LOGGER.error(
-            (
-                "External URL '%s' is not allowed, please add to"
-                " 'allowlist_external_urls'"
-            ),
-            url,
-        )
-        return None
-
-    _LOGGER.debug("Getting predominant RGB from image URL '%s'", url)
-
-    # Download the image into a buffer for ColorThief to check against
-    try:
-        session = aiohttp_client.async_get_clientsession(hass)
-
-        async with asyncio.timeout(10):
-            response = await session.get(url)
-
-    except (TimeoutError, aiohttp.ClientError) as err:
-        _LOGGER.error("Failed to get ColorThief image due to HTTPError: %s", err)
-        return None
-
-    content = await response.content.read()
-
-    with io.BytesIO(content) as _file:
-        _file.name = "color_extractor.jpg"
-        _file.seek(0)
-
-        return _get_color(_file)
-
-
-def _extract_color_from_path(
-    hass: HomeAssistant, file_path: str
-) -> tuple[int, int, int] | None:
-    """Handle call for local file based image."""
-    if not hass.config.is_allowed_path(file_path):
-        _LOGGER.error(
-            "File path '%s' is not allowed, please add to 'allowlist_external_dirs'",
-            file_path,
-        )
-        return None
-
-    _LOGGER.debug("Getting predominant RGB from file path '%s'", file_path)
-
-    _file = _get_file(file_path)
-    return _get_color(_file)
-
-
-async def async_handle_service(service_call: ServiceCall) -> None:
-    """Decide which color_extractor method to call based on service."""
-    service_data = dict(service_call.data)
-
-    try:
-        if ATTR_URL in service_data:
-            image_type = "URL"
-            image_reference = service_data.pop(ATTR_URL)
-            color = await _async_extract_color_from_url(
-                service_call.hass, image_reference
-            )
-
-        elif ATTR_PATH in service_data:
-            image_type = "file path"
-            image_reference = service_data.pop(ATTR_PATH)
-            color = await service_call.hass.async_add_executor_job(
-                _extract_color_from_path, service_call.hass, image_reference
-            )
-
-    except UnidentifiedImageError as ex:
-        _LOGGER.error(
-            "Bad image from %s '%s' provided, are you sure it's an image? %s",
-            image_type,
-            image_reference,
-            ex,
-        )
-        return
-
-    if color:
-        service_data[ATTR_RGB_COLOR] = color
-
-        await service_call.hass.services.async_call(
-            LIGHT_DOMAIN, LIGHT_SERVICE_TURN_ON, service_data, blocking=True
-        )
-
-
-@callback
-def async_setup_services(hass: HomeAssistant) -> None:
-    """Register the services."""
-
-    hass.services.async_register(
-        DOMAIN,
-        SERVICE_TURN_ON,
-        async_handle_service,
-        schema=SERVICE_SCHEMA,
-    )

homeassistant/components/coolmaster/climate.py

@@ -8,10 +8,6 @@ from typing import Any
 from pycoolmasternet_async import SWING_MODES
 
 from homeassistant.components.climate import (
-    FAN_AUTO,
-    FAN_HIGH,
-    FAN_LOW,
-    FAN_MEDIUM,
     ClimateEntity,
     ClimateEntityFeature,
     HVACMode,
@@ -35,16 +31,7 @@ CM_TO_HA_STATE = {
 
 HA_STATE_TO_CM = {value: key for key, value in CM_TO_HA_STATE.items()}
 
-CM_TO_HA_FAN = {
-    "low": FAN_LOW,
-    "med": FAN_MEDIUM,
-    "high": FAN_HIGH,
-    "auto": FAN_AUTO,
-}
-
-HA_FAN_TO_CM = {value: key for key, value in CM_TO_HA_FAN.items()}
-
-FAN_MODES = list(CM_TO_HA_FAN.values())
+FAN_MODES = ["low", "med", "high", "auto"]
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -124,7 +111,7 @@ class CoolmasterClimate(CoolmasterEntity, ClimateEntity):
     @property
     def fan_mode(self):
         """Return the fan setting."""
-        return CM_TO_HA_FAN[self._unit.fan_speed]
+        return self._unit.fan_speed
 
     @property
     def fan_modes(self):
@@ -151,7 +138,7 @@ class CoolmasterClimate(CoolmasterEntity, ClimateEntity):
     async def async_set_fan_mode(self, fan_mode: str) -> None:
         """Set new fan mode."""
         _LOGGER.debug("Setting fan mode of %s to %s", self.unique_id, fan_mode)
-        self._unit = await self._unit.set_fan_speed(HA_FAN_TO_CM[fan_mode])
+        self._unit = await self._unit.set_fan_speed(fan_mode)
         self.async_write_ha_state()
 
     async def async_set_swing_mode(self, swing_mode: str) -> None:

homeassistant/components/cync/manifest.json

@@ -7,5 +7,5 @@
   "integration_type": "hub",
   "iot_class": "cloud_push",
   "quality_scale": "bronze",
-  "requirements": ["pycync==0.5.0"]
+  "requirements": ["pycync==0.4.3"]
 }

homeassistant/components/device_automation/condition.py

@@ -56,6 +56,7 @@ class DeviceAutomationConditionProtocol(Protocol):
 class DeviceCondition(Condition):
     """Device condition."""
 
+    _hass: HomeAssistant
     _config: ConfigType
 
     @classmethod
@@ -86,7 +87,7 @@ class DeviceCondition(Condition):
 
     def __init__(self, hass: HomeAssistant, config: ConditionConfig) -> None:
         """Initialize condition."""
-        super().__init__(hass, config)
+        self._hass = hass
         assert config.options is not None
         self._config = config.options
 

homeassistant/components/dnsip/manifest.json

@@ -5,5 +5,5 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/dnsip",
   "iot_class": "cloud_polling",
-  "requirements": ["aiodns==3.6.0"]
+  "requirements": ["aiodns==3.5.0"]
 }

homeassistant/components/doorbird/manifest.json

@@ -7,7 +7,7 @@
   "documentation": "https://www.home-assistant.io/integrations/doorbird",
   "iot_class": "local_push",
   "loggers": ["doorbirdpy"],
-  "requirements": ["DoorBirdPy==3.0.11"],
+  "requirements": ["DoorBirdPy==3.0.8"],
   "zeroconf": [
     {
       "properties": {

homeassistant/components/duckdns/__init__.py

@@ -2,22 +2,33 @@
 
 from __future__ import annotations
 
+from collections.abc import Callable, Coroutine, Sequence
+from datetime import datetime, timedelta
 import logging
+from typing import Any, cast
 
+from aiohttp import ClientSession
 import voluptuous as vol
 
-from homeassistant.config_entries import SOURCE_IMPORT
+from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
 from homeassistant.const import CONF_ACCESS_TOKEN, CONF_DOMAIN
-from homeassistant.core import HomeAssistant, ServiceCall
+from homeassistant.core import (
+    CALLBACK_TYPE,
+    HassJob,
+    HomeAssistant,
+    ServiceCall,
+    callback,
+)
 from homeassistant.exceptions import ServiceValidationError
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.event import async_call_later
 from homeassistant.helpers.selector import ConfigEntrySelector
 from homeassistant.helpers.typing import ConfigType
+from homeassistant.loader import bind_hass
+from homeassistant.util import dt as dt_util
 
 from .const import ATTR_CONFIG_ENTRY
-from .coordinator import DuckDnsConfigEntry, DuckDnsUpdateCoordinator
-from .helpers import update_duckdns
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -25,8 +36,17 @@ ATTR_TXT = "txt"
 
 DOMAIN = "duckdns"
 
+INTERVAL = timedelta(minutes=5)
+BACKOFF_INTERVALS = (
+    INTERVAL,
+    timedelta(minutes=1),
+    timedelta(minutes=5),
+    timedelta(minutes=15),
+    timedelta(minutes=30),
+)
 SERVICE_SET_TXT = "set_txt"
 
+UPDATE_URL = "https://www.duckdns.org/update"
 
 CONFIG_SCHEMA = vol.Schema(
     {
@@ -51,6 +71,8 @@ SERVICE_TXT_SCHEMA = vol.Schema(
     }
 )
 
+type DuckDnsConfigEntry = ConfigEntry
+
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     """Initialize the DuckDNS component."""
@@ -77,12 +99,21 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
 async def async_setup_entry(hass: HomeAssistant, entry: DuckDnsConfigEntry) -> bool:
     """Set up Duck DNS from a config entry."""
 
-    coordinator = DuckDnsUpdateCoordinator(hass, entry)
-    await coordinator.async_config_entry_first_refresh()
-    entry.runtime_data = coordinator
+    session = async_get_clientsession(hass)
 
-    # Add a dummy listener as we do not have regular entities
-    entry.async_on_unload(coordinator.async_add_listener(lambda: None))
+    async def update_domain_interval(_now: datetime) -> bool:
+        """Update the DuckDNS entry."""
+        return await _update_duckdns(
+            session,
+            entry.data[CONF_DOMAIN],
+            entry.data[CONF_ACCESS_TOKEN],
+        )
+
+    entry.async_on_unload(
+        async_track_time_interval_backoff(
+            hass, update_domain_interval, BACKOFF_INTERVALS
+        )
+    )
 
     return True
 
@@ -122,7 +153,7 @@ async def update_domain_service(call: ServiceCall) -> None:
 
     session = async_get_clientsession(call.hass)
 
-    await update_duckdns(
+    await _update_duckdns(
         session,
         entry.data[CONF_DOMAIN],
         entry.data[CONF_ACCESS_TOKEN],
@@ -133,3 +164,73 @@ async def update_domain_service(call: ServiceCall) -> None:
 async def async_unload_entry(hass: HomeAssistant, entry: DuckDnsConfigEntry) -> bool:
     """Unload a config entry."""
     return True
+
+
+_SENTINEL = object()
+
+
+async def _update_duckdns(
+    session: ClientSession,
+    domain: str,
+    token: str,
+    *,
+    txt: str | None | object = _SENTINEL,
+    clear: bool = False,
+) -> bool:
+    """Update DuckDNS."""
+    params = {"domains": domain, "token": token}
+
+    if txt is not _SENTINEL:
+        if txt is None:
+            # Pass in empty txt value to indicate it's clearing txt record
+            params["txt"] = ""
+            clear = True
+        else:
+            params["txt"] = cast(str, txt)
+
+    if clear:
+        params["clear"] = "true"
+
+    resp = await session.get(UPDATE_URL, params=params)
+    body = await resp.text()
+
+    if body != "OK":
+        _LOGGER.warning("Updating DuckDNS domain failed: %s", domain)
+        return False
+
+    return True
+
+
+@callback
+@bind_hass
+def async_track_time_interval_backoff(
+    hass: HomeAssistant,
+    action: Callable[[datetime], Coroutine[Any, Any, bool]],
+    intervals: Sequence[timedelta],
+) -> CALLBACK_TYPE:
+    """Add a listener that fires repetitively at every timedelta interval."""
+    remove: CALLBACK_TYPE | None = None
+    failed = 0
+
+    async def interval_listener(now: datetime) -> None:
+        """Handle elapsed intervals with backoff."""
+        nonlocal failed, remove
+        try:
+            failed += 1
+            if await action(now):
+                failed = 0
+        finally:
+            delay = intervals[failed] if failed < len(intervals) else intervals[-1]
+            remove = async_call_later(
+                hass, delay.total_seconds(), interval_listener_job
+            )
+
+    interval_listener_job = HassJob(interval_listener, cancel_on_shutdown=True)
+    hass.async_run_hass_job(interval_listener_job, dt_util.utcnow())
+
+    def remove_listener() -> None:
+        """Remove interval listener."""
+        if remove:
+            remove()
+
+    return remove_listener

homeassistant/components/duckdns/config_flow.py

@@ -8,7 +8,7 @@ from typing import Any
 import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_ACCESS_TOKEN, CONF_DOMAIN, CONF_NAME
+from homeassistant.const import CONF_ACCESS_TOKEN, CONF_DOMAIN
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.selector import (
     TextSelector,
@@ -16,8 +16,8 @@ from homeassistant.helpers.selector import (
     TextSelectorType,
 )
 
+from . import _update_duckdns
 from .const import DOMAIN
-from .helpers import update_duckdns
 from .issue import deprecate_yaml_issue
 
 _LOGGER = logging.getLogger(__name__)
@@ -31,8 +31,6 @@ STEP_USER_DATA_SCHEMA = vol.Schema(
     }
 )
 
-STEP_RECONFIGURE_DATA_SCHEMA = vol.Schema({vol.Required(CONF_ACCESS_TOKEN): str})
-
 
 class DuckDnsConfigFlow(ConfigFlow, domain=DOMAIN):
     """Handle a config flow for Duck DNS."""
@@ -46,7 +44,7 @@ class DuckDnsConfigFlow(ConfigFlow, domain=DOMAIN):
             self._async_abort_entries_match({CONF_DOMAIN: user_input[CONF_DOMAIN]})
             session = async_get_clientsession(self.hass)
             try:
-                if not await update_duckdns(
+                if not await _update_duckdns(
                     session,
                     user_input[CONF_DOMAIN],
                     user_input[CONF_ACCESS_TOKEN],
@@ -81,37 +79,3 @@ class DuckDnsConfigFlow(ConfigFlow, domain=DOMAIN):
 
         deprecate_yaml_issue(self.hass, import_success=True)
         return result
-
-    async def async_step_reconfigure(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle reconfigure flow."""
-        errors: dict[str, str] = {}
-
-        entry = self._get_reconfigure_entry()
-
-        if user_input is not None:
-            session = async_get_clientsession(self.hass)
-            try:
-                if not await update_duckdns(
-                    session,
-                    entry.data[CONF_DOMAIN],
-                    user_input[CONF_ACCESS_TOKEN],
-                ):
-                    errors["base"] = "update_failed"
-            except Exception:
-                _LOGGER.exception("Unexpected exception")
-                errors["base"] = "unknown"
-
-            if not errors:
-                return self.async_update_reload_and_abort(
-                    entry,
-                    data_updates=user_input,
-                )
-
-        return self.async_show_form(
-            step_id="reconfigure",
-            data_schema=STEP_RECONFIGURE_DATA_SCHEMA,
-            errors=errors,
-            description_placeholders={CONF_NAME: entry.title},
-        )

homeassistant/components/duckdns/coordinator.py

@@ -1,83 +0,0 @@
-"""Coordinator for the Duck DNS integration."""
-
-from __future__ import annotations
-
-from datetime import timedelta
-import logging
-
-from aiohttp import ClientError
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_ACCESS_TOKEN, CONF_DOMAIN
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-
-from .const import DOMAIN
-from .helpers import update_duckdns
-
-_LOGGER = logging.getLogger(__name__)
-
-
-type DuckDnsConfigEntry = ConfigEntry[DuckDnsUpdateCoordinator]
-
-INTERVAL = timedelta(minutes=5)
-BACKOFF_INTERVALS = (
-    INTERVAL,
-    timedelta(minutes=1),
-    timedelta(minutes=5),
-    timedelta(minutes=15),
-    timedelta(minutes=30),
-)
-
-
-class DuckDnsUpdateCoordinator(DataUpdateCoordinator[None]):
-    """Duck DNS update coordinator."""
-
-    config_entry: DuckDnsConfigEntry
-
-    def __init__(self, hass: HomeAssistant, config_entry: DuckDnsConfigEntry) -> None:
-        """Initialize the Duck DNS update coordinator."""
-        super().__init__(
-            hass,
-            _LOGGER,
-            config_entry=config_entry,
-            name=DOMAIN,
-            update_interval=INTERVAL,
-        )
-        self.session = async_get_clientsession(hass)
-        self.failed = 0
-
-    async def _async_update_data(self) -> None:
-        """Update Duck DNS."""
-
-        retry_after = BACKOFF_INTERVALS[
-            min(self.failed, len(BACKOFF_INTERVALS))
-        ].total_seconds()
-
-        try:
-            if not await update_duckdns(
-                self.session,
-                self.config_entry.data[CONF_DOMAIN],
-                self.config_entry.data[CONF_ACCESS_TOKEN],
-            ):
-                self.failed += 1
-                raise UpdateFailed(
-                    translation_domain=DOMAIN,
-                    translation_key="update_failed",
-                    translation_placeholders={
-                        CONF_DOMAIN: self.config_entry.data[CONF_DOMAIN],
-                    },
-                    retry_after=retry_after,
-                )
-        except ClientError as e:
-            self.failed += 1
-            raise UpdateFailed(
-                translation_domain=DOMAIN,
-                translation_key="connection_error",
-                translation_placeholders={
-                    CONF_DOMAIN: self.config_entry.data[CONF_DOMAIN],
-                },
-                retry_after=retry_after,
-            ) from e
-        self.failed = 0

homeassistant/components/duckdns/helpers.py

@@ -1,35 +0,0 @@
-"""Helpers for Duck DNS integration."""
-
-from aiohttp import ClientSession
-
-from homeassistant.helpers.typing import UNDEFINED, UndefinedType
-
-UPDATE_URL = "https://www.duckdns.org/update"
-
-
-async def update_duckdns(
-    session: ClientSession,
-    domain: str,
-    token: str,
-    *,
-    txt: str | None | UndefinedType = UNDEFINED,
-    clear: bool = False,
-) -> bool:
-    """Update DuckDNS."""
-    params = {"domains": domain, "token": token}
-
-    if txt is not UNDEFINED:
-        if txt is None:
-            # Pass in empty txt value to indicate it's clearing txt record
-            params["txt"] = ""
-            clear = True
-        else:
-            params["txt"] = txt
-
-    if clear:
-        params["clear"] = "true"
-
-    resp = await session.get(UPDATE_URL, params=params)
-    body = await resp.text()
-
-    return body == "OK"

homeassistant/components/duckdns/strings.json

@@ -1,23 +1,13 @@
 {
   "config": {
     "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     },
     "error": {
       "unknown": "[%key:common::config_flow::error::unknown%]",
       "update_failed": "Updating Duck DNS failed"
     },
     "step": {
-      "reconfigure": {
-        "data": {
-          "access_token": "[%key:component::duckdns::config::step::user::data::access_token%]"
-        },
-        "data_description": {
-          "access_token": "[%key:component::duckdns::config::step::user::data_description::access_token%]"
-        },
-        "title": "Re-configure {name}"
-      },
       "user": {
         "data": {
           "access_token": "Token",
@@ -32,17 +22,11 @@
     }
   },
   "exceptions": {
-    "connection_error": {
-      "message": "Updating Duck DNS domain {domain} failed due to a connection error"
-    },
     "entry_not_found": {
       "message": "Duck DNS integration entry not found"
     },
     "entry_not_selected": {
       "message": "Duck DNS integration entry not selected"
-    },
-    "update_failed": {
-      "message": "Updating Duck DNS domain {domain} failed"
     }
   },
   "issues": {

homeassistant/components/egauge/__init__.py

@@ -1,42 +0,0 @@
-"""Integration for eGauge energy monitors."""
-
-from __future__ import annotations
-
-from homeassistant.const import Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import device_registry as dr
-
-from .const import DOMAIN, MANUFACTURER, MODEL
-from .coordinator import EgaugeConfigEntry, EgaugeDataCoordinator
-
-PLATFORMS = [Platform.SENSOR]
-
-
-async def async_setup_entry(hass: HomeAssistant, entry: EgaugeConfigEntry) -> bool:
-    """Set up eGauge from a config entry."""
-
-    coordinator = EgaugeDataCoordinator(hass, entry)
-    await coordinator.async_config_entry_first_refresh()
-
-    # Store coordinator in runtime_data
-    entry.runtime_data = coordinator
-
-    # Set up main device
-    device_registry = dr.async_get(hass)
-    device_registry.async_get_or_create(
-        config_entry_id=entry.entry_id,
-        identifiers={(DOMAIN, coordinator.serial_number)},
-        name=coordinator.hostname,
-        manufacturer=MANUFACTURER,
-        model=MODEL,
-        serial_number=coordinator.serial_number,
-    )
-
-    # Setup sensor platform
-    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
-    return True
-
-
-async def async_unload_entry(hass: HomeAssistant, entry: EgaugeConfigEntry) -> bool:
-    """Unload eGauge config entry."""
-    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)

homeassistant/components/egauge/config_flow.py

@@ -1,77 +0,0 @@
-"""Config flow to configure the eGauge integration."""
-
-from __future__ import annotations
-
-from typing import Any
-
-from egauge_async.exceptions import EgaugeAuthenticationError, EgaugePermissionError
-from egauge_async.json.client import EgaugeJsonClient
-from httpx import ConnectError
-import voluptuous as vol
-
-from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import (
-    CONF_HOST,
-    CONF_PASSWORD,
-    CONF_SSL,
-    CONF_USERNAME,
-    CONF_VERIFY_SSL,
-)
-from homeassistant.helpers.httpx_client import get_async_client
-
-from .const import DOMAIN, LOGGER
-
-STEP_USER_DATA_SCHEMA = vol.Schema(
-    {
-        vol.Required(CONF_HOST): str,
-        vol.Required(CONF_USERNAME): str,
-        vol.Required(CONF_PASSWORD): str,
-        vol.Required(CONF_SSL, default=True): bool,
-        vol.Required(CONF_VERIFY_SSL, default=False): bool,
-    }
-)
-
-
-class EgaugeFlowHandler(ConfigFlow, domain=DOMAIN):
-    """Handle an eGauge config flow."""
-
-    async def async_step_user(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle a flow initiated by the user."""
-        errors: dict[str, str] = {}
-
-        if user_input is not None:
-            client = EgaugeJsonClient(
-                host=user_input[CONF_HOST],
-                username=user_input[CONF_USERNAME],
-                password=user_input[CONF_PASSWORD],
-                client=get_async_client(
-                    self.hass, verify_ssl=user_input[CONF_VERIFY_SSL]
-                ),
-                use_ssl=user_input[CONF_SSL],
-            )
-            try:
-                serial_number = await client.get_device_serial_number()
-                hostname = await client.get_hostname()
-            except EgaugeAuthenticationError:
-                errors["base"] = "invalid_auth"
-            except EgaugePermissionError:
-                errors["base"] = "missing_permission"
-            except ConnectError:
-                errors["base"] = "cannot_connect"
-            except Exception:  # noqa: BLE001
-                LOGGER.exception("Unexpected exception")
-                errors["base"] = "unknown"
-            else:
-                await self.async_set_unique_id(serial_number)
-                self._abort_if_unique_id_configured()
-                return self.async_create_entry(title=hostname, data=user_input)
-
-        return self.async_show_form(
-            step_id="user",
-            data_schema=self.add_suggested_values_to_schema(
-                STEP_USER_DATA_SCHEMA, user_input
-            ),
-            errors=errors,
-        )

homeassistant/components/egauge/const.py

@@ -1,10 +0,0 @@
-"""Constants for the eGauge integration."""
-
-import logging
-
-DOMAIN = "egauge"
-LOGGER = logging.getLogger(__package__)
-
-MANUFACTURER = "eGauge Systems"
-MODEL = "eGauge Energy Monitor"
-COORDINATOR_UPDATE_INTERVAL_SECONDS = 30

homeassistant/components/egauge/coordinator.py

@@ -1,105 +0,0 @@
-"""Data update coordinator for eGauge energy monitors."""
-
-from __future__ import annotations
-
-from dataclasses import dataclass
-from datetime import timedelta
-
-from egauge_async.exceptions import (
-    EgaugeAuthenticationError,
-    EgaugeException,
-    EgaugePermissionError,
-)
-from egauge_async.json.client import EgaugeJsonClient
-from egauge_async.json.models import RegisterInfo
-from httpx import ConnectError
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import (
-    CONF_HOST,
-    CONF_PASSWORD,
-    CONF_SSL,
-    CONF_USERNAME,
-    CONF_VERIFY_SSL,
-)
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryError
-from homeassistant.helpers.httpx_client import get_async_client
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-
-from .const import COORDINATOR_UPDATE_INTERVAL_SECONDS, DOMAIN, LOGGER
-
-type EgaugeConfigEntry = ConfigEntry[EgaugeDataCoordinator]
-
-
-@dataclass
-class EgaugeData:
-    """Data from eGauge device."""
-
-    measurements: dict[str, float]  # Instantaneous values (W, V, A, etc.)
-    counters: dict[str, float]  # Cumulative values (Ws)
-    register_info: dict[str, RegisterInfo]  # Metadata for all registers
-
-
-class EgaugeDataCoordinator(DataUpdateCoordinator[EgaugeData]):
-    """Class to manage fetching eGauge data."""
-
-    serial_number: str
-    hostname: str
-
-    def __init__(self, hass: HomeAssistant, config_entry: ConfigEntry) -> None:
-        """Initialize the coordinator."""
-        super().__init__(
-            hass,
-            logger=LOGGER,
-            name=DOMAIN,
-            update_interval=timedelta(seconds=COORDINATOR_UPDATE_INTERVAL_SECONDS),
-            config_entry=config_entry,
-        )
-        self.client = EgaugeJsonClient(
-            host=config_entry.data[CONF_HOST],
-            username=config_entry.data[CONF_USERNAME],
-            password=config_entry.data[CONF_PASSWORD],
-            client=get_async_client(
-                hass, verify_ssl=config_entry.data[CONF_VERIFY_SSL]
-            ),
-            use_ssl=config_entry.data[CONF_SSL],
-        )
-        # Populated in _async_setup
-        self._register_info: dict[str, RegisterInfo] = {}
-
-    async def _async_setup(self) -> None:
-        try:
-            self.serial_number = await self.client.get_device_serial_number()
-            self.hostname = await self.client.get_hostname()
-            self._register_info = await self.client.get_register_info()
-        except (
-            EgaugeAuthenticationError,
-            EgaugePermissionError,
-            EgaugeException,
-        ) as err:
-            # EgaugeAuthenticationError and EgaugePermissionError will raise ConfigEntryAuthFailed once reauth is implemented
-            raise ConfigEntryError from err
-        except ConnectError as err:
-            raise UpdateFailed(f"Error fetching device info: {err}") from err
-
-    async def _async_update_data(self) -> EgaugeData:
-        """Fetch data from eGauge device."""
-        try:
-            measurements = await self.client.get_current_measurements()
-            counters = await self.client.get_current_counters()
-        except (
-            EgaugeAuthenticationError,
-            EgaugePermissionError,
-            EgaugeException,
-        ) as err:
-            # will raise ConfigEntryAuthFailed once reauth is implemented
-            raise ConfigEntryError("Error fetching device info: {err}") from err
-        except ConnectError as err:
-            raise UpdateFailed(f"Error fetching device info: {err}") from err
-
-        return EgaugeData(
-            measurements=measurements,
-            counters=counters,
-            register_info=self._register_info,
-        )

homeassistant/components/egauge/entity.py

@@ -1,35 +0,0 @@
-"""Base entity for the eGauge integration."""
-
-from __future__ import annotations
-
-from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
-
-from .const import DOMAIN, MANUFACTURER, MODEL
-from .coordinator import EgaugeDataCoordinator
-
-
-class EgaugeEntity(CoordinatorEntity[EgaugeDataCoordinator]):
-    """Base entity for eGauge sensors."""
-
-    _attr_has_entity_name = True
-
-    def __init__(
-        self,
-        coordinator: EgaugeDataCoordinator,
-        register_name: str,
-    ) -> None:
-        """Initialize the eGauge entity."""
-        super().__init__(coordinator)
-
-        register_identifier = f"{coordinator.serial_number}_{register_name}"
-        register_name = f"{coordinator.hostname} {register_name}"
-
-        # Device info using coordinator's cached data
-        self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, register_identifier)},
-            name=register_name,
-            manufacturer=MANUFACTURER,
-            model=MODEL,
-            via_device=(DOMAIN, coordinator.serial_number),
-        )

homeassistant/components/egauge/manifest.json

@@ -1,11 +0,0 @@
-{
-  "domain": "egauge",
-  "name": "eGauge",
-  "codeowners": ["@neggert"],
-  "config_flow": true,
-  "documentation": "https://www.home-assistant.io/integrations/egauge",
-  "integration_type": "device",
-  "iot_class": "local_polling",
-  "quality_scale": "bronze",
-  "requirements": ["egauge-async==0.4.0"]
-}

homeassistant/components/egauge/quality_scale.yaml

@@ -1,74 +0,0 @@
-rules:
-  # Bronze
-  action-setup:
-    status: exempt
-    comment: Integration does not register custom actions
-  appropriate-polling: done
-  brands: done
-  common-modules: done
-  config-flow: done
-  config-flow-test-coverage: done
-  dependency-transparency: done
-  docs-actions:
-    status: exempt
-    comment: Integration does not register custom actions
-  docs-high-level-description: done
-  docs-installation-instructions: done
-  docs-removal-instructions: done
-  entity-event-setup:
-    status: exempt
-    comment: Integration does not subscribe to events
-  entity-unique-id: done
-  has-entity-name: done
-  runtime-data: done
-  test-before-configure: done
-  test-before-setup: done
-  unique-config-entry: done
-
-  # Silver
-  action-exceptions:
-    status: exempt
-    comment: Integration does not register actions
-  config-entry-unloading: done
-  docs-configuration-parameters:
-    status: exempt
-    comment: Integration does not expose configuration options
-  docs-installation-parameters: done
-  entity-unavailable: done
-  integration-owner: done
-  log-when-unavailable: done
-  parallel-updates: todo
-  reauthentication-flow: todo
-  test-coverage: done
-
-  # Gold
-  devices: done
-  diagnostics: todo
-  discovery: todo
-  discovery-update-info: todo
-  docs-data-update: done
-  docs-examples: todo
-  docs-known-limitations: done
-  docs-supported-devices: done
-  docs-supported-functions: done
-  docs-troubleshooting: done
-  docs-use-cases: todo
-  dynamic-devices: todo
-  entity-category: done
-  entity-device-class: done
-  entity-disabled-by-default:
-    status: exempt
-    comment: Integration only has essential entities
-  entity-translations: done
-  exception-translations: todo
-  icon-translations:
-    status: exempt
-    comment: Integration uses standard device class icons
-  reconfiguration-flow: todo
-  repair-issues: todo
-  stale-devices: todo
-
-  # Platinum
-  async-dependency: done
-  inject-websession: done
-  strict-typing: todo

homeassistant/components/egauge/sensor.py

@@ -1,99 +0,0 @@
-"""Sensor platform for eGauge energy monitors."""
-
-from __future__ import annotations
-
-from collections.abc import Callable
-from dataclasses import dataclass
-
-from egauge_async.json.models import RegisterType
-
-from homeassistant.components.sensor import (
-    SensorDeviceClass,
-    SensorEntity,
-    SensorEntityDescription,
-    SensorStateClass,
-)
-from homeassistant.const import UnitOfEnergy, UnitOfPower
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-
-from .coordinator import EgaugeConfigEntry, EgaugeData, EgaugeDataCoordinator
-from .entity import EgaugeEntity
-
-
-@dataclass(frozen=True, kw_only=True)
-class EgaugeSensorEntityDescription(SensorEntityDescription):
-    """Extended sensor description for eGauge sensors."""
-
-    native_value_fn: Callable[[EgaugeData, str], float]
-    available_fn: Callable[[EgaugeData, str], bool]
-
-
-SENSORS: tuple[EgaugeSensorEntityDescription, ...] = (
-    EgaugeSensorEntityDescription(
-        key="power",
-        device_class=SensorDeviceClass.POWER,
-        state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=UnitOfPower.WATT,
-        native_value_fn=lambda data, register: data.measurements[register],
-        available_fn=lambda data, register: register in data.measurements,
-    ),
-    EgaugeSensorEntityDescription(
-        key="energy",
-        device_class=SensorDeviceClass.ENERGY,
-        state_class=SensorStateClass.TOTAL_INCREASING,
-        native_unit_of_measurement=UnitOfEnergy.JOULE,
-        suggested_unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR,
-        native_value_fn=lambda data, register: data.counters[register],
-        available_fn=lambda data, register: register in data.counters,
-    ),
-)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: EgaugeConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up eGauge sensor platform."""
-    coordinator = entry.runtime_data
-    async_add_entities(
-        EgaugeSensor(coordinator, register_name, sensor)
-        for sensor in SENSORS
-        for register_name, register_info in coordinator.data.register_info.items()
-        if register_info.type == RegisterType.POWER
-    )
-
-
-class EgaugeSensor(EgaugeEntity, SensorEntity):
-    """Generic sensor entity using entity description pattern."""
-
-    entity_description: EgaugeSensorEntityDescription
-
-    def __init__(
-        self,
-        coordinator: EgaugeDataCoordinator,
-        register_name: str,
-        description: EgaugeSensorEntityDescription,
-    ) -> None:
-        """Initialize the sensor."""
-        super().__init__(coordinator, register_name)
-        self._register_name = register_name
-        self.entity_description = description
-        self._attr_unique_id = (
-            f"{coordinator.serial_number}_{register_name}_{description.key}"
-        )
-
-    @property
-    def native_value(self) -> float:
-        """Return the sensor value using the description's value function."""
-        return self.entity_description.native_value_fn(
-            self.coordinator.data, self._register_name
-        )
-
-    @property
-    def available(self) -> bool:
-        """Return true if the corresponding register is available."""
-        return super().available and self.entity_description.available_fn(
-            self.coordinator.data, self._register_name
-        )

homeassistant/components/egauge/strings.json

@@ -1,32 +0,0 @@
-{
-  "config": {
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
-    },
-    "error": {
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
-      "missing_permission": "The provided user does not have the necessary permissions",
-      "unknown": "[%key:common::config_flow::error::unknown%]"
-    },
-    "step": {
-      "user": {
-        "data": {
-          "host": "[%key:common::config_flow::data::host%]",
-          "password": "[%key:common::config_flow::data::password%]",
-          "ssl": "[%key:common::config_flow::data::ssl%]",
-          "username": "[%key:common::config_flow::data::username%]",
-          "verify_ssl": "[%key:common::config_flow::data::verify_ssl%]"
-        },
-        "data_description": {
-          "host": "The hostname or IP address of the eGauge device",
-          "password": "The password for the provided user.",
-          "ssl": "Use SSL for a secure connection.",
-          "username": "The username for the eGauge device. The user must have permission to read registers and settings.",
-          "verify_ssl": "Verify SSL certificate. eGauge devices use a self-signed certificate by default, so leave this off unless a custom certificate has been installed on the device."
-        }
-      }
-    }
-  }
-}

homeassistant/components/elevenlabs/const.py

@@ -17,7 +17,7 @@ DEFAULT_TTS_MODEL = "eleven_multilingual_v2"
 DEFAULT_STABILITY = 0.5
 DEFAULT_SIMILARITY = 0.75
 DEFAULT_STT_AUTO_LANGUAGE = False
-DEFAULT_STT_MODEL = "scribe_v2"
+DEFAULT_STT_MODEL = "scribe_v1"
 DEFAULT_STYLE = 0
 DEFAULT_USE_SPEAKER_BOOST = True
 
@@ -129,5 +129,4 @@ STT_LANGUAGES = [
 STT_MODELS = {
     "scribe_v1": "Scribe v1",
     "scribe_v1_experimental": "Scribe v1 Experimental",
-    "scribe_v2": "Scribe v2 Realtime",
 }

homeassistant/components/energyzero/coordinator.py

@@ -56,11 +56,11 @@ class EnergyZeroDataUpdateCoordinator(DataUpdateCoordinator[EnergyZeroData]):
         energy_tomorrow = None
 
         try:
-            energy_today = await self.energyzero.get_electricity_prices_legacy(
+            energy_today = await self.energyzero.energy_prices(
                 start_date=today, end_date=today
             )
             try:
-                gas_today = await self.energyzero.get_gas_prices_legacy(
+                gas_today = await self.energyzero.gas_prices(
                     start_date=today, end_date=today
                 )
             except EnergyZeroNoDataError:
@@ -69,10 +69,8 @@ class EnergyZeroDataUpdateCoordinator(DataUpdateCoordinator[EnergyZeroData]):
             if dt_util.utcnow().hour >= THRESHOLD_HOUR:
                 tomorrow = today + timedelta(days=1)
                 try:
-                    energy_tomorrow = (
-                        await self.energyzero.get_electricity_prices_legacy(
-                            start_date=tomorrow, end_date=tomorrow
-                        )
+                    energy_tomorrow = await self.energyzero.energy_prices(
+                        start_date=tomorrow, end_date=tomorrow
                     )
                 except EnergyZeroNoDataError:
                     LOGGER.debug("No data for tomorrow for EnergyZero integration")

homeassistant/components/energyzero/manifest.json

@@ -6,6 +6,6 @@
   "documentation": "https://www.home-assistant.io/integrations/energyzero",
   "integration_type": "service",
   "iot_class": "cloud_polling",
-  "requirements": ["energyzero==4.0.1"],
+  "requirements": ["energyzero==2.1.1"],
   "single_config_entry": true
 }

homeassistant/components/energyzero/services.py

@@ -128,13 +128,13 @@ async def __get_prices(
     data: Electricity | Gas
 
     if price_type == PriceType.GAS:
-        data = await coordinator.energyzero.get_gas_prices_legacy(
+        data = await coordinator.energyzero.gas_prices(
             start_date=start,
             end_date=end,
             vat=vat,
         )
     else:
-        data = await coordinator.energyzero.get_electricity_prices_legacy(
+        data = await coordinator.energyzero.energy_prices(
             start_date=start,
             end_date=end,
             vat=vat,

homeassistant/components/entur_public_transport/const.py

@@ -1,44 +0,0 @@
-"""Constants for the Entur public transport integration."""
-
-from datetime import timedelta
-
-DOMAIN = "entur_public_transport"
-
-API_CLIENT_NAME = "homeassistant-{}"
-
-CONF_STOP_IDS = "stop_ids"
-CONF_EXPAND_PLATFORMS = "expand_platforms"
-CONF_WHITELIST_LINES = "line_whitelist"
-CONF_OMIT_NON_BOARDING = "omit_non_boarding"
-CONF_NUMBER_OF_DEPARTURES = "number_of_departures"
-
-DEFAULT_NAME = "Entur"
-DEFAULT_ICON_KEY = "bus"
-
-ICONS = {
-    "air": "mdi:airplane",
-    "bus": "mdi:bus",
-    "metro": "mdi:subway",
-    "rail": "mdi:train",
-    "tram": "mdi:tram",
-    "water": "mdi:ferry",
-}
-
-SCAN_INTERVAL = timedelta(seconds=45)
-
-ATTR_STOP_ID = "stop_id"
-
-ATTR_ROUTE = "route"
-ATTR_ROUTE_ID = "route_id"
-ATTR_EXPECTED_AT = "due_at"
-ATTR_DELAY = "delay"
-ATTR_REALTIME = "real_time"
-
-ATTR_NEXT_UP_IN = "next_due_in"
-ATTR_NEXT_UP_ROUTE = "next_route"
-ATTR_NEXT_UP_ROUTE_ID = "next_route_id"
-ATTR_NEXT_UP_AT = "next_due_at"
-ATTR_NEXT_UP_DELAY = "next_delay"
-ATTR_NEXT_UP_REALTIME = "next_real_time"
-
-ATTR_TRANSPORT_MODE = "transport_mode"

homeassistant/components/entur_public_transport/manifest.json

@@ -1,9 +1,8 @@
 {
   "domain": "entur_public_transport",
   "name": "Entur",
-  "codeowners": ["@hfurubotten", "@SanderBlom"],
+  "codeowners": ["@hfurubotten"],
   "documentation": "https://www.home-assistant.io/integrations/entur_public_transport",
-  "integration_type": "service",
   "iot_class": "cloud_polling",
   "loggers": ["enturclient"],
   "quality_scale": "legacy",

homeassistant/components/entur_public_transport/sensor.py

@@ -26,29 +26,27 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import Throttle, dt as dt_util
 
-from .const import (
-    API_CLIENT_NAME,
-    ATTR_DELAY,
-    ATTR_EXPECTED_AT,
-    ATTR_NEXT_UP_AT,
-    ATTR_NEXT_UP_DELAY,
-    ATTR_NEXT_UP_IN,
-    ATTR_NEXT_UP_REALTIME,
-    ATTR_NEXT_UP_ROUTE,
-    ATTR_NEXT_UP_ROUTE_ID,
-    ATTR_REALTIME,
-    ATTR_ROUTE,
-    ATTR_ROUTE_ID,
-    ATTR_STOP_ID,
-    CONF_EXPAND_PLATFORMS,
-    CONF_NUMBER_OF_DEPARTURES,
-    CONF_OMIT_NON_BOARDING,
-    CONF_STOP_IDS,
-    CONF_WHITELIST_LINES,
-    DEFAULT_ICON_KEY,
-    DEFAULT_NAME,
-    ICONS,
-)
+API_CLIENT_NAME = "homeassistant-{}"
+
+CONF_STOP_IDS = "stop_ids"
+CONF_EXPAND_PLATFORMS = "expand_platforms"
+CONF_WHITELIST_LINES = "line_whitelist"
+CONF_OMIT_NON_BOARDING = "omit_non_boarding"
+CONF_NUMBER_OF_DEPARTURES = "number_of_departures"
+
+DEFAULT_NAME = "Entur"
+DEFAULT_ICON_KEY = "bus"
+
+ICONS = {
+    "air": "mdi:airplane",
+    "bus": "mdi:bus",
+    "metro": "mdi:subway",
+    "rail": "mdi:train",
+    "tram": "mdi:tram",
+    "water": "mdi:ferry",
+}
+
+SCAN_INTERVAL = timedelta(seconds=45)
 
 PLATFORM_SCHEMA = SENSOR_PLATFORM_SCHEMA.extend(
     {
@@ -65,6 +63,24 @@ PLATFORM_SCHEMA = SENSOR_PLATFORM_SCHEMA.extend(
 )
 
 
+ATTR_STOP_ID = "stop_id"
+
+ATTR_ROUTE = "route"
+ATTR_ROUTE_ID = "route_id"
+ATTR_EXPECTED_AT = "due_at"
+ATTR_DELAY = "delay"
+ATTR_REALTIME = "real_time"
+
+ATTR_NEXT_UP_IN = "next_due_in"
+ATTR_NEXT_UP_ROUTE = "next_route"
+ATTR_NEXT_UP_ROUTE_ID = "next_route_id"
+ATTR_NEXT_UP_AT = "next_due_at"
+ATTR_NEXT_UP_DELAY = "next_delay"
+ATTR_NEXT_UP_REALTIME = "next_real_time"
+
+ATTR_TRANSPORT_MODE = "transport_mode"
+
+
 def due_in_minutes(timestamp: datetime) -> int:
     """Get the time in minutes from a timestamp."""
     if timestamp is None:

homeassistant/components/esphome/manager.py

@@ -15,14 +15,12 @@ from aioesphomeapi import (
     APIVersion,
     DeviceInfo as EsphomeDeviceInfo,
     EncryptionPlaintextAPIError,
-    ExecuteServiceResponse,
     HomeassistantServiceCall,
     InvalidAuthAPIError,
     InvalidEncryptionKeyAPIError,
     LogLevel,
     ReconnectLogic,
     RequiresEncryptionAPIError,
-    SupportsResponseType,
     UserService,
     UserServiceArgType,
     ZWaveProxyRequest,
@@ -46,9 +44,7 @@ from homeassistant.core import (
     EventStateChangedData,
     HomeAssistant,
     ServiceCall,
-    ServiceResponse,
     State,
-    SupportsResponse,
     callback,
 )
 from homeassistant.exceptions import (
@@ -62,7 +58,7 @@ from homeassistant.helpers import (
     device_registry as dr,
     entity_registry as er,
     issue_registry as ir,
-    json as json_helper,
+    json,
     template,
 )
 from homeassistant.helpers.device_registry import format_mac
@@ -74,7 +70,6 @@ from homeassistant.helpers.issue_registry import (
 )
 from homeassistant.helpers.service import async_set_service_schema
 from homeassistant.helpers.template import Template
-from homeassistant.util.json import json_loads_object
 
 from .bluetooth import async_connect_scanner
 from .const import (
@@ -96,7 +91,6 @@ from .encryption_key_storage import async_get_encryption_key_storage
 
 # Import config flow so that it's added to the registry
 from .entry_data import ESPHomeConfigEntry, RuntimeEntryData
-from .enum_mapper import EsphomeEnumMapper
 
 DEVICE_CONFLICT_ISSUE_FORMAT = "device_conflict-{}"
 UNPACK_UINT32_BE = struct.Struct(">I").unpack_from
@@ -373,7 +367,7 @@ class ESPHomeManager:
                 response_dict = {"response": action_response}
 
             # JSON encode response data for ESPHome
-            response_data = json_helper.json_bytes(response_dict)
+            response_data = json.json_bytes(response_dict)
 
         except (
             ServiceNotFound,
@@ -1156,52 +1150,13 @@ ARG_TYPE_METADATA = {
 }
 
 
-async def execute_service(
-    entry_data: RuntimeEntryData,
-    service: UserService,
-    call: ServiceCall,
-    *,
-    supports_response: SupportsResponseType,
-) -> ServiceResponse:
-    """Execute a service on a node and optionally wait for response."""
-    # Determine if we should wait for a response
-    # NONE: fire and forget
-    # OPTIONAL/ONLY/STATUS: always wait for success/error confirmation
-    wait_for_response = supports_response != SupportsResponseType.NONE
-
-    if not wait_for_response:
-        # Fire and forget - no response expected
-        try:
-            await entry_data.client.execute_service(service, call.data)
-        except APIConnectionError as err:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="action_call_failed",
-                translation_placeholders={
-                    "call_name": service.name,
-                    "device_name": entry_data.name,
-                    "error": str(err),
-                },
-            ) from err
-        else:
-            return None
-
-    # Determine if we need response_data from ESPHome
-    # ONLY: always need response_data
-    # OPTIONAL: only if caller requested it
-    # STATUS: never need response_data (just success/error)
-    need_response_data = supports_response == SupportsResponseType.ONLY or (
-        supports_response == SupportsResponseType.OPTIONAL and call.return_response
-    )
-
+@callback
+def execute_service(
+    entry_data: RuntimeEntryData, service: UserService, call: ServiceCall
+) -> None:
+    """Execute a service on a node."""
     try:
-        response: (
-            ExecuteServiceResponse | None
-        ) = await entry_data.client.execute_service(
-            service,
-            call.data,
-            return_response=need_response_data,
-        )
+        entry_data.client.execute_service(service, call.data)
     except APIConnectionError as err:
         raise HomeAssistantError(
             translation_domain=DOMAIN,
@@ -1212,44 +1167,6 @@ async def execute_service(
                 "error": str(err),
             },
         ) from err
-    except TimeoutError as err:
-        raise HomeAssistantError(
-            translation_domain=DOMAIN,
-            translation_key="action_call_timeout",
-            translation_placeholders={
-                "call_name": service.name,
-                "device_name": entry_data.name,
-            },
-        ) from err
-
-    assert response is not None
-
-    if not response.success:
-        raise HomeAssistantError(
-            translation_domain=DOMAIN,
-            translation_key="action_call_failed",
-            translation_placeholders={
-                "call_name": service.name,
-                "device_name": entry_data.name,
-                "error": response.error_message,
-            },
-        )
-
-    # Parse and return response data as JSON if we requested it
-    if need_response_data and response.response_data:
-        try:
-            return json_loads_object(response.response_data)
-        except ValueError as err:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="action_call_failed",
-                translation_placeholders={
-                    "call_name": service.name,
-                    "device_name": entry_data.name,
-                    "error": f"Invalid JSON response: {err}",
-                },
-            ) from err
-    return None
 
 
 def build_service_name(device_info: EsphomeDeviceInfo, service: UserService) -> str:
@@ -1257,19 +1174,6 @@ def build_service_name(device_info: EsphomeDeviceInfo, service: UserService) ->
     return f"{device_info.name.replace('-', '_')}_{service.name}"
 
 
-# Map ESPHome SupportsResponseType to Home Assistant SupportsResponse
-# STATUS (100) is ESPHome-specific: waits for success/error internally but
-# doesn't return data to HA, so it maps to NONE from HA's perspective
-_RESPONSE_TYPE_MAPPER = EsphomeEnumMapper[SupportsResponseType, SupportsResponse](
-    {
-        SupportsResponseType.NONE: SupportsResponse.NONE,
-        SupportsResponseType.OPTIONAL: SupportsResponse.OPTIONAL,
-        SupportsResponseType.ONLY: SupportsResponse.ONLY,
-        SupportsResponseType.STATUS: SupportsResponse.NONE,
-    }
-)
-
-
 @callback
 def _async_register_service(
     hass: HomeAssistant,
@@ -1301,21 +1205,11 @@ def _async_register_service(
             "selector": metadata.selector,
         }
 
-    # Get the supports_response from the service, defaulting to NONE
-    esphome_supports_response = service.supports_response or SupportsResponseType.NONE
-    ha_supports_response = _RESPONSE_TYPE_MAPPER.from_esphome(esphome_supports_response)
-
     hass.services.async_register(
         DOMAIN,
         service_name,
-        partial(
-            execute_service,
-            entry_data,
-            service,
-            supports_response=esphome_supports_response,
-        ),
+        partial(execute_service, entry_data, service),
         vol.Schema(schema),
-        supports_response=ha_supports_response,
     )
     async_set_service_schema(
         hass,

homeassistant/components/esphome/manifest.json

@@ -17,7 +17,7 @@
   "mqtt": ["esphome/discover/#"],
   "quality_scale": "platinum",
   "requirements": [
-    "aioesphomeapi==43.0.0",
+    "aioesphomeapi==42.9.0",
     "esphome-dashboard-api==1.3.0",
     "bleak-esphome==3.4.0"
   ],

homeassistant/components/esphome/strings.json

@@ -128,9 +128,6 @@
     "action_call_failed": {
       "message": "Failed to execute the action call {call_name} on {device_name}: {error}"
     },
-    "action_call_timeout": {
-      "message": "Timeout waiting for response from action call {call_name} on {device_name}"
-    },
     "error_communicating_with_device": {
       "message": "Error communicating with the device {device_name}: {error}"
     },

homeassistant/components/fitbit/api.py

@@ -1,30 +1,22 @@
 """API for fitbit bound to Home Assistant OAuth."""
 
 from abc import ABC, abstractmethod
-from collections.abc import Awaitable, Callable
+from collections.abc import Callable
 import logging
 from typing import Any, cast
 
 from fitbit import Fitbit
 from fitbit.exceptions import HTTPException, HTTPUnauthorized
-from fitbit_web_api import ApiClient, Configuration, DevicesApi
-from fitbit_web_api.exceptions import (
-    ApiException,
-    OpenApiException,
-    UnauthorizedException,
-)
-from fitbit_web_api.models.device import Device
 from requests.exceptions import ConnectionError as RequestsConnectionError
 
 from homeassistant.const import CONF_ACCESS_TOKEN
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_entry_oauth2_flow
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.util.unit_system import METRIC_SYSTEM
 
 from .const import FitbitUnitSystem
 from .exceptions import FitbitApiException, FitbitAuthException
-from .model import FitbitProfile
+from .model import FitbitDevice, FitbitProfile
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -66,14 +58,6 @@ class FitbitApi(ABC):
             expires_at=float(token[CONF_EXPIRES_AT]),
         )
 
-    async def _async_get_fitbit_web_api(self) -> ApiClient:
-        """Create and return an ApiClient configured with the current access token."""
-        token = await self.async_get_access_token()
-        configuration = Configuration()
-        configuration.pool_manager = async_get_clientsession(self._hass)
-        configuration.access_token = token[CONF_ACCESS_TOKEN]
-        return ApiClient(configuration)
-
     async def async_get_user_profile(self) -> FitbitProfile:
         """Return the user profile from the API."""
         if self._profile is None:
@@ -110,13 +94,21 @@ class FitbitApi(ABC):
             return FitbitUnitSystem.METRIC
         return FitbitUnitSystem.EN_US
 
-    async def async_get_devices(self) -> list[Device]:
-        """Return available devices using fitbit-web-api."""
-        client = await self._async_get_fitbit_web_api()
-        devices_api = DevicesApi(client)
-        devices: list[Device] = await self._run_async(devices_api.get_devices)
+    async def async_get_devices(self) -> list[FitbitDevice]:
+        """Return available devices."""
+        client = await self._async_get_client()
+        devices: list[dict[str, str]] = await self._run(client.get_devices)
         _LOGGER.debug("get_devices=%s", devices)
-        return devices
+        return [
+            FitbitDevice(
+                id=device["id"],
+                device_version=device["deviceVersion"],
+                battery_level=int(device["batteryLevel"]),
+                battery=device["battery"],
+                type=device["type"],
+            )
+            for device in devices
+        ]
 
     async def async_get_latest_time_series(self, resource_type: str) -> dict[str, Any]:
         """Return the most recent value from the time series for the specified resource type."""
@@ -148,20 +140,6 @@ class FitbitApi(ABC):
             _LOGGER.debug("Error from fitbit API: %s", err)
             raise FitbitApiException("Error from fitbit API") from err
 
-    async def _run_async[_T](self, func: Callable[[], Awaitable[_T]]) -> _T:
-        """Run client command."""
-        try:
-            return await func()
-        except UnauthorizedException as err:
-            _LOGGER.debug("Unauthorized error from fitbit API: %s", err)
-            raise FitbitAuthException("Authentication error from fitbit API") from err
-        except ApiException as err:
-            _LOGGER.debug("Error from fitbit API: %s", err)
-            raise FitbitApiException("Error from fitbit API") from err
-        except OpenApiException as err:
-            _LOGGER.debug("Error communicating with fitbit API: %s", err)
-            raise FitbitApiException("Communication error from fitbit API") from err
-
 
 class OAuthFitbitApi(FitbitApi):
     """Provide fitbit authentication tied to an OAuth2 based config entry."""

homeassistant/components/fitbit/coordinator.py

@@ -6,8 +6,6 @@ import datetime
 import logging
 from typing import Final
 
-from fitbit_web_api.models.device import Device
-
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed
@@ -15,6 +13,7 @@ from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, Upda
 
 from .api import FitbitApi
 from .exceptions import FitbitApiException, FitbitAuthException
+from .model import FitbitDevice
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -24,7 +23,7 @@ TIMEOUT = 10
 type FitbitConfigEntry = ConfigEntry[FitbitData]
 
 
-class FitbitDeviceCoordinator(DataUpdateCoordinator[dict[str, Device]]):
+class FitbitDeviceCoordinator(DataUpdateCoordinator[dict[str, FitbitDevice]]):
     """Coordinator for fetching fitbit devices from the API."""
 
     config_entry: FitbitConfigEntry
@@ -42,7 +41,7 @@ class FitbitDeviceCoordinator(DataUpdateCoordinator[dict[str, Device]]):
         )
         self._api = api
 
-    async def _async_update_data(self) -> dict[str, Device]:
+    async def _async_update_data(self) -> dict[str, FitbitDevice]:
         """Fetch data from API endpoint."""
         async with asyncio.timeout(TIMEOUT):
             try:
@@ -51,7 +50,7 @@ class FitbitDeviceCoordinator(DataUpdateCoordinator[dict[str, Device]]):
                 raise ConfigEntryAuthFailed(err) from err
             except FitbitApiException as err:
                 raise UpdateFailed(err) from err
-        return {device.id: device for device in devices if device.id is not None}
+        return {device.id: device for device in devices}
 
 
 @dataclass

homeassistant/components/fitbit/manifest.json

@@ -6,6 +6,6 @@
   "dependencies": ["application_credentials", "http"],
   "documentation": "https://www.home-assistant.io/integrations/fitbit",
   "iot_class": "cloud_polling",
-  "loggers": ["fitbit", "fitbit_web_api"],
-  "requirements": ["fitbit==0.3.1", "fitbit-web-api==2.13.5"]
+  "loggers": ["fitbit"],
+  "requirements": ["fitbit==0.3.1"]
 }

homeassistant/components/fitbit/model.py

@@ -21,6 +21,26 @@ class FitbitProfile:
     """The locale defined in the user's Fitbit account settings."""
 
 
+@dataclass
+class FitbitDevice:
+    """Device from the Fitbit API response."""
+
+    id: str
+    """The device ID."""
+
+    device_version: str
+    """The product name of the device."""
+
+    battery_level: int
+    """The battery level as a percentage."""
+
+    battery: str
+    """Returns the battery level of the device."""
+
+    type: str
+    """The type of the device such as TRACKER or SCALE."""
+
+
 @dataclass
 class FitbitConfig:
     """Information from the fitbit ConfigEntry data."""

homeassistant/components/fitbit/sensor.py

@@ -8,8 +8,6 @@ import datetime
 import logging
 from typing import Any, Final, cast
 
-from fitbit_web_api.models.device import Device
-
 from homeassistant.components.sensor import (
     SensorDeviceClass,
     SensorEntity,
@@ -34,7 +32,7 @@ from .api import FitbitApi
 from .const import ATTRIBUTION, BATTERY_LEVELS, DOMAIN, FitbitScope, FitbitUnitSystem
 from .coordinator import FitbitConfigEntry, FitbitDeviceCoordinator
 from .exceptions import FitbitApiException, FitbitAuthException
-from .model import config_from_entry_data
+from .model import FitbitDevice, config_from_entry_data
 
 _LOGGER: Final = logging.getLogger(__name__)
 
@@ -659,7 +657,7 @@ class FitbitBatterySensor(CoordinatorEntity[FitbitDeviceCoordinator], SensorEnti
         coordinator: FitbitDeviceCoordinator,
         user_profile_id: str,
         description: FitbitSensorEntityDescription,
-        device: Device,
+        device: FitbitDevice,
         enable_default_override: bool,
     ) -> None:
         """Initialize the Fitbit sensor."""
@@ -679,9 +677,7 @@ class FitbitBatterySensor(CoordinatorEntity[FitbitDeviceCoordinator], SensorEnti
     @property
     def icon(self) -> str | None:
         """Icon to use in the frontend, if any."""
-        if self.device.battery is not None and (
-            battery_level := BATTERY_LEVELS.get(self.device.battery)
-        ):
+        if battery_level := BATTERY_LEVELS.get(self.device.battery):
             return icon_for_battery_level(battery_level=battery_level)
         return self.entity_description.icon
 
@@ -701,7 +697,7 @@ class FitbitBatterySensor(CoordinatorEntity[FitbitDeviceCoordinator], SensorEnti
     @callback
     def _handle_coordinator_update(self) -> None:
         """Handle updated data from the coordinator."""
-        self.device = self.coordinator.data[cast(str, self.device.id)]
+        self.device = self.coordinator.data[self.device.id]
         self._attr_native_value = self.device.battery
         self.async_write_ha_state()
 
@@ -719,7 +715,7 @@ class FitbitBatteryLevelSensor(
         coordinator: FitbitDeviceCoordinator,
         user_profile_id: str,
         description: FitbitSensorEntityDescription,
-        device: Device,
+        device: FitbitDevice,
     ) -> None:
         """Initialize the Fitbit sensor."""
         super().__init__(coordinator)
@@ -740,6 +736,6 @@ class FitbitBatteryLevelSensor(
     @callback
     def _handle_coordinator_update(self) -> None:
         """Handle updated data from the coordinator."""
-        self.device = self.coordinator.data[cast(str, self.device.id)]
+        self.device = self.coordinator.data[self.device.id]
         self._attr_native_value = self.device.battery_level
         self.async_write_ha_state()