Bump version to 2026.3.0b2

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

.core_files.yaml

@@ -34,7 +34,6 @@ base_platforms: &base_platforms
   - homeassistant/components/humidifier/**
   - homeassistant/components/image/**
   - homeassistant/components/image_processing/**
-  - homeassistant/components/infrared/**
   - homeassistant/components/lawn_mower/**
   - homeassistant/components/light/**
   - homeassistant/components/lock/**

.github/workflows/builder.yml

@@ -182,7 +182,7 @@ jobs:
           fi
 
       - name: Download translations
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
         with:
           name: translations
 
@@ -544,7 +544,7 @@ jobs:
           python-version: ${{ env.DEFAULT_PYTHON }}
 
       - name: Download translations
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
         with:
           name: translations
 

.github/workflows/ci.yaml

@@ -40,9 +40,7 @@ env:
   CACHE_VERSION: 3
   UV_CACHE_VERSION: 1
   MYPY_CACHE_VERSION: 1
-  PYTEST_DURATIONS_CACHE_VERSION: 1
-  PYTEST_DURATIONS_FILE: .ci/pytest_durations.json
-  HA_SHORT_VERSION: "2026.4"
+  HA_SHORT_VERSION: "2026.3"
   DEFAULT_PYTHON: "3.14.2"
   ALL_PYTHON_VERSIONS: "['3.14.2']"
   # 10.3 is the oldest supported version
@@ -607,7 +605,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Dependency review
-        uses: actions/dependency-review-action@05fe4576374b728f0c523d6a13d64c25081e0803 # v4.8.3
+        uses: actions/dependency-review-action@3c4e3dcb1aa7874d2c16be7d79418e9b7efd6261 # v4.8.2
         with:
           license-check: false # We use our own license audit checks
 
@@ -896,27 +894,12 @@ jobs:
           key: >-
             ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
             needs.info.outputs.python_cache_key }}
-      - name: Restore pytest durations cache
-        uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
-        with:
-          path: ${{ env.PYTEST_DURATIONS_FILE }}
-          key: >-
-            ${{ runner.os }}-${{ runner.arch }}-pytest-durations-${{ env.PYTEST_DURATIONS_CACHE_VERSION }}-${{
-            github.base_ref || github.ref_name }}
-          restore-keys: |
-            ${{ runner.os }}-${{ runner.arch }}-pytest-durations-${{ env.PYTEST_DURATIONS_CACHE_VERSION }}-${{ github.base_ref || github.ref_name }}-
-            ${{ runner.os }}-${{ runner.arch }}-pytest-durations-${{ env.PYTEST_DURATIONS_CACHE_VERSION }}-dev
       - name: Run split_tests.py
         env:
           TEST_GROUP_COUNT: ${{ needs.info.outputs.test_group_count }}
-          PYTEST_DURATIONS_FILE: ${{ env.PYTEST_DURATIONS_FILE }}
         run: |
           . venv/bin/activate
-          split_args=("${TEST_GROUP_COUNT}" tests)
-          if [[ -f "${PYTEST_DURATIONS_FILE}" ]]; then
-            split_args+=(--durations-file "${PYTEST_DURATIONS_FILE}")
-          fi
-          python -m script.split_tests "${split_args[@]}"
+          python -m script.split_tests ${TEST_GROUP_COUNT} tests
       - name: Upload pytest_buckets
         uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
@@ -995,7 +978,7 @@ jobs:
         run: |
           echo "::add-matcher::.github/workflows/matchers/pytest-slow.json"
       - name: Download pytest_buckets
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
         with:
           name: pytest_buckets
       - name: Compile English translations
@@ -1014,10 +997,11 @@ jobs:
           . venv/bin/activate
           python --version
           set -o pipefail
-          params=(--junitxml=junit.xml -o junit_family=legacy)
+          cov_params=()
           if [[ "${SKIP_COVERAGE}" != "true" ]]; then
-            params+=(--cov="homeassistant")
-            params+=(--cov-report=xml)
+            cov_params+=(--cov="homeassistant")
+            cov_params+=(--cov-report=xml)
+            cov_params+=(--junitxml=junit.xml -o junit_family=legacy)
           fi
 
           echo "Test group ${TEST_GROUP}: $(sed -n "${TEST_GROUP},1p" pytest_buckets.txt)"
@@ -1028,7 +1012,7 @@ jobs:
             --numprocesses auto \
             --snapshot-details \
             --dist=loadfile \
-            ${params[@]} \
+            ${cov_params[@]} \
             -o console_output_style=count \
             -p no:sugar \
             --exclude-warning-annotations \
@@ -1048,25 +1032,6 @@ jobs:
           name: coverage-${{ matrix.python-version }}-${{ matrix.group }}
           path: coverage.xml
           overwrite: true
-      - name: Collect pytest durations
-        env:
-          TEST_GROUP: ${{ matrix.group }}
-          PYTHON_VERSION: ${{ matrix.python-version }}
-        run: |
-          . venv/bin/activate
-          output="pytest-durations-${PYTHON_VERSION}-${TEST_GROUP}.json"
-          if [[ -f junit.xml ]]; then
-            python -m script.collect_test_durations --output "${output}" junit.xml
-          else
-            echo "::error::Missing junit.xml, cannot collect pytest durations"
-            exit 1
-          fi
-      - name: Upload pytest durations
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
-        with:
-          name: pytest-durations-${{ matrix.python-version }}-${{ matrix.group }}
-          path: pytest-durations-*.json
-          overwrite: true
       - name: Beautify test results
         # For easier identification of parsing errors
         if: needs.info.outputs.skip_coverage != 'true'
@@ -1085,68 +1050,6 @@ jobs:
         run: |
           ./script/check_dirty
 
-  update-pytest-duration-cache:
-    name: Update pytest durations cache
-    runs-on: ubuntu-24.04
-    permissions:
-      contents: read
-    needs:
-      - info
-      - prepare-pytest-full
-      - pytest-full
-    if: |
-      needs.info.outputs.lint_only != 'true'
-      && needs.info.outputs.test_full_suite == 'true'
-    steps:
-      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
-        with:
-          python-version: ${{ env.DEFAULT_PYTHON }}
-          check-latest: true
-      - name: Restore pytest durations cache
-        uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
-        with:
-          path: ${{ env.PYTEST_DURATIONS_FILE }}
-          key: >-
-            ${{ runner.os }}-${{ runner.arch }}-pytest-durations-${{ env.PYTEST_DURATIONS_CACHE_VERSION }}-${{
-            github.base_ref || github.ref_name }}
-          restore-keys: |
-            ${{ runner.os }}-${{ runner.arch }}-pytest-durations-${{ env.PYTEST_DURATIONS_CACHE_VERSION }}-${{ github.base_ref || github.ref_name }}-
-            ${{ runner.os }}-${{ runner.arch }}-pytest-durations-${{ env.PYTEST_DURATIONS_CACHE_VERSION }}-dev
-      - name: Download pytest durations artifacts
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
-        with:
-          pattern: pytest-durations-*
-          merge-multiple: true
-          path: .ci/pytest-durations
-      - name: Merge pytest durations
-        run: |
-          input_files=()
-          for file in .ci/pytest-durations/*.json; do
-            [[ -f "${file}" ]] || continue
-            input_files+=("${file}")
-          done
-
-          if [[ ${#input_files[@]} -eq 0 ]]; then
-            mkdir -p "$(dirname "${PYTEST_DURATIONS_FILE}")"
-            if [[ ! -f "${PYTEST_DURATIONS_FILE}" ]]; then
-              echo "{}" > "${PYTEST_DURATIONS_FILE}"
-            fi
-            exit 0
-          fi
-
-          python -m script.collect_test_durations \
-            --existing "${PYTEST_DURATIONS_FILE}" \
-            --output "${PYTEST_DURATIONS_FILE}" \
-            "${input_files[@]}"
-      - name: Save pytest durations cache
-        uses: actions/cache/save@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
-        with:
-          path: ${{ env.PYTEST_DURATIONS_FILE }}
-          key: >-
-            ${{ runner.os }}-${{ runner.arch }}-pytest-durations-${{ env.PYTEST_DURATIONS_CACHE_VERSION }}-${{
-            github.base_ref || github.ref_name }}-${{ github.run_id }}-${{ github.run_attempt }}
-
   pytest-mariadb:
     name: Run ${{ matrix.mariadb-group }} tests Python ${{ matrix.python-version }}
     runs-on: ubuntu-24.04
@@ -1484,7 +1387,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Download all coverage artifacts
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
         with:
           pattern: coverage-*
       - name: Upload coverage to Codecov
@@ -1655,7 +1558,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Download all coverage artifacts
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
         with:
           pattern: coverage-*
       - name: Upload coverage to Codecov
@@ -1684,7 +1587,7 @@ jobs:
       && needs.info.outputs.skip_coverage != 'true' && !cancelled()
     steps:
       - name: Download all coverage artifacts
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
         with:
           pattern: test-results-*
       - name: Upload test results to Codecov

.github/workflows/codeql.yml

@@ -28,11 +28,11 @@ jobs:
           persist-credentials: false
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@89a39a4e59826350b863aa6b6252a07ad50cf83e # v4.32.4
+        uses: github/codeql-action/init@9e907b5e64f6b83e7804b09294d44122997950d6 # v4.32.3
         with:
           languages: python
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@89a39a4e59826350b863aa6b6252a07ad50cf83e # v4.32.4
+        uses: github/codeql-action/analyze@9e907b5e64f6b83e7804b09294d44122997950d6 # v4.32.3
         with:
           category: "/language:python"

.github/workflows/wheels.yml

@@ -124,12 +124,12 @@ jobs:
           persist-credentials: false
 
       - name: Download env_file
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
         with:
           name: env_file
 
       - name: Download requirements_diff
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
         with:
           name: requirements_diff
 
@@ -175,17 +175,17 @@ jobs:
           persist-credentials: false
 
       - name: Download env_file
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
         with:
           name: env_file
 
       - name: Download requirements_diff
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
         with:
           name: requirements_diff
 
       - name: Download requirements_all_wheels
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
         with:
           name: requirements_all_wheels
 

.strict-typing

@@ -289,7 +289,6 @@ homeassistant.components.imgw_pib.*
 homeassistant.components.immich.*
 homeassistant.components.incomfort.*
 homeassistant.components.inels.*
-homeassistant.components.infrared.*
 homeassistant.components.input_button.*
 homeassistant.components.input_select.*
 homeassistant.components.input_text.*
@@ -545,7 +544,6 @@ homeassistant.components.tcp.*
 homeassistant.components.technove.*
 homeassistant.components.tedee.*
 homeassistant.components.telegram_bot.*
-homeassistant.components.teslemetry.*
 homeassistant.components.text.*
 homeassistant.components.thethingsnetwork.*
 homeassistant.components.threshold.*

CODEOWNERS

@@ -401,6 +401,8 @@ build.json @home-assistant/supervisor
 /tests/components/dsmr_reader/ @sorted-bits @glodenox @erwindouna
 /homeassistant/components/duckdns/ @tr4nt0r
 /tests/components/duckdns/ @tr4nt0r
+/homeassistant/components/duke_energy/ @hunterjm
+/tests/components/duke_energy/ @hunterjm
 /homeassistant/components/duotecno/ @cereal2nd
 /tests/components/duotecno/ @cereal2nd
 /homeassistant/components/dwd_weather_warnings/ @runningman84 @stephan192
@@ -792,8 +794,6 @@ build.json @home-assistant/supervisor
 /tests/components/inels/ @epdevlab
 /homeassistant/components/influxdb/ @mdegat01 @Robbie1221
 /tests/components/influxdb/ @mdegat01 @Robbie1221
-/homeassistant/components/infrared/ @home-assistant/core
-/tests/components/infrared/ @home-assistant/core
 /homeassistant/components/inkbird/ @bdraco
 /tests/components/inkbird/ @bdraco
 /homeassistant/components/input_boolean/ @home-assistant/core
@@ -1899,8 +1899,8 @@ build.json @home-assistant/supervisor
 /tests/components/withings/ @joostlek
 /homeassistant/components/wiz/ @sbidy @arturpragacz
 /tests/components/wiz/ @sbidy @arturpragacz
-/homeassistant/components/wled/ @frenck @mik-laj
-/tests/components/wled/ @frenck @mik-laj
+/homeassistant/components/wled/ @frenck
+/tests/components/wled/ @frenck
 /homeassistant/components/wmspro/ @mback2k
 /tests/components/wmspro/ @mback2k
 /homeassistant/components/wolflink/ @adamkrol93 @mtielen

codecov.yml

@@ -10,7 +10,6 @@ coverage:
         target: auto
         threshold: 1
         paths:
-          - homeassistant/components/*/backup.py
           - homeassistant/components/*/config_flow.py
           - homeassistant/components/*/device_action.py
           - homeassistant/components/*/device_condition.py
@@ -29,7 +28,6 @@ coverage:
         target: 100
         threshold: 0
         paths:
-          - homeassistant/components/*/backup.py
           - homeassistant/components/*/config_flow.py
           - homeassistant/components/*/device_action.py
           - homeassistant/components/*/device_condition.py

homeassistant/bootstrap.py

@@ -70,7 +70,7 @@ from .const import (
     SIGNAL_BOOTSTRAP_INTEGRATIONS,
 )
 from .core_config import async_process_ha_core_config
-from .exceptions import HomeAssistantError, UnsupportedStorageVersionError
+from .exceptions import HomeAssistantError
 from .helpers import (
     area_registry,
     category_registry,
@@ -433,56 +433,32 @@ def _init_blocking_io_modules_in_executor() -> None:
     is_docker_env()
 
 
-async def async_load_base_functionality(hass: core.HomeAssistant) -> bool:
-    """Load the registries and modules that will do blocking I/O.
-
-    Return whether loading succeeded.
-    """
+async def async_load_base_functionality(hass: core.HomeAssistant) -> None:
+    """Load the registries and modules that will do blocking I/O."""
     if DATA_REGISTRIES_LOADED in hass.data:
-        return True
-
+        return
     hass.data[DATA_REGISTRIES_LOADED] = None
     entity.async_setup(hass)
     frame.async_setup(hass)
     template.async_setup(hass)
     translation.async_setup(hass)
-
-    recovery = hass.config.recovery_mode
-    try:
-        await asyncio.gather(
-            create_eager_task(get_internal_store_manager(hass).async_initialize()),
-            create_eager_task(area_registry.async_load(hass, load_empty=recovery)),
-            create_eager_task(category_registry.async_load(hass, load_empty=recovery)),
-            create_eager_task(device_registry.async_load(hass, load_empty=recovery)),
-            create_eager_task(entity_registry.async_load(hass, load_empty=recovery)),
-            create_eager_task(floor_registry.async_load(hass, load_empty=recovery)),
-            create_eager_task(issue_registry.async_load(hass, load_empty=recovery)),
-            create_eager_task(label_registry.async_load(hass, load_empty=recovery)),
-            hass.async_add_executor_job(_init_blocking_io_modules_in_executor),
-            create_eager_task(template.async_load_custom_templates(hass)),
-            create_eager_task(restore_state.async_load(hass, load_empty=recovery)),
-            create_eager_task(hass.config_entries.async_initialize()),
-            create_eager_task(async_get_system_info(hass)),
-            create_eager_task(condition.async_setup(hass)),
-            create_eager_task(trigger.async_setup(hass)),
-        )
-    except UnsupportedStorageVersionError as err:
-        # If we're already in recovery mode, we don't want to handle the exception
-        # and activate recovery mode again, as that would lead to an infinite loop.
-        if recovery:
-            raise
-
-        _LOGGER.error(
-            "Storage file %s was created by a newer version of Home Assistant"
-            " (storage version %s > %s); activating recovery mode; on-disk data"
-            " is preserved; upgrade Home Assistant or restore from a backup",
-            err.storage_key,
-            err.found_version,
-            err.max_supported_version,
-        )
-        return False
-
-    return True
+    await asyncio.gather(
+        create_eager_task(get_internal_store_manager(hass).async_initialize()),
+        create_eager_task(area_registry.async_load(hass)),
+        create_eager_task(category_registry.async_load(hass)),
+        create_eager_task(device_registry.async_load(hass)),
+        create_eager_task(entity_registry.async_load(hass)),
+        create_eager_task(floor_registry.async_load(hass)),
+        create_eager_task(issue_registry.async_load(hass)),
+        create_eager_task(label_registry.async_load(hass)),
+        hass.async_add_executor_job(_init_blocking_io_modules_in_executor),
+        create_eager_task(template.async_load_custom_templates(hass)),
+        create_eager_task(restore_state.async_load(hass)),
+        create_eager_task(hass.config_entries.async_initialize()),
+        create_eager_task(async_get_system_info(hass)),
+        create_eager_task(condition.async_setup(hass)),
+        create_eager_task(trigger.async_setup(hass)),
+    )
 
 
 async def async_from_config_dict(
@@ -499,9 +475,7 @@ async def async_from_config_dict(
     # Prime custom component cache early so we know if registry entries are tied
     # to a custom integration
     await loader.async_get_custom_components(hass)
-
-    if not await async_load_base_functionality(hass):
-        return None
+    await async_load_base_functionality(hass)
 
     # Set up core.
     _LOGGER.debug("Setting up %s", CORE_INTEGRATIONS)

homeassistant/brands/ubisys.json

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

homeassistant/components/abode/services.py

@@ -12,6 +12,10 @@ from homeassistant.helpers.dispatcher import dispatcher_send
 
 from .const import DOMAIN, DOMAIN_DATA, LOGGER
 
+SERVICE_SETTINGS = "change_setting"
+SERVICE_CAPTURE_IMAGE = "capture_image"
+SERVICE_TRIGGER_AUTOMATION = "trigger_automation"
+
 ATTR_SETTING = "setting"
 ATTR_VALUE = "value"
 
@@ -71,13 +75,16 @@ def async_setup_services(hass: HomeAssistant) -> None:
     """Home Assistant services."""
 
     hass.services.async_register(
-        DOMAIN, "change_setting", _change_setting, schema=CHANGE_SETTING_SCHEMA
+        DOMAIN, SERVICE_SETTINGS, _change_setting, schema=CHANGE_SETTING_SCHEMA
     )
 
     hass.services.async_register(
-        DOMAIN, "capture_image", _capture_image, schema=CAPTURE_IMAGE_SCHEMA
+        DOMAIN, SERVICE_CAPTURE_IMAGE, _capture_image, schema=CAPTURE_IMAGE_SCHEMA
     )
 
     hass.services.async_register(
-        DOMAIN, "trigger_automation", _trigger_automation, schema=AUTOMATION_SCHEMA
+        DOMAIN,
+        SERVICE_TRIGGER_AUTOMATION,
+        _trigger_automation,
+        schema=AUTOMATION_SCHEMA,
     )

homeassistant/components/advantage_air/services.py

@@ -10,6 +10,8 @@ from homeassistant.helpers import config_validation as cv, service
 
 from .const import DOMAIN
 
+ADVANTAGE_AIR_SERVICE_SET_TIME_TO = "set_time_to"
+
 
 @callback
 def async_setup_services(hass: HomeAssistant) -> None:
@@ -18,7 +20,7 @@ def async_setup_services(hass: HomeAssistant) -> None:
     service.async_register_platform_entity_service(
         hass,
         DOMAIN,
-        "set_time_to",
+        ADVANTAGE_AIR_SERVICE_SET_TIME_TO,
         entity_domain=SENSOR_DOMAIN,
         schema={vol.Required("minutes"): cv.positive_int},
         func="set_time_to",

homeassistant/components/agent_dvr/services.py

@@ -8,12 +8,18 @@ from homeassistant.helpers import service
 
 from .const import DOMAIN
 
+_DEV_EN_ALT = "enable_alerts"
+_DEV_DS_ALT = "disable_alerts"
+_DEV_EN_REC = "start_recording"
+_DEV_DS_REC = "stop_recording"
+_DEV_SNAP = "snapshot"
+
 CAMERA_SERVICES = {
-    "enable_alerts": "async_enable_alerts",
-    "disable_alerts": "async_disable_alerts",
-    "start_recording": "async_start_recording",
-    "stop_recording": "async_stop_recording",
-    "snapshot": "async_snapshot",
+    _DEV_EN_ALT: "async_enable_alerts",
+    _DEV_DS_ALT: "async_disable_alerts",
+    _DEV_EN_REC: "async_start_recording",
+    _DEV_DS_REC: "async_stop_recording",
+    _DEV_SNAP: "async_snapshot",
 }
 
 

homeassistant/components/aladdin_connect/diagnostics.py

@@ -1,32 +0,0 @@
-"""Diagnostics support for Aladdin Connect."""
-
-from __future__ import annotations
-
-from typing import Any
-
-from homeassistant.components.diagnostics import async_redact_data
-from homeassistant.core import HomeAssistant
-
-from .coordinator import AladdinConnectConfigEntry
-
-TO_REDACT = {"access_token", "refresh_token"}
-
-
-async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant, config_entry: AladdinConnectConfigEntry
-) -> dict[str, Any]:
-    """Return diagnostics for a config entry."""
-    return {
-        "config_entry": async_redact_data(config_entry.as_dict(), TO_REDACT),
-        "doors": {
-            uid: {
-                "device_id": coordinator.data.device_id,
-                "door_number": coordinator.data.door_number,
-                "name": coordinator.data.name,
-                "status": coordinator.data.status,
-                "link_status": coordinator.data.link_status,
-                "battery_level": coordinator.data.battery_level,
-            }
-            for uid, coordinator in config_entry.runtime_data.items()
-        },
-    }

homeassistant/components/aladdin_connect/quality_scale.yaml

@@ -45,7 +45,7 @@ rules:
 
   # Gold
   devices: done
-  diagnostics: done
+  diagnostics: todo
   discovery: done
   discovery-update-info:
     status: exempt

homeassistant/components/alarm_control_panel/trigger.py

@@ -44,7 +44,7 @@ def make_entity_state_trigger_required_features(
     class CustomTrigger(EntityStateTriggerRequiredFeatures):
         """Trigger for entity state changes."""
 
-        _domains = {domain}
+        _domain = domain
         _to_states = {to_state}
         _required_features = required_features
 

homeassistant/components/alarmdecoder/services.py

@@ -13,6 +13,9 @@ from homeassistant.helpers import config_validation as cv, service
 
 from .const import DOMAIN
 
+SERVICE_ALARM_TOGGLE_CHIME = "alarm_toggle_chime"
+
+SERVICE_ALARM_KEYPRESS = "alarm_keypress"
 ATTR_KEYPRESS = "keypress"
 
 
@@ -23,7 +26,7 @@ def async_setup_services(hass: HomeAssistant) -> None:
     service.async_register_platform_entity_service(
         hass,
         DOMAIN,
-        "alarm_toggle_chime",
+        SERVICE_ALARM_TOGGLE_CHIME,
         entity_domain=ALARM_CONTROL_PANEL_DOMAIN,
         schema={
             vol.Required(ATTR_CODE): cv.string,
@@ -34,7 +37,7 @@ def async_setup_services(hass: HomeAssistant) -> None:
     service.async_register_platform_entity_service(
         hass,
         DOMAIN,
-        "alarm_keypress",
+        SERVICE_ALARM_KEYPRESS,
         entity_domain=ALARM_CONTROL_PANEL_DOMAIN,
         schema={
             vol.Required(ATTR_KEYPRESS): cv.string,

homeassistant/components/alexa_devices/services.py

@@ -16,6 +16,9 @@ from .coordinator import AmazonConfigEntry
 ATTR_TEXT_COMMAND = "text_command"
 ATTR_SOUND = "sound"
 ATTR_INFO_SKILL = "info_skill"
+SERVICE_TEXT_COMMAND = "send_text_command"
+SERVICE_SOUND_NOTIFICATION = "send_sound"
+SERVICE_INFO_SKILL = "send_info_skill"
 
 SCHEMA_SOUND_SERVICE = vol.Schema(
     {
@@ -125,17 +128,17 @@ def async_setup_services(hass: HomeAssistant) -> None:
     """Set up the services for the Amazon Devices integration."""
     for service_name, method, schema in (
         (
-            "send_sound",
+            SERVICE_SOUND_NOTIFICATION,
             async_send_sound_notification,
             SCHEMA_SOUND_SERVICE,
         ),
         (
-            "send_text_command",
+            SERVICE_TEXT_COMMAND,
             async_send_text_command,
             SCHEMA_CUSTOM_COMMAND,
         ),
         (
-            "send_info_skill",
+            SERVICE_INFO_SKILL,
             async_send_info_skill,
             SCHEMA_INFO_SKILL,
         ),

homeassistant/components/amberelectric/const.py

@@ -16,6 +16,8 @@ ATTRIBUTION = "Data provided by Amber Electric"
 LOGGER = logging.getLogger(__package__)
 PLATFORMS = [Platform.BINARY_SENSOR, Platform.SENSOR]
 
+SERVICE_GET_FORECASTS = "get_forecasts"
+
 GENERAL_CHANNEL = "general"
 CONTROLLED_LOAD_CHANNEL = "controlled_load"
 FEED_IN_CHANNEL = "feed_in"

homeassistant/components/amberelectric/services.py

@@ -22,6 +22,7 @@ from .const import (
     DOMAIN,
     FEED_IN_CHANNEL,
     GENERAL_CHANNEL,
+    SERVICE_GET_FORECASTS,
 )
 from .coordinator import AmberConfigEntry
 from .helpers import format_cents_to_dollars, normalize_descriptor
@@ -100,7 +101,7 @@ def async_setup_services(hass: HomeAssistant) -> None:
 
     hass.services.async_register(
         DOMAIN,
-        "get_forecasts",
+        SERVICE_GET_FORECASTS,
         handle_get_forecasts,
         GET_FORECASTS_SCHEMA,
         supports_response=SupportsResponse.ONLY,

homeassistant/components/amcrest/camera.py

@@ -49,6 +49,18 @@ SCAN_INTERVAL = timedelta(seconds=15)
 
 STREAM_SOURCE_LIST = ["snapshot", "mjpeg", "rtsp"]
 
+_SRV_EN_REC = "enable_recording"
+_SRV_DS_REC = "disable_recording"
+_SRV_EN_AUD = "enable_audio"
+_SRV_DS_AUD = "disable_audio"
+_SRV_EN_MOT_REC = "enable_motion_recording"
+_SRV_DS_MOT_REC = "disable_motion_recording"
+_SRV_GOTO = "goto_preset"
+_SRV_CBW = "set_color_bw"
+_SRV_TOUR_ON = "start_tour"
+_SRV_TOUR_OFF = "stop_tour"
+
+_SRV_PTZ_CTRL = "ptz_control"
 _ATTR_PTZ_TT = "travel_time"
 _ATTR_PTZ_MOV = "movement"
 _MOV = [
@@ -91,17 +103,17 @@ _SRV_PTZ_SCHEMA = _SRV_SCHEMA.extend(
 )
 
 CAMERA_SERVICES = {
-    "enable_recording": (_SRV_SCHEMA, "async_enable_recording", ()),
-    "disable_recording": (_SRV_SCHEMA, "async_disable_recording", ()),
-    "enable_audio": (_SRV_SCHEMA, "async_enable_audio", ()),
-    "disable_audio": (_SRV_SCHEMA, "async_disable_audio", ()),
-    "enable_motion_recording": (_SRV_SCHEMA, "async_enable_motion_recording", ()),
-    "disable_motion_recording": (_SRV_SCHEMA, "async_disable_motion_recording", ()),
-    "goto_preset": (_SRV_GOTO_SCHEMA, "async_goto_preset", (_ATTR_PRESET,)),
-    "set_color_bw": (_SRV_CBW_SCHEMA, "async_set_color_bw", (_ATTR_COLOR_BW,)),
-    "start_tour": (_SRV_SCHEMA, "async_start_tour", ()),
-    "stop_tour": (_SRV_SCHEMA, "async_stop_tour", ()),
-    "ptz_control": (
+    _SRV_EN_REC: (_SRV_SCHEMA, "async_enable_recording", ()),
+    _SRV_DS_REC: (_SRV_SCHEMA, "async_disable_recording", ()),
+    _SRV_EN_AUD: (_SRV_SCHEMA, "async_enable_audio", ()),
+    _SRV_DS_AUD: (_SRV_SCHEMA, "async_disable_audio", ()),
+    _SRV_EN_MOT_REC: (_SRV_SCHEMA, "async_enable_motion_recording", ()),
+    _SRV_DS_MOT_REC: (_SRV_SCHEMA, "async_disable_motion_recording", ()),
+    _SRV_GOTO: (_SRV_GOTO_SCHEMA, "async_goto_preset", (_ATTR_PRESET,)),
+    _SRV_CBW: (_SRV_CBW_SCHEMA, "async_set_color_bw", (_ATTR_COLOR_BW,)),
+    _SRV_TOUR_ON: (_SRV_SCHEMA, "async_start_tour", ()),
+    _SRV_TOUR_OFF: (_SRV_SCHEMA, "async_stop_tour", ()),
+    _SRV_PTZ_CTRL: (
         _SRV_PTZ_SCHEMA,
         "async_ptz_control",
         (_ATTR_PTZ_MOV, _ATTR_PTZ_TT),

homeassistant/components/androidtv/media_player.py

@@ -36,7 +36,7 @@ from .const import (
     SIGNAL_CONFIG_ENTITY,
 )
 from .entity import AndroidTVEntity, adb_decorator
-from .services import ATTR_ADB_RESPONSE, ATTR_HDMI_INPUT
+from .services import ATTR_ADB_RESPONSE, ATTR_HDMI_INPUT, SERVICE_LEARN_SENDEVENT
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -271,7 +271,7 @@ class ADBDevice(AndroidTVEntity, MediaPlayerEntity):
             self.async_write_ha_state()
 
             msg = (
-                f"Output from service 'learn_sendevent' from"
+                f"Output from service '{SERVICE_LEARN_SENDEVENT}' from"
                 f" {self.entity_id}: '{output}'"
             )
             persistent_notification.async_create(

homeassistant/components/androidtv/services.py

@@ -16,6 +16,11 @@ ATTR_DEVICE_PATH = "device_path"
 ATTR_HDMI_INPUT = "hdmi_input"
 ATTR_LOCAL_PATH = "local_path"
 
+SERVICE_ADB_COMMAND = "adb_command"
+SERVICE_DOWNLOAD = "download"
+SERVICE_LEARN_SENDEVENT = "learn_sendevent"
+SERVICE_UPLOAD = "upload"
+
 
 @callback
 def async_setup_services(hass: HomeAssistant) -> None:
@@ -24,7 +29,7 @@ def async_setup_services(hass: HomeAssistant) -> None:
     service.async_register_platform_entity_service(
         hass,
         DOMAIN,
-        "adb_command",
+        SERVICE_ADB_COMMAND,
         entity_domain=MEDIA_PLAYER_DOMAIN,
         schema={vol.Required(ATTR_COMMAND): cv.string},
         func="adb_command",
@@ -32,7 +37,7 @@ def async_setup_services(hass: HomeAssistant) -> None:
     service.async_register_platform_entity_service(
         hass,
         DOMAIN,
-        "learn_sendevent",
+        SERVICE_LEARN_SENDEVENT,
         entity_domain=MEDIA_PLAYER_DOMAIN,
         schema=None,
         func="learn_sendevent",
@@ -40,7 +45,7 @@ def async_setup_services(hass: HomeAssistant) -> None:
     service.async_register_platform_entity_service(
         hass,
         DOMAIN,
-        "download",
+        SERVICE_DOWNLOAD,
         entity_domain=MEDIA_PLAYER_DOMAIN,
         schema={
             vol.Required(ATTR_DEVICE_PATH): cv.string,
@@ -51,7 +56,7 @@ def async_setup_services(hass: HomeAssistant) -> None:
     service.async_register_platform_entity_service(
         hass,
         DOMAIN,
-        "upload",
+        SERVICE_UPLOAD,
         entity_domain=MEDIA_PLAYER_DOMAIN,
         schema={
             vol.Required(ATTR_DEVICE_PATH): cv.string,

homeassistant/components/anthropic/entity.py

@@ -400,8 +400,8 @@ def _convert_content(
                 # If there is only one text block, simplify the content to a string
                 messages[-1]["content"] = messages[-1]["content"][0]["text"]
         else:
-            # Note: We don't pass SystemContent here as it's passed to the API as the prompt
-            raise HomeAssistantError("Unexpected content type in chat log")
+            # Note: We don't pass SystemContent here as its passed to the API as the prompt
+            raise TypeError(f"Unexpected content type: {type(content)}")
 
     return messages, container_id
 
@@ -442,8 +442,8 @@ async def _transform_stream(  # noqa: C901 - This is complex, but better to have
 
     Each message could contain multiple blocks of the same type.
     """
-    if stream is None or not hasattr(stream, "__aiter__"):
-        raise HomeAssistantError("Expected a stream of messages")
+    if stream is None:
+        raise TypeError("Expected a stream of messages")
 
     current_tool_block: ToolUseBlockParam | ServerToolUseBlockParam | None = None
     current_tool_args: str
@@ -456,6 +456,8 @@ async def _transform_stream(  # noqa: C901 - This is complex, but better to have
         LOGGER.debug("Received response: %s", response)
 
         if isinstance(response, RawMessageStartEvent):
+            if response.message.role != "assistant":
+                raise ValueError("Unexpected message role")
             input_usage = response.message.usage
             first_block = True
         elif isinstance(response, RawContentBlockStartEvent):
@@ -664,7 +666,7 @@ class AnthropicBaseLLMEntity(Entity):
 
         system = chat_log.content[0]
         if not isinstance(system, conversation.SystemContent):
-            raise HomeAssistantError("First message must be a system message")
+            raise TypeError("First message must be a system message")
 
         # System prompt with caching enabled
         system_prompt: list[TextBlockParam] = [

homeassistant/components/anthropic/quality_scale.yaml

@@ -31,7 +31,10 @@ rules:
   test-before-setup: done
   unique-config-entry: done
   # Silver
-  action-exceptions: done
+  action-exceptions:
+    status: todo
+    comment: |
+      Reevaluate exceptions for entity services.
   config-entry-unloading: done
   docs-configuration-parameters: done
   docs-installation-parameters: done

homeassistant/components/aquostv/media_player.py

@@ -117,7 +117,6 @@ class SharpAquosTVDevice(MediaPlayerEntity):
         | MediaPlayerEntityFeature.VOLUME_SET
         | MediaPlayerEntityFeature.PLAY
     )
-    _attr_volume_step = 2 / 60
 
     def __init__(
         self, name: str, remote: sharp_aquos_rc.TV, power_on_enabled: bool = False
@@ -162,6 +161,22 @@ class SharpAquosTVDevice(MediaPlayerEntity):
         """Turn off tvplayer."""
         self._remote.power(0)
 
+    @_retry
+    def volume_up(self) -> None:
+        """Volume up the media player."""
+        if self.volume_level is None:
+            _LOGGER.debug("Unknown volume in volume_up")
+            return
+        self._remote.volume(int(self.volume_level * 60) + 2)
+
+    @_retry
+    def volume_down(self) -> None:
+        """Volume down media player."""
+        if self.volume_level is None:
+            _LOGGER.debug("Unknown volume in volume_down")
+            return
+        self._remote.volume(int(self.volume_level * 60) - 2)
+
     @_retry
     def set_volume_level(self, volume: float) -> None:
         """Set Volume media player."""

homeassistant/components/aws_s3/backup.py

@@ -19,7 +19,7 @@ from homeassistant.components.backup import (
 from homeassistant.core import HomeAssistant, callback
 
 from . import S3ConfigEntry
-from .const import CONF_BUCKET, CONF_PREFIX, DATA_BACKUP_AGENT_LISTENERS, DOMAIN
+from .const import CONF_BUCKET, DATA_BACKUP_AGENT_LISTENERS, DOMAIN
 from .helpers import async_list_backups_from_s3
 
 _LOGGER = logging.getLogger(__name__)
@@ -100,13 +100,6 @@ class S3BackupAgent(BackupAgent):
         self.unique_id = entry.entry_id
         self._backup_cache: dict[str, AgentBackup] = {}
         self._cache_expiration = time()
-        self._prefix: str = entry.data.get(CONF_PREFIX, "")
-
-    def _with_prefix(self, key: str) -> str:
-        """Add prefix to a key if configured."""
-        if not self._prefix:
-            return key
-        return f"{self._prefix}/{key}"
 
     @handle_boto_errors
     async def async_download_backup(
@@ -122,9 +115,7 @@ class S3BackupAgent(BackupAgent):
         backup = await self._find_backup_by_id(backup_id)
         tar_filename, _ = suggested_filenames(backup)
 
-        response = await self._client.get_object(
-            Bucket=self._bucket, Key=self._with_prefix(tar_filename)
-        )
+        response = await self._client.get_object(Bucket=self._bucket, Key=tar_filename)
         return response["Body"].iter_chunks()
 
     async def async_upload_backup(
@@ -151,7 +142,7 @@ class S3BackupAgent(BackupAgent):
             metadata_content = json.dumps(backup.as_dict())
             await self._client.put_object(
                 Bucket=self._bucket,
-                Key=self._with_prefix(metadata_filename),
+                Key=metadata_filename,
                 Body=metadata_content,
             )
         except BotoCoreError as err:
@@ -178,7 +169,7 @@ class S3BackupAgent(BackupAgent):
 
         await self._client.put_object(
             Bucket=self._bucket,
-            Key=self._with_prefix(tar_filename),
+            Key=tar_filename,
             Body=bytes(file_data),
         )
 
@@ -195,7 +186,7 @@ class S3BackupAgent(BackupAgent):
         _LOGGER.debug("Starting multipart upload for %s", tar_filename)
         multipart_upload = await self._client.create_multipart_upload(
             Bucket=self._bucket,
-            Key=self._with_prefix(tar_filename),
+            Key=tar_filename,
         )
         upload_id = multipart_upload["UploadId"]
         try:
@@ -225,7 +216,7 @@ class S3BackupAgent(BackupAgent):
                         )
                         part = await cast(Any, self._client).upload_part(
                             Bucket=self._bucket,
-                            Key=self._with_prefix(tar_filename),
+                            Key=tar_filename,
                             PartNumber=part_number,
                             UploadId=upload_id,
                             Body=part_data.tobytes(),
@@ -253,7 +244,7 @@ class S3BackupAgent(BackupAgent):
                 )
                 part = await cast(Any, self._client).upload_part(
                     Bucket=self._bucket,
-                    Key=self._with_prefix(tar_filename),
+                    Key=tar_filename,
                     PartNumber=part_number,
                     UploadId=upload_id,
                     Body=remaining_data.tobytes(),
@@ -262,7 +253,7 @@ class S3BackupAgent(BackupAgent):
 
             await cast(Any, self._client).complete_multipart_upload(
                 Bucket=self._bucket,
-                Key=self._with_prefix(tar_filename),
+                Key=tar_filename,
                 UploadId=upload_id,
                 MultipartUpload={"Parts": parts},
             )
@@ -271,7 +262,7 @@ class S3BackupAgent(BackupAgent):
             try:
                 await self._client.abort_multipart_upload(
                     Bucket=self._bucket,
-                    Key=self._with_prefix(tar_filename),
+                    Key=tar_filename,
                     UploadId=upload_id,
                 )
             except BotoCoreError:
@@ -292,12 +283,8 @@ class S3BackupAgent(BackupAgent):
         tar_filename, metadata_filename = suggested_filenames(backup)
 
         # Delete both the backup file and its metadata file
-        await self._client.delete_object(
-            Bucket=self._bucket, Key=self._with_prefix(tar_filename)
-        )
-        await self._client.delete_object(
-            Bucket=self._bucket, Key=self._with_prefix(metadata_filename)
-        )
+        await self._client.delete_object(Bucket=self._bucket, Key=tar_filename)
+        await self._client.delete_object(Bucket=self._bucket, Key=metadata_filename)
 
         # Reset cache after successful deletion
         self._cache_expiration = time()
@@ -330,9 +317,7 @@ class S3BackupAgent(BackupAgent):
         if time() <= self._cache_expiration:
             return self._backup_cache
 
-        backups_list = await async_list_backups_from_s3(
-            self._client, self._bucket, self._prefix
-        )
+        backups_list = await async_list_backups_from_s3(self._client, self._bucket)
         self._backup_cache = {b.backup_id: b for b in backups_list}
         self._cache_expiration = time() + CACHE_TTL
 

homeassistant/components/aws_s3/config_flow.py

@@ -22,7 +22,6 @@ from .const import (
     CONF_ACCESS_KEY_ID,
     CONF_BUCKET,
     CONF_ENDPOINT_URL,
-    CONF_PREFIX,
     CONF_SECRET_ACCESS_KEY,
     DEFAULT_ENDPOINT_URL,
     DESCRIPTION_AWS_S3_DOCS_URL,
@@ -40,7 +39,6 @@ STEP_USER_DATA_SCHEMA = vol.Schema(
         vol.Required(CONF_ENDPOINT_URL, default=DEFAULT_ENDPOINT_URL): TextSelector(
             config=TextSelectorConfig(type=TextSelectorType.URL)
         ),
-        vol.Optional(CONF_PREFIX, default=""): cv.string,
     }
 )
 
@@ -55,17 +53,12 @@ class S3ConfigFlow(ConfigFlow, domain=DOMAIN):
         errors: dict[str, str] = {}
 
         if user_input is not None:
-            normalized_prefix = user_input.get(CONF_PREFIX, "").strip("/")
-            # Check for existing entries, treating missing prefix as empty
-            for entry in self._async_current_entries(include_ignore=False):
-                entry_prefix = (entry.data.get(CONF_PREFIX) or "").strip("/")
-                if (
-                    entry.data.get(CONF_BUCKET) == user_input[CONF_BUCKET]
-                    and entry.data.get(CONF_ENDPOINT_URL)
-                    == user_input[CONF_ENDPOINT_URL]
-                    and entry_prefix == normalized_prefix
-                ):
-                    return self.async_abort(reason="already_configured")
+            self._async_abort_entries_match(
+                {
+                    CONF_BUCKET: user_input[CONF_BUCKET],
+                    CONF_ENDPOINT_URL: user_input[CONF_ENDPOINT_URL],
+                }
+            )
 
             hostname = urlparse(user_input[CONF_ENDPOINT_URL]).hostname
             if not hostname or not hostname.endswith(AWS_DOMAIN):
@@ -90,18 +83,9 @@ class S3ConfigFlow(ConfigFlow, domain=DOMAIN):
                 except ConnectionError:
                     errors[CONF_ENDPOINT_URL] = "cannot_connect"
                 else:
-                    data = dict(user_input)
-                    if not normalized_prefix:
-                        # Do not persist empty optional values
-                        data.pop(CONF_PREFIX, None)
-                    else:
-                        data[CONF_PREFIX] = normalized_prefix
-
-                    title = user_input[CONF_BUCKET]
-                    if normalized_prefix:
-                        title = f"{title} - {normalized_prefix}"
-
-                    return self.async_create_entry(title=title, data=data)
+                    return self.async_create_entry(
+                        title=user_input[CONF_BUCKET], data=user_input
+                    )
 
         return self.async_show_form(
             step_id="user",

homeassistant/components/aws_s3/const.py

@@ -11,7 +11,6 @@ CONF_ACCESS_KEY_ID = "access_key_id"
 CONF_SECRET_ACCESS_KEY = "secret_access_key"
 CONF_ENDPOINT_URL = "endpoint_url"
 CONF_BUCKET = "bucket"
-CONF_PREFIX = "prefix"
 
 AWS_DOMAIN = "amazonaws.com"
 DEFAULT_ENDPOINT_URL = f"https://s3.eu-central-1.{AWS_DOMAIN}/"

homeassistant/components/aws_s3/coordinator.py

@@ -13,7 +13,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
-from .const import CONF_BUCKET, CONF_PREFIX, DOMAIN
+from .const import CONF_BUCKET, DOMAIN
 from .helpers import async_list_backups_from_s3
 
 SCAN_INTERVAL = timedelta(hours=6)
@@ -53,14 +53,11 @@ class S3DataUpdateCoordinator(DataUpdateCoordinator[SensorData]):
         )
         self.client = client
         self._bucket: str = entry.data[CONF_BUCKET]
-        self._prefix: str = entry.data.get(CONF_PREFIX, "")
 
     async def _async_update_data(self) -> SensorData:
         """Fetch data from AWS S3."""
         try:
-            backups = await async_list_backups_from_s3(
-                self.client, self._bucket, self._prefix
-            )
+            backups = await async_list_backups_from_s3(self.client, self._bucket)
         except BotoCoreError as error:
             raise UpdateFailed(
                 translation_domain=DOMAIN,

homeassistant/components/aws_s3/helpers.py

@@ -17,17 +17,11 @@ _LOGGER = logging.getLogger(__name__)
 async def async_list_backups_from_s3(
     client: S3Client,
     bucket: str,
-    prefix: str,
 ) -> list[AgentBackup]:
     """List backups from an S3 bucket by reading metadata files."""
     paginator = client.get_paginator("list_objects_v2")
     metadata_files: list[dict[str, Any]] = []
-
-    list_kwargs: dict[str, Any] = {"Bucket": bucket}
-    if prefix:
-        list_kwargs["Prefix"] = prefix + "/"
-
-    async for page in paginator.paginate(**list_kwargs):
+    async for page in paginator.paginate(Bucket=bucket):
         metadata_files.extend(
             obj
             for obj in page.get("Contents", [])

homeassistant/components/aws_s3/quality_scale.yaml

@@ -23,9 +23,7 @@ rules:
   runtime-data: done
   test-before-configure: done
   test-before-setup: done
-  unique-config-entry:
-    status: exempt
-    comment: Hassfest does not recognize the duplicate prevention logic. Duplicate entries are prevented by checking bucket, endpoint URL, and prefix in the config flow.
+  unique-config-entry: done
 
   # Silver
   action-exceptions:
@@ -38,7 +36,7 @@ rules:
   docs-installation-parameters: done
   entity-unavailable: done
   integration-owner: done
-  log-when-unavailable: done
+  log-when-unavailable: todo
   parallel-updates: done
   reauthentication-flow: todo
   test-coverage: done

homeassistant/components/aws_s3/strings.json

@@ -15,14 +15,12 @@
           "access_key_id": "Access key ID",
           "bucket": "Bucket name",
           "endpoint_url": "Endpoint URL",
-          "prefix": "Prefix",
           "secret_access_key": "Secret access key"
         },
         "data_description": {
           "access_key_id": "Access key ID to connect to AWS S3 API",
           "bucket": "Bucket must already exist and be writable by the provided credentials.",
           "endpoint_url": "Endpoint URL provided to [Boto3 Session]({boto3_docs_url}). Region-specific [AWS S3 endpoints]({aws_s3_docs_url}) are available in their docs.",
-          "prefix": "Folder or prefix to store backups in, for example `backups`",
           "secret_access_key": "Secret access key to connect to AWS S3 API"
         },
         "title": "Add AWS S3 bucket"

homeassistant/components/backup/store.py

@@ -29,17 +29,12 @@ class StoredBackupData(TypedDict):
 class _BackupStore(Store[StoredBackupData]):
     """Class to help storing backup data."""
 
-    # Maximum version we support reading for forward compatibility.
-    # This allows reading data written by a newer HA version after downgrade.
-    _MAX_READABLE_VERSION = 2
-
     def __init__(self, hass: HomeAssistant) -> None:
         """Initialize storage class."""
         super().__init__(
             hass,
             STORAGE_VERSION,
             STORAGE_KEY,
-            max_readable_version=self._MAX_READABLE_VERSION,
             minor_version=STORAGE_VERSION_MINOR,
         )
 
@@ -91,8 +86,8 @@ class _BackupStore(Store[StoredBackupData]):
         # data["config"]["schedule"]["state"] will be removed. The bump to 2 is
         # planned to happen after a 6 month quiet period with no minor version
         # changes.
-        # Reject if major version is higher than _MAX_READABLE_VERSION.
-        if old_major_version > self._MAX_READABLE_VERSION:
+        # Reject if major version is higher than 2.
+        if old_major_version > 2:
             raise NotImplementedError
         return data
 

homeassistant/components/binary_sensor/trigger.py

@@ -24,7 +24,7 @@ class BinarySensorOnOffTrigger(EntityTargetStateTriggerBase):
     """Class for binary sensor on/off triggers."""
 
     _device_class: BinarySensorDeviceClass | None
-    _domains = {DOMAIN}
+    _domain: str = DOMAIN
 
     def entity_filter(self, entities: set[str]) -> set[str]:
         """Filter entities of this domain."""

homeassistant/components/bitcoin/sensor.py

@@ -190,7 +190,7 @@ class BitcoinSensor(SensorEntity):
         elif sensor_type == "miners_revenue_usd":
             self._attr_native_value = f"{stats.miners_revenue_usd:.0f}"
         elif sensor_type == "btc_mined":
-            self._attr_native_value = str(stats.btc_mined * 1e-8)
+            self._attr_native_value = str(stats.btc_mined * 0.00000001)
         elif sensor_type == "trade_volume_usd":
             self._attr_native_value = f"{stats.trade_volume_usd:.1f}"
         elif sensor_type == "difficulty":
@@ -208,13 +208,13 @@ class BitcoinSensor(SensorEntity):
         elif sensor_type == "blocks_size":
             self._attr_native_value = f"{stats.blocks_size:.1f}"
         elif sensor_type == "total_fees_btc":
-            self._attr_native_value = f"{stats.total_fees_btc * 1e-8:.2f}"
+            self._attr_native_value = f"{stats.total_fees_btc * 0.00000001:.2f}"
         elif sensor_type == "total_btc_sent":
-            self._attr_native_value = f"{stats.total_btc_sent * 1e-8:.2f}"
+            self._attr_native_value = f"{stats.total_btc_sent * 0.00000001:.2f}"
         elif sensor_type == "estimated_btc_sent":
-            self._attr_native_value = f"{stats.estimated_btc_sent * 1e-8:.2f}"
+            self._attr_native_value = f"{stats.estimated_btc_sent * 0.00000001:.2f}"
         elif sensor_type == "total_btc":
-            self._attr_native_value = f"{stats.total_btc * 1e-8:.2f}"
+            self._attr_native_value = f"{stats.total_btc * 0.00000001:.2f}"
         elif sensor_type == "total_blocks":
             self._attr_native_value = f"{stats.total_blocks:.0f}"
         elif sensor_type == "next_retarget":
@@ -222,7 +222,7 @@ class BitcoinSensor(SensorEntity):
         elif sensor_type == "estimated_transaction_volume_usd":
             self._attr_native_value = f"{stats.estimated_transaction_volume_usd:.2f}"
         elif sensor_type == "miners_revenue_btc":
-            self._attr_native_value = f"{stats.miners_revenue_btc * 1e-8:.1f}"
+            self._attr_native_value = f"{stats.miners_revenue_btc * 0.00000001:.1f}"
         elif sensor_type == "market_price_usd":
             self._attr_native_value = f"{stats.market_price_usd:.2f}"
 

homeassistant/components/bluesound/media_player.py

@@ -85,7 +85,6 @@ class BluesoundPlayer(CoordinatorEntity[BluesoundCoordinator], MediaPlayerEntity
     _attr_media_content_type = MediaType.MUSIC
     _attr_has_entity_name = True
     _attr_name = None
-    _attr_volume_step = 0.01
 
     def __init__(
         self,
@@ -689,6 +688,24 @@ class BluesoundPlayer(CoordinatorEntity[BluesoundCoordinator], MediaPlayerEntity
 
         await self._player.play_url(url)
 
+    async def async_volume_up(self) -> None:
+        """Volume up the media player."""
+        if self.volume_level is None:
+            return
+
+        new_volume = self.volume_level + 0.01
+        new_volume = min(1, new_volume)
+        await self.async_set_volume_level(new_volume)
+
+    async def async_volume_down(self) -> None:
+        """Volume down the media player."""
+        if self.volume_level is None:
+            return
+
+        new_volume = self.volume_level - 0.01
+        new_volume = max(0, new_volume)
+        await self.async_set_volume_level(new_volume)
+
     async def async_set_volume_level(self, volume: float) -> None:
         """Send volume_up command to media player."""
         volume = int(round(volume * 100))

homeassistant/components/bsblan/manifest.json

@@ -8,7 +8,7 @@
   "iot_class": "local_polling",
   "loggers": ["bsblan"],
   "quality_scale": "silver",
-  "requirements": ["python-bsblan==5.1.1"],
+  "requirements": ["python-bsblan==5.1.0"],
   "zeroconf": [
     {
       "name": "bsb-lan*",

homeassistant/components/bsblan/services.py

@@ -31,6 +31,10 @@ ATTR_FRIDAY_SLOTS = "friday_slots"
 ATTR_SATURDAY_SLOTS = "saturday_slots"
 ATTR_SUNDAY_SLOTS = "sunday_slots"
 
+# Service names
+SERVICE_SET_HOT_WATER_SCHEDULE = "set_hot_water_schedule"
+SERVICE_SYNC_TIME = "sync_time"
+
 
 # Schema for a single time slot
 _SLOT_SCHEMA = vol.Schema(
@@ -256,14 +260,14 @@ def async_setup_services(hass: HomeAssistant) -> None:
     """Register the BSB-LAN services."""
     hass.services.async_register(
         DOMAIN,
-        "set_hot_water_schedule",
+        SERVICE_SET_HOT_WATER_SCHEDULE,
         set_hot_water_schedule,
         schema=SERVICE_SET_HOT_WATER_SCHEDULE_SCHEMA,
     )
 
     hass.services.async_register(
         DOMAIN,
-        "sync_time",
+        SERVICE_SYNC_TIME,
         async_sync_time,
         schema=SYNC_TIME_SCHEMA,
     )

homeassistant/components/button/trigger.py

@@ -14,7 +14,7 @@ from . import DOMAIN
 class ButtonPressedTrigger(EntityTriggerBase):
     """Trigger for button entity presses."""
 
-    _domains = {DOMAIN}
+    _domain = DOMAIN
     _schema = ENTITY_STATE_TRIGGER_SCHEMA
 
     def is_valid_transition(self, from_state: State, to_state: State) -> bool:

homeassistant/components/cambridge_audio/icons.json

@@ -29,12 +29,6 @@
       "early_update": {
         "default": "mdi:update"
       },
-      "equalizer": {
-        "default": "mdi:equalizer",
-        "state": {
-          "off": "mdi:equalizer-outline"
-        }
-      },
       "pre_amp": {
         "default": "mdi:volume-high",
         "state": {

homeassistant/components/cambridge_audio/strings.json

@@ -65,9 +65,6 @@
       "early_update": {
         "name": "Early update"
       },
-      "equalizer": {
-        "name": "Equalizer"
-      },
       "pre_amp": {
         "name": "Pre-Amp"
       },

homeassistant/components/cambridge_audio/switch.py

@@ -33,13 +33,6 @@ def room_correction_enabled(client: StreamMagicClient) -> bool:
     return client.audio.tilt_eq.enabled
 
 
-def equalizer_enabled(client: StreamMagicClient) -> bool:
-    """Check if equalizer is enabled."""
-    if TYPE_CHECKING:
-        assert client.audio.user_eq is not None
-    return client.audio.user_eq.enabled
-
-
 CONTROL_ENTITIES: tuple[CambridgeAudioSwitchEntityDescription, ...] = (
     CambridgeAudioSwitchEntityDescription(
         key="pre_amp",
@@ -63,14 +56,6 @@ CONTROL_ENTITIES: tuple[CambridgeAudioSwitchEntityDescription, ...] = (
         value_fn=room_correction_enabled,
         set_value_fn=lambda client, value: client.set_room_correction_mode(value),
     ),
-    CambridgeAudioSwitchEntityDescription(
-        key="equalizer",
-        translation_key="equalizer",
-        entity_category=EntityCategory.CONFIG,
-        load_fn=lambda client: client.audio.user_eq is not None,
-        value_fn=equalizer_enabled,
-        set_value_fn=lambda client, value: client.set_equalizer_mode(value),
-    ),
 )
 
 

homeassistant/components/climate/trigger.py

@@ -43,7 +43,7 @@ HVAC_MODE_CHANGED_TRIGGER_SCHEMA = ENTITY_STATE_TRIGGER_SCHEMA_FIRST_LAST.extend
 class HVACModeChangedTrigger(EntityTargetStateTriggerBase):
     """Trigger for entity state changes."""
 
-    _domains = {DOMAIN}
+    _domain = DOMAIN
     _schema = HVAC_MODE_CHANGED_TRIGGER_SCHEMA
 
     def __init__(self, hass: HomeAssistant, config: TriggerConfig) -> None:

homeassistant/components/compit/__init__.py

@@ -12,7 +12,6 @@ from .coordinator import CompitConfigEntry, CompitDataUpdateCoordinator
 PLATFORMS = [
     Platform.BINARY_SENSOR,
     Platform.CLIMATE,
-    Platform.FAN,
     Platform.NUMBER,
     Platform.SELECT,
     Platform.SENSOR,

homeassistant/components/compit/fan.py

@@ -1,172 +0,0 @@
-"""Fan platform for Compit integration."""
-
-from typing import Any
-
-from compit_inext_api import PARAM_VALUES
-from compit_inext_api.consts import CompitParameter
-
-from homeassistant.components.fan import (
-    FanEntity,
-    FanEntityDescription,
-    FanEntityFeature,
-)
-from homeassistant.const import STATE_OFF, STATE_ON
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
-from homeassistant.util.percentage import (
-    ordered_list_item_to_percentage,
-    percentage_to_ordered_list_item,
-)
-
-from .const import DOMAIN, MANUFACTURER_NAME
-from .coordinator import CompitConfigEntry, CompitDataUpdateCoordinator
-
-PARALLEL_UPDATES = 0
-
-COMPIT_GEAR_TO_HA = PARAM_VALUES[CompitParameter.VENTILATION_GEAR_TARGET]
-HA_STATE_TO_COMPIT = {value: key for key, value in COMPIT_GEAR_TO_HA.items()}
-
-
-DEVICE_DEFINITIONS: dict[int, FanEntityDescription] = {
-    223: FanEntityDescription(
-        key="Nano Color 2",
-        translation_key="ventilation",
-    ),
-    12: FanEntityDescription(
-        key="Nano Color",
-        translation_key="ventilation",
-    ),
-}
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: CompitConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up Compit fan entities from a config entry."""
-    coordinator = entry.runtime_data
-    async_add_entities(
-        CompitFan(
-            coordinator,
-            device_id,
-            device_definition,
-        )
-        for device_id, device in coordinator.connector.all_devices.items()
-        if (device_definition := DEVICE_DEFINITIONS.get(device.definition.code))
-    )
-
-
-class CompitFan(CoordinatorEntity[CompitDataUpdateCoordinator], FanEntity):
-    """Representation of a Compit fan entity."""
-
-    _attr_speed_count = len(COMPIT_GEAR_TO_HA)
-    _attr_has_entity_name = True
-    _attr_name = None
-    _attr_supported_features = (
-        FanEntityFeature.TURN_ON
-        | FanEntityFeature.TURN_OFF
-        | FanEntityFeature.SET_SPEED
-    )
-
-    def __init__(
-        self,
-        coordinator: CompitDataUpdateCoordinator,
-        device_id: int,
-        entity_description: FanEntityDescription,
-    ) -> None:
-        """Initialize the fan entity."""
-        super().__init__(coordinator)
-        self.device_id = device_id
-        self.entity_description = entity_description
-        self._attr_unique_id = f"{device_id}_{entity_description.key}"
-        self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, str(device_id))},
-            name=entity_description.key,
-            manufacturer=MANUFACTURER_NAME,
-            model=entity_description.key,
-        )
-
-    @property
-    def available(self) -> bool:
-        """Return if entity is available."""
-        return (
-            super().available
-            and self.coordinator.connector.get_device(self.device_id) is not None
-        )
-
-    @property
-    def is_on(self) -> bool | None:
-        """Return true if the fan is on."""
-        value = self.coordinator.connector.get_current_option(
-            self.device_id, CompitParameter.VENTILATION_ON_OFF
-        )
-
-        return True if value == STATE_ON else False if value == STATE_OFF else None
-
-    async def async_turn_on(
-        self,
-        percentage: int | None = None,
-        preset_mode: str | None = None,
-        **kwargs: Any,
-    ) -> None:
-        """Turn on the fan."""
-        await self.coordinator.connector.select_device_option(
-            self.device_id, CompitParameter.VENTILATION_ON_OFF, STATE_ON
-        )
-
-        if percentage is None:
-            self.async_write_ha_state()
-            return
-
-        await self.async_set_percentage(percentage)
-
-    async def async_turn_off(self, **kwargs: Any) -> None:
-        """Turn off the fan."""
-        await self.coordinator.connector.select_device_option(
-            self.device_id, CompitParameter.VENTILATION_ON_OFF, STATE_OFF
-        )
-        self.async_write_ha_state()
-
-    @property
-    def percentage(self) -> int | None:
-        """Return the current fan speed as a percentage."""
-        if self.is_on is False:
-            return 0
-        mode = self.coordinator.connector.get_current_option(
-            self.device_id, CompitParameter.VENTILATION_GEAR_TARGET
-        )
-        if mode is None:
-            return None
-        gear = COMPIT_GEAR_TO_HA.get(mode)
-        return (
-            None
-            if gear is None
-            else ordered_list_item_to_percentage(
-                list(COMPIT_GEAR_TO_HA.values()),
-                gear,
-            )
-        )
-
-    async def async_set_percentage(self, percentage: int) -> None:
-        """Set the fan speed."""
-        if percentage == 0:
-            await self.async_turn_off()
-            return
-
-        gear = int(
-            percentage_to_ordered_list_item(
-                list(COMPIT_GEAR_TO_HA.values()),
-                percentage,
-            )
-        )
-        mode = HA_STATE_TO_COMPIT.get(gear)
-        if mode is None:
-            return
-
-        await self.coordinator.connector.select_device_option(
-            self.device_id, CompitParameter.VENTILATION_GEAR_TARGET, mode
-        )
-        self.async_write_ha_state()

homeassistant/components/compit/icons.json

@@ -20,14 +20,6 @@
         "default": "mdi:alert"
       }
     },
-    "fan": {
-      "ventilation": {
-        "default": "mdi:fan",
-        "state": {
-          "off": "mdi:fan-off"
-        }
-      }
-    },
     "number": {
       "boiler_target_temperature": {
         "default": "mdi:water-boiler"

homeassistant/components/compit/strings.json

@@ -53,11 +53,6 @@
         "name": "Temperature alert"
       }
     },
-    "fan": {
-      "ventilation": {
-        "name": "[%key:component::fan::title%]"
-      }
-    },
     "number": {
       "boiler_target_temperature": {
         "name": "Boiler target temperature"

homeassistant/components/conversation/http.py

@@ -48,8 +48,6 @@ def async_setup(hass: HomeAssistant) -> None:
         vol.Optional("conversation_id"): vol.Any(str, None),
         vol.Optional("language"): str,
         vol.Optional("agent_id"): agent_id_validator,
-        vol.Optional("device_id"): vol.Any(str, None),
-        vol.Optional("satellite_id"): vol.Any(str, None),
     }
 )
 @websocket_api.async_response
@@ -66,8 +64,6 @@ async def websocket_process(
         context=connection.context(msg),
         language=msg.get("language"),
         agent_id=msg.get("agent_id"),
-        device_id=msg.get("device_id"),
-        satellite_id=msg.get("satellite_id"),
     )
     connection.send_result(msg["id"], result.as_dict())
 
@@ -252,8 +248,6 @@ class ConversationProcessView(http.HomeAssistantView):
                 vol.Optional("conversation_id"): str,
                 vol.Optional("language"): str,
                 vol.Optional("agent_id"): agent_id_validator,
-                vol.Optional("device_id"): vol.Any(str, None),
-                vol.Optional("satellite_id"): vol.Any(str, None),
             }
         )
     )
@@ -268,8 +262,6 @@ class ConversationProcessView(http.HomeAssistantView):
             context=self.context(request),
             language=data.get("language"),
             agent_id=data.get("agent_id"),
-            device_id=data.get("device_id"),
-            satellite_id=data.get("satellite_id"),
         )
 
         return self.json(result.as_dict())

homeassistant/components/daikin/climate.py

@@ -112,12 +112,11 @@ def _zone_is_configured(zone: DaikinZone) -> bool:
 
 def _zone_temperature_lists(device: Appliance) -> tuple[list[str], list[str]]:
     """Return the decoded zone temperature lists."""
-    values = device.values
-    if DAIKIN_ZONE_TEMP_HEAT not in values or DAIKIN_ZONE_TEMP_COOL not in values:
+    try:
+        heating = device.represent(DAIKIN_ZONE_TEMP_HEAT)[1]
+        cooling = device.represent(DAIKIN_ZONE_TEMP_COOL)[1]
+    except AttributeError, KeyError:
         return ([], [])
-
-    heating = device.represent(DAIKIN_ZONE_TEMP_HEAT)[1]
-    cooling = device.represent(DAIKIN_ZONE_TEMP_COOL)[1]
     return (list(heating or []), list(cooling or []))
 
 

homeassistant/components/demo/media_player.py

@@ -139,6 +139,18 @@ class AbstractDemoPlayer(MediaPlayerEntity):
         self._attr_is_volume_muted = mute
         self.schedule_update_ha_state()
 
+    def volume_up(self) -> None:
+        """Increase volume."""
+        assert self.volume_level is not None
+        self._attr_volume_level = min(1.0, self.volume_level + 0.1)
+        self.schedule_update_ha_state()
+
+    def volume_down(self) -> None:
+        """Decrease volume."""
+        assert self.volume_level is not None
+        self._attr_volume_level = max(0.0, self.volume_level - 0.1)
+        self.schedule_update_ha_state()
+
     def set_volume_level(self, volume: float) -> None:
         """Set the volume level, range 0..1."""
         self._attr_volume_level = volume

homeassistant/components/duke_energy/__init__.py

@@ -0,0 +1,22 @@
+"""The Duke Energy integration."""
+
+from __future__ import annotations
+
+from homeassistant.core import HomeAssistant
+
+from .coordinator import DukeEnergyConfigEntry, DukeEnergyCoordinator
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: DukeEnergyConfigEntry) -> bool:
+    """Set up Duke Energy from a config entry."""
+
+    coordinator = DukeEnergyCoordinator(hass, entry)
+    await coordinator.async_config_entry_first_refresh()
+    entry.runtime_data = coordinator
+
+    return True
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: DukeEnergyConfigEntry) -> bool:
+    """Unload a config entry."""
+    return True

homeassistant/components/duke_energy/config_flow.py

@@ -0,0 +1,67 @@
+"""Config flow for Duke Energy integration."""
+
+from __future__ import annotations
+
+import logging
+from typing import Any
+
+from aiodukeenergy import DukeEnergy
+from aiohttp import ClientError, ClientResponseError
+import voluptuous as vol
+
+from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
+from homeassistant.const import CONF_EMAIL, CONF_PASSWORD, CONF_USERNAME
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+
+from .const import DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+STEP_USER_DATA_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_USERNAME): str,
+        vol.Required(CONF_PASSWORD): str,
+    }
+)
+
+
+class DukeEnergyConfigFlow(ConfigFlow, domain=DOMAIN):
+    """Handle a config flow for Duke Energy."""
+
+    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:
+            session = async_get_clientsession(self.hass)
+            api = DukeEnergy(
+                user_input[CONF_USERNAME], user_input[CONF_PASSWORD], session
+            )
+            try:
+                auth = await api.authenticate()
+            except ClientResponseError as e:
+                errors["base"] = "invalid_auth" if e.status == 404 else "cannot_connect"
+            except ClientError, TimeoutError:
+                errors["base"] = "cannot_connect"
+            except Exception:
+                _LOGGER.exception("Unexpected exception")
+                errors["base"] = "unknown"
+            else:
+                username = auth["internalUserID"].lower()
+                await self.async_set_unique_id(username)
+                self._abort_if_unique_id_configured()
+                email = auth["loginEmailAddress"].lower()
+                data = {
+                    CONF_EMAIL: email,
+                    CONF_USERNAME: username,
+                    CONF_PASSWORD: user_input[CONF_PASSWORD],
+                }
+                self._async_abort_entries_match(data)
+                return self.async_create_entry(title=email, data=data)
+
+        return self.async_show_form(
+            step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=errors
+        )

homeassistant/components/duke_energy/const.py

@@ -0,0 +1,3 @@
+"""Constants for the Duke Energy integration."""
+
+DOMAIN = "duke_energy"

homeassistant/components/duke_energy/coordinator.py

@@ -0,0 +1,222 @@
+"""Coordinator to handle Duke Energy connections."""
+
+from datetime import datetime, timedelta
+import logging
+from typing import Any, cast
+
+from aiodukeenergy import DukeEnergy
+from aiohttp import ClientError
+
+from homeassistant.components.recorder import get_instance
+from homeassistant.components.recorder.models import (
+    StatisticData,
+    StatisticMeanType,
+    StatisticMetaData,
+)
+from homeassistant.components.recorder.statistics import (
+    async_add_external_statistics,
+    get_last_statistics,
+    statistics_during_period,
+)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_PASSWORD, CONF_USERNAME, UnitOfEnergy, UnitOfVolume
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
+from homeassistant.util import dt as dt_util
+from homeassistant.util.unit_conversion import EnergyConverter
+
+from .const import DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+_SUPPORTED_METER_TYPES = ("ELECTRIC",)
+
+type DukeEnergyConfigEntry = ConfigEntry[DukeEnergyCoordinator]
+
+
+class DukeEnergyCoordinator(DataUpdateCoordinator[None]):
+    """Handle inserting statistics."""
+
+    config_entry: DukeEnergyConfigEntry
+
+    def __init__(
+        self, hass: HomeAssistant, config_entry: DukeEnergyConfigEntry
+    ) -> None:
+        """Initialize the data handler."""
+        super().__init__(
+            hass,
+            _LOGGER,
+            config_entry=config_entry,
+            name="Duke Energy",
+            # Data is updated daily on Duke Energy.
+            # Refresh every 12h to be at most 12h behind.
+            update_interval=timedelta(hours=12),
+        )
+        self.api = DukeEnergy(
+            config_entry.data[CONF_USERNAME],
+            config_entry.data[CONF_PASSWORD],
+            async_get_clientsession(hass),
+        )
+        self._statistic_ids: set = set()
+
+        @callback
+        def _dummy_listener() -> None:
+            pass
+
+        # Force the coordinator to periodically update by registering at least one listener.
+        # Duke Energy does not provide forecast data, so all information is historical.
+        # This makes _async_update_data get periodically called so we can insert statistics.
+        self.async_add_listener(_dummy_listener)
+
+        self.config_entry.async_on_unload(self._clear_statistics)
+
+    def _clear_statistics(self) -> None:
+        """Clear statistics."""
+        get_instance(self.hass).async_clear_statistics(list(self._statistic_ids))
+
+    async def _async_update_data(self) -> None:
+        """Insert Duke Energy statistics."""
+        meters: dict[str, dict[str, Any]] = await self.api.get_meters()
+        for serial_number, meter in meters.items():
+            if (
+                not isinstance(meter["serviceType"], str)
+                or meter["serviceType"] not in _SUPPORTED_METER_TYPES
+            ):
+                _LOGGER.debug(
+                    "Skipping unsupported meter type %s", meter["serviceType"]
+                )
+                continue
+
+            id_prefix = f"{meter['serviceType'].lower()}_{serial_number}"
+            consumption_statistic_id = f"{DOMAIN}:{id_prefix}_energy_consumption"
+            self._statistic_ids.add(consumption_statistic_id)
+            _LOGGER.debug(
+                "Updating Statistics for %s",
+                consumption_statistic_id,
+            )
+
+            last_stat = await get_instance(self.hass).async_add_executor_job(
+                get_last_statistics, self.hass, 1, consumption_statistic_id, True, set()
+            )
+            if not last_stat:
+                _LOGGER.debug("Updating statistic for the first time")
+                usage = await self._async_get_energy_usage(meter)
+                consumption_sum = 0.0
+                last_stats_time = None
+            else:
+                usage = await self._async_get_energy_usage(
+                    meter,
+                    last_stat[consumption_statistic_id][0]["start"],
+                )
+                if not usage:
+                    _LOGGER.debug("No recent usage data. Skipping update")
+                    continue
+                stats = await get_instance(self.hass).async_add_executor_job(
+                    statistics_during_period,
+                    self.hass,
+                    min(usage.keys()),
+                    None,
+                    {consumption_statistic_id},
+                    "hour",
+                    None,
+                    {"sum"},
+                )
+                consumption_sum = cast(float, stats[consumption_statistic_id][0]["sum"])
+                last_stats_time = stats[consumption_statistic_id][0]["start"]
+
+            consumption_statistics = []
+
+            for start, data in usage.items():
+                if last_stats_time is not None and start.timestamp() <= last_stats_time:
+                    continue
+                consumption_sum += data["energy"]
+
+                consumption_statistics.append(
+                    StatisticData(
+                        start=start, state=data["energy"], sum=consumption_sum
+                    )
+                )
+
+            name_prefix = (
+                f"Duke Energy {meter['serviceType'].capitalize()} {serial_number}"
+            )
+            consumption_metadata = StatisticMetaData(
+                mean_type=StatisticMeanType.NONE,
+                has_sum=True,
+                name=f"{name_prefix} Consumption",
+                source=DOMAIN,
+                statistic_id=consumption_statistic_id,
+                unit_class=EnergyConverter.UNIT_CLASS,
+                unit_of_measurement=UnitOfEnergy.KILO_WATT_HOUR
+                if meter["serviceType"] == "ELECTRIC"
+                else UnitOfVolume.CENTUM_CUBIC_FEET,
+            )
+
+            _LOGGER.debug(
+                "Adding %s statistics for %s",
+                len(consumption_statistics),
+                consumption_statistic_id,
+            )
+            async_add_external_statistics(
+                self.hass, consumption_metadata, consumption_statistics
+            )
+
+    async def _async_get_energy_usage(
+        self, meter: dict[str, Any], start_time: float | None = None
+    ) -> dict[datetime, dict[str, float | int]]:
+        """Get energy usage.
+
+        If start_time is None, get usage since account activation (or as far back as possible),
+        otherwise since start_time - 30 days to allow corrections in data.
+
+        Duke Energy provides hourly data all the way back to ~3 years.
+        """
+
+        # All of Duke Energy Service Areas are currently in America/New_York timezone
+        # May need to re-think this if that ever changes and determine timezone based
+        # on the service address somehow.
+        tz = await dt_util.async_get_time_zone("America/New_York")
+        lookback = timedelta(days=30)
+        one = timedelta(days=1)
+        if start_time is None:
+            # Max 3 years of data
+            start = dt_util.now(tz) - timedelta(days=3 * 365)
+        else:
+            start = datetime.fromtimestamp(start_time, tz=tz) - lookback
+        agreement_date = dt_util.parse_datetime(meter["agreementActiveDate"])
+        if agreement_date is not None:
+            start = max(agreement_date.replace(tzinfo=tz), start)
+
+        start = start.replace(hour=0, minute=0, second=0, microsecond=0)
+        end = dt_util.now(tz).replace(hour=0, minute=0, second=0, microsecond=0) - one
+        _LOGGER.debug("Data lookup range: %s - %s", start, end)
+
+        start_step = max(end - lookback, start)
+        end_step = end
+        usage: dict[datetime, dict[str, float | int]] = {}
+        while True:
+            _LOGGER.debug("Getting hourly usage: %s - %s", start_step, end_step)
+            try:
+                # Get data
+                results = await self.api.get_energy_usage(
+                    meter["serialNum"], "HOURLY", "DAY", start_step, end_step
+                )
+                usage = {**results["data"], **usage}
+
+                for missing in results["missing"]:
+                    _LOGGER.debug("Missing data: %s", missing)
+
+                # Set next range
+                end_step = start_step - one
+                start_step = max(start_step - lookback, start)
+
+                # Make sure we don't go back too far
+                if end_step < start:
+                    break
+            except TimeoutError, ClientError:
+                # ClientError is raised when there is no more data for the range
+                break
+
+        _LOGGER.debug("Got %s meter usage reads", len(usage))
+        return usage

homeassistant/components/duke_energy/manifest.json

@@ -0,0 +1,11 @@
+{
+  "domain": "duke_energy",
+  "name": "Duke Energy",
+  "codeowners": ["@hunterjm"],
+  "config_flow": true,
+  "dependencies": ["recorder"],
+  "documentation": "https://www.home-assistant.io/integrations/duke_energy",
+  "integration_type": "service",
+  "iot_class": "cloud_polling",
+  "requirements": ["aiodukeenergy==0.3.0"]
+}

homeassistant/components/duke_energy/strings.json

@@ -0,0 +1,20 @@
+{
+  "config": {
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+    },
+    "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": {
+      "user": {
+        "data": {
+          "password": "[%key:common::config_flow::data::password%]",
+          "username": "[%key:common::config_flow::data::username%]"
+        }
+      }
+    }
+  }
+}

homeassistant/components/eafm/__init__.py

@@ -2,39 +2,14 @@
 
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import device_registry as dr
 
-from .const import DOMAIN
 from .coordinator import EafmConfigEntry, EafmCoordinator
 
 PLATFORMS = [Platform.SENSOR]
 
 
-def _fix_device_registry_identifiers(
-    hass: HomeAssistant, entry: EafmConfigEntry
-) -> None:
-    """Fix invalid identifiers in device registry.
-
-    Added in 2026.4, can be removed in 2026.10 or later.
-    """
-    device_registry = dr.async_get(hass)
-    for device_entry in dr.async_entries_for_config_entry(
-        device_registry, entry.entry_id
-    ):
-        old_identifier = (DOMAIN, "measure-id", entry.data["station"])
-        if old_identifier not in device_entry.identifiers:  # type: ignore[comparison-overlap]
-            continue
-        new_identifiers = device_entry.identifiers.copy()
-        new_identifiers.discard(old_identifier)  # type: ignore[arg-type]
-        new_identifiers.add((DOMAIN, entry.data["station"]))
-        device_registry.async_update_device(
-            device_entry.id, new_identifiers=new_identifiers
-        )
-
-
 async def async_setup_entry(hass: HomeAssistant, entry: EafmConfigEntry) -> bool:
     """Set up flood monitoring sensors for this config entry."""
-    _fix_device_registry_identifiers(hass, entry)
     coordinator = EafmCoordinator(hass, entry=entry)
     await coordinator.async_config_entry_first_refresh()
     entry.runtime_data = coordinator

homeassistant/components/eafm/sensor.py

@@ -94,11 +94,11 @@ class Measurement(CoordinatorEntity, SensorEntity):
         return self.coordinator.data["measures"][self.key]["parameterName"]
 
     @property
-    def device_info(self) -> DeviceInfo:
+    def device_info(self):
         """Return the device info."""
         return DeviceInfo(
             entry_type=DeviceEntryType.SERVICE,
-            identifiers={(DOMAIN, self.station_id)},
+            identifiers={(DOMAIN, "measure-id", self.station_id)},
             manufacturer="https://environment.data.gov.uk/",
             model=self.parameter_name,
             name=f"{self.station_name} {self.parameter_name} {self.qualifier}",

homeassistant/components/enphase_envoy/sensor.py

@@ -405,13 +405,8 @@ CT_SENSORS = (
         )
         for cttype, key in (
             (CtType.NET_CONSUMPTION, "lifetime_net_consumption"),
-            (CtType.PRODUCTION, "production_ct_energy_delivered"),
+            # Production CT energy_delivered is not used
             (CtType.STORAGE, "lifetime_battery_discharged"),
-            (CtType.TOTAL_CONSUMPTION, "total_consumption_ct_energy_delivered"),
-            (CtType.BACKFEED, "backfeed_ct_energy_delivered"),
-            (CtType.LOAD, "load_ct_energy_delivered"),
-            (CtType.EVSE, "evse_ct_energy_delivered"),
-            (CtType.PV3P, "pv3p_ct_energy_delivered"),
         )
     ]
     + [
@@ -428,13 +423,8 @@ CT_SENSORS = (
         )
         for cttype, key in (
             (CtType.NET_CONSUMPTION, "lifetime_net_production"),
-            (CtType.PRODUCTION, "production_ct_energy_received"),
+            # Production CT energy_received is not used
             (CtType.STORAGE, "lifetime_battery_charged"),
-            (CtType.TOTAL_CONSUMPTION, "total_consumption_ct_energy_received"),
-            (CtType.BACKFEED, "backfeed_ct_energy_received"),
-            (CtType.LOAD, "load_ct_energy_received"),
-            (CtType.EVSE, "evse_ct_energy_received"),
-            (CtType.PV3P, "pv3p_ct_energy_received"),
         )
     ]
     + [
@@ -451,13 +441,8 @@ CT_SENSORS = (
         )
         for cttype, key in (
             (CtType.NET_CONSUMPTION, "net_consumption"),
-            (CtType.PRODUCTION, "production_ct_power"),
+            # Production CT active_power is not used
             (CtType.STORAGE, "battery_discharge"),
-            (CtType.TOTAL_CONSUMPTION, "total_consumption_ct_power"),
-            (CtType.BACKFEED, "backfeed_ct_power"),
-            (CtType.LOAD, "load_ct_power"),
-            (CtType.EVSE, "evse_ct_power"),
-            (CtType.PV3P, "pv3p_ct_power"),
         )
     ]
     + [
@@ -476,11 +461,6 @@ CT_SENSORS = (
             (CtType.NET_CONSUMPTION, "frequency", "net_ct_frequency"),
             (CtType.PRODUCTION, "production_ct_frequency", ""),
             (CtType.STORAGE, "storage_ct_frequency", ""),
-            (CtType.TOTAL_CONSUMPTION, "total_consumption_ct_frequency", ""),
-            (CtType.BACKFEED, "backfeed_ct_frequency", ""),
-            (CtType.LOAD, "load_ct_frequency", ""),
-            (CtType.EVSE, "evse_ct_frequency", ""),
-            (CtType.PV3P, "pv3p_ct_frequency", ""),
         )
     ]
     + [
@@ -500,11 +480,6 @@ CT_SENSORS = (
             (CtType.NET_CONSUMPTION, "voltage", "net_ct_voltage"),
             (CtType.PRODUCTION, "production_ct_voltage", ""),
             (CtType.STORAGE, "storage_voltage", "storage_ct_voltage"),
-            (CtType.TOTAL_CONSUMPTION, "total_consumption_ct_voltage", ""),
-            (CtType.BACKFEED, "backfeed_ct_voltage", ""),
-            (CtType.LOAD, "load_ct_voltage", ""),
-            (CtType.EVSE, "evse_ct_voltage", ""),
-            (CtType.PV3P, "pv3p_ct_voltage", ""),
         )
     ]
     + [
@@ -524,11 +499,6 @@ CT_SENSORS = (
             (CtType.NET_CONSUMPTION, "net_ct_current"),
             (CtType.PRODUCTION, "production_ct_current"),
             (CtType.STORAGE, "storage_ct_current"),
-            (CtType.TOTAL_CONSUMPTION, "total_consumption_ct_current"),
-            (CtType.BACKFEED, "backfeed_ct_current"),
-            (CtType.LOAD, "load_ct_current"),
-            (CtType.EVSE, "evse_ct_current"),
-            (CtType.PV3P, "pv3p_ct_current"),
         )
     ]
     + [
@@ -546,11 +516,6 @@ CT_SENSORS = (
             (CtType.NET_CONSUMPTION, "net_ct_powerfactor"),
             (CtType.PRODUCTION, "production_ct_powerfactor"),
             (CtType.STORAGE, "storage_ct_powerfactor"),
-            (CtType.TOTAL_CONSUMPTION, "total_consumption_ct_powerfactor"),
-            (CtType.BACKFEED, "backfeed_ct_powerfactor"),
-            (CtType.LOAD, "load_ct_powerfactor"),
-            (CtType.EVSE, "evse_ct_powerfactor"),
-            (CtType.PV3P, "pv3p_ct_powerfactor"),
         )
     ]
     + [
@@ -572,11 +537,6 @@ CT_SENSORS = (
             ),
             (CtType.PRODUCTION, "production_ct_metering_status", ""),
             (CtType.STORAGE, "storage_ct_metering_status", ""),
-            (CtType.TOTAL_CONSUMPTION, "total_consumption_ct_metering_status", ""),
-            (CtType.BACKFEED, "backfeed_ct_metering_status", ""),
-            (CtType.LOAD, "load_ct_metering_status", ""),
-            (CtType.EVSE, "evse_ct_metering_status", ""),
-            (CtType.PV3P, "pv3p_ct_metering_status", ""),
         )
     ]
     + [
@@ -597,11 +557,6 @@ CT_SENSORS = (
             ),
             (CtType.PRODUCTION, "production_ct_status_flags", ""),
             (CtType.STORAGE, "storage_ct_status_flags", ""),
-            (CtType.TOTAL_CONSUMPTION, "total_consumption_ct_status_flags", ""),
-            (CtType.BACKFEED, "backfeed_ct_status_flags", ""),
-            (CtType.LOAD, "load_ct_status_flags", ""),
-            (CtType.EVSE, "evse_ct_status_flags", ""),
-            (CtType.PV3P, "pv3p_ct_status_flags", ""),
         )
     ]
 )

homeassistant/components/enphase_envoy/strings.json

@@ -160,60 +160,6 @@
       "available_energy": {
         "name": "Available battery energy"
       },
-      "backfeed_ct_current": {
-        "name": "Backfeed CT current"
-      },
-      "backfeed_ct_current_phase": {
-        "name": "Backfeed CT current {phase_name}"
-      },
-      "backfeed_ct_energy_delivered": {
-        "name": "Backfeed CT energy delivered"
-      },
-      "backfeed_ct_energy_delivered_phase": {
-        "name": "Backfeed CT energy delivered {phase_name}"
-      },
-      "backfeed_ct_energy_received": {
-        "name": "Backfeed CT energy received"
-      },
-      "backfeed_ct_energy_received_phase": {
-        "name": "Backfeed CT energy received {phase_name}"
-      },
-      "backfeed_ct_frequency": {
-        "name": "Frequency backfeed CT"
-      },
-      "backfeed_ct_frequency_phase": {
-        "name": "Frequency backfeed CT {phase_name}"
-      },
-      "backfeed_ct_metering_status": {
-        "name": "Metering status backfeed CT"
-      },
-      "backfeed_ct_metering_status_phase": {
-        "name": "Metering status backfeed CT {phase_name}"
-      },
-      "backfeed_ct_power": {
-        "name": "Backfeed CT power"
-      },
-      "backfeed_ct_power_phase": {
-        "name": "Backfeed CT power {phase_name}"
-      },
-      "backfeed_ct_powerfactor": {
-        "name": "Power factor backfeed CT"
-      },
-      "backfeed_ct_powerfactor_phase": {
-        "name": "Power factor backfeed CT {phase_name}"
-      },
-      "backfeed_ct_status_flags": {
-        "name": "Meter status flags active backfeed CT"
-      },
-      "backfeed_ct_status_flags_phase": {
-        "name": "Meter status flags active backfeed CT {phase_name}"
-      },
-      "backfeed_ct_voltage": {
-        "name": "Voltage backfeed CT"
-      },
-      "backfeed_ct_voltage_phase": {
-        "name": "Voltage backfeed CT {phase_name}"
-      },
       "balanced_net_consumption": {
         "name": "Balanced net power consumption"
       },
@@ -265,60 +211,6 @@
       "energy_today": {
         "name": "[%key:component::enphase_envoy::entity::sensor::daily_production::name%]"
       },
-      "evse_ct_current": {
-        "name": "EVSE CT current"
-      },
-      "evse_ct_current_phase": {
-        "name": "EVSE CT current {phase_name}"
-      },
-      "evse_ct_energy_delivered": {
-        "name": "EVSE CT energy delivered"
-      },
-      "evse_ct_energy_delivered_phase": {
-        "name": "EVSE CT energy delivered {phase_name}"
-      },
-      "evse_ct_energy_received": {
-        "name": "EVSE CT energy received"
-      },
-      "evse_ct_energy_received_phase": {
-        "name": "EVSE CT energy received {phase_name}"
-      },
-      "evse_ct_frequency": {
-        "name": "Frequency EVSE CT"
-      },
-      "evse_ct_frequency_phase": {
-        "name": "Frequency EVSE CT {phase_name}"
-      },
-      "evse_ct_metering_status": {
-        "name": "Metering status EVSE CT"
-      },
-      "evse_ct_metering_status_phase": {
-        "name": "Metering status EVSE CT {phase_name}"
-      },
-      "evse_ct_power": {
-        "name": "EVSE CT power"
-      },
-      "evse_ct_power_phase": {
-        "name": "EVSE CT power {phase_name}"
-      },
-      "evse_ct_powerfactor": {
-        "name": "Power factor EVSE CT"
-      },
-      "evse_ct_powerfactor_phase": {
-        "name": "Power factor EVSE CT {phase_name}"
-      },
-      "evse_ct_status_flags": {
-        "name": "Meter status flags active EVSE CT"
-      },
-      "evse_ct_status_flags_phase": {
-        "name": "Meter status flags active EVSE CT {phase_name}"
-      },
-      "evse_ct_voltage": {
-        "name": "Voltage EVSE CT"
-      },
-      "evse_ct_voltage_phase": {
-        "name": "Voltage EVSE CT {phase_name}"
-      },
       "grid_status": {
         "name": "[%key:component::enphase_envoy::entity::binary_sensor::grid_status::name%]",
         "state": {
@@ -378,60 +270,6 @@
       "lifetime_production_phase": {
         "name": "Lifetime energy production {phase_name}"
       },
-      "load_ct_current": {
-        "name": "Load CT current"
-      },
-      "load_ct_current_phase": {
-        "name": "Load CT current {phase_name}"
-      },
-      "load_ct_energy_delivered": {
-        "name": "Load CT energy delivered"
-      },
-      "load_ct_energy_delivered_phase": {
-        "name": "Load CT energy delivered {phase_name}"
-      },
-      "load_ct_energy_received": {
-        "name": "Load CT energy received"
-      },
-      "load_ct_energy_received_phase": {
-        "name": "Load CT energy received {phase_name}"
-      },
-      "load_ct_frequency": {
-        "name": "Frequency load CT"
-      },
-      "load_ct_frequency_phase": {
-        "name": "Frequency load CT {phase_name}"
-      },
-      "load_ct_metering_status": {
-        "name": "Metering status load CT"
-      },
-      "load_ct_metering_status_phase": {
-        "name": "Metering status load CT {phase_name}"
-      },
-      "load_ct_power": {
-        "name": "Load CT power"
-      },
-      "load_ct_power_phase": {
-        "name": "Load CT power {phase_name}"
-      },
-      "load_ct_powerfactor": {
-        "name": "Power factor load CT"
-      },
-      "load_ct_powerfactor_phase": {
-        "name": "Power factor load CT {phase_name}"
-      },
-      "load_ct_status_flags": {
-        "name": "Meter status flags active load CT"
-      },
-      "load_ct_status_flags_phase": {
-        "name": "Meter status flags active load CT {phase_name}"
-      },
-      "load_ct_voltage": {
-        "name": "Voltage load CT"
-      },
-      "load_ct_voltage_phase": {
-        "name": "Voltage load CT {phase_name}"
-      },
       "max_capacity": {
         "name": "Battery capacity"
       },
@@ -493,18 +331,6 @@
       "production_ct_current_phase": {
         "name": "Production CT current {phase_name}"
       },
-      "production_ct_energy_delivered": {
-        "name": "Production CT energy delivered"
-      },
-      "production_ct_energy_delivered_phase": {
-        "name": "Production CT energy delivered {phase_name}"
-      },
-      "production_ct_energy_received": {
-        "name": "Production CT energy received"
-      },
-      "production_ct_energy_received_phase": {
-        "name": "Production CT energy received {phase_name}"
-      },
       "production_ct_frequency": {
         "name": "Frequency production CT"
       },
@@ -517,12 +343,6 @@
       "production_ct_metering_status_phase": {
         "name": "Metering status production CT {phase_name}"
       },
-      "production_ct_power": {
-        "name": "Production CT power"
-      },
-      "production_ct_power_phase": {
-        "name": "Production CT power {phase_name}"
-      },
       "production_ct_powerfactor": {
         "name": "Power factor production CT"
       },
@@ -541,60 +361,6 @@
       "production_ct_voltage_phase": {
         "name": "Voltage production CT {phase_name}"
       },
-      "pv3p_ct_current": {
-        "name": "PV3P CT current"
-      },
-      "pv3p_ct_current_phase": {
-        "name": "PV3P CT current {phase_name}"
-      },
-      "pv3p_ct_energy_delivered": {
-        "name": "PV3P CT energy delivered"
-      },
-      "pv3p_ct_energy_delivered_phase": {
-        "name": "PV3P CT energy delivered {phase_name}"
-      },
-      "pv3p_ct_energy_received": {
-        "name": "PV3P CT energy received"
-      },
-      "pv3p_ct_energy_received_phase": {
-        "name": "PV3P CT energy received {phase_name}"
-      },
-      "pv3p_ct_frequency": {
-        "name": "Frequency PV3P CT"
-      },
-      "pv3p_ct_frequency_phase": {
-        "name": "Frequency PV3P CT {phase_name}"
-      },
-      "pv3p_ct_metering_status": {
-        "name": "Metering status PV3P CT"
-      },
-      "pv3p_ct_metering_status_phase": {
-        "name": "Metering status PV3P CT {phase_name}"
-      },
-      "pv3p_ct_power": {
-        "name": "PV3P CT power"
-      },
-      "pv3p_ct_power_phase": {
-        "name": "PV3P CT power {phase_name}"
-      },
-      "pv3p_ct_powerfactor": {
-        "name": "Power factor PV3P CT"
-      },
-      "pv3p_ct_powerfactor_phase": {
-        "name": "Power factor PV3P CT {phase_name}"
-      },
-      "pv3p_ct_status_flags": {
-        "name": "Meter status flags active PV3P CT"
-      },
-      "pv3p_ct_status_flags_phase": {
-        "name": "Meter status flags active PV3P CT {phase_name}"
-      },
-      "pv3p_ct_voltage": {
-        "name": "Voltage PV3P CT"
-      },
-      "pv3p_ct_voltage_phase": {
-        "name": "Voltage PV3P CT {phase_name}"
-      },
       "reserve_energy": {
         "name": "Reserve battery energy"
       },
@@ -648,60 +414,6 @@
       },
       "storage_ct_voltage_phase": {
         "name": "Voltage storage CT {phase_name}"
-      },
-      "total_consumption_ct_current": {
-        "name": "Total consumption CT current"
-      },
-      "total_consumption_ct_current_phase": {
-        "name": "Total consumption CT current {phase_name}"
-      },
-      "total_consumption_ct_energy_delivered": {
-        "name": "Total consumption CT energy delivered"
-      },
-      "total_consumption_ct_energy_delivered_phase": {
-        "name": "Total consumption CT energy delivered {phase_name}"
-      },
-      "total_consumption_ct_energy_received": {
-        "name": "Total consumption CT energy received"
-      },
-      "total_consumption_ct_energy_received_phase": {
-        "name": "Total consumption CT energy received {phase_name}"
-      },
-      "total_consumption_ct_frequency": {
-        "name": "Frequency total consumption CT"
-      },
-      "total_consumption_ct_frequency_phase": {
-        "name": "Frequency total consumption CT {phase_name}"
-      },
-      "total_consumption_ct_metering_status": {
-        "name": "Metering status total consumption CT"
-      },
-      "total_consumption_ct_metering_status_phase": {
-        "name": "Metering status total consumption CT {phase_name}"
-      },
-      "total_consumption_ct_power": {
-        "name": "Total consumption CT power"
-      },
-      "total_consumption_ct_power_phase": {
-        "name": "Total consumption CT power {phase_name}"
-      },
-      "total_consumption_ct_powerfactor": {
-        "name": "Power factor total consumption CT"
-      },
-      "total_consumption_ct_powerfactor_phase": {
-        "name": "Power factor total consumption CT {phase_name}"
-      },
-      "total_consumption_ct_status_flags": {
-        "name": "Meter status flags active total consumption CT"
-      },
-      "total_consumption_ct_status_flags_phase": {
-        "name": "Meter status flags active total consumption CT {phase_name}"
-      },
-      "total_consumption_ct_voltage": {
-        "name": "Voltage total consumption CT"
-      },
-      "total_consumption_ct_voltage_phase": {
-        "name": "Voltage total consumption CT {phase_name}"
       }
     },
     "switch": {

homeassistant/components/environment_canada/manifest.json

@@ -7,5 +7,5 @@
   "integration_type": "service",
   "iot_class": "cloud_polling",
   "loggers": ["env_canada"],
-  "requirements": ["env-canada==0.13.2"]
+  "requirements": ["env-canada==0.12.4"]
 }

homeassistant/components/esphome/entity.py

@@ -189,7 +189,6 @@ async def platform_async_setup_entry(
     info_type: type[_InfoT],
     entity_type: type[_EntityT],
     state_type: type[_StateT],
-    info_filter: Callable[[_InfoT], bool] | None = None,
 ) -> None:
     """Set up an esphome platform.
 
@@ -209,22 +208,10 @@ async def platform_async_setup_entry(
         entity_type,
         state_type,
     )
-
-    if info_filter is not None:
-
-        def on_filtered_update(infos: list[EntityInfo]) -> None:
-            on_static_info_update(
-                [info for info in infos if info_filter(cast(_InfoT, info))]
-            )
-
-        info_callback = on_filtered_update
-    else:
-        info_callback = on_static_info_update
-
     entry_data.cleanup_callbacks.append(
         entry_data.async_register_static_info_callback(
             info_type,
-            info_callback,
+            on_static_info_update,
         )
     )
 

homeassistant/components/esphome/entry_data.py

@@ -29,7 +29,6 @@ from aioesphomeapi import (
     Event,
     EventInfo,
     FanInfo,
-    InfraredInfo,
     LightInfo,
     LockInfo,
     MediaPlayerInfo,
@@ -86,7 +85,6 @@ INFO_TYPE_TO_PLATFORM: dict[type[EntityInfo], Platform] = {
     DateTimeInfo: Platform.DATETIME,
     EventInfo: Platform.EVENT,
     FanInfo: Platform.FAN,
-    InfraredInfo: Platform.INFRARED,
     LightInfo: Platform.LIGHT,
     LockInfo: Platform.LOCK,
     MediaPlayerInfo: Platform.MEDIA_PLAYER,

homeassistant/components/esphome/infrared.py

@@ -1,59 +0,0 @@
-"""Infrared platform for ESPHome."""
-
-from __future__ import annotations
-
-from functools import partial
-import logging
-
-from aioesphomeapi import EntityState, InfraredCapability, InfraredInfo
-
-from homeassistant.components.infrared import InfraredCommand, InfraredEntity
-from homeassistant.core import callback
-
-from .entity import (
-    EsphomeEntity,
-    convert_api_error_ha_error,
-    platform_async_setup_entry,
-)
-
-_LOGGER = logging.getLogger(__name__)
-
-PARALLEL_UPDATES = 0
-
-
-class EsphomeInfraredEntity(EsphomeEntity[InfraredInfo, EntityState], InfraredEntity):
-    """ESPHome infrared entity using native API."""
-
-    @callback
-    def _on_device_update(self) -> None:
-        """Call when device updates or entry data changes."""
-        super()._on_device_update()
-        if self._entry_data.available:
-            # Infrared entities should go available as soon as the device comes online
-            self.async_write_ha_state()
-
-    @convert_api_error_ha_error
-    async def async_send_command(self, command: InfraredCommand) -> None:
-        """Send an IR command."""
-        timings = [
-            interval
-            for timing in command.get_raw_timings()
-            for interval in (timing.high_us, -timing.low_us)
-        ]
-        _LOGGER.debug("Sending command: %s", timings)
-
-        self._client.infrared_rf_transmit_raw_timings(
-            self._static_info.key,
-            carrier_frequency=command.modulation,
-            timings=timings,
-            device_id=self._static_info.device_id,
-        )
-
-
-async_setup_entry = partial(
-    platform_async_setup_entry,
-    info_type=InfraredInfo,
-    entity_type=EsphomeInfraredEntity,
-    state_type=EntityState,
-    info_filter=lambda info: bool(info.capabilities & InfraredCapability.TRANSMITTER),
-)

homeassistant/components/esphome/light.py

@@ -241,7 +241,7 @@ class EsphomeLight(EsphomeEntity[LightInfo, LightState], LightEntity):
 
         if (color_temp_k := kwargs.get(ATTR_COLOR_TEMP_KELVIN)) is not None:
             # Do not use kelvin_to_mired here to prevent precision loss
-            data["color_temperature"] = 1_000_000.0 / color_temp_k
+            data["color_temperature"] = 1000000.0 / color_temp_k
             if color_temp_modes := _filter_color_modes(
                 color_modes, LightColorCapability.COLOR_TEMPERATURE
             ):

homeassistant/components/evohome/climate.py

@@ -36,12 +36,19 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import dt as dt_util
 
-from .const import ATTR_DURATION, ATTR_PERIOD, DOMAIN, EVOHOME_DATA, EvoService
+from .const import (
+    ATTR_DURATION,
+    ATTR_DURATION_UNTIL,
+    ATTR_PERIOD,
+    ATTR_SETPOINT,
+    EVOHOME_DATA,
+    EvoService,
+)
 from .coordinator import EvoDataUpdateCoordinator
 from .entity import EvoChild, EvoEntity
 
@@ -132,24 +139,6 @@ class EvoClimateEntity(EvoEntity, ClimateEntity):
     _attr_hvac_modes = [HVACMode.OFF, HVACMode.HEAT]
     _attr_temperature_unit = UnitOfTemperature.CELSIUS
 
-    async def async_clear_zone_override(self) -> None:
-        """Clear the zone override; only supported by zones."""
-        raise ServiceValidationError(
-            translation_domain=DOMAIN,
-            translation_key="zone_only_service",
-            translation_placeholders={"service": EvoService.CLEAR_ZONE_OVERRIDE},
-        )
-
-    async def async_set_zone_override(
-        self, setpoint: float, duration: timedelta | None = None
-    ) -> None:
-        """Set the zone override; only supported by zones."""
-        raise ServiceValidationError(
-            translation_domain=DOMAIN,
-            translation_key="zone_only_service",
-            translation_placeholders={"service": EvoService.SET_ZONE_OVERRIDE},
-        )
-
 
 class EvoZone(EvoChild, EvoClimateEntity):
     """Base for any evohome-compatible heating zone."""
@@ -188,22 +177,22 @@ class EvoZone(EvoChild, EvoClimateEntity):
             | ClimateEntityFeature.TURN_ON
         )
 
-    async def async_clear_zone_override(self) -> None:
-        """Clear the zone's override, if any."""
-        await self.coordinator.call_client_api(self._evo_device.reset())
+    async def async_zone_svc_request(self, service: str, data: dict[str, Any]) -> None:
+        """Process a service request (setpoint override) for a zone."""
+        if service == EvoService.RESET_ZONE_OVERRIDE:
+            await self.coordinator.call_client_api(self._evo_device.reset())
+            return
 
-    async def async_set_zone_override(
-        self, setpoint: float, duration: timedelta | None = None
-    ) -> None:
-        """Set the zone's override (mode/setpoint)."""
-        temperature = max(min(setpoint, self.max_temp), self.min_temp)
+        # otherwise it is EvoService.SET_ZONE_OVERRIDE
+        temperature = max(min(data[ATTR_SETPOINT], self.max_temp), self.min_temp)
 
-        if duration is not None:
+        if ATTR_DURATION_UNTIL in data:
+            duration: timedelta = data[ATTR_DURATION_UNTIL]
             if duration.total_seconds() == 0:
                 await self._update_schedule()
                 until = self.setpoints.get("next_sp_from")
             else:
-                until = dt_util.now() + duration
+                until = dt_util.now() + data[ATTR_DURATION_UNTIL]
         else:
             until = None  # indefinitely
 

homeassistant/components/evohome/const.py

@@ -28,6 +28,7 @@ ATTR_PERIOD: Final = "period"  # number of days
 ATTR_DURATION: Final = "duration"  # number of minutes, <24h
 
 ATTR_SETPOINT: Final = "setpoint"
+ATTR_DURATION_UNTIL: Final = "duration"
 
 
 @unique
@@ -38,4 +39,4 @@ class EvoService(StrEnum):
     SET_SYSTEM_MODE = "set_system_mode"
     RESET_SYSTEM = "reset_system"
     SET_ZONE_OVERRIDE = "set_zone_override"
-    CLEAR_ZONE_OVERRIDE = "clear_zone_override"
+    RESET_ZONE_OVERRIDE = "clear_zone_override"

homeassistant/components/evohome/entity.py

@@ -12,7 +12,7 @@ from homeassistant.core import callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from .const import DOMAIN
+from .const import DOMAIN, EvoService
 from .coordinator import EvoDataUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
@@ -47,12 +47,22 @@ class EvoEntity(CoordinatorEntity[EvoDataUpdateCoordinator]):
             raise NotImplementedError
         if payload["unique_id"] != self._attr_unique_id:
             return
+        if payload["service"] in (
+            EvoService.SET_ZONE_OVERRIDE,
+            EvoService.RESET_ZONE_OVERRIDE,
+        ):
+            await self.async_zone_svc_request(payload["service"], payload["data"])
+            return
         await self.async_tcs_svc_request(payload["service"], payload["data"])
 
     async def async_tcs_svc_request(self, service: str, data: dict[str, Any]) -> None:
         """Process a service request (system mode) for a controller."""
         raise NotImplementedError
 
+    async def async_zone_svc_request(self, service: str, data: dict[str, Any]) -> None:
+        """Process a service request (setpoint override) for a zone."""
+        raise NotImplementedError
+
     @property
     def extra_state_attributes(self) -> Mapping[str, Any]:
         """Return the evohome-specific state attributes."""

homeassistant/components/evohome/services.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from datetime import timedelta
-from typing import Any, Final
+from typing import Final
 
 from evohomeasync2.const import SZ_CAN_BE_TEMPORARY, SZ_SYSTEM_MODE, SZ_TIMING_MODE
 from evohomeasync2.schemas.const import (
@@ -13,51 +13,40 @@ from evohomeasync2.schemas.const import (
 )
 import voluptuous as vol
 
-from homeassistant.components.climate import DOMAIN as CLIMATE_DOMAIN
-from homeassistant.const import ATTR_MODE
+from homeassistant.const import ATTR_ENTITY_ID, ATTR_MODE
 from homeassistant.core import HomeAssistant, ServiceCall, callback
-from homeassistant.helpers import config_validation as cv, service
+from homeassistant.helpers import config_validation as cv, entity_registry as er
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.service import verify_domain_control
 
-from .const import ATTR_DURATION, ATTR_PERIOD, ATTR_SETPOINT, DOMAIN, EvoService
+from .const import (
+    ATTR_DURATION,
+    ATTR_DURATION_UNTIL,
+    ATTR_PERIOD,
+    ATTR_SETPOINT,
+    DOMAIN,
+    EvoService,
+)
 from .coordinator import EvoDataUpdateCoordinator
 
 # system mode schemas are built dynamically when the services are registered
 # because supported modes can vary for edge-case systems
 
-# Zone service schemas (registered as entity services)
-CLEAR_ZONE_OVERRIDE_SCHEMA: Final[dict[str | vol.Marker, Any]] = {}
-SET_ZONE_OVERRIDE_SCHEMA: Final[dict[str | vol.Marker, Any]] = {
-    vol.Required(ATTR_SETPOINT): vol.All(
-        vol.Coerce(float), vol.Range(min=4.0, max=35.0)
-    ),
-    vol.Optional(ATTR_DURATION): vol.All(
-        cv.time_period,
-        vol.Range(min=timedelta(days=0), max=timedelta(days=1)),
-    ),
-}
-
-
-def _register_zone_entity_services(hass: HomeAssistant) -> None:
-    """Register entity-level services for zones."""
-
-    service.async_register_platform_entity_service(
-        hass,
-        DOMAIN,
-        EvoService.CLEAR_ZONE_OVERRIDE,
-        entity_domain=CLIMATE_DOMAIN,
-        schema=CLEAR_ZONE_OVERRIDE_SCHEMA,
-        func="async_clear_zone_override",
-    )
-    service.async_register_platform_entity_service(
-        hass,
-        DOMAIN,
-        EvoService.SET_ZONE_OVERRIDE,
-        entity_domain=CLIMATE_DOMAIN,
-        schema=SET_ZONE_OVERRIDE_SCHEMA,
-        func="async_set_zone_override",
-    )
+RESET_ZONE_OVERRIDE_SCHEMA: Final = vol.Schema(
+    {vol.Required(ATTR_ENTITY_ID): cv.entity_id}
+)
+SET_ZONE_OVERRIDE_SCHEMA: Final = vol.Schema(
+    {
+        vol.Required(ATTR_ENTITY_ID): cv.entity_id,
+        vol.Required(ATTR_SETPOINT): vol.All(
+            vol.Coerce(float), vol.Range(min=4.0, max=35.0)
+        ),
+        vol.Optional(ATTR_DURATION_UNTIL): vol.All(
+            cv.time_period,
+            vol.Range(min=timedelta(days=0), max=timedelta(days=1)),
+        ),
+    }
+)
 
 
 @callback
@@ -69,6 +58,8 @@ def setup_service_functions(
     Not all Honeywell TCC-compatible systems support all operating modes. In addition,
     each mode will require any of four distinct service schemas. This has to be
     enumerated before registering the appropriate handlers.
+
+    It appears that all TCC-compatible systems support the same three zones modes.
     """
 
     @verify_domain_control(DOMAIN)
@@ -88,6 +79,28 @@ def setup_service_functions(
         }
         async_dispatcher_send(hass, DOMAIN, payload)
 
+    @verify_domain_control(DOMAIN)
+    async def set_zone_override(call: ServiceCall) -> None:
+        """Set the zone override (setpoint)."""
+        entity_id = call.data[ATTR_ENTITY_ID]
+
+        registry = er.async_get(hass)
+        registry_entry = registry.async_get(entity_id)
+
+        if registry_entry is None or registry_entry.platform != DOMAIN:
+            raise ValueError(f"'{entity_id}' is not a known {DOMAIN} entity")
+
+        if registry_entry.domain != "climate":
+            raise ValueError(f"'{entity_id}' is not an {DOMAIN} controller/zone")
+
+        payload = {
+            "unique_id": registry_entry.unique_id,
+            "service": call.service,
+            "data": call.data,
+        }
+
+        async_dispatcher_send(hass, DOMAIN, payload)
+
     assert coordinator.tcs is not None  # mypy
 
     hass.services.async_register(DOMAIN, EvoService.REFRESH_SYSTEM, force_refresh)
@@ -150,4 +163,16 @@ def setup_service_functions(
             schema=vol.Schema(vol.Any(*system_mode_schemas)),
         )
 
-    _register_zone_entity_services(hass)
+    # The zone modes are consistent across all systems and use the same schema
+    hass.services.async_register(
+        DOMAIN,
+        EvoService.RESET_ZONE_OVERRIDE,
+        set_zone_override,
+        schema=RESET_ZONE_OVERRIDE_SCHEMA,
+    )
+    hass.services.async_register(
+        DOMAIN,
+        EvoService.SET_ZONE_OVERRIDE,
+        set_zone_override,
+        schema=SET_ZONE_OVERRIDE_SCHEMA,
+    )

homeassistant/components/evohome/services.yaml

@@ -28,11 +28,14 @@ reset_system:
 refresh_system:
 
 set_zone_override:
-  target:
-    entity:
-      integration: evohome
-      domain: climate
   fields:
+    entity_id:
+      required: true
+      example: climate.bathroom
+      selector:
+        entity:
+          integration: evohome
+          domain: climate
     setpoint:
       required: true
       selector:
@@ -46,7 +49,10 @@ set_zone_override:
         object:
 
 clear_zone_override:
-  target:
-    entity:
-      integration: evohome
-      domain: climate
+  fields:
+    entity_id:
+      required: true
+      selector:
+        entity:
+          integration: evohome
+          domain: climate

homeassistant/components/evohome/strings.json

@@ -1,12 +1,13 @@
 {
-  "exceptions": {
-    "zone_only_service": {
-      "message": "Only zones support the `{service}` action"
-    }
-  },
   "services": {
     "clear_zone_override": {
       "description": "Sets a zone to follow its schedule.",
+      "fields": {
+        "entity_id": {
+          "description": "[%key:component::evohome::services::set_zone_override::fields::entity_id::description%]",
+          "name": "[%key:component::evohome::services::set_zone_override::fields::entity_id::name%]"
+        }
+      },
       "name": "Clear zone override"
     },
     "refresh_system": {
@@ -42,6 +43,10 @@
           "description": "The zone will revert to its schedule after this time. If 0 the change is until the next scheduled setpoint.",
           "name": "Duration"
         },
+        "entity_id": {
+          "description": "The entity ID of the Evohome zone.",
+          "name": "Entity"
+        },
         "setpoint": {
           "description": "The temperature to be used instead of the scheduled setpoint.",
           "name": "Setpoint"

homeassistant/components/frontend/storage.py

@@ -45,10 +45,6 @@ async def async_user_store(hass: HomeAssistant, user_id: str) -> UserStore:
         except BaseException as ex:
             del stores[user_id]
             future.set_exception(ex)
-            # Ensure the future is marked as retrieved
-            # since if there is no concurrent call it
-            # will otherwise never be retrieved.
-            future.exception()
             raise
         future.set_result(store)
 

homeassistant/components/fully_kiosk/manifest.json

@@ -14,5 +14,5 @@
   "iot_class": "local_polling",
   "mqtt": ["fully/deviceInfo/+"],
   "quality_scale": "bronze",
-  "requirements": ["python-fullykiosk==0.0.15"]
+  "requirements": ["python-fullykiosk==0.0.14"]
 }

homeassistant/components/github/coordinator.py

@@ -78,12 +78,6 @@ query ($owner: String!, $repository: String!) {
         number
       }
     }
-    merged_pull_request: pullRequests(
-      first:1
-      states: MERGED
-    ) {
-      total: totalCount
-    }
     release: latestRelease {
       name
       url

homeassistant/components/github/icons.json

@@ -28,9 +28,6 @@
       "latest_tag": {
         "default": "mdi:tag"
       },
-      "merged_pulls_count": {
-        "default": "mdi:source-merge"
-      },
       "pulls_count": {
         "default": "mdi:source-pull"
       },

homeassistant/components/github/sensor.py

@@ -75,13 +75,6 @@ SENSOR_DESCRIPTIONS: tuple[GitHubSensorEntityDescription, ...] = (
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda data: data["pull_request"]["total"],
     ),
-    GitHubSensorEntityDescription(
-        key="merged_pulls_count",
-        translation_key="merged_pulls_count",
-        entity_category=EntityCategory.DIAGNOSTIC,
-        state_class=SensorStateClass.TOTAL,
-        value_fn=lambda data: data["merged_pull_request"]["total"],
-    ),
     GitHubSensorEntityDescription(
         key="latest_commit",
         translation_key="latest_commit",

homeassistant/components/github/strings.json

@@ -48,10 +48,6 @@
       "latest_tag": {
         "name": "Latest tag"
       },
-      "merged_pulls_count": {
-        "name": "Merged pull requests",
-        "unit_of_measurement": "pull requests"
-      },
       "pulls_count": {
         "name": "Pull requests",
         "unit_of_measurement": "pull requests"

homeassistant/components/govee_ble/manifest.json

@@ -54,10 +54,6 @@
       "connectable": false,
       "local_name": "GVH5110*"
     },
-    {
-      "connectable": false,
-      "local_name": "GV5140*"
-    },
     {
       "connectable": false,
       "manufacturer_id": 1,
@@ -144,5 +140,5 @@
   "documentation": "https://www.home-assistant.io/integrations/govee_ble",
   "integration_type": "device",
   "iot_class": "local_push",
-  "requirements": ["govee-ble==1.2.0"]
+  "requirements": ["govee-ble==0.44.0"]
 }

homeassistant/components/govee_ble/sensor.py

@@ -21,7 +21,6 @@ from homeassistant.components.sensor import (
 )
 from homeassistant.const import (
     CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    CONCENTRATION_PARTS_PER_MILLION,
     PERCENTAGE,
     SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
     UnitOfTemperature,
@@ -73,12 +72,6 @@ SENSOR_DESCRIPTIONS = {
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
     ),
-    (DeviceClass.CO2, Units.CONCENTRATION_PARTS_PER_MILLION): SensorEntityDescription(
-        key=f"{DeviceClass.CO2}_{Units.CONCENTRATION_PARTS_PER_MILLION}",
-        device_class=SensorDeviceClass.CO2,
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
 }
 
 

homeassistant/components/hassio/__init__.py

@@ -21,7 +21,6 @@ from homeassistant.components.homeassistant import async_set_stop_handler
 from homeassistant.components.http import StaticPathConfig
 from homeassistant.config_entries import SOURCE_SYSTEM, ConfigEntry
 from homeassistant.const import (
-    ATTR_DEVICE_ID,
     ATTR_NAME,
     EVENT_CORE_CONFIG_UPDATE,
     HASSIO_USER_NAME,
@@ -35,13 +34,11 @@ from homeassistant.core import (
     async_get_hass_or_none,
     callback,
 )
-from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
 from homeassistant.helpers import (
     config_validation as cv,
     device_registry as dr,
     discovery_flow,
     issue_registry as ir,
-    selector,
 )
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.event import async_call_later
@@ -95,7 +92,6 @@ from .const import (
     DATA_SUPERVISOR_INFO,
     DOMAIN,
     HASSIO_UPDATE_INTERVAL,
-    SupervisorEntityModel,
 )
 from .coordinator import (
     HassioDataUpdateCoordinator,
@@ -151,7 +147,6 @@ SERVICE_BACKUP_FULL = "backup_full"
 SERVICE_BACKUP_PARTIAL = "backup_partial"
 SERVICE_RESTORE_FULL = "restore_full"
 SERVICE_RESTORE_PARTIAL = "restore_partial"
-SERVICE_MOUNT_RELOAD = "mount_reload"
 
 VALID_ADDON_SLUG = vol.Match(re.compile(r"^[-_.A-Za-z0-9]+$"))
 
@@ -234,19 +229,6 @@ SCHEMA_RESTORE_PARTIAL = SCHEMA_RESTORE_FULL.extend(
     }
 )
 
-SCHEMA_MOUNT_RELOAD = vol.Schema(
-    {
-        vol.Required(ATTR_DEVICE_ID): selector.DeviceSelector(
-            selector.DeviceSelectorConfig(
-                filter=selector.DeviceFilterSelectorConfig(
-                    integration=DOMAIN,
-                    model=SupervisorEntityModel.MOUNT,
-                )
-            )
-        )
-    }
-)
-
 
 def _is_32_bit() -> bool:
     size = struct.calcsize("P")
@@ -462,42 +444,6 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:  # noqa:
             DOMAIN, service, async_service_handler, schema=settings.schema
         )
 
-    dev_reg = dr.async_get(hass)
-
-    async def async_mount_reload(service: ServiceCall) -> None:
-        """Handle service calls for Hass.io."""
-        coordinator: HassioDataUpdateCoordinator | None = None
-
-        if (device := dev_reg.async_get(service.data[ATTR_DEVICE_ID])) is None:
-            raise ServiceValidationError(
-                translation_domain=DOMAIN,
-                translation_key="mount_reload_unknown_device_id",
-            )
-
-        if (
-            device.name is None
-            or device.model != SupervisorEntityModel.MOUNT
-            or (coordinator := hass.data.get(ADDONS_COORDINATOR)) is None
-            or coordinator.entry_id not in device.config_entries
-        ):
-            raise ServiceValidationError(
-                translation_domain=DOMAIN,
-                translation_key="mount_reload_invalid_device",
-            )
-
-        try:
-            await supervisor_client.mounts.reload_mount(device.name)
-        except SupervisorError as error:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="mount_reload_error",
-                translation_placeholders={"name": device.name, "error": str(error)},
-            ) from error
-
-    hass.services.async_register(
-        DOMAIN, SERVICE_MOUNT_RELOAD, async_mount_reload, SCHEMA_MOUNT_RELOAD
-    )
-
     async def update_info_data(_: datetime | None = None) -> None:
         """Update last available supervisor information."""
         supervisor_client = get_supervisor_client(hass)

homeassistant/components/hassio/icons.json

@@ -46,9 +46,6 @@
     "host_shutdown": {
       "service": "mdi:power"
     },
-    "mount_reload": {
-      "service": "mdi:reload"
-    },
     "restore_full": {
       "service": "mdi:backup-restore"
     },

homeassistant/components/hassio/services.yaml

@@ -165,13 +165,3 @@ restore_partial:
       example: "password"
       selector:
         text:
-
-mount_reload:
-  fields:
-    device_id:
-      required: true
-      selector:
-        device:
-          filter:
-            integration: hassio
-            model: Home Assistant Mount

homeassistant/components/hassio/strings.json

@@ -43,17 +43,6 @@
       }
     }
   },
-  "exceptions": {
-    "mount_reload_error": {
-      "message": "Failed to reload mount {name}: {error}"
-    },
-    "mount_reload_invalid_device": {
-      "message": "Device is not a supervisor mount point"
-    },
-    "mount_reload_unknown_device_id": {
-      "message": "Device ID not found"
-    }
-  },
   "issues": {
     "issue_addon_boot_fail": {
       "fix_flow": {
@@ -467,16 +456,6 @@
       "description": "Powers off the host system.",
       "name": "Power off the host system"
     },
-    "mount_reload": {
-      "description": "Reloads a network storage mount.",
-      "fields": {
-        "device_id": {
-          "description": "The device ID of the network storage mount to reload.",
-          "name": "Device ID"
-        }
-      },
-      "name": "Reload network storage mount"
-    },
     "restore_full": {
       "description": "Restores from full backup.",
       "fields": {

homeassistant/components/hdfury/icons.json

@@ -6,12 +6,6 @@
       }
     },
     "number": {
-      "audio_unmute": {
-        "default": "mdi:volume-high"
-      },
-      "earc_unmute": {
-        "default": "mdi:volume-high"
-      },
       "oled_fade": {
         "default": "mdi:cellphone-information"
       },

homeassistant/components/hdfury/number.py

@@ -31,32 +31,6 @@ class HDFuryNumberEntityDescription(NumberEntityDescription):
 
 
 NUMBERS: tuple[HDFuryNumberEntityDescription, ...] = (
-    HDFuryNumberEntityDescription(
-        key="unmutecnt",
-        translation_key="audio_unmute",
-        entity_registry_enabled_default=False,
-        mode=NumberMode.BOX,
-        native_min_value=50,
-        native_max_value=1000,
-        native_step=1,
-        device_class=NumberDeviceClass.DURATION,
-        native_unit_of_measurement=UnitOfTime.MILLISECONDS,
-        entity_category=EntityCategory.CONFIG,
-        set_value_fn=lambda client, value: client.set_audio_unmute(value),
-    ),
-    HDFuryNumberEntityDescription(
-        key="earcunmutecnt",
-        translation_key="earc_unmute",
-        entity_registry_enabled_default=False,
-        mode=NumberMode.BOX,
-        native_min_value=0,
-        native_max_value=1000,
-        native_step=1,
-        device_class=NumberDeviceClass.DURATION,
-        native_unit_of_measurement=UnitOfTime.MILLISECONDS,
-        entity_category=EntityCategory.CONFIG,
-        set_value_fn=lambda client, value: client.set_earc_unmute(value),
-    ),
     HDFuryNumberEntityDescription(
         key="oledfade",
         translation_key="oled_fade",

homeassistant/components/hdfury/strings.json

@@ -41,12 +41,6 @@
       }
     },
     "number": {
-      "audio_unmute": {
-        "name": "Unmute delay"
-      },
-      "earc_unmute": {
-        "name": "eARC unmute delay"
-      },
       "oled_fade": {
         "name": "OLED fade timer"
       },

homeassistant/components/history_stats/__init__.py

@@ -16,14 +16,7 @@ from homeassistant.helpers.helper_integration import (
 )
 from homeassistant.helpers.template import Template
 
-from .const import (
-    CONF_DURATION,
-    CONF_END,
-    CONF_MIN_STATE_DURATION,
-    CONF_START,
-    PLATFORMS,
-    SECTION_ADVANCED_SETTINGS,
-)
+from .const import CONF_DURATION, CONF_END, CONF_START, PLATFORMS
 from .coordinator import HistoryStatsUpdateCoordinator
 from .data import HistoryStats
 
@@ -43,14 +36,8 @@ async def async_setup_entry(
     end: str | None = entry.options.get(CONF_END)
 
     duration: timedelta | None = None
-    min_state_duration: timedelta
     if duration_dict := entry.options.get(CONF_DURATION):
         duration = timedelta(**duration_dict)
-    advanced_settings = entry.options.get(SECTION_ADVANCED_SETTINGS, {})
-    if min_state_duration_dict := advanced_settings.get(CONF_MIN_STATE_DURATION):
-        min_state_duration = timedelta(**min_state_duration_dict)
-    else:
-        min_state_duration = timedelta(0)
 
     history_stats = HistoryStats(
         hass,
@@ -59,7 +46,6 @@ async def async_setup_entry(
         Template(start, hass) if start else None,
         Template(end, hass) if end else None,
         duration,
-        min_state_duration,
     )
     coordinator = HistoryStatsUpdateCoordinator(hass, history_stats, entry, entry.title)
     await coordinator.async_config_entry_first_refresh()

homeassistant/components/history_stats/config_flow.py

@@ -12,7 +12,6 @@ from homeassistant.components import websocket_api
 from homeassistant.components.sensor import CONF_STATE_CLASS, SensorStateClass
 from homeassistant.const import CONF_ENTITY_ID, CONF_NAME, CONF_STATE, CONF_TYPE
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.data_entry_flow import section
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.schema_config_entry_flow import (
     SchemaCommonFlowHandler,
@@ -38,7 +37,6 @@ from homeassistant.helpers.template import Template
 from .const import (
     CONF_DURATION,
     CONF_END,
-    CONF_MIN_STATE_DURATION,
     CONF_PERIOD_KEYS,
     CONF_START,
     CONF_TYPE_KEYS,
@@ -46,7 +44,6 @@ from .const import (
     CONF_TYPE_TIME,
     DEFAULT_NAME,
     DOMAIN,
-    SECTION_ADVANCED_SETTINGS,
 )
 from .coordinator import HistoryStatsUpdateCoordinator
 from .data import HistoryStats
@@ -142,7 +139,7 @@ def _get_options_schema_with_entity_id(entity_id: str, type: str) -> vol.Schema:
             vol.Optional(CONF_START): TemplateSelector(),
             vol.Optional(CONF_END): TemplateSelector(),
             vol.Optional(CONF_DURATION): DurationSelector(
-                DurationSelectorConfig(enable_day=True, allow_negative=False),
+                DurationSelectorConfig(enable_day=True, allow_negative=False)
             ),
             vol.Optional(CONF_STATE_CLASS): SelectSelector(
                 SelectSelectorConfig(
@@ -151,18 +148,6 @@ def _get_options_schema_with_entity_id(entity_id: str, type: str) -> vol.Schema:
                     mode=SelectSelectorMode.DROPDOWN,
                 ),
             ),
-            vol.Optional(SECTION_ADVANCED_SETTINGS): section(
-                vol.Schema(
-                    {
-                        vol.Optional(CONF_MIN_STATE_DURATION): DurationSelector(
-                            DurationSelectorConfig(
-                                enable_day=True, allow_negative=False
-                            )
-                        ),
-                    }
-                ),
-                {"collapsed": True},
-            ),
         }
     )
 
@@ -290,8 +275,6 @@ async def ws_start_preview(
     start = validated_data.get(CONF_START)
     end = validated_data.get(CONF_END)
     duration = validated_data.get(CONF_DURATION)
-    advanced_settings = validated_data.get(SECTION_ADVANCED_SETTINGS, {})
-    min_state_duration = advanced_settings.get(CONF_MIN_STATE_DURATION)
     state_class = validated_data.get(CONF_STATE_CLASS)
 
     history_stats = HistoryStats(
@@ -301,7 +284,6 @@ async def ws_start_preview(
         Template(start, hass) if start else None,
         Template(end, hass) if end else None,
         timedelta(**duration) if duration else None,
-        timedelta(**min_state_duration) if min_state_duration else timedelta(0),
         True,
     )
     coordinator = HistoryStatsUpdateCoordinator(hass, history_stats, None, name, True)

homeassistant/components/history_stats/const.py

@@ -8,7 +8,6 @@ PLATFORMS = [Platform.SENSOR]
 CONF_START = "start"
 CONF_END = "end"
 CONF_DURATION = "duration"
-CONF_MIN_STATE_DURATION = "min_state_duration"
 CONF_PERIOD_KEYS = [CONF_START, CONF_END, CONF_DURATION]
 
 CONF_TYPE_TIME = "time"
@@ -17,5 +16,3 @@ CONF_TYPE_COUNT = "count"
 CONF_TYPE_KEYS = [CONF_TYPE_TIME, CONF_TYPE_RATIO, CONF_TYPE_COUNT]
 
 DEFAULT_NAME = "unnamed statistics"
-
-SECTION_ADVANCED_SETTINGS = "advanced_settings"

homeassistant/components/history_stats/data.py

@@ -47,7 +47,6 @@ class HistoryStats:
         start: Template | None,
         end: Template | None,
         duration: datetime.timedelta | None,
-        min_state_duration: datetime.timedelta,
         preview: bool = False,
     ) -> None:
         """Init the history stats manager."""
@@ -59,7 +58,6 @@ class HistoryStats:
         self._has_recorder_data = False
         self._entity_states = set(entity_states)
         self._duration = duration
-        self._min_state_duration = min_state_duration.total_seconds()
         self._start = start
         self._end = end
         self._preview = preview
@@ -245,38 +243,18 @@ class HistoryStats:
                 )
                 break
 
-            if not previous_state_matches and current_state_matches:
-                # We are entering a matching state.
-                # This marks the start of a new candidate block that may later
-                # qualify if it lasts at least min_state_duration.
-                last_state_change_timestamp = max(
-                    start_timestamp, state_change_timestamp
-                )
-            elif previous_state_matches and not current_state_matches:
-                # We are leaving a matching state.
-                # This closes the current matching block and allows to
-                # evaluate its total duration.
-                block_duration = state_change_timestamp - last_state_change_timestamp
-                if block_duration >= self._min_state_duration:
-                    # The block lasted long enough so we increment match count
-                    # and accumulate its duration.
-                    elapsed += block_duration
-                    match_count += 1
+            if previous_state_matches:
+                elapsed += state_change_timestamp - last_state_change_timestamp
+            elif current_state_matches:
+                match_count += 1
 
             previous_state_matches = current_state_matches
+            last_state_change_timestamp = max(start_timestamp, state_change_timestamp)
 
         # Count time elapsed between last history state and end of measure
         if previous_state_matches:
-            # We are still inside a matching block at the end of the
-            # measurement window. This block has not been closed by a
-            # transition, so we evaluate it up to measure_end.
             measure_end = min(end_timestamp, now_timestamp)
-            last_state_duration = max(0, measure_end - last_state_change_timestamp)
-            if last_state_duration >= self._min_state_duration:
-                # The open block lasted long enough so we increment match count
-                # and accumulate its duration.
-                elapsed += last_state_duration
-                match_count += 1
+            elapsed += measure_end - last_state_change_timestamp
 
         # Save value in seconds
         seconds_matched = elapsed

homeassistant/components/history_stats/sensor.py

@@ -42,7 +42,6 @@ from . import HistoryStatsConfigEntry
 from .const import (
     CONF_DURATION,
     CONF_END,
-    CONF_MIN_STATE_DURATION,
     CONF_PERIOD_KEYS,
     CONF_START,
     CONF_TYPE_COUNT,
@@ -64,8 +63,6 @@ UNITS: dict[str, str] = {
 }
 ICON = "mdi:chart-line"
 
-DEFAULT_MIN_STATE_DURATION = datetime.timedelta(0)
-
 
 def exactly_two_period_keys[_T: dict[str, Any]](conf: _T) -> _T:
     """Ensure exactly 2 of CONF_PERIOD_KEYS are provided."""
@@ -94,9 +91,6 @@ PLATFORM_SCHEMA = vol.All(
             vol.Optional(CONF_START): cv.template,
             vol.Optional(CONF_END): cv.template,
             vol.Optional(CONF_DURATION): cv.time_period,
-            vol.Optional(
-                CONF_MIN_STATE_DURATION, default=DEFAULT_MIN_STATE_DURATION
-            ): cv.time_period,
             vol.Optional(CONF_TYPE, default=CONF_TYPE_TIME): vol.In(CONF_TYPE_KEYS),
             vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
             vol.Optional(CONF_UNIQUE_ID): cv.string,
@@ -126,7 +120,6 @@ async def async_setup_platform(
     start: Template | None = config.get(CONF_START)
     end: Template | None = config.get(CONF_END)
     duration: datetime.timedelta | None = config.get(CONF_DURATION)
-    min_state_duration: datetime.timedelta = config[CONF_MIN_STATE_DURATION]
     sensor_type: str = config[CONF_TYPE]
     name: str = config[CONF_NAME]
     unique_id: str | None = config.get(CONF_UNIQUE_ID)
@@ -134,9 +127,7 @@ async def async_setup_platform(
         CONF_STATE_CLASS, SensorStateClass.MEASUREMENT
     )
 
-    history_stats = HistoryStats(
-        hass, entity_id, entity_states, start, end, duration, min_state_duration
-    )
+    history_stats = HistoryStats(hass, entity_id, entity_states, start, end, duration)
     coordinator = HistoryStatsUpdateCoordinator(hass, history_stats, None, name)
     await coordinator.async_refresh()
     if not coordinator.last_update_success:

homeassistant/components/history_stats/strings.json

@@ -19,23 +19,14 @@
         },
         "data_description": {
           "duration": "Duration of the measure.",
-          "end": "When to stop the measure (timestamp or datetime). Can be a template.",
+          "end": "When to stop the measure (timestamp or datetime). Can be a template",
           "entity_id": "[%key:component::history_stats::config::step::user::data_description::entity_id%]",
           "start": "When to start the measure (timestamp or datetime). Can be a template.",
           "state": "[%key:component::history_stats::config::step::user::data_description::state%]",
           "state_class": "The state class for statistics calculation.",
           "type": "[%key:component::history_stats::config::step::user::data_description::type%]"
         },
-        "description": "Read the documentation for further details on how to configure the history stats sensor using these options.",
-        "sections": {
-          "advanced_settings": {
-            "data": { "min_state_duration": "Minimum state duration" },
-            "data_description": {
-              "min_state_duration": "The minimum state duration to account for the statistics. Default is 0 seconds."
-            },
-            "name": "Advanced settings"
-          }
-        }
+        "description": "Read the documentation for further details on how to configure the history stats sensor using these options."
       },
       "state": {
         "data": {
@@ -91,18 +82,7 @@
           "state_class": "The state class for statistics calculation. Changing the state class will require statistics to be reset.",
           "type": "[%key:component::history_stats::config::step::user::data_description::type%]"
         },
-        "description": "[%key:component::history_stats::config::step::options::description%]",
-        "sections": {
-          "advanced_settings": {
-            "data": {
-              "min_state_duration": "[%key:component::history_stats::config::step::options::sections::advanced_settings::data::min_state_duration%]"
-            },
-            "data_description": {
-              "min_state_duration": "[%key:component::history_stats::config::step::options::sections::advanced_settings::data_description::min_state_duration%]"
-            },
-            "name": "[%key:component::history_stats::config::step::options::sections::advanced_settings::name%]"
-          }
-        }
+        "description": "[%key:component::history_stats::config::step::options::description%]"
       }
     }
   },

homeassistant/components/infrared/__init__.py

@@ -1,153 +0,0 @@
-"""Provides functionality to interact with infrared devices."""
-
-from __future__ import annotations
-
-from abc import abstractmethod
-from datetime import timedelta
-import logging
-from typing import final
-
-from infrared_protocols import Command as InfraredCommand
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import STATE_UNAVAILABLE
-from homeassistant.core import Context, HomeAssistant, callback
-from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import config_validation as cv, entity_registry as er
-from homeassistant.helpers.entity import EntityDescription
-from homeassistant.helpers.entity_component import EntityComponent
-from homeassistant.helpers.restore_state import RestoreEntity
-from homeassistant.helpers.typing import ConfigType
-from homeassistant.util import dt as dt_util
-from homeassistant.util.hass_dict import HassKey
-
-from .const import DOMAIN
-
-__all__ = [
-    "DOMAIN",
-    "InfraredEntity",
-    "InfraredEntityDescription",
-    "async_get_emitters",
-    "async_send_command",
-]
-
-_LOGGER = logging.getLogger(__name__)
-
-DATA_COMPONENT: HassKey[EntityComponent[InfraredEntity]] = HassKey(DOMAIN)
-ENTITY_ID_FORMAT = DOMAIN + ".{}"
-PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA
-PLATFORM_SCHEMA_BASE = cv.PLATFORM_SCHEMA_BASE
-SCAN_INTERVAL = timedelta(seconds=30)
-
-
-async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the infrared domain."""
-    component = hass.data[DATA_COMPONENT] = EntityComponent[InfraredEntity](
-        _LOGGER, DOMAIN, hass, SCAN_INTERVAL
-    )
-    await component.async_setup(config)
-
-    return True
-
-
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
-    """Set up a config entry."""
-    return await hass.data[DATA_COMPONENT].async_setup_entry(entry)
-
-
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
-    """Unload a config entry."""
-    return await hass.data[DATA_COMPONENT].async_unload_entry(entry)
-
-
-@callback
-def async_get_emitters(hass: HomeAssistant) -> list[InfraredEntity]:
-    """Get all infrared emitters."""
-    component = hass.data.get(DATA_COMPONENT)
-    if component is None:
-        return []
-
-    return list(component.entities)
-
-
-async def async_send_command(
-    hass: HomeAssistant,
-    entity_id_or_uuid: str,
-    command: InfraredCommand,
-    context: Context | None = None,
-) -> None:
-    """Send an IR command to the specified infrared entity.
-
-    Raises:
-        HomeAssistantError: If the infrared entity is not found.
-    """
-    component = hass.data.get(DATA_COMPONENT)
-    if component is None:
-        raise HomeAssistantError(
-            translation_domain=DOMAIN,
-            translation_key="component_not_loaded",
-        )
-
-    ent_reg = er.async_get(hass)
-    entity_id = er.async_validate_entity_id(ent_reg, entity_id_or_uuid)
-    entity = component.get_entity(entity_id)
-    if entity is None:
-        raise HomeAssistantError(
-            translation_domain=DOMAIN,
-            translation_key="entity_not_found",
-            translation_placeholders={"entity_id": entity_id},
-        )
-
-    if context is not None:
-        entity.async_set_context(context)
-
-    await entity.async_send_command_internal(command)
-
-
-class InfraredEntityDescription(EntityDescription, frozen_or_thawed=True):
-    """Describes infrared entities."""
-
-
-class InfraredEntity(RestoreEntity):
-    """Base class for infrared transmitter entities."""
-
-    entity_description: InfraredEntityDescription
-    _attr_should_poll = False
-    _attr_state: None = None
-
-    __last_command_sent: str | None = None
-
-    @property
-    @final
-    def state(self) -> str | None:
-        """Return the entity state."""
-        return self.__last_command_sent
-
-    @final
-    async def async_send_command_internal(self, command: InfraredCommand) -> None:
-        """Send an IR command and update state.
-
-        Should not be overridden, handles setting last sent timestamp.
-        """
-        await self.async_send_command(command)
-        self.__last_command_sent = dt_util.utcnow().isoformat(timespec="milliseconds")
-        self.async_write_ha_state()
-
-    @final
-    async def async_internal_added_to_hass(self) -> None:
-        """Call when the infrared entity is added to hass."""
-        await super().async_internal_added_to_hass()
-        state = await self.async_get_last_state()
-        if state is not None and state.state not in (STATE_UNAVAILABLE, None):
-            self.__last_command_sent = state.state
-
-    @abstractmethod
-    async def async_send_command(self, command: InfraredCommand) -> None:
-        """Send an IR command.
-
-        Args:
-            command: The IR command to send.
-
-        Raises:
-            HomeAssistantError: If transmission fails.
-        """

homeassistant/components/infrared/const.py

@@ -1,5 +0,0 @@
-"""Constants for the Infrared integration."""
-
-from typing import Final
-
-DOMAIN: Final = "infrared"

homeassistant/components/infrared/icons.json

@@ -1,7 +0,0 @@
-{
-  "entity_component": {
-    "_": {
-      "default": "mdi:led-on"
-    }
-  }
-}

homeassistant/components/infrared/manifest.json

@@ -1,9 +0,0 @@
-{
-  "domain": "infrared",
-  "name": "Infrared",
-  "codeowners": ["@home-assistant/core"],
-  "documentation": "https://www.home-assistant.io/integrations/infrared",
-  "integration_type": "entity",
-  "quality_scale": "internal",
-  "requirements": ["infrared-protocols==1.0.0"]
-}

homeassistant/components/infrared/strings.json

@@ -1,10 +0,0 @@
-{
-  "exceptions": {
-    "component_not_loaded": {
-      "message": "Infrared component not loaded"
-    },
-    "entity_not_found": {
-      "message": "Infrared entity `{entity_id}` not found"
-    }
-  }
-}

homeassistant/components/kitchen_sink/__init__.py

@@ -56,9 +56,7 @@ from .const import DATA_BACKUP_AGENT_LISTENERS, DOMAIN
 
 COMPONENTS_WITH_DEMO_PLATFORM = [
     Platform.BUTTON,
-    Platform.FAN,
     Platform.IMAGE,
-    Platform.INFRARED,
     Platform.LAWN_MOWER,
     Platform.LOCK,
     Platform.NOTIFY,
@@ -133,9 +131,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     # Notify backup listeners
     hass.async_create_task(_notify_backup_listeners(hass), eager_start=False)
 
-    # Reload config entry when subentries are added/removed/updated
-    entry.async_on_unload(entry.add_update_listener(_async_update_listener))
-
     # Subscribe to labs feature updates for kitchen_sink preview repair
     entry.async_on_unload(
         async_subscribe_preview_feature(
@@ -152,11 +147,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     return True
 
 
-async def _async_update_listener(hass: HomeAssistant, entry: ConfigEntry) -> None:
-    """Reload config entry on update (e.g. subentry added/removed)."""
-    await hass.config_entries.async_reload(entry.entry_id)
-
-
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload config entry."""
     # Notify backup listeners

homeassistant/components/kitchen_sink/config_flow.py

@@ -8,23 +8,18 @@ from typing import Any
 import voluptuous as vol
 
 from homeassistant import data_entry_flow
-from homeassistant.components.infrared import (
-    DOMAIN as INFRARED_DOMAIN,
-    async_get_emitters,
-)
 from homeassistant.config_entries import (
     ConfigEntry,
     ConfigFlow,
     ConfigFlowResult,
     ConfigSubentryFlow,
-    OptionsFlow,
+    OptionsFlowWithReload,
     SubentryFlowResult,
 )
 from homeassistant.core import callback
 from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.selector import EntitySelector, EntitySelectorConfig
 
-from .const import CONF_INFRARED_ENTITY_ID, DOMAIN
+from . import DOMAIN
 
 CONF_BOOLEAN = "bool"
 CONF_INT = "int"
@@ -49,10 +44,7 @@ class KitchenSinkConfigFlow(ConfigFlow, domain=DOMAIN):
         cls, config_entry: ConfigEntry
     ) -> dict[str, type[ConfigSubentryFlow]]:
         """Return subentries supported by this handler."""
-        return {
-            "entity": SubentryFlowHandler,
-            "infrared_fan": InfraredFanSubentryFlowHandler,
-        }
+        return {"entity": SubentryFlowHandler}
 
     async def async_step_import(self, import_data: dict[str, Any]) -> ConfigFlowResult:
         """Set the config entry up from yaml."""
@@ -73,7 +65,7 @@ class KitchenSinkConfigFlow(ConfigFlow, domain=DOMAIN):
         return self.async_abort(reason="reauth_successful")
 
 
-class OptionsFlowHandler(OptionsFlow):
+class OptionsFlowHandler(OptionsFlowWithReload):
     """Handle options."""
 
     async def async_step_init(
@@ -154,7 +146,7 @@ class SubentryFlowHandler(ConfigSubentryFlow):
         """Reconfigure a sensor."""
         if user_input is not None:
             title = user_input.pop("name")
-            return self.async_update_and_abort(
+            return self.async_update_reload_and_abort(
                 self._get_entry(),
                 self._get_reconfigure_subentry(),
                 data=user_input,
@@ -170,35 +162,3 @@ class SubentryFlowHandler(ConfigSubentryFlow):
                 }
             ),
         )
-
-
-class InfraredFanSubentryFlowHandler(ConfigSubentryFlow):
-    """Handle infrared fan subentry flow."""
-
-    async def async_step_user(
-        self, user_input: dict[str, Any] | None = None
-    ) -> SubentryFlowResult:
-        """User flow to add an infrared fan."""
-
-        entities = async_get_emitters(self.hass)
-        if not entities:
-            return self.async_abort(reason="no_emitters")
-
-        if user_input is not None:
-            title = user_input.pop("name")
-            return self.async_create_entry(data=user_input, title=title)
-
-        return self.async_show_form(
-            step_id="user",
-            data_schema=vol.Schema(
-                {
-                    vol.Required("name"): str,
-                    vol.Required(CONF_INFRARED_ENTITY_ID): EntitySelector(
-                        EntitySelectorConfig(
-                            domain=INFRARED_DOMAIN,
-                            include_entities=[entity.entity_id for entity in entities],
-                        )
-                    ),
-                }
-            ),
-        )