diff --git a/.core_files.yaml b/.core_files.yaml
index 6fd3a74df92..e211b8ca5ec 100644
--- a/.core_files.yaml
+++ b/.core_files.yaml
@@ -79,7 +79,6 @@ components: &components
- homeassistant/components/group/**
- homeassistant/components/hassio/**
- homeassistant/components/homeassistant/**
- - homeassistant/components/homeassistant_hardware/**
- homeassistant/components/http/**
- homeassistant/components/image/**
- homeassistant/components/input_boolean/**
diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
index cc100c48fd8..e359ed59cf0 100644
--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@@ -10,7 +10,7 @@ on:
env:
BUILD_TYPE: core
- DEFAULT_PYTHON: "3.13"
+ DEFAULT_PYTHON: "3.12"
PIP_TIMEOUT: 60
UV_HTTP_TIMEOUT: 60
UV_SYSTEM_PYTHON: "true"
@@ -531,7 +531,7 @@ jobs:
- name: Generate artifact attestation
if: needs.init.outputs.channel != 'dev' && needs.init.outputs.publish == 'true'
- uses: actions/attest-build-provenance@ef244123eb79f2f7a7e75d99086184180e6d0018 # v1.4.4
+ uses: actions/attest-build-provenance@1c608d11d69870c2092266b3f9a6f3abbf17002c # v1.4.3
with:
subject-name: ${{ env.HASSFEST_IMAGE_NAME }}
subject-digest: ${{ steps.push.outputs.digest }}
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index fa05f6082a2..263f9ed5d6d 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -40,9 +40,9 @@ env:
CACHE_VERSION: 11
UV_CACHE_VERSION: 1
MYPY_CACHE_VERSION: 9
- HA_SHORT_VERSION: "2024.12"
+ HA_SHORT_VERSION: "2024.11"
DEFAULT_PYTHON: "3.12"
- ALL_PYTHON_VERSIONS: "['3.12', '3.13']"
+ ALL_PYTHON_VERSIONS: "['3.12']"
# 10.3 is the oldest supported version
# - 10.3.32 is the version currently shipped with Synology (as of 17 Feb 2022)
# 10.6 is the current long-term-support
@@ -622,13 +622,13 @@ jobs:
steps:
- name: Check out code from GitHub
uses: actions/checkout@v4.2.2
- - name: Set up Python ${{ matrix.python-version }}
+ - name: Set up Python ${{ env.DEFAULT_PYTHON }}
id: python
uses: actions/setup-python@v5.3.0
with:
- python-version: ${{ matrix.python-version }}
+ python-version: ${{ env.DEFAULT_PYTHON }}
check-latest: true
- - name: Restore full Python ${{ matrix.python-version }} virtual environment
+ - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
id: cache-venv
uses: actions/cache/restore@v4.1.2
with:
@@ -819,7 +819,11 @@ jobs:
needs:
- info
- base
- name: Split tests for full run
+ strategy:
+ fail-fast: false
+ matrix:
+ python-version: ${{ fromJson(needs.info.outputs.python_versions) }}
+ name: Split tests for full run Python ${{ matrix.python-version }}
steps:
- name: Install additional OS dependencies
run: |
@@ -832,11 +836,11 @@ jobs:
libgammu-dev
- name: Check out code from GitHub
uses: actions/checkout@v4.2.2
- - name: Set up Python ${{ env.DEFAULT_PYTHON }}
+ - name: Set up Python ${{ matrix.python-version }}
id: python
uses: actions/setup-python@v5.3.0
with:
- python-version: ${{ env.DEFAULT_PYTHON }}
+ python-version: ${{ matrix.python-version }}
check-latest: true
- name: Restore base Python virtual environment
id: cache-venv
@@ -854,7 +858,7 @@ jobs:
- name: Upload pytest_buckets
uses: actions/upload-artifact@v4.4.3
with:
- name: pytest_buckets
+ name: pytest_buckets-${{ matrix.python-version }}
path: pytest_buckets.txt
overwrite: true
@@ -919,7 +923,7 @@ jobs:
- name: Download pytest_buckets
uses: actions/download-artifact@v4.1.8
with:
- name: pytest_buckets
+ name: pytest_buckets-${{ matrix.python-version }}
- name: Compile English translations
run: |
. venv/bin/activate
@@ -945,7 +949,6 @@ jobs:
--timeout=9 \
--durations=10 \
--numprocesses auto \
- --snapshot-details \
--dist=loadfile \
${cov_params[@]} \
-o console_output_style=count \
@@ -1068,7 +1071,6 @@ jobs:
-qq \
--timeout=20 \
--numprocesses 1 \
- --snapshot-details \
${cov_params[@]} \
-o console_output_style=count \
--durations=10 \
@@ -1197,7 +1199,6 @@ jobs:
-qq \
--timeout=9 \
--numprocesses 1 \
- --snapshot-details \
${cov_params[@]} \
-o console_output_style=count \
--durations=0 \
@@ -1344,7 +1345,6 @@ jobs:
-qq \
--timeout=9 \
--numprocesses auto \
- --snapshot-details \
${cov_params[@]} \
-o console_output_style=count \
--durations=0 \
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index 48e37717232..176e010c5b9 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -24,11 +24,11 @@ jobs:
uses: actions/checkout@v4.2.2
- name: Initialize CodeQL
- uses: github/codeql-action/init@v3.27.3
+ uses: github/codeql-action/init@v3.27.0
with:
languages: python
- name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@v3.27.3
+ uses: github/codeql-action/analyze@v3.27.0
with:
category: "/language:python"
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index b9f54bba081..0c8df57d5a2 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -112,7 +112,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- abi: ["cp312", "cp313"]
+ abi: ["cp312"]
arch: ${{ fromJson(needs.init.outputs.architectures) }}
steps:
- name: Checkout the repository
@@ -135,14 +135,14 @@ jobs:
sed -i "/uv/d" requirements_diff.txt
- name: Build wheels
- uses: home-assistant/wheels@2024.11.0
+ uses: home-assistant/wheels@2024.07.1
with:
abi: ${{ matrix.abi }}
tag: musllinux_1_2
arch: ${{ matrix.arch }}
wheels-key: ${{ secrets.WHEELS_KEY }}
env-file: true
- apk: "libffi-dev;openssl-dev;yaml-dev;nasm;zlib-dev"
+ apk: "libffi-dev;openssl-dev;yaml-dev;nasm"
skip-binary: aiohttp;multidict;yarl
constraints: "homeassistant/package_constraints.txt"
requirements-diff: "requirements_diff.txt"
@@ -156,7 +156,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- abi: ["cp312", "cp313"]
+ abi: ["cp312"]
arch: ${{ fromJson(needs.init.outputs.architectures) }}
steps:
- name: Checkout the repository
@@ -198,7 +198,6 @@ jobs:
split -l $(expr $(expr $(cat requirements_all.txt | wc -l) + 1) / 3) requirements_all_wheels_${{ matrix.arch }}.txt requirements_all.txt
- name: Create requirements for cython<3
- if: matrix.abi == 'cp312'
run: |
# Some dependencies still require 'cython<3'
# and don't yet use isolated build environments.
@@ -209,8 +208,7 @@ jobs:
cat homeassistant/package_constraints.txt | grep 'pydantic==' >> requirements_old-cython.txt
- name: Build wheels (old cython)
- uses: home-assistant/wheels@2024.11.0
- if: matrix.abi == 'cp312'
+ uses: home-assistant/wheels@2024.07.1
with:
abi: ${{ matrix.abi }}
tag: musllinux_1_2
@@ -225,43 +223,43 @@ jobs:
pip: "'cython<3'"
- name: Build wheels (part 1)
- uses: home-assistant/wheels@2024.11.0
+ uses: home-assistant/wheels@2024.07.1
with:
abi: ${{ matrix.abi }}
tag: musllinux_1_2
arch: ${{ matrix.arch }}
wheels-key: ${{ secrets.WHEELS_KEY }}
env-file: true
- apk: "bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;cups-dev;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev;gammu-dev;yaml-dev;openblas-dev;fftw-dev;lapack-dev;gfortran;blas-dev;eigen-dev;freetype-dev;glew-dev;harfbuzz-dev;hdf5-dev;libdc1394-dev;libtbb-dev;mesa-dev;openexr-dev;openjpeg-dev;uchardet-dev;nasm;zlib-dev"
- skip-binary: aiohttp;charset-normalizer;grpcio;multidict;SQLAlchemy;propcache;protobuf;pymicro-vad;yarl
+ apk: "bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;cups-dev;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev;gammu-dev;yaml-dev;openblas-dev;fftw-dev;lapack-dev;gfortran;blas-dev;eigen-dev;freetype-dev;glew-dev;harfbuzz-dev;hdf5-dev;libdc1394-dev;libtbb-dev;mesa-dev;openexr-dev;openjpeg-dev;uchardet-dev;nasm"
+ skip-binary: aiohttp;charset-normalizer;grpcio;multidict;SQLAlchemy;propcache;protobuf;pydantic;pymicro-vad;yarl
constraints: "homeassistant/package_constraints.txt"
requirements-diff: "requirements_diff.txt"
requirements: "requirements_all.txtaa"
- name: Build wheels (part 2)
- uses: home-assistant/wheels@2024.11.0
+ uses: home-assistant/wheels@2024.07.1
with:
abi: ${{ matrix.abi }}
tag: musllinux_1_2
arch: ${{ matrix.arch }}
wheels-key: ${{ secrets.WHEELS_KEY }}
env-file: true
- apk: "bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;cups-dev;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev;gammu-dev;yaml-dev;openblas-dev;fftw-dev;lapack-dev;gfortran;blas-dev;eigen-dev;freetype-dev;glew-dev;harfbuzz-dev;hdf5-dev;libdc1394-dev;libtbb-dev;mesa-dev;openexr-dev;openjpeg-dev;uchardet-dev;nasm;zlib-dev"
- skip-binary: aiohttp;charset-normalizer;grpcio;multidict;SQLAlchemy;propcache;protobuf;pymicro-vad;yarl
+ apk: "bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;cups-dev;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev;gammu-dev;yaml-dev;openblas-dev;fftw-dev;lapack-dev;gfortran;blas-dev;eigen-dev;freetype-dev;glew-dev;harfbuzz-dev;hdf5-dev;libdc1394-dev;libtbb-dev;mesa-dev;openexr-dev;openjpeg-dev;uchardet-dev;nasm"
+ skip-binary: aiohttp;charset-normalizer;grpcio;multidict;SQLAlchemy;propcache;protobuf;pydantic;pymicro-vad;yarl
constraints: "homeassistant/package_constraints.txt"
requirements-diff: "requirements_diff.txt"
requirements: "requirements_all.txtab"
- name: Build wheels (part 3)
- uses: home-assistant/wheels@2024.11.0
+ uses: home-assistant/wheels@2024.07.1
with:
abi: ${{ matrix.abi }}
tag: musllinux_1_2
arch: ${{ matrix.arch }}
wheels-key: ${{ secrets.WHEELS_KEY }}
env-file: true
- apk: "bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;cups-dev;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev;gammu-dev;yaml-dev;openblas-dev;fftw-dev;lapack-dev;gfortran;blas-dev;eigen-dev;freetype-dev;glew-dev;harfbuzz-dev;hdf5-dev;libdc1394-dev;libtbb-dev;mesa-dev;openexr-dev;openjpeg-dev;uchardet-dev;nasm;zlib-dev"
- skip-binary: aiohttp;charset-normalizer;grpcio;multidict;SQLAlchemy;propcache;protobuf;pymicro-vad;yarl
+ apk: "bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;cups-dev;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev;gammu-dev;yaml-dev;openblas-dev;fftw-dev;lapack-dev;gfortran;blas-dev;eigen-dev;freetype-dev;glew-dev;harfbuzz-dev;hdf5-dev;libdc1394-dev;libtbb-dev;mesa-dev;openexr-dev;openjpeg-dev;uchardet-dev;nasm"
+ skip-binary: aiohttp;charset-normalizer;grpcio;multidict;SQLAlchemy;propcache;protobuf;pydantic;pymicro-vad;yarl
constraints: "homeassistant/package_constraints.txt"
requirements-diff: "requirements_diff.txt"
requirements: "requirements_all.txtac"
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 56fbabe8087..a619936cbbf 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
- rev: v0.7.3
+ rev: v0.7.1
hooks:
- id: ruff
args:
@@ -90,7 +90,7 @@ repos:
pass_filenames: false
language: script
types: [text]
- files: ^(script/hassfest/metadata\.py|homeassistant/const\.py$|pyproject\.toml|homeassistant/components/go2rtc/const\.py)$
+ files: ^(script/hassfest/metadata\.py|homeassistant/const\.py$|pyproject\.toml)$
- id: hassfest-mypy-config
name: hassfest-mypy-config
entry: script/run-in-env.sh python3 -m script.hassfest -p mypy_config
diff --git a/.strict-typing b/.strict-typing
index b0fd74bce54..4bfacaa64f4 100644
--- a/.strict-typing
+++ b/.strict-typing
@@ -324,13 +324,11 @@ homeassistant.components.moon.*
homeassistant.components.mopeka.*
homeassistant.components.motionmount.*
homeassistant.components.mqtt.*
-homeassistant.components.music_assistant.*
homeassistant.components.my.*
homeassistant.components.mysensors.*
homeassistant.components.myuplink.*
homeassistant.components.nam.*
homeassistant.components.nanoleaf.*
-homeassistant.components.nasweb.*
homeassistant.components.neato.*
homeassistant.components.nest.*
homeassistant.components.netatmo.*
@@ -340,7 +338,6 @@ homeassistant.components.nfandroidtv.*
homeassistant.components.nightscout.*
homeassistant.components.nissan_leaf.*
homeassistant.components.no_ip.*
-homeassistant.components.nordpool.*
homeassistant.components.notify.*
homeassistant.components.notion.*
homeassistant.components.number.*
diff --git a/CODEOWNERS b/CODEOWNERS
index e204463695e..5cda5610f6c 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -40,8 +40,6 @@ build.json @home-assistant/supervisor
# Integrations
/homeassistant/components/abode/ @shred86
/tests/components/abode/ @shred86
-/homeassistant/components/acaia/ @zweckj
-/tests/components/acaia/ @zweckj
/homeassistant/components/accuweather/ @bieniu
/tests/components/accuweather/ @bieniu
/homeassistant/components/acmeda/ @atmurray
@@ -498,8 +496,8 @@ build.json @home-assistant/supervisor
/tests/components/freebox/ @hacf-fr @Quentame
/homeassistant/components/freedompro/ @stefano055415
/tests/components/freedompro/ @stefano055415
-/homeassistant/components/fritz/ @AaronDavidSchneider @chemelli74 @mib1185
-/tests/components/fritz/ @AaronDavidSchneider @chemelli74 @mib1185
+/homeassistant/components/fritz/ @mammuth @AaronDavidSchneider @chemelli74 @mib1185
+/tests/components/fritz/ @mammuth @AaronDavidSchneider @chemelli74 @mib1185
/homeassistant/components/fritzbox/ @mib1185 @flabbamann
/tests/components/fritzbox/ @mib1185 @flabbamann
/homeassistant/components/fritzbox_callmonitor/ @cdce8p
@@ -956,8 +954,6 @@ build.json @home-assistant/supervisor
/homeassistant/components/msteams/ @peroyvind
/homeassistant/components/mullvad/ @meichthys
/tests/components/mullvad/ @meichthys
-/homeassistant/components/music_assistant/ @music-assistant
-/tests/components/music_assistant/ @music-assistant
/homeassistant/components/mutesync/ @currentoor
/tests/components/mutesync/ @currentoor
/homeassistant/components/my/ @home-assistant/core
@@ -972,8 +968,6 @@ build.json @home-assistant/supervisor
/tests/components/nam/ @bieniu
/homeassistant/components/nanoleaf/ @milanmeu @joostlek
/tests/components/nanoleaf/ @milanmeu @joostlek
-/homeassistant/components/nasweb/ @nasWebio
-/tests/components/nasweb/ @nasWebio
/homeassistant/components/neato/ @Santobert
/tests/components/neato/ @Santobert
/homeassistant/components/nederlandse_spoorwegen/ @YarmoM
@@ -1014,8 +1008,6 @@ build.json @home-assistant/supervisor
/homeassistant/components/noaa_tides/ @jdelaney72
/homeassistant/components/nobo_hub/ @echoromeo @oyvindwe
/tests/components/nobo_hub/ @echoromeo @oyvindwe
-/homeassistant/components/nordpool/ @gjohansson-ST
-/tests/components/nordpool/ @gjohansson-ST
/homeassistant/components/notify/ @home-assistant/core
/tests/components/notify/ @home-assistant/core
/homeassistant/components/notify_events/ @matrozov @papajojo
@@ -1346,8 +1338,6 @@ build.json @home-assistant/supervisor
/tests/components/siren/ @home-assistant/core @raman325
/homeassistant/components/sisyphus/ @jkeljo
/homeassistant/components/sky_hub/ @rogerselwyn
-/homeassistant/components/sky_remote/ @dunnmj @saty9
-/tests/components/sky_remote/ @dunnmj @saty9
/homeassistant/components/skybell/ @tkdrob
/tests/components/skybell/ @tkdrob
/homeassistant/components/slack/ @tkdrob @fletcherau
@@ -1489,8 +1479,8 @@ build.json @home-assistant/supervisor
/tests/components/tedee/ @patrickhilker @zweckj
/homeassistant/components/tellduslive/ @fredrike
/tests/components/tellduslive/ @fredrike
-/homeassistant/components/template/ @PhracturedBlue @home-assistant/core
-/tests/components/template/ @PhracturedBlue @home-assistant/core
+/homeassistant/components/template/ @PhracturedBlue @tetienne @home-assistant/core
+/tests/components/template/ @PhracturedBlue @tetienne @home-assistant/core
/homeassistant/components/tesla_fleet/ @Bre77
/tests/components/tesla_fleet/ @Bre77
/homeassistant/components/tesla_wall_connector/ @einarhauks
diff --git a/Dockerfile b/Dockerfile
index 15574192093..b6d571f308e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@ ENV \
ARG QEMU_CPU
# Install uv
-RUN pip3 install uv==0.5.0
+RUN pip3 install uv==0.4.28
WORKDIR /usr/src
@@ -55,7 +55,7 @@ RUN \
"armv7") go2rtc_suffix='arm' ;; \
*) go2rtc_suffix=${BUILD_ARCH} ;; \
esac \
- && curl -L https://github.com/AlexxIT/go2rtc/releases/download/v1.9.7/go2rtc_linux_${go2rtc_suffix} --output /bin/go2rtc \
+ && curl -L https://github.com/AlexxIT/go2rtc/releases/download/v1.9.6/go2rtc_linux_${go2rtc_suffix} --output /bin/go2rtc \
&& chmod +x /bin/go2rtc \
# Verify go2rtc can be executed
&& go2rtc --version
diff --git a/Dockerfile.dev b/Dockerfile.dev
index 48f582a1581..d05c6df425c 100644
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -35,9 +35,6 @@ RUN \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
-# Add go2rtc binary
-COPY --from=ghcr.io/alexxit/go2rtc:latest /usr/local/bin/go2rtc /bin/go2rtc
-
# Install uv
RUN pip3 install uv
diff --git a/build.yaml b/build.yaml
index a8755bbbf5c..13618740ab8 100644
--- a/build.yaml
+++ b/build.yaml
@@ -1,10 +1,10 @@
image: ghcr.io/home-assistant/{arch}-homeassistant
build_from:
- aarch64: ghcr.io/home-assistant/aarch64-homeassistant-base:2024.11.0
- armhf: ghcr.io/home-assistant/armhf-homeassistant-base:2024.11.0
- armv7: ghcr.io/home-assistant/armv7-homeassistant-base:2024.11.0
- amd64: ghcr.io/home-assistant/amd64-homeassistant-base:2024.11.0
- i386: ghcr.io/home-assistant/i386-homeassistant-base:2024.11.0
+ aarch64: ghcr.io/home-assistant/aarch64-homeassistant-base:2024.06.1
+ armhf: ghcr.io/home-assistant/armhf-homeassistant-base:2024.06.1
+ armv7: ghcr.io/home-assistant/armv7-homeassistant-base:2024.06.1
+ amd64: ghcr.io/home-assistant/amd64-homeassistant-base:2024.06.1
+ i386: ghcr.io/home-assistant/i386-homeassistant-base:2024.06.1
codenotary:
signer: notary@home-assistant.io
base_image: notary@home-assistant.io
diff --git a/homeassistant/__main__.py b/homeassistant/__main__.py
index b9d98832705..4c870e94b24 100644
--- a/homeassistant/__main__.py
+++ b/homeassistant/__main__.py
@@ -9,7 +9,6 @@ import os
import sys
import threading
-from .backup_restore import restore_backup
from .const import REQUIRED_PYTHON_VER, RESTART_EXIT_CODE, __version__
FAULT_LOG_FILENAME = "home-assistant.log.fault"
@@ -183,9 +182,6 @@ def main() -> int:
return scripts.run(args.script)
config_dir = os.path.abspath(os.path.join(os.getcwd(), args.config))
- if restore_backup(config_dir):
- return RESTART_EXIT_CODE
-
ensure_config_path(config_dir)
# pylint: disable-next=import-outside-toplevel
diff --git a/homeassistant/backup_restore.py b/homeassistant/backup_restore.py
deleted file mode 100644
index 32991dfb2d3..00000000000
--- a/homeassistant/backup_restore.py
+++ /dev/null
@@ -1,126 +0,0 @@
-"""Home Assistant module to handle restoring backups."""
-
-from dataclasses import dataclass
-import json
-import logging
-from pathlib import Path
-import shutil
-import sys
-from tempfile import TemporaryDirectory
-
-from awesomeversion import AwesomeVersion
-import securetar
-
-from .const import __version__ as HA_VERSION
-
-RESTORE_BACKUP_FILE = ".HA_RESTORE"
-KEEP_PATHS = ("backups",)
-
-_LOGGER = logging.getLogger(__name__)
-
-
-@dataclass
-class RestoreBackupFileContent:
- """Definition for restore backup file content."""
-
- backup_file_path: Path
-
-
-def restore_backup_file_content(config_dir: Path) -> RestoreBackupFileContent | None:
- """Return the contents of the restore backup file."""
- instruction_path = config_dir.joinpath(RESTORE_BACKUP_FILE)
- try:
- instruction_content = json.loads(instruction_path.read_text(encoding="utf-8"))
- return RestoreBackupFileContent(
- backup_file_path=Path(instruction_content["path"])
- )
- except (FileNotFoundError, json.JSONDecodeError):
- return None
-
-
-def _clear_configuration_directory(config_dir: Path) -> None:
- """Delete all files and directories in the config directory except for the backups directory."""
- keep_paths = [config_dir.joinpath(path) for path in KEEP_PATHS]
- config_contents = sorted(
- [entry for entry in config_dir.iterdir() if entry not in keep_paths]
- )
-
- for entry in config_contents:
- entrypath = config_dir.joinpath(entry)
-
- if entrypath.is_file():
- entrypath.unlink()
- elif entrypath.is_dir():
- shutil.rmtree(entrypath)
-
-
-def _extract_backup(config_dir: Path, backup_file_path: Path) -> None:
- """Extract the backup file to the config directory."""
- with (
- TemporaryDirectory() as tempdir,
- securetar.SecureTarFile(
- backup_file_path,
- gzip=False,
- mode="r",
- ) as ostf,
- ):
- ostf.extractall(
- path=Path(tempdir, "extracted"),
- members=securetar.secure_path(ostf),
- filter="fully_trusted",
- )
- backup_meta_file = Path(tempdir, "extracted", "backup.json")
- backup_meta = json.loads(backup_meta_file.read_text(encoding="utf8"))
-
- if (
- backup_meta_version := AwesomeVersion(
- backup_meta["homeassistant"]["version"]
- )
- ) > HA_VERSION:
- raise ValueError(
- f"You need at least Home Assistant version {backup_meta_version} to restore this backup"
- )
-
- with securetar.SecureTarFile(
- Path(
- tempdir,
- "extracted",
- f"homeassistant.tar{'.gz' if backup_meta["compressed"] else ''}",
- ),
- gzip=backup_meta["compressed"],
- mode="r",
- ) as istf:
- for member in istf.getmembers():
- if member.name == "data":
- continue
- member.name = member.name.replace("data/", "")
- _clear_configuration_directory(config_dir)
- istf.extractall(
- path=config_dir,
- members=[
- member
- for member in securetar.secure_path(istf)
- if member.name != "data"
- ],
- filter="fully_trusted",
- )
-
-
-def restore_backup(config_dir_path: str) -> bool:
- """Restore the backup file if any.
-
- Returns True if a restore backup file was found and restored, False otherwise.
- """
- config_dir = Path(config_dir_path)
- if not (restore_content := restore_backup_file_content(config_dir)):
- return False
-
- logging.basicConfig(stream=sys.stdout, level=logging.INFO)
- backup_file_path = restore_content.backup_file_path
- _LOGGER.info("Restoring %s", backup_file_path)
- try:
- _extract_backup(config_dir, backup_file_path)
- except FileNotFoundError as err:
- raise ValueError(f"Backup file {backup_file_path} does not exist") from err
- _LOGGER.info("Restore complete, restarting")
- return True
diff --git a/homeassistant/bootstrap.py b/homeassistant/bootstrap.py
index 1034223051c..dcfb6685627 100644
--- a/homeassistant/bootstrap.py
+++ b/homeassistant/bootstrap.py
@@ -515,7 +515,7 @@ async def async_from_config_dict(
issue_registry.async_create_issue(
hass,
core.DOMAIN,
- f"python_version_{required_python_version}",
+ "python_version",
is_fixable=False,
severity=issue_registry.IssueSeverity.WARNING,
breaks_in_ha_version=REQUIRED_NEXT_PYTHON_HA_RELEASE,
diff --git a/homeassistant/brands/sky.json b/homeassistant/brands/sky.json
deleted file mode 100644
index 3ab0cbbe5bd..00000000000
--- a/homeassistant/brands/sky.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "domain": "sky",
- "name": "Sky",
- "integrations": ["sky_hub", "sky_remote"]
-}
diff --git a/homeassistant/components/acaia/__init__.py b/homeassistant/components/acaia/__init__.py
deleted file mode 100644
index dfdb4cb935d..00000000000
--- a/homeassistant/components/acaia/__init__.py
+++ /dev/null
@@ -1,29 +0,0 @@
-"""Initialize the Acaia component."""
-
-from homeassistant.const import Platform
-from homeassistant.core import HomeAssistant
-
-from .coordinator import AcaiaConfigEntry, AcaiaCoordinator
-
-PLATFORMS = [
- Platform.BUTTON,
-]
-
-
-async def async_setup_entry(hass: HomeAssistant, entry: AcaiaConfigEntry) -> bool:
- """Set up acaia as config entry."""
-
- coordinator = AcaiaCoordinator(hass, entry)
- await coordinator.async_config_entry_first_refresh()
-
- entry.runtime_data = coordinator
-
- await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
-
- return True
-
-
-async def async_unload_entry(hass: HomeAssistant, entry: AcaiaConfigEntry) -> bool:
- """Unload a config entry."""
-
- return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/acaia/button.py b/homeassistant/components/acaia/button.py
deleted file mode 100644
index 50671eecbba..00000000000
--- a/homeassistant/components/acaia/button.py
+++ /dev/null
@@ -1,61 +0,0 @@
-"""Button entities for Acaia scales."""
-
-from collections.abc import Callable, Coroutine
-from dataclasses import dataclass
-from typing import Any
-
-from aioacaia.acaiascale import AcaiaScale
-
-from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-
-from .coordinator import AcaiaConfigEntry
-from .entity import AcaiaEntity
-
-
-@dataclass(kw_only=True, frozen=True)
-class AcaiaButtonEntityDescription(ButtonEntityDescription):
- """Description for acaia button entities."""
-
- press_fn: Callable[[AcaiaScale], Coroutine[Any, Any, None]]
-
-
-BUTTONS: tuple[AcaiaButtonEntityDescription, ...] = (
- AcaiaButtonEntityDescription(
- key="tare",
- translation_key="tare",
- press_fn=lambda scale: scale.tare(),
- ),
- AcaiaButtonEntityDescription(
- key="reset_timer",
- translation_key="reset_timer",
- press_fn=lambda scale: scale.reset_timer(),
- ),
- AcaiaButtonEntityDescription(
- key="start_stop",
- translation_key="start_stop",
- press_fn=lambda scale: scale.start_stop_timer(),
- ),
-)
-
-
-async def async_setup_entry(
- hass: HomeAssistant,
- entry: AcaiaConfigEntry,
- async_add_entities: AddEntitiesCallback,
-) -> None:
- """Set up button entities and services."""
-
- coordinator = entry.runtime_data
- async_add_entities(AcaiaButton(coordinator, description) for description in BUTTONS)
-
-
-class AcaiaButton(AcaiaEntity, ButtonEntity):
- """Representation of an Acaia button."""
-
- entity_description: AcaiaButtonEntityDescription
-
- async def async_press(self) -> None:
- """Handle the button press."""
- await self.entity_description.press_fn(self._scale)
diff --git a/homeassistant/components/acaia/config_flow.py b/homeassistant/components/acaia/config_flow.py
deleted file mode 100644
index 36727059c8a..00000000000
--- a/homeassistant/components/acaia/config_flow.py
+++ /dev/null
@@ -1,149 +0,0 @@
-"""Config flow for Acaia integration."""
-
-import logging
-from typing import Any
-
-from aioacaia.exceptions import AcaiaDeviceNotFound, AcaiaError, AcaiaUnknownDevice
-from aioacaia.helpers import is_new_scale
-import voluptuous as vol
-
-from homeassistant.components.bluetooth import (
- BluetoothServiceInfoBleak,
- async_discovered_service_info,
-)
-from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_ADDRESS, CONF_NAME
-from homeassistant.helpers.device_registry import format_mac
-from homeassistant.helpers.selector import (
- SelectOptionDict,
- SelectSelector,
- SelectSelectorConfig,
- SelectSelectorMode,
-)
-
-from .const import CONF_IS_NEW_STYLE_SCALE, DOMAIN
-
-_LOGGER = logging.getLogger(__name__)
-
-
-class AcaiaConfigFlow(ConfigFlow, domain=DOMAIN):
- """Handle a config flow for acaia."""
-
- def __init__(self) -> None:
- """Initialize the config flow."""
- self._discovered: dict[str, Any] = {}
- self._discovered_devices: dict[str, str] = {}
-
- async def async_step_user(
- self, user_input: dict[str, Any] | None = None
- ) -> ConfigFlowResult:
- """Handle a flow initialized by the user."""
-
- errors: dict[str, str] = {}
-
- if user_input is not None:
- mac = format_mac(user_input[CONF_ADDRESS])
- try:
- is_new_style_scale = await is_new_scale(mac)
- except AcaiaDeviceNotFound:
- errors["base"] = "device_not_found"
- except AcaiaError:
- _LOGGER.exception("Error occurred while connecting to the scale")
- errors["base"] = "unknown"
- except AcaiaUnknownDevice:
- return self.async_abort(reason="unsupported_device")
- else:
- await self.async_set_unique_id(mac)
- self._abort_if_unique_id_configured()
-
- if not errors:
- return self.async_create_entry(
- title=self._discovered_devices[user_input[CONF_ADDRESS]],
- data={
- CONF_ADDRESS: mac,
- CONF_IS_NEW_STYLE_SCALE: is_new_style_scale,
- },
- )
-
- for device in async_discovered_service_info(self.hass):
- self._discovered_devices[device.address] = device.name
-
- if not self._discovered_devices:
- return self.async_abort(reason="no_devices_found")
-
- options = [
- SelectOptionDict(
- value=device_mac,
- label=f"{device_name} ({device_mac})",
- )
- for device_mac, device_name in self._discovered_devices.items()
- ]
-
- return self.async_show_form(
- step_id="user",
- data_schema=vol.Schema(
- {
- vol.Required(CONF_ADDRESS): SelectSelector(
- SelectSelectorConfig(
- options=options,
- mode=SelectSelectorMode.DROPDOWN,
- )
- )
- }
- ),
- errors=errors,
- )
-
- async def async_step_bluetooth(
- self, discovery_info: BluetoothServiceInfoBleak
- ) -> ConfigFlowResult:
- """Handle a discovered Bluetooth device."""
-
- self._discovered[CONF_ADDRESS] = mac = format_mac(discovery_info.address)
- self._discovered[CONF_NAME] = discovery_info.name
-
- await self.async_set_unique_id(mac)
- self._abort_if_unique_id_configured()
-
- try:
- self._discovered[CONF_IS_NEW_STYLE_SCALE] = await is_new_scale(
- discovery_info.address
- )
- except AcaiaDeviceNotFound:
- _LOGGER.debug("Device not found during discovery")
- return self.async_abort(reason="device_not_found")
- except AcaiaError:
- _LOGGER.debug(
- "Error occurred while connecting to the scale during discovery",
- exc_info=True,
- )
- return self.async_abort(reason="unknown")
- except AcaiaUnknownDevice:
- _LOGGER.debug("Unsupported device during discovery")
- return self.async_abort(reason="unsupported_device")
-
- return await self.async_step_bluetooth_confirm()
-
- async def async_step_bluetooth_confirm(
- self, user_input: dict[str, Any] | None = None
- ) -> ConfigFlowResult:
- """Handle confirmation of Bluetooth discovery."""
-
- if user_input is not None:
- return self.async_create_entry(
- title=self._discovered[CONF_NAME],
- data={
- CONF_ADDRESS: self._discovered[CONF_ADDRESS],
- CONF_IS_NEW_STYLE_SCALE: self._discovered[CONF_IS_NEW_STYLE_SCALE],
- },
- )
-
- self.context["title_placeholders"] = placeholders = {
- CONF_NAME: self._discovered[CONF_NAME]
- }
-
- self._set_confirm_only()
- return self.async_show_form(
- step_id="bluetooth_confirm",
- description_placeholders=placeholders,
- )
diff --git a/homeassistant/components/acaia/const.py b/homeassistant/components/acaia/const.py
deleted file mode 100644
index c603578763d..00000000000
--- a/homeassistant/components/acaia/const.py
+++ /dev/null
@@ -1,4 +0,0 @@
-"""Constants for component."""
-
-DOMAIN = "acaia"
-CONF_IS_NEW_STYLE_SCALE = "is_new_style_scale"
diff --git a/homeassistant/components/acaia/coordinator.py b/homeassistant/components/acaia/coordinator.py
deleted file mode 100644
index bd915b42408..00000000000
--- a/homeassistant/components/acaia/coordinator.py
+++ /dev/null
@@ -1,86 +0,0 @@
-"""Coordinator for Acaia integration."""
-
-from __future__ import annotations
-
-from datetime import timedelta
-import logging
-
-from aioacaia.acaiascale import AcaiaScale
-from aioacaia.exceptions import AcaiaDeviceNotFound, AcaiaError
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_ADDRESS
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
-
-from .const import CONF_IS_NEW_STYLE_SCALE
-
-SCAN_INTERVAL = timedelta(seconds=15)
-
-_LOGGER = logging.getLogger(__name__)
-
-type AcaiaConfigEntry = ConfigEntry[AcaiaCoordinator]
-
-
-class AcaiaCoordinator(DataUpdateCoordinator[None]):
- """Class to handle fetching data from the scale."""
-
- config_entry: AcaiaConfigEntry
-
- def __init__(self, hass: HomeAssistant, entry: AcaiaConfigEntry) -> None:
- """Initialize coordinator."""
- super().__init__(
- hass,
- _LOGGER,
- name="acaia coordinator",
- update_interval=SCAN_INTERVAL,
- config_entry=entry,
- )
-
- self._scale = AcaiaScale(
- address_or_ble_device=entry.data[CONF_ADDRESS],
- name=entry.title,
- is_new_style_scale=entry.data[CONF_IS_NEW_STYLE_SCALE],
- notify_callback=self.async_update_listeners,
- )
-
- @property
- def scale(self) -> AcaiaScale:
- """Return the scale object."""
- return self._scale
-
- async def _async_update_data(self) -> None:
- """Fetch data."""
-
- # scale is already connected, return
- if self._scale.connected:
- return
-
- # scale is not connected, try to connect
- try:
- await self._scale.connect(setup_tasks=False)
- except (AcaiaDeviceNotFound, AcaiaError, TimeoutError) as ex:
- _LOGGER.debug(
- "Could not connect to scale: %s, Error: %s",
- self.config_entry.data[CONF_ADDRESS],
- ex,
- )
- self._scale.device_disconnected_handler(notify=False)
- return
-
- # connected, set up background tasks
- if not self._scale.heartbeat_task or self._scale.heartbeat_task.done():
- self._scale.heartbeat_task = self.config_entry.async_create_background_task(
- hass=self.hass,
- target=self._scale.send_heartbeats(),
- name="acaia_heartbeat_task",
- )
-
- if not self._scale.process_queue_task or self._scale.process_queue_task.done():
- self._scale.process_queue_task = (
- self.config_entry.async_create_background_task(
- hass=self.hass,
- target=self._scale.process_queue(),
- name="acaia_process_queue_task",
- )
- )
diff --git a/homeassistant/components/acaia/entity.py b/homeassistant/components/acaia/entity.py
deleted file mode 100644
index 8a2108d2687..00000000000
--- a/homeassistant/components/acaia/entity.py
+++ /dev/null
@@ -1,40 +0,0 @@
-"""Base class for Acaia entities."""
-
-from dataclasses import dataclass
-
-from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity import EntityDescription
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
-
-from .const import DOMAIN
-from .coordinator import AcaiaCoordinator
-
-
-@dataclass
-class AcaiaEntity(CoordinatorEntity[AcaiaCoordinator]):
- """Common elements for all entities."""
-
- _attr_has_entity_name = True
-
- def __init__(
- self,
- coordinator: AcaiaCoordinator,
- entity_description: EntityDescription,
- ) -> None:
- """Initialize the entity."""
- super().__init__(coordinator)
- self.entity_description = entity_description
- self._scale = coordinator.scale
- self._attr_unique_id = f"{self._scale.mac}_{entity_description.key}"
-
- self._attr_device_info = DeviceInfo(
- identifiers={(DOMAIN, self._scale.mac)},
- manufacturer="Acaia",
- model=self._scale.model,
- suggested_area="Kitchen",
- )
-
- @property
- def available(self) -> bool:
- """Returns whether entity is available."""
- return super().available and self._scale.connected
diff --git a/homeassistant/components/acaia/icons.json b/homeassistant/components/acaia/icons.json
deleted file mode 100644
index aeab07ee912..00000000000
--- a/homeassistant/components/acaia/icons.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "entity": {
- "button": {
- "tare": {
- "default": "mdi:scale-balance"
- },
- "reset_timer": {
- "default": "mdi:timer-refresh"
- },
- "start_stop": {
- "default": "mdi:timer-play"
- }
- }
- }
-}
diff --git a/homeassistant/components/acaia/manifest.json b/homeassistant/components/acaia/manifest.json
deleted file mode 100644
index c907a70a38e..00000000000
--- a/homeassistant/components/acaia/manifest.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "domain": "acaia",
- "name": "Acaia",
- "bluetooth": [
- {
- "manufacturer_id": 16962
- },
- {
- "local_name": "ACAIA*"
- },
- {
- "local_name": "PYXIS-*"
- },
- {
- "local_name": "LUNAR-*"
- },
- {
- "local_name": "PROCHBT001"
- }
- ],
- "codeowners": ["@zweckj"],
- "config_flow": true,
- "dependencies": ["bluetooth_adapters"],
- "documentation": "https://www.home-assistant.io/integrations/acaia",
- "integration_type": "device",
- "iot_class": "local_push",
- "loggers": ["aioacaia"],
- "requirements": ["aioacaia==0.1.6"]
-}
diff --git a/homeassistant/components/acaia/strings.json b/homeassistant/components/acaia/strings.json
deleted file mode 100644
index f6a1aeb66fd..00000000000
--- a/homeassistant/components/acaia/strings.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "config": {
- "flow_title": "{name}",
- "abort": {
- "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
- "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]",
- "unsupported_device": "This device is not supported."
- },
- "error": {
- "device_not_found": "Device could not be found.",
- "unknown": "[%key:common::config_flow::error::unknown%]"
- },
- "step": {
- "bluetooth_confirm": {
- "description": "[%key:component::bluetooth::config::step::bluetooth_confirm::description%]"
- },
- "user": {
- "description": "[%key:component::bluetooth::config::step::user::description%]",
- "data": {
- "address": "[%key:common::config_flow::data::device%]"
- }
- }
- }
- },
- "entity": {
- "button": {
- "tare": {
- "name": "Tare"
- },
- "reset_timer": {
- "name": "Reset timer"
- },
- "start_stop": {
- "name": "Start/stop timer"
- }
- }
- }
-}
diff --git a/homeassistant/components/aemet/__init__.py b/homeassistant/components/aemet/__init__.py
index 29bc044c67d..e242d62a580 100644
--- a/homeassistant/components/aemet/__init__.py
+++ b/homeassistant/components/aemet/__init__.py
@@ -1,5 +1,6 @@
"""The AEMET OpenData component."""
+from dataclasses import dataclass
import logging
from aemet_opendata.exceptions import AemetError, TownNotFound
@@ -12,10 +13,20 @@ from homeassistant.exceptions import ConfigEntryNotReady
from homeassistant.helpers import aiohttp_client
from .const import CONF_STATION_UPDATES, PLATFORMS
-from .coordinator import AemetConfigEntry, AemetData, WeatherUpdateCoordinator
+from .coordinator import WeatherUpdateCoordinator
_LOGGER = logging.getLogger(__name__)
+type AemetConfigEntry = ConfigEntry[AemetData]
+
+
+@dataclass
+class AemetData:
+ """Aemet runtime data."""
+
+ name: str
+ coordinator: WeatherUpdateCoordinator
+
async def async_setup_entry(hass: HomeAssistant, entry: AemetConfigEntry) -> bool:
"""Set up AEMET OpenData as config entry."""
@@ -35,7 +46,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: AemetConfigEntry) -> boo
except AemetError as err:
raise ConfigEntryNotReady(err) from err
- weather_coordinator = WeatherUpdateCoordinator(hass, entry, aemet)
+ weather_coordinator = WeatherUpdateCoordinator(hass, aemet)
await weather_coordinator.async_config_entry_first_refresh()
entry.runtime_data = AemetData(name=name, coordinator=weather_coordinator)
diff --git a/homeassistant/components/aemet/coordinator.py b/homeassistant/components/aemet/coordinator.py
index 2e8534c7466..8d179ccdb02 100644
--- a/homeassistant/components/aemet/coordinator.py
+++ b/homeassistant/components/aemet/coordinator.py
@@ -3,7 +3,6 @@
from __future__ import annotations
from asyncio import timeout
-from dataclasses import dataclass
from datetime import timedelta
import logging
from typing import Any, Final, cast
@@ -20,7 +19,6 @@ from aemet_opendata.helpers import dict_nested_value
from aemet_opendata.interface import AEMET
from homeassistant.components.weather import Forecast
-from homeassistant.config_entries import ConfigEntry
from homeassistant.core import HomeAssistant
from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
@@ -31,16 +29,6 @@ _LOGGER = logging.getLogger(__name__)
API_TIMEOUT: Final[int] = 120
WEATHER_UPDATE_INTERVAL = timedelta(minutes=10)
-type AemetConfigEntry = ConfigEntry[AemetData]
-
-
-@dataclass
-class AemetData:
- """Aemet runtime data."""
-
- name: str
- coordinator: WeatherUpdateCoordinator
-
class WeatherUpdateCoordinator(DataUpdateCoordinator):
"""Weather data update coordinator."""
@@ -48,7 +36,6 @@ class WeatherUpdateCoordinator(DataUpdateCoordinator):
def __init__(
self,
hass: HomeAssistant,
- entry: AemetConfigEntry,
aemet: AEMET,
) -> None:
"""Initialize coordinator."""
@@ -57,7 +44,6 @@ class WeatherUpdateCoordinator(DataUpdateCoordinator):
super().__init__(
hass,
_LOGGER,
- config_entry=entry,
name=DOMAIN,
update_interval=WEATHER_UPDATE_INTERVAL,
)
diff --git a/homeassistant/components/aemet/diagnostics.py b/homeassistant/components/aemet/diagnostics.py
index bc366fc6d44..2379bd34bc0 100644
--- a/homeassistant/components/aemet/diagnostics.py
+++ b/homeassistant/components/aemet/diagnostics.py
@@ -15,7 +15,7 @@ from homeassistant.const import (
)
from homeassistant.core import HomeAssistant
-from .coordinator import AemetConfigEntry
+from . import AemetConfigEntry
TO_REDACT_CONFIG = [
CONF_API_KEY,
diff --git a/homeassistant/components/aemet/sensor.py b/homeassistant/components/aemet/sensor.py
index 88eb34b6f84..e55344490aa 100644
--- a/homeassistant/components/aemet/sensor.py
+++ b/homeassistant/components/aemet/sensor.py
@@ -55,6 +55,7 @@ from homeassistant.core import HomeAssistant
from homeassistant.helpers.entity_platform import AddEntitiesCallback
from homeassistant.util import dt as dt_util
+from . import AemetConfigEntry
from .const import (
ATTR_API_CONDITION,
ATTR_API_FORECAST_CONDITION,
@@ -86,7 +87,7 @@ from .const import (
ATTR_API_WIND_SPEED,
CONDITIONS_MAP,
)
-from .coordinator import AemetConfigEntry, WeatherUpdateCoordinator
+from .coordinator import WeatherUpdateCoordinator
from .entity import AemetEntity
diff --git a/homeassistant/components/aemet/weather.py b/homeassistant/components/aemet/weather.py
index a156652eadd..341b81d71c4 100644
--- a/homeassistant/components/aemet/weather.py
+++ b/homeassistant/components/aemet/weather.py
@@ -27,8 +27,9 @@ from homeassistant.const import (
from homeassistant.core import HomeAssistant, callback
from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from . import AemetConfigEntry
from .const import CONDITIONS_MAP
-from .coordinator import AemetConfigEntry, WeatherUpdateCoordinator
+from .coordinator import WeatherUpdateCoordinator
from .entity import AemetEntity
diff --git a/homeassistant/components/agent_dvr/manifest.json b/homeassistant/components/agent_dvr/manifest.json
index 4ec14296363..9a6c528c336 100644
--- a/homeassistant/components/agent_dvr/manifest.json
+++ b/homeassistant/components/agent_dvr/manifest.json
@@ -6,5 +6,5 @@
"documentation": "https://www.home-assistant.io/integrations/agent_dvr",
"iot_class": "local_polling",
"loggers": ["agent"],
- "requirements": ["agent-py==0.0.24"]
+ "requirements": ["agent-py==0.0.23"]
}
diff --git a/homeassistant/components/airnow/config_flow.py b/homeassistant/components/airnow/config_flow.py
index d0ab16e9758..e839acdcb7b 100644
--- a/homeassistant/components/airnow/config_flow.py
+++ b/homeassistant/components/airnow/config_flow.py
@@ -1,7 +1,5 @@
"""Config flow for AirNow integration."""
-from __future__ import annotations
-
import logging
from typing import Any
@@ -14,6 +12,7 @@ from homeassistant.config_entries import (
ConfigFlow,
ConfigFlowResult,
OptionsFlow,
+ OptionsFlowWithConfigEntry,
)
from homeassistant.const import CONF_API_KEY, CONF_LATITUDE, CONF_LONGITUDE, CONF_RADIUS
from homeassistant.core import HomeAssistant, callback
@@ -121,12 +120,12 @@ class AirNowConfigFlow(ConfigFlow, domain=DOMAIN):
@callback
def async_get_options_flow(
config_entry: ConfigEntry,
- ) -> AirNowOptionsFlowHandler:
+ ) -> OptionsFlow:
"""Return the options flow."""
- return AirNowOptionsFlowHandler()
+ return AirNowOptionsFlowHandler(config_entry)
-class AirNowOptionsFlowHandler(OptionsFlow):
+class AirNowOptionsFlowHandler(OptionsFlowWithConfigEntry):
"""Handle an options flow for AirNow."""
async def async_step_init(
@@ -137,7 +136,12 @@ class AirNowOptionsFlowHandler(OptionsFlow):
return self.async_create_entry(data=user_input)
options_schema = vol.Schema(
- {vol.Optional(CONF_RADIUS): vol.All(int, vol.Range(min=5))}
+ {
+ vol.Optional(CONF_RADIUS): vol.All(
+ int,
+ vol.Range(min=5),
+ ),
+ }
)
return self.async_show_form(
diff --git a/homeassistant/components/airzone/manifest.json b/homeassistant/components/airzone/manifest.json
index 6bf374087a6..10fb20bb2ce 100644
--- a/homeassistant/components/airzone/manifest.json
+++ b/homeassistant/components/airzone/manifest.json
@@ -11,5 +11,5 @@
"documentation": "https://www.home-assistant.io/integrations/airzone",
"iot_class": "local_polling",
"loggers": ["aioairzone"],
- "requirements": ["aioairzone==0.9.6"]
+ "requirements": ["aioairzone==0.9.5"]
}
diff --git a/homeassistant/components/alarm_control_panel/__init__.py b/homeassistant/components/alarm_control_panel/__init__.py
index a9e433a3650..2946fc64941 100644
--- a/homeassistant/components/alarm_control_panel/__init__.py
+++ b/homeassistant/components/alarm_control_panel/__init__.py
@@ -6,7 +6,7 @@ import asyncio
from datetime import timedelta
from functools import partial
import logging
-from typing import TYPE_CHECKING, Any, Final, final
+from typing import Any, Final, final
from propcache import cached_property
import voluptuous as vol
@@ -221,15 +221,9 @@ class AlarmControlPanelEntity(Entity, cached_properties=CACHED_PROPERTIES_WITH_A
@property
def state(self) -> str | None:
"""Return the current state."""
- if (alarm_state := self.alarm_state) is not None:
- return alarm_state
- if self._attr_state is not None:
- # Backwards compatibility for integrations that set state directly
- # Should be removed in 2025.11
- if TYPE_CHECKING:
- assert isinstance(self._attr_state, str)
- return self._attr_state
- return None
+ if (alarm_state := self.alarm_state) is None:
+ return None
+ return alarm_state
@cached_property
def alarm_state(self) -> AlarmControlPanelState | None:
diff --git a/homeassistant/components/analytics_insights/config_flow.py b/homeassistant/components/analytics_insights/config_flow.py
index c36755f5403..baf0190967d 100644
--- a/homeassistant/components/analytics_insights/config_flow.py
+++ b/homeassistant/components/analytics_insights/config_flow.py
@@ -16,6 +16,7 @@ from homeassistant.config_entries import (
ConfigFlow,
ConfigFlowResult,
OptionsFlow,
+ OptionsFlowWithConfigEntry,
)
from homeassistant.core import callback
from homeassistant.helpers.aiohttp_client import async_get_clientsession
@@ -45,11 +46,9 @@ class HomeassistantAnalyticsConfigFlow(ConfigFlow, domain=DOMAIN):
@staticmethod
@callback
- def async_get_options_flow(
- config_entry: ConfigEntry,
- ) -> HomeassistantAnalyticsOptionsFlowHandler:
+ def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlow:
"""Get the options flow for this handler."""
- return HomeassistantAnalyticsOptionsFlowHandler()
+ return HomeassistantAnalyticsOptionsFlowHandler(config_entry)
async def async_step_user(
self, user_input: dict[str, Any] | None = None
@@ -133,7 +132,7 @@ class HomeassistantAnalyticsConfigFlow(ConfigFlow, domain=DOMAIN):
)
-class HomeassistantAnalyticsOptionsFlowHandler(OptionsFlow):
+class HomeassistantAnalyticsOptionsFlowHandler(OptionsFlowWithConfigEntry):
"""Handle Homeassistant Analytics options."""
async def async_step_init(
@@ -212,6 +211,6 @@ class HomeassistantAnalyticsOptionsFlowHandler(OptionsFlow):
),
},
),
- self.config_entry.options,
+ self.options,
),
)
diff --git a/homeassistant/components/androidtv/config_flow.py b/homeassistant/components/androidtv/config_flow.py
index afaba5175da..af6f1d14dcd 100644
--- a/homeassistant/components/androidtv/config_flow.py
+++ b/homeassistant/components/androidtv/config_flow.py
@@ -13,7 +13,7 @@ from homeassistant.config_entries import (
ConfigEntry,
ConfigFlow,
ConfigFlowResult,
- OptionsFlow,
+ OptionsFlowWithConfigEntry,
)
from homeassistant.const import CONF_DEVICE_CLASS, CONF_HOST, CONF_PORT
from homeassistant.core import callback
@@ -186,14 +186,16 @@ class AndroidTVFlowHandler(ConfigFlow, domain=DOMAIN):
return OptionsFlowHandler(config_entry)
-class OptionsFlowHandler(OptionsFlow):
+class OptionsFlowHandler(OptionsFlowWithConfigEntry):
"""Handle an option flow for Android Debug Bridge."""
def __init__(self, config_entry: ConfigEntry) -> None:
"""Initialize options flow."""
- self._apps: dict[str, Any] = dict(config_entry.options.get(CONF_APPS, {}))
- self._state_det_rules: dict[str, Any] = dict(
- config_entry.options.get(CONF_STATE_DETECTION_RULES, {})
+ super().__init__(config_entry)
+
+ self._apps: dict[str, Any] = self.options.setdefault(CONF_APPS, {})
+ self._state_det_rules: dict[str, Any] = self.options.setdefault(
+ CONF_STATE_DETECTION_RULES, {}
)
self._conf_app_id: str | None = None
self._conf_rule_id: str | None = None
@@ -235,7 +237,7 @@ class OptionsFlowHandler(OptionsFlow):
SelectOptionDict(value=k, label=v) for k, v in apps_list.items()
]
rules = [RULES_NEW_ID, *self._state_det_rules]
- options = self.config_entry.options
+ options = self.options
data_schema = vol.Schema(
{
diff --git a/homeassistant/components/androidtv_remote/config_flow.py b/homeassistant/components/androidtv_remote/config_flow.py
index 3500e4ff47b..3512dd5ea65 100644
--- a/homeassistant/components/androidtv_remote/config_flow.py
+++ b/homeassistant/components/androidtv_remote/config_flow.py
@@ -20,7 +20,7 @@ from homeassistant.config_entries import (
ConfigEntry,
ConfigFlow,
ConfigFlowResult,
- OptionsFlow,
+ OptionsFlowWithConfigEntry,
)
from homeassistant.const import CONF_HOST, CONF_MAC, CONF_NAME
from homeassistant.core import callback
@@ -221,12 +221,13 @@ class AndroidTVRemoteConfigFlow(ConfigFlow, domain=DOMAIN):
return AndroidTVRemoteOptionsFlowHandler(config_entry)
-class AndroidTVRemoteOptionsFlowHandler(OptionsFlow):
+class AndroidTVRemoteOptionsFlowHandler(OptionsFlowWithConfigEntry):
"""Android TV Remote options flow."""
def __init__(self, config_entry: ConfigEntry) -> None:
"""Initialize options flow."""
- self._apps: dict[str, Any] = dict(config_entry.options.get(CONF_APPS, {}))
+ super().__init__(config_entry)
+ self._apps: dict[str, Any] = self.options.setdefault(CONF_APPS, {})
self._conf_app_id: str | None = None
@callback
diff --git a/homeassistant/components/anthropic/config_flow.py b/homeassistant/components/anthropic/config_flow.py
index fa43a3c4bcc..5ea167090c6 100644
--- a/homeassistant/components/anthropic/config_flow.py
+++ b/homeassistant/components/anthropic/config_flow.py
@@ -121,6 +121,7 @@ class AnthropicOptionsFlow(OptionsFlow):
def __init__(self, config_entry: ConfigEntry) -> None:
"""Initialize options flow."""
+ self.config_entry = config_entry
self.last_rendered_recommended = config_entry.options.get(
CONF_RECOMMENDED, False
)
diff --git a/homeassistant/components/assist_pipeline/audio_enhancer.py b/homeassistant/components/assist_pipeline/audio_enhancer.py
index 1fabc7790e7..ff2b122187a 100644
--- a/homeassistant/components/assist_pipeline/audio_enhancer.py
+++ b/homeassistant/components/assist_pipeline/audio_enhancer.py
@@ -22,8 +22,8 @@ class EnhancedAudioChunk:
timestamp_ms: int
"""Timestamp relative to start of audio stream (milliseconds)"""
- speech_probability: float | None
- """Probability that audio chunk contains speech (0-1), None if unknown"""
+ is_speech: bool | None
+ """True if audio chunk likely contains speech, False if not, None if unknown"""
class AudioEnhancer(ABC):
@@ -70,27 +70,27 @@ class MicroVadSpeexEnhancer(AudioEnhancer):
)
self.vad: MicroVad | None = None
+ self.threshold = 0.5
if self.is_vad_enabled:
self.vad = MicroVad()
- _LOGGER.debug("Initialized microVAD")
+ _LOGGER.debug("Initialized microVAD with threshold=%s", self.threshold)
def enhance_chunk(self, audio: bytes, timestamp_ms: int) -> EnhancedAudioChunk:
"""Enhance 10ms chunk of PCM audio @ 16Khz with 16-bit mono samples."""
- speech_probability: float | None = None
+ is_speech: bool | None = None
assert len(audio) == BYTES_PER_CHUNK
if self.vad is not None:
# Run VAD
- speech_probability = self.vad.Process10ms(audio)
+ speech_prob = self.vad.Process10ms(audio)
+ is_speech = speech_prob > self.threshold
if self.audio_processor is not None:
# Run noise suppression and auto gain
audio = self.audio_processor.Process10ms(audio).audio
return EnhancedAudioChunk(
- audio=audio,
- timestamp_ms=timestamp_ms,
- speech_probability=speech_probability,
+ audio=audio, timestamp_ms=timestamp_ms, is_speech=is_speech
)
diff --git a/homeassistant/components/assist_pipeline/pipeline.py b/homeassistant/components/assist_pipeline/pipeline.py
index a55e23ae051..a4255e37756 100644
--- a/homeassistant/components/assist_pipeline/pipeline.py
+++ b/homeassistant/components/assist_pipeline/pipeline.py
@@ -780,9 +780,7 @@ class PipelineRun:
# speaking the voice command.
audio_chunks_for_stt.extend(
EnhancedAudioChunk(
- audio=chunk_ts[0],
- timestamp_ms=chunk_ts[1],
- speech_probability=None,
+ audio=chunk_ts[0], timestamp_ms=chunk_ts[1], is_speech=False
)
for chunk_ts in result.queued_audio
)
@@ -829,7 +827,7 @@ class PipelineRun:
if wake_word_vad is not None:
chunk_seconds = (len(chunk.audio) // sample_width) / sample_rate
- if not wake_word_vad.process(chunk_seconds, chunk.speech_probability):
+ if not wake_word_vad.process(chunk_seconds, chunk.is_speech):
raise WakeWordTimeoutError(
code="wake-word-timeout", message="Wake word was not detected"
)
@@ -957,7 +955,7 @@ class PipelineRun:
if stt_vad is not None:
chunk_seconds = (len(chunk.audio) // sample_width) / sample_rate
- if not stt_vad.process(chunk_seconds, chunk.speech_probability):
+ if not stt_vad.process(chunk_seconds, chunk.is_speech):
# Silence detected at the end of voice command
self.process_event(
PipelineEvent(
@@ -1223,7 +1221,7 @@ class PipelineRun:
yield EnhancedAudioChunk(
audio=sub_chunk,
timestamp_ms=timestamp_ms,
- speech_probability=None, # no VAD
+ is_speech=None, # no VAD
)
timestamp_ms += MS_PER_CHUNK
diff --git a/homeassistant/components/assist_pipeline/vad.py b/homeassistant/components/assist_pipeline/vad.py
index deae5b9b7b3..4782d14dee4 100644
--- a/homeassistant/components/assist_pipeline/vad.py
+++ b/homeassistant/components/assist_pipeline/vad.py
@@ -75,7 +75,7 @@ class AudioBuffer:
class VoiceCommandSegmenter:
"""Segments an audio stream into voice commands."""
- speech_seconds: float = 0.1
+ speech_seconds: float = 0.3
"""Seconds of speech before voice command has started."""
command_seconds: float = 1.0
@@ -96,12 +96,6 @@ class VoiceCommandSegmenter:
timed_out: bool = False
"""True a timeout occurred during voice command."""
- before_command_speech_threshold: float = 0.2
- """Probability threshold for speech before voice command."""
-
- in_command_speech_threshold: float = 0.5
- """Probability threshold for speech during voice command."""
-
_speech_seconds_left: float = 0.0
"""Seconds left before considering voice command as started."""
@@ -130,7 +124,7 @@ class VoiceCommandSegmenter:
self._reset_seconds_left = self.reset_seconds
self.in_command = False
- def process(self, chunk_seconds: float, speech_probability: float | None) -> bool:
+ def process(self, chunk_seconds: float, is_speech: bool | None) -> bool:
"""Process samples using external VAD.
Returns False when command is done.
@@ -148,12 +142,7 @@ class VoiceCommandSegmenter:
self.timed_out = True
return False
- if speech_probability is None:
- speech_probability = 0.0
-
if not self.in_command:
- # Before command
- is_speech = speech_probability > self.before_command_speech_threshold
if is_speech:
self._reset_seconds_left = self.reset_seconds
self._speech_seconds_left -= chunk_seconds
@@ -171,29 +160,24 @@ class VoiceCommandSegmenter:
if self._reset_seconds_left <= 0:
self._speech_seconds_left = self.speech_seconds
self._reset_seconds_left = self.reset_seconds
+ elif not is_speech:
+ # Silence in command
+ self._reset_seconds_left = self.reset_seconds
+ self._silence_seconds_left -= chunk_seconds
+ self._command_seconds_left -= chunk_seconds
+ if (self._silence_seconds_left <= 0) and (self._command_seconds_left <= 0):
+ # Command finished successfully
+ self.reset()
+ _LOGGER.debug("Voice command finished")
+ return False
else:
- # In command
- is_speech = speech_probability > self.in_command_speech_threshold
- if not is_speech:
- # Silence in command
+ # Speech in command.
+ # Reset silence counter if enough speech.
+ self._reset_seconds_left -= chunk_seconds
+ self._command_seconds_left -= chunk_seconds
+ if self._reset_seconds_left <= 0:
+ self._silence_seconds_left = self.silence_seconds
self._reset_seconds_left = self.reset_seconds
- self._silence_seconds_left -= chunk_seconds
- self._command_seconds_left -= chunk_seconds
- if (self._silence_seconds_left <= 0) and (
- self._command_seconds_left <= 0
- ):
- # Command finished successfully
- self.reset()
- _LOGGER.debug("Voice command finished")
- return False
- else:
- # Speech in command.
- # Reset silence counter if enough speech.
- self._reset_seconds_left -= chunk_seconds
- self._command_seconds_left -= chunk_seconds
- if self._reset_seconds_left <= 0:
- self._silence_seconds_left = self.silence_seconds
- self._reset_seconds_left = self.reset_seconds
return True
@@ -242,9 +226,6 @@ class VoiceActivityTimeout:
reset_seconds: float = 0.5
"""Seconds of speech before resetting timeout."""
- speech_threshold: float = 0.5
- """Threshold for speech."""
-
_silence_seconds_left: float = 0.0
"""Seconds left before considering voice command as stopped."""
@@ -260,15 +241,12 @@ class VoiceActivityTimeout:
self._silence_seconds_left = self.silence_seconds
self._reset_seconds_left = self.reset_seconds
- def process(self, chunk_seconds: float, speech_probability: float | None) -> bool:
+ def process(self, chunk_seconds: float, is_speech: bool | None) -> bool:
"""Process samples using external VAD.
Returns False when timeout is reached.
"""
- if speech_probability is None:
- speech_probability = 0.0
-
- if speech_probability > self.speech_threshold:
+ if is_speech:
# Speech
self._reset_seconds_left -= chunk_seconds
if self._reset_seconds_left <= 0:
diff --git a/homeassistant/components/axis/config_flow.py b/homeassistant/components/axis/config_flow.py
index 592b1e2d41f..84d9880b7f8 100644
--- a/homeassistant/components/axis/config_flow.py
+++ b/homeassistant/components/axis/config_flow.py
@@ -18,7 +18,7 @@ from homeassistant.config_entries import (
ConfigEntry,
ConfigFlow,
ConfigFlowResult,
- OptionsFlow,
+ OptionsFlowWithConfigEntry,
)
from homeassistant.const import (
CONF_HOST,
@@ -59,11 +59,9 @@ class AxisFlowHandler(ConfigFlow, domain=AXIS_DOMAIN):
@staticmethod
@callback
- def async_get_options_flow(
- config_entry: ConfigEntry,
- ) -> AxisOptionsFlowHandler:
+ def async_get_options_flow(config_entry: ConfigEntry) -> AxisOptionsFlowHandler:
"""Get the options flow for this handler."""
- return AxisOptionsFlowHandler()
+ return AxisOptionsFlowHandler(config_entry)
def __init__(self) -> None:
"""Initialize the Axis config flow."""
@@ -266,7 +264,7 @@ class AxisFlowHandler(ConfigFlow, domain=AXIS_DOMAIN):
return await self.async_step_user()
-class AxisOptionsFlowHandler(OptionsFlow):
+class AxisOptionsFlowHandler(OptionsFlowWithConfigEntry):
"""Handle Axis device options."""
config_entry: AxisConfigEntry
@@ -284,7 +282,8 @@ class AxisOptionsFlowHandler(OptionsFlow):
) -> ConfigFlowResult:
"""Manage the Axis device stream options."""
if user_input is not None:
- return self.async_create_entry(data=self.config_entry.options | user_input)
+ self.options.update(user_input)
+ return self.async_create_entry(title="", data=self.options)
schema = {}
diff --git a/homeassistant/components/backup/__init__.py b/homeassistant/components/backup/__init__.py
index 907fda4c7f8..200cb4a3f65 100644
--- a/homeassistant/components/backup/__init__.py
+++ b/homeassistant/components/backup/__init__.py
@@ -32,9 +32,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
async def async_handle_create_service(call: ServiceCall) -> None:
"""Service handler for creating backups."""
- await backup_manager.async_create_backup(on_progress=None)
- if backup_task := backup_manager.backup_task:
- await backup_task
+ await backup_manager.async_create_backup()
hass.services.async_register(DOMAIN, "create", async_handle_create_service)
diff --git a/homeassistant/components/backup/const.py b/homeassistant/components/backup/const.py
index f613f7cc352..90faa33fc7f 100644
--- a/homeassistant/components/backup/const.py
+++ b/homeassistant/components/backup/const.py
@@ -17,7 +17,6 @@ LOGGER = getLogger(__package__)
EXCLUDE_FROM_BACKUP = [
"__pycache__/*",
".DS_Store",
- ".HA_RESTORE",
"*.db-shm",
"*.log.*",
"*.log",
diff --git a/homeassistant/components/backup/http.py b/homeassistant/components/backup/http.py
index 42693035bd3..4cc4e61c9e4 100644
--- a/homeassistant/components/backup/http.py
+++ b/homeassistant/components/backup/http.py
@@ -2,26 +2,23 @@
from __future__ import annotations
-import asyncio
from http import HTTPStatus
-from typing import cast
-from aiohttp import BodyPartReader
from aiohttp.hdrs import CONTENT_DISPOSITION
from aiohttp.web import FileResponse, Request, Response
-from homeassistant.components.http import KEY_HASS, HomeAssistantView, require_admin
+from homeassistant.components.http import KEY_HASS, HomeAssistantView
from homeassistant.core import HomeAssistant, callback
from homeassistant.util import slugify
-from .const import DATA_MANAGER
+from .const import DOMAIN
+from .manager import BaseBackupManager
@callback
def async_register_http_views(hass: HomeAssistant) -> None:
"""Register the http views."""
hass.http.register_view(DownloadBackupView)
- hass.http.register_view(UploadBackupView)
class DownloadBackupView(HomeAssistantView):
@@ -39,7 +36,7 @@ class DownloadBackupView(HomeAssistantView):
if not request["hass_user"].is_admin:
return Response(status=HTTPStatus.UNAUTHORIZED)
- manager = request.app[KEY_HASS].data[DATA_MANAGER]
+ manager: BaseBackupManager = request.app[KEY_HASS].data[DOMAIN]
backup = await manager.async_get_backup(slug=slug)
if backup is None or not backup.path.exists():
@@ -51,29 +48,3 @@ class DownloadBackupView(HomeAssistantView):
CONTENT_DISPOSITION: f"attachment; filename={slugify(backup.name)}.tar"
},
)
-
-
-class UploadBackupView(HomeAssistantView):
- """Generate backup view."""
-
- url = "/api/backup/upload"
- name = "api:backup:upload"
-
- @require_admin
- async def post(self, request: Request) -> Response:
- """Upload a backup file."""
- manager = request.app[KEY_HASS].data[DATA_MANAGER]
- reader = await request.multipart()
- contents = cast(BodyPartReader, await reader.next())
-
- try:
- await manager.async_receive_backup(contents=contents)
- except OSError as err:
- return Response(
- body=f"Can't write backup file {err}",
- status=HTTPStatus.INTERNAL_SERVER_ERROR,
- )
- except asyncio.CancelledError:
- return Response(status=HTTPStatus.INTERNAL_SERVER_ERROR)
-
- return Response(status=HTTPStatus.CREATED)
diff --git a/homeassistant/components/backup/manager.py b/homeassistant/components/backup/manager.py
index ddc0a1eac3f..701174e1b8d 100644
--- a/homeassistant/components/backup/manager.py
+++ b/homeassistant/components/backup/manager.py
@@ -4,24 +4,18 @@ from __future__ import annotations
import abc
import asyncio
-from collections.abc import Callable
from dataclasses import asdict, dataclass
import hashlib
import io
import json
from pathlib import Path
-from queue import SimpleQueue
-import shutil
import tarfile
from tarfile import TarError
-from tempfile import TemporaryDirectory
import time
from typing import Any, Protocol, cast
-import aiohttp
from securetar import SecureTarFile, atomic_contents_add
-from homeassistant.backup_restore import RESTORE_BACKUP_FILE
from homeassistant.const import __version__ as HAVERSION
from homeassistant.core import HomeAssistant, callback
from homeassistant.exceptions import HomeAssistantError
@@ -35,13 +29,6 @@ from .const import DOMAIN, EXCLUDE_FROM_BACKUP, LOGGER
BUF_SIZE = 2**20 * 4 # 4MB
-@dataclass(slots=True)
-class NewBackup:
- """New backup class."""
-
- slug: str
-
-
@dataclass(slots=True)
class Backup:
"""Backup class."""
@@ -57,15 +44,6 @@ class Backup:
return {**asdict(self), "path": self.path.as_posix()}
-@dataclass(slots=True)
-class BackupProgress:
- """Backup progress class."""
-
- done: bool
- stage: str | None
- success: bool | None
-
-
class BackupPlatformProtocol(Protocol):
"""Define the format that backup platforms can have."""
@@ -82,7 +60,7 @@ class BaseBackupManager(abc.ABC):
def __init__(self, hass: HomeAssistant) -> None:
"""Initialize the backup manager."""
self.hass = hass
- self.backup_task: asyncio.Task | None = None
+ self.backing_up = False
self.backups: dict[str, Backup] = {}
self.loaded_platforms = False
self.platforms: dict[str, BackupPlatformProtocol] = {}
@@ -146,16 +124,7 @@ class BaseBackupManager(abc.ABC):
self.loaded_platforms = True
@abc.abstractmethod
- async def async_restore_backup(self, slug: str, **kwargs: Any) -> None:
- """Restore a backup."""
-
- @abc.abstractmethod
- async def async_create_backup(
- self,
- *,
- on_progress: Callable[[BackupProgress], None] | None,
- **kwargs: Any,
- ) -> NewBackup:
+ async def async_create_backup(self, **kwargs: Any) -> Backup:
"""Generate a backup."""
@abc.abstractmethod
@@ -173,15 +142,6 @@ class BaseBackupManager(abc.ABC):
async def async_remove_backup(self, *, slug: str, **kwargs: Any) -> None:
"""Remove a backup."""
- @abc.abstractmethod
- async def async_receive_backup(
- self,
- *,
- contents: aiohttp.BodyPartReader,
- **kwargs: Any,
- ) -> None:
- """Receive and store a backup file from upload."""
-
class BackupManager(BaseBackupManager):
"""Backup manager for the Backup integration."""
@@ -257,93 +217,17 @@ class BackupManager(BaseBackupManager):
LOGGER.debug("Removed backup located at %s", backup.path)
self.backups.pop(slug)
- async def async_receive_backup(
- self,
- *,
- contents: aiohttp.BodyPartReader,
- **kwargs: Any,
- ) -> None:
- """Receive and store a backup file from upload."""
- queue: SimpleQueue[tuple[bytes, asyncio.Future[None] | None] | None] = (
- SimpleQueue()
- )
- temp_dir_handler = await self.hass.async_add_executor_job(TemporaryDirectory)
- target_temp_file = Path(
- temp_dir_handler.name, contents.filename or "backup.tar"
- )
-
- def _sync_queue_consumer() -> None:
- with target_temp_file.open("wb") as file_handle:
- while True:
- if (_chunk_future := queue.get()) is None:
- break
- _chunk, _future = _chunk_future
- if _future is not None:
- self.hass.loop.call_soon_threadsafe(_future.set_result, None)
- file_handle.write(_chunk)
-
- fut: asyncio.Future[None] | None = None
- try:
- fut = self.hass.async_add_executor_job(_sync_queue_consumer)
- megabytes_sending = 0
- while chunk := await contents.read_chunk(BUF_SIZE):
- megabytes_sending += 1
- if megabytes_sending % 5 != 0:
- queue.put_nowait((chunk, None))
- continue
-
- chunk_future = self.hass.loop.create_future()
- queue.put_nowait((chunk, chunk_future))
- await asyncio.wait(
- (fut, chunk_future),
- return_when=asyncio.FIRST_COMPLETED,
- )
- if fut.done():
- # The executor job failed
- break
-
- queue.put_nowait(None) # terminate queue consumer
- finally:
- if fut is not None:
- await fut
-
- def _move_and_cleanup() -> None:
- shutil.move(target_temp_file, self.backup_dir / target_temp_file.name)
- temp_dir_handler.cleanup()
-
- await self.hass.async_add_executor_job(_move_and_cleanup)
- await self.load_backups()
-
- async def async_create_backup(
- self,
- *,
- on_progress: Callable[[BackupProgress], None] | None,
- **kwargs: Any,
- ) -> NewBackup:
+ async def async_create_backup(self, **kwargs: Any) -> Backup:
"""Generate a backup."""
- if self.backup_task:
+ if self.backing_up:
raise HomeAssistantError("Backup already in progress")
- backup_name = f"Core {HAVERSION}"
- date_str = dt_util.now().isoformat()
- slug = _generate_slug(date_str, backup_name)
- self.backup_task = self.hass.async_create_task(
- self._async_create_backup(backup_name, date_str, slug, on_progress),
- name="backup_manager_create_backup",
- eager_start=False, # To ensure the task is not started before we return
- )
- return NewBackup(slug=slug)
- async def _async_create_backup(
- self,
- backup_name: str,
- date_str: str,
- slug: str,
- on_progress: Callable[[BackupProgress], None] | None,
- ) -> Backup:
- """Generate a backup."""
- success = False
try:
+ self.backing_up = True
await self.async_pre_backup_actions()
+ backup_name = f"Core {HAVERSION}"
+ date_str = dt_util.now().isoformat()
+ slug = _generate_slug(date_str, backup_name)
backup_data = {
"slug": slug,
@@ -370,12 +254,9 @@ class BackupManager(BaseBackupManager):
if self.loaded_backups:
self.backups[slug] = backup
LOGGER.debug("Generated new backup with slug %s", slug)
- success = True
return backup
finally:
- if on_progress:
- on_progress(BackupProgress(done=True, stage=None, success=success))
- self.backup_task = None
+ self.backing_up = False
await self.async_post_backup_actions()
def _mkdir_and_generate_backup_contents(
@@ -410,25 +291,6 @@ class BackupManager(BaseBackupManager):
return tar_file_path.stat().st_size
- async def async_restore_backup(self, slug: str, **kwargs: Any) -> None:
- """Restore a backup.
-
- This will write the restore information to .HA_RESTORE which
- will be handled during startup by the restore_backup module.
- """
- if (backup := await self.async_get_backup(slug=slug)) is None:
- raise HomeAssistantError(f"Backup {slug} not found")
-
- def _write_restore_file() -> None:
- """Write the restore file."""
- Path(self.hass.config.path(RESTORE_BACKUP_FILE)).write_text(
- json.dumps({"path": backup.path.as_posix()}),
- encoding="utf-8",
- )
-
- await self.hass.async_add_executor_job(_write_restore_file)
- await self.hass.services.async_call("homeassistant", "restart", {})
-
def _generate_slug(date: str, name: str) -> str:
"""Generate a backup slug."""
diff --git a/homeassistant/components/backup/websocket.py b/homeassistant/components/backup/websocket.py
index a7c61b7c66c..7daaaad1ec7 100644
--- a/homeassistant/components/backup/websocket.py
+++ b/homeassistant/components/backup/websocket.py
@@ -8,7 +8,6 @@ from homeassistant.components import websocket_api
from homeassistant.core import HomeAssistant, callback
from .const import DATA_MANAGER, LOGGER
-from .manager import BackupProgress
@callback
@@ -23,7 +22,6 @@ def async_register_websocket_handlers(hass: HomeAssistant, with_hassio: bool) ->
websocket_api.async_register_command(hass, handle_info)
websocket_api.async_register_command(hass, handle_create)
websocket_api.async_register_command(hass, handle_remove)
- websocket_api.async_register_command(hass, handle_restore)
@websocket_api.require_admin
@@ -41,7 +39,7 @@ async def handle_info(
msg["id"],
{
"backups": list(backups.values()),
- "backing_up": manager.backup_task is not None,
+ "backing_up": manager.backing_up,
},
)
@@ -87,24 +85,6 @@ async def handle_remove(
connection.send_result(msg["id"])
-@websocket_api.require_admin
-@websocket_api.websocket_command(
- {
- vol.Required("type"): "backup/restore",
- vol.Required("slug"): str,
- }
-)
-@websocket_api.async_response
-async def handle_restore(
- hass: HomeAssistant,
- connection: websocket_api.ActiveConnection,
- msg: dict[str, Any],
-) -> None:
- """Restore a backup."""
- await hass.data[DATA_MANAGER].async_restore_backup(msg["slug"])
- connection.send_result(msg["id"])
-
-
@websocket_api.require_admin
@websocket_api.websocket_command({vol.Required("type"): "backup/generate"})
@websocket_api.async_response
@@ -114,11 +94,7 @@ async def handle_create(
msg: dict[str, Any],
) -> None:
"""Generate a backup."""
-
- def on_progress(progress: BackupProgress) -> None:
- connection.send_message(websocket_api.event_message(msg["id"], progress))
-
- backup = await hass.data[DATA_MANAGER].async_create_backup(on_progress=on_progress)
+ backup = await hass.data[DATA_MANAGER].async_create_backup()
connection.send_result(msg["id"], backup)
@@ -132,6 +108,7 @@ async def handle_backup_start(
) -> None:
"""Backup start notification."""
manager = hass.data[DATA_MANAGER]
+ manager.backing_up = True
LOGGER.debug("Backup start notification")
try:
@@ -153,6 +130,7 @@ async def handle_backup_end(
) -> None:
"""Backup end notification."""
manager = hass.data[DATA_MANAGER]
+ manager.backing_up = False
LOGGER.debug("Backup end notification")
try:
diff --git a/homeassistant/components/bang_olufsen/const.py b/homeassistant/components/bang_olufsen/const.py
index 209311d3e8a..1e06f153cdb 100644
--- a/homeassistant/components/bang_olufsen/const.py
+++ b/homeassistant/components/bang_olufsen/const.py
@@ -17,9 +17,62 @@ from homeassistant.components.media_player import (
class BangOlufsenSource:
"""Class used for associating device source ids with friendly names. May not include all sources."""
- LINE_IN: Final[Source] = Source(name="Line-In", id="lineIn")
- SPDIF: Final[Source] = Source(name="Optical", id="spdif")
- URI_STREAMER: Final[Source] = Source(name="Audio Streamer", id="uriStreamer")
+ URI_STREAMER: Final[Source] = Source(
+ name="Audio Streamer",
+ id="uriStreamer",
+ is_seekable=False,
+ is_enabled=True,
+ is_playable=True,
+ )
+ BLUETOOTH: Final[Source] = Source(
+ name="Bluetooth",
+ id="bluetooth",
+ is_seekable=False,
+ is_enabled=True,
+ is_playable=True,
+ )
+ CHROMECAST: Final[Source] = Source(
+ name="Chromecast built-in",
+ id="chromeCast",
+ is_seekable=False,
+ is_enabled=True,
+ is_playable=True,
+ )
+ LINE_IN: Final[Source] = Source(
+ name="Line-In",
+ id="lineIn",
+ is_seekable=False,
+ is_enabled=True,
+ is_playable=True,
+ )
+ SPDIF: Final[Source] = Source(
+ name="Optical",
+ id="spdif",
+ is_seekable=False,
+ is_enabled=True,
+ is_playable=True,
+ )
+ NET_RADIO: Final[Source] = Source(
+ name="B&O Radio",
+ id="netRadio",
+ is_seekable=False,
+ is_enabled=True,
+ is_playable=True,
+ )
+ DEEZER: Final[Source] = Source(
+ name="Deezer",
+ id="deezer",
+ is_seekable=True,
+ is_enabled=True,
+ is_playable=True,
+ )
+ TIDAL: Final[Source] = Source(
+ name="Tidal",
+ id="tidal",
+ is_seekable=True,
+ is_enabled=True,
+ is_playable=True,
+ )
BANG_OLUFSEN_STATES: dict[str, MediaPlayerState] = {
diff --git a/homeassistant/components/bang_olufsen/icons.json b/homeassistant/components/bang_olufsen/icons.json
deleted file mode 100644
index fec0bf20937..00000000000
--- a/homeassistant/components/bang_olufsen/icons.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "services": {
- "beolink_join": { "service": "mdi:location-enter" },
- "beolink_expand": { "service": "mdi:location-enter" },
- "beolink_unexpand": { "service": "mdi:location-exit" },
- "beolink_leave": { "service": "mdi:close-circle-outline" },
- "beolink_allstandby": { "service": "mdi:close-circle-multiple-outline" }
- }
-}
diff --git a/homeassistant/components/bang_olufsen/media_player.py b/homeassistant/components/bang_olufsen/media_player.py
index 56aa66d32e8..e8108ee2cf7 100644
--- a/homeassistant/components/bang_olufsen/media_player.py
+++ b/homeassistant/components/bang_olufsen/media_player.py
@@ -11,7 +11,7 @@ from typing import TYPE_CHECKING, Any, cast
from aiohttp import ClientConnectorError
from mozart_api import __version__ as MOZART_API_VERSION
-from mozart_api.exceptions import ApiException, NotFoundException
+from mozart_api.exceptions import ApiException
from mozart_api.models import (
Action,
Art,
@@ -38,7 +38,6 @@ from mozart_api.models import (
VolumeState,
)
from mozart_api.mozart_client import MozartClient, get_highest_resolution_artwork
-import voluptuous as vol
from homeassistant.components import media_source
from homeassistant.components.media_player import (
@@ -56,17 +55,10 @@ from homeassistant.config_entries import ConfigEntry
from homeassistant.const import CONF_MODEL, Platform
from homeassistant.core import HomeAssistant, callback
from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
-from homeassistant.helpers import (
- config_validation as cv,
- device_registry as dr,
- entity_registry as er,
-)
+from homeassistant.helpers import entity_registry as er
from homeassistant.helpers.device_registry import DeviceInfo
from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import (
- AddEntitiesCallback,
- async_get_current_platform,
-)
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
from homeassistant.util.dt import utcnow
from . import BangOlufsenConfigEntry
@@ -124,58 +116,6 @@ async def async_setup_entry(
]
)
- # Register actions.
- platform = async_get_current_platform()
-
- jid_regex = vol.Match(
- r"(^\d{4})[.](\d{7})[.](\d{8})(@products\.bang-olufsen\.com)$"
- )
-
- platform.async_register_entity_service(
- name="beolink_join",
- schema={vol.Optional("beolink_jid"): jid_regex},
- func="async_beolink_join",
- )
-
- platform.async_register_entity_service(
- name="beolink_expand",
- schema={
- vol.Exclusive("all_discovered", "devices", ""): cv.boolean,
- vol.Exclusive(
- "beolink_jids",
- "devices",
- "Define either specific Beolink JIDs or all discovered",
- ): vol.All(
- cv.ensure_list,
- [jid_regex],
- ),
- },
- func="async_beolink_expand",
- )
-
- platform.async_register_entity_service(
- name="beolink_unexpand",
- schema={
- vol.Required("beolink_jids"): vol.All(
- cv.ensure_list,
- [jid_regex],
- ),
- },
- func="async_beolink_unexpand",
- )
-
- platform.async_register_entity_service(
- name="beolink_leave",
- schema=None,
- func="async_beolink_leave",
- )
-
- platform.async_register_entity_service(
- name="beolink_allstandby",
- schema=None,
- func="async_beolink_allstandby",
- )
-
class BangOlufsenMediaPlayer(BangOlufsenEntity, MediaPlayerEntity):
"""Representation of a media player."""
@@ -216,8 +156,6 @@ class BangOlufsenMediaPlayer(BangOlufsenEntity, MediaPlayerEntity):
# Beolink compatible sources
self._beolink_sources: dict[str, bool] = {}
self._remote_leader: BeolinkLeader | None = None
- # Extra state attributes for showing Beolink: peer(s), listener(s), leader and self
- self._beolink_attributes: dict[str, dict[str, dict[str, str]]] = {}
async def async_added_to_hass(self) -> None:
"""Turn on the dispatchers."""
@@ -227,7 +165,6 @@ class BangOlufsenMediaPlayer(BangOlufsenEntity, MediaPlayerEntity):
CONNECTION_STATUS: self._async_update_connection_state,
WebsocketNotification.ACTIVE_LISTENING_MODE: self._async_update_sound_modes,
WebsocketNotification.BEOLINK: self._async_update_beolink,
- WebsocketNotification.CONFIGURATION: self._async_update_name_and_beolink,
WebsocketNotification.PLAYBACK_ERROR: self._async_update_playback_error,
WebsocketNotification.PLAYBACK_METADATA: self._async_update_playback_metadata_and_beolink,
WebsocketNotification.PLAYBACK_PROGRESS: self._async_update_playback_progress,
@@ -293,9 +230,6 @@ class BangOlufsenMediaPlayer(BangOlufsenEntity, MediaPlayerEntity):
await self._async_update_sound_modes()
- # Update beolink attributes and device name.
- await self._async_update_name_and_beolink()
-
async def async_update(self) -> None:
"""Update queue settings."""
# The WebSocket event listener is the main handler for connection state.
@@ -438,44 +372,9 @@ class BangOlufsenMediaPlayer(BangOlufsenEntity, MediaPlayerEntity):
self.async_write_ha_state()
- async def _async_update_name_and_beolink(self) -> None:
- """Update the device friendly name."""
- beolink_self = await self._client.get_beolink_self()
-
- # Update device name
- device_registry = dr.async_get(self.hass)
- assert self.device_entry is not None
-
- device_registry.async_update_device(
- device_id=self.device_entry.id,
- name=beolink_self.friendly_name,
- )
-
- await self._async_update_beolink()
-
async def _async_update_beolink(self) -> None:
"""Update the current Beolink leader, listeners, peers and self."""
- self._beolink_attributes = {}
-
- assert self.device_entry is not None
- assert self.device_entry.name is not None
-
- # Add Beolink self
- self._beolink_attributes = {
- "beolink": {"self": {self.device_entry.name: self._beolink_jid}}
- }
-
- # Add Beolink peers
- peers = await self._client.get_beolink_peers()
-
- if len(peers) > 0:
- self._beolink_attributes["beolink"]["peers"] = {}
- for peer in peers:
- self._beolink_attributes["beolink"]["peers"][peer.friendly_name] = (
- peer.jid
- )
-
# Add Beolink listeners / leader
self._remote_leader = self._playback_metadata.remote_leader
@@ -495,14 +394,9 @@ class BangOlufsenMediaPlayer(BangOlufsenEntity, MediaPlayerEntity):
# Add self
group_members.append(self.entity_id)
- self._beolink_attributes["beolink"]["leader"] = {
- self._remote_leader.friendly_name: self._remote_leader.jid,
- }
-
# If not listener, check if leader.
else:
beolink_listeners = await self._client.get_beolink_listeners()
- beolink_listeners_attribute = {}
# Check if the device is a leader.
if len(beolink_listeners) > 0:
@@ -523,18 +417,6 @@ class BangOlufsenMediaPlayer(BangOlufsenEntity, MediaPlayerEntity):
for beolink_listener in beolink_listeners
]
)
- # Update Beolink attributes
- for beolink_listener in beolink_listeners:
- for peer in peers:
- if peer.jid == beolink_listener.jid:
- # Get the friendly names for the listeners from the peers
- beolink_listeners_attribute[peer.friendly_name] = (
- beolink_listener.jid
- )
- break
- self._beolink_attributes["beolink"]["listeners"] = (
- beolink_listeners_attribute
- )
self._attr_group_members = group_members
@@ -688,19 +570,38 @@ class BangOlufsenMediaPlayer(BangOlufsenEntity, MediaPlayerEntity):
@property
def source(self) -> str | None:
"""Return the current audio source."""
+
+ # Try to fix some of the source_change chromecast weirdness.
+ if hasattr(self._playback_metadata, "title"):
+ # source_change is chromecast but line in is selected.
+ if self._playback_metadata.title == BangOlufsenSource.LINE_IN.name:
+ return BangOlufsenSource.LINE_IN.name
+
+ # source_change is chromecast but bluetooth is selected.
+ if self._playback_metadata.title == BangOlufsenSource.BLUETOOTH.name:
+ return BangOlufsenSource.BLUETOOTH.name
+
+ # source_change is line in, bluetooth or optical but stale metadata is sent through the WebSocket,
+ # And the source has not changed.
+ if self._source_change.id in (
+ BangOlufsenSource.BLUETOOTH.id,
+ BangOlufsenSource.LINE_IN.id,
+ BangOlufsenSource.SPDIF.id,
+ ):
+ return BangOlufsenSource.CHROMECAST.name
+
+ # source_change is chromecast and there is metadata but no artwork. Bluetooth does support metadata but not artwork
+ # So i assume that it is bluetooth and not chromecast
+ if (
+ hasattr(self._playback_metadata, "art")
+ and self._playback_metadata.art is not None
+ and len(self._playback_metadata.art) == 0
+ and self._source_change.id == BangOlufsenSource.CHROMECAST.id
+ ):
+ return BangOlufsenSource.BLUETOOTH.name
+
return self._source_change.name
- @property
- def extra_state_attributes(self) -> dict[str, Any] | None:
- """Return information that is not returned anywhere else."""
- attributes: dict[str, Any] = {}
-
- # Add Beolink attributes
- if self._beolink_attributes:
- attributes.update(self._beolink_attributes)
-
- return attributes
-
async def async_turn_off(self) -> None:
"""Set the device to "networkStandby"."""
await self._client.post_standby()
@@ -972,30 +873,23 @@ class BangOlufsenMediaPlayer(BangOlufsenEntity, MediaPlayerEntity):
# Beolink compatible B&O device.
# Repeated presses / calls will cycle between compatible playing devices.
if len(group_members) == 0:
- await self.async_beolink_join()
+ await self._async_beolink_join()
return
# Get JID for each group member
jids = [self._get_beolink_jid(group_member) for group_member in group_members]
- await self.async_beolink_expand(jids)
+ await self._async_beolink_expand(jids)
async def async_unjoin_player(self) -> None:
"""Unjoin Beolink session. End session if leader."""
- await self.async_beolink_leave()
+ await self._async_beolink_leave()
- # Custom actions:
- async def async_beolink_join(self, beolink_jid: str | None = None) -> None:
+ async def _async_beolink_join(self) -> None:
"""Join a Beolink multi-room experience."""
- if beolink_jid is None:
- await self._client.join_latest_beolink_experience()
- else:
- await self._client.join_beolink_peer(jid=beolink_jid)
+ await self._client.join_latest_beolink_experience()
- async def async_beolink_expand(
- self, beolink_jids: list[str] | None = None, all_discovered: bool = False
- ) -> None:
+ async def _async_beolink_expand(self, beolink_jids: list[str]) -> None:
"""Expand a Beolink multi-room experience with a device or devices."""
-
# Ensure that the current source is expandable
if not self._beolink_sources[cast(str, self._source_change.id)]:
raise ServiceValidationError(
@@ -1007,37 +901,10 @@ class BangOlufsenMediaPlayer(BangOlufsenEntity, MediaPlayerEntity):
},
)
- # Expand to all discovered devices
- if all_discovered:
- peers = await self._client.get_beolink_peers()
-
- for peer in peers:
- try:
- await self._client.post_beolink_expand(jid=peer.jid)
- except NotFoundException:
- _LOGGER.warning("Unable to expand to %s", peer.jid)
-
# Try to expand to all defined devices
- elif beolink_jids:
- for beolink_jid in beolink_jids:
- try:
- await self._client.post_beolink_expand(jid=beolink_jid)
- except NotFoundException:
- _LOGGER.warning(
- "Unable to expand to %s. Is the device available on the network?",
- beolink_jid,
- )
-
- async def async_beolink_unexpand(self, beolink_jids: list[str]) -> None:
- """Unexpand a Beolink multi-room experience with a device or devices."""
- # Unexpand all defined devices
for beolink_jid in beolink_jids:
- await self._client.post_beolink_unexpand(jid=beolink_jid)
+ await self._client.post_beolink_expand(jid=beolink_jid)
- async def async_beolink_leave(self) -> None:
+ async def _async_beolink_leave(self) -> None:
"""Leave the current Beolink experience."""
await self._client.post_beolink_leave()
-
- async def async_beolink_allstandby(self) -> None:
- """Set all connected Beolink devices to standby."""
- await self._client.post_beolink_allstandby()
diff --git a/homeassistant/components/bang_olufsen/services.yaml b/homeassistant/components/bang_olufsen/services.yaml
deleted file mode 100644
index e5d61420dff..00000000000
--- a/homeassistant/components/bang_olufsen/services.yaml
+++ /dev/null
@@ -1,79 +0,0 @@
-beolink_allstandby:
- target:
- entity:
- integration: bang_olufsen
- domain: media_player
- device:
- integration: bang_olufsen
-
-beolink_expand:
- target:
- entity:
- integration: bang_olufsen
- domain: media_player
- device:
- integration: bang_olufsen
- fields:
- all_discovered:
- required: false
- example: false
- selector:
- boolean:
- jid_options:
- collapsed: false
- fields:
- beolink_jids:
- required: false
- example: >-
- [
- 1111.2222222.33333333@products.bang-olufsen.com,
- 4444.5555555.66666666@products.bang-olufsen.com
- ]
- selector:
- object:
-
-beolink_join:
- target:
- entity:
- integration: bang_olufsen
- domain: media_player
- device:
- integration: bang_olufsen
- fields:
- jid_options:
- collapsed: false
- fields:
- beolink_jid:
- required: false
- example: 1111.2222222.33333333@products.bang-olufsen.com
- selector:
- text:
-
-beolink_leave:
- target:
- entity:
- integration: bang_olufsen
- domain: media_player
- device:
- integration: bang_olufsen
-
-beolink_unexpand:
- target:
- entity:
- integration: bang_olufsen
- domain: media_player
- device:
- integration: bang_olufsen
- fields:
- jid_options:
- collapsed: false
- fields:
- beolink_jids:
- required: true
- example: >-
- [
- 1111.2222222.33333333@products.bang-olufsen.com,
- 4444.5555555.66666666@products.bang-olufsen.com
- ]
- selector:
- object:
diff --git a/homeassistant/components/bang_olufsen/strings.json b/homeassistant/components/bang_olufsen/strings.json
index aef6f953524..3e336f7d2d8 100644
--- a/homeassistant/components/bang_olufsen/strings.json
+++ b/homeassistant/components/bang_olufsen/strings.json
@@ -1,8 +1,4 @@
{
- "common": {
- "jid_options_name": "JID options",
- "jid_options_description": "Advanced grouping options, where devices' unique Beolink IDs (Called JIDs) are used directly. JIDs can be found in the state attributes of the media player entity."
- },
"config": {
"error": {
"api_exception": "[%key:common::config_flow::error::cannot_connect%]",
@@ -29,68 +25,6 @@
}
}
},
- "services": {
- "beolink_allstandby": {
- "name": "Beolink all standby",
- "description": "Set all Connected Beolink devices to standby."
- },
- "beolink_expand": {
- "name": "Beolink expand",
- "description": "Expand current Beolink experience.",
- "fields": {
- "all_discovered": {
- "name": "All discovered",
- "description": "Expand Beolink experience to all discovered devices."
- },
- "beolink_jids": {
- "name": "Beolink JIDs",
- "description": "Specify which Beolink JIDs will join current Beolink experience."
- }
- },
- "sections": {
- "jid_options": {
- "name": "[%key:component::bang_olufsen::common::jid_options_name%]",
- "description": "[%key:component::bang_olufsen::common::jid_options_description%]"
- }
- }
- },
- "beolink_join": {
- "name": "Beolink join",
- "description": "Join a Beolink experience.",
- "fields": {
- "beolink_jid": {
- "name": "Beolink JID",
- "description": "Manually specify Beolink JID to join."
- }
- },
- "sections": {
- "jid_options": {
- "name": "[%key:component::bang_olufsen::common::jid_options_name%]",
- "description": "[%key:component::bang_olufsen::common::jid_options_description%]"
- }
- }
- },
- "beolink_leave": {
- "name": "Beolink leave",
- "description": "Leave a Beolink experience."
- },
- "beolink_unexpand": {
- "name": "Beolink unexpand",
- "description": "Unexpand from current Beolink experience.",
- "fields": {
- "beolink_jids": {
- "name": "Beolink JIDs",
- "description": "Specify which Beolink JIDs will leave from current Beolink experience."
- }
- },
- "sections": {
- "jid_options": {
- "name": "[%key:component::bang_olufsen::common::jid_options_name%]",
- "description": "[%key:component::bang_olufsen::common::jid_options_description%]"
- }
- }
- }
- },
"exceptions": {
"m3u_invalid_format": {
"message": "Media sources with the .m3u extension are not supported."
diff --git a/homeassistant/components/bang_olufsen/websocket.py b/homeassistant/components/bang_olufsen/websocket.py
index 913f7cb3241..94b84189ccc 100644
--- a/homeassistant/components/bang_olufsen/websocket.py
+++ b/homeassistant/components/bang_olufsen/websocket.py
@@ -120,11 +120,6 @@ class BangOlufsenWebsocket(BangOlufsenBase):
self.hass,
f"{self._unique_id}_{WebsocketNotification.BEOLINK}",
)
- elif notification_type is WebsocketNotification.CONFIGURATION:
- async_dispatcher_send(
- self.hass,
- f"{self._unique_id}_{WebsocketNotification.CONFIGURATION}",
- )
elif notification_type is WebsocketNotification.REMOTE_MENU_CHANGED:
async_dispatcher_send(
self.hass,
diff --git a/homeassistant/components/blink/sensor.py b/homeassistant/components/blink/sensor.py
index e0b5989cc80..f20f8188b42 100644
--- a/homeassistant/components/blink/sensor.py
+++ b/homeassistant/components/blink/sensor.py
@@ -10,11 +10,7 @@ from homeassistant.components.sensor import (
SensorEntityDescription,
SensorStateClass,
)
-from homeassistant.const import (
- SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
- EntityCategory,
- UnitOfTemperature,
-)
+from homeassistant.const import EntityCategory, UnitOfTemperature
from homeassistant.core import HomeAssistant, callback
from homeassistant.helpers.device_registry import DeviceInfo
from homeassistant.helpers.entity_platform import AddEntitiesCallback
@@ -36,8 +32,6 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
SensorEntityDescription(
key=TYPE_WIFI_STRENGTH,
translation_key="wifi_strength",
- native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
- device_class=SensorDeviceClass.SIGNAL_STRENGTH,
entity_category=EntityCategory.DIAGNOSTIC,
state_class=SensorStateClass.MEASUREMENT,
),
diff --git a/homeassistant/components/bluesound/media_player.py b/homeassistant/components/bluesound/media_player.py
index 97985a74300..1d46af2cc4b 100644
--- a/homeassistant/components/bluesound/media_player.py
+++ b/homeassistant/components/bluesound/media_player.py
@@ -770,7 +770,7 @@ class BluesoundPlayer(MediaPlayerEntity):
async def async_set_volume_level(self, volume: float) -> None:
"""Send volume_up command to media player."""
- volume = int(round(volume * 100))
+ volume = int(volume * 100)
volume = min(100, volume)
volume = max(0, volume)
diff --git a/homeassistant/components/bmw_connected_drive/config_flow.py b/homeassistant/components/bmw_connected_drive/config_flow.py
index 409bfdca6f1..6803bbac600 100644
--- a/homeassistant/components/bmw_connected_drive/config_flow.py
+++ b/homeassistant/components/bmw_connected_drive/config_flow.py
@@ -21,7 +21,7 @@ from homeassistant.config_entries import (
ConfigEntry,
ConfigFlow,
ConfigFlowResult,
- OptionsFlow,
+ OptionsFlowWithConfigEntry,
)
from homeassistant.const import CONF_PASSWORD, CONF_REGION, CONF_SOURCE, CONF_USERNAME
from homeassistant.core import HomeAssistant, callback
@@ -153,10 +153,10 @@ class BMWConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> BMWOptionsFlow:
"""Return a MyBMW option flow."""
- return BMWOptionsFlow()
+ return BMWOptionsFlow(config_entry)
-class BMWOptionsFlow(OptionsFlow):
+class BMWOptionsFlow(OptionsFlowWithConfigEntry):
"""Handle a option flow for MyBMW."""
async def async_step_init(
diff --git a/homeassistant/components/bring/icons.json b/homeassistant/components/bring/icons.json
index c670ef87700..74c3b2e393b 100644
--- a/homeassistant/components/bring/icons.json
+++ b/homeassistant/components/bring/icons.json
@@ -16,8 +16,7 @@
"list_access": {
"default": "mdi:account-lock",
"state": {
- "shared": "mdi:account-group",
- "invitation": "mdi:account-multiple-plus"
+ "shared": "mdi:account-group"
}
}
},
diff --git a/homeassistant/components/bring/sensor.py b/homeassistant/components/bring/sensor.py
index 746ed397e1b..57ceb099535 100644
--- a/homeassistant/components/bring/sensor.py
+++ b/homeassistant/components/bring/sensor.py
@@ -79,7 +79,7 @@ SENSOR_DESCRIPTIONS: tuple[BringSensorEntityDescription, ...] = (
translation_key=BringSensor.LIST_ACCESS,
value_fn=lambda lst, _: lst["status"].lower(),
entity_category=EntityCategory.DIAGNOSTIC,
- options=["registered", "shared", "invitation"],
+ options=["registered", "shared"],
device_class=SensorDeviceClass.ENUM,
),
)
diff --git a/homeassistant/components/bring/strings.json b/homeassistant/components/bring/strings.json
index 9a93881b5d2..61121cdca60 100644
--- a/homeassistant/components/bring/strings.json
+++ b/homeassistant/components/bring/strings.json
@@ -66,8 +66,7 @@
"name": "List access",
"state": {
"registered": "Private",
- "shared": "Shared",
- "invitation": "Invitation pending"
+ "shared": "Shared"
}
}
}
diff --git a/homeassistant/components/bsblan/manifest.json b/homeassistant/components/bsblan/manifest.json
index aa9c03abf4a..3f100aef04f 100644
--- a/homeassistant/components/bsblan/manifest.json
+++ b/homeassistant/components/bsblan/manifest.json
@@ -7,5 +7,5 @@
"integration_type": "device",
"iot_class": "local_polling",
"loggers": ["bsblan"],
- "requirements": ["python-bsblan==1.2.1"]
+ "requirements": ["python-bsblan==0.6.4"]
}
diff --git a/homeassistant/components/caldav/calendar.py b/homeassistant/components/caldav/calendar.py
index fb53947a723..d9ebe8e73fd 100644
--- a/homeassistant/components/caldav/calendar.py
+++ b/homeassistant/components/caldav/calendar.py
@@ -109,7 +109,6 @@ async def async_setup_platform(
entity_id = async_generate_entity_id(ENTITY_ID_FORMAT, device_id, hass=hass)
coordinator = CalDavUpdateCoordinator(
hass,
- None,
calendar=calendar,
days=days,
include_all_day=True,
@@ -127,7 +126,6 @@ async def async_setup_platform(
entity_id = async_generate_entity_id(ENTITY_ID_FORMAT, device_id, hass=hass)
coordinator = CalDavUpdateCoordinator(
hass,
- None,
calendar=calendar,
days=days,
include_all_day=False,
@@ -154,7 +152,6 @@ async def async_setup_entry(
async_generate_entity_id(ENTITY_ID_FORMAT, calendar.name, hass=hass),
CalDavUpdateCoordinator(
hass,
- entry,
calendar=calendar,
days=CONFIG_ENTRY_DEFAULT_DAYS,
include_all_day=True,
@@ -207,8 +204,7 @@ class WebDavCalendarEntity(CoordinatorEntity[CalDavUpdateCoordinator], CalendarE
if self._supports_offset:
self._attr_extra_state_attributes = {
"offset_reached": is_offset_reached(
- self._event.start_datetime_local,
- self.coordinator.offset, # type: ignore[arg-type]
+ self._event.start_datetime_local, self.coordinator.offset
)
if self._event
else False
diff --git a/homeassistant/components/caldav/coordinator.py b/homeassistant/components/caldav/coordinator.py
index eb09e3f5452..3a10b567167 100644
--- a/homeassistant/components/caldav/coordinator.py
+++ b/homeassistant/components/caldav/coordinator.py
@@ -6,9 +6,6 @@ from datetime import date, datetime, time, timedelta
from functools import partial
import logging
import re
-from typing import TYPE_CHECKING
-
-import caldav
from homeassistant.components.calendar import CalendarEvent, extract_offset
from homeassistant.core import HomeAssistant
@@ -17,9 +14,6 @@ from homeassistant.util import dt as dt_util
from .api import get_attr_value
-if TYPE_CHECKING:
- from . import CalDavConfigEntry
-
_LOGGER = logging.getLogger(__name__)
MIN_TIME_BETWEEN_UPDATES = timedelta(minutes=15)
@@ -29,20 +23,11 @@ OFFSET = "!!"
class CalDavUpdateCoordinator(DataUpdateCoordinator[CalendarEvent | None]):
"""Class to utilize the calendar dav client object to get next event."""
- def __init__(
- self,
- hass: HomeAssistant,
- entry: CalDavConfigEntry | None,
- calendar: caldav.Calendar,
- days: int,
- include_all_day: bool,
- search: str | None,
- ) -> None:
+ def __init__(self, hass, calendar, days, include_all_day, search):
"""Set up how we are going to search the WebDav calendar."""
super().__init__(
hass,
_LOGGER,
- config_entry=entry,
name=f"CalDAV {calendar.name}",
update_interval=MIN_TIME_BETWEEN_UPDATES,
)
@@ -50,7 +35,7 @@ class CalDavUpdateCoordinator(DataUpdateCoordinator[CalendarEvent | None]):
self.days = days
self.include_all_day = include_all_day
self.search = search
- self.offset: timedelta | None = None
+ self.offset = None
async def async_get_events(
self, hass: HomeAssistant, start_date: datetime, end_date: datetime
@@ -124,7 +109,7 @@ class CalDavUpdateCoordinator(DataUpdateCoordinator[CalendarEvent | None]):
_start_of_tomorrow = start_of_tomorrow
if _start_of_today <= start_dt < _start_of_tomorrow:
new_event = event.copy()
- new_vevent = new_event.instance.vevent # type: ignore[attr-defined]
+ new_vevent = new_event.instance.vevent
if hasattr(new_vevent, "dtend"):
dur = new_vevent.dtend.value - new_vevent.dtstart.value
new_vevent.dtend.value = start_dt + dur
diff --git a/homeassistant/components/cambridge_audio/manifest.json b/homeassistant/components/cambridge_audio/manifest.json
index c359ca14a21..edacd17f54d 100644
--- a/homeassistant/components/cambridge_audio/manifest.json
+++ b/homeassistant/components/cambridge_audio/manifest.json
@@ -7,6 +7,6 @@
"integration_type": "device",
"iot_class": "local_push",
"loggers": ["aiostreammagic"],
- "requirements": ["aiostreammagic==2.8.5"],
+ "requirements": ["aiostreammagic==2.8.4"],
"zeroconf": ["_stream-magic._tcp.local.", "_smoip._tcp.local."]
}
diff --git a/homeassistant/components/cambridge_audio/select.py b/homeassistant/components/cambridge_audio/select.py
index c99abc853e5..ca6eebdec6b 100644
--- a/homeassistant/components/cambridge_audio/select.py
+++ b/homeassistant/components/cambridge_audio/select.py
@@ -51,13 +51,8 @@ CONTROL_ENTITIES: tuple[CambridgeAudioSelectEntityDescription, ...] = (
CambridgeAudioSelectEntityDescription(
key="display_brightness",
translation_key="display_brightness",
- options=[
- DisplayBrightness.BRIGHT.value,
- DisplayBrightness.DIM.value,
- DisplayBrightness.OFF.value,
- ],
+ options=[x.value for x in DisplayBrightness],
entity_category=EntityCategory.CONFIG,
- load_fn=lambda client: client.display.brightness != DisplayBrightness.NONE,
value_fn=lambda client: client.display.brightness,
set_value_fn=lambda client, value: client.set_display_brightness(
DisplayBrightness(value)
diff --git a/homeassistant/components/camera/__init__.py b/homeassistant/components/camera/__init__.py
index d31d21d424c..6d65ea255c7 100644
--- a/homeassistant/components/camera/__init__.py
+++ b/homeassistant/components/camera/__init__.py
@@ -421,12 +421,8 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
if hass.config.webrtc.ice_servers:
return hass.config.webrtc.ice_servers
return [
- RTCIceServer(
- urls=[
- "stun:stun.home-assistant.io:80",
- "stun:stun.home-assistant.io:3478",
- ]
- ),
+ RTCIceServer(urls="stun:stun.home-assistant.io:80"),
+ RTCIceServer(urls="stun:stun.home-assistant.io:3478"),
]
async_register_ice_servers(hass, get_ice_servers)
diff --git a/homeassistant/components/camera/webrtc.py b/homeassistant/components/camera/webrtc.py
index d627a888169..0612c96e40c 100644
--- a/homeassistant/components/camera/webrtc.py
+++ b/homeassistant/components/camera/webrtc.py
@@ -6,7 +6,7 @@ from abc import ABC, abstractmethod
import asyncio
from collections.abc import Awaitable, Callable, Iterable
from dataclasses import asdict, dataclass, field
-from functools import cache, partial, wraps
+from functools import cache, partial
import logging
from typing import TYPE_CHECKING, Any, Protocol
@@ -205,49 +205,6 @@ async def _async_refresh_providers(hass: HomeAssistant) -> None:
)
-type WsCommandWithCamera = Callable[
- [websocket_api.ActiveConnection, dict[str, Any], Camera],
- Awaitable[None],
-]
-
-
-def require_webrtc_support(
- error_code: str,
-) -> Callable[[WsCommandWithCamera], websocket_api.AsyncWebSocketCommandHandler]:
- """Validate that the camera supports WebRTC."""
-
- def decorate(
- func: WsCommandWithCamera,
- ) -> websocket_api.AsyncWebSocketCommandHandler:
- """Decorate func."""
-
- @wraps(func)
- async def validate(
- hass: HomeAssistant,
- connection: websocket_api.ActiveConnection,
- msg: dict[str, Any],
- ) -> None:
- """Validate that the camera supports WebRTC."""
- entity_id = msg["entity_id"]
- camera = get_camera_from_entity_id(hass, entity_id)
- if camera.frontend_stream_type != StreamType.WEB_RTC:
- connection.send_error(
- msg["id"],
- error_code,
- (
- "Camera does not support WebRTC,"
- f" frontend_stream_type={camera.frontend_stream_type}"
- ),
- )
- return
-
- await func(connection, msg, camera)
-
- return validate
-
- return decorate
-
-
@websocket_api.websocket_command(
{
vol.Required("type"): "camera/webrtc/offer",
@@ -256,9 +213,8 @@ def require_webrtc_support(
}
)
@websocket_api.async_response
-@require_webrtc_support("webrtc_offer_failed")
async def ws_webrtc_offer(
- connection: websocket_api.ActiveConnection, msg: dict[str, Any], camera: Camera
+ hass: HomeAssistant, connection: websocket_api.ActiveConnection, msg: dict[str, Any]
) -> None:
"""Handle the signal path for a WebRTC stream.
@@ -270,7 +226,20 @@ async def ws_webrtc_offer(
Async friendly.
"""
+ entity_id = msg["entity_id"]
offer = msg["offer"]
+ camera = get_camera_from_entity_id(hass, entity_id)
+ if camera.frontend_stream_type != StreamType.WEB_RTC:
+ connection.send_error(
+ msg["id"],
+ "webrtc_offer_failed",
+ (
+ "Camera does not support WebRTC,"
+ f" frontend_stream_type={camera.frontend_stream_type}"
+ ),
+ )
+ return
+
session_id = ulid()
connection.subscriptions[msg["id"]] = partial(
camera.close_webrtc_session, session_id
@@ -309,11 +278,23 @@ async def ws_webrtc_offer(
}
)
@websocket_api.async_response
-@require_webrtc_support("webrtc_get_client_config_failed")
async def ws_get_client_config(
- connection: websocket_api.ActiveConnection, msg: dict[str, Any], camera: Camera
+ hass: HomeAssistant, connection: websocket_api.ActiveConnection, msg: dict[str, Any]
) -> None:
"""Handle get WebRTC client config websocket command."""
+ entity_id = msg["entity_id"]
+ camera = get_camera_from_entity_id(hass, entity_id)
+ if camera.frontend_stream_type != StreamType.WEB_RTC:
+ connection.send_error(
+ msg["id"],
+ "webrtc_get_client_config_failed",
+ (
+ "Camera does not support WebRTC,"
+ f" frontend_stream_type={camera.frontend_stream_type}"
+ ),
+ )
+ return
+
config = camera.async_get_webrtc_client_configuration().to_frontend_dict()
connection.send_result(
msg["id"],
@@ -330,11 +311,23 @@ async def ws_get_client_config(
}
)
@websocket_api.async_response
-@require_webrtc_support("webrtc_candidate_failed")
async def ws_candidate(
- connection: websocket_api.ActiveConnection, msg: dict[str, Any], camera: Camera
+ hass: HomeAssistant, connection: websocket_api.ActiveConnection, msg: dict[str, Any]
) -> None:
"""Handle WebRTC candidate websocket command."""
+ entity_id = msg["entity_id"]
+ camera = get_camera_from_entity_id(hass, entity_id)
+ if camera.frontend_stream_type != StreamType.WEB_RTC:
+ connection.send_error(
+ msg["id"],
+ "webrtc_candidate_failed",
+ (
+ "Camera does not support WebRTC,"
+ f" frontend_stream_type={camera.frontend_stream_type}"
+ ),
+ )
+ return
+
await camera.async_on_webrtc_candidate(
msg["session_id"], RTCIceCandidate(msg["candidate"])
)
diff --git a/homeassistant/components/canary/config_flow.py b/homeassistant/components/canary/config_flow.py
index 2dd3a678b5d..5af7142af8f 100644
--- a/homeassistant/components/canary/config_flow.py
+++ b/homeassistant/components/canary/config_flow.py
@@ -52,7 +52,7 @@ class CanaryConfigFlow(ConfigFlow, domain=DOMAIN):
@callback
def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlow:
"""Get the options flow for this handler."""
- return CanaryOptionsFlowHandler()
+ return CanaryOptionsFlowHandler(config_entry)
async def async_step_import(self, import_data: dict[str, Any]) -> ConfigFlowResult:
"""Handle a flow initiated by configuration file."""
@@ -104,6 +104,10 @@ class CanaryConfigFlow(ConfigFlow, domain=DOMAIN):
class CanaryOptionsFlowHandler(OptionsFlow):
"""Handle Canary client options."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/cast/config_flow.py b/homeassistant/components/cast/config_flow.py
index 03a3f2ea1f8..0ebfa553f62 100644
--- a/homeassistant/components/cast/config_flow.py
+++ b/homeassistant/components/cast/config_flow.py
@@ -41,7 +41,7 @@ class FlowHandler(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> CastOptionsFlowHandler:
"""Get the options flow for this handler."""
- return CastOptionsFlowHandler()
+ return CastOptionsFlowHandler(config_entry)
async def async_step_user(
self, user_input: dict[str, Any] | None = None
@@ -109,8 +109,9 @@ class FlowHandler(ConfigFlow, domain=DOMAIN):
class CastOptionsFlowHandler(OptionsFlow):
"""Handle Google Cast options."""
- def __init__(self) -> None:
+ def __init__(self, config_entry: ConfigEntry) -> None:
"""Initialize Google Cast options flow."""
+ self.config_entry = config_entry
self.updated_config: dict[str, Any] = {}
async def async_step_init(self, user_input: None = None) -> ConfigFlowResult:
diff --git a/homeassistant/components/cloud/http_api.py b/homeassistant/components/cloud/http_api.py
index 4f2ad0ddcf7..844f0e9f11d 100644
--- a/homeassistant/components/cloud/http_api.py
+++ b/homeassistant/components/cloud/http_api.py
@@ -440,16 +440,16 @@ def validate_language_voice(value: tuple[str, str]) -> tuple[str, str]:
@websocket_api.websocket_command(
{
vol.Required("type"): "cloud/update_prefs",
- vol.Optional(PREF_ALEXA_REPORT_STATE): bool,
- vol.Optional(PREF_ENABLE_ALEXA): bool,
- vol.Optional(PREF_ENABLE_CLOUD_ICE_SERVERS): bool,
vol.Optional(PREF_ENABLE_GOOGLE): bool,
+ vol.Optional(PREF_ENABLE_ALEXA): bool,
+ vol.Optional(PREF_ALEXA_REPORT_STATE): bool,
vol.Optional(PREF_GOOGLE_REPORT_STATE): bool,
vol.Optional(PREF_GOOGLE_SECURE_DEVICES_PIN): vol.Any(None, str),
- vol.Optional(PREF_REMOTE_ALLOW_REMOTE_ENABLE): bool,
vol.Optional(PREF_TTS_DEFAULT_VOICE): vol.All(
vol.Coerce(tuple), validate_language_voice
),
+ vol.Optional(PREF_REMOTE_ALLOW_REMOTE_ENABLE): bool,
+ vol.Optional(PREF_ENABLE_CLOUD_ICE_SERVERS): bool,
}
)
@websocket_api.async_response
diff --git a/homeassistant/components/cloud/manifest.json b/homeassistant/components/cloud/manifest.json
index 4201cb1b2d4..8d2b40ff8ba 100644
--- a/homeassistant/components/cloud/manifest.json
+++ b/homeassistant/components/cloud/manifest.json
@@ -8,6 +8,6 @@
"integration_type": "system",
"iot_class": "cloud_push",
"loggers": ["hass_nabucasa"],
- "requirements": ["hass-nabucasa==0.84.0"],
+ "requirements": ["hass-nabucasa==0.83.0"],
"single_config_entry": true
}
diff --git a/homeassistant/components/cloud/prefs.py b/homeassistant/components/cloud/prefs.py
index ae4b2794e1b..a0811393097 100644
--- a/homeassistant/components/cloud/prefs.py
+++ b/homeassistant/components/cloud/prefs.py
@@ -163,21 +163,21 @@ class CloudPreferences:
async def async_update(
self,
*,
- alexa_enabled: bool | UndefinedType = UNDEFINED,
- alexa_report_state: bool | UndefinedType = UNDEFINED,
- alexa_settings_version: int | UndefinedType = UNDEFINED,
- cloud_ice_servers_enabled: bool | UndefinedType = UNDEFINED,
- cloud_user: str | UndefinedType = UNDEFINED,
- cloudhooks: dict[str, dict[str, str | bool]] | UndefinedType = UNDEFINED,
- google_connected: bool | UndefinedType = UNDEFINED,
google_enabled: bool | UndefinedType = UNDEFINED,
- google_report_state: bool | UndefinedType = UNDEFINED,
- google_secure_devices_pin: str | None | UndefinedType = UNDEFINED,
- google_settings_version: int | UndefinedType = UNDEFINED,
- remote_allow_remote_enable: bool | UndefinedType = UNDEFINED,
- remote_domain: str | None | UndefinedType = UNDEFINED,
+ alexa_enabled: bool | UndefinedType = UNDEFINED,
remote_enabled: bool | UndefinedType = UNDEFINED,
+ google_secure_devices_pin: str | None | UndefinedType = UNDEFINED,
+ cloudhooks: dict[str, dict[str, str | bool]] | UndefinedType = UNDEFINED,
+ cloud_user: str | UndefinedType = UNDEFINED,
+ alexa_report_state: bool | UndefinedType = UNDEFINED,
+ google_report_state: bool | UndefinedType = UNDEFINED,
tts_default_voice: tuple[str, str] | UndefinedType = UNDEFINED,
+ remote_domain: str | None | UndefinedType = UNDEFINED,
+ alexa_settings_version: int | UndefinedType = UNDEFINED,
+ google_settings_version: int | UndefinedType = UNDEFINED,
+ google_connected: bool | UndefinedType = UNDEFINED,
+ remote_allow_remote_enable: bool | UndefinedType = UNDEFINED,
+ cloud_ice_servers_enabled: bool | UndefinedType = UNDEFINED,
) -> None:
"""Update user preferences."""
prefs = {**self._prefs}
@@ -186,21 +186,21 @@ class CloudPreferences:
{
key: value
for key, value in (
- (PREF_ALEXA_REPORT_STATE, alexa_report_state),
- (PREF_ALEXA_SETTINGS_VERSION, alexa_settings_version),
- (PREF_CLOUD_USER, cloud_user),
- (PREF_CLOUDHOOKS, cloudhooks),
- (PREF_ENABLE_ALEXA, alexa_enabled),
- (PREF_ENABLE_CLOUD_ICE_SERVERS, cloud_ice_servers_enabled),
(PREF_ENABLE_GOOGLE, google_enabled),
+ (PREF_ENABLE_ALEXA, alexa_enabled),
(PREF_ENABLE_REMOTE, remote_enabled),
- (PREF_GOOGLE_CONNECTED, google_connected),
- (PREF_GOOGLE_REPORT_STATE, google_report_state),
(PREF_GOOGLE_SECURE_DEVICES_PIN, google_secure_devices_pin),
+ (PREF_CLOUDHOOKS, cloudhooks),
+ (PREF_CLOUD_USER, cloud_user),
+ (PREF_ALEXA_REPORT_STATE, alexa_report_state),
+ (PREF_GOOGLE_REPORT_STATE, google_report_state),
+ (PREF_ALEXA_SETTINGS_VERSION, alexa_settings_version),
(PREF_GOOGLE_SETTINGS_VERSION, google_settings_version),
- (PREF_REMOTE_ALLOW_REMOTE_ENABLE, remote_allow_remote_enable),
- (PREF_REMOTE_DOMAIN, remote_domain),
(PREF_TTS_DEFAULT_VOICE, tts_default_voice),
+ (PREF_REMOTE_DOMAIN, remote_domain),
+ (PREF_GOOGLE_CONNECTED, google_connected),
+ (PREF_REMOTE_ALLOW_REMOTE_ENABLE, remote_allow_remote_enable),
+ (PREF_ENABLE_CLOUD_ICE_SERVERS, cloud_ice_servers_enabled),
)
if value is not UNDEFINED
}
@@ -242,7 +242,6 @@ class CloudPreferences:
PREF_ALEXA_REPORT_STATE: self.alexa_report_state,
PREF_CLOUDHOOKS: self.cloudhooks,
PREF_ENABLE_ALEXA: self.alexa_enabled,
- PREF_ENABLE_CLOUD_ICE_SERVERS: self.cloud_ice_servers_enabled,
PREF_ENABLE_GOOGLE: self.google_enabled,
PREF_ENABLE_REMOTE: self.remote_enabled,
PREF_GOOGLE_DEFAULT_EXPOSE: self.google_default_expose,
@@ -250,6 +249,7 @@ class CloudPreferences:
PREF_GOOGLE_SECURE_DEVICES_PIN: self.google_secure_devices_pin,
PREF_REMOTE_ALLOW_REMOTE_ENABLE: self.remote_allow_remote_enable,
PREF_TTS_DEFAULT_VOICE: self.tts_default_voice,
+ PREF_ENABLE_CLOUD_ICE_SERVERS: self.cloud_ice_servers_enabled,
}
@property
diff --git a/homeassistant/components/co2signal/config_flow.py b/homeassistant/components/co2signal/config_flow.py
index 0d357cce199..622c09f0d38 100644
--- a/homeassistant/components/co2signal/config_flow.py
+++ b/homeassistant/components/co2signal/config_flow.py
@@ -168,7 +168,7 @@ class ElectricityMapsConfigFlow(ConfigFlow, domain=DOMAIN):
)
return self.async_create_entry(
- title=get_extra_name(data) or "Electricity Maps",
+ title=get_extra_name(data) or "CO2 Signal",
data=data,
)
diff --git a/homeassistant/components/coinbase/config_flow.py b/homeassistant/components/coinbase/config_flow.py
index 8b7b4b9e313..616fdaf8f7a 100644
--- a/homeassistant/components/coinbase/config_flow.py
+++ b/homeassistant/components/coinbase/config_flow.py
@@ -158,12 +158,16 @@ class CoinbaseConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> OptionsFlowHandler:
"""Get the options flow for this handler."""
- return OptionsFlowHandler()
+ return OptionsFlowHandler(config_entry)
class OptionsFlowHandler(OptionsFlow):
"""Handle a option flow for Coinbase."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/compensation/manifest.json b/homeassistant/components/compensation/manifest.json
index 775bde3c859..caae9190bca 100644
--- a/homeassistant/components/compensation/manifest.json
+++ b/homeassistant/components/compensation/manifest.json
@@ -4,5 +4,5 @@
"codeowners": ["@Petro31"],
"documentation": "https://www.home-assistant.io/integrations/compensation",
"iot_class": "calculated",
- "requirements": ["numpy==2.1.3"]
+ "requirements": ["numpy==1.26.4"]
}
diff --git a/homeassistant/components/control4/config_flow.py b/homeassistant/components/control4/config_flow.py
index 19fae1ef7ca..77ae2c98c7d 100644
--- a/homeassistant/components/control4/config_flow.py
+++ b/homeassistant/components/control4/config_flow.py
@@ -154,12 +154,16 @@ class Control4ConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> OptionsFlowHandler:
"""Get the options flow for this handler."""
- return OptionsFlowHandler()
+ return OptionsFlowHandler(config_entry)
class OptionsFlowHandler(OptionsFlow):
"""Handle a option flow for Control4."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/conversation/default_agent.py b/homeassistant/components/conversation/default_agent.py
index 4838d19537a..6b5cef89fd6 100644
--- a/homeassistant/components/conversation/default_agent.py
+++ b/homeassistant/components/conversation/default_agent.py
@@ -16,11 +16,11 @@ from hassil.expression import Expression, ListReference, Sequence
from hassil.intents import Intents, SlotList, TextSlotList, WildcardSlotList
from hassil.recognize import (
MISSING_ENTITY,
+ MatchEntity,
RecognizeResult,
+ UnmatchedTextEntity,
recognize_all,
- recognize_best,
)
-from hassil.string_matcher import UnmatchedRangeEntity, UnmatchedTextEntity
from hassil.util import merge_dict
from home_assistant_intents import ErrorKey, get_intents, get_languages
import yaml
@@ -294,7 +294,7 @@ class DefaultAgent(ConversationEntity):
self.hass, language, DOMAIN, [DOMAIN]
)
response_text = translations.get(
- f"component.{DOMAIN}.conversation.agent.done", "Done"
+ f"component.{DOMAIN}.agent.done", "Done"
)
response.async_set_speech(response_text)
@@ -499,7 +499,6 @@ class DefaultAgent(ConversationEntity):
maybe_result: RecognizeResult | None = None
best_num_matched_entities = 0
best_num_unmatched_entities = 0
- best_num_unmatched_ranges = 0
for result in recognize_all(
user_input.text,
lang_intents.intents,
@@ -518,14 +517,10 @@ class DefaultAgent(ConversationEntity):
num_matched_entities += 1
num_unmatched_entities = 0
- num_unmatched_ranges = 0
for unmatched_entity in result.unmatched_entities_list:
if isinstance(unmatched_entity, UnmatchedTextEntity):
if unmatched_entity.text != MISSING_ENTITY:
num_unmatched_entities += 1
- elif isinstance(unmatched_entity, UnmatchedRangeEntity):
- num_unmatched_ranges += 1
- num_unmatched_entities += 1
else:
num_unmatched_entities += 1
@@ -537,24 +532,15 @@ class DefaultAgent(ConversationEntity):
(num_matched_entities == best_num_matched_entities)
and (num_unmatched_entities < best_num_unmatched_entities)
)
- or (
- # Prefer unmatched ranges
- (num_matched_entities == best_num_matched_entities)
- and (num_unmatched_entities == best_num_unmatched_entities)
- and (num_unmatched_ranges > best_num_unmatched_ranges)
- )
or (
# More literal text matched
(num_matched_entities == best_num_matched_entities)
and (num_unmatched_entities == best_num_unmatched_entities)
- and (num_unmatched_ranges == best_num_unmatched_ranges)
and (result.text_chunks_matched > maybe_result.text_chunks_matched)
)
or (
# Prefer match failures with entities
(result.text_chunks_matched == maybe_result.text_chunks_matched)
- and (num_unmatched_entities == best_num_unmatched_entities)
- and (num_unmatched_ranges == best_num_unmatched_ranges)
and (
("name" in result.entities)
or ("name" in result.unmatched_entities)
@@ -564,7 +550,6 @@ class DefaultAgent(ConversationEntity):
maybe_result = result
best_num_matched_entities = num_matched_entities
best_num_unmatched_entities = num_unmatched_entities
- best_num_unmatched_ranges = num_unmatched_ranges
return maybe_result
@@ -577,15 +562,76 @@ class DefaultAgent(ConversationEntity):
language: str,
) -> RecognizeResult | None:
"""Search intents for a strict match to user input."""
- return recognize_best(
+ custom_found = False
+ name_found = False
+ best_results: list[RecognizeResult] = []
+ best_name_quality: int | None = None
+ best_text_chunks_matched: int | None = None
+ for result in recognize_all(
user_input.text,
lang_intents.intents,
slot_lists=slot_lists,
intent_context=intent_context,
language=language,
- best_metadata_key=METADATA_CUSTOM_SENTENCE,
- best_slot_name="name",
- )
+ ):
+ # Prioritize user intents
+ is_custom = (
+ result.intent_metadata is not None
+ and result.intent_metadata.get(METADATA_CUSTOM_SENTENCE)
+ )
+
+ if custom_found and not is_custom:
+ continue
+
+ if not custom_found and is_custom:
+ custom_found = True
+ # Clear builtin results
+ name_found = False
+ best_results = []
+ best_name_quality = None
+ best_text_chunks_matched = None
+
+ # Prioritize results with a "name" slot
+ name = result.entities.get("name")
+ is_name = name and not name.is_wildcard
+
+ if name_found and not is_name:
+ continue
+
+ if not name_found and is_name:
+ name_found = True
+ # Clear non-name results
+ best_results = []
+ best_text_chunks_matched = None
+
+ if is_name:
+ # Prioritize results with a better "name" slot
+ name_quality = len(cast(MatchEntity, name).value.split())
+ if (best_name_quality is None) or (name_quality > best_name_quality):
+ best_name_quality = name_quality
+ # Clear worse name results
+ best_results = []
+ best_text_chunks_matched = None
+ elif name_quality < best_name_quality:
+ continue
+
+ # Prioritize results with more literal text
+ # This causes wildcards to match last.
+ if (best_text_chunks_matched is None) or (
+ result.text_chunks_matched > best_text_chunks_matched
+ ):
+ best_results = [result]
+ best_text_chunks_matched = result.text_chunks_matched
+ elif result.text_chunks_matched == best_text_chunks_matched:
+ # Accumulate results with the same number of literal text matched.
+ # We will resolve the ambiguity below.
+ best_results.append(result)
+
+ if best_results:
+ # Successful strict match
+ return best_results[0]
+
+ return None
async def _build_speech(
self,
diff --git a/homeassistant/components/conversation/http.py b/homeassistant/components/conversation/http.py
index 5e5800ad6f1..df1ffc7f74f 100644
--- a/homeassistant/components/conversation/http.py
+++ b/homeassistant/components/conversation/http.py
@@ -6,8 +6,12 @@ from collections.abc import Iterable
from typing import Any
from aiohttp import web
-from hassil.recognize import MISSING_ENTITY, RecognizeResult
-from hassil.string_matcher import UnmatchedRangeEntity, UnmatchedTextEntity
+from hassil.recognize import (
+ MISSING_ENTITY,
+ RecognizeResult,
+ UnmatchedRangeEntity,
+ UnmatchedTextEntity,
+)
import voluptuous as vol
from homeassistant.components import http, websocket_api
diff --git a/homeassistant/components/conversation/manifest.json b/homeassistant/components/conversation/manifest.json
index 1676cdf8254..2c446ac5d70 100644
--- a/homeassistant/components/conversation/manifest.json
+++ b/homeassistant/components/conversation/manifest.json
@@ -6,5 +6,5 @@
"documentation": "https://www.home-assistant.io/integrations/conversation",
"integration_type": "system",
"quality_scale": "internal",
- "requirements": ["hassil==2.0.1", "home-assistant-intents==2024.11.13"]
+ "requirements": ["hassil==1.7.4", "home-assistant-intents==2024.11.4"]
}
diff --git a/homeassistant/components/conversation/trigger.py b/homeassistant/components/conversation/trigger.py
index a4f64ffbad9..ec7ecc76da0 100644
--- a/homeassistant/components/conversation/trigger.py
+++ b/homeassistant/components/conversation/trigger.py
@@ -4,8 +4,7 @@ from __future__ import annotations
from typing import Any
-from hassil.recognize import RecognizeResult
-from hassil.util import PUNCTUATION_ALL
+from hassil.recognize import PUNCTUATION, RecognizeResult
import voluptuous as vol
from homeassistant.const import CONF_COMMAND, CONF_PLATFORM
@@ -21,7 +20,7 @@ from .const import DATA_DEFAULT_ENTITY, DOMAIN
def has_no_punctuation(value: list[str]) -> list[str]:
"""Validate result does not contain punctuation."""
for sentence in value:
- if PUNCTUATION_ALL.search(sentence):
+ if PUNCTUATION.search(sentence):
raise vol.Invalid("sentence should not contain punctuation")
return value
diff --git a/homeassistant/components/crownstone/config_flow.py b/homeassistant/components/crownstone/config_flow.py
index bf6e9204714..7d86fbbd7fb 100644
--- a/homeassistant/components/crownstone/config_flow.py
+++ b/homeassistant/components/crownstone/config_flow.py
@@ -213,19 +213,18 @@ class CrownstoneOptionsFlowHandler(BaseCrownstoneFlowHandler, OptionsFlow):
def __init__(self, config_entry: ConfigEntry) -> None:
"""Initialize Crownstone options."""
super().__init__(OPTIONS_FLOW, self.async_create_new_entry)
- self.options = config_entry.options.copy()
+ self.entry = config_entry
+ self.updated_options = config_entry.options.copy()
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Manage Crownstone options."""
- self.cloud: CrownstoneCloud = self.hass.data[DOMAIN][
- self.config_entry.entry_id
- ].cloud
+ self.cloud: CrownstoneCloud = self.hass.data[DOMAIN][self.entry.entry_id].cloud
spheres = {sphere.name: sphere.cloud_id for sphere in self.cloud.cloud_data}
- usb_path = self.config_entry.options.get(CONF_USB_PATH)
- usb_sphere = self.config_entry.options.get(CONF_USB_SPHERE)
+ usb_path = self.entry.options.get(CONF_USB_PATH)
+ usb_sphere = self.entry.options.get(CONF_USB_SPHERE)
options_schema = vol.Schema(
{vol.Optional(CONF_USE_USB_OPTION, default=usb_path is not None): bool}
@@ -244,14 +243,14 @@ class CrownstoneOptionsFlowHandler(BaseCrownstoneFlowHandler, OptionsFlow):
if user_input[CONF_USE_USB_OPTION] and usb_path is None:
return await self.async_step_usb_config()
if not user_input[CONF_USE_USB_OPTION] and usb_path is not None:
- self.options[CONF_USB_PATH] = None
- self.options[CONF_USB_SPHERE] = None
+ self.updated_options[CONF_USB_PATH] = None
+ self.updated_options[CONF_USB_SPHERE] = None
elif (
CONF_USB_SPHERE_OPTION in user_input
and spheres[user_input[CONF_USB_SPHERE_OPTION]] != usb_sphere
):
sphere_id = spheres[user_input[CONF_USB_SPHERE_OPTION]]
- self.options[CONF_USB_SPHERE] = sphere_id
+ self.updated_options[CONF_USB_SPHERE] = sphere_id
return self.async_create_new_entry()
@@ -261,7 +260,7 @@ class CrownstoneOptionsFlowHandler(BaseCrownstoneFlowHandler, OptionsFlow):
"""Create a new entry."""
# these attributes will only change when a usb was configured
if self.usb_path is not None and self.usb_sphere_id is not None:
- self.options[CONF_USB_PATH] = self.usb_path
- self.options[CONF_USB_SPHERE] = self.usb_sphere_id
+ self.updated_options[CONF_USB_PATH] = self.usb_path
+ self.updated_options[CONF_USB_SPHERE] = self.usb_sphere_id
- return super().async_create_entry(title="", data=self.options)
+ return super().async_create_entry(title="", data=self.updated_options)
diff --git a/homeassistant/components/deconz/config_flow.py b/homeassistant/components/deconz/config_flow.py
index ed54701f656..3fb025b4d99 100644
--- a/homeassistant/components/deconz/config_flow.py
+++ b/homeassistant/components/deconz/config_flow.py
@@ -74,11 +74,9 @@ class DeconzFlowHandler(ConfigFlow, domain=DOMAIN):
@staticmethod
@callback
- def async_get_options_flow(
- config_entry: ConfigEntry,
- ) -> DeconzOptionsFlowHandler:
+ def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlow:
"""Get the options flow for this handler."""
- return DeconzOptionsFlowHandler()
+ return DeconzOptionsFlowHandler(config_entry)
def __init__(self) -> None:
"""Initialize the deCONZ config flow."""
@@ -301,6 +299,11 @@ class DeconzOptionsFlowHandler(OptionsFlow):
gateway: DeconzHub
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize deCONZ options flow."""
+ self.config_entry = config_entry
+ self.options = dict(config_entry.options)
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
@@ -312,7 +315,8 @@ class DeconzOptionsFlowHandler(OptionsFlow):
) -> ConfigFlowResult:
"""Manage the deconz devices options."""
if user_input is not None:
- return self.async_create_entry(data=self.config_entry.options | user_input)
+ self.options.update(user_input)
+ return self.async_create_entry(title="", data=self.options)
schema_options = {}
for option, default in (
diff --git a/homeassistant/components/demo/config_flow.py b/homeassistant/components/demo/config_flow.py
index 53c1678aa81..241f62bed69 100644
--- a/homeassistant/components/demo/config_flow.py
+++ b/homeassistant/components/demo/config_flow.py
@@ -47,6 +47,7 @@ class OptionsFlowHandler(OptionsFlow):
def __init__(self, config_entry: ConfigEntry) -> None:
"""Initialize options flow."""
+ self.config_entry = config_entry
self.options = dict(config_entry.options)
async def async_step_init(
diff --git a/homeassistant/components/denonavr/config_flow.py b/homeassistant/components/denonavr/config_flow.py
index 9ff05411588..9a7d2a30438 100644
--- a/homeassistant/components/denonavr/config_flow.py
+++ b/homeassistant/components/denonavr/config_flow.py
@@ -52,6 +52,10 @@ CONFIG_SCHEMA = vol.Schema({vol.Optional(CONF_HOST): str})
class OptionsFlowHandler(OptionsFlow):
"""Options for the component."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Init object."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
@@ -115,7 +119,7 @@ class DenonAvrFlowHandler(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> OptionsFlowHandler:
"""Get the options flow."""
- return OptionsFlowHandler()
+ return OptionsFlowHandler(config_entry)
async def async_step_user(
self, user_input: dict[str, Any] | None = None
diff --git a/homeassistant/components/dexcom/config_flow.py b/homeassistant/components/dexcom/config_flow.py
index c5c830dedf6..c3ed43c8e9a 100644
--- a/homeassistant/components/dexcom/config_flow.py
+++ b/homeassistant/components/dexcom/config_flow.py
@@ -69,12 +69,16 @@ class DexcomConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> DexcomOptionsFlowHandler:
"""Get the options flow for this handler."""
- return DexcomOptionsFlowHandler()
+ return DexcomOptionsFlowHandler(config_entry)
class DexcomOptionsFlowHandler(OptionsFlow):
"""Handle a option flow for Dexcom."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/dlna_dmr/config_flow.py b/homeassistant/components/dlna_dmr/config_flow.py
index 75f50192500..06ac935e8d9 100644
--- a/homeassistant/components/dlna_dmr/config_flow.py
+++ b/homeassistant/components/dlna_dmr/config_flow.py
@@ -74,7 +74,7 @@ class DlnaDmrFlowHandler(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> OptionsFlow:
"""Define the config flow to handle options."""
- return DlnaDmrOptionsFlowHandler()
+ return DlnaDmrOptionsFlowHandler(config_entry)
async def async_step_user(self, user_input: FlowInput = None) -> ConfigFlowResult:
"""Handle a flow initialized by the user.
@@ -327,6 +327,10 @@ class DlnaDmrOptionsFlowHandler(OptionsFlow):
Configures the single instance and updates the existing config entry.
"""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/dnsip/config_flow.py b/homeassistant/components/dnsip/config_flow.py
index 8c2cfa5e556..6dda0c03910 100644
--- a/homeassistant/components/dnsip/config_flow.py
+++ b/homeassistant/components/dnsip/config_flow.py
@@ -14,7 +14,7 @@ from homeassistant.config_entries import (
ConfigEntry,
ConfigFlow,
ConfigFlowResult,
- OptionsFlow,
+ OptionsFlowWithConfigEntry,
)
from homeassistant.const import CONF_NAME, CONF_PORT
from homeassistant.core import callback
@@ -101,7 +101,7 @@ class DnsIPConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> DnsIPOptionsFlowHandler:
"""Return Option handler."""
- return DnsIPOptionsFlowHandler()
+ return DnsIPOptionsFlowHandler(config_entry)
async def async_step_user(
self, user_input: dict[str, Any] | None = None
@@ -165,7 +165,7 @@ class DnsIPConfigFlow(ConfigFlow, domain=DOMAIN):
)
-class DnsIPOptionsFlowHandler(OptionsFlow):
+class DnsIPOptionsFlowHandler(OptionsFlowWithConfigEntry):
"""Handle a option config flow for dnsip integration."""
async def async_step_init(
diff --git a/homeassistant/components/doods/manifest.json b/homeassistant/components/doods/manifest.json
index 7c85ca63467..fabb2c30190 100644
--- a/homeassistant/components/doods/manifest.json
+++ b/homeassistant/components/doods/manifest.json
@@ -5,5 +5,5 @@
"documentation": "https://www.home-assistant.io/integrations/doods",
"iot_class": "local_polling",
"loggers": ["pydoods"],
- "requirements": ["pydoods==1.0.2", "Pillow==11.0.0"]
+ "requirements": ["pydoods==1.0.2", "Pillow==10.4.0"]
}
diff --git a/homeassistant/components/doorbird/config_flow.py b/homeassistant/components/doorbird/config_flow.py
index ebb1d6fc126..650ddb8811d 100644
--- a/homeassistant/components/doorbird/config_flow.py
+++ b/homeassistant/components/doorbird/config_flow.py
@@ -213,12 +213,16 @@ class DoorBirdConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> OptionsFlowHandler:
"""Get the options flow for this handler."""
- return OptionsFlowHandler()
+ return OptionsFlowHandler(config_entry)
class OptionsFlowHandler(OptionsFlow):
"""Handle a option flow for doorbird."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/dsmr/config_flow.py b/homeassistant/components/dsmr/config_flow.py
index 7d6a641b006..49e1818edcc 100644
--- a/homeassistant/components/dsmr/config_flow.py
+++ b/homeassistant/components/dsmr/config_flow.py
@@ -171,11 +171,9 @@ class DSMRFlowHandler(ConfigFlow, domain=DOMAIN):
@staticmethod
@callback
- def async_get_options_flow(
- config_entry: ConfigEntry,
- ) -> DSMROptionFlowHandler:
+ def async_get_options_flow(config_entry: ConfigEntry) -> DSMROptionFlowHandler:
"""Get the options flow for this handler."""
- return DSMROptionFlowHandler()
+ return DSMROptionFlowHandler(config_entry)
async def async_step_user(
self, user_input: dict[str, Any] | None = None
@@ -313,6 +311,10 @@ class DSMRFlowHandler(ConfigFlow, domain=DOMAIN):
class DSMROptionFlowHandler(OptionsFlow):
"""Handle options."""
+ def __init__(self, entry: ConfigEntry) -> None:
+ """Initialize options flow."""
+ self.entry = entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
@@ -326,7 +328,7 @@ class DSMROptionFlowHandler(OptionsFlow):
{
vol.Optional(
CONF_TIME_BETWEEN_UPDATE,
- default=self.config_entry.options.get(
+ default=self.entry.options.get(
CONF_TIME_BETWEEN_UPDATE, DEFAULT_TIME_BETWEEN_UPDATE
),
): vol.All(vol.Coerce(int), vol.Range(min=0)),
diff --git a/homeassistant/components/ecobee/number.py b/homeassistant/components/ecobee/number.py
index ed3744bf11e..ab09407903d 100644
--- a/homeassistant/components/ecobee/number.py
+++ b/homeassistant/components/ecobee/number.py
@@ -6,14 +6,9 @@ from collections.abc import Awaitable, Callable
from dataclasses import dataclass
import logging
-from homeassistant.components.number import (
- NumberDeviceClass,
- NumberEntity,
- NumberEntityDescription,
- NumberMode,
-)
+from homeassistant.components.number import NumberEntity, NumberEntityDescription
from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import UnitOfTemperature, UnitOfTime
+from homeassistant.const import UnitOfTime
from homeassistant.core import HomeAssistant
from homeassistant.helpers.entity_platform import AddEntitiesCallback
@@ -59,30 +54,21 @@ async def async_setup_entry(
) -> None:
"""Set up the ecobee thermostat number entity."""
data: EcobeeData = hass.data[DOMAIN]
+ _LOGGER.debug("Adding min time ventilators numbers (if present)")
- assert data is not None
-
- entities: list[NumberEntity] = [
- EcobeeVentilatorMinTime(data, index, numbers)
- for index, thermostat in enumerate(data.ecobee.thermostats)
- if thermostat["settings"]["ventilatorType"] != "none"
- for numbers in VENTILATOR_NUMBERS
- ]
-
- _LOGGER.debug("Adding compressor min temp number (if present)")
- entities.extend(
+ async_add_entities(
(
- EcobeeCompressorMinTemp(data, index)
+ EcobeeVentilatorMinTime(data, index, numbers)
for index, thermostat in enumerate(data.ecobee.thermostats)
- if thermostat["settings"]["hasHeatPump"]
- )
+ if thermostat["settings"]["ventilatorType"] != "none"
+ for numbers in VENTILATOR_NUMBERS
+ ),
+ True,
)
- async_add_entities(entities, True)
-
class EcobeeVentilatorMinTime(EcobeeBaseEntity, NumberEntity):
- """A number class, representing min time for an ecobee thermostat with ventilator attached."""
+ """A number class, representing min time for an ecobee thermostat with ventilator attached."""
entity_description: EcobeeNumberEntityDescription
@@ -119,53 +105,3 @@ class EcobeeVentilatorMinTime(EcobeeBaseEntity, NumberEntity):
"""Set new ventilator Min On Time value."""
self.entity_description.set_fn(self.data, self.thermostat_index, int(value))
self.update_without_throttle = True
-
-
-class EcobeeCompressorMinTemp(EcobeeBaseEntity, NumberEntity):
- """Minimum outdoor temperature at which the compressor will operate.
-
- This applies more to air source heat pumps than geothermal. This serves as a safety
- feature (compressors have a minimum operating temperature) as well as
- providing the ability to choose fuel in a dual-fuel system (i.e. choose between
- electrical heat pump and fossil auxiliary heat depending on Time of Use, Solar,
- etc.).
- Note that python-ecobee-api refers to this as Aux Cutover Threshold, but Ecobee
- uses Compressor Protection Min Temp.
- """
-
- _attr_device_class = NumberDeviceClass.TEMPERATURE
- _attr_has_entity_name = True
- _attr_icon = "mdi:thermometer-off"
- _attr_mode = NumberMode.BOX
- _attr_native_min_value = -25
- _attr_native_max_value = 66
- _attr_native_step = 5
- _attr_native_unit_of_measurement = UnitOfTemperature.FAHRENHEIT
- _attr_translation_key = "compressor_protection_min_temp"
-
- def __init__(
- self,
- data: EcobeeData,
- thermostat_index: int,
- ) -> None:
- """Initialize ecobee compressor min temperature."""
- super().__init__(data, thermostat_index)
- self._attr_unique_id = f"{self.base_unique_id}_compressor_protection_min_temp"
- self.update_without_throttle = False
-
- async def async_update(self) -> None:
- """Get the latest state from the thermostat."""
- if self.update_without_throttle:
- await self.data.update(no_throttle=True)
- self.update_without_throttle = False
- else:
- await self.data.update()
-
- self._attr_native_value = (
- (self.thermostat["settings"]["compressorProtectionMinTemp"]) / 10
- )
-
- def set_native_value(self, value: float) -> None:
- """Set new compressor minimum temperature."""
- self.data.ecobee.set_aux_cutover_threshold(self.thermostat_index, value)
- self.update_without_throttle = True
diff --git a/homeassistant/components/ecobee/strings.json b/homeassistant/components/ecobee/strings.json
index 8c636bd9b04..18929cb45de 100644
--- a/homeassistant/components/ecobee/strings.json
+++ b/homeassistant/components/ecobee/strings.json
@@ -33,18 +33,15 @@
},
"number": {
"ventilator_min_type_home": {
- "name": "Ventilator minimum time home"
+ "name": "Ventilator min time home"
},
"ventilator_min_type_away": {
- "name": "Ventilator minimum time away"
- },
- "compressor_protection_min_temp": {
- "name": "Compressor minimum temperature"
+ "name": "Ventilator min time away"
}
},
"switch": {
"aux_heat_only": {
- "name": "Auxiliary heat only"
+ "name": "Aux heat only"
}
}
},
diff --git a/homeassistant/components/ecobee/switch.py b/homeassistant/components/ecobee/switch.py
index 89ee433c072..67be78fb21d 100644
--- a/homeassistant/components/ecobee/switch.py
+++ b/homeassistant/components/ecobee/switch.py
@@ -31,26 +31,25 @@ async def async_setup_entry(
"""Set up the ecobee thermostat switch entity."""
data: EcobeeData = hass.data[DOMAIN]
- entities: list[SwitchEntity] = [
- EcobeeVentilator20MinSwitch(
- data,
- index,
- (await dt_util.async_get_time_zone(thermostat["location"]["timeZone"]))
- or dt_util.get_default_time_zone(),
- )
- for index, thermostat in enumerate(data.ecobee.thermostats)
- if thermostat["settings"]["ventilatorType"] != "none"
- ]
-
- entities.extend(
- (
- EcobeeSwitchAuxHeatOnly(data, index)
+ async_add_entities(
+ [
+ EcobeeVentilator20MinSwitch(
+ data,
+ index,
+ (await dt_util.async_get_time_zone(thermostat["location"]["timeZone"]))
+ or dt_util.get_default_time_zone(),
+ )
for index, thermostat in enumerate(data.ecobee.thermostats)
- if thermostat["settings"]["hasHeatPump"]
- )
+ if thermostat["settings"]["ventilatorType"] != "none"
+ ],
+ update_before_add=True,
)
- async_add_entities(entities, update_before_add=True)
+ async_add_entities(
+ EcobeeSwitchAuxHeatOnly(data, index)
+ for index, thermostat in enumerate(data.ecobee.thermostats)
+ if thermostat["settings"]["hasHeatPump"]
+ )
class EcobeeVentilator20MinSwitch(EcobeeBaseEntity, SwitchEntity):
diff --git a/homeassistant/components/ecovacs/manifest.json b/homeassistant/components/ecovacs/manifest.json
index 0ab9f9a4612..33977b3b0de 100644
--- a/homeassistant/components/ecovacs/manifest.json
+++ b/homeassistant/components/ecovacs/manifest.json
@@ -6,5 +6,5 @@
"documentation": "https://www.home-assistant.io/integrations/ecovacs",
"iot_class": "cloud_push",
"loggers": ["sleekxmppfs", "sucks", "deebot_client"],
- "requirements": ["py-sucks==0.9.10", "deebot-client==8.4.1"]
+ "requirements": ["py-sucks==0.9.10", "deebot-client==8.4.0"]
}
diff --git a/homeassistant/components/elevenlabs/config_flow.py b/homeassistant/components/elevenlabs/config_flow.py
index 227150a0f4e..b596ec05b00 100644
--- a/homeassistant/components/elevenlabs/config_flow.py
+++ b/homeassistant/components/elevenlabs/config_flow.py
@@ -14,6 +14,7 @@ from homeassistant.config_entries import (
ConfigFlow,
ConfigFlowResult,
OptionsFlow,
+ OptionsFlowWithConfigEntry,
)
from homeassistant.const import CONF_API_KEY
from homeassistant.core import HomeAssistant
@@ -102,12 +103,13 @@ class ElevenLabsConfigFlow(ConfigFlow, domain=DOMAIN):
return ElevenLabsOptionsFlow(config_entry)
-class ElevenLabsOptionsFlow(OptionsFlow):
+class ElevenLabsOptionsFlow(OptionsFlowWithConfigEntry):
"""ElevenLabs options flow."""
def __init__(self, config_entry: ConfigEntry) -> None:
"""Initialize options flow."""
- self.api_key: str = config_entry.data[CONF_API_KEY]
+ super().__init__(config_entry)
+ self.api_key: str = self.config_entry.data[CONF_API_KEY]
# id -> name
self.voices: dict[str, str] = {}
self.models: dict[str, str] = {}
@@ -168,7 +170,7 @@ class ElevenLabsOptionsFlow(OptionsFlow):
vol.Required(CONF_CONFIGURE_VOICE, default=False): bool,
}
),
- self.config_entry.options,
+ self.options,
)
async def async_step_voice_settings(
diff --git a/homeassistant/components/emoncms/__init__.py b/homeassistant/components/emoncms/__init__.py
index 0cd686b5b56..98ed6328578 100644
--- a/homeassistant/components/emoncms/__init__.py
+++ b/homeassistant/components/emoncms/__init__.py
@@ -5,11 +5,8 @@ from pyemoncms import EmoncmsClient
from homeassistant.config_entries import ConfigEntry
from homeassistant.const import CONF_API_KEY, CONF_URL, Platform
from homeassistant.core import HomeAssistant
-from homeassistant.helpers import entity_registry as er
from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
-from .const import DOMAIN, EMONCMS_UUID_DOC_URL, LOGGER
from .coordinator import EmoncmsCoordinator
PLATFORMS: list[Platform] = [Platform.SENSOR]
@@ -17,49 +14,6 @@ PLATFORMS: list[Platform] = [Platform.SENSOR]
type EmonCMSConfigEntry = ConfigEntry[EmoncmsCoordinator]
-def _migrate_unique_id(
- hass: HomeAssistant, entry: EmonCMSConfigEntry, emoncms_unique_id: str
-) -> None:
- """Migrate to emoncms unique id if needed."""
- ent_reg = er.async_get(hass)
- entry_entities = ent_reg.entities.get_entries_for_config_entry_id(entry.entry_id)
- for entity in entry_entities:
- if entity.unique_id.split("-")[0] == entry.entry_id:
- feed_id = entity.unique_id.split("-")[-1]
- LOGGER.debug(f"moving feed {feed_id} to hardware uuid")
- ent_reg.async_update_entity(
- entity.entity_id, new_unique_id=f"{emoncms_unique_id}-{feed_id}"
- )
- hass.config_entries.async_update_entry(
- entry,
- unique_id=emoncms_unique_id,
- )
-
-
-async def _check_unique_id_migration(
- hass: HomeAssistant, entry: EmonCMSConfigEntry, emoncms_client: EmoncmsClient
-) -> None:
- """Check if we can migrate to the emoncms uuid."""
- emoncms_unique_id = await emoncms_client.async_get_uuid()
- if emoncms_unique_id:
- if entry.unique_id != emoncms_unique_id:
- _migrate_unique_id(hass, entry, emoncms_unique_id)
- else:
- async_create_issue(
- hass,
- DOMAIN,
- "migrate database",
- is_fixable=False,
- issue_domain=DOMAIN,
- severity=IssueSeverity.WARNING,
- translation_key="migrate_database",
- translation_placeholders={
- "url": entry.data[CONF_URL],
- "doc_url": EMONCMS_UUID_DOC_URL,
- },
- )
-
-
async def async_setup_entry(hass: HomeAssistant, entry: EmonCMSConfigEntry) -> bool:
"""Load a config entry."""
emoncms_client = EmoncmsClient(
@@ -67,7 +21,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: EmonCMSConfigEntry) -> b
entry.data[CONF_API_KEY],
session=async_get_clientsession(hass),
)
- await _check_unique_id_migration(hass, entry, emoncms_client)
coordinator = EmoncmsCoordinator(hass, emoncms_client)
await coordinator.async_config_entry_first_refresh()
entry.runtime_data = coordinator
diff --git a/homeassistant/components/emoncms/config_flow.py b/homeassistant/components/emoncms/config_flow.py
index e0d4d0d03e9..fdd5d29788e 100644
--- a/homeassistant/components/emoncms/config_flow.py
+++ b/homeassistant/components/emoncms/config_flow.py
@@ -1,7 +1,5 @@
"""Configflow for the emoncms integration."""
-from __future__ import annotations
-
from typing import Any
from pyemoncms import EmoncmsClient
@@ -11,10 +9,10 @@ from homeassistant.config_entries import (
ConfigEntry,
ConfigFlow,
ConfigFlowResult,
- OptionsFlow,
+ OptionsFlowWithConfigEntry,
)
from homeassistant.const import CONF_API_KEY, CONF_URL
-from homeassistant.core import callback
+from homeassistant.core import HomeAssistant, callback
from homeassistant.helpers.aiohttp_client import async_get_clientsession
from homeassistant.helpers.selector import selector
from homeassistant.helpers.typing import ConfigType
@@ -48,10 +46,13 @@ def sensor_name(url: str) -> str:
return f"emoncms@{sensorip}"
-async def get_feed_list(
- emoncms_client: EmoncmsClient,
-) -> dict[str, Any]:
+async def get_feed_list(hass: HomeAssistant, url: str, api_key: str) -> dict[str, Any]:
"""Check connection to emoncms and return feed list if successful."""
+ emoncms_client = EmoncmsClient(
+ url,
+ api_key,
+ session=async_get_clientsession(hass),
+ )
return await emoncms_client.async_request("/feed/list.json")
@@ -67,7 +68,7 @@ class EmoncmsConfigFlow(ConfigFlow, domain=DOMAIN):
@callback
def async_get_options_flow(
config_entry: ConfigEntry,
- ) -> EmoncmsOptionsFlow:
+ ) -> OptionsFlowWithConfigEntry:
"""Get the options flow for this handler."""
return EmoncmsOptionsFlow(config_entry)
@@ -76,28 +77,23 @@ class EmoncmsConfigFlow(ConfigFlow, domain=DOMAIN):
) -> ConfigFlowResult:
"""Initiate a flow via the UI."""
errors: dict[str, str] = {}
- description_placeholders = {}
if user_input is not None:
- self.url = user_input[CONF_URL]
- self.api_key = user_input[CONF_API_KEY]
self._async_abort_entries_match(
{
- CONF_API_KEY: self.api_key,
- CONF_URL: self.url,
+ CONF_API_KEY: user_input[CONF_API_KEY],
+ CONF_URL: user_input[CONF_URL],
}
)
- emoncms_client = EmoncmsClient(
- self.url, self.api_key, session=async_get_clientsession(self.hass)
+ result = await get_feed_list(
+ self.hass, user_input[CONF_URL], user_input[CONF_API_KEY]
)
- result = await get_feed_list(emoncms_client)
if not result[CONF_SUCCESS]:
- errors["base"] = "api_error"
- description_placeholders = {"details": result[CONF_MESSAGE]}
+ errors["base"] = result[CONF_MESSAGE]
else:
self.include_only_feeds = user_input.get(CONF_ONLY_INCLUDE_FEEDID)
- await self.async_set_unique_id(await emoncms_client.async_get_uuid())
- self._abort_if_unique_id_configured()
+ self.url = user_input[CONF_URL]
+ self.api_key = user_input[CONF_API_KEY]
options = get_options(result[CONF_MESSAGE])
self.dropdown = {
"options": options,
@@ -117,7 +113,6 @@ class EmoncmsConfigFlow(ConfigFlow, domain=DOMAIN):
user_input,
),
errors=errors,
- description_placeholders=description_placeholders,
)
async def async_step_choose_feeds(
@@ -172,41 +167,32 @@ class EmoncmsConfigFlow(ConfigFlow, domain=DOMAIN):
return result
-class EmoncmsOptionsFlow(OptionsFlow):
+class EmoncmsOptionsFlow(OptionsFlowWithConfigEntry):
"""Emoncms Options flow handler."""
- def __init__(self, config_entry: ConfigEntry) -> None:
- """Initialize emoncms options flow."""
- self._url = config_entry.data[CONF_URL]
- self._api_key = config_entry.data[CONF_API_KEY]
-
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Manage the options."""
errors: dict[str, str] = {}
- description_placeholders = {}
- include_only_feeds = self.config_entry.options.get(
- CONF_ONLY_INCLUDE_FEEDID,
- self.config_entry.data.get(CONF_ONLY_INCLUDE_FEEDID, []),
- )
+ data = self.options if self.options else self._config_entry.data
+ url = data[CONF_URL]
+ api_key = data[CONF_API_KEY]
+ include_only_feeds = data.get(CONF_ONLY_INCLUDE_FEEDID, [])
options: list = include_only_feeds
- emoncms_client = EmoncmsClient(
- self._url,
- self._api_key,
- session=async_get_clientsession(self.hass),
- )
- result = await get_feed_list(emoncms_client)
+ result = await get_feed_list(self.hass, url, api_key)
if not result[CONF_SUCCESS]:
- errors["base"] = "api_error"
- description_placeholders = {"details": result[CONF_MESSAGE]}
+ errors["base"] = result[CONF_MESSAGE]
else:
options = get_options(result[CONF_MESSAGE])
dropdown = {"options": options, "mode": "dropdown", "multiple": True}
if user_input:
include_only_feeds = user_input[CONF_ONLY_INCLUDE_FEEDID]
return self.async_create_entry(
+ title=sensor_name(url),
data={
+ CONF_URL: url,
+ CONF_API_KEY: api_key,
CONF_ONLY_INCLUDE_FEEDID: include_only_feeds,
},
)
@@ -221,5 +207,4 @@ class EmoncmsOptionsFlow(OptionsFlow):
}
),
errors=errors,
- description_placeholders=description_placeholders,
)
diff --git a/homeassistant/components/emoncms/const.py b/homeassistant/components/emoncms/const.py
index c53f7cc8a9f..256db5726bb 100644
--- a/homeassistant/components/emoncms/const.py
+++ b/homeassistant/components/emoncms/const.py
@@ -7,10 +7,6 @@ CONF_ONLY_INCLUDE_FEEDID = "include_only_feed_id"
CONF_MESSAGE = "message"
CONF_SUCCESS = "success"
DOMAIN = "emoncms"
-EMONCMS_UUID_DOC_URL = (
- "https://docs.openenergymonitor.org/emoncms/update.html"
- "#upgrading-to-a-version-producing-a-unique-identifier"
-)
FEED_ID = "id"
FEED_NAME = "name"
FEED_TAG = "tag"
diff --git a/homeassistant/components/emoncms/sensor.py b/homeassistant/components/emoncms/sensor.py
index c696a569135..4add7c9625d 100644
--- a/homeassistant/components/emoncms/sensor.py
+++ b/homeassistant/components/emoncms/sensor.py
@@ -138,30 +138,29 @@ async def async_setup_entry(
async_add_entities: AddEntitiesCallback,
) -> None:
"""Set up the emoncms sensors."""
- name = sensor_name(entry.data[CONF_URL])
- exclude_feeds = entry.data.get(CONF_EXCLUDE_FEEDID)
- include_only_feeds = entry.options.get(
- CONF_ONLY_INCLUDE_FEEDID, entry.data.get(CONF_ONLY_INCLUDE_FEEDID)
- )
+ config = entry.options if entry.options else entry.data
+ name = sensor_name(config[CONF_URL])
+ exclude_feeds = config.get(CONF_EXCLUDE_FEEDID)
+ include_only_feeds = config.get(CONF_ONLY_INCLUDE_FEEDID)
if exclude_feeds is None and include_only_feeds is None:
return
coordinator = entry.runtime_data
- # uuid was added in emoncms database 11.5.7
- unique_id = entry.unique_id if entry.unique_id else entry.entry_id
elems = coordinator.data
if not elems:
return
+
sensors: list[EmonCmsSensor] = []
for idx, elem in enumerate(elems):
if include_only_feeds is not None and elem[FEED_ID] not in include_only_feeds:
continue
+
sensors.append(
EmonCmsSensor(
coordinator,
- unique_id,
+ entry.entry_id,
elem["unit"],
name,
idx,
@@ -176,7 +175,7 @@ class EmonCmsSensor(CoordinatorEntity[EmoncmsCoordinator], SensorEntity):
def __init__(
self,
coordinator: EmoncmsCoordinator,
- unique_id: str,
+ entry_id: str,
unit_of_measurement: str | None,
name: str,
idx: int,
@@ -189,7 +188,7 @@ class EmonCmsSensor(CoordinatorEntity[EmoncmsCoordinator], SensorEntity):
elem = self.coordinator.data[self.idx]
self._attr_name = f"{name} {elem[FEED_NAME]}"
self._attr_native_unit_of_measurement = unit_of_measurement
- self._attr_unique_id = f"{unique_id}-{elem[FEED_ID]}"
+ self._attr_unique_id = f"{entry_id}-{elem[FEED_ID]}"
if unit_of_measurement in ("kWh", "Wh"):
self._attr_device_class = SensorDeviceClass.ENERGY
self._attr_state_class = SensorStateClass.TOTAL_INCREASING
diff --git a/homeassistant/components/emoncms/strings.json b/homeassistant/components/emoncms/strings.json
index 0d841f2efb4..4a700cc8981 100644
--- a/homeassistant/components/emoncms/strings.json
+++ b/homeassistant/components/emoncms/strings.json
@@ -1,8 +1,5 @@
{
"config": {
- "error": {
- "api_error": "An error occured in the pyemoncms API : {details}"
- },
"step": {
"user": {
"data": {
@@ -19,15 +16,9 @@
"include_only_feed_id": "Choose feeds to include"
}
}
- },
- "abort": {
- "already_configured": "This server is already configured"
}
},
"options": {
- "error": {
- "api_error": "[%key:component::emoncms::config::error::api_error%]"
- },
"step": {
"init": {
"data": {
@@ -44,10 +35,6 @@
"missing_include_only_feed_id": {
"title": "No feed synchronized with the {domain} sensor",
"description": "Configuring {domain} using YAML is being removed.\n\nPlease add manually the feeds you want to synchronize with the `configure` button of the integration."
- },
- "migrate_database": {
- "title": "Upgrade your emoncms version",
- "description": "Your [emoncms]({url}) does not ship a unique identifier.\n\n Please upgrade to at least version 11.5.7 and migrate your emoncms database.\n\n More info on [emoncms documentation]({doc_url})"
}
}
}
diff --git a/homeassistant/components/emulated_kasa/manifest.json b/homeassistant/components/emulated_kasa/manifest.json
index d4889c0c5f5..f1a01f9d7aa 100644
--- a/homeassistant/components/emulated_kasa/manifest.json
+++ b/homeassistant/components/emulated_kasa/manifest.json
@@ -6,5 +6,5 @@
"iot_class": "local_push",
"loggers": ["sense_energy"],
"quality_scale": "internal",
- "requirements": ["sense-energy==0.13.3"]
+ "requirements": ["sense-energy==0.13.2"]
}
diff --git a/homeassistant/components/energy/data.py b/homeassistant/components/energy/data.py
index ff86177cf41..9c5a9fbacd1 100644
--- a/homeassistant/components/energy/data.py
+++ b/homeassistant/components/energy/data.py
@@ -331,7 +331,7 @@ class EnergyManager:
"device_consumption",
):
if key in update:
- data[key] = update[key]
+ data[key] = update[key] # type: ignore[literal-required]
self.data = data
self._store.async_delay_save(lambda: data, 60)
diff --git a/homeassistant/components/enphase_envoy/config_flow.py b/homeassistant/components/enphase_envoy/config_flow.py
index 23c769293c8..d04f77d8e88 100644
--- a/homeassistant/components/enphase_envoy/config_flow.py
+++ b/homeassistant/components/enphase_envoy/config_flow.py
@@ -16,7 +16,7 @@ from homeassistant.config_entries import (
ConfigEntry,
ConfigFlow,
ConfigFlowResult,
- OptionsFlow,
+ OptionsFlowWithConfigEntry,
)
from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PASSWORD, CONF_USERNAME
from homeassistant.core import HomeAssistant, callback
@@ -66,11 +66,9 @@ class EnphaseConfigFlow(ConfigFlow, domain=DOMAIN):
@staticmethod
@callback
- def async_get_options_flow(
- config_entry: ConfigEntry,
- ) -> EnvoyOptionsFlowHandler:
+ def async_get_options_flow(config_entry: ConfigEntry) -> EnvoyOptionsFlowHandler:
"""Options flow handler for Enphase_Envoy."""
- return EnvoyOptionsFlowHandler()
+ return EnvoyOptionsFlowHandler(config_entry)
@callback
def _async_generate_schema(self) -> vol.Schema:
@@ -290,7 +288,7 @@ class EnphaseConfigFlow(ConfigFlow, domain=DOMAIN):
)
-class EnvoyOptionsFlowHandler(OptionsFlow):
+class EnvoyOptionsFlowHandler(OptionsFlowWithConfigEntry):
"""Envoy config flow options handler."""
async def async_step_init(
diff --git a/homeassistant/components/eq3btsmart/__init__.py b/homeassistant/components/eq3btsmart/__init__.py
index 84b27161edd..f63e627ea7d 100644
--- a/homeassistant/components/eq3btsmart/__init__.py
+++ b/homeassistant/components/eq3btsmart/__init__.py
@@ -15,23 +15,17 @@ from homeassistant.core import HomeAssistant
from homeassistant.exceptions import ConfigEntryNotReady
from homeassistant.helpers.dispatcher import async_dispatcher_send
-from .const import SIGNAL_THERMOSTAT_CONNECTED, SIGNAL_THERMOSTAT_DISCONNECTED
+from .const import DOMAIN, SIGNAL_THERMOSTAT_CONNECTED, SIGNAL_THERMOSTAT_DISCONNECTED
from .models import Eq3Config, Eq3ConfigEntryData
PLATFORMS = [
- Platform.BINARY_SENSOR,
Platform.CLIMATE,
- Platform.NUMBER,
- Platform.SWITCH,
]
_LOGGER = logging.getLogger(__name__)
-type Eq3ConfigEntry = ConfigEntry[Eq3ConfigEntryData]
-
-
-async def async_setup_entry(hass: HomeAssistant, entry: Eq3ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
"""Handle config entry setup."""
mac_address: str | None = entry.unique_id
@@ -59,11 +53,12 @@ async def async_setup_entry(hass: HomeAssistant, entry: Eq3ConfigEntry) -> bool:
ble_device=device,
)
- entry.runtime_data = Eq3ConfigEntryData(
- eq3_config=eq3_config, thermostat=thermostat
- )
+ eq3_config_entry = Eq3ConfigEntryData(eq3_config=eq3_config, thermostat=thermostat)
+ hass.data.setdefault(DOMAIN, {})[entry.entry_id] = eq3_config_entry
+
entry.async_on_unload(entry.add_update_listener(update_listener))
await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+
entry.async_create_background_task(
hass, _async_run_thermostat(hass, entry), entry.entry_id
)
@@ -71,27 +66,29 @@ async def async_setup_entry(hass: HomeAssistant, entry: Eq3ConfigEntry) -> bool:
return True
-async def async_unload_entry(hass: HomeAssistant, entry: Eq3ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
"""Handle config entry unload."""
if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
- await entry.runtime_data.thermostat.async_disconnect()
+ eq3_config_entry: Eq3ConfigEntryData = hass.data[DOMAIN].pop(entry.entry_id)
+ await eq3_config_entry.thermostat.async_disconnect()
return unload_ok
-async def update_listener(hass: HomeAssistant, entry: Eq3ConfigEntry) -> None:
+async def update_listener(hass: HomeAssistant, entry: ConfigEntry) -> None:
"""Handle config entry update."""
await hass.config_entries.async_reload(entry.entry_id)
-async def _async_run_thermostat(hass: HomeAssistant, entry: Eq3ConfigEntry) -> None:
+async def _async_run_thermostat(hass: HomeAssistant, entry: ConfigEntry) -> None:
"""Run the thermostat."""
- thermostat = entry.runtime_data.thermostat
- mac_address = entry.runtime_data.eq3_config.mac_address
- scan_interval = entry.runtime_data.eq3_config.scan_interval
+ eq3_config_entry: Eq3ConfigEntryData = hass.data[DOMAIN][entry.entry_id]
+ thermostat = eq3_config_entry.thermostat
+ mac_address = eq3_config_entry.eq3_config.mac_address
+ scan_interval = eq3_config_entry.eq3_config.scan_interval
await _async_reconnect_thermostat(hass, entry)
@@ -120,14 +117,13 @@ async def _async_run_thermostat(hass: HomeAssistant, entry: Eq3ConfigEntry) -> N
await asyncio.sleep(scan_interval)
-async def _async_reconnect_thermostat(
- hass: HomeAssistant, entry: Eq3ConfigEntry
-) -> None:
+async def _async_reconnect_thermostat(hass: HomeAssistant, entry: ConfigEntry) -> None:
"""Reconnect the thermostat."""
- thermostat = entry.runtime_data.thermostat
- mac_address = entry.runtime_data.eq3_config.mac_address
- scan_interval = entry.runtime_data.eq3_config.scan_interval
+ eq3_config_entry: Eq3ConfigEntryData = hass.data[DOMAIN][entry.entry_id]
+ thermostat = eq3_config_entry.thermostat
+ mac_address = eq3_config_entry.eq3_config.mac_address
+ scan_interval = eq3_config_entry.eq3_config.scan_interval
while True:
try:
diff --git a/homeassistant/components/eq3btsmart/binary_sensor.py b/homeassistant/components/eq3btsmart/binary_sensor.py
deleted file mode 100644
index 27525d47972..00000000000
--- a/homeassistant/components/eq3btsmart/binary_sensor.py
+++ /dev/null
@@ -1,86 +0,0 @@
-"""Platform for eq3 binary sensor entities."""
-
-from collections.abc import Callable
-from dataclasses import dataclass
-from typing import TYPE_CHECKING
-
-from eq3btsmart.models import Status
-
-from homeassistant.components.binary_sensor import (
- BinarySensorDeviceClass,
- BinarySensorEntity,
- BinarySensorEntityDescription,
-)
-from homeassistant.const import EntityCategory
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-
-from . import Eq3ConfigEntry
-from .const import ENTITY_KEY_BATTERY, ENTITY_KEY_DST, ENTITY_KEY_WINDOW
-from .entity import Eq3Entity
-
-
-@dataclass(frozen=True, kw_only=True)
-class Eq3BinarySensorEntityDescription(BinarySensorEntityDescription):
- """Entity description for eq3 binary sensors."""
-
- value_func: Callable[[Status], bool]
-
-
-BINARY_SENSOR_ENTITY_DESCRIPTIONS = [
- Eq3BinarySensorEntityDescription(
- value_func=lambda status: status.is_low_battery,
- key=ENTITY_KEY_BATTERY,
- device_class=BinarySensorDeviceClass.BATTERY,
- entity_category=EntityCategory.DIAGNOSTIC,
- ),
- Eq3BinarySensorEntityDescription(
- value_func=lambda status: status.is_window_open,
- key=ENTITY_KEY_WINDOW,
- device_class=BinarySensorDeviceClass.WINDOW,
- ),
- Eq3BinarySensorEntityDescription(
- value_func=lambda status: status.is_dst,
- key=ENTITY_KEY_DST,
- translation_key=ENTITY_KEY_DST,
- entity_category=EntityCategory.DIAGNOSTIC,
- ),
-]
-
-
-async def async_setup_entry(
- hass: HomeAssistant,
- entry: Eq3ConfigEntry,
- async_add_entities: AddEntitiesCallback,
-) -> None:
- """Set up the entry."""
-
- async_add_entities(
- Eq3BinarySensorEntity(entry, entity_description)
- for entity_description in BINARY_SENSOR_ENTITY_DESCRIPTIONS
- )
-
-
-class Eq3BinarySensorEntity(Eq3Entity, BinarySensorEntity):
- """Base class for eQ-3 binary sensor entities."""
-
- entity_description: Eq3BinarySensorEntityDescription
-
- def __init__(
- self,
- entry: Eq3ConfigEntry,
- entity_description: Eq3BinarySensorEntityDescription,
- ) -> None:
- """Initialize the entity."""
-
- super().__init__(entry, entity_description.key)
- self.entity_description = entity_description
-
- @property
- def is_on(self) -> bool:
- """Return the state of the binary sensor."""
-
- if TYPE_CHECKING:
- assert self._thermostat.status is not None
-
- return self.entity_description.value_func(self._thermostat.status)
diff --git a/homeassistant/components/eq3btsmart/climate.py b/homeassistant/components/eq3btsmart/climate.py
index ae01d0fc9a7..7b8ccb6c990 100644
--- a/homeassistant/components/eq3btsmart/climate.py
+++ b/homeassistant/components/eq3btsmart/climate.py
@@ -3,6 +3,7 @@
import logging
from typing import Any
+from eq3btsmart import Thermostat
from eq3btsmart.const import EQ3BT_MAX_TEMP, EQ3BT_OFF_TEMP, Eq3Preset, OperationMode
from eq3btsmart.exceptions import Eq3Exception
@@ -14,35 +15,45 @@ from homeassistant.components.climate import (
HVACAction,
HVACMode,
)
+from homeassistant.config_entries import ConfigEntry
from homeassistant.const import ATTR_TEMPERATURE, PRECISION_HALVES, UnitOfTemperature
from homeassistant.core import HomeAssistant, callback
from homeassistant.exceptions import ServiceValidationError
from homeassistant.helpers import device_registry as dr
-from homeassistant.helpers.device_registry import CONNECTION_BLUETOOTH
+from homeassistant.helpers.device_registry import CONNECTION_BLUETOOTH, DeviceInfo
+from homeassistant.helpers.dispatcher import async_dispatcher_connect
from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.util import slugify
-from . import Eq3ConfigEntry
from .const import (
+ DEVICE_MODEL,
+ DOMAIN,
EQ_TO_HA_HVAC,
HA_TO_EQ_HVAC,
+ MANUFACTURER,
+ SIGNAL_THERMOSTAT_CONNECTED,
+ SIGNAL_THERMOSTAT_DISCONNECTED,
CurrentTemperatureSelector,
Preset,
TargetTemperatureSelector,
)
from .entity import Eq3Entity
+from .models import Eq3Config, Eq3ConfigEntryData
_LOGGER = logging.getLogger(__name__)
async def async_setup_entry(
hass: HomeAssistant,
- entry: Eq3ConfigEntry,
+ config_entry: ConfigEntry,
async_add_entities: AddEntitiesCallback,
) -> None:
"""Handle config entry setup."""
+ eq3_config_entry: Eq3ConfigEntryData = hass.data[DOMAIN][config_entry.entry_id]
+
async_add_entities(
- [Eq3Climate(entry)],
+ [Eq3Climate(eq3_config_entry.eq3_config, eq3_config_entry.thermostat)],
)
@@ -69,6 +80,53 @@ class Eq3Climate(Eq3Entity, ClimateEntity):
_attr_preset_mode: str | None = None
_target_temperature: float | None = None
+ def __init__(self, eq3_config: Eq3Config, thermostat: Thermostat) -> None:
+ """Initialize the climate entity."""
+
+ super().__init__(eq3_config, thermostat)
+ self._attr_unique_id = dr.format_mac(eq3_config.mac_address)
+ self._attr_device_info = DeviceInfo(
+ name=slugify(self._eq3_config.mac_address),
+ manufacturer=MANUFACTURER,
+ model=DEVICE_MODEL,
+ connections={(CONNECTION_BLUETOOTH, self._eq3_config.mac_address)},
+ )
+
+ async def async_added_to_hass(self) -> None:
+ """Run when entity about to be added to hass."""
+
+ self._thermostat.register_update_callback(self._async_on_updated)
+
+ self.async_on_remove(
+ async_dispatcher_connect(
+ self.hass,
+ f"{SIGNAL_THERMOSTAT_DISCONNECTED}_{self._eq3_config.mac_address}",
+ self._async_on_disconnected,
+ )
+ )
+ self.async_on_remove(
+ async_dispatcher_connect(
+ self.hass,
+ f"{SIGNAL_THERMOSTAT_CONNECTED}_{self._eq3_config.mac_address}",
+ self._async_on_connected,
+ )
+ )
+
+ async def async_will_remove_from_hass(self) -> None:
+ """Run when entity will be removed from hass."""
+
+ self._thermostat.unregister_update_callback(self._async_on_updated)
+
+ @callback
+ def _async_on_disconnected(self) -> None:
+ self._attr_available = False
+ self.async_write_ha_state()
+
+ @callback
+ def _async_on_connected(self) -> None:
+ self._attr_available = True
+ self.async_write_ha_state()
+
@callback
def _async_on_updated(self) -> None:
"""Handle updated data from the thermostat."""
@@ -79,15 +137,12 @@ class Eq3Climate(Eq3Entity, ClimateEntity):
if self._thermostat.device_data is not None:
self._async_on_device_updated()
- super()._async_on_updated()
+ self.async_write_ha_state()
@callback
def _async_on_status_updated(self) -> None:
"""Handle updated status from the thermostat."""
- if self._thermostat.status is None:
- return
-
self._target_temperature = self._thermostat.status.target_temperature.value
self._attr_hvac_mode = EQ_TO_HA_HVAC[self._thermostat.status.operation_mode]
self._attr_current_temperature = self._get_current_temperature()
@@ -99,16 +154,13 @@ class Eq3Climate(Eq3Entity, ClimateEntity):
def _async_on_device_updated(self) -> None:
"""Handle updated device data from the thermostat."""
- if self._thermostat.device_data is None:
- return
-
device_registry = dr.async_get(self.hass)
if device := device_registry.async_get_device(
connections={(CONNECTION_BLUETOOTH, self._eq3_config.mac_address)},
):
device_registry.async_update_device(
device.id,
- sw_version=str(self._thermostat.device_data.firmware_version),
+ sw_version=self._thermostat.device_data.firmware_version,
serial_number=self._thermostat.device_data.device_serial.value,
)
@@ -213,7 +265,7 @@ class Eq3Climate(Eq3Entity, ClimateEntity):
self.async_write_ha_state()
try:
- await self._thermostat.async_set_temperature(temperature)
+ await self._thermostat.async_set_temperature(self._target_temperature)
except Eq3Exception:
_LOGGER.error(
"[%s] Failed setting temperature", self._eq3_config.mac_address
diff --git a/homeassistant/components/eq3btsmart/const.py b/homeassistant/components/eq3btsmart/const.py
index 78292940e60..111c4d0eba4 100644
--- a/homeassistant/components/eq3btsmart/const.py
+++ b/homeassistant/components/eq3btsmart/const.py
@@ -18,20 +18,9 @@ DOMAIN = "eq3btsmart"
MANUFACTURER = "eQ-3 AG"
DEVICE_MODEL = "CC-RT-BLE-EQ"
-ENTITY_KEY_DST = "dst"
-ENTITY_KEY_BATTERY = "battery"
-ENTITY_KEY_WINDOW = "window"
-ENTITY_KEY_LOCK = "lock"
-ENTITY_KEY_BOOST = "boost"
-ENTITY_KEY_AWAY = "away"
-ENTITY_KEY_COMFORT = "comfort"
-ENTITY_KEY_ECO = "eco"
-ENTITY_KEY_OFFSET = "offset"
-ENTITY_KEY_WINDOW_OPEN_TEMPERATURE = "window_open_temperature"
-ENTITY_KEY_WINDOW_OPEN_TIMEOUT = "window_open_timeout"
-
GET_DEVICE_TIMEOUT = 5 # seconds
+
EQ_TO_HA_HVAC: dict[OperationMode, HVACMode] = {
OperationMode.OFF: HVACMode.OFF,
OperationMode.ON: HVACMode.HEAT,
@@ -82,5 +71,3 @@ DEFAULT_SCAN_INTERVAL = 10 # seconds
SIGNAL_THERMOSTAT_DISCONNECTED = f"{DOMAIN}.thermostat_disconnected"
SIGNAL_THERMOSTAT_CONNECTED = f"{DOMAIN}.thermostat_connected"
-
-EQ3BT_STEP = 0.5
diff --git a/homeassistant/components/eq3btsmart/entity.py b/homeassistant/components/eq3btsmart/entity.py
index e68545c08c7..e8c00d4e3cf 100644
--- a/homeassistant/components/eq3btsmart/entity.py
+++ b/homeassistant/components/eq3btsmart/entity.py
@@ -1,22 +1,10 @@
"""Base class for all eQ-3 entities."""
-from homeassistant.core import callback
-from homeassistant.helpers.device_registry import (
- CONNECTION_BLUETOOTH,
- DeviceInfo,
- format_mac,
-)
-from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity import Entity
-from homeassistant.util import slugify
+from eq3btsmart.thermostat import Thermostat
-from . import Eq3ConfigEntry
-from .const import (
- DEVICE_MODEL,
- MANUFACTURER,
- SIGNAL_THERMOSTAT_CONNECTED,
- SIGNAL_THERMOSTAT_DISCONNECTED,
-)
+from homeassistant.helpers.entity import Entity
+
+from .models import Eq3Config
class Eq3Entity(Entity):
@@ -24,70 +12,8 @@ class Eq3Entity(Entity):
_attr_has_entity_name = True
- def __init__(
- self,
- entry: Eq3ConfigEntry,
- unique_id_key: str | None = None,
- ) -> None:
+ def __init__(self, eq3_config: Eq3Config, thermostat: Thermostat) -> None:
"""Initialize the eq3 entity."""
- self._eq3_config = entry.runtime_data.eq3_config
- self._thermostat = entry.runtime_data.thermostat
- self._attr_device_info = DeviceInfo(
- name=slugify(self._eq3_config.mac_address),
- manufacturer=MANUFACTURER,
- model=DEVICE_MODEL,
- connections={(CONNECTION_BLUETOOTH, self._eq3_config.mac_address)},
- )
- suffix = f"_{unique_id_key}" if unique_id_key else ""
- self._attr_unique_id = f"{format_mac(self._eq3_config.mac_address)}{suffix}"
-
- async def async_added_to_hass(self) -> None:
- """Run when entity about to be added to hass."""
-
- self._thermostat.register_update_callback(self._async_on_updated)
-
- self.async_on_remove(
- async_dispatcher_connect(
- self.hass,
- f"{SIGNAL_THERMOSTAT_DISCONNECTED}_{self._eq3_config.mac_address}",
- self._async_on_disconnected,
- )
- )
- self.async_on_remove(
- async_dispatcher_connect(
- self.hass,
- f"{SIGNAL_THERMOSTAT_CONNECTED}_{self._eq3_config.mac_address}",
- self._async_on_connected,
- )
- )
-
- async def async_will_remove_from_hass(self) -> None:
- """Run when entity will be removed from hass."""
-
- self._thermostat.unregister_update_callback(self._async_on_updated)
-
- def _async_on_updated(self) -> None:
- """Handle updated data from the thermostat."""
-
- self.async_write_ha_state()
-
- @callback
- def _async_on_disconnected(self) -> None:
- """Handle disconnection from the thermostat."""
-
- self._attr_available = False
- self.async_write_ha_state()
-
- @callback
- def _async_on_connected(self) -> None:
- """Handle connection to the thermostat."""
-
- self._attr_available = True
- self.async_write_ha_state()
-
- @property
- def available(self) -> bool:
- """Whether the entity is available."""
-
- return self._thermostat.status is not None and self._attr_available
+ self._eq3_config = eq3_config
+ self._thermostat = thermostat
diff --git a/homeassistant/components/eq3btsmart/icons.json b/homeassistant/components/eq3btsmart/icons.json
deleted file mode 100644
index e6eb7532f37..00000000000
--- a/homeassistant/components/eq3btsmart/icons.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
- "entity": {
- "binary_sensor": {
- "dst": {
- "default": "mdi:sun-clock",
- "state": {
- "off": "mdi:sun-clock-outline"
- }
- }
- },
- "number": {
- "comfort": {
- "default": "mdi:sun-thermometer"
- },
- "eco": {
- "default": "mdi:snowflake-thermometer"
- },
- "offset": {
- "default": "mdi:thermometer-plus"
- },
- "window_open_temperature": {
- "default": "mdi:window-open-variant"
- },
- "window_open_timeout": {
- "default": "mdi:timer-refresh"
- }
- },
- "switch": {
- "away": {
- "default": "mdi:home-account",
- "state": {
- "on": "mdi:home-export"
- }
- },
- "lock": {
- "default": "mdi:lock",
- "state": {
- "off": "mdi:lock-off"
- }
- },
- "boost": {
- "default": "mdi:fire",
- "state": {
- "off": "mdi:fire-off"
- }
- }
- }
- }
-}
diff --git a/homeassistant/components/eq3btsmart/manifest.json b/homeassistant/components/eq3btsmart/manifest.json
index b30f806bf63..e25c675bf82 100644
--- a/homeassistant/components/eq3btsmart/manifest.json
+++ b/homeassistant/components/eq3btsmart/manifest.json
@@ -23,5 +23,5 @@
"iot_class": "local_polling",
"loggers": ["eq3btsmart"],
"quality_scale": "silver",
- "requirements": ["eq3btsmart==1.4.1", "bleak-esphome==1.1.0"]
+ "requirements": ["eq3btsmart==1.2.0", "bleak-esphome==1.1.0"]
}
diff --git a/homeassistant/components/eq3btsmart/models.py b/homeassistant/components/eq3btsmart/models.py
index 858465effa8..8ea0955dbdd 100644
--- a/homeassistant/components/eq3btsmart/models.py
+++ b/homeassistant/components/eq3btsmart/models.py
@@ -2,6 +2,7 @@
from dataclasses import dataclass
+from eq3btsmart.const import DEFAULT_AWAY_HOURS, DEFAULT_AWAY_TEMP
from eq3btsmart.thermostat import Thermostat
from .const import (
@@ -22,6 +23,8 @@ class Eq3Config:
target_temp_selector: TargetTemperatureSelector = DEFAULT_TARGET_TEMP_SELECTOR
external_temp_sensor: str = ""
scan_interval: int = DEFAULT_SCAN_INTERVAL
+ default_away_hours: float = DEFAULT_AWAY_HOURS
+ default_away_temperature: float = DEFAULT_AWAY_TEMP
@dataclass(slots=True)
diff --git a/homeassistant/components/eq3btsmart/number.py b/homeassistant/components/eq3btsmart/number.py
deleted file mode 100644
index 2e069180fa3..00000000000
--- a/homeassistant/components/eq3btsmart/number.py
+++ /dev/null
@@ -1,158 +0,0 @@
-"""Platform for eq3 number entities."""
-
-from collections.abc import Awaitable, Callable
-from dataclasses import dataclass
-from typing import TYPE_CHECKING
-
-from eq3btsmart import Thermostat
-from eq3btsmart.const import (
- EQ3BT_MAX_OFFSET,
- EQ3BT_MAX_TEMP,
- EQ3BT_MIN_OFFSET,
- EQ3BT_MIN_TEMP,
-)
-from eq3btsmart.models import Presets
-
-from homeassistant.components.number import (
- NumberDeviceClass,
- NumberEntity,
- NumberEntityDescription,
- NumberMode,
-)
-from homeassistant.const import EntityCategory, UnitOfTemperature, UnitOfTime
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-
-from . import Eq3ConfigEntry
-from .const import (
- ENTITY_KEY_COMFORT,
- ENTITY_KEY_ECO,
- ENTITY_KEY_OFFSET,
- ENTITY_KEY_WINDOW_OPEN_TEMPERATURE,
- ENTITY_KEY_WINDOW_OPEN_TIMEOUT,
- EQ3BT_STEP,
-)
-from .entity import Eq3Entity
-
-
-@dataclass(frozen=True, kw_only=True)
-class Eq3NumberEntityDescription(NumberEntityDescription):
- """Entity description for eq3 number entities."""
-
- value_func: Callable[[Presets], float]
- value_set_func: Callable[
- [Thermostat],
- Callable[[float], Awaitable[None]],
- ]
- mode: NumberMode = NumberMode.BOX
- entity_category: EntityCategory | None = EntityCategory.CONFIG
-
-
-NUMBER_ENTITY_DESCRIPTIONS = [
- Eq3NumberEntityDescription(
- key=ENTITY_KEY_COMFORT,
- value_func=lambda presets: presets.comfort_temperature.value,
- value_set_func=lambda thermostat: thermostat.async_configure_comfort_temperature,
- translation_key=ENTITY_KEY_COMFORT,
- native_min_value=EQ3BT_MIN_TEMP,
- native_max_value=EQ3BT_MAX_TEMP,
- native_step=EQ3BT_STEP,
- native_unit_of_measurement=UnitOfTemperature.CELSIUS,
- device_class=NumberDeviceClass.TEMPERATURE,
- ),
- Eq3NumberEntityDescription(
- key=ENTITY_KEY_ECO,
- value_func=lambda presets: presets.eco_temperature.value,
- value_set_func=lambda thermostat: thermostat.async_configure_eco_temperature,
- translation_key=ENTITY_KEY_ECO,
- native_min_value=EQ3BT_MIN_TEMP,
- native_max_value=EQ3BT_MAX_TEMP,
- native_step=EQ3BT_STEP,
- native_unit_of_measurement=UnitOfTemperature.CELSIUS,
- device_class=NumberDeviceClass.TEMPERATURE,
- ),
- Eq3NumberEntityDescription(
- key=ENTITY_KEY_WINDOW_OPEN_TEMPERATURE,
- value_func=lambda presets: presets.window_open_temperature.value,
- value_set_func=lambda thermostat: thermostat.async_configure_window_open_temperature,
- translation_key=ENTITY_KEY_WINDOW_OPEN_TEMPERATURE,
- native_min_value=EQ3BT_MIN_TEMP,
- native_max_value=EQ3BT_MAX_TEMP,
- native_step=EQ3BT_STEP,
- native_unit_of_measurement=UnitOfTemperature.CELSIUS,
- device_class=NumberDeviceClass.TEMPERATURE,
- ),
- Eq3NumberEntityDescription(
- key=ENTITY_KEY_OFFSET,
- value_func=lambda presets: presets.offset_temperature.value,
- value_set_func=lambda thermostat: thermostat.async_configure_temperature_offset,
- translation_key=ENTITY_KEY_OFFSET,
- native_min_value=EQ3BT_MIN_OFFSET,
- native_max_value=EQ3BT_MAX_OFFSET,
- native_step=EQ3BT_STEP,
- native_unit_of_measurement=UnitOfTemperature.CELSIUS,
- device_class=NumberDeviceClass.TEMPERATURE,
- ),
- Eq3NumberEntityDescription(
- key=ENTITY_KEY_WINDOW_OPEN_TIMEOUT,
- value_set_func=lambda thermostat: thermostat.async_configure_window_open_duration,
- value_func=lambda presets: presets.window_open_time.value.total_seconds() / 60,
- translation_key=ENTITY_KEY_WINDOW_OPEN_TIMEOUT,
- native_min_value=0,
- native_max_value=60,
- native_step=5,
- native_unit_of_measurement=UnitOfTime.MINUTES,
- ),
-]
-
-
-async def async_setup_entry(
- hass: HomeAssistant,
- entry: Eq3ConfigEntry,
- async_add_entities: AddEntitiesCallback,
-) -> None:
- """Set up the entry."""
-
- async_add_entities(
- Eq3NumberEntity(entry, entity_description)
- for entity_description in NUMBER_ENTITY_DESCRIPTIONS
- )
-
-
-class Eq3NumberEntity(Eq3Entity, NumberEntity):
- """Base class for all eq3 number entities."""
-
- entity_description: Eq3NumberEntityDescription
-
- def __init__(
- self, entry: Eq3ConfigEntry, entity_description: Eq3NumberEntityDescription
- ) -> None:
- """Initialize the entity."""
-
- super().__init__(entry, entity_description.key)
- self.entity_description = entity_description
-
- @property
- def native_value(self) -> float:
- """Return the state of the entity."""
-
- if TYPE_CHECKING:
- assert self._thermostat.status is not None
- assert self._thermostat.status.presets is not None
-
- return self.entity_description.value_func(self._thermostat.status.presets)
-
- async def async_set_native_value(self, value: float) -> None:
- """Set the state of the entity."""
-
- await self.entity_description.value_set_func(self._thermostat)(value)
-
- @property
- def available(self) -> bool:
- """Return whether the entity is available."""
-
- return (
- self._thermostat.status is not None
- and self._thermostat.status.presets is not None
- and self._attr_available
- )
diff --git a/homeassistant/components/eq3btsmart/strings.json b/homeassistant/components/eq3btsmart/strings.json
index acfd5082f45..5108baa1bcf 100644
--- a/homeassistant/components/eq3btsmart/strings.json
+++ b/homeassistant/components/eq3btsmart/strings.json
@@ -18,40 +18,5 @@
"error": {
"invalid_mac_address": "Invalid MAC address"
}
- },
- "entity": {
- "binary_sensor": {
- "dst": {
- "name": "Daylight saving time"
- }
- },
- "number": {
- "comfort": {
- "name": "Comfort temperature"
- },
- "eco": {
- "name": "Eco temperature"
- },
- "offset": {
- "name": "Offset temperature"
- },
- "window_open_temperature": {
- "name": "Window open temperature"
- },
- "window_open_timeout": {
- "name": "Window open timeout"
- }
- },
- "switch": {
- "lock": {
- "name": "Lock"
- },
- "boost": {
- "name": "Boost"
- },
- "away": {
- "name": "Away"
- }
- }
}
}
diff --git a/homeassistant/components/eq3btsmart/switch.py b/homeassistant/components/eq3btsmart/switch.py
deleted file mode 100644
index 7525d8ca494..00000000000
--- a/homeassistant/components/eq3btsmart/switch.py
+++ /dev/null
@@ -1,94 +0,0 @@
-"""Platform for eq3 switch entities."""
-
-from collections.abc import Awaitable, Callable
-from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any
-
-from eq3btsmart import Thermostat
-from eq3btsmart.models import Status
-
-from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-
-from . import Eq3ConfigEntry
-from .const import ENTITY_KEY_AWAY, ENTITY_KEY_BOOST, ENTITY_KEY_LOCK
-from .entity import Eq3Entity
-
-
-@dataclass(frozen=True, kw_only=True)
-class Eq3SwitchEntityDescription(SwitchEntityDescription):
- """Entity description for eq3 switch entities."""
-
- toggle_func: Callable[[Thermostat], Callable[[bool], Awaitable[None]]]
- value_func: Callable[[Status], bool]
-
-
-SWITCH_ENTITY_DESCRIPTIONS = [
- Eq3SwitchEntityDescription(
- key=ENTITY_KEY_LOCK,
- translation_key=ENTITY_KEY_LOCK,
- toggle_func=lambda thermostat: thermostat.async_set_locked,
- value_func=lambda status: status.is_locked,
- ),
- Eq3SwitchEntityDescription(
- key=ENTITY_KEY_BOOST,
- translation_key=ENTITY_KEY_BOOST,
- toggle_func=lambda thermostat: thermostat.async_set_boost,
- value_func=lambda status: status.is_boost,
- ),
- Eq3SwitchEntityDescription(
- key=ENTITY_KEY_AWAY,
- translation_key=ENTITY_KEY_AWAY,
- toggle_func=lambda thermostat: thermostat.async_set_away,
- value_func=lambda status: status.is_away,
- ),
-]
-
-
-async def async_setup_entry(
- hass: HomeAssistant,
- entry: Eq3ConfigEntry,
- async_add_entities: AddEntitiesCallback,
-) -> None:
- """Set up the entry."""
-
- async_add_entities(
- Eq3SwitchEntity(entry, entity_description)
- for entity_description in SWITCH_ENTITY_DESCRIPTIONS
- )
-
-
-class Eq3SwitchEntity(Eq3Entity, SwitchEntity):
- """Base class for eq3 switch entities."""
-
- entity_description: Eq3SwitchEntityDescription
-
- def __init__(
- self,
- entry: Eq3ConfigEntry,
- entity_description: Eq3SwitchEntityDescription,
- ) -> None:
- """Initialize the entity."""
-
- super().__init__(entry, entity_description.key)
- self.entity_description = entity_description
-
- async def async_turn_on(self, **kwargs: Any) -> None:
- """Turn on the switch."""
-
- await self.entity_description.toggle_func(self._thermostat)(True)
-
- async def async_turn_off(self, **kwargs: Any) -> None:
- """Turn off the switch."""
-
- await self.entity_description.toggle_func(self._thermostat)(False)
-
- @property
- def is_on(self) -> bool:
- """Return the state of the switch."""
-
- if TYPE_CHECKING:
- assert self._thermostat.status is not None
-
- return self.entity_description.value_func(self._thermostat.status)
diff --git a/homeassistant/components/esphome/config_flow.py b/homeassistant/components/esphome/config_flow.py
index cb892b314cd..87061b0366f 100644
--- a/homeassistant/components/esphome/config_flow.py
+++ b/homeassistant/components/esphome/config_flow.py
@@ -257,9 +257,6 @@ class EsphomeFlowHandler(ConfigFlow, domain=DOMAIN):
self, discovery_info: MqttServiceInfo
) -> ConfigFlowResult:
"""Handle MQTT discovery."""
- if not discovery_info.payload:
- return self.async_abort(reason="mqtt_missing_payload")
-
device_info = json_loads_object(discovery_info.payload)
if "mac" not in device_info:
return self.async_abort(reason="mqtt_missing_mac")
@@ -485,12 +482,16 @@ class EsphomeFlowHandler(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> OptionsFlowHandler:
"""Get the options flow for this handler."""
- return OptionsFlowHandler()
+ return OptionsFlowHandler(config_entry)
class OptionsFlowHandler(OptionsFlow):
"""Handle a option flow for esphome."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/esphome/coordinator.py b/homeassistant/components/esphome/coordinator.py
index b31a74dcf3f..284e17fd183 100644
--- a/homeassistant/components/esphome/coordinator.py
+++ b/homeassistant/components/esphome/coordinator.py
@@ -31,7 +31,6 @@ class ESPHomeDashboardCoordinator(DataUpdateCoordinator[dict[str, ConfiguredDevi
super().__init__(
hass,
_LOGGER,
- config_entry=None,
name="ESPHome Dashboard",
update_interval=timedelta(minutes=5),
always_update=False,
diff --git a/homeassistant/components/esphome/strings.json b/homeassistant/components/esphome/strings.json
index 18a54772e30..ec7e6f674b3 100644
--- a/homeassistant/components/esphome/strings.json
+++ b/homeassistant/components/esphome/strings.json
@@ -8,8 +8,7 @@
"service_received": "Action received",
"mqtt_missing_mac": "Missing MAC address in MQTT properties.",
"mqtt_missing_api": "Missing API port in MQTT properties.",
- "mqtt_missing_ip": "Missing IP address in MQTT properties.",
- "mqtt_missing_payload": "Missing MQTT Payload."
+ "mqtt_missing_ip": "Missing IP address in MQTT properties."
},
"error": {
"resolve_error": "Can't resolve address of the ESP. If this error persists, please set a static IP address",
diff --git a/homeassistant/components/evohome/__init__.py b/homeassistant/components/evohome/__init__.py
index 612131919d4..1097f19f47c 100644
--- a/homeassistant/components/evohome/__init__.py
+++ b/homeassistant/components/evohome/__init__.py
@@ -240,7 +240,6 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
coordinator = DataUpdateCoordinator(
hass,
_LOGGER,
- config_entry=None,
name=f"{DOMAIN}_coordinator",
update_interval=config[DOMAIN][CONF_SCAN_INTERVAL],
update_method=broker.async_update,
diff --git a/homeassistant/components/ezviz/config_flow.py b/homeassistant/components/ezviz/config_flow.py
index a7551737c10..aa998cc6f60 100644
--- a/homeassistant/components/ezviz/config_flow.py
+++ b/homeassistant/components/ezviz/config_flow.py
@@ -150,7 +150,7 @@ class EzvizConfigFlow(ConfigFlow, domain=DOMAIN):
@callback
def async_get_options_flow(config_entry: ConfigEntry) -> EzvizOptionsFlowHandler:
"""Get the options flow for this handler."""
- return EzvizOptionsFlowHandler()
+ return EzvizOptionsFlowHandler(config_entry)
async def async_step_user(
self, user_input: dict[str, Any] | None = None
@@ -391,6 +391,10 @@ class EzvizConfigFlow(ConfigFlow, domain=DOMAIN):
class EzvizOptionsFlowHandler(OptionsFlow):
"""Handle EZVIZ client options."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/ezviz/update.py b/homeassistant/components/ezviz/update.py
index 25a506a0052..05735d152cf 100644
--- a/homeassistant/components/ezviz/update.py
+++ b/homeassistant/components/ezviz/update.py
@@ -73,9 +73,11 @@ class EzvizUpdateEntity(EzvizEntity, UpdateEntity):
return self.data["version"]
@property
- def in_progress(self) -> bool:
+ def in_progress(self) -> bool | int | None:
"""Update installation progress."""
- return bool(self.data["upgrade_in_progress"])
+ if self.data["upgrade_in_progress"]:
+ return self.data["upgrade_percent"]
+ return False
@property
def latest_version(self) -> str | None:
@@ -91,13 +93,6 @@ class EzvizUpdateEntity(EzvizEntity, UpdateEntity):
return self.data["latest_firmware_info"].get("desc")
return None
- @property
- def update_percentage(self) -> int | None:
- """Update installation progress."""
- if self.data["upgrade_in_progress"]:
- return self.data["upgrade_percent"]
- return None
-
async def async_install(
self, version: str | None, backup: bool, **kwargs: Any
) -> None:
diff --git a/homeassistant/components/feedreader/config_flow.py b/homeassistant/components/feedreader/config_flow.py
index b902d48a1c8..2a73e24a3e5 100644
--- a/homeassistant/components/feedreader/config_flow.py
+++ b/homeassistant/components/feedreader/config_flow.py
@@ -15,6 +15,7 @@ from homeassistant.config_entries import (
ConfigFlow,
ConfigFlowResult,
OptionsFlow,
+ OptionsFlowWithConfigEntry,
)
from homeassistant.const import CONF_URL
from homeassistant.core import HomeAssistant, callback
@@ -45,11 +46,9 @@ class FeedReaderConfigFlow(ConfigFlow, domain=DOMAIN):
@staticmethod
@callback
- def async_get_options_flow(
- config_entry: ConfigEntry,
- ) -> OptionsFlow:
+ def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlow:
"""Get the options flow for this handler."""
- return FeedReaderOptionsFlowHandler()
+ return FeedReaderOptionsFlowHandler(config_entry)
def show_user_form(
self,
@@ -148,7 +147,7 @@ class FeedReaderConfigFlow(ConfigFlow, domain=DOMAIN):
return self.async_abort(reason="reconfigure_successful")
-class FeedReaderOptionsFlowHandler(OptionsFlow):
+class FeedReaderOptionsFlowHandler(OptionsFlowWithConfigEntry):
"""Handle an options flow."""
async def async_step_init(
@@ -163,9 +162,7 @@ class FeedReaderOptionsFlowHandler(OptionsFlow):
{
vol.Optional(
CONF_MAX_ENTRIES,
- default=self.config_entry.options.get(
- CONF_MAX_ENTRIES, DEFAULT_MAX_ENTRIES
- ),
+ default=self.options.get(CONF_MAX_ENTRIES, DEFAULT_MAX_ENTRIES),
): cv.positive_int,
}
)
diff --git a/homeassistant/components/ffmpeg/manifest.json b/homeassistant/components/ffmpeg/manifest.json
index 085db6791b3..e5f4f8b93a8 100644
--- a/homeassistant/components/ffmpeg/manifest.json
+++ b/homeassistant/components/ffmpeg/manifest.json
@@ -4,5 +4,5 @@
"codeowners": [],
"documentation": "https://www.home-assistant.io/integrations/ffmpeg",
"integration_type": "system",
- "requirements": ["ha-ffmpeg==3.2.2"]
+ "requirements": ["ha-ffmpeg==3.2.1"]
}
diff --git a/homeassistant/components/file/__init__.py b/homeassistant/components/file/__init__.py
index 7bc206057c8..0c9cfee5f4d 100644
--- a/homeassistant/components/file/__init__.py
+++ b/homeassistant/components/file/__init__.py
@@ -3,16 +3,88 @@
from copy import deepcopy
from typing import Any
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_FILE_PATH, CONF_NAME, CONF_PLATFORM, Platform
-from homeassistant.core import HomeAssistant
+from homeassistant.components.notify import migrate_notify_issue
+from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
+from homeassistant.const import (
+ CONF_FILE_PATH,
+ CONF_NAME,
+ CONF_PLATFORM,
+ CONF_SCAN_INTERVAL,
+ Platform,
+)
+from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant
from homeassistant.exceptions import ConfigEntryNotReady
+from homeassistant.helpers import (
+ config_validation as cv,
+ discovery,
+ issue_registry as ir,
+)
+from homeassistant.helpers.typing import ConfigType
from .const import DOMAIN
+from .notify import PLATFORM_SCHEMA as NOTIFY_PLATFORM_SCHEMA
+from .sensor import PLATFORM_SCHEMA as SENSOR_PLATFORM_SCHEMA
+
+IMPORT_SCHEMA = {
+ Platform.SENSOR: SENSOR_PLATFORM_SCHEMA,
+ Platform.NOTIFY: NOTIFY_PLATFORM_SCHEMA,
+}
+
+CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
PLATFORMS = [Platform.NOTIFY, Platform.SENSOR]
+async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
+ """Set up the file integration."""
+
+ hass.data[DOMAIN] = config
+ if hass.config_entries.async_entries(DOMAIN):
+ # We skip import in case we already have config entries
+ return True
+ # The use of the legacy notify service was deprecated with HA Core 2024.6.0
+ # and will be removed with HA Core 2024.12
+ migrate_notify_issue(hass, DOMAIN, "File", "2024.12.0")
+ # The YAML config was imported with HA Core 2024.6.0 and will be removed with
+ # HA Core 2024.12
+ ir.async_create_issue(
+ hass,
+ HOMEASSISTANT_DOMAIN,
+ f"deprecated_yaml_{DOMAIN}",
+ breaks_in_ha_version="2024.12.0",
+ is_fixable=False,
+ issue_domain=DOMAIN,
+ learn_more_url="https://www.home-assistant.io/integrations/file/",
+ severity=ir.IssueSeverity.WARNING,
+ translation_key="deprecated_yaml",
+ translation_placeholders={
+ "domain": DOMAIN,
+ "integration_title": "File",
+ },
+ )
+
+ # Import the YAML config into separate config entries
+ platforms_config: dict[Platform, list[ConfigType]] = {
+ domain: config[domain] for domain in PLATFORMS if domain in config
+ }
+ for domain, items in platforms_config.items():
+ for item in items:
+ if item[CONF_PLATFORM] == DOMAIN:
+ file_config_item = IMPORT_SCHEMA[domain](item)
+ file_config_item[CONF_PLATFORM] = domain
+ if CONF_SCAN_INTERVAL in file_config_item:
+ del file_config_item[CONF_SCAN_INTERVAL]
+ hass.async_create_task(
+ hass.config_entries.flow.async_init(
+ DOMAIN,
+ context={"source": SOURCE_IMPORT},
+ data=file_config_item,
+ )
+ )
+
+ return True
+
+
async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
"""Set up a file component entry."""
config = {**entry.data, **entry.options}
@@ -30,6 +102,20 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
entry, [Platform(entry.data[CONF_PLATFORM])]
)
entry.async_on_unload(entry.add_update_listener(update_listener))
+ if entry.data[CONF_PLATFORM] == Platform.NOTIFY and CONF_NAME in entry.data:
+ # New notify entities are being setup through the config entry,
+ # but during the deprecation period we want to keep the legacy notify platform,
+ # so we forward the setup config through discovery.
+ # Only the entities from yaml will still be available as legacy service.
+ hass.async_create_task(
+ discovery.async_load_platform(
+ hass,
+ Platform.NOTIFY,
+ DOMAIN,
+ config,
+ hass.data[DOMAIN],
+ )
+ )
return True
diff --git a/homeassistant/components/file/config_flow.py b/homeassistant/components/file/config_flow.py
index 992635d05fd..d74e36ce935 100644
--- a/homeassistant/components/file/config_flow.py
+++ b/homeassistant/components/file/config_flow.py
@@ -1,8 +1,7 @@
"""Config flow for file integration."""
-from __future__ import annotations
-
from copy import deepcopy
+import os
from typing import Any
import voluptuous as vol
@@ -12,9 +11,11 @@ from homeassistant.config_entries import (
ConfigFlow,
ConfigFlowResult,
OptionsFlow,
+ OptionsFlowWithConfigEntry,
)
from homeassistant.const import (
CONF_FILE_PATH,
+ CONF_FILENAME,
CONF_NAME,
CONF_PLATFORM,
CONF_UNIT_OF_MEASUREMENT,
@@ -73,11 +74,9 @@ class FileConfigFlowHandler(ConfigFlow, domain=DOMAIN):
@staticmethod
@callback
- def async_get_options_flow(
- config_entry: ConfigEntry,
- ) -> FileOptionsFlowHandler:
+ def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlow:
"""Get the options flow for this handler."""
- return FileOptionsFlowHandler()
+ return FileOptionsFlowHandler(config_entry)
async def validate_file_path(self, file_path: str) -> bool:
"""Ensure the file path is valid."""
@@ -130,8 +129,29 @@ class FileConfigFlowHandler(ConfigFlow, domain=DOMAIN):
"""Handle file sensor config flow."""
return await self._async_handle_step(Platform.SENSOR.value, user_input)
+ async def async_step_import(self, import_data: dict[str, Any]) -> ConfigFlowResult:
+ """Import `file`` config from configuration.yaml."""
+ self._async_abort_entries_match(import_data)
+ platform = import_data[CONF_PLATFORM]
+ name: str = import_data.get(CONF_NAME, DEFAULT_NAME)
+ file_name: str
+ if platform == Platform.NOTIFY:
+ file_name = import_data.pop(CONF_FILENAME)
+ file_path: str = os.path.join(self.hass.config.config_dir, file_name)
+ import_data[CONF_FILE_PATH] = file_path
+ else:
+ file_path = import_data[CONF_FILE_PATH]
+ title = f"{name} [{file_path}]"
+ data = deepcopy(import_data)
+ options = {}
+ for key, value in import_data.items():
+ if key not in (CONF_FILE_PATH, CONF_PLATFORM, CONF_NAME):
+ data.pop(key)
+ options[key] = value
+ return self.async_create_entry(title=title, data=data, options=options)
-class FileOptionsFlowHandler(OptionsFlow):
+
+class FileOptionsFlowHandler(OptionsFlowWithConfigEntry):
"""Handle File options."""
async def async_step_init(
diff --git a/homeassistant/components/file/notify.py b/homeassistant/components/file/notify.py
index 10e3d4a4ac6..9411b7cf1a8 100644
--- a/homeassistant/components/file/notify.py
+++ b/homeassistant/components/file/notify.py
@@ -2,23 +2,104 @@
from __future__ import annotations
+from functools import partial
+import logging
import os
from typing import Any, TextIO
+import voluptuous as vol
+
from homeassistant.components.notify import (
+ ATTR_TITLE,
ATTR_TITLE_DEFAULT,
+ PLATFORM_SCHEMA as NOTIFY_PLATFORM_SCHEMA,
+ BaseNotificationService,
NotifyEntity,
NotifyEntityFeature,
+ migrate_notify_issue,
)
from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_FILE_PATH, CONF_NAME
+from homeassistant.const import CONF_FILE_PATH, CONF_FILENAME, CONF_NAME
from homeassistant.core import HomeAssistant
from homeassistant.exceptions import ServiceValidationError
+import homeassistant.helpers.config_validation as cv
from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
import homeassistant.util.dt as dt_util
from .const import CONF_TIMESTAMP, DEFAULT_NAME, DOMAIN, FILE_ICON
+_LOGGER = logging.getLogger(__name__)
+
+# The legacy platform schema uses a filename, after import
+# The full file path is stored in the config entry
+PLATFORM_SCHEMA = NOTIFY_PLATFORM_SCHEMA.extend(
+ {
+ vol.Required(CONF_FILENAME): cv.string,
+ vol.Optional(CONF_TIMESTAMP, default=False): cv.boolean,
+ }
+)
+
+
+async def async_get_service(
+ hass: HomeAssistant,
+ config: ConfigType,
+ discovery_info: DiscoveryInfoType | None = None,
+) -> FileNotificationService | None:
+ """Get the file notification service."""
+ if discovery_info is None:
+ # We only set up through discovery
+ return None
+ file_path: str = discovery_info[CONF_FILE_PATH]
+ timestamp: bool = discovery_info[CONF_TIMESTAMP]
+
+ return FileNotificationService(file_path, timestamp)
+
+
+class FileNotificationService(BaseNotificationService):
+ """Implement the notification service for the File service."""
+
+ def __init__(self, file_path: str, add_timestamp: bool) -> None:
+ """Initialize the service."""
+ self._file_path = file_path
+ self.add_timestamp = add_timestamp
+
+ async def async_send_message(self, message: str = "", **kwargs: Any) -> None:
+ """Send a message to a file."""
+ # The use of the legacy notify service was deprecated with HA Core 2024.6.0
+ # and will be removed with HA Core 2024.12
+ migrate_notify_issue(
+ self.hass, DOMAIN, "File", "2024.12.0", service_name=self._service_name
+ )
+ await self.hass.async_add_executor_job(
+ partial(self.send_message, message, **kwargs)
+ )
+
+ def send_message(self, message: str = "", **kwargs: Any) -> None:
+ """Send a message to a file."""
+ file: TextIO
+ filepath = self._file_path
+ try:
+ with open(filepath, "a", encoding="utf8") as file:
+ if os.stat(filepath).st_size == 0:
+ title = (
+ f"{kwargs.get(ATTR_TITLE, ATTR_TITLE_DEFAULT)} notifications (Log"
+ f" started: {dt_util.utcnow().isoformat()})\n{'-' * 80}\n"
+ )
+ file.write(title)
+
+ if self.add_timestamp:
+ text = f"{dt_util.utcnow().isoformat()} {message}\n"
+ else:
+ text = f"{message}\n"
+ file.write(text)
+ except OSError as exc:
+ raise ServiceValidationError(
+ translation_domain=DOMAIN,
+ translation_key="write_access_failed",
+ translation_placeholders={"filename": filepath, "exc": f"{exc!r}"},
+ ) from exc
+
async def async_setup_entry(
hass: HomeAssistant,
diff --git a/homeassistant/components/file/sensor.py b/homeassistant/components/file/sensor.py
index 879c06e29f3..e37a3df86a6 100644
--- a/homeassistant/components/file/sensor.py
+++ b/homeassistant/components/file/sensor.py
@@ -6,8 +6,12 @@ import logging
import os
from file_read_backwards import FileReadBackwards
+import voluptuous as vol
-from homeassistant.components.sensor import SensorEntity
+from homeassistant.components.sensor import (
+ PLATFORM_SCHEMA as SENSOR_PLATFORM_SCHEMA,
+ SensorEntity,
+)
from homeassistant.config_entries import ConfigEntry
from homeassistant.const import (
CONF_FILE_PATH,
@@ -16,13 +20,38 @@ from homeassistant.const import (
CONF_VALUE_TEMPLATE,
)
from homeassistant.core import HomeAssistant
+from homeassistant.helpers import config_validation as cv
from homeassistant.helpers.entity_platform import AddEntitiesCallback
from homeassistant.helpers.template import Template
+from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
from .const import DEFAULT_NAME, FILE_ICON
_LOGGER = logging.getLogger(__name__)
+PLATFORM_SCHEMA = SENSOR_PLATFORM_SCHEMA.extend(
+ {
+ vol.Required(CONF_FILE_PATH): cv.isfile,
+ vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+ vol.Optional(CONF_VALUE_TEMPLATE): cv.string,
+ vol.Optional(CONF_UNIT_OF_MEASUREMENT): cv.string,
+ }
+)
+
+
+async def async_setup_platform(
+ hass: HomeAssistant,
+ config: ConfigType,
+ async_add_entities: AddEntitiesCallback,
+ discovery_info: DiscoveryInfoType | None = None,
+) -> None:
+ """Set up the file sensor from YAML.
+
+ The YAML platform config is automatically
+ imported to a config entry, this method can be removed
+ when YAML support is removed.
+ """
+
async def async_setup_entry(
hass: HomeAssistant,
diff --git a/homeassistant/components/file/strings.json b/homeassistant/components/file/strings.json
index 8806c67cd96..60ebf451f78 100644
--- a/homeassistant/components/file/strings.json
+++ b/homeassistant/components/file/strings.json
@@ -18,7 +18,7 @@
},
"data_description": {
"file_path": "The local file path to retrieve the sensor value from",
- "value_template": "A template to render the sensors value based on the file content",
+ "value_template": "A template to render the the sensors value based on the file content",
"unit_of_measurement": "Unit of measurement for the sensor"
}
},
diff --git a/homeassistant/components/flux_led/config_flow.py b/homeassistant/components/flux_led/config_flow.py
index 9a02120f33a..d78fc699579 100644
--- a/homeassistant/components/flux_led/config_flow.py
+++ b/homeassistant/components/flux_led/config_flow.py
@@ -71,11 +71,9 @@ class FluxLedConfigFlow(ConfigFlow, domain=DOMAIN):
@staticmethod
@callback
- def async_get_options_flow(
- config_entry: ConfigEntry,
- ) -> FluxLedOptionsFlow:
+ def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlow:
"""Get the options flow for the Flux LED component."""
- return FluxLedOptionsFlow()
+ return FluxLedOptionsFlow(config_entry)
async def async_step_dhcp(
self, discovery_info: dhcp.DhcpServiceInfo
@@ -322,6 +320,10 @@ class FluxLedConfigFlow(ConfigFlow, domain=DOMAIN):
class FluxLedOptionsFlow(OptionsFlow):
"""Handle flux_led options."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize the flux_led options flow."""
+ self._config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
@@ -330,7 +332,7 @@ class FluxLedOptionsFlow(OptionsFlow):
if user_input is not None:
return self.async_create_entry(title="", data=user_input)
- options = self.config_entry.options
+ options = self._config_entry.options
options_schema = vol.Schema(
{
vol.Optional(
diff --git a/homeassistant/components/forecast_solar/config_flow.py b/homeassistant/components/forecast_solar/config_flow.py
index 9a64ce6e1fb..982f32eb07b 100644
--- a/homeassistant/components/forecast_solar/config_flow.py
+++ b/homeassistant/components/forecast_solar/config_flow.py
@@ -41,7 +41,7 @@ class ForecastSolarFlowHandler(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> ForecastSolarOptionFlowHandler:
"""Get the options flow for this handler."""
- return ForecastSolarOptionFlowHandler()
+ return ForecastSolarOptionFlowHandler(config_entry)
async def async_step_user(
self, user_input: dict[str, Any] | None = None
@@ -91,6 +91,10 @@ class ForecastSolarFlowHandler(ConfigFlow, domain=DOMAIN):
class ForecastSolarOptionFlowHandler(OptionsFlow):
"""Handle options."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/forked_daapd/config_flow.py b/homeassistant/components/forked_daapd/config_flow.py
index 5fb9f08f1c0..5f061aa4be1 100644
--- a/homeassistant/components/forked_daapd/config_flow.py
+++ b/homeassistant/components/forked_daapd/config_flow.py
@@ -52,6 +52,10 @@ TEST_CONNECTION_ERROR_DICT = {
class ForkedDaapdOptionsFlowHandler(OptionsFlow):
"""Handle a forked-daapd options flow."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
@@ -118,7 +122,7 @@ class ForkedDaapdFlowHandler(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> ForkedDaapdOptionsFlowHandler:
"""Return options flow handler."""
- return ForkedDaapdOptionsFlowHandler()
+ return ForkedDaapdOptionsFlowHandler(config_entry)
async def validate_input(self, user_input):
"""Validate the user input."""
diff --git a/homeassistant/components/fritz/config_flow.py b/homeassistant/components/fritz/config_flow.py
index 920ecda1c52..0d27894c8ab 100644
--- a/homeassistant/components/fritz/config_flow.py
+++ b/homeassistant/components/fritz/config_flow.py
@@ -23,6 +23,7 @@ from homeassistant.config_entries import (
ConfigFlow,
ConfigFlowResult,
OptionsFlow,
+ OptionsFlowWithConfigEntry,
)
from homeassistant.const import (
CONF_HOST,
@@ -57,18 +58,15 @@ class FritzBoxToolsFlowHandler(ConfigFlow, domain=DOMAIN):
VERSION = 1
- _host: str
-
@staticmethod
@callback
- def async_get_options_flow(
- config_entry: ConfigEntry,
- ) -> FritzBoxToolsOptionsFlowHandler:
+ def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlow:
"""Get the options flow for this handler."""
- return FritzBoxToolsOptionsFlowHandler()
+ return FritzBoxToolsOptionsFlowHandler(config_entry)
def __init__(self) -> None:
"""Initialize FRITZ!Box Tools flow."""
+ self._host: str | None = None
self._name: str = ""
self._password: str = ""
self._use_tls: bool = False
@@ -113,6 +111,7 @@ class FritzBoxToolsFlowHandler(ConfigFlow, domain=DOMAIN):
async def async_check_configured_entry(self) -> ConfigEntry | None:
"""Check if entry is configured."""
+ assert self._host
current_host = await self.hass.async_add_executor_job(
socket.gethostbyname, self._host
)
@@ -154,17 +153,15 @@ class FritzBoxToolsFlowHandler(ConfigFlow, domain=DOMAIN):
) -> ConfigFlowResult:
"""Handle a flow initialized by discovery."""
ssdp_location: ParseResult = urlparse(discovery_info.ssdp_location or "")
- host = ssdp_location.hostname
- if not host or ipaddress.ip_address(host).is_link_local:
- return self.async_abort(reason="ignore_ip6_link_local")
-
- self._host = host
+ self._host = ssdp_location.hostname
self._name = (
discovery_info.upnp.get(ssdp.ATTR_UPNP_FRIENDLY_NAME)
or discovery_info.upnp[ssdp.ATTR_UPNP_MODEL_NAME]
)
- uuid: str | None
+ if not self._host or ipaddress.ip_address(self._host).is_link_local:
+ return self.async_abort(reason="ignore_ip6_link_local")
+
if uuid := discovery_info.upnp.get(ssdp.ATTR_UPNP_UDN):
if uuid.startswith("uuid:"):
uuid = uuid[5:]
@@ -396,7 +393,7 @@ class FritzBoxToolsFlowHandler(ConfigFlow, domain=DOMAIN):
)
-class FritzBoxToolsOptionsFlowHandler(OptionsFlow):
+class FritzBoxToolsOptionsFlowHandler(OptionsFlowWithConfigEntry):
"""Handle an options flow."""
async def async_step_init(
@@ -407,18 +404,19 @@ class FritzBoxToolsOptionsFlowHandler(OptionsFlow):
if user_input is not None:
return self.async_create_entry(title="", data=user_input)
- options = self.config_entry.options
data_schema = vol.Schema(
{
vol.Optional(
CONF_CONSIDER_HOME,
- default=options.get(
+ default=self.options.get(
CONF_CONSIDER_HOME, DEFAULT_CONSIDER_HOME.total_seconds()
),
): vol.All(vol.Coerce(int), vol.Clamp(min=0, max=900)),
vol.Optional(
CONF_OLD_DISCOVERY,
- default=options.get(CONF_OLD_DISCOVERY, DEFAULT_CONF_OLD_DISCOVERY),
+ default=self.options.get(
+ CONF_OLD_DISCOVERY, DEFAULT_CONF_OLD_DISCOVERY
+ ),
): bool,
}
)
diff --git a/homeassistant/components/fritz/manifest.json b/homeassistant/components/fritz/manifest.json
index 27aa42d9b2c..35250d9d34d 100644
--- a/homeassistant/components/fritz/manifest.json
+++ b/homeassistant/components/fritz/manifest.json
@@ -1,7 +1,7 @@
{
"domain": "fritz",
"name": "AVM FRITZ!Box Tools",
- "codeowners": ["@AaronDavidSchneider", "@chemelli74", "@mib1185"],
+ "codeowners": ["@mammuth", "@AaronDavidSchneider", "@chemelli74", "@mib1185"],
"config_flow": true,
"dependencies": ["network"],
"documentation": "https://www.home-assistant.io/integrations/fritz",
diff --git a/homeassistant/components/fritzbox/config_flow.py b/homeassistant/components/fritzbox/config_flow.py
index ffec4a9ea29..76754fc5082 100644
--- a/homeassistant/components/fritzbox/config_flow.py
+++ b/homeassistant/components/fritzbox/config_flow.py
@@ -43,11 +43,10 @@ class FritzboxConfigFlow(ConfigFlow, domain=DOMAIN):
VERSION = 1
- _name: str
-
def __init__(self) -> None:
"""Initialize flow."""
self._host: str | None = None
+ self._name: str | None = None
self._password: str | None = None
self._username: str | None = None
@@ -159,6 +158,7 @@ class FritzboxConfigFlow(ConfigFlow, domain=DOMAIN):
result = await self.async_try_connect()
if result == RESULT_SUCCESS:
+ assert self._name is not None
return self._get_entry(self._name)
if result != RESULT_INVALID_AUTH:
return self.async_abort(reason=result)
diff --git a/homeassistant/components/fritzbox_callmonitor/config_flow.py b/homeassistant/components/fritzbox_callmonitor/config_flow.py
index 7bd0eacb66a..69efceae281 100644
--- a/homeassistant/components/fritzbox_callmonitor/config_flow.py
+++ b/homeassistant/components/fritzbox_callmonitor/config_flow.py
@@ -141,7 +141,7 @@ class FritzBoxCallMonitorConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> FritzBoxCallMonitorOptionsFlowHandler:
"""Get the options flow for this handler."""
- return FritzBoxCallMonitorOptionsFlowHandler()
+ return FritzBoxCallMonitorOptionsFlowHandler(config_entry)
async def async_step_user(
self, user_input: dict[str, Any] | None = None
@@ -278,6 +278,10 @@ class FritzBoxCallMonitorConfigFlow(ConfigFlow, domain=DOMAIN):
class FritzBoxCallMonitorOptionsFlowHandler(OptionsFlow):
"""Handle a fritzbox_callmonitor options flow."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize."""
+ self.config_entry = config_entry
+
@classmethod
def _are_prefixes_valid(cls, prefixes: str | None) -> bool:
"""Check if prefixes are valid."""
diff --git a/homeassistant/components/frontend/manifest.json b/homeassistant/components/frontend/manifest.json
index 4dc5a2b0ae4..2df14df4523 100644
--- a/homeassistant/components/frontend/manifest.json
+++ b/homeassistant/components/frontend/manifest.json
@@ -20,5 +20,5 @@
"documentation": "https://www.home-assistant.io/integrations/frontend",
"integration_type": "system",
"quality_scale": "internal",
- "requirements": ["home-assistant-frontend==20241106.2"]
+ "requirements": ["home-assistant-frontend==20241106.0"]
}
diff --git a/homeassistant/components/generic/config_flow.py b/homeassistant/components/generic/config_flow.py
index 8bd238fd0e6..7b10cdfb64b 100644
--- a/homeassistant/components/generic/config_flow.py
+++ b/homeassistant/components/generic/config_flow.py
@@ -324,7 +324,7 @@ class GenericIPCamConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> GenericOptionsFlowHandler:
"""Get the options flow for this handler."""
- return GenericOptionsFlowHandler()
+ return GenericOptionsFlowHandler(config_entry)
def check_for_existing(self, options: dict[str, Any]) -> bool:
"""Check whether an existing entry is using the same URLs."""
@@ -409,8 +409,9 @@ class GenericIPCamConfigFlow(ConfigFlow, domain=DOMAIN):
class GenericOptionsFlowHandler(OptionsFlow):
"""Handle Generic IP Camera options."""
- def __init__(self) -> None:
+ def __init__(self, config_entry: ConfigEntry) -> None:
"""Initialize Generic IP Camera options flow."""
+ self.config_entry = config_entry
self.preview_cam: dict[str, Any] = {}
self.user_input: dict[str, Any] = {}
diff --git a/homeassistant/components/generic/manifest.json b/homeassistant/components/generic/manifest.json
index c1fbc16d9be..b19d6d6293e 100644
--- a/homeassistant/components/generic/manifest.json
+++ b/homeassistant/components/generic/manifest.json
@@ -7,5 +7,5 @@
"documentation": "https://www.home-assistant.io/integrations/generic",
"integration_type": "device",
"iot_class": "local_push",
- "requirements": ["av==13.1.0", "Pillow==11.0.0"]
+ "requirements": ["ha-av==10.1.1", "Pillow==10.4.0"]
}
diff --git a/homeassistant/components/generic_hygrostat/strings.json b/homeassistant/components/generic_hygrostat/strings.json
index 2be3955eff1..a21ab68c628 100644
--- a/homeassistant/components/generic_hygrostat/strings.json
+++ b/homeassistant/components/generic_hygrostat/strings.json
@@ -4,7 +4,7 @@
"step": {
"user": {
"title": "Add generic hygrostat",
- "description": "Create a humidifier entity that control the humidity via a switch and sensor.",
+ "description": "Create a entity that control the humidity via a switch and sensor.",
"data": {
"device_class": "Device class",
"dry_tolerance": "Dry tolerance",
diff --git a/homeassistant/components/generic_thermostat/strings.json b/homeassistant/components/generic_thermostat/strings.json
index 51549dc844e..1ddd41de734 100644
--- a/homeassistant/components/generic_thermostat/strings.json
+++ b/homeassistant/components/generic_thermostat/strings.json
@@ -3,7 +3,7 @@
"config": {
"step": {
"user": {
- "title": "Add generic thermostat",
+ "title": "Add generic thermostat helper",
"description": "Create a climate entity that controls the temperature via a switch and sensor.",
"data": {
"ac_mode": "Cooling mode",
@@ -17,8 +17,8 @@
"data_description": {
"ac_mode": "Set the actuator specified to be treated as a cooling device instead of a heating device.",
"heater": "Switch entity used to cool or heat depending on A/C mode.",
- "target_sensor": "Temperature sensor that reflects the current temperature.",
- "min_cycle_duration": "Set a minimum amount of time that the switch specified must be in its current state prior to being switched either off or on.",
+ "target_sensor": "Temperature sensor that reflect the current temperature.",
+ "min_cycle_duration": "Set a minimum amount of time that the switch specified must be in its current state prior to being switched either off or on. This option will be ignored if the keep alive option is set.",
"cold_tolerance": "Minimum amount of difference between the temperature read by the temperature sensor the target temperature that must change prior to being switched on. For example, if the target temperature is 25 and the tolerance is 0.5 the heater will start when the sensor equals or goes below 24.5.",
"hot_tolerance": "Minimum amount of difference between the temperature read by the temperature sensor the target temperature that must change prior to being switched off. For example, if the target temperature is 25 and the tolerance is 0.5 the heater will stop when the sensor equals or goes above 25.5."
}
diff --git a/homeassistant/components/geniushub/__init__.py b/homeassistant/components/geniushub/__init__.py
index 9ca6ecfcfe0..f3081e50289 100644
--- a/homeassistant/components/geniushub/__init__.py
+++ b/homeassistant/components/geniushub/__init__.py
@@ -9,6 +9,7 @@ import aiohttp
from geniushubclient import GeniusHub
import voluptuous as vol
+from homeassistant import config_entries
from homeassistant.config_entries import ConfigEntry
from homeassistant.const import (
ATTR_ENTITY_ID,
@@ -20,12 +21,20 @@ from homeassistant.const import (
CONF_USERNAME,
Platform,
)
-from homeassistant.core import HomeAssistant, ServiceCall, callback
+from homeassistant.core import (
+ DOMAIN as HOMEASSISTANT_DOMAIN,
+ HomeAssistant,
+ ServiceCall,
+ callback,
+)
+from homeassistant.data_entry_flow import FlowResultType
from homeassistant.helpers import config_validation as cv, entity_registry as er
from homeassistant.helpers.aiohttp_client import async_get_clientsession
from homeassistant.helpers.dispatcher import async_dispatcher_send
from homeassistant.helpers.event import async_track_time_interval
+from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
from homeassistant.helpers.service import verify_domain_control
+from homeassistant.helpers.typing import ConfigType
from .const import DOMAIN
@@ -36,6 +45,27 @@ SCAN_INTERVAL = timedelta(seconds=60)
MAC_ADDRESS_REGEXP = r"^([0-9A-F]{2}:){5}([0-9A-F]{2})$"
+CLOUD_API_SCHEMA = vol.Schema(
+ {
+ vol.Required(CONF_TOKEN): cv.string,
+ vol.Required(CONF_MAC): vol.Match(MAC_ADDRESS_REGEXP),
+ }
+)
+
+
+LOCAL_API_SCHEMA = vol.Schema(
+ {
+ vol.Required(CONF_HOST): cv.string,
+ vol.Required(CONF_USERNAME): cv.string,
+ vol.Required(CONF_PASSWORD): cv.string,
+ vol.Optional(CONF_MAC): vol.Match(MAC_ADDRESS_REGEXP),
+ }
+)
+
+CONFIG_SCHEMA = vol.Schema(
+ {DOMAIN: vol.Any(LOCAL_API_SCHEMA, CLOUD_API_SCHEMA)}, extra=vol.ALLOW_EXTRA
+)
+
ATTR_ZONE_MODE = "mode"
ATTR_DURATION = "duration"
@@ -70,6 +100,56 @@ PLATFORMS = [
]
+async def _async_import(hass: HomeAssistant, base_config: ConfigType) -> None:
+ """Import a config entry from configuration.yaml."""
+
+ result = await hass.config_entries.flow.async_init(
+ DOMAIN,
+ context={"source": config_entries.SOURCE_IMPORT},
+ data=base_config[DOMAIN],
+ )
+ if (
+ result["type"] is FlowResultType.CREATE_ENTRY
+ or result["reason"] == "already_configured"
+ ):
+ async_create_issue(
+ hass,
+ HOMEASSISTANT_DOMAIN,
+ f"deprecated_yaml_{DOMAIN}",
+ breaks_in_ha_version="2024.12.0",
+ is_fixable=False,
+ issue_domain=DOMAIN,
+ severity=IssueSeverity.WARNING,
+ translation_key="deprecated_yaml",
+ translation_placeholders={
+ "domain": DOMAIN,
+ "integration_title": "Genius Hub",
+ },
+ )
+ return
+ async_create_issue(
+ hass,
+ DOMAIN,
+ f"deprecated_yaml_import_issue_{result['reason']}",
+ breaks_in_ha_version="2024.12.0",
+ is_fixable=False,
+ issue_domain=DOMAIN,
+ severity=IssueSeverity.WARNING,
+ translation_key=f"deprecated_yaml_import_issue_{result['reason']}",
+ translation_placeholders={
+ "domain": DOMAIN,
+ "integration_title": "Genius Hub",
+ },
+ )
+
+
+async def async_setup(hass: HomeAssistant, base_config: ConfigType) -> bool:
+ """Set up a Genius Hub system."""
+ if DOMAIN in base_config:
+ hass.async_create_task(_async_import(hass, base_config))
+ return True
+
+
type GeniusHubConfigEntry = ConfigEntry[GeniusBroker]
diff --git a/homeassistant/components/geniushub/config_flow.py b/homeassistant/components/geniushub/config_flow.py
index b106f9907bb..601eac6c2f2 100644
--- a/homeassistant/components/geniushub/config_flow.py
+++ b/homeassistant/components/geniushub/config_flow.py
@@ -13,6 +13,7 @@ import voluptuous as vol
from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_TOKEN, CONF_USERNAME
+from homeassistant.data_entry_flow import FlowResultType
from homeassistant.helpers.aiohttp_client import async_get_clientsession
from .const import DOMAIN
@@ -122,3 +123,14 @@ class GeniusHubConfigFlow(ConfigFlow, domain=DOMAIN):
return self.async_show_form(
step_id="cloud_api", errors=errors, data_schema=CLOUD_API_SCHEMA
)
+
+ async def async_step_import(self, import_data: dict[str, Any]) -> ConfigFlowResult:
+ """Import the yaml config."""
+ if CONF_HOST in import_data:
+ result = await self.async_step_local_api(import_data)
+ else:
+ result = await self.async_step_cloud_api(import_data)
+ if result["type"] is FlowResultType.FORM:
+ assert result["errors"]
+ return self.async_abort(reason=result["errors"]["base"])
+ return result
diff --git a/homeassistant/components/github/config_flow.py b/homeassistant/components/github/config_flow.py
index 9977f9d84cc..25d8782618f 100644
--- a/homeassistant/components/github/config_flow.py
+++ b/homeassistant/components/github/config_flow.py
@@ -211,12 +211,16 @@ class GitHubConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> OptionsFlowHandler:
"""Get the options flow for this handler."""
- return OptionsFlowHandler()
+ return OptionsFlowHandler(config_entry)
class OptionsFlowHandler(OptionsFlow):
"""Handle a option flow for GitHub."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(
self,
user_input: dict[str, Any] | None = None,
diff --git a/homeassistant/components/go2rtc/__init__.py b/homeassistant/components/go2rtc/__init__.py
index f1f6e44abc1..a07a62305f2 100644
--- a/homeassistant/components/go2rtc/__init__.py
+++ b/homeassistant/components/go2rtc/__init__.py
@@ -4,7 +4,6 @@ import logging
import shutil
from aiohttp.client_exceptions import ClientConnectionError, ServerConnectionError
-from awesomeversion import AwesomeVersion
from go2rtc_client import Go2RtcRestClient
from go2rtc_client.exceptions import Go2RtcClientError, Go2RtcVersionError
from go2rtc_client.ws import (
@@ -33,23 +32,13 @@ from homeassistant.config_entries import SOURCE_SYSTEM, ConfigEntry
from homeassistant.const import CONF_URL, EVENT_HOMEASSISTANT_STOP
from homeassistant.core import Event, HomeAssistant, callback
from homeassistant.exceptions import ConfigEntryNotReady
-from homeassistant.helpers import (
- config_validation as cv,
- discovery_flow,
- issue_registry as ir,
-)
+from homeassistant.helpers import config_validation as cv, discovery_flow
from homeassistant.helpers.aiohttp_client import async_get_clientsession
from homeassistant.helpers.typing import ConfigType
from homeassistant.util.hass_dict import HassKey
from homeassistant.util.package import is_docker_env
-from .const import (
- CONF_DEBUG_UI,
- DEBUG_UI_URL_MESSAGE,
- DOMAIN,
- HA_MANAGED_URL,
- RECOMMENDED_VERSION,
-)
+from .const import CONF_DEBUG_UI, DEBUG_UI_URL_MESSAGE, DOMAIN, HA_MANAGED_URL
from .server import Server
_LOGGER = logging.getLogger(__name__)
@@ -158,21 +147,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
# Validate the server URL
try:
client = Go2RtcRestClient(async_get_clientsession(hass), url)
- version = await client.validate_server_version()
- if version < AwesomeVersion(RECOMMENDED_VERSION):
- ir.async_create_issue(
- hass,
- DOMAIN,
- "recommended_version",
- is_fixable=False,
- is_persistent=False,
- severity=ir.IssueSeverity.WARNING,
- translation_key="recommended_version",
- translation_placeholders={
- "recommended_version": RECOMMENDED_VERSION,
- "current_version": str(version),
- },
- )
+ await client.validate_server_version()
except Go2RtcClientError as err:
if isinstance(err.__cause__, _RETRYABLE_ERRORS):
raise ConfigEntryNotReady(
@@ -249,13 +224,7 @@ class WebRTCProvider(CameraWebRTCProvider):
):
await self._rest_client.streams.add(
camera.entity_id,
- [
- stream_source,
- # We are setting any ffmpeg rtsp related logs to debug
- # Connection problems to the camera will be logged by the first stream
- # Therefore setting it to debug will not hide any important logs
- f"ffmpeg:{camera.entity_id}#audio=opus#query=log_level=debug",
- ],
+ [stream_source, f"ffmpeg:{camera.entity_id}#audio=opus"],
)
@callback
diff --git a/homeassistant/components/go2rtc/const.py b/homeassistant/components/go2rtc/const.py
index 3c1c84c42b5..d33ae3e3897 100644
--- a/homeassistant/components/go2rtc/const.py
+++ b/homeassistant/components/go2rtc/const.py
@@ -6,4 +6,3 @@ CONF_DEBUG_UI = "debug_ui"
DEBUG_UI_URL_MESSAGE = "Url and debug_ui cannot be set at the same time."
HA_MANAGED_API_PORT = 11984
HA_MANAGED_URL = f"http://localhost:{HA_MANAGED_API_PORT}/"
-RECOMMENDED_VERSION = "1.9.7"
diff --git a/homeassistant/components/go2rtc/manifest.json b/homeassistant/components/go2rtc/manifest.json
index 201b7168847..ea9308e5e18 100644
--- a/homeassistant/components/go2rtc/manifest.json
+++ b/homeassistant/components/go2rtc/manifest.json
@@ -7,6 +7,6 @@
"documentation": "https://www.home-assistant.io/integrations/go2rtc",
"integration_type": "system",
"iot_class": "local_polling",
- "requirements": ["go2rtc-client==0.1.1"],
+ "requirements": ["go2rtc-client==0.1.0"],
"single_config_entry": true
}
diff --git a/homeassistant/components/go2rtc/server.py b/homeassistant/components/go2rtc/server.py
index 6699ee4d8a2..ed3b44aadf9 100644
--- a/homeassistant/components/go2rtc/server.py
+++ b/homeassistant/components/go2rtc/server.py
@@ -24,15 +24,14 @@ _RESPAWN_COOLDOWN = 1
# Default configuration for HA
# - Api is listening only on localhost
-# - Enable rtsp for localhost only as ffmpeg needs it
+# - Disable rtsp listener
# - Clear default ice servers
-_GO2RTC_CONFIG_FORMAT = r"""# This file is managed by Home Assistant
-# Do not edit it manually
-
+_GO2RTC_CONFIG_FORMAT = r"""
api:
listen: "{api_ip}:{api_port}"
rtsp:
+ # ffmpeg needs rtsp for opus audio transcoding
listen: "127.0.0.1:18554"
webrtc:
diff --git a/homeassistant/components/go2rtc/strings.json b/homeassistant/components/go2rtc/strings.json
deleted file mode 100644
index e350c19af96..00000000000
--- a/homeassistant/components/go2rtc/strings.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "issues": {
- "recommended_version": {
- "title": "Outdated go2rtc server detected",
- "description": "We detected that you are using an outdated go2rtc server version. For the best experience, we recommend updating the go2rtc server to version `{recommended_version}`.\nCurrently you are using version `{current_version}`."
- }
- }
-}
diff --git a/homeassistant/components/google/config_flow.py b/homeassistant/components/google/config_flow.py
index 8ae09b58957..39b3c2d5666 100644
--- a/homeassistant/components/google/config_flow.py
+++ b/homeassistant/components/google/config_flow.py
@@ -238,12 +238,16 @@ class OAuth2FlowHandler(
config_entry: ConfigEntry,
) -> OptionsFlow:
"""Create an options flow."""
- return OptionsFlowHandler()
+ return OptionsFlowHandler(config_entry)
class OptionsFlowHandler(OptionsFlow):
"""Google Calendar options flow."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/google/strings.json b/homeassistant/components/google/strings.json
index 2ea45239a53..c029b46051e 100644
--- a/homeassistant/components/google/strings.json
+++ b/homeassistant/components/google/strings.json
@@ -87,8 +87,8 @@
}
},
"create_event": {
- "name": "Create event",
- "description": "Adds a new calendar event.",
+ "name": "Creates event",
+ "description": "Add a new calendar event.",
"fields": {
"summary": {
"name": "Summary",
diff --git a/homeassistant/components/google_assistant/const.py b/homeassistant/components/google_assistant/const.py
index 8132ecaae2c..04c85639e07 100644
--- a/homeassistant/components/google_assistant/const.py
+++ b/homeassistant/components/google_assistant/const.py
@@ -78,7 +78,6 @@ TYPE_AWNING = f"{PREFIX_TYPES}AWNING"
TYPE_BLINDS = f"{PREFIX_TYPES}BLINDS"
TYPE_CAMERA = f"{PREFIX_TYPES}CAMERA"
TYPE_CURTAIN = f"{PREFIX_TYPES}CURTAIN"
-TYPE_CARBON_MONOXIDE_DETECTOR = f"{PREFIX_TYPES}CARBON_MONOXIDE_DETECTOR"
TYPE_DEHUMIDIFIER = f"{PREFIX_TYPES}DEHUMIDIFIER"
TYPE_DOOR = f"{PREFIX_TYPES}DOOR"
TYPE_DOORBELL = f"{PREFIX_TYPES}DOORBELL"
@@ -94,7 +93,6 @@ TYPE_SCENE = f"{PREFIX_TYPES}SCENE"
TYPE_SENSOR = f"{PREFIX_TYPES}SENSOR"
TYPE_SETTOP = f"{PREFIX_TYPES}SETTOP"
TYPE_SHUTTER = f"{PREFIX_TYPES}SHUTTER"
-TYPE_SMOKE_DETECTOR = f"{PREFIX_TYPES}SMOKE_DETECTOR"
TYPE_SPEAKER = f"{PREFIX_TYPES}SPEAKER"
TYPE_SWITCH = f"{PREFIX_TYPES}SWITCH"
TYPE_THERMOSTAT = f"{PREFIX_TYPES}THERMOSTAT"
@@ -138,7 +136,6 @@ EVENT_SYNC_RECEIVED = "google_assistant_sync"
DOMAIN_TO_GOOGLE_TYPES = {
alarm_control_panel.DOMAIN: TYPE_ALARM,
- binary_sensor.DOMAIN: TYPE_SENSOR,
button.DOMAIN: TYPE_SCENE,
camera.DOMAIN: TYPE_CAMERA,
climate.DOMAIN: TYPE_THERMOSTAT,
@@ -171,14 +168,6 @@ DEVICE_CLASS_TO_GOOGLE_TYPES = {
binary_sensor.DOMAIN,
binary_sensor.BinarySensorDeviceClass.GARAGE_DOOR,
): TYPE_GARAGE,
- (
- binary_sensor.DOMAIN,
- binary_sensor.BinarySensorDeviceClass.SMOKE,
- ): TYPE_SMOKE_DETECTOR,
- (
- binary_sensor.DOMAIN,
- binary_sensor.BinarySensorDeviceClass.CO,
- ): TYPE_CARBON_MONOXIDE_DETECTOR,
(cover.DOMAIN, cover.CoverDeviceClass.AWNING): TYPE_AWNING,
(cover.DOMAIN, cover.CoverDeviceClass.CURTAIN): TYPE_CURTAIN,
(cover.DOMAIN, cover.CoverDeviceClass.DOOR): TYPE_DOOR,
diff --git a/homeassistant/components/google_assistant/trait.py b/homeassistant/components/google_assistant/trait.py
index f99f1574038..df56885995a 100644
--- a/homeassistant/components/google_assistant/trait.py
+++ b/homeassistant/components/google_assistant/trait.py
@@ -2706,21 +2706,6 @@ class SensorStateTrait(_Trait):
),
}
- binary_sensor_types = {
- binary_sensor.BinarySensorDeviceClass.CO: (
- "CarbonMonoxideLevel",
- ["carbon monoxide detected", "no carbon monoxide detected", "unknown"],
- ),
- binary_sensor.BinarySensorDeviceClass.SMOKE: (
- "SmokeLevel",
- ["smoke detected", "no smoke detected", "unknown"],
- ),
- binary_sensor.BinarySensorDeviceClass.MOISTURE: (
- "WaterLeak",
- ["leak", "no leak", "unknown"],
- ),
- }
-
name = TRAIT_SENSOR_STATE
commands: list[str] = []
@@ -2743,37 +2728,24 @@ class SensorStateTrait(_Trait):
@classmethod
def supported(cls, domain, features, device_class, _):
"""Test if state is supported."""
- return (domain == sensor.DOMAIN and device_class in cls.sensor_types) or (
- domain == binary_sensor.DOMAIN and device_class in cls.binary_sensor_types
- )
+ return domain == sensor.DOMAIN and device_class in cls.sensor_types
def sync_attributes(self) -> dict[str, Any]:
"""Return attributes for a sync request."""
device_class = self.state.attributes.get(ATTR_DEVICE_CLASS)
+ data = self.sensor_types.get(device_class)
- def create_sensor_state(
- name: str,
- raw_value_unit: str | None = None,
- available_states: list[str] | None = None,
- ) -> dict[str, Any]:
- sensor_state: dict[str, Any] = {
- "name": name,
- }
- if raw_value_unit:
- sensor_state["numericCapabilities"] = {"rawValueUnit": raw_value_unit}
- if available_states:
- sensor_state["descriptiveCapabilities"] = {
- "availableStates": available_states
- }
- return {"sensorStatesSupported": [sensor_state]}
+ if device_class is None or data is None:
+ return {}
- if self.state.domain == sensor.DOMAIN:
- sensor_data = self.sensor_types.get(device_class)
- if device_class is None or sensor_data is None:
- return {}
- available_states: list[str] | None = None
- if device_class == sensor.SensorDeviceClass.AQI:
- available_states = [
+ sensor_state = {
+ "name": data[0],
+ "numericCapabilities": {"rawValueUnit": data[1]},
+ }
+
+ if device_class == sensor.SensorDeviceClass.AQI:
+ sensor_state["descriptiveCapabilities"] = {
+ "availableStates": [
"healthy",
"moderate",
"unhealthy for sensitive groups",
@@ -2781,53 +2753,30 @@ class SensorStateTrait(_Trait):
"very unhealthy",
"hazardous",
"unknown",
- ]
- return create_sensor_state(sensor_data[0], sensor_data[1], available_states)
- binary_sensor_data = self.binary_sensor_types.get(device_class)
- if device_class is None or binary_sensor_data is None:
- return {}
- return create_sensor_state(
- binary_sensor_data[0], available_states=binary_sensor_data[1]
- )
+ ],
+ }
+
+ return {"sensorStatesSupported": [sensor_state]}
def query_attributes(self) -> dict[str, Any]:
"""Return the attributes of this trait for this entity."""
device_class = self.state.attributes.get(ATTR_DEVICE_CLASS)
+ data = self.sensor_types.get(device_class)
- def create_sensor_state(
- name: str, raw_value: float | None = None, current_state: str | None = None
- ) -> dict[str, Any]:
- sensor_state: dict[str, Any] = {
- "name": name,
- "rawValue": raw_value,
- }
- if current_state:
- sensor_state["currentSensorState"] = current_state
- return {"currentSensorStateData": [sensor_state]}
-
- if self.state.domain == sensor.DOMAIN:
- sensor_data = self.sensor_types.get(device_class)
- if device_class is None or sensor_data is None:
- return {}
- try:
- value = float(self.state.state)
- except ValueError:
- value = None
- if self.state.state == STATE_UNKNOWN:
- value = None
- current_state: str | None = None
- if device_class == sensor.SensorDeviceClass.AQI:
- current_state = self._air_quality_description_for_aqi(value)
- return create_sensor_state(sensor_data[0], value, current_state)
-
- binary_sensor_data = self.binary_sensor_types.get(device_class)
- if device_class is None or binary_sensor_data is None:
+ if device_class is None or data is None:
return {}
- value = {
- STATE_ON: 0,
- STATE_OFF: 1,
- STATE_UNKNOWN: 2,
- }[self.state.state]
- return create_sensor_state(
- binary_sensor_data[0], current_state=binary_sensor_data[1][value]
- )
+
+ try:
+ value = float(self.state.state)
+ except ValueError:
+ value = None
+ if self.state.state == STATE_UNKNOWN:
+ value = None
+ sensor_data = {"name": data[0], "rawValue": value}
+
+ if device_class == sensor.SensorDeviceClass.AQI:
+ sensor_data["currentSensorState"] = self._air_quality_description_for_aqi(
+ value
+ )
+
+ return {"currentSensorStateData": [sensor_data]}
diff --git a/homeassistant/components/google_assistant_sdk/config_flow.py b/homeassistant/components/google_assistant_sdk/config_flow.py
index cd78c90e297..ea1ebe9e24a 100644
--- a/homeassistant/components/google_assistant_sdk/config_flow.py
+++ b/homeassistant/components/google_assistant_sdk/config_flow.py
@@ -84,12 +84,16 @@ class OAuth2FlowHandler(
config_entry: ConfigEntry,
) -> OptionsFlow:
"""Create the options flow."""
- return OptionsFlowHandler()
+ return OptionsFlowHandler(config_entry)
class OptionsFlowHandler(OptionsFlow):
"""Google Assistant SDK options flow."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/google_cloud/config_flow.py b/homeassistant/components/google_cloud/config_flow.py
index fa6c952022b..dec849de4e6 100644
--- a/homeassistant/components/google_cloud/config_flow.py
+++ b/homeassistant/components/google_cloud/config_flow.py
@@ -15,7 +15,7 @@ from homeassistant.config_entries import (
ConfigEntry,
ConfigFlow,
ConfigFlowResult,
- OptionsFlow,
+ OptionsFlowWithConfigEntry,
)
from homeassistant.core import callback
from homeassistant.helpers.selector import (
@@ -135,10 +135,10 @@ class GoogleCloudConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> GoogleCloudOptionsFlowHandler:
"""Create the options flow."""
- return GoogleCloudOptionsFlowHandler()
+ return GoogleCloudOptionsFlowHandler(config_entry)
-class GoogleCloudOptionsFlowHandler(OptionsFlow):
+class GoogleCloudOptionsFlowHandler(OptionsFlowWithConfigEntry):
"""Google Cloud options flow."""
async def async_step_init(
@@ -169,7 +169,7 @@ class GoogleCloudOptionsFlowHandler(OptionsFlow):
)
),
**tts_options_schema(
- self.config_entry.options, voices, from_config_flow=True
+ self.options, voices, from_config_flow=True
).schema,
vol.Optional(
CONF_STT_MODEL,
@@ -182,6 +182,6 @@ class GoogleCloudOptionsFlowHandler(OptionsFlow):
),
}
),
- self.config_entry.options,
+ self.options,
),
)
diff --git a/homeassistant/components/google_cloud/helpers.py b/homeassistant/components/google_cloud/helpers.py
index f6e89fae7fa..3c614156132 100644
--- a/homeassistant/components/google_cloud/helpers.py
+++ b/homeassistant/components/google_cloud/helpers.py
@@ -52,7 +52,7 @@ async def async_tts_voices(
def tts_options_schema(
- config_options: Mapping[str, Any],
+ config_options: dict[str, Any],
voices: dict[str, list[str]],
from_config_flow: bool = False,
) -> vol.Schema:
diff --git a/homeassistant/components/google_generative_ai_conversation/config_flow.py b/homeassistant/components/google_generative_ai_conversation/config_flow.py
index 83eec25ed15..bccc7d1fb84 100644
--- a/homeassistant/components/google_generative_ai_conversation/config_flow.py
+++ b/homeassistant/components/google_generative_ai_conversation/config_flow.py
@@ -163,6 +163,7 @@ class GoogleGenerativeAIOptionsFlow(OptionsFlow):
def __init__(self, config_entry: ConfigEntry) -> None:
"""Initialize options flow."""
+ self.config_entry = config_entry
self.last_rendered_recommended = config_entry.options.get(
CONF_RECOMMENDED, False
)
diff --git a/homeassistant/components/google_travel_time/config_flow.py b/homeassistant/components/google_travel_time/config_flow.py
index 08de293bc7d..ee809a23aea 100644
--- a/homeassistant/components/google_travel_time/config_flow.py
+++ b/homeassistant/components/google_travel_time/config_flow.py
@@ -148,6 +148,10 @@ def default_options(hass: HomeAssistant) -> dict[str, str]:
class GoogleOptionsFlow(OptionsFlow):
"""Handle an options flow for Google Travel Time."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize google options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(self, user_input=None) -> ConfigFlowResult:
"""Handle the initial step."""
if user_input is not None:
@@ -209,7 +213,7 @@ class GoogleTravelTimeConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> GoogleOptionsFlow:
"""Get the options flow for this handler."""
- return GoogleOptionsFlow()
+ return GoogleOptionsFlow(config_entry)
async def async_step_user(self, user_input=None) -> ConfigFlowResult:
"""Handle the initial step."""
diff --git a/homeassistant/components/habitica/__init__.py b/homeassistant/components/habitica/__init__.py
index 5843e14d63e..502f52609dd 100644
--- a/homeassistant/components/habitica/__init__.py
+++ b/homeassistant/components/habitica/__init__.py
@@ -30,7 +30,6 @@ CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
PLATFORMS = [
- Platform.BINARY_SENSOR,
Platform.BUTTON,
Platform.CALENDAR,
Platform.SENSOR,
diff --git a/homeassistant/components/habitica/binary_sensor.py b/homeassistant/components/habitica/binary_sensor.py
deleted file mode 100644
index bc79370ea63..00000000000
--- a/homeassistant/components/habitica/binary_sensor.py
+++ /dev/null
@@ -1,85 +0,0 @@
-"""Binary sensor platform for Habitica integration."""
-
-from __future__ import annotations
-
-from collections.abc import Callable
-from dataclasses import dataclass
-from enum import StrEnum
-from typing import Any
-
-from homeassistant.components.binary_sensor import (
- BinarySensorEntity,
- BinarySensorEntityDescription,
-)
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-
-from .const import ASSETS_URL
-from .entity import HabiticaBase
-from .types import HabiticaConfigEntry
-
-
-@dataclass(kw_only=True, frozen=True)
-class HabiticaBinarySensorEntityDescription(BinarySensorEntityDescription):
- """Habitica Binary Sensor Description."""
-
- value_fn: Callable[[dict[str, Any]], bool | None]
- entity_picture: Callable[[dict[str, Any]], str | None]
-
-
-class HabiticaBinarySensor(StrEnum):
- """Habitica Entities."""
-
- PENDING_QUEST = "pending_quest"
-
-
-def get_scroll_image_for_pending_quest_invitation(user: dict[str, Any]) -> str | None:
- """Entity picture for pending quest invitation."""
- if user["party"]["quest"].get("key") and user["party"]["quest"]["RSVPNeeded"]:
- return f"inventory_quest_scroll_{user["party"]["quest"]["key"]}.png"
- return None
-
-
-BINARY_SENSOR_DESCRIPTIONS: tuple[HabiticaBinarySensorEntityDescription, ...] = (
- HabiticaBinarySensorEntityDescription(
- key=HabiticaBinarySensor.PENDING_QUEST,
- translation_key=HabiticaBinarySensor.PENDING_QUEST,
- value_fn=lambda user: user["party"]["quest"]["RSVPNeeded"],
- entity_picture=get_scroll_image_for_pending_quest_invitation,
- ),
-)
-
-
-async def async_setup_entry(
- hass: HomeAssistant,
- config_entry: HabiticaConfigEntry,
- async_add_entities: AddEntitiesCallback,
-) -> None:
- """Set up the habitica binary sensors."""
-
- coordinator = config_entry.runtime_data
-
- async_add_entities(
- HabiticaBinarySensorEntity(coordinator, description)
- for description in BINARY_SENSOR_DESCRIPTIONS
- )
-
-
-class HabiticaBinarySensorEntity(HabiticaBase, BinarySensorEntity):
- """Representation of a Habitica binary sensor."""
-
- entity_description: HabiticaBinarySensorEntityDescription
-
- @property
- def is_on(self) -> bool | None:
- """If the binary sensor is on."""
- return self.entity_description.value_fn(self.coordinator.data.user)
-
- @property
- def entity_picture(self) -> str | None:
- """Return the entity picture to use in the frontend, if any."""
- if entity_picture := self.entity_description.entity_picture(
- self.coordinator.data.user
- ):
- return f"{ASSETS_URL}{entity_picture}"
- return None
diff --git a/homeassistant/components/habitica/const.py b/homeassistant/components/habitica/const.py
index ae98cb13dcb..55322a13e6a 100644
--- a/homeassistant/components/habitica/const.py
+++ b/homeassistant/components/habitica/const.py
@@ -25,16 +25,7 @@ UNIT_TASKS = "tasks"
ATTR_CONFIG_ENTRY = "config_entry"
ATTR_SKILL = "skill"
ATTR_TASK = "task"
-ATTR_DIRECTION = "direction"
SERVICE_CAST_SKILL = "cast_skill"
-SERVICE_START_QUEST = "start_quest"
-SERVICE_ACCEPT_QUEST = "accept_quest"
-SERVICE_CANCEL_QUEST = "cancel_quest"
-SERVICE_ABORT_QUEST = "abort_quest"
-SERVICE_REJECT_QUEST = "reject_quest"
-SERVICE_LEAVE_QUEST = "leave_quest"
-SERVICE_SCORE_HABIT = "score_habit"
-SERVICE_SCORE_REWARD = "score_reward"
WARRIOR = "warrior"
ROGUE = "rogue"
diff --git a/homeassistant/components/habitica/coordinator.py b/homeassistant/components/habitica/coordinator.py
index f9ffb1b53bd..cce2c684ba8 100644
--- a/homeassistant/components/habitica/coordinator.py
+++ b/homeassistant/components/habitica/coordinator.py
@@ -51,17 +51,12 @@ class HabiticaDataUpdateCoordinator(DataUpdateCoordinator[HabiticaData]):
),
)
self.api = habitipy
- self.content: dict[str, Any] = {}
async def _async_update_data(self) -> HabiticaData:
try:
user_response = await self.api.user.get()
tasks_response = await self.api.tasks.user.get()
tasks_response.extend(await self.api.tasks.user.get(type="completedTodos"))
- if not self.content:
- self.content = await self.api.content.get(
- language=user_response["preferences"]["language"]
- )
except ClientResponseError as error:
if error.status == HTTPStatus.TOO_MANY_REQUESTS:
_LOGGER.debug("Rate limit exceeded, will try again later")
diff --git a/homeassistant/components/habitica/icons.json b/homeassistant/components/habitica/icons.json
index d33b9c60c96..617f08a4e58 100644
--- a/homeassistant/components/habitica/icons.json
+++ b/homeassistant/components/habitica/icons.json
@@ -126,18 +126,6 @@
},
"rewards": {
"default": "mdi:treasure-chest"
- },
- "strength": {
- "default": "mdi:arm-flex-outline"
- },
- "intelligence": {
- "default": "mdi:head-snowflake-outline"
- },
- "perception": {
- "default": "mdi:eye-outline"
- },
- "constitution": {
- "default": "mdi:run-fast"
}
},
"switch": {
@@ -147,14 +135,6 @@
"on": "mdi:sleep"
}
}
- },
- "binary_sensor": {
- "pending_quest": {
- "default": "mdi:script-outline",
- "state": {
- "on": "mdi:script-text-outline"
- }
- }
}
},
"services": {
@@ -163,30 +143,6 @@
},
"cast_skill": {
"service": "mdi:creation-outline"
- },
- "accept_quest": {
- "service": "mdi:script-text"
- },
- "reject_quest": {
- "service": "mdi:script-text"
- },
- "leave_quest": {
- "service": "mdi:script-text"
- },
- "abort_quest": {
- "service": "mdi:script-text-key"
- },
- "cancel_quest": {
- "service": "mdi:script-text-key"
- },
- "start_quest": {
- "service": "mdi:script-text-key"
- },
- "score_habit": {
- "service": "mdi:counter"
- },
- "score_reward": {
- "service": "mdi:sack"
}
}
}
diff --git a/homeassistant/components/habitica/sensor.py b/homeassistant/components/habitica/sensor.py
index 3b2395ecc52..77356f88265 100644
--- a/homeassistant/components/habitica/sensor.py
+++ b/homeassistant/components/habitica/sensor.py
@@ -27,7 +27,7 @@ from homeassistant.helpers.typing import StateType
from .const import DOMAIN, UNIT_TASKS
from .entity import HabiticaBase
from .types import HabiticaConfigEntry
-from .util import entity_used_in, get_attribute_points, get_attributes_total
+from .util import entity_used_in
_LOGGER = logging.getLogger(__name__)
@@ -36,10 +36,7 @@ _LOGGER = logging.getLogger(__name__)
class HabitipySensorEntityDescription(SensorEntityDescription):
"""Habitipy Sensor Description."""
- value_fn: Callable[[dict[str, Any], dict[str, Any]], StateType]
- attributes_fn: (
- Callable[[dict[str, Any], dict[str, Any]], dict[str, Any] | None] | None
- ) = None
+ value_fn: Callable[[dict[str, Any]], StateType]
@dataclass(kw_only=True, frozen=True)
@@ -68,80 +65,76 @@ class HabitipySensorEntity(StrEnum):
REWARDS = "rewards"
GEMS = "gems"
TRINKETS = "trinkets"
- STRENGTH = "strength"
- INTELLIGENCE = "intelligence"
- CONSTITUTION = "constitution"
- PERCEPTION = "perception"
SENSOR_DESCRIPTIONS: tuple[HabitipySensorEntityDescription, ...] = (
HabitipySensorEntityDescription(
key=HabitipySensorEntity.DISPLAY_NAME,
translation_key=HabitipySensorEntity.DISPLAY_NAME,
- value_fn=lambda user, _: user.get("profile", {}).get("name"),
+ value_fn=lambda user: user.get("profile", {}).get("name"),
),
HabitipySensorEntityDescription(
key=HabitipySensorEntity.HEALTH,
translation_key=HabitipySensorEntity.HEALTH,
native_unit_of_measurement="HP",
suggested_display_precision=0,
- value_fn=lambda user, _: user.get("stats", {}).get("hp"),
+ value_fn=lambda user: user.get("stats", {}).get("hp"),
),
HabitipySensorEntityDescription(
key=HabitipySensorEntity.HEALTH_MAX,
translation_key=HabitipySensorEntity.HEALTH_MAX,
native_unit_of_measurement="HP",
entity_registry_enabled_default=False,
- value_fn=lambda user, _: user.get("stats", {}).get("maxHealth"),
+ value_fn=lambda user: user.get("stats", {}).get("maxHealth"),
),
HabitipySensorEntityDescription(
key=HabitipySensorEntity.MANA,
translation_key=HabitipySensorEntity.MANA,
native_unit_of_measurement="MP",
suggested_display_precision=0,
- value_fn=lambda user, _: user.get("stats", {}).get("mp"),
+ value_fn=lambda user: user.get("stats", {}).get("mp"),
),
HabitipySensorEntityDescription(
key=HabitipySensorEntity.MANA_MAX,
translation_key=HabitipySensorEntity.MANA_MAX,
native_unit_of_measurement="MP",
- value_fn=lambda user, _: user.get("stats", {}).get("maxMP"),
+ value_fn=lambda user: user.get("stats", {}).get("maxMP"),
),
HabitipySensorEntityDescription(
key=HabitipySensorEntity.EXPERIENCE,
translation_key=HabitipySensorEntity.EXPERIENCE,
native_unit_of_measurement="XP",
- value_fn=lambda user, _: user.get("stats", {}).get("exp"),
+ value_fn=lambda user: user.get("stats", {}).get("exp"),
),
HabitipySensorEntityDescription(
key=HabitipySensorEntity.EXPERIENCE_MAX,
translation_key=HabitipySensorEntity.EXPERIENCE_MAX,
native_unit_of_measurement="XP",
- value_fn=lambda user, _: user.get("stats", {}).get("toNextLevel"),
+ value_fn=lambda user: user.get("stats", {}).get("toNextLevel"),
),
HabitipySensorEntityDescription(
key=HabitipySensorEntity.LEVEL,
translation_key=HabitipySensorEntity.LEVEL,
- value_fn=lambda user, _: user.get("stats", {}).get("lvl"),
+ value_fn=lambda user: user.get("stats", {}).get("lvl"),
),
HabitipySensorEntityDescription(
key=HabitipySensorEntity.GOLD,
translation_key=HabitipySensorEntity.GOLD,
native_unit_of_measurement="GP",
suggested_display_precision=2,
- value_fn=lambda user, _: user.get("stats", {}).get("gp"),
+ value_fn=lambda user: user.get("stats", {}).get("gp"),
),
HabitipySensorEntityDescription(
key=HabitipySensorEntity.CLASS,
translation_key=HabitipySensorEntity.CLASS,
- value_fn=lambda user, _: user.get("stats", {}).get("class"),
+ value_fn=lambda user: user.get("stats", {}).get("class"),
device_class=SensorDeviceClass.ENUM,
options=["warrior", "healer", "wizard", "rogue"],
),
HabitipySensorEntityDescription(
key=HabitipySensorEntity.GEMS,
translation_key=HabitipySensorEntity.GEMS,
- value_fn=lambda user, _: user.get("balance", 0) * 4,
+ value_fn=lambda user: user.get("balance", 0) * 4,
suggested_display_precision=0,
native_unit_of_measurement="gems",
),
@@ -149,7 +142,7 @@ SENSOR_DESCRIPTIONS: tuple[HabitipySensorEntityDescription, ...] = (
key=HabitipySensorEntity.TRINKETS,
translation_key=HabitipySensorEntity.TRINKETS,
value_fn=(
- lambda user, _: user.get("purchased", {})
+ lambda user: user.get("purchased", {})
.get("plan", {})
.get("consecutive", {})
.get("trinkets", 0)
@@ -157,38 +150,6 @@ SENSOR_DESCRIPTIONS: tuple[HabitipySensorEntityDescription, ...] = (
suggested_display_precision=0,
native_unit_of_measurement="⧖",
),
- HabitipySensorEntityDescription(
- key=HabitipySensorEntity.STRENGTH,
- translation_key=HabitipySensorEntity.STRENGTH,
- value_fn=lambda user, content: get_attributes_total(user, content, "str"),
- attributes_fn=lambda user, content: get_attribute_points(user, content, "str"),
- suggested_display_precision=0,
- native_unit_of_measurement="STR",
- ),
- HabitipySensorEntityDescription(
- key=HabitipySensorEntity.INTELLIGENCE,
- translation_key=HabitipySensorEntity.INTELLIGENCE,
- value_fn=lambda user, content: get_attributes_total(user, content, "int"),
- attributes_fn=lambda user, content: get_attribute_points(user, content, "int"),
- suggested_display_precision=0,
- native_unit_of_measurement="INT",
- ),
- HabitipySensorEntityDescription(
- key=HabitipySensorEntity.PERCEPTION,
- translation_key=HabitipySensorEntity.PERCEPTION,
- value_fn=lambda user, content: get_attributes_total(user, content, "per"),
- attributes_fn=lambda user, content: get_attribute_points(user, content, "per"),
- suggested_display_precision=0,
- native_unit_of_measurement="PER",
- ),
- HabitipySensorEntityDescription(
- key=HabitipySensorEntity.CONSTITUTION,
- translation_key=HabitipySensorEntity.CONSTITUTION,
- value_fn=lambda user, content: get_attributes_total(user, content, "con"),
- attributes_fn=lambda user, content: get_attribute_points(user, content, "con"),
- suggested_display_precision=0,
- native_unit_of_measurement="CON",
- ),
)
@@ -282,16 +243,7 @@ class HabitipySensor(HabiticaBase, SensorEntity):
def native_value(self) -> StateType:
"""Return the state of the device."""
- return self.entity_description.value_fn(
- self.coordinator.data.user, self.coordinator.content
- )
-
- @property
- def extra_state_attributes(self) -> dict[str, float | None] | None:
- """Return entity specific state attributes."""
- if func := self.entity_description.attributes_fn:
- return func(self.coordinator.data.user, self.coordinator.content)
- return None
+ return self.entity_description.value_fn(self.coordinator.data.user)
class HabitipyTaskSensor(HabiticaBase, SensorEntity):
diff --git a/homeassistant/components/habitica/services.py b/homeassistant/components/habitica/services.py
index a50e5f1e6e3..8ca80ff63ad 100644
--- a/homeassistant/components/habitica/services.py
+++ b/homeassistant/components/habitica/services.py
@@ -9,7 +9,6 @@ from typing import Any
from aiohttp import ClientResponseError
import voluptuous as vol
-from homeassistant.config_entries import ConfigEntryState
from homeassistant.const import ATTR_NAME, CONF_NAME
from homeassistant.core import (
HomeAssistant,
@@ -19,29 +18,19 @@ from homeassistant.core import (
)
from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
from homeassistant.helpers.selector import ConfigEntrySelector
from .const import (
ATTR_ARGS,
ATTR_CONFIG_ENTRY,
ATTR_DATA,
- ATTR_DIRECTION,
ATTR_PATH,
ATTR_SKILL,
ATTR_TASK,
DOMAIN,
EVENT_API_CALL_SUCCESS,
- SERVICE_ABORT_QUEST,
- SERVICE_ACCEPT_QUEST,
SERVICE_API_CALL,
- SERVICE_CANCEL_QUEST,
SERVICE_CAST_SKILL,
- SERVICE_LEAVE_QUEST,
- SERVICE_REJECT_QUEST,
- SERVICE_SCORE_HABIT,
- SERVICE_SCORE_REWARD,
- SERVICE_START_QUEST,
)
from .types import HabiticaConfigEntry
@@ -64,52 +53,11 @@ SERVICE_CAST_SKILL_SCHEMA = vol.Schema(
}
)
-SERVICE_MANAGE_QUEST_SCHEMA = vol.Schema(
- {
- vol.Required(ATTR_CONFIG_ENTRY): ConfigEntrySelector(),
- }
-)
-SERVICE_SCORE_TASK_SCHEMA = vol.Schema(
- {
- vol.Required(ATTR_CONFIG_ENTRY): ConfigEntrySelector(),
- vol.Required(ATTR_TASK): cv.string,
- vol.Optional(ATTR_DIRECTION): cv.string,
- }
-)
-
-def get_config_entry(hass: HomeAssistant, entry_id: str) -> HabiticaConfigEntry:
- """Return config entry or raise if not found or not loaded."""
- if not (entry := hass.config_entries.async_get_entry(entry_id)):
- raise ServiceValidationError(
- translation_domain=DOMAIN,
- translation_key="entry_not_found",
- )
- if entry.state is not ConfigEntryState.LOADED:
- raise ServiceValidationError(
- translation_domain=DOMAIN,
- translation_key="entry_not_loaded",
- )
- return entry
-
-
-def async_setup_services(hass: HomeAssistant) -> None: # noqa: C901
+def async_setup_services(hass: HomeAssistant) -> None:
"""Set up services for Habitica integration."""
async def handle_api_call(call: ServiceCall) -> None:
- async_create_issue(
- hass,
- DOMAIN,
- "deprecated_api_call",
- breaks_in_ha_version="2025.6.0",
- is_fixable=False,
- severity=IssueSeverity.WARNING,
- translation_key="deprecated_api_call",
- )
- _LOGGER.warning(
- "Deprecated action called: 'habitica.api_call' is deprecated and will be removed in Home Assistant version 2025.6.0"
- )
-
name = call.data[ATTR_NAME]
path = call.data[ATTR_PATH]
entries = hass.config_entries.async_entries(DOMAIN)
@@ -138,7 +86,14 @@ def async_setup_services(hass: HomeAssistant) -> None: # noqa: C901
async def cast_skill(call: ServiceCall) -> ServiceResponse:
"""Skill action."""
- entry = get_config_entry(hass, call.data[ATTR_CONFIG_ENTRY])
+ entry: HabiticaConfigEntry | None
+ if not (
+ entry := hass.config_entries.async_get_entry(call.data[ATTR_CONFIG_ENTRY])
+ ):
+ raise ServiceValidationError(
+ translation_domain=DOMAIN,
+ translation_key="entry_not_found",
+ )
coordinator = entry.runtime_data
skill = {
"pickpocket": {"spellId": "pickPocket", "cost": "10 MP"},
@@ -196,104 +151,6 @@ def async_setup_services(hass: HomeAssistant) -> None: # noqa: C901
await coordinator.async_request_refresh()
return response
- async def manage_quests(call: ServiceCall) -> ServiceResponse:
- """Accept, reject, start, leave or cancel quests."""
- entry = get_config_entry(hass, call.data[ATTR_CONFIG_ENTRY])
- coordinator = entry.runtime_data
-
- COMMAND_MAP = {
- SERVICE_ABORT_QUEST: "abort",
- SERVICE_ACCEPT_QUEST: "accept",
- SERVICE_CANCEL_QUEST: "cancel",
- SERVICE_LEAVE_QUEST: "leave",
- SERVICE_REJECT_QUEST: "reject",
- SERVICE_START_QUEST: "force-start",
- }
- try:
- return await coordinator.api.groups.party.quests[
- COMMAND_MAP[call.service]
- ].post()
- except ClientResponseError as e:
- if e.status == HTTPStatus.TOO_MANY_REQUESTS:
- raise ServiceValidationError(
- translation_domain=DOMAIN,
- translation_key="setup_rate_limit_exception",
- ) from e
- if e.status == HTTPStatus.UNAUTHORIZED:
- raise ServiceValidationError(
- translation_domain=DOMAIN, translation_key="quest_action_unallowed"
- ) from e
- if e.status == HTTPStatus.NOT_FOUND:
- raise ServiceValidationError(
- translation_domain=DOMAIN, translation_key="quest_not_found"
- ) from e
- raise HomeAssistantError(
- translation_domain=DOMAIN, translation_key="service_call_exception"
- ) from e
-
- for service in (
- SERVICE_ABORT_QUEST,
- SERVICE_ACCEPT_QUEST,
- SERVICE_CANCEL_QUEST,
- SERVICE_LEAVE_QUEST,
- SERVICE_REJECT_QUEST,
- SERVICE_START_QUEST,
- ):
- hass.services.async_register(
- DOMAIN,
- service,
- manage_quests,
- schema=SERVICE_MANAGE_QUEST_SCHEMA,
- supports_response=SupportsResponse.ONLY,
- )
-
- async def score_task(call: ServiceCall) -> ServiceResponse:
- """Score a task action."""
- entry = get_config_entry(hass, call.data[ATTR_CONFIG_ENTRY])
- coordinator = entry.runtime_data
- try:
- task_id, task_value = next(
- (task["id"], task.get("value"))
- for task in coordinator.data.tasks
- if call.data[ATTR_TASK] in (task["id"], task.get("alias"))
- or call.data[ATTR_TASK] == task["text"]
- )
- except StopIteration as e:
- raise ServiceValidationError(
- translation_domain=DOMAIN,
- translation_key="task_not_found",
- translation_placeholders={"task": f"'{call.data[ATTR_TASK]}'"},
- ) from e
-
- try:
- response: dict[str, Any] = (
- await coordinator.api.tasks[task_id]
- .score[call.data.get(ATTR_DIRECTION, "up")]
- .post()
- )
- except ClientResponseError as e:
- if e.status == HTTPStatus.TOO_MANY_REQUESTS:
- raise ServiceValidationError(
- translation_domain=DOMAIN,
- translation_key="setup_rate_limit_exception",
- ) from e
- if e.status == HTTPStatus.UNAUTHORIZED and task_value is not None:
- raise ServiceValidationError(
- translation_domain=DOMAIN,
- translation_key="not_enough_gold",
- translation_placeholders={
- "gold": f"{coordinator.data.user["stats"]["gp"]:.2f} GP",
- "cost": f"{task_value} GP",
- },
- ) from e
- raise HomeAssistantError(
- translation_domain=DOMAIN,
- translation_key="service_call_exception",
- ) from e
- else:
- await coordinator.async_request_refresh()
- return response
-
hass.services.async_register(
DOMAIN,
SERVICE_API_CALL,
@@ -308,18 +165,3 @@ def async_setup_services(hass: HomeAssistant) -> None: # noqa: C901
schema=SERVICE_CAST_SKILL_SCHEMA,
supports_response=SupportsResponse.ONLY,
)
-
- hass.services.async_register(
- DOMAIN,
- SERVICE_SCORE_HABIT,
- score_task,
- schema=SERVICE_SCORE_TASK_SCHEMA,
- supports_response=SupportsResponse.ONLY,
- )
- hass.services.async_register(
- DOMAIN,
- SERVICE_SCORE_REWARD,
- score_task,
- schema=SERVICE_SCORE_TASK_SCHEMA,
- supports_response=SupportsResponse.ONLY,
- )
diff --git a/homeassistant/components/habitica/services.yaml b/homeassistant/components/habitica/services.yaml
index b539f6c65bf..546ac8c1c34 100644
--- a/homeassistant/components/habitica/services.yaml
+++ b/homeassistant/components/habitica/services.yaml
@@ -17,7 +17,7 @@ api_call:
object:
cast_skill:
fields:
- config_entry: &config_entry
+ config_entry:
required: true
selector:
config_entry:
@@ -33,42 +33,7 @@ cast_skill:
- "fireball"
mode: dropdown
translation_key: "skill_select"
- task: &task
+ task:
required: true
selector:
text:
-accept_quest:
- fields:
- config_entry: *config_entry
-reject_quest:
- fields:
- config_entry: *config_entry
-start_quest:
- fields:
- config_entry: *config_entry
-cancel_quest:
- fields:
- config_entry: *config_entry
-abort_quest:
- fields:
- config_entry: *config_entry
-leave_quest:
- fields:
- config_entry: *config_entry
-score_habit:
- fields:
- config_entry: *config_entry
- task: *task
- direction:
- required: true
- selector:
- select:
- options:
- - value: up
- label: "➕"
- - value: down
- label: "➖"
-score_reward:
- fields:
- config_entry: *config_entry
- task: *task
diff --git a/homeassistant/components/habitica/strings.json b/homeassistant/components/habitica/strings.json
index ac1faf5fcef..690cdab09ad 100644
--- a/homeassistant/components/habitica/strings.json
+++ b/homeassistant/components/habitica/strings.json
@@ -1,8 +1,7 @@
{
"common": {
"todos": "To-Do's",
- "dailies": "Dailies",
- "config_entry_name": "Select character"
+ "dailies": "Dailies"
},
"config": {
"abort": {
@@ -39,11 +38,6 @@
}
},
"entity": {
- "binary_sensor": {
- "pending_quest": {
- "name": "Pending quest invitation"
- }
- },
"button": {
"run_cron": {
"name": "Start my day"
@@ -165,86 +159,6 @@
},
"rewards": {
"name": "Rewards"
- },
- "strength": {
- "name": "Strength",
- "state_attributes": {
- "level": {
- "name": "[%key:component::habitica::entity::sensor::level::name%]"
- },
- "equipment": {
- "name": "Battle gear"
- },
- "class": {
- "name": "Class equip bonus"
- },
- "allocated": {
- "name": "Allocated attribute points"
- },
- "buffs": {
- "name": "Buffs"
- }
- }
- },
- "intelligence": {
- "name": "Intelligence",
- "state_attributes": {
- "level": {
- "name": "[%key:component::habitica::entity::sensor::level::name%]"
- },
- "equipment": {
- "name": "[%key:component::habitica::entity::sensor::strength::state_attributes::equipment::name%]"
- },
- "class": {
- "name": "[%key:component::habitica::entity::sensor::strength::state_attributes::class::name%]"
- },
- "allocated": {
- "name": "[%key:component::habitica::entity::sensor::strength::state_attributes::allocated::name%]"
- },
- "buffs": {
- "name": "[%key:component::habitica::entity::sensor::strength::state_attributes::buffs::name%]"
- }
- }
- },
- "perception": {
- "name": "Perception",
- "state_attributes": {
- "level": {
- "name": "[%key:component::habitica::entity::sensor::level::name%]"
- },
- "equipment": {
- "name": "[%key:component::habitica::entity::sensor::strength::state_attributes::equipment::name%]"
- },
- "class": {
- "name": "[%key:component::habitica::entity::sensor::strength::state_attributes::class::name%]"
- },
- "allocated": {
- "name": "[%key:component::habitica::entity::sensor::strength::state_attributes::allocated::name%]"
- },
- "buffs": {
- "name": "[%key:component::habitica::entity::sensor::strength::state_attributes::buffs::name%]"
- }
- }
- },
- "constitution": {
- "name": "Constitution",
- "state_attributes": {
- "level": {
- "name": "[%key:component::habitica::entity::sensor::level::name%]"
- },
- "equipment": {
- "name": "[%key:component::habitica::entity::sensor::strength::state_attributes::equipment::name%]"
- },
- "class": {
- "name": "[%key:component::habitica::entity::sensor::strength::state_attributes::class::name%]"
- },
- "allocated": {
- "name": "[%key:component::habitica::entity::sensor::strength::state_attributes::allocated::name%]"
- },
- "buffs": {
- "name": "[%key:component::habitica::entity::sensor::strength::state_attributes::buffs::name%]"
- }
- }
}
},
"switch": {
@@ -301,36 +215,20 @@
"not_enough_mana": {
"message": "Unable to cast skill, not enough mana. Your character has {mana}, but the skill costs {cost}."
},
- "not_enough_gold": {
- "message": "Unable to buy reward, not enough gold. Your character has {gold}, but the reward costs {cost}."
- },
"skill_not_found": {
"message": "Unable to cast skill, your character does not have the skill or spell {skill}."
},
"entry_not_found": {
- "message": "The selected character is not configured in Home Assistant."
- },
- "entry_not_loaded": {
- "message": "The selected character is currently not loaded or disabled in Home Assistant."
+ "message": "The selected character is currently not configured or loaded in Home Assistant."
},
"task_not_found": {
- "message": "Unable to complete action, could not find the task {task}"
- },
- "quest_action_unallowed": {
- "message": "Action not allowed, only quest leader or group leader can perform this action"
- },
- "quest_not_found": {
- "message": "Unable to complete action, quest or group not found"
+ "message": "Unable to cast skill, could not find the task {task}"
}
},
"issues": {
"deprecated_task_entity": {
"title": "The Habitica {task_name} sensor is deprecated",
"description": "The Habitica entity `{entity}` is deprecated and will be removed in a future release.\nPlease update your automations and scripts to replace the sensor entity with the newly added todo entity.\nWhen you are done migrating you can disable `{entity}`."
- },
- "deprecated_api_call": {
- "title": "The Habitica action habitica.api_call is deprecated",
- "description": "The Habitica action `habitica.api_call` is deprecated and will be removed in Home Assistant 2025.5.0.\n\nPlease update your automations and scripts to use other Habitica actions and entities."
}
},
"services": {
@@ -357,7 +255,7 @@
"description": "Use a skill or spell from your Habitica character on a specific task to affect its progress or status.",
"fields": {
"config_entry": {
- "name": "[%key:component::habitica::common::config_entry_name%]",
+ "name": "Select character",
"description": "Choose the Habitica character to cast the skill."
},
"skill": {
@@ -369,98 +267,6 @@
"description": "The name (or task ID) of the task you want to target with the skill or spell."
}
}
- },
- "accept_quest": {
- "name": "Accept a quest invitation",
- "description": "Accept a pending invitation to a quest.",
- "fields": {
- "config_entry": {
- "name": "[%key:component::habitica::common::config_entry_name%]",
- "description": "Choose the Habitica character for which to perform the action."
- }
- }
- },
- "reject_quest": {
- "name": "Reject a quest invitation",
- "description": "Reject a pending invitation to a quest.",
- "fields": {
- "config_entry": {
- "name": "[%key:component::habitica::common::config_entry_name%]",
- "description": "[%key:component::habitica::services::accept_quest::fields::config_entry::description%]"
- }
- }
- },
- "leave_quest": {
- "name": "Leave a quest",
- "description": "Leave the current quest you are participating in.",
- "fields": {
- "config_entry": {
- "name": "[%key:component::habitica::common::config_entry_name%]",
- "description": "[%key:component::habitica::services::accept_quest::fields::config_entry::description%]"
- }
- }
- },
- "abort_quest": {
- "name": "Abort an active quest",
- "description": "Terminate your party's ongoing quest. All progress will be lost and the quest roll returned to the owner's inventory. Only quest leader or group leader can perform this action.",
- "fields": {
- "config_entry": {
- "name": "[%key:component::habitica::common::config_entry_name%]",
- "description": "[%key:component::habitica::services::accept_quest::fields::config_entry::description%]"
- }
- }
- },
- "cancel_quest": {
- "name": "Cancel a pending quest",
- "description": "Cancel a quest that has not yet startet. All accepted and pending invitations will be canceled and the quest roll returned to the owner's inventory. Only quest leader or group leader can perform this action.",
- "fields": {
- "config_entry": {
- "name": "[%key:component::habitica::common::config_entry_name%]",
- "description": "[%key:component::habitica::services::accept_quest::fields::config_entry::description%]"
- }
- }
- },
- "start_quest": {
- "name": "Force-start a pending quest",
- "description": "Begin the quest immediately, bypassing any pending invitations that haven't been accepted or rejected. Only quest leader or group leader can perform this action.",
- "fields": {
- "config_entry": {
- "name": "[%key:component::habitica::common::config_entry_name%]",
- "description": "[%key:component::habitica::services::accept_quest::fields::config_entry::description%]"
- }
- }
- },
- "score_habit": {
- "name": "Track a habit",
- "description": "Increase the positive or negative streak of a habit to track its progress.",
- "fields": {
- "config_entry": {
- "name": "[%key:component::habitica::common::config_entry_name%]",
- "description": "Select the Habitica character tracking your habit."
- },
- "task": {
- "name": "Habit name",
- "description": "The name (or task ID) of the Habitica habit."
- },
- "direction": {
- "name": "Reward or loss",
- "description": "Is it positive or negative progress you want to track for your habit."
- }
- }
- },
- "score_reward": {
- "name": "Buy a reward",
- "description": "Reward yourself and buy one of your custom rewards with gold earned by fulfilling tasks.",
- "fields": {
- "config_entry": {
- "name": "[%key:component::habitica::common::config_entry_name%]",
- "description": "Select the Habitica character buying the reward."
- },
- "task": {
- "name": "Reward name",
- "description": "The name (or task ID) of the custom reward."
- }
- }
}
},
"selector": {
diff --git a/homeassistant/components/habitica/util.py b/homeassistant/components/habitica/util.py
index 03acb08baf9..93a7c234a5d 100644
--- a/homeassistant/components/habitica/util.py
+++ b/homeassistant/components/habitica/util.py
@@ -3,7 +3,6 @@
from __future__ import annotations
import datetime
-from math import floor
from typing import TYPE_CHECKING, Any
from dateutil.rrule import (
@@ -140,52 +139,3 @@ def get_recurrence_rule(recurrence: rrule) -> str:
"""
return str(recurrence).split("RRULE:")[1]
-
-
-def get_attribute_points(
- user: dict[str, Any], content: dict[str, Any], attribute: str
-) -> dict[str, float]:
- """Get modifiers contributing to strength attribute."""
-
- gear_set = {
- "weapon",
- "armor",
- "head",
- "shield",
- "back",
- "headAccessory",
- "eyewear",
- "body",
- }
-
- equipment = sum(
- stats[attribute]
- for gear in gear_set
- if (equipped := user["items"]["gear"]["equipped"].get(gear))
- and (stats := content["gear"]["flat"].get(equipped))
- )
-
- class_bonus = sum(
- stats[attribute] / 2
- for gear in gear_set
- if (equipped := user["items"]["gear"]["equipped"].get(gear))
- and (stats := content["gear"]["flat"].get(equipped))
- and stats["klass"] == user["stats"]["class"]
- )
-
- return {
- "level": min(round(user["stats"]["lvl"] / 2), 50),
- "equipment": equipment,
- "class": class_bonus,
- "allocated": user["stats"][attribute],
- "buffs": user["stats"]["buffs"][attribute],
- }
-
-
-def get_attributes_total(
- user: dict[str, Any], content: dict[str, Any], attribute: str
-) -> int:
- """Get total attribute points."""
- return floor(
- sum(value for value in get_attribute_points(user, content, attribute).values())
- )
diff --git a/homeassistant/components/harmony/config_flow.py b/homeassistant/components/harmony/config_flow.py
index b75ad617b39..87eb657a0a9 100644
--- a/homeassistant/components/harmony/config_flow.py
+++ b/homeassistant/components/harmony/config_flow.py
@@ -28,6 +28,7 @@ from homeassistant.core import callback
from homeassistant.exceptions import HomeAssistantError
from .const import DOMAIN, PREVIOUS_ACTIVE_ACTIVITY, UNIQUE_ID
+from .data import HarmonyConfigEntry
from .util import (
find_best_name_for_remote,
find_unique_id_for_remote,
@@ -155,7 +156,7 @@ class HarmonyConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> OptionsFlowHandler:
"""Get the options flow for this handler."""
- return OptionsFlowHandler()
+ return OptionsFlowHandler(config_entry)
async def _async_create_entry_from_valid_input(
self, validated: dict[str, Any], user_input: dict[str, Any]
@@ -185,6 +186,10 @@ def _options_from_user_input(user_input: dict[str, Any]) -> dict[str, Any]:
class OptionsFlowHandler(OptionsFlow):
"""Handle a option flow for Harmony."""
+ def __init__(self, config_entry: HarmonyConfigEntry) -> None:
+ """Initialize options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/hassio/const.py b/homeassistant/components/hassio/const.py
index 82ce74832c2..b337017147b 100644
--- a/homeassistant/components/hassio/const.py
+++ b/homeassistant/components/hassio/const.py
@@ -137,3 +137,17 @@ class SupervisorEntityModel(StrEnum):
CORE = "Home Assistant Core"
SUPERVIOSR = "Home Assistant Supervisor"
HOST = "Home Assistant Host"
+
+
+class SupervisorIssueContext(StrEnum):
+ """Context for supervisor issues."""
+
+ ADDON = "addon"
+ CORE = "core"
+ DNS_SERVER = "dns_server"
+ MOUNT = "mount"
+ OS = "os"
+ PLUGIN = "plugin"
+ SUPERVISOR = "supervisor"
+ STORE = "store"
+ SYSTEM = "system"
diff --git a/homeassistant/components/hassio/handler.py b/homeassistant/components/hassio/handler.py
index 58f2aa8c144..f69ee40293b 100644
--- a/homeassistant/components/hassio/handler.py
+++ b/homeassistant/components/hassio/handler.py
@@ -91,6 +91,15 @@ async def async_create_backup(
return await hassio.send_command(command, payload=payload, timeout=None)
+@bind_hass
+@_api_bool
+async def async_apply_suggestion(hass: HomeAssistant, suggestion_uuid: str) -> dict:
+ """Apply a suggestion from supervisor's resolution center."""
+ hassio: HassIO = hass.data[DOMAIN]
+ command = f"/resolution/suggestion/{suggestion_uuid}"
+ return await hassio.send_command(command, timeout=None)
+
+
@api_data
async def async_get_green_settings(hass: HomeAssistant) -> dict[str, bool]:
"""Return settings specific to Home Assistant Green."""
@@ -236,6 +245,26 @@ class HassIO:
"""
return self.send_command("/ingress/panels", method="get")
+ @api_data
+ def get_resolution_info(self) -> Coroutine:
+ """Return data for Supervisor resolution center.
+
+ This method returns a coroutine.
+ """
+ return self.send_command("/resolution/info", method="get")
+
+ @api_data
+ def get_suggestions_for_issue(
+ self, issue_id: str
+ ) -> Coroutine[Any, Any, dict[str, Any]]:
+ """Return suggestions for issue from Supervisor resolution center.
+
+ This method returns a coroutine.
+ """
+ return self.send_command(
+ f"/resolution/issue/{issue_id}/suggestions", method="get"
+ )
+
@_api_bool
async def update_hass_api(
self, http_config: dict[str, Any], refresh_token: RefreshToken
@@ -275,6 +304,14 @@ class HassIO:
"/supervisor/options", payload={"diagnostics": diagnostics}
)
+ @_api_bool
+ def apply_suggestion(self, suggestion_uuid: str) -> Coroutine:
+ """Apply a suggestion from supervisor's resolution center.
+
+ This method returns a coroutine.
+ """
+ return self.send_command(f"/resolution/suggestion/{suggestion_uuid}")
+
async def send_command(
self,
command: str,
diff --git a/homeassistant/components/hassio/issues.py b/homeassistant/components/hassio/issues.py
index 16697659077..944bc99a6b9 100644
--- a/homeassistant/components/hassio/issues.py
+++ b/homeassistant/components/hassio/issues.py
@@ -7,10 +7,6 @@ from dataclasses import dataclass, field
from datetime import datetime
import logging
from typing import Any, NotRequired, TypedDict
-from uuid import UUID
-
-from aiohasupervisor import SupervisorError
-from aiohasupervisor.models import ContextType, Issue as SupervisorIssue
from homeassistant.core import HassJob, HomeAssistant, callback
from homeassistant.helpers.dispatcher import async_dispatcher_connect
@@ -24,8 +20,12 @@ from homeassistant.helpers.issue_registry import (
from .const import (
ATTR_DATA,
ATTR_HEALTHY,
+ ATTR_ISSUES,
+ ATTR_SUGGESTIONS,
ATTR_SUPPORTED,
+ ATTR_UNHEALTHY,
ATTR_UNHEALTHY_REASONS,
+ ATTR_UNSUPPORTED,
ATTR_UNSUPPORTED_REASONS,
ATTR_UPDATE_KEY,
ATTR_WS_EVENT,
@@ -45,9 +45,10 @@ from .const import (
PLACEHOLDER_KEY_REFERENCE,
REQUEST_REFRESH_DELAY,
UPDATE_KEY_SUPERVISOR,
+ SupervisorIssueContext,
)
from .coordinator import get_addons_info
-from .handler import HassIO, get_supervisor_client
+from .handler import HassIO, HassioAPIError
ISSUE_KEY_UNHEALTHY = "unhealthy"
ISSUE_KEY_UNSUPPORTED = "unsupported"
@@ -119,9 +120,9 @@ class SuggestionDataType(TypedDict):
class Suggestion:
"""Suggestion from Supervisor which resolves an issue."""
- uuid: UUID
+ uuid: str
type: str
- context: ContextType
+ context: SupervisorIssueContext
reference: str | None = None
@property
@@ -133,9 +134,9 @@ class Suggestion:
def from_dict(cls, data: SuggestionDataType) -> Suggestion:
"""Convert from dictionary representation."""
return cls(
- uuid=UUID(data["uuid"]),
+ uuid=data["uuid"],
type=data["type"],
- context=ContextType(data["context"]),
+ context=SupervisorIssueContext(data["context"]),
reference=data["reference"],
)
@@ -154,9 +155,9 @@ class IssueDataType(TypedDict):
class Issue:
"""Issue from Supervisor."""
- uuid: UUID
+ uuid: str
type: str
- context: ContextType
+ context: SupervisorIssueContext
reference: str | None = None
suggestions: list[Suggestion] = field(default_factory=list, compare=False)
@@ -170,9 +171,9 @@ class Issue:
"""Convert from dictionary representation."""
suggestions: list[SuggestionDataType] = data.get("suggestions", [])
return cls(
- uuid=UUID(data["uuid"]),
+ uuid=data["uuid"],
type=data["type"],
- context=ContextType(data["context"]),
+ context=SupervisorIssueContext(data["context"]),
reference=data["reference"],
suggestions=[
Suggestion.from_dict(suggestion) for suggestion in suggestions
@@ -189,8 +190,7 @@ class SupervisorIssues:
self._client = client
self._unsupported_reasons: set[str] = set()
self._unhealthy_reasons: set[str] = set()
- self._issues: dict[UUID, Issue] = {}
- self._supervisor_client = get_supervisor_client(hass)
+ self._issues: dict[str, Issue] = {}
@property
def unhealthy_reasons(self) -> set[str]:
@@ -283,7 +283,7 @@ class SupervisorIssues:
async_create_issue(
self._hass,
DOMAIN,
- issue.uuid.hex,
+ issue.uuid,
is_fixable=bool(issue.suggestions),
severity=IssueSeverity.WARNING,
translation_key=issue.key,
@@ -292,37 +292,19 @@ class SupervisorIssues:
self._issues[issue.uuid] = issue
- async def add_issue_from_data(self, data: SupervisorIssue) -> None:
+ async def add_issue_from_data(self, data: IssueDataType) -> None:
"""Add issue from data to list after getting latest suggestions."""
try:
- suggestions = (
- await self._supervisor_client.resolution.suggestions_for_issue(
- data.uuid
- )
- )
- except SupervisorError:
+ data["suggestions"] = (
+ await self._client.get_suggestions_for_issue(data["uuid"])
+ )[ATTR_SUGGESTIONS]
+ except HassioAPIError:
_LOGGER.error(
"Could not get suggestions for supervisor issue %s, skipping it",
- data.uuid.hex,
+ data["uuid"],
)
return
- self.add_issue(
- Issue(
- uuid=data.uuid,
- type=str(data.type),
- context=data.context,
- reference=data.reference,
- suggestions=[
- Suggestion(
- uuid=suggestion.uuid,
- type=str(suggestion.type),
- context=suggestion.context,
- reference=suggestion.reference,
- )
- for suggestion in suggestions
- ],
- )
- )
+ self.add_issue(Issue.from_dict(data))
def remove_issue(self, issue: Issue) -> None:
"""Remove an issue from the list. Delete a repair if necessary."""
@@ -330,13 +312,13 @@ class SupervisorIssues:
return
if issue.key in ISSUE_KEYS_FOR_REPAIRS:
- async_delete_issue(self._hass, DOMAIN, issue.uuid.hex)
+ async_delete_issue(self._hass, DOMAIN, issue.uuid)
del self._issues[issue.uuid]
def get_issue(self, issue_id: str) -> Issue | None:
"""Get issue from key."""
- return self._issues.get(UUID(issue_id))
+ return self._issues.get(issue_id)
async def setup(self) -> None:
"""Create supervisor events listener."""
@@ -349,8 +331,8 @@ class SupervisorIssues:
async def _update(self, _: datetime | None = None) -> None:
"""Update issues from Supervisor resolution center."""
try:
- data = await self._supervisor_client.resolution.info()
- except SupervisorError as err:
+ data = await self._client.get_resolution_info()
+ except HassioAPIError as err:
_LOGGER.error("Failed to update supervisor issues: %r", err)
async_call_later(
self._hass,
@@ -358,16 +340,18 @@ class SupervisorIssues:
HassJob(self._update, cancel_on_shutdown=True),
)
return
- self.unhealthy_reasons = set(data.unhealthy)
- self.unsupported_reasons = set(data.unsupported)
+ self.unhealthy_reasons = set(data[ATTR_UNHEALTHY])
+ self.unsupported_reasons = set(data[ATTR_UNSUPPORTED])
# Remove any cached issues that weren't returned
- for issue_id in set(self._issues) - {issue.uuid for issue in data.issues}:
+ for issue_id in set(self._issues.keys()) - {
+ issue["uuid"] for issue in data[ATTR_ISSUES]
+ }:
self.remove_issue(self._issues[issue_id])
# Add/update any issues that came back
await asyncio.gather(
- *[self.add_issue_from_data(issue) for issue in data.issues]
+ *[self.add_issue_from_data(issue) for issue in data[ATTR_ISSUES]]
)
@callback
diff --git a/homeassistant/components/hassio/repairs.py b/homeassistant/components/hassio/repairs.py
index 0e8122c08b9..0fcd96ace38 100644
--- a/homeassistant/components/hassio/repairs.py
+++ b/homeassistant/components/hassio/repairs.py
@@ -6,8 +6,6 @@ from collections.abc import Callable, Coroutine
from types import MethodType
from typing import Any
-from aiohasupervisor import SupervisorError
-from aiohasupervisor.models import ContextType
import voluptuous as vol
from homeassistant.components.repairs import RepairsFlow
@@ -22,8 +20,9 @@ from .const import (
PLACEHOLDER_KEY_ADDON,
PLACEHOLDER_KEY_COMPONENTS,
PLACEHOLDER_KEY_REFERENCE,
+ SupervisorIssueContext,
)
-from .handler import get_supervisor_client
+from .handler import async_apply_suggestion
from .issues import Issue, Suggestion
HELP_URLS = {
@@ -52,10 +51,9 @@ class SupervisorIssueRepairFlow(RepairsFlow):
_data: dict[str, Any] | None = None
_issue: Issue | None = None
- def __init__(self, hass: HomeAssistant, issue_id: str) -> None:
+ def __init__(self, issue_id: str) -> None:
"""Initialize repair flow."""
self._issue_id = issue_id
- self._supervisor_client = get_supervisor_client(hass)
super().__init__()
@property
@@ -126,12 +124,9 @@ class SupervisorIssueRepairFlow(RepairsFlow):
if not confirmed and suggestion.key in SUGGESTION_CONFIRMATION_REQUIRED:
return self._async_form_for_suggestion(suggestion)
- try:
- await self._supervisor_client.resolution.apply_suggestion(suggestion.uuid)
- except SupervisorError:
- return self.async_abort(reason="apply_suggestion_fail")
-
- return self.async_create_entry(data={})
+ if await async_apply_suggestion(self.hass, suggestion.uuid):
+ return self.async_create_entry(data={})
+ return self.async_abort(reason="apply_suggestion_fail")
@staticmethod
def _async_step(
@@ -168,9 +163,9 @@ class DockerConfigIssueRepairFlow(SupervisorIssueRepairFlow):
if issue.key == self.issue.key or issue.type != self.issue.type:
continue
- if issue.context == ContextType.CORE:
+ if issue.context == SupervisorIssueContext.CORE:
components.insert(0, "Home Assistant")
- elif issue.context == ContextType.ADDON:
+ elif issue.context == SupervisorIssueContext.ADDON:
components.append(
next(
(
@@ -215,11 +210,11 @@ async def async_create_fix_flow(
supervisor_issues = get_issues_info(hass)
issue = supervisor_issues and supervisor_issues.get_issue(issue_id)
if issue and issue.key == ISSUE_KEY_SYSTEM_DOCKER_CONFIG:
- return DockerConfigIssueRepairFlow(hass, issue_id)
+ return DockerConfigIssueRepairFlow(issue_id)
if issue and issue.key in {
ISSUE_KEY_ADDON_DETACHED_ADDON_REMOVED,
ISSUE_KEY_ADDON_BOOT_FAIL,
}:
- return AddonIssueRepairFlow(hass, issue_id)
+ return AddonIssueRepairFlow(issue_id)
- return SupervisorIssueRepairFlow(hass, issue_id)
+ return SupervisorIssueRepairFlow(issue_id)
diff --git a/homeassistant/components/here_travel_time/config_flow.py b/homeassistant/components/here_travel_time/config_flow.py
index c2b70de148c..4376ae793c0 100644
--- a/homeassistant/components/here_travel_time/config_flow.py
+++ b/homeassistant/components/here_travel_time/config_flow.py
@@ -113,7 +113,7 @@ class HERETravelTimeConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> HERETravelTimeOptionsFlow:
"""Get the options flow."""
- return HERETravelTimeOptionsFlow()
+ return HERETravelTimeOptionsFlow(config_entry)
async def async_step_user(
self, user_input: dict[str, Any] | None = None
@@ -297,8 +297,9 @@ class HERETravelTimeConfigFlow(ConfigFlow, domain=DOMAIN):
class HERETravelTimeOptionsFlow(OptionsFlow):
"""Handle HERE Travel Time options."""
- def __init__(self) -> None:
+ def __init__(self, config_entry: ConfigEntry) -> None:
"""Initialize HERE Travel Time options flow."""
+ self.config_entry = config_entry
self._config: dict[str, Any] = {}
async def async_step_init(
diff --git a/homeassistant/components/hive/config_flow.py b/homeassistant/components/hive/config_flow.py
index a997954f4cc..d6be2d1efab 100644
--- a/homeassistant/components/hive/config_flow.py
+++ b/homeassistant/components/hive/config_flow.py
@@ -182,6 +182,7 @@ class HiveOptionsFlowHandler(OptionsFlow):
def __init__(self, config_entry: ConfigEntry) -> None:
"""Initialize Hive options flow."""
self.hive = None
+ self.config_entry = config_entry
self.interval = config_entry.options.get(CONF_SCAN_INTERVAL, 120)
async def async_step_init(
diff --git a/homeassistant/components/home_connect/binary_sensor.py b/homeassistant/components/home_connect/binary_sensor.py
index 232b581d58b..f044a3fdfb4 100644
--- a/homeassistant/components/home_connect/binary_sensor.py
+++ b/homeassistant/components/home_connect/binary_sensor.py
@@ -12,7 +12,6 @@ from homeassistant.components.binary_sensor import (
from homeassistant.components.script import scripts_with_entity
from homeassistant.config_entries import ConfigEntry
from homeassistant.core import HomeAssistant
-from homeassistant.helpers import entity_registry as er
from homeassistant.helpers.entity_platform import AddEntitiesCallback
from homeassistant.helpers.issue_registry import (
IssueSeverity,
@@ -193,32 +192,11 @@ class HomeConnectDoorBinarySensor(HomeConnectBinarySensor):
async def async_added_to_hass(self) -> None:
"""Call when entity is added to hass."""
await super().async_added_to_hass()
- automations = automations_with_entity(self.hass, self.entity_id)
- scripts = scripts_with_entity(self.hass, self.entity_id)
- items = automations + scripts
+ entity_automations = automations_with_entity(self.hass, self.entity_id)
+ entity_scripts = scripts_with_entity(self.hass, self.entity_id)
+ items = entity_automations + entity_scripts
if not items:
return
-
- entity_reg: er.EntityRegistry = er.async_get(self.hass)
- entity_automations = [
- automation_entity
- for automation_id in automations
- if (automation_entity := entity_reg.async_get(automation_id))
- ]
- entity_scripts = [
- script_entity
- for script_id in scripts
- if (script_entity := entity_reg.async_get(script_id))
- ]
-
- items_list = [
- f"- [{item.original_name}](/config/automation/edit/{item.unique_id})"
- for item in entity_automations
- ] + [
- f"- [{item.original_name}](/config/script/edit/{item.unique_id})"
- for item in entity_scripts
- ]
-
async_create_issue(
self.hass,
DOMAIN,
@@ -229,7 +207,7 @@ class HomeConnectDoorBinarySensor(HomeConnectBinarySensor):
translation_key="deprecated_binary_common_door_sensor",
translation_placeholders={
"entity": self.entity_id,
- "items": "\n".join(items_list),
+ "items": "\n".join([f"- {item}" for item in items]),
},
)
diff --git a/homeassistant/components/homeassistant_hardware/firmware_config_flow.py b/homeassistant/components/homeassistant_hardware/firmware_config_flow.py
index a91fb00c142..37d12d2bd61 100644
--- a/homeassistant/components/homeassistant_hardware/firmware_config_flow.py
+++ b/homeassistant/components/homeassistant_hardware/firmware_config_flow.py
@@ -24,6 +24,7 @@ from homeassistant.config_entries import (
ConfigFlow,
ConfigFlowResult,
OptionsFlow,
+ OptionsFlowWithConfigEntry,
)
from homeassistant.core import callback
from homeassistant.data_entry_flow import AbortFlow
@@ -495,15 +496,13 @@ class BaseFirmwareConfigFlow(BaseFirmwareInstallFlow, ConfigFlow):
return await self.async_step_pick_firmware()
-class BaseFirmwareOptionsFlow(BaseFirmwareInstallFlow, OptionsFlow):
+class BaseFirmwareOptionsFlow(BaseFirmwareInstallFlow, OptionsFlowWithConfigEntry):
"""Zigbee and Thread options flow handlers."""
- def __init__(self, config_entry: ConfigEntry, *args: Any, **kwargs: Any) -> None:
+ def __init__(self, *args: Any, **kwargs: Any) -> None:
"""Instantiate options flow."""
super().__init__(*args, **kwargs)
- self._config_entry = config_entry
-
self._probed_firmware_type = ApplicationType(self.config_entry.data["firmware"])
# Make `context` a regular dictionary
diff --git a/homeassistant/components/homeassistant_hardware/silabs_multiprotocol_addon.py b/homeassistant/components/homeassistant_hardware/silabs_multiprotocol_addon.py
index 2b08031405f..14ae57391ef 100644
--- a/homeassistant/components/homeassistant_hardware/silabs_multiprotocol_addon.py
+++ b/homeassistant/components/homeassistant_hardware/silabs_multiprotocol_addon.py
@@ -318,6 +318,7 @@ class OptionsFlowHandler(OptionsFlow, ABC):
self.start_task: asyncio.Task | None = None
self.stop_task: asyncio.Task | None = None
self._zha_migration_mgr: ZhaMultiPANMigrationHelper | None = None
+ self.config_entry = config_entry
self.original_addon_config: dict[str, Any] | None = None
self.revert_reason: str | None = None
diff --git a/homeassistant/components/homekit/config_flow.py b/homeassistant/components/homekit/config_flow.py
index 53db7774821..a63e365ead7 100644
--- a/homeassistant/components/homekit/config_flow.py
+++ b/homeassistant/components/homekit/config_flow.py
@@ -362,14 +362,15 @@ class HomeKitConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> OptionsFlowHandler:
"""Get the options flow for this handler."""
- return OptionsFlowHandler()
+ return OptionsFlowHandler(config_entry)
class OptionsFlowHandler(OptionsFlow):
"""Handle a option flow for homekit."""
- def __init__(self) -> None:
+ def __init__(self, config_entry: ConfigEntry) -> None:
"""Initialize options flow."""
+ self.config_entry = config_entry
self.hk_options: dict[str, Any] = {}
self.included_cameras: list[str] = []
diff --git a/homeassistant/components/homekit/type_security_systems.py b/homeassistant/components/homekit/type_security_systems.py
index 8634589cb5f..9f3f183f11f 100644
--- a/homeassistant/components/homekit/type_security_systems.py
+++ b/homeassistant/components/homekit/type_security_systems.py
@@ -18,8 +18,6 @@ from homeassistant.const import (
SERVICE_ALARM_ARM_HOME,
SERVICE_ALARM_ARM_NIGHT,
SERVICE_ALARM_DISARM,
- STATE_UNAVAILABLE,
- STATE_UNKNOWN,
)
from homeassistant.core import State, callback
@@ -154,12 +152,12 @@ class SecuritySystem(HomeAccessory):
@callback
def async_update_state(self, new_state: State) -> None:
"""Update security state after state changed."""
- hass_state: str | AlarmControlPanelState = new_state.state
- if hass_state in {"None", STATE_UNKNOWN, STATE_UNAVAILABLE}:
- # Bail out early for no state, unknown or unavailable
+ hass_state = None
+ if new_state and new_state.state == "None":
+ # Bail out early for no state
return
- if hass_state is not None:
- hass_state = AlarmControlPanelState(hass_state)
+ if new_state and new_state.state is not None:
+ hass_state = AlarmControlPanelState(new_state.state)
if (
hass_state
and (current_state := HASS_TO_HOMEKIT_CURRENT.get(hass_state)) is not None
diff --git a/homeassistant/components/homematicip_cloud/sensor.py b/homeassistant/components/homematicip_cloud/sensor.py
index c44d280c190..eab7ba4f09e 100644
--- a/homeassistant/components/homematicip_cloud/sensor.py
+++ b/homeassistant/components/homematicip_cloud/sensor.py
@@ -420,7 +420,6 @@ class HomematicipWindspeedSensor(HomematicipGenericEntity, SensorEntity):
_attr_device_class = SensorDeviceClass.WIND_SPEED
_attr_native_unit_of_measurement = UnitOfSpeed.KILOMETERS_PER_HOUR
- _attr_state_class = SensorStateClass.MEASUREMENT
def __init__(self, hap: HomematicipHAP, device) -> None:
"""Initialize the windspeed sensor."""
@@ -452,7 +451,6 @@ class HomematicipTodayRainSensor(HomematicipGenericEntity, SensorEntity):
_attr_device_class = SensorDeviceClass.PRECIPITATION
_attr_native_unit_of_measurement = UnitOfPrecipitationDepth.MILLIMETERS
- _attr_state_class = SensorStateClass.MEASUREMENT
def __init__(self, hap: HomematicipHAP, device) -> None:
"""Initialize the device."""
diff --git a/homeassistant/components/honeywell/config_flow.py b/homeassistant/components/honeywell/config_flow.py
index c7cda500692..c9b1dfb950a 100644
--- a/homeassistant/components/honeywell/config_flow.py
+++ b/homeassistant/components/honeywell/config_flow.py
@@ -129,12 +129,16 @@ class HoneywellConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> HoneywellOptionsFlowHandler:
"""Options callback for Honeywell."""
- return HoneywellOptionsFlowHandler()
+ return HoneywellOptionsFlowHandler(config_entry)
class HoneywellOptionsFlowHandler(OptionsFlow):
"""Config flow options for Honeywell."""
+ def __init__(self, entry: ConfigEntry) -> None:
+ """Initialize Honeywell options flow."""
+ self.config_entry = entry
+
async def async_step_init(self, user_input=None) -> ConfigFlowResult:
"""Manage the options."""
if user_input is not None:
diff --git a/homeassistant/components/honeywell/strings.json b/homeassistant/components/honeywell/strings.json
index a64f1a6fce0..aa6e53620a5 100644
--- a/homeassistant/components/honeywell/strings.json
+++ b/homeassistant/components/honeywell/strings.json
@@ -16,9 +16,6 @@
}
}
},
- "abort": {
- "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
- },
"error": {
"invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
"cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
diff --git a/homeassistant/components/huawei_lte/config_flow.py b/homeassistant/components/huawei_lte/config_flow.py
index 08fdae50c51..02349b2ae7f 100644
--- a/homeassistant/components/huawei_lte/config_flow.py
+++ b/homeassistant/components/huawei_lte/config_flow.py
@@ -69,7 +69,7 @@ class ConfigFlowHandler(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> OptionsFlowHandler:
"""Get options flow."""
- return OptionsFlowHandler()
+ return OptionsFlowHandler(config_entry)
async def _async_show_user_form(
self,
@@ -345,6 +345,10 @@ class ConfigFlowHandler(ConfigFlow, domain=DOMAIN):
class OptionsFlowHandler(OptionsFlow):
"""Huawei LTE options flow."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/huawei_lte/manifest.json b/homeassistant/components/huawei_lte/manifest.json
index 6720d6718ef..908092ba2ca 100644
--- a/homeassistant/components/huawei_lte/manifest.json
+++ b/homeassistant/components/huawei_lte/manifest.json
@@ -7,7 +7,7 @@
"iot_class": "local_polling",
"loggers": ["huawei_lte_api.Session"],
"requirements": [
- "huawei-lte-api==1.10.0",
+ "huawei-lte-api==1.9.3",
"stringcase==1.2.0",
"url-normalize==1.4.3"
],
diff --git a/homeassistant/components/hue/config_flow.py b/homeassistant/components/hue/config_flow.py
index 8d17f810461..e73ae8fe11d 100644
--- a/homeassistant/components/hue/config_flow.py
+++ b/homeassistant/components/hue/config_flow.py
@@ -57,8 +57,8 @@ class HueFlowHandler(ConfigFlow, domain=DOMAIN):
) -> HueV1OptionsFlowHandler | HueV2OptionsFlowHandler:
"""Get the options flow for this handler."""
if config_entry.data.get(CONF_API_VERSION, 1) == 1:
- return HueV1OptionsFlowHandler()
- return HueV2OptionsFlowHandler()
+ return HueV1OptionsFlowHandler(config_entry)
+ return HueV2OptionsFlowHandler(config_entry)
def __init__(self) -> None:
"""Initialize the Hue flow."""
@@ -280,6 +280,10 @@ class HueFlowHandler(ConfigFlow, domain=DOMAIN):
class HueV1OptionsFlowHandler(OptionsFlow):
"""Handle Hue options for V1 implementation."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize Hue options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
@@ -311,6 +315,10 @@ class HueV1OptionsFlowHandler(OptionsFlow):
class HueV2OptionsFlowHandler(OptionsFlow):
"""Handle Hue options for V2 implementation."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize Hue options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/hue/strings.json b/homeassistant/components/hue/strings.json
index 2f7f2e55561..ab1d0fb58ad 100644
--- a/homeassistant/components/hue/strings.json
+++ b/homeassistant/components/hue/strings.json
@@ -137,15 +137,15 @@
"services": {
"hue_activate_scene": {
"name": "Activate scene",
- "description": "Activates a Hue scene stored in the Hue hub.",
+ "description": "Activates a hue scene stored in the hue hub.",
"fields": {
"group_name": {
"name": "Group",
- "description": "Name of Hue group/room from the Hue app."
+ "description": "Name of hue group/room from the hue app."
},
"scene_name": {
"name": "Scene",
- "description": "Name of Hue scene from the Hue app."
+ "description": "Name of hue scene from the hue app."
},
"dynamic": {
"name": "Dynamic",
diff --git a/homeassistant/components/hunterdouglas_powerview/number.py b/homeassistant/components/hunterdouglas_powerview/number.py
index fb8c9f76d79..f893b04b2d1 100644
--- a/homeassistant/components/hunterdouglas_powerview/number.py
+++ b/homeassistant/components/hunterdouglas_powerview/number.py
@@ -95,7 +95,7 @@ class PowerViewNumber(ShadeEntity, RestoreNumber):
self.entity_description = description
self._attr_unique_id = f"{self._attr_unique_id}_{description.key}"
- async def async_set_native_value(self, value: float) -> None:
+ def set_native_value(self, value: float) -> None:
"""Update the current value."""
self._attr_native_value = value
self.entity_description.store_value_fn(self.coordinator, self._shade.id, value)
diff --git a/homeassistant/components/husqvarna_automower/coordinator.py b/homeassistant/components/husqvarna_automower/coordinator.py
index c19f37a040d..458ff50dac9 100644
--- a/homeassistant/components/husqvarna_automower/coordinator.py
+++ b/homeassistant/components/husqvarna_automower/coordinator.py
@@ -8,7 +8,6 @@ from aioautomower.exceptions import (
ApiException,
AuthException,
HusqvarnaWSServerHandshakeError,
- TimeoutException,
)
from aioautomower.model import MowerAttributes
from aioautomower.session import AutomowerSession
@@ -23,7 +22,6 @@ from .const import DOMAIN
_LOGGER = logging.getLogger(__name__)
MAX_WS_RECONNECT_TIME = 600
SCAN_INTERVAL = timedelta(minutes=8)
-DEFAULT_RECONNECT_TIME = 2 # Define a default reconnect time
class AutomowerDataUpdateCoordinator(DataUpdateCoordinator[dict[str, MowerAttributes]]):
@@ -42,8 +40,8 @@ class AutomowerDataUpdateCoordinator(DataUpdateCoordinator[dict[str, MowerAttrib
update_interval=SCAN_INTERVAL,
)
self.api = api
+
self.ws_connected: bool = False
- self.reconnect_time = DEFAULT_RECONNECT_TIME
async def _async_update_data(self) -> dict[str, MowerAttributes]:
"""Subscribe for websocket and poll data from the API."""
@@ -68,28 +66,24 @@ class AutomowerDataUpdateCoordinator(DataUpdateCoordinator[dict[str, MowerAttrib
hass: HomeAssistant,
entry: ConfigEntry,
automower_client: AutomowerSession,
+ reconnect_time: int = 2,
) -> None:
"""Listen with the client."""
try:
await automower_client.auth.websocket_connect()
- # Reset reconnect time after successful connection
- self.reconnect_time = DEFAULT_RECONNECT_TIME
+ reconnect_time = 2
await automower_client.start_listening()
except HusqvarnaWSServerHandshakeError as err:
_LOGGER.debug(
- "Failed to connect to websocket. Trying to reconnect: %s",
- err,
- )
- except TimeoutException as err:
- _LOGGER.debug(
- "Failed to listen to websocket. Trying to reconnect: %s",
- err,
+ "Failed to connect to websocket. Trying to reconnect: %s", err
)
+
if not hass.is_stopping:
- await asyncio.sleep(self.reconnect_time)
- self.reconnect_time = min(self.reconnect_time * 2, MAX_WS_RECONNECT_TIME)
- entry.async_create_background_task(
- hass,
- self.client_listen(hass, entry, automower_client),
- "reconnect_task",
+ await asyncio.sleep(reconnect_time)
+ reconnect_time = min(reconnect_time * 2, MAX_WS_RECONNECT_TIME)
+ await self.client_listen(
+ hass=hass,
+ entry=entry,
+ automower_client=automower_client,
+ reconnect_time=reconnect_time,
)
diff --git a/homeassistant/components/huum/manifest.json b/homeassistant/components/huum/manifest.json
index 38562e1a072..7629f529b91 100644
--- a/homeassistant/components/huum/manifest.json
+++ b/homeassistant/components/huum/manifest.json
@@ -5,5 +5,5 @@
"config_flow": true,
"documentation": "https://www.home-assistant.io/integrations/huum",
"iot_class": "cloud_polling",
- "requirements": ["huum==0.7.12"]
+ "requirements": ["huum==0.7.10"]
}
diff --git a/homeassistant/components/hvv_departures/config_flow.py b/homeassistant/components/hvv_departures/config_flow.py
index 536b8f18259..3e1b98d9a38 100644
--- a/homeassistant/components/hvv_departures/config_flow.py
+++ b/homeassistant/components/hvv_departures/config_flow.py
@@ -141,14 +141,16 @@ class HVVDeparturesConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> OptionsFlowHandler:
"""Get options flow."""
- return OptionsFlowHandler()
+ return OptionsFlowHandler(config_entry)
class OptionsFlowHandler(OptionsFlow):
"""Options flow handler."""
- def __init__(self) -> None:
+ def __init__(self, config_entry: ConfigEntry) -> None:
"""Initialize HVV Departures options flow."""
+ self.config_entry = config_entry
+ self.options = dict(config_entry.options)
self.departure_filters: dict[str, Any] = {}
async def async_step_init(
diff --git a/homeassistant/components/hyperion/config_flow.py b/homeassistant/components/hyperion/config_flow.py
index b2b7dbdf531..161c531328d 100644
--- a/homeassistant/components/hyperion/config_flow.py
+++ b/homeassistant/components/hyperion/config_flow.py
@@ -424,22 +424,24 @@ class HyperionConfigFlow(ConfigFlow, domain=DOMAIN):
@staticmethod
@callback
- def async_get_options_flow(
- config_entry: ConfigEntry,
- ) -> HyperionOptionsFlow:
+ def async_get_options_flow(config_entry: ConfigEntry) -> HyperionOptionsFlow:
"""Get the Hyperion Options flow."""
- return HyperionOptionsFlow()
+ return HyperionOptionsFlow(config_entry)
class HyperionOptionsFlow(OptionsFlow):
"""Hyperion options flow."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize a Hyperion options flow."""
+ self._config_entry = config_entry
+
def _create_client(self) -> client.HyperionClient:
"""Create and connect a client instance."""
return create_hyperion_client(
- self.config_entry.data[CONF_HOST],
- self.config_entry.data[CONF_PORT],
- token=self.config_entry.data.get(CONF_TOKEN),
+ self._config_entry.data[CONF_HOST],
+ self._config_entry.data[CONF_PORT],
+ token=self._config_entry.data.get(CONF_TOKEN),
)
async def async_step_init(
@@ -468,7 +470,8 @@ class HyperionOptionsFlow(OptionsFlow):
return self.async_create_entry(title="", data=user_input)
default_effect_show_list = list(
- set(effects) - set(self.config_entry.options.get(CONF_EFFECT_HIDE_LIST, []))
+ set(effects)
+ - set(self._config_entry.options.get(CONF_EFFECT_HIDE_LIST, []))
)
return self.async_show_form(
@@ -477,7 +480,7 @@ class HyperionOptionsFlow(OptionsFlow):
{
vol.Optional(
CONF_PRIORITY,
- default=self.config_entry.options.get(
+ default=self._config_entry.options.get(
CONF_PRIORITY, DEFAULT_PRIORITY
),
): vol.All(vol.Coerce(int), vol.Range(min=0, max=255)),
diff --git a/homeassistant/components/ibeacon/config_flow.py b/homeassistant/components/ibeacon/config_flow.py
index c00398e39b0..feb5a801d51 100644
--- a/homeassistant/components/ibeacon/config_flow.py
+++ b/homeassistant/components/ibeacon/config_flow.py
@@ -44,12 +44,16 @@ class IBeaconConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> OptionsFlow:
"""Get the options flow for this handler."""
- return IBeaconOptionsFlow()
+ return IBeaconOptionsFlow(config_entry)
class IBeaconOptionsFlow(OptionsFlow):
"""Handle options."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(self, user_input: dict | None = None) -> ConfigFlowResult:
"""Manage the options."""
errors = {}
diff --git a/homeassistant/components/image_processing/__init__.py b/homeassistant/components/image_processing/__init__.py
index 0ac8d39813b..2c1d0f9304c 100644
--- a/homeassistant/components/image_processing/__init__.py
+++ b/homeassistant/components/image_processing/__init__.py
@@ -223,7 +223,7 @@ class ImageProcessingFaceEntity(ImageProcessingEntity):
confidence = f_co
for attr in (ATTR_NAME, ATTR_MOTION):
if attr in face:
- state = face[attr]
+ state = face[attr] # type: ignore[literal-required]
break
return state
diff --git a/homeassistant/components/image_upload/manifest.json b/homeassistant/components/image_upload/manifest.json
index bb8c33ba749..963721a0476 100644
--- a/homeassistant/components/image_upload/manifest.json
+++ b/homeassistant/components/image_upload/manifest.json
@@ -7,5 +7,5 @@
"documentation": "https://www.home-assistant.io/integrations/image_upload",
"integration_type": "system",
"quality_scale": "internal",
- "requirements": ["Pillow==11.0.0"]
+ "requirements": ["Pillow==10.4.0"]
}
diff --git a/homeassistant/components/imap/config_flow.py b/homeassistant/components/imap/config_flow.py
index 994c53b5b3e..5bbb8599cf2 100644
--- a/homeassistant/components/imap/config_flow.py
+++ b/homeassistant/components/imap/config_flow.py
@@ -13,7 +13,7 @@ from homeassistant.config_entries import (
ConfigEntry,
ConfigFlow,
ConfigFlowResult,
- OptionsFlow,
+ OptionsFlowWithConfigEntry,
)
from homeassistant.const import (
CONF_NAME,
@@ -213,12 +213,12 @@ class IMAPConfigFlow(ConfigFlow, domain=DOMAIN):
@callback
def async_get_options_flow(
config_entry: ConfigEntry,
- ) -> ImapOptionsFlow:
+ ) -> OptionsFlow:
"""Get the options flow for this handler."""
- return ImapOptionsFlow()
+ return OptionsFlow(config_entry)
-class ImapOptionsFlow(OptionsFlow):
+class OptionsFlow(OptionsFlowWithConfigEntry):
"""Option flow handler."""
async def async_step_init(
@@ -226,13 +226,13 @@ class ImapOptionsFlow(OptionsFlow):
) -> ConfigFlowResult:
"""Manage the options."""
errors: dict[str, str] | None = None
- entry_data: dict[str, Any] = dict(self.config_entry.data)
+ entry_data: dict[str, Any] = dict(self._config_entry.data)
if user_input is not None:
try:
self._async_abort_entries_match(
{
- CONF_SERVER: self.config_entry.data[CONF_SERVER],
- CONF_USERNAME: self.config_entry.data[CONF_USERNAME],
+ CONF_SERVER: self._config_entry.data[CONF_SERVER],
+ CONF_USERNAME: self._config_entry.data[CONF_USERNAME],
CONF_FOLDER: user_input[CONF_FOLDER],
CONF_SEARCH: user_input[CONF_SEARCH],
}
diff --git a/homeassistant/components/imap/strings.json b/homeassistant/components/imap/strings.json
index 7c4a0d9a973..115d46f3d0e 100644
--- a/homeassistant/components/imap/strings.json
+++ b/homeassistant/components/imap/strings.json
@@ -104,7 +104,7 @@
"services": {
"fetch": {
"name": "Fetch message",
- "description": "Fetch an email message from the server.",
+ "description": "Fetch the email message from the server.",
"fields": {
"entry": {
"name": "Entry",
diff --git a/homeassistant/components/insteon/strings.json b/homeassistant/components/insteon/strings.json
index 4df997ac939..1464a2dbc8f 100644
--- a/homeassistant/components/insteon/strings.json
+++ b/homeassistant/components/insteon/strings.json
@@ -112,7 +112,7 @@
"services": {
"add_all_link": {
"name": "Add all link",
- "description": "Tells the Insteon Modem (IM) start All-Linking mode. Once the IM is in All-Linking mode, press the link button on the device to complete All-Linking.",
+ "description": "Tells the Insteom Modem (IM) start All-Linking mode. Once the IM is in All-Linking mode, press the link button on the device to complete All-Linking.",
"fields": {
"group": {
"name": "Group",
diff --git a/homeassistant/components/iqvia/manifest.json b/homeassistant/components/iqvia/manifest.json
index 11c99a7428f..6142fa1349e 100644
--- a/homeassistant/components/iqvia/manifest.json
+++ b/homeassistant/components/iqvia/manifest.json
@@ -7,5 +7,5 @@
"integration_type": "service",
"iot_class": "cloud_polling",
"loggers": ["pyiqvia"],
- "requirements": ["numpy==2.1.3", "pyiqvia==2022.04.0"]
+ "requirements": ["numpy==1.26.4", "pyiqvia==2022.04.0"]
}
diff --git a/homeassistant/components/iron_os/coordinator.py b/homeassistant/components/iron_os/coordinator.py
index 699f5a01704..da82b76f92e 100644
--- a/homeassistant/components/iron_os/coordinator.py
+++ b/homeassistant/components/iron_os/coordinator.py
@@ -37,14 +37,15 @@ class IronOSLiveDataCoordinator(DataUpdateCoordinator[LiveDataResponse]):
)
self.device = device
+ async def _async_setup(self) -> None:
+ """Set up the coordinator."""
+
+ self.device_info = await self.device.get_device_info()
+
async def _async_update_data(self) -> LiveDataResponse:
"""Fetch data from Device."""
try:
- # device info is cached and won't be refetched on every
- # coordinator refresh, only after the device has disconnected
- # the device info is refetched
- self.device_info = await self.device.get_device_info()
return await self.device.get_live_data()
except CommunicationError as e:
@@ -59,7 +60,6 @@ class IronOSFirmwareUpdateCoordinator(DataUpdateCoordinator[GitHubReleaseModel])
super().__init__(
hass,
_LOGGER,
- config_entry=None,
name=DOMAIN,
update_interval=SCAN_INTERVAL_GITHUB,
)
diff --git a/homeassistant/components/iron_os/manifest.json b/homeassistant/components/iron_os/manifest.json
index 4ec08a43b61..9fcb84e0f6a 100644
--- a/homeassistant/components/iron_os/manifest.json
+++ b/homeassistant/components/iron_os/manifest.json
@@ -13,5 +13,5 @@
"documentation": "https://www.home-assistant.io/integrations/iron_os",
"iot_class": "local_polling",
"loggers": ["pynecil", "aiogithubapi"],
- "requirements": ["pynecil==0.2.1", "aiogithubapi==24.6.0"]
+ "requirements": ["pynecil==0.2.0", "aiogithubapi==24.6.0"]
}
diff --git a/homeassistant/components/islamic_prayer_times/config_flow.py b/homeassistant/components/islamic_prayer_times/config_flow.py
index ce911ccc49d..2db89183499 100644
--- a/homeassistant/components/islamic_prayer_times/config_flow.py
+++ b/homeassistant/components/islamic_prayer_times/config_flow.py
@@ -52,7 +52,7 @@ class IslamicPrayerFlowHandler(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> IslamicPrayerOptionsFlowHandler:
"""Get the options flow for this handler."""
- return IslamicPrayerOptionsFlowHandler()
+ return IslamicPrayerOptionsFlowHandler(config_entry)
async def async_step_user(
self, user_input: dict[str, Any] | None = None
@@ -93,6 +93,10 @@ class IslamicPrayerFlowHandler(ConfigFlow, domain=DOMAIN):
class IslamicPrayerOptionsFlowHandler(OptionsFlow):
"""Handle Islamic Prayer client options."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/iss/config_flow.py b/homeassistant/components/iss/config_flow.py
index eaf01a6d094..9cc533f5cc5 100644
--- a/homeassistant/components/iss/config_flow.py
+++ b/homeassistant/components/iss/config_flow.py
@@ -1,7 +1,5 @@
"""Config flow to configure iss component."""
-from __future__ import annotations
-
import voluptuous as vol
from homeassistant.config_entries import (
@@ -25,9 +23,9 @@ class ISSConfigFlow(ConfigFlow, domain=DOMAIN):
@callback
def async_get_options_flow(
config_entry: ConfigEntry,
- ) -> OptionsFlowHandler:
+ ) -> OptionsFlow:
"""Get the options flow for this handler."""
- return OptionsFlowHandler()
+ return OptionsFlowHandler(config_entry)
async def async_step_user(self, user_input=None) -> ConfigFlowResult:
"""Handle a flow initialized by the user."""
@@ -44,10 +42,16 @@ class ISSConfigFlow(ConfigFlow, domain=DOMAIN):
class OptionsFlowHandler(OptionsFlow):
"""Config flow options handler for iss."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize options flow."""
+ self.config_entry = config_entry
+ self.options = dict(config_entry.options)
+
async def async_step_init(self, user_input=None) -> ConfigFlowResult:
"""Manage the options."""
if user_input is not None:
- return self.async_create_entry(data=self.config_entry.options | user_input)
+ self.options.update(user_input)
+ return self.async_create_entry(title="", data=self.options)
return self.async_show_form(
step_id="init",
diff --git a/homeassistant/components/isy994/config_flow.py b/homeassistant/components/isy994/config_flow.py
index 3575fa99a55..0239926f5e3 100644
--- a/homeassistant/components/isy994/config_flow.py
+++ b/homeassistant/components/isy994/config_flow.py
@@ -140,7 +140,7 @@ class Isy994ConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> OptionsFlow:
"""Get the options flow for this handler."""
- return OptionsFlowHandler()
+ return OptionsFlowHandler(config_entry)
async def async_step_user(
self, user_input: dict[str, Any] | None = None
@@ -314,6 +314,10 @@ class Isy994ConfigFlow(ConfigFlow, domain=DOMAIN):
class OptionsFlowHandler(OptionsFlow):
"""Handle a option flow for ISY/IoX."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/jellyfin/config_flow.py b/homeassistant/components/jellyfin/config_flow.py
index 0c170d2485f..f60d96f3efa 100644
--- a/homeassistant/components/jellyfin/config_flow.py
+++ b/homeassistant/components/jellyfin/config_flow.py
@@ -8,7 +8,11 @@ from typing import Any
import voluptuous as vol
-from homeassistant.config_entries import ConfigFlow, ConfigFlowResult, OptionsFlow
+from homeassistant.config_entries import (
+ ConfigFlow,
+ ConfigFlowResult,
+ OptionsFlowWithConfigEntry,
+)
from homeassistant.const import CONF_PASSWORD, CONF_URL, CONF_USERNAME
from homeassistant.core import callback
from homeassistant.util.uuid import random_uuid_hex
@@ -139,12 +143,12 @@ class JellyfinConfigFlow(ConfigFlow, domain=DOMAIN):
@callback
def async_get_options_flow(
config_entry: JellyfinConfigEntry,
- ) -> OptionsFlowHandler:
+ ) -> OptionsFlowWithConfigEntry:
"""Create the options flow."""
- return OptionsFlowHandler()
+ return OptionsFlowHandler(config_entry)
-class OptionsFlowHandler(OptionsFlow):
+class OptionsFlowHandler(OptionsFlowWithConfigEntry):
"""Handle an option flow for jellyfin."""
async def async_step_init(
diff --git a/homeassistant/components/jewish_calendar/__init__.py b/homeassistant/components/jewish_calendar/__init__.py
index 823e9bd59be..fd238e8d615 100644
--- a/homeassistant/components/jewish_calendar/__init__.py
+++ b/homeassistant/components/jewish_calendar/__init__.py
@@ -5,17 +5,26 @@ from __future__ import annotations
from functools import partial
from hdate import Location
+import voluptuous as vol
+from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
from homeassistant.const import (
CONF_ELEVATION,
CONF_LANGUAGE,
CONF_LATITUDE,
+ CONF_LOCATION,
CONF_LONGITUDE,
+ CONF_NAME,
CONF_TIME_ZONE,
Platform,
)
-from homeassistant.core import HomeAssistant
+from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant, callback
+import homeassistant.helpers.config_validation as cv
+import homeassistant.helpers.entity_registry as er
+from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
+from homeassistant.helpers.typing import ConfigType
+from .binary_sensor import BINARY_SENSORS
from .const import (
CONF_CANDLE_LIGHT_MINUTES,
CONF_DIASPORA,
@@ -24,15 +33,94 @@ from .const import (
DEFAULT_DIASPORA,
DEFAULT_HAVDALAH_OFFSET_MINUTES,
DEFAULT_LANGUAGE,
+ DEFAULT_NAME,
+ DOMAIN,
)
-from .entity import JewishCalendarConfigEntry, JewishCalendarData
+from .sensor import INFO_SENSORS, TIME_SENSORS
PLATFORMS: list[Platform] = [Platform.BINARY_SENSOR, Platform.SENSOR]
+CONFIG_SCHEMA = vol.Schema(
+ {
+ DOMAIN: vol.All(
+ cv.deprecated(DOMAIN),
+ {
+ vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+ vol.Optional(CONF_DIASPORA, default=DEFAULT_DIASPORA): cv.boolean,
+ vol.Inclusive(CONF_LATITUDE, "coordinates"): cv.latitude,
+ vol.Inclusive(CONF_LONGITUDE, "coordinates"): cv.longitude,
+ vol.Optional(CONF_LANGUAGE, default=DEFAULT_LANGUAGE): vol.In(
+ ["hebrew", "english"]
+ ),
+ vol.Optional(
+ CONF_CANDLE_LIGHT_MINUTES, default=DEFAULT_CANDLE_LIGHT
+ ): int,
+ # Default of 0 means use 8.5 degrees / 'three_stars' time.
+ vol.Optional(
+ CONF_HAVDALAH_OFFSET_MINUTES,
+ default=DEFAULT_HAVDALAH_OFFSET_MINUTES,
+ ): int,
+ },
+ )
+ },
+ extra=vol.ALLOW_EXTRA,
+)
-async def async_setup_entry(
- hass: HomeAssistant, config_entry: JewishCalendarConfigEntry
-) -> bool:
+
+def get_unique_prefix(
+ location: Location,
+ language: str,
+ candle_lighting_offset: int | None,
+ havdalah_offset: int | None,
+) -> str:
+ """Create a prefix for unique ids."""
+ # location.altitude was unset before 2024.6 when this method
+ # was used to create the unique id. As such it would always
+ # use the default altitude of 754.
+ config_properties = [
+ location.latitude,
+ location.longitude,
+ location.timezone,
+ 754,
+ location.diaspora,
+ language,
+ candle_lighting_offset,
+ havdalah_offset,
+ ]
+ prefix = "_".join(map(str, config_properties))
+ return f"{prefix}"
+
+
+async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
+ """Set up the Jewish Calendar component."""
+ if DOMAIN not in config:
+ return True
+
+ async_create_issue(
+ hass,
+ HOMEASSISTANT_DOMAIN,
+ f"deprecated_yaml_{DOMAIN}",
+ is_fixable=False,
+ issue_domain=DOMAIN,
+ breaks_in_ha_version="2024.12.0",
+ severity=IssueSeverity.WARNING,
+ translation_key="deprecated_yaml",
+ translation_placeholders={
+ "domain": DOMAIN,
+ "integration_title": DEFAULT_NAME,
+ },
+ )
+
+ hass.async_create_task(
+ hass.config_entries.flow.async_init(
+ DOMAIN, context={"source": SOURCE_IMPORT}, data=config[DOMAIN]
+ )
+ )
+
+ return True
+
+
+async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
"""Set up a configuration entry for Jewish calendar."""
language = config_entry.data.get(CONF_LANGUAGE, DEFAULT_LANGUAGE)
diaspora = config_entry.data.get(CONF_DIASPORA, DEFAULT_DIASPORA)
@@ -55,19 +143,27 @@ async def async_setup_entry(
)
)
- config_entry.runtime_data = JewishCalendarData(
- language,
- diaspora,
- location,
- candle_lighting_offset,
- havdalah_offset,
+ hass.data.setdefault(DOMAIN, {})[config_entry.entry_id] = {
+ CONF_LANGUAGE: language,
+ CONF_DIASPORA: diaspora,
+ CONF_LOCATION: location,
+ CONF_CANDLE_LIGHT_MINUTES: candle_lighting_offset,
+ CONF_HAVDALAH_OFFSET_MINUTES: havdalah_offset,
+ }
+
+ # Update unique ID to be unrelated to user defined options
+ old_prefix = get_unique_prefix(
+ location, language, candle_lighting_offset, havdalah_offset
)
+ ent_reg = er.async_get(hass)
+ entries = er.async_entries_for_config_entry(ent_reg, config_entry.entry_id)
+ if not entries or any(entry.unique_id.startswith(old_prefix) for entry in entries):
+ async_update_unique_ids(ent_reg, config_entry.entry_id, old_prefix)
+
await hass.config_entries.async_forward_entry_setups(config_entry, PLATFORMS)
- async def update_listener(
- hass: HomeAssistant, config_entry: JewishCalendarConfigEntry
- ) -> None:
+ async def update_listener(hass: HomeAssistant, entry: ConfigEntry) -> None:
# Trigger update of states for all platforms
await hass.config_entries.async_reload(config_entry.entry_id)
@@ -75,8 +171,35 @@ async def async_setup_entry(
return True
-async def async_unload_entry(
- hass: HomeAssistant, config_entry: JewishCalendarConfigEntry
-) -> bool:
+async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
"""Unload a config entry."""
- return await hass.config_entries.async_unload_platforms(config_entry, PLATFORMS)
+ unload_ok = await hass.config_entries.async_unload_platforms(
+ config_entry, PLATFORMS
+ )
+
+ if unload_ok:
+ hass.data[DOMAIN].pop(config_entry.entry_id)
+
+ return unload_ok
+
+
+@callback
+def async_update_unique_ids(
+ ent_reg: er.EntityRegistry, new_prefix: str, old_prefix: str
+) -> None:
+ """Update unique ID to be unrelated to user defined options.
+
+ Introduced with release 2024.6
+ """
+ platform_descriptions = {
+ Platform.BINARY_SENSOR: BINARY_SENSORS,
+ Platform.SENSOR: (*INFO_SENSORS, *TIME_SENSORS),
+ }
+ for platform, descriptions in platform_descriptions.items():
+ for description in descriptions:
+ new_unique_id = f"{new_prefix}-{description.key}"
+ old_unique_id = f"{old_prefix}_{description.key}"
+ if entity_id := ent_reg.async_get_entity_id(
+ platform, DOMAIN, old_unique_id
+ ):
+ ent_reg.async_update_entity(entity_id, new_unique_id=new_unique_id)
diff --git a/homeassistant/components/jewish_calendar/binary_sensor.py b/homeassistant/components/jewish_calendar/binary_sensor.py
index 9fd1371f8a8..060650ee25c 100644
--- a/homeassistant/components/jewish_calendar/binary_sensor.py
+++ b/homeassistant/components/jewish_calendar/binary_sensor.py
@@ -14,13 +14,15 @@ from homeassistant.components.binary_sensor import (
BinarySensorEntity,
BinarySensorEntityDescription,
)
+from homeassistant.config_entries import ConfigEntry
from homeassistant.const import EntityCategory
from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback
from homeassistant.helpers import event
from homeassistant.helpers.entity_platform import AddEntitiesCallback
import homeassistant.util.dt as dt_util
-from .entity import JewishCalendarConfigEntry, JewishCalendarEntity
+from .const import DOMAIN
+from .entity import JewishCalendarEntity
@dataclass(frozen=True)
@@ -61,12 +63,14 @@ BINARY_SENSORS: tuple[JewishCalendarBinarySensorEntityDescription, ...] = (
async def async_setup_entry(
hass: HomeAssistant,
- config_entry: JewishCalendarConfigEntry,
+ config_entry: ConfigEntry,
async_add_entities: AddEntitiesCallback,
) -> None:
"""Set up the Jewish Calendar binary sensors."""
+ entry = hass.data[DOMAIN][config_entry.entry_id]
+
async_add_entities(
- JewishCalendarBinarySensor(config_entry, description)
+ JewishCalendarBinarySensor(config_entry, entry, description)
for description in BINARY_SENSORS
)
diff --git a/homeassistant/components/jewish_calendar/config_flow.py b/homeassistant/components/jewish_calendar/config_flow.py
index a2eadbf57bd..f96699d01bd 100644
--- a/homeassistant/components/jewish_calendar/config_flow.py
+++ b/homeassistant/components/jewish_calendar/config_flow.py
@@ -12,7 +12,7 @@ from homeassistant.config_entries import (
ConfigEntry,
ConfigFlow,
ConfigFlowResult,
- OptionsFlow,
+ OptionsFlowWithConfigEntry,
)
from homeassistant.const import (
CONF_ELEVATION,
@@ -90,21 +90,32 @@ class JewishCalendarConfigFlow(ConfigFlow, domain=DOMAIN):
@staticmethod
@callback
- def async_get_options_flow(
- config_entry: ConfigEntry,
- ) -> JewishCalendarOptionsFlowHandler:
+ def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlowWithConfigEntry:
"""Get the options flow for this handler."""
- return JewishCalendarOptionsFlowHandler()
+ return JewishCalendarOptionsFlowHandler(config_entry)
async def async_step_user(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Handle the initial step."""
if user_input is not None:
+ _options = {}
+ if CONF_CANDLE_LIGHT_MINUTES in user_input:
+ _options[CONF_CANDLE_LIGHT_MINUTES] = user_input[
+ CONF_CANDLE_LIGHT_MINUTES
+ ]
+ del user_input[CONF_CANDLE_LIGHT_MINUTES]
+ if CONF_HAVDALAH_OFFSET_MINUTES in user_input:
+ _options[CONF_HAVDALAH_OFFSET_MINUTES] = user_input[
+ CONF_HAVDALAH_OFFSET_MINUTES
+ ]
+ del user_input[CONF_HAVDALAH_OFFSET_MINUTES]
if CONF_LOCATION in user_input:
user_input[CONF_LATITUDE] = user_input[CONF_LOCATION][CONF_LATITUDE]
user_input[CONF_LONGITUDE] = user_input[CONF_LOCATION][CONF_LONGITUDE]
- return self.async_create_entry(title=DEFAULT_NAME, data=user_input)
+ return self.async_create_entry(
+ title=DEFAULT_NAME, data=user_input, options=_options
+ )
return self.async_show_form(
step_id="user",
@@ -113,6 +124,10 @@ class JewishCalendarConfigFlow(ConfigFlow, domain=DOMAIN):
),
)
+ async def async_step_import(self, import_data: dict[str, Any]) -> ConfigFlowResult:
+ """Import a config entry from configuration.yaml."""
+ return await self.async_step_user(import_data)
+
async def async_step_reconfigure(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
@@ -130,7 +145,7 @@ class JewishCalendarConfigFlow(ConfigFlow, domain=DOMAIN):
return self.async_update_reload_and_abort(reconfigure_entry, data=user_input)
-class JewishCalendarOptionsFlowHandler(OptionsFlow):
+class JewishCalendarOptionsFlowHandler(OptionsFlowWithConfigEntry):
"""Handle Jewish Calendar options."""
async def async_step_init(
diff --git a/homeassistant/components/jewish_calendar/entity.py b/homeassistant/components/jewish_calendar/entity.py
index ad5ac8e2137..c11925df954 100644
--- a/homeassistant/components/jewish_calendar/entity.py
+++ b/homeassistant/components/jewish_calendar/entity.py
@@ -1,27 +1,18 @@
"""Entity representing a Jewish Calendar sensor."""
-from dataclasses import dataclass
-
-from hdate import Location
+from typing import Any
from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_LANGUAGE, CONF_LOCATION
from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
from homeassistant.helpers.entity import Entity, EntityDescription
-from .const import DOMAIN
-
-type JewishCalendarConfigEntry = ConfigEntry[JewishCalendarData]
-
-
-@dataclass
-class JewishCalendarData:
- """Jewish Calendar runtime dataclass."""
-
- language: str
- diaspora: bool
- location: Location
- candle_lighting_offset: int
- havdalah_offset: int
+from .const import (
+ CONF_CANDLE_LIGHT_MINUTES,
+ CONF_DIASPORA,
+ CONF_HAVDALAH_OFFSET_MINUTES,
+ DOMAIN,
+)
class JewishCalendarEntity(Entity):
@@ -31,7 +22,8 @@ class JewishCalendarEntity(Entity):
def __init__(
self,
- config_entry: JewishCalendarConfigEntry,
+ config_entry: ConfigEntry,
+ data: dict[str, Any],
description: EntityDescription,
) -> None:
"""Initialize a Jewish Calendar entity."""
@@ -40,10 +32,10 @@ class JewishCalendarEntity(Entity):
self._attr_device_info = DeviceInfo(
entry_type=DeviceEntryType.SERVICE,
identifiers={(DOMAIN, config_entry.entry_id)},
+ name=config_entry.title,
)
- data = config_entry.runtime_data
- self._location = data.location
- self._hebrew = data.language == "hebrew"
- self._candle_lighting_offset = data.candle_lighting_offset
- self._havdalah_offset = data.havdalah_offset
- self._diaspora = data.diaspora
+ self._location = data[CONF_LOCATION]
+ self._hebrew = data[CONF_LANGUAGE] == "hebrew"
+ self._candle_lighting_offset = data[CONF_CANDLE_LIGHT_MINUTES]
+ self._havdalah_offset = data[CONF_HAVDALAH_OFFSET_MINUTES]
+ self._diaspora = data[CONF_DIASPORA]
diff --git a/homeassistant/components/jewish_calendar/sensor.py b/homeassistant/components/jewish_calendar/sensor.py
index c32647af07c..87b4375b8b2 100644
--- a/homeassistant/components/jewish_calendar/sensor.py
+++ b/homeassistant/components/jewish_calendar/sensor.py
@@ -14,13 +14,15 @@ from homeassistant.components.sensor import (
SensorEntity,
SensorEntityDescription,
)
+from homeassistant.config_entries import ConfigEntry
from homeassistant.const import SUN_EVENT_SUNSET, EntityCategory
from homeassistant.core import HomeAssistant
from homeassistant.helpers.entity_platform import AddEntitiesCallback
from homeassistant.helpers.sun import get_astral_event_date
import homeassistant.util.dt as dt_util
-from .entity import JewishCalendarConfigEntry, JewishCalendarEntity
+from .const import DOMAIN
+from .entity import JewishCalendarEntity
_LOGGER = logging.getLogger(__name__)
@@ -167,15 +169,17 @@ TIME_SENSORS: tuple[SensorEntityDescription, ...] = (
async def async_setup_entry(
hass: HomeAssistant,
- config_entry: JewishCalendarConfigEntry,
+ config_entry: ConfigEntry,
async_add_entities: AddEntitiesCallback,
) -> None:
"""Set up the Jewish calendar sensors ."""
+ entry = hass.data[DOMAIN][config_entry.entry_id]
sensors = [
- JewishCalendarSensor(config_entry, description) for description in INFO_SENSORS
+ JewishCalendarSensor(config_entry, entry, description)
+ for description in INFO_SENSORS
]
sensors.extend(
- JewishCalendarTimeSensor(config_entry, description)
+ JewishCalendarTimeSensor(config_entry, entry, description)
for description in TIME_SENSORS
)
@@ -189,11 +193,12 @@ class JewishCalendarSensor(JewishCalendarEntity, SensorEntity):
def __init__(
self,
- config_entry: JewishCalendarConfigEntry,
+ config_entry: ConfigEntry,
+ data: dict[str, Any],
description: SensorEntityDescription,
) -> None:
"""Initialize the Jewish calendar sensor."""
- super().__init__(config_entry, description)
+ super().__init__(config_entry, data, description)
self._attrs: dict[str, str] = {}
async def async_update(self) -> None:
diff --git a/homeassistant/components/jewish_calendar/strings.json b/homeassistant/components/jewish_calendar/strings.json
index 1b7b86c0056..e5367b5819e 100644
--- a/homeassistant/components/jewish_calendar/strings.json
+++ b/homeassistant/components/jewish_calendar/strings.json
@@ -27,8 +27,7 @@
}
},
"abort": {
- "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
- "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]"
+ "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
}
},
"options": {
diff --git a/homeassistant/components/keenetic_ndms2/config_flow.py b/homeassistant/components/keenetic_ndms2/config_flow.py
index d11fedac385..69e81bf292d 100644
--- a/homeassistant/components/keenetic_ndms2/config_flow.py
+++ b/homeassistant/components/keenetic_ndms2/config_flow.py
@@ -55,7 +55,7 @@ class KeeneticFlowHandler(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> KeeneticOptionsFlowHandler:
"""Get the options flow for this handler."""
- return KeeneticOptionsFlowHandler()
+ return KeeneticOptionsFlowHandler(config_entry)
async def async_step_user(
self, user_input: dict[str, Any] | None = None
@@ -138,8 +138,9 @@ class KeeneticFlowHandler(ConfigFlow, domain=DOMAIN):
class KeeneticOptionsFlowHandler(OptionsFlow):
"""Handle options."""
- def __init__(self) -> None:
+ def __init__(self, config_entry: ConfigEntry) -> None:
"""Initialize options flow."""
+ self.config_entry = config_entry
self._interface_options: dict[str, str] = {}
async def async_step_init(
diff --git a/homeassistant/components/kitchen_sink/config_flow.py b/homeassistant/components/kitchen_sink/config_flow.py
index 019d1dddcad..986879e3058 100644
--- a/homeassistant/components/kitchen_sink/config_flow.py
+++ b/homeassistant/components/kitchen_sink/config_flow.py
@@ -12,7 +12,7 @@ from homeassistant.config_entries import (
ConfigEntry,
ConfigFlow,
ConfigFlowResult,
- OptionsFlow,
+ OptionsFlowWithConfigEntry,
)
from homeassistant.core import callback
@@ -33,7 +33,7 @@ class KitchenSinkConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> OptionsFlowHandler:
"""Get the options flow for this handler."""
- return OptionsFlowHandler()
+ return OptionsFlowHandler(config_entry)
async def async_step_import(self, import_data: dict[str, Any]) -> ConfigFlowResult:
"""Set the config entry up from yaml."""
@@ -54,7 +54,7 @@ class KitchenSinkConfigFlow(ConfigFlow, domain=DOMAIN):
return self.async_abort(reason="reauth_successful")
-class OptionsFlowHandler(OptionsFlow):
+class OptionsFlowHandler(OptionsFlowWithConfigEntry):
"""Handle options."""
async def async_step_init(
@@ -68,7 +68,8 @@ class OptionsFlowHandler(OptionsFlow):
) -> ConfigFlowResult:
"""Manage the options."""
if user_input is not None:
- return self.async_create_entry(data=self.config_entry.options | user_input)
+ self.options.update(user_input)
+ return await self._update_options()
return self.async_show_form(
step_id="options_1",
@@ -94,3 +95,7 @@ class OptionsFlowHandler(OptionsFlow):
}
),
)
+
+ async def _update_options(self) -> ConfigFlowResult:
+ """Update config entry options."""
+ return self.async_create_entry(title="", data=self.options)
diff --git a/homeassistant/components/kmtronic/config_flow.py b/homeassistant/components/kmtronic/config_flow.py
index 56b1d4675bc..6bf0b878f72 100644
--- a/homeassistant/components/kmtronic/config_flow.py
+++ b/homeassistant/components/kmtronic/config_flow.py
@@ -66,7 +66,7 @@ class KmtronicConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> KMTronicOptionsFlow:
"""Get the options flow for this handler."""
- return KMTronicOptionsFlow()
+ return KMTronicOptionsFlow(config_entry)
async def async_step_user(
self, user_input: dict[str, Any] | None = None
@@ -102,6 +102,10 @@ class InvalidAuth(HomeAssistantError):
class KMTronicOptionsFlow(OptionsFlow):
"""Handle options."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/knx/config_flow.py b/homeassistant/components/knx/config_flow.py
index feeb7626577..4a71c600824 100644
--- a/homeassistant/components/knx/config_flow.py
+++ b/homeassistant/components/knx/config_flow.py
@@ -770,6 +770,7 @@ class KNXOptionsFlow(KNXCommonFlow, OptionsFlow):
def __init__(self, config_entry: ConfigEntry) -> None:
"""Initialize KNX options flow."""
+ self.config_entry = config_entry
super().__init__(initial_data=config_entry.data) # type: ignore[arg-type]
@callback
diff --git a/homeassistant/components/konnected/config_flow.py b/homeassistant/components/konnected/config_flow.py
index 65dd7cf39b3..3f1ef99c6fb 100644
--- a/homeassistant/components/konnected/config_flow.py
+++ b/homeassistant/components/konnected/config_flow.py
@@ -402,10 +402,9 @@ class OptionsFlowHandler(OptionsFlow):
def __init__(self, config_entry: ConfigEntry) -> None:
"""Initialize options flow."""
- self.model = config_entry.data[CONF_MODEL]
- self.current_opt = (
- config_entry.options or config_entry.data[CONF_DEFAULT_OPTIONS]
- )
+ self.entry = config_entry
+ self.model = self.entry.data[CONF_MODEL]
+ self.current_opt = self.entry.options or self.entry.data[CONF_DEFAULT_OPTIONS]
# as config proceeds we'll build up new options and then replace what's in the config entry
self.new_opt: dict[str, Any] = {CONF_IO: {}}
@@ -476,7 +475,7 @@ class OptionsFlowHandler(OptionsFlow):
),
description_placeholders={
"model": KONN_PANEL_MODEL_NAMES[self.model],
- "host": self.config_entry.data[CONF_HOST],
+ "host": self.entry.data[CONF_HOST],
},
errors=errors,
)
@@ -512,7 +511,7 @@ class OptionsFlowHandler(OptionsFlow):
),
description_placeholders={
"model": KONN_PANEL_MODEL_NAMES[self.model],
- "host": self.config_entry.data[CONF_HOST],
+ "host": self.entry.data[CONF_HOST],
},
errors=errors,
)
@@ -572,7 +571,7 @@ class OptionsFlowHandler(OptionsFlow):
),
description_placeholders={
"model": KONN_PANEL_MODEL_NAMES[self.model],
- "host": self.config_entry.data[CONF_HOST],
+ "host": self.entry.data[CONF_HOST],
},
errors=errors,
)
diff --git a/homeassistant/components/kostal_plenticore/sensor.py b/homeassistant/components/kostal_plenticore/sensor.py
index 67de34f2fce..fbbfb03fb3e 100644
--- a/homeassistant/components/kostal_plenticore/sensor.py
+++ b/homeassistant/components/kostal_plenticore/sensor.py
@@ -17,7 +17,6 @@ from homeassistant.components.sensor import (
from homeassistant.config_entries import ConfigEntry
from homeassistant.const import (
PERCENTAGE,
- EntityCategory,
UnitOfElectricCurrent,
UnitOfElectricPotential,
UnitOfEnergy,
@@ -748,15 +747,6 @@ SENSOR_PROCESS_DATA = [
state_class=SensorStateClass.TOTAL_INCREASING,
formatter="format_energy",
),
- PlenticoreSensorEntityDescription(
- module_id="scb:event",
- key="Event:ActiveErrorCnt",
- name="Active Alarms",
- entity_category=EntityCategory.DIAGNOSTIC,
- entity_registry_enabled_default=False,
- icon="mdi:alert",
- formatter="format_round",
- ),
PlenticoreSensorEntityDescription(
module_id="_virt_",
key="pv_P",
diff --git a/homeassistant/components/kraken/config_flow.py b/homeassistant/components/kraken/config_flow.py
index 54a817f0a50..67778515273 100644
--- a/homeassistant/components/kraken/config_flow.py
+++ b/homeassistant/components/kraken/config_flow.py
@@ -33,7 +33,7 @@ class KrakenConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> KrakenOptionsFlowHandler:
"""Get the options flow for this handler."""
- return KrakenOptionsFlowHandler()
+ return KrakenOptionsFlowHandler(config_entry)
async def async_step_user(
self, user_input: dict[str, Any] | None = None
@@ -53,6 +53,10 @@ class KrakenConfigFlow(ConfigFlow, domain=DOMAIN):
class KrakenOptionsFlowHandler(OptionsFlow):
"""Handle Kraken client options."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize Kraken options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/lamarzocco/__init__.py b/homeassistant/components/lamarzocco/__init__.py
index da513bc8cff..82a91c0003f 100644
--- a/homeassistant/components/lamarzocco/__init__.py
+++ b/homeassistant/components/lamarzocco/__init__.py
@@ -2,12 +2,12 @@
import logging
+from lmcloud.client_bluetooth import LaMarzoccoBluetoothClient
+from lmcloud.client_cloud import LaMarzoccoCloudClient
+from lmcloud.client_local import LaMarzoccoLocalClient
+from lmcloud.const import BT_MODEL_PREFIXES, FirmwareType
+from lmcloud.exceptions import AuthFail, RequestNotSuccessful
from packaging import version
-from pylamarzocco.client_bluetooth import LaMarzoccoBluetoothClient
-from pylamarzocco.client_cloud import LaMarzoccoCloudClient
-from pylamarzocco.client_local import LaMarzoccoLocalClient
-from pylamarzocco.const import BT_MODEL_PREFIXES, FirmwareType
-from pylamarzocco.exceptions import AuthFail, RequestNotSuccessful
from homeassistant.components.bluetooth import async_discovered_service_info
from homeassistant.config_entries import ConfigEntry
diff --git a/homeassistant/components/lamarzocco/binary_sensor.py b/homeassistant/components/lamarzocco/binary_sensor.py
index 444e4d0723b..c48453214bd 100644
--- a/homeassistant/components/lamarzocco/binary_sensor.py
+++ b/homeassistant/components/lamarzocco/binary_sensor.py
@@ -3,7 +3,7 @@
from collections.abc import Callable
from dataclasses import dataclass
-from pylamarzocco.models import LaMarzoccoMachineConfig
+from lmcloud.models import LaMarzoccoMachineConfig
from homeassistant.components.binary_sensor import (
BinarySensorDeviceClass,
diff --git a/homeassistant/components/lamarzocco/button.py b/homeassistant/components/lamarzocco/button.py
index ae79e21897f..60374a85e1e 100644
--- a/homeassistant/components/lamarzocco/button.py
+++ b/homeassistant/components/lamarzocco/button.py
@@ -1,11 +1,11 @@
"""Button platform for La Marzocco espresso machines."""
-import asyncio
from collections.abc import Callable, Coroutine
from dataclasses import dataclass
from typing import Any
-from pylamarzocco.exceptions import RequestNotSuccessful
+from lmcloud.exceptions import RequestNotSuccessful
+from lmcloud.lm_machine import LaMarzoccoMachine
from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
from homeassistant.core import HomeAssistant
@@ -13,11 +13,9 @@ from homeassistant.exceptions import HomeAssistantError
from homeassistant.helpers.entity_platform import AddEntitiesCallback
from .const import DOMAIN
-from .coordinator import LaMarzoccoConfigEntry, LaMarzoccoUpdateCoordinator
+from .coordinator import LaMarzoccoConfigEntry
from .entity import LaMarzoccoEntity, LaMarzoccoEntityDescription
-BACKFLUSH_ENABLED_DURATION = 15
-
@dataclass(frozen=True, kw_only=True)
class LaMarzoccoButtonEntityDescription(
@@ -26,25 +24,14 @@ class LaMarzoccoButtonEntityDescription(
):
"""Description of a La Marzocco button."""
- press_fn: Callable[[LaMarzoccoUpdateCoordinator], Coroutine[Any, Any, None]]
-
-
-async def async_backflush_and_update(coordinator: LaMarzoccoUpdateCoordinator) -> None:
- """Press backflush button."""
- await coordinator.device.start_backflush()
- # lib will set state optimistically
- coordinator.async_set_updated_data(None)
- # backflush is enabled for 15 seconds
- # then turns off automatically
- await asyncio.sleep(BACKFLUSH_ENABLED_DURATION + 1)
- await coordinator.async_request_refresh()
+ press_fn: Callable[[LaMarzoccoMachine], Coroutine[Any, Any, None]]
ENTITIES: tuple[LaMarzoccoButtonEntityDescription, ...] = (
LaMarzoccoButtonEntityDescription(
key="start_backflush",
translation_key="start_backflush",
- press_fn=async_backflush_and_update,
+ press_fn=lambda machine: machine.start_backflush(),
),
)
@@ -72,7 +59,7 @@ class LaMarzoccoButtonEntity(LaMarzoccoEntity, ButtonEntity):
async def async_press(self) -> None:
"""Press button."""
try:
- await self.entity_description.press_fn(self.coordinator)
+ await self.entity_description.press_fn(self.coordinator.device)
except RequestNotSuccessful as exc:
raise HomeAssistantError(
translation_domain=DOMAIN,
@@ -81,3 +68,4 @@ class LaMarzoccoButtonEntity(LaMarzoccoEntity, ButtonEntity):
"key": self.entity_description.key,
},
) from exc
+ await self.coordinator.async_request_refresh()
diff --git a/homeassistant/components/lamarzocco/calendar.py b/homeassistant/components/lamarzocco/calendar.py
index 0ec9b55a9a1..3d8b2474c94 100644
--- a/homeassistant/components/lamarzocco/calendar.py
+++ b/homeassistant/components/lamarzocco/calendar.py
@@ -3,7 +3,7 @@
from collections.abc import Iterator
from datetime import datetime, timedelta
-from pylamarzocco.models import LaMarzoccoWakeUpSleepEntry
+from lmcloud.models import LaMarzoccoWakeUpSleepEntry
from homeassistant.components.calendar import CalendarEntity, CalendarEvent
from homeassistant.core import HomeAssistant
diff --git a/homeassistant/components/lamarzocco/config_flow.py b/homeassistant/components/lamarzocco/config_flow.py
index 04e705edbdc..438bf7fe6b9 100644
--- a/homeassistant/components/lamarzocco/config_flow.py
+++ b/homeassistant/components/lamarzocco/config_flow.py
@@ -1,22 +1,19 @@
"""Config flow for La Marzocco integration."""
-from __future__ import annotations
-
from collections.abc import Mapping
import logging
from typing import Any
-from pylamarzocco.client_cloud import LaMarzoccoCloudClient
-from pylamarzocco.client_local import LaMarzoccoLocalClient
-from pylamarzocco.exceptions import AuthFail, RequestNotSuccessful
-from pylamarzocco.models import LaMarzoccoDeviceInfo
+from lmcloud.client_cloud import LaMarzoccoCloudClient
+from lmcloud.client_local import LaMarzoccoLocalClient
+from lmcloud.exceptions import AuthFail, RequestNotSuccessful
+from lmcloud.models import LaMarzoccoDeviceInfo
import voluptuous as vol
from homeassistant.components.bluetooth import (
BluetoothServiceInfo,
async_discovered_service_info,
)
-from homeassistant.components.dhcp import DhcpServiceInfo
from homeassistant.config_entries import (
SOURCE_REAUTH,
SOURCE_RECONFIGURE,
@@ -24,6 +21,7 @@ from homeassistant.config_entries import (
ConfigFlow,
ConfigFlowResult,
OptionsFlow,
+ OptionsFlowWithConfigEntry,
)
from homeassistant.const import (
CONF_HOST,
@@ -105,15 +103,6 @@ class LmConfigFlow(ConfigFlow, domain=DOMAIN):
errors["base"] = "machine_not_found"
else:
self._config = data
- # if DHCP discovery was used, auto fill machine selection
- if CONF_HOST in self._discovered:
- return await self.async_step_machine_selection(
- user_input={
- CONF_HOST: self._discovered[CONF_HOST],
- CONF_MACHINE: self._discovered[CONF_MACHINE],
- }
- )
- # if Bluetooth discovery was used, only select host
return self.async_show_form(
step_id="machine_selection",
data_schema=vol.Schema(
@@ -269,27 +258,6 @@ class LmConfigFlow(ConfigFlow, domain=DOMAIN):
return await self.async_step_user()
- async def async_step_dhcp(
- self, discovery_info: DhcpServiceInfo
- ) -> ConfigFlowResult:
- """Handle discovery via dhcp."""
-
- serial = discovery_info.hostname.upper()
-
- await self.async_set_unique_id(serial)
- self._abort_if_unique_id_configured()
-
- _LOGGER.debug(
- "Discovered La Marzocco machine %s through DHCP at address %s",
- discovery_info.hostname,
- discovery_info.ip,
- )
-
- self._discovered[CONF_MACHINE] = serial
- self._discovered[CONF_HOST] = discovery_info.ip
-
- return await self.async_step_user()
-
async def async_step_reauth(
self, entry_data: Mapping[str, Any]
) -> ConfigFlowResult:
@@ -340,12 +308,12 @@ class LmConfigFlow(ConfigFlow, domain=DOMAIN):
@callback
def async_get_options_flow(
config_entry: ConfigEntry,
- ) -> LmOptionsFlowHandler:
+ ) -> OptionsFlow:
"""Create the options flow."""
- return LmOptionsFlowHandler()
+ return LmOptionsFlowHandler(config_entry)
-class LmOptionsFlowHandler(OptionsFlow):
+class LmOptionsFlowHandler(OptionsFlowWithConfigEntry):
"""Handles options flow for the component."""
async def async_step_init(
@@ -359,7 +327,7 @@ class LmOptionsFlowHandler(OptionsFlow):
{
vol.Optional(
CONF_USE_BLUETOOTH,
- default=self.config_entry.options.get(CONF_USE_BLUETOOTH, True),
+ default=self.options.get(CONF_USE_BLUETOOTH, True),
): cv.boolean,
}
)
diff --git a/homeassistant/components/lamarzocco/coordinator.py b/homeassistant/components/lamarzocco/coordinator.py
index 05fee98c599..e2ff8791a05 100644
--- a/homeassistant/components/lamarzocco/coordinator.py
+++ b/homeassistant/components/lamarzocco/coordinator.py
@@ -8,11 +8,11 @@ import logging
from time import time
from typing import Any
-from pylamarzocco.client_bluetooth import LaMarzoccoBluetoothClient
-from pylamarzocco.client_cloud import LaMarzoccoCloudClient
-from pylamarzocco.client_local import LaMarzoccoLocalClient
-from pylamarzocco.exceptions import AuthFail, RequestNotSuccessful
-from pylamarzocco.lm_machine import LaMarzoccoMachine
+from lmcloud.client_bluetooth import LaMarzoccoBluetoothClient
+from lmcloud.client_cloud import LaMarzoccoCloudClient
+from lmcloud.client_local import LaMarzoccoLocalClient
+from lmcloud.exceptions import AuthFail, RequestNotSuccessful
+from lmcloud.lm_machine import LaMarzoccoMachine
from homeassistant.config_entries import ConfigEntry
from homeassistant.const import CONF_MODEL, CONF_NAME, EVENT_HOMEASSISTANT_STOP
diff --git a/homeassistant/components/lamarzocco/diagnostics.py b/homeassistant/components/lamarzocco/diagnostics.py
index 43ae51ee192..edce6a349aa 100644
--- a/homeassistant/components/lamarzocco/diagnostics.py
+++ b/homeassistant/components/lamarzocco/diagnostics.py
@@ -5,7 +5,7 @@ from __future__ import annotations
from dataclasses import asdict
from typing import Any, TypedDict
-from pylamarzocco.const import FirmwareType
+from lmcloud.const import FirmwareType
from homeassistant.components.diagnostics import async_redact_data
from homeassistant.core import HomeAssistant
diff --git a/homeassistant/components/lamarzocco/entity.py b/homeassistant/components/lamarzocco/entity.py
index 1ea84302a17..f7e6ff9e2b8 100644
--- a/homeassistant/components/lamarzocco/entity.py
+++ b/homeassistant/components/lamarzocco/entity.py
@@ -3,8 +3,8 @@
from collections.abc import Callable
from dataclasses import dataclass
-from pylamarzocco.const import FirmwareType
-from pylamarzocco.lm_machine import LaMarzoccoMachine
+from lmcloud.const import FirmwareType
+from lmcloud.lm_machine import LaMarzoccoMachine
from homeassistant.helpers.device_registry import DeviceInfo
from homeassistant.helpers.entity import EntityDescription
diff --git a/homeassistant/components/lamarzocco/manifest.json b/homeassistant/components/lamarzocco/manifest.json
index 6b226051118..a1da8982cd8 100644
--- a/homeassistant/components/lamarzocco/manifest.json
+++ b/homeassistant/components/lamarzocco/manifest.json
@@ -18,20 +18,9 @@
"codeowners": ["@zweckj"],
"config_flow": true,
"dependencies": ["bluetooth_adapters"],
- "dhcp": [
- {
- "hostname": "gs[0-9][0-9][0-9][0-9][0-9][0-9]"
- },
- {
- "hostname": "lm[0-9][0-9][0-9][0-9][0-9][0-9]"
- },
- {
- "hostname": "mr[0-9][0-9][0-9][0-9][0-9][0-9]"
- }
- ],
"documentation": "https://www.home-assistant.io/integrations/lamarzocco",
"integration_type": "device",
"iot_class": "cloud_polling",
- "loggers": ["pylamarzocco"],
- "requirements": ["pylamarzocco==1.2.3"]
+ "loggers": ["lmcloud"],
+ "requirements": ["lmcloud==1.2.3"]
}
diff --git a/homeassistant/components/lamarzocco/number.py b/homeassistant/components/lamarzocco/number.py
index 825c5d6deb0..df75147e7e1 100644
--- a/homeassistant/components/lamarzocco/number.py
+++ b/homeassistant/components/lamarzocco/number.py
@@ -4,16 +4,16 @@ from collections.abc import Callable, Coroutine
from dataclasses import dataclass
from typing import Any
-from pylamarzocco.const import (
+from lmcloud.const import (
KEYS_PER_MODEL,
BoilerType,
MachineModel,
PhysicalKey,
PrebrewMode,
)
-from pylamarzocco.exceptions import RequestNotSuccessful
-from pylamarzocco.lm_machine import LaMarzoccoMachine
-from pylamarzocco.models import LaMarzoccoMachineConfig
+from lmcloud.exceptions import RequestNotSuccessful
+from lmcloud.lm_machine import LaMarzoccoMachine
+from lmcloud.models import LaMarzoccoMachineConfig
from homeassistant.components.number import (
NumberDeviceClass,
diff --git a/homeassistant/components/lamarzocco/select.py b/homeassistant/components/lamarzocco/select.py
index 1889ba38d6b..1958fa6f210 100644
--- a/homeassistant/components/lamarzocco/select.py
+++ b/homeassistant/components/lamarzocco/select.py
@@ -4,10 +4,10 @@ from collections.abc import Callable, Coroutine
from dataclasses import dataclass
from typing import Any
-from pylamarzocco.const import MachineModel, PrebrewMode, SmartStandbyMode, SteamLevel
-from pylamarzocco.exceptions import RequestNotSuccessful
-from pylamarzocco.lm_machine import LaMarzoccoMachine
-from pylamarzocco.models import LaMarzoccoMachineConfig
+from lmcloud.const import MachineModel, PrebrewMode, SmartStandbyMode, SteamLevel
+from lmcloud.exceptions import RequestNotSuccessful
+from lmcloud.lm_machine import LaMarzoccoMachine
+from lmcloud.models import LaMarzoccoMachineConfig
from homeassistant.components.select import SelectEntity, SelectEntityDescription
from homeassistant.const import EntityCategory
diff --git a/homeassistant/components/lamarzocco/sensor.py b/homeassistant/components/lamarzocco/sensor.py
index 04b095e798c..ca8a118c1ee 100644
--- a/homeassistant/components/lamarzocco/sensor.py
+++ b/homeassistant/components/lamarzocco/sensor.py
@@ -3,8 +3,8 @@
from collections.abc import Callable
from dataclasses import dataclass
-from pylamarzocco.const import BoilerType, MachineModel, PhysicalKey
-from pylamarzocco.lm_machine import LaMarzoccoMachine
+from lmcloud.const import BoilerType, MachineModel, PhysicalKey
+from lmcloud.lm_machine import LaMarzoccoMachine
from homeassistant.components.sensor import (
SensorDeviceClass,
diff --git a/homeassistant/components/lamarzocco/switch.py b/homeassistant/components/lamarzocco/switch.py
index f7690885f05..a611424418f 100644
--- a/homeassistant/components/lamarzocco/switch.py
+++ b/homeassistant/components/lamarzocco/switch.py
@@ -4,10 +4,10 @@ from collections.abc import Callable, Coroutine
from dataclasses import dataclass
from typing import Any
-from pylamarzocco.const import BoilerType
-from pylamarzocco.exceptions import RequestNotSuccessful
-from pylamarzocco.lm_machine import LaMarzoccoMachine
-from pylamarzocco.models import LaMarzoccoMachineConfig
+from lmcloud.const import BoilerType
+from lmcloud.exceptions import RequestNotSuccessful
+from lmcloud.lm_machine import LaMarzoccoMachine
+from lmcloud.models import LaMarzoccoMachineConfig
from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
from homeassistant.const import EntityCategory
diff --git a/homeassistant/components/lamarzocco/update.py b/homeassistant/components/lamarzocco/update.py
index 371ff679bae..61f436a7d7f 100644
--- a/homeassistant/components/lamarzocco/update.py
+++ b/homeassistant/components/lamarzocco/update.py
@@ -3,8 +3,8 @@
from dataclasses import dataclass
from typing import Any
-from pylamarzocco.const import FirmwareType
-from pylamarzocco.exceptions import RequestNotSuccessful
+from lmcloud.const import FirmwareType
+from lmcloud.exceptions import RequestNotSuccessful
from homeassistant.components.update import (
UpdateDeviceClass,
diff --git a/homeassistant/components/lastfm/config_flow.py b/homeassistant/components/lastfm/config_flow.py
index 0e1f680dd63..c6ea120242d 100644
--- a/homeassistant/components/lastfm/config_flow.py
+++ b/homeassistant/components/lastfm/config_flow.py
@@ -11,7 +11,7 @@ from homeassistant.config_entries import (
ConfigEntry,
ConfigFlow,
ConfigFlowResult,
- OptionsFlow,
+ OptionsFlowWithConfigEntry,
)
from homeassistant.const import CONF_API_KEY
from homeassistant.core import callback
@@ -80,7 +80,7 @@ class LastFmConfigFlowHandler(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> LastFmOptionsFlowHandler:
"""Get the options flow for this handler."""
- return LastFmOptionsFlowHandler()
+ return LastFmOptionsFlowHandler(config_entry)
async def async_step_user(
self, user_input: dict[str, Any] | None = None
@@ -155,7 +155,7 @@ class LastFmConfigFlowHandler(ConfigFlow, domain=DOMAIN):
)
-class LastFmOptionsFlowHandler(OptionsFlow):
+class LastFmOptionsFlowHandler(OptionsFlowWithConfigEntry):
"""LastFm Options flow handler."""
async def async_step_init(
@@ -163,25 +163,24 @@ class LastFmOptionsFlowHandler(OptionsFlow):
) -> ConfigFlowResult:
"""Initialize form."""
errors: dict[str, str] = {}
- options = self.config_entry.options
if user_input is not None:
users, errors = validate_lastfm_users(
- options[CONF_API_KEY], user_input[CONF_USERS]
+ self.options[CONF_API_KEY], user_input[CONF_USERS]
)
user_input[CONF_USERS] = users
if not errors:
return self.async_create_entry(
title="LastFM",
data={
- **options,
+ **self.options,
CONF_USERS: user_input[CONF_USERS],
},
)
- if options[CONF_MAIN_USER]:
+ if self.options[CONF_MAIN_USER]:
try:
main_user, _ = get_lastfm_user(
- options[CONF_API_KEY],
- options[CONF_MAIN_USER],
+ self.options[CONF_API_KEY],
+ self.options[CONF_MAIN_USER],
)
friends_response = await self.hass.async_add_executor_job(
main_user.get_friends
@@ -207,6 +206,6 @@ class LastFmOptionsFlowHandler(OptionsFlow):
),
}
),
- user_input or options,
+ user_input or self.options,
),
)
diff --git a/homeassistant/components/lcn/__init__.py b/homeassistant/components/lcn/__init__.py
index eb26ef48e4e..5995e06efcc 100644
--- a/homeassistant/components/lcn/__init__.py
+++ b/homeassistant/components/lcn/__init__.py
@@ -8,7 +8,7 @@ import logging
import pypck
from pypck.connection import PchkConnectionManager
-from homeassistant.config_entries import ConfigEntry
+from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
from homeassistant.const import (
CONF_DEVICE_ID,
CONF_DOMAIN,
@@ -20,7 +20,7 @@ from homeassistant.const import (
Platform,
)
from homeassistant.core import HomeAssistant
-from homeassistant.helpers import config_validation as cv, device_registry as dr
+from homeassistant.helpers import device_registry as dr
from homeassistant.helpers.typing import ConfigType
from .const import (
@@ -39,29 +39,40 @@ from .helpers import (
InputType,
async_update_config_entry,
generate_unique_id,
+ import_lcn_config,
register_lcn_address_devices,
register_lcn_host_device,
)
-from .services import register_services
+from .schemas import CONFIG_SCHEMA # noqa: F401
+from .services import SERVICES
from .websocket import register_panel_and_ws_api
_LOGGER = logging.getLogger(__name__)
-CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
-
async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
"""Set up the LCN component."""
- hass.data.setdefault(DOMAIN, {})
+ if DOMAIN not in config:
+ return True
- await register_services(hass)
- await register_panel_and_ws_api(hass)
+ # initialize a config_flow for all LCN configurations read from
+ # configuration.yaml
+ config_entries_data = import_lcn_config(config[DOMAIN])
+ for config_entry_data in config_entries_data:
+ hass.async_create_task(
+ hass.config_entries.flow.async_init(
+ DOMAIN,
+ context={"source": SOURCE_IMPORT},
+ data=config_entry_data,
+ )
+ )
return True
async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
"""Set up a connection to PCHK host from a config entry."""
+ hass.data.setdefault(DOMAIN, {})
if config_entry.entry_id in hass.data[DOMAIN]:
return False
@@ -121,6 +132,15 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
)
lcn_connection.register_for_inputs(input_received)
+ # register service calls
+ for service_name, service in SERVICES:
+ if not hass.services.has_service(DOMAIN, service_name):
+ hass.services.async_register(
+ DOMAIN, service_name, service(hass).async_call_service, service.schema
+ )
+
+ await register_panel_and_ws_api(hass)
+
return True
@@ -171,6 +191,11 @@ async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry) ->
host = hass.data[DOMAIN].pop(config_entry.entry_id)
await host[CONNECTION].async_close()
+ # unregister service calls
+ if unload_ok and not hass.data[DOMAIN]: # check if this is the last entry to unload
+ for service_name, _ in SERVICES:
+ hass.services.async_remove(DOMAIN, service_name)
+
return unload_ok
diff --git a/homeassistant/components/lcn/config_flow.py b/homeassistant/components/lcn/config_flow.py
index 008265e62ae..e78378a61b1 100644
--- a/homeassistant/components/lcn/config_flow.py
+++ b/homeassistant/components/lcn/config_flow.py
@@ -9,6 +9,7 @@ import pypck
import voluptuous as vol
from homeassistant import config_entries
+from homeassistant.config_entries import ConfigFlowResult
from homeassistant.const import (
CONF_BASE,
CONF_DEVICES,
@@ -19,12 +20,14 @@ from homeassistant.const import (
CONF_PORT,
CONF_USERNAME,
)
-from homeassistant.core import HomeAssistant
+from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant
import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
from homeassistant.helpers.typing import ConfigType
from . import PchkConnectionManager
from .const import CONF_ACKNOWLEDGE, CONF_DIM_MODE, CONF_SK_NUM_TRIES, DIM_MODES, DOMAIN
+from .helpers import purge_device_registry, purge_entity_registry
_LOGGER = logging.getLogger(__name__)
@@ -110,6 +113,55 @@ class LcnFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
VERSION = 2
MINOR_VERSION = 1
+ async def async_step_import(self, import_data: dict[str, Any]) -> ConfigFlowResult:
+ """Import existing configuration from LCN."""
+ # validate the imported connection parameters
+ if error := await validate_connection(import_data):
+ async_create_issue(
+ self.hass,
+ DOMAIN,
+ error,
+ is_fixable=False,
+ issue_domain=DOMAIN,
+ severity=IssueSeverity.ERROR,
+ translation_key=error,
+ translation_placeholders={
+ "url": "/config/integrations/dashboard/add?domain=lcn"
+ },
+ )
+ return self.async_abort(reason=error)
+
+ async_create_issue(
+ self.hass,
+ HOMEASSISTANT_DOMAIN,
+ f"deprecated_yaml_{DOMAIN}",
+ breaks_in_ha_version="2024.12.0",
+ is_fixable=False,
+ is_persistent=False,
+ issue_domain=DOMAIN,
+ severity=IssueSeverity.WARNING,
+ translation_key="deprecated_yaml",
+ translation_placeholders={
+ "domain": DOMAIN,
+ "integration_title": "LCN",
+ },
+ )
+
+ # check if we already have a host with the same address configured
+ if entry := get_config_entry(self.hass, import_data):
+ entry.source = config_entries.SOURCE_IMPORT
+ # Cleanup entity and device registry, if we imported from configuration.yaml to
+ # remove orphans when entities were removed from configuration
+ purge_entity_registry(self.hass, entry.entry_id, import_data)
+ purge_device_registry(self.hass, entry.entry_id, import_data)
+
+ self.hass.config_entries.async_update_entry(entry, data=import_data)
+ return self.async_abort(reason="existing_configuration_updated")
+
+ return self.async_create_entry(
+ title=f"{import_data[CONF_HOST]}", data=import_data
+ )
+
async def async_step_user(
self, user_input: dict[str, Any] | None = None
) -> config_entries.ConfigFlowResult:
diff --git a/homeassistant/components/lcn/helpers.py b/homeassistant/components/lcn/helpers.py
index 6a9c63ea212..7da047682ac 100644
--- a/homeassistant/components/lcn/helpers.py
+++ b/homeassistant/components/lcn/helpers.py
@@ -9,6 +9,7 @@ import re
from typing import cast
import pypck
+import voluptuous as vol
from homeassistant.config_entries import ConfigEntry
from homeassistant.const import (
@@ -18,12 +19,17 @@ from homeassistant.const import (
CONF_DEVICES,
CONF_DOMAIN,
CONF_ENTITIES,
+ CONF_HOST,
+ CONF_IP_ADDRESS,
CONF_LIGHTS,
CONF_NAME,
+ CONF_PASSWORD,
+ CONF_PORT,
CONF_RESOURCE,
CONF_SENSORS,
CONF_SOURCE,
CONF_SWITCHES,
+ CONF_USERNAME,
)
from homeassistant.core import HomeAssistant
from homeassistant.helpers import device_registry as dr, entity_registry as er
@@ -31,13 +37,19 @@ from homeassistant.helpers.typing import ConfigType
from .const import (
BINSENSOR_PORTS,
+ CONF_ACKNOWLEDGE,
CONF_CLIMATES,
+ CONF_CONNECTIONS,
+ CONF_DIM_MODE,
+ CONF_DOMAIN_DATA,
CONF_HARDWARE_SERIAL,
CONF_HARDWARE_TYPE,
CONF_OUTPUT,
CONF_SCENES,
+ CONF_SK_NUM_TRIES,
CONF_SOFTWARE_SERIAL,
CONNECTION,
+ DEFAULT_NAME,
DOMAIN,
LED_PORTS,
LOGICOP_PORTS,
@@ -134,6 +146,110 @@ def generate_unique_id(
return unique_id
+def import_lcn_config(lcn_config: ConfigType) -> list[ConfigType]:
+ """Convert lcn settings from configuration.yaml to config_entries data.
+
+ Create a list of config_entry data structures like:
+
+ "data": {
+ "host": "pchk",
+ "ip_address": "192.168.2.41",
+ "port": 4114,
+ "username": "lcn",
+ "password": "lcn,
+ "sk_num_tries: 0,
+ "dim_mode: "STEPS200",
+ "acknowledge": False,
+ "devices": [
+ {
+ "address": (0, 7, False)
+ "name": "",
+ "hardware_serial": -1,
+ "software_serial": -1,
+ "hardware_type": -1
+ }, ...
+ ],
+ "entities": [
+ {
+ "address": (0, 7, False)
+ "name": "Light_Output1",
+ "resource": "output1",
+ "domain": "light",
+ "domain_data": {
+ "output": "OUTPUT1",
+ "dimmable": True,
+ "transition": 5000.0
+ }
+ }, ...
+ ]
+ }
+ """
+ data = {}
+ for connection in lcn_config[CONF_CONNECTIONS]:
+ host = {
+ CONF_HOST: connection[CONF_NAME],
+ CONF_IP_ADDRESS: connection[CONF_HOST],
+ CONF_PORT: connection[CONF_PORT],
+ CONF_USERNAME: connection[CONF_USERNAME],
+ CONF_PASSWORD: connection[CONF_PASSWORD],
+ CONF_SK_NUM_TRIES: connection[CONF_SK_NUM_TRIES],
+ CONF_DIM_MODE: connection[CONF_DIM_MODE],
+ CONF_ACKNOWLEDGE: False,
+ CONF_DEVICES: [],
+ CONF_ENTITIES: [],
+ }
+ data[connection[CONF_NAME]] = host
+
+ for confkey, domain_config in lcn_config.items():
+ if confkey == CONF_CONNECTIONS:
+ continue
+ domain = DOMAIN_LOOKUP[confkey]
+ # loop over entities in configuration.yaml
+ for domain_data in domain_config:
+ # remove name and address from domain_data
+ entity_name = domain_data.pop(CONF_NAME)
+ address, host_name = domain_data.pop(CONF_ADDRESS)
+
+ if host_name is None:
+ host_name = DEFAULT_NAME
+
+ # check if we have a new device config
+ for device_config in data[host_name][CONF_DEVICES]:
+ if address == device_config[CONF_ADDRESS]:
+ break
+ else: # create new device_config
+ device_config = {
+ CONF_ADDRESS: address,
+ CONF_NAME: "",
+ CONF_HARDWARE_SERIAL: -1,
+ CONF_SOFTWARE_SERIAL: -1,
+ CONF_HARDWARE_TYPE: -1,
+ }
+
+ data[host_name][CONF_DEVICES].append(device_config)
+
+ # insert entity config
+ resource = get_resource(domain, domain_data).lower()
+ for entity_config in data[host_name][CONF_ENTITIES]:
+ if (
+ address == entity_config[CONF_ADDRESS]
+ and resource == entity_config[CONF_RESOURCE]
+ and domain == entity_config[CONF_DOMAIN]
+ ):
+ break
+ else: # create new entity_config
+ entity_config = {
+ CONF_ADDRESS: address,
+ CONF_NAME: entity_name,
+ CONF_RESOURCE: resource,
+ CONF_DOMAIN: domain,
+ CONF_DOMAIN_DATA: domain_data.copy(),
+ }
+ data[host_name][CONF_ENTITIES].append(entity_config)
+
+ return list(data.values())
+
+
def purge_entity_registry(
hass: HomeAssistant, entry_id: str, imported_entry_data: ConfigType
) -> None:
@@ -320,6 +436,26 @@ def get_device_config(
return None
+def has_unique_host_names(hosts: list[ConfigType]) -> list[ConfigType]:
+ """Validate that all connection names are unique.
+
+ Use 'pchk' as default connection_name (or add a numeric suffix if
+ pchk' is already in use.
+ """
+ suffix = 0
+ for host in hosts:
+ if host.get(CONF_NAME) is None:
+ if suffix == 0:
+ host[CONF_NAME] = DEFAULT_NAME
+ else:
+ host[CONF_NAME] = f"{DEFAULT_NAME}{suffix:d}"
+ suffix += 1
+
+ schema = vol.Schema(vol.Unique())
+ schema([host.get(CONF_NAME) for host in hosts])
+ return hosts
+
+
def is_address(value: str) -> tuple[AddressType, str]:
"""Validate the given address string.
diff --git a/homeassistant/components/lcn/manifest.json b/homeassistant/components/lcn/manifest.json
index 695a35df871..6ce41a2d08d 100644
--- a/homeassistant/components/lcn/manifest.json
+++ b/homeassistant/components/lcn/manifest.json
@@ -8,5 +8,5 @@
"documentation": "https://www.home-assistant.io/integrations/lcn",
"iot_class": "local_push",
"loggers": ["pypck"],
- "requirements": ["pypck==0.7.24", "lcn-frontend==0.2.2"]
+ "requirements": ["pypck==0.7.24", "lcn-frontend==0.2.1"]
}
diff --git a/homeassistant/components/lcn/schemas.py b/homeassistant/components/lcn/schemas.py
index c9c91b9843d..3b4d2333970 100644
--- a/homeassistant/components/lcn/schemas.py
+++ b/homeassistant/components/lcn/schemas.py
@@ -4,9 +4,20 @@ import voluptuous as vol
from homeassistant.components.climate import DEFAULT_MAX_TEMP, DEFAULT_MIN_TEMP
from homeassistant.const import (
+ CONF_ADDRESS,
+ CONF_BINARY_SENSORS,
+ CONF_COVERS,
+ CONF_HOST,
+ CONF_LIGHTS,
+ CONF_NAME,
+ CONF_PASSWORD,
+ CONF_PORT,
CONF_SCENE,
+ CONF_SENSORS,
CONF_SOURCE,
+ CONF_SWITCHES,
CONF_UNIT_OF_MEASUREMENT,
+ CONF_USERNAME,
UnitOfTemperature,
)
import homeassistant.helpers.config_validation as cv
@@ -14,6 +25,9 @@ from homeassistant.helpers.typing import VolDictType
from .const import (
BINSENSOR_PORTS,
+ CONF_CLIMATES,
+ CONF_CONNECTIONS,
+ CONF_DIM_MODE,
CONF_DIMMABLE,
CONF_LOCKABLE,
CONF_MAX_TEMP,
@@ -23,8 +37,12 @@ from .const import (
CONF_OUTPUTS,
CONF_REGISTER,
CONF_REVERSE_TIME,
+ CONF_SCENES,
CONF_SETPOINT,
+ CONF_SK_NUM_TRIES,
CONF_TRANSITION,
+ DIM_MODES,
+ DOMAIN,
KEYS,
LED_PORTS,
LOGICOP_PORTS,
@@ -38,6 +56,7 @@ from .const import (
VAR_UNITS,
VARIABLES,
)
+from .helpers import has_unique_host_names, is_address
ADDRESS_SCHEMA = vol.Coerce(tuple)
@@ -111,3 +130,72 @@ DOMAIN_DATA_SWITCH: VolDictType = {
vol.In(OUTPUT_PORTS + RELAY_PORTS + SETPOINTS + KEYS),
),
}
+
+
+#
+# Configuration
+#
+
+DOMAIN_DATA_BASE: VolDictType = {
+ vol.Required(CONF_NAME): cv.string,
+ vol.Required(CONF_ADDRESS): is_address,
+}
+
+BINARY_SENSORS_SCHEMA = vol.Schema({**DOMAIN_DATA_BASE, **DOMAIN_DATA_BINARY_SENSOR})
+
+CLIMATES_SCHEMA = vol.Schema({**DOMAIN_DATA_BASE, **DOMAIN_DATA_CLIMATE})
+
+COVERS_SCHEMA = vol.Schema({**DOMAIN_DATA_BASE, **DOMAIN_DATA_COVER})
+
+LIGHTS_SCHEMA = vol.Schema({**DOMAIN_DATA_BASE, **DOMAIN_DATA_LIGHT})
+
+SCENES_SCHEMA = vol.Schema({**DOMAIN_DATA_BASE, **DOMAIN_DATA_SCENE})
+
+SENSORS_SCHEMA = vol.Schema({**DOMAIN_DATA_BASE, **DOMAIN_DATA_SENSOR})
+
+SWITCHES_SCHEMA = vol.Schema({**DOMAIN_DATA_BASE, **DOMAIN_DATA_SWITCH})
+
+CONNECTION_SCHEMA = vol.Schema(
+ {
+ vol.Required(CONF_HOST): cv.string,
+ vol.Required(CONF_PORT): cv.port,
+ vol.Required(CONF_USERNAME): cv.string,
+ vol.Required(CONF_PASSWORD): cv.string,
+ vol.Optional(CONF_SK_NUM_TRIES, default=0): cv.positive_int,
+ vol.Optional(CONF_DIM_MODE, default="steps50"): vol.All(
+ vol.Upper, vol.In(DIM_MODES)
+ ),
+ vol.Optional(CONF_NAME): cv.string,
+ }
+)
+
+CONFIG_SCHEMA = vol.Schema(
+ vol.All(
+ cv.deprecated(DOMAIN),
+ {
+ DOMAIN: vol.Schema(
+ {
+ vol.Required(CONF_CONNECTIONS): vol.All(
+ cv.ensure_list, has_unique_host_names, [CONNECTION_SCHEMA]
+ ),
+ vol.Optional(CONF_BINARY_SENSORS): vol.All(
+ cv.ensure_list, [BINARY_SENSORS_SCHEMA]
+ ),
+ vol.Optional(CONF_CLIMATES): vol.All(
+ cv.ensure_list, [CLIMATES_SCHEMA]
+ ),
+ vol.Optional(CONF_COVERS): vol.All(cv.ensure_list, [COVERS_SCHEMA]),
+ vol.Optional(CONF_LIGHTS): vol.All(cv.ensure_list, [LIGHTS_SCHEMA]),
+ vol.Optional(CONF_SCENES): vol.All(cv.ensure_list, [SCENES_SCHEMA]),
+ vol.Optional(CONF_SENSORS): vol.All(
+ cv.ensure_list, [SENSORS_SCHEMA]
+ ),
+ vol.Optional(CONF_SWITCHES): vol.All(
+ cv.ensure_list, [SWITCHES_SCHEMA]
+ ),
+ },
+ )
+ },
+ ),
+ extra=vol.ALLOW_EXTRA,
+)
diff --git a/homeassistant/components/lcn/services.py b/homeassistant/components/lcn/services.py
index 92f5863c47e..611a7353bcd 100644
--- a/homeassistant/components/lcn/services.py
+++ b/homeassistant/components/lcn/services.py
@@ -429,11 +429,3 @@ SERVICES = (
(LcnService.DYN_TEXT, DynText),
(LcnService.PCK, Pck),
)
-
-
-async def register_services(hass: HomeAssistant) -> None:
- """Register services for LCN."""
- for service_name, service in SERVICES:
- hass.services.async_register(
- DOMAIN, service_name, service(hass).async_call_service, service.schema
- )
diff --git a/homeassistant/components/lcn/strings.json b/homeassistant/components/lcn/strings.json
index 088a3654500..ae0b1b01f9a 100644
--- a/homeassistant/components/lcn/strings.json
+++ b/homeassistant/components/lcn/strings.json
@@ -63,6 +63,18 @@
}
},
"issues": {
+ "authentication_error": {
+ "title": "Authentication failed.",
+ "description": "Configuring LCN using YAML is being removed but there was an error importing your YAML configuration.\n\nEnsure username and password are correct.\n\nConsider removing the LCN YAML configuration from your configuration.yaml file and continue to [set up the integration]({url}) manually."
+ },
+ "license_error": {
+ "title": "Maximum number of connections was reached.",
+ "description": "Configuring LCN using YAML is being removed but there was an error importing your YAML configuration.\n\nEnsure sufficient PCHK licenses are registered and restart Home Assistant.\n\nConsider removing the LCN YAML configuration from your configuration.yaml file and continue to [set up the integration]({url}) manually."
+ },
+ "connection_refused": {
+ "title": "Unable to connect to PCHK.",
+ "description": "Configuring LCN using YAML is being removed but there was an error importing your YAML configuration.\n\nEnsure the connection (IP and port) to the LCN bus coupler is correct.\n\nConsider removing the LCN YAML configuration from your configuration.yaml file and continue to [set up the integration]({url}) manually."
+ },
"deprecated_regulatorlock_sensor": {
"title": "Deprecated LCN regulator lock binary sensor",
"description": "Your LCN regulator lock binary sensor entity `{entity}` is beeing used in automations or scripts. A regulator lock switch entity is available and should be used going forward.\n\nPlease adjust your automations or scripts to fix this issue."
diff --git a/homeassistant/components/lektrico/__init__.py b/homeassistant/components/lektrico/__init__.py
index 475b6132541..c309bb42ece 100644
--- a/homeassistant/components/lektrico/__init__.py
+++ b/homeassistant/components/lektrico/__init__.py
@@ -12,7 +12,6 @@ from .coordinator import LektricoDeviceDataUpdateCoordinator
# List the platforms that charger supports.
CHARGERS_PLATFORMS: list[Platform] = [
- Platform.BINARY_SENSOR,
Platform.BUTTON,
Platform.NUMBER,
Platform.SENSOR,
diff --git a/homeassistant/components/lektrico/binary_sensor.py b/homeassistant/components/lektrico/binary_sensor.py
deleted file mode 100644
index d0a3e39690c..00000000000
--- a/homeassistant/components/lektrico/binary_sensor.py
+++ /dev/null
@@ -1,139 +0,0 @@
-"""Support for Lektrico binary sensors entities."""
-
-from collections.abc import Callable
-from dataclasses import dataclass
-from typing import Any
-
-from homeassistant.components.binary_sensor import (
- BinarySensorDeviceClass,
- BinarySensorEntity,
- BinarySensorEntityDescription,
-)
-from homeassistant.const import ATTR_SERIAL_NUMBER, CONF_TYPE, EntityCategory
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-
-from . import LektricoConfigEntry, LektricoDeviceDataUpdateCoordinator
-from .entity import LektricoEntity
-
-
-@dataclass(frozen=True, kw_only=True)
-class LektricoBinarySensorEntityDescription(BinarySensorEntityDescription):
- """Describes Lektrico binary sensor entity."""
-
- value_fn: Callable[[dict[str, Any]], bool]
-
-
-BINARY_SENSORS: tuple[LektricoBinarySensorEntityDescription, ...] = (
- LektricoBinarySensorEntityDescription(
- key="state_e_activated",
- translation_key="state_e_activated",
- entity_category=EntityCategory.DIAGNOSTIC,
- device_class=BinarySensorDeviceClass.PROBLEM,
- value_fn=lambda data: bool(data["state_e_activated"]),
- ),
- LektricoBinarySensorEntityDescription(
- key="overtemp",
- translation_key="overtemp",
- entity_category=EntityCategory.DIAGNOSTIC,
- device_class=BinarySensorDeviceClass.PROBLEM,
- value_fn=lambda data: bool(data["overtemp"]),
- ),
- LektricoBinarySensorEntityDescription(
- key="critical_temp",
- translation_key="critical_temp",
- entity_category=EntityCategory.DIAGNOSTIC,
- device_class=BinarySensorDeviceClass.PROBLEM,
- value_fn=lambda data: bool(data["critical_temp"]),
- ),
- LektricoBinarySensorEntityDescription(
- key="overcurrent",
- translation_key="overcurrent",
- entity_category=EntityCategory.DIAGNOSTIC,
- device_class=BinarySensorDeviceClass.PROBLEM,
- value_fn=lambda data: bool(data["overcurrent"]),
- ),
- LektricoBinarySensorEntityDescription(
- key="meter_fault",
- translation_key="meter_fault",
- entity_category=EntityCategory.DIAGNOSTIC,
- device_class=BinarySensorDeviceClass.PROBLEM,
- value_fn=lambda data: bool(data["meter_fault"]),
- ),
- LektricoBinarySensorEntityDescription(
- key="undervoltage",
- translation_key="undervoltage",
- entity_category=EntityCategory.DIAGNOSTIC,
- device_class=BinarySensorDeviceClass.PROBLEM,
- value_fn=lambda data: bool(data["undervoltage_error"]),
- ),
- LektricoBinarySensorEntityDescription(
- key="overvoltage",
- translation_key="overvoltage",
- entity_category=EntityCategory.DIAGNOSTIC,
- device_class=BinarySensorDeviceClass.PROBLEM,
- value_fn=lambda data: bool(data["overvoltage_error"]),
- ),
- LektricoBinarySensorEntityDescription(
- key="rcd_error",
- translation_key="rcd_error",
- entity_category=EntityCategory.DIAGNOSTIC,
- device_class=BinarySensorDeviceClass.PROBLEM,
- value_fn=lambda data: bool(data["rcd_error"]),
- ),
- LektricoBinarySensorEntityDescription(
- key="cp_diode_failure",
- translation_key="cp_diode_failure",
- entity_category=EntityCategory.DIAGNOSTIC,
- device_class=BinarySensorDeviceClass.PROBLEM,
- value_fn=lambda data: bool(data["cp_diode_failure"]),
- ),
- LektricoBinarySensorEntityDescription(
- key="contactor_failure",
- translation_key="contactor_failure",
- entity_category=EntityCategory.DIAGNOSTIC,
- device_class=BinarySensorDeviceClass.PROBLEM,
- value_fn=lambda data: bool(data["contactor_failure"]),
- ),
-)
-
-
-async def async_setup_entry(
- hass: HomeAssistant,
- entry: LektricoConfigEntry,
- async_add_entities: AddEntitiesCallback,
-) -> None:
- """Set up Lektrico binary sensor entities based on a config entry."""
- coordinator = entry.runtime_data
-
- async_add_entities(
- LektricoBinarySensor(
- description,
- coordinator,
- f"{entry.data[CONF_TYPE]}_{entry.data[ATTR_SERIAL_NUMBER]}",
- )
- for description in BINARY_SENSORS
- )
-
-
-class LektricoBinarySensor(LektricoEntity, BinarySensorEntity):
- """Defines a Lektrico binary sensor entity."""
-
- entity_description: LektricoBinarySensorEntityDescription
-
- def __init__(
- self,
- description: LektricoBinarySensorEntityDescription,
- coordinator: LektricoDeviceDataUpdateCoordinator,
- device_name: str,
- ) -> None:
- """Initialize Lektrico binary sensor."""
- super().__init__(coordinator, device_name)
- self.entity_description = description
- self._coordinator = coordinator
- self._attr_unique_id = f"{coordinator.serial_number}_{description.key}"
-
- @property
- def is_on(self) -> bool:
- """Return the state of the binary sensor."""
- return self.entity_description.value_fn(self.coordinator.data)
diff --git a/homeassistant/components/lektrico/strings.json b/homeassistant/components/lektrico/strings.json
index e24700c9b09..e6dc7b9eb46 100644
--- a/homeassistant/components/lektrico/strings.json
+++ b/homeassistant/components/lektrico/strings.json
@@ -22,38 +22,6 @@
}
},
"entity": {
- "binary_sensor": {
- "state_e_activated": {
- "name": "Ev error"
- },
- "overtemp": {
- "name": "Thermal throttling"
- },
- "critical_temp": {
- "name": "Overheating"
- },
- "overcurrent": {
- "name": "Overcurrent"
- },
- "meter_fault": {
- "name": "Metering error"
- },
- "undervoltage": {
- "name": "Undervoltage"
- },
- "overvoltage": {
- "name": "Overvoltage"
- },
- "rcd_error": {
- "name": "Rcd error"
- },
- "cp_diode_failure": {
- "name": "Ev diode short"
- },
- "contactor_failure": {
- "name": "Relay contacts welded"
- }
- },
"button": {
"charge_start": {
"name": "Charge start"
diff --git a/homeassistant/components/lg_thinq/fan.py b/homeassistant/components/lg_thinq/fan.py
index edcadf2598a..187cc74b3eb 100644
--- a/homeassistant/components/lg_thinq/fan.py
+++ b/homeassistant/components/lg_thinq/fan.py
@@ -72,11 +72,8 @@ class ThinQFanEntity(ThinQEntity, FanEntity):
super().__init__(coordinator, entity_description, property_id)
self._ordered_named_fan_speeds = []
- self._attr_supported_features = (
- FanEntityFeature.SET_SPEED
- | FanEntityFeature.TURN_ON
- | FanEntityFeature.TURN_OFF
- )
+ self._attr_supported_features |= FanEntityFeature.SET_SPEED
+
if (fan_modes := self.data.fan_modes) is not None:
self._attr_speed_count = len(fan_modes)
if self.speed_count == 4:
@@ -101,7 +98,7 @@ class ThinQFanEntity(ThinQEntity, FanEntity):
self._attr_percentage = 0
_LOGGER.debug(
- "[%s:%s] update status: %s -> %s (percentage=%s)",
+ "[%s:%s] update status: %s -> %s (percntage=%s)",
self.coordinator.device_name,
self.property_id,
self.data.is_on,
@@ -123,7 +120,7 @@ class ThinQFanEntity(ThinQEntity, FanEntity):
return
_LOGGER.debug(
- "[%s:%s] async_set_percentage. percentage=%s, value=%s",
+ "[%s:%s] async_set_percentage. percntage=%s, value=%s",
self.coordinator.device_name,
self.property_id,
percentage,
diff --git a/homeassistant/components/linkplay/diagnostics.py b/homeassistant/components/linkplay/diagnostics.py
deleted file mode 100644
index cfc1346aff4..00000000000
--- a/homeassistant/components/linkplay/diagnostics.py
+++ /dev/null
@@ -1,17 +0,0 @@
-"""Diagnostics support for Linkplay."""
-
-from __future__ import annotations
-
-from typing import Any
-
-from homeassistant.core import HomeAssistant
-
-from . import LinkPlayConfigEntry
-
-
-async def async_get_config_entry_diagnostics(
- hass: HomeAssistant, entry: LinkPlayConfigEntry
-) -> dict[str, Any]:
- """Return diagnostics for a config entry."""
- data = entry.runtime_data
- return {"device_info": data.bridge.to_dict()}
diff --git a/homeassistant/components/linkplay/manifest.json b/homeassistant/components/linkplay/manifest.json
index e74d22b8207..f2b2e2da00c 100644
--- a/homeassistant/components/linkplay/manifest.json
+++ b/homeassistant/components/linkplay/manifest.json
@@ -7,6 +7,6 @@
"integration_type": "hub",
"iot_class": "local_polling",
"loggers": ["linkplay"],
- "requirements": ["python-linkplay==0.0.20"],
+ "requirements": ["python-linkplay==0.0.17"],
"zeroconf": ["_linkplay._tcp.local."]
}
diff --git a/homeassistant/components/linkplay/media_player.py b/homeassistant/components/linkplay/media_player.py
index c29c2978522..36834610c04 100644
--- a/homeassistant/components/linkplay/media_player.py
+++ b/homeassistant/components/linkplay/media_player.py
@@ -9,7 +9,7 @@ from typing import Any, Concatenate
from linkplay.bridge import LinkPlayBridge
from linkplay.consts import EqualizerMode, LoopMode, PlayingMode, PlayingStatus
from linkplay.controller import LinkPlayController, LinkPlayMultiroom
-from linkplay.exceptions import LinkPlayRequestException
+from linkplay.exceptions import LinkPlayException, LinkPlayRequestException
import voluptuous as vol
from homeassistant.components import media_source
@@ -69,8 +69,6 @@ SOURCE_MAP: dict[PlayingMode, str] = {
PlayingMode.FM: "FM Radio",
PlayingMode.RCA: "RCA",
PlayingMode.UDISK: "USB",
- PlayingMode.SPOTIFY: "Spotify",
- PlayingMode.TIDAL: "Tidal",
PlayingMode.FOLLOWER: "Follower",
}
@@ -203,8 +201,9 @@ class LinkPlayMediaPlayerEntity(MediaPlayerEntity):
try:
await self._bridge.player.update_status()
self._update_properties()
- except LinkPlayRequestException:
+ except LinkPlayException:
self._attr_available = False
+ raise
@exception_wrap
async def async_select_source(self, source: str) -> None:
@@ -293,15 +292,7 @@ class LinkPlayMediaPlayerEntity(MediaPlayerEntity):
@exception_wrap
async def async_play_preset(self, preset_number: int) -> None:
"""Play preset number."""
- try:
- await self._bridge.player.play_preset(preset_number)
- except ValueError as err:
- raise HomeAssistantError(err) from err
-
- @exception_wrap
- async def async_media_seek(self, position: float) -> None:
- """Seek to a position."""
- await self._bridge.player.seek(round(position))
+ await self._bridge.player.play_preset(preset_number)
@exception_wrap
async def async_join_players(self, group_members: list[str]) -> None:
@@ -388,9 +379,9 @@ class LinkPlayMediaPlayerEntity(MediaPlayerEntity):
)
self._attr_source = SOURCE_MAP.get(self._bridge.player.play_mode, "other")
- self._attr_media_position = self._bridge.player.current_position_in_seconds
+ self._attr_media_position = self._bridge.player.current_position / 1000
self._attr_media_position_updated_at = utcnow()
- self._attr_media_duration = self._bridge.player.total_length_in_seconds
+ self._attr_media_duration = self._bridge.player.total_length / 1000
self._attr_media_artist = self._bridge.player.artist
self._attr_media_title = self._bridge.player.title
self._attr_media_album_name = self._bridge.player.album
diff --git a/homeassistant/components/linkplay/services.yaml b/homeassistant/components/linkplay/services.yaml
index 0d7335a28c8..20bc47be7a7 100644
--- a/homeassistant/components/linkplay/services.yaml
+++ b/homeassistant/components/linkplay/services.yaml
@@ -11,4 +11,5 @@ play_preset:
selector:
number:
min: 1
+ max: 10
mode: box
diff --git a/homeassistant/components/litejet/config_flow.py b/homeassistant/components/litejet/config_flow.py
index 9aa0b19c506..b9f8a0f4b66 100644
--- a/homeassistant/components/litejet/config_flow.py
+++ b/homeassistant/components/litejet/config_flow.py
@@ -24,6 +24,10 @@ from .const import CONF_DEFAULT_TRANSITION, DOMAIN
class LiteJetOptionsFlow(OptionsFlow):
"""Handle LiteJet options."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize LiteJet options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
@@ -80,4 +84,4 @@ class LiteJetConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> LiteJetOptionsFlow:
"""Get the options flow for this handler."""
- return LiteJetOptionsFlow()
+ return LiteJetOptionsFlow(config_entry)
diff --git a/homeassistant/components/london_underground/coordinator.py b/homeassistant/components/london_underground/coordinator.py
index 29d1e8e2f54..cf14ad14b43 100644
--- a/homeassistant/components/london_underground/coordinator.py
+++ b/homeassistant/components/london_underground/coordinator.py
@@ -24,7 +24,6 @@ class LondonTubeCoordinator(DataUpdateCoordinator[dict[str, dict[str, str]]]):
super().__init__(
hass,
_LOGGER,
- config_entry=None,
name=DOMAIN,
update_interval=SCAN_INTERVAL,
)
diff --git a/homeassistant/components/matrix/manifest.json b/homeassistant/components/matrix/manifest.json
index 43c151c7c23..520bd0550cc 100644
--- a/homeassistant/components/matrix/manifest.json
+++ b/homeassistant/components/matrix/manifest.json
@@ -5,5 +5,5 @@
"documentation": "https://www.home-assistant.io/integrations/matrix",
"iot_class": "cloud_push",
"loggers": ["matrix_client"],
- "requirements": ["matrix-nio==0.25.2", "Pillow==11.0.0"]
+ "requirements": ["matrix-nio==0.25.2", "Pillow==10.4.0"]
}
diff --git a/homeassistant/components/media_source/__init__.py b/homeassistant/components/media_source/__init__.py
index 3ea8f581245..604f9b7cc88 100644
--- a/homeassistant/components/media_source/__init__.py
+++ b/homeassistant/components/media_source/__init__.py
@@ -18,7 +18,7 @@ from homeassistant.components.media_player import (
from homeassistant.components.websocket_api import ActiveConnection
from homeassistant.core import HomeAssistant, callback
from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.frame import report_usage
+from homeassistant.helpers.frame import report
from homeassistant.helpers.integration_platform import (
async_process_integration_platforms,
)
@@ -156,7 +156,7 @@ async def async_resolve_media(
raise Unresolvable("Media Source not loaded")
if target_media_player is UNDEFINED:
- report_usage(
+ report(
"calls media_source.async_resolve_media without passing an entity_id",
exclude_integrations={DOMAIN},
)
diff --git a/homeassistant/components/met/config_flow.py b/homeassistant/components/met/config_flow.py
index 62964d22bb1..84a44682413 100644
--- a/homeassistant/components/met/config_flow.py
+++ b/homeassistant/components/met/config_flow.py
@@ -11,6 +11,7 @@ from homeassistant.config_entries import (
ConfigFlow,
ConfigFlowResult,
OptionsFlow,
+ OptionsFlowWithConfigEntry,
)
from homeassistant.const import (
CONF_ELEVATION,
@@ -142,12 +143,12 @@ class MetConfigFlowHandler(ConfigFlow, domain=DOMAIN):
@callback
def async_get_options_flow(
config_entry: ConfigEntry,
- ) -> MetOptionsFlowHandler:
+ ) -> OptionsFlow:
"""Get the options flow for Met."""
- return MetOptionsFlowHandler()
+ return MetOptionsFlowHandler(config_entry)
-class MetOptionsFlowHandler(OptionsFlow):
+class MetOptionsFlowHandler(OptionsFlowWithConfigEntry):
"""Options flow for Met component."""
async def async_step_init(
@@ -158,13 +159,13 @@ class MetOptionsFlowHandler(OptionsFlow):
if user_input is not None:
# Update config entry with data from user input
self.hass.config_entries.async_update_entry(
- self.config_entry, data=user_input
+ self._config_entry, data=user_input
)
return self.async_create_entry(
- title=self.config_entry.title, data=user_input
+ title=self._config_entry.title, data=user_input
)
return self.async_show_form(
step_id="init",
- data_schema=_get_data_schema(self.hass, config_entry=self.config_entry),
+ data_schema=_get_data_schema(self.hass, config_entry=self._config_entry),
)
diff --git a/homeassistant/components/mikrotik/config_flow.py b/homeassistant/components/mikrotik/config_flow.py
index bca394f0d38..98303889194 100644
--- a/homeassistant/components/mikrotik/config_flow.py
+++ b/homeassistant/components/mikrotik/config_flow.py
@@ -46,7 +46,7 @@ class MikrotikFlowHandler(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> MikrotikOptionsFlowHandler:
"""Get the options flow for this handler."""
- return MikrotikOptionsFlowHandler()
+ return MikrotikOptionsFlowHandler(config_entry)
async def async_step_user(
self, user_input: dict[str, Any] | None = None
@@ -122,6 +122,10 @@ class MikrotikFlowHandler(ConfigFlow, domain=DOMAIN):
class MikrotikOptionsFlowHandler(OptionsFlow):
"""Handle Mikrotik options."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize Mikrotik options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/mill/manifest.json b/homeassistant/components/mill/manifest.json
index 6316eb72096..16e7bf552ba 100644
--- a/homeassistant/components/mill/manifest.json
+++ b/homeassistant/components/mill/manifest.json
@@ -6,5 +6,5 @@
"documentation": "https://www.home-assistant.io/integrations/mill",
"iot_class": "local_polling",
"loggers": ["mill", "mill_local"],
- "requirements": ["millheater==0.12.2", "mill-local==0.3.0"]
+ "requirements": ["millheater==0.11.8", "mill-local==0.3.0"]
}
diff --git a/homeassistant/components/mjpeg/config_flow.py b/homeassistant/components/mjpeg/config_flow.py
index e0150f8c461..84267936788 100644
--- a/homeassistant/components/mjpeg/config_flow.py
+++ b/homeassistant/components/mjpeg/config_flow.py
@@ -141,7 +141,7 @@ class MJPEGFlowHandler(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> MJPEGOptionsFlowHandler:
"""Get the options flow for this handler."""
- return MJPEGOptionsFlowHandler()
+ return MJPEGOptionsFlowHandler(config_entry)
async def async_step_user(
self, user_input: dict[str, Any] | None = None
@@ -183,6 +183,10 @@ class MJPEGFlowHandler(ConfigFlow, domain=DOMAIN):
class MJPEGOptionsFlowHandler(OptionsFlow):
"""Handle MJPEG IP Camera options."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize MJPEG IP Camera options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/modbus/binary_sensor.py b/homeassistant/components/modbus/binary_sensor.py
index b50d21faf42..54ee49ed6a2 100644
--- a/homeassistant/components/modbus/binary_sensor.py
+++ b/homeassistant/components/modbus/binary_sensor.py
@@ -90,7 +90,6 @@ class ModbusBinarySensor(BasePlatform, RestoreEntity, BinarySensorEntity):
self._coordinator = DataUpdateCoordinator(
hass,
_LOGGER,
- config_entry=None,
name=name,
)
diff --git a/homeassistant/components/modbus/sensor.py b/homeassistant/components/modbus/sensor.py
index d5a16c95cc4..4b4fd5bd51a 100644
--- a/homeassistant/components/modbus/sensor.py
+++ b/homeassistant/components/modbus/sensor.py
@@ -91,7 +91,6 @@ class ModbusRegisterSensor(BaseStructPlatform, RestoreSensor, SensorEntity):
self._coordinator = DataUpdateCoordinator(
hass,
_LOGGER,
- config_entry=None,
name=name,
)
diff --git a/homeassistant/components/modern_forms/config_flow.py b/homeassistant/components/modern_forms/config_flow.py
index 33e814efb51..dee08736234 100644
--- a/homeassistant/components/modern_forms/config_flow.py
+++ b/homeassistant/components/modern_forms/config_flow.py
@@ -9,13 +9,11 @@ import voluptuous as vol
from homeassistant.components import zeroconf
from homeassistant.config_entries import SOURCE_ZEROCONF, ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_HOST, CONF_MAC
+from homeassistant.const import CONF_HOST, CONF_MAC, CONF_NAME
from homeassistant.helpers.aiohttp_client import async_get_clientsession
from .const import DOMAIN
-USER_SCHEMA = vol.Schema({vol.Required(CONF_HOST): str})
-
class ModernFormsFlowHandler(ConfigFlow, domain=DOMAIN):
"""Handle a ModernForms config flow."""
@@ -57,21 +55,17 @@ class ModernFormsFlowHandler(ConfigFlow, domain=DOMAIN):
self, user_input: dict[str, Any] | None = None, prepare: bool = False
) -> ConfigFlowResult:
"""Config flow handler for ModernForms."""
+ source = self.context["source"]
+
# Request user input, unless we are preparing discovery flow
if user_input is None:
user_input = {}
if not prepare:
- if self.source == SOURCE_ZEROCONF:
- return self.async_show_form(
- step_id="zeroconf_confirm",
- description_placeholders={"name": self.name},
- )
- return self.async_show_form(
- step_id="user",
- data_schema=USER_SCHEMA,
- )
+ if source == SOURCE_ZEROCONF:
+ return self._show_confirm_dialog()
+ return self._show_setup_form()
- if self.source == SOURCE_ZEROCONF:
+ if source == SOURCE_ZEROCONF:
user_input[CONF_HOST] = self.host
user_input[CONF_MAC] = self.mac
@@ -81,21 +75,18 @@ class ModernFormsFlowHandler(ConfigFlow, domain=DOMAIN):
try:
device = await device.update()
except ModernFormsConnectionError:
- if self.source == SOURCE_ZEROCONF:
+ if source == SOURCE_ZEROCONF:
return self.async_abort(reason="cannot_connect")
- return self.async_show_form(
- step_id="user",
- data_schema=USER_SCHEMA,
- errors={"base": "cannot_connect"},
- )
+ return self._show_setup_form({"base": "cannot_connect"})
user_input[CONF_MAC] = device.info.mac_address
+ user_input[CONF_NAME] = device.info.device_name
# Check if already configured
await self.async_set_unique_id(user_input[CONF_MAC])
self._abort_if_unique_id_configured(updates={CONF_HOST: user_input[CONF_HOST]})
title = device.info.device_name
- if self.source == SOURCE_ZEROCONF:
+ if source == SOURCE_ZEROCONF:
title = self.name
if prepare:
@@ -105,3 +96,19 @@ class ModernFormsFlowHandler(ConfigFlow, domain=DOMAIN):
title=title,
data={CONF_HOST: user_input[CONF_HOST], CONF_MAC: user_input[CONF_MAC]},
)
+
+ def _show_setup_form(self, errors: dict | None = None) -> ConfigFlowResult:
+ """Show the setup form to the user."""
+ return self.async_show_form(
+ step_id="user",
+ data_schema=vol.Schema({vol.Required(CONF_HOST): str}),
+ errors=errors or {},
+ )
+
+ def _show_confirm_dialog(self, errors: dict | None = None) -> ConfigFlowResult:
+ """Show the confirm dialog to the user."""
+ return self.async_show_form(
+ step_id="zeroconf_confirm",
+ description_placeholders={"name": self.name},
+ errors=errors or {},
+ )
diff --git a/homeassistant/components/mold_indicator/sensor.py b/homeassistant/components/mold_indicator/sensor.py
index 262d13ad3af..eb4c0bf7284 100644
--- a/homeassistant/components/mold_indicator/sensor.py
+++ b/homeassistant/components/mold_indicator/sensor.py
@@ -22,7 +22,6 @@ from homeassistant.const import (
CONF_NAME,
CONF_UNIQUE_ID,
PERCENTAGE,
- STATE_UNAVAILABLE,
STATE_UNKNOWN,
UnitOfTemperature,
)
@@ -38,7 +37,7 @@ import homeassistant.helpers.config_validation as cv
from homeassistant.helpers.device import async_device_info_to_link_from_entity
from homeassistant.helpers.entity_platform import AddEntitiesCallback
from homeassistant.helpers.event import async_track_state_change_event
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
+from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType, StateType
from homeassistant.util.unit_conversion import TemperatureConverter
from homeassistant.util.unit_system import METRIC_SYSTEM
@@ -151,6 +150,7 @@ class MoldIndicator(SensorEntity):
unique_id: str | None,
) -> None:
"""Initialize the sensor."""
+ self._state: str | None = None
self._attr_name = name
self._attr_unique_id = unique_id
self._indoor_temp_sensor = indoor_temp_sensor
@@ -272,7 +272,7 @@ class MoldIndicator(SensorEntity):
# re-calculate dewpoint and mold indicator
self._calc_dewpoint()
self._calc_moldindicator()
- if self._attr_native_value is None:
+ if self._state is None:
self._attr_available = False
else:
self._attr_available = True
@@ -311,7 +311,7 @@ class MoldIndicator(SensorEntity):
_LOGGER.debug("Updating temp sensor with value %s", state.state)
# Return an error if the sensor change its state to Unknown.
- if state.state in (STATE_UNKNOWN, STATE_UNAVAILABLE):
+ if state.state == STATE_UNKNOWN:
_LOGGER.error(
"Unable to parse temperature sensor %s with state: %s",
state.entity_id,
@@ -319,6 +319,8 @@ class MoldIndicator(SensorEntity):
)
return None
+ unit = state.attributes.get(ATTR_UNIT_OF_MEASUREMENT)
+
if (temp := util.convert(state.state, float)) is None:
_LOGGER.error(
"Unable to parse temperature sensor %s with state: %s",
@@ -328,10 +330,12 @@ class MoldIndicator(SensorEntity):
return None
# convert to celsius if necessary
- if (
- unit := state.attributes.get(ATTR_UNIT_OF_MEASUREMENT)
- ) in UnitOfTemperature:
- return TemperatureConverter.convert(temp, unit, UnitOfTemperature.CELSIUS)
+ if unit == UnitOfTemperature.FAHRENHEIT:
+ return TemperatureConverter.convert(
+ temp, UnitOfTemperature.FAHRENHEIT, UnitOfTemperature.CELSIUS
+ )
+ if unit == UnitOfTemperature.CELSIUS:
+ return temp
_LOGGER.error(
"Temp sensor %s has unsupported unit: %s (allowed: %s, %s)",
state.entity_id,
@@ -348,7 +352,7 @@ class MoldIndicator(SensorEntity):
_LOGGER.debug("Updating humidity sensor with value %s", state.state)
# Return an error if the sensor change its state to Unknown.
- if state.state in (STATE_UNKNOWN, STATE_UNAVAILABLE):
+ if state.state == STATE_UNKNOWN:
_LOGGER.error(
"Unable to parse humidity sensor %s, state: %s",
state.entity_id,
@@ -366,18 +370,19 @@ class MoldIndicator(SensorEntity):
if (unit := state.attributes.get(ATTR_UNIT_OF_MEASUREMENT)) != PERCENTAGE:
_LOGGER.error(
- "Humidity sensor %s has unsupported unit: %s (allowed: %s)",
+ "Humidity sensor %s has unsupported unit: %s %s",
state.entity_id,
unit,
- PERCENTAGE,
+ " (allowed: %)",
)
return None
if hum > 100 or hum < 0:
_LOGGER.error(
- "Humidity sensor %s is out of range: %s (allowed: 0-100)",
+ "Humidity sensor %s is out of range: %s %s",
state.entity_id,
hum,
+ "(allowed: 0-100%)",
)
return None
@@ -396,7 +401,7 @@ class MoldIndicator(SensorEntity):
# re-calculate dewpoint and mold indicator
self._calc_dewpoint()
self._calc_moldindicator()
- if self._attr_native_value is None:
+ if self._state is None:
self._attr_available = False
self._dewpoint = None
self._crit_temp = None
@@ -432,7 +437,7 @@ class MoldIndicator(SensorEntity):
self._dewpoint,
self._calib_factor,
)
- self._attr_native_value = None
+ self._state = None
self._attr_available = False
self._crit_temp = None
return
@@ -463,13 +468,18 @@ class MoldIndicator(SensorEntity):
# check bounds and format
if crit_humidity > 100:
- self._attr_native_value = "100"
+ self._state = "100"
elif crit_humidity < 0:
- self._attr_native_value = "0"
+ self._state = "0"
else:
- self._attr_native_value = f"{int(crit_humidity):d}"
+ self._state = f"{int(crit_humidity):d}"
- _LOGGER.debug("Mold indicator humidity: %s", self.native_value)
+ _LOGGER.debug("Mold indicator humidity: %s", self._state)
+
+ @property
+ def native_value(self) -> StateType:
+ """Return the state of the entity."""
+ return self._state
@property
def extra_state_attributes(self) -> dict[str, Any]:
diff --git a/homeassistant/components/monoprice/config_flow.py b/homeassistant/components/monoprice/config_flow.py
index b2619623a07..cac673e38c1 100644
--- a/homeassistant/components/monoprice/config_flow.py
+++ b/homeassistant/components/monoprice/config_flow.py
@@ -108,7 +108,7 @@ class MonoPriceConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> MonopriceOptionsFlowHandler:
"""Define the config flow to handle options."""
- return MonopriceOptionsFlowHandler()
+ return MonopriceOptionsFlowHandler(config_entry)
@callback
@@ -126,6 +126,10 @@ def _key_for_source(index, source, previous_sources):
class MonopriceOptionsFlowHandler(OptionsFlow):
"""Handle a Monoprice options flow."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize."""
+ self.config_entry = config_entry
+
@callback
def _previous_sources(self):
if CONF_SOURCES in self.config_entry.options:
diff --git a/homeassistant/components/monzo/manifest.json b/homeassistant/components/monzo/manifest.json
index 7038cecd7ea..d9d17eb8abc 100644
--- a/homeassistant/components/monzo/manifest.json
+++ b/homeassistant/components/monzo/manifest.json
@@ -6,5 +6,5 @@
"dependencies": ["application_credentials"],
"documentation": "https://www.home-assistant.io/integrations/monzo",
"iot_class": "cloud_polling",
- "requirements": ["monzopy==1.4.2"]
+ "requirements": ["monzopy==1.3.2"]
}
diff --git a/homeassistant/components/mopeka/config_flow.py b/homeassistant/components/mopeka/config_flow.py
index 2e35ff4283f..72e9386a47f 100644
--- a/homeassistant/components/mopeka/config_flow.py
+++ b/homeassistant/components/mopeka/config_flow.py
@@ -58,7 +58,7 @@ class MopekaConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: config_entries.ConfigEntry,
) -> MopekaOptionsFlow:
"""Return the options flow for this handler."""
- return MopekaOptionsFlow()
+ return MopekaOptionsFlow(config_entry)
async def async_step_bluetooth(
self, discovery_info: BluetoothServiceInfoBleak
@@ -139,6 +139,10 @@ class MopekaConfigFlow(ConfigFlow, domain=DOMAIN):
class MopekaOptionsFlow(config_entries.OptionsFlow):
"""Handle options for the Mopeka component."""
+ def __init__(self, config_entry: config_entries.ConfigEntry) -> None:
+ """Initialize options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/motion_blinds/config_flow.py b/homeassistant/components/motion_blinds/config_flow.py
index e961880375c..131299314a2 100644
--- a/homeassistant/components/motion_blinds/config_flow.py
+++ b/homeassistant/components/motion_blinds/config_flow.py
@@ -38,6 +38,10 @@ CONFIG_SCHEMA = vol.Schema(
class OptionsFlowHandler(OptionsFlow):
"""Options for the component."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Init object."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
@@ -79,7 +83,7 @@ class MotionBlindsFlowHandler(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> OptionsFlowHandler:
"""Get the options flow."""
- return OptionsFlowHandler()
+ return OptionsFlowHandler(config_entry)
async def async_step_dhcp(
self, discovery_info: dhcp.DhcpServiceInfo
diff --git a/homeassistant/components/motionblinds_ble/config_flow.py b/homeassistant/components/motionblinds_ble/config_flow.py
index d99096d3a09..cda673b13ac 100644
--- a/homeassistant/components/motionblinds_ble/config_flow.py
+++ b/homeassistant/components/motionblinds_ble/config_flow.py
@@ -187,12 +187,16 @@ class FlowHandler(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> OptionsFlow:
"""Create the options flow."""
- return OptionsFlowHandler()
+ return OptionsFlowHandler(config_entry)
class OptionsFlowHandler(OptionsFlow):
"""Handle an options flow for Motionblinds BLE."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/motioneye/config_flow.py b/homeassistant/components/motioneye/config_flow.py
index 80a6449a22d..f6d947dab5f 100644
--- a/homeassistant/components/motioneye/config_flow.py
+++ b/homeassistant/components/motioneye/config_flow.py
@@ -179,16 +179,18 @@ class MotionEyeConfigFlow(ConfigFlow, domain=DOMAIN):
@staticmethod
@callback
- def async_get_options_flow(
- config_entry: ConfigEntry,
- ) -> MotionEyeOptionsFlow:
+ def async_get_options_flow(config_entry: ConfigEntry) -> MotionEyeOptionsFlow:
"""Get the Hyperion Options flow."""
- return MotionEyeOptionsFlow()
+ return MotionEyeOptionsFlow(config_entry)
class MotionEyeOptionsFlow(OptionsFlow):
"""motionEye options flow."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize a motionEye options flow."""
+ self._config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
@@ -199,14 +201,14 @@ class MotionEyeOptionsFlow(OptionsFlow):
schema: dict[vol.Marker, type] = {
vol.Required(
CONF_WEBHOOK_SET,
- default=self.config_entry.options.get(
+ default=self._config_entry.options.get(
CONF_WEBHOOK_SET,
DEFAULT_WEBHOOK_SET,
),
): bool,
vol.Required(
CONF_WEBHOOK_SET_OVERWRITE,
- default=self.config_entry.options.get(
+ default=self._config_entry.options.get(
CONF_WEBHOOK_SET_OVERWRITE,
DEFAULT_WEBHOOK_SET_OVERWRITE,
),
@@ -217,9 +219,9 @@ class MotionEyeOptionsFlow(OptionsFlow):
# The input URL is not validated as being a URL, to allow for the possibility
# the template input won't be a valid URL until after it's rendered
description: dict[str, str] | None = None
- if CONF_STREAM_URL_TEMPLATE in self.config_entry.options:
+ if CONF_STREAM_URL_TEMPLATE in self._config_entry.options:
description = {
- "suggested_value": self.config_entry.options[
+ "suggested_value": self._config_entry.options[
CONF_STREAM_URL_TEMPLATE
]
}
diff --git a/homeassistant/components/mqtt/config_flow.py b/homeassistant/components/mqtt/config_flow.py
index 6e6b44cd4b8..e94f734069a 100644
--- a/homeassistant/components/mqtt/config_flow.py
+++ b/homeassistant/components/mqtt/config_flow.py
@@ -220,7 +220,7 @@ class FlowHandler(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> MQTTOptionsFlowHandler:
"""Get the options flow for this handler."""
- return MQTTOptionsFlowHandler()
+ return MQTTOptionsFlowHandler(config_entry)
async def _async_install_addon(self) -> None:
"""Install the Mosquitto Mqtt broker add-on."""
@@ -543,9 +543,11 @@ class FlowHandler(ConfigFlow, domain=DOMAIN):
class MQTTOptionsFlowHandler(OptionsFlow):
"""Handle MQTT options."""
- def __init__(self) -> None:
+ def __init__(self, config_entry: ConfigEntry) -> None:
"""Initialize MQTT options flow."""
+ self.config_entry = config_entry
self.broker_config: dict[str, str | int] = {}
+ self.options = config_entry.options
async def async_step_init(self, user_input: None = None) -> ConfigFlowResult:
"""Manage the MQTT options."""
diff --git a/homeassistant/components/music_assistant/__init__.py b/homeassistant/components/music_assistant/__init__.py
deleted file mode 100644
index 9f0fc1aad27..00000000000
--- a/homeassistant/components/music_assistant/__init__.py
+++ /dev/null
@@ -1,164 +0,0 @@
-"""Music Assistant (music-assistant.io) integration."""
-
-from __future__ import annotations
-
-import asyncio
-from dataclasses import dataclass
-from typing import TYPE_CHECKING
-
-from music_assistant_client import MusicAssistantClient
-from music_assistant_client.exceptions import CannotConnect, InvalidServerVersion
-from music_assistant_models.enums import EventType
-from music_assistant_models.errors import MusicAssistantError
-
-from homeassistant.config_entries import ConfigEntry, ConfigEntryState
-from homeassistant.const import CONF_URL, EVENT_HOMEASSISTANT_STOP, Platform
-from homeassistant.core import Event, HomeAssistant
-from homeassistant.exceptions import ConfigEntryNotReady
-from homeassistant.helpers import device_registry as dr
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.issue_registry import (
- IssueSeverity,
- async_create_issue,
- async_delete_issue,
-)
-
-from .const import DOMAIN, LOGGER
-
-if TYPE_CHECKING:
- from music_assistant_models.event import MassEvent
-
-type MusicAssistantConfigEntry = ConfigEntry[MusicAssistantEntryData]
-
-PLATFORMS = [Platform.MEDIA_PLAYER]
-
-CONNECT_TIMEOUT = 10
-LISTEN_READY_TIMEOUT = 30
-
-
-@dataclass
-class MusicAssistantEntryData:
- """Hold Mass data for the config entry."""
-
- mass: MusicAssistantClient
- listen_task: asyncio.Task
-
-
-async def async_setup_entry(
- hass: HomeAssistant, entry: MusicAssistantConfigEntry
-) -> bool:
- """Set up from a config entry."""
- http_session = async_get_clientsession(hass, verify_ssl=False)
- mass_url = entry.data[CONF_URL]
- mass = MusicAssistantClient(mass_url, http_session)
-
- try:
- async with asyncio.timeout(CONNECT_TIMEOUT):
- await mass.connect()
- except (TimeoutError, CannotConnect) as err:
- raise ConfigEntryNotReady(
- f"Failed to connect to music assistant server {mass_url}"
- ) from err
- except InvalidServerVersion as err:
- async_create_issue(
- hass,
- DOMAIN,
- "invalid_server_version",
- is_fixable=False,
- severity=IssueSeverity.ERROR,
- translation_key="invalid_server_version",
- )
- raise ConfigEntryNotReady(f"Invalid server version: {err}") from err
- except MusicAssistantError as err:
- LOGGER.exception("Failed to connect to music assistant server", exc_info=err)
- raise ConfigEntryNotReady(
- f"Unknown error connecting to the Music Assistant server {mass_url}"
- ) from err
-
- async_delete_issue(hass, DOMAIN, "invalid_server_version")
-
- async def on_hass_stop(event: Event) -> None:
- """Handle incoming stop event from Home Assistant."""
- await mass.disconnect()
-
- entry.async_on_unload(
- hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, on_hass_stop)
- )
-
- # launch the music assistant client listen task in the background
- # use the init_ready event to wait until initialization is done
- init_ready = asyncio.Event()
- listen_task = asyncio.create_task(_client_listen(hass, entry, mass, init_ready))
-
- try:
- async with asyncio.timeout(LISTEN_READY_TIMEOUT):
- await init_ready.wait()
- except TimeoutError as err:
- listen_task.cancel()
- raise ConfigEntryNotReady("Music Assistant client not ready") from err
-
- entry.runtime_data = MusicAssistantEntryData(mass, listen_task)
-
- # If the listen task is already failed, we need to raise ConfigEntryNotReady
- if listen_task.done() and (listen_error := listen_task.exception()) is not None:
- await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
- try:
- await mass.disconnect()
- finally:
- raise ConfigEntryNotReady(listen_error) from listen_error
-
- # initialize platforms
- await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
-
- # register listener for removed players
- async def handle_player_removed(event: MassEvent) -> None:
- """Handle Mass Player Removed event."""
- if event.object_id is None:
- return
- dev_reg = dr.async_get(hass)
- if hass_device := dev_reg.async_get_device({(DOMAIN, event.object_id)}):
- dev_reg.async_update_device(
- hass_device.id, remove_config_entry_id=entry.entry_id
- )
-
- entry.async_on_unload(
- mass.subscribe(handle_player_removed, EventType.PLAYER_REMOVED)
- )
-
- return True
-
-
-async def _client_listen(
- hass: HomeAssistant,
- entry: ConfigEntry,
- mass: MusicAssistantClient,
- init_ready: asyncio.Event,
-) -> None:
- """Listen with the client."""
- try:
- await mass.start_listening(init_ready)
- except MusicAssistantError as err:
- if entry.state != ConfigEntryState.LOADED:
- raise
- LOGGER.error("Failed to listen: %s", err)
- except Exception as err: # pylint: disable=broad-except
- # We need to guard against unknown exceptions to not crash this task.
- if entry.state != ConfigEntryState.LOADED:
- raise
- LOGGER.exception("Unexpected exception: %s", err)
-
- if not hass.is_stopping:
- LOGGER.debug("Disconnected from server. Reloading integration")
- hass.async_create_task(hass.config_entries.async_reload(entry.entry_id))
-
-
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
- """Unload a config entry."""
- unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
-
- if unload_ok:
- mass_entry_data: MusicAssistantEntryData = entry.runtime_data
- mass_entry_data.listen_task.cancel()
- await mass_entry_data.mass.disconnect()
-
- return unload_ok
diff --git a/homeassistant/components/music_assistant/config_flow.py b/homeassistant/components/music_assistant/config_flow.py
deleted file mode 100644
index fc50a2d654b..00000000000
--- a/homeassistant/components/music_assistant/config_flow.py
+++ /dev/null
@@ -1,137 +0,0 @@
-"""Config flow for MusicAssistant integration."""
-
-from __future__ import annotations
-
-from typing import TYPE_CHECKING, Any
-
-from music_assistant_client import MusicAssistantClient
-from music_assistant_client.exceptions import (
- CannotConnect,
- InvalidServerVersion,
- MusicAssistantClientException,
-)
-from music_assistant_models.api import ServerInfoMessage
-import voluptuous as vol
-
-from homeassistant.components import zeroconf
-from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_URL
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import aiohttp_client
-
-from .const import DOMAIN, LOGGER
-
-DEFAULT_URL = "http://mass.local:8095"
-DEFAULT_TITLE = "Music Assistant"
-
-
-def get_manual_schema(user_input: dict[str, Any]) -> vol.Schema:
- """Return a schema for the manual step."""
- default_url = user_input.get(CONF_URL, DEFAULT_URL)
- return vol.Schema(
- {
- vol.Required(CONF_URL, default=default_url): str,
- }
- )
-
-
-async def get_server_info(hass: HomeAssistant, url: str) -> ServerInfoMessage:
- """Validate the user input allows us to connect."""
- async with MusicAssistantClient(
- url, aiohttp_client.async_get_clientsession(hass)
- ) as client:
- if TYPE_CHECKING:
- assert client.server_info is not None
- return client.server_info
-
-
-class MusicAssistantConfigFlow(ConfigFlow, domain=DOMAIN):
- """Handle a config flow for MusicAssistant."""
-
- VERSION = 1
-
- def __init__(self) -> None:
- """Set up flow instance."""
- self.server_info: ServerInfoMessage | None = None
-
- async def async_step_user(
- self, user_input: dict[str, Any] | None = None
- ) -> ConfigFlowResult:
- """Handle a manual configuration."""
- errors: dict[str, str] = {}
- if user_input is not None:
- try:
- self.server_info = await get_server_info(
- self.hass, user_input[CONF_URL]
- )
- await self.async_set_unique_id(
- self.server_info.server_id, raise_on_progress=False
- )
- self._abort_if_unique_id_configured(
- updates={CONF_URL: self.server_info.base_url},
- reload_on_update=True,
- )
- except CannotConnect:
- errors["base"] = "cannot_connect"
- except InvalidServerVersion:
- errors["base"] = "invalid_server_version"
- except MusicAssistantClientException:
- LOGGER.exception("Unexpected exception")
- errors["base"] = "unknown"
- else:
- return self.async_create_entry(
- title=DEFAULT_TITLE,
- data={
- CONF_URL: self.server_info.base_url,
- },
- )
-
- return self.async_show_form(
- step_id="user", data_schema=get_manual_schema(user_input), errors=errors
- )
-
- return self.async_show_form(step_id="user", data_schema=get_manual_schema({}))
-
- async def async_step_zeroconf(
- self, discovery_info: zeroconf.ZeroconfServiceInfo
- ) -> ConfigFlowResult:
- """Handle a discovered Mass server.
-
- This flow is triggered by the Zeroconf component. It will check if the
- host is already configured and delegate to the import step if not.
- """
- # abort if discovery info is not what we expect
- if "server_id" not in discovery_info.properties:
- return self.async_abort(reason="missing_server_id")
- # abort if we already have exactly this server_id
- # reload the integration if the host got updated
- self.server_info = ServerInfoMessage.from_dict(discovery_info.properties)
- await self.async_set_unique_id(self.server_info.server_id)
- self._abort_if_unique_id_configured(
- updates={CONF_URL: self.server_info.base_url},
- reload_on_update=True,
- )
- try:
- await get_server_info(self.hass, self.server_info.base_url)
- except CannotConnect:
- return self.async_abort(reason="cannot_connect")
- return await self.async_step_discovery_confirm()
-
- async def async_step_discovery_confirm(
- self, user_input: dict[str, Any] | None = None
- ) -> ConfigFlowResult:
- """Handle user-confirmation of discovered server."""
- if TYPE_CHECKING:
- assert self.server_info is not None
- if user_input is not None:
- return self.async_create_entry(
- title=DEFAULT_TITLE,
- data={
- CONF_URL: self.server_info.base_url,
- },
- )
- self._set_confirm_only()
- return self.async_show_form(
- step_id="discovery_confirm",
- description_placeholders={"url": self.server_info.base_url},
- )
diff --git a/homeassistant/components/music_assistant/const.py b/homeassistant/components/music_assistant/const.py
deleted file mode 100644
index 6512f58b96c..00000000000
--- a/homeassistant/components/music_assistant/const.py
+++ /dev/null
@@ -1,18 +0,0 @@
-"""Constants for Music Assistant Component."""
-
-import logging
-
-DOMAIN = "music_assistant"
-DOMAIN_EVENT = f"{DOMAIN}_event"
-
-DEFAULT_NAME = "Music Assistant"
-
-ATTR_IS_GROUP = "is_group"
-ATTR_GROUP_MEMBERS = "group_members"
-ATTR_GROUP_PARENTS = "group_parents"
-
-ATTR_MASS_PLAYER_TYPE = "mass_player_type"
-ATTR_ACTIVE_QUEUE = "active_queue"
-ATTR_STREAM_TITLE = "stream_title"
-
-LOGGER = logging.getLogger(__package__)
diff --git a/homeassistant/components/music_assistant/entity.py b/homeassistant/components/music_assistant/entity.py
deleted file mode 100644
index f5b6d92b0cf..00000000000
--- a/homeassistant/components/music_assistant/entity.py
+++ /dev/null
@@ -1,86 +0,0 @@
-"""Base entity model."""
-
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-from music_assistant_models.enums import EventType
-from music_assistant_models.event import MassEvent
-from music_assistant_models.player import Player
-
-from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity import Entity
-
-from .const import DOMAIN
-
-if TYPE_CHECKING:
- from music_assistant_client import MusicAssistantClient
-
-
-class MusicAssistantEntity(Entity):
- """Base Entity from Music Assistant Player."""
-
- _attr_has_entity_name = True
- _attr_should_poll = False
-
- def __init__(self, mass: MusicAssistantClient, player_id: str) -> None:
- """Initialize MediaPlayer entity."""
- self.mass = mass
- self.player_id = player_id
- provider = self.mass.get_provider(self.player.provider)
- if TYPE_CHECKING:
- assert provider is not None
- self._attr_device_info = DeviceInfo(
- identifiers={(DOMAIN, player_id)},
- manufacturer=self.player.device_info.manufacturer or provider.name,
- model=self.player.device_info.model or self.player.name,
- name=self.player.display_name,
- configuration_url=f"{mass.server_url}/#/settings/editplayer/{player_id}",
- )
-
- async def async_added_to_hass(self) -> None:
- """Register callbacks."""
- await self.async_on_update()
- self.async_on_remove(
- self.mass.subscribe(
- self.__on_mass_update, EventType.PLAYER_UPDATED, self.player_id
- )
- )
- self.async_on_remove(
- self.mass.subscribe(
- self.__on_mass_update,
- EventType.QUEUE_UPDATED,
- )
- )
-
- @property
- def player(self) -> Player:
- """Return the Mass Player attached to this HA entity."""
- return self.mass.players[self.player_id]
-
- @property
- def unique_id(self) -> str | None:
- """Return unique id for entity."""
- _base = self.player_id
- if hasattr(self, "entity_description"):
- return f"{_base}_{self.entity_description.key}"
- return _base
-
- @property
- def available(self) -> bool:
- """Return availability of entity."""
- return self.player.available and bool(self.mass.connection.connected)
-
- async def __on_mass_update(self, event: MassEvent) -> None:
- """Call when we receive an event from MusicAssistant."""
- if event.event == EventType.QUEUE_UPDATED and event.object_id not in (
- self.player.active_source,
- self.player.active_group,
- self.player.player_id,
- ):
- return
- await self.async_on_update()
- self.async_write_ha_state()
-
- async def async_on_update(self) -> None:
- """Handle player updates."""
diff --git a/homeassistant/components/music_assistant/manifest.json b/homeassistant/components/music_assistant/manifest.json
deleted file mode 100644
index 65e6652407f..00000000000
--- a/homeassistant/components/music_assistant/manifest.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "domain": "music_assistant",
- "name": "Music Assistant",
- "after_dependencies": ["media_source", "media_player"],
- "codeowners": ["@music-assistant"],
- "config_flow": true,
- "documentation": "https://www.home-assistant.io/integrations/music_assistant",
- "iot_class": "local_push",
- "loggers": ["music_assistant"],
- "requirements": ["music-assistant-client==1.0.5"],
- "zeroconf": ["_mass._tcp.local."]
-}
diff --git a/homeassistant/components/music_assistant/media_player.py b/homeassistant/components/music_assistant/media_player.py
deleted file mode 100644
index f0f3675ee32..00000000000
--- a/homeassistant/components/music_assistant/media_player.py
+++ /dev/null
@@ -1,557 +0,0 @@
-"""MediaPlayer platform for Music Assistant integration."""
-
-from __future__ import annotations
-
-import asyncio
-from collections.abc import Awaitable, Callable, Coroutine, Mapping
-from contextlib import suppress
-import functools
-import os
-from typing import TYPE_CHECKING, Any
-
-from music_assistant_models.enums import (
- EventType,
- MediaType,
- PlayerFeature,
- QueueOption,
- RepeatMode as MassRepeatMode,
-)
-from music_assistant_models.errors import MediaNotFoundError, MusicAssistantError
-from music_assistant_models.event import MassEvent
-from music_assistant_models.media_items import ItemMapping, MediaItemType, Track
-
-from homeassistant.components import media_source
-from homeassistant.components.media_player import (
- ATTR_MEDIA_EXTRA,
- BrowseMedia,
- MediaPlayerDeviceClass,
- MediaPlayerEnqueue,
- MediaPlayerEntity,
- MediaPlayerEntityFeature,
- MediaPlayerState,
- MediaType as HAMediaType,
- RepeatMode,
- async_process_play_media_url,
-)
-from homeassistant.const import STATE_OFF
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.util.dt import utc_from_timestamp
-
-from . import MusicAssistantConfigEntry
-from .const import ATTR_ACTIVE_QUEUE, ATTR_MASS_PLAYER_TYPE, DOMAIN
-from .entity import MusicAssistantEntity
-
-if TYPE_CHECKING:
- from music_assistant_client import MusicAssistantClient
- from music_assistant_models.player import Player
- from music_assistant_models.player_queue import PlayerQueue
-
-SUPPORTED_FEATURES = (
- MediaPlayerEntityFeature.PAUSE
- | MediaPlayerEntityFeature.VOLUME_SET
- | MediaPlayerEntityFeature.STOP
- | MediaPlayerEntityFeature.PREVIOUS_TRACK
- | MediaPlayerEntityFeature.NEXT_TRACK
- | MediaPlayerEntityFeature.SHUFFLE_SET
- | MediaPlayerEntityFeature.REPEAT_SET
- | MediaPlayerEntityFeature.TURN_ON
- | MediaPlayerEntityFeature.TURN_OFF
- | MediaPlayerEntityFeature.PLAY
- | MediaPlayerEntityFeature.PLAY_MEDIA
- | MediaPlayerEntityFeature.VOLUME_STEP
- | MediaPlayerEntityFeature.CLEAR_PLAYLIST
- | MediaPlayerEntityFeature.BROWSE_MEDIA
- | MediaPlayerEntityFeature.MEDIA_ENQUEUE
- | MediaPlayerEntityFeature.MEDIA_ANNOUNCE
- | MediaPlayerEntityFeature.SEEK
-)
-
-QUEUE_OPTION_MAP = {
- # map from HA enqueue options to MA enqueue options
- # which are the same but just in case
- MediaPlayerEnqueue.ADD: QueueOption.ADD,
- MediaPlayerEnqueue.NEXT: QueueOption.NEXT,
- MediaPlayerEnqueue.PLAY: QueueOption.PLAY,
- MediaPlayerEnqueue.REPLACE: QueueOption.REPLACE,
-}
-
-ATTR_RADIO_MODE = "radio_mode"
-ATTR_MEDIA_ID = "media_id"
-ATTR_MEDIA_TYPE = "media_type"
-ATTR_ARTIST = "artist"
-ATTR_ALBUM = "album"
-ATTR_URL = "url"
-ATTR_USE_PRE_ANNOUNCE = "use_pre_announce"
-ATTR_ANNOUNCE_VOLUME = "announce_volume"
-ATTR_SOURCE_PLAYER = "source_player"
-ATTR_AUTO_PLAY = "auto_play"
-
-
-def catch_musicassistant_error[_R, **P](
- func: Callable[..., Awaitable[_R]],
-) -> Callable[..., Coroutine[Any, Any, _R | None]]:
- """Check and log commands to players."""
-
- @functools.wraps(func)
- async def wrapper(
- self: MusicAssistantPlayer, *args: P.args, **kwargs: P.kwargs
- ) -> _R | None:
- """Catch Music Assistant errors and convert to Home Assistant error."""
- try:
- return await func(self, *args, **kwargs)
- except MusicAssistantError as err:
- error_msg = str(err) or err.__class__.__name__
- raise HomeAssistantError(error_msg) from err
-
- return wrapper
-
-
-async def async_setup_entry(
- hass: HomeAssistant,
- entry: MusicAssistantConfigEntry,
- async_add_entities: AddEntitiesCallback,
-) -> None:
- """Set up Music Assistant MediaPlayer(s) from Config Entry."""
- mass = entry.runtime_data.mass
- added_ids = set()
-
- async def handle_player_added(event: MassEvent) -> None:
- """Handle Mass Player Added event."""
- if TYPE_CHECKING:
- assert event.object_id is not None
- if event.object_id in added_ids:
- return
- added_ids.add(event.object_id)
- async_add_entities([MusicAssistantPlayer(mass, event.object_id)])
-
- # register listener for new players
- entry.async_on_unload(mass.subscribe(handle_player_added, EventType.PLAYER_ADDED))
- mass_players = []
- # add all current players
- for player in mass.players:
- added_ids.add(player.player_id)
- mass_players.append(MusicAssistantPlayer(mass, player.player_id))
-
- async_add_entities(mass_players)
-
-
-class MusicAssistantPlayer(MusicAssistantEntity, MediaPlayerEntity):
- """Representation of MediaPlayerEntity from Music Assistant Player."""
-
- _attr_name = None
- _attr_media_image_remotely_accessible = True
- _attr_media_content_type = HAMediaType.MUSIC
-
- def __init__(self, mass: MusicAssistantClient, player_id: str) -> None:
- """Initialize MediaPlayer entity."""
- super().__init__(mass, player_id)
- self._attr_icon = self.player.icon.replace("mdi-", "mdi:")
- self._attr_supported_features = SUPPORTED_FEATURES
- if PlayerFeature.SYNC in self.player.supported_features:
- self._attr_supported_features |= MediaPlayerEntityFeature.GROUPING
- self._attr_device_class = MediaPlayerDeviceClass.SPEAKER
- self._prev_time: float = 0
-
- async def async_added_to_hass(self) -> None:
- """Register callbacks."""
- await super().async_added_to_hass()
-
- # we subscribe to player queue time update but we only
- # accept a state change on big time jumps (e.g. seeking)
- async def queue_time_updated(event: MassEvent) -> None:
- if event.object_id != self.player.active_source:
- return
- if abs((self._prev_time or 0) - event.data) > 5:
- await self.async_on_update()
- self.async_write_ha_state()
- self._prev_time = event.data
-
- self.async_on_remove(
- self.mass.subscribe(
- queue_time_updated,
- EventType.QUEUE_TIME_UPDATED,
- )
- )
-
- @property
- def active_queue(self) -> PlayerQueue | None:
- """Return the active queue for this player (if any)."""
- if not self.player.active_source:
- return None
- return self.mass.player_queues.get(self.player.active_source)
-
- @property
- def extra_state_attributes(self) -> Mapping[str, Any]:
- """Return additional state attributes."""
- return {
- ATTR_MASS_PLAYER_TYPE: self.player.type.value,
- ATTR_ACTIVE_QUEUE: (
- self.active_queue.queue_id if self.active_queue else None
- ),
- }
-
- async def async_on_update(self) -> None:
- """Handle player updates."""
- if not self.available:
- return
- player = self.player
- active_queue = self.active_queue
- # update generic attributes
- if player.powered and active_queue is not None:
- self._attr_state = MediaPlayerState(active_queue.state.value)
- if player.powered and player.state is not None:
- self._attr_state = MediaPlayerState(player.state.value)
- else:
- self._attr_state = MediaPlayerState(STATE_OFF)
- group_members_entity_ids: list[str] = []
- if player.group_childs:
- # translate MA group_childs to HA group_members as entity id's
- entity_registry = er.async_get(self.hass)
- group_members_entity_ids = [
- entity_id
- for child_id in player.group_childs
- if (
- entity_id := entity_registry.async_get_entity_id(
- self.platform.domain, DOMAIN, child_id
- )
- )
- ]
- self._attr_group_members = group_members_entity_ids
- self._attr_volume_level = (
- player.volume_level / 100 if player.volume_level is not None else None
- )
- self._attr_is_volume_muted = player.volume_muted
- self._update_media_attributes(player, active_queue)
- self._update_media_image_url(player, active_queue)
-
- @catch_musicassistant_error
- async def async_media_play(self) -> None:
- """Send play command to device."""
- await self.mass.players.player_command_play(self.player_id)
-
- @catch_musicassistant_error
- async def async_media_pause(self) -> None:
- """Send pause command to device."""
- await self.mass.players.player_command_pause(self.player_id)
-
- @catch_musicassistant_error
- async def async_media_stop(self) -> None:
- """Send stop command to device."""
- await self.mass.players.player_command_stop(self.player_id)
-
- @catch_musicassistant_error
- async def async_media_next_track(self) -> None:
- """Send next track command to device."""
- await self.mass.players.player_command_next_track(self.player_id)
-
- @catch_musicassistant_error
- async def async_media_previous_track(self) -> None:
- """Send previous track command to device."""
- await self.mass.players.player_command_previous_track(self.player_id)
-
- @catch_musicassistant_error
- async def async_media_seek(self, position: float) -> None:
- """Send seek command."""
- position = int(position)
- await self.mass.players.player_command_seek(self.player_id, position)
-
- @catch_musicassistant_error
- async def async_mute_volume(self, mute: bool) -> None:
- """Mute the volume."""
- await self.mass.players.player_command_volume_mute(self.player_id, mute)
-
- @catch_musicassistant_error
- async def async_set_volume_level(self, volume: float) -> None:
- """Send new volume_level to device."""
- volume = int(volume * 100)
- await self.mass.players.player_command_volume_set(self.player_id, volume)
-
- @catch_musicassistant_error
- async def async_volume_up(self) -> None:
- """Send new volume_level to device."""
- await self.mass.players.player_command_volume_up(self.player_id)
-
- @catch_musicassistant_error
- async def async_volume_down(self) -> None:
- """Send new volume_level to device."""
- await self.mass.players.player_command_volume_down(self.player_id)
-
- @catch_musicassistant_error
- async def async_turn_on(self) -> None:
- """Turn on device."""
- await self.mass.players.player_command_power(self.player_id, True)
-
- @catch_musicassistant_error
- async def async_turn_off(self) -> None:
- """Turn off device."""
- await self.mass.players.player_command_power(self.player_id, False)
-
- @catch_musicassistant_error
- async def async_set_shuffle(self, shuffle: bool) -> None:
- """Set shuffle state."""
- if not self.active_queue:
- return
- await self.mass.player_queues.queue_command_shuffle(
- self.active_queue.queue_id, shuffle
- )
-
- @catch_musicassistant_error
- async def async_set_repeat(self, repeat: RepeatMode) -> None:
- """Set repeat state."""
- if not self.active_queue:
- return
- await self.mass.player_queues.queue_command_repeat(
- self.active_queue.queue_id, MassRepeatMode(repeat)
- )
-
- @catch_musicassistant_error
- async def async_clear_playlist(self) -> None:
- """Clear players playlist."""
- if TYPE_CHECKING:
- assert self.player.active_source is not None
- if queue := self.mass.player_queues.get(self.player.active_source):
- await self.mass.player_queues.queue_command_clear(queue.queue_id)
-
- @catch_musicassistant_error
- async def async_play_media(
- self,
- media_type: MediaType | str,
- media_id: str,
- enqueue: MediaPlayerEnqueue | None = None,
- announce: bool | None = None,
- **kwargs: Any,
- ) -> None:
- """Send the play_media command to the media player."""
- if media_source.is_media_source_id(media_id):
- # Handle media_source
- sourced_media = await media_source.async_resolve_media(
- self.hass, media_id, self.entity_id
- )
- media_id = sourced_media.url
- media_id = async_process_play_media_url(self.hass, media_id)
-
- if announce:
- await self._async_handle_play_announcement(
- media_id,
- use_pre_announce=kwargs[ATTR_MEDIA_EXTRA].get("use_pre_announce"),
- announce_volume=kwargs[ATTR_MEDIA_EXTRA].get("announce_volume"),
- )
- return
-
- # forward to our advanced play_media handler
- await self._async_handle_play_media(
- media_id=[media_id],
- enqueue=enqueue,
- media_type=media_type,
- radio_mode=kwargs[ATTR_MEDIA_EXTRA].get(ATTR_RADIO_MODE),
- )
-
- @catch_musicassistant_error
- async def async_join_players(self, group_members: list[str]) -> None:
- """Join `group_members` as a player group with the current player."""
- player_ids: list[str] = []
- for child_entity_id in group_members:
- # resolve HA entity_id to MA player_id
- if (hass_state := self.hass.states.get(child_entity_id)) is None:
- continue
- if (mass_player_id := hass_state.attributes.get("mass_player_id")) is None:
- continue
- player_ids.append(mass_player_id)
- await self.mass.players.player_command_sync_many(self.player_id, player_ids)
-
- @catch_musicassistant_error
- async def async_unjoin_player(self) -> None:
- """Remove this player from any group."""
- await self.mass.players.player_command_unsync(self.player_id)
-
- @catch_musicassistant_error
- async def _async_handle_play_media(
- self,
- media_id: list[str],
- enqueue: MediaPlayerEnqueue | QueueOption | None = None,
- radio_mode: bool | None = None,
- media_type: str | None = None,
- ) -> None:
- """Send the play_media command to the media player."""
- media_uris: list[str] = []
- item: MediaItemType | ItemMapping | None = None
- # work out (all) uri(s) to play
- for media_id_str in media_id:
- # URL or URI string
- if "://" in media_id_str:
- media_uris.append(media_id_str)
- continue
- # try content id as library id
- if media_type and media_id_str.isnumeric():
- with suppress(MediaNotFoundError):
- item = await self.mass.music.get_item(
- MediaType(media_type), media_id_str, "library"
- )
- if isinstance(item, MediaItemType | ItemMapping) and item.uri:
- media_uris.append(item.uri)
- continue
- # try local accessible filename
- elif await asyncio.to_thread(os.path.isfile, media_id_str):
- media_uris.append(media_id_str)
- continue
-
- if not media_uris:
- raise HomeAssistantError(
- f"Could not resolve {media_id} to playable media item"
- )
-
- # determine active queue to send the play request to
- if TYPE_CHECKING:
- assert self.player.active_source is not None
- if queue := self.mass.player_queues.get(self.player.active_source):
- queue_id = queue.queue_id
- else:
- queue_id = self.player_id
-
- await self.mass.player_queues.play_media(
- queue_id,
- media=media_uris,
- option=self._convert_queueoption_to_media_player_enqueue(enqueue),
- radio_mode=radio_mode if radio_mode else False,
- )
-
- @catch_musicassistant_error
- async def _async_handle_play_announcement(
- self,
- url: str,
- use_pre_announce: bool | None = None,
- announce_volume: int | None = None,
- ) -> None:
- """Send the play_announcement command to the media player."""
- await self.mass.players.play_announcement(
- self.player_id, url, use_pre_announce, announce_volume
- )
-
- async def async_browse_media(
- self,
- media_content_type: MediaType | str | None = None,
- media_content_id: str | None = None,
- ) -> BrowseMedia:
- """Implement the websocket media browsing helper."""
- return await media_source.async_browse_media(
- self.hass,
- media_content_id,
- content_filter=lambda item: item.media_content_type.startswith("audio/"),
- )
-
- def _update_media_image_url(
- self, player: Player, queue: PlayerQueue | None
- ) -> None:
- """Update image URL for the active queue item."""
- if queue is None or queue.current_item is None:
- self._attr_media_image_url = None
- return
- if image_url := self.mass.get_media_item_image_url(queue.current_item):
- self._attr_media_image_remotely_accessible = (
- self.mass.server_url not in image_url
- )
- self._attr_media_image_url = image_url
- return
- self._attr_media_image_url = None
-
- def _update_media_attributes(
- self, player: Player, queue: PlayerQueue | None
- ) -> None:
- """Update media attributes for the active queue item."""
- # pylint: disable=too-many-statements
- self._attr_media_artist = None
- self._attr_media_album_artist = None
- self._attr_media_album_name = None
- self._attr_media_title = None
- self._attr_media_content_id = None
- self._attr_media_duration = None
- self._attr_media_position = None
- self._attr_media_position_updated_at = None
-
- if queue is None and player.current_media:
- # player has some external source active
- self._attr_media_content_id = player.current_media.uri
- self._attr_app_id = player.active_source
- self._attr_media_title = player.current_media.title
- self._attr_media_artist = player.current_media.artist
- self._attr_media_album_name = player.current_media.album
- self._attr_media_duration = player.current_media.duration
- # shuffle and repeat are not (yet) supported for external sources
- self._attr_shuffle = None
- self._attr_repeat = None
- if TYPE_CHECKING:
- assert player.elapsed_time is not None
- self._attr_media_position = int(player.elapsed_time)
- self._attr_media_position_updated_at = (
- utc_from_timestamp(player.elapsed_time_last_updated)
- if player.elapsed_time_last_updated
- else None
- )
- if TYPE_CHECKING:
- assert player.elapsed_time is not None
- self._prev_time = player.elapsed_time
- return
-
- if queue is None:
- # player has no MA queue active
- self._attr_source = player.active_source
- self._attr_app_id = player.active_source
- return
-
- # player has an MA queue active (either its own queue or some group queue)
- self._attr_app_id = DOMAIN
- self._attr_shuffle = queue.shuffle_enabled
- self._attr_repeat = queue.repeat_mode.value
- if not (cur_item := queue.current_item):
- # queue is empty
- return
-
- self._attr_media_content_id = queue.current_item.uri
- self._attr_media_duration = queue.current_item.duration
- self._attr_media_position = int(queue.elapsed_time)
- self._attr_media_position_updated_at = utc_from_timestamp(
- queue.elapsed_time_last_updated
- )
- self._prev_time = queue.elapsed_time
-
- # handle stream title (radio station icy metadata)
- if (stream_details := cur_item.streamdetails) and stream_details.stream_title:
- self._attr_media_album_name = cur_item.name
- if " - " in stream_details.stream_title:
- stream_title_parts = stream_details.stream_title.split(" - ", 1)
- self._attr_media_title = stream_title_parts[1]
- self._attr_media_artist = stream_title_parts[0]
- else:
- self._attr_media_title = stream_details.stream_title
- return
-
- if not (media_item := cur_item.media_item):
- # queue is not playing a regular media item (edge case?!)
- self._attr_media_title = cur_item.name
- return
-
- # queue is playing regular media item
- self._attr_media_title = media_item.name
- # for tracks we can extract more info
- if media_item.media_type == MediaType.TRACK:
- if TYPE_CHECKING:
- assert isinstance(media_item, Track)
- self._attr_media_artist = media_item.artist_str
- if media_item.version:
- self._attr_media_title += f" ({media_item.version})"
- if media_item.album:
- self._attr_media_album_name = media_item.album.name
- self._attr_media_album_artist = getattr(
- media_item.album, "artist_str", None
- )
-
- def _convert_queueoption_to_media_player_enqueue(
- self, queue_option: MediaPlayerEnqueue | QueueOption | None
- ) -> QueueOption | None:
- """Convert a QueueOption to a MediaPlayerEnqueue."""
- if isinstance(queue_option, MediaPlayerEnqueue):
- queue_option = QUEUE_OPTION_MAP.get(queue_option)
- return queue_option
diff --git a/homeassistant/components/music_assistant/strings.json b/homeassistant/components/music_assistant/strings.json
deleted file mode 100644
index f15b0b1b306..00000000000
--- a/homeassistant/components/music_assistant/strings.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
- "config": {
- "step": {
- "init": {
- "data": {
- "url": "URL of the Music Assistant server"
- }
- },
- "manual": {
- "title": "Manually add Music Assistant Server",
- "description": "Enter the URL to your already running Music Assistant Server. If you do not have the Music Assistant Server running, you should install it first.",
- "data": {
- "url": "URL of the Music Assistant server"
- }
- },
- "discovery_confirm": {
- "description": "Do you want to add the Music Assistant Server `{url}` to Home Assistant?",
- "title": "Discovered Music Assistant Server"
- }
- },
- "error": {
- "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
- "invalid_server_version": "The Music Assistant server is not the correct version",
- "unknown": "[%key:common::config_flow::error::unknown%]"
- },
- "abort": {
- "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
- "already_in_progress": "Configuration flow is already in progress",
- "reconfiguration_successful": "Successfully reconfigured the Music Assistant integration.",
- "cannot_connect": "Failed to connect",
- "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]"
- }
- },
- "issues": {
- "invalid_server_version": {
- "title": "The Music Assistant server is not the correct version",
- "description": "Check if there are updates available for the Music Assistant Server and/or integration."
- }
- },
- "selector": {
- "enqueue": {
- "options": {
- "play": "Play",
- "next": "Play next",
- "add": "Add to queue",
- "replace": "Play now and clear queue",
- "replace_next": "Play next and clear queue"
- }
- }
- }
-}
diff --git a/homeassistant/components/myuplink/binary_sensor.py b/homeassistant/components/myuplink/binary_sensor.py
index 953859986d0..0ba6ac7b078 100644
--- a/homeassistant/components/myuplink/binary_sensor.py
+++ b/homeassistant/components/myuplink/binary_sensor.py
@@ -12,12 +12,11 @@ from homeassistant.core import HomeAssistant
from homeassistant.helpers.entity_platform import AddEntitiesCallback
from . import MyUplinkConfigEntry, MyUplinkDataCoordinator
-from .const import F_SERIES
from .entity import MyUplinkEntity, MyUplinkSystemEntity
-from .helpers import find_matching_platform, transform_model_series
+from .helpers import find_matching_platform
CATEGORY_BASED_DESCRIPTIONS: dict[str, dict[str, BinarySensorEntityDescription]] = {
- F_SERIES: {
+ "F730": {
"43161": BinarySensorEntityDescription(
key="elect_add",
translation_key="elect_add",
@@ -51,7 +50,6 @@ def get_description(device_point: DevicePoint) -> BinarySensorEntityDescription
2. Default to None
"""
prefix, _, _ = device_point.category.partition(" ")
- prefix = transform_model_series(prefix)
return CATEGORY_BASED_DESCRIPTIONS.get(prefix, {}).get(device_point.parameter_id)
diff --git a/homeassistant/components/myuplink/const.py b/homeassistant/components/myuplink/const.py
index 6fd354a21ec..3541a8078c3 100644
--- a/homeassistant/components/myuplink/const.py
+++ b/homeassistant/components/myuplink/const.py
@@ -6,5 +6,3 @@ API_ENDPOINT = "https://api.myuplink.com"
OAUTH2_AUTHORIZE = "https://api.myuplink.com/oauth/authorize"
OAUTH2_TOKEN = "https://api.myuplink.com/oauth/token"
OAUTH2_SCOPES = ["WRITESYSTEM", "READSYSTEM", "offline_access"]
-
-F_SERIES = "f-series"
diff --git a/homeassistant/components/myuplink/helpers.py b/homeassistant/components/myuplink/helpers.py
index de5486d8dea..eb4881c410e 100644
--- a/homeassistant/components/myuplink/helpers.py
+++ b/homeassistant/components/myuplink/helpers.py
@@ -6,8 +6,6 @@ from homeassistant.components.number import NumberEntityDescription
from homeassistant.components.sensor import SensorEntityDescription
from homeassistant.const import Platform
-from .const import F_SERIES
-
def find_matching_platform(
device_point: DevicePoint,
@@ -88,9 +86,8 @@ PARAMETER_ID_TO_EXCLUDE_F730 = (
"47941",
"47975",
"48009",
+ "48042",
"48072",
- "48442",
- "49909",
"50113",
)
@@ -113,7 +110,7 @@ def skip_entity(model: str, device_point: DevicePoint) -> bool:
):
return False
return True
- if model.lower().startswith("f"):
+ if "F730" in model:
# Entity names containing weekdays are used for advanced scheduling in the
# heat pump and should not be exposed in the integration
if any(d in device_point.parameter_name.lower() for d in WEEKDAYS):
@@ -121,10 +118,3 @@ def skip_entity(model: str, device_point: DevicePoint) -> bool:
if device_point.parameter_id in PARAMETER_ID_TO_EXCLUDE_F730:
return True
return False
-
-
-def transform_model_series(prefix: str) -> str:
- """Remap all F-series models."""
- if prefix.lower().startswith("f"):
- return F_SERIES
- return prefix
diff --git a/homeassistant/components/myuplink/number.py b/homeassistant/components/myuplink/number.py
index b05ab5d46c9..0c7da0c716f 100644
--- a/homeassistant/components/myuplink/number.py
+++ b/homeassistant/components/myuplink/number.py
@@ -10,9 +10,8 @@ from homeassistant.exceptions import HomeAssistantError
from homeassistant.helpers.entity_platform import AddEntitiesCallback
from . import MyUplinkConfigEntry, MyUplinkDataCoordinator
-from .const import F_SERIES
from .entity import MyUplinkEntity
-from .helpers import find_matching_platform, skip_entity, transform_model_series
+from .helpers import find_matching_platform, skip_entity
DEVICE_POINT_UNIT_DESCRIPTIONS: dict[str, NumberEntityDescription] = {
"DM": NumberEntityDescription(
@@ -23,7 +22,7 @@ DEVICE_POINT_UNIT_DESCRIPTIONS: dict[str, NumberEntityDescription] = {
}
CATEGORY_BASED_DESCRIPTIONS: dict[str, dict[str, NumberEntityDescription]] = {
- F_SERIES: {
+ "F730": {
"40940": NumberEntityDescription(
key="degree_minutes",
translation_key="degree_minutes",
@@ -49,7 +48,6 @@ def get_description(device_point: DevicePoint) -> NumberEntityDescription | None
3. Default to None
"""
prefix, _, _ = device_point.category.partition(" ")
- prefix = transform_model_series(prefix)
description = CATEGORY_BASED_DESCRIPTIONS.get(prefix, {}).get(
device_point.parameter_id
)
diff --git a/homeassistant/components/myuplink/sensor.py b/homeassistant/components/myuplink/sensor.py
index ef827fc1fb1..7feb20bc093 100644
--- a/homeassistant/components/myuplink/sensor.py
+++ b/homeassistant/components/myuplink/sensor.py
@@ -25,9 +25,8 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback
from homeassistant.helpers.typing import StateType
from . import MyUplinkConfigEntry, MyUplinkDataCoordinator
-from .const import F_SERIES
from .entity import MyUplinkEntity
-from .helpers import find_matching_platform, skip_entity, transform_model_series
+from .helpers import find_matching_platform, skip_entity
DEVICE_POINT_UNIT_DESCRIPTIONS: dict[str, SensorEntityDescription] = {
"°C": SensorEntityDescription(
@@ -140,7 +139,7 @@ DEVICE_POINT_UNIT_DESCRIPTIONS: dict[str, SensorEntityDescription] = {
MARKER_FOR_UNKNOWN_VALUE = -32768
CATEGORY_BASED_DESCRIPTIONS: dict[str, dict[str, SensorEntityDescription]] = {
- F_SERIES: {
+ "F730": {
"43108": SensorEntityDescription(
key="fan_mode",
translation_key="fan_mode",
@@ -201,7 +200,6 @@ def get_description(device_point: DevicePoint) -> SensorEntityDescription | None
"""
description = None
prefix, _, _ = device_point.category.partition(" ")
- prefix = transform_model_series(prefix)
description = CATEGORY_BASED_DESCRIPTIONS.get(prefix, {}).get(
device_point.parameter_id
)
diff --git a/homeassistant/components/myuplink/switch.py b/homeassistant/components/myuplink/switch.py
index 75ba6bd7819..5c47c8294fe 100644
--- a/homeassistant/components/myuplink/switch.py
+++ b/homeassistant/components/myuplink/switch.py
@@ -12,12 +12,11 @@ from homeassistant.exceptions import HomeAssistantError
from homeassistant.helpers.entity_platform import AddEntitiesCallback
from . import MyUplinkConfigEntry, MyUplinkDataCoordinator
-from .const import F_SERIES
from .entity import MyUplinkEntity
-from .helpers import find_matching_platform, skip_entity, transform_model_series
+from .helpers import find_matching_platform, skip_entity
CATEGORY_BASED_DESCRIPTIONS: dict[str, dict[str, SwitchEntityDescription]] = {
- F_SERIES: {
+ "F730": {
"50004": SwitchEntityDescription(
key="temporary_lux",
translation_key="temporary_lux",
@@ -48,7 +47,6 @@ def get_description(device_point: DevicePoint) -> SwitchEntityDescription | None
2. Default to None
"""
prefix, _, _ = device_point.category.partition(" ")
- prefix = transform_model_series(prefix)
return CATEGORY_BASED_DESCRIPTIONS.get(prefix, {}).get(device_point.parameter_id)
diff --git a/homeassistant/components/nasweb/__init__.py b/homeassistant/components/nasweb/__init__.py
deleted file mode 100644
index 1992cc41c75..00000000000
--- a/homeassistant/components/nasweb/__init__.py
+++ /dev/null
@@ -1,125 +0,0 @@
-"""The NASweb integration."""
-
-from __future__ import annotations
-
-import logging
-
-from webio_api import WebioAPI
-from webio_api.api_client import AuthError
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME, Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryError, ConfigEntryNotReady
-from homeassistant.helpers import device_registry as dr
-from homeassistant.helpers.network import NoURLAvailableError
-from homeassistant.util.hass_dict import HassKey
-
-from .const import DOMAIN, MANUFACTURER, SUPPORT_EMAIL
-from .coordinator import NASwebCoordinator
-from .nasweb_data import NASwebData
-
-PLATFORMS: list[Platform] = [Platform.SWITCH]
-
-NASWEB_CONFIG_URL = "https://{host}/page"
-
-_LOGGER = logging.getLogger(__name__)
-type NASwebConfigEntry = ConfigEntry[NASwebCoordinator]
-DATA_NASWEB: HassKey[NASwebData] = HassKey(DOMAIN)
-
-
-async def async_setup_entry(hass: HomeAssistant, entry: NASwebConfigEntry) -> bool:
- """Set up NASweb from a config entry."""
-
- if DATA_NASWEB not in hass.data:
- data = NASwebData()
- data.initialize(hass)
- hass.data[DATA_NASWEB] = data
- nasweb_data = hass.data[DATA_NASWEB]
-
- webio_api = WebioAPI(
- entry.data[CONF_HOST], entry.data[CONF_USERNAME], entry.data[CONF_PASSWORD]
- )
- try:
- if not await webio_api.check_connection():
- raise ConfigEntryNotReady(
- f"[{entry.data[CONF_HOST]}] Check connection failed"
- )
- if not await webio_api.refresh_device_info():
- _LOGGER.error("[%s] Refresh device info failed", entry.data[CONF_HOST])
- raise ConfigEntryError(
- translation_key="config_entry_error_internal_error",
- translation_placeholders={"support_email": SUPPORT_EMAIL},
- )
- webio_serial = webio_api.get_serial_number()
- if webio_serial is None:
- _LOGGER.error("[%s] Serial number not available", entry.data[CONF_HOST])
- raise ConfigEntryError(
- translation_key="config_entry_error_internal_error",
- translation_placeholders={"support_email": SUPPORT_EMAIL},
- )
- if entry.unique_id != webio_serial:
- _LOGGER.error(
- "[%s] Serial number doesn't match config entry", entry.data[CONF_HOST]
- )
- raise ConfigEntryError(translation_key="config_entry_error_serial_mismatch")
-
- coordinator = NASwebCoordinator(
- hass, webio_api, name=f"NASweb[{webio_api.get_name()}]"
- )
- entry.runtime_data = coordinator
- nasweb_data.notify_coordinator.add_coordinator(webio_serial, entry.runtime_data)
-
- webhook_url = nasweb_data.get_webhook_url(hass)
- if not await webio_api.status_subscription(webhook_url, True):
- _LOGGER.error("Failed to subscribe for status updates from webio")
- raise ConfigEntryError(
- translation_key="config_entry_error_internal_error",
- translation_placeholders={"support_email": SUPPORT_EMAIL},
- )
- if not await nasweb_data.notify_coordinator.check_connection(webio_serial):
- _LOGGER.error("Did not receive status from device")
- raise ConfigEntryError(
- translation_key="config_entry_error_no_status_update",
- translation_placeholders={"support_email": SUPPORT_EMAIL},
- )
- except TimeoutError as error:
- raise ConfigEntryNotReady(
- f"[{entry.data[CONF_HOST]}] Check connection reached timeout"
- ) from error
- except AuthError as error:
- raise ConfigEntryError(
- translation_key="config_entry_error_invalid_authentication"
- ) from error
- except NoURLAvailableError as error:
- raise ConfigEntryError(
- translation_key="config_entry_error_missing_internal_url"
- ) from error
-
- device_registry = dr.async_get(hass)
- device_registry.async_get_or_create(
- config_entry_id=entry.entry_id,
- identifiers={(DOMAIN, webio_serial)},
- manufacturer=MANUFACTURER,
- name=webio_api.get_name(),
- configuration_url=NASWEB_CONFIG_URL.format(host=entry.data[CONF_HOST]),
- )
- await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
- return True
-
-
-async def async_unload_entry(hass: HomeAssistant, entry: NASwebConfigEntry) -> bool:
- """Unload a config entry."""
- if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
- nasweb_data = hass.data[DATA_NASWEB]
- coordinator = entry.runtime_data
- serial = entry.unique_id
- if serial is not None:
- nasweb_data.notify_coordinator.remove_coordinator(serial)
- if nasweb_data.can_be_deinitialized():
- nasweb_data.deinitialize(hass)
- hass.data.pop(DATA_NASWEB)
- webhook_url = nasweb_data.get_webhook_url(hass)
- await coordinator.webio_api.status_subscription(webhook_url, False)
-
- return unload_ok
diff --git a/homeassistant/components/nasweb/config_flow.py b/homeassistant/components/nasweb/config_flow.py
deleted file mode 100644
index 3a9ad3f7d49..00000000000
--- a/homeassistant/components/nasweb/config_flow.py
+++ /dev/null
@@ -1,137 +0,0 @@
-"""Config flow for NASweb integration."""
-
-from __future__ import annotations
-
-import logging
-from typing import Any
-
-import voluptuous as vol
-from webio_api import WebioAPI
-from webio_api.api_client import AuthError
-
-from homeassistant import config_entries
-from homeassistant.config_entries import ConfigFlowResult
-from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_UNIQUE_ID, CONF_USERNAME
-from homeassistant.core import HomeAssistant
-from homeassistant.data_entry_flow import AbortFlow
-from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.network import NoURLAvailableError
-
-from .const import DOMAIN
-from .coordinator import NASwebCoordinator
-from .nasweb_data import NASwebData
-
-NASWEB_SCHEMA_IMG_URL = (
- "https://home-assistant.io/images/integrations/nasweb/nasweb_scheme.png"
-)
-
-_LOGGER = logging.getLogger(__name__)
-
-STEP_USER_DATA_SCHEMA = vol.Schema(
- {
- vol.Required(CONF_HOST): str,
- vol.Required(CONF_USERNAME): str,
- vol.Required(CONF_PASSWORD): str,
- }
-)
-
-
-async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> dict[str, Any]:
- """Validate user-provided data."""
- webio_api = WebioAPI(data[CONF_HOST], data[CONF_USERNAME], data[CONF_PASSWORD])
- if not await webio_api.check_connection():
- raise CannotConnect
- try:
- await webio_api.refresh_device_info()
- except AuthError as e:
- raise InvalidAuth from e
-
- nasweb_data = NASwebData()
- nasweb_data.initialize(hass)
- try:
- webio_serial = webio_api.get_serial_number()
- if webio_serial is None:
- raise MissingNASwebData("Device serial number is not available")
-
- coordinator = NASwebCoordinator(hass, webio_api)
- webhook_url = nasweb_data.get_webhook_url(hass)
- nasweb_data.notify_coordinator.add_coordinator(webio_serial, coordinator)
- subscription = await webio_api.status_subscription(webhook_url, True)
- if not subscription:
- nasweb_data.notify_coordinator.remove_coordinator(webio_serial)
- raise MissingNASwebData(
- "Failed to subscribe for status updates from device"
- )
-
- result = await nasweb_data.notify_coordinator.check_connection(webio_serial)
- nasweb_data.notify_coordinator.remove_coordinator(webio_serial)
- if not result:
- if subscription:
- await webio_api.status_subscription(webhook_url, False)
- raise MissingNASwebStatus("Did not receive status from device")
-
- name = webio_api.get_name()
- finally:
- nasweb_data.deinitialize(hass)
- return {"title": name, CONF_UNIQUE_ID: webio_serial}
-
-
-class NASwebConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
- """Handle a config flow for NASweb."""
-
- 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:
- try:
- info = await validate_input(self.hass, user_input)
- await self.async_set_unique_id(info[CONF_UNIQUE_ID])
- self._abort_if_unique_id_configured()
- except CannotConnect:
- errors["base"] = "cannot_connect"
- except InvalidAuth:
- errors["base"] = "invalid_auth"
- except NoURLAvailableError:
- errors["base"] = "missing_internal_url"
- except MissingNASwebData:
- errors["base"] = "missing_nasweb_data"
- except MissingNASwebStatus:
- errors["base"] = "missing_status"
- except AbortFlow:
- raise
- except Exception: # pylint: disable=broad-except
- _LOGGER.exception("Unexpected exception")
- errors["base"] = "unknown"
- else:
- return self.async_create_entry(title=info["title"], data=user_input)
-
- return self.async_show_form(
- step_id="user",
- data_schema=self.add_suggested_values_to_schema(
- STEP_USER_DATA_SCHEMA, user_input
- ),
- errors=errors,
- description_placeholders={
- "nasweb_schema_img": '
',
- },
- )
-
-
-class CannotConnect(HomeAssistantError):
- """Error to indicate we cannot connect."""
-
-
-class InvalidAuth(HomeAssistantError):
- """Error to indicate there is invalid auth."""
-
-
-class MissingNASwebData(HomeAssistantError):
- """Error to indicate missing information from NASweb."""
-
-
-class MissingNASwebStatus(HomeAssistantError):
- """Error to indicate there was no status received from NASweb."""
diff --git a/homeassistant/components/nasweb/const.py b/homeassistant/components/nasweb/const.py
deleted file mode 100644
index ec750c90c8c..00000000000
--- a/homeassistant/components/nasweb/const.py
+++ /dev/null
@@ -1,7 +0,0 @@
-"""Constants for the NASweb integration."""
-
-DOMAIN = "nasweb"
-MANUFACTURER = "chomtech.pl"
-STATUS_UPDATE_MAX_TIME_INTERVAL = 60
-SUPPORT_EMAIL = "support@chomtech.eu"
-WEBHOOK_URL = "{internal_url}/api/webhook/{webhook_id}"
diff --git a/homeassistant/components/nasweb/coordinator.py b/homeassistant/components/nasweb/coordinator.py
deleted file mode 100644
index 90dca0f3022..00000000000
--- a/homeassistant/components/nasweb/coordinator.py
+++ /dev/null
@@ -1,191 +0,0 @@
-"""Message routing coordinators for handling NASweb push notifications."""
-
-from __future__ import annotations
-
-import asyncio
-from collections.abc import Callable
-from datetime import datetime, timedelta
-import logging
-import time
-from typing import Any
-
-from aiohttp.web import Request, Response
-from webio_api import WebioAPI
-from webio_api.const import KEY_DEVICE_SERIAL, KEY_OUTPUTS, KEY_TYPE, TYPE_STATUS_UPDATE
-
-from homeassistant.core import CALLBACK_TYPE, HassJob, HomeAssistant, callback
-from homeassistant.helpers import event
-from homeassistant.helpers.update_coordinator import BaseDataUpdateCoordinatorProtocol
-
-from .const import STATUS_UPDATE_MAX_TIME_INTERVAL
-
-_LOGGER = logging.getLogger(__name__)
-
-
-class NotificationCoordinator:
- """Coordinator redirecting push notifications for this integration to appropriate NASwebCoordinator."""
-
- def __init__(self) -> None:
- """Initialize coordinator."""
- self._coordinators: dict[str, NASwebCoordinator] = {}
-
- def add_coordinator(self, serial: str, coordinator: NASwebCoordinator) -> None:
- """Add NASwebCoordinator to possible notification targets."""
- self._coordinators[serial] = coordinator
- _LOGGER.debug("Added NASwebCoordinator for NASweb[%s]", serial)
-
- def remove_coordinator(self, serial: str) -> None:
- """Remove NASwebCoordinator from possible notification targets."""
- self._coordinators.pop(serial)
- _LOGGER.debug("Removed NASwebCoordinator for NASweb[%s]", serial)
-
- def has_coordinators(self) -> bool:
- """Check if there is any registered coordinator for push notifications."""
- return len(self._coordinators) > 0
-
- async def check_connection(self, serial: str) -> bool:
- """Wait for first status update to confirm connection with NASweb."""
- nasweb_coordinator = self._coordinators.get(serial)
- if nasweb_coordinator is None:
- _LOGGER.error("Cannot check connection. No device match serial number")
- return False
- for counter in range(10):
- _LOGGER.debug("Checking connection with: %s (%s)", serial, counter)
- if nasweb_coordinator.is_connection_confirmed():
- return True
- await asyncio.sleep(1)
- return False
-
- async def handle_webhook_request(
- self, hass: HomeAssistant, webhook_id: str, request: Request
- ) -> Response | None:
- """Handle webhook request from Push API."""
- if not self.has_coordinators():
- return None
- notification = await request.json()
- serial = notification.get(KEY_DEVICE_SERIAL, None)
- _LOGGER.debug("Received push: %s", notification)
- if serial is None:
- _LOGGER.warning("Received notification without nasweb identifier")
- return None
- nasweb_coordinator = self._coordinators.get(serial)
- if nasweb_coordinator is None:
- _LOGGER.warning("Received notification for not registered nasweb")
- return None
- await nasweb_coordinator.handle_push_notification(notification)
- return Response(body='{"response": "ok"}', content_type="application/json")
-
-
-class NASwebCoordinator(BaseDataUpdateCoordinatorProtocol):
- """Coordinator managing status of single NASweb device.
-
- Since status updates are managed through push notifications, this class schedules
- periodic checks to ensure that devices are marked unavailable if updates
- haven't been received for a prolonged period.
- """
-
- def __init__(
- self, hass: HomeAssistant, webio_api: WebioAPI, name: str = "NASweb[default]"
- ) -> None:
- """Initialize NASweb coordinator."""
- self._hass = hass
- self.name = name
- self.webio_api = webio_api
- self._last_update: float | None = None
- job_name = f"NASwebCoordinator[{name}]"
- self._job = HassJob(self._handle_max_update_interval, job_name)
- self._unsub_last_update_check: CALLBACK_TYPE | None = None
- self._listeners: dict[CALLBACK_TYPE, tuple[CALLBACK_TYPE, object | None]] = {}
- data: dict[str, Any] = {}
- data[KEY_OUTPUTS] = self.webio_api.outputs
- self.async_set_updated_data(data)
-
- def is_connection_confirmed(self) -> bool:
- """Check whether coordinator received status update from NASweb."""
- return self._last_update is not None
-
- @callback
- def async_add_listener(
- self, update_callback: CALLBACK_TYPE, context: Any = None
- ) -> Callable[[], None]:
- """Listen for data updates."""
- schedule_update_check = not self._listeners
-
- @callback
- def remove_listener() -> None:
- """Remove update listener."""
- self._listeners.pop(remove_listener)
- if not self._listeners:
- self._async_unsub_last_update_check()
-
- self._listeners[remove_listener] = (update_callback, context)
- # This is the first listener, set up interval.
- if schedule_update_check:
- self._schedule_last_update_check()
- return remove_listener
-
- @callback
- def async_set_updated_data(self, data: dict[str, Any]) -> None:
- """Update data and notify listeners."""
- self.data = data
- self.last_update = self._hass.loop.time()
- _LOGGER.debug("Updated %s data", self.name)
- if self._listeners:
- self._schedule_last_update_check()
- self.async_update_listeners()
-
- @callback
- def async_update_listeners(self) -> None:
- """Update all registered listeners."""
- for update_callback, _ in list(self._listeners.values()):
- update_callback()
-
- async def _handle_max_update_interval(self, now: datetime) -> None:
- """Handle max update interval occurrence.
-
- This method is called when `STATUS_UPDATE_MAX_TIME_INTERVAL` has passed without
- receiving a status update. It only needs to trigger state update of entities
- which then change their state accordingly.
- """
- self._unsub_last_update_check = None
- if self._listeners:
- self.async_update_listeners()
-
- def _schedule_last_update_check(self) -> None:
- """Schedule a task to trigger entities state update after `STATUS_UPDATE_MAX_TIME_INTERVAL`.
-
- This method schedules a task (`_handle_max_update_interval`) to be executed after
- `STATUS_UPDATE_MAX_TIME_INTERVAL` seconds without status update, which enables entities
- to change their state to unavailable. After each status update this task is rescheduled.
- """
- self._async_unsub_last_update_check()
- now = self._hass.loop.time()
- next_check = (
- now + timedelta(seconds=STATUS_UPDATE_MAX_TIME_INTERVAL).total_seconds()
- )
- self._unsub_last_update_check = event.async_call_at(
- self._hass,
- self._job,
- next_check,
- )
-
- def _async_unsub_last_update_check(self) -> None:
- """Cancel any scheduled update check call."""
- if self._unsub_last_update_check:
- self._unsub_last_update_check()
- self._unsub_last_update_check = None
-
- async def handle_push_notification(self, notification: dict) -> None:
- """Handle incoming push notification from NASweb."""
- msg_type = notification.get(KEY_TYPE)
- _LOGGER.debug("Received push notification: %s", msg_type)
-
- if msg_type == TYPE_STATUS_UPDATE:
- await self.process_status_update(notification)
- self._last_update = time.time()
-
- async def process_status_update(self, new_status: dict) -> None:
- """Process status update from NASweb."""
- self.webio_api.update_device_status(new_status)
- new_data = {KEY_OUTPUTS: self.webio_api.outputs}
- self.async_set_updated_data(new_data)
diff --git a/homeassistant/components/nasweb/manifest.json b/homeassistant/components/nasweb/manifest.json
deleted file mode 100644
index e7e06419dad..00000000000
--- a/homeassistant/components/nasweb/manifest.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "domain": "nasweb",
- "name": "NASweb",
- "codeowners": ["@nasWebio"],
- "config_flow": true,
- "dependencies": ["webhook"],
- "documentation": "https://www.home-assistant.io/integrations/nasweb",
- "homekit": {},
- "integration_type": "hub",
- "iot_class": "local_push",
- "requirements": ["webio-api==0.1.8"],
- "ssdp": [],
- "zeroconf": []
-}
diff --git a/homeassistant/components/nasweb/nasweb_data.py b/homeassistant/components/nasweb/nasweb_data.py
deleted file mode 100644
index 4f6a37e6cc7..00000000000
--- a/homeassistant/components/nasweb/nasweb_data.py
+++ /dev/null
@@ -1,64 +0,0 @@
-"""Dataclass storing integration data in hass.data[DOMAIN]."""
-
-from dataclasses import dataclass, field
-import logging
-
-from aiohttp.hdrs import METH_POST
-
-from homeassistant.components.webhook import (
- async_generate_id,
- async_register as webhook_register,
- async_unregister as webhook_unregister,
-)
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.network import get_url
-
-from .const import DOMAIN, WEBHOOK_URL
-from .coordinator import NotificationCoordinator
-
-_LOGGER = logging.getLogger(__name__)
-
-
-@dataclass
-class NASwebData:
- """Class storing integration data."""
-
- notify_coordinator: NotificationCoordinator = field(
- default_factory=NotificationCoordinator
- )
- webhook_id = ""
-
- def is_initialized(self) -> bool:
- """Return True if instance was initialized and is ready for use."""
- return bool(self.webhook_id)
-
- def can_be_deinitialized(self) -> bool:
- """Return whether this instance can be deinitialized."""
- return not self.notify_coordinator.has_coordinators()
-
- def initialize(self, hass: HomeAssistant) -> None:
- """Initialize NASwebData instance."""
- if self.is_initialized():
- return
- new_webhook_id = async_generate_id()
- webhook_register(
- hass,
- DOMAIN,
- "NASweb",
- new_webhook_id,
- self.notify_coordinator.handle_webhook_request,
- allowed_methods=[METH_POST],
- )
- self.webhook_id = new_webhook_id
- _LOGGER.debug("Registered webhook: %s", self.webhook_id)
-
- def deinitialize(self, hass: HomeAssistant) -> None:
- """Deinitialize NASwebData instance."""
- if not self.is_initialized():
- return
- webhook_unregister(hass, self.webhook_id)
-
- def get_webhook_url(self, hass: HomeAssistant) -> str:
- """Return webhook url for Push API."""
- hass_url = get_url(hass, allow_external=False)
- return WEBHOOK_URL.format(internal_url=hass_url, webhook_id=self.webhook_id)
diff --git a/homeassistant/components/nasweb/strings.json b/homeassistant/components/nasweb/strings.json
deleted file mode 100644
index b8af8cd54db..00000000000
--- a/homeassistant/components/nasweb/strings.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
- "config": {
- "step": {
- "user": {
- "title": "Add NASweb device",
- "description": "{nasweb_schema_img}NASweb combines the functions of a control panel and the ability to manage building automation. The device monitors the flow of information from sensors and programmable switches and stores settings, definitions and configured actions.",
- "data": {
- "host": "[%key:common::config_flow::data::host%]",
- "username": "[%key:common::config_flow::data::username%]",
- "password": "[%key:common::config_flow::data::password%]"
- }
- }
- },
- "error": {
- "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
- "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
- "missing_internal_url": "Make sure Home Assistant has valid internal url",
- "missing_nasweb_data": "Something isn't right with device internal configuration. Try restarting the device and HomeAssistant.",
- "missing_status": "Did not received any status updates within the expected time window. Make sure the Home Assistant Internal URL is reachable from the NASweb device.",
- "unknown": "[%key:common::config_flow::error::unknown%]"
- },
- "abort": {
- "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
- }
- },
- "exceptions": {
- "config_entry_error_invalid_authentication": {
- "message": "Invalid username/password. Most likely user changed password or was removed. Delete this entry and create new one with correct username/password."
- },
- "config_entry_error_internal_error": {
- "message": "Something isn't right with device internal configuration. Try restarting the device and HomeAssistant. If the issue persists contact support at {support_email}"
- },
- "config_entry_error_no_status_update": {
- "message": "Did not received any status updates within the expected time window. Make sure the Home Assistant Internal URL is reachable from the NASweb device. If the issue persists contact support at {support_email}"
- },
- "config_entry_error_missing_internal_url": {
- "message": "[%key:component::nasweb::config::error::missing_internal_url%]"
- },
- "serial_mismatch": {
- "message": "Connected to different NASweb device (serial number mismatch)."
- }
- },
- "entity": {
- "switch": {
- "switch_output": {
- "name": "Relay Switch {index}"
- }
- }
- }
-}
diff --git a/homeassistant/components/nasweb/switch.py b/homeassistant/components/nasweb/switch.py
deleted file mode 100644
index 00e5a21da18..00000000000
--- a/homeassistant/components/nasweb/switch.py
+++ /dev/null
@@ -1,133 +0,0 @@
-"""Platform for NASweb output."""
-
-from __future__ import annotations
-
-import logging
-import time
-from typing import Any
-
-from webio_api import Output as NASwebOutput
-
-from homeassistant.components.switch import DOMAIN as DOMAIN_SWITCH, SwitchEntity
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-import homeassistant.helpers.entity_registry as er
-from homeassistant.helpers.typing import DiscoveryInfoType
-from homeassistant.helpers.update_coordinator import (
- BaseCoordinatorEntity,
- BaseDataUpdateCoordinatorProtocol,
-)
-
-from . import NASwebConfigEntry
-from .const import DOMAIN, STATUS_UPDATE_MAX_TIME_INTERVAL
-from .coordinator import NASwebCoordinator
-
-OUTPUT_TRANSLATION_KEY = "switch_output"
-
-_LOGGER = logging.getLogger(__name__)
-
-
-def _get_output(coordinator: NASwebCoordinator, index: int) -> NASwebOutput | None:
- for out in coordinator.webio_api.outputs:
- if out.index == index:
- return out
- return None
-
-
-async def async_setup_entry(
- hass: HomeAssistant,
- config: NASwebConfigEntry,
- async_add_entities: AddEntitiesCallback,
- discovery_info: DiscoveryInfoType | None = None,
-) -> None:
- """Set up switch platform."""
- coordinator = config.runtime_data
- current_outputs: set[int] = set()
-
- @callback
- def _check_entities() -> None:
- received_outputs = {out.index for out in coordinator.webio_api.outputs}
- added = {i for i in received_outputs if i not in current_outputs}
- removed = {i for i in current_outputs if i not in received_outputs}
- entities_to_add: list[RelaySwitch] = []
- for index in added:
- webio_output = _get_output(coordinator, index)
- if not isinstance(webio_output, NASwebOutput):
- _LOGGER.error("Cannot create RelaySwitch entity without NASwebOutput")
- continue
- new_output = RelaySwitch(coordinator, webio_output)
- entities_to_add.append(new_output)
- current_outputs.add(index)
- async_add_entities(entities_to_add)
- entity_registry = er.async_get(hass)
- for index in removed:
- unique_id = f"{DOMAIN}.{config.unique_id}.relay_switch.{index}"
- if entity_id := entity_registry.async_get_entity_id(
- DOMAIN_SWITCH, DOMAIN, unique_id
- ):
- entity_registry.async_remove(entity_id)
- current_outputs.remove(index)
- else:
- _LOGGER.warning("Failed to remove old output: no entity_id")
-
- coordinator.async_add_listener(_check_entities)
- _check_entities()
-
-
-class RelaySwitch(SwitchEntity, BaseCoordinatorEntity):
- """Entity representing NASweb Output."""
-
- def __init__(
- self,
- coordinator: BaseDataUpdateCoordinatorProtocol,
- nasweb_output: NASwebOutput,
- ) -> None:
- """Initialize RelaySwitch."""
- super().__init__(coordinator)
- self._output = nasweb_output
- self._attr_icon = "mdi:export"
- self._attr_has_entity_name = True
- self._attr_translation_key = OUTPUT_TRANSLATION_KEY
- self._attr_translation_placeholders = {"index": f"{nasweb_output.index:2d}"}
- self._attr_unique_id = (
- f"{DOMAIN}.{self._output.webio_serial}.relay_switch.{self._output.index}"
- )
- self._attr_device_info = DeviceInfo(
- identifiers={(DOMAIN, self._output.webio_serial)},
- )
-
- async def async_added_to_hass(self) -> None:
- """When entity is added to hass."""
- await super().async_added_to_hass()
- self._handle_coordinator_update()
-
- @callback
- def _handle_coordinator_update(self) -> None:
- """Handle updated data from the coordinator."""
- self._attr_is_on = self._output.state
- if (
- self.coordinator.last_update is None
- or time.time() - self._output.last_update >= STATUS_UPDATE_MAX_TIME_INTERVAL
- ):
- self._attr_available = False
- else:
- self._attr_available = (
- self._output.available if self._output.available is not None else False
- )
- self.async_write_ha_state()
-
- async def async_update(self) -> None:
- """Update the entity.
-
- Only used by the generic entity update service.
- Scheduling updates is not necessary, the coordinator takes care of updates via push notifications.
- """
-
- async def async_turn_on(self, **kwargs: Any) -> None:
- """Turn On RelaySwitch."""
- await self._output.turn_on()
-
- async def async_turn_off(self, **kwargs: Any) -> None:
- """Turn Off RelaySwitch."""
- await self._output.turn_off()
diff --git a/homeassistant/components/nest/api.py b/homeassistant/components/nest/api.py
index 5c65a70c75d..aa359dcd167 100644
--- a/homeassistant/components/nest/api.py
+++ b/homeassistant/components/nest/api.py
@@ -114,8 +114,9 @@ async def new_subscriber(
implementation, config_entry_oauth2_flow.LocalOAuth2Implementation
):
raise TypeError(f"Unexpected auth implementation {implementation}")
- if (subscription_name := entry.data.get(CONF_SUBSCRIPTION_NAME)) is None:
- subscription_name = entry.data[CONF_SUBSCRIBER_ID]
+ subscription_name = entry.data.get(
+ CONF_SUBSCRIPTION_NAME, entry.data[CONF_SUBSCRIBER_ID]
+ )
auth = AsyncConfigEntryAuth(
aiohttp_client.async_get_clientsession(hass),
config_entry_oauth2_flow.OAuth2Session(hass, entry, implementation),
diff --git a/homeassistant/components/nest/camera.py b/homeassistant/components/nest/camera.py
index 0a46d67a3ad..30f96f819c1 100644
--- a/homeassistant/components/nest/camera.py
+++ b/homeassistant/components/nest/camera.py
@@ -2,9 +2,9 @@
from __future__ import annotations
-from abc import ABC
+from abc import ABC, abstractmethod
import asyncio
-from collections.abc import Awaitable, Callable
+from collections.abc import Callable
import datetime
import functools
import logging
@@ -19,7 +19,6 @@ from google_nest_sdm.camera_traits import (
from google_nest_sdm.device import Device
from google_nest_sdm.device_manager import DeviceManager
from google_nest_sdm.exceptions import ApiException
-from webrtc_models import RTCIceCandidate
from homeassistant.components.camera import (
Camera,
@@ -47,11 +46,6 @@ PLACEHOLDER = Path(__file__).parent / "placeholder.png"
# Used to schedule an alarm to refresh the stream before expiration
STREAM_EXPIRATION_BUFFER = datetime.timedelta(seconds=30)
-# Refresh streams with a bounded interval and backoff on failure
-MIN_REFRESH_BACKOFF_INTERVAL = datetime.timedelta(minutes=1)
-MAX_REFRESH_BACKOFF_INTERVAL = datetime.timedelta(minutes=10)
-BACKOFF_MULTIPLIER = 1.5
-
async def async_setup_entry(
hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
@@ -73,68 +67,6 @@ async def async_setup_entry(
async_add_entities(entities)
-class StreamRefresh:
- """Class that will refresh an expiring stream.
-
- This class will schedule an alarm for the next expiration time of a stream.
- When the alarm fires, it runs the provided `refresh_cb` to extend the
- lifetime of the stream and return a new expiration time.
-
- A simple backoff will be applied when the refresh callback fails.
- """
-
- def __init__(
- self,
- hass: HomeAssistant,
- expires_at: datetime.datetime,
- refresh_cb: Callable[[], Awaitable[datetime.datetime | None]],
- ) -> None:
- """Initialize StreamRefresh."""
- self._hass = hass
- self._unsub: Callable[[], None] | None = None
- self._min_refresh_interval = MIN_REFRESH_BACKOFF_INTERVAL
- self._refresh_cb = refresh_cb
- self._schedule_stream_refresh(expires_at - STREAM_EXPIRATION_BUFFER)
-
- def unsub(self) -> None:
- """Invalidates the stream."""
- if self._unsub:
- self._unsub()
-
- async def _handle_refresh(self, _: datetime.datetime) -> None:
- """Alarm that fires to check if the stream should be refreshed."""
- self._unsub = None
- try:
- expires_at = await self._refresh_cb()
- except ApiException as err:
- _LOGGER.debug("Failed to refresh stream: %s", err)
- # Increase backoff until the max backoff interval is reached
- self._min_refresh_interval = min(
- self._min_refresh_interval * BACKOFF_MULTIPLIER,
- MAX_REFRESH_BACKOFF_INTERVAL,
- )
- refresh_time = utcnow() + self._min_refresh_interval
- else:
- if expires_at is None:
- return
- self._min_refresh_interval = MIN_REFRESH_BACKOFF_INTERVAL # Reset backoff
- # Defend against invalid stream expiration time in the past
- refresh_time = max(
- expires_at - STREAM_EXPIRATION_BUFFER,
- utcnow() + self._min_refresh_interval,
- )
- self._schedule_stream_refresh(refresh_time)
-
- def _schedule_stream_refresh(self, refresh_time: datetime.datetime) -> None:
- """Schedules an alarm to refresh any streams before expiration."""
- _LOGGER.debug("Scheduling stream refresh for %s", refresh_time)
- self._unsub = async_track_point_in_utc_time(
- self._hass,
- self._handle_refresh,
- refresh_time,
- )
-
-
class NestCameraBaseEntity(Camera, ABC):
"""Devices that support cameras."""
@@ -154,6 +86,41 @@ class NestCameraBaseEntity(Camera, ABC):
self.stream_options[CONF_EXTRA_PART_WAIT_TIME] = 3
# The API "name" field is a unique device identifier.
self._attr_unique_id = f"{self._device.name}-camera"
+ self._stream_refresh_unsub: Callable[[], None] | None = None
+
+ @abstractmethod
+ def _stream_expires_at(self) -> datetime.datetime | None:
+ """Next time when a stream expires."""
+
+ @abstractmethod
+ async def _async_refresh_stream(self) -> None:
+ """Refresh any stream to extend expiration time."""
+
+ def _schedule_stream_refresh(self) -> None:
+ """Schedules an alarm to refresh any streams before expiration."""
+ if self._stream_refresh_unsub is not None:
+ self._stream_refresh_unsub()
+
+ expiration_time = self._stream_expires_at()
+ if not expiration_time:
+ return
+ refresh_time = expiration_time - STREAM_EXPIRATION_BUFFER
+ _LOGGER.debug("Scheduled next stream refresh for %s", refresh_time)
+
+ self._stream_refresh_unsub = async_track_point_in_utc_time(
+ self.hass,
+ self._handle_stream_refresh,
+ refresh_time,
+ )
+
+ async def _handle_stream_refresh(self, _: datetime.datetime) -> None:
+ """Alarm that fires to check if the stream should be refreshed."""
+ _LOGGER.debug("Examining streams to refresh")
+ self._stream_refresh_unsub = None
+ try:
+ await self._async_refresh_stream()
+ finally:
+ self._schedule_stream_refresh()
async def async_added_to_hass(self) -> None:
"""Run when entity is added to register update signal handler."""
@@ -161,6 +128,12 @@ class NestCameraBaseEntity(Camera, ABC):
self._device.add_update_listener(self.async_write_ha_state)
)
+ async def async_will_remove_from_hass(self) -> None:
+ """Invalidates the RTSP token when unloaded."""
+ await super().async_will_remove_from_hass()
+ if self._stream_refresh_unsub:
+ self._stream_refresh_unsub()
+
class NestRTSPEntity(NestCameraBaseEntity):
"""Nest cameras that use RTSP."""
@@ -173,7 +146,6 @@ class NestRTSPEntity(NestCameraBaseEntity):
super().__init__(device)
self._create_stream_url_lock = asyncio.Lock()
self._rtsp_live_stream_trait = device.traits[CameraLiveStreamTrait.NAME]
- self._refresh_unsub: Callable[[], None] | None = None
@property
def use_stream_for_stills(self) -> bool:
@@ -201,21 +173,20 @@ class NestRTSPEntity(NestCameraBaseEntity):
)
except ApiException as err:
raise HomeAssistantError(f"Nest API error: {err}") from err
- refresh = StreamRefresh(
- self.hass,
- self._rtsp_stream.expires_at,
- self._async_refresh_stream,
- )
- self._refresh_unsub = refresh.unsub
+ self._schedule_stream_refresh()
assert self._rtsp_stream
if self._rtsp_stream.expires_at < utcnow():
_LOGGER.warning("Stream already expired")
return self._rtsp_stream.rtsp_stream_url
- async def _async_refresh_stream(self) -> datetime.datetime | None:
+ def _stream_expires_at(self) -> datetime.datetime | None:
+ """Next time when a stream expires."""
+ return self._rtsp_stream.expires_at if self._rtsp_stream else None
+
+ async def _async_refresh_stream(self) -> None:
"""Refresh stream to extend expiration time."""
if not self._rtsp_stream:
- return None
+ return
_LOGGER.debug("Extending RTSP stream")
try:
self._rtsp_stream = await self._rtsp_stream.extend_rtsp_stream()
@@ -226,17 +197,14 @@ class NestRTSPEntity(NestCameraBaseEntity):
if self.stream:
await self.stream.stop()
self.stream = None
- return None
+ return
# Update the stream worker with the latest valid url
if self.stream:
self.stream.update_source(self._rtsp_stream.rtsp_stream_url)
- return self._rtsp_stream.expires_at
async def async_will_remove_from_hass(self) -> None:
"""Invalidates the RTSP token when unloaded."""
await super().async_will_remove_from_hass()
- if self._refresh_unsub is not None:
- self._refresh_unsub()
if self._rtsp_stream:
try:
await self._rtsp_stream.stop_stream()
@@ -252,23 +220,34 @@ class NestWebRTCEntity(NestCameraBaseEntity):
"""Initialize the camera."""
super().__init__(device)
self._webrtc_sessions: dict[str, WebRtcStream] = {}
- self._refresh_unsub: dict[str, Callable[[], None]] = {}
@property
def frontend_stream_type(self) -> StreamType | None:
"""Return the type of stream supported by this camera."""
return StreamType.WEB_RTC
- async def _async_refresh_stream(self, session_id: str) -> datetime.datetime | None:
- """Refresh stream to extend expiration time."""
- if not (webrtc_stream := self._webrtc_sessions.get(session_id)):
+ def _stream_expires_at(self) -> datetime.datetime | None:
+ """Next time when a stream expires."""
+ if not self._webrtc_sessions:
return None
- _LOGGER.debug("Extending WebRTC stream %s", webrtc_stream.media_session_id)
- webrtc_stream = await webrtc_stream.extend_stream()
- if session_id in self._webrtc_sessions:
- self._webrtc_sessions[session_id] = webrtc_stream
- return webrtc_stream.expires_at
- return None
+ return min(stream.expires_at for stream in self._webrtc_sessions.values())
+
+ async def _async_refresh_stream(self) -> None:
+ """Refresh stream to extend expiration time."""
+ now = utcnow()
+ for webrtc_stream in list(self._webrtc_sessions.values()):
+ if now < (webrtc_stream.expires_at - STREAM_EXPIRATION_BUFFER):
+ _LOGGER.debug(
+ "Stream does not yet expire: %s", webrtc_stream.expires_at
+ )
+ continue
+ _LOGGER.debug("Extending WebRTC stream %s", webrtc_stream.media_session_id)
+ try:
+ webrtc_stream = await webrtc_stream.extend_stream()
+ except ApiException as err:
+ _LOGGER.debug("Failed to extend stream: %s", err)
+ else:
+ self._webrtc_sessions[webrtc_stream.media_session_id] = webrtc_stream
async def async_camera_image(
self, width: int | None = None, height: int | None = None
@@ -296,18 +275,7 @@ class NestWebRTCEntity(NestCameraBaseEntity):
)
self._webrtc_sessions[session_id] = stream
send_message(WebRTCAnswer(stream.answer_sdp))
- refresh = StreamRefresh(
- self.hass,
- stream.expires_at,
- functools.partial(self._async_refresh_stream, session_id),
- )
- self._refresh_unsub[session_id] = refresh.unsub
-
- async def async_on_webrtc_candidate(
- self, session_id: str, candidate: RTCIceCandidate
- ) -> None:
- """Ignore WebRTC candidates for Nest cloud based cameras."""
- return
+ self._schedule_stream_refresh()
@callback
def close_webrtc_session(self, session_id: str) -> None:
@@ -316,8 +284,6 @@ class NestWebRTCEntity(NestCameraBaseEntity):
_LOGGER.debug(
"Closing WebRTC session %s, %s", session_id, stream.media_session_id
)
- unsub = self._refresh_unsub.pop(session_id)
- unsub()
async def stop_stream() -> None:
try:
diff --git a/homeassistant/components/nest/manifest.json b/homeassistant/components/nest/manifest.json
index 44eaeeaf62d..976e870cc83 100644
--- a/homeassistant/components/nest/manifest.json
+++ b/homeassistant/components/nest/manifest.json
@@ -20,5 +20,5 @@
"iot_class": "cloud_push",
"loggers": ["google_nest_sdm"],
"quality_scale": "platinum",
- "requirements": ["google-nest-sdm==6.1.5"]
+ "requirements": ["google-nest-sdm==6.1.3"]
}
diff --git a/homeassistant/components/netatmo/config_flow.py b/homeassistant/components/netatmo/config_flow.py
index d853694ffea..0da4d6f16b7 100644
--- a/homeassistant/components/netatmo/config_flow.py
+++ b/homeassistant/components/netatmo/config_flow.py
@@ -101,6 +101,7 @@ class NetatmoOptionsFlowHandler(OptionsFlow):
def __init__(self, config_entry: ConfigEntry) -> None:
"""Initialize Netatmo options flow."""
+ self.config_entry = config_entry
self.options = dict(config_entry.options)
self.options.setdefault(CONF_WEATHER_AREAS, {})
diff --git a/homeassistant/components/netgear/config_flow.py b/homeassistant/components/netgear/config_flow.py
index 965e3618645..fba934af38d 100644
--- a/homeassistant/components/netgear/config_flow.py
+++ b/homeassistant/components/netgear/config_flow.py
@@ -63,6 +63,10 @@ def _ordered_shared_schema(schema_input):
class OptionsFlowHandler(OptionsFlow):
"""Options for the component."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Init object."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, int] | None = None
) -> ConfigFlowResult:
@@ -105,7 +109,7 @@ class NetgearFlowHandler(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> OptionsFlowHandler:
"""Get the options flow."""
- return OptionsFlowHandler()
+ return OptionsFlowHandler(config_entry)
async def _show_setup_form(
self,
diff --git a/homeassistant/components/nice_go/manifest.json b/homeassistant/components/nice_go/manifest.json
index 817d7ef9bc9..d3f54e5e668 100644
--- a/homeassistant/components/nice_go/manifest.json
+++ b/homeassistant/components/nice_go/manifest.json
@@ -7,5 +7,5 @@
"integration_type": "hub",
"iot_class": "cloud_push",
"loggers": ["nice_go"],
- "requirements": ["nice-go==0.3.10"]
+ "requirements": ["nice-go==0.3.9"]
}
diff --git a/homeassistant/components/nightscout/sensor.py b/homeassistant/components/nightscout/sensor.py
index 620349ec3c3..92291bdc4f9 100644
--- a/homeassistant/components/nightscout/sensor.py
+++ b/homeassistant/components/nightscout/sensor.py
@@ -9,9 +9,9 @@ from typing import Any
from aiohttp import ClientError
from py_nightscout import Api as NightscoutAPI
-from homeassistant.components.sensor import SensorDeviceClass, SensorEntity
+from homeassistant.components.sensor import SensorEntity
from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import ATTR_DATE, UnitOfBloodGlucoseConcentration
+from homeassistant.const import ATTR_DATE
from homeassistant.core import HomeAssistant
from homeassistant.helpers.entity_platform import AddEntitiesCallback
@@ -37,10 +37,7 @@ async def async_setup_entry(
class NightscoutSensor(SensorEntity):
"""Implementation of a Nightscout sensor."""
- _attr_device_class = SensorDeviceClass.BLOOD_GLUCOSE_CONCENTRATION
- _attr_native_unit_of_measurement = (
- UnitOfBloodGlucoseConcentration.MILLIGRAMS_PER_DECILITER
- )
+ _attr_native_unit_of_measurement = "mg/dL"
_attr_icon = "mdi:cloud-question"
def __init__(self, api: NightscoutAPI, name: str, unique_id: str | None) -> None:
diff --git a/homeassistant/components/nina/config_flow.py b/homeassistant/components/nina/config_flow.py
index a1ba9ae0c61..dd4319d566b 100644
--- a/homeassistant/components/nina/config_flow.py
+++ b/homeassistant/components/nina/config_flow.py
@@ -171,7 +171,8 @@ class OptionsFlowHandler(OptionsFlow):
def __init__(self, config_entry: ConfigEntry) -> None:
"""Initialize options flow."""
- self.data = dict(config_entry.data)
+ self.config_entry = config_entry
+ self.data = dict(self.config_entry.data)
self._all_region_codes_sorted: dict[str, str] = {}
self.regions: dict[str, dict[str, Any]] = {}
diff --git a/homeassistant/components/nina/strings.json b/homeassistant/components/nina/strings.json
index 98ea88d8798..9747feaddb7 100644
--- a/homeassistant/components/nina/strings.json
+++ b/homeassistant/components/nina/strings.json
@@ -38,10 +38,12 @@
}
}
},
+ "abort": {
+ "unknown": "[%key:common::config_flow::error::unknown%]"
+ },
"error": {
"no_selection": "[%key:component::nina::config::error::no_selection%]",
- "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
- "unknown": "[%key:common::config_flow::error::unknown%]"
+ "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
}
}
}
diff --git a/homeassistant/components/nmap_tracker/config_flow.py b/homeassistant/components/nmap_tracker/config_flow.py
index e05150995aa..b724dca1a81 100644
--- a/homeassistant/components/nmap_tracker/config_flow.py
+++ b/homeassistant/components/nmap_tracker/config_flow.py
@@ -213,6 +213,6 @@ class NmapTrackerConfigFlow(ConfigFlow, domain=DOMAIN):
@staticmethod
@callback
- def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlowHandler:
+ def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlow:
"""Get the options flow for this handler."""
return OptionsFlowHandler(config_entry)
diff --git a/homeassistant/components/nobo_hub/config_flow.py b/homeassistant/components/nobo_hub/config_flow.py
index 7e1ae4c1d9b..8aed520f21e 100644
--- a/homeassistant/components/nobo_hub/config_flow.py
+++ b/homeassistant/components/nobo_hub/config_flow.py
@@ -175,7 +175,7 @@ class NoboHubConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> OptionsFlow:
"""Get the options flow for this handler."""
- return OptionsFlowHandler()
+ return OptionsFlowHandler(config_entry)
class NoboHubConnectError(HomeAssistantError):
@@ -190,6 +190,10 @@ class NoboHubConnectError(HomeAssistantError):
class OptionsFlowHandler(OptionsFlow):
"""Handles options flow for the component."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize the options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(self, user_input=None) -> ConfigFlowResult:
"""Manage the options."""
diff --git a/homeassistant/components/nordpool/__init__.py b/homeassistant/components/nordpool/__init__.py
deleted file mode 100644
index b688bf74a37..00000000000
--- a/homeassistant/components/nordpool/__init__.py
+++ /dev/null
@@ -1,29 +0,0 @@
-"""The Nord Pool component."""
-
-from __future__ import annotations
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
-from homeassistant.util import dt as dt_util
-
-from .const import PLATFORMS
-from .coordinator import NordPoolDataUpdateCoordinator
-
-type NordPoolConfigEntry = ConfigEntry[NordPoolDataUpdateCoordinator]
-
-
-async def async_setup_entry(hass: HomeAssistant, entry: NordPoolConfigEntry) -> bool:
- """Set up Nord Pool from a config entry."""
-
- coordinator = NordPoolDataUpdateCoordinator(hass, entry)
- await coordinator.fetch_data(dt_util.utcnow())
- entry.runtime_data = coordinator
-
- await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
-
- return True
-
-
-async def async_unload_entry(hass: HomeAssistant, entry: NordPoolConfigEntry) -> bool:
- """Unload Nord Pool config entry."""
- return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/nordpool/config_flow.py b/homeassistant/components/nordpool/config_flow.py
deleted file mode 100644
index 1d75d825e47..00000000000
--- a/homeassistant/components/nordpool/config_flow.py
+++ /dev/null
@@ -1,115 +0,0 @@
-"""Adds config flow for Nord Pool integration."""
-
-from __future__ import annotations
-
-from typing import Any
-
-from pynordpool import (
- Currency,
- NordPoolClient,
- NordPoolEmptyResponseError,
- NordPoolError,
-)
-from pynordpool.const import AREAS
-import voluptuous as vol
-
-from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_CURRENCY
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.selector import (
- SelectOptionDict,
- SelectSelector,
- SelectSelectorConfig,
- SelectSelectorMode,
-)
-from homeassistant.util import dt as dt_util
-
-from .const import CONF_AREAS, DEFAULT_NAME, DOMAIN
-
-SELECT_AREAS = [
- SelectOptionDict(value=area, label=name) for area, name in AREAS.items()
-]
-SELECT_CURRENCY = [currency.value for currency in Currency]
-
-DATA_SCHEMA = vol.Schema(
- {
- vol.Required(CONF_AREAS, default=[]): SelectSelector(
- SelectSelectorConfig(
- options=SELECT_AREAS,
- multiple=True,
- mode=SelectSelectorMode.DROPDOWN,
- sort=True,
- )
- ),
- vol.Required(CONF_CURRENCY, default="SEK"): SelectSelector(
- SelectSelectorConfig(
- options=SELECT_CURRENCY,
- multiple=False,
- mode=SelectSelectorMode.DROPDOWN,
- sort=True,
- )
- ),
- }
-)
-
-
-async def test_api(hass: HomeAssistant, user_input: dict[str, Any]) -> dict[str, str]:
- """Test fetch data from Nord Pool."""
- client = NordPoolClient(async_get_clientsession(hass))
- try:
- await client.async_get_delivery_period(
- dt_util.now(),
- Currency(user_input[CONF_CURRENCY]),
- user_input[CONF_AREAS],
- )
- except NordPoolEmptyResponseError:
- return {"base": "no_data"}
- except NordPoolError:
- return {"base": "cannot_connect"}
-
- return {}
-
-
-class NordpoolConfigFlow(ConfigFlow, domain=DOMAIN):
- """Handle a config flow for Nord Pool integration."""
-
- 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:
- errors = await test_api(self.hass, user_input)
- if not errors:
- return self.async_create_entry(
- title=DEFAULT_NAME,
- data=user_input,
- )
-
- return self.async_show_form(
- step_id="user",
- data_schema=DATA_SCHEMA,
- errors=errors,
- )
-
- async def async_step_reconfigure(
- self, user_input: dict[str, Any] | None = None
- ) -> ConfigFlowResult:
- """Handle the reconfiguration step."""
- errors: dict[str, str] = {}
- if user_input:
- errors = await test_api(self.hass, user_input)
- reconfigure_entry = self._get_reconfigure_entry()
- if not errors:
- return self.async_update_reload_and_abort(
- reconfigure_entry, data_updates=user_input
- )
-
- return self.async_show_form(
- step_id="reconfigure",
- data_schema=DATA_SCHEMA,
- errors=errors,
- )
diff --git a/homeassistant/components/nordpool/const.py b/homeassistant/components/nordpool/const.py
deleted file mode 100644
index 19a978d946c..00000000000
--- a/homeassistant/components/nordpool/const.py
+++ /dev/null
@@ -1,14 +0,0 @@
-"""Constants for Nord Pool."""
-
-import logging
-
-from homeassistant.const import Platform
-
-LOGGER = logging.getLogger(__package__)
-
-DEFAULT_SCAN_INTERVAL = 60
-DOMAIN = "nordpool"
-PLATFORMS = [Platform.SENSOR]
-DEFAULT_NAME = "Nord Pool"
-
-CONF_AREAS = "areas"
diff --git a/homeassistant/components/nordpool/coordinator.py b/homeassistant/components/nordpool/coordinator.py
deleted file mode 100644
index fa4e9ca2548..00000000000
--- a/homeassistant/components/nordpool/coordinator.py
+++ /dev/null
@@ -1,91 +0,0 @@
-"""DataUpdateCoordinator for the Nord Pool integration."""
-
-from __future__ import annotations
-
-from collections.abc import Callable
-from datetime import datetime, timedelta
-from typing import TYPE_CHECKING
-
-from pynordpool import (
- Currency,
- DeliveryPeriodData,
- NordPoolClient,
- NordPoolEmptyResponseError,
- NordPoolError,
- NordPoolResponseError,
-)
-
-from homeassistant.const import CONF_CURRENCY
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.event import async_track_point_in_utc_time
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
-from homeassistant.util import dt as dt_util
-
-from .const import CONF_AREAS, DOMAIN, LOGGER
-
-if TYPE_CHECKING:
- from . import NordPoolConfigEntry
-
-
-class NordPoolDataUpdateCoordinator(DataUpdateCoordinator[DeliveryPeriodData]):
- """A Nord Pool Data Update Coordinator."""
-
- config_entry: NordPoolConfigEntry
-
- def __init__(self, hass: HomeAssistant, config_entry: NordPoolConfigEntry) -> None:
- """Initialize the Nord Pool coordinator."""
- super().__init__(
- hass,
- LOGGER,
- config_entry=config_entry,
- name=DOMAIN,
- )
- self.client = NordPoolClient(session=async_get_clientsession(hass))
- self.unsub: Callable[[], None] | None = None
-
- def get_next_interval(self, now: datetime) -> datetime:
- """Compute next time an update should occur."""
- next_hour = dt_util.utcnow() + timedelta(hours=1)
- next_run = datetime(
- next_hour.year,
- next_hour.month,
- next_hour.day,
- next_hour.hour,
- tzinfo=dt_util.UTC,
- )
- LOGGER.debug("Next update at %s", next_run)
- return next_run
-
- async def async_shutdown(self) -> None:
- """Cancel any scheduled call, and ignore new runs."""
- await super().async_shutdown()
- if self.unsub:
- self.unsub()
- self.unsub = None
-
- async def fetch_data(self, now: datetime) -> None:
- """Fetch data from Nord Pool."""
- self.unsub = async_track_point_in_utc_time(
- self.hass, self.fetch_data, self.get_next_interval(dt_util.utcnow())
- )
- try:
- data = await self.client.async_get_delivery_period(
- dt_util.now(),
- Currency(self.config_entry.data[CONF_CURRENCY]),
- self.config_entry.data[CONF_AREAS],
- )
- except NordPoolEmptyResponseError as error:
- LOGGER.debug("Empty response error: %s", error)
- self.async_set_update_error(error)
- return
- except NordPoolResponseError as error:
- LOGGER.debug("Response error: %s", error)
- self.async_set_update_error(error)
- return
- except NordPoolError as error:
- LOGGER.debug("Connection error: %s", error)
- self.async_set_update_error(error)
- return
-
- self.async_set_updated_data(data)
diff --git a/homeassistant/components/nordpool/diagnostics.py b/homeassistant/components/nordpool/diagnostics.py
deleted file mode 100644
index 3160c2bfa6d..00000000000
--- a/homeassistant/components/nordpool/diagnostics.py
+++ /dev/null
@@ -1,16 +0,0 @@
-"""Diagnostics support for Nord Pool."""
-
-from __future__ import annotations
-
-from typing import Any
-
-from homeassistant.core import HomeAssistant
-
-from . import NordPoolConfigEntry
-
-
-async def async_get_config_entry_diagnostics(
- hass: HomeAssistant, entry: NordPoolConfigEntry
-) -> dict[str, Any]:
- """Return diagnostics for Nord Pool config entry."""
- return {"raw": entry.runtime_data.data.raw}
diff --git a/homeassistant/components/nordpool/entity.py b/homeassistant/components/nordpool/entity.py
deleted file mode 100644
index 32240aad12c..00000000000
--- a/homeassistant/components/nordpool/entity.py
+++ /dev/null
@@ -1,32 +0,0 @@
-"""Base entity for Nord Pool."""
-
-from __future__ import annotations
-
-from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity import EntityDescription
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
-
-from .const import DOMAIN
-from .coordinator import NordPoolDataUpdateCoordinator
-
-
-class NordpoolBaseEntity(CoordinatorEntity[NordPoolDataUpdateCoordinator]):
- """Representation of a Nord Pool base entity."""
-
- _attr_has_entity_name = True
-
- def __init__(
- self,
- coordinator: NordPoolDataUpdateCoordinator,
- entity_description: EntityDescription,
- area: str,
- ) -> None:
- """Initiate Nord Pool base entity."""
- super().__init__(coordinator)
- self.entity_description = entity_description
- self._attr_unique_id = f"{area}-{entity_description.key}"
- self.area = area
- self._attr_device_info = DeviceInfo(
- identifiers={(DOMAIN, area)},
- name=f"Nord Pool {area}",
- )
diff --git a/homeassistant/components/nordpool/icons.json b/homeassistant/components/nordpool/icons.json
deleted file mode 100644
index 85434a2d09b..00000000000
--- a/homeassistant/components/nordpool/icons.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
- "entity": {
- "sensor": {
- "updated_at": {
- "default": "mdi:clock-outline"
- },
- "currency": {
- "default": "mdi:currency-usd"
- },
- "exchange_rate": {
- "default": "mdi:currency-usd"
- },
- "current_price": {
- "default": "mdi:cash"
- },
- "last_price": {
- "default": "mdi:cash"
- },
- "next_price": {
- "default": "mdi:cash"
- },
- "block_average": {
- "default": "mdi:cash-multiple"
- },
- "block_min": {
- "default": "mdi:cash-multiple"
- },
- "block_max": {
- "default": "mdi:cash-multiple"
- },
- "block_start_time": {
- "default": "mdi:clock-time-twelve-outline"
- },
- "block_end_time": {
- "default": "mdi:clock-time-two-outline"
- },
- "daily_average": {
- "default": "mdi:cash-multiple"
- }
- }
- }
-}
diff --git a/homeassistant/components/nordpool/manifest.json b/homeassistant/components/nordpool/manifest.json
deleted file mode 100644
index bf093eb3ee9..00000000000
--- a/homeassistant/components/nordpool/manifest.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "domain": "nordpool",
- "name": "Nord Pool",
- "codeowners": ["@gjohansson-ST"],
- "config_flow": true,
- "documentation": "https://www.home-assistant.io/integrations/nordpool",
- "integration_type": "hub",
- "iot_class": "cloud_polling",
- "loggers": ["pynordpool"],
- "requirements": ["pynordpool==0.2.2"],
- "single_config_entry": true
-}
diff --git a/homeassistant/components/nordpool/sensor.py b/homeassistant/components/nordpool/sensor.py
deleted file mode 100644
index e7e655a6657..00000000000
--- a/homeassistant/components/nordpool/sensor.py
+++ /dev/null
@@ -1,328 +0,0 @@
-"""Sensor platform for Nord Pool integration."""
-
-from __future__ import annotations
-
-from collections.abc import Callable
-from dataclasses import dataclass
-from datetime import datetime, timedelta
-
-from pynordpool import DeliveryPeriodData
-
-from homeassistant.components.sensor import (
- EntityCategory,
- SensorDeviceClass,
- SensorEntity,
- SensorEntityDescription,
- SensorStateClass,
-)
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.util import dt as dt_util, slugify
-
-from . import NordPoolConfigEntry
-from .const import LOGGER
-from .coordinator import NordPoolDataUpdateCoordinator
-from .entity import NordpoolBaseEntity
-
-PARALLEL_UPDATES = 0
-
-
-def get_prices(data: DeliveryPeriodData) -> dict[str, tuple[float, float, float]]:
- """Return previous, current and next prices.
-
- Output: {"SE3": (10.0, 10.5, 12.1)}
- """
- last_price_entries: dict[str, float] = {}
- current_price_entries: dict[str, float] = {}
- next_price_entries: dict[str, float] = {}
- current_time = dt_util.utcnow()
- previous_time = current_time - timedelta(hours=1)
- next_time = current_time + timedelta(hours=1)
- price_data = data.entries
- for entry in price_data:
- if entry.start <= current_time <= entry.end:
- current_price_entries = entry.entry
- if entry.start <= previous_time <= entry.end:
- last_price_entries = entry.entry
- if entry.start <= next_time <= entry.end:
- next_price_entries = entry.entry
-
- result = {}
- for area, price in current_price_entries.items():
- result[area] = (last_price_entries[area], price, next_price_entries[area])
- LOGGER.debug("Prices: %s", result)
- return result
-
-
-def get_blockprices(
- data: DeliveryPeriodData,
-) -> dict[str, dict[str, tuple[datetime, datetime, float, float, float]]]:
- """Return average, min and max for block prices.
-
- Output: {"SE3": {"Off-peak 1": (_datetime_, _datetime_, 9.3, 10.5, 12.1)}}
- """
- result: dict[str, dict[str, tuple[datetime, datetime, float, float, float]]] = {}
- block_prices = data.block_prices
- for entry in block_prices:
- for _area in entry.average:
- if _area not in result:
- result[_area] = {}
- result[_area][entry.name] = (
- entry.start,
- entry.end,
- entry.average[_area]["average"],
- entry.average[_area]["min"],
- entry.average[_area]["max"],
- )
-
- LOGGER.debug("Block prices: %s", result)
- return result
-
-
-@dataclass(frozen=True, kw_only=True)
-class NordpoolDefaultSensorEntityDescription(SensorEntityDescription):
- """Describes Nord Pool default sensor entity."""
-
- value_fn: Callable[[DeliveryPeriodData], str | float | datetime | None]
-
-
-@dataclass(frozen=True, kw_only=True)
-class NordpoolPricesSensorEntityDescription(SensorEntityDescription):
- """Describes Nord Pool prices sensor entity."""
-
- value_fn: Callable[[tuple[float, float, float]], float | None]
-
-
-@dataclass(frozen=True, kw_only=True)
-class NordpoolBlockPricesSensorEntityDescription(SensorEntityDescription):
- """Describes Nord Pool block prices sensor entity."""
-
- value_fn: Callable[
- [tuple[datetime, datetime, float, float, float]], float | datetime | None
- ]
-
-
-DEFAULT_SENSOR_TYPES: tuple[NordpoolDefaultSensorEntityDescription, ...] = (
- NordpoolDefaultSensorEntityDescription(
- key="updated_at",
- translation_key="updated_at",
- device_class=SensorDeviceClass.TIMESTAMP,
- value_fn=lambda data: data.updated_at,
- entity_category=EntityCategory.DIAGNOSTIC,
- ),
- NordpoolDefaultSensorEntityDescription(
- key="currency",
- translation_key="currency",
- value_fn=lambda data: data.currency,
- entity_category=EntityCategory.DIAGNOSTIC,
- ),
- NordpoolDefaultSensorEntityDescription(
- key="exchange_rate",
- translation_key="exchange_rate",
- value_fn=lambda data: data.exchange_rate,
- state_class=SensorStateClass.MEASUREMENT,
- entity_registry_enabled_default=False,
- entity_category=EntityCategory.DIAGNOSTIC,
- ),
-)
-PRICES_SENSOR_TYPES: tuple[NordpoolPricesSensorEntityDescription, ...] = (
- NordpoolPricesSensorEntityDescription(
- key="current_price",
- translation_key="current_price",
- value_fn=lambda data: data[1] / 1000,
- state_class=SensorStateClass.MEASUREMENT,
- suggested_display_precision=2,
- ),
- NordpoolPricesSensorEntityDescription(
- key="last_price",
- translation_key="last_price",
- value_fn=lambda data: data[0] / 1000,
- suggested_display_precision=2,
- ),
- NordpoolPricesSensorEntityDescription(
- key="next_price",
- translation_key="next_price",
- value_fn=lambda data: data[2] / 1000,
- suggested_display_precision=2,
- ),
-)
-BLOCK_PRICES_SENSOR_TYPES: tuple[NordpoolBlockPricesSensorEntityDescription, ...] = (
- NordpoolBlockPricesSensorEntityDescription(
- key="block_average",
- translation_key="block_average",
- value_fn=lambda data: data[2] / 1000,
- state_class=SensorStateClass.MEASUREMENT,
- suggested_display_precision=2,
- entity_registry_enabled_default=False,
- ),
- NordpoolBlockPricesSensorEntityDescription(
- key="block_min",
- translation_key="block_min",
- value_fn=lambda data: data[3] / 1000,
- state_class=SensorStateClass.MEASUREMENT,
- suggested_display_precision=2,
- entity_registry_enabled_default=False,
- ),
- NordpoolBlockPricesSensorEntityDescription(
- key="block_max",
- translation_key="block_max",
- value_fn=lambda data: data[4] / 1000,
- state_class=SensorStateClass.MEASUREMENT,
- suggested_display_precision=2,
- entity_registry_enabled_default=False,
- ),
- NordpoolBlockPricesSensorEntityDescription(
- key="block_start_time",
- translation_key="block_start_time",
- value_fn=lambda data: data[0],
- device_class=SensorDeviceClass.TIMESTAMP,
- entity_registry_enabled_default=False,
- ),
- NordpoolBlockPricesSensorEntityDescription(
- key="block_end_time",
- translation_key="block_end_time",
- value_fn=lambda data: data[1],
- device_class=SensorDeviceClass.TIMESTAMP,
- entity_registry_enabled_default=False,
- ),
-)
-DAILY_AVERAGE_PRICES_SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
- SensorEntityDescription(
- key="daily_average",
- translation_key="daily_average",
- state_class=SensorStateClass.MEASUREMENT,
- suggested_display_precision=2,
- entity_registry_enabled_default=False,
- ),
-)
-
-
-async def async_setup_entry(
- hass: HomeAssistant,
- entry: NordPoolConfigEntry,
- async_add_entities: AddEntitiesCallback,
-) -> None:
- """Set up Nord Pool sensor platform."""
-
- coordinator = entry.runtime_data
-
- entities: list[NordpoolBaseEntity] = []
- currency = entry.runtime_data.data.currency
-
- for area in get_prices(entry.runtime_data.data):
- LOGGER.debug("Setting up base sensors for area %s", area)
- entities.extend(
- NordpoolSensor(coordinator, description, area)
- for description in DEFAULT_SENSOR_TYPES
- )
- LOGGER.debug(
- "Setting up price sensors for area %s with currency %s", area, currency
- )
- entities.extend(
- NordpoolPriceSensor(coordinator, description, area, currency)
- for description in PRICES_SENSOR_TYPES
- )
- entities.extend(
- NordpoolDailyAveragePriceSensor(coordinator, description, area, currency)
- for description in DAILY_AVERAGE_PRICES_SENSOR_TYPES
- )
- for block_name in get_blockprices(coordinator.data)[area]:
- LOGGER.debug(
- "Setting up block price sensors for area %s with currency %s in block %s",
- area,
- currency,
- block_name,
- )
- entities.extend(
- NordpoolBlockPriceSensor(
- coordinator, description, area, currency, block_name
- )
- for description in BLOCK_PRICES_SENSOR_TYPES
- )
- async_add_entities(entities)
-
-
-class NordpoolSensor(NordpoolBaseEntity, SensorEntity):
- """Representation of a Nord Pool sensor."""
-
- entity_description: NordpoolDefaultSensorEntityDescription
-
- @property
- def native_value(self) -> str | float | datetime | None:
- """Return value of sensor."""
- return self.entity_description.value_fn(self.coordinator.data)
-
-
-class NordpoolPriceSensor(NordpoolBaseEntity, SensorEntity):
- """Representation of a Nord Pool price sensor."""
-
- entity_description: NordpoolPricesSensorEntityDescription
-
- def __init__(
- self,
- coordinator: NordPoolDataUpdateCoordinator,
- entity_description: NordpoolPricesSensorEntityDescription,
- area: str,
- currency: str,
- ) -> None:
- """Initiate Nord Pool sensor."""
- super().__init__(coordinator, entity_description, area)
- self._attr_native_unit_of_measurement = f"{currency}/kWh"
-
- @property
- def native_value(self) -> float | None:
- """Return value of sensor."""
- return self.entity_description.value_fn(
- get_prices(self.coordinator.data)[self.area]
- )
-
-
-class NordpoolBlockPriceSensor(NordpoolBaseEntity, SensorEntity):
- """Representation of a Nord Pool block price sensor."""
-
- entity_description: NordpoolBlockPricesSensorEntityDescription
-
- def __init__(
- self,
- coordinator: NordPoolDataUpdateCoordinator,
- entity_description: NordpoolBlockPricesSensorEntityDescription,
- area: str,
- currency: str,
- block_name: str,
- ) -> None:
- """Initiate Nord Pool sensor."""
- super().__init__(coordinator, entity_description, area)
- if entity_description.device_class is not SensorDeviceClass.TIMESTAMP:
- self._attr_native_unit_of_measurement = f"{currency}/kWh"
- self._attr_unique_id = f"{slugify(block_name)}-{area}-{entity_description.key}"
- self.block_name = block_name
- self._attr_translation_placeholders = {"block": block_name}
-
- @property
- def native_value(self) -> float | datetime | None:
- """Return value of sensor."""
- return self.entity_description.value_fn(
- get_blockprices(self.coordinator.data)[self.area][self.block_name]
- )
-
-
-class NordpoolDailyAveragePriceSensor(NordpoolBaseEntity, SensorEntity):
- """Representation of a Nord Pool daily average price sensor."""
-
- entity_description: SensorEntityDescription
-
- def __init__(
- self,
- coordinator: NordPoolDataUpdateCoordinator,
- entity_description: SensorEntityDescription,
- area: str,
- currency: str,
- ) -> None:
- """Initiate Nord Pool sensor."""
- super().__init__(coordinator, entity_description, area)
- self._attr_native_unit_of_measurement = f"{currency}/kWh"
-
- @property
- def native_value(self) -> float | None:
- """Return value of sensor."""
- return self.coordinator.data.area_average[self.area] / 1000
diff --git a/homeassistant/components/nordpool/strings.json b/homeassistant/components/nordpool/strings.json
deleted file mode 100644
index 59ba009eb90..00000000000
--- a/homeassistant/components/nordpool/strings.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
- "config": {
- "abort": {
- "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]"
- },
- "error": {
- "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
- "no_data": "API connected but the response was empty"
- },
- "step": {
- "user": {
- "data": {
- "currency": "Currency",
- "areas": "Areas"
- }
- },
- "reconfigure": {
- "data": {
- "currency": "[%key:component::nordpool::config::step::user::data::currency%]",
- "areas": "[%key:component::nordpool::config::step::user::data::areas%]"
- }
- }
- }
- },
- "entity": {
- "sensor": {
- "updated_at": {
- "name": "Last updated"
- },
- "currency": {
- "name": "Currency"
- },
- "exchange_rate": {
- "name": "Exchange rate"
- },
- "current_price": {
- "name": "Current price"
- },
- "last_price": {
- "name": "Previous price"
- },
- "next_price": {
- "name": "Next price"
- },
- "block_average": {
- "name": "{block} average"
- },
- "block_min": {
- "name": "{block} lowest price"
- },
- "block_max": {
- "name": "{block} highest price"
- },
- "block_start_time": {
- "name": "{block} time from"
- },
- "block_end_time": {
- "name": "{block} time until"
- },
- "daily_average": {
- "name": "Daily average"
- }
- }
- }
-}
diff --git a/homeassistant/components/nsw_fuel_station/__init__.py b/homeassistant/components/nsw_fuel_station/__init__.py
index 85e204b6f51..76dc9d4c6ff 100644
--- a/homeassistant/components/nsw_fuel_station/__init__.py
+++ b/homeassistant/components/nsw_fuel_station/__init__.py
@@ -33,7 +33,6 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
coordinator = DataUpdateCoordinator(
hass,
_LOGGER,
- config_entry=None,
name="sensor",
update_interval=SCAN_INTERVAL,
update_method=async_update_data,
diff --git a/homeassistant/components/number/const.py b/homeassistant/components/number/const.py
index 23e3ce0910b..ad95c9b5358 100644
--- a/homeassistant/components/number/const.py
+++ b/homeassistant/components/number/const.py
@@ -17,7 +17,6 @@ from homeassistant.const import (
SIGNAL_STRENGTH_DECIBELS,
SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
UnitOfApparentPower,
- UnitOfBloodGlucoseConcentration,
UnitOfConductivity,
UnitOfDataRate,
UnitOfElectricCurrent,
@@ -110,12 +109,6 @@ class NumberDeviceClass(StrEnum):
Unit of measurement: `%`
"""
- BLOOD_GLUCOSE_CONCENTRATION = "blood_glucose_concentration"
- """Blood glucose concentration.
-
- Unit of measurement: `mg/dL`, `mmol/L`
- """
-
CO = "carbon_monoxide"
"""Carbon Monoxide gas concentration.
@@ -169,7 +162,7 @@ class NumberDeviceClass(StrEnum):
ENERGY = "energy"
"""Energy.
- Unit of measurement: `Wh`, `kWh`, `MWh`, `GWh`, `TWh`, `MJ`, `GJ`
+ Unit of measurement: `Wh`, `kWh`, `MWh`, `MJ`, `GJ`
"""
ENERGY_STORAGE = "energy_storage"
@@ -178,7 +171,7 @@ class NumberDeviceClass(StrEnum):
Use this device class for sensors measuring stored energy, for example the amount
of electric energy currently stored in a battery or the capacity of a battery.
- Unit of measurement: `Wh`, `kWh`, `MWh`, `GWh`, `TWh`, `MJ`, `GJ`
+ Unit of measurement: `Wh`, `kWh`, `MWh`, `MJ`, `GJ`
"""
FREQUENCY = "frequency"
@@ -286,7 +279,7 @@ class NumberDeviceClass(StrEnum):
POWER = "power"
"""Power.
- Unit of measurement: `W`, `kW`, `MW`, `GW`, `TW`
+ Unit of measurement: `W`, `kW`
"""
PRECIPITATION = "precipitation"
@@ -436,7 +429,6 @@ DEVICE_CLASS_UNITS: dict[NumberDeviceClass, set[type[StrEnum] | str | None]] = {
NumberDeviceClass.AQI: {None},
NumberDeviceClass.ATMOSPHERIC_PRESSURE: set(UnitOfPressure),
NumberDeviceClass.BATTERY: {PERCENTAGE},
- NumberDeviceClass.BLOOD_GLUCOSE_CONCENTRATION: set(UnitOfBloodGlucoseConcentration),
NumberDeviceClass.CO: {CONCENTRATION_PARTS_PER_MILLION},
NumberDeviceClass.CO2: {CONCENTRATION_PARTS_PER_MILLION},
NumberDeviceClass.CONDUCTIVITY: set(UnitOfConductivity),
diff --git a/homeassistant/components/number/icons.json b/homeassistant/components/number/icons.json
index 5e0fc6e44d2..a122aaecb09 100644
--- a/homeassistant/components/number/icons.json
+++ b/homeassistant/components/number/icons.json
@@ -15,9 +15,6 @@
"battery": {
"default": "mdi:battery"
},
- "blood_glucose_concentration": {
- "default": "mdi:spoon-sugar"
- },
"carbon_dioxide": {
"default": "mdi:molecule-co2"
},
diff --git a/homeassistant/components/number/strings.json b/homeassistant/components/number/strings.json
index b9aec880ecc..580385172e3 100644
--- a/homeassistant/components/number/strings.json
+++ b/homeassistant/components/number/strings.json
@@ -43,9 +43,6 @@
"battery": {
"name": "[%key:component::sensor::entity_component::battery::name%]"
},
- "blood_glucose_concentration": {
- "name": "[%key:component::sensor::entity_component::blood_glucose_concentration::name%]"
- },
"carbon_dioxide": {
"name": "[%key:component::sensor::entity_component::carbon_dioxide::name%]"
},
diff --git a/homeassistant/components/nut/__init__.py b/homeassistant/components/nut/__init__.py
index 169dbbbff5d..c9b2bcc13b2 100644
--- a/homeassistant/components/nut/__init__.py
+++ b/homeassistant/components/nut/__init__.py
@@ -130,10 +130,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: NutConfigEntry) -> bool:
name=data.name.title(),
manufacturer=data.device_info.manufacturer,
model=data.device_info.model,
- model_id=data.device_info.model_id,
sw_version=data.device_info.firmware,
- serial_number=data.device_info.serial,
- suggested_area=data.device_info.device_location,
)
await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
@@ -211,10 +208,7 @@ class NUTDeviceInfo:
manufacturer: str | None = None
model: str | None = None
- model_id: str | None = None
firmware: str | None = None
- serial: str | None = None
- device_location: str | None = None
class PyNUTData:
@@ -273,13 +267,8 @@ class PyNUTData:
manufacturer = _manufacturer_from_status(self._status)
model = _model_from_status(self._status)
- model_id: str | None = self._status.get("device.part")
firmware = _firmware_from_status(self._status)
- serial = _serial_from_status(self._status)
- device_location: str | None = self._status.get("device.location")
- return NUTDeviceInfo(
- manufacturer, model, model_id, firmware, serial, device_location
- )
+ return NUTDeviceInfo(manufacturer, model, firmware)
async def _async_get_status(self) -> dict[str, str]:
"""Get the ups status from NUT."""
diff --git a/homeassistant/components/nut/config_flow.py b/homeassistant/components/nut/config_flow.py
index 966c51e98e9..d0a2da124a6 100644
--- a/homeassistant/components/nut/config_flow.py
+++ b/homeassistant/components/nut/config_flow.py
@@ -235,12 +235,16 @@ class NutConfigFlow(ConfigFlow, domain=DOMAIN):
@callback
def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlow:
"""Get the options flow for this handler."""
- return OptionsFlowHandler()
+ return OptionsFlowHandler(config_entry)
class OptionsFlowHandler(OptionsFlow):
"""Handle a option flow for nut."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/nut/sensor.py b/homeassistant/components/nut/sensor.py
index bb702873052..7f211d5452b 100644
--- a/homeassistant/components/nut/sensor.py
+++ b/homeassistant/components/nut/sensor.py
@@ -15,7 +15,6 @@ from homeassistant.components.sensor import (
from homeassistant.const import (
ATTR_MANUFACTURER,
ATTR_MODEL,
- ATTR_SERIAL_NUMBER,
ATTR_SW_VERSION,
PERCENTAGE,
STATE_UNKNOWN,
@@ -43,7 +42,6 @@ NUT_DEV_INFO_TO_DEV_INFO: dict[str, str] = {
"manufacturer": ATTR_MANUFACTURER,
"model": ATTR_MODEL,
"firmware": ATTR_SW_VERSION,
- "serial": ATTR_SERIAL_NUMBER,
}
_LOGGER = logging.getLogger(__name__)
diff --git a/homeassistant/components/ollama/config_flow.py b/homeassistant/components/ollama/config_flow.py
index 1024a824c25..65b8efaf525 100644
--- a/homeassistant/components/ollama/config_flow.py
+++ b/homeassistant/components/ollama/config_flow.py
@@ -207,8 +207,9 @@ class OllamaOptionsFlow(OptionsFlow):
def __init__(self, config_entry: ConfigEntry) -> None:
"""Initialize options flow."""
- self.url: str = config_entry.data[CONF_URL]
- self.model: str = config_entry.data[CONF_MODEL]
+ self.config_entry = config_entry
+ self.url: str = self.config_entry.data[CONF_URL]
+ self.model: str = self.config_entry.data[CONF_MODEL]
async def async_step_init(
self, user_input: dict[str, Any] | None = None
diff --git a/homeassistant/components/ollama/strings.json b/homeassistant/components/ollama/strings.json
index 248cac34f11..c307f160228 100644
--- a/homeassistant/components/ollama/strings.json
+++ b/homeassistant/components/ollama/strings.json
@@ -11,11 +11,9 @@
"title": "Downloading model"
}
},
- "abort": {
- "download_failed": "Model downloading failed"
- },
"error": {
"cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+ "download_failed": "Model downloading failed",
"unknown": "[%key:common::config_flow::error::unknown%]"
},
"progress": {
diff --git a/homeassistant/components/omnilogic/config_flow.py b/homeassistant/components/omnilogic/config_flow.py
index dfbd010ea98..489c8e6f601 100644
--- a/homeassistant/components/omnilogic/config_flow.py
+++ b/homeassistant/components/omnilogic/config_flow.py
@@ -34,7 +34,7 @@ class OmniLogicConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> OptionsFlowHandler:
"""Get the options flow for this handler."""
- return OptionsFlowHandler()
+ return OptionsFlowHandler(config_entry)
async def async_step_user(
self, user_input: dict[str, Any] | None = None
@@ -78,6 +78,10 @@ class OmniLogicConfigFlow(ConfigFlow, domain=DOMAIN):
class OptionsFlowHandler(OptionsFlow):
"""Handle Omnilogic client options."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/onewire/config_flow.py b/homeassistant/components/onewire/config_flow.py
index abb4c884974..a217674e3b4 100644
--- a/homeassistant/components/onewire/config_flow.py
+++ b/homeassistant/components/onewire/config_flow.py
@@ -2,7 +2,6 @@
from __future__ import annotations
-from copy import deepcopy
from typing import Any
import voluptuous as vol
@@ -11,7 +10,7 @@ from homeassistant.config_entries import (
ConfigEntry,
ConfigFlow,
ConfigFlowResult,
- OptionsFlow,
+ OptionsFlowWithConfigEntry,
)
from homeassistant.const import CONF_HOST, CONF_PORT
from homeassistant.core import HomeAssistant, callback
@@ -101,14 +100,12 @@ class OneWireFlowHandler(ConfigFlow, domain=DOMAIN):
@staticmethod
@callback
- def async_get_options_flow(
- config_entry: ConfigEntry,
- ) -> OnewireOptionsFlowHandler:
+ def async_get_options_flow(config_entry: ConfigEntry) -> OnewireOptionsFlowHandler:
"""Get the options flow for this handler."""
return OnewireOptionsFlowHandler(config_entry)
-class OnewireOptionsFlowHandler(OptionsFlow):
+class OnewireOptionsFlowHandler(OptionsFlowWithConfigEntry):
"""Handle OneWire Config options."""
configurable_devices: dict[str, str]
@@ -126,10 +123,6 @@ class OnewireOptionsFlowHandler(OptionsFlow):
current_device: str
"""Friendly name of the currently selected device."""
- def __init__(self, config_entry: ConfigEntry) -> None:
- """Initialize options flow."""
- self.options = deepcopy(dict(config_entry.options))
-
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/onkyo/config_flow.py b/homeassistant/components/onkyo/config_flow.py
index a8ced6fae64..4c5de362172 100644
--- a/homeassistant/components/onkyo/config_flow.py
+++ b/homeassistant/components/onkyo/config_flow.py
@@ -11,6 +11,7 @@ from homeassistant.config_entries import (
ConfigFlow,
ConfigFlowResult,
OptionsFlow,
+ OptionsFlowWithConfigEntry,
)
from homeassistant.const import CONF_HOST, CONF_NAME
from homeassistant.core import callback
@@ -322,13 +323,16 @@ class OnkyoConfigFlow(ConfigFlow, domain=DOMAIN):
return OnkyoOptionsFlowHandler(config_entry)
-class OnkyoOptionsFlowHandler(OptionsFlow):
+class OnkyoOptionsFlowHandler(OptionsFlowWithConfigEntry):
"""Handle an options flow for Onkyo."""
def __init__(self, config_entry: ConfigEntry) -> None:
"""Initialize options flow."""
- sources_store: dict[str, str] = config_entry.options[OPTION_INPUT_SOURCES]
- self._input_sources = {InputSource(k): v for k, v in sources_store.items()}
+ super().__init__(config_entry)
+
+ sources_store: dict[str, str] = self.options[OPTION_INPUT_SOURCES]
+ sources = {InputSource(k): v for k, v in sources_store.items()}
+ self.options[OPTION_INPUT_SOURCES] = sources
async def async_step_init(
self, user_input: dict[str, Any] | None = None
@@ -343,9 +347,7 @@ class OnkyoOptionsFlowHandler(OptionsFlow):
return self.async_create_entry(
data={
- OPTION_VOLUME_RESOLUTION: self.config_entry.options[
- OPTION_VOLUME_RESOLUTION
- ],
+ OPTION_VOLUME_RESOLUTION: self.options[OPTION_VOLUME_RESOLUTION],
OPTION_MAX_VOLUME: user_input[OPTION_MAX_VOLUME],
OPTION_INPUT_SOURCES: sources_store,
}
@@ -353,19 +355,22 @@ class OnkyoOptionsFlowHandler(OptionsFlow):
schema_dict: dict[Any, Selector] = {}
- max_volume: float = self.config_entry.options[OPTION_MAX_VOLUME]
+ max_volume: float = self.options[OPTION_MAX_VOLUME]
schema_dict[vol.Required(OPTION_MAX_VOLUME, default=max_volume)] = (
NumberSelector(
NumberSelectorConfig(min=1, max=100, mode=NumberSelectorMode.BOX)
)
)
- for source, source_name in self._input_sources.items():
- schema_dict[vol.Required(source.value_meaning, default=source_name)] = (
+ sources: dict[InputSource, str] = self.options[OPTION_INPUT_SOURCES]
+ for source in sources:
+ schema_dict[vol.Required(source.value_meaning, default=sources[source])] = (
TextSelector()
)
+ schema = vol.Schema(schema_dict)
+
return self.async_show_form(
step_id="init",
- data_schema=vol.Schema(schema_dict),
+ data_schema=schema,
)
diff --git a/homeassistant/components/onvif/config_flow.py b/homeassistant/components/onvif/config_flow.py
index 66e566af0bf..34f322b9f75 100644
--- a/homeassistant/components/onvif/config_flow.py
+++ b/homeassistant/components/onvif/config_flow.py
@@ -391,6 +391,7 @@ class OnvifOptionsFlowHandler(OptionsFlow):
def __init__(self, config_entry: ConfigEntry) -> None:
"""Initialize ONVIF options flow."""
+ self.config_entry = config_entry
self.options = dict(config_entry.options)
async def async_step_init(self, user_input: None = None) -> ConfigFlowResult:
diff --git a/homeassistant/components/openai_conversation/config_flow.py b/homeassistant/components/openai_conversation/config_flow.py
index 2a1764e6b5e..c6b8487ad0d 100644
--- a/homeassistant/components/openai_conversation/config_flow.py
+++ b/homeassistant/components/openai_conversation/config_flow.py
@@ -115,6 +115,7 @@ class OpenAIOptionsFlow(OptionsFlow):
def __init__(self, config_entry: ConfigEntry) -> None:
"""Initialize options flow."""
+ self.config_entry = config_entry
self.last_rendered_recommended = config_entry.options.get(
CONF_RECOMMENDED, False
)
diff --git a/homeassistant/components/opensky/config_flow.py b/homeassistant/components/opensky/config_flow.py
index 867a4781265..3cfd1ad30a0 100644
--- a/homeassistant/components/opensky/config_flow.py
+++ b/homeassistant/components/opensky/config_flow.py
@@ -13,11 +13,12 @@ from homeassistant.config_entries import (
ConfigEntry,
ConfigFlow,
ConfigFlowResult,
- OptionsFlow,
+ OptionsFlowWithConfigEntry,
)
from homeassistant.const import (
CONF_LATITUDE,
CONF_LONGITUDE,
+ CONF_NAME,
CONF_PASSWORD,
CONF_RADIUS,
CONF_USERNAME,
@@ -44,7 +45,7 @@ class OpenSkyConfigFlowHandler(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> OpenSkyOptionsFlowHandler:
"""Get the options flow for this handler."""
- return OpenSkyOptionsFlowHandler()
+ return OpenSkyOptionsFlowHandler(config_entry)
async def async_step_user(
self, user_input: dict[str, Any] | None = None
@@ -82,7 +83,7 @@ class OpenSkyConfigFlowHandler(ConfigFlow, domain=DOMAIN):
)
-class OpenSkyOptionsFlowHandler(OptionsFlow):
+class OpenSkyOptionsFlowHandler(OptionsFlowWithConfigEntry):
"""OpenSky Options flow handler."""
async def async_step_init(
@@ -111,7 +112,10 @@ class OpenSkyOptionsFlowHandler(OptionsFlow):
except OpenSkyUnauthenticatedError:
errors["base"] = "invalid_auth"
if not errors:
- return self.async_create_entry(data=user_input)
+ return self.async_create_entry(
+ title=self.options.get(CONF_NAME, "OpenSky"),
+ data=user_input,
+ )
return self.async_show_form(
step_id="init",
@@ -126,6 +130,6 @@ class OpenSkyOptionsFlowHandler(OptionsFlow):
vol.Optional(CONF_CONTRIBUTING_USER, default=False): bool,
}
),
- user_input or self.config_entry.options,
+ user_input or self.options,
),
)
diff --git a/homeassistant/components/opentherm_gw/config_flow.py b/homeassistant/components/opentherm_gw/config_flow.py
index 80c16ee88e1..1f52b47cbad 100644
--- a/homeassistant/components/opentherm_gw/config_flow.py
+++ b/homeassistant/components/opentherm_gw/config_flow.py
@@ -49,7 +49,7 @@ class OpenThermGwConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> OpenThermGwOptionsFlow:
"""Get the options flow for this handler."""
- return OpenThermGwOptionsFlow()
+ return OpenThermGwOptionsFlow(config_entry)
async def async_step_init(
self, info: dict[str, Any] | None = None
@@ -132,6 +132,10 @@ class OpenThermGwConfigFlow(ConfigFlow, domain=DOMAIN):
class OpenThermGwOptionsFlow(OptionsFlow):
"""Handle opentherm_gw options."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize the options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/openweathermap/config_flow.py b/homeassistant/components/openweathermap/config_flow.py
index 8d33e117287..5fe06ea2dcd 100644
--- a/homeassistant/components/openweathermap/config_flow.py
+++ b/homeassistant/components/openweathermap/config_flow.py
@@ -44,7 +44,7 @@ class OpenWeatherMapConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> OpenWeatherMapOptionsFlow:
"""Get the options flow for this handler."""
- return OpenWeatherMapOptionsFlow()
+ return OpenWeatherMapOptionsFlow(config_entry)
async def async_step_user(self, user_input=None) -> ConfigFlowResult:
"""Handle a flow initialized by the user."""
@@ -97,6 +97,10 @@ class OpenWeatherMapConfigFlow(ConfigFlow, domain=DOMAIN):
class OpenWeatherMapOptionsFlow(OptionsFlow):
"""Handle options."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(self, user_input: dict | None = None) -> ConfigFlowResult:
"""Manage the options."""
if user_input is not None:
diff --git a/homeassistant/components/p1_monitor/config_flow.py b/homeassistant/components/p1_monitor/config_flow.py
index a7ede186d72..055973e8e37 100644
--- a/homeassistant/components/p1_monitor/config_flow.py
+++ b/homeassistant/components/p1_monitor/config_flow.py
@@ -57,13 +57,10 @@ class P1MonitorFlowHandler(ConfigFlow, domain=DOMAIN):
data_schema=vol.Schema(
{
vol.Required(CONF_HOST): TextSelector(),
- vol.Required(CONF_PORT, default=80): vol.All(
- NumberSelector(
- NumberSelectorConfig(
- min=1, max=65535, mode=NumberSelectorMode.BOX
- ),
- ),
- vol.Coerce(int),
+ vol.Required(CONF_PORT, default=80): NumberSelector(
+ NumberSelectorConfig(
+ mode=NumberSelectorMode.BOX,
+ )
),
}
),
diff --git a/homeassistant/components/palazzetti/config_flow.py b/homeassistant/components/palazzetti/config_flow.py
index fe892b6624d..a58461b9ca7 100644
--- a/homeassistant/components/palazzetti/config_flow.py
+++ b/homeassistant/components/palazzetti/config_flow.py
@@ -6,7 +6,6 @@ from pypalazzetti.client import PalazzettiClient
from pypalazzetti.exceptions import CommunicationError
import voluptuous as vol
-from homeassistant.components import dhcp
from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
from homeassistant.const import CONF_HOST
from homeassistant.helpers import device_registry as dr
@@ -17,8 +16,6 @@ from .const import DOMAIN, LOGGER
class PalazzettiConfigFlow(ConfigFlow, domain=DOMAIN):
"""Palazzetti config flow."""
- _discovered_device: PalazzettiClient
-
async def async_step_user(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
@@ -51,41 +48,3 @@ class PalazzettiConfigFlow(ConfigFlow, domain=DOMAIN):
data_schema=vol.Schema({vol.Required(CONF_HOST): str}),
errors=errors,
)
-
- async def async_step_dhcp(
- self, discovery_info: dhcp.DhcpServiceInfo
- ) -> ConfigFlowResult:
- """Handle DHCP discovery."""
-
- LOGGER.debug(
- "DHCP discovery detected Palazzetti: %s", discovery_info.macaddress
- )
-
- await self.async_set_unique_id(dr.format_mac(discovery_info.macaddress))
- self._abort_if_unique_id_configured()
- self._discovered_device = PalazzettiClient(hostname=discovery_info.ip)
- try:
- await self._discovered_device.connect()
- except CommunicationError:
- return self.async_abort(reason="cannot_connect")
-
- return await self.async_step_discovery_confirm()
-
- async def async_step_discovery_confirm(
- self, user_input: dict[str, Any] | None = None
- ) -> ConfigFlowResult:
- """Confirm discovery."""
- if user_input is not None:
- return self.async_create_entry(
- title=self._discovered_device.name,
- data={CONF_HOST: self._discovered_device.host},
- )
-
- self._set_confirm_only()
- return self.async_show_form(
- step_id="discovery_confirm",
- description_placeholders={
- "name": self._discovered_device.name,
- "host": self._discovered_device.host,
- },
- )
diff --git a/homeassistant/components/palazzetti/manifest.json b/homeassistant/components/palazzetti/manifest.json
index aff82275e2e..a1b25f563bf 100644
--- a/homeassistant/components/palazzetti/manifest.json
+++ b/homeassistant/components/palazzetti/manifest.json
@@ -3,17 +3,8 @@
"name": "Palazzetti",
"codeowners": ["@dotvav"],
"config_flow": true,
- "dhcp": [
- {
- "hostname": "connbox*",
- "macaddress": "40F3857*"
- },
- {
- "registered_devices": true
- }
- ],
"documentation": "https://www.home-assistant.io/integrations/palazzetti",
"integration_type": "device",
"iot_class": "local_polling",
- "requirements": ["pypalazzetti==0.1.11"]
+ "requirements": ["pypalazzetti==0.1.10"]
}
diff --git a/homeassistant/components/palazzetti/strings.json b/homeassistant/components/palazzetti/strings.json
index cc10c8ed5c6..fdf50f29f0d 100644
--- a/homeassistant/components/palazzetti/strings.json
+++ b/homeassistant/components/palazzetti/strings.json
@@ -8,9 +8,6 @@
"data_description": {
"host": "The host name or the IP address of the Palazzetti CBox"
}
- },
- "discovery_confirm": {
- "description": "Do you want to add {name} ({host}) to Home Assistant?"
}
},
"abort": {
diff --git a/homeassistant/components/ping/config_flow.py b/homeassistant/components/ping/config_flow.py
index 4f2adb0d2c0..9470b2134d4 100644
--- a/homeassistant/components/ping/config_flow.py
+++ b/homeassistant/components/ping/config_flow.py
@@ -66,12 +66,16 @@ class PingConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> OptionsFlow:
"""Create the options flow."""
- return OptionsFlowHandler()
+ return OptionsFlowHandler(config_entry)
class OptionsFlowHandler(OptionsFlow):
"""Handle an options flow for Ping."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/plaato/config_flow.py b/homeassistant/components/plaato/config_flow.py
index f398a733cd6..74967c417a4 100644
--- a/homeassistant/components/plaato/config_flow.py
+++ b/homeassistant/components/plaato/config_flow.py
@@ -176,19 +176,23 @@ class PlaatoConfigFlow(ConfigFlow, domain=DOMAIN):
@staticmethod
@callback
- def async_get_options_flow(
- config_entry: ConfigEntry,
- ) -> PlaatoOptionsFlowHandler:
+ def async_get_options_flow(config_entry: ConfigEntry) -> PlaatoOptionsFlowHandler:
"""Get the options flow for this handler."""
- return PlaatoOptionsFlowHandler()
+ return PlaatoOptionsFlowHandler(config_entry)
class PlaatoOptionsFlowHandler(OptionsFlow):
"""Handle Plaato options."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize domain options flow."""
+ super().__init__()
+
+ self._config_entry = config_entry
+
async def async_step_init(self, user_input: None = None) -> ConfigFlowResult:
"""Manage the options."""
- use_webhook = self.config_entry.data.get(CONF_USE_WEBHOOK, False)
+ use_webhook = self._config_entry.data.get(CONF_USE_WEBHOOK, False)
if use_webhook:
return await self.async_step_webhook()
@@ -207,7 +211,7 @@ class PlaatoOptionsFlowHandler(OptionsFlow):
{
vol.Optional(
CONF_SCAN_INTERVAL,
- default=self.config_entry.options.get(
+ default=self._config_entry.options.get(
CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL
),
): cv.positive_int
@@ -222,7 +226,7 @@ class PlaatoOptionsFlowHandler(OptionsFlow):
if user_input is not None:
return self.async_create_entry(title="", data=user_input)
- webhook_id = self.config_entry.data.get(CONF_WEBHOOK_ID, None)
+ webhook_id = self._config_entry.data.get(CONF_WEBHOOK_ID, None)
webhook_url = (
""
if webhook_id is None
diff --git a/homeassistant/components/plex/config_flow.py b/homeassistant/components/plex/config_flow.py
index ae7cbb12574..fcd5751effb 100644
--- a/homeassistant/components/plex/config_flow.py
+++ b/homeassistant/components/plex/config_flow.py
@@ -3,7 +3,7 @@
from __future__ import annotations
from collections.abc import Mapping
-from copy import deepcopy
+import copy
import logging
from typing import TYPE_CHECKING, Any
@@ -385,7 +385,7 @@ class PlexOptionsFlowHandler(OptionsFlow):
def __init__(self, config_entry: ConfigEntry) -> None:
"""Initialize Plex options flow."""
- self.options = deepcopy(dict(config_entry.options))
+ self.options = copy.deepcopy(dict(config_entry.options))
self.server_id = config_entry.data[CONF_SERVER_IDENTIFIER]
async def async_step_init(self, user_input: None = None) -> ConfigFlowResult:
diff --git a/homeassistant/components/plugwise/config_flow.py b/homeassistant/components/plugwise/config_flow.py
index 57abb1ccb86..b0d68aaa33b 100644
--- a/homeassistant/components/plugwise/config_flow.py
+++ b/homeassistant/components/plugwise/config_flow.py
@@ -71,6 +71,7 @@ async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> Smile:
password=data[CONF_PASSWORD],
port=data[CONF_PORT],
username=data[CONF_USERNAME],
+ timeout=30,
websession=websession,
)
await api.connect()
diff --git a/homeassistant/components/plugwise/coordinator.py b/homeassistant/components/plugwise/coordinator.py
index b897a8bf833..da2ef810d35 100644
--- a/homeassistant/components/plugwise/coordinator.py
+++ b/homeassistant/components/plugwise/coordinator.py
@@ -54,6 +54,7 @@ class PlugwiseDataUpdateCoordinator(DataUpdateCoordinator[PlugwiseData]):
username=self.config_entry.data.get(CONF_USERNAME, DEFAULT_USERNAME),
password=self.config_entry.data[CONF_PASSWORD],
port=self.config_entry.data.get(CONF_PORT, DEFAULT_PORT),
+ timeout=30,
websession=async_get_clientsession(hass, verify_ssl=False),
)
self._current_devices: set[str] = set()
diff --git a/homeassistant/components/plugwise/manifest.json b/homeassistant/components/plugwise/manifest.json
index dbbad15c0dc..a4253a30cb5 100644
--- a/homeassistant/components/plugwise/manifest.json
+++ b/homeassistant/components/plugwise/manifest.json
@@ -7,6 +7,6 @@
"integration_type": "hub",
"iot_class": "local_polling",
"loggers": ["plugwise"],
- "requirements": ["plugwise==1.5.0"],
+ "requirements": ["plugwise==1.4.4"],
"zeroconf": ["_plugwise._tcp.local."]
}
diff --git a/homeassistant/components/powerwall/config_flow.py b/homeassistant/components/powerwall/config_flow.py
index 0c39392ca19..bacbff63211 100644
--- a/homeassistant/components/powerwall/config_flow.py
+++ b/homeassistant/components/powerwall/config_flow.py
@@ -251,8 +251,8 @@ class PowerwallConfigFlow(ConfigFlow, domain=DOMAIN):
"""Handle reauth confirmation."""
errors: dict[str, str] | None = {}
description_placeholders: dict[str, str] = {}
- reauth_entry = self._get_reauth_entry()
if user_input is not None:
+ reauth_entry = self._get_reauth_entry()
errors, _, description_placeholders = await self._async_try_connect(
{CONF_IP_ADDRESS: reauth_entry.data[CONF_IP_ADDRESS], **user_input}
)
@@ -261,10 +261,6 @@ class PowerwallConfigFlow(ConfigFlow, domain=DOMAIN):
reauth_entry, data_updates=user_input
)
- self.context["title_placeholders"] = {
- "name": reauth_entry.title,
- "ip_address": reauth_entry.data[CONF_IP_ADDRESS],
- }
return self.async_show_form(
step_id="reauth_confirm",
data_schema=vol.Schema({vol.Optional(CONF_PASSWORD): str}),
diff --git a/homeassistant/components/profiler/__init__.py b/homeassistant/components/profiler/__init__.py
index 389e3384ad9..9b2b9736574 100644
--- a/homeassistant/components/profiler/__init__.py
+++ b/homeassistant/components/profiler/__init__.py
@@ -436,10 +436,6 @@ async def _async_generate_memory_profile(hass: HomeAssistant, call: ServiceCall)
# Imports deferred to avoid loading modules
# in memory since usually only one part of this
# integration is used at a time
- if sys.version_info >= (3, 13):
- raise HomeAssistantError(
- "Memory profiling is not supported on Python 3.13. Please use Python 3.12."
- )
from guppy import hpy # pylint: disable=import-outside-toplevel
start_time = int(time.time() * 1000000)
diff --git a/homeassistant/components/profiler/manifest.json b/homeassistant/components/profiler/manifest.json
index 8d2814c8c7f..9f27ee7f7d0 100644
--- a/homeassistant/components/profiler/manifest.json
+++ b/homeassistant/components/profiler/manifest.json
@@ -7,7 +7,7 @@
"quality_scale": "internal",
"requirements": [
"pyprof2calltree==1.4.5",
- "guppy3==3.1.4.post1;python_version<'3.13'",
+ "guppy3==3.1.4.post1",
"objgraph==3.5.0"
],
"single_config_entry": true
diff --git a/homeassistant/components/proximity/config_flow.py b/homeassistant/components/proximity/config_flow.py
index 5818ec2979b..1758b182ad7 100644
--- a/homeassistant/components/proximity/config_flow.py
+++ b/homeassistant/components/proximity/config_flow.py
@@ -89,7 +89,7 @@ class ProximityConfigFlow(ConfigFlow, domain=DOMAIN):
@callback
def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlow:
"""Get the options flow for this handler."""
- return ProximityOptionsFlow()
+ return ProximityOptionsFlow(config_entry)
async def async_step_user(
self, user_input: dict[str, Any] | None = None
@@ -121,6 +121,10 @@ class ProximityConfigFlow(ConfigFlow, domain=DOMAIN):
class ProximityOptionsFlow(OptionsFlow):
"""Handle a option flow."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize options flow."""
+ self.config_entry = config_entry
+
def _user_form_schema(self, user_input: dict[str, Any]) -> vol.Schema:
return vol.Schema(_base_schema(user_input))
diff --git a/homeassistant/components/proxy/manifest.json b/homeassistant/components/proxy/manifest.json
index f13799422df..1e70c4d3e10 100644
--- a/homeassistant/components/proxy/manifest.json
+++ b/homeassistant/components/proxy/manifest.json
@@ -3,5 +3,5 @@
"name": "Camera Proxy",
"codeowners": [],
"documentation": "https://www.home-assistant.io/integrations/proxy",
- "requirements": ["Pillow==11.0.0"]
+ "requirements": ["Pillow==10.4.0"]
}
diff --git a/homeassistant/components/purpleair/config_flow.py b/homeassistant/components/purpleair/config_flow.py
index 3ca7870b3cb..6337431ecea 100644
--- a/homeassistant/components/purpleair/config_flow.py
+++ b/homeassistant/components/purpleair/config_flow.py
@@ -209,7 +209,7 @@ class PurpleAirConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> PurpleAirOptionsFlowHandler:
"""Define the config flow to handle options."""
- return PurpleAirOptionsFlowHandler()
+ return PurpleAirOptionsFlowHandler(config_entry)
async def async_step_by_coordinates(
self, user_input: dict[str, Any] | None = None
@@ -315,9 +315,10 @@ class PurpleAirConfigFlow(ConfigFlow, domain=DOMAIN):
class PurpleAirOptionsFlowHandler(OptionsFlow):
"""Handle a PurpleAir options flow."""
- def __init__(self) -> None:
+ def __init__(self, config_entry: ConfigEntry) -> None:
"""Initialize."""
self._flow_data: dict[str, Any] = {}
+ self.config_entry = config_entry
@property
def settings_schema(self) -> vol.Schema:
diff --git a/homeassistant/components/pvpc_hourly_pricing/config_flow.py b/homeassistant/components/pvpc_hourly_pricing/config_flow.py
index 3c6b510004a..67f9de458d0 100644
--- a/homeassistant/components/pvpc_hourly_pricing/config_flow.py
+++ b/homeassistant/components/pvpc_hourly_pricing/config_flow.py
@@ -13,7 +13,7 @@ from homeassistant.config_entries import (
ConfigEntry,
ConfigFlow,
ConfigFlowResult,
- OptionsFlow,
+ OptionsFlowWithConfigEntry,
)
from homeassistant.const import CONF_API_TOKEN, CONF_NAME
from homeassistant.core import callback
@@ -56,7 +56,7 @@ class TariffSelectorConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> PVPCOptionsFlowHandler:
"""Get the options flow for this handler."""
- return PVPCOptionsFlowHandler()
+ return PVPCOptionsFlowHandler(config_entry)
async def async_step_user(
self, user_input: dict[str, Any] | None = None
@@ -178,7 +178,7 @@ class TariffSelectorConfigFlow(ConfigFlow, domain=DOMAIN):
return self.async_show_form(step_id="reauth_confirm", data_schema=data_schema)
-class PVPCOptionsFlowHandler(OptionsFlow):
+class PVPCOptionsFlowHandler(OptionsFlowWithConfigEntry):
"""Handle PVPC options."""
_power: float | None = None
@@ -199,7 +199,7 @@ class PVPCOptionsFlowHandler(OptionsFlow):
)
# Fill options with entry data
- api_token = self.config_entry.options.get(
+ api_token = self.options.get(
CONF_API_TOKEN, self.config_entry.data.get(CONF_API_TOKEN)
)
return self.async_show_form(
@@ -229,11 +229,13 @@ class PVPCOptionsFlowHandler(OptionsFlow):
)
# Fill options with entry data
- options = self.config_entry.options
- data = self.config_entry.data
- power = options.get(ATTR_POWER, data[ATTR_POWER])
- power_valley = options.get(ATTR_POWER_P3, data[ATTR_POWER_P3])
- api_token = options.get(CONF_API_TOKEN, data.get(CONF_API_TOKEN))
+ power = self.options.get(ATTR_POWER, self.config_entry.data[ATTR_POWER])
+ power_valley = self.options.get(
+ ATTR_POWER_P3, self.config_entry.data[ATTR_POWER_P3]
+ )
+ api_token = self.options.get(
+ CONF_API_TOKEN, self.config_entry.data.get(CONF_API_TOKEN)
+ )
use_api_token = api_token is not None
schema = vol.Schema(
{
diff --git a/homeassistant/components/qnap/sensor.py b/homeassistant/components/qnap/sensor.py
index 383a4e5f572..526516bfcdd 100644
--- a/homeassistant/components/qnap/sensor.py
+++ b/homeassistant/components/qnap/sensor.py
@@ -13,6 +13,7 @@ from homeassistant.components.sensor import (
SensorStateClass,
)
from homeassistant.const import (
+ ATTR_NAME,
PERCENTAGE,
EntityCategory,
UnitOfDataRate,
@@ -374,6 +375,17 @@ class QNAPMemorySensor(QNAPSensor):
return None
+ # Deprecated since Home Assistant 2024.6.0
+ # Can be removed completely in 2024.12.0
+ @property
+ def extra_state_attributes(self) -> dict[str, Any] | None:
+ """Return the state attributes."""
+ if self.coordinator.data:
+ data = self.coordinator.data["system_stats"]["memory"]
+ size = round(float(data["total"]) / 1024, 2)
+ return {ATTR_MEMORY_SIZE: f"{size} {UnitOfInformation.GIBIBYTES}"}
+ return None
+
class QNAPNetworkSensor(QNAPSensor):
"""A QNAP sensor that monitors network stats."""
@@ -402,6 +414,22 @@ class QNAPNetworkSensor(QNAPSensor):
return None
+ # Deprecated since Home Assistant 2024.6.0
+ # Can be removed completely in 2024.12.0
+ @property
+ def extra_state_attributes(self) -> dict[str, Any] | None:
+ """Return the state attributes."""
+ if self.coordinator.data:
+ data = self.coordinator.data["system_stats"]["nics"][self.monitor_device]
+ return {
+ ATTR_IP: data["ip"],
+ ATTR_MASK: data["mask"],
+ ATTR_MAC: data["mac"],
+ ATTR_MAX_SPEED: data["max_speed"],
+ ATTR_PACKETS_ERR: data["err_packets"],
+ }
+ return None
+
class QNAPSystemSensor(QNAPSensor):
"""A QNAP sensor that monitors overall system health."""
@@ -427,6 +455,25 @@ class QNAPSystemSensor(QNAPSensor):
return None
+ # Deprecated since Home Assistant 2024.6.0
+ # Can be removed completely in 2024.12.0
+ @property
+ def extra_state_attributes(self) -> dict[str, Any] | None:
+ """Return the state attributes."""
+ if self.coordinator.data:
+ data = self.coordinator.data["system_stats"]
+ days = int(data["uptime"]["days"])
+ hours = int(data["uptime"]["hours"])
+ minutes = int(data["uptime"]["minutes"])
+
+ return {
+ ATTR_NAME: data["system"]["name"],
+ ATTR_MODEL: data["system"]["model"],
+ ATTR_SERIAL: data["system"]["serial_number"],
+ ATTR_UPTIME: f"{days:0>2d}d {hours:0>2d}h {minutes:0>2d}m",
+ }
+ return None
+
class QNAPDriveSensor(QNAPSensor):
"""A QNAP sensor that monitors HDD/SSD drive stats."""
@@ -486,3 +533,17 @@ class QNAPVolumeSensor(QNAPSensor):
return used_gb / total_gb * 100
return None
+
+ # Deprecated since Home Assistant 2024.6.0
+ # Can be removed completely in 2024.12.0
+ @property
+ def extra_state_attributes(self) -> dict[str, Any] | None:
+ """Return the state attributes."""
+ if self.coordinator.data:
+ data = self.coordinator.data["volumes"][self.monitor_device]
+ total_gb = int(data["total_size"]) / 1024 / 1024 / 1024
+
+ return {
+ ATTR_VOLUME_SIZE: f"{round(total_gb, 1)} {UnitOfInformation.GIBIBYTES}"
+ }
+ return None
diff --git a/homeassistant/components/qrcode/manifest.json b/homeassistant/components/qrcode/manifest.json
index 3fcc895c2b9..14f2d093f37 100644
--- a/homeassistant/components/qrcode/manifest.json
+++ b/homeassistant/components/qrcode/manifest.json
@@ -5,5 +5,5 @@
"documentation": "https://www.home-assistant.io/integrations/qrcode",
"iot_class": "calculated",
"loggers": ["pyzbar"],
- "requirements": ["Pillow==11.0.0", "pyzbar==0.1.7"]
+ "requirements": ["Pillow==10.4.0", "pyzbar==0.1.7"]
}
diff --git a/homeassistant/components/rachio/config_flow.py b/homeassistant/components/rachio/config_flow.py
index fac93952b35..66811091820 100644
--- a/homeassistant/components/rachio/config_flow.py
+++ b/homeassistant/components/rachio/config_flow.py
@@ -108,12 +108,16 @@ class RachioConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> OptionsFlowHandler:
"""Get the options flow for this handler."""
- return OptionsFlowHandler()
+ return OptionsFlowHandler(config_entry)
class OptionsFlowHandler(OptionsFlow):
"""Handle a option flow for Rachio."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, int] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/rainbird/config_flow.py b/homeassistant/components/rainbird/config_flow.py
index abeb1b5da15..c1c814b05c4 100644
--- a/homeassistant/components/rainbird/config_flow.py
+++ b/homeassistant/components/rainbird/config_flow.py
@@ -65,7 +65,7 @@ class RainbirdConfigFlowHandler(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> RainBirdOptionsFlowHandler:
"""Define the config flow to handle options."""
- return RainBirdOptionsFlowHandler()
+ return RainBirdOptionsFlowHandler(config_entry)
async def async_step_user(
self, user_input: dict[str, Any] | None = None
@@ -165,6 +165,10 @@ class RainbirdConfigFlowHandler(ConfigFlow, domain=DOMAIN):
class RainBirdOptionsFlowHandler(OptionsFlow):
"""Handle a RainBird options flow."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize RainBirdOptionsFlowHandler."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/rainmachine/config_flow.py b/homeassistant/components/rainmachine/config_flow.py
index 0b40d506566..5c07f04c163 100644
--- a/homeassistant/components/rainmachine/config_flow.py
+++ b/homeassistant/components/rainmachine/config_flow.py
@@ -63,7 +63,7 @@ class RainMachineFlowHandler(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> RainMachineOptionsFlowHandler:
"""Define the config flow to handle options."""
- return RainMachineOptionsFlowHandler()
+ return RainMachineOptionsFlowHandler(config_entry)
async def async_step_homekit(
self, discovery_info: zeroconf.ZeroconfServiceInfo
@@ -168,6 +168,10 @@ class RainMachineFlowHandler(ConfigFlow, domain=DOMAIN):
class RainMachineOptionsFlowHandler(OptionsFlow):
"""Handle a RainMachine options flow."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/random/binary_sensor.py b/homeassistant/components/random/binary_sensor.py
index ae9a5886d59..9d33ad52692 100644
--- a/homeassistant/components/random/binary_sensor.py
+++ b/homeassistant/components/random/binary_sensor.py
@@ -59,9 +59,10 @@ class RandomBinarySensor(BinarySensorEntity):
def __init__(self, config: Mapping[str, Any], entry_id: str | None = None) -> None:
"""Initialize the Random binary sensor."""
- self._attr_name = config[CONF_NAME]
+ self._attr_name = config.get(CONF_NAME)
self._attr_device_class = config.get(CONF_DEVICE_CLASS)
- self._attr_unique_id = entry_id
+ if entry_id:
+ self._attr_unique_id = entry_id
async def async_update(self) -> None:
"""Get new state and update the sensor's state."""
diff --git a/homeassistant/components/random/config_flow.py b/homeassistant/components/random/config_flow.py
index 00314169260..fcbd77916a9 100644
--- a/homeassistant/components/random/config_flow.py
+++ b/homeassistant/components/random/config_flow.py
@@ -95,7 +95,7 @@ def _generate_schema(domain: str, flow_type: _FlowType) -> vol.Schema:
async def choose_options_step(options: dict[str, Any]) -> str:
- """Return next step_id for options flow according to entity_type."""
+ """Return next step_id for options flow according to template_type."""
return cast(str, options["entity_type"])
@@ -122,7 +122,7 @@ def _validate_unit(options: dict[str, Any]) -> None:
def validate_user_input(
- entity_type: str,
+ template_type: str,
) -> Callable[
[SchemaCommonFlowHandler, dict[str, Any]],
Coroutine[Any, Any, dict[str, Any]],
@@ -136,10 +136,10 @@ def validate_user_input(
_: SchemaCommonFlowHandler,
user_input: dict[str, Any],
) -> dict[str, Any]:
- """Add entity type to user input."""
- if entity_type == Platform.SENSOR:
+ """Add template type to user input."""
+ if template_type == Platform.SENSOR:
_validate_unit(user_input)
- return {"entity_type": entity_type} | user_input
+ return {"entity_type": template_type} | user_input
return _validate_user_input
diff --git a/homeassistant/components/random/sensor.py b/homeassistant/components/random/sensor.py
index aad4fcb851c..3c6e67c9918 100644
--- a/homeassistant/components/random/sensor.py
+++ b/homeassistant/components/random/sensor.py
@@ -70,22 +70,22 @@ class RandomSensor(SensorEntity):
"""Representation of a Random number sensor."""
_attr_translation_key = "random"
- _unrecorded_attributes = frozenset({ATTR_MAXIMUM, ATTR_MINIMUM})
def __init__(self, config: Mapping[str, Any], entry_id: str | None = None) -> None:
"""Initialize the Random sensor."""
- self._attr_name = config[CONF_NAME]
- self._minimum = config[CONF_MINIMUM]
- self._maximum = config[CONF_MAXIMUM]
+ self._attr_name = config.get(CONF_NAME)
+ self._minimum = config.get(CONF_MINIMUM, DEFAULT_MIN)
+ self._maximum = config.get(CONF_MAXIMUM, DEFAULT_MAX)
self._attr_native_unit_of_measurement = config.get(CONF_UNIT_OF_MEASUREMENT)
self._attr_device_class = config.get(CONF_DEVICE_CLASS)
self._attr_extra_state_attributes = {
ATTR_MAXIMUM: self._maximum,
ATTR_MINIMUM: self._minimum,
}
- self._attr_unique_id = entry_id
+ if entry_id:
+ self._attr_unique_id = entry_id
async def async_update(self) -> None:
- """Get a new number and update the state."""
+ """Get a new number and updates the states."""
self._attr_native_value = randrange(self._minimum, self._maximum + 1)
diff --git a/homeassistant/components/recollect_waste/config_flow.py b/homeassistant/components/recollect_waste/config_flow.py
index 299af2609e3..882eb6a00d2 100644
--- a/homeassistant/components/recollect_waste/config_flow.py
+++ b/homeassistant/components/recollect_waste/config_flow.py
@@ -34,9 +34,9 @@ class RecollectWasteConfigFlow(ConfigFlow, domain=DOMAIN):
@callback
def async_get_options_flow(
config_entry: ConfigEntry,
- ) -> RecollectWasteOptionsFlowHandler:
+ ) -> OptionsFlow:
"""Define the config flow to handle options."""
- return RecollectWasteOptionsFlowHandler()
+ return RecollectWasteOptionsFlowHandler(config_entry)
async def async_step_user(
self, user_input: dict[str, Any] | None = None
@@ -79,6 +79,10 @@ class RecollectWasteConfigFlow(ConfigFlow, domain=DOMAIN):
class RecollectWasteOptionsFlowHandler(OptionsFlow):
"""Handle a Recollect Waste options flow."""
+ def __init__(self, entry: ConfigEntry) -> None:
+ """Initialize."""
+ self._entry = entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
@@ -92,7 +96,7 @@ class RecollectWasteOptionsFlowHandler(OptionsFlow):
{
vol.Optional(
CONF_FRIENDLY_NAME,
- default=self.config_entry.options.get(CONF_FRIENDLY_NAME),
+ default=self._entry.options.get(CONF_FRIENDLY_NAME),
): bool
}
),
diff --git a/homeassistant/components/recorder/pool.py b/homeassistant/components/recorder/pool.py
index fc2a8ccb1cc..30f8fa8d07a 100644
--- a/homeassistant/components/recorder/pool.py
+++ b/homeassistant/components/recorder/pool.py
@@ -16,7 +16,7 @@ from sqlalchemy.pool import (
StaticPool,
)
-from homeassistant.helpers.frame import ReportBehavior, report_usage
+from homeassistant.helpers.frame import report
from homeassistant.util.loop import raise_for_blocking_call
_LOGGER = logging.getLogger(__name__)
@@ -108,14 +108,14 @@ class RecorderPool(SingletonThreadPool, NullPool):
# raise_for_blocking_call will raise an exception
def _do_get_db_connection_protected(self) -> ConnectionPoolEntry:
- report_usage(
+ report(
(
"accesses the database without the database executor; "
f"{ADVISE_MSG} "
"for faster database operations"
),
exclude_integrations={"recorder"},
- core_behavior=ReportBehavior.LOG,
+ error_if_core=False,
)
return NullPool._create_connection(self) # noqa: SLF001
diff --git a/homeassistant/components/recorder/statistics.py b/homeassistant/components/recorder/statistics.py
index 7243af9d4d5..4ffe7c72971 100644
--- a/homeassistant/components/recorder/statistics.py
+++ b/homeassistant/components/recorder/statistics.py
@@ -28,7 +28,6 @@ from homeassistant.helpers.typing import UNDEFINED, UndefinedType
from homeassistant.util import dt as dt_util
from homeassistant.util.unit_conversion import (
BaseUnitConverter,
- BloodGlucoseConcentrationConverter,
ConductivityConverter,
DataRateConverter,
DistanceConverter,
@@ -129,10 +128,6 @@ QUERY_STATISTICS_SUMMARY_SUM = (
STATISTIC_UNIT_TO_UNIT_CONVERTER: dict[str | None, type[BaseUnitConverter]] = {
- **{
- unit: BloodGlucoseConcentrationConverter
- for unit in BloodGlucoseConcentrationConverter.VALID_UNITS
- },
**{unit: ConductivityConverter for unit in ConductivityConverter.VALID_UNITS},
**{unit: DataRateConverter for unit in DataRateConverter.VALID_UNITS},
**{unit: DistanceConverter for unit in DistanceConverter.VALID_UNITS},
diff --git a/homeassistant/components/recorder/websocket_api.py b/homeassistant/components/recorder/websocket_api.py
index f4dce73fa47..ac917e903df 100644
--- a/homeassistant/components/recorder/websocket_api.py
+++ b/homeassistant/components/recorder/websocket_api.py
@@ -16,7 +16,6 @@ from homeassistant.helpers import config_validation as cv
from homeassistant.helpers.json import json_bytes
from homeassistant.util import dt as dt_util
from homeassistant.util.unit_conversion import (
- BloodGlucoseConcentrationConverter,
ConductivityConverter,
DataRateConverter,
DistanceConverter,
@@ -55,9 +54,6 @@ UPDATE_STATISTICS_METADATA_TIME_OUT = 10
UNIT_SCHEMA = vol.Schema(
{
- vol.Optional("blood_glucose_concentration"): vol.In(
- BloodGlucoseConcentrationConverter.VALID_UNITS
- ),
vol.Optional("conductivity"): vol.In(ConductivityConverter.VALID_UNITS),
vol.Optional("data_rate"): vol.In(DataRateConverter.VALID_UNITS),
vol.Optional("distance"): vol.In(DistanceConverter.VALID_UNITS),
diff --git a/homeassistant/components/reolink/config_flow.py b/homeassistant/components/reolink/config_flow.py
index 0b1ed7b4b15..102aeae575e 100644
--- a/homeassistant/components/reolink/config_flow.py
+++ b/homeassistant/components/reolink/config_flow.py
@@ -54,6 +54,10 @@ DEFAULT_OPTIONS = {CONF_PROTOCOL: DEFAULT_PROTOCOL}
class ReolinkOptionsFlowHandler(OptionsFlow):
"""Handle Reolink options."""
+ def __init__(self, config_entry: ReolinkConfigEntry) -> None:
+ """Initialize ReolinkOptionsFlowHandler."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
@@ -108,7 +112,7 @@ class ReolinkFlowHandler(ConfigFlow, domain=DOMAIN):
config_entry: ReolinkConfigEntry,
) -> ReolinkOptionsFlowHandler:
"""Options callback for Reolink."""
- return ReolinkOptionsFlowHandler()
+ return ReolinkOptionsFlowHandler(config_entry)
async def async_step_reauth(
self, entry_data: Mapping[str, Any]
diff --git a/homeassistant/components/reolink/icons.json b/homeassistant/components/reolink/icons.json
index d333a8a0201..5815e165607 100644
--- a/homeassistant/components/reolink/icons.json
+++ b/homeassistant/components/reolink/icons.json
@@ -246,12 +246,6 @@
"off": "mdi:music-note-off"
}
},
- "vehicle_tone": {
- "default": "mdi:music-note",
- "state": {
- "off": "mdi:music-note-off"
- }
- },
"visitor_tone": {
"default": "mdi:music-note",
"state": {
@@ -267,10 +261,7 @@
},
"sensor": {
"ptz_pan_position": {
- "default": "mdi:pan-horizontal"
- },
- "ptz_tilt_position": {
- "default": "mdi:pan-vertical"
+ "default": "mdi:pan"
},
"battery_temperature": {
"default": "mdi:thermometer"
diff --git a/homeassistant/components/reolink/manifest.json b/homeassistant/components/reolink/manifest.json
index 7921bdb6ed5..23a46c5e1c9 100644
--- a/homeassistant/components/reolink/manifest.json
+++ b/homeassistant/components/reolink/manifest.json
@@ -18,5 +18,5 @@
"documentation": "https://www.home-assistant.io/integrations/reolink",
"iot_class": "local_push",
"loggers": ["reolink_aio"],
- "requirements": ["reolink-aio==0.11.1"]
+ "requirements": ["reolink-aio==0.10.4"]
}
diff --git a/homeassistant/components/reolink/select.py b/homeassistant/components/reolink/select.py
index a444997a907..1306c881059 100644
--- a/homeassistant/components/reolink/select.py
+++ b/homeassistant/components/reolink/select.py
@@ -197,16 +197,6 @@ CHIME_SELECT_ENTITIES = (
value=lambda chime: ChimeToneEnum(chime.tone("people")).name,
method=lambda chime, name: chime.set_tone("people", ChimeToneEnum[name].value),
),
- ReolinkChimeSelectEntityDescription(
- key="vehicle_tone",
- cmd_key="GetDingDongCfg",
- translation_key="vehicle_tone",
- entity_category=EntityCategory.CONFIG,
- get_options=[method.name for method in ChimeToneEnum],
- supported=lambda chime: "vehicle" in chime.chime_event_types,
- value=lambda chime: ChimeToneEnum(chime.tone("vehicle")).name,
- method=lambda chime, name: chime.set_tone("vehicle", ChimeToneEnum[name].value),
- ),
ReolinkChimeSelectEntityDescription(
key="visitor_tone",
cmd_key="GetDingDongCfg",
diff --git a/homeassistant/components/reolink/sensor.py b/homeassistant/components/reolink/sensor.py
index 80e58c3d5c2..c2fc815235e 100644
--- a/homeassistant/components/reolink/sensor.py
+++ b/homeassistant/components/reolink/sensor.py
@@ -58,16 +58,7 @@ SENSORS = (
state_class=SensorStateClass.MEASUREMENT,
entity_category=EntityCategory.DIAGNOSTIC,
value=lambda api, ch: api.ptz_pan_position(ch),
- supported=lambda api, ch: api.supported(ch, "ptz_pan_position"),
- ),
- ReolinkSensorEntityDescription(
- key="ptz_tilt_position",
- cmd_key="GetPtzCurPos",
- translation_key="ptz_tilt_position",
- state_class=SensorStateClass.MEASUREMENT,
- entity_category=EntityCategory.DIAGNOSTIC,
- value=lambda api, ch: api.ptz_tilt_position(ch),
- supported=lambda api, ch: api.supported(ch, "ptz_tilt_position"),
+ supported=lambda api, ch: api.supported(ch, "ptz_position"),
),
ReolinkSensorEntityDescription(
key="battery_percent",
diff --git a/homeassistant/components/reolink/strings.json b/homeassistant/components/reolink/strings.json
index 1d699b7b658..67fd5329e14 100644
--- a/homeassistant/components/reolink/strings.json
+++ b/homeassistant/components/reolink/strings.json
@@ -606,22 +606,6 @@
"waybackhome": "[%key:component::reolink::entity::select::motion_tone::state::waybackhome%]"
}
},
- "vehicle_tone": {
- "name": "Vehicle ringtone",
- "state": {
- "off": "[%key:common::state::off%]",
- "citybird": "[%key:component::reolink::entity::select::motion_tone::state::citybird%]",
- "originaltune": "[%key:component::reolink::entity::select::motion_tone::state::originaltune%]",
- "pianokey": "[%key:component::reolink::entity::select::motion_tone::state::pianokey%]",
- "loop": "[%key:component::reolink::entity::select::motion_tone::state::loop%]",
- "attraction": "[%key:component::reolink::entity::select::motion_tone::state::attraction%]",
- "hophop": "[%key:component::reolink::entity::select::motion_tone::state::hophop%]",
- "goodday": "[%key:component::reolink::entity::select::motion_tone::state::goodday%]",
- "operetta": "[%key:component::reolink::entity::select::motion_tone::state::operetta%]",
- "moonlight": "[%key:component::reolink::entity::select::motion_tone::state::moonlight%]",
- "waybackhome": "[%key:component::reolink::entity::select::motion_tone::state::waybackhome%]"
- }
- },
"visitor_tone": {
"name": "Visitor ringtone",
"state": {
@@ -665,9 +649,6 @@
"ptz_pan_position": {
"name": "PTZ pan position"
},
- "ptz_tilt_position": {
- "name": "PTZ tilt position"
- },
"battery_temperature": {
"name": "Battery temperature"
},
diff --git a/homeassistant/components/rest/__init__.py b/homeassistant/components/rest/__init__.py
index 5695e51933e..59239ad6744 100644
--- a/homeassistant/components/rest/__init__.py
+++ b/homeassistant/components/rest/__init__.py
@@ -180,7 +180,6 @@ def _rest_coordinator(
return DataUpdateCoordinator(
hass,
_LOGGER,
- config_entry=None,
name="rest data",
update_method=update_method,
update_interval=update_interval,
diff --git a/homeassistant/components/rfxtrx/config_flow.py b/homeassistant/components/rfxtrx/config_flow.py
index 866d9ecb1bb..ceb9bea4661 100644
--- a/homeassistant/components/rfxtrx/config_flow.py
+++ b/homeassistant/components/rfxtrx/config_flow.py
@@ -87,8 +87,9 @@ class RfxtrxOptionsFlow(OptionsFlow):
_device_registry: dr.DeviceRegistry
_device_entries: list[dr.DeviceEntry]
- def __init__(self) -> None:
+ def __init__(self, config_entry: ConfigEntry) -> None:
"""Initialize rfxtrx options flow."""
+ self._config_entry = config_entry
self._global_options: dict[str, Any] = {}
self._selected_device: dict[str, Any] = {}
self._selected_device_entry_id: str | None = None
@@ -119,7 +120,9 @@ class RfxtrxOptionsFlow(OptionsFlow):
event_code = device_data["event_code"]
assert event_code
self._selected_device_event_code = event_code
- self._selected_device = self.config_entry.data[CONF_DEVICES][event_code]
+ self._selected_device = self._config_entry.data[CONF_DEVICES][
+ event_code
+ ]
self._selected_device_object = get_rfx_object(event_code)
return await self.async_step_set_device_options()
if CONF_EVENT_CODE in user_input:
@@ -145,7 +148,7 @@ class RfxtrxOptionsFlow(OptionsFlow):
device_registry = dr.async_get(self.hass)
device_entries = dr.async_entries_for_config_entry(
- device_registry, self.config_entry.entry_id
+ device_registry, self._config_entry.entry_id
)
self._device_registry = device_registry
self._device_entries = device_entries
@@ -159,11 +162,11 @@ class RfxtrxOptionsFlow(OptionsFlow):
options = {
vol.Optional(
CONF_AUTOMATIC_ADD,
- default=self.config_entry.data[CONF_AUTOMATIC_ADD],
+ default=self._config_entry.data[CONF_AUTOMATIC_ADD],
): bool,
vol.Optional(
CONF_PROTOCOLS,
- default=self.config_entry.data.get(CONF_PROTOCOLS) or [],
+ default=self._config_entry.data.get(CONF_PROTOCOLS) or [],
): cv.multi_select(RECV_MODES),
vol.Optional(CONF_EVENT_CODE): str,
vol.Optional(CONF_DEVICE): vol.In(configure_devices),
@@ -422,7 +425,7 @@ class RfxtrxOptionsFlow(OptionsFlow):
def _can_add_device(self, new_rfx_obj: rfxtrxmod.RFXtrxEvent) -> bool:
"""Check if device does not already exist."""
new_device_id = get_device_id(new_rfx_obj.device)
- for packet_id, entity_info in self.config_entry.data[CONF_DEVICES].items():
+ for packet_id, entity_info in self._config_entry.data[CONF_DEVICES].items():
rfx_obj = get_rfx_object(packet_id)
assert rfx_obj
@@ -465,7 +468,7 @@ class RfxtrxOptionsFlow(OptionsFlow):
assert entry
device_id = get_device_tuple_from_identifiers(entry.identifiers)
assert device_id
- for packet_id, entity_info in self.config_entry.data[CONF_DEVICES].items():
+ for packet_id, entity_info in self._config_entry.data[CONF_DEVICES].items():
if tuple(entity_info.get(CONF_DEVICE_ID)) == device_id:
event_code = cast(str, packet_id)
break
@@ -478,8 +481,8 @@ class RfxtrxOptionsFlow(OptionsFlow):
devices: dict[str, Any] | None = None,
) -> None:
"""Update data in ConfigEntry."""
- entry_data = self.config_entry.data.copy()
- entry_data[CONF_DEVICES] = copy.deepcopy(self.config_entry.data[CONF_DEVICES])
+ entry_data = self._config_entry.data.copy()
+ entry_data[CONF_DEVICES] = copy.deepcopy(self._config_entry.data[CONF_DEVICES])
if global_options:
entry_data.update(global_options)
if devices:
@@ -491,9 +494,9 @@ class RfxtrxOptionsFlow(OptionsFlow):
entry_data[CONF_DEVICES].pop(event_code, None)
else:
entry_data[CONF_DEVICES][event_code] = options
- self.hass.config_entries.async_update_entry(self.config_entry, data=entry_data)
+ self.hass.config_entries.async_update_entry(self._config_entry, data=entry_data)
self.hass.async_create_task(
- self.hass.config_entries.async_reload(self.config_entry.entry_id)
+ self.hass.config_entries.async_reload(self._config_entry.entry_id)
)
@@ -634,11 +637,9 @@ class RfxtrxConfigFlow(ConfigFlow, domain=DOMAIN):
@staticmethod
@callback
- def async_get_options_flow(
- config_entry: ConfigEntry,
- ) -> RfxtrxOptionsFlow:
+ def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlow:
"""Get the options flow for this handler."""
- return RfxtrxOptionsFlow()
+ return RfxtrxOptionsFlow(config_entry)
def _test_transport(host: str | None, port: int | None, device: str | None) -> bool:
diff --git a/homeassistant/components/ring/event.py b/homeassistant/components/ring/event.py
index 71a4bc8aea5..e6d9d25542f 100644
--- a/homeassistant/components/ring/event.py
+++ b/homeassistant/components/ring/event.py
@@ -96,7 +96,7 @@ class RingEvent(RingBaseEntity[RingListenCoordinator, RingDeviceT], EventEntity)
@callback
def _handle_coordinator_update(self) -> None:
- if (alert := self._get_coordinator_alert()) and not alert.is_update:
+ if alert := self._get_coordinator_alert():
self._async_handle_event(alert.kind)
super()._handle_coordinator_update()
diff --git a/homeassistant/components/ring/manifest.json b/homeassistant/components/ring/manifest.json
index e431c680081..4e0514ba7f9 100644
--- a/homeassistant/components/ring/manifest.json
+++ b/homeassistant/components/ring/manifest.json
@@ -30,5 +30,5 @@
"iot_class": "cloud_polling",
"loggers": ["ring_doorbell"],
"quality_scale": "silver",
- "requirements": ["ring-doorbell==0.9.12"]
+ "requirements": ["ring-doorbell==0.9.8"]
}
diff --git a/homeassistant/components/risco/config_flow.py b/homeassistant/components/risco/config_flow.py
index f7365d35414..8f88c7c30a3 100644
--- a/homeassistant/components/risco/config_flow.py
+++ b/homeassistant/components/risco/config_flow.py
@@ -220,6 +220,7 @@ class RiscoOptionsFlowHandler(OptionsFlow):
def __init__(self, config_entry: ConfigEntry) -> None:
"""Initialize."""
+ self.config_entry = config_entry
self._data = {**DEFAULT_OPTIONS, **config_entry.options}
def _options_schema(self) -> vol.Schema:
diff --git a/homeassistant/components/roborock/config_flow.py b/homeassistant/components/roborock/config_flow.py
index 200614b024e..06fbf3e717e 100644
--- a/homeassistant/components/roborock/config_flow.py
+++ b/homeassistant/components/roborock/config_flow.py
@@ -3,7 +3,6 @@
from __future__ import annotations
from collections.abc import Mapping
-from copy import deepcopy
import logging
from typing import Any
@@ -25,6 +24,7 @@ from homeassistant.config_entries import (
ConfigFlow,
ConfigFlowResult,
OptionsFlow,
+ OptionsFlowWithConfigEntry,
)
from homeassistant.const import CONF_USERNAME
from homeassistant.core import callback
@@ -171,18 +171,14 @@ class RoborockFlowHandler(ConfigFlow, domain=DOMAIN):
@callback
def async_get_options_flow(
config_entry: ConfigEntry,
- ) -> RoborockOptionsFlowHandler:
+ ) -> OptionsFlow:
"""Create the options flow."""
return RoborockOptionsFlowHandler(config_entry)
-class RoborockOptionsFlowHandler(OptionsFlow):
+class RoborockOptionsFlowHandler(OptionsFlowWithConfigEntry):
"""Handle an option flow for Roborock."""
- def __init__(self, config_entry: ConfigEntry) -> None:
- """Initialize options flow."""
- self.options = deepcopy(dict(config_entry.options))
-
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/roborock/coordinator.py b/homeassistant/components/roborock/coordinator.py
index fe592074f71..20bc50f9855 100644
--- a/homeassistant/components/roborock/coordinator.py
+++ b/homeassistant/components/roborock/coordinator.py
@@ -2,6 +2,7 @@
from __future__ import annotations
+import asyncio
from datetime import timedelta
import logging
@@ -106,12 +107,8 @@ class RoborockDataUpdateCoordinator(DataUpdateCoordinator[DeviceProp]):
async def _async_update_data(self) -> DeviceProp:
"""Update data via library."""
try:
- # Update device props and standard api information
- await self._update_device_prop()
- # Set the new map id from the updated device props
+ await asyncio.gather(*(self._update_device_prop(), self.get_rooms()))
self._set_current_map()
- # Get the rooms for that map id.
- await self.get_rooms()
except RoborockException as ex:
raise UpdateFailed(ex) from ex
return self.roborock_device_info.props
diff --git a/homeassistant/components/roborock/manifest.json b/homeassistant/components/roborock/manifest.json
index c305e4710fc..79a9bf77578 100644
--- a/homeassistant/components/roborock/manifest.json
+++ b/homeassistant/components/roborock/manifest.json
@@ -7,7 +7,7 @@
"iot_class": "local_polling",
"loggers": ["roborock"],
"requirements": [
- "python-roborock==2.7.2",
+ "python-roborock==2.6.1",
"vacuum-map-parser-roborock==0.1.2"
]
}
diff --git a/homeassistant/components/roborock/select.py b/homeassistant/components/roborock/select.py
index 73cb95d2d7c..3dfe0e72a7b 100644
--- a/homeassistant/components/roborock/select.py
+++ b/homeassistant/components/roborock/select.py
@@ -135,9 +135,6 @@ class RoborockCurrentMapSelectEntity(RoborockCoordinatedEntityV1, SelectEntity):
RoborockCommand.LOAD_MULTI_MAP,
[map_id],
)
- # Update the current map id manually so that nothing gets broken
- # if another service hits the api.
- self.coordinator.current_map = map_id
# We need to wait after updating the map
# so that other commands will be executed correctly.
await asyncio.sleep(MAP_SLEEP)
@@ -151,9 +148,6 @@ class RoborockCurrentMapSelectEntity(RoborockCoordinatedEntityV1, SelectEntity):
@property
def current_option(self) -> str | None:
"""Get the current status of the select entity from device_status."""
- if (
- (current_map := self.coordinator.current_map) is not None
- and current_map in self.coordinator.maps
- ): # 63 means it is searching for a map.
+ if (current_map := self.coordinator.current_map) is not None:
return self.coordinator.maps[current_map].name
return None
diff --git a/homeassistant/components/roku/config_flow.py b/homeassistant/components/roku/config_flow.py
index 18e3b3ed68a..3ece9aff3f2 100644
--- a/homeassistant/components/roku/config_flow.py
+++ b/homeassistant/components/roku/config_flow.py
@@ -14,7 +14,7 @@ from homeassistant.config_entries import (
ConfigEntry,
ConfigFlow,
ConfigFlowResult,
- OptionsFlow,
+ OptionsFlowWithConfigEntry,
)
from homeassistant.const import CONF_HOST, CONF_NAME
from homeassistant.core import HomeAssistant, callback
@@ -165,12 +165,12 @@ class RokuConfigFlow(ConfigFlow, domain=DOMAIN):
@callback
def async_get_options_flow(
config_entry: ConfigEntry,
- ) -> RokuOptionsFlowHandler:
+ ) -> OptionsFlowWithConfigEntry:
"""Create the options flow."""
- return RokuOptionsFlowHandler()
+ return RokuOptionsFlowHandler(config_entry)
-class RokuOptionsFlowHandler(OptionsFlow):
+class RokuOptionsFlowHandler(OptionsFlowWithConfigEntry):
"""Handle Roku options."""
async def async_step_init(
@@ -186,7 +186,7 @@ class RokuOptionsFlowHandler(OptionsFlow):
{
vol.Optional(
CONF_PLAY_MEDIA_APP_ID,
- default=self.config_entry.options.get(
+ default=self.options.get(
CONF_PLAY_MEDIA_APP_ID, DEFAULT_PLAY_MEDIA_APP_ID
),
): str,
diff --git a/homeassistant/components/roomba/config_flow.py b/homeassistant/components/roomba/config_flow.py
index e48d2d91139..d0c29faca69 100644
--- a/homeassistant/components/roomba/config_flow.py
+++ b/homeassistant/components/roomba/config_flow.py
@@ -16,7 +16,7 @@ from homeassistant.config_entries import (
ConfigEntry,
ConfigFlow,
ConfigFlowResult,
- OptionsFlow,
+ OptionsFlowWithConfigEntry,
)
from homeassistant.const import CONF_DELAY, CONF_HOST, CONF_NAME, CONF_PASSWORD
from homeassistant.core import HomeAssistant, callback
@@ -92,7 +92,7 @@ class RoombaConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> RoombaOptionsFlowHandler:
"""Get the options flow for this handler."""
- return RoombaOptionsFlowHandler()
+ return RoombaOptionsFlowHandler(config_entry)
async def async_step_zeroconf(
self, discovery_info: zeroconf.ZeroconfServiceInfo
@@ -300,7 +300,7 @@ class RoombaConfigFlow(ConfigFlow, domain=DOMAIN):
)
-class RoombaOptionsFlowHandler(OptionsFlow):
+class RoombaOptionsFlowHandler(OptionsFlowWithConfigEntry):
"""Handle options."""
async def async_step_init(
@@ -310,18 +310,17 @@ class RoombaOptionsFlowHandler(OptionsFlow):
if user_input is not None:
return self.async_create_entry(title="", data=user_input)
- options = self.config_entry.options
return self.async_show_form(
step_id="init",
data_schema=vol.Schema(
{
vol.Optional(
CONF_CONTINUOUS,
- default=options.get(CONF_CONTINUOUS, DEFAULT_CONTINUOUS),
+ default=self.options.get(CONF_CONTINUOUS, DEFAULT_CONTINUOUS),
): bool,
vol.Optional(
CONF_DELAY,
- default=options.get(CONF_DELAY, DEFAULT_DELAY),
+ default=self.options.get(CONF_DELAY, DEFAULT_DELAY),
): int,
}
),
diff --git a/homeassistant/components/rtsp_to_webrtc/config_flow.py b/homeassistant/components/rtsp_to_webrtc/config_flow.py
index 22502659757..8c2eac3a4b1 100644
--- a/homeassistant/components/rtsp_to_webrtc/config_flow.py
+++ b/homeassistant/components/rtsp_to_webrtc/config_flow.py
@@ -119,12 +119,16 @@ class RTSPToWebRTCConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> OptionsFlow:
"""Create an options flow."""
- return OptionsFlowHandler()
+ return OptionsFlowHandler(config_entry)
class OptionsFlowHandler(OptionsFlow):
"""RTSPtoWeb Options flow."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/ruckus_unleashed/manifest.json b/homeassistant/components/ruckus_unleashed/manifest.json
index 8d56f3a5563..2066b65221e 100644
--- a/homeassistant/components/ruckus_unleashed/manifest.json
+++ b/homeassistant/components/ruckus_unleashed/manifest.json
@@ -7,5 +7,5 @@
"integration_type": "hub",
"iot_class": "local_polling",
"loggers": ["aioruckus"],
- "requirements": ["aioruckus==0.42"]
+ "requirements": ["aioruckus==0.41"]
}
diff --git a/homeassistant/components/russound_rio/__init__.py b/homeassistant/components/russound_rio/__init__.py
index 784629ea0bc..ba53f6794e3 100644
--- a/homeassistant/components/russound_rio/__init__.py
+++ b/homeassistant/components/russound_rio/__init__.py
@@ -11,7 +11,7 @@ from homeassistant.const import CONF_HOST, CONF_PORT, Platform
from homeassistant.core import HomeAssistant
from homeassistant.exceptions import ConfigEntryNotReady
-from .const import CONNECT_TIMEOUT, DOMAIN, RUSSOUND_RIO_EXCEPTIONS
+from .const import CONNECT_TIMEOUT, RUSSOUND_RIO_EXCEPTIONS
PLATFORMS = [Platform.MEDIA_PLAYER]
@@ -43,14 +43,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: RussoundConfigEntry) ->
async with asyncio.timeout(CONNECT_TIMEOUT):
await client.connect()
except RUSSOUND_RIO_EXCEPTIONS as err:
- raise ConfigEntryNotReady(
- translation_domain=DOMAIN,
- translation_key="entry_cannot_connect",
- translation_placeholders={
- "host": host,
- "port": port,
- },
- ) from err
+ raise ConfigEntryNotReady(f"Error while connecting to {host}:{port}") from err
entry.runtime_data = client
await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
diff --git a/homeassistant/components/russound_rio/const.py b/homeassistant/components/russound_rio/const.py
index af52e89d399..1b38dc8ce5c 100644
--- a/homeassistant/components/russound_rio/const.py
+++ b/homeassistant/components/russound_rio/const.py
@@ -17,7 +17,7 @@ RUSSOUND_RIO_EXCEPTIONS = (
)
-CONNECT_TIMEOUT = 15
+CONNECT_TIMEOUT = 5
MP_FEATURES_BY_FLAG = {
FeatureFlag.COMMANDS_ZONE_MUTE_OFF_ON: MediaPlayerEntityFeature.VOLUME_MUTE
diff --git a/homeassistant/components/russound_rio/entity.py b/homeassistant/components/russound_rio/entity.py
index 9790ff43e68..23b196ecb2f 100644
--- a/homeassistant/components/russound_rio/entity.py
+++ b/homeassistant/components/russound_rio/entity.py
@@ -26,12 +26,7 @@ def command[_EntityT: RussoundBaseEntity, **_P](
await func(self, *args, **kwargs)
except RUSSOUND_RIO_EXCEPTIONS as exc:
raise HomeAssistantError(
- translation_domain=DOMAIN,
- translation_key="command_error",
- translation_placeholders={
- "function_name": func.__name__,
- "entity_id": self.entity_id,
- },
+ f"Error executing {func.__name__} on entity {self.entity_id},"
) from exc
return decorator
@@ -96,4 +91,6 @@ class RussoundBaseEntity(Entity):
async def async_will_remove_from_hass(self) -> None:
"""Remove callbacks."""
- self._client.unregister_state_update_callbacks(self._state_update_callback)
+ await self._client.unregister_state_update_callbacks(
+ self._state_update_callback
+ )
diff --git a/homeassistant/components/russound_rio/manifest.json b/homeassistant/components/russound_rio/manifest.json
index ab77ca3ab6a..96fc0fb53db 100644
--- a/homeassistant/components/russound_rio/manifest.json
+++ b/homeassistant/components/russound_rio/manifest.json
@@ -7,5 +7,5 @@
"iot_class": "local_push",
"loggers": ["aiorussound"],
"quality_scale": "silver",
- "requirements": ["aiorussound==4.1.0"]
+ "requirements": ["aiorussound==4.0.5"]
}
diff --git a/homeassistant/components/russound_rio/media_player.py b/homeassistant/components/russound_rio/media_player.py
index 45818d3e25b..316e4d2be7c 100644
--- a/homeassistant/components/russound_rio/media_player.py
+++ b/homeassistant/components/russound_rio/media_player.py
@@ -5,7 +5,7 @@ from __future__ import annotations
import logging
from aiorussound import Controller
-from aiorussound.models import PlayStatus, Source
+from aiorussound.models import Source
from aiorussound.rio import ZoneControlSurface
from homeassistant.components.media_player import (
@@ -132,18 +132,11 @@ class RussoundZoneDevice(RussoundBaseEntity, MediaPlayerEntity):
def state(self) -> MediaPlayerState | None:
"""Return the state of the device."""
status = self._zone.status
- play_status = self._source.play_status
- if not status:
+ if status == "ON":
+ return MediaPlayerState.ON
+ if status == "OFF":
return MediaPlayerState.OFF
- if play_status == PlayStatus.PLAYING:
- return MediaPlayerState.PLAYING
- if play_status == PlayStatus.PAUSED:
- return MediaPlayerState.PAUSED
- if play_status == PlayStatus.TRANSITIONING:
- return MediaPlayerState.BUFFERING
- if play_status == PlayStatus.STOPPED:
- return MediaPlayerState.IDLE
- return MediaPlayerState.ON
+ return None
@property
def source(self):
@@ -182,7 +175,7 @@ class RussoundZoneDevice(RussoundBaseEntity, MediaPlayerEntity):
Value is returned based on a range (0..50).
Therefore float divide by 50 to get to the required range.
"""
- return self._zone.volume / 50.0
+ return float(self._zone.volume or "0") / 50.0
@command
async def async_turn_off(self) -> None:
diff --git a/homeassistant/components/russound_rio/strings.json b/homeassistant/components/russound_rio/strings.json
index b8c29c08301..c105dcafae2 100644
--- a/homeassistant/components/russound_rio/strings.json
+++ b/homeassistant/components/russound_rio/strings.json
@@ -33,13 +33,5 @@
"title": "[%key:component::russound_rio::issues::deprecated_yaml_import_issue_cannot_connect::title%]",
"description": "[%key:component::russound_rio::issues::deprecated_yaml_import_issue_cannot_connect::description%]"
}
- },
- "exceptions": {
- "entry_cannot_connect": {
- "message": "Error while connecting to {host}:{port}"
- },
- "command_error": {
- "message": "Error executing {function_name} on entity {entity_id}"
- }
}
}
diff --git a/homeassistant/components/screenlogic/config_flow.py b/homeassistant/components/screenlogic/config_flow.py
index 19db89dc03d..4a46756cf2f 100644
--- a/homeassistant/components/screenlogic/config_flow.py
+++ b/homeassistant/components/screenlogic/config_flow.py
@@ -81,7 +81,7 @@ class ScreenlogicConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> ScreenLogicOptionsFlowHandler:
"""Get the options flow for ScreenLogic."""
- return ScreenLogicOptionsFlowHandler()
+ return ScreenLogicOptionsFlowHandler(config_entry)
async def async_step_user(
self, user_input: dict[str, Any] | None = None
@@ -192,6 +192,10 @@ class ScreenlogicConfigFlow(ConfigFlow, domain=DOMAIN):
class ScreenLogicOptionsFlowHandler(OptionsFlow):
"""Handles the options for the ScreenLogic integration."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Init the screen logic options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(self, user_input=None) -> ConfigFlowResult:
"""Manage the options."""
if user_input is not None:
diff --git a/homeassistant/components/sense/manifest.json b/homeassistant/components/sense/manifest.json
index df2317c3a6c..72d1d045c9a 100644
--- a/homeassistant/components/sense/manifest.json
+++ b/homeassistant/components/sense/manifest.json
@@ -20,5 +20,5 @@
"documentation": "https://www.home-assistant.io/integrations/sense",
"iot_class": "cloud_polling",
"loggers": ["sense_energy"],
- "requirements": ["sense-energy==0.13.3"]
+ "requirements": ["sense-energy==0.13.2"]
}
diff --git a/homeassistant/components/sensor/const.py b/homeassistant/components/sensor/const.py
index f4573f873a2..da0b48a23a0 100644
--- a/homeassistant/components/sensor/const.py
+++ b/homeassistant/components/sensor/const.py
@@ -17,7 +17,6 @@ from homeassistant.const import (
SIGNAL_STRENGTH_DECIBELS,
SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
UnitOfApparentPower,
- UnitOfBloodGlucoseConcentration,
UnitOfConductivity,
UnitOfDataRate,
UnitOfElectricCurrent,
@@ -48,7 +47,6 @@ from homeassistant.helpers.deprecation import (
)
from homeassistant.util.unit_conversion import (
BaseUnitConverter,
- BloodGlucoseConcentrationConverter,
ConductivityConverter,
DataRateConverter,
DistanceConverter,
@@ -129,12 +127,6 @@ class SensorDeviceClass(StrEnum):
Unit of measurement: `%`
"""
- BLOOD_GLUCOSE_CONCENTRATION = "blood_glucose_concentration"
- """Blood glucose concentration.
-
- Unit of measurement: `mg/dL`, `mmol/L`
- """
-
CO = "carbon_monoxide"
"""Carbon Monoxide gas concentration.
@@ -190,7 +182,7 @@ class SensorDeviceClass(StrEnum):
Use this device class for sensors measuring energy consumption, for example
electric energy consumption.
- Unit of measurement: `J`, `kJ`, `MJ`, `GJ`, `Wh`, `kWh`, `MWh`, `GWh`, `TWh`, `cal`, `kcal`, `Mcal`, `Gcal`
+ Unit of measurement: `J`, `kJ`, `MJ`, `GJ`, `Wh`, `kWh`, `MWh`, `cal`, `kcal`, `Mcal`, `Gcal`
"""
ENERGY_STORAGE = "energy_storage"
@@ -199,7 +191,7 @@ class SensorDeviceClass(StrEnum):
Use this device class for sensors measuring stored energy, for example the amount
of electric energy currently stored in a battery or the capacity of a battery.
- Unit of measurement: `Wh`, `kWh`, `MWh`, `GWh`, `TWh`, `MJ`, `GJ`
+ Unit of measurement: `Wh`, `kWh`, `MWh`, `MJ`, `GJ`
"""
FREQUENCY = "frequency"
@@ -307,7 +299,7 @@ class SensorDeviceClass(StrEnum):
POWER = "power"
"""Power.
- Unit of measurement: `W`, `kW`, `MW`, `GW`, `TW`
+ Unit of measurement: `W`, `kW`
"""
PRECIPITATION = "precipitation"
@@ -501,7 +493,6 @@ STATE_CLASSES: Final[list[str]] = [cls.value for cls in SensorStateClass]
UNIT_CONVERTERS: dict[SensorDeviceClass | str | None, type[BaseUnitConverter]] = {
SensorDeviceClass.ATMOSPHERIC_PRESSURE: PressureConverter,
- SensorDeviceClass.BLOOD_GLUCOSE_CONCENTRATION: BloodGlucoseConcentrationConverter,
SensorDeviceClass.CONDUCTIVITY: ConductivityConverter,
SensorDeviceClass.CURRENT: ElectricCurrentConverter,
SensorDeviceClass.DATA_RATE: DataRateConverter,
@@ -533,7 +524,6 @@ DEVICE_CLASS_UNITS: dict[SensorDeviceClass, set[type[StrEnum] | str | None]] = {
SensorDeviceClass.AQI: {None},
SensorDeviceClass.ATMOSPHERIC_PRESSURE: set(UnitOfPressure),
SensorDeviceClass.BATTERY: {PERCENTAGE},
- SensorDeviceClass.BLOOD_GLUCOSE_CONCENTRATION: set(UnitOfBloodGlucoseConcentration),
SensorDeviceClass.CO: {CONCENTRATION_PARTS_PER_MILLION},
SensorDeviceClass.CO2: {CONCENTRATION_PARTS_PER_MILLION},
SensorDeviceClass.CONDUCTIVITY: set(UnitOfConductivity),
@@ -609,7 +599,6 @@ DEVICE_CLASS_STATE_CLASSES: dict[SensorDeviceClass, set[SensorStateClass]] = {
SensorDeviceClass.AQI: {SensorStateClass.MEASUREMENT},
SensorDeviceClass.ATMOSPHERIC_PRESSURE: {SensorStateClass.MEASUREMENT},
SensorDeviceClass.BATTERY: {SensorStateClass.MEASUREMENT},
- SensorDeviceClass.BLOOD_GLUCOSE_CONCENTRATION: {SensorStateClass.MEASUREMENT},
SensorDeviceClass.CO: {SensorStateClass.MEASUREMENT},
SensorDeviceClass.CO2: {SensorStateClass.MEASUREMENT},
SensorDeviceClass.CONDUCTIVITY: {SensorStateClass.MEASUREMENT},
diff --git a/homeassistant/components/sensor/device_condition.py b/homeassistant/components/sensor/device_condition.py
index 56ecb36adb3..f2b51899312 100644
--- a/homeassistant/components/sensor/device_condition.py
+++ b/homeassistant/components/sensor/device_condition.py
@@ -37,7 +37,6 @@ CONF_IS_APPARENT_POWER = "is_apparent_power"
CONF_IS_AQI = "is_aqi"
CONF_IS_ATMOSPHERIC_PRESSURE = "is_atmospheric_pressure"
CONF_IS_BATTERY_LEVEL = "is_battery_level"
-CONF_IS_BLOOD_GLUCOSE_CONCENTRATION = "is_blood_glucose_concentration"
CONF_IS_CO = "is_carbon_monoxide"
CONF_IS_CO2 = "is_carbon_dioxide"
CONF_IS_CONDUCTIVITY = "is_conductivity"
@@ -88,9 +87,6 @@ ENTITY_CONDITIONS = {
SensorDeviceClass.AQI: [{CONF_TYPE: CONF_IS_AQI}],
SensorDeviceClass.ATMOSPHERIC_PRESSURE: [{CONF_TYPE: CONF_IS_ATMOSPHERIC_PRESSURE}],
SensorDeviceClass.BATTERY: [{CONF_TYPE: CONF_IS_BATTERY_LEVEL}],
- SensorDeviceClass.BLOOD_GLUCOSE_CONCENTRATION: [
- {CONF_TYPE: CONF_IS_BLOOD_GLUCOSE_CONCENTRATION}
- ],
SensorDeviceClass.CO: [{CONF_TYPE: CONF_IS_CO}],
SensorDeviceClass.CO2: [{CONF_TYPE: CONF_IS_CO2}],
SensorDeviceClass.CONDUCTIVITY: [{CONF_TYPE: CONF_IS_CONDUCTIVITY}],
@@ -155,7 +151,6 @@ CONDITION_SCHEMA = vol.All(
CONF_IS_AQI,
CONF_IS_ATMOSPHERIC_PRESSURE,
CONF_IS_BATTERY_LEVEL,
- CONF_IS_BLOOD_GLUCOSE_CONCENTRATION,
CONF_IS_CO,
CONF_IS_CO2,
CONF_IS_CONDUCTIVITY,
diff --git a/homeassistant/components/sensor/device_trigger.py b/homeassistant/components/sensor/device_trigger.py
index ffee10d9f40..b07b3fac11e 100644
--- a/homeassistant/components/sensor/device_trigger.py
+++ b/homeassistant/components/sensor/device_trigger.py
@@ -36,7 +36,6 @@ CONF_APPARENT_POWER = "apparent_power"
CONF_AQI = "aqi"
CONF_ATMOSPHERIC_PRESSURE = "atmospheric_pressure"
CONF_BATTERY_LEVEL = "battery_level"
-CONF_BLOOD_GLUCOSE_CONCENTRATION = "blood_glucose_concentration"
CONF_CO = "carbon_monoxide"
CONF_CO2 = "carbon_dioxide"
CONF_CONDUCTIVITY = "conductivity"
@@ -87,9 +86,6 @@ ENTITY_TRIGGERS = {
SensorDeviceClass.AQI: [{CONF_TYPE: CONF_AQI}],
SensorDeviceClass.ATMOSPHERIC_PRESSURE: [{CONF_TYPE: CONF_ATMOSPHERIC_PRESSURE}],
SensorDeviceClass.BATTERY: [{CONF_TYPE: CONF_BATTERY_LEVEL}],
- SensorDeviceClass.BLOOD_GLUCOSE_CONCENTRATION: [
- {CONF_TYPE: CONF_BLOOD_GLUCOSE_CONCENTRATION}
- ],
SensorDeviceClass.CO: [{CONF_TYPE: CONF_CO}],
SensorDeviceClass.CO2: [{CONF_TYPE: CONF_CO2}],
SensorDeviceClass.CONDUCTIVITY: [{CONF_TYPE: CONF_CONDUCTIVITY}],
@@ -155,7 +151,6 @@ TRIGGER_SCHEMA = vol.All(
CONF_AQI,
CONF_ATMOSPHERIC_PRESSURE,
CONF_BATTERY_LEVEL,
- CONF_BLOOD_GLUCOSE_CONCENTRATION,
CONF_CO,
CONF_CO2,
CONF_CONDUCTIVITY,
diff --git a/homeassistant/components/sensor/icons.json b/homeassistant/components/sensor/icons.json
index ea4c902e665..6132fcbc1e9 100644
--- a/homeassistant/components/sensor/icons.json
+++ b/homeassistant/components/sensor/icons.json
@@ -12,9 +12,6 @@
"atmospheric_pressure": {
"default": "mdi:thermometer-lines"
},
- "blood_glucose_concentration": {
- "default": "mdi:spoon-sugar"
- },
"carbon_dioxide": {
"default": "mdi:molecule-co2"
},
diff --git a/homeassistant/components/sensor/strings.json b/homeassistant/components/sensor/strings.json
index 6d529e72c3b..71bead342c4 100644
--- a/homeassistant/components/sensor/strings.json
+++ b/homeassistant/components/sensor/strings.json
@@ -6,7 +6,6 @@
"is_aqi": "Current {entity_name} air quality index",
"is_atmospheric_pressure": "Current {entity_name} atmospheric pressure",
"is_battery_level": "Current {entity_name} battery level",
- "is_blood_glucose_concentration": "Current {entity_name} blood glucose concentration",
"is_carbon_monoxide": "Current {entity_name} carbon monoxide concentration level",
"is_carbon_dioxide": "Current {entity_name} carbon dioxide concentration level",
"is_conductivity": "Current {entity_name} conductivity",
@@ -57,7 +56,6 @@
"aqi": "{entity_name} air quality index changes",
"atmospheric_pressure": "{entity_name} atmospheric pressure changes",
"battery_level": "{entity_name} battery level changes",
- "blood_glucose_concentration": "{entity_name} blood glucose concentration changes",
"carbon_monoxide": "{entity_name} carbon monoxide concentration changes",
"carbon_dioxide": "{entity_name} carbon dioxide concentration changes",
"conductivity": "{entity_name} conductivity changes",
@@ -151,9 +149,6 @@
"battery": {
"name": "Battery"
},
- "blood_glucose_concentration": {
- "name": "Blood glucose concentration"
- },
"carbon_monoxide": {
"name": "Carbon monoxide"
},
diff --git a/homeassistant/components/sentry/config_flow.py b/homeassistant/components/sentry/config_flow.py
index 2fead7c27cd..59cd1f3f0e9 100644
--- a/homeassistant/components/sentry/config_flow.py
+++ b/homeassistant/components/sentry/config_flow.py
@@ -49,7 +49,7 @@ class SentryConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> SentryOptionsFlow:
"""Get the options flow for this handler."""
- return SentryOptionsFlow()
+ return SentryOptionsFlow(config_entry)
async def async_step_user(
self, user_input: dict[str, Any] | None = None
@@ -78,6 +78,10 @@ class SentryConfigFlow(ConfigFlow, domain=DOMAIN):
class SentryOptionsFlow(OptionsFlow):
"""Handle Sentry options."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize Sentry options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/seven_segments/manifest.json b/homeassistant/components/seven_segments/manifest.json
index af00a1fdfed..2f39644d6d3 100644
--- a/homeassistant/components/seven_segments/manifest.json
+++ b/homeassistant/components/seven_segments/manifest.json
@@ -4,5 +4,5 @@
"codeowners": ["@fabaff"],
"documentation": "https://www.home-assistant.io/integrations/seven_segments",
"iot_class": "local_polling",
- "requirements": ["Pillow==11.0.0"]
+ "requirements": ["Pillow==10.4.0"]
}
diff --git a/homeassistant/components/seventeentrack/services.py b/homeassistant/components/seventeentrack/services.py
index 54c23e6d619..0833bc0a97b 100644
--- a/homeassistant/components/seventeentrack/services.py
+++ b/homeassistant/components/seventeentrack/services.py
@@ -1,8 +1,8 @@
"""Services for the seventeentrack integration."""
-from typing import Any, Final
+from typing import Final
-from pyseventeentrack.package import PACKAGE_STATUS_MAP, Package
+from pyseventeentrack.package import PACKAGE_STATUS_MAP
import voluptuous as vol
from homeassistant.config_entries import ConfigEntry, ConfigEntryState
@@ -81,7 +81,18 @@ def setup_services(hass: HomeAssistant) -> None:
return {
"packages": [
- package_to_dict(package)
+ {
+ ATTR_DESTINATION_COUNTRY: package.destination_country,
+ ATTR_ORIGIN_COUNTRY: package.origin_country,
+ ATTR_PACKAGE_TYPE: package.package_type,
+ ATTR_TRACKING_INFO_LANGUAGE: package.tracking_info_language,
+ ATTR_TRACKING_NUMBER: package.tracking_number,
+ ATTR_LOCATION: package.location,
+ ATTR_STATUS: package.status,
+ ATTR_TIMESTAMP: package.timestamp.isoformat(),
+ ATTR_INFO_TEXT: package.info_text,
+ ATTR_FRIENDLY_NAME: package.friendly_name,
+ }
for package in live_packages
if slugify(package.status) in package_states or package_states == []
]
@@ -99,22 +110,6 @@ def setup_services(hass: HomeAssistant) -> None:
await seventeen_coordinator.client.profile.archive_package(tracking_number)
- def package_to_dict(package: Package) -> dict[str, Any]:
- result = {
- ATTR_DESTINATION_COUNTRY: package.destination_country,
- ATTR_ORIGIN_COUNTRY: package.origin_country,
- ATTR_PACKAGE_TYPE: package.package_type,
- ATTR_TRACKING_INFO_LANGUAGE: package.tracking_info_language,
- ATTR_TRACKING_NUMBER: package.tracking_number,
- ATTR_LOCATION: package.location,
- ATTR_STATUS: package.status,
- ATTR_INFO_TEXT: package.info_text,
- ATTR_FRIENDLY_NAME: package.friendly_name,
- }
- if timestamp := package.timestamp:
- result[ATTR_TIMESTAMP] = timestamp.isoformat()
- return result
-
async def _validate_service(config_entry_id):
entry: ConfigEntry | None = hass.config_entries.async_get_entry(config_entry_id)
if not entry:
diff --git a/homeassistant/components/shelly/config_flow.py b/homeassistant/components/shelly/config_flow.py
index 1daa4710f30..717e0923fd6 100644
--- a/homeassistant/components/shelly/config_flow.py
+++ b/homeassistant/components/shelly/config_flow.py
@@ -444,7 +444,7 @@ class ShellyConfigFlow(ConfigFlow, domain=DOMAIN):
@callback
def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlowHandler:
"""Get the options flow for this handler."""
- return OptionsFlowHandler()
+ return OptionsFlowHandler(config_entry)
@classmethod
@callback
@@ -460,6 +460,10 @@ class ShellyConfigFlow(ConfigFlow, domain=DOMAIN):
class OptionsFlowHandler(OptionsFlow):
"""Handle the option flow for shelly."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/shelly/coordinator.py b/homeassistant/components/shelly/coordinator.py
index a66fbb20f48..6332e139244 100644
--- a/homeassistant/components/shelly/coordinator.py
+++ b/homeassistant/components/shelly/coordinator.py
@@ -603,7 +603,7 @@ class ShellyRpcCoordinator(ShellyCoordinatorBase[RpcDevice]):
async def _async_update_data(self) -> None:
"""Fetch data."""
- if self.update_sleep_period() or self.hass.is_stopping:
+ if self.update_sleep_period():
return
if self.sleep_period:
diff --git a/homeassistant/components/shelly/update.py b/homeassistant/components/shelly/update.py
index f22547acf50..fb586ae8b85 100644
--- a/homeassistant/components/shelly/update.py
+++ b/homeassistant/components/shelly/update.py
@@ -238,8 +238,7 @@ class RpcUpdateEntity(ShellyRpcAttributeEntity, UpdateEntity):
) -> None:
"""Initialize update entity."""
super().__init__(coordinator, key, attribute, description)
- self._ota_in_progress = False
- self._ota_progress_percentage: int | None = None
+ self._ota_in_progress: bool | int = False
self._attr_release_url = get_release_url(
coordinator.device.gen, coordinator.model, description.beta
)
@@ -257,12 +256,11 @@ class RpcUpdateEntity(ShellyRpcAttributeEntity, UpdateEntity):
if self.in_progress is not False:
event_type = event["event"]
if event_type == OTA_BEGIN:
- self._ota_progress_percentage = 0
+ self._ota_in_progress = 0
elif event_type == OTA_PROGRESS:
- self._ota_progress_percentage = event["progress_percent"]
+ self._ota_in_progress = event["progress_percent"]
elif event_type in (OTA_ERROR, OTA_SUCCESS):
self._ota_in_progress = False
- self._ota_progress_percentage = None
self.async_write_ha_state()
@property
@@ -280,15 +278,10 @@ class RpcUpdateEntity(ShellyRpcAttributeEntity, UpdateEntity):
return self.installed_version
@property
- def in_progress(self) -> bool:
+ def in_progress(self) -> bool | int:
"""Update installation in progress."""
return self._ota_in_progress
- @property
- def update_percentage(self) -> int | None:
- """Update installation progress."""
- return self._ota_progress_percentage
-
async def async_install(
self, version: str | None, backup: bool, **kwargs: Any
) -> None:
@@ -317,7 +310,6 @@ class RpcUpdateEntity(ShellyRpcAttributeEntity, UpdateEntity):
await self.coordinator.async_shutdown_device_and_start_reauth()
else:
self._ota_in_progress = True
- self._ota_progress_percentage = None
LOGGER.debug("OTA update call for %s successful", self.coordinator.name)
diff --git a/homeassistant/components/sia/config_flow.py b/homeassistant/components/sia/config_flow.py
index a23978145e7..cb451133d41 100644
--- a/homeassistant/components/sia/config_flow.py
+++ b/homeassistant/components/sia/config_flow.py
@@ -181,6 +181,7 @@ class SIAOptionsFlowHandler(OptionsFlow):
def __init__(self, config_entry: ConfigEntry) -> None:
"""Initialize SIA options flow."""
+ self.config_entry = config_entry
self.options = deepcopy(dict(config_entry.options))
self.hub: SIAHub | None = None
self.accounts_todo: list = []
diff --git a/homeassistant/components/sighthound/manifest.json b/homeassistant/components/sighthound/manifest.json
index 7d08367cf7d..875c98acb6d 100644
--- a/homeassistant/components/sighthound/manifest.json
+++ b/homeassistant/components/sighthound/manifest.json
@@ -5,5 +5,5 @@
"documentation": "https://www.home-assistant.io/integrations/sighthound",
"iot_class": "cloud_polling",
"loggers": ["simplehound"],
- "requirements": ["Pillow==11.0.0", "simplehound==0.3"]
+ "requirements": ["Pillow==10.4.0", "simplehound==0.3"]
}
diff --git a/homeassistant/components/simplisafe/config_flow.py b/homeassistant/components/simplisafe/config_flow.py
index 68974fe118f..6fdbd351a29 100644
--- a/homeassistant/components/simplisafe/config_flow.py
+++ b/homeassistant/components/simplisafe/config_flow.py
@@ -67,7 +67,7 @@ class SimpliSafeFlowHandler(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> SimpliSafeOptionsFlowHandler:
"""Define the config flow to handle options."""
- return SimpliSafeOptionsFlowHandler()
+ return SimpliSafeOptionsFlowHandler(config_entry)
async def async_step_reauth(
self, entry_data: Mapping[str, Any]
@@ -153,6 +153,10 @@ class SimpliSafeFlowHandler(ConfigFlow, domain=DOMAIN):
class SimpliSafeOptionsFlowHandler(OptionsFlow):
"""Handle a SimpliSafe options flow."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/sky_remote/__init__.py b/homeassistant/components/sky_remote/__init__.py
deleted file mode 100644
index 4daad78c558..00000000000
--- a/homeassistant/components/sky_remote/__init__.py
+++ /dev/null
@@ -1,39 +0,0 @@
-"""The Sky Remote Control integration."""
-
-import logging
-
-from skyboxremote import RemoteControl, SkyBoxConnectionError
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_HOST, CONF_PORT, Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryNotReady
-
-PLATFORMS = [Platform.REMOTE]
-
-_LOGGER = logging.getLogger(__name__)
-
-
-type SkyRemoteConfigEntry = ConfigEntry[RemoteControl]
-
-
-async def async_setup_entry(hass: HomeAssistant, entry: SkyRemoteConfigEntry) -> bool:
- """Set up Sky remote."""
- host = entry.data[CONF_HOST]
- port = entry.data[CONF_PORT]
-
- _LOGGER.debug("Setting up Host: %s, Port: %s", host, port)
- remote = RemoteControl(host, port)
- try:
- await remote.check_connectable()
- except SkyBoxConnectionError as e:
- raise ConfigEntryNotReady from e
-
- entry.runtime_data = remote
- await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
- return True
-
-
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
- """Unload a config entry."""
- return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/sky_remote/config_flow.py b/homeassistant/components/sky_remote/config_flow.py
deleted file mode 100644
index a55dfb2a52b..00000000000
--- a/homeassistant/components/sky_remote/config_flow.py
+++ /dev/null
@@ -1,64 +0,0 @@
-"""Config flow for sky_remote."""
-
-import logging
-from typing import Any
-
-from skyboxremote import RemoteControl, SkyBoxConnectionError
-import voluptuous as vol
-
-from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_HOST, CONF_PORT
-import homeassistant.helpers.config_validation as cv
-
-from .const import DEFAULT_PORT, DOMAIN, LEGACY_PORT
-
-DATA_SCHEMA = vol.Schema(
- {
- vol.Required(CONF_HOST): cv.string,
- }
-)
-
-
-async def async_find_box_port(host: str) -> int:
- """Find port box uses for communication."""
- logging.debug("Attempting to find port to connect to %s on", host)
- remote = RemoteControl(host, DEFAULT_PORT)
- try:
- await remote.check_connectable()
- except SkyBoxConnectionError:
- # Try legacy port if the default one failed
- remote = RemoteControl(host, LEGACY_PORT)
- await remote.check_connectable()
- return LEGACY_PORT
- return DEFAULT_PORT
-
-
-class SkyRemoteConfigFlow(ConfigFlow, domain=DOMAIN):
- """Handle a config flow for Sky Remote."""
-
- VERSION = 1
- MINOR_VERSION = 1
-
- async def async_step_user(
- self, user_input: dict[str, Any] | None = None
- ) -> ConfigFlowResult:
- """Handle the user step."""
-
- errors: dict[str, str] = {}
- if user_input is not None:
- logging.debug("user_input: %s", user_input)
- self._async_abort_entries_match(user_input)
- try:
- port = await async_find_box_port(user_input[CONF_HOST])
- except SkyBoxConnectionError:
- logging.exception("while finding port of skybox")
- errors["base"] = "cannot_connect"
- else:
- return self.async_create_entry(
- title=user_input[CONF_HOST],
- data={**user_input, CONF_PORT: port},
- )
-
- return self.async_show_form(
- step_id="user", data_schema=DATA_SCHEMA, errors=errors
- )
diff --git a/homeassistant/components/sky_remote/const.py b/homeassistant/components/sky_remote/const.py
deleted file mode 100644
index e67744a741b..00000000000
--- a/homeassistant/components/sky_remote/const.py
+++ /dev/null
@@ -1,6 +0,0 @@
-"""Constants."""
-
-DOMAIN = "sky_remote"
-
-DEFAULT_PORT = 49160
-LEGACY_PORT = 5900
diff --git a/homeassistant/components/sky_remote/manifest.json b/homeassistant/components/sky_remote/manifest.json
deleted file mode 100644
index b00ff309b10..00000000000
--- a/homeassistant/components/sky_remote/manifest.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "domain": "sky_remote",
- "name": "Sky Remote Control",
- "codeowners": ["@dunnmj", "@saty9"],
- "config_flow": true,
- "documentation": "https://www.home-assistant.io/integrations/sky_remote",
- "integration_type": "device",
- "iot_class": "assumed_state",
- "requirements": ["skyboxremote==0.0.6"]
-}
diff --git a/homeassistant/components/sky_remote/remote.py b/homeassistant/components/sky_remote/remote.py
deleted file mode 100644
index 05a464f73a6..00000000000
--- a/homeassistant/components/sky_remote/remote.py
+++ /dev/null
@@ -1,70 +0,0 @@
-"""Home Assistant integration to control a sky box using the remote platform."""
-
-from collections.abc import Iterable
-import logging
-from typing import Any
-
-from skyboxremote import VALID_KEYS, RemoteControl
-
-from homeassistant.components.remote import RemoteEntity
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ServiceValidationError
-from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-
-from . import SkyRemoteConfigEntry
-from .const import DOMAIN
-
-_LOGGER = logging.getLogger(__name__)
-
-
-async def async_setup_entry(
- hass: HomeAssistant,
- config: SkyRemoteConfigEntry,
- async_add_entities: AddEntitiesCallback,
-) -> None:
- """Set up the Sky remote platform."""
- async_add_entities(
- [SkyRemote(config.runtime_data, config.entry_id)],
- True,
- )
-
-
-class SkyRemote(RemoteEntity):
- """Representation of a Sky Remote."""
-
- _attr_has_entity_name = True
- _attr_name = None
-
- def __init__(self, remote: RemoteControl, unique_id: str) -> None:
- """Initialize the Sky Remote."""
- self._remote = remote
- self._attr_unique_id = unique_id
- self._attr_device_info = DeviceInfo(
- identifiers={(DOMAIN, unique_id)},
- manufacturer="SKY",
- model="Sky Box",
- name=remote.host,
- )
-
- def turn_on(self, activity: str | None = None, **kwargs: Any) -> None:
- """Send the power on command."""
- self.send_command(["sky"])
-
- def turn_off(self, activity: str | None = None, **kwargs: Any) -> None:
- """Send the power command."""
- self.send_command(["power"])
-
- def send_command(self, command: Iterable[str], **kwargs: Any) -> None:
- """Send a list of commands to the device."""
- for cmd in command:
- if cmd not in VALID_KEYS:
- raise ServiceValidationError(
- f"{cmd} is not in Valid Keys: {VALID_KEYS}"
- )
- try:
- self._remote.send_keys(command)
- except ValueError as err:
- _LOGGER.error("Invalid command: %s. Error: %s", command, err)
- return
- _LOGGER.debug("Successfully sent command %s", command)
diff --git a/homeassistant/components/sky_remote/strings.json b/homeassistant/components/sky_remote/strings.json
deleted file mode 100644
index af794490c43..00000000000
--- a/homeassistant/components/sky_remote/strings.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "config": {
- "error": {
- "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
- },
- "abort": {
- "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
- },
- "step": {
- "user": {
- "title": "Add Sky Remote",
- "data": {
- "host": "[%key:common::config_flow::data::host%]"
- },
- "data_description": {
- "host": "Hostname or IP address of your Sky device"
- }
- }
- }
- }
-}
diff --git a/homeassistant/components/smarty/__init__.py b/homeassistant/components/smarty/__init__.py
index 0d043804c3d..cc7215349a6 100644
--- a/homeassistant/components/smarty/__init__.py
+++ b/homeassistant/components/smarty/__init__.py
@@ -30,13 +30,7 @@ CONFIG_SCHEMA = vol.Schema(
extra=vol.ALLOW_EXTRA,
)
-PLATFORMS = [
- Platform.BINARY_SENSOR,
- Platform.BUTTON,
- Platform.FAN,
- Platform.SENSOR,
- Platform.SWITCH,
-]
+PLATFORMS = [Platform.BINARY_SENSOR, Platform.FAN, Platform.SENSOR]
async def async_setup(hass: HomeAssistant, hass_config: ConfigType) -> bool:
diff --git a/homeassistant/components/smarty/button.py b/homeassistant/components/smarty/button.py
deleted file mode 100644
index b8e31cf6fc8..00000000000
--- a/homeassistant/components/smarty/button.py
+++ /dev/null
@@ -1,74 +0,0 @@
-"""Platform to control a Salda Smarty XP/XV ventilation unit."""
-
-from __future__ import annotations
-
-from collections.abc import Callable
-from dataclasses import dataclass
-import logging
-from typing import Any
-
-from pysmarty2 import Smarty
-
-from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-
-from .coordinator import SmartyConfigEntry, SmartyCoordinator
-from .entity import SmartyEntity
-
-_LOGGER = logging.getLogger(__name__)
-
-
-@dataclass(frozen=True, kw_only=True)
-class SmartyButtonDescription(ButtonEntityDescription):
- """Class describing Smarty button."""
-
- press_fn: Callable[[Smarty], bool | None]
-
-
-ENTITIES: tuple[SmartyButtonDescription, ...] = (
- SmartyButtonDescription(
- key="reset_filters_timer",
- translation_key="reset_filters_timer",
- press_fn=lambda smarty: smarty.reset_filters_timer(),
- ),
-)
-
-
-async def async_setup_entry(
- hass: HomeAssistant,
- entry: SmartyConfigEntry,
- async_add_entities: AddEntitiesCallback,
-) -> None:
- """Set up the Smarty Button Platform."""
-
- coordinator = entry.runtime_data
-
- async_add_entities(
- SmartyButton(coordinator, description) for description in ENTITIES
- )
-
-
-class SmartyButton(SmartyEntity, ButtonEntity):
- """Representation of a Smarty Button."""
-
- entity_description: SmartyButtonDescription
-
- def __init__(
- self,
- coordinator: SmartyCoordinator,
- entity_description: SmartyButtonDescription,
- ) -> None:
- """Initialize the entity."""
- super().__init__(coordinator)
- self.entity_description = entity_description
- self._attr_unique_id = (
- f"{coordinator.config_entry.entry_id}_{entity_description.key}"
- )
-
- async def async_press(self, **kwargs: Any) -> None:
- """Press the button."""
- await self.hass.async_add_executor_job(
- self.entity_description.press_fn, self.coordinator.client
- )
- await self.coordinator.async_refresh()
diff --git a/homeassistant/components/smarty/strings.json b/homeassistant/components/smarty/strings.json
index 341a300a26e..367a3a34625 100644
--- a/homeassistant/components/smarty/strings.json
+++ b/homeassistant/components/smarty/strings.json
@@ -28,10 +28,6 @@
"deprecated_yaml_import_issue_auth_error": {
"title": "YAML import failed due to an authentication error",
"description": "Configuring {integration_title} using YAML is being removed but there was an authentication error while importing your existing configuration.\nSetup will not proceed.\n\nVerify that your {integration_title} is operating correctly and restart Home Assistant to attempt the import again.\n\nAlternatively, you may remove the `{domain}` configuration from your configuration.yaml entirely, restart Home Assistant, and add the {integration_title} integration manually."
- },
- "deprecated_yaml_import_issue_cannot_connect": {
- "title": "YAML import failed due to a connection error",
- "description": "Configuring {integration_title} using YAML is being removed but there was a connect error while importing your existing configuration.\nSetup will not proceed.\n\nVerify that your {integration_title} is operating correctly and restart Home Assistant to attempt the import again.\n\nAlternatively, you may remove the `{domain}` configuration from your configuration.yaml entirely, restart Home Assistant, and add the {integration_title} integration manually."
}
},
"entity": {
@@ -46,11 +42,6 @@
"name": "Boost state"
}
},
- "button": {
- "reset_filters_timer": {
- "name": "Reset filters timer"
- }
- },
"sensor": {
"supply_air_temperature": {
"name": "Supply air temperature"
@@ -70,11 +61,6 @@
"filter_days_left": {
"name": "Filter days left"
}
- },
- "switch": {
- "boost": {
- "name": "Boost"
- }
}
}
}
diff --git a/homeassistant/components/smarty/switch.py b/homeassistant/components/smarty/switch.py
deleted file mode 100644
index bf5fe80db44..00000000000
--- a/homeassistant/components/smarty/switch.py
+++ /dev/null
@@ -1,90 +0,0 @@
-"""Platform to control a Salda Smarty XP/XV ventilation unit."""
-
-from __future__ import annotations
-
-from collections.abc import Callable
-from dataclasses import dataclass
-import logging
-from typing import Any
-
-from pysmarty2 import Smarty
-
-from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-
-from .coordinator import SmartyConfigEntry, SmartyCoordinator
-from .entity import SmartyEntity
-
-_LOGGER = logging.getLogger(__name__)
-
-
-@dataclass(frozen=True, kw_only=True)
-class SmartySwitchDescription(SwitchEntityDescription):
- """Class describing Smarty switch."""
-
- is_on_fn: Callable[[Smarty], bool]
- turn_on_fn: Callable[[Smarty], bool | None]
- turn_off_fn: Callable[[Smarty], bool | None]
-
-
-ENTITIES: tuple[SmartySwitchDescription, ...] = (
- SmartySwitchDescription(
- key="boost",
- translation_key="boost",
- is_on_fn=lambda smarty: smarty.boost,
- turn_on_fn=lambda smarty: smarty.enable_boost(),
- turn_off_fn=lambda smarty: smarty.disable_boost(),
- ),
-)
-
-
-async def async_setup_entry(
- hass: HomeAssistant,
- entry: SmartyConfigEntry,
- async_add_entities: AddEntitiesCallback,
-) -> None:
- """Set up the Smarty Switch Platform."""
-
- coordinator = entry.runtime_data
-
- async_add_entities(
- SmartySwitch(coordinator, description) for description in ENTITIES
- )
-
-
-class SmartySwitch(SmartyEntity, SwitchEntity):
- """Representation of a Smarty Switch."""
-
- entity_description: SmartySwitchDescription
-
- def __init__(
- self,
- coordinator: SmartyCoordinator,
- entity_description: SmartySwitchDescription,
- ) -> None:
- """Initialize the entity."""
- super().__init__(coordinator)
- self.entity_description = entity_description
- self._attr_unique_id = (
- f"{coordinator.config_entry.entry_id}_{entity_description.key}"
- )
-
- @property
- def is_on(self) -> bool:
- """Return the state of the switch."""
- return self.entity_description.is_on_fn(self.coordinator.client)
-
- async def async_turn_on(self, **kwargs: Any) -> None:
- """Turn the switch on."""
- await self.hass.async_add_executor_job(
- self.entity_description.turn_on_fn, self.coordinator.client
- )
- await self.coordinator.async_refresh()
-
- async def async_turn_off(self, **kwargs: Any) -> None:
- """Turn the switch off."""
- await self.hass.async_add_executor_job(
- self.entity_description.turn_off_fn, self.coordinator.client
- )
- await self.coordinator.async_refresh()
diff --git a/homeassistant/components/somfy_mylink/config_flow.py b/homeassistant/components/somfy_mylink/config_flow.py
index c2d85160175..705db43362e 100644
--- a/homeassistant/components/somfy_mylink/config_flow.py
+++ b/homeassistant/components/somfy_mylink/config_flow.py
@@ -130,6 +130,7 @@ class OptionsFlowHandler(OptionsFlow):
def __init__(self, config_entry: ConfigEntry) -> None:
"""Initialize options flow."""
+ self.config_entry = config_entry
self.options = deepcopy(dict(config_entry.options))
self._target_id: str | None = None
diff --git a/homeassistant/components/sonarr/config_flow.py b/homeassistant/components/sonarr/config_flow.py
index e1cedba10e7..1c1d02638d8 100644
--- a/homeassistant/components/sonarr/config_flow.py
+++ b/homeassistant/components/sonarr/config_flow.py
@@ -63,7 +63,7 @@ class SonarrConfigFlow(ConfigFlow, domain=DOMAIN):
@callback
def async_get_options_flow(config_entry: ConfigEntry) -> SonarrOptionsFlowHandler:
"""Get the options flow for this handler."""
- return SonarrOptionsFlowHandler()
+ return SonarrOptionsFlowHandler(config_entry)
async def async_step_reauth(
self, entry_data: Mapping[str, Any]
@@ -93,13 +93,6 @@ class SonarrConfigFlow(ConfigFlow, domain=DOMAIN):
errors = {}
if user_input is not None:
- # aiopyarr defaults to the service port if one isn't given
- # this is counter to standard practice where http = 80
- # and https = 443.
- if CONF_URL in user_input:
- url = yarl.URL(user_input[CONF_URL])
- user_input[CONF_URL] = f"{url.scheme}://{url.host}:{url.port}{url.path}"
-
if self.source == SOURCE_REAUTH:
user_input = {**self._get_reauth_entry().data, **user_input}
@@ -155,6 +148,10 @@ class SonarrConfigFlow(ConfigFlow, domain=DOMAIN):
class SonarrOptionsFlowHandler(OptionsFlow):
"""Handle Sonarr client options."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, int] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/sonos/manifest.json b/homeassistant/components/sonos/manifest.json
index 76a7d0bfa91..d6c5eb298d8 100644
--- a/homeassistant/components/sonos/manifest.json
+++ b/homeassistant/components/sonos/manifest.json
@@ -8,7 +8,7 @@
"documentation": "https://www.home-assistant.io/integrations/sonos",
"iot_class": "local_push",
"loggers": ["soco"],
- "requirements": ["soco==0.30.6", "sonos-websocket==0.1.3"],
+ "requirements": ["soco==0.30.4", "sonos-websocket==0.1.3"],
"ssdp": [
{
"st": "urn:schemas-upnp-org:device:ZonePlayer:1"
diff --git a/homeassistant/components/speedtestdotnet/config_flow.py b/homeassistant/components/speedtestdotnet/config_flow.py
index 3bfd4eb6e4a..dc64448bbef 100644
--- a/homeassistant/components/speedtestdotnet/config_flow.py
+++ b/homeassistant/components/speedtestdotnet/config_flow.py
@@ -30,7 +30,7 @@ class SpeedTestFlowHandler(ConfigFlow, domain=DOMAIN):
config_entry: SpeedTestConfigEntry,
) -> SpeedTestOptionsFlowHandler:
"""Get the options flow for this handler."""
- return SpeedTestOptionsFlowHandler()
+ return SpeedTestOptionsFlowHandler(config_entry)
async def async_step_user(
self, user_input: dict[str, Any] | None = None
@@ -48,8 +48,9 @@ class SpeedTestFlowHandler(ConfigFlow, domain=DOMAIN):
class SpeedTestOptionsFlowHandler(OptionsFlow):
"""Handle SpeedTest options."""
- def __init__(self) -> None:
+ def __init__(self, config_entry: SpeedTestConfigEntry) -> None:
"""Initialize options flow."""
+ self.config_entry = config_entry
self._servers: dict = {}
async def async_step_init(
diff --git a/homeassistant/components/spotify/manifest.json b/homeassistant/components/spotify/manifest.json
index 8f8f7e0d588..8cf8d735553 100644
--- a/homeassistant/components/spotify/manifest.json
+++ b/homeassistant/components/spotify/manifest.json
@@ -9,6 +9,6 @@
"iot_class": "cloud_polling",
"loggers": ["spotipy"],
"quality_scale": "silver",
- "requirements": ["spotifyaio==0.8.8"],
+ "requirements": ["spotifyaio==0.8.5"],
"zeroconf": ["_spotify-connect._tcp.local."]
}
diff --git a/homeassistant/components/sql/config_flow.py b/homeassistant/components/sql/config_flow.py
index 4fe04f2401c..5537c7ff3b0 100644
--- a/homeassistant/components/sql/config_flow.py
+++ b/homeassistant/components/sql/config_flow.py
@@ -23,7 +23,7 @@ from homeassistant.config_entries import (
ConfigEntry,
ConfigFlow,
ConfigFlowResult,
- OptionsFlow,
+ OptionsFlowWithConfigEntry,
)
from homeassistant.const import (
CONF_DEVICE_CLASS,
@@ -144,7 +144,7 @@ class SQLConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> SQLOptionsFlowHandler:
"""Get the options flow for this handler."""
- return SQLOptionsFlowHandler()
+ return SQLOptionsFlowHandler(config_entry)
async def async_step_user(
self, user_input: dict[str, Any] | None = None
@@ -209,7 +209,7 @@ class SQLConfigFlow(ConfigFlow, domain=DOMAIN):
)
-class SQLOptionsFlowHandler(OptionsFlow):
+class SQLOptionsFlowHandler(OptionsFlowWithConfigEntry):
"""Handle SQL options."""
async def async_step_init(
@@ -223,7 +223,7 @@ class SQLOptionsFlowHandler(OptionsFlow):
db_url = user_input.get(CONF_DB_URL)
query = user_input[CONF_QUERY]
column = user_input[CONF_COLUMN_NAME]
- name = self.config_entry.options.get(CONF_NAME, self.config_entry.title)
+ name = self.options.get(CONF_NAME, self.config_entry.title)
try:
query = validate_sql_select(query)
@@ -275,7 +275,7 @@ class SQLOptionsFlowHandler(OptionsFlow):
return self.async_show_form(
step_id="init",
data_schema=self.add_suggested_values_to_schema(
- OPTIONS_SCHEMA, user_input or self.config_entry.options
+ OPTIONS_SCHEMA, user_input or self.options
),
errors=errors,
description_placeholders=description_placeholders,
diff --git a/homeassistant/components/srp_energy/strings.json b/homeassistant/components/srp_energy/strings.json
index eca4f465435..191d10a70dd 100644
--- a/homeassistant/components/srp_energy/strings.json
+++ b/homeassistant/components/srp_energy/strings.json
@@ -17,8 +17,7 @@
"unknown": "[%key:common::config_flow::error::unknown%]"
},
"abort": {
- "already_configured": "[%key:common::config_flow::abort::already_configured_service%]",
- "unknown": "Unexpected error"
+ "already_configured": "[%key:common::config_flow::abort::already_configured_service%]"
}
},
"entity": {
diff --git a/homeassistant/components/statistics/strings.json b/homeassistant/components/statistics/strings.json
index 3e6fec9d986..a060c88da24 100644
--- a/homeassistant/components/statistics/strings.json
+++ b/homeassistant/components/statistics/strings.json
@@ -23,10 +23,10 @@
"state_characteristic": {
"description": "Read the documention for further details on available options and how to use them.",
"data": {
- "state_characteristic": "Statistic characteristic"
+ "state_characteristic": "State_characteristic"
},
"data_description": {
- "state_characteristic": "The statistic characteristic that should be used as the state of the sensor."
+ "state_characteristic": "The characteristic that should be used as the state of the statistics sensor."
}
},
"options": {
diff --git a/homeassistant/components/steam_online/config_flow.py b/homeassistant/components/steam_online/config_flow.py
index 69009fca8c4..704eef616f6 100644
--- a/homeassistant/components/steam_online/config_flow.py
+++ b/homeassistant/components/steam_online/config_flow.py
@@ -40,7 +40,7 @@ class SteamFlowHandler(ConfigFlow, domain=DOMAIN):
@callback
def async_get_options_flow(
config_entry: SteamConfigEntry,
- ) -> SteamOptionsFlowHandler:
+ ) -> OptionsFlow:
"""Get the options flow for this handler."""
return SteamOptionsFlowHandler(config_entry)
@@ -123,6 +123,7 @@ class SteamOptionsFlowHandler(OptionsFlow):
def __init__(self, entry: SteamConfigEntry) -> None:
"""Initialize options flow."""
+ self.entry = entry
self.options = dict(entry.options)
async def async_step_init(
@@ -130,7 +131,7 @@ class SteamOptionsFlowHandler(OptionsFlow):
) -> ConfigFlowResult:
"""Manage Steam options."""
if user_input is not None:
- await self.hass.config_entries.async_unload(self.config_entry.entry_id)
+ await self.hass.config_entries.async_unload(self.entry.entry_id)
for _id in self.options[CONF_ACCOUNTS]:
if _id not in user_input[CONF_ACCOUNTS] and (
entity_id := er.async_get(self.hass).async_get_entity_id(
@@ -145,7 +146,7 @@ class SteamOptionsFlowHandler(OptionsFlow):
if _id in user_input[CONF_ACCOUNTS]
}
}
- await self.hass.config_entries.async_reload(self.config_entry.entry_id)
+ await self.hass.config_entries.async_reload(self.entry.entry_id)
return self.async_create_entry(title="", data=channel_data)
error = None
try:
@@ -175,9 +176,7 @@ class SteamOptionsFlowHandler(OptionsFlow):
"""Get accounts."""
interface = steam.api.interface("ISteamUser")
try:
- friends = interface.GetFriendList(
- steamid=self.config_entry.data[CONF_ACCOUNT]
- )
+ friends = interface.GetFriendList(steamid=self.entry.data[CONF_ACCOUNT])
_users_str = [user["steamid"] for user in friends["friendslist"]["friends"]]
except steam.api.HTTPError:
return []
diff --git a/homeassistant/components/stream/const.py b/homeassistant/components/stream/const.py
index 66455ffad1a..a2fa065e019 100644
--- a/homeassistant/components/stream/const.py
+++ b/homeassistant/components/stream/const.py
@@ -1,9 +1,5 @@
"""Constants for Stream component."""
-from __future__ import annotations
-
-from typing import Final
-
DOMAIN = "stream"
ATTR_ENDPOINTS = "endpoints"
@@ -15,8 +11,8 @@ RECORDER_PROVIDER = "recorder"
OUTPUT_FORMATS = [HLS_PROVIDER]
-SEGMENT_CONTAINER_FORMAT: Final = "mp4" # format for segments
-RECORDER_CONTAINER_FORMAT: Final = "mp4" # format for recorder output
+SEGMENT_CONTAINER_FORMAT = "mp4" # format for segments
+RECORDER_CONTAINER_FORMAT = "mp4" # format for recorder output
AUDIO_CODECS = {"aac", "mp3"}
FORMAT_CONTENT_TYPE = {HLS_PROVIDER: "application/vnd.apple.mpegurl"}
diff --git a/homeassistant/components/stream/core.py b/homeassistant/components/stream/core.py
index 4184b23b9a0..68c08a4f072 100644
--- a/homeassistant/components/stream/core.py
+++ b/homeassistant/components/stream/core.py
@@ -9,7 +9,7 @@ from dataclasses import dataclass, field
import datetime
from enum import IntEnum
import logging
-from typing import TYPE_CHECKING, Any, cast
+from typing import TYPE_CHECKING, Any
from aiohttp import web
import numpy as np
@@ -27,7 +27,7 @@ from .const import (
)
if TYPE_CHECKING:
- from av import Packet, VideoCodecContext
+ from av import CodecContext, Packet
from homeassistant.components.camera import DynamicStreamSettings
@@ -438,17 +438,17 @@ class KeyFrameConverter:
"""Initialize."""
# Keep import here so that we can import stream integration
- # without installing reqs
+ # without installingreqs
# pylint: disable-next=import-outside-toplevel
from homeassistant.components.camera.img_util import TurboJPEGSingleton
- self._packet: Packet | None = None
+ self._packet: Packet = None
self._event: asyncio.Event = asyncio.Event()
self._hass = hass
self._image: bytes | None = None
self._turbojpeg = TurboJPEGSingleton.instance()
self._lock = asyncio.Lock()
- self._codec_context: VideoCodecContext | None = None
+ self._codec_context: CodecContext | None = None
self._stream_settings = stream_settings
self._dynamic_stream_settings = dynamic_stream_settings
@@ -460,7 +460,7 @@ class KeyFrameConverter:
self._packet = packet
self._hass.loop.call_soon_threadsafe(self._event.set)
- def create_codec_context(self, codec_context: VideoCodecContext) -> None:
+ def create_codec_context(self, codec_context: CodecContext) -> None:
"""Create a codec context to be used for decoding the keyframes.
This is run by the worker thread and will only be called once per worker.
@@ -474,9 +474,7 @@ class KeyFrameConverter:
# pylint: disable-next=import-outside-toplevel
from av import CodecContext
- self._codec_context = cast(
- "VideoCodecContext", CodecContext.create(codec_context.name, "r")
- )
+ self._codec_context = CodecContext.create(codec_context.name, "r")
self._codec_context.extradata = codec_context.extradata
self._codec_context.skip_frame = "NONKEY"
self._codec_context.thread_type = "NONE"
@@ -508,8 +506,9 @@ class KeyFrameConverter:
frames = self._codec_context.decode(None)
break
except EOFError:
- _LOGGER.debug("Codec context needs flushing")
- self._codec_context.flush_buffers()
+ _LOGGER.debug("Codec context needs flushing, attempting to reopen")
+ self._codec_context.close()
+ self._codec_context.open()
else:
_LOGGER.debug("Unable to decode keyframe")
return
diff --git a/homeassistant/components/stream/manifest.json b/homeassistant/components/stream/manifest.json
index fdf81d99e65..00387d97b83 100644
--- a/homeassistant/components/stream/manifest.json
+++ b/homeassistant/components/stream/manifest.json
@@ -7,5 +7,5 @@
"integration_type": "system",
"iot_class": "local_push",
"quality_scale": "internal",
- "requirements": ["PyTurboJPEG==1.7.5", "av==13.1.0", "numpy==2.1.3"]
+ "requirements": ["PyTurboJPEG==1.7.5", "ha-av==10.1.1", "numpy==1.26.4"]
}
diff --git a/homeassistant/components/stream/recorder.py b/homeassistant/components/stream/recorder.py
index a24440e6d19..6dfc09891b7 100644
--- a/homeassistant/components/stream/recorder.py
+++ b/homeassistant/components/stream/recorder.py
@@ -9,7 +9,6 @@ import os
from typing import TYPE_CHECKING
import av
-import av.container
from homeassistant.core import HomeAssistant, callback
@@ -106,23 +105,24 @@ class RecorderOutput(StreamOutput):
# Create output on first segment
if not output:
- container_options: dict[str, str] = {
- "video_track_timescale": str(int(1 / source_v.time_base)), # type: ignore[operator]
- "movflags": "frag_keyframe+empty_moov",
- "min_frag_duration": str(self.stream_settings.min_segment_duration),
- }
output = av.open(
self.video_path + ".tmp",
"w",
format=RECORDER_CONTAINER_FORMAT,
- container_options=container_options,
+ container_options={
+ "video_track_timescale": str(int(1 / source_v.time_base)),
+ "movflags": "frag_keyframe+empty_moov",
+ "min_frag_duration": str(
+ self.stream_settings.min_segment_duration
+ ),
+ },
)
# Add output streams if necessary
if not output_v:
output_v = output.add_stream(template=source_v)
context = output_v.codec_context
- context.global_header = True
+ context.flags |= "GLOBAL_HEADER"
if source_a and not output_a:
output_a = output.add_stream(template=source_a)
@@ -132,23 +132,21 @@ class RecorderOutput(StreamOutput):
last_stream_id = segment.stream_id
pts_adjuster["video"] = int(
(running_duration - source.start_time)
- / (av.time_base * source_v.time_base) # type: ignore[operator]
+ / (av.time_base * source_v.time_base)
)
if source_a:
pts_adjuster["audio"] = int(
(running_duration - source.start_time)
- / (av.time_base * source_a.time_base) # type: ignore[operator]
+ / (av.time_base * source_a.time_base)
)
# Remux video
for packet in source.demux():
- if packet.pts is None:
+ if packet.dts is None:
continue
- packet.pts += pts_adjuster[packet.stream.type] # type: ignore[operator]
- packet.dts += pts_adjuster[packet.stream.type] # type: ignore[operator]
- stream = output_v if packet.stream.type == "video" else output_a
- assert stream
- packet.stream = stream
+ packet.pts += pts_adjuster[packet.stream.type]
+ packet.dts += pts_adjuster[packet.stream.type]
+ packet.stream = output_v if packet.stream.type == "video" else output_a
output.mux(packet)
running_duration += source.duration - source.start_time
@@ -171,9 +169,7 @@ class RecorderOutput(StreamOutput):
os.remove(video_path + ".tmp")
def finish_writing(
- segments: deque[Segment],
- output: av.container.OutputContainer | None,
- video_path: str,
+ segments: deque[Segment], output: av.OutputContainer, video_path: str
) -> None:
"""Finish writing output."""
# Should only have 0 or 1 segments, but loop through just in case
diff --git a/homeassistant/components/stream/worker.py b/homeassistant/components/stream/worker.py
index 8c9bb1b8e9e..0d72a9b0818 100644
--- a/homeassistant/components/stream/worker.py
+++ b/homeassistant/components/stream/worker.py
@@ -13,9 +13,6 @@ from threading import Event
from typing import Any, Self, cast
import av
-import av.audio
-import av.container
-import av.stream
from homeassistant.core import HomeAssistant
from homeassistant.util import dt as dt_util
@@ -50,10 +47,10 @@ class StreamWorkerError(Exception):
"""An exception thrown while processing a stream."""
-def redact_av_error_string(err: av.FFmpegError) -> str:
+def redact_av_error_string(err: av.AVError) -> str:
"""Return an error string with credentials redacted from the url."""
- parts = [str(err.type), err.strerror] # type: ignore[attr-defined]
- if err.filename:
+ parts = [str(err.type), err.strerror]
+ if err.filename is not None:
parts.append(redact_credentials(err.filename))
return ", ".join(parts)
@@ -126,31 +123,30 @@ class StreamState:
class StreamMuxer:
"""StreamMuxer re-packages video/audio packets for output."""
- _segment_start_dts: int
- _memory_file: BytesIO
- _av_output: av.container.OutputContainer
- _output_video_stream: av.VideoStream
- _output_audio_stream: av.audio.AudioStream | None
- _segment: Segment | None
- # the following 2 member variables are used for Part formation
- _memory_file_pos: int
- _part_start_dts: float
-
def __init__(
self,
hass: HomeAssistant,
- video_stream: av.VideoStream,
- audio_stream: av.audio.AudioStream | None,
- audio_bsf: str | None,
+ video_stream: av.video.VideoStream,
+ audio_stream: av.audio.stream.AudioStream | None,
+ audio_bsf: av.BitStreamFilter | None,
stream_state: StreamState,
stream_settings: StreamSettings,
) -> None:
"""Initialize StreamMuxer."""
self._hass = hass
- self._input_video_stream = video_stream
- self._input_audio_stream = audio_stream
+ self._segment_start_dts: int = cast(int, None)
+ self._memory_file: BytesIO = cast(BytesIO, None)
+ self._av_output: av.container.OutputContainer = None
+ self._input_video_stream: av.video.VideoStream = video_stream
+ self._input_audio_stream: av.audio.stream.AudioStream | None = audio_stream
self._audio_bsf = audio_bsf
- self._audio_bsf_context: av.BitStreamFilterContext | None = None
+ self._audio_bsf_context: av.BitStreamFilterContext = None
+ self._output_video_stream: av.video.VideoStream = None
+ self._output_audio_stream: av.audio.stream.AudioStream | None = None
+ self._segment: Segment | None = None
+ # the following 3 member variables are used for Part formation
+ self._memory_file_pos: int = cast(int, None)
+ self._part_start_dts: int = cast(int, None)
self._part_has_keyframe = False
self._stream_settings = stream_settings
self._stream_state = stream_state
@@ -160,83 +156,83 @@ class StreamMuxer:
self,
memory_file: BytesIO,
sequence: int,
- input_vstream: av.VideoStream,
- input_astream: av.audio.AudioStream | None,
+ input_vstream: av.video.VideoStream,
+ input_astream: av.audio.stream.AudioStream | None,
) -> tuple[
av.container.OutputContainer,
- av.VideoStream,
- av.audio.AudioStream | None,
+ av.video.VideoStream,
+ av.audio.stream.AudioStream | None,
]:
"""Make a new av OutputContainer and add output streams."""
- container_options: dict[str, str] = {
- # Removed skip_sidx - see:
- # https://github.com/home-assistant/core/pull/39970
- # "cmaf" flag replaces several of the movflags used,
- # but too recent to use for now
- "movflags": "frag_custom+empty_moov+default_base_moof+frag_discont+negative_cts_offsets+skip_trailer+delay_moov",
- # Sometimes the first segment begins with negative timestamps,
- # and this setting just
- # adjusts the timestamps in the output from that segment to start
- # from 0. Helps from having to make some adjustments
- # in test_durations
- "avoid_negative_ts": "make_non_negative",
- "fragment_index": str(sequence + 1),
- "video_track_timescale": str(int(1 / input_vstream.time_base)), # type: ignore[operator]
- # Only do extra fragmenting if we are using ll_hls
- # Let ffmpeg do the work using frag_duration
- # Fragment durations may exceed the 15% allowed variance but it seems ok
- **(
- {
- "movflags": "empty_moov+default_base_moof+frag_discont+negative_cts_offsets+skip_trailer+delay_moov",
- # Create a fragment every TARGET_PART_DURATION. The data from
- # each fragment is stored in a "Part" that can be combined with
- # the data from all the other "Part"s, plus an init section,
- # to reconstitute the data in a "Segment".
- #
- # The LL-HLS spec allows for a fragment's duration to be within
- # the range [0.85x,1.0x] of the part target duration. We use the
- # frag_duration option to tell ffmpeg to try to cut the
- # fragments when they reach frag_duration. However,
- # the resulting fragments can have variability in their
- # durations and can end up being too short or too long. With a
- # video track with no audio, the discrete nature of frames means
- # that the frame at the end of a fragment will sometimes extend
- # slightly beyond the desired frag_duration.
- #
- # If there are two tracks, as in the case of a video feed with
- # audio, there is an added wrinkle as the fragment cut seems to
- # be done on the first track that crosses the desired threshold,
- # and cutting on the audio track may also result in a shorter
- # video fragment than desired.
- #
- # Given this, our approach is to give ffmpeg a frag_duration
- # somewhere in the middle of the range, hoping that the parts
- # stay pretty well bounded, and we adjust the part durations
- # a bit in the hls metadata so that everything "looks" ok.
- "frag_duration": str(
- int(self._stream_settings.part_target_duration * 9e5)
- ),
- }
- if self._stream_settings.ll_hls
- else {}
- ),
- }
container = av.open(
memory_file,
mode="w",
format=SEGMENT_CONTAINER_FORMAT,
- container_options=container_options,
+ container_options={
+ # Removed skip_sidx - see:
+ # https://github.com/home-assistant/core/pull/39970
+ # "cmaf" flag replaces several of the movflags used,
+ # but too recent to use for now
+ "movflags": "frag_custom+empty_moov+default_base_moof+frag_discont+negative_cts_offsets+skip_trailer+delay_moov",
+ # Sometimes the first segment begins with negative timestamps,
+ # and this setting just
+ # adjusts the timestamps in the output from that segment to start
+ # from 0. Helps from having to make some adjustments
+ # in test_durations
+ "avoid_negative_ts": "make_non_negative",
+ "fragment_index": str(sequence + 1),
+ "video_track_timescale": str(int(1 / input_vstream.time_base)),
+ # Only do extra fragmenting if we are using ll_hls
+ # Let ffmpeg do the work using frag_duration
+ # Fragment durations may exceed the 15% allowed variance but it seems ok
+ **(
+ {
+ "movflags": "empty_moov+default_base_moof+frag_discont+negative_cts_offsets+skip_trailer+delay_moov",
+ # Create a fragment every TARGET_PART_DURATION. The data from
+ # each fragment is stored in a "Part" that can be combined with
+ # the data from all the other "Part"s, plus an init section,
+ # to reconstitute the data in a "Segment".
+ #
+ # The LL-HLS spec allows for a fragment's duration to be within
+ # the range [0.85x,1.0x] of the part target duration. We use the
+ # frag_duration option to tell ffmpeg to try to cut the
+ # fragments when they reach frag_duration. However,
+ # the resulting fragments can have variability in their
+ # durations and can end up being too short or too long. With a
+ # video track with no audio, the discrete nature of frames means
+ # that the frame at the end of a fragment will sometimes extend
+ # slightly beyond the desired frag_duration.
+ #
+ # If there are two tracks, as in the case of a video feed with
+ # audio, there is an added wrinkle as the fragment cut seems to
+ # be done on the first track that crosses the desired threshold,
+ # and cutting on the audio track may also result in a shorter
+ # video fragment than desired.
+ #
+ # Given this, our approach is to give ffmpeg a frag_duration
+ # somewhere in the middle of the range, hoping that the parts
+ # stay pretty well bounded, and we adjust the part durations
+ # a bit in the hls metadata so that everything "looks" ok.
+ "frag_duration": str(
+ int(self._stream_settings.part_target_duration * 9e5)
+ ),
+ }
+ if self._stream_settings.ll_hls
+ else {}
+ ),
+ },
)
output_vstream = container.add_stream(template=input_vstream)
# Check if audio is requested
output_astream = None
if input_astream:
if self._audio_bsf:
- self._audio_bsf_context = av.BitStreamFilterContext(
- self._audio_bsf, input_astream
- )
- output_astream = container.add_stream(template=input_astream)
- return container, output_vstream, output_astream # type: ignore[return-value]
+ self._audio_bsf_context = self._audio_bsf.create()
+ self._audio_bsf_context.set_input_stream(input_astream)
+ output_astream = container.add_stream(
+ template=self._audio_bsf_context or input_astream
+ )
+ return container, output_vstream, output_astream
def reset(self, video_dts: int) -> None:
"""Initialize a new stream segment."""
@@ -255,7 +251,7 @@ class StreamMuxer:
input_astream=self._input_audio_stream,
)
if self._output_video_stream.name == "hevc":
- self._output_video_stream.codec_context.codec_tag = "hvc1"
+ self._output_video_stream.codec_tag = "hvc1"
def mux_packet(self, packet: av.Packet) -> None:
"""Mux a packet to the appropriate output stream."""
@@ -277,11 +273,11 @@ class StreamMuxer:
self._part_has_keyframe |= packet.is_keyframe
elif packet.stream == self._input_audio_stream:
- assert self._output_audio_stream
if self._audio_bsf_context:
- for audio_packet in self._audio_bsf_context.filter(packet):
- audio_packet.stream = self._output_audio_stream
- self._av_output.mux(audio_packet)
+ self._audio_bsf_context.send(packet)
+ while packet := self._audio_bsf_context.recv():
+ packet.stream = self._output_audio_stream
+ self._av_output.mux(packet)
return
packet.stream = self._output_audio_stream
self._av_output.mux(packet)
@@ -399,7 +395,7 @@ class StreamMuxer:
self._memory_file.close()
-class PeekIterator(Iterator[av.Packet]):
+class PeekIterator(Iterator):
"""An Iterator that may allow multiple passes.
This may be consumed like a normal Iterator, however also supports a
@@ -463,7 +459,7 @@ class TimestampValidator:
"""Validate the packet timestamp based on ordering within the stream."""
# Discard packets missing DTS. Terminate if too many are missing.
if packet.dts is None:
- if self._missing_dts >= MAX_MISSING_DTS: # type: ignore[unreachable]
+ if self._missing_dts >= MAX_MISSING_DTS:
raise StreamWorkerError(
f"No dts in {MAX_MISSING_DTS+1} consecutive packets"
)
@@ -490,7 +486,7 @@ def is_keyframe(packet: av.Packet) -> Any:
def get_audio_bitstream_filter(
packets: Iterator[av.Packet], audio_stream: Any
-) -> str | None:
+) -> av.BitStreamFilterContext | None:
"""Return the aac_adtstoasc bitstream filter if ADTS AAC is detected."""
if not audio_stream:
return None
@@ -507,7 +503,7 @@ def get_audio_bitstream_filter(
_LOGGER.debug(
"ADTS AAC detected. Adding aac_adtstoaac bitstream filter"
)
- return "aac_adtstoasc"
+ return av.BitStreamFilter("aac_adtstoasc")
break
return None
@@ -528,7 +524,7 @@ def stream_worker(
del pyav_options["stimeout"]
try:
container = av.open(source, options=pyav_options, timeout=SOURCE_TIMEOUT)
- except av.FFmpegError as err:
+ except av.AVError as err:
raise StreamWorkerError(
f"Error opening stream ({redact_av_error_string(err)})"
) from err
@@ -545,7 +541,7 @@ def stream_worker(
audio_stream = None
# Some audio streams do not have a profile and throw errors when remuxing
if audio_stream and audio_stream.profile is None:
- audio_stream = None # type: ignore[unreachable]
+ audio_stream = None
# Disable ll-hls for hls inputs
if container.format.name == "hls":
for field in fields(StreamSettings):
@@ -560,8 +556,8 @@ def stream_worker(
stream_state.diagnostics.set_value("audio_codec", audio_stream.name)
dts_validator = TimestampValidator(
- int(1 / video_stream.time_base), # type: ignore[operator]
- int(1 / audio_stream.time_base) if audio_stream else 1, # type: ignore[operator]
+ int(1 / video_stream.time_base),
+ 1 / audio_stream.time_base if audio_stream else 1,
)
container_packets = PeekIterator(
filter(dts_validator.is_valid, container.demux((video_stream, audio_stream)))
@@ -602,7 +598,7 @@ def stream_worker(
except StopIteration as ex:
container.close()
raise StreamEndedError("Stream ended; no additional packets") from ex
- except av.FFmpegError as ex:
+ except av.AVError as ex:
container.close()
raise StreamWorkerError(
f"Error demuxing stream while finding first packet ({redact_av_error_string(ex)})"
@@ -629,7 +625,7 @@ def stream_worker(
raise
except StopIteration as ex:
raise StreamEndedError("Stream ended; no additional packets") from ex
- except av.FFmpegError as ex:
+ except av.AVError as ex:
raise StreamWorkerError(
f"Error demuxing stream ({redact_av_error_string(ex)})"
) from ex
diff --git a/homeassistant/components/subaru/config_flow.py b/homeassistant/components/subaru/config_flow.py
index 0ef4ed29941..3d96a89a14f 100644
--- a/homeassistant/components/subaru/config_flow.py
+++ b/homeassistant/components/subaru/config_flow.py
@@ -106,7 +106,7 @@ class SubaruConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> OptionsFlowHandler:
"""Get the options flow for this handler."""
- return OptionsFlowHandler()
+ return OptionsFlowHandler(config_entry)
async def validate_login_creds(self, data):
"""Validate the user input allows us to connect.
@@ -218,6 +218,10 @@ class SubaruConfigFlow(ConfigFlow, domain=DOMAIN):
class OptionsFlowHandler(OptionsFlow):
"""Handle a option flow for Subaru."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/subaru/strings.json b/homeassistant/components/subaru/strings.json
index 00da729dccd..78625192e4a 100644
--- a/homeassistant/components/subaru/strings.json
+++ b/homeassistant/components/subaru/strings.json
@@ -37,13 +37,13 @@
"invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
"incorrect_pin": "Incorrect PIN",
"bad_pin_format": "PIN should be 4 digits",
+ "two_factor_request_failed": "Request for 2FA code failed, please try again",
"bad_validation_code_format": "Validation code should be 6 digits",
"incorrect_validation_code": "Incorrect validation code"
},
"abort": {
"already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
- "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
- "two_factor_request_failed": "Request for 2FA code failed, please try again"
+ "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
}
},
"options": {
diff --git a/homeassistant/components/suez_water/__init__.py b/homeassistant/components/suez_water/__init__.py
index 06f503b85c2..f5b2880e011 100644
--- a/homeassistant/components/suez_water/__init__.py
+++ b/homeassistant/components/suez_water/__init__.py
@@ -2,12 +2,15 @@
from __future__ import annotations
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import Platform
-from homeassistant.core import HomeAssistant
+from pysuez import SuezClient
+from pysuez.client import PySuezError
-from .const import DOMAIN
-from .coordinator import SuezWaterCoordinator
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_PASSWORD, CONF_USERNAME, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryError, ConfigEntryNotReady
+
+from .const import CONF_COUNTER_ID, DOMAIN
PLATFORMS: list[Platform] = [Platform.SENSOR]
@@ -15,10 +18,23 @@ PLATFORMS: list[Platform] = [Platform.SENSOR]
async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
"""Set up Suez Water from a config entry."""
- coordinator = SuezWaterCoordinator(hass, entry)
- await coordinator.async_config_entry_first_refresh()
+ def get_client() -> SuezClient:
+ try:
+ client = SuezClient(
+ entry.data[CONF_USERNAME],
+ entry.data[CONF_PASSWORD],
+ entry.data[CONF_COUNTER_ID],
+ provider=None,
+ )
+ if not client.check_credentials():
+ raise ConfigEntryError
+ except PySuezError as ex:
+ raise ConfigEntryNotReady from ex
+ return client
- hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
+ hass.data.setdefault(DOMAIN, {})[
+ entry.entry_id
+ ] = await hass.async_add_executor_job(get_client)
await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
diff --git a/homeassistant/components/suez_water/config_flow.py b/homeassistant/components/suez_water/config_flow.py
index ac09cf4a1d3..28b211dc808 100644
--- a/homeassistant/components/suez_water/config_flow.py
+++ b/homeassistant/components/suez_water/config_flow.py
@@ -5,7 +5,8 @@ from __future__ import annotations
import logging
from typing import Any
-from pysuez import PySuezError, SuezClient
+from pysuez import SuezClient
+from pysuez.client import PySuezError
import voluptuous as vol
from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
@@ -20,34 +21,28 @@ STEP_USER_DATA_SCHEMA = vol.Schema(
{
vol.Required(CONF_USERNAME): str,
vol.Required(CONF_PASSWORD): str,
- vol.Optional(CONF_COUNTER_ID): str,
+ vol.Required(CONF_COUNTER_ID): str,
}
)
-async def validate_input(data: dict[str, Any]) -> None:
+def validate_input(data: dict[str, Any]) -> None:
"""Validate the user input allows us to connect.
Data has the keys from STEP_USER_DATA_SCHEMA with values provided by the user.
"""
try:
- counter_id = data.get(CONF_COUNTER_ID)
client = SuezClient(
data[CONF_USERNAME],
data[CONF_PASSWORD],
- counter_id,
+ data[CONF_COUNTER_ID],
+ provider=None,
)
- if not await client.check_credentials():
+ if not client.check_credentials():
raise InvalidAuth
except PySuezError as ex:
raise CannotConnect from ex
- if counter_id is None:
- try:
- data[CONF_COUNTER_ID] = await client.find_counter()
- except PySuezError as ex:
- raise CounterNotFound from ex
-
class SuezWaterConfigFlow(ConfigFlow, domain=DOMAIN):
"""Handle a config flow for Suez Water."""
@@ -63,13 +58,11 @@ class SuezWaterConfigFlow(ConfigFlow, domain=DOMAIN):
await self.async_set_unique_id(user_input[CONF_USERNAME])
self._abort_if_unique_id_configured()
try:
- await validate_input(user_input)
+ await self.hass.async_add_executor_job(validate_input, user_input)
except CannotConnect:
errors["base"] = "cannot_connect"
except InvalidAuth:
errors["base"] = "invalid_auth"
- except CounterNotFound:
- errors["base"] = "counter_not_found"
except Exception:
_LOGGER.exception("Unexpected exception")
errors["base"] = "unknown"
@@ -89,7 +82,3 @@ class CannotConnect(HomeAssistantError):
class InvalidAuth(HomeAssistantError):
"""Error to indicate there is invalid auth."""
-
-
-class CounterNotFound(HomeAssistantError):
- """Error to indicate we cannot automatically found the counter id."""
diff --git a/homeassistant/components/suez_water/const.py b/homeassistant/components/suez_water/const.py
index cecd779c22c..7afc0d3ce3e 100644
--- a/homeassistant/components/suez_water/const.py
+++ b/homeassistant/components/suez_water/const.py
@@ -1,9 +1,5 @@
"""Constants for the Suez Water integration."""
-from datetime import timedelta
-
DOMAIN = "suez_water"
CONF_COUNTER_ID = "counter_id"
-
-DATA_REFRESH_INTERVAL = timedelta(hours=12)
diff --git a/homeassistant/components/suez_water/coordinator.py b/homeassistant/components/suez_water/coordinator.py
deleted file mode 100644
index 224929c606e..00000000000
--- a/homeassistant/components/suez_water/coordinator.py
+++ /dev/null
@@ -1,88 +0,0 @@
-"""Suez water update coordinator."""
-
-from collections.abc import Mapping
-from dataclasses import dataclass
-from datetime import date
-from typing import Any
-
-from pysuez import PySuezError, SuezClient
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
-from homeassistant.core import _LOGGER, HomeAssistant
-from homeassistant.exceptions import ConfigEntryError
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-
-from .const import CONF_COUNTER_ID, DATA_REFRESH_INTERVAL, DOMAIN
-
-
-@dataclass
-class SuezWaterAggregatedAttributes:
- """Class containing aggregated sensor extra attributes."""
-
- this_month_consumption: dict[date, float]
- previous_month_consumption: dict[date, float]
- last_year_overall: dict[str, float]
- this_year_overall: dict[str, float]
- history: dict[date, float]
- highest_monthly_consumption: float
-
-
-@dataclass
-class SuezWaterData:
- """Class used to hold all fetch data from suez api."""
-
- aggregated_value: float
- aggregated_attr: Mapping[str, Any]
- price: float
-
-
-class SuezWaterCoordinator(DataUpdateCoordinator[SuezWaterData]):
- """Suez water coordinator."""
-
- _suez_client: SuezClient
- config_entry: ConfigEntry
-
- def __init__(self, hass: HomeAssistant, config_entry: ConfigEntry) -> None:
- """Initialize suez water coordinator."""
- super().__init__(
- hass,
- _LOGGER,
- name=DOMAIN,
- update_interval=DATA_REFRESH_INTERVAL,
- always_update=True,
- config_entry=config_entry,
- )
-
- async def _async_setup(self) -> None:
- self._suez_client = SuezClient(
- username=self.config_entry.data[CONF_USERNAME],
- password=self.config_entry.data[CONF_PASSWORD],
- counter_id=self.config_entry.data[CONF_COUNTER_ID],
- )
- if not await self._suez_client.check_credentials():
- raise ConfigEntryError("Invalid credentials for suez water")
-
- async def _async_update_data(self) -> SuezWaterData:
- """Fetch data from API endpoint."""
- try:
- aggregated = await self._suez_client.fetch_aggregated_data()
- data = SuezWaterData(
- aggregated_value=aggregated.value,
- aggregated_attr={
- "this_month_consumption": aggregated.current_month,
- "previous_month_consumption": aggregated.previous_month,
- "highest_monthly_consumption": aggregated.highest_monthly_consumption,
- "last_year_overall": aggregated.previous_year,
- "this_year_overall": aggregated.current_year,
- "history": aggregated.history,
- },
- price=(await self._suez_client.get_price()).price,
- )
- except PySuezError as err:
- _LOGGER.exception(err)
- raise UpdateFailed(
- f"Suez coordinator error communicating with API: {err}"
- ) from err
- _LOGGER.debug("Successfully fetched suez data")
- return data
diff --git a/homeassistant/components/suez_water/manifest.json b/homeassistant/components/suez_water/manifest.json
index 5eb05b9acb7..fa7f8f6461d 100644
--- a/homeassistant/components/suez_water/manifest.json
+++ b/homeassistant/components/suez_water/manifest.json
@@ -6,5 +6,5 @@
"documentation": "https://www.home-assistant.io/integrations/suez_water",
"iot_class": "cloud_polling",
"loggers": ["pysuez", "regex"],
- "requirements": ["pysuezV2==1.3.1"]
+ "requirements": ["pysuezV2==0.2.2"]
}
diff --git a/homeassistant/components/suez_water/sensor.py b/homeassistant/components/suez_water/sensor.py
index 2ba699a9af1..5b00cbf2dc4 100644
--- a/homeassistant/components/suez_water/sensor.py
+++ b/homeassistant/components/suez_water/sensor.py
@@ -2,53 +2,24 @@
from __future__ import annotations
-from collections.abc import Callable, Mapping
-from dataclasses import dataclass
-from typing import Any
+from datetime import timedelta
+import logging
-from pysuez.const import ATTRIBUTION
+from pysuez import SuezClient
+from pysuez.client import PySuezError
-from homeassistant.components.sensor import (
- SensorDeviceClass,
- SensorEntity,
- SensorEntityDescription,
-)
+from homeassistant.components.sensor import SensorDeviceClass, SensorEntity
from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CURRENCY_EURO, UnitOfVolume
+from homeassistant.const import UnitOfVolume
from homeassistant.core import HomeAssistant
from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
from .const import CONF_COUNTER_ID, DOMAIN
-from .coordinator import SuezWaterCoordinator, SuezWaterData
+_LOGGER = logging.getLogger(__name__)
-@dataclass(frozen=True, kw_only=True)
-class SuezWaterSensorEntityDescription(SensorEntityDescription):
- """Describes Suez water sensor entity."""
-
- value_fn: Callable[[SuezWaterData], float | str | None]
- attr_fn: Callable[[SuezWaterData], Mapping[str, Any] | None] = lambda _: None
-
-
-SENSORS: tuple[SuezWaterSensorEntityDescription, ...] = (
- SuezWaterSensorEntityDescription(
- key="water_usage_yesterday",
- translation_key="water_usage_yesterday",
- native_unit_of_measurement=UnitOfVolume.LITERS,
- device_class=SensorDeviceClass.WATER,
- value_fn=lambda suez_data: suez_data.aggregated_value,
- attr_fn=lambda suez_data: suez_data.aggregated_attr,
- ),
- SuezWaterSensorEntityDescription(
- key="water_price",
- translation_key="water_price",
- native_unit_of_measurement=CURRENCY_EURO,
- device_class=SensorDeviceClass.MONETARY,
- value_fn=lambda suez_data: suez_data.price,
- ),
-)
+SCAN_INTERVAL = timedelta(hours=12)
async def async_setup_entry(
@@ -57,43 +28,68 @@ async def async_setup_entry(
async_add_entities: AddEntitiesCallback,
) -> None:
"""Set up Suez Water sensor from a config entry."""
- coordinator = hass.data[DOMAIN][entry.entry_id]
- counter_id = entry.data[CONF_COUNTER_ID]
-
- async_add_entities(
- SuezWaterSensor(coordinator, counter_id, description) for description in SENSORS
- )
+ client = hass.data[DOMAIN][entry.entry_id]
+ async_add_entities([SuezSensor(client, entry.data[CONF_COUNTER_ID])], True)
-class SuezWaterSensor(CoordinatorEntity[SuezWaterCoordinator], SensorEntity):
- """Representation of a Suez water sensor."""
+class SuezSensor(SensorEntity):
+ """Representation of a Sensor."""
_attr_has_entity_name = True
- _attr_attribution = ATTRIBUTION
- entity_description: SuezWaterSensorEntityDescription
+ _attr_translation_key = "water_usage_yesterday"
+ _attr_native_unit_of_measurement = UnitOfVolume.LITERS
+ _attr_device_class = SensorDeviceClass.WATER
- def __init__(
- self,
- coordinator: SuezWaterCoordinator,
- counter_id: int,
- entity_description: SuezWaterSensorEntityDescription,
- ) -> None:
- """Initialize the suez water sensor entity."""
- super().__init__(coordinator)
- self._attr_unique_id = f"{counter_id}_{entity_description.key}"
+ def __init__(self, client: SuezClient, counter_id: int) -> None:
+ """Initialize the data object."""
+ self.client = client
+ self._attr_extra_state_attributes = {}
+ self._attr_unique_id = f"{counter_id}_water_usage_yesterday"
self._attr_device_info = DeviceInfo(
identifiers={(DOMAIN, str(counter_id))},
entry_type=DeviceEntryType.SERVICE,
manufacturer="Suez",
)
- self.entity_description = entity_description
- @property
- def native_value(self) -> float | str | None:
- """Return the state of the sensor."""
- return self.entity_description.value_fn(self.coordinator.data)
+ def _fetch_data(self) -> None:
+ """Fetch latest data from Suez."""
+ try:
+ self.client.update()
+ # _state holds the volume of consumed water during previous day
+ self._attr_native_value = self.client.state
+ self._attr_available = True
+ self._attr_attribution = self.client.attributes["attribution"]
- @property
- def extra_state_attributes(self) -> Mapping[str, Any] | None:
- """Return extra state of the sensor."""
- return self.entity_description.attr_fn(self.coordinator.data)
+ self._attr_extra_state_attributes["this_month_consumption"] = {}
+ for item in self.client.attributes["thisMonthConsumption"]:
+ self._attr_extra_state_attributes["this_month_consumption"][item] = (
+ self.client.attributes["thisMonthConsumption"][item]
+ )
+ self._attr_extra_state_attributes["previous_month_consumption"] = {}
+ for item in self.client.attributes["previousMonthConsumption"]:
+ self._attr_extra_state_attributes["previous_month_consumption"][
+ item
+ ] = self.client.attributes["previousMonthConsumption"][item]
+ self._attr_extra_state_attributes["highest_monthly_consumption"] = (
+ self.client.attributes["highestMonthlyConsumption"]
+ )
+ self._attr_extra_state_attributes["last_year_overall"] = (
+ self.client.attributes["lastYearOverAll"]
+ )
+ self._attr_extra_state_attributes["this_year_overall"] = (
+ self.client.attributes["thisYearOverAll"]
+ )
+ self._attr_extra_state_attributes["history"] = {}
+ for item in self.client.attributes["history"]:
+ self._attr_extra_state_attributes["history"][item] = (
+ self.client.attributes["history"][item]
+ )
+
+ except PySuezError:
+ self._attr_available = False
+ _LOGGER.warning("Unable to fetch data")
+
+ def update(self) -> None:
+ """Return the latest collected data from Suez."""
+ self._fetch_data()
+ _LOGGER.debug("Suez data state is: %s", self.native_value)
diff --git a/homeassistant/components/suez_water/strings.json b/homeassistant/components/suez_water/strings.json
index 6be2affab97..f9abd70fc19 100644
--- a/homeassistant/components/suez_water/strings.json
+++ b/homeassistant/components/suez_water/strings.json
@@ -12,8 +12,7 @@
"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%]",
- "counter_not_found": "Could not find counter id automatically"
+ "unknown": "[%key:common::config_flow::error::unknown%]"
},
"abort": {
"already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
@@ -23,9 +22,6 @@
"sensor": {
"water_usage_yesterday": {
"name": "Water usage yesterday"
- },
- "water_price": {
- "name": "Water price"
}
}
}
diff --git a/homeassistant/components/switchbot/config_flow.py b/homeassistant/components/switchbot/config_flow.py
index a0e45169770..0468db5618a 100644
--- a/homeassistant/components/switchbot/config_flow.py
+++ b/homeassistant/components/switchbot/config_flow.py
@@ -80,7 +80,7 @@ class SwitchbotConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> SwitchbotOptionsFlowHandler:
"""Get the options flow for this handler."""
- return SwitchbotOptionsFlowHandler()
+ return SwitchbotOptionsFlowHandler(config_entry)
def __init__(self) -> None:
"""Initialize the config flow."""
@@ -346,6 +346,10 @@ class SwitchbotConfigFlow(ConfigFlow, domain=DOMAIN):
class SwitchbotOptionsFlowHandler(OptionsFlow):
"""Handle Switchbot options."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/switchbot_cloud/__init__.py b/homeassistant/components/switchbot_cloud/__init__.py
index 625b4698301..a2738ed446f 100644
--- a/homeassistant/components/switchbot_cloud/__init__.py
+++ b/homeassistant/components/switchbot_cloud/__init__.py
@@ -85,9 +85,6 @@ def make_device_data(
"Meter",
"MeterPlus",
"WoIOSensor",
- "Hub 2",
- "MeterPro",
- "MeterPro(CO2)",
]:
devices_data.sensors.append(
prepare_device(hass, api, device, coordinators_by_id)
diff --git a/homeassistant/components/switchbot_cloud/sensor.py b/homeassistant/components/switchbot_cloud/sensor.py
index 90135ad96b3..ac612aea119 100644
--- a/homeassistant/components/switchbot_cloud/sensor.py
+++ b/homeassistant/components/switchbot_cloud/sensor.py
@@ -9,11 +9,7 @@ from homeassistant.components.sensor import (
SensorStateClass,
)
from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import (
- CONCENTRATION_PARTS_PER_MILLION,
- PERCENTAGE,
- UnitOfTemperature,
-)
+from homeassistant.const import PERCENTAGE, UnitOfTemperature
from homeassistant.core import HomeAssistant, callback
from homeassistant.helpers.entity_platform import AddEntitiesCallback
@@ -25,7 +21,6 @@ from .entity import SwitchBotCloudEntity
SENSOR_TYPE_TEMPERATURE = "temperature"
SENSOR_TYPE_HUMIDITY = "humidity"
SENSOR_TYPE_BATTERY = "battery"
-SENSOR_TYPE_CO2 = "CO2"
METER_PLUS_SENSOR_DESCRIPTIONS = (
SensorEntityDescription(
@@ -48,16 +43,6 @@ METER_PLUS_SENSOR_DESCRIPTIONS = (
),
)
-METER_PRO_CO2_SENSOR_DESCRIPTIONS = (
- *METER_PLUS_SENSOR_DESCRIPTIONS,
- SensorEntityDescription(
- key=SENSOR_TYPE_CO2,
- native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
- state_class=SensorStateClass.MEASUREMENT,
- device_class=SensorDeviceClass.CO2,
- ),
-)
-
async def async_setup_entry(
hass: HomeAssistant,
@@ -70,11 +55,7 @@ async def async_setup_entry(
async_add_entities(
SwitchBotCloudSensor(data.api, device, coordinator, description)
for device, coordinator in data.devices.sensors
- for description in (
- METER_PRO_CO2_SENSOR_DESCRIPTIONS
- if device.device_type == "MeterPro(CO2)"
- else METER_PLUS_SENSOR_DESCRIPTIONS
- )
+ for description in METER_PLUS_SENSOR_DESCRIPTIONS
)
diff --git a/homeassistant/components/switcher_kis/cover.py b/homeassistant/components/switcher_kis/cover.py
index dc3b6d96aed..c56fa7442fb 100644
--- a/homeassistant/components/switcher_kis/cover.py
+++ b/homeassistant/components/switcher_kis/cover.py
@@ -41,20 +41,16 @@ async def async_setup_entry(
def async_add_cover(coordinator: SwitcherDataUpdateCoordinator) -> None:
"""Add cover from Switcher device."""
entities: list[CoverEntity] = []
-
if coordinator.data.device_type.category in (
DeviceCategory.SHUTTER,
DeviceCategory.SINGLE_SHUTTER_DUAL_LIGHT,
- DeviceCategory.DUAL_SHUTTER_SINGLE_LIGHT,
):
- number_of_covers = len(cast(SwitcherShutter, coordinator.data).position)
- if number_of_covers == 1:
- entities.append(SwitcherSingleCoverEntity(coordinator, 0))
- else:
- entities.extend(
- SwitcherMultiCoverEntity(coordinator, i)
- for i in range(number_of_covers)
- )
+ entities.append(SwitcherSingleCoverEntity(coordinator, 0))
+ if (
+ coordinator.data.device_type.category
+ == DeviceCategory.DUAL_SHUTTER_SINGLE_LIGHT
+ ):
+ entities.extend(SwitcherDualCoverEntity(coordinator, i) for i in range(2))
async_add_entities(entities)
config_entry.async_on_unload(
@@ -156,8 +152,8 @@ class SwitcherSingleCoverEntity(SwitcherBaseCoverEntity):
self._update_data()
-class SwitcherMultiCoverEntity(SwitcherBaseCoverEntity):
- """Representation of a Switcher multiple cover entity."""
+class SwitcherDualCoverEntity(SwitcherBaseCoverEntity):
+ """Representation of a Switcher dual cover entity."""
_attr_translation_key = "cover"
diff --git a/homeassistant/components/switcher_kis/light.py b/homeassistant/components/switcher_kis/light.py
index bd87176bcf0..4b6df6db6ed 100644
--- a/homeassistant/components/switcher_kis/light.py
+++ b/homeassistant/components/switcher_kis/light.py
@@ -35,20 +35,16 @@ async def async_setup_entry(
def async_add_light(coordinator: SwitcherDataUpdateCoordinator) -> None:
"""Add light from Switcher device."""
entities: list[LightEntity] = []
-
- if coordinator.data.device_type.category in (
- DeviceCategory.SINGLE_SHUTTER_DUAL_LIGHT,
- DeviceCategory.DUAL_SHUTTER_SINGLE_LIGHT,
- DeviceCategory.LIGHT,
+ if (
+ coordinator.data.device_type.category
+ == DeviceCategory.SINGLE_SHUTTER_DUAL_LIGHT
):
- number_of_lights = len(cast(SwitcherLight, coordinator.data).light)
- if number_of_lights == 1:
- entities.append(SwitcherSingleLightEntity(coordinator, 0))
- else:
- entities.extend(
- SwitcherMultiLightEntity(coordinator, i)
- for i in range(number_of_lights)
- )
+ entities.extend(SwitcherDualLightEntity(coordinator, i) for i in range(2))
+ if (
+ coordinator.data.device_type.category
+ == DeviceCategory.DUAL_SHUTTER_SINGLE_LIGHT
+ ):
+ entities.append(SwitcherSingleLightEntity(coordinator, 0))
async_add_entities(entities)
config_entry.async_on_unload(
@@ -137,8 +133,8 @@ class SwitcherSingleLightEntity(SwitcherBaseLightEntity):
self._attr_unique_id = f"{coordinator.device_id}-{coordinator.mac_address}"
-class SwitcherMultiLightEntity(SwitcherBaseLightEntity):
- """Representation of a Switcher multiple light entity."""
+class SwitcherDualLightEntity(SwitcherBaseLightEntity):
+ """Representation of a Switcher dual light entity."""
_attr_translation_key = "light"
diff --git a/homeassistant/components/synology_dsm/config_flow.py b/homeassistant/components/synology_dsm/config_flow.py
index 918a24035f8..70ab13c5c09 100644
--- a/homeassistant/components/synology_dsm/config_flow.py
+++ b/homeassistant/components/synology_dsm/config_flow.py
@@ -118,7 +118,7 @@ class SynologyDSMFlowHandler(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> SynologyDSMOptionsFlowHandler:
"""Get the options flow for this handler."""
- return SynologyDSMOptionsFlowHandler()
+ return SynologyDSMOptionsFlowHandler(config_entry)
def __init__(self) -> None:
"""Initialize the synology_dsm config flow."""
@@ -376,6 +376,10 @@ class SynologyDSMFlowHandler(ConfigFlow, domain=DOMAIN):
class SynologyDSMOptionsFlowHandler(OptionsFlow):
"""Handle a option flow."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/systemmonitor/manifest.json b/homeassistant/components/systemmonitor/manifest.json
index 4c6ae0653d3..236f25bb1ed 100644
--- a/homeassistant/components/systemmonitor/manifest.json
+++ b/homeassistant/components/systemmonitor/manifest.json
@@ -6,5 +6,5 @@
"documentation": "https://www.home-assistant.io/integrations/systemmonitor",
"iot_class": "local_push",
"loggers": ["psutil"],
- "requirements": ["psutil-home-assistant==0.0.1", "psutil==6.1.0"]
+ "requirements": ["psutil-home-assistant==0.0.1", "psutil==6.0.0"]
}
diff --git a/homeassistant/components/tado/config_flow.py b/homeassistant/components/tado/config_flow.py
index c7bb7684901..2ab2a86f200 100644
--- a/homeassistant/components/tado/config_flow.py
+++ b/homeassistant/components/tado/config_flow.py
@@ -160,12 +160,16 @@ class TadoConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> OptionsFlowHandler:
"""Get the options flow for this handler."""
- return OptionsFlowHandler()
+ return OptionsFlowHandler(config_entry)
class OptionsFlowHandler(OptionsFlow):
"""Handle an option flow for Tado."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/tado/manifest.json b/homeassistant/components/tado/manifest.json
index 652d51f0261..b0c00c888b7 100644
--- a/homeassistant/components/tado/manifest.json
+++ b/homeassistant/components/tado/manifest.json
@@ -14,5 +14,5 @@
},
"iot_class": "cloud_polling",
"loggers": ["PyTado"],
- "requirements": ["python-tado==0.17.7"]
+ "requirements": ["python-tado==0.17.6"]
}
diff --git a/homeassistant/components/tankerkoenig/config_flow.py b/homeassistant/components/tankerkoenig/config_flow.py
index 509f293665d..b13bfa1fa36 100644
--- a/homeassistant/components/tankerkoenig/config_flow.py
+++ b/homeassistant/components/tankerkoenig/config_flow.py
@@ -74,7 +74,7 @@ class FlowHandler(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> OptionsFlowHandler:
"""Get the options flow for this handler."""
- return OptionsFlowHandler()
+ return OptionsFlowHandler(config_entry)
async def async_step_user(
self, user_input: dict[str, Any] | None = None
@@ -236,8 +236,9 @@ class FlowHandler(ConfigFlow, domain=DOMAIN):
class OptionsFlowHandler(OptionsFlow):
"""Handle an options flow."""
- def __init__(self) -> None:
+ def __init__(self, config_entry: ConfigEntry) -> None:
"""Initialize options flow."""
+ self.config_entry = config_entry
self._stations: dict[str, str] = {}
async def async_step_init(
diff --git a/homeassistant/components/tedee/__init__.py b/homeassistant/components/tedee/__init__.py
index 528a5052678..cd593f68e3a 100644
--- a/homeassistant/components/tedee/__init__.py
+++ b/homeassistant/components/tedee/__init__.py
@@ -7,7 +7,7 @@ from typing import Any
from aiohttp.hdrs import METH_POST
from aiohttp.web import Request, Response
-from aiotedee.exception import TedeeDataUpdateException, TedeeWebhookException
+from pytedee_async.exception import TedeeDataUpdateException, TedeeWebhookException
from homeassistant.components.http import HomeAssistantView
from homeassistant.components.webhook import (
diff --git a/homeassistant/components/tedee/binary_sensor.py b/homeassistant/components/tedee/binary_sensor.py
index b586db7c2a7..5eab7bfa254 100644
--- a/homeassistant/components/tedee/binary_sensor.py
+++ b/homeassistant/components/tedee/binary_sensor.py
@@ -3,8 +3,8 @@
from collections.abc import Callable
from dataclasses import dataclass
-from aiotedee import TedeeLock
-from aiotedee.lock import TedeeLockState
+from pytedee_async import TedeeLock
+from pytedee_async.lock import TedeeLockState
from homeassistant.components.binary_sensor import (
BinarySensorDeviceClass,
diff --git a/homeassistant/components/tedee/config_flow.py b/homeassistant/components/tedee/config_flow.py
index 422d818d1b5..65d4ec12e80 100644
--- a/homeassistant/components/tedee/config_flow.py
+++ b/homeassistant/components/tedee/config_flow.py
@@ -4,7 +4,7 @@ from collections.abc import Mapping
import logging
from typing import Any
-from aiotedee import (
+from pytedee_async import (
TedeeAuthException,
TedeeClient,
TedeeClientException,
diff --git a/homeassistant/components/tedee/coordinator.py b/homeassistant/components/tedee/coordinator.py
index 445585a1a2c..de3090a3f78 100644
--- a/homeassistant/components/tedee/coordinator.py
+++ b/homeassistant/components/tedee/coordinator.py
@@ -8,7 +8,7 @@ import logging
import time
from typing import Any
-from aiotedee import (
+from pytedee_async import (
TedeeClient,
TedeeClientException,
TedeeDataUpdateException,
@@ -16,7 +16,7 @@ from aiotedee import (
TedeeLock,
TedeeWebhookException,
)
-from aiotedee.bridge import TedeeBridge
+from pytedee_async.bridge import TedeeBridge
from homeassistant.config_entries import ConfigEntry
from homeassistant.const import CONF_HOST
diff --git a/homeassistant/components/tedee/entity.py b/homeassistant/components/tedee/entity.py
index 96cc6f2b3f5..c72e293a292 100644
--- a/homeassistant/components/tedee/entity.py
+++ b/homeassistant/components/tedee/entity.py
@@ -1,6 +1,6 @@
"""Bases for Tedee entities."""
-from aiotedee.lock import TedeeLock
+from pytedee_async.lock import TedeeLock
from homeassistant.core import callback
from homeassistant.helpers.device_registry import DeviceInfo
diff --git a/homeassistant/components/tedee/lock.py b/homeassistant/components/tedee/lock.py
index 6e89a48f2a0..34d313f3e48 100644
--- a/homeassistant/components/tedee/lock.py
+++ b/homeassistant/components/tedee/lock.py
@@ -2,7 +2,7 @@
from typing import Any
-from aiotedee import TedeeClientException, TedeeLock, TedeeLockState
+from pytedee_async import TedeeClientException, TedeeLock, TedeeLockState
from homeassistant.components.lock import LockEntity, LockEntityFeature
from homeassistant.core import HomeAssistant
diff --git a/homeassistant/components/tedee/manifest.json b/homeassistant/components/tedee/manifest.json
index bca51f08f93..4f071267a25 100644
--- a/homeassistant/components/tedee/manifest.json
+++ b/homeassistant/components/tedee/manifest.json
@@ -6,7 +6,7 @@
"dependencies": ["http", "webhook"],
"documentation": "https://www.home-assistant.io/integrations/tedee",
"iot_class": "local_push",
- "loggers": ["aiotedee"],
+ "loggers": ["pytedee_async"],
"quality_scale": "platinum",
- "requirements": ["aiotedee==0.2.20"]
+ "requirements": ["pytedee-async==0.2.20"]
}
diff --git a/homeassistant/components/tedee/sensor.py b/homeassistant/components/tedee/sensor.py
index 90f76317fff..33894a5eb52 100644
--- a/homeassistant/components/tedee/sensor.py
+++ b/homeassistant/components/tedee/sensor.py
@@ -3,7 +3,7 @@
from collections.abc import Callable
from dataclasses import dataclass
-from aiotedee import TedeeLock
+from pytedee_async import TedeeLock
from homeassistant.components.sensor import (
SensorDeviceClass,
diff --git a/homeassistant/components/tedee/strings.json b/homeassistant/components/tedee/strings.json
index b6966fa2933..2dc0e23968c 100644
--- a/homeassistant/components/tedee/strings.json
+++ b/homeassistant/components/tedee/strings.json
@@ -38,8 +38,7 @@
"abort": {
"already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
"reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
- "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]",
- "unique_id_mismatch": "You selected a different bridge than the one this config entry was configured with, this is not allowed."
+ "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]"
},
"error": {
"invalid_api_key": "[%key:common::config_flow::error::invalid_api_key%]",
diff --git a/homeassistant/components/template/coordinator.py b/homeassistant/components/template/coordinator.py
index 4d8fe78f2b5..b9bbd3625af 100644
--- a/homeassistant/components/template/coordinator.py
+++ b/homeassistant/components/template/coordinator.py
@@ -24,9 +24,7 @@ class TriggerUpdateCoordinator(DataUpdateCoordinator):
def __init__(self, hass: HomeAssistant, config: dict[str, Any]) -> None:
"""Instantiate trigger data."""
- super().__init__(
- hass, _LOGGER, config_entry=None, name="Trigger Update Coordinator"
- )
+ super().__init__(hass, _LOGGER, name="Trigger Update Coordinator")
self.config = config
self._cond_func: Callable[[Mapping[str, Any] | None], bool] | None = None
self._unsub_start: Callable[[], None] | None = None
diff --git a/homeassistant/components/template/manifest.json b/homeassistant/components/template/manifest.json
index f1225f74f06..57188aebaa3 100644
--- a/homeassistant/components/template/manifest.json
+++ b/homeassistant/components/template/manifest.json
@@ -2,7 +2,7 @@
"domain": "template",
"name": "Template",
"after_dependencies": ["group"],
- "codeowners": ["@PhracturedBlue", "@home-assistant/core"],
+ "codeowners": ["@PhracturedBlue", "@tetienne", "@home-assistant/core"],
"config_flow": true,
"dependencies": ["blueprint"],
"documentation": "https://www.home-assistant.io/integrations/template",
diff --git a/homeassistant/components/template/trigger_entity.py b/homeassistant/components/template/trigger_entity.py
index 5130f332d5b..df84ce057c3 100644
--- a/homeassistant/components/template/trigger_entity.py
+++ b/homeassistant/components/template/trigger_entity.py
@@ -3,7 +3,6 @@
from __future__ import annotations
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.template import TemplateStateFromEntityId
from homeassistant.helpers.trigger_template_entity import TriggerBaseEntity
from homeassistant.helpers.update_coordinator import CoordinatorEntity
@@ -42,11 +41,11 @@ class TriggerEntity( # pylint: disable=hass-enforce-class-module
def _process_data(self) -> None:
"""Process new data."""
+ this = None
+ if state := self.hass.states.get(self.entity_id):
+ this = state.as_dict()
run_variables = self.coordinator.data["run_variables"]
- variables = {
- "this": TemplateStateFromEntityId(self.hass, self.entity_id),
- **(run_variables or {}),
- }
+ variables = {"this": this, **(run_variables or {})}
self._render_templates(variables)
diff --git a/homeassistant/components/tensorflow/manifest.json b/homeassistant/components/tensorflow/manifest.json
index 86fd83ad088..4f2b6f19285 100644
--- a/homeassistant/components/tensorflow/manifest.json
+++ b/homeassistant/components/tensorflow/manifest.json
@@ -9,7 +9,7 @@
"tensorflow==2.5.0",
"tf-models-official==2.5.0",
"pycocotools==2.0.6",
- "numpy==2.1.3",
- "Pillow==11.0.0"
+ "numpy==1.26.4",
+ "Pillow==10.4.0"
]
}
diff --git a/homeassistant/components/tesla_fleet/__init__.py b/homeassistant/components/tesla_fleet/__init__.py
index e7030b568b3..4cd8c5c7142 100644
--- a/homeassistant/components/tesla_fleet/__init__.py
+++ b/homeassistant/components/tesla_fleet/__init__.py
@@ -5,12 +5,7 @@ from typing import Final
from aiohttp.client_exceptions import ClientResponseError
import jwt
-from tesla_fleet_api import (
- EnergySpecific,
- TeslaFleetApi,
- VehicleSigned,
- VehicleSpecific,
-)
+from tesla_fleet_api import EnergySpecific, TeslaFleetApi, VehicleSpecific
from tesla_fleet_api.const import Scope
from tesla_fleet_api.exceptions import (
InvalidRegion,
@@ -131,13 +126,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: TeslaFleetConfigEntry) -
# Remove the protobuff 'cached_data' that we do not use to save memory
product.pop("cached_data", None)
vin = product["vin"]
- signing = product["command_signing"] == "required"
- if signing:
- if not tesla.private_key:
- await tesla.get_private_key(hass.config.path("tesla_fleet.key"))
- api = VehicleSigned(tesla.vehicle, vin)
- else:
- api = VehicleSpecific(tesla.vehicle, vin)
+ api = VehicleSpecific(tesla.vehicle, vin)
coordinator = TeslaFleetVehicleDataCoordinator(hass, api, product)
await coordinator.async_config_entry_first_refresh()
@@ -156,7 +145,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: TeslaFleetConfigEntry) -
coordinator=coordinator,
vin=vin,
device=device,
- signing=signing,
+ signing=product["command_signing"] == "required",
)
)
elif "energy_site_id" in product and hasattr(tesla, "energy"):
diff --git a/homeassistant/components/tesla_fleet/button.py b/homeassistant/components/tesla_fleet/button.py
index aea0f91a97c..87cd95576d2 100644
--- a/homeassistant/components/tesla_fleet/button.py
+++ b/homeassistant/components/tesla_fleet/button.py
@@ -70,6 +70,8 @@ async def async_setup_entry(
for vehicle in entry.runtime_data.vehicles
for description in DESCRIPTIONS
if Scope.VEHICLE_CMDS in entry.runtime_data.scopes
+ and (not vehicle.signing or description.key == "wake")
+ # Wake doesn't need signing
)
diff --git a/homeassistant/components/tesla_fleet/climate.py b/homeassistant/components/tesla_fleet/climate.py
index 9a1533a688f..6199ee112b5 100644
--- a/homeassistant/components/tesla_fleet/climate.py
+++ b/homeassistant/components/tesla_fleet/climate.py
@@ -84,7 +84,7 @@ class TeslaFleetClimateEntity(TeslaFleetVehicleEntity, ClimateEntity):
) -> None:
"""Initialize the climate."""
- self.read_only = Scope.VEHICLE_CMDS not in scopes
+ self.read_only = Scope.VEHICLE_CMDS not in scopes or data.signing
if self.read_only:
self._attr_supported_features = ClimateEntityFeature(0)
@@ -231,7 +231,7 @@ class TeslaFleetCabinOverheatProtectionEntity(TeslaFleetVehicleEntity, ClimateEn
"""Initialize the cabin overheat climate entity."""
# Scopes
- self.read_only = Scope.VEHICLE_CMDS not in scopes
+ self.read_only = Scope.VEHICLE_CMDS not in scopes or data.signing
# Supported Features
if self.read_only:
diff --git a/homeassistant/components/tesla_fleet/cover.py b/homeassistant/components/tesla_fleet/cover.py
index f270734424f..4e49e24b689 100644
--- a/homeassistant/components/tesla_fleet/cover.py
+++ b/homeassistant/components/tesla_fleet/cover.py
@@ -57,7 +57,7 @@ class TeslaFleetWindowEntity(TeslaFleetVehicleEntity, CoverEntity):
self._attr_supported_features = (
CoverEntityFeature.OPEN | CoverEntityFeature.CLOSE
)
- if not self.scoped:
+ if not self.scoped or self.vehicle.signing:
self._attr_supported_features = CoverEntityFeature(0)
def _async_update_attrs(self) -> None:
@@ -111,7 +111,7 @@ class TeslaFleetChargePortEntity(TeslaFleetVehicleEntity, CoverEntity):
self._attr_supported_features = (
CoverEntityFeature.OPEN | CoverEntityFeature.CLOSE
)
- if not self.scoped:
+ if not self.scoped or self.vehicle.signing:
self._attr_supported_features = CoverEntityFeature(0)
def _async_update_attrs(self) -> None:
@@ -144,7 +144,7 @@ class TeslaFleetFrontTrunkEntity(TeslaFleetVehicleEntity, CoverEntity):
self.scoped = Scope.VEHICLE_CMDS in scopes
self._attr_supported_features = CoverEntityFeature.OPEN
- if not self.scoped:
+ if not self.scoped or self.vehicle.signing:
self._attr_supported_features = CoverEntityFeature(0)
def _async_update_attrs(self) -> None:
@@ -172,12 +172,18 @@ class TeslaFleetRearTrunkEntity(TeslaFleetVehicleEntity, CoverEntity):
self._attr_supported_features = (
CoverEntityFeature.OPEN | CoverEntityFeature.CLOSE
)
- if not self.scoped:
+ if not self.scoped or self.vehicle.signing:
self._attr_supported_features = CoverEntityFeature(0)
def _async_update_attrs(self) -> None:
"""Update the entity attributes."""
- self._attr_is_closed = self._value == CLOSED
+ value = self._value
+ if value == CLOSED:
+ self._attr_is_closed = True
+ elif value == OPEN:
+ self._attr_is_closed = False
+ else:
+ self._attr_is_closed = None
async def async_open_cover(self, **kwargs: Any) -> None:
"""Open rear trunk."""
@@ -210,7 +216,7 @@ class TeslaFleetSunroofEntity(TeslaFleetVehicleEntity, CoverEntity):
super().__init__(vehicle, "vehicle_state_sun_roof_state")
self.scoped = Scope.VEHICLE_CMDS in scopes
- if not self.scoped:
+ if not self.scoped or self.vehicle.signing:
self._attr_supported_features = CoverEntityFeature(0)
def _async_update_attrs(self) -> None:
diff --git a/homeassistant/components/tesla_fleet/entity.py b/homeassistant/components/tesla_fleet/entity.py
index 0ee41b5e322..60230cd881d 100644
--- a/homeassistant/components/tesla_fleet/entity.py
+++ b/homeassistant/components/tesla_fleet/entity.py
@@ -123,6 +123,14 @@ class TeslaFleetVehicleEntity(TeslaFleetEntity):
"""Wake up the vehicle if its asleep."""
await wake_up_vehicle(self.vehicle)
+ def raise_for_read_only(self, scope: Scope) -> None:
+ """Raise an error if no command signing or a scope is not available."""
+ if self.vehicle.signing:
+ raise ServiceValidationError(
+ translation_domain=DOMAIN, translation_key="command_signing"
+ )
+ super().raise_for_read_only(scope)
+
class TeslaFleetEnergyLiveEntity(TeslaFleetEntity):
"""Parent class for TeslaFleet Energy Site Live entities."""
diff --git a/homeassistant/components/tesla_fleet/media_player.py b/homeassistant/components/tesla_fleet/media_player.py
index 455c990077d..0a1d18c3407 100644
--- a/homeassistant/components/tesla_fleet/media_player.py
+++ b/homeassistant/components/tesla_fleet/media_player.py
@@ -64,7 +64,7 @@ class TeslaFleetMediaEntity(TeslaFleetVehicleEntity, MediaPlayerEntity):
"""Initialize the media player entity."""
super().__init__(data, "media")
self.scoped = scoped
- if not scoped:
+ if not scoped and data.signing:
self._attr_supported_features = MediaPlayerEntityFeature(0)
def _async_update_attrs(self) -> None:
diff --git a/homeassistant/components/tesla_fleet/oauth.py b/homeassistant/components/tesla_fleet/oauth.py
index 8b43460436b..00976abf56f 100644
--- a/homeassistant/components/tesla_fleet/oauth.py
+++ b/homeassistant/components/tesla_fleet/oauth.py
@@ -49,7 +49,6 @@ class TeslaSystemImplementation(config_entry_oauth2_flow.LocalOAuth2Implementati
def extra_authorize_data(self) -> dict[str, Any]:
"""Extra data that needs to be appended to the authorize url."""
return {
- "prompt": "login",
"scope": " ".join(SCOPES),
"code_challenge": self.code_challenge, # PKCE
}
@@ -84,4 +83,4 @@ class TeslaUserImplementation(AuthImplementation):
@property
def extra_authorize_data(self) -> dict[str, Any]:
"""Extra data that needs to be appended to the authorize url."""
- return {"prompt": "login", "scope": " ".join(SCOPES)}
+ return {"scope": " ".join(SCOPES)}
diff --git a/homeassistant/components/tesla_fleet/strings.json b/homeassistant/components/tesla_fleet/strings.json
index fe5cd06c1ef..942824c5043 100644
--- a/homeassistant/components/tesla_fleet/strings.json
+++ b/homeassistant/components/tesla_fleet/strings.json
@@ -504,6 +504,9 @@
"command_no_reason": {
"message": "Command was unsuccessful but did not return a reason why."
},
+ "command_signing": {
+ "message": "Vehicle requires command signing. Please see documentation for more details."
+ },
"invalid_cop_temp": {
"message": "Cabin overheat protection does not support that temperature."
},
diff --git a/homeassistant/components/teslemetry/__init__.py b/homeassistant/components/teslemetry/__init__.py
index aa1d2b42660..b884f9bbc5c 100644
--- a/homeassistant/components/teslemetry/__init__.py
+++ b/homeassistant/components/teslemetry/__init__.py
@@ -135,11 +135,11 @@ async def async_setup_entry(hass: HomeAssistant, entry: TeslemetryConfigEntry) -
elif "energy_site_id" in product and Scope.ENERGY_DEVICE_DATA in scopes:
site_id = product["energy_site_id"]
- powerwall = (
- product["components"]["battery"] or product["components"]["solar"]
- )
- wall_connector = "wall_connectors" in product["components"]
- if not powerwall and not wall_connector:
+ if not (
+ product["components"]["battery"]
+ or product["components"]["solar"]
+ or "wall_connectors" in product["components"]
+ ):
LOGGER.debug(
"Skipping Energy Site %s as it has no components",
site_id,
@@ -162,11 +162,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: TeslemetryConfigEntry) -
info_coordinator=TeslemetryEnergySiteInfoCoordinator(
hass, api, product
),
- history_coordinator=(
- TeslemetryEnergyHistoryCoordinator(hass, api)
- if powerwall
- else None
- ),
+ history_coordinator=TeslemetryEnergyHistoryCoordinator(hass, api),
id=site_id,
device=device,
)
@@ -189,7 +185,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: TeslemetryConfigEntry) -
*(
energysite.history_coordinator.async_config_entry_first_refresh()
for energysite in energysites
- if energysite.history_coordinator
),
)
diff --git a/homeassistant/components/teslemetry/cover.py b/homeassistant/components/teslemetry/cover.py
index 8775da931d5..190f729d99f 100644
--- a/homeassistant/components/teslemetry/cover.py
+++ b/homeassistant/components/teslemetry/cover.py
@@ -182,7 +182,13 @@ class TeslemetryRearTrunkEntity(TeslemetryVehicleEntity, CoverEntity):
def _async_update_attrs(self) -> None:
"""Update the entity attributes."""
- self._attr_is_closed = self._value == CLOSED
+ value = self._value
+ if value == CLOSED:
+ self._attr_is_closed = True
+ elif value == OPEN:
+ self._attr_is_closed = False
+ else:
+ self._attr_is_closed = None
async def async_open_cover(self, **kwargs: Any) -> None:
"""Open rear trunk."""
diff --git a/homeassistant/components/teslemetry/entity.py b/homeassistant/components/teslemetry/entity.py
index d14f3a42734..ca40d4d00ce 100644
--- a/homeassistant/components/teslemetry/entity.py
+++ b/homeassistant/components/teslemetry/entity.py
@@ -175,8 +175,6 @@ class TeslemetryEnergyHistoryEntity(TeslemetryEntity):
) -> None:
"""Initialize common aspects of a Teslemetry Energy Site Info entity."""
- assert data.history_coordinator
-
self.api = data.api
self._attr_unique_id = f"{data.id}-{key}"
self._attr_device_info = data.device
diff --git a/homeassistant/components/teslemetry/models.py b/homeassistant/components/teslemetry/models.py
index d3969b30a7c..7f8bd37425a 100644
--- a/homeassistant/components/teslemetry/models.py
+++ b/homeassistant/components/teslemetry/models.py
@@ -49,6 +49,6 @@ class TeslemetryEnergyData:
api: EnergySpecific
live_coordinator: TeslemetryEnergySiteLiveCoordinator
info_coordinator: TeslemetryEnergySiteInfoCoordinator
- history_coordinator: TeslemetryEnergyHistoryCoordinator | None
+ history_coordinator: TeslemetryEnergyHistoryCoordinator
id: int
device: DeviceInfo
diff --git a/homeassistant/components/teslemetry/sensor.py b/homeassistant/components/teslemetry/sensor.py
index 95876cc2cf9..ba7d930fcd0 100644
--- a/homeassistant/components/teslemetry/sensor.py
+++ b/homeassistant/components/teslemetry/sensor.py
@@ -482,7 +482,8 @@ async def async_setup_entry(
TeslemetryEnergyHistorySensorEntity(energysite, description)
for energysite in entry.runtime_data.energysites
for description in ENERGY_HISTORY_DESCRIPTIONS
- if energysite.history_coordinator
+ if energysite.info_coordinator.data.get("components_battery")
+ or energysite.info_coordinator.data.get("components_solar")
),
)
)
diff --git a/homeassistant/components/thethingsnetwork/__init__.py b/homeassistant/components/thethingsnetwork/__init__.py
index d3c6c8356cb..253ce7a052e 100644
--- a/homeassistant/components/thethingsnetwork/__init__.py
+++ b/homeassistant/components/thethingsnetwork/__init__.py
@@ -2,15 +2,55 @@
import logging
+import voluptuous as vol
+
from homeassistant.config_entries import ConfigEntry
from homeassistant.const import CONF_API_KEY, CONF_HOST
from homeassistant.core import HomeAssistant
+from homeassistant.helpers import issue_registry as ir
+import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers.typing import ConfigType
-from .const import DOMAIN, PLATFORMS, TTN_API_HOST
+from .const import CONF_APP_ID, DOMAIN, PLATFORMS, TTN_API_HOST
from .coordinator import TTNCoordinator
_LOGGER = logging.getLogger(__name__)
+CONFIG_SCHEMA = vol.Schema(
+ {
+ # Configuration via yaml not longer supported - keeping to warn about migration
+ DOMAIN: vol.Schema(
+ {
+ vol.Required(CONF_APP_ID): cv.string,
+ vol.Required("access_key"): cv.string,
+ }
+ )
+ },
+ extra=vol.ALLOW_EXTRA,
+)
+
+
+async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
+ """Initialize of The Things Network component."""
+
+ if DOMAIN in config:
+ ir.async_create_issue(
+ hass,
+ DOMAIN,
+ "manual_migration",
+ breaks_in_ha_version="2024.12.0",
+ is_fixable=False,
+ severity=ir.IssueSeverity.ERROR,
+ translation_key="manual_migration",
+ translation_placeholders={
+ "domain": DOMAIN,
+ "v2_v3_migration_url": "https://www.thethingsnetwork.org/forum/c/v2-to-v3-upgrade/102",
+ "v2_deprecation_url": "https://www.thethingsnetwork.org/forum/t/the-things-network-v2-is-permanently-shutting-down-completed/50710",
+ },
+ )
+
+ return True
+
async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
"""Establish connection with The Things Network."""
diff --git a/homeassistant/components/thethingsnetwork/strings.json b/homeassistant/components/thethingsnetwork/strings.json
index f5a4fcef8fd..98572cb318c 100644
--- a/homeassistant/components/thethingsnetwork/strings.json
+++ b/homeassistant/components/thethingsnetwork/strings.json
@@ -22,5 +22,11 @@
"invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
"unknown": "[%key:common::config_flow::error::unknown%]"
}
+ },
+ "issues": {
+ "manual_migration": {
+ "description": "Configuring {domain} using YAML was removed as part of migrating to [The Things Network v3]({v2_v3_migration_url}). [The Things Network v2 has shutted down]({v2_deprecation_url}).\n\nPlease remove the {domain} entry from the configuration.yaml and add re-add the integration using the config_flow",
+ "title": "The {domain} YAML configuration is not supported"
+ }
}
}
diff --git a/homeassistant/components/threshold/binary_sensor.py b/homeassistant/components/threshold/binary_sensor.py
index 3d52d2225be..5f1639ff2e1 100644
--- a/homeassistant/components/threshold/binary_sensor.py
+++ b/homeassistant/components/threshold/binary_sensor.py
@@ -61,29 +61,15 @@ _LOGGER = logging.getLogger(__name__)
DEFAULT_NAME: Final = "Threshold"
-
-def no_missing_threshold(value: dict) -> dict:
- """Validate data point list is greater than polynomial degrees."""
- if value.get(CONF_LOWER) is None and value.get(CONF_UPPER) is None:
- raise vol.Invalid("Lower or Upper thresholds are not provided")
-
- return value
-
-
-PLATFORM_SCHEMA = vol.All(
- BINARY_SENSOR_PLATFORM_SCHEMA.extend(
- {
- vol.Required(CONF_ENTITY_ID): cv.entity_id,
- vol.Optional(CONF_DEVICE_CLASS): DEVICE_CLASSES_SCHEMA,
- vol.Optional(CONF_HYSTERESIS, default=DEFAULT_HYSTERESIS): vol.Coerce(
- float
- ),
- vol.Optional(CONF_LOWER): vol.Coerce(float),
- vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
- vol.Optional(CONF_UPPER): vol.Coerce(float),
- }
- ),
- no_missing_threshold,
+PLATFORM_SCHEMA = BINARY_SENSOR_PLATFORM_SCHEMA.extend(
+ {
+ vol.Required(CONF_ENTITY_ID): cv.entity_id,
+ vol.Optional(CONF_DEVICE_CLASS): DEVICE_CLASSES_SCHEMA,
+ vol.Optional(CONF_HYSTERESIS, default=DEFAULT_HYSTERESIS): vol.Coerce(float),
+ vol.Optional(CONF_LOWER): vol.Coerce(float),
+ vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
+ vol.Optional(CONF_UPPER): vol.Coerce(float),
+ }
)
@@ -140,6 +126,9 @@ async def async_setup_platform(
hysteresis: float = config[CONF_HYSTERESIS]
device_class: BinarySensorDeviceClass | None = config.get(CONF_DEVICE_CLASS)
+ if lower is None and upper is None:
+ raise ValueError("Lower or Upper thresholds not provided")
+
async_add_entities(
[
ThresholdSensor(
@@ -162,9 +151,6 @@ class ThresholdSensor(BinarySensorEntity):
"""Representation of a Threshold sensor."""
_attr_should_poll = False
- _unrecorded_attributes = frozenset(
- {ATTR_ENTITY_ID, ATTR_HYSTERESIS, ATTR_LOWER, ATTR_TYPE, ATTR_UPPER}
- )
def __init__(
self,
diff --git a/homeassistant/components/tibber/__init__.py b/homeassistant/components/tibber/__init__.py
index 9b5c7ee1168..ce05b8070f6 100644
--- a/homeassistant/components/tibber/__init__.py
+++ b/homeassistant/components/tibber/__init__.py
@@ -6,9 +6,15 @@ import aiohttp
import tibber
from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_ACCESS_TOKEN, EVENT_HOMEASSISTANT_STOP, Platform
+from homeassistant.const import (
+ CONF_ACCESS_TOKEN,
+ CONF_NAME,
+ EVENT_HOMEASSISTANT_STOP,
+ Platform,
+)
from homeassistant.core import Event, HomeAssistant
from homeassistant.exceptions import ConfigEntryNotReady
+from homeassistant.helpers import discovery
from homeassistant.helpers.aiohttp_client import async_get_clientsession
import homeassistant.helpers.config_validation as cv
from homeassistant.helpers.typing import ConfigType
@@ -67,6 +73,19 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+ # Use discovery to load platform legacy notify platform
+ # The use of the legacy notify service was deprecated with HA Core 2024.6
+ # Support will be removed with HA Core 2024.12
+ hass.async_create_task(
+ discovery.async_load_platform(
+ hass,
+ Platform.NOTIFY,
+ DOMAIN,
+ {CONF_NAME: DOMAIN},
+ hass.data[DATA_HASS_CONFIG],
+ )
+ )
+
return True
diff --git a/homeassistant/components/tibber/manifest.json b/homeassistant/components/tibber/manifest.json
index bc9304ab59d..205bc1352eb 100644
--- a/homeassistant/components/tibber/manifest.json
+++ b/homeassistant/components/tibber/manifest.json
@@ -8,5 +8,5 @@
"iot_class": "cloud_polling",
"loggers": ["tibber"],
"quality_scale": "silver",
- "requirements": ["pyTibber==0.30.8"]
+ "requirements": ["pyTibber==0.30.4"]
}
diff --git a/homeassistant/components/tibber/notify.py b/homeassistant/components/tibber/notify.py
index fdeeeba68ef..1c9f86ed502 100644
--- a/homeassistant/components/tibber/notify.py
+++ b/homeassistant/components/tibber/notify.py
@@ -2,21 +2,38 @@
from __future__ import annotations
+from collections.abc import Callable
+from typing import Any
+
from tibber import Tibber
from homeassistant.components.notify import (
+ ATTR_TITLE,
ATTR_TITLE_DEFAULT,
+ BaseNotificationService,
NotifyEntity,
NotifyEntityFeature,
+ migrate_notify_issue,
)
from homeassistant.config_entries import ConfigEntry
from homeassistant.core import HomeAssistant
from homeassistant.exceptions import HomeAssistantError
from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
from . import DOMAIN as TIBBER_DOMAIN
+async def async_get_service(
+ hass: HomeAssistant,
+ config: ConfigType,
+ discovery_info: DiscoveryInfoType | None = None,
+) -> TibberNotificationService:
+ """Get the Tibber notification service."""
+ tibber_connection: Tibber = hass.data[TIBBER_DOMAIN]
+ return TibberNotificationService(tibber_connection.send_notification)
+
+
async def async_setup_entry(
hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
) -> None:
@@ -24,6 +41,31 @@ async def async_setup_entry(
async_add_entities([TibberNotificationEntity(entry.entry_id)])
+class TibberNotificationService(BaseNotificationService):
+ """Implement the notification service for Tibber."""
+
+ def __init__(self, notify: Callable) -> None:
+ """Initialize the service."""
+ self._notify = notify
+
+ async def async_send_message(self, message: str = "", **kwargs: Any) -> None:
+ """Send a message to Tibber devices."""
+ migrate_notify_issue(
+ self.hass,
+ TIBBER_DOMAIN,
+ "Tibber",
+ "2024.12.0",
+ service_name=self._service_name,
+ )
+ title = kwargs.get(ATTR_TITLE, ATTR_TITLE_DEFAULT)
+ try:
+ await self._notify(title=title, message=message)
+ except TimeoutError as exc:
+ raise HomeAssistantError(
+ translation_domain=TIBBER_DOMAIN, translation_key="send_message_timeout"
+ ) from exc
+
+
class TibberNotificationEntity(NotifyEntity):
"""Implement the notification entity service for Tibber."""
diff --git a/homeassistant/components/tod/binary_sensor.py b/homeassistant/components/tod/binary_sensor.py
index 3ac90b5578c..907df849ea1 100644
--- a/homeassistant/components/tod/binary_sensor.py
+++ b/homeassistant/components/tod/binary_sensor.py
@@ -5,7 +5,7 @@ from __future__ import annotations
from collections.abc import Callable
from datetime import datetime, time, timedelta
import logging
-from typing import Any, Literal, TypeGuard
+from typing import TYPE_CHECKING, Any, Literal, TypeGuard
import voluptuous as vol
@@ -109,9 +109,6 @@ class TodSensor(BinarySensorEntity):
"""Time of the Day Sensor."""
_attr_should_poll = False
- _time_before: datetime
- _time_after: datetime
- _next_update: datetime
def __init__(
self,
@@ -125,6 +122,9 @@ class TodSensor(BinarySensorEntity):
"""Init the ToD Sensor..."""
self._attr_unique_id = unique_id
self._attr_name = name
+ self._time_before: datetime | None = None
+ self._time_after: datetime | None = None
+ self._next_update: datetime | None = None
self._after_offset = after_offset
self._before_offset = before_offset
self._before = before
@@ -134,6 +134,9 @@ class TodSensor(BinarySensorEntity):
@property
def is_on(self) -> bool:
"""Return True is sensor is on."""
+ if TYPE_CHECKING:
+ assert self._time_after is not None
+ assert self._time_before is not None
if self._time_after < self._time_before:
return self._time_after <= dt_util.utcnow() < self._time_before
return False
@@ -141,6 +144,10 @@ class TodSensor(BinarySensorEntity):
@property
def extra_state_attributes(self) -> dict[str, Any] | None:
"""Return the state attributes of the sensor."""
+ if TYPE_CHECKING:
+ assert self._time_after is not None
+ assert self._time_before is not None
+ assert self._next_update is not None
if time_zone := dt_util.get_default_time_zone():
return {
ATTR_AFTER: self._time_after.astimezone(time_zone).isoformat(),
@@ -237,6 +244,9 @@ class TodSensor(BinarySensorEntity):
def _turn_to_next_day(self) -> None:
"""Turn to to the next day."""
+ if TYPE_CHECKING:
+ assert self._time_after is not None
+ assert self._time_before is not None
if _is_sun_event(self._after):
self._time_after = get_astral_event_next(
self.hass, self._after, self._time_after - self._after_offset
@@ -272,12 +282,17 @@ class TodSensor(BinarySensorEntity):
self.async_on_remove(_clean_up_listener)
+ if TYPE_CHECKING:
+ assert self._next_update is not None
self._unsub_update = event.async_track_point_in_utc_time(
self.hass, self._point_in_time_listener, self._next_update
)
def _calculate_next_update(self) -> None:
"""Datetime when the next update to the state."""
+ if TYPE_CHECKING:
+ assert self._time_after is not None
+ assert self._time_before is not None
now = dt_util.utcnow()
if now < self._time_after:
self._next_update = self._time_after
@@ -294,6 +309,9 @@ class TodSensor(BinarySensorEntity):
self._calculate_next_update()
self.async_write_ha_state()
+ if TYPE_CHECKING:
+ assert self._next_update is not None
+
self._unsub_update = event.async_track_point_in_utc_time(
self.hass, self._point_in_time_listener, self._next_update
)
diff --git a/homeassistant/components/todoist/__init__.py b/homeassistant/components/todoist/__init__.py
index 2e30856d0df..60c40b1c03c 100644
--- a/homeassistant/components/todoist/__init__.py
+++ b/homeassistant/components/todoist/__init__.py
@@ -25,7 +25,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
token = entry.data[CONF_TOKEN]
api = TodoistAPIAsync(token)
- coordinator = TodoistCoordinator(hass, _LOGGER, entry, SCAN_INTERVAL, api, token)
+ coordinator = TodoistCoordinator(hass, _LOGGER, SCAN_INTERVAL, api, token)
await coordinator.async_config_entry_first_refresh()
hass.data.setdefault(DOMAIN, {})
diff --git a/homeassistant/components/todoist/calendar.py b/homeassistant/components/todoist/calendar.py
index 62f9fafc02a..31470633cc6 100644
--- a/homeassistant/components/todoist/calendar.py
+++ b/homeassistant/components/todoist/calendar.py
@@ -142,7 +142,7 @@ async def async_setup_platform(
project_id_lookup = {}
api = TodoistAPIAsync(token)
- coordinator = TodoistCoordinator(hass, _LOGGER, None, SCAN_INTERVAL, api, token)
+ coordinator = TodoistCoordinator(hass, _LOGGER, SCAN_INTERVAL, api, token)
await coordinator.async_refresh()
async def _shutdown_coordinator(_: Event) -> None:
diff --git a/homeassistant/components/todoist/coordinator.py b/homeassistant/components/todoist/coordinator.py
index 2f35741c5ab..b55680907ac 100644
--- a/homeassistant/components/todoist/coordinator.py
+++ b/homeassistant/components/todoist/coordinator.py
@@ -6,7 +6,6 @@ import logging
from todoist_api_python.api_async import TodoistAPIAsync
from todoist_api_python.models import Label, Project, Section, Task
-from homeassistant.config_entries import ConfigEntry
from homeassistant.core import HomeAssistant
from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
@@ -18,19 +17,12 @@ class TodoistCoordinator(DataUpdateCoordinator[list[Task]]):
self,
hass: HomeAssistant,
logger: logging.Logger,
- entry: ConfigEntry | None,
update_interval: timedelta,
api: TodoistAPIAsync,
token: str,
) -> None:
"""Initialize the Todoist coordinator."""
- super().__init__(
- hass,
- logger,
- config_entry=entry,
- name="Todoist",
- update_interval=update_interval,
- )
+ super().__init__(hass, logger, name="Todoist", update_interval=update_interval)
self.api = api
self._projects: list[Project] | None = None
self._labels: list[Label] | None = None
diff --git a/homeassistant/components/todoist/strings.json b/homeassistant/components/todoist/strings.json
index 721b491bbf5..5b083ac58bf 100644
--- a/homeassistant/components/todoist/strings.json
+++ b/homeassistant/components/todoist/strings.json
@@ -78,7 +78,7 @@
"description": "When should user be reminded of this task, in natural language."
},
"reminder_date_lang": {
- "name": "Reminder date language",
+ "name": "Reminder data language",
"description": "The language of reminder_date_string."
},
"reminder_date": {
diff --git a/homeassistant/components/tomorrowio/config_flow.py b/homeassistant/components/tomorrowio/config_flow.py
index cce41b17498..90bb488a7c2 100644
--- a/homeassistant/components/tomorrowio/config_flow.py
+++ b/homeassistant/components/tomorrowio/config_flow.py
@@ -91,6 +91,10 @@ def _get_unique_id(hass: HomeAssistant, input_dict: dict[str, Any]):
class TomorrowioOptionsConfigFlow(OptionsFlow):
"""Handle Tomorrow.io options."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize Tomorrow.io options flow."""
+ self._config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
@@ -101,7 +105,7 @@ class TomorrowioOptionsConfigFlow(OptionsFlow):
options_schema = {
vol.Required(
CONF_TIMESTEP,
- default=self.config_entry.options[CONF_TIMESTEP],
+ default=self._config_entry.options[CONF_TIMESTEP],
): vol.In([1, 5, 15, 30, 60]),
}
@@ -121,7 +125,7 @@ class TomorrowioConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> TomorrowioOptionsConfigFlow:
"""Get the options flow for this handler."""
- return TomorrowioOptionsConfigFlow()
+ return TomorrowioOptionsConfigFlow(config_entry)
async def async_step_user(
self, user_input: dict[str, Any] | None = None
diff --git a/homeassistant/components/totalconnect/config_flow.py b/homeassistant/components/totalconnect/config_flow.py
index 3f5d05fda13..c64dd5c6120 100644
--- a/homeassistant/components/totalconnect/config_flow.py
+++ b/homeassistant/components/totalconnect/config_flow.py
@@ -193,12 +193,16 @@ class TotalConnectConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> TotalConnectOptionsFlowHandler:
"""Get options flow."""
- return TotalConnectOptionsFlowHandler()
+ return TotalConnectOptionsFlowHandler(config_entry)
class TotalConnectOptionsFlowHandler(OptionsFlow):
"""TotalConnect options flow handler."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, bool] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/tplink/__init__.py b/homeassistant/components/tplink/__init__.py
index ee1d90e70b4..ceeb1120ed8 100644
--- a/homeassistant/components/tplink/__init__.py
+++ b/homeassistant/components/tplink/__init__.py
@@ -31,7 +31,6 @@ from homeassistant.const import (
CONF_MAC,
CONF_MODEL,
CONF_PASSWORD,
- CONF_PORT,
CONF_USERNAME,
)
from homeassistant.core import HomeAssistant, callback
@@ -142,7 +141,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: TPLinkConfigEntry) -> bo
entry_credentials_hash = entry.data.get(CONF_CREDENTIALS_HASH)
entry_use_http = entry.data.get(CONF_USES_HTTP, False)
entry_aes_keys = entry.data.get(CONF_AES_KEYS)
- port_override = entry.data.get(CONF_PORT)
conn_params: Device.ConnectionParameters | None = None
if conn_params_dict := entry.data.get(CONF_CONNECTION_PARAMETERS):
@@ -159,7 +157,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: TPLinkConfigEntry) -> bo
timeout=CONNECT_TIMEOUT,
http_client=client,
aes_keys=entry_aes_keys,
- port_override=port_override,
)
if conn_params:
config.connection_type = conn_params
diff --git a/homeassistant/components/tplink/config_flow.py b/homeassistant/components/tplink/config_flow.py
index 63f1b4e125b..a9f665e12fd 100644
--- a/homeassistant/components/tplink/config_flow.py
+++ b/homeassistant/components/tplink/config_flow.py
@@ -32,7 +32,6 @@ from homeassistant.const import (
CONF_MAC,
CONF_MODEL,
CONF_PASSWORD,
- CONF_PORT,
CONF_USERNAME,
)
from homeassistant.core import callback
@@ -70,7 +69,6 @@ class TPLinkConfigFlow(ConfigFlow, domain=DOMAIN):
MINOR_VERSION = CONF_CONFIG_ENTRY_MINOR_VERSION
host: str | None = None
- port: int | None = None
def __init__(self) -> None:
"""Initialize the config flow."""
@@ -262,26 +260,6 @@ class TPLinkConfigFlow(ConfigFlow, domain=DOMAIN):
step_id="discovery_confirm", description_placeholders=placeholders
)
- @staticmethod
- def _async_get_host_port(host_str: str) -> tuple[str, int | None]:
- """Parse the host string for host and port."""
- if "[" in host_str:
- _, _, bracketed = host_str.partition("[")
- host, _, port_str = bracketed.partition("]")
- _, _, port_str = port_str.partition(":")
- else:
- host, _, port_str = host_str.partition(":")
-
- if not port_str:
- return host, None
-
- try:
- port = int(port_str)
- except ValueError:
- return host, None
-
- return host, port
-
async def async_step_user(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
@@ -292,29 +270,14 @@ class TPLinkConfigFlow(ConfigFlow, domain=DOMAIN):
if user_input is not None:
if not (host := user_input[CONF_HOST]):
return await self.async_step_pick_device()
-
- host, port = self._async_get_host_port(host)
-
- match_dict = {CONF_HOST: host}
- if port:
- self.port = port
- match_dict[CONF_PORT] = port
- self._async_abort_entries_match(match_dict)
-
+ self._async_abort_entries_match({CONF_HOST: host})
self.host = host
credentials = await get_credentials(self.hass)
try:
device = await self._async_try_discover_and_update(
- host,
- credentials,
- raise_on_progress=False,
- raise_on_timeout=False,
- port=port,
+ host, credentials, raise_on_progress=False, raise_on_timeout=False
) or await self._async_try_connect_all(
- host,
- credentials=credentials,
- raise_on_progress=False,
- port=port,
+ host, credentials=credentials, raise_on_progress=False
)
except AuthenticationError:
return await self.async_step_user_auth_confirm()
@@ -355,10 +318,7 @@ class TPLinkConfigFlow(ConfigFlow, domain=DOMAIN):
)
else:
device = await self._async_try_connect_all(
- self.host,
- credentials=credentials,
- raise_on_progress=False,
- port=self.port,
+ self.host, credentials=credentials, raise_on_progress=False
)
except AuthenticationError as ex:
errors[CONF_PASSWORD] = "invalid_auth"
@@ -460,8 +420,6 @@ class TPLinkConfigFlow(ConfigFlow, domain=DOMAIN):
data[CONF_AES_KEYS] = device.config.aes_keys
if device.credentials_hash:
data[CONF_CREDENTIALS_HASH] = device.credentials_hash
- if port := device.config.port_override:
- data[CONF_PORT] = port
return self.async_create_entry(
title=f"{device.alias} {device.model}",
data=data,
@@ -472,8 +430,6 @@ class TPLinkConfigFlow(ConfigFlow, domain=DOMAIN):
host: str,
credentials: Credentials | None,
raise_on_progress: bool,
- *,
- port: int | None = None,
) -> Device | None:
"""Try to connect to the device speculatively.
@@ -485,15 +441,12 @@ class TPLinkConfigFlow(ConfigFlow, domain=DOMAIN):
host,
credentials=credentials,
http_client=create_async_tplink_clientsession(self.hass),
- port=port,
)
else:
# This will just try the legacy protocol that doesn't require auth
# and doesn't use http
try:
- device = await Device.connect(
- config=DeviceConfig(host, port_override=port)
- )
+ device = await Device.connect(config=DeviceConfig(host))
except Exception: # noqa: BLE001
return None
if device:
@@ -509,8 +462,6 @@ class TPLinkConfigFlow(ConfigFlow, domain=DOMAIN):
credentials: Credentials | None,
raise_on_progress: bool,
raise_on_timeout: bool,
- *,
- port: int | None = None,
) -> Device | None:
"""Try to discover the device and call update.
@@ -519,9 +470,7 @@ class TPLinkConfigFlow(ConfigFlow, domain=DOMAIN):
self._discovered_device = None
try:
self._discovered_device = await Discover.discover_single(
- host,
- credentials=credentials,
- port=port,
+ host, credentials=credentials
)
except TimeoutError as ex:
if raise_on_timeout:
@@ -577,7 +526,6 @@ class TPLinkConfigFlow(ConfigFlow, domain=DOMAIN):
reauth_entry = self._get_reauth_entry()
entry_data = reauth_entry.data
host = entry_data[CONF_HOST]
- port = entry_data.get(CONF_PORT)
if user_input:
username = user_input[CONF_USERNAME]
@@ -589,12 +537,8 @@ class TPLinkConfigFlow(ConfigFlow, domain=DOMAIN):
credentials=credentials,
raise_on_progress=False,
raise_on_timeout=False,
- port=port,
) or await self._async_try_connect_all(
- host,
- credentials=credentials,
- raise_on_progress=False,
- port=port,
+ host, credentials=credentials, raise_on_progress=False
)
except AuthenticationError as ex:
errors[CONF_PASSWORD] = "invalid_auth"
diff --git a/homeassistant/components/tplink/icons.json b/homeassistant/components/tplink/icons.json
index 0abd68543c5..96ea8f41bb7 100644
--- a/homeassistant/components/tplink/icons.json
+++ b/homeassistant/components/tplink/icons.json
@@ -68,15 +68,6 @@
"state": {
"on": "mdi:sleep"
}
- },
- "child_lock": {
- "default": "mdi:account-lock"
- },
- "pir_enabled": {
- "default": "mdi:motion-sensor-off",
- "state": {
- "on": "mdi:motion-sensor"
- }
}
},
"sensor": {
@@ -97,9 +88,6 @@
},
"alarm_source": {
"default": "mdi:bell"
- },
- "water_alert_timestamp": {
- "default": "mdi:clock-alert-outline"
}
},
"number": {
diff --git a/homeassistant/components/tplink/sensor.py b/homeassistant/components/tplink/sensor.py
index 809d9002768..f3d3b1c7b31 100644
--- a/homeassistant/components/tplink/sensor.py
+++ b/homeassistant/components/tplink/sensor.py
@@ -97,10 +97,6 @@ SENSOR_DESCRIPTIONS: tuple[TPLinkSensorEntityDescription, ...] = (
key="device_time",
device_class=SensorDeviceClass.TIMESTAMP,
),
- TPLinkSensorEntityDescription(
- key="water_alert_timestamp",
- device_class=SensorDeviceClass.TIMESTAMP,
- ),
TPLinkSensorEntityDescription(
key="humidity",
device_class=SensorDeviceClass.HUMIDITY,
diff --git a/homeassistant/components/tplink/strings.json b/homeassistant/components/tplink/strings.json
index 8e5118c2720..e4eb484aec9 100644
--- a/homeassistant/components/tplink/strings.json
+++ b/homeassistant/components/tplink/strings.json
@@ -159,9 +159,6 @@
"device_time": {
"name": "Device time"
},
- "water_alert_timestamp": {
- "name": "Last water leak alert"
- },
"auto_off_at": {
"name": "Auto off at"
},
@@ -190,12 +187,6 @@
},
"fan_sleep_mode": {
"name": "Fan sleep mode"
- },
- "child_lock": {
- "name": "Child lock"
- },
- "pir_enabled": {
- "name": "Motion sensor"
}
},
"number": {
diff --git a/homeassistant/components/tplink/switch.py b/homeassistant/components/tplink/switch.py
index c9285d86ba6..6d3e21d88c5 100644
--- a/homeassistant/components/tplink/switch.py
+++ b/homeassistant/components/tplink/switch.py
@@ -48,12 +48,6 @@ SWITCH_DESCRIPTIONS: tuple[TPLinkSwitchEntityDescription, ...] = (
TPLinkSwitchEntityDescription(
key="fan_sleep_mode",
),
- TPLinkSwitchEntityDescription(
- key="child_lock",
- ),
- TPLinkSwitchEntityDescription(
- key="pir_enabled",
- ),
)
SWITCH_DESCRIPTIONS_MAP = {desc.key: desc for desc in SWITCH_DESCRIPTIONS}
diff --git a/homeassistant/components/tplink_omada/manifest.json b/homeassistant/components/tplink_omada/manifest.json
index af20b54675b..6bde656dc30 100644
--- a/homeassistant/components/tplink_omada/manifest.json
+++ b/homeassistant/components/tplink_omada/manifest.json
@@ -6,5 +6,5 @@
"documentation": "https://www.home-assistant.io/integrations/tplink_omada",
"integration_type": "hub",
"iot_class": "local_polling",
- "requirements": ["tplink-omada-client==1.4.3"]
+ "requirements": ["tplink-omada-client==1.4.2"]
}
diff --git a/homeassistant/components/trafikverket_train/config_flow.py b/homeassistant/components/trafikverket_train/config_flow.py
index f498a7b0d0e..a9eefd09b9b 100644
--- a/homeassistant/components/trafikverket_train/config_flow.py
+++ b/homeassistant/components/trafikverket_train/config_flow.py
@@ -21,7 +21,7 @@ from homeassistant.config_entries import (
ConfigEntry,
ConfigFlow,
ConfigFlowResult,
- OptionsFlow,
+ OptionsFlowWithConfigEntry,
)
from homeassistant.const import CONF_API_KEY, CONF_NAME, CONF_WEEKDAY, WEEKDAYS
from homeassistant.core import HomeAssistant, callback
@@ -132,7 +132,7 @@ class TVTrainConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> TVTrainOptionsFlowHandler:
"""Get the options flow for this handler."""
- return TVTrainOptionsFlowHandler()
+ return TVTrainOptionsFlowHandler(config_entry)
async def async_step_reauth(
self, entry_data: Mapping[str, Any]
@@ -229,7 +229,7 @@ class TVTrainConfigFlow(ConfigFlow, domain=DOMAIN):
)
-class TVTrainOptionsFlowHandler(OptionsFlow):
+class TVTrainOptionsFlowHandler(OptionsFlowWithConfigEntry):
"""Handle Trafikverket Train options."""
async def async_step_init(
@@ -247,7 +247,7 @@ class TVTrainOptionsFlowHandler(OptionsFlow):
step_id="init",
data_schema=self.add_suggested_values_to_schema(
vol.Schema(OPTION_SCHEMA),
- user_input or self.config_entry.options,
+ user_input or self.options,
),
errors=errors,
)
diff --git a/homeassistant/components/transmission/config_flow.py b/homeassistant/components/transmission/config_flow.py
index 30e9f5a146b..a6e77dd23f7 100644
--- a/homeassistant/components/transmission/config_flow.py
+++ b/homeassistant/components/transmission/config_flow.py
@@ -63,7 +63,7 @@ class TransmissionFlowHandler(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> TransmissionOptionsFlowHandler:
"""Get the options flow for this handler."""
- return TransmissionOptionsFlowHandler()
+ return TransmissionOptionsFlowHandler(config_entry)
async def async_step_user(
self, user_input: dict[str, Any] | None = None
@@ -138,6 +138,10 @@ class TransmissionFlowHandler(ConfigFlow, domain=DOMAIN):
class TransmissionOptionsFlowHandler(OptionsFlow):
"""Handle Transmission client options."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize Transmission options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/trend/manifest.json b/homeassistant/components/trend/manifest.json
index d7981105fd2..56b4b811171 100644
--- a/homeassistant/components/trend/manifest.json
+++ b/homeassistant/components/trend/manifest.json
@@ -7,5 +7,5 @@
"integration_type": "helper",
"iot_class": "calculated",
"quality_scale": "internal",
- "requirements": ["numpy==2.1.3"]
+ "requirements": ["numpy==1.26.4"]
}
diff --git a/homeassistant/components/tuya/__init__.py b/homeassistant/components/tuya/__init__.py
index c8a639cd239..47143f3595c 100644
--- a/homeassistant/components/tuya/__init__.py
+++ b/homeassistant/components/tuya/__init__.py
@@ -146,21 +146,14 @@ class DeviceListener(SharingDeviceListener):
self.hass = hass
self.manager = manager
- def update_device(
- self, device: CustomerDevice, updated_status_properties: list[str] | None
- ) -> None:
+ def update_device(self, device: CustomerDevice) -> None:
"""Update device status."""
LOGGER.debug(
- "Received update for device %s: %s (updated properties: %s)",
+ "Received update for device %s: %s",
device.id,
self.manager.device_map[device.id].status,
- updated_status_properties,
- )
- dispatcher_send(
- self.hass,
- f"{TUYA_HA_SIGNAL_UPDATE_ENTITY}_{device.id}",
- updated_status_properties,
)
+ dispatcher_send(self.hass, f"{TUYA_HA_SIGNAL_UPDATE_ENTITY}_{device.id}")
def add_device(self, device: CustomerDevice) -> None:
"""Add device added listener."""
diff --git a/homeassistant/components/tuya/entity.py b/homeassistant/components/tuya/entity.py
index cc258560067..4d3710f7570 100644
--- a/homeassistant/components/tuya/entity.py
+++ b/homeassistant/components/tuya/entity.py
@@ -283,15 +283,10 @@ class TuyaEntity(Entity):
async_dispatcher_connect(
self.hass,
f"{TUYA_HA_SIGNAL_UPDATE_ENTITY}_{self.device.id}",
- self._handle_state_update,
+ self.async_write_ha_state,
)
)
- async def _handle_state_update(
- self, updated_status_properties: list[str] | None
- ) -> None:
- self.async_write_ha_state()
-
def _send_command(self, commands: list[dict[str, Any]]) -> None:
"""Send command to the device."""
LOGGER.debug("Sending commands for device %s: %s", self.device.id, commands)
diff --git a/homeassistant/components/tuya/manifest.json b/homeassistant/components/tuya/manifest.json
index b53e6fa27d8..305a74160de 100644
--- a/homeassistant/components/tuya/manifest.json
+++ b/homeassistant/components/tuya/manifest.json
@@ -43,5 +43,5 @@
"integration_type": "hub",
"iot_class": "cloud_push",
"loggers": ["tuya_iot"],
- "requirements": ["tuya-device-sharing-sdk==0.2.1"]
+ "requirements": ["tuya-device-sharing-sdk==0.1.9"]
}
diff --git a/homeassistant/components/tuya/sensor.py b/homeassistant/components/tuya/sensor.py
index b9677037b7e..fd8efcac95d 100644
--- a/homeassistant/components/tuya/sensor.py
+++ b/homeassistant/components/tuya/sensor.py
@@ -203,17 +203,6 @@ SENSORS: dict[str, tuple[TuyaSensorEntityDescription, ...]] = {
device_class=SensorDeviceClass.CO2,
state_class=SensorStateClass.MEASUREMENT,
),
- TuyaSensorEntityDescription(
- key=DPCode.CH2O_VALUE,
- translation_key="formaldehyde",
- state_class=SensorStateClass.MEASUREMENT,
- ),
- TuyaSensorEntityDescription(
- key=DPCode.VOC_VALUE,
- translation_key="voc",
- device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS,
- state_class=SensorStateClass.MEASUREMENT,
- ),
*BATTERY_SENSORS,
),
# Two-way temperature and humidity switch
diff --git a/homeassistant/components/twitch/config_flow.py b/homeassistant/components/twitch/config_flow.py
index ed196897c11..dbaef59c236 100644
--- a/homeassistant/components/twitch/config_flow.py
+++ b/homeassistant/components/twitch/config_flow.py
@@ -78,10 +78,7 @@ class OAuth2FlowHandler(
reauth_entry = self._get_reauth_entry()
self._abort_if_unique_id_mismatch(
reason="wrong_account",
- description_placeholders={
- "title": reauth_entry.title,
- "username": str(reauth_entry.unique_id),
- },
+ description_placeholders={"title": reauth_entry.title},
)
new_channels = reauth_entry.options[CONF_CHANNELS]
diff --git a/homeassistant/components/unifi/config_flow.py b/homeassistant/components/unifi/config_flow.py
index 63c8533aa2e..f36edc8a888 100644
--- a/homeassistant/components/unifi/config_flow.py
+++ b/homeassistant/components/unifi/config_flow.py
@@ -21,6 +21,7 @@ import voluptuous as vol
from homeassistant.components import ssdp
from homeassistant.config_entries import (
SOURCE_REAUTH,
+ ConfigEntry,
ConfigEntryState,
ConfigFlow,
ConfigFlowResult,
@@ -78,7 +79,7 @@ class UnifiFlowHandler(ConfigFlow, domain=UNIFI_DOMAIN):
@staticmethod
@callback
def async_get_options_flow(
- config_entry: UnifiConfigEntry,
+ config_entry: ConfigEntry,
) -> UnifiOptionsFlowHandler:
"""Get the options flow for this handler."""
return UnifiOptionsFlowHandler(config_entry)
@@ -249,6 +250,7 @@ class UnifiOptionsFlowHandler(OptionsFlow):
def __init__(self, config_entry: UnifiConfigEntry) -> None:
"""Initialize UniFi Network options flow."""
+ self.config_entry = config_entry
self.options = dict(config_entry.options)
async def async_step_init(
diff --git a/homeassistant/components/unifiprotect/config_flow.py b/homeassistant/components/unifiprotect/config_flow.py
index 31950f8f7e4..6a9dc1210c0 100644
--- a/homeassistant/components/unifiprotect/config_flow.py
+++ b/homeassistant/components/unifiprotect/config_flow.py
@@ -225,7 +225,7 @@ class ProtectFlowHandler(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> OptionsFlow:
"""Get the options flow for this handler."""
- return OptionsFlowHandler()
+ return OptionsFlowHandler(config_entry)
@callback
def _async_create_entry(self, title: str, data: dict[str, Any]) -> ConfigFlowResult:
@@ -376,6 +376,10 @@ class ProtectFlowHandler(ConfigFlow, domain=DOMAIN):
class OptionsFlowHandler(OptionsFlow):
"""Handle options."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/upcloud/config_flow.py b/homeassistant/components/upcloud/config_flow.py
index bb988726ba5..20860df5553 100644
--- a/homeassistant/components/upcloud/config_flow.py
+++ b/homeassistant/components/upcloud/config_flow.py
@@ -95,12 +95,16 @@ class UpCloudConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> UpCloudOptionsFlow:
"""Get options flow."""
- return UpCloudOptionsFlow()
+ return UpCloudOptionsFlow(config_entry)
class UpCloudOptionsFlow(OptionsFlow):
"""UpCloud options flow."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/upnp/config_flow.py b/homeassistant/components/upnp/config_flow.py
index 41e481fa58c..1a40d4b3442 100644
--- a/homeassistant/components/upnp/config_flow.py
+++ b/homeassistant/components/upnp/config_flow.py
@@ -16,6 +16,7 @@ from homeassistant.config_entries import (
ConfigFlow,
ConfigFlowResult,
OptionsFlow,
+ OptionsFlowWithConfigEntry,
)
from homeassistant.core import HomeAssistant, callback
@@ -93,11 +94,9 @@ class UpnpFlowHandler(ConfigFlow, domain=DOMAIN):
@staticmethod
@callback
- def async_get_options_flow(
- config_entry: ConfigEntry,
- ) -> UpnpOptionsFlowHandler:
+ def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlow:
"""Get the options flow for this handler."""
- return UpnpOptionsFlowHandler()
+ return UpnpOptionsFlowHandler(config_entry)
@property
def _discoveries(self) -> dict[str, SsdpServiceInfo]:
@@ -300,7 +299,7 @@ class UpnpFlowHandler(ConfigFlow, domain=DOMAIN):
return self.async_create_entry(title=title, data=data, options=options)
-class UpnpOptionsFlowHandler(OptionsFlow):
+class UpnpOptionsFlowHandler(OptionsFlowWithConfigEntry):
"""Handle an options flow."""
async def async_step_init(
@@ -314,7 +313,7 @@ class UpnpOptionsFlowHandler(OptionsFlow):
{
vol.Optional(
CONFIG_ENTRY_FORCE_POLL,
- default=self.config_entry.options.get(
+ default=self.options.get(
CONFIG_ENTRY_FORCE_POLL, DEFAULT_CONFIG_ENTRY_FORCE_POLL
),
): bool,
diff --git a/homeassistant/components/utility_meter/manifest.json b/homeassistant/components/utility_meter/manifest.json
index 31a2d4e9584..25e803e6a2d 100644
--- a/homeassistant/components/utility_meter/manifest.json
+++ b/homeassistant/components/utility_meter/manifest.json
@@ -8,5 +8,5 @@
"iot_class": "local_push",
"loggers": ["croniter"],
"quality_scale": "internal",
- "requirements": ["cronsim==2.6"]
+ "requirements": ["croniter==2.0.2"]
}
diff --git a/homeassistant/components/utility_meter/sensor.py b/homeassistant/components/utility_meter/sensor.py
index 19ef3c1f3a8..6b8c07c7ef7 100644
--- a/homeassistant/components/utility_meter/sensor.py
+++ b/homeassistant/components/utility_meter/sensor.py
@@ -9,7 +9,7 @@ from decimal import Decimal, DecimalException, InvalidOperation
import logging
from typing import Any, Self
-from cronsim import CronSim
+from croniter import croniter
import voluptuous as vol
from homeassistant.components.sensor import (
@@ -379,13 +379,14 @@ class UtilityMeterSensor(RestoreSensor):
self.entity_id = suggested_entity_id
self._parent_meter = parent_meter
self._sensor_source_id = source_entity
+ self._state = None
self._last_period = Decimal(0)
self._last_reset = dt_util.utcnow()
self._last_valid_state = None
self._collecting = None
- self._attr_name = name
+ self._name = name
self._input_device_class = None
- self._attr_native_unit_of_measurement = None
+ self._unit_of_measurement = None
self._period = meter_type
if meter_type is not None:
# For backwards compatibility reasons we convert the period and offset into a cron pattern
@@ -404,22 +405,12 @@ class UtilityMeterSensor(RestoreSensor):
self._tariff = tariff
self._tariff_entity = tariff_entity
self._next_reset = None
- self.scheduler = (
- CronSim(
- self._cron_pattern,
- dt_util.now(
- dt_util.get_default_time_zone()
- ), # we need timezone for DST purposes (see issue #102984)
- )
- if self._cron_pattern
- else None
- )
def start(self, attributes: Mapping[str, Any]) -> None:
"""Initialize unit and state upon source initial update."""
self._input_device_class = attributes.get(ATTR_DEVICE_CLASS)
- self._attr_native_unit_of_measurement = attributes.get(ATTR_UNIT_OF_MEASUREMENT)
- self._attr_native_value = 0
+ self._unit_of_measurement = attributes.get(ATTR_UNIT_OF_MEASUREMENT)
+ self._state = 0
self.async_write_ha_state()
@staticmethod
@@ -494,13 +485,13 @@ class UtilityMeterSensor(RestoreSensor):
)
return
- if self.native_value is None:
+ if self._state is None:
# First state update initializes the utility_meter sensors
for sensor in self.hass.data[DATA_UTILITY][self._parent_meter][
DATA_TARIFF_SENSORS
]:
sensor.start(new_state_attributes)
- if self.native_unit_of_measurement is None:
+ if self._unit_of_measurement is None:
_LOGGER.warning(
"Source sensor %s has no unit of measurement. Please %s",
self._sensor_source_id,
@@ -511,12 +502,10 @@ class UtilityMeterSensor(RestoreSensor):
adjustment := self.calculate_adjustment(old_state, new_state)
) is not None and (self._sensor_net_consumption or adjustment >= 0):
# If net_consumption is off, the adjustment must be non-negative
- self._attr_native_value += adjustment # type: ignore[operator] # self._attr_native_value will be set to by the start function if it is None, therefore it always has a valid Decimal value at this line
+ self._state += adjustment # type: ignore[operator] # self._state will be set to by the start function if it is None, therefore it always has a valid Decimal value at this line
self._input_device_class = new_state_attributes.get(ATTR_DEVICE_CLASS)
- self._attr_native_unit_of_measurement = new_state_attributes.get(
- ATTR_UNIT_OF_MEASUREMENT
- )
+ self._unit_of_measurement = new_state_attributes.get(ATTR_UNIT_OF_MEASUREMENT)
self._last_valid_state = new_state_val
self.async_write_ha_state()
@@ -545,7 +534,7 @@ class UtilityMeterSensor(RestoreSensor):
_LOGGER.debug(
"%s - %s - source <%s>",
- self.name,
+ self._name,
COLLECTING if self._collecting is not None else PAUSED,
self._sensor_source_id,
)
@@ -554,10 +543,11 @@ class UtilityMeterSensor(RestoreSensor):
async def _program_reset(self):
"""Program the reset of the utility meter."""
- if self.scheduler:
- self._next_reset = next(self.scheduler)
-
- _LOGGER.debug("Next reset of %s is %s", self.entity_id, self._next_reset)
+ if self._cron_pattern is not None:
+ tz = dt_util.get_default_time_zone()
+ self._next_reset = croniter(self._cron_pattern, dt_util.now(tz)).get_next(
+ datetime
+ ) # we need timezone for DST purposes (see issue #102984)
self.async_on_remove(
async_track_point_in_time(
self.hass,
@@ -585,16 +575,14 @@ class UtilityMeterSensor(RestoreSensor):
return
_LOGGER.debug("Reset utility meter <%s>", self.entity_id)
self._last_reset = dt_util.utcnow()
- self._last_period = (
- Decimal(self.native_value) if self.native_value else Decimal(0)
- )
- self._attr_native_value = 0
+ self._last_period = Decimal(self._state) if self._state else Decimal(0)
+ self._state = 0
self.async_write_ha_state()
async def async_calibrate(self, value):
"""Calibrate the Utility Meter with a given value."""
- _LOGGER.debug("Calibrate %s = %s type(%s)", self.name, value, type(value))
- self._attr_native_value = Decimal(str(value))
+ _LOGGER.debug("Calibrate %s = %s type(%s)", self._name, value, type(value))
+ self._state = Decimal(str(value))
self.async_write_ha_state()
async def async_added_to_hass(self):
@@ -610,11 +598,10 @@ class UtilityMeterSensor(RestoreSensor):
)
if (last_sensor_data := await self.async_get_last_sensor_data()) is not None:
- self._attr_native_value = last_sensor_data.native_value
+ # new introduced in 2022.04
+ self._state = last_sensor_data.native_value
self._input_device_class = last_sensor_data.input_device_class
- self._attr_native_unit_of_measurement = (
- last_sensor_data.native_unit_of_measurement
- )
+ self._unit_of_measurement = last_sensor_data.native_unit_of_measurement
self._last_period = last_sensor_data.last_period
self._last_reset = last_sensor_data.last_reset
self._last_valid_state = last_sensor_data.last_valid_state
@@ -622,6 +609,39 @@ class UtilityMeterSensor(RestoreSensor):
# Null lambda to allow cancelling the collection on tariff change
self._collecting = lambda: None
+ elif state := await self.async_get_last_state():
+ # legacy to be removed on 2022.10 (we are keeping this to avoid utility_meter counter losses)
+ try:
+ self._state = Decimal(state.state)
+ except InvalidOperation:
+ _LOGGER.error(
+ "Could not restore state <%s>. Resetting utility_meter.%s",
+ state.state,
+ self.name,
+ )
+ else:
+ self._unit_of_measurement = state.attributes.get(
+ ATTR_UNIT_OF_MEASUREMENT
+ )
+ self._last_period = (
+ Decimal(state.attributes[ATTR_LAST_PERIOD])
+ if state.attributes.get(ATTR_LAST_PERIOD)
+ and is_number(state.attributes[ATTR_LAST_PERIOD])
+ else Decimal(0)
+ )
+ self._last_valid_state = (
+ Decimal(state.attributes[ATTR_LAST_VALID_STATE])
+ if state.attributes.get(ATTR_LAST_VALID_STATE)
+ and is_number(state.attributes[ATTR_LAST_VALID_STATE])
+ else None
+ )
+ self._last_reset = dt_util.as_utc(
+ dt_util.parse_datetime(state.attributes.get(ATTR_LAST_RESET))
+ )
+ if state.attributes.get(ATTR_STATUS) == COLLECTING:
+ # Null lambda to allow cancelling the collection on tariff change
+ self._collecting = lambda: None
+
@callback
def async_source_tracking(event):
"""Wait for source to be ready, then start meter."""
@@ -646,7 +666,7 @@ class UtilityMeterSensor(RestoreSensor):
_LOGGER.debug(
"<%s> collecting %s from %s",
self.name,
- self.native_unit_of_measurement,
+ self._unit_of_measurement,
self._sensor_source_id,
)
self._collecting = async_track_state_change_event(
@@ -661,15 +681,22 @@ class UtilityMeterSensor(RestoreSensor):
self._collecting()
self._collecting = None
+ @property
+ def name(self):
+ """Return the name of the sensor."""
+ return self._name
+
+ @property
+ def native_value(self):
+ """Return the state of the sensor."""
+ return self._state
+
@property
def device_class(self):
"""Return the device class of the sensor."""
if self._input_device_class is not None:
return self._input_device_class
- if (
- self.native_unit_of_measurement
- in DEVICE_CLASS_UNITS[SensorDeviceClass.ENERGY]
- ):
+ if self._unit_of_measurement in DEVICE_CLASS_UNITS[SensorDeviceClass.ENERGY]:
return SensorDeviceClass.ENERGY
return None
@@ -682,6 +709,11 @@ class UtilityMeterSensor(RestoreSensor):
else SensorStateClass.TOTAL_INCREASING
)
+ @property
+ def native_unit_of_measurement(self):
+ """Return the unit the value is expressed in."""
+ return self._unit_of_measurement
+
@property
def extra_state_attributes(self):
"""Return the state attributes of the sensor."""
diff --git a/homeassistant/components/vera/config_flow.py b/homeassistant/components/vera/config_flow.py
index f2b182cc270..08e7640773b 100644
--- a/homeassistant/components/vera/config_flow.py
+++ b/homeassistant/components/vera/config_flow.py
@@ -76,6 +76,10 @@ def options_data(user_input: dict[str, str]) -> dict[str, list[int]]:
class OptionsFlowHandler(OptionsFlow):
"""Options for the component."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Init object."""
+ self.config_entry = config_entry
+
async def async_step_init(
self,
user_input: dict[str, str] | None = None,
@@ -100,7 +104,7 @@ class VeraFlowHandler(ConfigFlow, domain=DOMAIN):
@callback
def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlowHandler:
"""Get the options flow."""
- return OptionsFlowHandler()
+ return OptionsFlowHandler(config_entry)
async def async_step_user(
self, user_input: dict[str, Any] | None = None
diff --git a/homeassistant/components/verisure/config_flow.py b/homeassistant/components/verisure/config_flow.py
index 0f1088ccb80..42ce7f9e9fe 100644
--- a/homeassistant/components/verisure/config_flow.py
+++ b/homeassistant/components/verisure/config_flow.py
@@ -43,11 +43,9 @@ class VerisureConfigFlowHandler(ConfigFlow, domain=DOMAIN):
@staticmethod
@callback
- def async_get_options_flow(
- config_entry: ConfigEntry,
- ) -> VerisureOptionsFlowHandler:
+ def async_get_options_flow(config_entry: ConfigEntry) -> VerisureOptionsFlowHandler:
"""Get the options flow for this handler."""
- return VerisureOptionsFlowHandler()
+ return VerisureOptionsFlowHandler(config_entry)
async def async_step_user(
self, user_input: dict[str, Any] | None = None
@@ -292,6 +290,10 @@ class VerisureConfigFlowHandler(ConfigFlow, domain=DOMAIN):
class VerisureOptionsFlowHandler(OptionsFlow):
"""Handle Verisure options."""
+ def __init__(self, entry: ConfigEntry) -> None:
+ """Initialize Verisure options flow."""
+ self.entry = entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
@@ -308,7 +310,7 @@ class VerisureOptionsFlowHandler(OptionsFlow):
vol.Optional(
CONF_LOCK_CODE_DIGITS,
description={
- "suggested_value": self.config_entry.options.get(
+ "suggested_value": self.entry.options.get(
CONF_LOCK_CODE_DIGITS, DEFAULT_LOCK_CODE_DIGITS
)
},
diff --git a/homeassistant/components/vesync/fan.py b/homeassistant/components/vesync/fan.py
index 098a17e90f0..58a262e769f 100644
--- a/homeassistant/components/vesync/fan.py
+++ b/homeassistant/components/vesync/fan.py
@@ -94,7 +94,6 @@ class VeSyncFanHA(VeSyncDevice, FanEntity):
| FanEntityFeature.TURN_ON
)
_attr_name = None
- _attr_translation_key = "vesync"
_enable_turn_on_off_backwards_compatibility = False
def __init__(self, fan) -> None:
diff --git a/homeassistant/components/vesync/icons.json b/homeassistant/components/vesync/icons.json
index e4769acc9a5..cfdefb2ed09 100644
--- a/homeassistant/components/vesync/icons.json
+++ b/homeassistant/components/vesync/icons.json
@@ -1,20 +1,4 @@
{
- "entity": {
- "fan": {
- "vesync": {
- "state_attributes": {
- "preset_mode": {
- "state": {
- "auto": "mdi:fan-auto",
- "sleep": "mdi:sleep",
- "pet": "mdi:paw",
- "turbo": "mdi:weather-tornado"
- }
- }
- }
- }
- }
- },
"services": {
"update_devices": {
"service": "mdi:update"
diff --git a/homeassistant/components/vesync/strings.json b/homeassistant/components/vesync/strings.json
index b6e4e2fd957..5ff0aa58722 100644
--- a/homeassistant/components/vesync/strings.json
+++ b/homeassistant/components/vesync/strings.json
@@ -42,20 +42,6 @@
"current_voltage": {
"name": "Current voltage"
}
- },
- "fan": {
- "vesync": {
- "state_attributes": {
- "preset_mode": {
- "state": {
- "auto": "Auto",
- "sleep": "Sleep",
- "pet": "Pet",
- "turbo": "Turbo"
- }
- }
- }
- }
}
},
"services": {
diff --git a/homeassistant/components/vizio/config_flow.py b/homeassistant/components/vizio/config_flow.py
index 49f6a709565..c8f1aaa21cb 100644
--- a/homeassistant/components/vizio/config_flow.py
+++ b/homeassistant/components/vizio/config_flow.py
@@ -108,6 +108,10 @@ def _host_is_same(host1: str, host2: str) -> bool:
class VizioOptionsConfigFlow(OptionsFlow):
"""Handle Vizio options."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize vizio options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
@@ -180,7 +184,7 @@ class VizioConfigFlow(ConfigFlow, domain=DOMAIN):
@callback
def async_get_options_flow(config_entry: ConfigEntry) -> VizioOptionsConfigFlow:
"""Get the options flow for this handler."""
- return VizioOptionsConfigFlow()
+ return VizioOptionsConfigFlow(config_entry)
def __init__(self) -> None:
"""Initialize config flow."""
diff --git a/homeassistant/components/vizio/coordinator.py b/homeassistant/components/vizio/coordinator.py
index a7ca7d7f9ed..1930828b595 100644
--- a/homeassistant/components/vizio/coordinator.py
+++ b/homeassistant/components/vizio/coordinator.py
@@ -34,9 +34,10 @@ class VizioAppsDataUpdateCoordinator(DataUpdateCoordinator[list[dict[str, Any]]]
self.fail_threshold = 10
self.store = store
- async def _async_setup(self) -> None:
+ async def async_config_entry_first_refresh(self) -> None:
"""Refresh data for the first time when a config entry is setup."""
self.data = await self.store.async_load() or APPS
+ await super().async_config_entry_first_refresh()
async def _async_update_data(self) -> list[dict[str, Any]]:
"""Update data via library."""
diff --git a/homeassistant/components/vodafone_station/config_flow.py b/homeassistant/components/vodafone_station/config_flow.py
index 7a80244f8d6..c373520bc58 100644
--- a/homeassistant/components/vodafone_station/config_flow.py
+++ b/homeassistant/components/vodafone_station/config_flow.py
@@ -17,6 +17,7 @@ from homeassistant.config_entries import (
ConfigFlow,
ConfigFlowResult,
OptionsFlow,
+ OptionsFlowWithConfigEntry,
)
from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
from homeassistant.core import HomeAssistant, callback
@@ -62,11 +63,9 @@ class VodafoneStationConfigFlow(ConfigFlow, domain=DOMAIN):
@staticmethod
@callback
- def async_get_options_flow(
- config_entry: ConfigEntry,
- ) -> VodafoneStationOptionsFlowHandler:
+ def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlow:
"""Get the options flow for this handler."""
- return VodafoneStationOptionsFlowHandler()
+ return VodafoneStationOptionsFlowHandler(config_entry)
async def async_step_user(
self, user_input: dict[str, Any] | None = None
@@ -144,7 +143,7 @@ class VodafoneStationConfigFlow(ConfigFlow, domain=DOMAIN):
)
-class VodafoneStationOptionsFlowHandler(OptionsFlow):
+class VodafoneStationOptionsFlowHandler(OptionsFlowWithConfigEntry):
"""Handle a option flow."""
async def async_step_init(
@@ -159,7 +158,7 @@ class VodafoneStationOptionsFlowHandler(OptionsFlow):
{
vol.Optional(
CONF_CONSIDER_HOME,
- default=self.config_entry.options.get(
+ default=self.options.get(
CONF_CONSIDER_HOME, DEFAULT_CONSIDER_HOME.total_seconds()
),
): vol.All(vol.Coerce(int), vol.Clamp(min=0, max=900))
diff --git a/homeassistant/components/vodafone_station/sensor.py b/homeassistant/components/vodafone_station/sensor.py
index 307fcaf0ea8..136aa94b43a 100644
--- a/homeassistant/components/vodafone_station/sensor.py
+++ b/homeassistant/components/vodafone_station/sensor.py
@@ -22,7 +22,7 @@ from .const import _LOGGER, DOMAIN, LINE_TYPES
from .coordinator import VodafoneStationRouter
NOT_AVAILABLE: list = ["", "N/A", "0.0.0.0"]
-UPTIME_DEVIATION = 60
+UPTIME_DEVIATION = 45
@dataclass(frozen=True, kw_only=True)
@@ -43,10 +43,12 @@ def _calculate_uptime(
) -> datetime:
"""Calculate device uptime."""
+ assert isinstance(last_value, datetime)
+
delta_uptime = coordinator.api.convert_uptime(coordinator.data.sensors[key])
if (
- not isinstance(last_value, datetime)
+ not last_value
or abs((delta_uptime - last_value).total_seconds()) > UPTIME_DEVIATION
):
return delta_uptime
diff --git a/homeassistant/components/voip/config_flow.py b/homeassistant/components/voip/config_flow.py
index 63dcb8f86ee..821c7f29a1e 100644
--- a/homeassistant/components/voip/config_flow.py
+++ b/homeassistant/components/voip/config_flow.py
@@ -47,12 +47,16 @@ class VoIPConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> OptionsFlow:
"""Create the options flow."""
- return VoipOptionsFlowHandler()
+ return VoipOptionsFlowHandler(config_entry)
class VoipOptionsFlowHandler(OptionsFlow):
"""Handle VoIP options."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/water_heater/strings.json b/homeassistant/components/water_heater/strings.json
index 07e132a0b5b..741b277d84d 100644
--- a/homeassistant/components/water_heater/strings.json
+++ b/homeassistant/components/water_heater/strings.json
@@ -1,5 +1,4 @@
{
- "title": "Water heater",
"device_automation": {
"action_type": {
"turn_on": "[%key:common::device_automation::action_type::turn_on%]",
@@ -8,7 +7,7 @@
},
"entity_component": {
"_": {
- "name": "[%key:component::water_heater::title%]",
+ "name": "Water heater",
"state": {
"off": "[%key:common::state::off%]",
"eco": "Eco",
diff --git a/homeassistant/components/watttime/config_flow.py b/homeassistant/components/watttime/config_flow.py
index ad676e166c5..db68738b302 100644
--- a/homeassistant/components/watttime/config_flow.py
+++ b/homeassistant/components/watttime/config_flow.py
@@ -126,11 +126,9 @@ class WattTimeConfigFlow(ConfigFlow, domain=DOMAIN):
@staticmethod
@callback
- def async_get_options_flow(
- config_entry: ConfigEntry,
- ) -> WattTimeOptionsFlowHandler:
+ def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlow:
"""Define the config flow to handle options."""
- return WattTimeOptionsFlowHandler()
+ return WattTimeOptionsFlowHandler(config_entry)
async def async_step_coordinates(
self, user_input: dict[str, Any] | None = None
@@ -243,6 +241,10 @@ class WattTimeConfigFlow(ConfigFlow, domain=DOMAIN):
class WattTimeOptionsFlowHandler(OptionsFlow):
"""Handle a WattTime options flow."""
+ def __init__(self, entry: ConfigEntry) -> None:
+ """Initialize."""
+ self.entry = entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
@@ -256,7 +258,7 @@ class WattTimeOptionsFlowHandler(OptionsFlow):
{
vol.Required(
CONF_SHOW_ON_MAP,
- default=self.config_entry.options.get(CONF_SHOW_ON_MAP, True),
+ default=self.entry.options.get(CONF_SHOW_ON_MAP, True),
): bool
}
),
diff --git a/homeassistant/components/waze_travel_time/config_flow.py b/homeassistant/components/waze_travel_time/config_flow.py
index 6ab6a4b121c..1d75adc6c29 100644
--- a/homeassistant/components/waze_travel_time/config_flow.py
+++ b/homeassistant/components/waze_travel_time/config_flow.py
@@ -113,6 +113,10 @@ def default_options(hass: HomeAssistant) -> dict[str, str | bool | list[str]]:
class WazeOptionsFlow(OptionsFlow):
"""Handle an options flow for Waze Travel Time."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize waze options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(self, user_input=None) -> ConfigFlowResult:
"""Handle the initial step."""
if user_input is not None:
@@ -144,7 +148,7 @@ class WazeConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> WazeOptionsFlow:
"""Get the options flow for this handler."""
- return WazeOptionsFlow()
+ return WazeOptionsFlow(config_entry)
async def async_step_user(
self, user_input: dict[str, Any] | None = None
diff --git a/homeassistant/components/webostv/config_flow.py b/homeassistant/components/webostv/config_flow.py
index 45395bd282a..24bf89b24a6 100644
--- a/homeassistant/components/webostv/config_flow.py
+++ b/homeassistant/components/webostv/config_flow.py
@@ -170,6 +170,8 @@ class OptionsFlowHandler(OptionsFlow):
def __init__(self, config_entry: ConfigEntry) -> None:
"""Initialize options flow."""
+ self.config_entry = config_entry
+ self.options = config_entry.options
self.host = config_entry.data[CONF_HOST]
self.key = config_entry.data[CONF_CLIENT_SECRET]
@@ -186,8 +188,7 @@ class OptionsFlowHandler(OptionsFlow):
if not sources_list:
errors["base"] = "cannot_retrieve"
- option_sources = self.config_entry.options.get(CONF_SOURCES, [])
- sources = [s for s in option_sources if s in sources_list]
+ sources = [s for s in self.options.get(CONF_SOURCES, []) if s in sources_list]
if not sources:
sources = sources_list
diff --git a/homeassistant/components/websocket_api/http.py b/homeassistant/components/websocket_api/http.py
index e7d57aebab6..29dc6113350 100644
--- a/homeassistant/components/websocket_api/http.py
+++ b/homeassistant/components/websocket_api/http.py
@@ -36,8 +36,6 @@ from .error import Disconnect
from .messages import message_to_json_bytes
from .util import describe_request
-CLOSE_MSG_TYPES = {WSMsgType.CLOSE, WSMsgType.CLOSED, WSMsgType.CLOSING}
-
if TYPE_CHECKING:
from .connection import ActiveConnection
@@ -330,7 +328,13 @@ class WebSocketHandler:
if TYPE_CHECKING:
assert writer is not None
- send_bytes_text = partial(writer.send_frame, opcode=WSMsgType.TEXT)
+ # aiohttp 3.11.0 changed the method name from _send_frame to send_frame
+ if hasattr(writer, "send_frame"):
+ send_frame = writer.send_frame # pragma: no cover
+ else:
+ send_frame = writer._send_frame # noqa: SLF001
+
+ send_bytes_text = partial(send_frame, opcode=WSMsgType.TEXT)
auth = AuthPhase(
logger, hass, self._send_message, self._cancel, request, send_bytes_text
)
@@ -340,7 +344,7 @@ class WebSocketHandler:
try:
connection = await self._async_handle_auth_phase(auth, send_bytes_text)
self._async_increase_writer_limit(writer)
- await self._async_websocket_command_phase(connection)
+ await self._async_websocket_command_phase(connection, send_bytes_text)
except asyncio.CancelledError:
logger.debug("%s: Connection cancelled", self.description)
raise
@@ -450,7 +454,9 @@ class WebSocketHandler:
writer._limit = 2**20 # noqa: SLF001
async def _async_websocket_command_phase(
- self, connection: ActiveConnection
+ self,
+ connection: ActiveConnection,
+ send_bytes_text: Callable[[bytes], Coroutine[Any, Any, None]],
) -> None:
"""Handle the command phase of the websocket connection."""
wsock = self._wsock
@@ -461,26 +467,24 @@ class WebSocketHandler:
# Command phase
while not wsock.closed:
msg = await wsock.receive()
- msg_type = msg.type
- msg_data = msg.data
- if msg_type in CLOSE_MSG_TYPES:
+ if msg.type in (WSMsgType.CLOSE, WSMsgType.CLOSED, WSMsgType.CLOSING):
break
- if msg_type is WSMsgType.BINARY:
- if len(msg_data) < 1:
+ if msg.type is WSMsgType.BINARY:
+ if len(msg.data) < 1:
raise Disconnect("Received invalid binary message.")
- handler = msg_data[0]
- payload = msg_data[1:]
+ handler = msg.data[0]
+ payload = msg.data[1:]
async_handle_binary(handler, payload)
continue
- if msg_type is not WSMsgType.TEXT:
+ if msg.type is not WSMsgType.TEXT:
raise Disconnect("Received non-Text message.")
try:
- command_msg_data = json_loads(msg_data)
+ command_msg_data = json_loads(msg.data)
except ValueError as ex:
raise Disconnect("Received invalid JSON.") from ex
diff --git a/homeassistant/components/weheat/manifest.json b/homeassistant/components/weheat/manifest.json
index ef89a2f1acb..d32e0ce4047 100644
--- a/homeassistant/components/weheat/manifest.json
+++ b/homeassistant/components/weheat/manifest.json
@@ -6,5 +6,5 @@
"dependencies": ["application_credentials"],
"documentation": "https://www.home-assistant.io/integrations/weheat",
"iot_class": "cloud_polling",
- "requirements": ["weheat==2024.11.02"]
+ "requirements": ["weheat==2024.09.23"]
}
diff --git a/homeassistant/components/wemo/config_flow.py b/homeassistant/components/wemo/config_flow.py
index 361c58953c5..10a9bf5604b 100644
--- a/homeassistant/components/wemo/config_flow.py
+++ b/homeassistant/components/wemo/config_flow.py
@@ -32,12 +32,16 @@ class WemoFlow(DiscoveryFlowHandler, domain=DOMAIN):
@callback
def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlow:
"""Get the options flow for this handler."""
- return WemoOptionsFlow()
+ return WemoOptionsFlow(config_entry)
class WemoOptionsFlow(OptionsFlow):
"""Options flow for the WeMo component."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/wiffi/config_flow.py b/homeassistant/components/wiffi/config_flow.py
index 308923597cd..3fcbef395e6 100644
--- a/homeassistant/components/wiffi/config_flow.py
+++ b/homeassistant/components/wiffi/config_flow.py
@@ -34,7 +34,7 @@ class WiffiFlowHandler(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> OptionsFlowHandler:
"""Create Wiffi server setup option flow."""
- return OptionsFlowHandler()
+ return OptionsFlowHandler(config_entry)
async def async_step_user(
self, user_input: dict[str, Any] | None = None
@@ -79,6 +79,10 @@ class WiffiFlowHandler(ConfigFlow, domain=DOMAIN):
class OptionsFlowHandler(OptionsFlow):
"""Wiffi server setup option flow."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize options flow."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, int] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/withings/manifest.json b/homeassistant/components/withings/manifest.json
index f9e8328ae53..a0a86be5da3 100644
--- a/homeassistant/components/withings/manifest.json
+++ b/homeassistant/components/withings/manifest.json
@@ -9,5 +9,5 @@
"iot_class": "cloud_push",
"loggers": ["aiowithings"],
"quality_scale": "platinum",
- "requirements": ["aiowithings==3.1.3"]
+ "requirements": ["aiowithings==3.1.1"]
}
diff --git a/homeassistant/components/wled/config_flow.py b/homeassistant/components/wled/config_flow.py
index 812a0500d1a..2798e0d46d1 100644
--- a/homeassistant/components/wled/config_flow.py
+++ b/homeassistant/components/wled/config_flow.py
@@ -12,7 +12,7 @@ from homeassistant.config_entries import (
ConfigEntry,
ConfigFlow,
ConfigFlowResult,
- OptionsFlow,
+ OptionsFlowWithConfigEntry,
)
from homeassistant.const import CONF_HOST, CONF_MAC
from homeassistant.core import callback
@@ -30,11 +30,9 @@ class WLEDFlowHandler(ConfigFlow, domain=DOMAIN):
@staticmethod
@callback
- def async_get_options_flow(
- config_entry: ConfigEntry,
- ) -> WLEDOptionsFlowHandler:
+ def async_get_options_flow(config_entry: ConfigEntry) -> WLEDOptionsFlowHandler:
"""Get the options flow for this handler."""
- return WLEDOptionsFlowHandler()
+ return WLEDOptionsFlowHandler(config_entry)
async def async_step_user(
self, user_input: dict[str, Any] | None = None
@@ -119,7 +117,7 @@ class WLEDFlowHandler(ConfigFlow, domain=DOMAIN):
return await wled.update()
-class WLEDOptionsFlowHandler(OptionsFlow):
+class WLEDOptionsFlowHandler(OptionsFlowWithConfigEntry):
"""Handle WLED options."""
async def async_step_init(
@@ -135,7 +133,7 @@ class WLEDOptionsFlowHandler(OptionsFlow):
{
vol.Optional(
CONF_KEEP_MAIN_LIGHT,
- default=self.config_entry.options.get(
+ default=self.options.get(
CONF_KEEP_MAIN_LIGHT, DEFAULT_KEEP_MAIN_LIGHT
),
): bool,
diff --git a/homeassistant/components/wled/coordinator.py b/homeassistant/components/wled/coordinator.py
index 8e2855e9f05..cb39fde5e5a 100644
--- a/homeassistant/components/wled/coordinator.py
+++ b/homeassistant/components/wled/coordinator.py
@@ -49,7 +49,6 @@ class WLEDDataUpdateCoordinator(DataUpdateCoordinator[WLEDDevice]):
super().__init__(
hass,
LOGGER,
- config_entry=entry,
name=DOMAIN,
update_interval=SCAN_INTERVAL,
)
@@ -134,7 +133,6 @@ class WLEDReleasesDataUpdateCoordinator(DataUpdateCoordinator[Releases]):
super().__init__(
hass,
LOGGER,
- config_entry=None,
name=DOMAIN,
update_interval=RELEASES_SCAN_INTERVAL,
)
diff --git a/homeassistant/components/workday/config_flow.py b/homeassistant/components/workday/config_flow.py
index 4d93fccb1a7..2552fe849e2 100644
--- a/homeassistant/components/workday/config_flow.py
+++ b/homeassistant/components/workday/config_flow.py
@@ -12,7 +12,7 @@ from homeassistant.config_entries import (
ConfigEntry,
ConfigFlow,
ConfigFlowResult,
- OptionsFlow,
+ OptionsFlowWithConfigEntry,
)
from homeassistant.const import CONF_COUNTRY, CONF_LANGUAGE, CONF_NAME
from homeassistant.core import callback
@@ -219,7 +219,7 @@ class WorkdayConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> WorkdayOptionsFlowHandler:
"""Get the options flow for this handler."""
- return WorkdayOptionsFlowHandler()
+ return WorkdayOptionsFlowHandler(config_entry)
async def async_step_user(
self, user_input: dict[str, Any] | None = None
@@ -310,7 +310,7 @@ class WorkdayConfigFlow(ConfigFlow, domain=DOMAIN):
)
-class WorkdayOptionsFlowHandler(OptionsFlow):
+class WorkdayOptionsFlowHandler(OptionsFlowWithConfigEntry):
"""Handle Workday options."""
async def async_step_init(
@@ -320,7 +320,7 @@ class WorkdayOptionsFlowHandler(OptionsFlow):
errors: dict[str, str] = {}
if user_input is not None:
- combined_input: dict[str, Any] = {**self.config_entry.options, **user_input}
+ combined_input: dict[str, Any] = {**self.options, **user_input}
if CONF_PROVINCE not in user_input:
# Province not present, delete old value (if present) too
combined_input.pop(CONF_PROVINCE, None)
@@ -340,7 +340,7 @@ class WorkdayOptionsFlowHandler(OptionsFlow):
else:
LOGGER.debug("abort_check in options with %s", combined_input)
abort_match = {
- CONF_COUNTRY: self.config_entry.options.get(CONF_COUNTRY),
+ CONF_COUNTRY: self._config_entry.options.get(CONF_COUNTRY),
CONF_EXCLUDES: combined_input[CONF_EXCLUDES],
CONF_OFFSET: combined_input[CONF_OFFSET],
CONF_WORKDAYS: combined_input[CONF_WORKDAYS],
@@ -357,22 +357,23 @@ class WorkdayOptionsFlowHandler(OptionsFlow):
else:
return self.async_create_entry(data=combined_input)
- options = self.config_entry.options
schema: vol.Schema = await self.hass.async_add_executor_job(
add_province_and_language_to_schema,
DATA_SCHEMA_OPT,
- options.get(CONF_COUNTRY),
+ self.options.get(CONF_COUNTRY),
)
- new_schema = self.add_suggested_values_to_schema(schema, user_input or options)
+ new_schema = self.add_suggested_values_to_schema(
+ schema, user_input or self.options
+ )
LOGGER.debug("Errors have occurred in options %s", errors)
return self.async_show_form(
step_id="init",
data_schema=new_schema,
errors=errors,
description_placeholders={
- "name": options[CONF_NAME],
- "country": options.get(CONF_COUNTRY),
+ "name": self.options[CONF_NAME],
+ "country": self.options.get(CONF_COUNTRY),
},
)
diff --git a/homeassistant/components/ws66i/config_flow.py b/homeassistant/components/ws66i/config_flow.py
index 120b7738d2e..9f6f4ca59c2 100644
--- a/homeassistant/components/ws66i/config_flow.py
+++ b/homeassistant/components/ws66i/config_flow.py
@@ -130,7 +130,7 @@ class WS66iConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> Ws66iOptionsFlowHandler:
"""Define the config flow to handle options."""
- return Ws66iOptionsFlowHandler()
+ return Ws66iOptionsFlowHandler(config_entry)
@callback
@@ -145,6 +145,10 @@ def _key_for_source(
class Ws66iOptionsFlowHandler(OptionsFlow):
"""Handle a WS66i options flow."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, str] | None = None
) -> ConfigFlowResult:
diff --git a/homeassistant/components/xiaomi_miio/config_flow.py b/homeassistant/components/xiaomi_miio/config_flow.py
index b068f4a1e61..7fc84c26235 100644
--- a/homeassistant/components/xiaomi_miio/config_flow.py
+++ b/homeassistant/components/xiaomi_miio/config_flow.py
@@ -63,6 +63,10 @@ DEVICE_CLOUD_CONFIG = vol.Schema(
class OptionsFlowHandler(OptionsFlow):
"""Options for the component."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Init object."""
+ self.config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
@@ -118,7 +122,7 @@ class XiaomiMiioFlowHandler(ConfigFlow, domain=DOMAIN):
@callback
def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlowHandler:
"""Get the options flow."""
- return OptionsFlowHandler()
+ return OptionsFlowHandler(config_entry)
async def async_step_reauth(
self, entry_data: Mapping[str, Any]
diff --git a/homeassistant/components/yale_smart_alarm/config_flow.py b/homeassistant/components/yale_smart_alarm/config_flow.py
index c71b7b33a08..7b68a1f5dab 100644
--- a/homeassistant/components/yale_smart_alarm/config_flow.py
+++ b/homeassistant/components/yale_smart_alarm/config_flow.py
@@ -23,8 +23,10 @@ from .const import (
CONF_AREA_ID,
CONF_LOCK_CODE_DIGITS,
DEFAULT_AREA_ID,
+ DEFAULT_LOCK_CODE_DIGITS,
DEFAULT_NAME,
DOMAIN,
+ LOGGER,
YALE_BASE_ERRORS,
)
@@ -42,26 +44,6 @@ DATA_SCHEMA_AUTH = vol.Schema(
}
)
-OPTIONS_SCHEMA = vol.Schema(
- {
- vol.Optional(
- CONF_LOCK_CODE_DIGITS,
- ): int,
- }
-)
-
-
-def validate_credentials(username: str, password: str) -> dict[str, Any]:
- """Validate credentials."""
- errors: dict[str, str] = {}
- try:
- YaleSmartAlarmClient(username, password)
- except AuthenticationError:
- errors = {"base": "invalid_auth"}
- except YALE_BASE_ERRORS:
- errors = {"base": "cannot_connect"}
- return errors
-
class YaleConfigFlow(ConfigFlow, domain=DOMAIN):
"""Handle a config flow for Yale integration."""
@@ -72,7 +54,7 @@ class YaleConfigFlow(ConfigFlow, domain=DOMAIN):
@callback
def async_get_options_flow(config_entry: ConfigEntry) -> YaleOptionsFlowHandler:
"""Get the options flow for this handler."""
- return YaleOptionsFlowHandler()
+ return YaleOptionsFlowHandler(config_entry)
async def async_step_reauth(
self, entry_data: Mapping[str, Any]
@@ -84,16 +66,24 @@ class YaleConfigFlow(ConfigFlow, domain=DOMAIN):
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Dialog that informs the user that reauth is required."""
- errors: dict[str, str] = {}
+ errors = {}
if user_input is not None:
reauth_entry = self._get_reauth_entry()
username = reauth_entry.data[CONF_USERNAME]
password = user_input[CONF_PASSWORD]
- errors = await self.hass.async_add_executor_job(
- validate_credentials, username, password
- )
+ try:
+ await self.hass.async_add_executor_job(
+ YaleSmartAlarmClient, username, password
+ )
+ except AuthenticationError as error:
+ LOGGER.error("Authentication failed. Check credentials %s", error)
+ errors = {"base": "invalid_auth"}
+ except YALE_BASE_ERRORS as error:
+ LOGGER.error("Connection to API failed %s", error)
+ errors = {"base": "cannot_connect"}
+
if not errors:
return self.async_update_reload_and_abort(
reauth_entry,
@@ -106,42 +96,11 @@ class YaleConfigFlow(ConfigFlow, domain=DOMAIN):
errors=errors,
)
- async def async_step_reconfigure(
- self, user_input: dict[str, Any] | None = None
- ) -> ConfigFlowResult:
- """Handle reconfiguration of existing entry."""
- errors: dict[str, str] = {}
-
- if user_input is not None:
- reconfigure_entry = self._get_reconfigure_entry()
- username = user_input[CONF_USERNAME]
-
- errors = await self.hass.async_add_executor_job(
- validate_credentials, username, user_input[CONF_PASSWORD]
- )
- if (
- username != reconfigure_entry.unique_id
- and await self.async_set_unique_id(username)
- ):
- errors["base"] = "unique_id_exists"
- if not errors:
- return self.async_update_reload_and_abort(
- reconfigure_entry,
- unique_id=username,
- data_updates=user_input,
- )
-
- return self.async_show_form(
- step_id="reconfigure",
- data_schema=DATA_SCHEMA,
- errors=errors,
- )
-
async def async_step_user(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Handle the initial step."""
- errors: dict[str, str] = {}
+ errors = {}
if user_input is not None:
username = user_input[CONF_USERNAME]
@@ -149,9 +108,17 @@ class YaleConfigFlow(ConfigFlow, domain=DOMAIN):
name = DEFAULT_NAME
area = user_input.get(CONF_AREA_ID, DEFAULT_AREA_ID)
- errors = await self.hass.async_add_executor_job(
- validate_credentials, username, password
- )
+ try:
+ await self.hass.async_add_executor_job(
+ YaleSmartAlarmClient, username, password
+ )
+ except AuthenticationError as error:
+ LOGGER.error("Authentication failed. Check credentials %s", error)
+ errors = {"base": "invalid_auth"}
+ except YALE_BASE_ERRORS as error:
+ LOGGER.error("Connection to API failed %s", error)
+ errors = {"base": "cannot_connect"}
+
if not errors:
await self.async_set_unique_id(username)
self._abort_if_unique_id_configured()
@@ -176,18 +143,32 @@ class YaleConfigFlow(ConfigFlow, domain=DOMAIN):
class YaleOptionsFlowHandler(OptionsFlow):
"""Handle Yale options."""
+ def __init__(self, entry: ConfigEntry) -> None:
+ """Initialize Yale options flow."""
+ self.entry = entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Manage Yale options."""
+ errors: dict[str, Any] = {}
- if user_input is not None:
+ if user_input:
return self.async_create_entry(data=user_input)
return self.async_show_form(
step_id="init",
- data_schema=self.add_suggested_values_to_schema(
- OPTIONS_SCHEMA,
- self.config_entry.options,
+ data_schema=vol.Schema(
+ {
+ vol.Optional(
+ CONF_LOCK_CODE_DIGITS,
+ description={
+ "suggested_value": self.entry.options.get(
+ CONF_LOCK_CODE_DIGITS, DEFAULT_LOCK_CODE_DIGITS
+ )
+ },
+ ): int,
+ }
),
+ errors=errors,
)
diff --git a/homeassistant/components/yale_smart_alarm/strings.json b/homeassistant/components/yale_smart_alarm/strings.json
index 7f940e1139e..cc837d7b7d7 100644
--- a/homeassistant/components/yale_smart_alarm/strings.json
+++ b/homeassistant/components/yale_smart_alarm/strings.json
@@ -2,13 +2,11 @@
"config": {
"abort": {
"already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
- "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
- "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]"
+ "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
},
"error": {
"invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
- "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
- "unique_id_exists": "Another config entry with this username already exist"
+ "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
},
"step": {
"user": {
@@ -23,13 +21,6 @@
"data": {
"password": "[%key:common::config_flow::data::password%]"
}
- },
- "reconfigure": {
- "data": {
- "username": "[%key:common::config_flow::data::username%]",
- "password": "[%key:common::config_flow::data::password%]",
- "area_id": "[%key:component::yale_smart_alarm::config::step::user::data::area_id%]"
- }
}
}
},
diff --git a/homeassistant/components/yalexs_ble/config_flow.py b/homeassistant/components/yalexs_ble/config_flow.py
index 6de74759686..191ef5a20b2 100644
--- a/homeassistant/components/yalexs_ble/config_flow.py
+++ b/homeassistant/components/yalexs_ble/config_flow.py
@@ -312,12 +312,16 @@ class YalexsConfigFlow(ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> YaleXSBLEOptionsFlowHandler:
"""Get the options flow for this handler."""
- return YaleXSBLEOptionsFlowHandler()
+ return YaleXSBLEOptionsFlowHandler(config_entry)
class YaleXSBLEOptionsFlowHandler(OptionsFlow):
"""Handle YaleXSBLE options."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize YaleXSBLE options flow."""
+ self.entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
@@ -339,9 +343,7 @@ class YaleXSBLEOptionsFlowHandler(OptionsFlow):
{
vol.Optional(
CONF_ALWAYS_CONNECTED,
- default=self.config_entry.options.get(
- CONF_ALWAYS_CONNECTED, False
- ),
+ default=self.entry.options.get(CONF_ALWAYS_CONNECTED, False),
): bool,
}
),
diff --git a/homeassistant/components/yeelight/config_flow.py b/homeassistant/components/yeelight/config_flow.py
index 7a3a0a2f100..5438414ea61 100644
--- a/homeassistant/components/yeelight/config_flow.py
+++ b/homeassistant/components/yeelight/config_flow.py
@@ -58,11 +58,9 @@ class YeelightConfigFlow(ConfigFlow, domain=DOMAIN):
@staticmethod
@callback
- def async_get_options_flow(
- config_entry: ConfigEntry,
- ) -> OptionsFlowHandler:
+ def async_get_options_flow(config_entry: ConfigEntry) -> OptionsFlowHandler:
"""Return the options flow."""
- return OptionsFlowHandler()
+ return OptionsFlowHandler(config_entry)
def __init__(self) -> None:
"""Initialize the config flow."""
@@ -298,12 +296,16 @@ class YeelightConfigFlow(ConfigFlow, domain=DOMAIN):
class OptionsFlowHandler(OptionsFlow):
"""Handle a option flow for Yeelight."""
+ def __init__(self, config_entry: ConfigEntry) -> None:
+ """Initialize the option flow."""
+ self._config_entry = config_entry
+
async def async_step_init(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Handle the initial step."""
- data = self.config_entry.data
- options = self.config_entry.options
+ data = self._config_entry.data
+ options = self._config_entry.options
detected_model = data.get(CONF_DETECTED_MODEL)
model = options[CONF_MODEL] or detected_model
diff --git a/homeassistant/components/youtube/config_flow.py b/homeassistant/components/youtube/config_flow.py
index 48336422585..8d6c7753282 100644
--- a/homeassistant/components/youtube/config_flow.py
+++ b/homeassistant/components/youtube/config_flow.py
@@ -15,7 +15,7 @@ from homeassistant.config_entries import (
SOURCE_REAUTH,
ConfigEntry,
ConfigFlowResult,
- OptionsFlow,
+ OptionsFlowWithConfigEntry,
)
from homeassistant.const import CONF_ACCESS_TOKEN, CONF_TOKEN
from homeassistant.core import callback
@@ -54,7 +54,7 @@ class OAuth2FlowHandler(
config_entry: ConfigEntry,
) -> YouTubeOptionsFlowHandler:
"""Get the options flow for this handler."""
- return YouTubeOptionsFlowHandler()
+ return YouTubeOptionsFlowHandler(config_entry)
@property
def logger(self) -> logging.Logger:
@@ -159,7 +159,7 @@ class OAuth2FlowHandler(
)
-class YouTubeOptionsFlowHandler(OptionsFlow):
+class YouTubeOptionsFlowHandler(OptionsFlowWithConfigEntry):
"""YouTube Options flow handler."""
async def async_step_init(
@@ -194,6 +194,6 @@ class YouTubeOptionsFlowHandler(OptionsFlow):
),
}
),
- self.config_entry.options,
+ self.options,
),
)
diff --git a/homeassistant/components/zeroconf/usage.py b/homeassistant/components/zeroconf/usage.py
index 8ddfdbd592d..b9d51cd3c36 100644
--- a/homeassistant/components/zeroconf/usage.py
+++ b/homeassistant/components/zeroconf/usage.py
@@ -4,7 +4,7 @@ from typing import Any
import zeroconf
-from homeassistant.helpers.frame import ReportBehavior, report_usage
+from homeassistant.helpers.frame import report
from .models import HaZeroconf
@@ -16,14 +16,14 @@ def install_multiple_zeroconf_catcher(hass_zc: HaZeroconf) -> None:
"""
def new_zeroconf_new(self: zeroconf.Zeroconf, *k: Any, **kw: Any) -> HaZeroconf:
- report_usage(
+ report(
(
"attempted to create another Zeroconf instance. Please use the shared"
" Zeroconf via await"
" homeassistant.components.zeroconf.async_get_instance(hass)"
),
exclude_integrations={"zeroconf"},
- core_behavior=ReportBehavior.LOG,
+ error_if_core=False,
)
return hass_zc
diff --git a/homeassistant/components/zha/config_flow.py b/homeassistant/components/zha/config_flow.py
index f3f7f38772d..20eb006eb74 100644
--- a/homeassistant/components/zha/config_flow.py
+++ b/homeassistant/components/zha/config_flow.py
@@ -33,7 +33,6 @@ from homeassistant.config_entries import (
from homeassistant.const import CONF_NAME
from homeassistant.core import HomeAssistant, callback
from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.hassio import is_hassio
from homeassistant.helpers.selector import FileSelector, FileSelectorConfig
from homeassistant.util import dt as dt_util
@@ -105,26 +104,25 @@ async def list_serial_ports(hass: HomeAssistant) -> list[ListPortInfo]:
yellow_radio.description = "Yellow Zigbee module"
yellow_radio.manufacturer = "Nabu Casa"
- if is_hassio(hass):
- # Present the multi-PAN addon as a setup option, if it's available
- multipan_manager = (
- await silabs_multiprotocol_addon.get_multiprotocol_addon_manager(hass)
+ # Present the multi-PAN addon as a setup option, if it's available
+ multipan_manager = await silabs_multiprotocol_addon.get_multiprotocol_addon_manager(
+ hass
+ )
+
+ try:
+ addon_info = await multipan_manager.async_get_addon_info()
+ except (AddonError, KeyError):
+ addon_info = None
+
+ if addon_info is not None and addon_info.state != AddonState.NOT_INSTALLED:
+ addon_port = ListPortInfo(
+ device=silabs_multiprotocol_addon.get_zigbee_socket(),
+ skip_link_detection=True,
)
- try:
- addon_info = await multipan_manager.async_get_addon_info()
- except (AddonError, KeyError):
- addon_info = None
-
- if addon_info is not None and addon_info.state != AddonState.NOT_INSTALLED:
- addon_port = ListPortInfo(
- device=silabs_multiprotocol_addon.get_zigbee_socket(),
- skip_link_detection=True,
- )
-
- addon_port.description = "Multiprotocol add-on"
- addon_port.manufacturer = "Nabu Casa"
- ports.append(addon_port)
+ addon_port.description = "Multiprotocol add-on"
+ addon_port.manufacturer = "Nabu Casa"
+ ports.append(addon_port)
return ports
@@ -682,6 +680,8 @@ class ZhaOptionsFlowHandler(BaseZhaFlow, OptionsFlow):
def __init__(self, config_entry: ConfigEntry) -> None:
"""Initialize options flow."""
super().__init__()
+ self.config_entry = config_entry
+
self._radio_mgr.device_path = config_entry.data[CONF_DEVICE][CONF_DEVICE_PATH]
self._radio_mgr.device_settings = config_entry.data[CONF_DEVICE]
self._radio_mgr.radio_type = RadioType[config_entry.data[CONF_RADIO_TYPE]]
diff --git a/homeassistant/components/zwave_js/api.py b/homeassistant/components/zwave_js/api.py
index bd49e85b601..6eb54afb51a 100644
--- a/homeassistant/components/zwave_js/api.py
+++ b/homeassistant/components/zwave_js/api.py
@@ -43,7 +43,6 @@ from zwave_js_server.model.controller.firmware import (
ControllerFirmwareUpdateResult,
)
from zwave_js_server.model.driver import Driver
-from zwave_js_server.model.endpoint import Endpoint
from zwave_js_server.model.log_config import LogConfig
from zwave_js_server.model.log_message import LogMessage
from zwave_js_server.model.node import Node, NodeStatistics
@@ -56,7 +55,6 @@ from zwave_js_server.model.utils import (
async_parse_qr_code_string,
async_try_parse_dsk_from_qr_code_string,
)
-from zwave_js_server.model.value import ConfigurationValueFormat
from zwave_js_server.util.node import async_set_config_parameter
from homeassistant.components import websocket_api
@@ -77,11 +75,6 @@ from homeassistant.helpers.dispatcher import async_dispatcher_connect
from .config_validation import BITMASK_SCHEMA
from .const import (
- ATTR_COMMAND_CLASS,
- ATTR_ENDPOINT,
- ATTR_METHOD_NAME,
- ATTR_PARAMETERS,
- ATTR_WAIT_FOR_RESULT,
CONF_DATA_COLLECTION_OPTED_IN,
DATA_CLIENT,
EVENT_DEVICE_ADDED_TO_REGISTRY,
@@ -107,8 +100,6 @@ PROPERTY = "property"
PROPERTY_KEY = "property_key"
ENDPOINT = "endpoint"
VALUE = "value"
-VALUE_SIZE = "value_size"
-VALUE_FORMAT = "value_format"
# constants for log config commands
CONFIG = "config"
@@ -419,8 +410,6 @@ def async_register_api(hass: HomeAssistant) -> None:
websocket_api.async_register_command(hass, websocket_rebuild_node_routes)
websocket_api.async_register_command(hass, websocket_set_config_parameter)
websocket_api.async_register_command(hass, websocket_get_config_parameters)
- websocket_api.async_register_command(hass, websocket_get_raw_config_parameter)
- websocket_api.async_register_command(hass, websocket_set_raw_config_parameter)
websocket_api.async_register_command(hass, websocket_subscribe_log_updates)
websocket_api.async_register_command(hass, websocket_update_log_config)
websocket_api.async_register_command(hass, websocket_get_log_config)
@@ -448,8 +437,6 @@ def async_register_api(hass: HomeAssistant) -> None:
)
websocket_api.async_register_command(hass, websocket_subscribe_node_statistics)
websocket_api.async_register_command(hass, websocket_hard_reset_controller)
- websocket_api.async_register_command(hass, websocket_node_capabilities)
- websocket_api.async_register_command(hass, websocket_invoke_cc_api)
hass.http.register_view(FirmwareUploadView(dr.async_get(hass)))
@@ -1765,72 +1752,6 @@ async def websocket_get_config_parameters(
)
-@websocket_api.require_admin
-@websocket_api.websocket_command(
- {
- vol.Required(TYPE): "zwave_js/set_raw_config_parameter",
- vol.Required(DEVICE_ID): str,
- vol.Required(PROPERTY): int,
- vol.Required(VALUE): int,
- vol.Required(VALUE_SIZE): vol.All(vol.Coerce(int), vol.Range(min=1, max=4)),
- vol.Required(VALUE_FORMAT): vol.Coerce(ConfigurationValueFormat),
- }
-)
-@websocket_api.async_response
-@async_handle_failed_command
-@async_get_node
-async def websocket_set_raw_config_parameter(
- hass: HomeAssistant,
- connection: ActiveConnection,
- msg: dict[str, Any],
- node: Node,
-) -> None:
- """Set a custom config parameter value for a Z-Wave node."""
- result = await node.async_set_raw_config_parameter_value(
- msg[VALUE],
- msg[PROPERTY],
- value_size=msg[VALUE_SIZE],
- value_format=msg[VALUE_FORMAT],
- )
-
- connection.send_result(
- msg[ID],
- {
- STATUS: result.status,
- },
- )
-
-
-@websocket_api.require_admin
-@websocket_api.websocket_command(
- {
- vol.Required(TYPE): "zwave_js/get_raw_config_parameter",
- vol.Required(DEVICE_ID): str,
- vol.Required(PROPERTY): int,
- }
-)
-@websocket_api.async_response
-@async_handle_failed_command
-@async_get_node
-async def websocket_get_raw_config_parameter(
- hass: HomeAssistant,
- connection: ActiveConnection,
- msg: dict[str, Any],
- node: Node,
-) -> None:
- """Get a custom config parameter value for a Z-Wave node."""
- value = await node.async_get_raw_config_parameter_value(
- msg[PROPERTY],
- )
-
- connection.send_result(
- msg[ID],
- {
- VALUE: value,
- },
- )
-
-
def filename_is_present_if_logging_to_file(obj: dict) -> dict:
"""Validate that filename is provided if log_to_file is True."""
if obj.get(LOG_TO_FILE, False) and FILENAME not in obj:
@@ -2604,81 +2525,3 @@ async def websocket_hard_reset_controller(
)
]
await driver.async_hard_reset()
-
-
-@websocket_api.websocket_command(
- {
- vol.Required(TYPE): "zwave_js/node_capabilities",
- vol.Required(DEVICE_ID): str,
- }
-)
-@websocket_api.async_response
-@async_handle_failed_command
-@async_get_node
-async def websocket_node_capabilities(
- hass: HomeAssistant,
- connection: ActiveConnection,
- msg: dict[str, Any],
- node: Node,
-) -> None:
- """Get node endpoints with their support command classes."""
- # consumers expect snake_case at the moment
- # remove that addition when consumers are updated
- connection.send_result(
- msg[ID],
- {
- idx: [
- command_class.to_dict() | {"is_secure": command_class.is_secure}
- for command_class in endpoint.command_classes
- ]
- for idx, endpoint in node.endpoints.items()
- },
- )
-
-
-@websocket_api.require_admin
-@websocket_api.websocket_command(
- {
- vol.Required(TYPE): "zwave_js/invoke_cc_api",
- vol.Required(DEVICE_ID): str,
- vol.Required(ATTR_COMMAND_CLASS): vol.All(
- vol.Coerce(int), vol.Coerce(CommandClass)
- ),
- vol.Optional(ATTR_ENDPOINT): vol.Coerce(int),
- vol.Required(ATTR_METHOD_NAME): cv.string,
- vol.Required(ATTR_PARAMETERS): list,
- vol.Optional(ATTR_WAIT_FOR_RESULT): cv.boolean,
- }
-)
-@websocket_api.async_response
-@async_handle_failed_command
-@async_get_node
-async def websocket_invoke_cc_api(
- hass: HomeAssistant,
- connection: ActiveConnection,
- msg: dict[str, Any],
- node: Node,
-) -> None:
- """Call invokeCCAPI on the node or provided endpoint."""
- command_class: CommandClass = msg[ATTR_COMMAND_CLASS]
- method_name: str = msg[ATTR_METHOD_NAME]
- parameters: list[Any] = msg[ATTR_PARAMETERS]
-
- node_or_endpoint: Node | Endpoint = node
- if (endpoint := msg.get(ATTR_ENDPOINT)) is not None:
- node_or_endpoint = node.endpoints[endpoint]
-
- try:
- result = await node_or_endpoint.async_invoke_cc_api(
- command_class,
- method_name,
- *parameters,
- wait_for_result=msg.get(ATTR_WAIT_FOR_RESULT, False),
- )
- except BaseZwaveJSServerError as err:
- connection.send_error(msg[ID], err.__class__.__name__, str(err))
- else:
- connection.send_result(
- msg[ID],
- result,
- )
diff --git a/homeassistant/components/zwave_js/config_flow.py b/homeassistant/components/zwave_js/config_flow.py
index 36f208e18d5..7eb887c8dcf 100644
--- a/homeassistant/components/zwave_js/config_flow.py
+++ b/homeassistant/components/zwave_js/config_flow.py
@@ -366,7 +366,7 @@ class ZWaveJSConfigFlow(BaseZwaveJSFlow, ConfigFlow, domain=DOMAIN):
config_entry: ConfigEntry,
) -> OptionsFlowHandler:
"""Return the options flow."""
- return OptionsFlowHandler()
+ return OptionsFlowHandler(config_entry)
async def async_step_user(
self, user_input: dict[str, Any] | None = None
@@ -725,9 +725,10 @@ class ZWaveJSConfigFlow(BaseZwaveJSFlow, ConfigFlow, domain=DOMAIN):
class OptionsFlowHandler(BaseZwaveJSFlow, OptionsFlow):
"""Handle an options flow for Z-Wave JS."""
- def __init__(self) -> None:
+ def __init__(self, config_entry: ConfigEntry) -> None:
"""Set up the options flow."""
super().__init__()
+ self.config_entry = config_entry
self.original_addon_config: dict[str, Any] | None = None
self.revert_reason: str | None = None
diff --git a/homeassistant/components/zwave_js/manifest.json b/homeassistant/components/zwave_js/manifest.json
index 3631bf1163b..a37b3560526 100644
--- a/homeassistant/components/zwave_js/manifest.json
+++ b/homeassistant/components/zwave_js/manifest.json
@@ -10,7 +10,7 @@
"iot_class": "local_push",
"loggers": ["zwave_js_server"],
"quality_scale": "platinum",
- "requirements": ["pyserial==3.5", "zwave-js-server-python==0.59.1"],
+ "requirements": ["pyserial==3.5", "zwave-js-server-python==0.58.1"],
"usb": [
{
"vid": "0658",
diff --git a/homeassistant/components/zwave_js/services.py b/homeassistant/components/zwave_js/services.py
index d1cb66ceafc..969a235bb41 100644
--- a/homeassistant/components/zwave_js/services.py
+++ b/homeassistant/components/zwave_js/services.py
@@ -529,15 +529,8 @@ class ZWaveServices:
for node_or_endpoint, result in get_valid_responses_from_results(
nodes_or_endpoints_list, _results
):
- if value_size is None:
- # async_set_config_parameter still returns (Value, SetConfigParameterResult)
- zwave_value = result[0]
- cmd_status = result[1]
- else:
- # async_set_raw_config_parameter_value now returns just SetConfigParameterResult
- cmd_status = result
- zwave_value = f"parameter {property_or_property_name}"
-
+ zwave_value = result[0]
+ cmd_status = result[1]
if cmd_status.status == CommandStatus.ACCEPTED:
msg = "Set configuration parameter %s on Node %s with value %s"
else:
diff --git a/homeassistant/components/zwave_js/services.yaml b/homeassistant/components/zwave_js/services.yaml
index acf6e9a0665..f5063fdfd93 100644
--- a/homeassistant/components/zwave_js/services.yaml
+++ b/homeassistant/components/zwave_js/services.yaml
@@ -51,6 +51,16 @@ set_lock_configuration:
min: 0
max: 65535
unit_of_measurement: sec
+ outside_handles_can_open_door_configuration:
+ required: false
+ example: [true, true, true, false]
+ selector:
+ object:
+ inside_handles_can_open_door_configuration:
+ required: false
+ example: [true, true, true, false]
+ selector:
+ object:
auto_relock_time:
required: false
example: 1
diff --git a/homeassistant/components/zwave_js/strings.json b/homeassistant/components/zwave_js/strings.json
index 28789bbf9f4..ca7d5153e6e 100644
--- a/homeassistant/components/zwave_js/strings.json
+++ b/homeassistant/components/zwave_js/strings.json
@@ -523,6 +523,10 @@
"description": "Duration in seconds the latch stays retracted.",
"name": "Hold and release time"
},
+ "inside_handles_can_open_door_configuration": {
+ "description": "A list of four booleans which indicate which inside handles can open the door.",
+ "name": "Inside handles can open door configuration"
+ },
"lock_timeout": {
"description": "Seconds until lock mode times out. Should only be used if operation type is `timed`.",
"name": "Lock timeout"
@@ -531,6 +535,10 @@
"description": "The operation type of the lock.",
"name": "Operation Type"
},
+ "outside_handles_can_open_door_configuration": {
+ "description": "A list of four booleans which indicate which outside handles can open the door.",
+ "name": "Outside handles can open door configuration"
+ },
"twist_assist": {
"description": "Enable Twist Assist.",
"name": "Twist assist"
diff --git a/homeassistant/config_entries.py b/homeassistant/config_entries.py
index f1748c6b7fb..9b5ffcf6fad 100644
--- a/homeassistant/config_entries.py
+++ b/homeassistant/config_entries.py
@@ -63,7 +63,7 @@ from .helpers.event import (
RANDOM_MICROSECOND_MIN,
async_call_later,
)
-from .helpers.frame import ReportBehavior, report, report_usage
+from .helpers.frame import report
from .helpers.json import json_bytes, json_bytes_sorted, json_fragment
from .helpers.typing import UNDEFINED, ConfigType, DiscoveryInfoType, UndefinedType
from .loader import async_suggest_report_issue
@@ -1260,22 +1260,11 @@ class ConfigEntriesFlowManager(
if not context or "source" not in context:
raise KeyError("Context not set or doesn't have a source set")
- # reauth/reconfigure flows should be linked to a config entry
- if (source := context["source"]) in {
- SOURCE_REAUTH,
- SOURCE_RECONFIGURE,
- } and "entry_id" not in context:
- # Deprecated in 2024.12, should fail in 2025.12
- report(
- f"initialises a {source} flow without a link to the config entry",
- error_if_integration=False,
- error_if_core=True,
- )
-
flow_id = ulid_util.ulid_now()
# Avoid starting a config flow on an integration that only supports
# a single config entry, but which already has an entry
+ source = context["source"]
if (
source not in {SOURCE_IGNORE, SOURCE_REAUTH, SOURCE_RECONFIGURE}
and (
@@ -1297,7 +1286,7 @@ class ConfigEntriesFlowManager(
loop = self.hass.loop
- if source == SOURCE_IMPORT:
+ if context["source"] == SOURCE_IMPORT:
self._pending_import_flows[handler][flow_id] = loop.create_future()
cancel_init_future = loop.create_future()
@@ -1507,14 +1496,10 @@ class ConfigEntriesFlowManager(
version=result["version"],
)
- if existing_entry is not None:
- # Unload and remove the existing entry
- await self.config_entries._async_remove(existing_entry.entry_id) # noqa: SLF001
await self.config_entries.async_add(entry)
if existing_entry is not None:
- # Clean up devices and entities belonging to the existing entry
- self.config_entries._async_clean_up(existing_entry) # noqa: SLF001
+ await self.config_entries.async_remove(existing_entry.entry_id)
result["result"] = entry
return result
@@ -1904,21 +1889,7 @@ class ConfigEntries:
self._async_schedule_save()
async def async_remove(self, entry_id: str) -> dict[str, Any]:
- """Remove, unload and clean up after an entry."""
- unload_success, entry = await self._async_remove(entry_id)
- self._async_clean_up(entry)
-
- for discovery_domain in entry.discovery_keys:
- async_dispatcher_send_internal(
- self.hass,
- signal_discovered_config_entry_removed(discovery_domain),
- entry,
- )
-
- return {"require_restart": not unload_success}
-
- async def _async_remove(self, entry_id: str) -> tuple[bool, ConfigEntry]:
- """Remove and unload an entry."""
+ """Remove an entry."""
if (entry := self.async_get_entry(entry_id)) is None:
raise UnknownEntry
@@ -1934,13 +1905,6 @@ class ConfigEntries:
self.async_update_issues()
self._async_schedule_save()
- return (unload_success, entry)
-
- @callback
- def _async_clean_up(self, entry: ConfigEntry) -> None:
- """Clean up after an entry."""
- entry_id = entry.entry_id
-
dev_reg = device_registry.async_get(self.hass)
ent_reg = entity_registry.async_get(self.hass)
@@ -1959,6 +1923,13 @@ class ConfigEntries:
ir.async_delete_issue(self.hass, HOMEASSISTANT_DOMAIN, issue_id)
self._async_dispatch(ConfigEntryChange.REMOVED, entry)
+ for discovery_domain in entry.discovery_keys:
+ async_dispatcher_send_internal(
+ self.hass,
+ signal_discovered_config_entry_removed(discovery_domain),
+ entry,
+ )
+ return {"require_restart": not unload_success}
@callback
def _async_shutdown(self, event: Event) -> None:
@@ -2176,12 +2147,7 @@ class ConfigEntries:
if unique_id is not UNDEFINED and entry.unique_id != unique_id:
# Deprecated in 2024.11, should fail in 2025.11
if (
- # flipr creates duplicates during migration, and asks users to
- # remove the duplicate. We don't need warn about it here too.
- # We should remove the special case for "flipr" in HA Core 2025.4,
- # when the flipr migration period ends
- entry.domain != "flipr"
- and unique_id is not None
+ unique_id is not None
and self.async_entry_for_domain_unique_id(entry.domain, unique_id)
is not None
):
@@ -2459,24 +2425,7 @@ class ConfigEntries:
issues.add(issue.issue_id)
for domain, unique_ids in self._entries._domain_unique_id_index.items(): # noqa: SLF001
- # flipr creates duplicates during migration, and asks users to
- # remove the duplicate. We don't need warn about it here too.
- # We should remove the special case for "flipr" in HA Core 2025.4,
- # when the flipr migration period ends
- if domain == "flipr":
- continue
for unique_id, entries in unique_ids.items():
- # We might mutate the list of entries, so we need a copy to not mess up
- # the index
- entries = list(entries)
-
- # There's no need to raise an issue for ignored entries, we can
- # safely remove them once we no longer allow unique id collisions.
- # Iterate over a copy of the copy to allow mutating while iterating
- for entry in list(entries):
- if entry.source == SOURCE_IGNORE:
- entries.remove(entry)
-
if len(entries) < 2:
continue
issue_id = f"{ISSUE_UNIQUE_ID_COLLISION}_{domain}_{unique_id}"
@@ -3102,9 +3051,6 @@ class OptionsFlow(ConfigEntryBaseFlow):
handler: str
- _config_entry: ConfigEntry
- """For compatibility only - to be removed in 2025.12"""
-
@callback
def _async_abort_entries_match(
self, match_dict: dict[str, Any] | None = None
@@ -3113,78 +3059,32 @@ class OptionsFlow(ConfigEntryBaseFlow):
Requires `already_configured` in strings.json in user visible flows.
"""
+
+ config_entry = cast(
+ ConfigEntry, self.hass.config_entries.async_get_entry(self.handler)
+ )
_async_abort_entries_match(
[
entry
- for entry in self.hass.config_entries.async_entries(
- self.config_entry.domain
- )
- if entry is not self.config_entry and entry.source != SOURCE_IGNORE
+ for entry in self.hass.config_entries.async_entries(config_entry.domain)
+ if entry is not config_entry and entry.source != SOURCE_IGNORE
],
match_dict,
)
- @property
- def _config_entry_id(self) -> str:
- """Return config entry id.
-
- Please note that this is not available inside `__init__` method, and
- can only be referenced after initialisation.
- """
- # This is the same as handler, but that's an implementation detail
- if self.handler is None:
- raise ValueError(
- "The config entry id is not available during initialisation"
- )
- return self.handler
-
- @property
- def config_entry(self) -> ConfigEntry:
- """Return the config entry linked to the current options flow.
-
- Please note that this is not available inside `__init__` method, and
- can only be referenced after initialisation.
- """
- # For compatibility only - to be removed in 2025.12
- if hasattr(self, "_config_entry"):
- return self._config_entry
-
- if self.hass is None:
- raise ValueError("The config entry is not available during initialisation")
- if entry := self.hass.config_entries.async_get_entry(self._config_entry_id):
- return entry
- raise UnknownEntry
-
- @config_entry.setter
- def config_entry(self, value: ConfigEntry) -> None:
- """Set the config entry value."""
- report_usage(
- "sets option flow config_entry explicitly, which is deprecated "
- "and will stop working in 2025.12",
- core_behavior=ReportBehavior.ERROR,
- core_integration_behavior=ReportBehavior.ERROR,
- custom_integration_behavior=ReportBehavior.LOG,
- )
- self._config_entry = value
-
class OptionsFlowWithConfigEntry(OptionsFlow):
- """Base class for options flows with config entry and options.
-
- This class is being phased out, and should not be referenced in new code.
- It is kept only for backward compatibility, and only for custom integrations.
- """
+ """Base class for options flows with config entry and options."""
def __init__(self, config_entry: ConfigEntry) -> None:
"""Initialize options flow."""
self._config_entry = config_entry
self._options = deepcopy(dict(config_entry.options))
- report_usage(
- "inherits from OptionsFlowWithConfigEntry",
- core_behavior=ReportBehavior.ERROR,
- core_integration_behavior=ReportBehavior.ERROR,
- custom_integration_behavior=ReportBehavior.IGNORE,
- )
+
+ @property
+ def config_entry(self) -> ConfigEntry:
+ """Return the config entry."""
+ return self._config_entry
@property
def options(self) -> dict[str, Any]:
diff --git a/homeassistant/const.py b/homeassistant/const.py
index 4082a076b94..af7b7768cec 100644
--- a/homeassistant/const.py
+++ b/homeassistant/const.py
@@ -24,14 +24,14 @@ if TYPE_CHECKING:
APPLICATION_NAME: Final = "HomeAssistant"
MAJOR_VERSION: Final = 2024
-MINOR_VERSION: Final = 12
-PATCH_VERSION: Final = "0.dev0"
+MINOR_VERSION: Final = 11
+PATCH_VERSION: Final = "0b9"
__short_version__: Final = f"{MAJOR_VERSION}.{MINOR_VERSION}"
__version__: Final = f"{__short_version__}.{PATCH_VERSION}"
REQUIRED_PYTHON_VER: Final[tuple[int, int, int]] = (3, 12, 0)
-REQUIRED_NEXT_PYTHON_VER: Final[tuple[int, int, int]] = (3, 13, 0)
+REQUIRED_NEXT_PYTHON_VER: Final[tuple[int, int, int]] = (3, 12, 0)
# Truthy date string triggers showing related deprecation warning messages.
-REQUIRED_NEXT_PYTHON_HA_RELEASE: Final = "2025.2"
+REQUIRED_NEXT_PYTHON_HA_RELEASE: Final = ""
# Format for platform files
PLATFORM_FORMAT: Final = "{platform}.{domain}"
@@ -725,9 +725,6 @@ class UnitOfPower(StrEnum):
WATT = "W"
KILO_WATT = "kW"
- MEGA_WATT = "MW"
- GIGA_WATT = "GW"
- TERA_WATT = "TW"
BTU_PER_HOUR = "BTU/h"
@@ -773,8 +770,6 @@ class UnitOfEnergy(StrEnum):
WATT_HOUR = "Wh"
KILO_WATT_HOUR = "kWh"
MEGA_WATT_HOUR = "MWh"
- GIGA_WATT_HOUR = "GWh"
- TERA_WATT_HOUR = "TWh"
CALORIE = "cal"
KILO_CALORIE = "kcal"
MEGA_CALORIE = "Mcal"
@@ -1358,13 +1353,6 @@ CONCENTRATION_PARTS_PER_MILLION: Final = "ppm"
CONCENTRATION_PARTS_PER_BILLION: Final = "ppb"
-class UnitOfBloodGlucoseConcentration(StrEnum):
- """Blood glucose concentration units."""
-
- MILLIGRAMS_PER_DECILITER = "mg/dL"
- MILLIMOLE_PER_LITER = "mmol/L"
-
-
# Speed units
class UnitOfSpeed(StrEnum):
"""Speed units."""
diff --git a/homeassistant/core.py b/homeassistant/core.py
index cdfb5570b44..ab852056353 100644
--- a/homeassistant/core.py
+++ b/homeassistant/core.py
@@ -656,12 +656,12 @@ class HomeAssistant:
# late import to avoid circular imports
from .helpers import frame # pylint: disable=import-outside-toplevel
- frame.report_usage(
+ frame.report(
"calls `async_add_job`, which is deprecated and will be removed in Home "
"Assistant 2025.4; Please review "
"https://developers.home-assistant.io/blog/2024/03/13/deprecate_add_run_job"
" for replacement options",
- core_behavior=frame.ReportBehavior.LOG,
+ error_if_core=False,
)
if target is None:
@@ -712,12 +712,12 @@ class HomeAssistant:
# late import to avoid circular imports
from .helpers import frame # pylint: disable=import-outside-toplevel
- frame.report_usage(
+ frame.report(
"calls `async_add_hass_job`, which is deprecated and will be removed in Home "
"Assistant 2025.5; Please review "
"https://developers.home-assistant.io/blog/2024/04/07/deprecate_add_hass_job"
" for replacement options",
- core_behavior=frame.ReportBehavior.LOG,
+ error_if_core=False,
)
return self._async_add_hass_job(hassjob, *args, background=background)
@@ -986,12 +986,12 @@ class HomeAssistant:
# late import to avoid circular imports
from .helpers import frame # pylint: disable=import-outside-toplevel
- frame.report_usage(
+ frame.report(
"calls `async_run_job`, which is deprecated and will be removed in Home "
"Assistant 2025.4; Please review "
"https://developers.home-assistant.io/blog/2024/03/13/deprecate_add_run_job"
" for replacement options",
- core_behavior=frame.ReportBehavior.LOG,
+ error_if_core=False,
)
if asyncio.iscoroutine(target):
@@ -1635,10 +1635,10 @@ class EventBus:
# late import to avoid circular imports
from .helpers import frame # pylint: disable=import-outside-toplevel
- frame.report_usage(
+ frame.report(
"calls `async_listen` with run_immediately, which is"
" deprecated and will be removed in Home Assistant 2025.5",
- core_behavior=frame.ReportBehavior.LOG,
+ error_if_core=False,
)
if event_filter is not None and not is_callback_check_partial(event_filter):
@@ -1705,10 +1705,10 @@ class EventBus:
# late import to avoid circular imports
from .helpers import frame # pylint: disable=import-outside-toplevel
- frame.report_usage(
+ frame.report(
"calls `async_listen_once` with run_immediately, which is "
"deprecated and will be removed in Home Assistant 2025.5",
- core_behavior=frame.ReportBehavior.LOG,
+ error_if_core=False,
)
one_time_listener: _OneTimeListener[_DataT] = _OneTimeListener(
diff --git a/homeassistant/core_config.py b/homeassistant/core_config.py
index 5c773c57bc4..25f745f110c 100644
--- a/homeassistant/core_config.py
+++ b/homeassistant/core_config.py
@@ -60,7 +60,7 @@ from .core import DOMAIN as HOMEASSISTANT_DOMAIN, HomeAssistant
from .generated.currencies import HISTORIC_CURRENCIES
from .helpers import config_validation as cv, issue_registry as ir
from .helpers.entity_values import EntityValues
-from .helpers.frame import ReportBehavior, report_usage
+from .helpers.frame import report
from .helpers.storage import Store
from .helpers.typing import UNDEFINED, UndefinedType
from .util import dt as dt_util, location
@@ -695,11 +695,11 @@ class Config:
It will be removed in Home Assistant 2025.6.
"""
- report_usage(
+ report(
"set the time zone using set_time_zone instead of async_set_time_zone"
" which will stop working in Home Assistant 2025.6",
- core_integration_behavior=ReportBehavior.ERROR,
- custom_integration_behavior=ReportBehavior.ERROR,
+ error_if_core=True,
+ error_if_integration=True,
)
if time_zone := dt_util.get_time_zone(time_zone_str):
self.time_zone = time_zone_str
diff --git a/homeassistant/data_entry_flow.py b/homeassistant/data_entry_flow.py
index 9d041c9b8d3..1fb6439a8c4 100644
--- a/homeassistant/data_entry_flow.py
+++ b/homeassistant/data_entry_flow.py
@@ -26,7 +26,7 @@ from .helpers.deprecation import (
check_if_deprecated_constant,
dir_with_deprecated_constants,
)
-from .helpers.frame import ReportBehavior, report_usage
+from .helpers.frame import report
from .loader import async_suggest_report_issue
from .util import uuid as uuid_util
@@ -530,12 +530,12 @@ class FlowManager(abc.ABC, Generic[_FlowContextT, _FlowResultT, _HandlerT]):
if not isinstance(result["type"], FlowResultType):
result["type"] = FlowResultType(result["type"]) # type: ignore[unreachable]
- report_usage(
+ report(
(
"does not use FlowResultType enum for data entry flow result type. "
"This is deprecated and will stop working in Home Assistant 2025.1"
),
- core_behavior=ReportBehavior.LOG,
+ error_if_core=False,
)
if (
diff --git a/homeassistant/generated/bluetooth.py b/homeassistant/generated/bluetooth.py
index a105efc2685..c4612898cb2 100644
--- a/homeassistant/generated/bluetooth.py
+++ b/homeassistant/generated/bluetooth.py
@@ -8,26 +8,6 @@ from __future__ import annotations
from typing import Final
BLUETOOTH: Final[list[dict[str, bool | str | int | list[int]]]] = [
- {
- "domain": "acaia",
- "manufacturer_id": 16962,
- },
- {
- "domain": "acaia",
- "local_name": "ACAIA*",
- },
- {
- "domain": "acaia",
- "local_name": "PYXIS-*",
- },
- {
- "domain": "acaia",
- "local_name": "LUNAR-*",
- },
- {
- "domain": "acaia",
- "local_name": "PROCHBT001",
- },
{
"domain": "airthings_ble",
"manufacturer_id": 820,
diff --git a/homeassistant/generated/config_flows.py b/homeassistant/generated/config_flows.py
index ffe61b915c6..e1694f8bc54 100644
--- a/homeassistant/generated/config_flows.py
+++ b/homeassistant/generated/config_flows.py
@@ -24,7 +24,6 @@ FLOWS = {
],
"integration": [
"abode",
- "acaia",
"accuweather",
"acmeda",
"adax",
@@ -385,14 +384,12 @@ FLOWS = {
"mpd",
"mqtt",
"mullvad",
- "music_assistant",
"mutesync",
"mysensors",
"mystrom",
"myuplink",
"nam",
"nanoleaf",
- "nasweb",
"neato",
"nest",
"netatmo",
@@ -409,7 +406,6 @@ FLOWS = {
"nina",
"nmap_tracker",
"nobo_hub",
- "nordpool",
"notion",
"nuheat",
"nuki",
@@ -538,7 +534,6 @@ FLOWS = {
"simplefin",
"simplepush",
"simplisafe",
- "sky_remote",
"skybell",
"slack",
"sleepiq",
diff --git a/homeassistant/generated/dhcp.py b/homeassistant/generated/dhcp.py
index 7dacf9a0bca..7dd13473d31 100644
--- a/homeassistant/generated/dhcp.py
+++ b/homeassistant/generated/dhcp.py
@@ -276,18 +276,6 @@ DHCP: Final[list[dict[str, str | bool]]] = [
"hostname": "polisy*",
"macaddress": "000DB9*",
},
- {
- "domain": "lamarzocco",
- "hostname": "gs[0-9][0-9][0-9][0-9][0-9][0-9]",
- },
- {
- "domain": "lamarzocco",
- "hostname": "lm[0-9][0-9][0-9][0-9][0-9][0-9]",
- },
- {
- "domain": "lamarzocco",
- "hostname": "mr[0-9][0-9][0-9][0-9][0-9][0-9]",
- },
{
"domain": "lametric",
"registered_devices": True,
@@ -379,15 +367,6 @@ DHCP: Final[list[dict[str, str | bool]]] = [
"hostname": "gateway*",
"macaddress": "F8811A*",
},
- {
- "domain": "palazzetti",
- "hostname": "connbox*",
- "macaddress": "40F3857*",
- },
- {
- "domain": "palazzetti",
- "registered_devices": True,
- },
{
"domain": "powerwall",
"hostname": "1118431-*",
diff --git a/homeassistant/generated/integrations.json b/homeassistant/generated/integrations.json
index f007db87868..3ed09c6fb9f 100644
--- a/homeassistant/generated/integrations.json
+++ b/homeassistant/generated/integrations.json
@@ -11,12 +11,6 @@
"config_flow": true,
"iot_class": "cloud_push"
},
- "acaia": {
- "name": "Acaia",
- "integration_type": "device",
- "config_flow": true,
- "iot_class": "local_push"
- },
"accuweather": {
"name": "AccuWeather",
"integration_type": "service",
@@ -3950,12 +3944,6 @@
"iot_class": "cloud_polling",
"single_config_entry": true
},
- "music_assistant": {
- "name": "Music Assistant",
- "integration_type": "hub",
- "config_flow": true,
- "iot_class": "local_push"
- },
"mutesync": {
"name": "mutesync",
"integration_type": "hub",
@@ -4022,12 +4010,6 @@
"config_flow": true,
"iot_class": "local_push"
},
- "nasweb": {
- "name": "NASweb",
- "integration_type": "hub",
- "config_flow": true,
- "iot_class": "local_push"
- },
"neato": {
"name": "Neato Botvac",
"integration_type": "hub",
@@ -4193,13 +4175,6 @@
"config_flow": true,
"iot_class": "local_push"
},
- "nordpool": {
- "name": "Nord Pool",
- "integration_type": "hub",
- "config_flow": true,
- "iot_class": "cloud_polling",
- "single_config_entry": true
- },
"norway_air": {
"name": "Om Luftkvalitet i Norge (Norway Air)",
"integration_type": "hub",
@@ -5614,22 +5589,11 @@
"config_flow": false,
"iot_class": "local_push"
},
- "sky": {
- "name": "Sky",
- "integrations": {
- "sky_hub": {
- "integration_type": "hub",
- "config_flow": false,
- "iot_class": "local_polling",
- "name": "Sky Hub"
- },
- "sky_remote": {
- "integration_type": "device",
- "config_flow": true,
- "iot_class": "assumed_state",
- "name": "Sky Remote Control"
- }
- }
+ "sky_hub": {
+ "name": "Sky Hub",
+ "integration_type": "hub",
+ "config_flow": false,
+ "iot_class": "local_polling"
},
"skybeacon": {
"name": "Skybeacon",
diff --git a/homeassistant/generated/zeroconf.py b/homeassistant/generated/zeroconf.py
index 1fbd6337fdb..eb3c1b3a105 100644
--- a/homeassistant/generated/zeroconf.py
+++ b/homeassistant/generated/zeroconf.py
@@ -639,11 +639,6 @@ ZEROCONF = {
},
},
],
- "_mass._tcp.local.": [
- {
- "domain": "music_assistant",
- },
- ],
"_matter._tcp.local.": [
{
"domain": "matter",
diff --git a/homeassistant/helpers/aiohttp_client.py b/homeassistant/helpers/aiohttp_client.py
index f01ae325875..2f4c1980468 100644
--- a/homeassistant/helpers/aiohttp_client.py
+++ b/homeassistant/helpers/aiohttp_client.py
@@ -44,13 +44,11 @@ SERVER_SOFTWARE = (
f"aiohttp/{aiohttp.__version__} Python/{sys.version_info[0]}.{sys.version_info[1]}"
)
-ENABLE_CLEANUP_CLOSED = (3, 13, 0) <= sys.version_info < (
- 3,
- 13,
- 1,
-) or sys.version_info < (3, 12, 7)
-# Cleanup closed is no longer needed after https://github.com/python/cpython/pull/118960
-# which first appeared in Python 3.12.7 and 3.13.1
+ENABLE_CLEANUP_CLOSED = not (3, 11, 1) <= sys.version_info < (3, 11, 4)
+# Enabling cleanup closed on python 3.11.1+ leaks memory relatively quickly
+# see https://github.com/aio-libs/aiohttp/issues/7252
+# aiohttp interacts poorly with https://github.com/python/cpython/pull/98540
+# The issue was fixed in 3.11.4 via https://github.com/python/cpython/pull/104485
WARN_CLOSE_MSG = "closes the Home Assistant aiohttp session"
diff --git a/homeassistant/helpers/config_validation.py b/homeassistant/helpers/config_validation.py
index 2b35ebade76..81ac10f86cc 100644
--- a/homeassistant/helpers/config_validation.py
+++ b/homeassistant/helpers/config_validation.py
@@ -719,14 +719,14 @@ def template(value: Any | None) -> template_helper.Template:
raise vol.Invalid("template value should be a string")
if not (hass := _async_get_hass_or_none()):
# pylint: disable-next=import-outside-toplevel
- from .frame import ReportBehavior, report_usage
+ from .frame import report
- report_usage(
+ report(
(
"validates schema outside the event loop, "
"which will stop working in HA Core 2025.10"
),
- core_behavior=ReportBehavior.LOG,
+ error_if_core=False,
)
template_value = template_helper.Template(str(value), hass)
@@ -748,14 +748,14 @@ def dynamic_template(value: Any | None) -> template_helper.Template:
raise vol.Invalid("template value does not contain a dynamic template")
if not (hass := _async_get_hass_or_none()):
# pylint: disable-next=import-outside-toplevel
- from .frame import ReportBehavior, report_usage
+ from .frame import report
- report_usage(
+ report(
(
"validates schema outside the event loop, "
"which will stop working in HA Core 2025.10"
),
- core_behavior=ReportBehavior.LOG,
+ error_if_core=False,
)
template_value = template_helper.Template(str(value), hass)
diff --git a/homeassistant/helpers/event.py b/homeassistant/helpers/event.py
index 61a798dbd75..02ea8103192 100644
--- a/homeassistant/helpers/event.py
+++ b/homeassistant/helpers/event.py
@@ -997,14 +997,14 @@ class TrackTemplateResultInfo:
continue
# pylint: disable-next=import-outside-toplevel
- from .frame import ReportBehavior, report_usage
+ from .frame import report
- report_usage(
+ report(
(
"calls async_track_template_result with template without hass, "
"which will stop working in HA Core 2025.10"
),
- core_behavior=ReportBehavior.LOG,
+ error_if_core=False,
)
track_template_.template.hass = hass
diff --git a/homeassistant/helpers/frame.py b/homeassistant/helpers/frame.py
index eda98099713..fd7e014b2ff 100644
--- a/homeassistant/helpers/frame.py
+++ b/homeassistant/helpers/frame.py
@@ -5,7 +5,6 @@ from __future__ import annotations
import asyncio
from collections.abc import Callable
from dataclasses import dataclass
-import enum
import functools
import linecache
import logging
@@ -145,72 +144,24 @@ def report(
If error_if_integration is True, raise instead of log if an integration is found
when unwinding the stack frame.
"""
- core_behavior = ReportBehavior.ERROR if error_if_core else ReportBehavior.LOG
- core_integration_behavior = (
- ReportBehavior.ERROR if error_if_integration else ReportBehavior.LOG
- )
- custom_integration_behavior = core_integration_behavior
-
- if log_custom_component_only:
- if core_behavior is ReportBehavior.LOG:
- core_behavior = ReportBehavior.IGNORE
- if core_integration_behavior is ReportBehavior.LOG:
- core_integration_behavior = ReportBehavior.IGNORE
-
- report_usage(
- what,
- core_behavior=core_behavior,
- core_integration_behavior=core_integration_behavior,
- custom_integration_behavior=custom_integration_behavior,
- exclude_integrations=exclude_integrations,
- level=level,
- )
-
-
-class ReportBehavior(enum.Enum):
- """Enum for behavior on code usage."""
-
- IGNORE = enum.auto()
- """Ignore the code usage."""
- LOG = enum.auto()
- """Log the code usage."""
- ERROR = enum.auto()
- """Raise an error on code usage."""
-
-
-def report_usage(
- what: str,
- *,
- core_behavior: ReportBehavior = ReportBehavior.ERROR,
- core_integration_behavior: ReportBehavior = ReportBehavior.LOG,
- custom_integration_behavior: ReportBehavior = ReportBehavior.LOG,
- exclude_integrations: set[str] | None = None,
- level: int = logging.WARNING,
-) -> None:
- """Report incorrect code usage.
-
- Similar to `report` but allows more fine-grained reporting.
- """
try:
integration_frame = get_integration_frame(
exclude_integrations=exclude_integrations
)
except MissingIntegrationFrame as err:
msg = f"Detected code that {what}. Please report this issue."
- if core_behavior is ReportBehavior.ERROR:
+ if error_if_core:
raise RuntimeError(msg) from err
- if core_behavior is ReportBehavior.LOG:
+ if not log_custom_component_only:
_LOGGER.warning(msg, stack_info=True)
return
- integration_behavior = core_integration_behavior
- if integration_frame.custom_integration:
- integration_behavior = custom_integration_behavior
-
- if integration_behavior is not ReportBehavior.IGNORE:
- _report_integration(
- what, integration_frame, level, integration_behavior is ReportBehavior.ERROR
- )
+ if (
+ error_if_integration
+ or not log_custom_component_only
+ or integration_frame.custom_integration
+ ):
+ _report_integration(what, integration_frame, level, error_if_integration)
def _report_integration(
diff --git a/homeassistant/helpers/schema_config_entry_flow.py b/homeassistant/helpers/schema_config_entry_flow.py
index af8c4c6402d..7463c9945b2 100644
--- a/homeassistant/helpers/schema_config_entry_flow.py
+++ b/homeassistant/helpers/schema_config_entry_flow.py
@@ -16,6 +16,7 @@ from homeassistant.config_entries import (
ConfigFlow,
ConfigFlowResult,
OptionsFlow,
+ OptionsFlowWithConfigEntry,
)
from homeassistant.core import HomeAssistant, callback, split_entity_id
from homeassistant.data_entry_flow import UnknownHandler
@@ -402,7 +403,7 @@ class SchemaConfigFlowHandler(ConfigFlow, ABC):
)
-class SchemaOptionsFlowHandler(OptionsFlow):
+class SchemaOptionsFlowHandler(OptionsFlowWithConfigEntry):
"""Handle a schema based options flow."""
def __init__(
@@ -421,8 +422,10 @@ class SchemaOptionsFlowHandler(OptionsFlow):
options, which is the union of stored options and user input from the options
flow steps.
"""
- self._options = copy.deepcopy(dict(config_entry.options))
- self._common_handler = SchemaCommonFlowHandler(self, options_flow, self.options)
+ super().__init__(config_entry)
+ self._common_handler = SchemaCommonFlowHandler(
+ self, options_flow, self._options
+ )
self._async_options_flow_finished = async_options_flow_finished
for step in options_flow:
@@ -435,11 +438,6 @@ class SchemaOptionsFlowHandler(OptionsFlow):
if async_setup_preview:
setattr(self, "async_setup_preview", async_setup_preview)
- @property
- def options(self) -> dict[str, Any]:
- """Return a mutable copy of the config entry options."""
- return self._options
-
@staticmethod
def _async_step(
step_id: str,
diff --git a/homeassistant/helpers/service.py b/homeassistant/helpers/service.py
index e3da52604cb..33e8f3d3d6e 100644
--- a/homeassistant/helpers/service.py
+++ b/homeassistant/helpers/service.py
@@ -1277,14 +1277,14 @@ def async_register_entity_service(
schema = cv.make_entity_service_schema(schema)
elif not cv.is_entity_service_schema(schema):
# pylint: disable-next=import-outside-toplevel
- from .frame import ReportBehavior, report_usage
+ from .frame import report
- report_usage(
+ report(
(
"registers an entity service with a non entity service schema "
"which will stop working in HA Core 2025.9"
),
- core_behavior=ReportBehavior.LOG,
+ error_if_core=False,
)
service_func: str | HassJob[..., Any]
diff --git a/homeassistant/helpers/template.py b/homeassistant/helpers/template.py
index 2eab666bbd4..753464c35d5 100644
--- a/homeassistant/helpers/template.py
+++ b/homeassistant/helpers/template.py
@@ -515,18 +515,18 @@ class Template:
will be non optional in Home Assistant Core 2025.10.
"""
# pylint: disable-next=import-outside-toplevel
- from .frame import ReportBehavior, report_usage
+ from .frame import report
if not isinstance(template, str):
raise TypeError("Expected template to be a string")
if not hass:
- report_usage(
+ report(
(
"creates a template object without passing hass, "
"which will stop working in HA Core 2025.10"
),
- core_behavior=ReportBehavior.LOG,
+ error_if_core=False,
)
self.template: str = template.strip()
diff --git a/homeassistant/helpers/update_coordinator.py b/homeassistant/helpers/update_coordinator.py
index 87d55891e90..f5c2a2a1288 100644
--- a/homeassistant/helpers/update_coordinator.py
+++ b/homeassistant/helpers/update_coordinator.py
@@ -29,7 +29,7 @@ from homeassistant.util.dt import utcnow
from . import entity, event
from .debounce import Debouncer
-from .frame import report_usage
+from .frame import report
from .typing import UNDEFINED, UndefinedType
REQUEST_REFRESH_DEFAULT_COOLDOWN = 10
@@ -286,20 +286,24 @@ class DataUpdateCoordinator(BaseDataUpdateCoordinatorProtocol, Generic[_DataT]):
to ensure that multiple retries do not cause log spam.
"""
if self.config_entry is None:
- report_usage(
+ report(
"uses `async_config_entry_first_refresh`, which is only supported "
"for coordinators with a config entry and will stop working in "
- "Home Assistant 2025.11"
+ "Home Assistant 2025.11",
+ error_if_core=True,
+ error_if_integration=False,
)
elif (
self.config_entry.state
is not config_entries.ConfigEntryState.SETUP_IN_PROGRESS
):
- report_usage(
+ report(
"uses `async_config_entry_first_refresh`, which is only supported "
f"when entry state is {config_entries.ConfigEntryState.SETUP_IN_PROGRESS}, "
f"but it is in state {self.config_entry.state}, "
"This will stop working in Home Assistant 2025.11",
+ error_if_core=True,
+ error_if_integration=False,
)
if await self.__wrap_async_setup():
await self._async_refresh(
diff --git a/homeassistant/loader.py b/homeassistant/loader.py
index d2e04df04c4..221a2c7ce19 100644
--- a/homeassistant/loader.py
+++ b/homeassistant/loader.py
@@ -1556,18 +1556,16 @@ class Components:
raise ImportError(f"Unable to load {comp_name}")
# Local import to avoid circular dependencies
- # pylint: disable-next=import-outside-toplevel
- from .helpers.frame import ReportBehavior, report_usage
+ from .helpers.frame import report # pylint: disable=import-outside-toplevel
- report_usage(
+ report(
(
f"accesses hass.components.{comp_name}."
" This is deprecated and will stop working in Home Assistant 2025.3, it"
f" should be updated to import functions used from {comp_name} directly"
),
- core_behavior=ReportBehavior.IGNORE,
- core_integration_behavior=ReportBehavior.IGNORE,
- custom_integration_behavior=ReportBehavior.LOG,
+ error_if_core=False,
+ log_custom_component_only=True,
)
wrapped = ModuleWrapper(self._hass, component)
@@ -1587,18 +1585,16 @@ class Helpers:
helper = importlib.import_module(f"homeassistant.helpers.{helper_name}")
# Local import to avoid circular dependencies
- # pylint: disable-next=import-outside-toplevel
- from .helpers.frame import ReportBehavior, report_usage
+ from .helpers.frame import report # pylint: disable=import-outside-toplevel
- report_usage(
+ report(
(
f"accesses hass.helpers.{helper_name}."
" This is deprecated and will stop working in Home Assistant 2025.5, it"
f" should be updated to import functions used from {helper_name} directly"
),
- core_behavior=ReportBehavior.IGNORE,
- core_integration_behavior=ReportBehavior.IGNORE,
- custom_integration_behavior=ReportBehavior.LOG,
+ error_if_core=False,
+ log_custom_component_only=True,
)
wrapped = ModuleWrapper(self._hass, helper)
diff --git a/homeassistant/package_constraints.txt b/homeassistant/package_constraints.txt
index 5bc539beb86..b399c64d7e2 100644
--- a/homeassistant/package_constraints.txt
+++ b/homeassistant/package_constraints.txt
@@ -5,7 +5,7 @@ aiodiscover==2.1.0
aiodns==3.2.0
aiohasupervisor==0.2.1
aiohttp-fast-zlib==0.1.1
-aiohttp==3.11.0
+aiohttp==3.10.10
aiohttp_cors==0.7.0
aiozoneinfo==0.2.1
astral==2.2
@@ -13,8 +13,6 @@ async-interrupt==1.2.0
async-upnp-client==0.41.0
atomicwrites-homeassistant==1.4.1
attrs==24.2.0
-audioop-lts==0.2.1;python_version>='3.13'
-av==13.1.0
awesomeversion==24.6.0
bcrypt==4.2.0
bleak-retry-connector==3.6.0
@@ -28,23 +26,24 @@ ciso8601==2.3.1
cryptography==43.0.1
dbus-fast==2.24.3
fnv-hash-fast==1.0.2
-go2rtc-client==0.1.1
-ha-ffmpeg==3.2.2
+go2rtc-client==0.1.0
+ha-av==10.1.1
+ha-ffmpeg==3.2.1
habluetooth==3.6.0
-hass-nabucasa==0.84.0
-hassil==2.0.1
+hass-nabucasa==0.83.0
+hassil==1.7.4
home-assistant-bluetooth==1.13.0
-home-assistant-frontend==20241106.2
-home-assistant-intents==2024.11.13
+home-assistant-frontend==20241106.0
+home-assistant-intents==2024.11.4
httpx==0.27.2
ifaddr==0.2.0
Jinja2==3.1.4
lru-dict==1.3.0
mutagen==1.47.0
-orjson==3.10.11
+orjson==3.10.10
packaging>=23.1
paho-mqtt==1.6.1
-Pillow==11.0.0
+Pillow==10.4.0
propcache==0.2.0
psutil-home-assistant==0.0.1
PyJWT==2.9.0
@@ -58,14 +57,11 @@ PyTurboJPEG==1.7.5
pyudev==0.24.1
PyYAML==6.0.2
requests==2.32.3
-securetar==2024.2.1
SQLAlchemy==2.0.31
-standard-aifc==3.13.0;python_version>='3.13'
-standard-telnetlib==3.13.0;python_version>='3.13'
typing-extensions>=4.12.2,<5.0
ulid-transform==1.0.2
urllib3>=1.26.5,<2
-uv==0.5.0
+uv==0.4.28
voluptuous-openapi==0.0.5
voluptuous-serialize==2.6.0
voluptuous==0.15.2
@@ -84,9 +80,9 @@ httplib2>=0.19.0
# gRPC is an implicit dependency that we want to make explicit so we manage
# upgrades intentionally. It is a large package to build from source and we
# want to ensure we have wheels built.
-grpcio==1.67.1
-grpcio-status==1.67.1
-grpcio-reflection==1.67.1
+grpcio==1.66.2
+grpcio-status==1.66.2
+grpcio-reflection==1.66.2
# This is a old unmaintained library and is replaced with pycryptodome
pycrypto==1000000000.0.0
@@ -115,8 +111,7 @@ httpcore==1.0.5
hyperframe>=5.2.0
# Ensure we run compatible with musllinux build env
-numpy==2.1.3
-pandas~=2.2.3
+numpy==1.26.4
# Constrain multidict to avoid typing issues
# https://github.com/home-assistant/core/pull/67046
@@ -127,7 +122,7 @@ backoff>=2.0
# Required to avoid breaking (#101042).
# v2 has breaking changes (#99218).
-pydantic==1.10.19
+pydantic==1.10.18
# Required for Python 3.12.4 compatibility (#119223).
mashumaro>=3.13.1
@@ -168,12 +163,15 @@ get-mac==1000000000.0.0
# We want to skip the binary wheels for the 'charset-normalizer' packages.
# They are build with mypyc, but causes issues with our wheel builder.
# In order to do so, we need to constrain the version.
-charset-normalizer==3.4.0
+charset-normalizer==3.2.0
# dacite: Ensure we have a version that is able to handle type unions for
-# NAM, Brother, and GIOS.
+# Roborock, NAM, Brother, and GIOS.
dacite>=1.7.0
+# Musle wheels for pandas 2.2.0 cannot be build for any architecture.
+pandas==2.1.4
+
# chacha20poly1305-reuseable==0.12.x is incompatible with cryptography==43.0.x
chacha20poly1305-reuseable>=0.13.0
@@ -181,8 +179,8 @@ chacha20poly1305-reuseable>=0.13.0
# https://github.com/pycountry/pycountry/blob/ea69bab36f00df58624a0e490fdad4ccdc14268b/HISTORY.txt#L39
pycountry>=23.12.11
-# scapy==2.6.0 causes CI failures due to a race condition
-scapy>=2.6.1
+# scapy<2.5.0 will not work with python3.12
+scapy>=2.5.0
# tuf isn't updated to deal with breaking changes in securesystemslib==1.0.
# Only tuf>=4 includes a constraint to <1.0.
diff --git a/homeassistant/runner.py b/homeassistant/runner.py
index 59775655854..102dbafe147 100644
--- a/homeassistant/runner.py
+++ b/homeassistant/runner.py
@@ -3,8 +3,10 @@
from __future__ import annotations
import asyncio
+from asyncio import events
import dataclasses
import logging
+import os
import subprocess
import threading
from time import monotonic
@@ -56,6 +58,22 @@ class RuntimeConfig:
safe_mode: bool = False
+def can_use_pidfd() -> bool:
+ """Check if pidfd_open is available.
+
+ Back ported from cpython 3.12
+ """
+ if not hasattr(os, "pidfd_open"):
+ return False
+ try:
+ pid = os.getpid()
+ os.close(os.pidfd_open(pid, 0))
+ except OSError:
+ # blocked by security policy like SECCOMP
+ return False
+ return True
+
+
class HassEventLoopPolicy(asyncio.DefaultEventLoopPolicy):
"""Event loop policy for Home Assistant."""
@@ -63,6 +81,23 @@ class HassEventLoopPolicy(asyncio.DefaultEventLoopPolicy):
"""Init the event loop policy."""
super().__init__()
self.debug = debug
+ self._watcher: asyncio.AbstractChildWatcher | None = None
+
+ def _init_watcher(self) -> None:
+ """Initialize the watcher for child processes.
+
+ Back ported from cpython 3.12
+ """
+ with events._lock: # type: ignore[attr-defined] # noqa: SLF001
+ if self._watcher is None: # pragma: no branch
+ if can_use_pidfd():
+ self._watcher = asyncio.PidfdChildWatcher()
+ else:
+ self._watcher = asyncio.ThreadedChildWatcher()
+ if threading.current_thread() is threading.main_thread():
+ self._watcher.attach_loop(
+ self._local._loop # type: ignore[attr-defined] # noqa: SLF001
+ )
@property
def loop_name(self) -> str:
diff --git a/homeassistant/util/unit_conversion.py b/homeassistant/util/unit_conversion.py
index 1bf3561e66a..6bc595bd487 100644
--- a/homeassistant/util/unit_conversion.py
+++ b/homeassistant/util/unit_conversion.py
@@ -10,7 +10,6 @@ from homeassistant.const import (
CONCENTRATION_PARTS_PER_MILLION,
PERCENTAGE,
UNIT_NOT_RECOGNIZED_TEMPLATE,
- UnitOfBloodGlucoseConcentration,
UnitOfConductivity,
UnitOfDataRate,
UnitOfElectricCurrent,
@@ -174,17 +173,6 @@ class DistanceConverter(BaseUnitConverter):
}
-class BloodGlucoseConcentrationConverter(BaseUnitConverter):
- """Utility to convert blood glucose concentration values."""
-
- UNIT_CLASS = "blood_glucose_concentration"
- _UNIT_CONVERSION: dict[str | None, float] = {
- UnitOfBloodGlucoseConcentration.MILLIGRAMS_PER_DECILITER: 18,
- UnitOfBloodGlucoseConcentration.MILLIMOLE_PER_LITER: 1,
- }
- VALID_UNITS = set(UnitOfBloodGlucoseConcentration)
-
-
class ConductivityConverter(BaseUnitConverter):
"""Utility to convert electric current values."""
@@ -234,8 +222,6 @@ class EnergyConverter(BaseUnitConverter):
UnitOfEnergy.WATT_HOUR: 1e3,
UnitOfEnergy.KILO_WATT_HOUR: 1,
UnitOfEnergy.MEGA_WATT_HOUR: 1 / 1e3,
- UnitOfEnergy.GIGA_WATT_HOUR: 1 / 1e6,
- UnitOfEnergy.TERA_WATT_HOUR: 1 / 1e9,
UnitOfEnergy.CALORIE: _WH_TO_CAL * 1e3,
UnitOfEnergy.KILO_CALORIE: _WH_TO_CAL,
UnitOfEnergy.MEGA_CALORIE: _WH_TO_CAL / 1e3,
@@ -306,16 +292,10 @@ class PowerConverter(BaseUnitConverter):
_UNIT_CONVERSION: dict[str | None, float] = {
UnitOfPower.WATT: 1,
UnitOfPower.KILO_WATT: 1 / 1000,
- UnitOfPower.MEGA_WATT: 1 / 1e6,
- UnitOfPower.GIGA_WATT: 1 / 1e9,
- UnitOfPower.TERA_WATT: 1 / 1e12,
}
VALID_UNITS = {
UnitOfPower.WATT,
UnitOfPower.KILO_WATT,
- UnitOfPower.MEGA_WATT,
- UnitOfPower.GIGA_WATT,
- UnitOfPower.TERA_WATT,
}
diff --git a/homeassistant/util/yaml/loader.py b/homeassistant/util/yaml/loader.py
index 39d38a8f47d..39ac17d94f9 100644
--- a/homeassistant/util/yaml/loader.py
+++ b/homeassistant/util/yaml/loader.py
@@ -25,6 +25,7 @@ except ImportError:
from propcache import cached_property
from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.frame import report
from .const import SECRET_YAML
from .objects import Input, NodeDictClass, NodeListClass, NodeStrClass
@@ -143,6 +144,37 @@ class FastSafeLoader(FastestAvailableSafeLoader, _LoaderMixin):
self.secrets = secrets
+class SafeLoader(FastSafeLoader):
+ """Provided for backwards compatibility. Logs when instantiated."""
+
+ def __init__(*args: Any, **kwargs: Any) -> None:
+ """Log a warning and call super."""
+ SafeLoader.__report_deprecated()
+ FastSafeLoader.__init__(*args, **kwargs)
+
+ @classmethod
+ def add_constructor(cls, tag: str, constructor: Callable) -> None:
+ """Log a warning and call super."""
+ SafeLoader.__report_deprecated()
+ FastSafeLoader.add_constructor(tag, constructor)
+
+ @classmethod
+ def add_multi_constructor(
+ cls, tag_prefix: str, multi_constructor: Callable
+ ) -> None:
+ """Log a warning and call super."""
+ SafeLoader.__report_deprecated()
+ FastSafeLoader.add_multi_constructor(tag_prefix, multi_constructor)
+
+ @staticmethod
+ def __report_deprecated() -> None:
+ """Log deprecation warning."""
+ report(
+ "uses deprecated 'SafeLoader' instead of 'FastSafeLoader', "
+ "which will stop working in HA Core 2024.6,"
+ )
+
+
class PythonSafeLoader(yaml.SafeLoader, _LoaderMixin):
"""Python safe loader."""
@@ -152,6 +184,37 @@ class PythonSafeLoader(yaml.SafeLoader, _LoaderMixin):
self.secrets = secrets
+class SafeLineLoader(PythonSafeLoader):
+ """Provided for backwards compatibility. Logs when instantiated."""
+
+ def __init__(*args: Any, **kwargs: Any) -> None:
+ """Log a warning and call super."""
+ SafeLineLoader.__report_deprecated()
+ PythonSafeLoader.__init__(*args, **kwargs)
+
+ @classmethod
+ def add_constructor(cls, tag: str, constructor: Callable) -> None:
+ """Log a warning and call super."""
+ SafeLineLoader.__report_deprecated()
+ PythonSafeLoader.add_constructor(tag, constructor)
+
+ @classmethod
+ def add_multi_constructor(
+ cls, tag_prefix: str, multi_constructor: Callable
+ ) -> None:
+ """Log a warning and call super."""
+ SafeLineLoader.__report_deprecated()
+ PythonSafeLoader.add_multi_constructor(tag_prefix, multi_constructor)
+
+ @staticmethod
+ def __report_deprecated() -> None:
+ """Log deprecation warning."""
+ report(
+ "uses deprecated 'SafeLineLoader' instead of 'PythonSafeLoader', "
+ "which will stop working in HA Core 2024.6,"
+ )
+
+
type LoaderType = FastSafeLoader | PythonSafeLoader
diff --git a/mypy.ini b/mypy.ini
index 4d33f16d968..794579eb48f 100644
--- a/mypy.ini
+++ b/mypy.ini
@@ -11,7 +11,6 @@ follow_imports = normal
local_partial_types = true
strict_equality = true
no_implicit_optional = true
-report_deprecated_as_error = true
warn_incomplete_stub = true
warn_redundant_casts = true
warn_unused_configs = true
@@ -2996,16 +2995,6 @@ disallow_untyped_defs = true
warn_return_any = true
warn_unreachable = true
-[mypy-homeassistant.components.music_assistant.*]
-check_untyped_defs = true
-disallow_incomplete_defs = true
-disallow_subclassing_any = true
-disallow_untyped_calls = true
-disallow_untyped_decorators = true
-disallow_untyped_defs = true
-warn_return_any = true
-warn_unreachable = true
-
[mypy-homeassistant.components.my.*]
check_untyped_defs = true
disallow_incomplete_defs = true
@@ -3056,16 +3045,6 @@ disallow_untyped_defs = true
warn_return_any = true
warn_unreachable = true
-[mypy-homeassistant.components.nasweb.*]
-check_untyped_defs = true
-disallow_incomplete_defs = true
-disallow_subclassing_any = true
-disallow_untyped_calls = true
-disallow_untyped_decorators = true
-disallow_untyped_defs = true
-warn_return_any = true
-warn_unreachable = true
-
[mypy-homeassistant.components.neato.*]
check_untyped_defs = true
disallow_incomplete_defs = true
@@ -3156,16 +3135,6 @@ disallow_untyped_defs = true
warn_return_any = true
warn_unreachable = true
-[mypy-homeassistant.components.nordpool.*]
-check_untyped_defs = true
-disallow_incomplete_defs = true
-disallow_subclassing_any = true
-disallow_untyped_calls = true
-disallow_untyped_decorators = true
-disallow_untyped_defs = true
-warn_return_any = true
-warn_unreachable = true
-
[mypy-homeassistant.components.notify.*]
check_untyped_defs = true
disallow_incomplete_defs = true
diff --git a/pyproject.toml b/pyproject.toml
index ebf22a93d7d..e26ab16b965 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
[project]
name = "homeassistant"
-version = "2024.12.0.dev0"
+version = "2024.11.0b9"
license = {text = "Apache-2.0"}
description = "Open-source home automation platform running on Python 3."
readme = "README.rst"
@@ -19,7 +19,6 @@ classifiers = [
"License :: OSI Approved :: Apache Software License",
"Operating System :: OS Independent",
"Programming Language :: Python :: 3.12",
- "Programming Language :: Python :: 3.13",
"Topic :: Home Automation",
]
requires-python = ">=3.12.0"
@@ -29,7 +28,7 @@ dependencies = [
# change behavior based on presence of supervisor. Deprecated with #127228
# Lib can be removed with 2025.11
"aiohasupervisor==0.2.1",
- "aiohttp==3.11.0",
+ "aiohttp==3.10.10",
"aiohttp_cors==0.7.0",
"aiohttp-fast-zlib==0.1.1",
"aiozoneinfo==0.2.1",
@@ -37,7 +36,6 @@ dependencies = [
"async-interrupt==1.2.0",
"attrs==24.2.0",
"atomicwrites-homeassistant==1.4.1",
- "audioop-lts==0.2.1;python_version>='3.13'",
"awesomeversion==24.6.0",
"bcrypt==4.2.0",
"certifi>=2021.5.30",
@@ -45,7 +43,7 @@ dependencies = [
"fnv-hash-fast==1.0.2",
# hass-nabucasa is imported by helpers which don't depend on the cloud
# integration
- "hass-nabucasa==0.84.0",
+ "hass-nabucasa==0.83.0",
# When bumping httpx, please check the version pins of
# httpcore, anyio, and h11 in gen_requirements_all
"httpx==0.27.2",
@@ -56,26 +54,23 @@ dependencies = [
"PyJWT==2.9.0",
# PyJWT has loose dependency. We want the latest one.
"cryptography==43.0.1",
- "Pillow==11.0.0",
+ "Pillow==10.4.0",
"propcache==0.2.0",
"pyOpenSSL==24.2.1",
- "orjson==3.10.11",
+ "orjson==3.10.10",
"packaging>=23.1",
"psutil-home-assistant==0.0.1",
"python-slugify==8.0.4",
"PyYAML==6.0.2",
"requests==2.32.3",
- "securetar==2024.2.1",
"SQLAlchemy==2.0.31",
- "standard-aifc==3.13.0;python_version>='3.13'",
- "standard-telnetlib==3.13.0;python_version>='3.13'",
"typing-extensions>=4.12.2,<5.0",
"ulid-transform==1.0.2",
# Constrain urllib3 to ensure we deal with CVE-2020-26137 and CVE-2021-33503
# Temporary setting an upper bound, to prevent compat issues with urllib3>=2
# https://github.com/home-assistant/core/issues/97248
"urllib3>=1.26.5,<2",
- "uv==0.5.0",
+ "uv==0.4.28",
"voluptuous==0.15.2",
"voluptuous-serialize==2.6.0",
"voluptuous-openapi==0.0.5",
@@ -490,13 +485,10 @@ filterwarnings = [
"ignore:Deprecated call to `pkg_resources.declare_namespace\\(('azure'|'google.*'|'pywinusb'|'repoze'|'xbox'|'zope')\\)`:DeprecationWarning:pkg_resources",
# -- tracked upstream / open PRs
- # - pyOpenSSL v24.2.1
# https://github.com/certbot/certbot/issues/9828 - v2.11.0
- # https://github.com/certbot/certbot/issues/9992
"ignore:X509Extension support in pyOpenSSL is deprecated. You should use the APIs in cryptography:DeprecationWarning:acme.crypto_util",
- "ignore:CSR support in pyOpenSSL is deprecated. You should use the APIs in cryptography:DeprecationWarning:acme.crypto_util",
- "ignore:CSR support in pyOpenSSL is deprecated. You should use the APIs in cryptography:DeprecationWarning:josepy.util",
- # - other
+ # https://github.com/beetbox/mediafile/issues/67 - v0.12.0
+ "ignore:'imghdr' is deprecated and slated for removal in Python 3.13:DeprecationWarning:mediafile",
# https://github.com/foxel/python_ndms2_client/issues/6 - v0.1.3
# https://github.com/foxel/python_ndms2_client/pull/8
"ignore:'telnetlib' is deprecated and slated for removal in Python 3.13:DeprecationWarning:ndms2_client.connection",
@@ -533,8 +525,6 @@ filterwarnings = [
"ignore:datetime.*utcnow\\(\\) is deprecated and scheduled for removal:DeprecationWarning:onvif.client",
# https://github.com/okunishinishi/python-stringcase/commit/6a5c5bbd3fe5337862abc7fd0853a0f36e18b2e1 - >1.2.0
"ignore:invalid escape sequence:SyntaxWarning:.*stringcase",
- # https://github.com/cereal2nd/velbus-aio/pull/126 - >2024.10.0
- "ignore:pkg_resources is deprecated as an API:DeprecationWarning:velbusaio.handler",
# -- fixed for Python 3.13
# https://github.com/rhasspy/wyoming/commit/e34af30d455b6f2bb9e5cfb25fad8d276914bc54 - >=1.4.2
@@ -558,7 +548,7 @@ filterwarnings = [
"ignore:setDaemon\\(\\) is deprecated, set the daemon attribute instead:DeprecationWarning:pylutron",
# https://github.com/pschmitt/pynuki/blob/1.6.3/pynuki/utils.py#L21 - v1.6.3 - 2024-02-24
"ignore:datetime.*utcnow\\(\\) is deprecated and scheduled for removal:DeprecationWarning:pynuki.utils",
- # https://github.com/lextudio/pysnmp/blob/v7.1.10/pysnmp/smi/compiler.py#L23-L31 - v7.1.10 - 2024-11-04
+ # https://github.com/lextudio/pysnmp/blob/v7.1.8/pysnmp/smi/compiler.py#L23-L31 - v7.1.8 - 2024-10-15
"ignore:smiV1Relaxed is deprecated. Please use smi_v1_relaxed instead:DeprecationWarning:pysnmp.smi.compiler",
"ignore:getReadersFromUrls is deprecated. Please use get_readers_from_urls instead:DeprecationWarning:pysmi.reader.url", # wrong stacklevel
# https://github.com/briis/pyweatherflowudp/blob/v1.4.5/pyweatherflowudp/const.py#L20 - v1.4.5 - 2023-10-10
@@ -588,7 +578,7 @@ filterwarnings = [
# - pkg_resources
# https://pypi.org/project/aiomusiccast/ - v0.14.8 - 2023-03-20
"ignore:pkg_resources is deprecated as an API:DeprecationWarning:aiomusiccast",
- # https://pypi.org/project/habitipy/ - v0.3.3 - 2024-10-28
+ # https://pypi.org/project/habitipy/ - v0.3.1 - 2019-01-14 / 2024-04-28
"ignore:pkg_resources is deprecated as an API:DeprecationWarning:habitipy.api",
# https://github.com/eavanvalkenburg/pysiaalarm/blob/v3.1.1/src/pysiaalarm/data/data.py#L7 - v3.1.1 - 2023-04-17
"ignore:pkg_resources is deprecated as an API:DeprecationWarning:pysiaalarm.data.data",
@@ -596,6 +586,14 @@ filterwarnings = [
"ignore:pkg_resources is deprecated as an API:DeprecationWarning:pybotvac.version",
# https://github.com/home-assistant-ecosystem/python-mystrom/blob/2.2.0/pymystrom/__init__.py#L10 - v2.2.0 - 2023-05-21
"ignore:pkg_resources is deprecated as an API:DeprecationWarning:pymystrom",
+ # https://pypi.org/project/velbus-aio/ - v2024.7.6 - 2024-07-31
+ # https://github.com/Cereal2nd/velbus-aio/blob/2024.7.6/velbusaio/handler.py#L22
+ "ignore:pkg_resources is deprecated as an API:DeprecationWarning:velbusaio.handler",
+ # - pyOpenSSL v24.2.1
+ # https://pypi.org/project/acme/ - v2.11.0 - 2024-06-06
+ "ignore:CSR support in pyOpenSSL is deprecated. You should use the APIs in cryptography:DeprecationWarning:acme.crypto_util",
+ # https://pypi.org/project/josepy/ - v1.14.0 - 2023-11-01
+ "ignore:CSR support in pyOpenSSL is deprecated. You should use the APIs in cryptography:DeprecationWarning:josepy.util",
# -- Python 3.13
# HomeAssistant
@@ -609,7 +607,7 @@ filterwarnings = [
# https://github.com/Uberi/speech_recognition/blob/3.11.0/speech_recognition/__init__.py#L7
"ignore:'aifc' is deprecated and slated for removal in Python 3.13:DeprecationWarning:speech_recognition",
# https://pypi.org/project/voip-utils/ - v0.2.0 - 2024-09-06
- # https://github.com/home-assistant-libs/voip-utils/blob/0.2.0/voip_utils/rtp_audio.py#L3
+ # https://github.com/home-assistant-libs/voip-utils/blob/v0.2.0/voip_utils/rtp_audio.py#L3
"ignore:'audioop' is deprecated and slated for removal in Python 3.13:DeprecationWarning:voip_utils.rtp_audio",
# -- Python 3.13 - unmaintained projects, last release about 2+ years
@@ -621,17 +619,6 @@ filterwarnings = [
# https://github.com/ssaenger/pyws66i/blob/v1.1/pyws66i/__init__.py#L2
"ignore:'telnetlib' is deprecated and slated for removal in Python 3.13:DeprecationWarning:pyws66i",
- # -- New in Python 3.13
- # https://github.com/kurtmckee/feedparser/pull/389 - >6.0.11
- # https://github.com/kurtmckee/feedparser/issues/481
- "ignore:'count' is passed as positional argument:DeprecationWarning:feedparser.html",
- # https://github.com/youknowone/python-deadlib - Backports for aifc, telnetlib
- "ignore:aifc was removed in Python 3.13.*'standard-aifc':DeprecationWarning:speech_recognition",
- "ignore:telnetlib was removed in Python 3.13.*'standard-telnetlib':DeprecationWarning:homeassistant.components.hddtemp.sensor",
- "ignore:telnetlib was removed in Python 3.13.*'standard-telnetlib':DeprecationWarning:ndms2_client.connection",
- "ignore:telnetlib was removed in Python 3.13.*'standard-telnetlib':DeprecationWarning:plumlightpad.lightpad",
- "ignore:telnetlib was removed in Python 3.13.*'standard-telnetlib':DeprecationWarning:pyws66i",
-
# -- unmaintained projects, last release about 2+ years
# https://pypi.org/project/agent-py/ - v0.0.23 - 2020-06-04
"ignore:with timeout\\(\\) is deprecated:DeprecationWarning:agent.a",
diff --git a/requirements.txt b/requirements.txt
index b97c8dc57a0..73c674fbc32 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@
# Home Assistant Core
aiodns==3.2.0
aiohasupervisor==0.2.1
-aiohttp==3.11.0
+aiohttp==3.10.10
aiohttp_cors==0.7.0
aiohttp-fast-zlib==0.1.1
aiozoneinfo==0.2.1
@@ -13,13 +13,12 @@ astral==2.2
async-interrupt==1.2.0
attrs==24.2.0
atomicwrites-homeassistant==1.4.1
-audioop-lts==0.2.1;python_version>='3.13'
awesomeversion==24.6.0
bcrypt==4.2.0
certifi>=2021.5.30
ciso8601==2.3.1
fnv-hash-fast==1.0.2
-hass-nabucasa==0.84.0
+hass-nabucasa==0.83.0
httpx==0.27.2
home-assistant-bluetooth==1.13.0
ifaddr==0.2.0
@@ -27,23 +26,20 @@ Jinja2==3.1.4
lru-dict==1.3.0
PyJWT==2.9.0
cryptography==43.0.1
-Pillow==11.0.0
+Pillow==10.4.0
propcache==0.2.0
pyOpenSSL==24.2.1
-orjson==3.10.11
+orjson==3.10.10
packaging>=23.1
psutil-home-assistant==0.0.1
python-slugify==8.0.4
PyYAML==6.0.2
requests==2.32.3
-securetar==2024.2.1
SQLAlchemy==2.0.31
-standard-aifc==3.13.0;python_version>='3.13'
-standard-telnetlib==3.13.0;python_version>='3.13'
typing-extensions>=4.12.2,<5.0
ulid-transform==1.0.2
urllib3>=1.26.5,<2
-uv==0.5.0
+uv==0.4.28
voluptuous==0.15.2
voluptuous-serialize==2.6.0
voluptuous-openapi==0.0.5
diff --git a/requirements_all.txt b/requirements_all.txt
index 65ef5f1ebf2..1e50a44c2dd 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -33,7 +33,7 @@ Mastodon.py==1.8.1
# homeassistant.components.seven_segments
# homeassistant.components.sighthound
# homeassistant.components.tensorflow
-Pillow==11.0.0
+Pillow==10.4.0
# homeassistant.components.plex
PlexAPI==4.15.16
@@ -152,7 +152,7 @@ advantage-air==0.4.4
afsapi==0.2.7
# homeassistant.components.agent_dvr
-agent-py==0.0.24
+agent-py==0.0.23
# homeassistant.components.geo_json_events
aio-geojson-generic-client==0.4
@@ -172,9 +172,6 @@ aio-geojson-usgs-earthquakes==0.3
# homeassistant.components.gdacs
aio-georss-gdacs==0.10
-# homeassistant.components.acaia
-aioacaia==0.1.6
-
# homeassistant.components.airq
aioairq==0.3.2
@@ -182,7 +179,7 @@ aioairq==0.3.2
aioairzone-cloud==0.6.10
# homeassistant.components.airzone
-aioairzone==0.9.6
+aioairzone==0.9.5
# homeassistant.components.ambient_network
# homeassistant.components.ambient_station
@@ -357,10 +354,10 @@ aiorecollect==2023.09.0
aioridwell==2024.01.0
# homeassistant.components.ruckus_unleashed
-aioruckus==0.42
+aioruckus==0.41
# homeassistant.components.russound_rio
-aiorussound==4.1.0
+aiorussound==4.0.5
# homeassistant.components.ruuvi_gateway
aioruuvigateway==0.1.0
@@ -384,7 +381,7 @@ aiosolaredge==0.2.0
aiosteamist==1.0.0
# homeassistant.components.cambridge_audio
-aiostreammagic==2.8.5
+aiostreammagic==2.8.4
# homeassistant.components.switcher_kis
aioswitcher==4.4.0
@@ -395,9 +392,6 @@ aiosyncthing==0.5.1
# homeassistant.components.tankerkoenig
aiotankerkoenig==0.4.2
-# homeassistant.components.tedee
-aiotedee==0.2.20
-
# homeassistant.components.tractive
aiotractive==0.6.0
@@ -420,7 +414,7 @@ aiowatttime==0.1.1
aiowebostv==0.4.2
# homeassistant.components.withings
-aiowithings==3.1.3
+aiowithings==3.1.1
# homeassistant.components.yandex_transport
aioymaps==1.2.5
@@ -532,10 +526,6 @@ autarco==3.1.0
# homeassistant.components.husqvarna_automower_ble
automower-ble==0.2.0
-# homeassistant.components.generic
-# homeassistant.components.stream
-av==13.1.0
-
# homeassistant.components.avea
# avea==1.5.1
@@ -708,7 +698,7 @@ connect-box==0.3.1
construct==2.10.68
# homeassistant.components.utility_meter
-cronsim==2.6
+croniter==2.0.2
# homeassistant.components.crownstone
crownstone-cloud==1.4.11
@@ -738,7 +728,7 @@ debugpy==1.8.6
# decora==0.6
# homeassistant.components.ecovacs
-deebot-client==8.4.1
+deebot-client==8.4.0
# homeassistant.components.ihc
# homeassistant.components.namecheapdns
@@ -863,7 +853,7 @@ epion==0.0.3
epson-projector==0.5.1
# homeassistant.components.eq3btsmart
-eq3btsmart==1.4.1
+eq3btsmart==1.2.0
# homeassistant.components.esphome
esphome-dashboard-api==1.2.3
@@ -996,7 +986,7 @@ gitterpy==0.1.7
glances-api==0.8.0
# homeassistant.components.go2rtc
-go2rtc-client==0.1.1
+go2rtc-client==0.1.0
# homeassistant.components.goalzero
goalzero==0.2.2
@@ -1021,7 +1011,7 @@ google-cloud-texttospeech==2.17.2
google-generativeai==0.8.2
# homeassistant.components.nest
-google-nest-sdm==6.1.5
+google-nest-sdm==6.1.3
# homeassistant.components.google_photos
google-photos-library-api==0.12.1
@@ -1069,13 +1059,17 @@ gspread==5.5.0
gstreamer-player==1.1.2
# homeassistant.components.profiler
-guppy3==3.1.4.post1;python_version<'3.13'
+guppy3==3.1.4.post1
# homeassistant.components.iaqualink
h2==4.1.0
+# homeassistant.components.generic
+# homeassistant.components.stream
+ha-av==10.1.1
+
# homeassistant.components.ffmpeg
-ha-ffmpeg==3.2.2
+ha-ffmpeg==3.2.1
# homeassistant.components.iotawatt
ha-iotawattpy==0.1.2
@@ -1090,13 +1084,13 @@ habitipy==0.3.3
habluetooth==3.6.0
# homeassistant.components.cloud
-hass-nabucasa==0.84.0
+hass-nabucasa==0.83.0
# homeassistant.components.splunk
hass-splunk==0.1.1
# homeassistant.components.conversation
-hassil==2.0.1
+hassil==1.7.4
# homeassistant.components.jewish_calendar
hdate==0.10.9
@@ -1130,10 +1124,10 @@ hole==0.8.0
holidays==0.60
# homeassistant.components.frontend
-home-assistant-frontend==20241106.2
+home-assistant-frontend==20241106.0
# homeassistant.components.conversation
-home-assistant-intents==2024.11.13
+home-assistant-intents==2024.11.4
# homeassistant.components.home_connect
homeconnect==0.8.0
@@ -1148,10 +1142,10 @@ horimote==0.4.1
httplib2==0.20.4
# homeassistant.components.huawei_lte
-huawei-lte-api==1.10.0
+huawei-lte-api==1.9.3
# homeassistant.components.huum
-huum==0.7.12
+huum==0.7.10
# homeassistant.components.hyperion
hyperion-py==0.7.5
@@ -1271,7 +1265,7 @@ lakeside==0.13
laundrify-aio==1.2.2
# homeassistant.components.lcn
-lcn-frontend==0.2.2
+lcn-frontend==0.2.1
# homeassistant.components.ld2410_ble
ld2410-ble==0.1.1
@@ -1312,6 +1306,9 @@ linear-garage-door==0.2.9
# homeassistant.components.linode
linode-api==4.1.9b1
+# homeassistant.components.lamarzocco
+lmcloud==1.2.3
+
# homeassistant.components.google_maps
locationsharinglib==5.0.1
@@ -1376,7 +1373,7 @@ microBeesPy==0.3.2
mill-local==0.3.0
# homeassistant.components.mill
-millheater==0.12.2
+millheater==0.11.8
# homeassistant.components.minio
minio==7.1.12
@@ -1388,7 +1385,7 @@ moat-ble==0.1.1
moehlenhoff-alpha2==1.3.1
# homeassistant.components.monzo
-monzopy==1.4.2
+monzopy==1.3.2
# homeassistant.components.mopeka
mopeka-iot-ble==0.8.0
@@ -1408,9 +1405,6 @@ mozart-api==4.1.1.116.0
# homeassistant.components.mullvad
mullvad-api==1.0.0
-# homeassistant.components.music_assistant
-music-assistant-client==1.0.5
-
# homeassistant.components.tts
mutagen==1.47.0
@@ -1460,7 +1454,7 @@ nextdns==3.3.0
nibe==2.11.0
# homeassistant.components.nice_go
-nice-go==0.3.10
+nice-go==0.3.9
# homeassistant.components.niko_home_control
niko-home-control==0.2.1
@@ -1494,7 +1488,7 @@ numato-gpio==0.13.0
# homeassistant.components.stream
# homeassistant.components.tensorflow
# homeassistant.components.trend
-numpy==2.1.3
+numpy==1.26.4
# homeassistant.components.nyt_games
nyt_games==0.4.4
@@ -1622,7 +1616,7 @@ plexauth==0.0.6
plexwebsocket==0.0.14
# homeassistant.components.plugwise
-plugwise==1.5.0
+plugwise==1.4.4
# homeassistant.components.plum_lightpad
plumlightpad==0.0.11
@@ -1654,7 +1648,7 @@ proxmoxer==2.0.1
psutil-home-assistant==0.0.1
# homeassistant.components.systemmonitor
-psutil==6.1.0
+psutil==6.0.0
# homeassistant.components.pulseaudio_loopback
pulsectl==23.5.2
@@ -1741,7 +1735,7 @@ pyRFXtrx==0.31.1
pySDCP==1
# homeassistant.components.tibber
-pyTibber==0.30.8
+pyTibber==0.30.4
# homeassistant.components.dlink
pyW215==0.7.0
@@ -2026,9 +2020,6 @@ pykwb==0.0.8
# homeassistant.components.lacrosse
pylacrosse==0.4
-# homeassistant.components.lamarzocco
-pylamarzocco==1.2.3
-
# homeassistant.components.lastfm
pylast==5.1.0
@@ -2090,7 +2081,7 @@ pymsteams==0.1.12
pymysensors==0.24.0
# homeassistant.components.iron_os
-pynecil==0.2.1
+pynecil==0.2.0
# homeassistant.components.netgear
pynetgear==0.10.10
@@ -2101,9 +2092,6 @@ pynetio==0.1.9.1
# homeassistant.components.nobo_hub
pynobo==1.8.1
-# homeassistant.components.nordpool
-pynordpool==0.2.2
-
# homeassistant.components.nuki
pynuki==1.6.3
@@ -2155,7 +2143,7 @@ pyoverkiz==1.14.1
pyownet==0.10.0.post1
# homeassistant.components.palazzetti
-pypalazzetti==0.1.11
+pypalazzetti==0.1.10
# homeassistant.components.elv
pypca==0.0.7
@@ -2293,7 +2281,7 @@ pysqueezebox==0.10.0
pystiebeleltron==0.0.1.dev2
# homeassistant.components.suez_water
-pysuezV2==1.3.1
+pysuezV2==0.2.2
# homeassistant.components.switchbee
pyswitchbee==1.8.3
@@ -2301,6 +2289,9 @@ pyswitchbee==1.8.3
# homeassistant.components.tautulli
pytautulli==23.1.1
+# homeassistant.components.tedee
+pytedee-async==0.2.20
+
# homeassistant.components.thinkingcleaner
pythinkingcleaner==0.0.3
@@ -2314,7 +2305,7 @@ python-awair==0.2.4
python-blockchain-api==0.0.2
# homeassistant.components.bsblan
-python-bsblan==1.2.1
+python-bsblan==0.6.4
# homeassistant.components.clementine
python-clementine-remote==1.0.1
@@ -2365,7 +2356,7 @@ python-juicenet==1.1.0
python-kasa[speedups]==0.7.7
# homeassistant.components.linkplay
-python-linkplay==0.0.20
+python-linkplay==0.0.17
# homeassistant.components.lirc
# python-lirc==1.2.3
@@ -2402,7 +2393,7 @@ python-rabbitair==0.0.8
python-ripple-api==0.0.3
# homeassistant.components.roborock
-python-roborock==2.7.2
+python-roborock==2.6.1
# homeassistant.components.smarttub
python-smarttub==0.0.36
@@ -2411,7 +2402,7 @@ python-smarttub==0.0.36
python-songpal==0.16.2
# homeassistant.components.tado
-python-tado==0.17.7
+python-tado==0.17.6
# homeassistant.components.technove
python-technove==1.3.1
@@ -2556,7 +2547,7 @@ renault-api==0.2.7
renson-endura-delta==1.7.1
# homeassistant.components.reolink
-reolink-aio==0.11.1
+reolink-aio==0.10.4
# homeassistant.components.idteck_prox
rfk101py==0.0.1
@@ -2565,7 +2556,7 @@ rfk101py==0.0.1
rflink==0.0.66
# homeassistant.components.ring
-ring-doorbell==0.9.12
+ring-doorbell==0.9.8
# homeassistant.components.fleetgo
ritassist==0.9.2
@@ -2632,7 +2623,7 @@ sendgrid==6.8.2
# homeassistant.components.emulated_kasa
# homeassistant.components.sense
-sense-energy==0.13.3
+sense-energy==0.13.2
# homeassistant.components.sensirion_ble
sensirion-ble==0.1.1
@@ -2676,9 +2667,6 @@ simplisafe-python==2024.01.0
# homeassistant.components.sisyphus
sisyphus-control==3.1.4
-# homeassistant.components.sky_remote
-skyboxremote==0.0.6
-
# homeassistant.components.slack
slackclient==2.5.0
@@ -2695,7 +2683,7 @@ smhi-pkg==1.0.18
snapcast==2.3.6
# homeassistant.components.sonos
-soco==0.30.6
+soco==0.30.4
# homeassistant.components.solaredge_local
solaredge-local==0.2.3
@@ -2719,7 +2707,7 @@ speak2mary==1.4.0
speedtest-cli==2.1.3
# homeassistant.components.spotify
-spotifyaio==0.8.8
+spotifyaio==0.8.5
# homeassistant.components.sql
sqlparse==0.5.0
@@ -2864,7 +2852,7 @@ total-connect-client==2024.5
tp-connected==0.0.4
# homeassistant.components.tplink_omada
-tplink-omada-client==1.4.3
+tplink-omada-client==1.4.2
# homeassistant.components.transmission
transmission-rpc==7.0.3
@@ -2879,7 +2867,7 @@ ttls==1.8.3
ttn_client==1.2.0
# homeassistant.components.tuya
-tuya-device-sharing-sdk==0.2.1
+tuya-device-sharing-sdk==0.1.9
# homeassistant.components.twentemilieu
twentemilieu==2.0.1
@@ -2986,14 +2974,11 @@ weatherflow4py==1.0.6
# homeassistant.components.cisco_webex_teams
webexpythonsdk==2.0.1
-# homeassistant.components.nasweb
-webio-api==0.1.8
-
# homeassistant.components.webmin
webmin-xmlrpc==0.0.2
# homeassistant.components.weheat
-weheat==2024.11.02
+weheat==2024.09.23
# homeassistant.components.whirlpool
whirlpool-sixth-sense==0.18.8
@@ -3093,7 +3078,7 @@ ziggo-mediabox-xl==1.1.0
zm-py==0.5.4
# homeassistant.components.zwave_js
-zwave-js-server-python==0.59.1
+zwave-js-server-python==0.58.1
# homeassistant.components.zwave_me
zwave-me-ws==0.4.3
diff --git a/requirements_test.txt b/requirements_test.txt
index 166fd965e2c..c879f0c6621 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -12,9 +12,9 @@ coverage==7.6.1
freezegun==1.5.1
license-expression==30.4.0
mock-open==1.4.0
-mypy-dev==1.14.0a2
+mypy-dev==1.13.0a1
pre-commit==4.0.0
-pydantic==1.10.19
+pydantic==1.10.18
pylint==3.3.1
pylint-per-file-ignores==1.3.2
pipdeptree==2.23.4
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index b61e65f3c68..2a04ce2bf63 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -33,7 +33,7 @@ Mastodon.py==1.8.1
# homeassistant.components.seven_segments
# homeassistant.components.sighthound
# homeassistant.components.tensorflow
-Pillow==11.0.0
+Pillow==10.4.0
# homeassistant.components.plex
PlexAPI==4.15.16
@@ -140,7 +140,7 @@ advantage-air==0.4.4
afsapi==0.2.7
# homeassistant.components.agent_dvr
-agent-py==0.0.24
+agent-py==0.0.23
# homeassistant.components.geo_json_events
aio-geojson-generic-client==0.4
@@ -160,9 +160,6 @@ aio-geojson-usgs-earthquakes==0.3
# homeassistant.components.gdacs
aio-georss-gdacs==0.10
-# homeassistant.components.acaia
-aioacaia==0.1.6
-
# homeassistant.components.airq
aioairq==0.3.2
@@ -170,7 +167,7 @@ aioairq==0.3.2
aioairzone-cloud==0.6.10
# homeassistant.components.airzone
-aioairzone==0.9.6
+aioairzone==0.9.5
# homeassistant.components.ambient_network
# homeassistant.components.ambient_station
@@ -339,10 +336,10 @@ aiorecollect==2023.09.0
aioridwell==2024.01.0
# homeassistant.components.ruckus_unleashed
-aioruckus==0.42
+aioruckus==0.41
# homeassistant.components.russound_rio
-aiorussound==4.1.0
+aiorussound==4.0.5
# homeassistant.components.ruuvi_gateway
aioruuvigateway==0.1.0
@@ -366,7 +363,7 @@ aiosolaredge==0.2.0
aiosteamist==1.0.0
# homeassistant.components.cambridge_audio
-aiostreammagic==2.8.5
+aiostreammagic==2.8.4
# homeassistant.components.switcher_kis
aioswitcher==4.4.0
@@ -377,9 +374,6 @@ aiosyncthing==0.5.1
# homeassistant.components.tankerkoenig
aiotankerkoenig==0.4.2
-# homeassistant.components.tedee
-aiotedee==0.2.20
-
# homeassistant.components.tractive
aiotractive==0.6.0
@@ -402,7 +396,7 @@ aiowatttime==0.1.1
aiowebostv==0.4.2
# homeassistant.components.withings
-aiowithings==3.1.3
+aiowithings==3.1.1
# homeassistant.components.yandex_transport
aioymaps==1.2.5
@@ -487,10 +481,6 @@ autarco==3.1.0
# homeassistant.components.husqvarna_automower_ble
automower-ble==0.2.0
-# homeassistant.components.generic
-# homeassistant.components.stream
-av==13.1.0
-
# homeassistant.components.axis
axis==63
@@ -604,7 +594,7 @@ colorthief==0.2.1
construct==2.10.68
# homeassistant.components.utility_meter
-cronsim==2.6
+croniter==2.0.2
# homeassistant.components.crownstone
crownstone-cloud==1.4.11
@@ -628,7 +618,7 @@ dbus-fast==2.24.3
debugpy==1.8.6
# homeassistant.components.ecovacs
-deebot-client==8.4.1
+deebot-client==8.4.0
# homeassistant.components.ihc
# homeassistant.components.namecheapdns
@@ -732,7 +722,7 @@ epion==0.0.3
epson-projector==0.5.1
# homeassistant.components.eq3btsmart
-eq3btsmart==1.4.1
+eq3btsmart==1.2.0
# homeassistant.components.esphome
esphome-dashboard-api==1.2.3
@@ -846,7 +836,7 @@ gios==5.0.0
glances-api==0.8.0
# homeassistant.components.go2rtc
-go2rtc-client==0.1.1
+go2rtc-client==0.1.0
# homeassistant.components.goalzero
goalzero==0.2.2
@@ -871,7 +861,7 @@ google-cloud-texttospeech==2.17.2
google-generativeai==0.8.2
# homeassistant.components.nest
-google-nest-sdm==6.1.5
+google-nest-sdm==6.1.3
# homeassistant.components.google_photos
google-photos-library-api==0.12.1
@@ -907,13 +897,17 @@ growattServer==1.5.0
gspread==5.5.0
# homeassistant.components.profiler
-guppy3==3.1.4.post1;python_version<'3.13'
+guppy3==3.1.4.post1
# homeassistant.components.iaqualink
h2==4.1.0
+# homeassistant.components.generic
+# homeassistant.components.stream
+ha-av==10.1.1
+
# homeassistant.components.ffmpeg
-ha-ffmpeg==3.2.2
+ha-ffmpeg==3.2.1
# homeassistant.components.iotawatt
ha-iotawattpy==0.1.2
@@ -928,10 +922,10 @@ habitipy==0.3.3
habluetooth==3.6.0
# homeassistant.components.cloud
-hass-nabucasa==0.84.0
+hass-nabucasa==0.83.0
# homeassistant.components.conversation
-hassil==2.0.1
+hassil==1.7.4
# homeassistant.components.jewish_calendar
hdate==0.10.9
@@ -956,10 +950,10 @@ hole==0.8.0
holidays==0.60
# homeassistant.components.frontend
-home-assistant-frontend==20241106.2
+home-assistant-frontend==20241106.0
# homeassistant.components.conversation
-home-assistant-intents==2024.11.13
+home-assistant-intents==2024.11.4
# homeassistant.components.home_connect
homeconnect==0.8.0
@@ -971,10 +965,10 @@ homematicip==1.1.2
httplib2==0.20.4
# homeassistant.components.huawei_lte
-huawei-lte-api==1.10.0
+huawei-lte-api==1.9.3
# homeassistant.components.huum
-huum==0.7.12
+huum==0.7.10
# homeassistant.components.hyperion
hyperion-py==0.7.5
@@ -1067,7 +1061,7 @@ lacrosse-view==1.0.3
laundrify-aio==1.2.2
# homeassistant.components.lcn
-lcn-frontend==0.2.2
+lcn-frontend==0.2.1
# homeassistant.components.ld2410_ble
ld2410-ble==0.1.1
@@ -1093,6 +1087,9 @@ libsoundtouch==0.8
# homeassistant.components.linear_garage_door
linear-garage-door==0.2.9
+# homeassistant.components.lamarzocco
+lmcloud==1.2.3
+
# homeassistant.components.london_underground
london-tube-status==0.5
@@ -1145,7 +1142,7 @@ microBeesPy==0.3.2
mill-local==0.3.0
# homeassistant.components.mill
-millheater==0.12.2
+millheater==0.11.8
# homeassistant.components.minio
minio==7.1.12
@@ -1157,7 +1154,7 @@ moat-ble==0.1.1
moehlenhoff-alpha2==1.3.1
# homeassistant.components.monzo
-monzopy==1.4.2
+monzopy==1.3.2
# homeassistant.components.mopeka
mopeka-iot-ble==0.8.0
@@ -1177,9 +1174,6 @@ mozart-api==4.1.1.116.0
# homeassistant.components.mullvad
mullvad-api==1.0.0
-# homeassistant.components.music_assistant
-music-assistant-client==1.0.5
-
# homeassistant.components.tts
mutagen==1.47.0
@@ -1220,7 +1214,7 @@ nextdns==3.3.0
nibe==2.11.0
# homeassistant.components.nice_go
-nice-go==0.3.10
+nice-go==0.3.9
# homeassistant.components.nfandroidtv
notifications-android-tv==0.1.5
@@ -1242,7 +1236,7 @@ numato-gpio==0.13.0
# homeassistant.components.stream
# homeassistant.components.tensorflow
# homeassistant.components.trend
-numpy==2.1.3
+numpy==1.26.4
# homeassistant.components.nyt_games
nyt_games==0.4.4
@@ -1329,7 +1323,7 @@ plexauth==0.0.6
plexwebsocket==0.0.14
# homeassistant.components.plugwise
-plugwise==1.5.0
+plugwise==1.4.4
# homeassistant.components.plum_lightpad
plumlightpad==0.0.11
@@ -1352,7 +1346,7 @@ prometheus-client==0.21.0
psutil-home-assistant==0.0.1
# homeassistant.components.systemmonitor
-psutil==6.1.0
+psutil==6.0.0
# homeassistant.components.androidtv
pure-python-adb[async]==0.3.0.dev0
@@ -1418,7 +1412,7 @@ pyElectra==1.2.4
pyRFXtrx==0.31.1
# homeassistant.components.tibber
-pyTibber==0.30.8
+pyTibber==0.30.4
# homeassistant.components.dlink
pyW215==0.7.0
@@ -1631,9 +1625,6 @@ pykrakenapi==0.1.8
# homeassistant.components.kulersky
pykulersky==0.5.2
-# homeassistant.components.lamarzocco
-pylamarzocco==1.2.3
-
# homeassistant.components.lastfm
pylast==5.1.0
@@ -1686,7 +1677,7 @@ pymonoprice==0.4
pymysensors==0.24.0
# homeassistant.components.iron_os
-pynecil==0.2.1
+pynecil==0.2.0
# homeassistant.components.netgear
pynetgear==0.10.10
@@ -1694,9 +1685,6 @@ pynetgear==0.10.10
# homeassistant.components.nobo_hub
pynobo==1.8.1
-# homeassistant.components.nordpool
-pynordpool==0.2.2
-
# homeassistant.components.nuki
pynuki==1.6.3
@@ -1742,7 +1730,7 @@ pyoverkiz==1.14.1
pyownet==0.10.0.post1
# homeassistant.components.palazzetti
-pypalazzetti==0.1.11
+pypalazzetti==0.1.10
# homeassistant.components.lcn
pypck==0.7.24
@@ -1850,7 +1838,7 @@ pyspeex-noise==1.0.2
pysqueezebox==0.10.0
# homeassistant.components.suez_water
-pysuezV2==1.3.1
+pysuezV2==0.2.2
# homeassistant.components.switchbee
pyswitchbee==1.8.3
@@ -1858,6 +1846,9 @@ pyswitchbee==1.8.3
# homeassistant.components.tautulli
pytautulli==23.1.1
+# homeassistant.components.tedee
+pytedee-async==0.2.20
+
# homeassistant.components.motionmount
python-MotionMount==2.2.0
@@ -1865,7 +1856,7 @@ python-MotionMount==2.2.0
python-awair==0.2.4
# homeassistant.components.bsblan
-python-bsblan==1.2.1
+python-bsblan==0.6.4
# homeassistant.components.ecobee
python-ecobee-api==0.2.20
@@ -1892,7 +1883,7 @@ python-juicenet==1.1.0
python-kasa[speedups]==0.7.7
# homeassistant.components.linkplay
-python-linkplay==0.0.20
+python-linkplay==0.0.17
# homeassistant.components.matter
python-matter-server==6.6.0
@@ -1923,7 +1914,7 @@ python-picnic-api==1.1.0
python-rabbitair==0.0.8
# homeassistant.components.roborock
-python-roborock==2.7.2
+python-roborock==2.6.1
# homeassistant.components.smarttub
python-smarttub==0.0.36
@@ -1932,7 +1923,7 @@ python-smarttub==0.0.36
python-songpal==0.16.2
# homeassistant.components.tado
-python-tado==0.17.7
+python-tado==0.17.6
# homeassistant.components.technove
python-technove==1.3.1
@@ -2047,13 +2038,13 @@ renault-api==0.2.7
renson-endura-delta==1.7.1
# homeassistant.components.reolink
-reolink-aio==0.11.1
+reolink-aio==0.10.4
# homeassistant.components.rflink
rflink==0.0.66
# homeassistant.components.ring
-ring-doorbell==0.9.12
+ring-doorbell==0.9.8
# homeassistant.components.roku
rokuecp==0.19.3
@@ -2099,7 +2090,7 @@ securetar==2024.2.1
# homeassistant.components.emulated_kasa
# homeassistant.components.sense
-sense-energy==0.13.3
+sense-energy==0.13.2
# homeassistant.components.sensirion_ble
sensirion-ble==0.1.1
@@ -2134,9 +2125,6 @@ simplepush==2.2.3
# homeassistant.components.simplisafe
simplisafe-python==2024.01.0
-# homeassistant.components.sky_remote
-skyboxremote==0.0.6
-
# homeassistant.components.slack
slackclient==2.5.0
@@ -2150,7 +2138,7 @@ smhi-pkg==1.0.18
snapcast==2.3.6
# homeassistant.components.sonos
-soco==0.30.6
+soco==0.30.4
# homeassistant.components.solarlog
solarlog_cli==0.3.2
@@ -2171,7 +2159,7 @@ speak2mary==1.4.0
speedtest-cli==2.1.3
# homeassistant.components.spotify
-spotifyaio==0.8.8
+spotifyaio==0.8.5
# homeassistant.components.sql
sqlparse==0.5.0
@@ -2277,7 +2265,7 @@ toonapi==0.3.0
total-connect-client==2024.5
# homeassistant.components.tplink_omada
-tplink-omada-client==1.4.3
+tplink-omada-client==1.4.2
# homeassistant.components.transmission
transmission-rpc==7.0.3
@@ -2292,7 +2280,7 @@ ttls==1.8.3
ttn_client==1.2.0
# homeassistant.components.tuya
-tuya-device-sharing-sdk==0.2.1
+tuya-device-sharing-sdk==0.1.9
# homeassistant.components.twentemilieu
twentemilieu==2.0.1
@@ -2381,14 +2369,11 @@ watchdog==2.3.1
# homeassistant.components.weatherflow_cloud
weatherflow4py==1.0.6
-# homeassistant.components.nasweb
-webio-api==0.1.8
-
# homeassistant.components.webmin
webmin-xmlrpc==0.0.2
# homeassistant.components.weheat
-weheat==2024.11.02
+weheat==2024.09.23
# homeassistant.components.whirlpool
whirlpool-sixth-sense==0.18.8
@@ -2467,7 +2452,7 @@ zeversolar==0.3.2
zha==0.0.37
# homeassistant.components.zwave_js
-zwave-js-server-python==0.59.1
+zwave-js-server-python==0.58.1
# homeassistant.components.zwave_me
zwave-me-ws==0.4.3
diff --git a/requirements_test_pre_commit.txt b/requirements_test_pre_commit.txt
index 23f584dd0de..a1c6304220c 100644
--- a/requirements_test_pre_commit.txt
+++ b/requirements_test_pre_commit.txt
@@ -1,5 +1,5 @@
# Automatically generated from .pre-commit-config.yaml by gen_requirements_all.py, do not edit
codespell==2.3.0
-ruff==0.7.3
+ruff==0.7.1
yamllint==1.35.1
diff --git a/script/gen_requirements_all.py b/script/gen_requirements_all.py
index 7d53741c661..36962ce1fe9 100755
--- a/script/gen_requirements_all.py
+++ b/script/gen_requirements_all.py
@@ -58,16 +58,8 @@ INCLUDED_REQUIREMENTS_WHEELS = {
# will be included in requirements_all_{action}.txt
OVERRIDDEN_REQUIREMENTS_ACTIONS = {
- "pytest": {
- "exclude": set(),
- "include": {"python-gammu"},
- "markers": {},
- },
- "wheels_aarch64": {
- "exclude": set(),
- "include": INCLUDED_REQUIREMENTS_WHEELS,
- "markers": {},
- },
+ "pytest": {"exclude": set(), "include": {"python-gammu"}},
+ "wheels_aarch64": {"exclude": set(), "include": INCLUDED_REQUIREMENTS_WHEELS},
# Pandas has issues building on armhf, it is expected they
# will drop the platform in the near future (they consider it
# "flimsy" on 386). The following packages depend on pandas,
@@ -75,23 +67,10 @@ OVERRIDDEN_REQUIREMENTS_ACTIONS = {
"wheels_armhf": {
"exclude": {"env-canada", "noaa-coops", "pyezviz", "pykrakenapi"},
"include": INCLUDED_REQUIREMENTS_WHEELS,
- "markers": {},
- },
- "wheels_armv7": {
- "exclude": set(),
- "include": INCLUDED_REQUIREMENTS_WHEELS,
- "markers": {},
- },
- "wheels_amd64": {
- "exclude": set(),
- "include": INCLUDED_REQUIREMENTS_WHEELS,
- "markers": {},
- },
- "wheels_i386": {
- "exclude": set(),
- "include": INCLUDED_REQUIREMENTS_WHEELS,
- "markers": {},
},
+ "wheels_armv7": {"exclude": set(), "include": INCLUDED_REQUIREMENTS_WHEELS},
+ "wheels_amd64": {"exclude": set(), "include": INCLUDED_REQUIREMENTS_WHEELS},
+ "wheels_i386": {"exclude": set(), "include": INCLUDED_REQUIREMENTS_WHEELS},
}
IGNORE_PIN = ("colorlog>2.1,<3", "urllib3")
@@ -117,9 +96,9 @@ httplib2>=0.19.0
# gRPC is an implicit dependency that we want to make explicit so we manage
# upgrades intentionally. It is a large package to build from source and we
# want to ensure we have wheels built.
-grpcio==1.67.1
-grpcio-status==1.67.1
-grpcio-reflection==1.67.1
+grpcio==1.66.2
+grpcio-status==1.66.2
+grpcio-reflection==1.66.2
# This is a old unmaintained library and is replaced with pycryptodome
pycrypto==1000000000.0.0
@@ -148,8 +127,7 @@ httpcore==1.0.5
hyperframe>=5.2.0
# Ensure we run compatible with musllinux build env
-numpy==2.1.3
-pandas~=2.2.3
+numpy==1.26.4
# Constrain multidict to avoid typing issues
# https://github.com/home-assistant/core/pull/67046
@@ -160,7 +138,7 @@ backoff>=2.0
# Required to avoid breaking (#101042).
# v2 has breaking changes (#99218).
-pydantic==1.10.19
+pydantic==1.10.18
# Required for Python 3.12.4 compatibility (#119223).
mashumaro>=3.13.1
@@ -201,12 +179,15 @@ get-mac==1000000000.0.0
# We want to skip the binary wheels for the 'charset-normalizer' packages.
# They are build with mypyc, but causes issues with our wheel builder.
# In order to do so, we need to constrain the version.
-charset-normalizer==3.4.0
+charset-normalizer==3.2.0
# dacite: Ensure we have a version that is able to handle type unions for
-# NAM, Brother, and GIOS.
+# Roborock, NAM, Brother, and GIOS.
dacite>=1.7.0
+# Musle wheels for pandas 2.2.0 cannot be build for any architecture.
+pandas==2.1.4
+
# chacha20poly1305-reuseable==0.12.x is incompatible with cryptography==43.0.x
chacha20poly1305-reuseable>=0.13.0
@@ -214,8 +195,8 @@ chacha20poly1305-reuseable>=0.13.0
# https://github.com/pycountry/pycountry/blob/ea69bab36f00df58624a0e490fdad4ccdc14268b/HISTORY.txt#L39
pycountry>=23.12.11
-# scapy==2.6.0 causes CI failures due to a race condition
-scapy>=2.6.1
+# scapy<2.5.0 will not work with python3.12
+scapy>=2.5.0
# tuf isn't updated to deal with breaking changes in securesystemslib==1.0.
# Only tuf>=4 includes a constraint to <1.0.
@@ -332,10 +313,6 @@ def process_action_requirement(req: str, action: str) -> str:
return req
if normalized_package_name in EXCLUDED_REQUIREMENTS_ALL:
return f"# {req}"
- if markers := OVERRIDDEN_REQUIREMENTS_ACTIONS[action]["markers"].get(
- normalized_package_name, None
- ):
- return f"{req};{markers}"
return req
diff --git a/script/hassfest/docker.py b/script/hassfest/docker.py
index 57d86bc4def..083cdaba1a9 100644
--- a/script/hassfest/docker.py
+++ b/script/hassfest/docker.py
@@ -4,7 +4,6 @@ from dataclasses import dataclass
from pathlib import Path
from homeassistant import core
-from homeassistant.components.go2rtc.const import RECOMMENDED_VERSION as GO2RTC_VERSION
from homeassistant.const import Platform
from homeassistant.util import executor, thread
from script.gen_requirements_all import gather_recursive_requirements
@@ -80,7 +79,7 @@ WORKDIR /config
_HASSFEST_TEMPLATE = r"""# Automatically generated by hassfest.
#
# To update, run python3 -m script.hassfest -p docker
-FROM python:3.13-alpine
+FROM python:3.12-alpine
ENV \
UV_SYSTEM_PYTHON=true \
@@ -113,6 +112,8 @@ LABEL "com.github.actions.icon"="terminal"
LABEL "com.github.actions.color"="gray-dark"
"""
+_GO2RTC_VERSION = "1.9.6"
+
def _get_package_versions(file: Path, packages: set[str]) -> dict[str, str]:
package_versions: dict[str, str] = {}
@@ -161,8 +162,6 @@ def _generate_hassfest_dockerimage(
packages.update(
gather_recursive_requirements(platform.value, already_checked_domains)
)
- # Add go2rtc requirements as this file needs the go2rtc integration
- packages.update(gather_recursive_requirements("go2rtc", already_checked_domains))
return File(
_HASSFEST_TEMPLATE.format(
@@ -198,7 +197,7 @@ def _generate_files(config: Config) -> list[File]:
DOCKERFILE_TEMPLATE.format(
timeout=timeout,
**package_versions,
- go2rtc=GO2RTC_VERSION,
+ go2rtc=_GO2RTC_VERSION,
),
config.root / "Dockerfile",
),
diff --git a/script/hassfest/docker/Dockerfile b/script/hassfest/docker/Dockerfile
index 0fa0a1a89fa..f54849ee12b 100644
--- a/script/hassfest/docker/Dockerfile
+++ b/script/hassfest/docker/Dockerfile
@@ -1,7 +1,7 @@
# Automatically generated by hassfest.
#
# To update, run python3 -m script.hassfest -p docker
-FROM python:3.13-alpine
+FROM python:3.12-alpine
ENV \
UV_SYSTEM_PYTHON=true \
@@ -14,7 +14,7 @@ WORKDIR "/github/workspace"
COPY . /usr/src/homeassistant
# Uv is only needed during build
-RUN --mount=from=ghcr.io/astral-sh/uv:0.5.0,source=/uv,target=/bin/uv \
+RUN --mount=from=ghcr.io/astral-sh/uv:0.4.28,source=/uv,target=/bin/uv \
# Required for PyTurboJPEG
apk add --no-cache libturbojpeg \
&& uv pip install \
@@ -22,8 +22,8 @@ RUN --mount=from=ghcr.io/astral-sh/uv:0.5.0,source=/uv,target=/bin/uv \
--no-cache \
-c /usr/src/homeassistant/homeassistant/package_constraints.txt \
-r /usr/src/homeassistant/requirements.txt \
- stdlib-list==0.10.0 pipdeptree==2.23.4 tqdm==4.66.5 ruff==0.7.3 \
- PyTurboJPEG==1.7.5 go2rtc-client==0.1.1 ha-ffmpeg==3.2.2 hassil==2.0.1 home-assistant-intents==2024.11.13 mutagen==1.47.0 pymicro-vad==1.0.1 pyspeex-noise==1.0.2
+ stdlib-list==0.10.0 pipdeptree==2.23.4 tqdm==4.66.5 ruff==0.7.1 \
+ PyTurboJPEG==1.7.5 ha-ffmpeg==3.2.1 hassil==1.7.4 home-assistant-intents==2024.11.4 mutagen==1.47.0 pymicro-vad==1.0.1 pyspeex-noise==1.0.2
LABEL "name"="hassfest"
LABEL "maintainer"="Home Assistant "
diff --git a/script/hassfest/manifest.py b/script/hassfest/manifest.py
index 4013c8a6c19..6d2f4087f59 100644
--- a/script/hassfest/manifest.py
+++ b/script/hassfest/manifest.py
@@ -268,6 +268,7 @@ INTEGRATION_MANIFEST_SCHEMA = vol.Schema(
)
],
vol.Required("documentation"): vol.All(vol.Url(), documentation_url),
+ vol.Optional("issue_tracker"): vol.Url(),
vol.Optional("quality_scale"): vol.In(SUPPORTED_QUALITY_SCALES),
vol.Optional("requirements"): [str],
vol.Optional("dependencies"): [str],
@@ -303,7 +304,6 @@ def manifest_schema(value: dict[str, Any]) -> vol.Schema:
CUSTOM_INTEGRATION_MANIFEST_SCHEMA = INTEGRATION_MANIFEST_SCHEMA.extend(
{
vol.Optional("version"): vol.All(str, verify_version),
- vol.Optional("issue_tracker"): vol.Url(),
vol.Optional("import_executor"): bool,
}
)
diff --git a/script/hassfest/mypy_config.py b/script/hassfest/mypy_config.py
index 25fe875e437..de42c964ddf 100644
--- a/script/hassfest/mypy_config.py
+++ b/script/hassfest/mypy_config.py
@@ -43,7 +43,6 @@ GENERAL_SETTINGS: Final[dict[str, str]] = {
"local_partial_types": "true",
"strict_equality": "true",
"no_implicit_optional": "true",
- "report_deprecated_as_error": "true",
"warn_incomplete_stub": "true",
"warn_redundant_casts": "true",
"warn_unused_configs": "true",
diff --git a/script/hassfest/services.py b/script/hassfest/services.py
index 8c9ab5c0c0b..92fca14d373 100644
--- a/script/hassfest/services.py
+++ b/script/hassfest/services.py
@@ -75,14 +75,6 @@ CUSTOM_INTEGRATION_FIELD_SCHEMA = CORE_INTEGRATION_FIELD_SCHEMA.extend(
}
)
-CUSTOM_INTEGRATION_SECTION_SCHEMA = vol.Schema(
- {
- vol.Optional("collapsed"): bool,
- vol.Required("fields"): vol.Schema({str: CUSTOM_INTEGRATION_FIELD_SCHEMA}),
- }
-)
-
-
CORE_INTEGRATION_SERVICE_SCHEMA = vol.Any(
vol.Schema(
{
@@ -113,17 +105,7 @@ CUSTOM_INTEGRATION_SERVICE_SCHEMA = vol.Any(
vol.Optional("target"): vol.Any(
selector.TargetSelector.CONFIG_SCHEMA, None
),
- vol.Optional("fields"): vol.All(
- vol.Schema(
- {
- str: vol.Any(
- CUSTOM_INTEGRATION_FIELD_SCHEMA,
- CUSTOM_INTEGRATION_SECTION_SCHEMA,
- )
- }
- ),
- unique_field_validator,
- ),
+ vol.Optional("fields"): vol.Schema({str: CUSTOM_INTEGRATION_FIELD_SCHEMA}),
}
),
None,
diff --git a/script/licenses.py b/script/licenses.py
index 464a2fc456b..4f5432ad519 100644
--- a/script/licenses.py
+++ b/script/licenses.py
@@ -84,7 +84,6 @@ OSI_APPROVED_LICENSES_SPDX = {
"LGPL-3.0-only",
"LGPL-3.0-or-later",
"MIT",
- "MIT-CMU",
"MPL-1.1",
"MPL-2.0",
"PSF-2.0",
@@ -189,6 +188,7 @@ EXCEPTIONS = {
"crownstone-uart", # https://github.com/crownstone/crownstone-lib-python-uart/pull/12
"eliqonline", # https://github.com/molobrakos/eliqonline/pull/17
"enocean", # https://github.com/kipe/enocean/pull/142
+ "huum", # https://github.com/frwickst/pyhuum/pull/8
"imutils", # https://github.com/PyImageSearch/imutils/pull/292
"iso4217", # Public domain
"kiwiki_client", # https://github.com/c7h/kiwiki_client/pull/6
diff --git a/script/split_tests.py b/script/split_tests.py
index c64de46a068..e124f722552 100755
--- a/script/split_tests.py
+++ b/script/split_tests.py
@@ -49,27 +49,16 @@ class BucketHolder:
test_folder.get_all_flatten(), reverse=True, key=lambda x: x.total_tests
)
for tests in sorted_tests:
+ print(f"{tests.total_tests:>{digits}} tests in {tests.path}")
if tests.added_to_bucket:
# Already added to bucket
continue
- print(f"{tests.total_tests:>{digits}} tests in {tests.path}")
smallest_bucket = min(self._buckets, key=lambda x: x.total_tests)
- is_file = isinstance(tests, TestFile)
if (
smallest_bucket.total_tests + tests.total_tests < self._tests_per_bucket
- ) or is_file:
+ ) or isinstance(tests, TestFile):
smallest_bucket.add(tests)
- # Ensure all files from the same folder are in the same bucket
- # to ensure that syrupy correctly identifies unused snapshots
- if is_file:
- for other_test in tests.parent.children.values():
- if other_test is tests or isinstance(other_test, TestFolder):
- continue
- print(
- f"{other_test.total_tests:>{digits}} tests in {other_test.path} (same bucket)"
- )
- smallest_bucket.add(other_test)
# verify that all tests are added to a bucket
if not test_folder.added_to_bucket:
@@ -90,7 +79,6 @@ class TestFile:
total_tests: int
path: Path
added_to_bucket: bool = field(default=False, init=False)
- parent: TestFolder | None = field(default=None, init=False)
def add_to_bucket(self) -> None:
"""Add test file to bucket."""
@@ -137,7 +125,6 @@ class TestFolder:
def add_test_file(self, file: TestFile) -> None:
"""Add test file to folder."""
path = file.path
- file.parent = self
relative_path = path.relative_to(self.path)
if not relative_path.parts:
raise ValueError("Path is not a child of this folder")
diff --git a/tests/components/acaia/__init__.py b/tests/components/acaia/__init__.py
deleted file mode 100644
index f4eaa39e615..00000000000
--- a/tests/components/acaia/__init__.py
+++ /dev/null
@@ -1,14 +0,0 @@
-"""Common test tools for the acaia integration."""
-
-from homeassistant.core import HomeAssistant
-
-from tests.common import MockConfigEntry
-
-
-async def setup_integration(
- hass: HomeAssistant, mock_config_entry: MockConfigEntry
-) -> None:
- """Set up the acaia integration for testing."""
- mock_config_entry.add_to_hass(hass)
- await hass.config_entries.async_setup(mock_config_entry.entry_id)
- await hass.async_block_till_done()
diff --git a/tests/components/acaia/conftest.py b/tests/components/acaia/conftest.py
deleted file mode 100644
index 1dc6ff31051..00000000000
--- a/tests/components/acaia/conftest.py
+++ /dev/null
@@ -1,80 +0,0 @@
-"""Common fixtures for the acaia tests."""
-
-from collections.abc import Generator
-from unittest.mock import AsyncMock, MagicMock, patch
-
-from aioacaia.acaiascale import AcaiaDeviceState
-from aioacaia.const import UnitMass as AcaiaUnitOfMass
-import pytest
-
-from homeassistant.components.acaia.const import CONF_IS_NEW_STYLE_SCALE, DOMAIN
-from homeassistant.const import CONF_ADDRESS
-from homeassistant.core import HomeAssistant
-
-from . import setup_integration
-
-from tests.common import MockConfigEntry
-
-
-@pytest.fixture
-def mock_setup_entry() -> Generator[AsyncMock]:
- """Override async_setup_entry."""
- with patch(
- "homeassistant.components.acaia.async_setup_entry", return_value=True
- ) as mock_setup_entry:
- yield mock_setup_entry
-
-
-@pytest.fixture
-def mock_verify() -> Generator[AsyncMock]:
- """Override is_new_scale check."""
- with patch(
- "homeassistant.components.acaia.config_flow.is_new_scale", return_value=True
- ) as mock_verify:
- yield mock_verify
-
-
-@pytest.fixture
-def mock_config_entry(hass: HomeAssistant) -> MockConfigEntry:
- """Return the default mocked config entry."""
- return MockConfigEntry(
- title="LUNAR-DDEEFF",
- domain=DOMAIN,
- version=1,
- data={
- CONF_ADDRESS: "aa:bb:cc:dd:ee:ff",
- CONF_IS_NEW_STYLE_SCALE: True,
- },
- unique_id="aa:bb:cc:dd:ee:ff",
- )
-
-
-@pytest.fixture
-async def init_integration(
- hass: HomeAssistant, mock_config_entry: MockConfigEntry, mock_scale: MagicMock
-) -> None:
- """Set up the acaia integration for testing."""
- await setup_integration(hass, mock_config_entry)
-
-
-@pytest.fixture
-def mock_scale() -> Generator[MagicMock]:
- """Return a mocked acaia scale client."""
- with (
- patch(
- "homeassistant.components.acaia.coordinator.AcaiaScale",
- autospec=True,
- ) as scale_mock,
- ):
- scale = scale_mock.return_value
- scale.connected = True
- scale.mac = "aa:bb:cc:dd:ee:ff"
- scale.model = "Lunar"
- scale.timer_running = True
- scale.heartbeat_task = None
- scale.process_queue_task = None
- scale.device_state = AcaiaDeviceState(
- battery_level=42, units=AcaiaUnitOfMass.GRAMS
- )
- scale.weight = 123.45
- yield scale
diff --git a/tests/components/acaia/snapshots/test_button.ambr b/tests/components/acaia/snapshots/test_button.ambr
deleted file mode 100644
index cd91ca1a17a..00000000000
--- a/tests/components/acaia/snapshots/test_button.ambr
+++ /dev/null
@@ -1,139 +0,0 @@
-# serializer version: 1
-# name: test_buttons[button.lunar_ddeeff_reset_timer-entry]
- EntityRegistryEntrySnapshot({
- 'aliases': set({
- }),
- 'area_id': None,
- 'capabilities': None,
- 'config_entry_id': ,
- 'device_class': None,
- 'device_id': ,
- 'disabled_by': None,
- 'domain': 'button',
- 'entity_category': None,
- 'entity_id': 'button.lunar_ddeeff_reset_timer',
- 'has_entity_name': True,
- 'hidden_by': None,
- 'icon': None,
- 'id': ,
- 'labels': set({
- }),
- 'name': None,
- 'options': dict({
- }),
- 'original_device_class': None,
- 'original_icon': None,
- 'original_name': 'Reset timer',
- 'platform': 'acaia',
- 'previous_unique_id': None,
- 'supported_features': 0,
- 'translation_key': 'reset_timer',
- 'unique_id': 'aa:bb:cc:dd:ee:ff_reset_timer',
- 'unit_of_measurement': None,
- })
-# ---
-# name: test_buttons[button.lunar_ddeeff_reset_timer-state]
- StateSnapshot({
- 'attributes': ReadOnlyDict({
- 'friendly_name': 'LUNAR-DDEEFF Reset timer',
- }),
- 'context': ,
- 'entity_id': 'button.lunar_ddeeff_reset_timer',
- 'last_changed': ,
- 'last_reported': ,
- 'last_updated': ,
- 'state': 'unknown',
- })
-# ---
-# name: test_buttons[button.lunar_ddeeff_start_stop_timer-entry]
- EntityRegistryEntrySnapshot({
- 'aliases': set({
- }),
- 'area_id': None,
- 'capabilities': None,
- 'config_entry_id': ,
- 'device_class': None,
- 'device_id': ,
- 'disabled_by': None,
- 'domain': 'button',
- 'entity_category': None,
- 'entity_id': 'button.lunar_ddeeff_start_stop_timer',
- 'has_entity_name': True,
- 'hidden_by': None,
- 'icon': None,
- 'id': ,
- 'labels': set({
- }),
- 'name': None,
- 'options': dict({
- }),
- 'original_device_class': None,
- 'original_icon': None,
- 'original_name': 'Start/stop timer',
- 'platform': 'acaia',
- 'previous_unique_id': None,
- 'supported_features': 0,
- 'translation_key': 'start_stop',
- 'unique_id': 'aa:bb:cc:dd:ee:ff_start_stop',
- 'unit_of_measurement': None,
- })
-# ---
-# name: test_buttons[button.lunar_ddeeff_start_stop_timer-state]
- StateSnapshot({
- 'attributes': ReadOnlyDict({
- 'friendly_name': 'LUNAR-DDEEFF Start/stop timer',
- }),
- 'context': ,
- 'entity_id': 'button.lunar_ddeeff_start_stop_timer',
- 'last_changed': ,
- 'last_reported': ,
- 'last_updated': ,
- 'state': 'unknown',
- })
-# ---
-# name: test_buttons[button.lunar_ddeeff_tare-entry]
- EntityRegistryEntrySnapshot({
- 'aliases': set({
- }),
- 'area_id': None,
- 'capabilities': None,
- 'config_entry_id': ,
- 'device_class': None,
- 'device_id': ,
- 'disabled_by': None,
- 'domain': 'button',
- 'entity_category': None,
- 'entity_id': 'button.lunar_ddeeff_tare',
- 'has_entity_name': True,
- 'hidden_by': None,
- 'icon': None,
- 'id': ,
- 'labels': set({
- }),
- 'name': None,
- 'options': dict({
- }),
- 'original_device_class': None,
- 'original_icon': None,
- 'original_name': 'Tare',
- 'platform': 'acaia',
- 'previous_unique_id': None,
- 'supported_features': 0,
- 'translation_key': 'tare',
- 'unique_id': 'aa:bb:cc:dd:ee:ff_tare',
- 'unit_of_measurement': None,
- })
-# ---
-# name: test_buttons[button.lunar_ddeeff_tare-state]
- StateSnapshot({
- 'attributes': ReadOnlyDict({
- 'friendly_name': 'LUNAR-DDEEFF Tare',
- }),
- 'context': ,
- 'entity_id': 'button.lunar_ddeeff_tare',
- 'last_changed': ,
- 'last_reported': ,
- 'last_updated': ,
- 'state': 'unknown',
- })
-# ---
diff --git a/tests/components/acaia/snapshots/test_init.ambr b/tests/components/acaia/snapshots/test_init.ambr
deleted file mode 100644
index 1cc3d8dbbc0..00000000000
--- a/tests/components/acaia/snapshots/test_init.ambr
+++ /dev/null
@@ -1,33 +0,0 @@
-# serializer version: 1
-# name: test_device
- DeviceRegistryEntrySnapshot({
- 'area_id': 'kitchen',
- 'config_entries': ,
- 'configuration_url': None,
- 'connections': set({
- }),
- 'disabled_by': None,
- 'entry_type': None,
- 'hw_version': None,
- 'id': ,
- 'identifiers': set({
- tuple(
- 'acaia',
- 'aa:bb:cc:dd:ee:ff',
- ),
- }),
- 'is_new': False,
- 'labels': set({
- }),
- 'manufacturer': 'Acaia',
- 'model': 'Lunar',
- 'model_id': None,
- 'name': 'LUNAR-DDEEFF',
- 'name_by_user': None,
- 'primary_config_entry': ,
- 'serial_number': None,
- 'suggested_area': 'Kitchen',
- 'sw_version': None,
- 'via_device_id': None,
- })
-# ---
diff --git a/tests/components/acaia/test_button.py b/tests/components/acaia/test_button.py
deleted file mode 100644
index f68f85e253d..00000000000
--- a/tests/components/acaia/test_button.py
+++ /dev/null
@@ -1,90 +0,0 @@
-"""Tests for the acaia buttons."""
-
-from datetime import timedelta
-from unittest.mock import MagicMock, patch
-
-from freezegun.api import FrozenDateTimeFactory
-from syrupy import SnapshotAssertion
-
-from homeassistant.components.button import DOMAIN as BUTTON_DOMAIN, SERVICE_PRESS
-from homeassistant.const import (
- ATTR_ENTITY_ID,
- STATE_UNAVAILABLE,
- STATE_UNKNOWN,
- Platform,
-)
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import entity_registry as er
-
-from . import setup_integration
-
-from tests.common import MockConfigEntry, async_fire_time_changed, snapshot_platform
-
-BUTTONS = (
- "tare",
- "reset_timer",
- "start_stop_timer",
-)
-
-
-async def test_buttons(
- hass: HomeAssistant,
- entity_registry: er.EntityRegistry,
- snapshot: SnapshotAssertion,
- mock_scale: MagicMock,
- mock_config_entry: MockConfigEntry,
-) -> None:
- """Test the acaia buttons."""
-
- with patch("homeassistant.components.acaia.PLATFORMS", [Platform.BUTTON]):
- await setup_integration(hass, mock_config_entry)
- await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)
-
-
-async def test_button_presses(
- hass: HomeAssistant,
- mock_scale: MagicMock,
- mock_config_entry: MockConfigEntry,
-) -> None:
- """Test the acaia button presses."""
-
- await setup_integration(hass, mock_config_entry)
-
- for button in BUTTONS:
- await hass.services.async_call(
- BUTTON_DOMAIN,
- SERVICE_PRESS,
- {
- ATTR_ENTITY_ID: f"button.lunar_ddeeff_{button}",
- },
- blocking=True,
- )
-
- function = getattr(mock_scale, button)
- function.assert_called_once()
-
-
-async def test_buttons_unavailable_on_disconnected_scale(
- hass: HomeAssistant,
- mock_scale: MagicMock,
- mock_config_entry: MockConfigEntry,
- freezer: FrozenDateTimeFactory,
-) -> None:
- """Test the acaia buttons are unavailable when the scale is disconnected."""
-
- await setup_integration(hass, mock_config_entry)
-
- for button in BUTTONS:
- state = hass.states.get(f"button.lunar_ddeeff_{button}")
- assert state
- assert state.state == STATE_UNKNOWN
-
- mock_scale.connected = False
- freezer.tick(timedelta(minutes=10))
- async_fire_time_changed(hass)
- await hass.async_block_till_done()
-
- for button in BUTTONS:
- state = hass.states.get(f"button.lunar_ddeeff_{button}")
- assert state
- assert state.state == STATE_UNAVAILABLE
diff --git a/tests/components/acaia/test_config_flow.py b/tests/components/acaia/test_config_flow.py
deleted file mode 100644
index 2bf4b1dbe8a..00000000000
--- a/tests/components/acaia/test_config_flow.py
+++ /dev/null
@@ -1,242 +0,0 @@
-"""Test the acaia config flow."""
-
-from collections.abc import Generator
-from unittest.mock import AsyncMock, patch
-
-from aioacaia.exceptions import AcaiaDeviceNotFound, AcaiaError, AcaiaUnknownDevice
-import pytest
-
-from homeassistant.components.acaia.const import CONF_IS_NEW_STYLE_SCALE, DOMAIN
-from homeassistant.config_entries import SOURCE_BLUETOOTH, SOURCE_USER
-from homeassistant.const import CONF_ADDRESS
-from homeassistant.core import HomeAssistant
-from homeassistant.data_entry_flow import FlowResultType
-from homeassistant.helpers.service_info.bluetooth import BluetoothServiceInfo
-
-from tests.common import MockConfigEntry
-
-service_info = BluetoothServiceInfo(
- name="LUNAR-DDEEFF",
- address="aa:bb:cc:dd:ee:ff",
- rssi=-63,
- manufacturer_data={},
- service_data={},
- service_uuids=[],
- source="local",
-)
-
-
-@pytest.fixture
-def mock_discovered_service_info() -> Generator[AsyncMock]:
- """Override getting Bluetooth service info."""
- with patch(
- "homeassistant.components.acaia.config_flow.async_discovered_service_info",
- return_value=[service_info],
- ) as mock_discovered_service_info:
- yield mock_discovered_service_info
-
-
-async def test_form(
- hass: HomeAssistant,
- mock_setup_entry: AsyncMock,
- mock_verify: AsyncMock,
- mock_discovered_service_info: AsyncMock,
-) -> None:
- """Test we get the form."""
- result = await hass.config_entries.flow.async_init(
- DOMAIN, context={"source": SOURCE_USER}
- )
- assert result["type"] is FlowResultType.FORM
- assert result["step_id"] == "user"
-
- user_input = {
- CONF_ADDRESS: "aa:bb:cc:dd:ee:ff",
- }
- result2 = await hass.config_entries.flow.async_configure(
- result["flow_id"],
- user_input=user_input,
- )
-
- assert result2["type"] is FlowResultType.CREATE_ENTRY
- assert result2["title"] == "LUNAR-DDEEFF"
- assert result2["data"] == {
- **user_input,
- CONF_IS_NEW_STYLE_SCALE: True,
- }
-
-
-async def test_bluetooth_discovery(
- hass: HomeAssistant,
- mock_setup_entry: AsyncMock,
- mock_verify: AsyncMock,
-) -> None:
- """Test we can discover a device."""
-
- result = await hass.config_entries.flow.async_init(
- DOMAIN, context={"source": SOURCE_BLUETOOTH}, data=service_info
- )
-
- assert result["type"] is FlowResultType.FORM
- assert result["step_id"] == "bluetooth_confirm"
-
- result2 = await hass.config_entries.flow.async_configure(
- result["flow_id"],
- user_input={},
- )
-
- assert result2["type"] is FlowResultType.CREATE_ENTRY
- assert result2["title"] == service_info.name
- assert result2["data"] == {
- CONF_ADDRESS: service_info.address,
- CONF_IS_NEW_STYLE_SCALE: True,
- }
-
-
-@pytest.mark.parametrize(
- ("exception", "error"),
- [
- (AcaiaDeviceNotFound("Error"), "device_not_found"),
- (AcaiaError, "unknown"),
- (AcaiaUnknownDevice, "unsupported_device"),
- ],
-)
-async def test_bluetooth_discovery_errors(
- hass: HomeAssistant,
- mock_verify: AsyncMock,
- exception: Exception,
- error: str,
-) -> None:
- """Test abortions of Bluetooth discovery."""
- mock_verify.side_effect = exception
-
- result = await hass.config_entries.flow.async_init(
- DOMAIN, context={"source": SOURCE_BLUETOOTH}, data=service_info
- )
-
- assert result["type"] is FlowResultType.ABORT
- assert result["reason"] == error
-
-
-async def test_already_configured(
- hass: HomeAssistant,
- mock_config_entry: MockConfigEntry,
- mock_verify: AsyncMock,
- mock_discovered_service_info: AsyncMock,
-) -> None:
- """Ensure we can't add the same device twice."""
-
- mock_config_entry.add_to_hass(hass)
-
- result = await hass.config_entries.flow.async_init(
- DOMAIN, context={"source": SOURCE_USER}
- )
- assert result["type"] is FlowResultType.FORM
-
- result2 = await hass.config_entries.flow.async_configure(
- result["flow_id"],
- {
- CONF_ADDRESS: "aa:bb:cc:dd:ee:ff",
- },
- )
- await hass.async_block_till_done()
-
- assert result2["type"] is FlowResultType.ABORT
- assert result2["reason"] == "already_configured"
-
-
-async def test_already_configured_bluetooth_discovery(
- hass: HomeAssistant,
- mock_config_entry: MockConfigEntry,
-) -> None:
- """Ensure configure device is not discovered again."""
-
- mock_config_entry.add_to_hass(hass)
-
- result = await hass.config_entries.flow.async_init(
- DOMAIN, context={"source": SOURCE_BLUETOOTH}, data=service_info
- )
-
- assert result["type"] is FlowResultType.ABORT
- assert result["reason"] == "already_configured"
-
-
-@pytest.mark.parametrize(
- ("exception", "error"),
- [
- (AcaiaDeviceNotFound("Error"), "device_not_found"),
- (AcaiaError, "unknown"),
- ],
-)
-async def test_recoverable_config_flow_errors(
- hass: HomeAssistant,
- mock_setup_entry: AsyncMock,
- mock_verify: AsyncMock,
- mock_discovered_service_info: AsyncMock,
- exception: Exception,
- error: str,
-) -> None:
- """Test recoverable errors."""
- mock_verify.side_effect = exception
- result = await hass.config_entries.flow.async_init(
- DOMAIN, context={"source": SOURCE_USER}
- )
- assert result["type"] is FlowResultType.FORM
-
- result2 = await hass.config_entries.flow.async_configure(
- result["flow_id"],
- {
- CONF_ADDRESS: "aa:bb:cc:dd:ee:ff",
- },
- )
-
- assert result2["type"] is FlowResultType.FORM
- assert result2["errors"] == {"base": error}
-
- # recover
- mock_verify.side_effect = None
- result3 = await hass.config_entries.flow.async_configure(
- result2["flow_id"],
- {
- CONF_ADDRESS: "aa:bb:cc:dd:ee:ff",
- },
- )
- assert result3["type"] is FlowResultType.CREATE_ENTRY
-
-
-async def test_unsupported_device(
- hass: HomeAssistant,
- mock_setup_entry: AsyncMock,
- mock_verify: AsyncMock,
- mock_discovered_service_info: AsyncMock,
-) -> None:
- """Test flow aborts on unsupported device."""
- mock_verify.side_effect = AcaiaUnknownDevice
- result = await hass.config_entries.flow.async_init(
- DOMAIN, context={"source": SOURCE_USER}
- )
- assert result["type"] is FlowResultType.FORM
-
- result2 = await hass.config_entries.flow.async_configure(
- result["flow_id"],
- {
- CONF_ADDRESS: "aa:bb:cc:dd:ee:ff",
- },
- )
-
- assert result2["type"] is FlowResultType.ABORT
- assert result2["reason"] == "unsupported_device"
-
-
-async def test_no_bluetooth_devices(
- hass: HomeAssistant,
- mock_setup_entry: AsyncMock,
- mock_discovered_service_info: AsyncMock,
-) -> None:
- """Test flow aborts on unsupported device."""
- mock_discovered_service_info.return_value = []
-
- result = await hass.config_entries.flow.async_init(
- DOMAIN, context={"source": SOURCE_USER}
- )
- assert result["type"] is FlowResultType.ABORT
- assert result["reason"] == "no_devices_found"
diff --git a/tests/components/acaia/test_init.py b/tests/components/acaia/test_init.py
deleted file mode 100644
index 8ad988d3b9b..00000000000
--- a/tests/components/acaia/test_init.py
+++ /dev/null
@@ -1,65 +0,0 @@
-"""Test init of acaia integration."""
-
-from datetime import timedelta
-from unittest.mock import MagicMock
-
-from aioacaia.exceptions import AcaiaDeviceNotFound, AcaiaError
-from freezegun.api import FrozenDateTimeFactory
-import pytest
-from syrupy import SnapshotAssertion
-
-from homeassistant.components.acaia.const import DOMAIN
-from homeassistant.config_entries import ConfigEntryState
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import device_registry as dr
-
-from tests.common import MockConfigEntry, async_fire_time_changed
-
-pytestmark = pytest.mark.usefixtures("init_integration")
-
-
-async def test_load_unload_config_entry(
- hass: HomeAssistant,
- mock_config_entry: MockConfigEntry,
-) -> None:
- """Test loading and unloading the integration."""
-
- assert mock_config_entry.state is ConfigEntryState.LOADED
-
- await hass.config_entries.async_unload(mock_config_entry.entry_id)
- await hass.async_block_till_done()
-
- assert mock_config_entry.state is ConfigEntryState.NOT_LOADED
-
-
-@pytest.mark.parametrize(
- "exception", [AcaiaError, AcaiaDeviceNotFound("Boom"), TimeoutError]
-)
-async def test_update_exception_leads_to_active_disconnect(
- hass: HomeAssistant,
- mock_scale: MagicMock,
- freezer: FrozenDateTimeFactory,
- exception: Exception,
-) -> None:
- """Test scale gets disconnected on exception."""
-
- mock_scale.connect.side_effect = exception
- mock_scale.connected = False
-
- freezer.tick(timedelta(minutes=10))
- async_fire_time_changed(hass)
- await hass.async_block_till_done()
-
- mock_scale.device_disconnected_handler.assert_called_once()
-
-
-async def test_device(
- mock_scale: MagicMock,
- device_registry: dr.DeviceRegistry,
- snapshot: SnapshotAssertion,
-) -> None:
- """Snapshot the device from registry."""
-
- device = device_registry.async_get_device({(DOMAIN, mock_scale.mac)})
- assert device
- assert device == snapshot
diff --git a/tests/components/advantage_air/test_binary_sensor.py b/tests/components/advantage_air/test_binary_sensor.py
index d0088d96ba5..13bbadb38f9 100644
--- a/tests/components/advantage_air/test_binary_sensor.py
+++ b/tests/components/advantage_air/test_binary_sensor.py
@@ -1,8 +1,10 @@
"""Test the Advantage Air Binary Sensor Platform."""
from datetime import timedelta
-from unittest.mock import AsyncMock, patch
+from unittest.mock import AsyncMock
+from homeassistant.components.advantage_air import ADVANTAGE_AIR_SYNC_INTERVAL
+from homeassistant.config_entries import RELOAD_AFTER_UPDATE_DELAY
from homeassistant.const import STATE_OFF, STATE_ON
from homeassistant.core import HomeAssistant
from homeassistant.helpers import entity_registry as er
@@ -68,14 +70,22 @@ async def test_binary_sensor_async_setup_entry(
assert not hass.states.get(entity_id)
mock_get.reset_mock()
+ entity_registry.async_update_entity(entity_id=entity_id, disabled_by=None)
+ await hass.async_block_till_done()
- with patch("homeassistant.config_entries.RELOAD_AFTER_UPDATE_DELAY", 1):
- entity_registry.async_update_entity(entity_id=entity_id, disabled_by=None)
- await hass.async_block_till_done()
+ async_fire_time_changed(
+ hass,
+ dt_util.utcnow() + timedelta(seconds=ADVANTAGE_AIR_SYNC_INTERVAL + 1),
+ )
+ await hass.async_block_till_done(wait_background_tasks=True)
+ assert len(mock_get.mock_calls) == 1
- async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=2))
- await hass.async_block_till_done(wait_background_tasks=True)
- assert len(mock_get.mock_calls) == 1
+ async_fire_time_changed(
+ hass,
+ dt_util.utcnow() + timedelta(seconds=RELOAD_AFTER_UPDATE_DELAY + 1),
+ )
+ await hass.async_block_till_done(wait_background_tasks=True)
+ assert len(mock_get.mock_calls) == 2
state = hass.states.get(entity_id)
assert state
@@ -91,14 +101,22 @@ async def test_binary_sensor_async_setup_entry(
assert not hass.states.get(entity_id)
mock_get.reset_mock()
+ entity_registry.async_update_entity(entity_id=entity_id, disabled_by=None)
+ await hass.async_block_till_done()
- with patch("homeassistant.config_entries.RELOAD_AFTER_UPDATE_DELAY", 1):
- entity_registry.async_update_entity(entity_id=entity_id, disabled_by=None)
- await hass.async_block_till_done()
+ async_fire_time_changed(
+ hass,
+ dt_util.utcnow() + timedelta(seconds=ADVANTAGE_AIR_SYNC_INTERVAL + 1),
+ )
+ await hass.async_block_till_done(wait_background_tasks=True)
+ assert len(mock_get.mock_calls) == 1
- async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=2))
- await hass.async_block_till_done(wait_background_tasks=True)
- assert len(mock_get.mock_calls) == 1
+ async_fire_time_changed(
+ hass,
+ dt_util.utcnow() + timedelta(seconds=RELOAD_AFTER_UPDATE_DELAY + 1),
+ )
+ await hass.async_block_till_done(wait_background_tasks=True)
+ assert len(mock_get.mock_calls) == 2
state = hass.states.get(entity_id)
assert state
diff --git a/tests/components/advantage_air/test_sensor.py b/tests/components/advantage_air/test_sensor.py
index 3ea368a59fb..06243921a64 100644
--- a/tests/components/advantage_air/test_sensor.py
+++ b/tests/components/advantage_air/test_sensor.py
@@ -1,13 +1,15 @@
"""Test the Advantage Air Sensor Platform."""
from datetime import timedelta
-from unittest.mock import AsyncMock, patch
+from unittest.mock import AsyncMock
+from homeassistant.components.advantage_air import ADVANTAGE_AIR_SYNC_INTERVAL
from homeassistant.components.advantage_air.const import DOMAIN as ADVANTAGE_AIR_DOMAIN
from homeassistant.components.advantage_air.sensor import (
ADVANTAGE_AIR_SERVICE_SET_TIME_TO,
ADVANTAGE_AIR_SET_COUNTDOWN_VALUE,
)
+from homeassistant.config_entries import RELOAD_AFTER_UPDATE_DELAY
from homeassistant.const import ATTR_ENTITY_ID
from homeassistant.core import HomeAssistant
from homeassistant.helpers import entity_registry as er
@@ -122,15 +124,23 @@ async def test_sensor_platform_disabled_entity(
assert not hass.states.get(entity_id)
+ entity_registry.async_update_entity(entity_id=entity_id, disabled_by=None)
+ await hass.async_block_till_done(wait_background_tasks=True)
mock_get.reset_mock()
- with patch("homeassistant.config_entries.RELOAD_AFTER_UPDATE_DELAY", 1):
- entity_registry.async_update_entity(entity_id=entity_id, disabled_by=None)
- await hass.async_block_till_done(wait_background_tasks=True)
+ async_fire_time_changed(
+ hass,
+ dt_util.utcnow() + timedelta(seconds=ADVANTAGE_AIR_SYNC_INTERVAL + 1),
+ )
+ await hass.async_block_till_done(wait_background_tasks=True)
+ assert len(mock_get.mock_calls) == 1
- async_fire_time_changed(hass, dt_util.utcnow() + timedelta(seconds=2))
- await hass.async_block_till_done(wait_background_tasks=True)
- assert len(mock_get.mock_calls) == 1
+ async_fire_time_changed(
+ hass,
+ dt_util.utcnow() + timedelta(seconds=RELOAD_AFTER_UPDATE_DELAY + 1),
+ )
+ await hass.async_block_till_done(wait_background_tasks=True)
+ assert len(mock_get.mock_calls) == 2
state = hass.states.get(entity_id)
assert state
diff --git a/tests/components/alarm_control_panel/test_init.py b/tests/components/alarm_control_panel/test_init.py
index 89a2a2a2b1a..90b23f87ab1 100644
--- a/tests/components/alarm_control_panel/test_init.py
+++ b/tests/components/alarm_control_panel/test_init.py
@@ -489,96 +489,3 @@ async def test_alarm_control_panel_log_deprecated_state_warning_using_attr_state
)
# Test we only log once
assert "Entities should implement the 'alarm_state' property and" not in caplog.text
-
-
-async def test_alarm_control_panel_deprecated_state_does_not_break_state(
- hass: HomeAssistant,
- code_format: CodeFormat | None,
- supported_features: AlarmControlPanelEntityFeature,
- code_arm_required: bool,
- caplog: pytest.LogCaptureFixture,
-) -> None:
- """Test using _attr_state attribute does not break state."""
-
- async def async_setup_entry_init(
- hass: HomeAssistant, config_entry: ConfigEntry
- ) -> bool:
- """Set up test config entry."""
- await hass.config_entries.async_forward_entry_setups(
- config_entry, [ALARM_CONTROL_PANEL_DOMAIN]
- )
- return True
-
- mock_integration(
- hass,
- MockModule(
- TEST_DOMAIN,
- async_setup_entry=async_setup_entry_init,
- ),
- )
-
- class MockLegacyAlarmControlPanel(MockAlarmControlPanel):
- """Mocked alarm control entity."""
-
- def __init__(
- self,
- supported_features: AlarmControlPanelEntityFeature = AlarmControlPanelEntityFeature(
- 0
- ),
- code_format: CodeFormat | None = None,
- code_arm_required: bool = True,
- ) -> None:
- """Initialize the alarm control."""
- self._attr_state = "armed_away"
- super().__init__(supported_features, code_format, code_arm_required)
-
- def alarm_disarm(self, code: str | None = None) -> None:
- """Mock alarm disarm calls."""
- self._attr_state = "disarmed"
-
- entity = MockLegacyAlarmControlPanel(
- supported_features=supported_features,
- code_format=code_format,
- code_arm_required=code_arm_required,
- )
-
- async def async_setup_entry_platform(
- hass: HomeAssistant,
- config_entry: ConfigEntry,
- async_add_entities: AddEntitiesCallback,
- ) -> None:
- """Set up test alarm control panel platform via config entry."""
- async_add_entities([entity])
-
- mock_platform(
- hass,
- f"{TEST_DOMAIN}.{ALARM_CONTROL_PANEL_DOMAIN}",
- MockPlatform(async_setup_entry=async_setup_entry_platform),
- )
-
- with patch.object(
- MockLegacyAlarmControlPanel,
- "__module__",
- "tests.custom_components.test.alarm_control_panel",
- ):
- config_entry = MockConfigEntry(domain=TEST_DOMAIN)
- config_entry.add_to_hass(hass)
- assert await hass.config_entries.async_setup(config_entry.entry_id)
- await hass.async_block_till_done()
-
- state = hass.states.get(entity.entity_id)
- assert state is not None
- assert state.state == "armed_away"
-
- with patch.object(
- MockLegacyAlarmControlPanel,
- "__module__",
- "tests.custom_components.test.alarm_control_panel",
- ):
- await help_test_async_alarm_control_panel_service(
- hass, entity.entity_id, SERVICE_ALARM_DISARM
- )
-
- state = hass.states.get(entity.entity_id)
- assert state is not None
- assert state.state == "disarmed"
diff --git a/tests/components/assist_pipeline/snapshots/test_websocket.ambr b/tests/components/assist_pipeline/snapshots/test_websocket.ambr
index b806c6faf23..131444c17ac 100644
--- a/tests/components/assist_pipeline/snapshots/test_websocket.ambr
+++ b/tests/components/assist_pipeline/snapshots/test_websocket.ambr
@@ -697,7 +697,7 @@
'speech': dict({
'plain': dict({
'extra_data': None,
- 'speech': 'Sorry, I am not aware of any area called Are',
+ 'speech': 'Sorry, I am not aware of any area called are',
}),
}),
}),
@@ -741,7 +741,7 @@
'speech': dict({
'plain': dict({
'extra_data': None,
- 'speech': 'Sorry, I am not aware of any area called Are',
+ 'speech': 'Sorry, I am not aware of any area called are',
}),
}),
}),
diff --git a/tests/components/assist_pipeline/test_vad.py b/tests/components/assist_pipeline/test_vad.py
index bd07601cd5d..fda26d2fb94 100644
--- a/tests/components/assist_pipeline/test_vad.py
+++ b/tests/components/assist_pipeline/test_vad.py
@@ -16,7 +16,7 @@ def test_silence() -> None:
segmenter = VoiceCommandSegmenter()
# True return value indicates voice command has not finished
- assert segmenter.process(_ONE_SECOND * 3, 0.0)
+ assert segmenter.process(_ONE_SECOND * 3, False)
assert not segmenter.in_command
@@ -26,15 +26,15 @@ def test_speech() -> None:
segmenter = VoiceCommandSegmenter()
# silence
- assert segmenter.process(_ONE_SECOND, 0.0)
+ assert segmenter.process(_ONE_SECOND, False)
# "speech"
- assert segmenter.process(_ONE_SECOND, 1.0)
+ assert segmenter.process(_ONE_SECOND, True)
assert segmenter.in_command
# silence
# False return value indicates voice command is finished
- assert not segmenter.process(_ONE_SECOND, 0.0)
+ assert not segmenter.process(_ONE_SECOND, False)
assert not segmenter.in_command
@@ -112,19 +112,19 @@ def test_silence_seconds() -> None:
segmenter = VoiceCommandSegmenter(silence_seconds=1.0)
# silence
- assert segmenter.process(_ONE_SECOND, 0.0)
+ assert segmenter.process(_ONE_SECOND, False)
assert not segmenter.in_command
# "speech"
- assert segmenter.process(_ONE_SECOND, 1.0)
+ assert segmenter.process(_ONE_SECOND, True)
assert segmenter.in_command
# not enough silence to end
- assert segmenter.process(_ONE_SECOND * 0.5, 0.0)
+ assert segmenter.process(_ONE_SECOND * 0.5, False)
assert segmenter.in_command
# exactly enough silence now
- assert not segmenter.process(_ONE_SECOND * 0.5, 0.0)
+ assert not segmenter.process(_ONE_SECOND * 0.5, False)
assert not segmenter.in_command
@@ -134,27 +134,27 @@ def test_silence_reset() -> None:
segmenter = VoiceCommandSegmenter(silence_seconds=1.0, reset_seconds=0.5)
# silence
- assert segmenter.process(_ONE_SECOND, 0.0)
+ assert segmenter.process(_ONE_SECOND, False)
assert not segmenter.in_command
# "speech"
- assert segmenter.process(_ONE_SECOND, 1.0)
+ assert segmenter.process(_ONE_SECOND, True)
assert segmenter.in_command
# not enough silence to end
- assert segmenter.process(_ONE_SECOND * 0.5, 0.0)
+ assert segmenter.process(_ONE_SECOND * 0.5, False)
assert segmenter.in_command
# speech should reset silence detection
- assert segmenter.process(_ONE_SECOND * 0.5, 1.0)
+ assert segmenter.process(_ONE_SECOND * 0.5, True)
assert segmenter.in_command
# not enough silence to end
- assert segmenter.process(_ONE_SECOND * 0.5, 0.0)
+ assert segmenter.process(_ONE_SECOND * 0.5, False)
assert segmenter.in_command
# exactly enough silence now
- assert not segmenter.process(_ONE_SECOND * 0.5, 0.0)
+ assert not segmenter.process(_ONE_SECOND * 0.5, False)
assert not segmenter.in_command
@@ -166,23 +166,23 @@ def test_speech_reset() -> None:
)
# silence
- assert segmenter.process(_ONE_SECOND, 0.0)
+ assert segmenter.process(_ONE_SECOND, False)
assert not segmenter.in_command
# not enough speech to start voice command
- assert segmenter.process(_ONE_SECOND * 0.5, 1.0)
+ assert segmenter.process(_ONE_SECOND * 0.5, True)
assert not segmenter.in_command
# silence should reset speech detection
- assert segmenter.process(_ONE_SECOND, 0.0)
+ assert segmenter.process(_ONE_SECOND, False)
assert not segmenter.in_command
# not enough speech to start voice command
- assert segmenter.process(_ONE_SECOND * 0.5, 1.0)
+ assert segmenter.process(_ONE_SECOND * 0.5, True)
assert not segmenter.in_command
# exactly enough speech now
- assert segmenter.process(_ONE_SECOND * 0.5, 1.0)
+ assert segmenter.process(_ONE_SECOND * 0.5, True)
assert segmenter.in_command
@@ -193,18 +193,18 @@ def test_timeout() -> None:
# not enough to time out
assert not segmenter.timed_out
- assert segmenter.process(_ONE_SECOND * 0.5, 0.0)
+ assert segmenter.process(_ONE_SECOND * 0.5, False)
assert not segmenter.timed_out
# enough to time out
- assert not segmenter.process(_ONE_SECOND * 0.5, 1.0)
+ assert not segmenter.process(_ONE_SECOND * 0.5, True)
assert segmenter.timed_out
# flag resets with more audio
- assert segmenter.process(_ONE_SECOND * 0.5, 1.0)
+ assert segmenter.process(_ONE_SECOND * 0.5, True)
assert not segmenter.timed_out
- assert not segmenter.process(_ONE_SECOND * 0.5, 0.0)
+ assert not segmenter.process(_ONE_SECOND * 0.5, False)
assert segmenter.timed_out
@@ -215,38 +215,14 @@ def test_command_seconds() -> None:
command_seconds=3, speech_seconds=1, silence_seconds=1, reset_seconds=1
)
- assert segmenter.process(_ONE_SECOND, 1.0)
+ assert segmenter.process(_ONE_SECOND, True)
# Silence counts towards total command length
- assert segmenter.process(_ONE_SECOND * 0.5, 0.0)
+ assert segmenter.process(_ONE_SECOND * 0.5, False)
# Enough to finish command now
- assert segmenter.process(_ONE_SECOND, 1.0)
- assert segmenter.process(_ONE_SECOND * 0.5, 0.0)
+ assert segmenter.process(_ONE_SECOND, True)
+ assert segmenter.process(_ONE_SECOND * 0.5, False)
# Silence to finish
- assert not segmenter.process(_ONE_SECOND * 0.5, 0.0)
-
-
-def test_speech_thresholds() -> None:
- """Test before/in command speech thresholds."""
-
- segmenter = VoiceCommandSegmenter(
- before_command_speech_threshold=0.2,
- in_command_speech_threshold=0.5,
- command_seconds=2,
- speech_seconds=1,
- silence_seconds=1,
- )
-
- # Not high enough probability to trigger command
- assert segmenter.process(_ONE_SECOND, 0.1)
- assert not segmenter.in_command
-
- # Triggers command
- assert segmenter.process(_ONE_SECOND, 0.3)
- assert segmenter.in_command
-
- # Now that same probability is considered silence.
- # Finishes command.
- assert not segmenter.process(_ONE_SECOND, 0.3)
+ assert not segmenter.process(_ONE_SECOND * 0.5, False)
diff --git a/tests/components/backup/conftest.py b/tests/components/backup/conftest.py
deleted file mode 100644
index 631c774e63c..00000000000
--- a/tests/components/backup/conftest.py
+++ /dev/null
@@ -1,73 +0,0 @@
-"""Test fixtures for the Backup integration."""
-
-from __future__ import annotations
-
-from collections.abc import Generator
-from pathlib import Path
-from unittest.mock import MagicMock, Mock, patch
-
-import pytest
-
-from homeassistant.core import HomeAssistant
-
-
-@pytest.fixture(name="mocked_json_bytes")
-def mocked_json_bytes_fixture() -> Generator[Mock]:
- """Mock json_bytes."""
- with patch(
- "homeassistant.components.backup.manager.json_bytes",
- return_value=b"{}", # Empty JSON
- ) as mocked_json_bytes:
- yield mocked_json_bytes
-
-
-@pytest.fixture(name="mocked_tarfile")
-def mocked_tarfile_fixture() -> Generator[Mock]:
- """Mock tarfile."""
- with patch(
- "homeassistant.components.backup.manager.SecureTarFile"
- ) as mocked_tarfile:
- yield mocked_tarfile
-
-
-@pytest.fixture(name="mock_backup_generation")
-def mock_backup_generation_fixture(
- hass: HomeAssistant, mocked_json_bytes: Mock, mocked_tarfile: Mock
-) -> Generator[None]:
- """Mock backup generator."""
-
- def _mock_iterdir(path: Path) -> list[Path]:
- if not path.name.endswith("testing_config"):
- return []
- return [
- Path("test.txt"),
- Path(".DS_Store"),
- Path(".storage"),
- ]
-
- with (
- patch("pathlib.Path.iterdir", _mock_iterdir),
- patch("pathlib.Path.stat", MagicMock(st_size=123)),
- patch("pathlib.Path.is_file", lambda x: x.name != ".storage"),
- patch(
- "pathlib.Path.is_dir",
- lambda x: x.name == ".storage",
- ),
- patch(
- "pathlib.Path.exists",
- lambda x: x != Path(hass.config.path("backups")),
- ),
- patch(
- "pathlib.Path.is_symlink",
- lambda _: False,
- ),
- patch(
- "pathlib.Path.mkdir",
- MagicMock(),
- ),
- patch(
- "homeassistant.components.backup.manager.HAVERSION",
- "2025.1.0",
- ),
- ):
- yield
diff --git a/tests/components/backup/snapshots/test_websocket.ambr b/tests/components/backup/snapshots/test_websocket.ambr
index 42eb524e529..07e099561b1 100644
--- a/tests/components/backup/snapshots/test_websocket.ambr
+++ b/tests/components/backup/snapshots/test_websocket.ambr
@@ -210,23 +210,16 @@
dict({
'id': 1,
'result': dict({
- 'slug': '27f5c632',
+ 'date': '1970-01-01T00:00:00.000Z',
+ 'name': 'Test',
+ 'path': 'abc123.tar',
+ 'size': 0.0,
+ 'slug': 'abc123',
}),
'success': True,
'type': 'result',
})
# ---
-# name: test_generate[without_hassio].1
- dict({
- 'event': dict({
- 'done': True,
- 'stage': None,
- 'success': True,
- }),
- 'id': 1,
- 'type': 'event',
- })
-# ---
# name: test_info[with_hassio]
dict({
'error': dict({
@@ -276,22 +269,3 @@
'type': 'result',
})
# ---
-# name: test_restore[with_hassio]
- dict({
- 'error': dict({
- 'code': 'unknown_command',
- 'message': 'Unknown command.',
- }),
- 'id': 1,
- 'success': False,
- 'type': 'result',
- })
-# ---
-# name: test_restore[without_hassio]
- dict({
- 'id': 1,
- 'result': None,
- 'success': True,
- 'type': 'result',
- })
-# ---
diff --git a/tests/components/backup/test_http.py b/tests/components/backup/test_http.py
index 76b1f76b55b..93ecb27bc97 100644
--- a/tests/components/backup/test_http.py
+++ b/tests/components/backup/test_http.py
@@ -1,11 +1,8 @@
"""Tests for the Backup integration."""
-import asyncio
-from io import StringIO
from unittest.mock import patch
from aiohttp import web
-import pytest
from homeassistant.core import HomeAssistant
@@ -52,12 +49,12 @@ async def test_downloading_backup_not_found(
assert resp.status == 404
-async def test_downloading_as_non_admin(
+async def test_non_admin(
hass: HomeAssistant,
hass_client: ClientSessionGenerator,
hass_admin_user: MockUser,
) -> None:
- """Test downloading a backup file when you are not an admin."""
+ """Test downloading a backup file that does not exist."""
hass_admin_user.groups = []
await setup_backup_integration(hass)
@@ -65,53 +62,3 @@ async def test_downloading_as_non_admin(
resp = await client.get("/api/backup/download/abc123")
assert resp.status == 401
-
-
-async def test_uploading_a_backup_file(
- hass: HomeAssistant,
- hass_client: ClientSessionGenerator,
-) -> None:
- """Test uploading a backup file."""
- await setup_backup_integration(hass)
-
- client = await hass_client()
-
- with patch(
- "homeassistant.components.backup.manager.BackupManager.async_receive_backup",
- ) as async_receive_backup_mock:
- resp = await client.post(
- "/api/backup/upload",
- data={"file": StringIO("test")},
- )
- assert resp.status == 201
- assert async_receive_backup_mock.called
-
-
-@pytest.mark.parametrize(
- ("error", "message"),
- [
- (OSError("Boom!"), "Can't write backup file Boom!"),
- (asyncio.CancelledError("Boom!"), ""),
- ],
-)
-async def test_error_handling_uploading_a_backup_file(
- hass: HomeAssistant,
- hass_client: ClientSessionGenerator,
- error: Exception,
- message: str,
-) -> None:
- """Test error handling when uploading a backup file."""
- await setup_backup_integration(hass)
-
- client = await hass_client()
-
- with patch(
- "homeassistant.components.backup.manager.BackupManager.async_receive_backup",
- side_effect=error,
- ):
- resp = await client.post(
- "/api/backup/upload",
- data={"file": StringIO("test")},
- )
- assert resp.status == 500
- assert await resp.text() == message
diff --git a/tests/components/backup/test_manager.py b/tests/components/backup/test_manager.py
index 9d24964aedf..1bf801a0fcf 100644
--- a/tests/components/backup/test_manager.py
+++ b/tests/components/backup/test_manager.py
@@ -2,18 +2,13 @@
from __future__ import annotations
-import asyncio
-from unittest.mock import AsyncMock, MagicMock, Mock, mock_open, patch
+from pathlib import Path
+from unittest.mock import AsyncMock, MagicMock, Mock, patch
-import aiohttp
-from multidict import CIMultiDict, CIMultiDictProxy
import pytest
from homeassistant.components.backup import BackupManager
-from homeassistant.components.backup.manager import (
- BackupPlatformProtocol,
- BackupProgress,
-)
+from homeassistant.components.backup.manager import BackupPlatformProtocol
from homeassistant.core import HomeAssistant
from homeassistant.exceptions import HomeAssistantError
from homeassistant.setup import async_setup_component
@@ -23,30 +18,59 @@ from .common import TEST_BACKUP
from tests.common import MockPlatform, mock_platform
-async def _mock_backup_generation(
- manager: BackupManager, mocked_json_bytes: Mock, mocked_tarfile: Mock
-) -> None:
+async def _mock_backup_generation(manager: BackupManager):
"""Mock backup generator."""
- progress: list[BackupProgress] = []
+ def _mock_iterdir(path: Path) -> list[Path]:
+ if not path.name.endswith("testing_config"):
+ return []
+ return [
+ Path("test.txt"),
+ Path(".DS_Store"),
+ Path(".storage"),
+ ]
- def on_progress(_progress: BackupProgress) -> None:
- """Mock progress callback."""
- progress.append(_progress)
+ with (
+ patch(
+ "homeassistant.components.backup.manager.SecureTarFile"
+ ) as mocked_tarfile,
+ patch("pathlib.Path.iterdir", _mock_iterdir),
+ patch("pathlib.Path.stat", MagicMock(st_size=123)),
+ patch("pathlib.Path.is_file", lambda x: x.name != ".storage"),
+ patch(
+ "pathlib.Path.is_dir",
+ lambda x: x.name == ".storage",
+ ),
+ patch(
+ "pathlib.Path.exists",
+ lambda x: x != manager.backup_dir,
+ ),
+ patch(
+ "pathlib.Path.is_symlink",
+ lambda _: False,
+ ),
+ patch(
+ "pathlib.Path.mkdir",
+ MagicMock(),
+ ),
+ patch(
+ "homeassistant.components.backup.manager.json_bytes",
+ return_value=b"{}", # Empty JSON
+ ) as mocked_json_bytes,
+ patch(
+ "homeassistant.components.backup.manager.HAVERSION",
+ "2025.1.0",
+ ),
+ ):
+ await manager.async_create_backup()
- assert manager.backup_task is None
- await manager.async_create_backup(on_progress=on_progress)
- assert manager.backup_task is not None
- assert progress == []
-
- await manager.backup_task
- assert progress == [BackupProgress(done=True, stage=None, success=True)]
-
- assert mocked_json_bytes.call_count == 1
- backup_json_dict = mocked_json_bytes.call_args[0][0]
- assert isinstance(backup_json_dict, dict)
- assert backup_json_dict["homeassistant"] == {"version": "2025.1.0"}
- assert manager.backup_dir.as_posix() in str(mocked_tarfile.call_args_list[0][0][0])
+ assert mocked_json_bytes.call_count == 1
+ backup_json_dict = mocked_json_bytes.call_args[0][0]
+ assert isinstance(backup_json_dict, dict)
+ assert backup_json_dict["homeassistant"] == {"version": "2025.1.0"}
+ assert manager.backup_dir.as_posix() in str(
+ mocked_tarfile.call_args_list[0][0][0]
+ )
async def _setup_mock_domain(
@@ -150,26 +174,21 @@ async def test_getting_backup_that_does_not_exist(
async def test_async_create_backup_when_backing_up(hass: HomeAssistant) -> None:
"""Test generate backup."""
- event = asyncio.Event()
manager = BackupManager(hass)
- manager.backup_task = hass.async_create_task(event.wait())
+ manager.backing_up = True
with pytest.raises(HomeAssistantError, match="Backup already in progress"):
- await manager.async_create_backup(on_progress=None)
- event.set()
+ await manager.async_create_backup()
-@pytest.mark.usefixtures("mock_backup_generation")
async def test_async_create_backup(
hass: HomeAssistant,
caplog: pytest.LogCaptureFixture,
- mocked_json_bytes: Mock,
- mocked_tarfile: Mock,
) -> None:
"""Test generate backup."""
manager = BackupManager(hass)
manager.loaded_backups = True
- await _mock_backup_generation(manager, mocked_json_bytes, mocked_tarfile)
+ await _mock_backup_generation(manager)
assert "Generated new backup with slug " in caplog.text
assert "Creating backup directory" in caplog.text
@@ -226,9 +245,7 @@ async def test_not_loading_bad_platforms(
)
-async def test_exception_plaform_pre(
- hass: HomeAssistant, mocked_json_bytes: Mock, mocked_tarfile: Mock
-) -> None:
+async def test_exception_plaform_pre(hass: HomeAssistant) -> None:
"""Test exception in pre step."""
manager = BackupManager(hass)
manager.loaded_backups = True
@@ -245,12 +262,10 @@ async def test_exception_plaform_pre(
)
with pytest.raises(HomeAssistantError):
- await _mock_backup_generation(manager, mocked_json_bytes, mocked_tarfile)
+ await _mock_backup_generation(manager)
-async def test_exception_plaform_post(
- hass: HomeAssistant, mocked_json_bytes: Mock, mocked_tarfile: Mock
-) -> None:
+async def test_exception_plaform_post(hass: HomeAssistant) -> None:
"""Test exception in post step."""
manager = BackupManager(hass)
manager.loaded_backups = True
@@ -267,7 +282,7 @@ async def test_exception_plaform_post(
)
with pytest.raises(HomeAssistantError):
- await _mock_backup_generation(manager, mocked_json_bytes, mocked_tarfile)
+ await _mock_backup_generation(manager)
async def test_loading_platforms_when_running_async_pre_backup_actions(
@@ -318,65 +333,3 @@ async def test_loading_platforms_when_running_async_post_backup_actions(
assert len(manager.platforms) == 1
assert "Loaded 1 platforms" in caplog.text
-
-
-async def test_async_receive_backup(
- hass: HomeAssistant,
- caplog: pytest.LogCaptureFixture,
-) -> None:
- """Test receiving a backup file."""
- manager = BackupManager(hass)
-
- size = 2 * 2**16
- protocol = Mock(_reading_paused=False)
- stream = aiohttp.StreamReader(protocol, 2**16)
- stream.feed_data(b"0" * size + b"\r\n--:--")
- stream.feed_eof()
-
- open_mock = mock_open()
-
- with patch("pathlib.Path.open", open_mock), patch("shutil.move") as mover_mock:
- await manager.async_receive_backup(
- contents=aiohttp.BodyPartReader(
- b"--:",
- CIMultiDictProxy(
- CIMultiDict(
- {
- aiohttp.hdrs.CONTENT_DISPOSITION: "attachment; filename=abc123.tar"
- }
- )
- ),
- stream,
- )
- )
- assert open_mock.call_count == 1
- assert mover_mock.call_count == 1
- assert mover_mock.mock_calls[0].args[1].name == "abc123.tar"
-
-
-async def test_async_trigger_restore(
- hass: HomeAssistant,
- caplog: pytest.LogCaptureFixture,
-) -> None:
- """Test trigger restore."""
- manager = BackupManager(hass)
- manager.loaded_backups = True
- manager.backups = {TEST_BACKUP.slug: TEST_BACKUP}
-
- with (
- patch("pathlib.Path.exists", return_value=True),
- patch("pathlib.Path.write_text") as mocked_write_text,
- patch("homeassistant.core.ServiceRegistry.async_call") as mocked_service_call,
- ):
- await manager.async_restore_backup(TEST_BACKUP.slug)
- assert mocked_write_text.call_args[0][0] == '{"path": "abc123.tar"}'
- assert mocked_service_call.called
-
-
-async def test_async_trigger_restore_missing_backup(hass: HomeAssistant) -> None:
- """Test trigger restore."""
- manager = BackupManager(hass)
- manager.loaded_backups = True
-
- with pytest.raises(HomeAssistantError, match="Backup abc123 not found"):
- await manager.async_restore_backup(TEST_BACKUP.slug)
diff --git a/tests/components/backup/test_websocket.py b/tests/components/backup/test_websocket.py
index 3e031f172ae..805182391da 100644
--- a/tests/components/backup/test_websocket.py
+++ b/tests/components/backup/test_websocket.py
@@ -2,7 +2,6 @@
from unittest.mock import patch
-from freezegun.api import FrozenDateTimeFactory
import pytest
from syrupy import SnapshotAssertion
@@ -115,34 +114,6 @@ async def test_remove(
assert snapshot == await client.receive_json()
-@pytest.mark.parametrize(
- ("with_hassio", "number_of_messages"),
- [
- pytest.param(True, 1, id="with_hassio"),
- pytest.param(False, 2, id="without_hassio"),
- ],
-)
-@pytest.mark.usefixtures("mock_backup_generation")
-async def test_generate(
- hass: HomeAssistant,
- hass_ws_client: WebSocketGenerator,
- freezer: FrozenDateTimeFactory,
- snapshot: SnapshotAssertion,
- with_hassio: bool,
- number_of_messages: int,
-) -> None:
- """Test generating a backup."""
- await setup_backup_integration(hass, with_hassio=with_hassio)
-
- client = await hass_ws_client(hass)
- freezer.move_to("2024-11-13 12:01:00+01:00")
- await hass.async_block_till_done()
-
- await client.send_json_auto_id({"type": "backup/generate"})
- for _ in range(number_of_messages):
- assert snapshot == await client.receive_json()
-
-
@pytest.mark.parametrize(
"with_hassio",
[
@@ -150,23 +121,24 @@ async def test_generate(
pytest.param(False, id="without_hassio"),
],
)
-async def test_restore(
+async def test_generate(
hass: HomeAssistant,
hass_ws_client: WebSocketGenerator,
snapshot: SnapshotAssertion,
with_hassio: bool,
) -> None:
- """Test calling the restore command."""
+ """Test generating a backup."""
await setup_backup_integration(hass, with_hassio=with_hassio)
client = await hass_ws_client(hass)
await hass.async_block_till_done()
with patch(
- "homeassistant.components.backup.manager.BackupManager.async_restore_backup",
+ "homeassistant.components.backup.manager.BackupManager.async_create_backup",
+ return_value=TEST_BACKUP,
):
- await client.send_json_auto_id({"type": "backup/restore", "slug": "abc123"})
- assert await client.receive_json() == snapshot
+ await client.send_json_auto_id({"type": "backup/generate"})
+ assert snapshot == await client.receive_json()
@pytest.mark.parametrize(
diff --git a/tests/components/bang_olufsen/conftest.py b/tests/components/bang_olufsen/conftest.py
index cbde856ff89..6c19a29c1da 100644
--- a/tests/components/bang_olufsen/conftest.py
+++ b/tests/components/bang_olufsen/conftest.py
@@ -35,13 +35,13 @@ from .const import (
TEST_DATA_CREATE_ENTRY,
TEST_DATA_CREATE_ENTRY_2,
TEST_FRIENDLY_NAME,
+ TEST_FRIENDLY_NAME_2,
TEST_FRIENDLY_NAME_3,
- TEST_FRIENDLY_NAME_4,
+ TEST_HOST_2,
TEST_HOST_3,
- TEST_HOST_4,
TEST_JID_1,
+ TEST_JID_2,
TEST_JID_3,
- TEST_JID_4,
TEST_NAME,
TEST_NAME_2,
TEST_SERIAL_NUMBER,
@@ -267,29 +267,29 @@ def mock_mozart_client() -> Generator[AsyncMock]:
}
client.get_beolink_peers = AsyncMock()
client.get_beolink_peers.return_value = [
+ BeolinkPeer(
+ friendly_name=TEST_FRIENDLY_NAME_2,
+ jid=TEST_JID_2,
+ ip_address=TEST_HOST_2,
+ ),
BeolinkPeer(
friendly_name=TEST_FRIENDLY_NAME_3,
jid=TEST_JID_3,
ip_address=TEST_HOST_3,
),
- BeolinkPeer(
- friendly_name=TEST_FRIENDLY_NAME_4,
- jid=TEST_JID_4,
- ip_address=TEST_HOST_4,
- ),
]
client.get_beolink_listeners = AsyncMock()
client.get_beolink_listeners.return_value = [
+ BeolinkPeer(
+ friendly_name=TEST_FRIENDLY_NAME_2,
+ jid=TEST_JID_2,
+ ip_address=TEST_HOST_2,
+ ),
BeolinkPeer(
friendly_name=TEST_FRIENDLY_NAME_3,
jid=TEST_JID_3,
ip_address=TEST_HOST_3,
),
- BeolinkPeer(
- friendly_name=TEST_FRIENDLY_NAME_4,
- jid=TEST_JID_4,
- ip_address=TEST_HOST_4,
- ),
]
client.get_listening_mode_set = AsyncMock()
diff --git a/tests/components/bang_olufsen/const.py b/tests/components/bang_olufsen/const.py
index 6602a898eb6..3769aef5cd3 100644
--- a/tests/components/bang_olufsen/const.py
+++ b/tests/components/bang_olufsen/const.py
@@ -16,7 +16,6 @@ from mozart_api.models import (
PlayQueueItemType,
RenderingState,
SceneProperties,
- Source,
UserFlow,
VolumeLevel,
VolumeMute,
@@ -126,10 +125,7 @@ TEST_DATA_ZEROCONF_IPV6 = ZeroconfServiceInfo(
},
)
-TEST_SOURCE = Source(
- name="Tidal", id="tidal", is_seekable=True, is_enabled=True, is_playable=True
-)
-TEST_AUDIO_SOURCES = [TEST_SOURCE.name, BangOlufsenSource.LINE_IN.name]
+TEST_AUDIO_SOURCES = [BangOlufsenSource.TIDAL.name, BangOlufsenSource.LINE_IN.name]
TEST_VIDEO_SOURCES = ["HDMI A"]
TEST_SOURCES = TEST_AUDIO_SOURCES + TEST_VIDEO_SOURCES
TEST_FALLBACK_SOURCES = [
diff --git a/tests/components/bang_olufsen/snapshots/test_media_player.ambr b/tests/components/bang_olufsen/snapshots/test_media_player.ambr
deleted file mode 100644
index ea96e286821..00000000000
--- a/tests/components/bang_olufsen/snapshots/test_media_player.ambr
+++ /dev/null
@@ -1,874 +0,0 @@
-# serializer version: 1
-# name: test_async_beolink_allstandby
- StateSnapshot({
- 'attributes': ReadOnlyDict({
- 'beolink': dict({
- 'listeners': dict({
- 'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
- 'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
- }),
- 'peers': dict({
- 'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
- 'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
- }),
- 'self': dict({
- 'Living room Balance': '1111.1111111.11111111@products.bang-olufsen.com',
- }),
- }),
- 'device_class': 'speaker',
- 'entity_picture_local': None,
- 'friendly_name': 'Living room Balance',
- 'group_members': list([
- 'media_player.beosound_balance_11111111',
- 'listener_not_in_hass-1111.1111111.33333333@products.bang-olufsen.com',
- 'listener_not_in_hass-1111.1111111.44444444@products.bang-olufsen.com',
- ]),
- 'icon': 'mdi:speaker-wireless',
- 'media_content_type': ,
- 'repeat': ,
- 'shuffle': False,
- 'sound_mode': 'Test Listening Mode (123)',
- 'sound_mode_list': list([
- 'Test Listening Mode (123)',
- 'Test Listening Mode (234)',
- 'Test Listening Mode 2 (345)',
- ]),
- 'source_list': list([
- 'Tidal',
- 'Line-In',
- 'HDMI A',
- ]),
- 'supported_features': ,
- }),
- 'context': ,
- 'entity_id': 'media_player.beosound_balance_11111111',
- 'last_changed': ,
- 'last_reported': ,
- 'last_updated': ,
- 'state': 'playing',
- })
-# ---
-# name: test_async_beolink_expand[all_discovered-True-None-log_messages0-2]
- StateSnapshot({
- 'attributes': ReadOnlyDict({
- 'beolink': dict({
- 'listeners': dict({
- 'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
- 'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
- }),
- 'peers': dict({
- 'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
- 'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
- }),
- 'self': dict({
- 'Living room Balance': '1111.1111111.11111111@products.bang-olufsen.com',
- }),
- }),
- 'device_class': 'speaker',
- 'entity_picture_local': None,
- 'friendly_name': 'Living room Balance',
- 'group_members': list([
- 'media_player.beosound_balance_11111111',
- 'listener_not_in_hass-1111.1111111.33333333@products.bang-olufsen.com',
- 'listener_not_in_hass-1111.1111111.44444444@products.bang-olufsen.com',
- ]),
- 'icon': 'mdi:speaker-wireless',
- 'media_content_type': ,
- 'repeat': ,
- 'shuffle': False,
- 'sound_mode': 'Test Listening Mode (123)',
- 'sound_mode_list': list([
- 'Test Listening Mode (123)',
- 'Test Listening Mode (234)',
- 'Test Listening Mode 2 (345)',
- ]),
- 'source': 'Tidal',
- 'source_list': list([
- 'Tidal',
- 'Line-In',
- 'HDMI A',
- ]),
- 'supported_features': ,
- }),
- 'context': ,
- 'entity_id': 'media_player.beosound_balance_11111111',
- 'last_changed': ,
- 'last_reported': ,
- 'last_updated': ,
- 'state': 'playing',
- })
-# ---
-# name: test_async_beolink_expand[all_discovered-True-expand_side_effect1-log_messages1-2]
- StateSnapshot({
- 'attributes': ReadOnlyDict({
- 'beolink': dict({
- 'listeners': dict({
- 'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
- 'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
- }),
- 'peers': dict({
- 'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
- 'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
- }),
- 'self': dict({
- 'Living room Balance': '1111.1111111.11111111@products.bang-olufsen.com',
- }),
- }),
- 'device_class': 'speaker',
- 'entity_picture_local': None,
- 'friendly_name': 'Living room Balance',
- 'group_members': list([
- 'media_player.beosound_balance_11111111',
- 'listener_not_in_hass-1111.1111111.33333333@products.bang-olufsen.com',
- 'listener_not_in_hass-1111.1111111.44444444@products.bang-olufsen.com',
- ]),
- 'icon': 'mdi:speaker-wireless',
- 'media_content_type': ,
- 'repeat': ,
- 'shuffle': False,
- 'sound_mode': 'Test Listening Mode (123)',
- 'sound_mode_list': list([
- 'Test Listening Mode (123)',
- 'Test Listening Mode (234)',
- 'Test Listening Mode 2 (345)',
- ]),
- 'source': 'Tidal',
- 'source_list': list([
- 'Tidal',
- 'Line-In',
- 'HDMI A',
- ]),
- 'supported_features': ,
- }),
- 'context': ,
- 'entity_id': 'media_player.beosound_balance_11111111',
- 'last_changed': ,
- 'last_reported': ,
- 'last_updated': ,
- 'state': 'playing',
- })
-# ---
-# name: test_async_beolink_expand[beolink_jids-parameter_value2-None-log_messages2-1]
- StateSnapshot({
- 'attributes': ReadOnlyDict({
- 'beolink': dict({
- 'listeners': dict({
- 'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
- 'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
- }),
- 'peers': dict({
- 'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
- 'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
- }),
- 'self': dict({
- 'Living room Balance': '1111.1111111.11111111@products.bang-olufsen.com',
- }),
- }),
- 'device_class': 'speaker',
- 'entity_picture_local': None,
- 'friendly_name': 'Living room Balance',
- 'group_members': list([
- 'media_player.beosound_balance_11111111',
- 'listener_not_in_hass-1111.1111111.33333333@products.bang-olufsen.com',
- 'listener_not_in_hass-1111.1111111.44444444@products.bang-olufsen.com',
- ]),
- 'icon': 'mdi:speaker-wireless',
- 'media_content_type': ,
- 'repeat': ,
- 'shuffle': False,
- 'sound_mode': 'Test Listening Mode (123)',
- 'sound_mode_list': list([
- 'Test Listening Mode (123)',
- 'Test Listening Mode (234)',
- 'Test Listening Mode 2 (345)',
- ]),
- 'source': 'Tidal',
- 'source_list': list([
- 'Tidal',
- 'Line-In',
- 'HDMI A',
- ]),
- 'supported_features': ,
- }),
- 'context': ,
- 'entity_id': 'media_player.beosound_balance_11111111',
- 'last_changed': ,
- 'last_reported': ,
- 'last_updated': ,
- 'state': 'playing',
- })
-# ---
-# name: test_async_beolink_expand[beolink_jids-parameter_value3-expand_side_effect3-log_messages3-1]
- StateSnapshot({
- 'attributes': ReadOnlyDict({
- 'beolink': dict({
- 'listeners': dict({
- 'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
- 'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
- }),
- 'peers': dict({
- 'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
- 'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
- }),
- 'self': dict({
- 'Living room Balance': '1111.1111111.11111111@products.bang-olufsen.com',
- }),
- }),
- 'device_class': 'speaker',
- 'entity_picture_local': None,
- 'friendly_name': 'Living room Balance',
- 'group_members': list([
- 'media_player.beosound_balance_11111111',
- 'listener_not_in_hass-1111.1111111.33333333@products.bang-olufsen.com',
- 'listener_not_in_hass-1111.1111111.44444444@products.bang-olufsen.com',
- ]),
- 'icon': 'mdi:speaker-wireless',
- 'media_content_type': ,
- 'repeat': ,
- 'shuffle': False,
- 'sound_mode': 'Test Listening Mode (123)',
- 'sound_mode_list': list([
- 'Test Listening Mode (123)',
- 'Test Listening Mode (234)',
- 'Test Listening Mode 2 (345)',
- ]),
- 'source': 'Tidal',
- 'source_list': list([
- 'Tidal',
- 'Line-In',
- 'HDMI A',
- ]),
- 'supported_features': ,
- }),
- 'context': ,
- 'entity_id': 'media_player.beosound_balance_11111111',
- 'last_changed': ,
- 'last_reported': ,
- 'last_updated': ,
- 'state': 'playing',
- })
-# ---
-# name: test_async_beolink_join
- StateSnapshot({
- 'attributes': ReadOnlyDict({
- 'beolink': dict({
- 'listeners': dict({
- 'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
- 'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
- }),
- 'peers': dict({
- 'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
- 'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
- }),
- 'self': dict({
- 'Living room Balance': '1111.1111111.11111111@products.bang-olufsen.com',
- }),
- }),
- 'device_class': 'speaker',
- 'entity_picture_local': None,
- 'friendly_name': 'Living room Balance',
- 'group_members': list([
- 'media_player.beosound_balance_11111111',
- 'listener_not_in_hass-1111.1111111.33333333@products.bang-olufsen.com',
- 'listener_not_in_hass-1111.1111111.44444444@products.bang-olufsen.com',
- ]),
- 'icon': 'mdi:speaker-wireless',
- 'media_content_type': ,
- 'repeat': ,
- 'shuffle': False,
- 'sound_mode': 'Test Listening Mode (123)',
- 'sound_mode_list': list([
- 'Test Listening Mode (123)',
- 'Test Listening Mode (234)',
- 'Test Listening Mode 2 (345)',
- ]),
- 'source_list': list([
- 'Tidal',
- 'Line-In',
- 'HDMI A',
- ]),
- 'supported_features': ,
- }),
- 'context': ,
- 'entity_id': 'media_player.beosound_balance_11111111',
- 'last_changed': ,
- 'last_reported': ,
- 'last_updated': ,
- 'state': 'playing',
- })
-# ---
-# name: test_async_beolink_unexpand
- StateSnapshot({
- 'attributes': ReadOnlyDict({
- 'beolink': dict({
- 'listeners': dict({
- 'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
- 'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
- }),
- 'peers': dict({
- 'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
- 'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
- }),
- 'self': dict({
- 'Living room Balance': '1111.1111111.11111111@products.bang-olufsen.com',
- }),
- }),
- 'device_class': 'speaker',
- 'entity_picture_local': None,
- 'friendly_name': 'Living room Balance',
- 'group_members': list([
- 'media_player.beosound_balance_11111111',
- 'listener_not_in_hass-1111.1111111.33333333@products.bang-olufsen.com',
- 'listener_not_in_hass-1111.1111111.44444444@products.bang-olufsen.com',
- ]),
- 'icon': 'mdi:speaker-wireless',
- 'media_content_type': ,
- 'repeat': ,
- 'shuffle': False,
- 'sound_mode': 'Test Listening Mode (123)',
- 'sound_mode_list': list([
- 'Test Listening Mode (123)',
- 'Test Listening Mode (234)',
- 'Test Listening Mode 2 (345)',
- ]),
- 'source_list': list([
- 'Tidal',
- 'Line-In',
- 'HDMI A',
- ]),
- 'supported_features': ,
- }),
- 'context': ,
- 'entity_id': 'media_player.beosound_balance_11111111',
- 'last_changed': ,
- 'last_reported': ,
- 'last_updated': ,
- 'state': 'playing',
- })
-# ---
-# name: test_async_join_players[group_members0-1-0]
- StateSnapshot({
- 'attributes': ReadOnlyDict({
- 'beolink': dict({
- 'listeners': dict({
- 'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
- 'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
- }),
- 'peers': dict({
- 'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
- 'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
- }),
- 'self': dict({
- 'Living room Balance': '1111.1111111.11111111@products.bang-olufsen.com',
- }),
- }),
- 'device_class': 'speaker',
- 'entity_picture_local': None,
- 'friendly_name': 'Living room Balance',
- 'group_members': list([
- 'media_player.beosound_balance_11111111',
- 'listener_not_in_hass-1111.1111111.33333333@products.bang-olufsen.com',
- 'listener_not_in_hass-1111.1111111.44444444@products.bang-olufsen.com',
- ]),
- 'icon': 'mdi:speaker-wireless',
- 'media_content_type': ,
- 'repeat': ,
- 'shuffle': False,
- 'sound_mode': 'Test Listening Mode (123)',
- 'sound_mode_list': list([
- 'Test Listening Mode (123)',
- 'Test Listening Mode (234)',
- 'Test Listening Mode 2 (345)',
- ]),
- 'source': 'Tidal',
- 'source_list': list([
- 'Tidal',
- 'Line-In',
- 'HDMI A',
- ]),
- 'supported_features': ,
- }),
- 'context': ,
- 'entity_id': 'media_player.beosound_balance_11111111',
- 'last_changed': ,
- 'last_reported': ,
- 'last_updated': ,
- 'state': 'playing',
- })
-# ---
-# name: test_async_join_players[group_members0-1-0].1
- StateSnapshot({
- 'attributes': ReadOnlyDict({
- 'beolink': dict({
- 'listeners': dict({
- 'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
- 'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
- }),
- 'peers': dict({
- 'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
- 'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
- }),
- 'self': dict({
- 'Living room Balance': '1111.1111111.22222222@products.bang-olufsen.com',
- }),
- }),
- 'device_class': 'speaker',
- 'entity_picture_local': None,
- 'friendly_name': 'Living room Balance',
- 'group_members': list([
- 'media_player.beosound_balance_22222222',
- 'listener_not_in_hass-1111.1111111.33333333@products.bang-olufsen.com',
- 'listener_not_in_hass-1111.1111111.44444444@products.bang-olufsen.com',
- ]),
- 'icon': 'mdi:speaker-wireless',
- 'media_content_type': ,
- 'sound_mode': 'Test Listening Mode (123)',
- 'sound_mode_list': list([
- 'Test Listening Mode (123)',
- 'Test Listening Mode (234)',
- 'Test Listening Mode 2 (345)',
- ]),
- 'source_list': list([
- 'Tidal',
- 'Line-In',
- 'HDMI A',
- ]),
- 'supported_features': ,
- }),
- 'context': ,
- 'entity_id': 'media_player.beosound_balance_22222222',
- 'last_changed': ,
- 'last_reported': ,
- 'last_updated': ,
- 'state': 'playing',
- })
-# ---
-# name: test_async_join_players[group_members1-0-1]
- StateSnapshot({
- 'attributes': ReadOnlyDict({
- 'beolink': dict({
- 'listeners': dict({
- 'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
- 'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
- }),
- 'peers': dict({
- 'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
- 'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
- }),
- 'self': dict({
- 'Living room Balance': '1111.1111111.11111111@products.bang-olufsen.com',
- }),
- }),
- 'device_class': 'speaker',
- 'entity_picture_local': None,
- 'friendly_name': 'Living room Balance',
- 'group_members': list([
- 'media_player.beosound_balance_11111111',
- 'listener_not_in_hass-1111.1111111.33333333@products.bang-olufsen.com',
- 'listener_not_in_hass-1111.1111111.44444444@products.bang-olufsen.com',
- ]),
- 'icon': 'mdi:speaker-wireless',
- 'media_content_type': ,
- 'repeat': ,
- 'shuffle': False,
- 'sound_mode': 'Test Listening Mode (123)',
- 'sound_mode_list': list([
- 'Test Listening Mode (123)',
- 'Test Listening Mode (234)',
- 'Test Listening Mode 2 (345)',
- ]),
- 'source': 'Tidal',
- 'source_list': list([
- 'Tidal',
- 'Line-In',
- 'HDMI A',
- ]),
- 'supported_features': ,
- }),
- 'context': ,
- 'entity_id': 'media_player.beosound_balance_11111111',
- 'last_changed': ,
- 'last_reported': ,
- 'last_updated': ,
- 'state': 'playing',
- })
-# ---
-# name: test_async_join_players[group_members1-0-1].1
- StateSnapshot({
- 'attributes': ReadOnlyDict({
- 'beolink': dict({
- 'listeners': dict({
- 'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
- 'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
- }),
- 'peers': dict({
- 'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
- 'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
- }),
- 'self': dict({
- 'Living room Balance': '1111.1111111.22222222@products.bang-olufsen.com',
- }),
- }),
- 'device_class': 'speaker',
- 'entity_picture_local': None,
- 'friendly_name': 'Living room Balance',
- 'group_members': list([
- 'media_player.beosound_balance_22222222',
- 'listener_not_in_hass-1111.1111111.33333333@products.bang-olufsen.com',
- 'listener_not_in_hass-1111.1111111.44444444@products.bang-olufsen.com',
- ]),
- 'icon': 'mdi:speaker-wireless',
- 'media_content_type': ,
- 'sound_mode': 'Test Listening Mode (123)',
- 'sound_mode_list': list([
- 'Test Listening Mode (123)',
- 'Test Listening Mode (234)',
- 'Test Listening Mode 2 (345)',
- ]),
- 'source_list': list([
- 'Tidal',
- 'Line-In',
- 'HDMI A',
- ]),
- 'supported_features': ,
- }),
- 'context': ,
- 'entity_id': 'media_player.beosound_balance_22222222',
- 'last_changed': ,
- 'last_reported': ,
- 'last_updated': ,
- 'state': 'playing',
- })
-# ---
-# name: test_async_join_players_invalid[source0-group_members0-expected_result0-invalid_source]
- StateSnapshot({
- 'attributes': ReadOnlyDict({
- 'beolink': dict({
- 'listeners': dict({
- 'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
- 'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
- }),
- 'peers': dict({
- 'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
- 'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
- }),
- 'self': dict({
- 'Living room Balance': '1111.1111111.11111111@products.bang-olufsen.com',
- }),
- }),
- 'device_class': 'speaker',
- 'entity_picture_local': None,
- 'friendly_name': 'Living room Balance',
- 'group_members': list([
- 'media_player.beosound_balance_11111111',
- 'listener_not_in_hass-1111.1111111.33333333@products.bang-olufsen.com',
- 'listener_not_in_hass-1111.1111111.44444444@products.bang-olufsen.com',
- ]),
- 'icon': 'mdi:speaker-wireless',
- 'media_content_type': ,
- 'media_position': 0,
- 'sound_mode': 'Test Listening Mode (123)',
- 'sound_mode_list': list([
- 'Test Listening Mode (123)',
- 'Test Listening Mode (234)',
- 'Test Listening Mode 2 (345)',
- ]),
- 'source': 'Line-In',
- 'source_list': list([
- 'Tidal',
- 'Line-In',
- 'HDMI A',
- ]),
- 'supported_features': ,
- }),
- 'context': ,
- 'entity_id': 'media_player.beosound_balance_11111111',
- 'last_changed': ,
- 'last_reported': ,
- 'last_updated': ,
- 'state': 'playing',
- })
-# ---
-# name: test_async_join_players_invalid[source0-group_members0-expected_result0-invalid_source].1
- StateSnapshot({
- 'attributes': ReadOnlyDict({
- 'beolink': dict({
- 'listeners': dict({
- 'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
- 'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
- }),
- 'peers': dict({
- 'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
- 'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
- }),
- 'self': dict({
- 'Living room Balance': '1111.1111111.22222222@products.bang-olufsen.com',
- }),
- }),
- 'device_class': 'speaker',
- 'entity_picture_local': None,
- 'friendly_name': 'Living room Balance',
- 'group_members': list([
- 'media_player.beosound_balance_22222222',
- 'listener_not_in_hass-1111.1111111.33333333@products.bang-olufsen.com',
- 'listener_not_in_hass-1111.1111111.44444444@products.bang-olufsen.com',
- ]),
- 'icon': 'mdi:speaker-wireless',
- 'media_content_type': ,
- 'sound_mode': 'Test Listening Mode (123)',
- 'sound_mode_list': list([
- 'Test Listening Mode (123)',
- 'Test Listening Mode (234)',
- 'Test Listening Mode 2 (345)',
- ]),
- 'source_list': list([
- 'Tidal',
- 'Line-In',
- 'HDMI A',
- ]),
- 'supported_features': ,
- }),
- 'context': ,
- 'entity_id': 'media_player.beosound_balance_22222222',
- 'last_changed': ,
- 'last_reported': ,
- 'last_updated': ,
- 'state': 'playing',
- })
-# ---
-# name: test_async_join_players_invalid[source1-group_members1-expected_result1-invalid_grouping_entity]
- StateSnapshot({
- 'attributes': ReadOnlyDict({
- 'beolink': dict({
- 'listeners': dict({
- 'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
- 'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
- }),
- 'peers': dict({
- 'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
- 'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
- }),
- 'self': dict({
- 'Living room Balance': '1111.1111111.11111111@products.bang-olufsen.com',
- }),
- }),
- 'device_class': 'speaker',
- 'entity_picture_local': None,
- 'friendly_name': 'Living room Balance',
- 'group_members': list([
- 'media_player.beosound_balance_11111111',
- 'listener_not_in_hass-1111.1111111.33333333@products.bang-olufsen.com',
- 'listener_not_in_hass-1111.1111111.44444444@products.bang-olufsen.com',
- ]),
- 'icon': 'mdi:speaker-wireless',
- 'media_content_type': ,
- 'sound_mode': 'Test Listening Mode (123)',
- 'sound_mode_list': list([
- 'Test Listening Mode (123)',
- 'Test Listening Mode (234)',
- 'Test Listening Mode 2 (345)',
- ]),
- 'source': 'Tidal',
- 'source_list': list([
- 'Tidal',
- 'Line-In',
- 'HDMI A',
- ]),
- 'supported_features': ,
- }),
- 'context': ,
- 'entity_id': 'media_player.beosound_balance_11111111',
- 'last_changed': ,
- 'last_reported': ,
- 'last_updated': ,
- 'state': 'playing',
- })
-# ---
-# name: test_async_join_players_invalid[source1-group_members1-expected_result1-invalid_grouping_entity].1
- StateSnapshot({
- 'attributes': ReadOnlyDict({
- 'beolink': dict({
- 'listeners': dict({
- 'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
- 'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
- }),
- 'peers': dict({
- 'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
- 'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
- }),
- 'self': dict({
- 'Living room Balance': '1111.1111111.22222222@products.bang-olufsen.com',
- }),
- }),
- 'device_class': 'speaker',
- 'entity_picture_local': None,
- 'friendly_name': 'Living room Balance',
- 'group_members': list([
- 'media_player.beosound_balance_22222222',
- 'listener_not_in_hass-1111.1111111.33333333@products.bang-olufsen.com',
- 'listener_not_in_hass-1111.1111111.44444444@products.bang-olufsen.com',
- ]),
- 'icon': 'mdi:speaker-wireless',
- 'media_content_type': ,
- 'sound_mode': 'Test Listening Mode (123)',
- 'sound_mode_list': list([
- 'Test Listening Mode (123)',
- 'Test Listening Mode (234)',
- 'Test Listening Mode 2 (345)',
- ]),
- 'source_list': list([
- 'Tidal',
- 'Line-In',
- 'HDMI A',
- ]),
- 'supported_features': ,
- }),
- 'context': ,
- 'entity_id': 'media_player.beosound_balance_22222222',
- 'last_changed': ,
- 'last_reported': ,
- 'last_updated': ,
- 'state': 'playing',
- })
-# ---
-# name: test_async_unjoin_player
- StateSnapshot({
- 'attributes': ReadOnlyDict({
- 'beolink': dict({
- 'listeners': dict({
- 'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
- 'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
- }),
- 'peers': dict({
- 'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
- 'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
- }),
- 'self': dict({
- 'Living room Balance': '1111.1111111.11111111@products.bang-olufsen.com',
- }),
- }),
- 'device_class': 'speaker',
- 'entity_picture_local': None,
- 'friendly_name': 'Living room Balance',
- 'group_members': list([
- 'media_player.beosound_balance_11111111',
- 'listener_not_in_hass-1111.1111111.33333333@products.bang-olufsen.com',
- 'listener_not_in_hass-1111.1111111.44444444@products.bang-olufsen.com',
- ]),
- 'icon': 'mdi:speaker-wireless',
- 'media_content_type': ,
- 'repeat': ,
- 'shuffle': False,
- 'sound_mode': 'Test Listening Mode (123)',
- 'sound_mode_list': list([
- 'Test Listening Mode (123)',
- 'Test Listening Mode (234)',
- 'Test Listening Mode 2 (345)',
- ]),
- 'source_list': list([
- 'Tidal',
- 'Line-In',
- 'HDMI A',
- ]),
- 'supported_features': ,
- }),
- 'context': ,
- 'entity_id': 'media_player.beosound_balance_11111111',
- 'last_changed': ,
- 'last_reported': ,
- 'last_updated': ,
- 'state': 'playing',
- })
-# ---
-# name: test_async_update_beolink_listener
- StateSnapshot({
- 'attributes': ReadOnlyDict({
- 'beolink': dict({
- 'leader': dict({
- 'Laundry room Balance': '1111.1111111.22222222@products.bang-olufsen.com',
- }),
- 'peers': dict({
- 'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
- 'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
- }),
- 'self': dict({
- 'Living room Balance': '1111.1111111.11111111@products.bang-olufsen.com',
- }),
- }),
- 'device_class': 'speaker',
- 'entity_picture_local': None,
- 'friendly_name': 'Living room Balance',
- 'group_members': list([
- 'media_player.beosound_balance_22222222',
- 'media_player.beosound_balance_11111111',
- ]),
- 'icon': 'mdi:speaker-wireless',
- 'media_content_type': ,
- 'sound_mode': 'Test Listening Mode (123)',
- 'sound_mode_list': list([
- 'Test Listening Mode (123)',
- 'Test Listening Mode (234)',
- 'Test Listening Mode 2 (345)',
- ]),
- 'source_list': list([
- 'Tidal',
- 'Line-In',
- 'HDMI A',
- ]),
- 'supported_features': ,
- }),
- 'context': ,
- 'entity_id': 'media_player.beosound_balance_11111111',
- 'last_changed': ,
- 'last_reported': ,
- 'last_updated': ,
- 'state': 'playing',
- })
-# ---
-# name: test_async_update_beolink_listener.1
- StateSnapshot({
- 'attributes': ReadOnlyDict({
- 'beolink': dict({
- 'listeners': dict({
- 'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
- 'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
- }),
- 'peers': dict({
- 'Lego room Balance': '1111.1111111.33333333@products.bang-olufsen.com',
- 'Lounge room Balance': '1111.1111111.44444444@products.bang-olufsen.com',
- }),
- 'self': dict({
- 'Living room Balance': '1111.1111111.22222222@products.bang-olufsen.com',
- }),
- }),
- 'device_class': 'speaker',
- 'entity_picture_local': None,
- 'friendly_name': 'Living room Balance',
- 'group_members': list([
- 'media_player.beosound_balance_22222222',
- 'listener_not_in_hass-1111.1111111.33333333@products.bang-olufsen.com',
- 'listener_not_in_hass-1111.1111111.44444444@products.bang-olufsen.com',
- ]),
- 'icon': 'mdi:speaker-wireless',
- 'media_content_type': ,
- 'sound_mode': 'Test Listening Mode (123)',
- 'sound_mode_list': list([
- 'Test Listening Mode (123)',
- 'Test Listening Mode (234)',
- 'Test Listening Mode 2 (345)',
- ]),
- 'source_list': list([
- 'Tidal',
- 'Line-In',
- 'HDMI A',
- ]),
- 'supported_features': ,
- }),
- 'context': ,
- 'entity_id': 'media_player.beosound_balance_22222222',
- 'last_changed': ,
- 'last_reported': ,
- 'last_updated': ,
- 'state': 'playing',
- })
-# ---
diff --git a/tests/components/bang_olufsen/test_init.py b/tests/components/bang_olufsen/test_init.py
index c8e4c05f9ab..5b809488ed8 100644
--- a/tests/components/bang_olufsen/test_init.py
+++ b/tests/components/bang_olufsen/test_init.py
@@ -9,7 +9,7 @@ from homeassistant.config_entries import ConfigEntryState
from homeassistant.core import HomeAssistant
from homeassistant.helpers.device_registry import DeviceRegistry
-from .const import TEST_FRIENDLY_NAME, TEST_MODEL_BALANCE, TEST_SERIAL_NUMBER
+from .const import TEST_MODEL_BALANCE, TEST_NAME, TEST_SERIAL_NUMBER
from tests.common import MockConfigEntry
@@ -35,8 +35,7 @@ async def test_setup_entry(
identifiers={(DOMAIN, TEST_SERIAL_NUMBER)}
)
assert device is not None
- # Is usually TEST_NAME, but is updated to the device's friendly name by _update_name_and_beolink
- assert device.name == TEST_FRIENDLY_NAME
+ assert device.name == TEST_NAME
assert device.model == TEST_MODEL_BALANCE
# Ensure that the connection has been checked WebSocket connection has been initialized
diff --git a/tests/components/bang_olufsen/test_media_player.py b/tests/components/bang_olufsen/test_media_player.py
index aa35b0265dc..8f23af9e04a 100644
--- a/tests/components/bang_olufsen/test_media_player.py
+++ b/tests/components/bang_olufsen/test_media_player.py
@@ -4,10 +4,8 @@ from contextlib import AbstractContextManager, nullcontext as does_not_raise
import logging
from unittest.mock import AsyncMock, patch
-from mozart_api.exceptions import NotFoundException
from mozart_api.models import (
BeolinkLeader,
- BeolinkSelf,
PlaybackContentMetadata,
PlayQueueSettings,
RenderingState,
@@ -16,8 +14,6 @@ from mozart_api.models import (
WebsocketNotificationTag,
)
import pytest
-from syrupy.assertion import SnapshotAssertion
-from syrupy.filters import props
from homeassistant.components.bang_olufsen.const import (
BANG_OLUFSEN_REPEAT_FROM_HA,
@@ -50,29 +46,24 @@ from homeassistant.components.media_player import (
ATTR_SOUND_MODE_LIST,
DOMAIN as MEDIA_PLAYER_DOMAIN,
SERVICE_CLEAR_PLAYLIST,
- SERVICE_JOIN,
SERVICE_MEDIA_NEXT_TRACK,
SERVICE_MEDIA_PLAY_PAUSE,
SERVICE_MEDIA_PREVIOUS_TRACK,
SERVICE_MEDIA_SEEK,
SERVICE_MEDIA_STOP,
SERVICE_PLAY_MEDIA,
- SERVICE_REPEAT_SET,
SERVICE_SELECT_SOUND_MODE,
SERVICE_SELECT_SOURCE,
- SERVICE_SHUFFLE_SET,
SERVICE_TURN_OFF,
- SERVICE_UNJOIN,
SERVICE_VOLUME_MUTE,
SERVICE_VOLUME_SET,
MediaPlayerState,
MediaType,
RepeatMode,
)
-from homeassistant.const import ATTR_ENTITY_ID
+from homeassistant.const import ATTR_ENTITY_ID, SERVICE_REPEAT_SET, SERVICE_SHUFFLE_SET
from homeassistant.core import HomeAssistant
from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
-from homeassistant.helpers.device_registry import DeviceRegistry
from homeassistant.setup import async_setup_component
from .const import (
@@ -85,10 +76,7 @@ from .const import (
TEST_DEEZER_TRACK,
TEST_FALLBACK_SOURCES,
TEST_FRIENDLY_NAME_2,
- TEST_JID_1,
TEST_JID_2,
- TEST_JID_3,
- TEST_JID_4,
TEST_LISTENING_MODE_REF,
TEST_MEDIA_PLAYER_ENTITY_ID,
TEST_MEDIA_PLAYER_ENTITY_ID_2,
@@ -105,7 +93,6 @@ from .const import (
TEST_SEEK_POSITION_HOME_ASSISTANT_FORMAT,
TEST_SOUND_MODE_2,
TEST_SOUND_MODES,
- TEST_SOURCE,
TEST_SOURCES,
TEST_VIDEO_SOURCES,
TEST_VOLUME,
@@ -149,9 +136,6 @@ async def test_initialization(
mock_mozart_client.get_remote_menu.assert_called_once()
mock_mozart_client.get_listening_mode_set.assert_called_once()
mock_mozart_client.get_active_listening_mode.assert_called_once()
- mock_mozart_client.get_beolink_self.assert_called_once()
- mock_mozart_client.get_beolink_peers.assert_called_once()
- mock_mozart_client.get_beolink_listeners.assert_called_once()
async def test_async_update_sources_audio_only(
@@ -232,7 +216,7 @@ async def test_async_update_sources_availability(
# Add a source that is available and playable
mock_mozart_client.get_available_sources.return_value = SourceArray(
- items=[TEST_SOURCE]
+ items=[BangOlufsenSource.TIDAL]
)
# Send playback_source. The source is not actually used, so its attributes don't matter
@@ -240,7 +224,7 @@ async def test_async_update_sources_availability(
assert mock_mozart_client.get_available_sources.call_count == 2
assert (states := hass.states.get(TEST_MEDIA_PLAYER_ENTITY_ID))
- assert states.attributes[ATTR_INPUT_SOURCE_LIST] == [TEST_SOURCE.name]
+ assert states.attributes[ATTR_INPUT_SOURCE_LIST] == [BangOlufsenSource.TIDAL.name]
async def test_async_update_playback_metadata(
@@ -358,17 +342,19 @@ async def test_async_update_playback_state(
@pytest.mark.parametrize(
- ("source", "content_type", "progress", "metadata"),
+ ("reported_source", "real_source", "content_type", "progress", "metadata"),
[
- # Normal source, music mediatype expected
+ # Normal source, music mediatype expected, no progress expected
(
- TEST_SOURCE,
+ BangOlufsenSource.TIDAL,
+ BangOlufsenSource.TIDAL,
MediaType.MUSIC,
TEST_PLAYBACK_PROGRESS.progress,
PlaybackContentMetadata(),
),
- # URI source, url media type expected
+ # URI source, url media type expected, no progress expected
(
+ BangOlufsenSource.URI_STREAMER,
BangOlufsenSource.URI_STREAMER,
MediaType.URL,
TEST_PLAYBACK_PROGRESS.progress,
@@ -377,17 +363,44 @@ async def test_async_update_playback_state(
# Line-In source,media type expected, progress 0 expected
(
BangOlufsenSource.LINE_IN,
+ BangOlufsenSource.CHROMECAST,
MediaType.MUSIC,
0,
PlaybackContentMetadata(),
),
+ # Chromecast as source, but metadata says Line-In.
+ # Progress is not set to 0 as the source is Chromecast first
+ (
+ BangOlufsenSource.CHROMECAST,
+ BangOlufsenSource.LINE_IN,
+ MediaType.MUSIC,
+ TEST_PLAYBACK_PROGRESS.progress,
+ PlaybackContentMetadata(title=BangOlufsenSource.LINE_IN.name),
+ ),
+ # Chromecast as source, but metadata says Bluetooth
+ (
+ BangOlufsenSource.CHROMECAST,
+ BangOlufsenSource.BLUETOOTH,
+ MediaType.MUSIC,
+ TEST_PLAYBACK_PROGRESS.progress,
+ PlaybackContentMetadata(title=BangOlufsenSource.BLUETOOTH.name),
+ ),
+ # Chromecast as source, but metadata says Bluetooth in another way
+ (
+ BangOlufsenSource.CHROMECAST,
+ BangOlufsenSource.BLUETOOTH,
+ MediaType.MUSIC,
+ TEST_PLAYBACK_PROGRESS.progress,
+ PlaybackContentMetadata(art=[]),
+ ),
],
)
async def test_async_update_source_change(
hass: HomeAssistant,
mock_mozart_client: AsyncMock,
mock_config_entry: MockConfigEntry,
- source: Source,
+ reported_source: Source,
+ real_source: Source,
content_type: MediaType,
progress: int,
metadata: PlaybackContentMetadata,
@@ -416,10 +429,10 @@ async def test_async_update_source_change(
# Simulate metadata
playback_metadata_callback(metadata)
- source_change_callback(source)
+ source_change_callback(reported_source)
assert (states := hass.states.get(TEST_MEDIA_PLAYER_ENTITY_ID))
- assert states.attributes[ATTR_INPUT_SOURCE] == source.name
+ assert states.attributes[ATTR_INPUT_SOURCE] == real_source.name
assert states.attributes[ATTR_MEDIA_CONTENT_TYPE] == content_type
assert states.attributes[ATTR_MEDIA_POSITION] == progress
@@ -517,14 +530,11 @@ async def test_async_update_beolink_line_in(
assert (states := hass.states.get(TEST_MEDIA_PLAYER_ENTITY_ID))
assert states.attributes["group_members"] == []
- # Called once during _initialize and once during _async_update_beolink
- assert mock_mozart_client.get_beolink_listeners.call_count == 2
- assert mock_mozart_client.get_beolink_peers.call_count == 2
+ assert mock_mozart_client.get_beolink_listeners.call_count == 1
async def test_async_update_beolink_listener(
hass: HomeAssistant,
- snapshot: SnapshotAssertion,
mock_mozart_client: AsyncMock,
mock_config_entry: MockConfigEntry,
mock_config_entry_2: MockConfigEntry,
@@ -557,56 +567,7 @@ async def test_async_update_beolink_listener(
TEST_MEDIA_PLAYER_ENTITY_ID,
]
- # Called once for each entity during _initialize
- assert mock_mozart_client.get_beolink_listeners.call_count == 2
- # Called once for each entity during _initialize and
- # once more during _async_update_beolink for the entity that has the callback associated with it.
- assert mock_mozart_client.get_beolink_peers.call_count == 3
-
- # Main entity
- assert (states := hass.states.get(TEST_MEDIA_PLAYER_ENTITY_ID))
- assert states == snapshot(exclude=props("media_position_updated_at"))
-
- # Secondary entity
- assert (states := hass.states.get(TEST_MEDIA_PLAYER_ENTITY_ID_2))
- assert states == snapshot(exclude=props("media_position_updated_at"))
-
-
-async def test_async_update_name_and_beolink(
- hass: HomeAssistant,
- device_registry: DeviceRegistry,
- mock_mozart_client: AsyncMock,
- mock_config_entry: MockConfigEntry,
-) -> None:
- """Test _async_update_name_and_beolink."""
- # Change response to ensure device name is changed
- mock_mozart_client.get_beolink_self.return_value = BeolinkSelf(
- friendly_name=TEST_FRIENDLY_NAME_2, jid=TEST_JID_1
- )
-
- mock_config_entry.add_to_hass(hass)
- await hass.config_entries.async_setup(mock_config_entry.entry_id)
-
- configuration_callback = (
- mock_mozart_client.get_notification_notifications.call_args[0][0]
- )
- # Trigger callback
- configuration_callback(WebsocketNotificationTag(value="configuration"))
-
- await hass.async_block_till_done()
-
- assert mock_mozart_client.get_beolink_self.call_count == 2
- assert mock_mozart_client.get_beolink_peers.call_count == 2
- assert mock_mozart_client.get_beolink_listeners.call_count == 2
-
- # Check that device name has been changed
- assert mock_config_entry.unique_id
- assert (
- device := device_registry.async_get_device(
- identifiers={(DOMAIN, mock_config_entry.unique_id)}
- )
- )
- assert device.name == TEST_FRIENDLY_NAME_2
+ assert mock_mozart_client.get_beolink_listeners.call_count == 0
async def test_async_mute_volume(
@@ -746,7 +707,7 @@ async def test_async_media_next_track(
("source", "expected_result", "seek_called_times"),
[
# Seekable source, seek expected
- (TEST_SOURCE, does_not_raise(), 1),
+ (BangOlufsenSource.DEEZER, does_not_raise(), 1),
# Non seekable source, seek shouldn't work
(BangOlufsenSource.LINE_IN, pytest.raises(HomeAssistantError), 0),
# Malformed source, seek shouldn't work
@@ -834,7 +795,7 @@ async def test_async_clear_playlist(
# Invalid source
("Test source", pytest.raises(ServiceValidationError), 0, 0),
# Valid audio source
- (TEST_SOURCE.name, does_not_raise(), 1, 0),
+ (BangOlufsenSource.TIDAL.name, does_not_raise(), 1, 0),
# Valid video source
(TEST_VIDEO_SOURCES[0], does_not_raise(), 0, 1),
],
@@ -1382,7 +1343,6 @@ async def test_async_browse_media(
)
async def test_async_join_players(
hass: HomeAssistant,
- snapshot: SnapshotAssertion,
mock_mozart_client: AsyncMock,
mock_config_entry: MockConfigEntry,
mock_config_entry_2: MockConfigEntry,
@@ -1404,11 +1364,11 @@ async def test_async_join_players(
await hass.config_entries.async_setup(mock_config_entry_2.entry_id)
# Set the source to a beolink expandable source
- source_change_callback(TEST_SOURCE)
+ source_change_callback(BangOlufsenSource.TIDAL)
await hass.services.async_call(
- MEDIA_PLAYER_DOMAIN,
- SERVICE_JOIN,
+ "media_player",
+ "join",
{
ATTR_ENTITY_ID: TEST_MEDIA_PLAYER_ENTITY_ID,
ATTR_GROUP_MEMBERS: group_members,
@@ -1419,14 +1379,6 @@ async def test_async_join_players(
assert mock_mozart_client.post_beolink_expand.call_count == expand_count
assert mock_mozart_client.join_latest_beolink_experience.call_count == join_count
- # Main entity
- assert (states := hass.states.get(TEST_MEDIA_PLAYER_ENTITY_ID))
- assert states == snapshot(exclude=props("media_position_updated_at"))
-
- # Secondary entity
- assert (states := hass.states.get(TEST_MEDIA_PLAYER_ENTITY_ID_2))
- assert states == snapshot(exclude=props("media_position_updated_at"))
-
@pytest.mark.parametrize(
("source", "group_members", "expected_result", "error_type"),
@@ -1440,7 +1392,7 @@ async def test_async_join_players(
),
# Invalid media_player entity
(
- TEST_SOURCE,
+ BangOlufsenSource.TIDAL,
[TEST_MEDIA_PLAYER_ENTITY_ID_3],
pytest.raises(ServiceValidationError),
"invalid_grouping_entity",
@@ -1449,7 +1401,6 @@ async def test_async_join_players(
)
async def test_async_join_players_invalid(
hass: HomeAssistant,
- snapshot: SnapshotAssertion,
mock_mozart_client: AsyncMock,
mock_config_entry: MockConfigEntry,
mock_config_entry_2: MockConfigEntry,
@@ -1474,8 +1425,8 @@ async def test_async_join_players_invalid(
with expected_result as exc_info:
await hass.services.async_call(
- MEDIA_PLAYER_DOMAIN,
- SERVICE_JOIN,
+ "media_player",
+ "join",
{
ATTR_ENTITY_ID: TEST_MEDIA_PLAYER_ENTITY_ID,
ATTR_GROUP_MEMBERS: group_members,
@@ -1490,18 +1441,9 @@ async def test_async_join_players_invalid(
assert mock_mozart_client.post_beolink_expand.call_count == 0
assert mock_mozart_client.join_latest_beolink_experience.call_count == 0
- # Main entity
- assert (states := hass.states.get(TEST_MEDIA_PLAYER_ENTITY_ID))
- assert states == snapshot(exclude=props("media_position_updated_at"))
-
- # Secondary entity
- assert (states := hass.states.get(TEST_MEDIA_PLAYER_ENTITY_ID_2))
- assert states == snapshot(exclude=props("media_position_updated_at"))
-
async def test_async_unjoin_player(
hass: HomeAssistant,
- snapshot: SnapshotAssertion,
mock_mozart_client: AsyncMock,
mock_config_entry: MockConfigEntry,
) -> None:
@@ -1511,181 +1453,14 @@ async def test_async_unjoin_player(
await hass.config_entries.async_setup(mock_config_entry.entry_id)
await hass.services.async_call(
- MEDIA_PLAYER_DOMAIN,
- SERVICE_UNJOIN,
+ "media_player",
+ "unjoin",
{ATTR_ENTITY_ID: TEST_MEDIA_PLAYER_ENTITY_ID},
blocking=True,
)
mock_mozart_client.post_beolink_leave.assert_called_once()
- assert (states := hass.states.get(TEST_MEDIA_PLAYER_ENTITY_ID))
- assert states == snapshot(exclude=props("media_position_updated_at"))
-
-
-async def test_async_beolink_join(
- hass: HomeAssistant,
- snapshot: SnapshotAssertion,
- mock_mozart_client: AsyncMock,
- mock_config_entry: MockConfigEntry,
-) -> None:
- """Test async_beolink_join with defined JID."""
-
- mock_config_entry.add_to_hass(hass)
- await hass.config_entries.async_setup(mock_config_entry.entry_id)
-
- await hass.services.async_call(
- DOMAIN,
- "beolink_join",
- {
- ATTR_ENTITY_ID: TEST_MEDIA_PLAYER_ENTITY_ID,
- "beolink_jid": TEST_JID_2,
- },
- blocking=True,
- )
-
- mock_mozart_client.join_beolink_peer.assert_called_once_with(jid=TEST_JID_2)
-
- assert (states := hass.states.get(TEST_MEDIA_PLAYER_ENTITY_ID))
- assert states == snapshot(exclude=props("media_position_updated_at"))
-
-
-@pytest.mark.parametrize(
- (
- "parameter",
- "parameter_value",
- "expand_side_effect",
- "log_messages",
- "peers_call_count",
- ),
- [
- # All discovered
- # Valid peers
- ("all_discovered", True, None, [], 2),
- # Invalid peers
- (
- "all_discovered",
- True,
- NotFoundException(),
- [f"Unable to expand to {TEST_JID_3}", f"Unable to expand to {TEST_JID_4}"],
- 2,
- ),
- # Beolink JIDs
- # Valid peer
- ("beolink_jids", [TEST_JID_3, TEST_JID_4], None, [], 1),
- # Invalid peer
- (
- "beolink_jids",
- [TEST_JID_3, TEST_JID_4],
- NotFoundException(),
- [
- f"Unable to expand to {TEST_JID_3}. Is the device available on the network?",
- f"Unable to expand to {TEST_JID_4}. Is the device available on the network?",
- ],
- 1,
- ),
- ],
-)
-async def test_async_beolink_expand(
- hass: HomeAssistant,
- caplog: pytest.LogCaptureFixture,
- snapshot: SnapshotAssertion,
- mock_mozart_client: AsyncMock,
- mock_config_entry: MockConfigEntry,
- parameter: str,
- parameter_value: bool | list[str],
- expand_side_effect: NotFoundException | None,
- log_messages: list[str],
- peers_call_count: int,
-) -> None:
- """Test async_beolink_expand."""
- mock_mozart_client.post_beolink_expand.side_effect = expand_side_effect
-
- mock_config_entry.add_to_hass(hass)
- await hass.config_entries.async_setup(mock_config_entry.entry_id)
-
- source_change_callback = (
- mock_mozart_client.get_source_change_notifications.call_args[0][0]
- )
-
- # Set the source to a beolink expandable source
- source_change_callback(TEST_SOURCE)
-
- await hass.services.async_call(
- DOMAIN,
- "beolink_expand",
- {
- ATTR_ENTITY_ID: TEST_MEDIA_PLAYER_ENTITY_ID,
- parameter: parameter_value,
- },
- blocking=True,
- )
-
- # Check log messages
- for log_message in log_messages:
- assert log_message in caplog.text
-
- # Called once during _initialize and once during async_beolink_expand for all_discovered
- assert mock_mozart_client.get_beolink_peers.call_count == peers_call_count
-
- assert mock_mozart_client.post_beolink_expand.call_count == len(
- await mock_mozart_client.get_beolink_peers()
- )
-
- assert (states := hass.states.get(TEST_MEDIA_PLAYER_ENTITY_ID))
- assert states == snapshot(exclude=props("media_position_updated_at"))
-
-
-async def test_async_beolink_unexpand(
- hass: HomeAssistant,
- snapshot: SnapshotAssertion,
- mock_mozart_client: AsyncMock,
- mock_config_entry: MockConfigEntry,
-) -> None:
- """Test test_async_beolink_unexpand."""
-
- mock_config_entry.add_to_hass(hass)
- await hass.config_entries.async_setup(mock_config_entry.entry_id)
-
- await hass.services.async_call(
- DOMAIN,
- "beolink_unexpand",
- {
- ATTR_ENTITY_ID: TEST_MEDIA_PLAYER_ENTITY_ID,
- "beolink_jids": [TEST_JID_3, TEST_JID_4],
- },
- blocking=True,
- )
-
- assert mock_mozart_client.post_beolink_unexpand.call_count == 2
-
- assert (states := hass.states.get(TEST_MEDIA_PLAYER_ENTITY_ID))
- assert states == snapshot(exclude=props("media_position_updated_at"))
-
-
-async def test_async_beolink_allstandby(
- hass: HomeAssistant,
- snapshot: SnapshotAssertion,
- mock_mozart_client: AsyncMock,
- mock_config_entry: MockConfigEntry,
-) -> None:
- """Test async_beolink_allstandby."""
-
- mock_config_entry.add_to_hass(hass)
- await hass.config_entries.async_setup(mock_config_entry.entry_id)
-
- await hass.services.async_call(
- DOMAIN,
- "beolink_allstandby",
- {ATTR_ENTITY_ID: TEST_MEDIA_PLAYER_ENTITY_ID},
- blocking=True,
- )
-
- mock_mozart_client.post_beolink_allstandby.assert_called_once()
-
- assert (states := hass.states.get(TEST_MEDIA_PLAYER_ENTITY_ID))
- assert states == snapshot(exclude=props("media_position_updated_at"))
-
@pytest.mark.parametrize(
("repeat"),
diff --git a/tests/components/bluesound/test_media_player.py b/tests/components/bluesound/test_media_player.py
index 0bf615de3da..894528265e1 100644
--- a/tests/components/bluesound/test_media_player.py
+++ b/tests/components/bluesound/test_media_player.py
@@ -345,31 +345,3 @@ async def test_attr_bluesound_group(
).attributes.get("bluesound_group")
assert attr_bluesound_group == ["player-name1111", "player-name2222"]
-
-
-async def test_volume_up_from_6_to_7(
- hass: HomeAssistant,
- setup_config_entry: None,
- player_mocks: PlayerMocks,
-) -> None:
- """Test the media player volume up from 6 to 7.
-
- This fails if if rounding is not done correctly. See https://github.com/home-assistant/core/issues/129956 for more details.
- """
- player_mocks.player_data.status_long_polling_mock.set(
- dataclasses.replace(
- player_mocks.player_data.status_long_polling_mock.get(), volume=6
- )
- )
-
- # give the long polling loop a chance to update the state; this could be any async call
- await hass.async_block_till_done()
-
- await hass.services.async_call(
- MEDIA_PLAYER_DOMAIN,
- SERVICE_VOLUME_UP,
- {ATTR_ENTITY_ID: "media_player.player_name1111"},
- blocking=True,
- )
-
- player_mocks.player_data.player.volume.assert_called_once_with(level=7)
diff --git a/tests/components/bring/fixtures/items_invitation.json b/tests/components/bring/fixtures/items_invitation.json
deleted file mode 100644
index 82ef623e439..00000000000
--- a/tests/components/bring/fixtures/items_invitation.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
- "uuid": "77a151f8-77c4-47a3-8295-c750a0e69d4f",
- "status": "INVITATION",
- "purchase": [
- {
- "uuid": "b5d0790b-5f32-4d5c-91da-e29066f167de",
- "itemId": "Paprika",
- "specification": "Rot",
- "attributes": [
- {
- "type": "PURCHASE_CONDITIONS",
- "content": {
- "urgent": true,
- "convenient": true,
- "discounted": true
- }
- }
- ]
- },
- {
- "uuid": "72d370ab-d8ca-4e41-b956-91df94795b4e",
- "itemId": "Pouletbrüstli",
- "specification": "Bio",
- "attributes": [
- {
- "type": "PURCHASE_CONDITIONS",
- "content": {
- "urgent": true,
- "convenient": true,
- "discounted": true
- }
- }
- ]
- }
- ],
- "recently": [
- {
- "uuid": "fc8db30a-647e-4e6c-9d71-3b85d6a2d954",
- "itemId": "Ananas",
- "specification": "",
- "attributes": []
- }
- ]
-}
diff --git a/tests/components/bring/fixtures/items_shared.json b/tests/components/bring/fixtures/items_shared.json
deleted file mode 100644
index 9ac999729d3..00000000000
--- a/tests/components/bring/fixtures/items_shared.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
- "uuid": "77a151f8-77c4-47a3-8295-c750a0e69d4f",
- "status": "SHARED",
- "purchase": [
- {
- "uuid": "b5d0790b-5f32-4d5c-91da-e29066f167de",
- "itemId": "Paprika",
- "specification": "Rot",
- "attributes": [
- {
- "type": "PURCHASE_CONDITIONS",
- "content": {
- "urgent": true,
- "convenient": true,
- "discounted": true
- }
- }
- ]
- },
- {
- "uuid": "72d370ab-d8ca-4e41-b956-91df94795b4e",
- "itemId": "Pouletbrüstli",
- "specification": "Bio",
- "attributes": [
- {
- "type": "PURCHASE_CONDITIONS",
- "content": {
- "urgent": true,
- "convenient": true,
- "discounted": true
- }
- }
- ]
- }
- ],
- "recently": [
- {
- "uuid": "fc8db30a-647e-4e6c-9d71-3b85d6a2d954",
- "itemId": "Ananas",
- "specification": "",
- "attributes": []
- }
- ]
-}
diff --git a/tests/components/bring/snapshots/test_sensor.ambr b/tests/components/bring/snapshots/test_sensor.ambr
index 97e1d1b4bd9..513b4e6469e 100644
--- a/tests/components/bring/snapshots/test_sensor.ambr
+++ b/tests/components/bring/snapshots/test_sensor.ambr
@@ -55,7 +55,6 @@
'options': list([
'registered',
'shared',
- 'invitation',
]),
}),
'config_entry_id': ,
@@ -93,7 +92,6 @@
'options': list([
'registered',
'shared',
- 'invitation',
]),
}),
'context': ,
@@ -346,7 +344,6 @@
'options': list([
'registered',
'shared',
- 'invitation',
]),
}),
'config_entry_id': ,
@@ -384,7 +381,6 @@
'options': list([
'registered',
'shared',
- 'invitation',
]),
}),
'context': ,
diff --git a/tests/components/bring/test_sensor.py b/tests/components/bring/test_sensor.py
index 974818ccedf..a36b0163165 100644
--- a/tests/components/bring/test_sensor.py
+++ b/tests/components/bring/test_sensor.py
@@ -1,18 +1,17 @@
"""Test for sensor platform of the Bring! integration."""
from collections.abc import Generator
-from unittest.mock import AsyncMock, patch
+from unittest.mock import patch
import pytest
from syrupy.assertion import SnapshotAssertion
-from homeassistant.components.bring.const import DOMAIN
from homeassistant.config_entries import ConfigEntryState
from homeassistant.const import Platform
from homeassistant.core import HomeAssistant
from homeassistant.helpers import entity_registry as er
-from tests.common import MockConfigEntry, load_json_object_fixture, snapshot_platform
+from tests.common import MockConfigEntry, snapshot_platform
@pytest.fixture(autouse=True)
@@ -43,34 +42,3 @@ async def test_setup(
await snapshot_platform(
hass, entity_registry, snapshot, bring_config_entry.entry_id
)
-
-
-@pytest.mark.parametrize(
- ("fixture", "entity_state"),
- [
- ("items_invitation", "invitation"),
- ("items_shared", "shared"),
- ("items", "registered"),
- ],
-)
-async def test_list_access_states(
- hass: HomeAssistant,
- bring_config_entry: MockConfigEntry,
- mock_bring_client: AsyncMock,
- fixture: str,
- entity_state: str,
-) -> None:
- """Snapshot test states of list access sensor."""
-
- mock_bring_client.get_list.return_value = load_json_object_fixture(
- f"{fixture}.json", DOMAIN
- )
-
- bring_config_entry.add_to_hass(hass)
- await hass.config_entries.async_setup(bring_config_entry.entry_id)
- await hass.async_block_till_done()
-
- assert bring_config_entry.state is ConfigEntryState.LOADED
-
- assert (state := hass.states.get("sensor.einkauf_list_access"))
- assert state.state == entity_state
diff --git a/tests/components/bsblan/snapshots/test_diagnostics.ambr b/tests/components/bsblan/snapshots/test_diagnostics.ambr
index 9fabd373205..e033b2417d2 100644
--- a/tests/components/bsblan/snapshots/test_diagnostics.ambr
+++ b/tests/components/bsblan/snapshots/test_diagnostics.ambr
@@ -6,103 +6,67 @@
'current_temperature': dict({
'data_type': 0,
'desc': '',
- 'error': 0,
'name': 'Room temp 1 actual value',
- 'precision': None,
- 'readonly': 1,
- 'readwrite': 0,
'unit': '°C',
- 'value': 18.6,
+ 'value': '18.6',
}),
'outside_temperature': dict({
'data_type': 0,
'desc': '',
- 'error': 0,
'name': 'Outside temp sensor local',
- 'precision': None,
- 'readonly': 0,
- 'readwrite': 0,
'unit': '°C',
- 'value': 6.1,
+ 'value': '6.1',
}),
}),
'state': dict({
'current_temperature': dict({
'data_type': 0,
'desc': '',
- 'error': 0,
'name': 'Room temp 1 actual value',
- 'precision': None,
- 'readonly': 1,
- 'readwrite': 0,
'unit': '°C',
- 'value': 18.6,
+ 'value': '18.6',
}),
'hvac_action': dict({
'data_type': 1,
'desc': 'Raumtemp’begrenzung',
- 'error': 0,
'name': 'Status heating circuit 1',
- 'precision': None,
- 'readonly': 1,
- 'readwrite': 0,
'unit': '',
- 'value': 122,
+ 'value': '122',
}),
'hvac_mode': dict({
'data_type': 1,
'desc': 'Komfort',
- 'error': 0,
'name': 'Operating mode',
- 'precision': None,
- 'readonly': 0,
- 'readwrite': 0,
'unit': '',
'value': 'heat',
}),
'hvac_mode2': dict({
'data_type': 1,
'desc': 'Reduziert',
- 'error': 0,
'name': 'Operating mode',
- 'precision': None,
- 'readonly': 0,
- 'readwrite': 0,
'unit': '',
- 'value': 2,
+ 'value': '2',
}),
'room1_temp_setpoint_boost': dict({
'data_type': 1,
'desc': 'Boost',
- 'error': 0,
'name': 'Room 1 Temp Setpoint Boost',
- 'precision': None,
- 'readonly': 1,
- 'readwrite': 0,
'unit': '°C',
'value': '22.5',
}),
'room1_thermostat_mode': dict({
'data_type': 1,
'desc': 'Kein Bedarf',
- 'error': 0,
'name': 'Raumthermostat 1',
- 'precision': None,
- 'readonly': 1,
- 'readwrite': 0,
'unit': '',
- 'value': 0,
+ 'value': '0',
}),
'target_temperature': dict({
'data_type': 0,
'desc': '',
- 'error': 0,
'name': 'Room temperature Comfort setpoint',
- 'precision': None,
- 'readonly': 0,
- 'readwrite': 0,
'unit': '°C',
- 'value': 18.5,
+ 'value': '18.5',
}),
}),
}),
@@ -116,33 +80,21 @@
'controller_family': dict({
'data_type': 0,
'desc': '',
- 'error': 0,
'name': 'Device family',
- 'precision': None,
- 'readonly': 0,
- 'readwrite': 0,
'unit': '',
- 'value': 211,
+ 'value': '211',
}),
'controller_variant': dict({
'data_type': 0,
'desc': '',
- 'error': 0,
'name': 'Device variant',
- 'precision': None,
- 'readonly': 0,
- 'readwrite': 0,
'unit': '',
- 'value': 127,
+ 'value': '127',
}),
'device_identification': dict({
'data_type': 7,
'desc': '',
- 'error': 0,
'name': 'Gerte-Identifikation',
- 'precision': None,
- 'readonly': 0,
- 'readwrite': 0,
'unit': '',
'value': 'RVS21.831F/127',
}),
@@ -151,24 +103,16 @@
'max_temp': dict({
'data_type': 0,
'desc': '',
- 'error': 0,
'name': 'Summer/winter changeover temp heat circuit 1',
- 'precision': None,
- 'readonly': 0,
- 'readwrite': 0,
'unit': '°C',
- 'value': 20.0,
+ 'value': '20.0',
}),
'min_temp': dict({
'data_type': 0,
'desc': '',
- 'error': 0,
'name': 'Room temp frost protection setpoint',
- 'precision': None,
- 'readonly': 0,
- 'readwrite': 0,
'unit': '°C',
- 'value': 8.0,
+ 'value': '8.0',
}),
}),
})
diff --git a/tests/components/camera/test_webrtc.py b/tests/components/camera/test_webrtc.py
index 29fb9d61c4e..7a1df556c20 100644
--- a/tests/components/camera/test_webrtc.py
+++ b/tests/components/camera/test_webrtc.py
@@ -139,46 +139,42 @@ async def init_test_integration(
return test_camera
-@pytest.mark.usefixtures("mock_camera", "mock_stream_source")
+@pytest.mark.usefixtures("mock_camera", "mock_stream", "mock_stream_source")
async def test_async_register_webrtc_provider(
hass: HomeAssistant,
) -> None:
"""Test registering a WebRTC provider."""
+ await async_setup_component(hass, "camera", {})
+
camera = get_camera_from_entity_id(hass, "camera.demo_camera")
- assert camera.camera_capabilities.frontend_stream_types == {StreamType.HLS}
+ assert camera.frontend_stream_type is StreamType.HLS
provider = SomeTestProvider()
unregister = async_register_webrtc_provider(hass, provider)
await hass.async_block_till_done()
- assert camera.camera_capabilities.frontend_stream_types == {
- StreamType.HLS,
- StreamType.WEB_RTC,
- }
+ assert camera.frontend_stream_type is StreamType.WEB_RTC
# Mark stream as unsupported
provider._is_supported = False
# Manually refresh the provider
await camera.async_refresh_providers()
- assert camera.camera_capabilities.frontend_stream_types == {StreamType.HLS}
+ assert camera.frontend_stream_type is StreamType.HLS
# Mark stream as supported
provider._is_supported = True
# Manually refresh the provider
await camera.async_refresh_providers()
- assert camera.camera_capabilities.frontend_stream_types == {
- StreamType.HLS,
- StreamType.WEB_RTC,
- }
+ assert camera.frontend_stream_type is StreamType.WEB_RTC
unregister()
await hass.async_block_till_done()
- assert camera.camera_capabilities.frontend_stream_types == {StreamType.HLS}
+ assert camera.frontend_stream_type is StreamType.HLS
-@pytest.mark.usefixtures("mock_camera", "mock_stream_source")
+@pytest.mark.usefixtures("mock_camera", "mock_stream", "mock_stream_source")
async def test_async_register_webrtc_provider_twice(
hass: HomeAssistant,
register_test_provider: SomeTestProvider,
@@ -196,11 +192,13 @@ async def test_async_register_webrtc_provider_camera_not_loaded(
async_register_webrtc_provider(hass, SomeTestProvider())
-@pytest.mark.usefixtures("mock_test_webrtc_cameras")
+@pytest.mark.usefixtures("mock_camera", "mock_stream", "mock_stream_source")
async def test_async_register_ice_server(
hass: HomeAssistant,
) -> None:
"""Test registering an ICE server."""
+ await async_setup_component(hass, "camera", {})
+
# Clear any existing ICE servers
hass.data[DATA_ICE_SERVERS].clear()
@@ -218,7 +216,7 @@ async def test_async_register_ice_server(
unregister = async_register_ice_servers(hass, get_ice_servers)
assert not called
- camera = get_camera_from_entity_id(hass, "camera.async")
+ camera = get_camera_from_entity_id(hass, "camera.demo_camera")
config = camera.async_get_webrtc_client_configuration()
assert config.configuration.ice_servers == [
@@ -279,7 +277,7 @@ async def test_async_register_ice_server(
assert config.configuration.ice_servers == []
-@pytest.mark.usefixtures("mock_test_webrtc_cameras")
+@pytest.mark.usefixtures("mock_camera_webrtc")
async def test_ws_get_client_config(
hass: HomeAssistant, hass_ws_client: WebSocketGenerator
) -> None:
@@ -288,7 +286,7 @@ async def test_ws_get_client_config(
client = await hass_ws_client(hass)
await client.send_json_auto_id(
- {"type": "camera/webrtc/get_client_config", "entity_id": "camera.async"}
+ {"type": "camera/webrtc/get_client_config", "entity_id": "camera.demo_camera"}
)
msg = await client.receive_json()
@@ -298,12 +296,8 @@ async def test_ws_get_client_config(
assert msg["result"] == {
"configuration": {
"iceServers": [
- {
- "urls": [
- "stun:stun.home-assistant.io:80",
- "stun:stun.home-assistant.io:3478",
- ]
- },
+ {"urls": "stun:stun.home-assistant.io:80"},
+ {"urls": "stun:stun.home-assistant.io:3478"},
],
},
"getCandidatesUpfront": False,
@@ -322,7 +316,7 @@ async def test_ws_get_client_config(
async_register_ice_servers(hass, get_ice_server)
await client.send_json_auto_id(
- {"type": "camera/webrtc/get_client_config", "entity_id": "camera.async"}
+ {"type": "camera/webrtc/get_client_config", "entity_id": "camera.demo_camera"}
)
msg = await client.receive_json()
@@ -332,12 +326,8 @@ async def test_ws_get_client_config(
assert msg["result"] == {
"configuration": {
"iceServers": [
- {
- "urls": [
- "stun:stun.home-assistant.io:80",
- "stun:stun.home-assistant.io:3478",
- ]
- },
+ {"urls": "stun:stun.home-assistant.io:80"},
+ {"urls": "stun:stun.home-assistant.io:3478"},
{
"urls": ["stun:example2.com", "turn:example2.com"],
"username": "user",
@@ -372,7 +362,7 @@ async def test_ws_get_client_config_sync_offer(
}
-@pytest.mark.usefixtures("mock_test_webrtc_cameras")
+@pytest.mark.usefixtures("mock_camera_webrtc")
async def test_ws_get_client_config_custom_config(
hass: HomeAssistant, hass_ws_client: WebSocketGenerator
) -> None:
@@ -386,7 +376,7 @@ async def test_ws_get_client_config_custom_config(
client = await hass_ws_client(hass)
await client.send_json_auto_id(
- {"type": "camera/webrtc/get_client_config", "entity_id": "camera.async"}
+ {"type": "camera/webrtc/get_client_config", "entity_id": "camera.demo_camera"}
)
msg = await client.receive_json()
@@ -437,7 +427,7 @@ def mock_rtsp_to_webrtc_fixture(hass: HomeAssistant) -> Generator[Mock]:
unsub()
-@pytest.mark.usefixtures("mock_test_webrtc_cameras")
+@pytest.mark.usefixtures("mock_camera_webrtc")
async def test_websocket_webrtc_offer(
hass: HomeAssistant, hass_ws_client: WebSocketGenerator
) -> None:
@@ -446,7 +436,7 @@ async def test_websocket_webrtc_offer(
await client.send_json_auto_id(
{
"type": "camera/webrtc/offer",
- "entity_id": "camera.async",
+ "entity_id": "camera.demo_camera",
"offer": WEBRTC_OFFER,
}
)
@@ -557,11 +547,11 @@ async def test_websocket_webrtc_offer_webrtc_provider(
mock_async_close_session.assert_called_once_with(session_id)
+@pytest.mark.usefixtures("mock_camera_webrtc")
async def test_websocket_webrtc_offer_invalid_entity(
hass: HomeAssistant, hass_ws_client: WebSocketGenerator
) -> None:
"""Test WebRTC with a camera entity that does not exist."""
- await async_setup_component(hass, "camera", {})
client = await hass_ws_client(hass)
await client.send_json_auto_id(
{
@@ -580,7 +570,7 @@ async def test_websocket_webrtc_offer_invalid_entity(
}
-@pytest.mark.usefixtures("mock_test_webrtc_cameras")
+@pytest.mark.usefixtures("mock_camera_webrtc")
async def test_websocket_webrtc_offer_missing_offer(
hass: HomeAssistant, hass_ws_client: WebSocketGenerator
) -> None:
@@ -607,6 +597,7 @@ async def test_websocket_webrtc_offer_missing_offer(
(TimeoutError(), "Timeout handling WebRTC offer"),
],
)
+@pytest.mark.usefixtures("mock_camera_webrtc_frontendtype_only")
async def test_websocket_webrtc_offer_failure(
hass: HomeAssistant,
hass_ws_client: WebSocketGenerator,
@@ -950,7 +941,7 @@ async def test_rtsp_to_webrtc_offer_not_accepted(
unsub()
-@pytest.mark.usefixtures("mock_test_webrtc_cameras")
+@pytest.mark.usefixtures("mock_camera_webrtc")
async def test_ws_webrtc_candidate(
hass: HomeAssistant, hass_ws_client: WebSocketGenerator
) -> None:
@@ -958,13 +949,13 @@ async def test_ws_webrtc_candidate(
client = await hass_ws_client(hass)
session_id = "session_id"
candidate = "candidate"
- with patch.object(
- get_camera_from_entity_id(hass, "camera.async"), "async_on_webrtc_candidate"
+ with patch(
+ "homeassistant.components.camera.Camera.async_on_webrtc_candidate"
) as mock_on_webrtc_candidate:
await client.send_json_auto_id(
{
"type": "camera/webrtc/candidate",
- "entity_id": "camera.async",
+ "entity_id": "camera.demo_camera",
"session_id": session_id,
"candidate": candidate,
}
@@ -977,7 +968,7 @@ async def test_ws_webrtc_candidate(
)
-@pytest.mark.usefixtures("mock_test_webrtc_cameras")
+@pytest.mark.usefixtures("mock_camera_webrtc")
async def test_ws_webrtc_candidate_not_supported(
hass: HomeAssistant, hass_ws_client: WebSocketGenerator
) -> None:
@@ -986,7 +977,7 @@ async def test_ws_webrtc_candidate_not_supported(
await client.send_json_auto_id(
{
"type": "camera/webrtc/candidate",
- "entity_id": "camera.sync",
+ "entity_id": "camera.demo_camera",
"session_id": "session_id",
"candidate": "candidate",
}
@@ -1029,11 +1020,11 @@ async def test_ws_webrtc_candidate_webrtc_provider(
)
+@pytest.mark.usefixtures("mock_camera_webrtc")
async def test_ws_webrtc_candidate_invalid_entity(
hass: HomeAssistant, hass_ws_client: WebSocketGenerator
) -> None:
"""Test ws WebRTC candidate command with a camera entity that does not exist."""
- await async_setup_component(hass, "camera", {})
client = await hass_ws_client(hass)
await client.send_json_auto_id(
{
@@ -1053,7 +1044,7 @@ async def test_ws_webrtc_candidate_invalid_entity(
}
-@pytest.mark.usefixtures("mock_test_webrtc_cameras")
+@pytest.mark.usefixtures("mock_camera_webrtc")
async def test_ws_webrtc_canidate_missing_candidate(
hass: HomeAssistant, hass_ws_client: WebSocketGenerator
) -> None:
@@ -1062,7 +1053,7 @@ async def test_ws_webrtc_canidate_missing_candidate(
await client.send_json_auto_id(
{
"type": "camera/webrtc/candidate",
- "entity_id": "camera.async",
+ "entity_id": "camera.demo_camera",
"session_id": "session_id",
}
)
diff --git a/tests/components/co2signal/test_config_flow.py b/tests/components/co2signal/test_config_flow.py
index f8f94d44126..92d9450b670 100644
--- a/tests/components/co2signal/test_config_flow.py
+++ b/tests/components/co2signal/test_config_flow.py
@@ -44,7 +44,7 @@ async def test_form_home(hass: HomeAssistant) -> None:
await hass.async_block_till_done()
assert result2["type"] is FlowResultType.CREATE_ENTRY
- assert result2["title"] == "Electricity Maps"
+ assert result2["title"] == "CO2 Signal"
assert result2["data"] == {
"api_key": "api_key",
}
@@ -185,7 +185,7 @@ async def test_form_error_handling(
await hass.async_block_till_done()
assert result["type"] is FlowResultType.CREATE_ENTRY
- assert result["title"] == "Electricity Maps"
+ assert result["title"] == "CO2 Signal"
assert result["data"] == {
"api_key": "api_key",
}
diff --git a/tests/components/conftest.py b/tests/components/conftest.py
index 363d39a2e63..5bf393a8405 100644
--- a/tests/components/conftest.py
+++ b/tests/components/conftest.py
@@ -5,17 +5,10 @@ from __future__ import annotations
from collections.abc import Callable, Generator
from importlib.util import find_spec
from pathlib import Path
-import string
from typing import TYPE_CHECKING, Any
from unittest.mock import AsyncMock, MagicMock, patch
-from aiohasupervisor.models import (
- Discovery,
- Repository,
- ResolutionInfo,
- StoreAddon,
- StoreInfo,
-)
+from aiohasupervisor.models import Discovery, Repository, StoreAddon, StoreInfo
import pytest
from homeassistant.config_entries import (
@@ -26,12 +19,7 @@ from homeassistant.config_entries import (
)
from homeassistant.const import STATE_OFF, STATE_ON
from homeassistant.core import HomeAssistant
-from homeassistant.data_entry_flow import (
- FlowContext,
- FlowHandler,
- FlowManager,
- FlowResultType,
-)
+from homeassistant.data_entry_flow import FlowHandler, FlowManager, FlowResultType
from homeassistant.helpers.translation import async_get_translations
if TYPE_CHECKING:
@@ -485,26 +473,6 @@ def supervisor_is_connected_fixture(supervisor_client: AsyncMock) -> AsyncMock:
return supervisor_client.supervisor.ping
-@pytest.fixture(name="resolution_info")
-def resolution_info_fixture(supervisor_client: AsyncMock) -> AsyncMock:
- """Mock resolution info from supervisor."""
- supervisor_client.resolution.info.return_value = ResolutionInfo(
- suggestions=[],
- unsupported=[],
- unhealthy=[],
- issues=[],
- checks=[],
- )
- return supervisor_client.resolution.info
-
-
-@pytest.fixture(name="resolution_suggestions_for_issue")
-def resolution_suggestions_for_issue_fixture(supervisor_client: AsyncMock) -> AsyncMock:
- """Mock suggestions by issue from supervisor resolution."""
- supervisor_client.resolution.suggestions_for_issue.return_value = []
- return supervisor_client.resolution.suggestions_for_issue
-
-
@pytest.fixture(name="supervisor_client")
def supervisor_client() -> Generator[AsyncMock]:
"""Mock the supervisor client."""
@@ -513,7 +481,6 @@ def supervisor_client() -> Generator[AsyncMock]:
supervisor_client.discovery = AsyncMock()
supervisor_client.homeassistant = AsyncMock()
supervisor_client.os = AsyncMock()
- supervisor_client.resolution = AsyncMock()
supervisor_client.supervisor = AsyncMock()
with (
patch(
@@ -537,63 +504,46 @@ def supervisor_client() -> Generator[AsyncMock]:
return_value=supervisor_client,
),
patch(
- "homeassistant.components.hassio.issues.get_supervisor_client",
- return_value=supervisor_client,
- ),
- patch(
- "homeassistant.components.hassio.repairs.get_supervisor_client",
+ "homeassistant.components.hassio.get_supervisor_client",
return_value=supervisor_client,
),
):
yield supervisor_client
-def _validate_translation_placeholders(
- full_key: str,
- translation: str,
- description_placeholders: dict[str, str] | None,
-) -> str | None:
- """Raise if translation exists with missing placeholders."""
- tuples = list(string.Formatter().parse(translation))
- for _, placeholder, _, _ in tuples:
- if placeholder is None:
- continue
- if (
- description_placeholders is None
- or placeholder not in description_placeholders
- ):
- ignore_translations[full_key] = (
- f"Description not found for placeholder `{placeholder}` in {full_key}"
- )
-
-
-async def _validate_translation(
+async def _ensure_translation_exists(
hass: HomeAssistant,
ignore_translations: dict[str, StoreInfo],
category: str,
component: str,
key: str,
- description_placeholders: dict[str, str] | None,
- *,
- translation_required: bool = True,
) -> None:
"""Raise if translation doesn't exist."""
full_key = f"component.{component}.{category}.{key}"
translations = await async_get_translations(hass, "en", category, [component])
- if (translation := translations.get(full_key)) is not None:
- _validate_translation_placeholders(
- full_key, translation, description_placeholders
- )
- return
-
- if not translation_required:
+ if full_key in translations:
return
if full_key in ignore_translations:
ignore_translations[full_key] = "used"
return
- ignore_translations[full_key] = (
+ key_parts = key.split(".")
+ # Ignore step data translations if title or description exists
+ if (
+ len(key_parts) >= 3
+ and key_parts[0] == "step"
+ and key_parts[2] == "data"
+ and (
+ f"component.{component}.{category}.{key_parts[0]}.{key_parts[1]}.description"
+ in translations
+ or f"component.{component}.{category}.{key_parts[0]}.{key_parts[1]}.title"
+ in translations
+ )
+ ):
+ return
+
+ pytest.fail(
f"Translation not found for {component}: `{category}.{key}`. "
f"Please add to homeassistant/components/{component}/strings.json"
)
@@ -609,106 +559,68 @@ def ignore_translations() -> str | list[str]:
return []
-async def _check_config_flow_result_translations(
- manager: FlowManager,
- flow: FlowHandler,
- result: FlowResult[FlowContext, str],
- ignore_translations: dict[str, str],
-) -> None:
- if isinstance(manager, ConfigEntriesFlowManager):
- category = "config"
- integration = flow.handler
- elif isinstance(manager, OptionsFlowManager):
- category = "options"
- integration = flow.hass.config_entries.async_get_entry(flow.handler).domain
- else:
- return
-
- # Check if this flow has been seen before
- # Gets set to False on first run, and to True on subsequent runs
- setattr(flow, "__flow_seen_before", hasattr(flow, "__flow_seen_before"))
-
- if result["type"] is FlowResultType.FORM:
- if step_id := result.get("step_id"):
- # neither title nor description are required
- # - title defaults to integration name
- # - description is optional
- for header in ("title", "description"):
- await _validate_translation(
- flow.hass,
- ignore_translations,
- category,
- integration,
- f"step.{step_id}.{header}",
- result["description_placeholders"],
- translation_required=False,
- )
- if errors := result.get("errors"):
- for error in errors.values():
- await _validate_translation(
- flow.hass,
- ignore_translations,
- category,
- integration,
- f"error.{error}",
- result["description_placeholders"],
- )
- return
-
- if result["type"] is FlowResultType.ABORT:
- # We don't need translations for a discovery flow which immediately
- # aborts, since such flows won't be seen by users
- if not flow.__flow_seen_before and flow.source in DISCOVERY_SOURCES:
- return
- await _validate_translation(
- flow.hass,
- ignore_translations,
- category,
- integration,
- f"abort.{result["reason"]}",
- result["description_placeholders"],
- )
-
-
@pytest.fixture(autouse=True)
-def check_translations(ignore_translations: str | list[str]) -> Generator[None]:
- """Check that translation requirements are met.
-
- Current checks:
- - data entry flow results (ConfigFlow/OptionsFlow)
- """
+def check_config_translations(ignore_translations: str | list[str]) -> Generator[None]:
+ """Ensure config_flow translations are available."""
if not isinstance(ignore_translations, list):
ignore_translations = [ignore_translations]
_ignore_translations = {k: "unused" for k in ignore_translations}
+ _original = FlowManager._async_handle_step
- # Keep reference to original functions
- _original_flow_manager_async_handle_step = FlowManager._async_handle_step
-
- # Prepare override functions
- async def _flow_manager_async_handle_step(
+ async def _async_handle_step(
self: FlowManager, flow: FlowHandler, *args
) -> FlowResult:
- result = await _original_flow_manager_async_handle_step(self, flow, *args)
- await _check_config_flow_result_translations(
- self, flow, result, _ignore_translations
- )
+ result = await _original(self, flow, *args)
+ if isinstance(self, ConfigEntriesFlowManager):
+ category = "config"
+ component = flow.handler
+ elif isinstance(self, OptionsFlowManager):
+ category = "options"
+ component = flow.hass.config_entries.async_get_entry(flow.handler).domain
+ else:
+ return result
+
+ # Check if this flow has been seen before
+ # Gets set to False on first run, and to True on subsequent runs
+ setattr(flow, "__flow_seen_before", hasattr(flow, "__flow_seen_before"))
+
+ if result["type"] is FlowResultType.FORM:
+ if errors := result.get("errors"):
+ for error in errors.values():
+ await _ensure_translation_exists(
+ flow.hass,
+ _ignore_translations,
+ category,
+ component,
+ f"error.{error}",
+ )
+ return result
+
+ if result["type"] is FlowResultType.ABORT:
+ # We don't need translations for a discovery flow which immediately
+ # aborts, since such flows won't be seen by users
+ if not flow.__flow_seen_before and flow.source in DISCOVERY_SOURCES:
+ return result
+ await _ensure_translation_exists(
+ flow.hass,
+ _ignore_translations,
+ category,
+ component,
+ f"abort.{result["reason"]}",
+ )
+
return result
- # Use override functions
with patch(
"homeassistant.data_entry_flow.FlowManager._async_handle_step",
- _flow_manager_async_handle_step,
+ _async_handle_step,
):
yield
- # Run final checks
unused_ignore = [k for k, v in _ignore_translations.items() if v == "unused"]
if unused_ignore:
pytest.fail(
f"Unused ignore translations: {', '.join(unused_ignore)}. "
"Please remove them from the ignore_translations fixture."
)
- for description in _ignore_translations.values():
- if description not in {"used", "unused"}:
- pytest.fail(description)
diff --git a/tests/components/conversation/snapshots/test_http.ambr b/tests/components/conversation/snapshots/test_http.ambr
index d9d859113f8..08aca43aba5 100644
--- a/tests/components/conversation/snapshots/test_http.ambr
+++ b/tests/components/conversation/snapshots/test_http.ambr
@@ -639,7 +639,7 @@
'details': dict({
'brightness': dict({
'name': 'brightness',
- 'text': '100',
+ 'text': '100%',
'value': 100,
}),
'name': dict({
@@ -654,7 +654,7 @@
'match': True,
'sentence_template': '[] brightness [to] ',
'slots': dict({
- 'brightness': '100',
+ 'brightness': '100%',
'name': 'test light',
}),
'source': 'builtin',
diff --git a/tests/components/conversation/test_default_agent.py b/tests/components/conversation/test_default_agent.py
index 3c6b463670a..14a9b0ca88c 100644
--- a/tests/components/conversation/test_default_agent.py
+++ b/tests/components/conversation/test_default_agent.py
@@ -418,44 +418,6 @@ async def test_trigger_sentences(hass: HomeAssistant) -> None:
assert len(callback.mock_calls) == 0
-@pytest.mark.parametrize(
- ("language", "expected"),
- [("en", "English done"), ("de", "German done"), ("not_translated", "Done")],
-)
-@pytest.mark.usefixtures("init_components")
-async def test_trigger_sentence_response_translation(
- hass: HomeAssistant, language: str, expected: str
-) -> None:
- """Test translation of default response 'done'."""
- hass.config.language = language
-
- agent = hass.data[DATA_DEFAULT_ENTITY]
- assert isinstance(agent, default_agent.DefaultAgent)
-
- translations = {
- "en": {"component.conversation.conversation.agent.done": "English done"},
- "de": {"component.conversation.conversation.agent.done": "German done"},
- "not_translated": {},
- }
-
- with patch(
- "homeassistant.components.conversation.default_agent.translation.async_get_translations",
- return_value=translations.get(language),
- ):
- unregister = agent.register_trigger(
- ["test sentence"], AsyncMock(return_value=None)
- )
- result = await conversation.async_converse(
- hass, "test sentence", None, Context()
- )
- assert result.response.response_type == intent.IntentResponseType.ACTION_DONE
- assert result.response.speech == {
- "plain": {"speech": expected, "extra_data": None}
- }
-
- unregister()
-
-
@pytest.mark.usefixtures("init_components", "sl_setup")
async def test_shopping_list_add_item(hass: HomeAssistant) -> None:
"""Test adding an item to the shopping list through the default agent."""
@@ -770,8 +732,8 @@ async def test_error_no_device_on_floor_exposed(
)
with patch(
- "homeassistant.components.conversation.default_agent.recognize_best",
- return_value=recognize_result,
+ "homeassistant.components.conversation.default_agent.recognize_all",
+ return_value=[recognize_result],
):
result = await conversation.async_converse(
hass, "turn on test light on the ground floor", None, Context(), None
@@ -838,8 +800,8 @@ async def test_error_no_domain(hass: HomeAssistant) -> None:
)
with patch(
- "homeassistant.components.conversation.default_agent.recognize_best",
- return_value=recognize_result,
+ "homeassistant.components.conversation.default_agent.recognize_all",
+ return_value=[recognize_result],
):
result = await conversation.async_converse(
hass, "turn on the fans", None, Context(), None
@@ -873,8 +835,8 @@ async def test_error_no_domain_exposed(hass: HomeAssistant) -> None:
)
with patch(
- "homeassistant.components.conversation.default_agent.recognize_best",
- return_value=recognize_result,
+ "homeassistant.components.conversation.default_agent.recognize_all",
+ return_value=[recognize_result],
):
result = await conversation.async_converse(
hass, "turn on the fans", None, Context(), None
@@ -1047,8 +1009,8 @@ async def test_error_no_device_class(hass: HomeAssistant) -> None:
)
with patch(
- "homeassistant.components.conversation.default_agent.recognize_best",
- return_value=recognize_result,
+ "homeassistant.components.conversation.default_agent.recognize_all",
+ return_value=[recognize_result],
):
result = await conversation.async_converse(
hass, "open the windows", None, Context(), None
@@ -1096,8 +1058,8 @@ async def test_error_no_device_class_exposed(hass: HomeAssistant) -> None:
)
with patch(
- "homeassistant.components.conversation.default_agent.recognize_best",
- return_value=recognize_result,
+ "homeassistant.components.conversation.default_agent.recognize_all",
+ return_value=[recognize_result],
):
result = await conversation.async_converse(
hass, "open all the windows", None, Context(), None
@@ -1207,8 +1169,8 @@ async def test_error_no_device_class_on_floor_exposed(
)
with patch(
- "homeassistant.components.conversation.default_agent.recognize_best",
- return_value=recognize_result,
+ "homeassistant.components.conversation.default_agent.recognize_all",
+ return_value=[recognize_result],
):
result = await conversation.async_converse(
hass, "open ground floor windows", None, Context(), None
@@ -1229,8 +1191,8 @@ async def test_error_no_device_class_on_floor_exposed(
async def test_error_no_intent(hass: HomeAssistant) -> None:
"""Test response with an intent match failure."""
with patch(
- "homeassistant.components.conversation.default_agent.recognize_best",
- return_value=None,
+ "homeassistant.components.conversation.default_agent.recognize_all",
+ return_value=[],
):
result = await conversation.async_converse(
hass, "do something", None, Context(), None
diff --git a/tests/components/conversation/test_trace.py b/tests/components/conversation/test_trace.py
index 7c00b9a80b2..59cd10d2510 100644
--- a/tests/components/conversation/test_trace.py
+++ b/tests/components/conversation/test_trace.py
@@ -56,7 +56,7 @@ async def test_converation_trace(
"intent_name": "HassListAddItem",
"slots": {
"name": "Shopping List",
- "item": "apples",
+ "item": "apples ",
},
}
diff --git a/tests/components/device_sun_light_trigger/test_init.py b/tests/components/device_sun_light_trigger/test_init.py
index 24996482916..1de0794b9ee 100644
--- a/tests/components/device_sun_light_trigger/test_init.py
+++ b/tests/components/device_sun_light_trigger/test_init.py
@@ -177,9 +177,6 @@ async def test_lights_turn_on_when_coming_home_after_sun_set_person(
hass: HomeAssistant, freezer: FrozenDateTimeFactory
) -> None:
"""Test lights turn on when coming home after sun set."""
- # Ensure all setup tasks are done (avoid flaky tests)
- await hass.async_block_till_done(wait_background_tasks=True)
-
device_1 = f"{DEVICE_TRACKER_DOMAIN}.device_1"
device_2 = f"{DEVICE_TRACKER_DOMAIN}.device_2"
diff --git a/tests/components/dhcp/conftest.py b/tests/components/dhcp/conftest.py
new file mode 100644
index 00000000000..b0fa3f573c5
--- /dev/null
+++ b/tests/components/dhcp/conftest.py
@@ -0,0 +1,21 @@
+"""Tests for the dhcp integration."""
+
+import os
+import pathlib
+
+
+def pytest_sessionstart(session):
+ """Try to avoid flaky FileExistsError in CI.
+
+ Called after the Session object has been created and
+ before performing collection and entering the run test loop.
+
+ This is needed due to a race condition in scapy v2.6.0
+ See https://github.com/secdev/scapy/pull/4558
+
+ Can be removed when scapy 2.6.1 is released.
+ """
+ for sub_dir in (".cache", ".config"):
+ path = pathlib.Path(os.path.join(os.path.expanduser("~"), sub_dir))
+ if not path.exists():
+ path.mkdir(mode=0o700, exist_ok=True)
diff --git a/tests/components/ecobee/fixtures/ecobee-data.json b/tests/components/ecobee/fixtures/ecobee-data.json
index e0e82d68863..1573484795f 100644
--- a/tests/components/ecobee/fixtures/ecobee-data.json
+++ b/tests/components/ecobee/fixtures/ecobee-data.json
@@ -160,7 +160,6 @@
"hasHumidifier": true,
"humidifierMode": "manual",
"hasHeatPump": true,
- "compressorProtectionMinTemp": 100,
"humidity": "30"
},
"equipmentStatus": "fan",
diff --git a/tests/components/ecobee/test_number.py b/tests/components/ecobee/test_number.py
index be65b6dbb30..5b01fe8c5ba 100644
--- a/tests/components/ecobee/test_number.py
+++ b/tests/components/ecobee/test_number.py
@@ -12,8 +12,8 @@ from homeassistant.core import HomeAssistant
from .common import setup_platform
-VENTILATOR_MIN_HOME_ID = "number.ecobee_ventilator_minimum_time_home"
-VENTILATOR_MIN_AWAY_ID = "number.ecobee_ventilator_minimum_time_away"
+VENTILATOR_MIN_HOME_ID = "number.ecobee_ventilator_min_time_home"
+VENTILATOR_MIN_AWAY_ID = "number.ecobee_ventilator_min_time_away"
THERMOSTAT_ID = 0
@@ -26,9 +26,7 @@ async def test_ventilator_min_on_home_attributes(hass: HomeAssistant) -> None:
assert state.attributes.get("min") == 0
assert state.attributes.get("max") == 60
assert state.attributes.get("step") == 5
- assert (
- state.attributes.get("friendly_name") == "ecobee Ventilator minimum time home"
- )
+ assert state.attributes.get("friendly_name") == "ecobee Ventilator min time home"
assert state.attributes.get("unit_of_measurement") == UnitOfTime.MINUTES
@@ -41,9 +39,7 @@ async def test_ventilator_min_on_away_attributes(hass: HomeAssistant) -> None:
assert state.attributes.get("min") == 0
assert state.attributes.get("max") == 60
assert state.attributes.get("step") == 5
- assert (
- state.attributes.get("friendly_name") == "ecobee Ventilator minimum time away"
- )
+ assert state.attributes.get("friendly_name") == "ecobee Ventilator min time away"
assert state.attributes.get("unit_of_measurement") == UnitOfTime.MINUTES
@@ -81,42 +77,3 @@ async def test_set_min_time_away(hass: HomeAssistant) -> None:
)
await hass.async_block_till_done()
mock_set_min_away_time.assert_called_once_with(THERMOSTAT_ID, target_value)
-
-
-COMPRESSOR_MIN_TEMP_ID = "number.ecobee2_compressor_minimum_temperature"
-
-
-async def test_compressor_protection_min_temp_attributes(hass: HomeAssistant) -> None:
- """Test the compressor min temp value is correct.
-
- Ecobee runs in Fahrenheit; the test rig runs in Celsius. Conversions are necessary.
- """
- await setup_platform(hass, NUMBER_DOMAIN)
-
- state = hass.states.get(COMPRESSOR_MIN_TEMP_ID)
- assert state.state == "-12.2"
- assert (
- state.attributes.get("friendly_name")
- == "ecobee2 Compressor minimum temperature"
- )
-
-
-async def test_set_compressor_protection_min_temp(hass: HomeAssistant) -> None:
- """Test the number can set minimum compressor operating temp.
-
- Ecobee runs in Fahrenheit; the test rig runs in Celsius. Conversions are necessary
- """
- target_value = 0
- with patch(
- "homeassistant.components.ecobee.Ecobee.set_aux_cutover_threshold"
- ) as mock_set_compressor_min_temp:
- await setup_platform(hass, NUMBER_DOMAIN)
-
- await hass.services.async_call(
- NUMBER_DOMAIN,
- SERVICE_SET_VALUE,
- {ATTR_ENTITY_ID: COMPRESSOR_MIN_TEMP_ID, ATTR_VALUE: target_value},
- blocking=True,
- )
- await hass.async_block_till_done()
- mock_set_compressor_min_temp.assert_called_once_with(1, 32)
diff --git a/tests/components/ecobee/test_switch.py b/tests/components/ecobee/test_switch.py
index b3c4c4f8296..31c8ce8f72d 100644
--- a/tests/components/ecobee/test_switch.py
+++ b/tests/components/ecobee/test_switch.py
@@ -118,7 +118,7 @@ async def test_turn_off_20min_ventilator(hass: HomeAssistant) -> None:
mock_set_20min_ventilator.assert_called_once_with(THERMOSTAT_ID, False)
-DEVICE_ID = "switch.ecobee2_auxiliary_heat_only"
+DEVICE_ID = "switch.ecobee2_aux_heat_only"
async def test_aux_heat_only_turn_on(hass: HomeAssistant) -> None:
diff --git a/tests/components/emoncms/conftest.py b/tests/components/emoncms/conftest.py
index 4bd1d68217a..29e86f3c59d 100644
--- a/tests/components/emoncms/conftest.py
+++ b/tests/components/emoncms/conftest.py
@@ -91,21 +91,6 @@ def config_entry() -> MockConfigEntry:
)
-FLOW_RESULT_SECOND_URL = copy.deepcopy(FLOW_RESULT)
-FLOW_RESULT_SECOND_URL[CONF_URL] = "http://1.1.1.2"
-
-
-@pytest.fixture
-def config_entry_unique_id() -> MockConfigEntry:
- """Mock emoncms config entry."""
- return MockConfigEntry(
- domain=DOMAIN,
- title=SENSOR_NAME,
- data=FLOW_RESULT_SECOND_URL,
- unique_id="123-53535292",
- )
-
-
FLOW_RESULT_NO_FEED = copy.deepcopy(FLOW_RESULT)
FLOW_RESULT_NO_FEED[CONF_ONLY_INCLUDE_FEEDID] = None
@@ -158,5 +143,4 @@ async def emoncms_client() -> AsyncGenerator[AsyncMock]:
):
client = mock_client.return_value
client.async_request.return_value = {"success": True, "message": FEEDS}
- client.async_get_uuid.return_value = "123-53535292"
yield client
diff --git a/tests/components/emoncms/snapshots/test_sensor.ambr b/tests/components/emoncms/snapshots/test_sensor.ambr
index f6a2745fb1a..5e718c1d8e8 100644
--- a/tests/components/emoncms/snapshots/test_sensor.ambr
+++ b/tests/components/emoncms/snapshots/test_sensor.ambr
@@ -30,7 +30,7 @@
'previous_unique_id': None,
'supported_features': 0,
'translation_key': None,
- 'unique_id': '123-53535292-1',
+ 'unique_id': 'XXXXXXXX-1',
'unit_of_measurement': ,
})
# ---
diff --git a/tests/components/emoncms/test_config_flow.py b/tests/components/emoncms/test_config_flow.py
index 1914f23fb0b..b554466639e 100644
--- a/tests/components/emoncms/test_config_flow.py
+++ b/tests/components/emoncms/test_config_flow.py
@@ -2,6 +2,8 @@
from unittest.mock import AsyncMock
+import pytest
+
from homeassistant.components.emoncms.const import CONF_ONLY_INCLUDE_FEEDID, DOMAIN
from homeassistant.config_entries import SOURCE_IMPORT, SOURCE_USER
from homeassistant.const import CONF_API_KEY, CONF_URL
@@ -42,7 +44,7 @@ async def test_flow_import_failure(
data=YAML,
)
assert result["type"] is FlowResultType.ABORT
- assert result["reason"] == "api_error"
+ assert result["reason"] == EMONCMS_FAILURE["message"]
async def test_flow_import_already_configured(
@@ -97,6 +99,10 @@ async def test_user_flow(
assert len(mock_setup_entry.mock_calls) == 1
+USER_OPTIONS = {
+ CONF_ONLY_INCLUDE_FEEDID: ["1"],
+}
+
CONFIG_ENTRY = {
CONF_API_KEY: "my_api_key",
CONF_ONLY_INCLUDE_FEEDID: ["1"],
@@ -106,26 +112,27 @@ CONFIG_ENTRY = {
async def test_options_flow(
hass: HomeAssistant,
+ mock_setup_entry: AsyncMock,
emoncms_client: AsyncMock,
config_entry: MockConfigEntry,
) -> None:
"""Options flow - success test."""
await setup_integration(hass, config_entry)
- assert config_entry.options == {}
result = await hass.config_entries.options.async_init(config_entry.entry_id)
await hass.async_block_till_done()
result = await hass.config_entries.options.async_configure(
result["flow_id"],
- user_input={
- CONF_ONLY_INCLUDE_FEEDID: ["1"],
- },
+ user_input=USER_OPTIONS,
)
assert result["type"] is FlowResultType.CREATE_ENTRY
- assert config_entry.options == {
- CONF_ONLY_INCLUDE_FEEDID: ["1"],
- }
+ assert result["data"] == CONFIG_ENTRY
+ assert config_entry.options == CONFIG_ENTRY
+@pytest.mark.parametrize( # Remove when translations fixed
+ "ignore_translations",
+ ["component.emoncms.options.error.failure"],
+)
async def test_options_flow_failure(
hass: HomeAssistant,
mock_setup_entry: AsyncMock,
@@ -137,25 +144,6 @@ async def test_options_flow_failure(
await setup_integration(hass, config_entry)
result = await hass.config_entries.options.async_init(config_entry.entry_id)
await hass.async_block_till_done()
- assert result["errors"]["base"] == "api_error"
- assert result["description_placeholders"]["details"] == "failure"
+ assert result["errors"]["base"] == "failure"
assert result["type"] is FlowResultType.FORM
assert result["step_id"] == "init"
-
-
-async def test_unique_id_exists(
- hass: HomeAssistant,
- mock_setup_entry: AsyncMock,
- emoncms_client: AsyncMock,
- config_entry_unique_id: MockConfigEntry,
-) -> None:
- """Test when entry with same unique id already exists."""
- config_entry_unique_id.add_to_hass(hass)
- result = await hass.config_entries.flow.async_init(
- DOMAIN, context={"source": SOURCE_USER}
- )
- result = await hass.config_entries.flow.async_configure(
- result["flow_id"], USER_INPUT
- )
- assert result["type"] is FlowResultType.ABORT
- assert result["reason"] == "already_configured"
diff --git a/tests/components/emoncms/test_init.py b/tests/components/emoncms/test_init.py
index abe1a020034..b89b6e65a66 100644
--- a/tests/components/emoncms/test_init.py
+++ b/tests/components/emoncms/test_init.py
@@ -4,14 +4,11 @@ from __future__ import annotations
from unittest.mock import AsyncMock
-from homeassistant.components.emoncms.const import DOMAIN, FEED_ID, FEED_NAME
from homeassistant.config_entries import ConfigEntryState
-from homeassistant.const import Platform
from homeassistant.core import HomeAssistant
-from homeassistant.helpers import entity_registry as er, issue_registry as ir
from . import setup_integration
-from .conftest import EMONCMS_FAILURE, FEEDS
+from .conftest import EMONCMS_FAILURE
from tests.common import MockConfigEntry
@@ -41,49 +38,3 @@ async def test_failure(
emoncms_client.async_request.return_value = EMONCMS_FAILURE
config_entry.add_to_hass(hass)
assert not await hass.config_entries.async_setup(config_entry.entry_id)
-
-
-async def test_migrate_uuid(
- hass: HomeAssistant,
- config_entry: MockConfigEntry,
- entity_registry: er.EntityRegistry,
- emoncms_client: AsyncMock,
-) -> None:
- """Test migration from home assistant uuid to emoncms uuid."""
- config_entry.add_to_hass(hass)
- assert config_entry.unique_id is None
- for _, feed in enumerate(FEEDS):
- entity_registry.async_get_or_create(
- Platform.SENSOR,
- DOMAIN,
- f"{config_entry.entry_id}-{feed[FEED_ID]}",
- config_entry=config_entry,
- suggested_object_id=f"{DOMAIN}_{feed[FEED_NAME]}",
- )
- assert await hass.config_entries.async_setup(config_entry.entry_id)
- await hass.async_block_till_done()
- emoncms_uuid = emoncms_client.async_get_uuid.return_value
- assert config_entry.unique_id == emoncms_uuid
- entity_entries = er.async_entries_for_config_entry(
- entity_registry, config_entry.entry_id
- )
-
- for nb, feed in enumerate(FEEDS):
- assert entity_entries[nb].unique_id == f"{emoncms_uuid}-{feed[FEED_ID]}"
- assert (
- entity_entries[nb].previous_unique_id
- == f"{config_entry.entry_id}-{feed[FEED_ID]}"
- )
-
-
-async def test_no_uuid(
- hass: HomeAssistant,
- config_entry: MockConfigEntry,
- issue_registry: ir.IssueRegistry,
- emoncms_client: AsyncMock,
-) -> None:
- """Test an issue is created when the emoncms server does not ship an uuid."""
- emoncms_client.async_get_uuid.return_value = None
- await setup_integration(hass, config_entry)
-
- assert issue_registry.async_get_issue(domain=DOMAIN, issue_id="migrate database")
diff --git a/tests/components/esphome/test_config_flow.py b/tests/components/esphome/test_config_flow.py
index 0a389969c78..3051547bd43 100644
--- a/tests/components/esphome/test_config_flow.py
+++ b/tests/components/esphome/test_config_flow.py
@@ -1400,14 +1400,6 @@ async def test_discovery_mqtt_no_mac(
await mqtt_discovery_test_abort(hass, "{}", "mqtt_missing_mac")
-@pytest.mark.usefixtures("mock_zeroconf")
-async def test_discovery_mqtt_empty_payload(
- hass: HomeAssistant, mock_client, mock_setup_entry: None
-) -> None:
- """Test discovery aborted if MQTT payload is empty."""
- await mqtt_discovery_test_abort(hass, "", "mqtt_missing_payload")
-
-
@pytest.mark.usefixtures("mock_zeroconf")
async def test_discovery_mqtt_no_api(
hass: HomeAssistant, mock_client, mock_setup_entry: None
diff --git a/tests/components/file/test_notify.py b/tests/components/file/test_notify.py
index e7cb85a9cfc..33e4739a488 100644
--- a/tests/components/file/test_notify.py
+++ b/tests/components/file/test_notify.py
@@ -12,46 +12,222 @@ from homeassistant.components.file import DOMAIN
from homeassistant.components.notify import ATTR_TITLE_DEFAULT
from homeassistant.core import HomeAssistant
from homeassistant.exceptions import ServiceValidationError
+from homeassistant.helpers.typing import ConfigType
+from homeassistant.setup import async_setup_component
import homeassistant.util.dt as dt_util
-from tests.common import MockConfigEntry
+from tests.common import MockConfigEntry, assert_setup_component
+
+
+async def test_bad_config(hass: HomeAssistant) -> None:
+ """Test set up the platform with bad/missing config."""
+ config = {notify.DOMAIN: {"name": "test", "platform": "file"}}
+ with assert_setup_component(0, domain="notify") as handle_config:
+ assert await async_setup_component(hass, notify.DOMAIN, config)
+ await hass.async_block_till_done()
+ assert not handle_config[notify.DOMAIN]
@pytest.mark.parametrize(
("domain", "service", "params"),
[
+ (notify.DOMAIN, "test", {"message": "one, two, testing, testing"}),
(
notify.DOMAIN,
"send_message",
{"entity_id": "notify.test", "message": "one, two, testing, testing"},
),
],
+ ids=["legacy", "entity"],
+)
+@pytest.mark.parametrize(
+ ("timestamp", "config"),
+ [
+ (
+ False,
+ {
+ "notify": [
+ {
+ "name": "test",
+ "platform": "file",
+ "filename": "mock_file",
+ "timestamp": False,
+ }
+ ]
+ },
+ ),
+ (
+ True,
+ {
+ "notify": [
+ {
+ "name": "test",
+ "platform": "file",
+ "filename": "mock_file",
+ "timestamp": True,
+ }
+ ]
+ },
+ ),
+ ],
+ ids=["no_timestamp", "timestamp"],
)
-@pytest.mark.parametrize("timestamp", [False, True], ids=["no_timestamp", "timestamp"])
async def test_notify_file(
hass: HomeAssistant,
freezer: FrozenDateTimeFactory,
- mock_is_allowed_path: MagicMock,
timestamp: bool,
+ mock_is_allowed_path: MagicMock,
+ config: ConfigType,
domain: str,
service: str,
params: dict[str, str],
) -> None:
"""Test the notify file output."""
filename = "mock_file"
- full_filename = os.path.join(hass.config.path(), filename)
+ message = params["message"]
+ assert await async_setup_component(hass, notify.DOMAIN, config)
+ await hass.async_block_till_done()
+ assert await async_setup_component(hass, DOMAIN, config)
+ await hass.async_block_till_done(wait_background_tasks=True)
+ freezer.move_to(dt_util.utcnow())
+
+ m_open = mock_open()
+ with (
+ patch("homeassistant.components.file.notify.open", m_open, create=True),
+ patch("homeassistant.components.file.notify.os.stat") as mock_st,
+ ):
+ mock_st.return_value.st_size = 0
+ title = (
+ f"{ATTR_TITLE_DEFAULT} notifications "
+ f"(Log started: {dt_util.utcnow().isoformat()})\n{'-' * 80}\n"
+ )
+
+ await hass.services.async_call(domain, service, params, blocking=True)
+
+ full_filename = os.path.join(hass.config.path(), filename)
+ assert m_open.call_count == 1
+ assert m_open.call_args == call(full_filename, "a", encoding="utf8")
+
+ assert m_open.return_value.write.call_count == 2
+ if not timestamp:
+ assert m_open.return_value.write.call_args_list == [
+ call(title),
+ call(f"{message}\n"),
+ ]
+ else:
+ assert m_open.return_value.write.call_args_list == [
+ call(title),
+ call(f"{dt_util.utcnow().isoformat()} {message}\n"),
+ ]
+
+
+@pytest.mark.parametrize(
+ ("domain", "service", "params"),
+ [(notify.DOMAIN, "test", {"message": "one, two, testing, testing"})],
+ ids=["legacy"],
+)
+@pytest.mark.parametrize(
+ ("is_allowed", "config"),
+ [
+ (
+ True,
+ {
+ "notify": [
+ {
+ "name": "test",
+ "platform": "file",
+ "filename": "mock_file",
+ }
+ ]
+ },
+ ),
+ ],
+ ids=["allowed_but_access_failed"],
+)
+async def test_legacy_notify_file_exception(
+ hass: HomeAssistant,
+ freezer: FrozenDateTimeFactory,
+ mock_is_allowed_path: MagicMock,
+ config: ConfigType,
+ domain: str,
+ service: str,
+ params: dict[str, str],
+) -> None:
+ """Test legacy notify file output has exception."""
+ assert await async_setup_component(hass, notify.DOMAIN, config)
+ await hass.async_block_till_done()
+ assert await async_setup_component(hass, DOMAIN, config)
+ await hass.async_block_till_done(wait_background_tasks=True)
+
+ freezer.move_to(dt_util.utcnow())
+
+ m_open = mock_open()
+ with (
+ patch("homeassistant.components.file.notify.open", m_open, create=True),
+ patch("homeassistant.components.file.notify.os.stat") as mock_st,
+ ):
+ mock_st.side_effect = OSError("Access Failed")
+ with pytest.raises(ServiceValidationError) as exc:
+ await hass.services.async_call(domain, service, params, blocking=True)
+ assert f"{exc.value!r}" == "ServiceValidationError('write_access_failed')"
+
+
+@pytest.mark.parametrize(
+ ("timestamp", "data", "options"),
+ [
+ (
+ False,
+ {
+ "name": "test",
+ "platform": "notify",
+ "file_path": "mock_file",
+ },
+ {
+ "timestamp": False,
+ },
+ ),
+ (
+ True,
+ {
+ "name": "test",
+ "platform": "notify",
+ "file_path": "mock_file",
+ },
+ {
+ "timestamp": True,
+ },
+ ),
+ ],
+ ids=["no_timestamp", "timestamp"],
+)
+async def test_legacy_notify_file_entry_only_setup(
+ hass: HomeAssistant,
+ freezer: FrozenDateTimeFactory,
+ timestamp: bool,
+ mock_is_allowed_path: MagicMock,
+ data: dict[str, Any],
+ options: dict[str, Any],
+) -> None:
+ """Test the legacy notify file output in entry only setup."""
+ filename = "mock_file"
+
+ domain = notify.DOMAIN
+ service = "test"
+ params = {"message": "one, two, testing, testing"}
message = params["message"]
entry = MockConfigEntry(
domain=DOMAIN,
- data={"name": "test", "platform": "notify", "file_path": full_filename},
- options={"timestamp": timestamp},
+ data=data,
version=2,
- title=f"test [{filename}]",
+ options=options,
+ title=f"test [{data['file_path']}]",
)
entry.add_to_hass(hass)
- assert await hass.config_entries.async_setup(entry.entry_id)
+ await hass.config_entries.async_setup(entry.entry_id)
+ await hass.async_block_till_done()
+ await hass.async_block_till_done(wait_background_tasks=True)
freezer.move_to(dt_util.utcnow())
@@ -69,7 +245,7 @@ async def test_notify_file(
await hass.services.async_call(domain, service, params, blocking=True)
assert m_open.call_count == 1
- assert m_open.call_args == call(full_filename, "a", encoding="utf8")
+ assert m_open.call_args == call(filename, "a", encoding="utf8")
assert m_open.return_value.write.call_count == 2
if not timestamp:
@@ -101,14 +277,14 @@ async def test_notify_file(
],
ids=["not_allowed"],
)
-async def test_notify_file_not_allowed(
+async def test_legacy_notify_file_not_allowed(
hass: HomeAssistant,
caplog: pytest.LogCaptureFixture,
mock_is_allowed_path: MagicMock,
config: dict[str, Any],
options: dict[str, Any],
) -> None:
- """Test notify file output not allowed."""
+ """Test legacy notify file output not allowed."""
entry = MockConfigEntry(
domain=DOMAIN,
data=config,
@@ -125,10 +301,11 @@ async def test_notify_file_not_allowed(
@pytest.mark.parametrize(
("service", "params"),
[
+ ("test", {"message": "one, two, testing, testing"}),
(
"send_message",
{"entity_id": "notify.test", "message": "one, two, testing, testing"},
- )
+ ),
],
)
@pytest.mark.parametrize(
diff --git a/tests/components/file/test_sensor.py b/tests/components/file/test_sensor.py
index 9e6a16e3e27..634ae9d626c 100644
--- a/tests/components/file/test_sensor.py
+++ b/tests/components/file/test_sensor.py
@@ -7,10 +7,33 @@ import pytest
from homeassistant.components.file import DOMAIN
from homeassistant.const import STATE_UNKNOWN
from homeassistant.core import HomeAssistant
+from homeassistant.setup import async_setup_component
from tests.common import MockConfigEntry, get_fixture_path
+@patch("os.path.isfile", Mock(return_value=True))
+@patch("os.access", Mock(return_value=True))
+async def test_file_value_yaml_setup(
+ hass: HomeAssistant, mock_is_allowed_path: MagicMock
+) -> None:
+ """Test the File sensor from YAML setup."""
+ config = {
+ "sensor": {
+ "platform": "file",
+ "scan_interval": 30,
+ "name": "file1",
+ "file_path": get_fixture_path("file_value.txt", "file"),
+ }
+ }
+
+ assert await async_setup_component(hass, "sensor", config)
+ await hass.async_block_till_done()
+
+ state = hass.states.get("sensor.file1")
+ assert state.state == "21"
+
+
@patch("os.path.isfile", Mock(return_value=True))
@patch("os.access", Mock(return_value=True))
async def test_file_value_entry_setup(
diff --git a/tests/components/fritz/test_config_flow.py b/tests/components/fritz/test_config_flow.py
index 84f1b240b88..e3fae8c083e 100644
--- a/tests/components/fritz/test_config_flow.py
+++ b/tests/components/fritz/test_config_flow.py
@@ -10,7 +10,6 @@ from fritzconnection.core.exceptions import (
)
import pytest
-from homeassistant.components import ssdp
from homeassistant.components.device_tracker import (
CONF_CONSIDER_HOME,
DEFAULT_CONSIDER_HOME,
@@ -23,6 +22,7 @@ from homeassistant.components.fritz.const import (
ERROR_UNKNOWN,
FRITZ_AUTH_EXCEPTIONS,
)
+from homeassistant.components.ssdp import ATTR_UPNP_UDN
from homeassistant.config_entries import SOURCE_SSDP, SOURCE_USER
from homeassistant.const import (
CONF_HOST,
@@ -644,7 +644,7 @@ async def test_ssdp_already_in_progress_host(
MOCK_NO_UNIQUE_ID = dataclasses.replace(MOCK_SSDP_DATA)
MOCK_NO_UNIQUE_ID.upnp = MOCK_NO_UNIQUE_ID.upnp.copy()
- del MOCK_NO_UNIQUE_ID.upnp[ssdp.ATTR_UPNP_UDN]
+ del MOCK_NO_UNIQUE_ID.upnp[ATTR_UPNP_UDN]
result = await hass.config_entries.flow.async_init(
DOMAIN, context={"source": SOURCE_SSDP}, data=MOCK_NO_UNIQUE_ID
)
@@ -737,23 +737,3 @@ async def test_options_flow(hass: HomeAssistant) -> None:
CONF_OLD_DISCOVERY: False,
CONF_CONSIDER_HOME: 37,
}
-
-
-async def test_ssdp_ipv6_link_local(hass: HomeAssistant) -> None:
- """Test ignoring ipv6-link-local while ssdp discovery."""
-
- result = await hass.config_entries.flow.async_init(
- DOMAIN,
- context={"source": SOURCE_SSDP},
- data=ssdp.SsdpServiceInfo(
- ssdp_usn="mock_usn",
- ssdp_st="mock_st",
- ssdp_location="https://[fe80::1ff:fe23:4567:890a]:12345/test",
- upnp={
- ssdp.ATTR_UPNP_FRIENDLY_NAME: "fake_name",
- ssdp.ATTR_UPNP_UDN: "uuid:only-a-test",
- },
- ),
- )
- assert result["type"] is FlowResultType.ABORT
- assert result["reason"] == "ignore_ip6_link_local"
diff --git a/tests/components/generic/test_camera.py b/tests/components/generic/test_camera.py
index d3ef0a39241..59ff513ccc9 100644
--- a/tests/components/generic/test_camera.py
+++ b/tests/components/generic/test_camera.py
@@ -275,9 +275,7 @@ async def test_limit_refetch(
with (
pytest.raises(aiohttp.ServerTimeoutError),
- patch.object(
- client.session._connector, "connect", side_effect=asyncio.TimeoutError
- ),
+ patch("asyncio.timeout", side_effect=TimeoutError()),
):
resp = await client.get("/api/camera_proxy/camera.config_test")
diff --git a/tests/components/geniushub/test_config_flow.py b/tests/components/geniushub/test_config_flow.py
index 7d1d33a2245..9234e03e35a 100644
--- a/tests/components/geniushub/test_config_flow.py
+++ b/tests/components/geniushub/test_config_flow.py
@@ -2,14 +2,21 @@
from http import HTTPStatus
import socket
+from typing import Any
from unittest.mock import AsyncMock
from aiohttp import ClientConnectionError, ClientResponseError
import pytest
from homeassistant.components.geniushub import DOMAIN
-from homeassistant.config_entries import SOURCE_USER
-from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_TOKEN, CONF_USERNAME
+from homeassistant.config_entries import SOURCE_IMPORT, SOURCE_USER
+from homeassistant.const import (
+ CONF_HOST,
+ CONF_MAC,
+ CONF_PASSWORD,
+ CONF_TOKEN,
+ CONF_USERNAME,
+)
from homeassistant.core import HomeAssistant
from homeassistant.data_entry_flow import FlowResultType
@@ -302,3 +309,174 @@ async def test_cloud_duplicate(
)
assert result["type"] is FlowResultType.ABORT
assert result["reason"] == "already_configured"
+
+
+@pytest.mark.parametrize(
+ ("data"),
+ [
+ {
+ CONF_HOST: "10.0.0.130",
+ CONF_USERNAME: "test-username",
+ CONF_PASSWORD: "test-password",
+ },
+ {
+ CONF_HOST: "10.0.0.130",
+ CONF_USERNAME: "test-username",
+ CONF_PASSWORD: "test-password",
+ CONF_MAC: "aa:bb:cc:dd:ee:ff",
+ },
+ ],
+)
+async def test_import_local_flow(
+ hass: HomeAssistant,
+ mock_setup_entry: AsyncMock,
+ mock_geniushub_client: AsyncMock,
+ data: dict[str, Any],
+) -> None:
+ """Test full local import flow."""
+ result = await hass.config_entries.flow.async_init(
+ DOMAIN,
+ context={"source": SOURCE_IMPORT},
+ data=data,
+ )
+ assert result["type"] is FlowResultType.CREATE_ENTRY
+ assert result["title"] == "10.0.0.130"
+ assert result["data"] == data
+ assert result["result"].unique_id == "aa:bb:cc:dd:ee:ff"
+
+
+@pytest.mark.parametrize(
+ ("data"),
+ [
+ {
+ CONF_TOKEN: "abcdef",
+ },
+ {
+ CONF_TOKEN: "abcdef",
+ CONF_MAC: "aa:bb:cc:dd:ee:ff",
+ },
+ ],
+)
+async def test_import_cloud_flow(
+ hass: HomeAssistant,
+ mock_setup_entry: AsyncMock,
+ mock_geniushub_client: AsyncMock,
+ data: dict[str, Any],
+) -> None:
+ """Test full cloud import flow."""
+ result = await hass.config_entries.flow.async_init(
+ DOMAIN,
+ context={"source": SOURCE_IMPORT},
+ data=data,
+ )
+ assert result["type"] is FlowResultType.CREATE_ENTRY
+ assert result["title"] == "Genius hub"
+ assert result["data"] == data
+
+
+@pytest.mark.parametrize(
+ ("data"),
+ [
+ {
+ CONF_HOST: "10.0.0.130",
+ CONF_USERNAME: "test-username",
+ CONF_PASSWORD: "test-password",
+ },
+ {
+ CONF_HOST: "10.0.0.130",
+ CONF_USERNAME: "test-username",
+ CONF_PASSWORD: "test-password",
+ CONF_MAC: "aa:bb:cc:dd:ee:ff",
+ },
+ {
+ CONF_TOKEN: "abcdef",
+ },
+ {
+ CONF_TOKEN: "abcdef",
+ CONF_MAC: "aa:bb:cc:dd:ee:ff",
+ },
+ ],
+)
+@pytest.mark.parametrize(
+ ("exception", "reason"),
+ [
+ (socket.gaierror, "invalid_host"),
+ (
+ ClientResponseError(AsyncMock(), (), status=HTTPStatus.UNAUTHORIZED),
+ "invalid_auth",
+ ),
+ (
+ ClientResponseError(AsyncMock(), (), status=HTTPStatus.NOT_FOUND),
+ "invalid_host",
+ ),
+ (TimeoutError, "cannot_connect"),
+ (ClientConnectionError, "cannot_connect"),
+ (Exception, "unknown"),
+ ],
+)
+async def test_import_flow_exceptions(
+ hass: HomeAssistant,
+ mock_geniushub_client: AsyncMock,
+ data: dict[str, Any],
+ exception: Exception,
+ reason: str,
+) -> None:
+ """Test import flow exceptions."""
+ mock_geniushub_client.request.side_effect = exception
+ result = await hass.config_entries.flow.async_init(
+ DOMAIN,
+ context={"source": SOURCE_IMPORT},
+ data=data,
+ )
+ assert result["type"] is FlowResultType.ABORT
+ assert result["reason"] == reason
+
+
+@pytest.mark.parametrize(
+ ("data"),
+ [
+ {
+ CONF_HOST: "10.0.0.130",
+ CONF_USERNAME: "test-username",
+ CONF_PASSWORD: "test-password",
+ },
+ {
+ CONF_HOST: "10.0.0.131",
+ CONF_USERNAME: "test-username1",
+ CONF_PASSWORD: "test-password",
+ },
+ ],
+)
+async def test_import_flow_local_duplicate(
+ hass: HomeAssistant,
+ mock_geniushub_client: AsyncMock,
+ mock_local_config_entry: MockConfigEntry,
+ data: dict[str, Any],
+) -> None:
+ """Test import flow aborts on local duplicate data."""
+ mock_local_config_entry.add_to_hass(hass)
+ result = await hass.config_entries.flow.async_init(
+ DOMAIN,
+ context={"source": SOURCE_IMPORT},
+ data=data,
+ )
+ assert result["type"] is FlowResultType.ABORT
+ assert result["reason"] == "already_configured"
+
+
+async def test_import_flow_cloud_duplicate(
+ hass: HomeAssistant,
+ mock_geniushub_client: AsyncMock,
+ mock_cloud_config_entry: MockConfigEntry,
+) -> None:
+ """Test import flow aborts on cloud duplicate data."""
+ mock_cloud_config_entry.add_to_hass(hass)
+ result = await hass.config_entries.flow.async_init(
+ DOMAIN,
+ context={"source": SOURCE_IMPORT},
+ data={
+ CONF_TOKEN: "abcdef",
+ },
+ )
+ assert result["type"] is FlowResultType.ABORT
+ assert result["reason"] == "already_configured"
diff --git a/tests/components/go2rtc/conftest.py b/tests/components/go2rtc/conftest.py
index abb139b89bf..42b363b2324 100644
--- a/tests/components/go2rtc/conftest.py
+++ b/tests/components/go2rtc/conftest.py
@@ -3,11 +3,9 @@
from collections.abc import Generator
from unittest.mock import AsyncMock, Mock, patch
-from awesomeversion import AwesomeVersion
from go2rtc_client.rest import _StreamClient, _WebRTCClient
import pytest
-from homeassistant.components.go2rtc.const import RECOMMENDED_VERSION
from homeassistant.components.go2rtc.server import Server
GO2RTC_PATH = "homeassistant.components.go2rtc"
@@ -25,9 +23,7 @@ def rest_client() -> Generator[AsyncMock]:
client = mock_client.return_value
client.streams = streams = Mock(spec_set=_StreamClient)
streams.list.return_value = {}
- client.validate_server_version = AsyncMock(
- return_value=AwesomeVersion(RECOMMENDED_VERSION)
- )
+ client.validate_server_version = AsyncMock()
client.webrtc = Mock(spec_set=_WebRTCClient)
yield client
diff --git a/tests/components/go2rtc/test_init.py b/tests/components/go2rtc/test_init.py
index 0f1cac6942d..18a46fdd4d1 100644
--- a/tests/components/go2rtc/test_init.py
+++ b/tests/components/go2rtc/test_init.py
@@ -6,7 +6,6 @@ from typing import NamedTuple
from unittest.mock import AsyncMock, Mock, patch
from aiohttp.client_exceptions import ClientConnectionError, ServerConnectionError
-from awesomeversion import AwesomeVersion
from go2rtc_client import Stream
from go2rtc_client.exceptions import Go2RtcClientError, Go2RtcVersionError
from go2rtc_client.models import Producer
@@ -37,12 +36,10 @@ from homeassistant.components.go2rtc.const import (
CONF_DEBUG_UI,
DEBUG_UI_URL_MESSAGE,
DOMAIN,
- RECOMMENDED_VERSION,
)
from homeassistant.config_entries import ConfigEntry, ConfigEntryState, ConfigFlow
from homeassistant.const import CONF_URL
from homeassistant.core import HomeAssistant
-from homeassistant.helpers import issue_registry as ir
from homeassistant.helpers.typing import ConfigType
from homeassistant.setup import async_setup_component
@@ -202,7 +199,6 @@ async def init_test_integration(
async def _test_setup_and_signaling(
hass: HomeAssistant,
- issue_registry: ir.IssueRegistry,
rest_client: AsyncMock,
ws_client: Mock,
config: ConfigType,
@@ -215,7 +211,6 @@ async def _test_setup_and_signaling(
assert await async_setup_component(hass, DOMAIN, config)
await hass.async_block_till_done(wait_background_tasks=True)
- assert issue_registry.async_get_issue(DOMAIN, "recommended_version") is None
config_entries = hass.config_entries.async_entries(DOMAIN)
assert len(config_entries) == 1
assert config_entries[0].state == ConfigEntryState.LOADED
@@ -243,11 +238,7 @@ async def _test_setup_and_signaling(
await test()
rest_client.streams.add.assert_called_once_with(
- entity_id,
- [
- "rtsp://stream",
- f"ffmpeg:{camera.entity_id}#audio=opus#query=log_level=debug",
- ],
+ entity_id, ["rtsp://stream", f"ffmpeg:{camera.entity_id}#audio=opus"]
)
# Stream exists but the source is different
@@ -261,11 +252,7 @@ async def _test_setup_and_signaling(
await test()
rest_client.streams.add.assert_called_once_with(
- entity_id,
- [
- "rtsp://stream",
- f"ffmpeg:{camera.entity_id}#audio=opus#query=log_level=debug",
- ],
+ entity_id, ["rtsp://stream", f"ffmpeg:{camera.entity_id}#audio=opus"]
)
# If the stream is already added, the stream should not be added again.
@@ -311,7 +298,6 @@ async def _test_setup_and_signaling(
@pytest.mark.parametrize("has_go2rtc_entry", [True, False])
async def test_setup_go_binary(
hass: HomeAssistant,
- issue_registry: ir.IssueRegistry,
rest_client: AsyncMock,
ws_client: Mock,
server: AsyncMock,
@@ -330,13 +316,7 @@ async def test_setup_go_binary(
server_start.assert_called_once()
await _test_setup_and_signaling(
- hass,
- issue_registry,
- rest_client,
- ws_client,
- config,
- after_setup,
- init_test_integration,
+ hass, rest_client, ws_client, config, after_setup, init_test_integration
)
await hass.async_stop()
@@ -352,9 +332,8 @@ async def test_setup_go_binary(
],
)
@pytest.mark.parametrize("has_go2rtc_entry", [True, False])
-async def test_setup(
+async def test_setup_go(
hass: HomeAssistant,
- issue_registry: ir.IssueRegistry,
rest_client: AsyncMock,
ws_client: Mock,
server: Mock,
@@ -372,13 +351,7 @@ async def test_setup(
server.assert_not_called()
await _test_setup_and_signaling(
- hass,
- issue_registry,
- rest_client,
- ws_client,
- config,
- after_setup,
- init_test_integration,
+ hass, rest_client, ws_client, config, after_setup, init_test_integration
)
mock_get_binary.assert_not_called()
@@ -730,30 +703,3 @@ async def test_config_entry_remove(hass: HomeAssistant) -> None:
assert len(hass.config_entries.async_entries(DOMAIN)) == 1
assert not await hass.config_entries.async_setup(config_entry.entry_id)
assert len(hass.config_entries.async_entries(DOMAIN)) == 0
-
-
-@pytest.mark.parametrize("config", [{DOMAIN: {CONF_URL: "http://localhost:1984"}}])
-@pytest.mark.usefixtures("server")
-async def test_setup_with_recommended_version_repair(
- hass: HomeAssistant,
- issue_registry: ir.IssueRegistry,
- rest_client: AsyncMock,
- config: ConfigType,
-) -> None:
- """Test setup integration entry fails."""
- rest_client.validate_server_version.return_value = AwesomeVersion("1.9.5")
- assert await async_setup_component(hass, DOMAIN, config)
- await hass.async_block_till_done(wait_background_tasks=True)
-
- # Verify the issue is created
- issue = issue_registry.async_get_issue(DOMAIN, "recommended_version")
- assert issue
- assert issue.is_fixable is False
- assert issue.is_persistent is False
- assert issue.severity == ir.IssueSeverity.WARNING
- assert issue.issue_id == "recommended_version"
- assert issue.translation_key == "recommended_version"
- assert issue.translation_placeholders == {
- "recommended_version": RECOMMENDED_VERSION,
- "current_version": "1.9.5",
- }
diff --git a/tests/components/go2rtc/test_server.py b/tests/components/go2rtc/test_server.py
index e4fe3993f3c..d810dbd88eb 100644
--- a/tests/components/go2rtc/test_server.py
+++ b/tests/components/go2rtc/test_server.py
@@ -105,13 +105,12 @@ async def test_server_run_success(
# Verify that the config file was written
mock_tempfile.write.assert_called_once_with(
- f"""# This file is managed by Home Assistant
-# Do not edit it manually
-
+ f"""
api:
listen: "{api_ip}:11984"
rtsp:
+ # ffmpeg needs rtsp for opus audio transcoding
listen: "127.0.0.1:18554"
webrtc:
diff --git a/tests/components/google_assistant/test_trait.py b/tests/components/google_assistant/test_trait.py
index 1e42edf8e7b..f5dedc357c1 100644
--- a/tests/components/google_assistant/test_trait.py
+++ b/tests/components/google_assistant/test_trait.py
@@ -4069,90 +4069,3 @@ async def test_sensorstate(
)
is False
)
-
-
-@pytest.mark.parametrize(
- ("state", "identifier"),
- [
- (STATE_ON, 0),
- (STATE_OFF, 1),
- (STATE_UNKNOWN, 2),
- ],
-)
-@pytest.mark.parametrize(
- ("device_class", "name", "states"),
- [
- (
- binary_sensor.BinarySensorDeviceClass.CO,
- "CarbonMonoxideLevel",
- ["carbon monoxide detected", "no carbon monoxide detected", "unknown"],
- ),
- (
- binary_sensor.BinarySensorDeviceClass.SMOKE,
- "SmokeLevel",
- ["smoke detected", "no smoke detected", "unknown"],
- ),
- (
- binary_sensor.BinarySensorDeviceClass.MOISTURE,
- "WaterLeak",
- ["leak", "no leak", "unknown"],
- ),
- ],
-)
-async def test_binary_sensorstate(
- hass: HomeAssistant,
- state: str,
- identifier: int,
- device_class: binary_sensor.BinarySensorDeviceClass,
- name: str,
- states: list[str],
-) -> None:
- """Test SensorState trait support for binary sensor domain."""
-
- assert helpers.get_google_type(binary_sensor.DOMAIN, None) is not None
- assert trait.SensorStateTrait.supported(
- binary_sensor.DOMAIN, None, device_class, None
- )
-
- trt = trait.SensorStateTrait(
- hass,
- State(
- "binary_sensor.test",
- state,
- {
- "device_class": device_class,
- },
- ),
- BASIC_CONFIG,
- )
-
- assert trt.sync_attributes() == {
- "sensorStatesSupported": [
- {
- "name": name,
- "descriptiveCapabilities": {
- "availableStates": states,
- },
- }
- ]
- }
- assert trt.query_attributes() == {
- "currentSensorStateData": [
- {
- "name": name,
- "currentSensorState": states[identifier],
- "rawValue": None,
- },
- ]
- }
-
- assert helpers.get_google_type(binary_sensor.DOMAIN, None) is not None
- assert (
- trait.SensorStateTrait.supported(
- binary_sensor.DOMAIN,
- None,
- binary_sensor.BinarySensorDeviceClass.TAMPER,
- None,
- )
- is False
- )
diff --git a/tests/components/habitica/conftest.py b/tests/components/habitica/conftest.py
index 8d729f4358f..b5ceadd2762 100644
--- a/tests/components/habitica/conftest.py
+++ b/tests/components/habitica/conftest.py
@@ -34,7 +34,7 @@ def mock_called_with(
(
call
for call in mock_client.mock_calls
- if call[0].upper() == method.upper() and call[1] == URL(url)
+ if call[0] == method.upper() and call[1] == URL(url)
),
None,
)
@@ -56,11 +56,6 @@ def mock_habitica(aioclient_mock: AiohttpClientMocker) -> AiohttpClientMocker:
f"{DEFAULT_URL}/api/v3/tasks/user",
json=load_json_object_fixture("tasks.json", DOMAIN),
)
- aioclient_mock.get(
- f"{DEFAULT_URL}/api/v3/content",
- params={"language": "en"},
- json=load_json_object_fixture("content.json", DOMAIN),
- )
return aioclient_mock
diff --git a/tests/components/habitica/fixtures/common_buttons_unavailable.json b/tests/components/habitica/fixtures/common_buttons_unavailable.json
index efee5364e02..08039ae1762 100644
--- a/tests/components/habitica/fixtures/common_buttons_unavailable.json
+++ b/tests/components/habitica/fixtures/common_buttons_unavailable.json
@@ -29,26 +29,11 @@
"preferences": {
"sleep": false,
"automaticAllocation": false,
- "disableClasses": false,
- "language": "en"
+ "disableClasses": false
},
"flags": {
"classSelected": true
},
- "needsCron": false,
- "items": {
- "gear": {
- "equipped": {
- "weapon": "weapon_warrior_5",
- "armor": "armor_warrior_5",
- "head": "head_warrior_5",
- "shield": "shield_warrior_5",
- "back": "heroicAureole",
- "headAccessory": "headAccessory_armoire_gogglesOfBookbinding",
- "eyewear": "plagueDoctorMask",
- "body": "aetherAmulet"
- }
- }
- }
+ "needsCron": false
}
}
diff --git a/tests/components/habitica/fixtures/content.json b/tests/components/habitica/fixtures/content.json
deleted file mode 100644
index e8e14dead73..00000000000
--- a/tests/components/habitica/fixtures/content.json
+++ /dev/null
@@ -1,287 +0,0 @@
-{
- "success": true,
- "data": {
- "gear": {
- "flat": {
- "weapon_warrior_5": {
- "text": "Ruby Sword",
- "notes": "Weapon whose forge-glow never fades. Increases Strength by 15. ",
- "str": 15,
- "value": 90,
- "type": "weapon",
- "key": "weapon_warrior_5",
- "set": "warrior-5",
- "klass": "warrior",
- "index": "5",
- "int": 0,
- "per": 0,
- "con": 0
- },
- "armor_warrior_5": {
- "text": "Golden Armor",
- "notes": "Looks ceremonial, but no known blade can pierce it. Increases Constitution by 11.",
- "con": 11,
- "value": 120,
- "last": true,
- "type": "armor",
- "key": "armor_warrior_5",
- "set": "warrior-5",
- "klass": "warrior",
- "index": "5",
- "str": 0,
- "int": 0,
- "per": 0
- },
- "head_warrior_5": {
- "text": "Golden Helm",
- "notes": "Regal crown bound to shining armor. Increases Strength by 12.",
- "str": 12,
- "value": 80,
- "last": true,
- "type": "head",
- "key": "head_warrior_5",
- "set": "warrior-5",
- "klass": "warrior",
- "index": "5",
- "int": 0,
- "per": 0,
- "con": 0
- },
- "shield_warrior_5": {
- "text": "Golden Shield",
- "notes": "Shining badge of the vanguard. Increases Constitution by 9.",
- "con": 9,
- "value": 90,
- "last": true,
- "type": "shield",
- "key": "shield_warrior_5",
- "set": "warrior-5",
- "klass": "warrior",
- "index": "5",
- "str": 0,
- "int": 0,
- "per": 0
- },
- "weapon_wizard_5": {
- "twoHanded": true,
- "text": "Archmage Staff",
- "notes": "Assists in weaving the most complex of spells. Increases Intelligence by 15 and Perception by 7. Two-handed item.",
- "int": 15,
- "per": 7,
- "value": 160,
- "type": "weapon",
- "key": "weapon_wizard_5",
- "set": "wizard-5",
- "klass": "wizard",
- "index": "5",
- "str": 0,
- "con": 0
- },
- "armor_wizard_5": {
- "text": "Royal Magus Robe",
- "notes": "Symbol of the power behind the throne. Increases Intelligence by 12.",
- "int": 12,
- "value": 120,
- "last": true,
- "type": "armor",
- "key": "armor_wizard_5",
- "set": "wizard-5",
- "klass": "wizard",
- "index": "5",
- "str": 0,
- "per": 0,
- "con": 0
- },
- "head_wizard_5": {
- "text": "Royal Magus Hat",
- "notes": "Shows authority over fortune, weather, and lesser mages. Increases Perception by 10.",
- "per": 10,
- "value": 80,
- "last": true,
- "type": "head",
- "key": "head_wizard_5",
- "set": "wizard-5",
- "klass": "wizard",
- "index": "5",
- "str": 0,
- "int": 0,
- "con": 0
- },
- "weapon_healer_5": {
- "text": "Royal Scepter",
- "notes": "Fit to grace the hand of a monarch, or of one who stands at a monarch's right hand. Increases Intelligence by 9. ",
- "int": 9,
- "value": 90,
- "type": "weapon",
- "key": "weapon_healer_5",
- "set": "healer-5",
- "klass": "healer",
- "index": "5",
- "str": 0,
- "per": 0,
- "con": 0
- },
- "armor_healer_5": {
- "text": "Royal Mantle",
- "notes": "Attire of those who have saved the lives of kings. Increases Constitution by 18.",
- "con": 18,
- "value": 120,
- "last": true,
- "type": "armor",
- "key": "armor_healer_5",
- "set": "healer-5",
- "klass": "healer",
- "index": "5",
- "str": 0,
- "int": 0,
- "per": 0
- },
- "head_healer_5": {
- "text": "Royal Diadem",
- "notes": "For king, queen, or miracle-worker. Increases Intelligence by 9.",
- "int": 9,
- "value": 80,
- "last": true,
- "type": "head",
- "key": "head_healer_5",
- "set": "healer-5",
- "klass": "healer",
- "index": "5",
- "str": 0,
- "per": 0,
- "con": 0
- },
- "shield_healer_5": {
- "text": "Royal Shield",
- "notes": "Bestowed upon those most dedicated to the kingdom's defense. Increases Constitution by 12.",
- "con": 12,
- "value": 90,
- "last": true,
- "type": "shield",
- "key": "shield_healer_5",
- "set": "healer-5",
- "klass": "healer",
- "index": "5",
- "str": 0,
- "int": 0,
- "per": 0
- },
- "weapon_rogue_5": {
- "text": "Ninja-to",
- "notes": "Sleek and deadly as the ninja themselves. Increases Strength by 8. ",
- "str": 8,
- "value": 90,
- "type": "weapon",
- "key": "weapon_rogue_5",
- "set": "rogue-5",
- "klass": "rogue",
- "index": "5",
- "int": 0,
- "per": 0,
- "con": 0
- },
- "armor_rogue_5": {
- "text": "Umbral Armor",
- "notes": "Allows stealth in the open in broad daylight. Increases Perception by 18.",
- "per": 18,
- "value": 120,
- "last": true,
- "type": "armor",
- "key": "armor_rogue_5",
- "set": "rogue-5",
- "klass": "rogue",
- "index": "5",
- "str": 0,
- "int": 0,
- "con": 0
- },
- "head_rogue_5": {
- "text": "Umbral Hood",
- "notes": "Conceals even thoughts from those who would probe them. Increases Perception by 12.",
- "per": 12,
- "value": 80,
- "last": true,
- "type": "head",
- "key": "head_rogue_5",
- "set": "rogue-5",
- "klass": "rogue",
- "index": "5",
- "str": 0,
- "int": 0,
- "con": 0
- },
- "shield_rogue_5": {
- "text": "Ninja-to",
- "notes": "Sleek and deadly as the ninja themselves. Increases Strength by 8. ",
- "str": 8,
- "value": 90,
- "type": "shield",
- "key": "shield_rogue_5",
- "set": "rogue-5",
- "klass": "rogue",
- "index": "5",
- "int": 0,
- "per": 0,
- "con": 0
- },
- "back_special_heroicAureole": {
- "text": "Heroic Aureole",
- "notes": "The gems on this aureole glimmer when you tell your tales of glory. Increases all stats by 7.",
- "con": 7,
- "str": 7,
- "per": 7,
- "int": 7,
- "value": 175,
- "type": "back",
- "key": "back_special_heroicAureole",
- "set": "special-heroicAureole",
- "klass": "special",
- "index": "heroicAureole"
- },
- "headAccessory_armoire_gogglesOfBookbinding": {
- "per": 8,
- "set": "bookbinder",
- "notes": "These goggles will help you zero in on any task, large or small! Increases Perception by 8. Enchanted Armoire: Bookbinder Set (Item 1 of 4).",
- "text": "Goggles of Bookbinding",
- "value": 100,
- "type": "headAccessory",
- "key": "headAccessory_armoire_gogglesOfBookbinding",
- "klass": "armoire",
- "index": "gogglesOfBookbinding",
- "str": 0,
- "int": 0,
- "con": 0
- },
- "eyewear_armoire_plagueDoctorMask": {
- "con": 5,
- "int": 5,
- "set": "plagueDoctor",
- "notes": "An authentic mask worn by the doctors who battle the Plague of Procrastination. Increases Constitution and Intelligence by 5 each. Enchanted Armoire: Plague Doctor Set (Item 2 of 3).",
- "text": "Plague Doctor Mask",
- "value": 100,
- "type": "eyewear",
- "key": "eyewear_armoire_plagueDoctorMask",
- "klass": "armoire",
- "index": "plagueDoctorMask",
- "str": 0,
- "per": 0
- },
- "body_special_aetherAmulet": {
- "text": "Aether Amulet",
- "notes": "This amulet has a mysterious history. Increases Constitution and Strength by 10 each.",
- "value": 175,
- "str": 10,
- "con": 10,
- "type": "body",
- "key": "body_special_aetherAmulet",
- "set": "special-aetherAmulet",
- "klass": "special",
- "index": "aetherAmulet",
- "int": 0,
- "per": 0
- }
- }
- }
- },
- "appVersion": "5.29.2"
-}
diff --git a/tests/components/habitica/fixtures/healer_fixture.json b/tests/components/habitica/fixtures/healer_fixture.json
index 85f719f4ca7..04cbabcfa2d 100644
--- a/tests/components/habitica/fixtures/healer_fixture.json
+++ b/tests/components/habitica/fixtures/healer_fixture.json
@@ -4,10 +4,10 @@
"profile": { "name": "test-user" },
"stats": {
"buffs": {
- "str": 26,
- "int": 26,
- "per": 26,
- "con": 26,
+ "str": 0,
+ "int": 0,
+ "per": 0,
+ "con": 0,
"stealth": 0,
"streaks": false,
"seafoam": false,
@@ -24,36 +24,17 @@
"maxHealth": 50,
"maxMP": 166,
"toNextLevel": 880,
- "points": 5,
- "str": 15,
- "con": 15,
- "int": 15,
- "per": 15
+ "points": 5
},
"preferences": {
"sleep": false,
"automaticAllocation": true,
- "disableClasses": false,
- "language": "en"
+ "disableClasses": false
},
"flags": {
"classSelected": true
},
"needsCron": true,
- "lastCron": "2024-09-21T22:01:55.586Z",
- "items": {
- "gear": {
- "equipped": {
- "weapon": "weapon_healer_5",
- "armor": "armor_healer_5",
- "head": "head_healer_5",
- "shield": "shield_healer_5",
- "back": "heroicAureole",
- "headAccessory": "headAccessory_armoire_gogglesOfBookbinding",
- "eyewear": "plagueDoctorMask",
- "body": "aetherAmulet"
- }
- }
- }
+ "lastCron": "2024-09-21T22:01:55.586Z"
}
}
diff --git a/tests/components/habitica/fixtures/healer_skills_unavailable.json b/tests/components/habitica/fixtures/healer_skills_unavailable.json
index a6bff246b2a..305a5f8cda1 100644
--- a/tests/components/habitica/fixtures/healer_skills_unavailable.json
+++ b/tests/components/habitica/fixtures/healer_skills_unavailable.json
@@ -4,10 +4,10 @@
"profile": { "name": "test-user" },
"stats": {
"buffs": {
- "str": 26,
- "int": 26,
- "per": 26,
- "con": 26,
+ "str": 0,
+ "int": 0,
+ "per": 0,
+ "con": 0,
"stealth": 0,
"streaks": false,
"seafoam": false,
@@ -24,35 +24,16 @@
"maxHealth": 50,
"maxMP": 166,
"toNextLevel": 880,
- "points": 0,
- "str": 15,
- "con": 15,
- "int": 15,
- "per": 15
+ "points": 0
},
"preferences": {
"sleep": false,
"automaticAllocation": false,
- "disableClasses": false,
- "language": "en"
+ "disableClasses": false
},
"flags": {
"classSelected": true
},
- "needsCron": false,
- "items": {
- "gear": {
- "equipped": {
- "weapon": "weapon_healer_5",
- "armor": "armor_healer_5",
- "head": "head_healer_5",
- "shield": "shield_healer_5",
- "back": "heroicAureole",
- "headAccessory": "headAccessory_armoire_gogglesOfBookbinding",
- "eyewear": "plagueDoctorMask",
- "body": "aetherAmulet"
- }
- }
- }
+ "needsCron": false
}
}
diff --git a/tests/components/habitica/fixtures/quest_invitation_off.json b/tests/components/habitica/fixtures/quest_invitation_off.json
deleted file mode 100644
index b5eccd99e10..00000000000
--- a/tests/components/habitica/fixtures/quest_invitation_off.json
+++ /dev/null
@@ -1,65 +0,0 @@
-{
- "data": {
- "api_user": "test-api-user",
- "profile": { "name": "test-user" },
- "stats": {
- "buffs": {
- "str": 0,
- "int": 0,
- "per": 0,
- "con": 0,
- "stealth": 0,
- "streaks": false,
- "seafoam": false,
- "shinySeed": false,
- "snowball": false,
- "spookySparkles": false
- },
- "hp": 0,
- "mp": 50.89999999999998,
- "exp": 737,
- "gp": 137.62587214609795,
- "lvl": 38,
- "class": "wizard",
- "maxHealth": 50,
- "maxMP": 166,
- "toNextLevel": 880,
- "points": 5
- },
- "preferences": {
- "sleep": false,
- "automaticAllocation": true,
- "disableClasses": false,
- "language": "en"
- },
- "flags": {
- "classSelected": true
- },
- "tasksOrder": {
- "rewards": ["5e2ea1df-f6e6-4ba3-bccb-97c5ec63e99b"],
- "todos": [
- "88de7cd9-af2b-49ce-9afd-bf941d87336b",
- "2f6fcabc-f670-4ec3-ba65-817e8deea490",
- "1aa3137e-ef72-4d1f-91ee-41933602f438",
- "86ea2475-d1b5-4020-bdcc-c188c7996afa"
- ],
- "dailys": [
- "f21fa608-cfc6-4413-9fc7-0eb1b48ca43a",
- "bc1d1855-b2b8-4663-98ff-62e7b763dfc4",
- "e97659e0-2c42-4599-a7bb-00282adc410d",
- "564b9ac9-c53d-4638-9e7f-1cd96fe19baa",
- "f2c85972-1a19-4426-bc6d-ce3337b9d99f",
- "2c6d136c-a1c3-4bef-b7c4-fa980784b1e1"
- ],
- "habits": ["1d147de6-5c02-4740-8e2f-71d3015a37f4"]
- },
- "party": {
- "quest": {
- "RSVPNeeded": false,
- "key": null
- }
- },
- "needsCron": true,
- "lastCron": "2024-09-21T22:01:55.586Z"
- }
-}
diff --git a/tests/components/habitica/fixtures/rogue_fixture.json b/tests/components/habitica/fixtures/rogue_fixture.json
index 1e5e996c034..f0ea42a7182 100644
--- a/tests/components/habitica/fixtures/rogue_fixture.json
+++ b/tests/components/habitica/fixtures/rogue_fixture.json
@@ -4,10 +4,10 @@
"profile": { "name": "test-user" },
"stats": {
"buffs": {
- "str": 26,
- "int": 26,
- "per": 26,
- "con": 26,
+ "str": 0,
+ "int": 0,
+ "per": 0,
+ "con": 0,
"stealth": 0,
"streaks": false,
"seafoam": false,
@@ -24,36 +24,17 @@
"maxHealth": 50,
"maxMP": 166,
"toNextLevel": 880,
- "points": 5,
- "str": 15,
- "con": 15,
- "int": 15,
- "per": 15
+ "points": 5
},
"preferences": {
"sleep": false,
"automaticAllocation": true,
- "disableClasses": false,
- "language": "en"
+ "disableClasses": false
},
"flags": {
"classSelected": true
},
"needsCron": true,
- "lastCron": "2024-09-21T22:01:55.586Z",
- "items": {
- "gear": {
- "equipped": {
- "weapon": "weapon_rogue_5",
- "armor": "armor_rogue_5",
- "head": "head_rogue_5",
- "shield": "shield_rogue_5",
- "back": "heroicAureole",
- "headAccessory": "headAccessory_armoire_gogglesOfBookbinding",
- "eyewear": "plagueDoctorMask",
- "body": "aetherAmulet"
- }
- }
- }
+ "lastCron": "2024-09-21T22:01:55.586Z"
}
}
diff --git a/tests/components/habitica/fixtures/rogue_skills_unavailable.json b/tests/components/habitica/fixtures/rogue_skills_unavailable.json
index c7c5ff32245..2709731ba55 100644
--- a/tests/components/habitica/fixtures/rogue_skills_unavailable.json
+++ b/tests/components/habitica/fixtures/rogue_skills_unavailable.json
@@ -4,10 +4,10 @@
"profile": { "name": "test-user" },
"stats": {
"buffs": {
- "str": 26,
- "int": 26,
- "per": 26,
- "con": 26,
+ "str": 0,
+ "int": 0,
+ "per": 0,
+ "con": 0,
"stealth": 0,
"streaks": true,
"seafoam": false,
@@ -24,35 +24,16 @@
"maxHealth": 50,
"maxMP": 166,
"toNextLevel": 880,
- "points": 0,
- "str": 15,
- "con": 15,
- "int": 15,
- "per": 15
+ "points": 0
},
"preferences": {
"sleep": false,
"automaticAllocation": false,
- "disableClasses": false,
- "language": "en"
+ "disableClasses": false
},
"flags": {
"classSelected": true
},
- "needsCron": false,
- "items": {
- "gear": {
- "equipped": {
- "weapon": "weapon_rogue_5",
- "armor": "armor_rogue_5",
- "head": "head_rogue_5",
- "shield": "shield_rogue_5",
- "back": "heroicAureole",
- "headAccessory": "headAccessory_armoire_gogglesOfBookbinding",
- "eyewear": "plagueDoctorMask",
- "body": "aetherAmulet"
- }
- }
- }
+ "needsCron": false
}
}
diff --git a/tests/components/habitica/fixtures/rogue_stealth_unavailable.json b/tests/components/habitica/fixtures/rogue_stealth_unavailable.json
index 9fd7adcca42..a4e86abbb91 100644
--- a/tests/components/habitica/fixtures/rogue_stealth_unavailable.json
+++ b/tests/components/habitica/fixtures/rogue_stealth_unavailable.json
@@ -4,10 +4,10 @@
"profile": { "name": "test-user" },
"stats": {
"buffs": {
- "str": 26,
- "int": 26,
- "per": 26,
- "con": 26,
+ "str": 0,
+ "int": 0,
+ "per": 0,
+ "con": 0,
"stealth": 4,
"streaks": false,
"seafoam": false,
@@ -24,35 +24,16 @@
"maxHealth": 50,
"maxMP": 166,
"toNextLevel": 880,
- "points": 0,
- "str": 15,
- "con": 15,
- "int": 15,
- "per": 15
+ "points": 0
},
"preferences": {
"sleep": false,
"automaticAllocation": false,
- "disableClasses": false,
- "language": "en"
+ "disableClasses": false
},
"flags": {
"classSelected": true
},
- "needsCron": false,
- "items": {
- "gear": {
- "equipped": {
- "weapon": "weapon_rogue_5",
- "armor": "armor_rogue_5",
- "head": "head_rogue_5",
- "shield": "shield_rogue_5",
- "back": "heroicAureole",
- "headAccessory": "headAccessory_armoire_gogglesOfBookbinding",
- "eyewear": "plagueDoctorMask",
- "body": "aetherAmulet"
- }
- }
- }
+ "needsCron": false
}
}
diff --git a/tests/components/habitica/fixtures/tasks.json b/tests/components/habitica/fixtures/tasks.json
index 2e8305283d0..0d6ffba0732 100644
--- a/tests/components/habitica/fixtures/tasks.json
+++ b/tests/components/habitica/fixtures/tasks.json
@@ -121,8 +121,7 @@
"createdAt": "2024-07-07T17:51:53.264Z",
"updatedAt": "2024-07-12T09:58:45.438Z",
"userId": "5f359083-ef78-4af0-985a-0b2c6d05797c",
- "id": "e97659e0-2c42-4599-a7bb-00282adc410d",
- "alias": "create_a_task"
+ "id": "e97659e0-2c42-4599-a7bb-00282adc410d"
},
{
"_id": "564b9ac9-c53d-4638-9e7f-1cd96fe19baa",
@@ -455,8 +454,7 @@
"createdAt": "2024-09-21T22:17:19.513Z",
"updatedAt": "2024-09-21T22:19:35.576Z",
"userId": "5f359083-ef78-4af0-985a-0b2c6d05797c",
- "id": "2f6fcabc-f670-4ec3-ba65-817e8deea490",
- "alias": "pay_bills"
+ "id": "2f6fcabc-f670-4ec3-ba65-817e8deea490"
},
{
"_id": "1aa3137e-ef72-4d1f-91ee-41933602f438",
diff --git a/tests/components/habitica/fixtures/user.json b/tests/components/habitica/fixtures/user.json
index 569c5b81a02..a10ce354f44 100644
--- a/tests/components/habitica/fixtures/user.json
+++ b/tests/components/habitica/fixtures/user.json
@@ -4,10 +4,10 @@
"profile": { "name": "test-user" },
"stats": {
"buffs": {
- "str": 26,
- "int": 26,
- "per": 26,
- "con": 26,
+ "str": 0,
+ "int": 0,
+ "per": 0,
+ "con": 0,
"stealth": 0,
"streaks": false,
"seafoam": false,
@@ -24,17 +24,12 @@
"maxHealth": 50,
"maxMP": 166,
"toNextLevel": 880,
- "points": 5,
- "str": 15,
- "con": 15,
- "int": 15,
- "per": 15
+ "points": 5
},
"preferences": {
"sleep": false,
"automaticAllocation": true,
- "disableClasses": false,
- "language": "en"
+ "disableClasses": false
},
"flags": {
"classSelected": true
@@ -57,27 +52,7 @@
],
"habits": ["1d147de6-5c02-4740-8e2f-71d3015a37f4"]
},
- "party": {
- "quest": {
- "RSVPNeeded": true,
- "key": "dustbunnies"
- }
- },
"needsCron": true,
- "lastCron": "2024-09-21T22:01:55.586Z",
- "items": {
- "gear": {
- "equipped": {
- "weapon": "weapon_warrior_5",
- "armor": "armor_warrior_5",
- "head": "head_warrior_5",
- "shield": "shield_warrior_5",
- "back": "heroicAureole",
- "headAccessory": "headAccessory_armoire_gogglesOfBookbinding",
- "eyewear": "plagueDoctorMask",
- "body": "aetherAmulet"
- }
- }
- }
+ "lastCron": "2024-09-21T22:01:55.586Z"
}
}
diff --git a/tests/components/habitica/fixtures/warrior_fixture.json b/tests/components/habitica/fixtures/warrior_fixture.json
index 3517e8a908a..53d18206f9a 100644
--- a/tests/components/habitica/fixtures/warrior_fixture.json
+++ b/tests/components/habitica/fixtures/warrior_fixture.json
@@ -4,10 +4,10 @@
"profile": { "name": "test-user" },
"stats": {
"buffs": {
- "str": 26,
- "int": 26,
- "per": 26,
- "con": 26,
+ "str": 0,
+ "int": 0,
+ "per": 0,
+ "con": 0,
"stealth": 0,
"streaks": false,
"seafoam": false,
@@ -24,36 +24,17 @@
"maxHealth": 50,
"maxMP": 166,
"toNextLevel": 880,
- "points": 5,
- "str": 15,
- "con": 15,
- "int": 15,
- "per": 15
+ "points": 5
},
"preferences": {
"sleep": false,
"automaticAllocation": true,
- "disableClasses": false,
- "language": "en"
+ "disableClasses": false
},
"flags": {
"classSelected": true
},
"needsCron": true,
- "lastCron": "2024-09-21T22:01:55.586Z",
- "items": {
- "gear": {
- "equipped": {
- "weapon": "weapon_warrior_5",
- "armor": "armor_warrior_5",
- "head": "head_warrior_5",
- "shield": "shield_warrior_5",
- "back": "heroicAureole",
- "headAccessory": "headAccessory_armoire_gogglesOfBookbinding",
- "eyewear": "plagueDoctorMask",
- "body": "aetherAmulet"
- }
- }
- }
+ "lastCron": "2024-09-21T22:01:55.586Z"
}
}
diff --git a/tests/components/habitica/fixtures/warrior_skills_unavailable.json b/tests/components/habitica/fixtures/warrior_skills_unavailable.json
index b3d33c85d5c..53160646569 100644
--- a/tests/components/habitica/fixtures/warrior_skills_unavailable.json
+++ b/tests/components/habitica/fixtures/warrior_skills_unavailable.json
@@ -4,10 +4,10 @@
"profile": { "name": "test-user" },
"stats": {
"buffs": {
- "str": 26,
- "int": 26,
- "per": 26,
- "con": 26,
+ "str": 0,
+ "int": 0,
+ "per": 0,
+ "con": 0,
"stealth": 0,
"streaks": false,
"seafoam": false,
@@ -24,35 +24,16 @@
"maxHealth": 50,
"maxMP": 166,
"toNextLevel": 880,
- "points": 0,
- "str": 15,
- "con": 15,
- "int": 15,
- "per": 15
+ "points": 0
},
"preferences": {
"sleep": false,
"automaticAllocation": false,
- "disableClasses": false,
- "language": "en"
+ "disableClasses": false
},
"flags": {
"classSelected": true
},
- "needsCron": false,
- "items": {
- "gear": {
- "equipped": {
- "weapon": "weapon_warrior_5",
- "armor": "armor_warrior_5",
- "head": "head_warrior_5",
- "shield": "shield_warrior_5",
- "back": "heroicAureole",
- "headAccessory": "headAccessory_armoire_gogglesOfBookbinding",
- "eyewear": "plagueDoctorMask",
- "body": "aetherAmulet"
- }
- }
- }
+ "needsCron": false
}
}
diff --git a/tests/components/habitica/fixtures/wizard_fixture.json b/tests/components/habitica/fixtures/wizard_fixture.json
index de596e231de..0f9f2a49639 100644
--- a/tests/components/habitica/fixtures/wizard_fixture.json
+++ b/tests/components/habitica/fixtures/wizard_fixture.json
@@ -4,10 +4,10 @@
"profile": { "name": "test-user" },
"stats": {
"buffs": {
- "str": 26,
- "int": 26,
- "per": 26,
- "con": 26,
+ "str": 0,
+ "int": 0,
+ "per": 0,
+ "con": 0,
"stealth": 0,
"streaks": false,
"seafoam": false,
@@ -24,36 +24,17 @@
"maxHealth": 50,
"maxMP": 166,
"toNextLevel": 880,
- "points": 5,
- "str": 15,
- "con": 15,
- "int": 15,
- "per": 15
+ "points": 5
},
"preferences": {
"sleep": false,
"automaticAllocation": true,
- "disableClasses": false,
- "language": "en"
+ "disableClasses": false
},
"flags": {
"classSelected": true
},
"needsCron": true,
- "lastCron": "2024-09-21T22:01:55.586Z",
- "items": {
- "gear": {
- "equipped": {
- "weapon": "weapon_wizard_5",
- "armor": "armor_wizard_5",
- "head": "head_wizard_5",
- "shield": "shield_base_0",
- "back": "heroicAureole",
- "headAccessory": "headAccessory_armoire_gogglesOfBookbinding",
- "eyewear": "plagueDoctorMask",
- "body": "aetherAmulet"
- }
- }
- }
+ "lastCron": "2024-09-21T22:01:55.586Z"
}
}
diff --git a/tests/components/habitica/fixtures/wizard_frost_unavailable.json b/tests/components/habitica/fixtures/wizard_frost_unavailable.json
index 31d10fde4b9..ba57568e99e 100644
--- a/tests/components/habitica/fixtures/wizard_frost_unavailable.json
+++ b/tests/components/habitica/fixtures/wizard_frost_unavailable.json
@@ -4,10 +4,10 @@
"profile": { "name": "test-user" },
"stats": {
"buffs": {
- "str": 26,
- "int": 26,
- "per": 26,
- "con": 26,
+ "str": 0,
+ "int": 0,
+ "per": 0,
+ "con": 0,
"stealth": 0,
"streaks": true,
"seafoam": false,
@@ -24,35 +24,16 @@
"maxHealth": 50,
"maxMP": 166,
"toNextLevel": 880,
- "points": 0,
- "str": 15,
- "con": 15,
- "int": 15,
- "per": 15
+ "points": 0
},
"preferences": {
"sleep": false,
"automaticAllocation": false,
- "disableClasses": false,
- "language": "en"
+ "disableClasses": false
},
"flags": {
"classSelected": true
},
- "needsCron": false,
- "items": {
- "gear": {
- "equipped": {
- "weapon": "weapon_wizard_5",
- "armor": "armor_wizard_5",
- "head": "head_wizard_5",
- "shield": "shield_base_0",
- "back": "heroicAureole",
- "headAccessory": "headAccessory_armoire_gogglesOfBookbinding",
- "eyewear": "plagueDoctorMask",
- "body": "aetherAmulet"
- }
- }
- }
+ "needsCron": false
}
}
diff --git a/tests/components/habitica/fixtures/wizard_skills_unavailable.json b/tests/components/habitica/fixtures/wizard_skills_unavailable.json
index f3bdee9dd74..11bf0a19193 100644
--- a/tests/components/habitica/fixtures/wizard_skills_unavailable.json
+++ b/tests/components/habitica/fixtures/wizard_skills_unavailable.json
@@ -4,10 +4,10 @@
"profile": { "name": "test-user" },
"stats": {
"buffs": {
- "str": 26,
- "int": 26,
- "per": 26,
- "con": 26,
+ "str": 0,
+ "int": 0,
+ "per": 0,
+ "con": 0,
"stealth": 0,
"streaks": false,
"seafoam": false,
@@ -24,35 +24,16 @@
"maxHealth": 50,
"maxMP": 166,
"toNextLevel": 880,
- "points": 0,
- "str": 15,
- "con": 15,
- "int": 15,
- "per": 15
+ "points": 0
},
"preferences": {
"sleep": false,
"automaticAllocation": false,
- "disableClasses": false,
- "language": "en"
+ "disableClasses": false
},
"flags": {
"classSelected": true
},
- "needsCron": false,
- "items": {
- "gear": {
- "equipped": {
- "weapon": "weapon_wizard_5",
- "armor": "armor_wizard_5",
- "head": "head_wizard_5",
- "shield": "shield_base_0",
- "back": "heroicAureole",
- "headAccessory": "headAccessory_armoire_gogglesOfBookbinding",
- "eyewear": "plagueDoctorMask",
- "body": "aetherAmulet"
- }
- }
- }
+ "needsCron": false
}
}
diff --git a/tests/components/habitica/snapshots/test_binary_sensor.ambr b/tests/components/habitica/snapshots/test_binary_sensor.ambr
deleted file mode 100644
index c18f8f551c9..00000000000
--- a/tests/components/habitica/snapshots/test_binary_sensor.ambr
+++ /dev/null
@@ -1,48 +0,0 @@
-# serializer version: 1
-# name: test_binary_sensors[binary_sensor.test_user_pending_quest_invitation-entry]
- EntityRegistryEntrySnapshot({
- 'aliases': set({
- }),
- 'area_id': None,
- 'capabilities': None,
- 'config_entry_id': ,
- 'device_class': None,
- 'device_id': ,
- 'disabled_by': None,
- 'domain': 'binary_sensor',
- 'entity_category': None,
- 'entity_id': 'binary_sensor.test_user_pending_quest_invitation',
- 'has_entity_name': True,
- 'hidden_by': None,
- 'icon': None,
- 'id': ,
- 'labels': set({
- }),
- 'name': None,
- 'options': dict({
- }),
- 'original_device_class': None,
- 'original_icon': None,
- 'original_name': 'Pending quest invitation',
- 'platform': 'habitica',
- 'previous_unique_id': None,
- 'supported_features': 0,
- 'translation_key': ,
- 'unique_id': '00000000-0000-0000-0000-000000000000_pending_quest',
- 'unit_of_measurement': None,
- })
-# ---
-# name: test_binary_sensors[binary_sensor.test_user_pending_quest_invitation-state]
- StateSnapshot({
- 'attributes': ReadOnlyDict({
- 'entity_picture': 'https://habitica-assets.s3.amazonaws.com/mobileApp/images/inventory_quest_scroll_dustbunnies.png',
- 'friendly_name': 'test-user Pending quest invitation',
- }),
- 'context': ,
- 'entity_id': 'binary_sensor.test_user_pending_quest_invitation',
- 'last_changed': ,
- 'last_reported': ,
- 'last_updated': ,
- 'state': 'on',
- })
-# ---
diff --git a/tests/components/habitica/snapshots/test_sensor.ambr b/tests/components/habitica/snapshots/test_sensor.ambr
index 3a43069bfc4..ee75b424a93 100644
--- a/tests/components/habitica/snapshots/test_sensor.ambr
+++ b/tests/components/habitica/snapshots/test_sensor.ambr
@@ -59,61 +59,6 @@
'state': 'wizard',
})
# ---
-# name: test_sensors[sensor.test_user_constitution-entry]
- EntityRegistryEntrySnapshot({
- 'aliases': set({
- }),
- 'area_id': None,
- 'capabilities': None,
- 'config_entry_id': ,
- 'device_class': None,
- 'device_id': ,
- 'disabled_by': None,
- 'domain': 'sensor',
- 'entity_category': None,
- 'entity_id': 'sensor.test_user_constitution',
- 'has_entity_name': True,
- 'hidden_by': None,
- 'icon': None,
- 'id': ,
- 'labels': set({
- }),
- 'name': None,
- 'options': dict({
- 'sensor': dict({
- 'suggested_display_precision': 0,
- }),
- }),
- 'original_device_class': None,
- 'original_icon': None,
- 'original_name': 'Constitution',
- 'platform': 'habitica',
- 'previous_unique_id': None,
- 'supported_features': 0,
- 'translation_key': ,
- 'unique_id': '00000000-0000-0000-0000-000000000000_constitution',
- 'unit_of_measurement': 'CON',
- })
-# ---
-# name: test_sensors[sensor.test_user_constitution-state]
- StateSnapshot({
- 'attributes': ReadOnlyDict({
- 'allocated': 15,
- 'buffs': 26,
- 'class': 0,
- 'equipment': 20,
- 'friendly_name': 'test-user Constitution',
- 'level': 19,
- 'unit_of_measurement': 'CON',
- }),
- 'context': ,
- 'entity_id': 'sensor.test_user_constitution',
- 'last_changed': ,
- 'last_reported': ,
- 'last_updated': ,
- 'state': '80',
- })
-# ---
# name: test_sensors[sensor.test_user_dailies-entry]
EntityRegistryEntrySnapshot({
'aliases': set({
@@ -622,61 +567,6 @@
'state': '0',
})
# ---
-# name: test_sensors[sensor.test_user_intelligence-entry]
- EntityRegistryEntrySnapshot({
- 'aliases': set({
- }),
- 'area_id': None,
- 'capabilities': None,
- 'config_entry_id': ,
- 'device_class': None,
- 'device_id': ,
- 'disabled_by': None,
- 'domain': 'sensor',
- 'entity_category': None,
- 'entity_id': 'sensor.test_user_intelligence',
- 'has_entity_name': True,
- 'hidden_by': None,
- 'icon': None,
- 'id': ,
- 'labels': set({
- }),
- 'name': None,
- 'options': dict({
- 'sensor': dict({
- 'suggested_display_precision': 0,
- }),
- }),
- 'original_device_class': None,
- 'original_icon': None,
- 'original_name': 'Intelligence',
- 'platform': 'habitica',
- 'previous_unique_id': None,
- 'supported_features': 0,
- 'translation_key': ,
- 'unique_id': '00000000-0000-0000-0000-000000000000_intelligence',
- 'unit_of_measurement': 'INT',
- })
-# ---
-# name: test_sensors[sensor.test_user_intelligence-state]
- StateSnapshot({
- 'attributes': ReadOnlyDict({
- 'allocated': 15,
- 'buffs': 26,
- 'class': 0,
- 'equipment': 0,
- 'friendly_name': 'test-user Intelligence',
- 'level': 19,
- 'unit_of_measurement': 'INT',
- }),
- 'context': ,
- 'entity_id': 'sensor.test_user_intelligence',
- 'last_changed': ,
- 'last_reported': ,
- 'last_updated': ,
- 'state': '60',
- })
-# ---
# name: test_sensors[sensor.test_user_level-entry]
EntityRegistryEntrySnapshot({
'aliases': set({
@@ -964,61 +854,6 @@
'state': '880',
})
# ---
-# name: test_sensors[sensor.test_user_perception-entry]
- EntityRegistryEntrySnapshot({
- 'aliases': set({
- }),
- 'area_id': None,
- 'capabilities': None,
- 'config_entry_id': ,
- 'device_class': None,
- 'device_id': ,
- 'disabled_by': None,
- 'domain': 'sensor',
- 'entity_category': None,
- 'entity_id': 'sensor.test_user_perception',
- 'has_entity_name': True,
- 'hidden_by': None,
- 'icon': None,
- 'id': ,
- 'labels': set({
- }),
- 'name': None,
- 'options': dict({
- 'sensor': dict({
- 'suggested_display_precision': 0,
- }),
- }),
- 'original_device_class': None,
- 'original_icon': None,
- 'original_name': 'Perception',
- 'platform': 'habitica',
- 'previous_unique_id': None,
- 'supported_features': 0,
- 'translation_key': ,
- 'unique_id': '00000000-0000-0000-0000-000000000000_perception',
- 'unit_of_measurement': 'PER',
- })
-# ---
-# name: test_sensors[sensor.test_user_perception-state]
- StateSnapshot({
- 'attributes': ReadOnlyDict({
- 'allocated': 15,
- 'buffs': 26,
- 'class': 0,
- 'equipment': 8,
- 'friendly_name': 'test-user Perception',
- 'level': 19,
- 'unit_of_measurement': 'PER',
- }),
- 'context': ,
- 'entity_id': 'sensor.test_user_perception',
- 'last_changed': ,
- 'last_reported': ,
- 'last_updated': ,
- 'state': '68',
- })
-# ---
# name: test_sensors[sensor.test_user_rewards-entry]
EntityRegistryEntrySnapshot({
'aliases': set({
@@ -1080,61 +915,6 @@
'state': '1',
})
# ---
-# name: test_sensors[sensor.test_user_strength-entry]
- EntityRegistryEntrySnapshot({
- 'aliases': set({
- }),
- 'area_id': None,
- 'capabilities': None,
- 'config_entry_id': ,
- 'device_class': None,
- 'device_id': ,
- 'disabled_by': None,
- 'domain': 'sensor',
- 'entity_category': None,
- 'entity_id': 'sensor.test_user_strength',
- 'has_entity_name': True,
- 'hidden_by': None,
- 'icon': None,
- 'id': ,
- 'labels': set({
- }),
- 'name': None,
- 'options': dict({
- 'sensor': dict({
- 'suggested_display_precision': 0,
- }),
- }),
- 'original_device_class': None,
- 'original_icon': None,
- 'original_name': 'Strength',
- 'platform': 'habitica',
- 'previous_unique_id': None,
- 'supported_features': 0,
- 'translation_key': ,
- 'unique_id': '00000000-0000-0000-0000-000000000000_strength',
- 'unit_of_measurement': 'STR',
- })
-# ---
-# name: test_sensors[sensor.test_user_strength-state]
- StateSnapshot({
- 'attributes': ReadOnlyDict({
- 'allocated': 15,
- 'buffs': 26,
- 'class': 0,
- 'equipment': 27,
- 'friendly_name': 'test-user Strength',
- 'level': 19,
- 'unit_of_measurement': 'STR',
- }),
- 'context': ,
- 'entity_id': 'sensor.test_user_strength',
- 'last_changed': ,
- 'last_reported': ,
- 'last_updated': ,
- 'state': '87',
- })
-# ---
# name: test_sensors[sensor.test_user_to_do_s-entry]
EntityRegistryEntrySnapshot({
'aliases': set({
diff --git a/tests/components/habitica/test_binary_sensor.py b/tests/components/habitica/test_binary_sensor.py
deleted file mode 100644
index 1710f8f217e..00000000000
--- a/tests/components/habitica/test_binary_sensor.py
+++ /dev/null
@@ -1,84 +0,0 @@
-"""Tests for the Habitica binary sensor platform."""
-
-from collections.abc import Generator
-from unittest.mock import patch
-
-import pytest
-from syrupy.assertion import SnapshotAssertion
-
-from homeassistant.components.habitica.const import ASSETS_URL, DEFAULT_URL, DOMAIN
-from homeassistant.config_entries import ConfigEntryState
-from homeassistant.const import STATE_OFF, STATE_ON, Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import entity_registry as er
-
-from tests.common import MockConfigEntry, load_json_object_fixture, snapshot_platform
-from tests.test_util.aiohttp import AiohttpClientMocker
-
-
-@pytest.fixture(autouse=True)
-def binary_sensor_only() -> Generator[None]:
- """Enable only the binarty sensor platform."""
- with patch(
- "homeassistant.components.habitica.PLATFORMS",
- [Platform.BINARY_SENSOR],
- ):
- yield
-
-
-@pytest.mark.usefixtures("mock_habitica")
-async def test_binary_sensors(
- hass: HomeAssistant,
- config_entry: MockConfigEntry,
- snapshot: SnapshotAssertion,
- entity_registry: er.EntityRegistry,
-) -> None:
- """Test setup of the Habitica binary sensor platform."""
-
- config_entry.add_to_hass(hass)
- await hass.config_entries.async_setup(config_entry.entry_id)
- await hass.async_block_till_done()
-
- assert config_entry.state is ConfigEntryState.LOADED
-
- await snapshot_platform(hass, entity_registry, snapshot, config_entry.entry_id)
-
-
-@pytest.mark.parametrize(
- ("fixture", "entity_state", "entity_picture"),
- [
- ("user", STATE_ON, f"{ASSETS_URL}inventory_quest_scroll_dustbunnies.png"),
- ("quest_invitation_off", STATE_OFF, None),
- ],
-)
-async def test_pending_quest_states(
- hass: HomeAssistant,
- config_entry: MockConfigEntry,
- aioclient_mock: AiohttpClientMocker,
- fixture: str,
- entity_state: str,
- entity_picture: str | None,
-) -> None:
- """Test states of pending quest sensor."""
-
- aioclient_mock.get(
- f"{DEFAULT_URL}/api/v3/user",
- json=load_json_object_fixture(f"{fixture}.json", DOMAIN),
- )
- aioclient_mock.get(f"{DEFAULT_URL}/api/v3/tasks/user", json={"data": []})
- aioclient_mock.get(
- f"{DEFAULT_URL}/api/v3/content",
- params={"language": "en"},
- json=load_json_object_fixture("content.json", DOMAIN),
- )
- config_entry.add_to_hass(hass)
- await hass.config_entries.async_setup(config_entry.entry_id)
- await hass.async_block_till_done()
-
- assert config_entry.state is ConfigEntryState.LOADED
-
- assert (
- state := hass.states.get("binary_sensor.test_user_pending_quest_invitation")
- )
- assert state.state == entity_state
- assert state.attributes.get("entity_picture") == entity_picture
diff --git a/tests/components/habitica/test_button.py b/tests/components/habitica/test_button.py
index 979cefef923..6bd62f3a58e 100644
--- a/tests/components/habitica/test_button.py
+++ b/tests/components/habitica/test_button.py
@@ -63,11 +63,6 @@ async def test_buttons(
f"{DEFAULT_URL}/api/v3/tasks/user",
json=load_json_object_fixture("tasks.json", DOMAIN),
)
- aioclient_mock.get(
- f"{DEFAULT_URL}/api/v3/content",
- params={"language": "en"},
- json=load_json_object_fixture("content.json", DOMAIN),
- )
config_entry.add_to_hass(hass)
await hass.config_entries.async_setup(config_entry.entry_id)
await hass.async_block_till_done()
@@ -168,11 +163,6 @@ async def test_button_press(
f"{DEFAULT_URL}/api/v3/tasks/user",
json=load_json_object_fixture("tasks.json", DOMAIN),
)
- aioclient_mock.get(
- f"{DEFAULT_URL}/api/v3/content",
- params={"language": "en"},
- json=load_json_object_fixture("content.json", DOMAIN),
- )
config_entry.add_to_hass(hass)
await hass.config_entries.async_setup(config_entry.entry_id)
await hass.async_block_till_done()
diff --git a/tests/components/habitica/test_services.py b/tests/components/habitica/test_services.py
deleted file mode 100644
index 403779bcbfb..00000000000
--- a/tests/components/habitica/test_services.py
+++ /dev/null
@@ -1,548 +0,0 @@
-"""Test Habitica actions."""
-
-from collections.abc import Generator
-from http import HTTPStatus
-from typing import Any
-from unittest.mock import patch
-
-import pytest
-
-from homeassistant.components.habitica.const import (
- ATTR_CONFIG_ENTRY,
- ATTR_DIRECTION,
- ATTR_SKILL,
- ATTR_TASK,
- DEFAULT_URL,
- DOMAIN,
- SERVICE_ABORT_QUEST,
- SERVICE_ACCEPT_QUEST,
- SERVICE_CANCEL_QUEST,
- SERVICE_CAST_SKILL,
- SERVICE_LEAVE_QUEST,
- SERVICE_REJECT_QUEST,
- SERVICE_SCORE_HABIT,
- SERVICE_SCORE_REWARD,
- SERVICE_START_QUEST,
-)
-from homeassistant.config_entries import ConfigEntryState
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
-
-from .conftest import mock_called_with
-
-from tests.common import MockConfigEntry
-from tests.test_util.aiohttp import AiohttpClientMocker
-
-REQUEST_EXCEPTION_MSG = "Unable to connect to Habitica, try again later"
-RATE_LIMIT_EXCEPTION_MSG = "Rate limit exceeded, try again later"
-
-
-@pytest.fixture(autouse=True)
-def services_only() -> Generator[None]:
- """Enable only services."""
- with patch(
- "homeassistant.components.habitica.PLATFORMS",
- [],
- ):
- yield
-
-
-@pytest.fixture(autouse=True)
-async def load_entry(
- hass: HomeAssistant,
- config_entry: MockConfigEntry,
- mock_habitica: AiohttpClientMocker,
- services_only: Generator,
-) -> None:
- """Load config entry."""
- config_entry.add_to_hass(hass)
- await hass.config_entries.async_setup(config_entry.entry_id)
- await hass.async_block_till_done()
-
- assert config_entry.state is ConfigEntryState.LOADED
-
-
-@pytest.mark.parametrize(
- ("service_data", "item", "target_id"),
- [
- (
- {
- ATTR_TASK: "2f6fcabc-f670-4ec3-ba65-817e8deea490",
- ATTR_SKILL: "pickpocket",
- },
- "pickPocket",
- "2f6fcabc-f670-4ec3-ba65-817e8deea490",
- ),
- (
- {
- ATTR_TASK: "2f6fcabc-f670-4ec3-ba65-817e8deea490",
- ATTR_SKILL: "backstab",
- },
- "backStab",
- "2f6fcabc-f670-4ec3-ba65-817e8deea490",
- ),
- (
- {
- ATTR_TASK: "2f6fcabc-f670-4ec3-ba65-817e8deea490",
- ATTR_SKILL: "fireball",
- },
- "fireball",
- "2f6fcabc-f670-4ec3-ba65-817e8deea490",
- ),
- (
- {
- ATTR_TASK: "2f6fcabc-f670-4ec3-ba65-817e8deea490",
- ATTR_SKILL: "smash",
- },
- "smash",
- "2f6fcabc-f670-4ec3-ba65-817e8deea490",
- ),
- (
- {
- ATTR_TASK: "Rechnungen bezahlen",
- ATTR_SKILL: "smash",
- },
- "smash",
- "2f6fcabc-f670-4ec3-ba65-817e8deea490",
- ),
- (
- {
- ATTR_TASK: "pay_bills",
- ATTR_SKILL: "smash",
- },
- "smash",
- "2f6fcabc-f670-4ec3-ba65-817e8deea490",
- ),
- ],
- ids=[
- "cast pickpocket",
- "cast backstab",
- "cast fireball",
- "cast smash",
- "select task by name",
- "select task_by_alias",
- ],
-)
-async def test_cast_skill(
- hass: HomeAssistant,
- config_entry: MockConfigEntry,
- mock_habitica: AiohttpClientMocker,
- service_data: dict[str, Any],
- item: str,
- target_id: str,
-) -> None:
- """Test Habitica cast skill action."""
-
- mock_habitica.post(
- f"{DEFAULT_URL}/api/v3/user/class/cast/{item}?targetId={target_id}",
- json={"success": True, "data": {}},
- )
-
- await hass.services.async_call(
- DOMAIN,
- SERVICE_CAST_SKILL,
- service_data={
- ATTR_CONFIG_ENTRY: config_entry.entry_id,
- **service_data,
- },
- return_response=True,
- blocking=True,
- )
-
- assert mock_called_with(
- mock_habitica,
- "post",
- f"{DEFAULT_URL}/api/v3/user/class/cast/{item}?targetId={target_id}",
- )
-
-
-@pytest.mark.parametrize(
- (
- "service_data",
- "http_status",
- "expected_exception",
- "expected_exception_msg",
- ),
- [
- (
- {
- ATTR_TASK: "task-not-found",
- ATTR_SKILL: "smash",
- },
- HTTPStatus.OK,
- ServiceValidationError,
- "Unable to complete action, could not find the task 'task-not-found'",
- ),
- (
- {
- ATTR_TASK: "Rechnungen bezahlen",
- ATTR_SKILL: "smash",
- },
- HTTPStatus.TOO_MANY_REQUESTS,
- ServiceValidationError,
- RATE_LIMIT_EXCEPTION_MSG,
- ),
- (
- {
- ATTR_TASK: "Rechnungen bezahlen",
- ATTR_SKILL: "smash",
- },
- HTTPStatus.NOT_FOUND,
- ServiceValidationError,
- "Unable to cast skill, your character does not have the skill or spell smash",
- ),
- (
- {
- ATTR_TASK: "Rechnungen bezahlen",
- ATTR_SKILL: "smash",
- },
- HTTPStatus.UNAUTHORIZED,
- ServiceValidationError,
- "Unable to cast skill, not enough mana. Your character has 50 MP, but the skill costs 10 MP",
- ),
- (
- {
- ATTR_TASK: "Rechnungen bezahlen",
- ATTR_SKILL: "smash",
- },
- HTTPStatus.BAD_REQUEST,
- HomeAssistantError,
- REQUEST_EXCEPTION_MSG,
- ),
- ],
-)
-@pytest.mark.usefixtures("mock_habitica")
-async def test_cast_skill_exceptions(
- hass: HomeAssistant,
- config_entry: MockConfigEntry,
- mock_habitica: AiohttpClientMocker,
- service_data: dict[str, Any],
- http_status: HTTPStatus,
- expected_exception: Exception,
- expected_exception_msg: str,
-) -> None:
- """Test Habitica cast skill action exceptions."""
-
- mock_habitica.post(
- f"{DEFAULT_URL}/api/v3/user/class/cast/smash?targetId=2f6fcabc-f670-4ec3-ba65-817e8deea490",
- json={"success": True, "data": {}},
- status=http_status,
- )
-
- with pytest.raises(expected_exception, match=expected_exception_msg):
- await hass.services.async_call(
- DOMAIN,
- SERVICE_CAST_SKILL,
- service_data={
- ATTR_CONFIG_ENTRY: config_entry.entry_id,
- **service_data,
- },
- return_response=True,
- blocking=True,
- )
-
-
-@pytest.mark.usefixtures("mock_habitica")
-async def test_get_config_entry(
- hass: HomeAssistant,
- config_entry: MockConfigEntry,
- mock_habitica: AiohttpClientMocker,
-) -> None:
- """Test Habitica config entry exceptions."""
-
- with pytest.raises(
- ServiceValidationError,
- match="The selected character is not configured in Home Assistant",
- ):
- await hass.services.async_call(
- DOMAIN,
- SERVICE_CAST_SKILL,
- service_data={
- ATTR_CONFIG_ENTRY: "0000000000000000",
- ATTR_TASK: "2f6fcabc-f670-4ec3-ba65-817e8deea490",
- ATTR_SKILL: "smash",
- },
- return_response=True,
- blocking=True,
- )
-
- assert await hass.config_entries.async_unload(config_entry.entry_id)
-
- with pytest.raises(
- ServiceValidationError,
- match="The selected character is currently not loaded or disabled in Home Assistant",
- ):
- await hass.services.async_call(
- DOMAIN,
- SERVICE_CAST_SKILL,
- service_data={
- ATTR_CONFIG_ENTRY: config_entry.entry_id,
- ATTR_TASK: "2f6fcabc-f670-4ec3-ba65-817e8deea490",
- ATTR_SKILL: "smash",
- },
- return_response=True,
- blocking=True,
- )
-
-
-@pytest.mark.parametrize(
- ("service", "command"),
- [
- (SERVICE_ABORT_QUEST, "abort"),
- (SERVICE_ACCEPT_QUEST, "accept"),
- (SERVICE_CANCEL_QUEST, "cancel"),
- (SERVICE_LEAVE_QUEST, "leave"),
- (SERVICE_REJECT_QUEST, "reject"),
- (SERVICE_START_QUEST, "force-start"),
- ],
- ids=[],
-)
-async def test_handle_quests(
- hass: HomeAssistant,
- config_entry: MockConfigEntry,
- mock_habitica: AiohttpClientMocker,
- service: str,
- command: str,
-) -> None:
- """Test Habitica actions for quest handling."""
-
- mock_habitica.post(
- f"{DEFAULT_URL}/api/v3/groups/party/quests/{command}",
- json={"success": True, "data": {}},
- )
-
- await hass.services.async_call(
- DOMAIN,
- service,
- service_data={ATTR_CONFIG_ENTRY: config_entry.entry_id},
- return_response=True,
- blocking=True,
- )
-
- assert mock_called_with(
- mock_habitica,
- "post",
- f"{DEFAULT_URL}/api/v3/groups/party/quests/{command}",
- )
-
-
-@pytest.mark.parametrize(
- (
- "http_status",
- "expected_exception",
- "expected_exception_msg",
- ),
- [
- (
- HTTPStatus.TOO_MANY_REQUESTS,
- ServiceValidationError,
- RATE_LIMIT_EXCEPTION_MSG,
- ),
- (
- HTTPStatus.NOT_FOUND,
- ServiceValidationError,
- "Unable to complete action, quest or group not found",
- ),
- (
- HTTPStatus.UNAUTHORIZED,
- ServiceValidationError,
- "Action not allowed, only quest leader or group leader can perform this action",
- ),
- (
- HTTPStatus.BAD_REQUEST,
- HomeAssistantError,
- REQUEST_EXCEPTION_MSG,
- ),
- ],
-)
-@pytest.mark.usefixtures("mock_habitica")
-async def test_handle_quests_exceptions(
- hass: HomeAssistant,
- config_entry: MockConfigEntry,
- mock_habitica: AiohttpClientMocker,
- http_status: HTTPStatus,
- expected_exception: Exception,
- expected_exception_msg: str,
-) -> None:
- """Test Habitica handle quests action exceptions."""
-
- mock_habitica.post(
- f"{DEFAULT_URL}/api/v3/groups/party/quests/accept",
- json={"success": True, "data": {}},
- status=http_status,
- )
-
- with pytest.raises(expected_exception, match=expected_exception_msg):
- await hass.services.async_call(
- DOMAIN,
- SERVICE_ACCEPT_QUEST,
- service_data={ATTR_CONFIG_ENTRY: config_entry.entry_id},
- return_response=True,
- blocking=True,
- )
-
-
-@pytest.mark.parametrize(
- ("service", "service_data", "task_id"),
- [
- (
- SERVICE_SCORE_HABIT,
- {
- ATTR_TASK: "e97659e0-2c42-4599-a7bb-00282adc410d",
- ATTR_DIRECTION: "up",
- },
- "e97659e0-2c42-4599-a7bb-00282adc410d",
- ),
- (
- SERVICE_SCORE_HABIT,
- {
- ATTR_TASK: "e97659e0-2c42-4599-a7bb-00282adc410d",
- ATTR_DIRECTION: "down",
- },
- "e97659e0-2c42-4599-a7bb-00282adc410d",
- ),
- (
- SERVICE_SCORE_REWARD,
- {
- ATTR_TASK: "5e2ea1df-f6e6-4ba3-bccb-97c5ec63e99b",
- },
- "5e2ea1df-f6e6-4ba3-bccb-97c5ec63e99b",
- ),
- (
- SERVICE_SCORE_HABIT,
- {
- ATTR_TASK: "Füge eine Aufgabe zu Habitica hinzu",
- ATTR_DIRECTION: "up",
- },
- "e97659e0-2c42-4599-a7bb-00282adc410d",
- ),
- (
- SERVICE_SCORE_HABIT,
- {
- ATTR_TASK: "create_a_task",
- ATTR_DIRECTION: "up",
- },
- "e97659e0-2c42-4599-a7bb-00282adc410d",
- ),
- ],
- ids=[
- "habit score up",
- "habit score down",
- "buy reward",
- "match task by name",
- "match task by alias",
- ],
-)
-async def test_score_task(
- hass: HomeAssistant,
- config_entry: MockConfigEntry,
- mock_habitica: AiohttpClientMocker,
- service: str,
- service_data: dict[str, Any],
- task_id: str,
-) -> None:
- """Test Habitica score task action."""
-
- mock_habitica.post(
- f"{DEFAULT_URL}/api/v3/tasks/{task_id}/score/{service_data.get(ATTR_DIRECTION, "up")}",
- json={"success": True, "data": {}},
- )
-
- await hass.services.async_call(
- DOMAIN,
- service,
- service_data={
- ATTR_CONFIG_ENTRY: config_entry.entry_id,
- **service_data,
- },
- return_response=True,
- blocking=True,
- )
-
- assert mock_called_with(
- mock_habitica,
- "post",
- f"{DEFAULT_URL}/api/v3/tasks/{task_id}/score/{service_data.get(ATTR_DIRECTION, "up")}",
- )
-
-
-@pytest.mark.parametrize(
- (
- "service_data",
- "http_status",
- "expected_exception",
- "expected_exception_msg",
- ),
- [
- (
- {
- ATTR_TASK: "task does not exist",
- ATTR_DIRECTION: "up",
- },
- HTTPStatus.OK,
- ServiceValidationError,
- "Unable to complete action, could not find the task 'task does not exist'",
- ),
- (
- {
- ATTR_TASK: "e97659e0-2c42-4599-a7bb-00282adc410d",
- ATTR_DIRECTION: "up",
- },
- HTTPStatus.TOO_MANY_REQUESTS,
- ServiceValidationError,
- RATE_LIMIT_EXCEPTION_MSG,
- ),
- (
- {
- ATTR_TASK: "e97659e0-2c42-4599-a7bb-00282adc410d",
- ATTR_DIRECTION: "up",
- },
- HTTPStatus.BAD_REQUEST,
- HomeAssistantError,
- REQUEST_EXCEPTION_MSG,
- ),
- (
- {
- ATTR_TASK: "5e2ea1df-f6e6-4ba3-bccb-97c5ec63e99b",
- ATTR_DIRECTION: "up",
- },
- HTTPStatus.UNAUTHORIZED,
- HomeAssistantError,
- "Unable to buy reward, not enough gold. Your character has 137.63 GP, but the reward costs 10 GP",
- ),
- ],
-)
-@pytest.mark.usefixtures("mock_habitica")
-async def test_score_task_exceptions(
- hass: HomeAssistant,
- config_entry: MockConfigEntry,
- mock_habitica: AiohttpClientMocker,
- service_data: dict[str, Any],
- http_status: HTTPStatus,
- expected_exception: Exception,
- expected_exception_msg: str,
-) -> None:
- """Test Habitica score task action exceptions."""
-
- mock_habitica.post(
- f"{DEFAULT_URL}/api/v3/tasks/e97659e0-2c42-4599-a7bb-00282adc410d/score/up",
- json={"success": True, "data": {}},
- status=http_status,
- )
- mock_habitica.post(
- f"{DEFAULT_URL}/api/v3/tasks/5e2ea1df-f6e6-4ba3-bccb-97c5ec63e99b/score/up",
- json={"success": True, "data": {}},
- status=http_status,
- )
-
- with pytest.raises(expected_exception, match=expected_exception_msg):
- await hass.services.async_call(
- DOMAIN,
- SERVICE_SCORE_HABIT,
- service_data={
- ATTR_CONFIG_ENTRY: config_entry.entry_id,
- **service_data,
- },
- return_response=True,
- blocking=True,
- )
diff --git a/tests/components/habitica/test_todo.py b/tests/components/habitica/test_todo.py
index c9a4b3dd37a..88947caba2d 100644
--- a/tests/components/habitica/test_todo.py
+++ b/tests/components/habitica/test_todo.py
@@ -672,11 +672,6 @@ async def test_next_due_date(
f"{DEFAULT_URL}/api/v3/tasks/user",
json=load_json_object_fixture(fixture, DOMAIN),
)
- aioclient_mock.get(
- f"{DEFAULT_URL}/api/v3/content",
- params={"language": "en"},
- json=load_json_object_fixture("content.json", DOMAIN),
- )
config_entry.add_to_hass(hass)
await hass.config_entries.async_setup(config_entry.entry_id)
diff --git a/tests/components/hassio/test_binary_sensor.py b/tests/components/hassio/test_binary_sensor.py
index 9878dd67a21..c97be736248 100644
--- a/tests/components/hassio/test_binary_sensor.py
+++ b/tests/components/hassio/test_binary_sensor.py
@@ -25,7 +25,6 @@ def mock_all(
store_info: AsyncMock,
addon_changelog: AsyncMock,
addon_stats: AsyncMock,
- resolution_info: AsyncMock,
) -> None:
"""Mock all setup requests."""
aioclient_mock.post("http://127.0.0.1/homeassistant/options", json={"result": "ok"})
@@ -141,6 +140,19 @@ def mock_all(
aioclient_mock.get(
"http://127.0.0.1/ingress/panels", json={"result": "ok", "data": {"panels": {}}}
)
+ aioclient_mock.get(
+ "http://127.0.0.1/resolution/info",
+ json={
+ "result": "ok",
+ "data": {
+ "unsupported": [],
+ "unhealthy": [],
+ "suggestions": [],
+ "issues": [],
+ "checks": [],
+ },
+ },
+ )
aioclient_mock.get(
"http://127.0.0.1/network/info",
json={
diff --git a/tests/components/hassio/test_diagnostics.py b/tests/components/hassio/test_diagnostics.py
index c95cde67b8a..c238d9d2a15 100644
--- a/tests/components/hassio/test_diagnostics.py
+++ b/tests/components/hassio/test_diagnostics.py
@@ -24,7 +24,6 @@ def mock_all(
store_info: AsyncMock,
addon_stats: AsyncMock,
addon_changelog: AsyncMock,
- resolution_info: AsyncMock,
) -> None:
"""Mock all setup requests."""
aioclient_mock.post("http://127.0.0.1/homeassistant/options", json={"result": "ok"})
@@ -144,6 +143,19 @@ def mock_all(
aioclient_mock.get(
"http://127.0.0.1/ingress/panels", json={"result": "ok", "data": {"panels": {}}}
)
+ aioclient_mock.get(
+ "http://127.0.0.1/resolution/info",
+ json={
+ "result": "ok",
+ "data": {
+ "unsupported": [],
+ "unhealthy": [],
+ "suggestions": [],
+ "issues": [],
+ "checks": [],
+ },
+ },
+ )
aioclient_mock.get(
"http://127.0.0.1/network/info",
json={
diff --git a/tests/components/hassio/test_handler.py b/tests/components/hassio/test_handler.py
index 56f0dcb706c..e125e09ae7e 100644
--- a/tests/components/hassio/test_handler.py
+++ b/tests/components/hassio/test_handler.py
@@ -208,7 +208,7 @@ async def test_api_ingress_panels(
@pytest.mark.parametrize(
("api_call", "method", "payload"),
[
- ("get_network_info", "GET", None),
+ ("get_resolution_info", "GET", None),
("update_diagnostics", "POST", True),
],
)
diff --git a/tests/components/hassio/test_init.py b/tests/components/hassio/test_init.py
index 5c11370ae74..23259543478 100644
--- a/tests/components/hassio/test_init.py
+++ b/tests/components/hassio/test_init.py
@@ -67,7 +67,6 @@ def mock_all(
addon_info: AsyncMock,
addon_stats: AsyncMock,
addon_changelog: AsyncMock,
- resolution_info: AsyncMock,
) -> None:
"""Mock all setup requests."""
aioclient_mock.post("http://127.0.0.1/homeassistant/options", json={"result": "ok"})
@@ -205,6 +204,19 @@ def mock_all(
aioclient_mock.get(
"http://127.0.0.1/ingress/panels", json={"result": "ok", "data": {"panels": {}}}
)
+ aioclient_mock.get(
+ "http://127.0.0.1/resolution/info",
+ json={
+ "result": "ok",
+ "data": {
+ "unsupported": [],
+ "unhealthy": [],
+ "suggestions": [],
+ "issues": [],
+ "checks": [],
+ },
+ },
+ )
aioclient_mock.get(
"http://127.0.0.1/network/info",
json={
diff --git a/tests/components/hassio/test_issues.py b/tests/components/hassio/test_issues.py
index 7ce11a18fb5..1a3d3d83f95 100644
--- a/tests/components/hassio/test_issues.py
+++ b/tests/components/hassio/test_issues.py
@@ -4,28 +4,11 @@ from __future__ import annotations
from collections.abc import Generator
from datetime import timedelta
+from http import HTTPStatus
import os
from typing import Any
-from unittest.mock import ANY, AsyncMock, patch
-from uuid import UUID, uuid4
+from unittest.mock import ANY, patch
-from aiohasupervisor import (
- SupervisorBadRequestError,
- SupervisorError,
- SupervisorTimeoutError,
-)
-from aiohasupervisor.models import (
- Check,
- CheckType,
- ContextType,
- Issue,
- IssueType,
- ResolutionInfo,
- Suggestion,
- SuggestionType,
- UnhealthyReason,
- UnsupportedReason,
-)
from freezegun.api import FrozenDateTimeFactory
import pytest
@@ -35,6 +18,7 @@ from homeassistant.setup import async_setup_component
from .test_init import MOCK_ENVIRON
+from tests.test_util.aiohttp import AiohttpClientMocker, AiohttpClientMockResponse
from tests.typing import WebSocketGenerator
@@ -52,41 +36,49 @@ def fixture_supervisor_environ() -> Generator[None]:
def mock_resolution_info(
- supervisor_client: AsyncMock,
- unsupported: list[UnsupportedReason] | None = None,
- unhealthy: list[UnhealthyReason] | None = None,
- issues: list[Issue] | None = None,
- suggestions_by_issue: dict[UUID, list[Suggestion]] | None = None,
- suggestion_result: SupervisorError | None = None,
+ aioclient_mock: AiohttpClientMocker,
+ unsupported: list[str] | None = None,
+ unhealthy: list[str] | None = None,
+ issues: list[dict[str, str]] | None = None,
+ suggestion_result: str = "ok",
) -> None:
"""Mock resolution/info endpoint with unsupported/unhealthy reasons and/or issues."""
- supervisor_client.resolution.info.return_value = ResolutionInfo(
- unsupported=unsupported or [],
- unhealthy=unhealthy or [],
- issues=issues or [],
- suggestions=[
- suggestion
- for issue_list in suggestions_by_issue.values()
- for suggestion in issue_list
- ]
- if suggestions_by_issue
- else [],
- checks=[
- Check(enabled=True, slug=CheckType.SUPERVISOR_TRUST),
- Check(enabled=True, slug=CheckType.FREE_SPACE),
- ],
+ aioclient_mock.get(
+ "http://127.0.0.1/resolution/info",
+ json={
+ "result": "ok",
+ "data": {
+ "unsupported": unsupported or [],
+ "unhealthy": unhealthy or [],
+ "suggestions": [],
+ "issues": [
+ {k: v for k, v in issue.items() if k != "suggestions"}
+ for issue in issues
+ ]
+ if issues
+ else [],
+ "checks": [
+ {"enabled": True, "slug": "supervisor_trust"},
+ {"enabled": True, "slug": "free_space"},
+ ],
+ },
+ },
)
- if suggestions_by_issue:
-
- async def mock_suggestions_for_issue(uuid: UUID) -> list[Suggestion]:
- """Mock of suggestions for issue api."""
- return suggestions_by_issue.get(uuid, [])
-
- supervisor_client.resolution.suggestions_for_issue.side_effect = (
- mock_suggestions_for_issue
- )
- supervisor_client.resolution.apply_suggestion.side_effect = suggestion_result
+ if issues:
+ suggestions_by_issue = {
+ issue["uuid"]: issue.get("suggestions", []) for issue in issues
+ }
+ for issue_uuid, suggestions in suggestions_by_issue.items():
+ aioclient_mock.get(
+ f"http://127.0.0.1/resolution/issue/{issue_uuid}/suggestions",
+ json={"result": "ok", "data": {"suggestions": suggestions}},
+ )
+ for suggestion in suggestions:
+ aioclient_mock.post(
+ f"http://127.0.0.1/resolution/suggestion/{suggestion['uuid']}",
+ json={"result": suggestion_result},
+ )
def assert_repair_in_list(
@@ -142,13 +134,11 @@ def assert_issue_repair_in_list(
@pytest.mark.usefixtures("all_setup_requests")
async def test_unhealthy_issues(
hass: HomeAssistant,
- supervisor_client: AsyncMock,
+ aioclient_mock: AiohttpClientMocker,
hass_ws_client: WebSocketGenerator,
) -> None:
"""Test issues added for unhealthy systems."""
- mock_resolution_info(
- supervisor_client, unhealthy=[UnhealthyReason.DOCKER, UnhealthyReason.SETUP]
- )
+ mock_resolution_info(aioclient_mock, unhealthy=["docker", "setup"])
result = await async_setup_component(hass, "hassio", {})
assert result
@@ -166,14 +156,11 @@ async def test_unhealthy_issues(
@pytest.mark.usefixtures("all_setup_requests")
async def test_unsupported_issues(
hass: HomeAssistant,
- supervisor_client: AsyncMock,
+ aioclient_mock: AiohttpClientMocker,
hass_ws_client: WebSocketGenerator,
) -> None:
"""Test issues added for unsupported systems."""
- mock_resolution_info(
- supervisor_client,
- unsupported=[UnsupportedReason.CONTENT_TRUST, UnsupportedReason.OS],
- )
+ mock_resolution_info(aioclient_mock, unsupported=["content_trust", "os"])
result = await async_setup_component(hass, "hassio", {})
assert result
@@ -193,11 +180,11 @@ async def test_unsupported_issues(
@pytest.mark.usefixtures("all_setup_requests")
async def test_unhealthy_issues_add_remove(
hass: HomeAssistant,
- supervisor_client: AsyncMock,
+ aioclient_mock: AiohttpClientMocker,
hass_ws_client: WebSocketGenerator,
) -> None:
"""Test unhealthy issues added and removed from dispatches."""
- mock_resolution_info(supervisor_client)
+ mock_resolution_info(aioclient_mock)
result = await async_setup_component(hass, "hassio", {})
assert result
@@ -250,11 +237,11 @@ async def test_unhealthy_issues_add_remove(
@pytest.mark.usefixtures("all_setup_requests")
async def test_unsupported_issues_add_remove(
hass: HomeAssistant,
- supervisor_client: AsyncMock,
+ aioclient_mock: AiohttpClientMocker,
hass_ws_client: WebSocketGenerator,
) -> None:
"""Test unsupported issues added and removed from dispatches."""
- mock_resolution_info(supervisor_client)
+ mock_resolution_info(aioclient_mock)
result = await async_setup_component(hass, "hassio", {})
assert result
@@ -307,21 +294,21 @@ async def test_unsupported_issues_add_remove(
@pytest.mark.usefixtures("all_setup_requests")
async def test_reset_issues_supervisor_restart(
hass: HomeAssistant,
- supervisor_client: AsyncMock,
+ aioclient_mock: AiohttpClientMocker,
hass_ws_client: WebSocketGenerator,
) -> None:
"""All issues reset on supervisor restart."""
mock_resolution_info(
- supervisor_client,
- unsupported=[UnsupportedReason.OS],
- unhealthy=[UnhealthyReason.DOCKER],
+ aioclient_mock,
+ unsupported=["os"],
+ unhealthy=["docker"],
issues=[
- Issue(
- type=IssueType.REBOOT_REQUIRED,
- context=ContextType.SYSTEM,
- reference=None,
- uuid=(uuid := uuid4()),
- )
+ {
+ "uuid": "1234",
+ "type": "reboot_required",
+ "context": "system",
+ "reference": None,
+ }
],
)
@@ -338,14 +325,15 @@ async def test_reset_issues_supervisor_restart(
assert_repair_in_list(msg["result"]["issues"], unhealthy=False, reason="os")
assert_issue_repair_in_list(
msg["result"]["issues"],
- uuid=uuid.hex,
+ uuid="1234",
context="system",
type_="reboot_required",
fixable=False,
reference=None,
)
- mock_resolution_info(supervisor_client)
+ aioclient_mock.clear_requests()
+ mock_resolution_info(aioclient_mock)
await client.send_json(
{
"id": 2,
@@ -370,15 +358,11 @@ async def test_reset_issues_supervisor_restart(
@pytest.mark.usefixtures("all_setup_requests")
async def test_reasons_added_and_removed(
hass: HomeAssistant,
- supervisor_client: AsyncMock,
+ aioclient_mock: AiohttpClientMocker,
hass_ws_client: WebSocketGenerator,
) -> None:
"""Test an unsupported/unhealthy reasons being added and removed at same time."""
- mock_resolution_info(
- supervisor_client,
- unsupported=[UnsupportedReason.OS],
- unhealthy=[UnhealthyReason.DOCKER],
- )
+ mock_resolution_info(aioclient_mock, unsupported=["os"], unhealthy=["docker"])
result = await async_setup_component(hass, "hassio", {})
assert result
@@ -392,10 +376,9 @@ async def test_reasons_added_and_removed(
assert_repair_in_list(msg["result"]["issues"], unhealthy=True, reason="docker")
assert_repair_in_list(msg["result"]["issues"], unhealthy=False, reason="os")
+ aioclient_mock.clear_requests()
mock_resolution_info(
- supervisor_client,
- unsupported=[UnsupportedReason.CONTENT_TRUST],
- unhealthy=[UnhealthyReason.SETUP],
+ aioclient_mock, unsupported=["content_trust"], unhealthy=["setup"]
)
await client.send_json(
{
@@ -425,14 +408,12 @@ async def test_reasons_added_and_removed(
@pytest.mark.usefixtures("all_setup_requests")
async def test_ignored_unsupported_skipped(
hass: HomeAssistant,
- supervisor_client: AsyncMock,
+ aioclient_mock: AiohttpClientMocker,
hass_ws_client: WebSocketGenerator,
) -> None:
"""Unsupported reasons which have an identical unhealthy reason are ignored."""
mock_resolution_info(
- supervisor_client,
- unsupported=[UnsupportedReason.PRIVILEGED],
- unhealthy=[UnhealthyReason.PRIVILEGED],
+ aioclient_mock, unsupported=["privileged"], unhealthy=["privileged"]
)
result = await async_setup_component(hass, "hassio", {})
@@ -450,14 +431,12 @@ async def test_ignored_unsupported_skipped(
@pytest.mark.usefixtures("all_setup_requests")
async def test_new_unsupported_unhealthy_reason(
hass: HomeAssistant,
- supervisor_client: AsyncMock,
+ aioclient_mock: AiohttpClientMocker,
hass_ws_client: WebSocketGenerator,
) -> None:
"""New unsupported/unhealthy reasons result in a generic repair until next core update."""
mock_resolution_info(
- supervisor_client,
- unsupported=["fake_unsupported"],
- unhealthy=["fake_unhealthy"],
+ aioclient_mock, unsupported=["fake_unsupported"], unhealthy=["fake_unhealthy"]
)
result = await async_setup_component(hass, "hassio", {})
@@ -502,43 +481,40 @@ async def test_new_unsupported_unhealthy_reason(
@pytest.mark.usefixtures("all_setup_requests")
async def test_supervisor_issues(
hass: HomeAssistant,
- supervisor_client: AsyncMock,
+ aioclient_mock: AiohttpClientMocker,
hass_ws_client: WebSocketGenerator,
) -> None:
"""Test repairs added for supervisor issue."""
mock_resolution_info(
- supervisor_client,
+ aioclient_mock,
issues=[
- Issue(
- type=IssueType.REBOOT_REQUIRED,
- context=ContextType.SYSTEM,
- reference=None,
- uuid=(uuid_issue1 := uuid4()),
- ),
- Issue(
- type=IssueType.MULTIPLE_DATA_DISKS,
- context=ContextType.SYSTEM,
- reference="/dev/sda1",
- uuid=(uuid_issue2 := uuid4()),
- ),
- Issue(
- type="should_not_be_repair",
- context=ContextType.OS,
- reference=None,
- uuid=uuid4(),
- ),
+ {
+ "uuid": "1234",
+ "type": "reboot_required",
+ "context": "system",
+ "reference": None,
+ },
+ {
+ "uuid": "1235",
+ "type": "multiple_data_disks",
+ "context": "system",
+ "reference": "/dev/sda1",
+ "suggestions": [
+ {
+ "uuid": "1236",
+ "type": "rename_data_disk",
+ "context": "system",
+ "reference": "/dev/sda1",
+ }
+ ],
+ },
+ {
+ "uuid": "1237",
+ "type": "should_not_be_repair",
+ "context": "os",
+ "reference": None,
+ },
],
- suggestions_by_issue={
- uuid_issue2: [
- Suggestion(
- type=SuggestionType.RENAME_DATA_DISK,
- context=ContextType.SYSTEM,
- reference="/dev/sda1",
- uuid=uuid4(),
- auto=False,
- )
- ]
- },
)
result = await async_setup_component(hass, "hassio", {})
@@ -552,7 +528,7 @@ async def test_supervisor_issues(
assert len(msg["result"]["issues"]) == 2
assert_issue_repair_in_list(
msg["result"]["issues"],
- uuid=uuid_issue1.hex,
+ uuid="1234",
context="system",
type_="reboot_required",
fixable=False,
@@ -560,7 +536,7 @@ async def test_supervisor_issues(
)
assert_issue_repair_in_list(
msg["result"]["issues"],
- uuid=uuid_issue2.hex,
+ uuid="1235",
context="system",
type_="multiple_data_disks",
fixable=True,
@@ -571,33 +547,61 @@ async def test_supervisor_issues(
@pytest.mark.usefixtures("all_setup_requests")
async def test_supervisor_issues_initial_failure(
hass: HomeAssistant,
- resolution_info: AsyncMock,
- resolution_suggestions_for_issue: AsyncMock,
+ aioclient_mock: AiohttpClientMocker,
hass_ws_client: WebSocketGenerator,
freezer: FrozenDateTimeFactory,
) -> None:
"""Test issues manager retries after initial update failure."""
- resolution_info.side_effect = [
- SupervisorBadRequestError("System is not ready with state: setup"),
- ResolutionInfo(
- unsupported=[],
- unhealthy=[],
- suggestions=[],
- issues=[
- Issue(
- type=IssueType.REBOOT_REQUIRED,
- context=ContextType.SYSTEM,
- reference=None,
- uuid=uuid4(),
- )
- ],
- checks=[
- Check(enabled=True, slug=CheckType.SUPERVISOR_TRUST),
- Check(enabled=True, slug=CheckType.FREE_SPACE),
- ],
+ responses = [
+ AiohttpClientMockResponse(
+ method="get",
+ url="http://127.0.0.1/resolution/info",
+ status=HTTPStatus.BAD_REQUEST,
+ json={
+ "result": "error",
+ "message": "System is not ready with state: setup",
+ },
+ ),
+ AiohttpClientMockResponse(
+ method="get",
+ url="http://127.0.0.1/resolution/info",
+ status=HTTPStatus.OK,
+ json={
+ "result": "ok",
+ "data": {
+ "unsupported": [],
+ "unhealthy": [],
+ "suggestions": [],
+ "issues": [
+ {
+ "uuid": "1234",
+ "type": "reboot_required",
+ "context": "system",
+ "reference": None,
+ },
+ ],
+ "checks": [
+ {"enabled": True, "slug": "supervisor_trust"},
+ {"enabled": True, "slug": "free_space"},
+ ],
+ },
+ },
),
]
+ async def mock_responses(*args):
+ nonlocal responses
+ return responses.pop(0)
+
+ aioclient_mock.get(
+ "http://127.0.0.1/resolution/info",
+ side_effect=mock_responses,
+ )
+ aioclient_mock.get(
+ "http://127.0.0.1/resolution/issue/1234/suggestions",
+ json={"result": "ok", "data": {"suggestions": []}},
+ )
+
with patch("homeassistant.components.hassio.issues.REQUEST_REFRESH_DELAY", new=0.1):
result = await async_setup_component(hass, "hassio", {})
await hass.async_block_till_done()
@@ -621,11 +625,11 @@ async def test_supervisor_issues_initial_failure(
@pytest.mark.usefixtures("all_setup_requests")
async def test_supervisor_issues_add_remove(
hass: HomeAssistant,
- supervisor_client: AsyncMock,
+ aioclient_mock: AiohttpClientMocker,
hass_ws_client: WebSocketGenerator,
) -> None:
"""Test supervisor issues added and removed from dispatches."""
- mock_resolution_info(supervisor_client)
+ mock_resolution_info(aioclient_mock)
result = await async_setup_component(hass, "hassio", {})
assert result
@@ -639,7 +643,7 @@ async def test_supervisor_issues_add_remove(
"data": {
"event": "issue_changed",
"data": {
- "uuid": (issue_uuid := uuid4().hex),
+ "uuid": "1234",
"type": "reboot_required",
"context": "system",
"reference": None,
@@ -657,7 +661,7 @@ async def test_supervisor_issues_add_remove(
assert len(msg["result"]["issues"]) == 1
assert_issue_repair_in_list(
msg["result"]["issues"],
- uuid=issue_uuid,
+ uuid="1234",
context="system",
type_="reboot_required",
fixable=False,
@@ -671,13 +675,13 @@ async def test_supervisor_issues_add_remove(
"data": {
"event": "issue_changed",
"data": {
- "uuid": issue_uuid,
+ "uuid": "1234",
"type": "reboot_required",
"context": "system",
"reference": None,
"suggestions": [
{
- "uuid": uuid4().hex,
+ "uuid": "1235",
"type": "execute_reboot",
"context": "system",
"reference": None,
@@ -697,7 +701,7 @@ async def test_supervisor_issues_add_remove(
assert len(msg["result"]["issues"]) == 1
assert_issue_repair_in_list(
msg["result"]["issues"],
- uuid=issue_uuid,
+ uuid="1234",
context="system",
type_="reboot_required",
fixable=True,
@@ -711,7 +715,7 @@ async def test_supervisor_issues_add_remove(
"data": {
"event": "issue_removed",
"data": {
- "uuid": issue_uuid,
+ "uuid": "1234",
"type": "reboot_required",
"context": "system",
"reference": None,
@@ -732,23 +736,37 @@ async def test_supervisor_issues_add_remove(
@pytest.mark.usefixtures("all_setup_requests")
async def test_supervisor_issues_suggestions_fail(
hass: HomeAssistant,
- supervisor_client: AsyncMock,
- resolution_suggestions_for_issue: AsyncMock,
+ aioclient_mock: AiohttpClientMocker,
hass_ws_client: WebSocketGenerator,
) -> None:
"""Test failing to get suggestions for issue skips it."""
- mock_resolution_info(
- supervisor_client,
- issues=[
- Issue(
- type=IssueType.REBOOT_REQUIRED,
- context=ContextType.SYSTEM,
- reference=None,
- uuid=uuid4(),
- )
- ],
+ aioclient_mock.get(
+ "http://127.0.0.1/resolution/info",
+ json={
+ "result": "ok",
+ "data": {
+ "unsupported": [],
+ "unhealthy": [],
+ "suggestions": [],
+ "issues": [
+ {
+ "uuid": "1234",
+ "type": "reboot_required",
+ "context": "system",
+ "reference": None,
+ }
+ ],
+ "checks": [
+ {"enabled": True, "slug": "supervisor_trust"},
+ {"enabled": True, "slug": "free_space"},
+ ],
+ },
+ },
+ )
+ aioclient_mock.get(
+ "http://127.0.0.1/resolution/issue/1234/suggestions",
+ exc=TimeoutError(),
)
- resolution_suggestions_for_issue.side_effect = SupervisorTimeoutError
result = await async_setup_component(hass, "hassio", {})
assert result
@@ -764,11 +782,11 @@ async def test_supervisor_issues_suggestions_fail(
@pytest.mark.usefixtures("all_setup_requests")
async def test_supervisor_remove_missing_issue_without_error(
hass: HomeAssistant,
- supervisor_client: AsyncMock,
+ aioclient_mock: AiohttpClientMocker,
hass_ws_client: WebSocketGenerator,
) -> None:
"""Test HA skips message to remove issue that it didn't know about (sync issue)."""
- mock_resolution_info(supervisor_client)
+ mock_resolution_info(aioclient_mock)
result = await async_setup_component(hass, "hassio", {})
assert result
@@ -798,12 +816,16 @@ async def test_supervisor_remove_missing_issue_without_error(
@pytest.mark.usefixtures("all_setup_requests")
async def test_system_is_not_ready(
hass: HomeAssistant,
- resolution_info: AsyncMock,
+ aioclient_mock: AiohttpClientMocker,
caplog: pytest.LogCaptureFixture,
) -> None:
"""Ensure hassio starts despite error."""
- resolution_info.side_effect = SupervisorBadRequestError(
- "System is not ready with state: setup"
+ aioclient_mock.get(
+ "http://127.0.0.1/resolution/info",
+ json={
+ "result": "",
+ "message": "System is not ready with state: setup",
+ },
)
assert await async_setup_component(hass, "hassio", {})
@@ -816,11 +838,11 @@ async def test_system_is_not_ready(
@pytest.mark.usefixtures("all_setup_requests")
async def test_supervisor_issues_detached_addon_missing(
hass: HomeAssistant,
- supervisor_client: AsyncMock,
+ aioclient_mock: AiohttpClientMocker,
hass_ws_client: WebSocketGenerator,
) -> None:
"""Test supervisor issue for detached addon due to missing repository."""
- mock_resolution_info(supervisor_client)
+ mock_resolution_info(aioclient_mock)
result = await async_setup_component(hass, "hassio", {})
assert result
@@ -834,7 +856,7 @@ async def test_supervisor_issues_detached_addon_missing(
"data": {
"event": "issue_changed",
"data": {
- "uuid": (issue_uuid := uuid4().hex),
+ "uuid": "1234",
"type": "detached_addon_missing",
"context": "addon",
"reference": "test",
@@ -852,7 +874,7 @@ async def test_supervisor_issues_detached_addon_missing(
assert len(msg["result"]["issues"]) == 1
assert_issue_repair_in_list(
msg["result"]["issues"],
- uuid=issue_uuid,
+ uuid="1234",
context="addon",
type_="detached_addon_missing",
fixable=False,
diff --git a/tests/components/hassio/test_repairs.py b/tests/components/hassio/test_repairs.py
index f8cac4e1a97..f3ccb5948f1 100644
--- a/tests/components/hassio/test_repairs.py
+++ b/tests/components/hassio/test_repairs.py
@@ -3,17 +3,8 @@
from collections.abc import Generator
from http import HTTPStatus
import os
-from unittest.mock import AsyncMock, patch
-from uuid import uuid4
+from unittest.mock import patch
-from aiohasupervisor import SupervisorError
-from aiohasupervisor.models import (
- ContextType,
- Issue,
- IssueType,
- Suggestion,
- SuggestionType,
-)
import pytest
from homeassistant.core import HomeAssistant
@@ -23,6 +14,7 @@ from homeassistant.setup import async_setup_component
from .test_init import MOCK_ENVIRON
from .test_issues import mock_resolution_info
+from tests.test_util.aiohttp import AiohttpClientMocker
from tests.typing import ClientSessionGenerator
@@ -36,39 +28,34 @@ def fixture_supervisor_environ() -> Generator[None]:
@pytest.mark.usefixtures("all_setup_requests")
async def test_supervisor_issue_repair_flow(
hass: HomeAssistant,
- supervisor_client: AsyncMock,
+ aioclient_mock: AiohttpClientMocker,
hass_client: ClientSessionGenerator,
issue_registry: ir.IssueRegistry,
) -> None:
"""Test fix flow for supervisor issue."""
mock_resolution_info(
- supervisor_client,
+ aioclient_mock,
issues=[
- Issue(
- type=IssueType.MULTIPLE_DATA_DISKS,
- context=ContextType.SYSTEM,
- reference="/dev/sda1",
- uuid=(issue_uuid := uuid4()),
- ),
+ {
+ "uuid": "1234",
+ "type": "multiple_data_disks",
+ "context": "system",
+ "reference": "/dev/sda1",
+ "suggestions": [
+ {
+ "uuid": "1235",
+ "type": "rename_data_disk",
+ "context": "system",
+ "reference": "/dev/sda1",
+ }
+ ],
+ },
],
- suggestions_by_issue={
- issue_uuid: [
- Suggestion(
- type=SuggestionType.RENAME_DATA_DISK,
- context=ContextType.SYSTEM,
- reference="/dev/sda1",
- uuid=(sugg_uuid := uuid4()),
- auto=False,
- )
- ]
- },
)
assert await async_setup_component(hass, "hassio", {})
- repair_issue = issue_registry.async_get_issue(
- domain="hassio", issue_id=issue_uuid.hex
- )
+ repair_issue = issue_registry.async_get_issue(domain="hassio", issue_id="1234")
assert repair_issue
client = await hass_client()
@@ -108,53 +95,52 @@ async def test_supervisor_issue_repair_flow(
"description_placeholders": None,
}
- assert not issue_registry.async_get_issue(domain="hassio", issue_id=issue_uuid.hex)
- supervisor_client.resolution.apply_suggestion.assert_called_once_with(sugg_uuid)
+ assert not issue_registry.async_get_issue(domain="hassio", issue_id="1234")
+
+ assert aioclient_mock.mock_calls[-1][0] == "post"
+ assert (
+ str(aioclient_mock.mock_calls[-1][1])
+ == "http://127.0.0.1/resolution/suggestion/1235"
+ )
@pytest.mark.usefixtures("all_setup_requests")
async def test_supervisor_issue_repair_flow_with_multiple_suggestions(
hass: HomeAssistant,
- supervisor_client: AsyncMock,
+ aioclient_mock: AiohttpClientMocker,
hass_client: ClientSessionGenerator,
issue_registry: ir.IssueRegistry,
) -> None:
"""Test fix flow for supervisor issue with multiple suggestions."""
mock_resolution_info(
- supervisor_client,
+ aioclient_mock,
issues=[
- Issue(
- type=IssueType.REBOOT_REQUIRED,
- context=ContextType.SYSTEM,
- reference="test",
- uuid=(issue_uuid := uuid4()),
- ),
+ {
+ "uuid": "1234",
+ "type": "reboot_required",
+ "context": "system",
+ "reference": "test",
+ "suggestions": [
+ {
+ "uuid": "1235",
+ "type": "execute_reboot",
+ "context": "system",
+ "reference": "test",
+ },
+ {
+ "uuid": "1236",
+ "type": "test_type",
+ "context": "system",
+ "reference": "test",
+ },
+ ],
+ },
],
- suggestions_by_issue={
- issue_uuid: [
- Suggestion(
- type=SuggestionType.EXECUTE_REBOOT,
- context=ContextType.SYSTEM,
- reference="test",
- uuid=uuid4(),
- auto=False,
- ),
- Suggestion(
- type="test_type",
- context=ContextType.SYSTEM,
- reference="test",
- uuid=(sugg_uuid := uuid4()),
- auto=False,
- ),
- ]
- },
)
assert await async_setup_component(hass, "hassio", {})
- repair_issue = issue_registry.async_get_issue(
- domain="hassio", issue_id=issue_uuid.hex
- )
+ repair_issue = issue_registry.async_get_issue(domain="hassio", issue_id="1234")
assert repair_issue
client = await hass_client()
@@ -203,53 +189,52 @@ async def test_supervisor_issue_repair_flow_with_multiple_suggestions(
"description_placeholders": None,
}
- assert not issue_registry.async_get_issue(domain="hassio", issue_id=issue_uuid.hex)
- supervisor_client.resolution.apply_suggestion.assert_called_once_with(sugg_uuid)
+ assert not issue_registry.async_get_issue(domain="hassio", issue_id="1234")
+
+ assert aioclient_mock.mock_calls[-1][0] == "post"
+ assert (
+ str(aioclient_mock.mock_calls[-1][1])
+ == "http://127.0.0.1/resolution/suggestion/1236"
+ )
@pytest.mark.usefixtures("all_setup_requests")
async def test_supervisor_issue_repair_flow_with_multiple_suggestions_and_confirmation(
hass: HomeAssistant,
- supervisor_client: AsyncMock,
+ aioclient_mock: AiohttpClientMocker,
hass_client: ClientSessionGenerator,
issue_registry: ir.IssueRegistry,
) -> None:
"""Test fix flow for supervisor issue with multiple suggestions and choice requires confirmation."""
mock_resolution_info(
- supervisor_client,
+ aioclient_mock,
issues=[
- Issue(
- type=IssueType.REBOOT_REQUIRED,
- context=ContextType.SYSTEM,
- reference=None,
- uuid=(issue_uuid := uuid4()),
- ),
+ {
+ "uuid": "1234",
+ "type": "reboot_required",
+ "context": "system",
+ "reference": None,
+ "suggestions": [
+ {
+ "uuid": "1235",
+ "type": "execute_reboot",
+ "context": "system",
+ "reference": None,
+ },
+ {
+ "uuid": "1236",
+ "type": "test_type",
+ "context": "system",
+ "reference": None,
+ },
+ ],
+ },
],
- suggestions_by_issue={
- issue_uuid: [
- Suggestion(
- type=SuggestionType.EXECUTE_REBOOT,
- context=ContextType.SYSTEM,
- reference=None,
- uuid=(sugg_uuid := uuid4()),
- auto=False,
- ),
- Suggestion(
- type="test_type",
- context=ContextType.SYSTEM,
- reference=None,
- uuid=uuid4(),
- auto=False,
- ),
- ]
- },
)
assert await async_setup_component(hass, "hassio", {})
- repair_issue = issue_registry.async_get_issue(
- domain="hassio", issue_id=issue_uuid.hex
- )
+ repair_issue = issue_registry.async_get_issue(domain="hassio", issue_id="1234")
assert repair_issue
client = await hass_client()
@@ -317,46 +302,46 @@ async def test_supervisor_issue_repair_flow_with_multiple_suggestions_and_confir
"description_placeholders": None,
}
- assert not issue_registry.async_get_issue(domain="hassio", issue_id=issue_uuid.hex)
- supervisor_client.resolution.apply_suggestion.assert_called_once_with(sugg_uuid)
+ assert not issue_registry.async_get_issue(domain="hassio", issue_id="1234")
+
+ assert aioclient_mock.mock_calls[-1][0] == "post"
+ assert (
+ str(aioclient_mock.mock_calls[-1][1])
+ == "http://127.0.0.1/resolution/suggestion/1235"
+ )
@pytest.mark.usefixtures("all_setup_requests")
async def test_supervisor_issue_repair_flow_skip_confirmation(
hass: HomeAssistant,
- supervisor_client: AsyncMock,
+ aioclient_mock: AiohttpClientMocker,
hass_client: ClientSessionGenerator,
issue_registry: ir.IssueRegistry,
) -> None:
"""Test confirmation skipped for fix flow for supervisor issue with one suggestion."""
mock_resolution_info(
- supervisor_client,
+ aioclient_mock,
issues=[
- Issue(
- type=IssueType.REBOOT_REQUIRED,
- context=ContextType.SYSTEM,
- reference=None,
- uuid=(issue_uuid := uuid4()),
- ),
+ {
+ "uuid": "1234",
+ "type": "reboot_required",
+ "context": "system",
+ "reference": None,
+ "suggestions": [
+ {
+ "uuid": "1235",
+ "type": "execute_reboot",
+ "context": "system",
+ "reference": None,
+ }
+ ],
+ },
],
- suggestions_by_issue={
- issue_uuid: [
- Suggestion(
- type=SuggestionType.EXECUTE_REBOOT,
- context=ContextType.SYSTEM,
- reference=None,
- uuid=(sugg_uuid := uuid4()),
- auto=False,
- ),
- ]
- },
)
assert await async_setup_component(hass, "hassio", {})
- repair_issue = issue_registry.async_get_issue(
- domain="hassio", issue_id=issue_uuid.hex
- )
+ repair_issue = issue_registry.async_get_issue(domain="hassio", issue_id="1234")
assert repair_issue
client = await hass_client()
@@ -396,54 +381,53 @@ async def test_supervisor_issue_repair_flow_skip_confirmation(
"description_placeholders": None,
}
- assert not issue_registry.async_get_issue(domain="hassio", issue_id=issue_uuid.hex)
- supervisor_client.resolution.apply_suggestion.assert_called_once_with(sugg_uuid)
+ assert not issue_registry.async_get_issue(domain="hassio", issue_id="1234")
+
+ assert aioclient_mock.mock_calls[-1][0] == "post"
+ assert (
+ str(aioclient_mock.mock_calls[-1][1])
+ == "http://127.0.0.1/resolution/suggestion/1235"
+ )
@pytest.mark.usefixtures("all_setup_requests")
async def test_mount_failed_repair_flow_error(
hass: HomeAssistant,
- supervisor_client: AsyncMock,
+ aioclient_mock: AiohttpClientMocker,
hass_client: ClientSessionGenerator,
issue_registry: ir.IssueRegistry,
) -> None:
"""Test repair flow fails when repair fails to apply."""
mock_resolution_info(
- supervisor_client,
+ aioclient_mock,
issues=[
- Issue(
- type=IssueType.MOUNT_FAILED,
- context=ContextType.MOUNT,
- reference="backup_share",
- uuid=(issue_uuid := uuid4()),
- ),
+ {
+ "uuid": "1234",
+ "type": "mount_failed",
+ "context": "mount",
+ "reference": "backup_share",
+ "suggestions": [
+ {
+ "uuid": "1235",
+ "type": "execute_reload",
+ "context": "mount",
+ "reference": "backup_share",
+ },
+ {
+ "uuid": "1236",
+ "type": "execute_remove",
+ "context": "mount",
+ "reference": "backup_share",
+ },
+ ],
+ },
],
- suggestions_by_issue={
- issue_uuid: [
- Suggestion(
- type=SuggestionType.EXECUTE_RELOAD,
- context=ContextType.MOUNT,
- reference="backup_share",
- uuid=uuid4(),
- auto=False,
- ),
- Suggestion(
- type=SuggestionType.EXECUTE_REMOVE,
- context=ContextType.MOUNT,
- reference="backup_share",
- uuid=uuid4(),
- auto=False,
- ),
- ]
- },
- suggestion_result=SupervisorError("boom"),
+ suggestion_result=False,
)
assert await async_setup_component(hass, "hassio", {})
- repair_issue = issue_registry.async_get_issue(
- domain="hassio", issue_id=issue_uuid.hex
- )
+ repair_issue = issue_registry.async_get_issue(domain="hassio", issue_id="1234")
assert repair_issue
client = await hass_client()
@@ -475,52 +459,46 @@ async def test_mount_failed_repair_flow_error(
"description_placeholders": None,
}
- assert issue_registry.async_get_issue(domain="hassio", issue_id=issue_uuid.hex)
+ assert issue_registry.async_get_issue(domain="hassio", issue_id="1234")
@pytest.mark.usefixtures("all_setup_requests")
async def test_mount_failed_repair_flow(
hass: HomeAssistant,
- supervisor_client: AsyncMock,
+ aioclient_mock: AiohttpClientMocker,
hass_client: ClientSessionGenerator,
issue_registry: ir.IssueRegistry,
) -> None:
"""Test repair flow for mount_failed issue."""
mock_resolution_info(
- supervisor_client,
+ aioclient_mock,
issues=[
- Issue(
- type=IssueType.MOUNT_FAILED,
- context=ContextType.MOUNT,
- reference="backup_share",
- uuid=(issue_uuid := uuid4()),
- ),
+ {
+ "uuid": "1234",
+ "type": "mount_failed",
+ "context": "mount",
+ "reference": "backup_share",
+ "suggestions": [
+ {
+ "uuid": "1235",
+ "type": "execute_reload",
+ "context": "mount",
+ "reference": "backup_share",
+ },
+ {
+ "uuid": "1236",
+ "type": "execute_remove",
+ "context": "mount",
+ "reference": "backup_share",
+ },
+ ],
+ },
],
- suggestions_by_issue={
- issue_uuid: [
- Suggestion(
- type=SuggestionType.EXECUTE_RELOAD,
- context=ContextType.MOUNT,
- reference="backup_share",
- uuid=(sugg_uuid := uuid4()),
- auto=False,
- ),
- Suggestion(
- type=SuggestionType.EXECUTE_REMOVE,
- context=ContextType.MOUNT,
- reference="backup_share",
- uuid=uuid4(),
- auto=False,
- ),
- ]
- },
)
assert await async_setup_component(hass, "hassio", {})
- repair_issue = issue_registry.async_get_issue(
- domain="hassio", issue_id=issue_uuid.hex
- )
+ repair_issue = issue_registry.async_get_issue(domain="hassio", issue_id="1234")
assert repair_issue
client = await hass_client()
@@ -573,8 +551,13 @@ async def test_mount_failed_repair_flow(
"description_placeholders": None,
}
- assert not issue_registry.async_get_issue(domain="hassio", issue_id=issue_uuid.hex)
- supervisor_client.resolution.apply_suggestion.assert_called_once_with(sugg_uuid)
+ assert not issue_registry.async_get_issue(domain="hassio", issue_id="1234")
+
+ assert aioclient_mock.mock_calls[-1][0] == "post"
+ assert (
+ str(aioclient_mock.mock_calls[-1][1])
+ == "http://127.0.0.1/resolution/suggestion/1235"
+ )
@pytest.mark.parametrize(
@@ -583,69 +566,62 @@ async def test_mount_failed_repair_flow(
@pytest.mark.usefixtures("all_setup_requests")
async def test_supervisor_issue_docker_config_repair_flow(
hass: HomeAssistant,
- supervisor_client: AsyncMock,
+ aioclient_mock: AiohttpClientMocker,
hass_client: ClientSessionGenerator,
issue_registry: ir.IssueRegistry,
) -> None:
"""Test fix flow for supervisor issue."""
mock_resolution_info(
- supervisor_client,
+ aioclient_mock,
issues=[
- Issue(
- type=IssueType.DOCKER_CONFIG,
- context=ContextType.SYSTEM,
- reference=None,
- uuid=(issue1_uuid := uuid4()),
- ),
- Issue(
- type=IssueType.DOCKER_CONFIG,
- context=ContextType.CORE,
- reference=None,
- uuid=(issue2_uuid := uuid4()),
- ),
- Issue(
- type=IssueType.DOCKER_CONFIG,
- context=ContextType.ADDON,
- reference="test",
- uuid=(issue3_uuid := uuid4()),
- ),
+ {
+ "uuid": "1234",
+ "type": "docker_config",
+ "context": "system",
+ "reference": None,
+ "suggestions": [
+ {
+ "uuid": "1235",
+ "type": "execute_rebuild",
+ "context": "system",
+ "reference": None,
+ }
+ ],
+ },
+ {
+ "uuid": "1236",
+ "type": "docker_config",
+ "context": "core",
+ "reference": None,
+ "suggestions": [
+ {
+ "uuid": "1237",
+ "type": "execute_rebuild",
+ "context": "core",
+ "reference": None,
+ }
+ ],
+ },
+ {
+ "uuid": "1238",
+ "type": "docker_config",
+ "context": "addon",
+ "reference": "test",
+ "suggestions": [
+ {
+ "uuid": "1239",
+ "type": "execute_rebuild",
+ "context": "addon",
+ "reference": "test",
+ }
+ ],
+ },
],
- suggestions_by_issue={
- issue1_uuid: [
- Suggestion(
- type=SuggestionType.EXECUTE_REBUILD,
- context=ContextType.SYSTEM,
- reference=None,
- uuid=(sugg_uuid := uuid4()),
- auto=False,
- ),
- ],
- issue2_uuid: [
- Suggestion(
- type=SuggestionType.EXECUTE_REBUILD,
- context=ContextType.CORE,
- reference=None,
- uuid=uuid4(),
- auto=False,
- ),
- ],
- issue3_uuid: [
- Suggestion(
- type=SuggestionType.EXECUTE_REBUILD,
- context=ContextType.ADDON,
- reference="test",
- uuid=uuid4(),
- auto=False,
- ),
- ],
- },
)
assert await async_setup_component(hass, "hassio", {})
- repair_issue = issue_registry.async_get_issue(
- domain="hassio", issue_id=issue1_uuid.hex
- )
+ repair_issue = issue_registry.async_get_issue(domain="hassio", issue_id="1234")
assert repair_issue
client = await hass_client()
@@ -685,53 +661,52 @@ async def test_supervisor_issue_docker_config_repair_flow(
"description_placeholders": None,
}
- assert not issue_registry.async_get_issue(domain="hassio", issue_id=issue1_uuid.hex)
- supervisor_client.resolution.apply_suggestion.assert_called_once_with(sugg_uuid)
+ assert not issue_registry.async_get_issue(domain="hassio", issue_id="1234")
+
+ assert aioclient_mock.mock_calls[-1][0] == "post"
+ assert (
+ str(aioclient_mock.mock_calls[-1][1])
+ == "http://127.0.0.1/resolution/suggestion/1235"
+ )
@pytest.mark.usefixtures("all_setup_requests")
async def test_supervisor_issue_repair_flow_multiple_data_disks(
hass: HomeAssistant,
- supervisor_client: AsyncMock,
+ aioclient_mock: AiohttpClientMocker,
hass_client: ClientSessionGenerator,
issue_registry: ir.IssueRegistry,
) -> None:
"""Test fix flow for multiple data disks supervisor issue."""
mock_resolution_info(
- supervisor_client,
+ aioclient_mock,
issues=[
- Issue(
- type=IssueType.MULTIPLE_DATA_DISKS,
- context=ContextType.SYSTEM,
- reference="/dev/sda1",
- uuid=(issue_uuid := uuid4()),
- ),
+ {
+ "uuid": "1234",
+ "type": "multiple_data_disks",
+ "context": "system",
+ "reference": "/dev/sda1",
+ "suggestions": [
+ {
+ "uuid": "1235",
+ "type": "rename_data_disk",
+ "context": "system",
+ "reference": "/dev/sda1",
+ },
+ {
+ "uuid": "1236",
+ "type": "adopt_data_disk",
+ "context": "system",
+ "reference": "/dev/sda1",
+ },
+ ],
+ },
],
- suggestions_by_issue={
- issue_uuid: [
- Suggestion(
- type=SuggestionType.RENAME_DATA_DISK,
- context=ContextType.SYSTEM,
- reference="/dev/sda1",
- uuid=uuid4(),
- auto=False,
- ),
- Suggestion(
- type=SuggestionType.ADOPT_DATA_DISK,
- context=ContextType.SYSTEM,
- reference="/dev/sda1",
- uuid=(sugg_uuid := uuid4()),
- auto=False,
- ),
- ]
- },
)
assert await async_setup_component(hass, "hassio", {})
- repair_issue = issue_registry.async_get_issue(
- domain="hassio", issue_id=issue_uuid.hex
- )
+ repair_issue = issue_registry.async_get_issue(domain="hassio", issue_id="1234")
assert repair_issue
client = await hass_client()
@@ -799,8 +774,13 @@ async def test_supervisor_issue_repair_flow_multiple_data_disks(
"description_placeholders": None,
}
- assert not issue_registry.async_get_issue(domain="hassio", issue_id=issue_uuid.hex)
- supervisor_client.resolution.apply_suggestion.assert_called_once_with(sugg_uuid)
+ assert not issue_registry.async_get_issue(domain="hassio", issue_id="1234")
+
+ assert aioclient_mock.mock_calls[-1][0] == "post"
+ assert (
+ str(aioclient_mock.mock_calls[-1][1])
+ == "http://127.0.0.1/resolution/suggestion/1236"
+ )
@pytest.mark.parametrize(
@@ -809,39 +789,34 @@ async def test_supervisor_issue_repair_flow_multiple_data_disks(
@pytest.mark.usefixtures("all_setup_requests")
async def test_supervisor_issue_detached_addon_removed(
hass: HomeAssistant,
- supervisor_client: AsyncMock,
+ aioclient_mock: AiohttpClientMocker,
hass_client: ClientSessionGenerator,
issue_registry: ir.IssueRegistry,
) -> None:
"""Test fix flow for supervisor issue."""
mock_resolution_info(
- supervisor_client,
+ aioclient_mock,
issues=[
- Issue(
- type=IssueType.DETACHED_ADDON_REMOVED,
- context=ContextType.ADDON,
- reference="test",
- uuid=(issue_uuid := uuid4()),
- ),
+ {
+ "uuid": "1234",
+ "type": "detached_addon_removed",
+ "context": "addon",
+ "reference": "test",
+ "suggestions": [
+ {
+ "uuid": "1235",
+ "type": "execute_remove",
+ "context": "addon",
+ "reference": "test",
+ }
+ ],
+ },
],
- suggestions_by_issue={
- issue_uuid: [
- Suggestion(
- type=SuggestionType.EXECUTE_REMOVE,
- context=ContextType.ADDON,
- reference="test",
- uuid=(sugg_uuid := uuid4()),
- auto=False,
- ),
- ]
- },
)
assert await async_setup_component(hass, "hassio", {})
- repair_issue = issue_registry.async_get_issue(
- domain="hassio", issue_id=issue_uuid.hex
- )
+ repair_issue = issue_registry.async_get_issue(domain="hassio", issue_id="1234")
assert repair_issue
client = await hass_client()
@@ -886,8 +861,13 @@ async def test_supervisor_issue_detached_addon_removed(
"description_placeholders": None,
}
- assert not issue_registry.async_get_issue(domain="hassio", issue_id=issue_uuid.hex)
- supervisor_client.resolution.apply_suggestion.assert_called_once_with(sugg_uuid)
+ assert not issue_registry.async_get_issue(domain="hassio", issue_id="1234")
+
+ assert aioclient_mock.mock_calls[-1][0] == "post"
+ assert (
+ str(aioclient_mock.mock_calls[-1][1])
+ == "http://127.0.0.1/resolution/suggestion/1235"
+ )
@pytest.mark.parametrize(
@@ -896,46 +876,40 @@ async def test_supervisor_issue_detached_addon_removed(
@pytest.mark.usefixtures("all_setup_requests")
async def test_supervisor_issue_addon_boot_fail(
hass: HomeAssistant,
- supervisor_client: AsyncMock,
+ aioclient_mock: AiohttpClientMocker,
hass_client: ClientSessionGenerator,
issue_registry: ir.IssueRegistry,
) -> None:
"""Test fix flow for supervisor issue."""
mock_resolution_info(
- supervisor_client,
+ aioclient_mock,
issues=[
- Issue(
- type="boot_fail",
- context=ContextType.ADDON,
- reference="test",
- uuid=(issue_uuid := uuid4()),
- ),
+ {
+ "uuid": "1234",
+ "type": "boot_fail",
+ "context": "addon",
+ "reference": "test",
+ "suggestions": [
+ {
+ "uuid": "1235",
+ "type": "execute_start",
+ "context": "addon",
+ "reference": "test",
+ },
+ {
+ "uuid": "1236",
+ "type": "disable_boot",
+ "context": "addon",
+ "reference": "test",
+ },
+ ],
+ },
],
- suggestions_by_issue={
- issue_uuid: [
- Suggestion(
- type="execute_start",
- context=ContextType.ADDON,
- reference="test",
- uuid=(sugg_uuid := uuid4()),
- auto=False,
- ),
- Suggestion(
- type="disable_boot",
- context=ContextType.ADDON,
- reference="test",
- uuid=uuid4(),
- auto=False,
- ),
- ]
- },
)
assert await async_setup_component(hass, "hassio", {})
- repair_issue = issue_registry.async_get_issue(
- domain="hassio", issue_id=issue_uuid.hex
- )
+ repair_issue = issue_registry.async_get_issue(domain="hassio", issue_id="1234")
assert repair_issue
client = await hass_client()
@@ -988,5 +962,10 @@ async def test_supervisor_issue_addon_boot_fail(
"description_placeholders": None,
}
- assert not issue_registry.async_get_issue(domain="hassio", issue_id=issue_uuid.hex)
- supervisor_client.resolution.apply_suggestion.assert_called_once_with(sugg_uuid)
+ assert not issue_registry.async_get_issue(domain="hassio", issue_id="1234")
+
+ assert aioclient_mock.mock_calls[-1][0] == "post"
+ assert (
+ str(aioclient_mock.mock_calls[-1][1])
+ == "http://127.0.0.1/resolution/suggestion/1235"
+ )
diff --git a/tests/components/hassio/test_sensor.py b/tests/components/hassio/test_sensor.py
index 7160a2cbf16..1b58534d52f 100644
--- a/tests/components/hassio/test_sensor.py
+++ b/tests/components/hassio/test_sensor.py
@@ -33,7 +33,6 @@ def mock_all(
store_info: AsyncMock,
addon_stats: AsyncMock,
addon_changelog: AsyncMock,
- resolution_info: AsyncMock,
) -> None:
"""Mock all setup requests."""
_install_default_mocks(aioclient_mock)
@@ -147,6 +146,19 @@ def _install_default_mocks(aioclient_mock: AiohttpClientMocker):
aioclient_mock.get(
"http://127.0.0.1/ingress/panels", json={"result": "ok", "data": {"panels": {}}}
)
+ aioclient_mock.get(
+ "http://127.0.0.1/resolution/info",
+ json={
+ "result": "ok",
+ "data": {
+ "unsupported": [],
+ "unhealthy": [],
+ "suggestions": [],
+ "issues": [],
+ "checks": [],
+ },
+ },
+ )
aioclient_mock.get(
"http://127.0.0.1/network/info",
json={
diff --git a/tests/components/hassio/test_update.py b/tests/components/hassio/test_update.py
index c1775d6e0b4..0d15eac48c5 100644
--- a/tests/components/hassio/test_update.py
+++ b/tests/components/hassio/test_update.py
@@ -29,7 +29,6 @@ def mock_all(
store_info: AsyncMock,
addon_stats: AsyncMock,
addon_changelog: AsyncMock,
- resolution_info: AsyncMock,
) -> None:
"""Mock all setup requests."""
aioclient_mock.post("http://127.0.0.1/homeassistant/options", json={"result": "ok"})
@@ -150,6 +149,19 @@ def mock_all(
aioclient_mock.get(
"http://127.0.0.1/ingress/panels", json={"result": "ok", "data": {"panels": {}}}
)
+ aioclient_mock.get(
+ "http://127.0.0.1/resolution/info",
+ json={
+ "result": "ok",
+ "data": {
+ "unsupported": [],
+ "unhealthy": [],
+ "suggestions": [],
+ "issues": [],
+ "checks": [],
+ },
+ },
+ )
aioclient_mock.get(
"http://127.0.0.1/network/info",
json={
diff --git a/tests/components/hassio/test_websocket_api.py b/tests/components/hassio/test_websocket_api.py
index 21e6b03678b..1023baa89df 100644
--- a/tests/components/hassio/test_websocket_api.py
+++ b/tests/components/hassio/test_websocket_api.py
@@ -26,9 +26,7 @@ from tests.typing import WebSocketGenerator
@pytest.fixture(autouse=True)
def mock_all(
- aioclient_mock: AiohttpClientMocker,
- supervisor_is_connected: AsyncMock,
- resolution_info: AsyncMock,
+ aioclient_mock: AiohttpClientMocker, supervisor_is_connected: AsyncMock
) -> None:
"""Mock all setup requests."""
aioclient_mock.post("http://127.0.0.1/homeassistant/options", json={"result": "ok"})
@@ -69,6 +67,19 @@ def mock_all(
aioclient_mock.get(
"http://127.0.0.1/ingress/panels", json={"result": "ok", "data": {"panels": {}}}
)
+ aioclient_mock.get(
+ "http://127.0.0.1/resolution/info",
+ json={
+ "result": "ok",
+ "data": {
+ "unsupported": [],
+ "unhealthy": [],
+ "suggestions": [],
+ "issues": [],
+ "checks": [],
+ },
+ },
+ )
@pytest.mark.usefixtures("hassio_env")
diff --git a/tests/components/homekit/test_type_security_systems.py b/tests/components/homekit/test_type_security_systems.py
index 94b0e68e76d..8377d847a7a 100644
--- a/tests/components/homekit/test_type_security_systems.py
+++ b/tests/components/homekit/test_type_security_systems.py
@@ -10,12 +10,7 @@ from homeassistant.components.alarm_control_panel import (
)
from homeassistant.components.homekit.const import ATTR_VALUE
from homeassistant.components.homekit.type_security_systems import SecuritySystem
-from homeassistant.const import (
- ATTR_CODE,
- ATTR_ENTITY_ID,
- STATE_UNAVAILABLE,
- STATE_UNKNOWN,
-)
+from homeassistant.const import ATTR_CODE, ATTR_ENTITY_ID, STATE_UNKNOWN
from homeassistant.core import Event, HomeAssistant
from tests.common import async_mock_service
@@ -312,33 +307,3 @@ async def test_supported_states(hass: HomeAssistant, hk_driver) -> None:
for val in valid_target_values.values():
assert val in test_config.get("target_values")
-
-
-@pytest.mark.parametrize(
- ("state"),
- [
- (None),
- ("None"),
- (STATE_UNKNOWN),
- (STATE_UNAVAILABLE),
- ],
-)
-async def test_handle_non_alarm_states(
- hass: HomeAssistant, hk_driver, events: list[Event], state: str
-) -> None:
- """Test we can handle states that should not raise."""
- code = "1234"
- config = {ATTR_CODE: code}
- entity_id = "alarm_control_panel.test"
-
- hass.states.async_set(entity_id, state)
- await hass.async_block_till_done()
- acc = SecuritySystem(hass, hk_driver, "SecuritySystem", entity_id, 2, config)
- acc.run()
- await hass.async_block_till_done()
-
- assert acc.aid == 2
- assert acc.category == 11 # AlarmSystem
-
- assert acc.char_current_state.value == 3
- assert acc.char_target_state.value == 3
diff --git a/tests/components/homematicip_cloud/test_sensor.py b/tests/components/homematicip_cloud/test_sensor.py
index 2dda3116032..bdd0b6194ed 100644
--- a/tests/components/homematicip_cloud/test_sensor.py
+++ b/tests/components/homematicip_cloud/test_sensor.py
@@ -23,11 +23,7 @@ from homeassistant.components.homematicip_cloud.sensor import (
ATTR_WIND_DIRECTION,
ATTR_WIND_DIRECTION_VARIATION,
)
-from homeassistant.components.sensor import (
- ATTR_STATE_CLASS,
- DOMAIN as SENSOR_DOMAIN,
- SensorStateClass,
-)
+from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
from homeassistant.const import (
ATTR_UNIT_OF_MEASUREMENT,
LIGHT_LUX,
@@ -366,7 +362,6 @@ async def test_hmip_windspeed_sensor(
assert (
ha_state.attributes[ATTR_UNIT_OF_MEASUREMENT] == UnitOfSpeed.KILOMETERS_PER_HOUR
)
- assert ha_state.attributes[ATTR_STATE_CLASS] == SensorStateClass.MEASUREMENT
await async_manipulate_test_data(hass, hmip_device, "windSpeed", 9.4)
ha_state = hass.states.get(entity_id)
assert ha_state.state == "9.4"
@@ -416,7 +411,6 @@ async def test_hmip_today_rain_sensor(
assert ha_state.state == "3.9"
assert ha_state.attributes[ATTR_UNIT_OF_MEASUREMENT] == UnitOfLength.MILLIMETERS
- assert ha_state.attributes[ATTR_STATE_CLASS] == SensorStateClass.MEASUREMENT
await async_manipulate_test_data(hass, hmip_device, "todayRainCounter", 14.2)
ha_state = hass.states.get(entity_id)
assert ha_state.state == "14.2"
diff --git a/tests/components/honeywell/test_config_flow.py b/tests/components/honeywell/test_config_flow.py
index ed9c86f5e10..b1c0b28f537 100644
--- a/tests/components/honeywell/test_config_flow.py
+++ b/tests/components/honeywell/test_config_flow.py
@@ -120,6 +120,10 @@ async def test_create_option_entry(
}
+@pytest.mark.parametrize( # Remove when translations fixed
+ "ignore_translations",
+ ["component.honeywell.config.abort.reauth_successful"],
+)
async def test_reauth_flow(hass: HomeAssistant) -> None:
"""Test a successful reauth flow."""
diff --git a/tests/components/http/test_ban.py b/tests/components/http/test_ban.py
index 59011de0cfd..7ffd0263157 100644
--- a/tests/components/http/test_ban.py
+++ b/tests/components/http/test_ban.py
@@ -197,7 +197,6 @@ async def test_access_from_supervisor_ip(
hass: HomeAssistant,
aiohttp_client: ClientSessionGenerator,
hassio_env,
- resolution_info: AsyncMock,
) -> None:
"""Test accessing to server from supervisor IP."""
app = web.Application()
@@ -219,7 +218,17 @@ async def test_access_from_supervisor_ip(
manager = app[KEY_BAN_MANAGER]
- assert await async_setup_component(hass, "hassio", {"hassio": {}})
+ with patch(
+ "homeassistant.components.hassio.HassIO.get_resolution_info",
+ return_value={
+ "unsupported": [],
+ "unhealthy": [],
+ "suggestions": [],
+ "issues": [],
+ "checks": [],
+ },
+ ):
+ assert await async_setup_component(hass, "hassio", {"hassio": {}})
m_open = mock_open()
diff --git a/tests/components/husqvarna_automower/conftest.py b/tests/components/husqvarna_automower/conftest.py
index 0202cec05b9..2814e1558d1 100644
--- a/tests/components/husqvarna_automower/conftest.py
+++ b/tests/components/husqvarna_automower/conftest.py
@@ -1,6 +1,5 @@
"""Test helpers for Husqvarna Automower."""
-import asyncio
from collections.abc import Generator
import time
from unittest.mock import AsyncMock, patch
@@ -102,17 +101,10 @@ async def setup_credentials(hass: HomeAssistant) -> None:
def mock_automower_client(values) -> Generator[AsyncMock]:
"""Mock a Husqvarna Automower client."""
- async def listen() -> None:
- """Mock listen."""
- listen_block = asyncio.Event()
- await listen_block.wait()
- pytest.fail("Listen was not cancelled!")
-
mock = AsyncMock(spec=AutomowerSession)
mock.auth = AsyncMock(side_effect=ClientWebSocketResponse)
mock.commands = AsyncMock(spec_set=_MowerCommands)
mock.get_status.return_value = values
- mock.start_listening = AsyncMock(side_effect=listen)
with patch(
"homeassistant.components.husqvarna_automower.AutomowerSession",
diff --git a/tests/components/husqvarna_automower/test_init.py b/tests/components/husqvarna_automower/test_init.py
index ae688571d2c..b2127145372 100644
--- a/tests/components/husqvarna_automower/test_init.py
+++ b/tests/components/husqvarna_automower/test_init.py
@@ -1,16 +1,14 @@
"""Tests for init module."""
-from asyncio import Event
-from datetime import datetime
+from datetime import datetime, timedelta
import http
import time
-from unittest.mock import AsyncMock, patch
+from unittest.mock import AsyncMock
from aioautomower.exceptions import (
ApiException,
AuthException,
HusqvarnaWSServerHandshakeError,
- TimeoutException,
)
from aioautomower.model import MowerAttributes, WorkArea
from freezegun.api import FrozenDateTimeFactory
@@ -129,77 +127,28 @@ async def test_update_failed(
assert entry.state is entry_state
-@patch(
- "homeassistant.components.husqvarna_automower.coordinator.DEFAULT_RECONNECT_TIME", 0
-)
-@pytest.mark.parametrize(
- ("method_path", "exception", "error_msg"),
- [
- (
- ["auth", "websocket_connect"],
- HusqvarnaWSServerHandshakeError,
- "Failed to connect to websocket.",
- ),
- (
- ["start_listening"],
- TimeoutException,
- "Failed to listen to websocket.",
- ),
- ],
-)
async def test_websocket_not_available(
hass: HomeAssistant,
mock_automower_client: AsyncMock,
mock_config_entry: MockConfigEntry,
caplog: pytest.LogCaptureFixture,
freezer: FrozenDateTimeFactory,
- method_path: list[str],
- exception: type[Exception],
- error_msg: str,
) -> None:
- """Test trying to reload the websocket."""
- calls = []
- mock_called = Event()
- mock_stall = Event()
-
- async def mock_function():
- mock_called.set()
- await mock_stall.wait()
- # Raise the first time the method is awaited
- if not calls:
- calls.append(None)
- raise exception("Boom")
- if mock_side_effect:
- await mock_side_effect()
-
- # Find the method to mock
- mock = mock_automower_client
- for itm in method_path:
- mock = getattr(mock, itm)
- mock_side_effect = mock.side_effect
- mock.side_effect = mock_function
-
- # Setup integration and verify log error message
+ """Test trying reload the websocket."""
+ mock_automower_client.start_listening.side_effect = HusqvarnaWSServerHandshakeError(
+ "Boom"
+ )
await setup_integration(hass, mock_config_entry)
- await mock_called.wait()
- mock_called.clear()
- # Allow the exception to be raised
- mock_stall.set()
- assert mock.call_count == 1
+ assert "Failed to connect to websocket. Trying to reconnect: Boom" in caplog.text
+ assert mock_automower_client.auth.websocket_connect.call_count == 1
+ assert mock_automower_client.start_listening.call_count == 1
+ assert mock_config_entry.state is ConfigEntryState.LOADED
+ freezer.tick(timedelta(seconds=2))
+ async_fire_time_changed(hass)
await hass.async_block_till_done()
- assert f"{error_msg} Trying to reconnect: Boom" in caplog.text
-
- # Simulate a successful connection
- caplog.clear()
- await mock_called.wait()
- mock_called.clear()
- await hass.async_block_till_done()
- assert mock.call_count == 2
- assert "Trying to reconnect: Boom" not in caplog.text
-
- # Simulate hass shutting down
- await hass.async_stop()
- assert mock.call_count == 2
+ assert mock_automower_client.auth.websocket_connect.call_count == 2
+ assert mock_automower_client.start_listening.call_count == 2
+ assert mock_config_entry.state is ConfigEntryState.LOADED
async def test_device_info(
@@ -306,7 +255,6 @@ async def test_add_and_remove_work_area(
del values[TEST_MOWER_ID].work_area_dict[123456]
del values[TEST_MOWER_ID].work_areas[123456]
del values[TEST_MOWER_ID].calendar.tasks[:2]
- values[TEST_MOWER_ID].mower.work_area_id = 654321
mock_automower_client.get_status.return_value = values
freezer.tick(SCAN_INTERVAL)
async_fire_time_changed(hass)
diff --git a/tests/components/husqvarna_automower_ble/conftest.py b/tests/components/husqvarna_automower_ble/conftest.py
index 3a8e881aba0..5e27582b81c 100644
--- a/tests/components/husqvarna_automower_ble/conftest.py
+++ b/tests/components/husqvarna_automower_ble/conftest.py
@@ -1,16 +1,19 @@
"""Common fixtures for the Husqvarna Automower Bluetooth tests."""
-from collections.abc import Generator
+from collections.abc import Awaitable, Callable, Generator
from unittest.mock import AsyncMock, patch
+from freezegun.api import FrozenDateTimeFactory
import pytest
from homeassistant.components.husqvarna_automower_ble.const import DOMAIN
+from homeassistant.components.husqvarna_automower_ble.coordinator import SCAN_INTERVAL
from homeassistant.const import CONF_ADDRESS, CONF_CLIENT_ID
+from homeassistant.core import HomeAssistant
from . import AUTOMOWER_SERVICE_INFO
-from tests.common import MockConfigEntry
+from tests.common import MockConfigEntry, async_fire_time_changed
@pytest.fixture
@@ -23,8 +26,25 @@ def mock_setup_entry() -> Generator[AsyncMock]:
yield mock_setup_entry
+@pytest.fixture
+async def scan_step(
+ hass: HomeAssistant, freezer: FrozenDateTimeFactory
+) -> Generator[None, None, Callable[[], Awaitable[None]]]:
+ """Step system time forward."""
+
+ freezer.move_to("2023-01-01T01:00:00Z")
+
+ async def delay() -> None:
+ """Trigger delay in system."""
+ freezer.tick(delta=SCAN_INTERVAL)
+ async_fire_time_changed(hass)
+ await hass.async_block_till_done()
+
+ return delay
+
+
@pytest.fixture(autouse=True)
-def mock_automower_client(enable_bluetooth: None) -> Generator[AsyncMock]:
+def mock_automower_client(enable_bluetooth: None, scan_step) -> Generator[AsyncMock]:
"""Mock a BleakClient client."""
with (
patch(
diff --git a/tests/components/isy994/test_config_flow.py b/tests/components/isy994/test_config_flow.py
index 2bc1fff222f..34e267fe904 100644
--- a/tests/components/isy994/test_config_flow.py
+++ b/tests/components/isy994/test_config_flow.py
@@ -698,16 +698,3 @@ async def test_reauth(hass: HomeAssistant) -> None:
assert mock_setup_entry.called
assert result4["type"] is FlowResultType.ABORT
assert result4["reason"] == "reauth_successful"
-
-
-async def test_options_flow(hass: HomeAssistant) -> None:
- """Test option flow."""
- entry = MockConfigEntry(domain=DOMAIN)
- entry.add_to_hass(hass)
-
- result = await hass.config_entries.options.async_init(entry.entry_id)
- assert result["type"] is FlowResultType.FORM
- assert result["step_id"] == "init"
-
- # This should be improved at a later stage to increase test coverage
- hass.config_entries.options.async_abort(result["flow_id"])
diff --git a/tests/components/jewish_calendar/test_config_flow.py b/tests/components/jewish_calendar/test_config_flow.py
index e00fe41749f..2a490270fdf 100644
--- a/tests/components/jewish_calendar/test_config_flow.py
+++ b/tests/components/jewish_calendar/test_config_flow.py
@@ -2,6 +2,8 @@
from unittest.mock import AsyncMock
+import pytest
+
from homeassistant import config_entries, setup
from homeassistant.components.jewish_calendar.const import (
CONF_CANDLE_LIGHT_MINUTES,
@@ -18,10 +20,12 @@ from homeassistant.const import (
CONF_LANGUAGE,
CONF_LATITUDE,
CONF_LONGITUDE,
+ CONF_NAME,
CONF_TIME_ZONE,
)
from homeassistant.core import HomeAssistant
from homeassistant.data_entry_flow import FlowResultType
+from homeassistant.setup import async_setup_component
from tests.common import MockConfigEntry
@@ -55,6 +59,51 @@ async def test_step_user(hass: HomeAssistant, mock_setup_entry: AsyncMock) -> No
assert entries[0].data[CONF_TIME_ZONE] == hass.config.time_zone
+@pytest.mark.parametrize("diaspora", [True, False])
+@pytest.mark.parametrize("language", ["hebrew", "english"])
+async def test_import_no_options(hass: HomeAssistant, language, diaspora) -> None:
+ """Test that the import step works."""
+ conf = {
+ DOMAIN: {CONF_NAME: "test", CONF_LANGUAGE: language, CONF_DIASPORA: diaspora}
+ }
+
+ assert await async_setup_component(hass, DOMAIN, conf.copy())
+ await hass.async_block_till_done()
+
+ entries = hass.config_entries.async_entries(DOMAIN)
+ assert len(entries) == 1
+ assert CONF_LANGUAGE in entries[0].data
+ assert CONF_DIASPORA in entries[0].data
+ for entry_key, entry_val in entries[0].data.items():
+ assert entry_val == conf[DOMAIN][entry_key]
+
+
+async def test_import_with_options(hass: HomeAssistant) -> None:
+ """Test that the import step works."""
+ conf = {
+ DOMAIN: {
+ CONF_NAME: "test",
+ CONF_DIASPORA: DEFAULT_DIASPORA,
+ CONF_LANGUAGE: DEFAULT_LANGUAGE,
+ CONF_CANDLE_LIGHT_MINUTES: 20,
+ CONF_HAVDALAH_OFFSET_MINUTES: 50,
+ CONF_LATITUDE: 31.76,
+ CONF_LONGITUDE: 35.235,
+ }
+ }
+
+ # Simulate HomeAssistant setting up the component
+ assert await async_setup_component(hass, DOMAIN, conf.copy())
+ await hass.async_block_till_done()
+
+ entries = hass.config_entries.async_entries(DOMAIN)
+ assert len(entries) == 1
+ for entry_key, entry_val in entries[0].data.items():
+ assert entry_val == conf[DOMAIN][entry_key]
+ for entry_key, entry_val in entries[0].options.items():
+ assert entry_val == conf[DOMAIN][entry_key]
+
+
async def test_single_instance_allowed(
hass: HomeAssistant,
mock_config_entry: MockConfigEntry,
@@ -119,6 +168,10 @@ async def test_options_reconfigure(
)
+@pytest.mark.parametrize( # Remove when translations fixed
+ "ignore_translations",
+ ["component.jewish_calendar.config.abort.reconfigure_successful"],
+)
async def test_reconfigure(
hass: HomeAssistant, mock_config_entry: MockConfigEntry
) -> None:
diff --git a/tests/components/jewish_calendar/test_init.py b/tests/components/jewish_calendar/test_init.py
index cb982afec0f..b8454b41a60 100644
--- a/tests/components/jewish_calendar/test_init.py
+++ b/tests/components/jewish_calendar/test_init.py
@@ -1 +1,76 @@
"""Tests for the Jewish Calendar component's init."""
+
+from hdate import Location
+
+from homeassistant.components.binary_sensor import DOMAIN as BINARY_SENSORS
+from homeassistant.components.jewish_calendar import get_unique_prefix
+from homeassistant.components.jewish_calendar.const import (
+ CONF_CANDLE_LIGHT_MINUTES,
+ CONF_DIASPORA,
+ CONF_HAVDALAH_OFFSET_MINUTES,
+ DEFAULT_DIASPORA,
+ DEFAULT_LANGUAGE,
+ DOMAIN,
+)
+from homeassistant.const import CONF_LANGUAGE, CONF_LATITUDE, CONF_LONGITUDE, CONF_NAME
+from homeassistant.core import HomeAssistant
+import homeassistant.helpers.entity_registry as er
+from homeassistant.setup import async_setup_component
+
+
+async def test_import_unique_id_migration(hass: HomeAssistant) -> None:
+ """Test unique_id migration."""
+ yaml_conf = {
+ DOMAIN: {
+ CONF_NAME: "test",
+ CONF_DIASPORA: DEFAULT_DIASPORA,
+ CONF_LANGUAGE: DEFAULT_LANGUAGE,
+ CONF_CANDLE_LIGHT_MINUTES: 20,
+ CONF_HAVDALAH_OFFSET_MINUTES: 50,
+ CONF_LATITUDE: 31.76,
+ CONF_LONGITUDE: 35.235,
+ }
+ }
+
+ # Create an entry in the entity registry with the data from conf
+ ent_reg = er.async_get(hass)
+ location = Location(
+ latitude=yaml_conf[DOMAIN][CONF_LATITUDE],
+ longitude=yaml_conf[DOMAIN][CONF_LONGITUDE],
+ timezone=hass.config.time_zone,
+ diaspora=DEFAULT_DIASPORA,
+ )
+ old_prefix = get_unique_prefix(location, DEFAULT_LANGUAGE, 20, 50)
+ sample_entity = ent_reg.async_get_or_create(
+ BINARY_SENSORS,
+ DOMAIN,
+ unique_id=f"{old_prefix}_erev_shabbat_hag",
+ suggested_object_id=f"{DOMAIN}_erev_shabbat_hag",
+ )
+ # Save the existing unique_id, DEFAULT_LANGUAGE should be part of it
+ old_unique_id = sample_entity.unique_id
+ assert DEFAULT_LANGUAGE in old_unique_id
+
+ # Simulate HomeAssistant setting up the component
+ assert await async_setup_component(hass, DOMAIN, yaml_conf.copy())
+ await hass.async_block_till_done()
+
+ entries = hass.config_entries.async_entries(DOMAIN)
+ assert len(entries) == 1
+ for entry_key, entry_val in entries[0].data.items():
+ assert entry_val == yaml_conf[DOMAIN][entry_key]
+ for entry_key, entry_val in entries[0].options.items():
+ assert entry_val == yaml_conf[DOMAIN][entry_key]
+
+ # Assert that the unique_id was updated
+ new_unique_id = ent_reg.async_get(sample_entity.entity_id).unique_id
+ assert new_unique_id != old_unique_id
+ assert DEFAULT_LANGUAGE not in new_unique_id
+
+ # Confirm that when the component is reloaded, the unique_id is not changed
+ assert ent_reg.async_get(sample_entity.entity_id).unique_id == new_unique_id
+
+ # Confirm that all the unique_ids are prefixed correctly
+ await hass.config_entries.async_reload(entries[0].entry_id)
+ er_entries = er.async_entries_for_config_entry(ent_reg, entries[0].entry_id)
+ assert all(entry.unique_id.startswith(entries[0].entry_id) for entry in er_entries)
diff --git a/tests/components/lamarzocco/__init__.py b/tests/components/lamarzocco/__init__.py
index f6ca0fe40df..4d274d10baa 100644
--- a/tests/components/lamarzocco/__init__.py
+++ b/tests/components/lamarzocco/__init__.py
@@ -1,6 +1,6 @@
"""Mock inputs for tests."""
-from pylamarzocco.const import MachineModel
+from lmcloud.const import MachineModel
from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
from homeassistant.core import HomeAssistant
@@ -19,10 +19,10 @@ PASSWORD_SELECTION = {
USER_INPUT = PASSWORD_SELECTION | {CONF_USERNAME: "username"}
SERIAL_DICT = {
- MachineModel.GS3_AV: "GS012345",
- MachineModel.GS3_MP: "GS012345",
- MachineModel.LINEA_MICRA: "MR012345",
- MachineModel.LINEA_MINI: "LM012345",
+ MachineModel.GS3_AV: "GS01234",
+ MachineModel.GS3_MP: "GS01234",
+ MachineModel.LINEA_MICRA: "MR01234",
+ MachineModel.LINEA_MINI: "LM01234",
}
WAKE_UP_SLEEP_ENTRY_IDS = ["Os2OswX", "aXFz5bJ"]
diff --git a/tests/components/lamarzocco/conftest.py b/tests/components/lamarzocco/conftest.py
index 210dd9406cc..2520433e86a 100644
--- a/tests/components/lamarzocco/conftest.py
+++ b/tests/components/lamarzocco/conftest.py
@@ -5,9 +5,9 @@ import json
from unittest.mock import MagicMock, patch
from bleak.backends.device import BLEDevice
-from pylamarzocco.const import FirmwareType, MachineModel, SteamLevel
-from pylamarzocco.lm_machine import LaMarzoccoMachine
-from pylamarzocco.models import LaMarzoccoDeviceInfo
+from lmcloud.const import FirmwareType, MachineModel, SteamLevel
+from lmcloud.lm_machine import LaMarzoccoMachine
+from lmcloud.models import LaMarzoccoDeviceInfo
import pytest
from homeassistant.components.lamarzocco.const import DOMAIN
@@ -75,11 +75,11 @@ def device_fixture() -> MachineModel:
@pytest.fixture
-def mock_device_info(device_fixture: MachineModel) -> LaMarzoccoDeviceInfo:
+def mock_device_info() -> LaMarzoccoDeviceInfo:
"""Return a mocked La Marzocco device info."""
return LaMarzoccoDeviceInfo(
- model=device_fixture,
- serial_number=SERIAL_DICT[device_fixture],
+ model=MachineModel.GS3_AV,
+ serial_number="GS01234",
name="GS3",
communication_key="token",
)
@@ -157,5 +157,5 @@ def mock_bluetooth(enable_bluetooth: None) -> None:
def mock_ble_device() -> BLEDevice:
"""Return a mock BLE device."""
return BLEDevice(
- "00:00:00:00:00:00", "GS_GS012345", details={"path": "path"}, rssi=50
+ "00:00:00:00:00:00", "GS_GS01234", details={"path": "path"}, rssi=50
)
diff --git a/tests/components/lamarzocco/snapshots/test_binary_sensor.ambr b/tests/components/lamarzocco/snapshots/test_binary_sensor.ambr
index cda285a7106..df47ac002e6 100644
--- a/tests/components/lamarzocco/snapshots/test_binary_sensor.ambr
+++ b/tests/components/lamarzocco/snapshots/test_binary_sensor.ambr
@@ -1,19 +1,19 @@
# serializer version: 1
-# name: test_binary_sensors[GS012345_backflush_active-binary_sensor]
+# name: test_binary_sensors[GS01234_backflush_active-binary_sensor]
StateSnapshot({
'attributes': ReadOnlyDict({
'device_class': 'running',
- 'friendly_name': 'GS012345 Backflush active',
+ 'friendly_name': 'GS01234 Backflush active',
}),
'context': ,
- 'entity_id': 'binary_sensor.gs012345_backflush_active',
+ 'entity_id': 'binary_sensor.gs01234_backflush_active',
'last_changed': ,
'last_reported': ,
'last_updated': ,
'state': 'off',
})
# ---
-# name: test_binary_sensors[GS012345_backflush_active-entry]
+# name: test_binary_sensors[GS01234_backflush_active-entry]
EntityRegistryEntrySnapshot({
'aliases': set({
}),
@@ -25,7 +25,7 @@
'disabled_by': None,
'domain': 'binary_sensor',
'entity_category': ,
- 'entity_id': 'binary_sensor.gs012345_backflush_active',
+ 'entity_id': 'binary_sensor.gs01234_backflush_active',
'has_entity_name': True,
'hidden_by': None,
'icon': None,
@@ -42,25 +42,25 @@
'previous_unique_id': None,
'supported_features': 0,
'translation_key': 'backflush_enabled',
- 'unique_id': 'GS012345_backflush_enabled',
+ 'unique_id': 'GS01234_backflush_enabled',
'unit_of_measurement': None,
})
# ---
-# name: test_binary_sensors[GS012345_brewing_active-binary_sensor]
+# name: test_binary_sensors[GS01234_brewing_active-binary_sensor]
StateSnapshot({
'attributes': ReadOnlyDict({
'device_class': 'running',
- 'friendly_name': 'GS012345 Brewing active',
+ 'friendly_name': 'GS01234 Brewing active',
}),
'context': ,
- 'entity_id': 'binary_sensor.gs012345_brewing_active',
+ 'entity_id': 'binary_sensor.gs01234_brewing_active',
'last_changed': ,
'last_reported': ,
'last_updated': ,
'state': 'off',
})
# ---
-# name: test_binary_sensors[GS012345_brewing_active-entry]
+# name: test_binary_sensors[GS01234_brewing_active-entry]
EntityRegistryEntrySnapshot({
'aliases': set({
}),
@@ -72,7 +72,7 @@
'disabled_by': None,
'domain': 'binary_sensor',
'entity_category': ,
- 'entity_id': 'binary_sensor.gs012345_brewing_active',
+ 'entity_id': 'binary_sensor.gs01234_brewing_active',
'has_entity_name': True,
'hidden_by': None,
'icon': None,
@@ -89,25 +89,25 @@
'previous_unique_id': None,
'supported_features': 0,
'translation_key': 'brew_active',
- 'unique_id': 'GS012345_brew_active',
+ 'unique_id': 'GS01234_brew_active',
'unit_of_measurement': None,
})
# ---
-# name: test_binary_sensors[GS012345_water_tank_empty-binary_sensor]
+# name: test_binary_sensors[GS01234_water_tank_empty-binary_sensor]
StateSnapshot({
'attributes': ReadOnlyDict({
'device_class': 'problem',
- 'friendly_name': 'GS012345 Water tank empty',
+ 'friendly_name': 'GS01234 Water tank empty',
}),
'context': ,
- 'entity_id': 'binary_sensor.gs012345_water_tank_empty',
+ 'entity_id': 'binary_sensor.gs01234_water_tank_empty',
'last_changed': ,
'last_reported': ,
'last_updated': ,
'state': 'off',
})
# ---
-# name: test_binary_sensors[GS012345_water_tank_empty-entry]
+# name: test_binary_sensors[GS01234_water_tank_empty-entry]
EntityRegistryEntrySnapshot({
'aliases': set({
}),
@@ -119,7 +119,7 @@
'disabled_by': None,
'domain': 'binary_sensor',
'entity_category': ,
- 'entity_id': 'binary_sensor.gs012345_water_tank_empty',
+ 'entity_id': 'binary_sensor.gs01234_water_tank_empty',
'has_entity_name': True,
'hidden_by': None,
'icon': None,
@@ -136,7 +136,7 @@
'previous_unique_id': None,
'supported_features': 0,
'translation_key': 'water_tank',
- 'unique_id': 'GS012345_water_tank',
+ 'unique_id': 'GS01234_water_tank',
'unit_of_measurement': None,
})
# ---
diff --git a/tests/components/lamarzocco/snapshots/test_button.ambr b/tests/components/lamarzocco/snapshots/test_button.ambr
index 64d47a11072..023039cc6f7 100644
--- a/tests/components/lamarzocco/snapshots/test_button.ambr
+++ b/tests/components/lamarzocco/snapshots/test_button.ambr
@@ -2,10 +2,10 @@
# name: test_start_backflush
StateSnapshot({
'attributes': ReadOnlyDict({
- 'friendly_name': 'GS012345 Start backflush',
+ 'friendly_name': 'GS01234 Start backflush',
}),
'context': ,
- 'entity_id': 'button.gs012345_start_backflush',
+ 'entity_id': 'button.gs01234_start_backflush',
'last_changed': ,
'last_reported': ,
'last_updated': ,
@@ -24,7 +24,7 @@
'disabled_by': None,
'domain': 'button',
'entity_category': None,
- 'entity_id': 'button.gs012345_start_backflush',
+ 'entity_id': 'button.gs01234_start_backflush',
'has_entity_name': True,
'hidden_by': None,
'icon': None,
@@ -41,7 +41,7 @@
'previous_unique_id': None,
'supported_features': 0,
'translation_key': 'start_backflush',
- 'unique_id': 'GS012345_start_backflush',
+ 'unique_id': 'GS01234_start_backflush',
'unit_of_measurement': None,
})
# ---
diff --git a/tests/components/lamarzocco/snapshots/test_calendar.ambr b/tests/components/lamarzocco/snapshots/test_calendar.ambr
index 729eed5879a..2fd5dab846a 100644
--- a/tests/components/lamarzocco/snapshots/test_calendar.ambr
+++ b/tests/components/lamarzocco/snapshots/test_calendar.ambr
@@ -1,7 +1,7 @@
# serializer version: 1
# name: test_calendar_edge_cases[start_date0-end_date0]
dict({
- 'calendar.gs012345_auto_on_off_schedule_axfz5bj': dict({
+ 'calendar.gs01234_auto_on_off_schedule_axfz5bj': dict({
'events': list([
dict({
'description': 'Machine is scheduled to turn on at the start time and off at the end time',
@@ -15,7 +15,7 @@
# ---
# name: test_calendar_edge_cases[start_date1-end_date1]
dict({
- 'calendar.gs012345_auto_on_off_schedule_axfz5bj': dict({
+ 'calendar.gs01234_auto_on_off_schedule_axfz5bj': dict({
'events': list([
dict({
'description': 'Machine is scheduled to turn on at the start time and off at the end time',
@@ -29,7 +29,7 @@
# ---
# name: test_calendar_edge_cases[start_date2-end_date2]
dict({
- 'calendar.gs012345_auto_on_off_schedule_axfz5bj': dict({
+ 'calendar.gs01234_auto_on_off_schedule_axfz5bj': dict({
'events': list([
dict({
'description': 'Machine is scheduled to turn on at the start time and off at the end time',
@@ -43,7 +43,7 @@
# ---
# name: test_calendar_edge_cases[start_date3-end_date3]
dict({
- 'calendar.gs012345_auto_on_off_schedule_axfz5bj': dict({
+ 'calendar.gs01234_auto_on_off_schedule_axfz5bj': dict({
'events': list([
dict({
'description': 'Machine is scheduled to turn on at the start time and off at the end time',
@@ -57,7 +57,7 @@
# ---
# name: test_calendar_edge_cases[start_date4-end_date4]
dict({
- 'calendar.gs012345_auto_on_off_schedule_axfz5bj': dict({
+ 'calendar.gs01234_auto_on_off_schedule_axfz5bj': dict({
'events': list([
]),
}),
@@ -65,7 +65,7 @@
# ---
# name: test_calendar_edge_cases[start_date5-end_date5]
dict({
- 'calendar.gs012345_auto_on_off_schedule_axfz5bj': dict({
+ 'calendar.gs01234_auto_on_off_schedule_axfz5bj': dict({
'events': list([
dict({
'description': 'Machine is scheduled to turn on at the start time and off at the end time',
@@ -83,7 +83,7 @@
}),
})
# ---
-# name: test_calendar_events[entry.GS012345_auto_on_off_schedule_axfz5bj]
+# name: test_calendar_events[entry.GS01234_auto_on_off_schedule_axfz5bj]
EntityRegistryEntrySnapshot({
'aliases': set({
}),
@@ -95,7 +95,7 @@
'disabled_by': None,
'domain': 'calendar',
'entity_category': None,
- 'entity_id': 'calendar.gs012345_auto_on_off_schedule_axfz5bj',
+ 'entity_id': 'calendar.gs01234_auto_on_off_schedule_axfz5bj',
'has_entity_name': True,
'hidden_by': None,
'icon': None,
@@ -112,11 +112,11 @@
'previous_unique_id': None,
'supported_features': 0,
'translation_key': 'auto_on_off_schedule',
- 'unique_id': 'GS012345_auto_on_off_schedule_aXFz5bJ',
+ 'unique_id': 'GS01234_auto_on_off_schedule_aXFz5bJ',
'unit_of_measurement': None,
})
# ---
-# name: test_calendar_events[entry.GS012345_auto_on_off_schedule_os2oswx]
+# name: test_calendar_events[entry.GS01234_auto_on_off_schedule_os2oswx]
EntityRegistryEntrySnapshot({
'aliases': set({
}),
@@ -128,7 +128,7 @@
'disabled_by': None,
'domain': 'calendar',
'entity_category': None,
- 'entity_id': 'calendar.gs012345_auto_on_off_schedule_os2oswx',
+ 'entity_id': 'calendar.gs01234_auto_on_off_schedule_os2oswx',
'has_entity_name': True,
'hidden_by': None,
'icon': None,
@@ -145,13 +145,13 @@
'previous_unique_id': None,
'supported_features': 0,
'translation_key': 'auto_on_off_schedule',
- 'unique_id': 'GS012345_auto_on_off_schedule_Os2OswX',
+ 'unique_id': 'GS01234_auto_on_off_schedule_Os2OswX',
'unit_of_measurement': None,
})
# ---
-# name: test_calendar_events[events.GS012345_auto_on_off_schedule_axfz5bj]
+# name: test_calendar_events[events.GS01234_auto_on_off_schedule_axfz5bj]
dict({
- 'calendar.gs012345_auto_on_off_schedule_axfz5bj': dict({
+ 'calendar.gs01234_auto_on_off_schedule_axfz5bj': dict({
'events': list([
dict({
'description': 'Machine is scheduled to turn on at the start time and off at the end time',
@@ -181,9 +181,9 @@
}),
})
# ---
-# name: test_calendar_events[events.GS012345_auto_on_off_schedule_os2oswx]
+# name: test_calendar_events[events.GS01234_auto_on_off_schedule_os2oswx]
dict({
- 'calendar.gs012345_auto_on_off_schedule_os2oswx': dict({
+ 'calendar.gs01234_auto_on_off_schedule_os2oswx': dict({
'events': list([
dict({
'description': 'Machine is scheduled to turn on at the start time and off at the end time',
@@ -327,38 +327,38 @@
}),
})
# ---
-# name: test_calendar_events[state.GS012345_auto_on_off_schedule_axfz5bj]
+# name: test_calendar_events[state.GS01234_auto_on_off_schedule_axfz5bj]
StateSnapshot({
'attributes': ReadOnlyDict({
'all_day': False,
'description': 'Machine is scheduled to turn on at the start time and off at the end time',
'end_time': '2024-01-14 07:30:00',
- 'friendly_name': 'GS012345 Auto on/off schedule (aXFz5bJ)',
+ 'friendly_name': 'GS01234 Auto on/off schedule (aXFz5bJ)',
'location': '',
'message': 'Machine My LaMarzocco on',
'start_time': '2024-01-14 07:00:00',
}),
'context': ,
- 'entity_id': 'calendar.gs012345_auto_on_off_schedule_axfz5bj',
+ 'entity_id': 'calendar.gs01234_auto_on_off_schedule_axfz5bj',
'last_changed': ,
'last_reported': ,
'last_updated': ,
'state': 'off',
})
# ---
-# name: test_calendar_events[state.GS012345_auto_on_off_schedule_os2oswx]
+# name: test_calendar_events[state.GS01234_auto_on_off_schedule_os2oswx]
StateSnapshot({
'attributes': ReadOnlyDict({
'all_day': False,
'description': 'Machine is scheduled to turn on at the start time and off at the end time',
'end_time': '2024-01-13 00:00:00',
- 'friendly_name': 'GS012345 Auto on/off schedule (Os2OswX)',
+ 'friendly_name': 'GS01234 Auto on/off schedule (Os2OswX)',
'location': '',
'message': 'Machine My LaMarzocco on',
'start_time': '2024-01-12 22:00:00',
}),
'context': ,
- 'entity_id': 'calendar.gs012345_auto_on_off_schedule_os2oswx',
+ 'entity_id': 'calendar.gs01234_auto_on_off_schedule_os2oswx',
'last_changed': ,
'last_reported': ,
'last_updated': ,
@@ -367,7 +367,7 @@
# ---
# name: test_no_calendar_events_global_disable
dict({
- 'calendar.gs012345_auto_on_off_schedule_os2oswx': dict({
+ 'calendar.gs01234_auto_on_off_schedule_os2oswx': dict({
'events': list([
]),
}),
diff --git a/tests/components/lamarzocco/snapshots/test_number.ambr b/tests/components/lamarzocco/snapshots/test_number.ambr
index b7e42bb425f..bd54ce2c0b4 100644
--- a/tests/components/lamarzocco/snapshots/test_number.ambr
+++ b/tests/components/lamarzocco/snapshots/test_number.ambr
@@ -3,7 +3,7 @@
StateSnapshot({
'attributes': ReadOnlyDict({
'device_class': 'temperature',
- 'friendly_name': 'GS012345 Coffee target temperature',
+ 'friendly_name': 'GS01234 Coffee target temperature',
'max': 104,
'min': 85,
'mode': ,
@@ -11,7 +11,7 @@
'unit_of_measurement': ,
}),
'context': ,
- 'entity_id': 'number.gs012345_coffee_target_temperature',
+ 'entity_id': 'number.gs01234_coffee_target_temperature',
'last_changed': ,
'last_reported': ,
'last_updated': ,
@@ -35,7 +35,7 @@
'disabled_by': None,
'domain': 'number',
'entity_category': None,
- 'entity_id': 'number.gs012345_coffee_target_temperature',
+ 'entity_id': 'number.gs01234_coffee_target_temperature',
'has_entity_name': True,
'hidden_by': None,
'icon': None,
@@ -52,7 +52,7 @@
'previous_unique_id': None,
'supported_features': 0,
'translation_key': 'coffee_temp',
- 'unique_id': 'GS012345_coffee_temp',
+ 'unique_id': 'GS01234_coffee_temp',
'unit_of_measurement': ,
})
# ---
@@ -60,7 +60,7 @@
StateSnapshot({
'attributes': ReadOnlyDict({
'device_class': 'duration',
- 'friendly_name': 'GS012345 Smart standby time',
+ 'friendly_name': 'GS01234 Smart standby time',
'max': 240,
'min': 10,
'mode': ,
@@ -68,7 +68,7 @@
'unit_of_measurement': ,
}),
'context': ,
- 'entity_id': 'number.gs012345_smart_standby_time',
+ 'entity_id': 'number.gs01234_smart_standby_time',
'last_changed': ,
'last_reported': ,
'last_updated': ,
@@ -92,7 +92,7 @@
'disabled_by': None,
'domain': 'number',
'entity_category': ,
- 'entity_id': 'number.gs012345_smart_standby_time',
+ 'entity_id': 'number.gs01234_smart_standby_time',
'has_entity_name': True,
'hidden_by': None,
'icon': None,
@@ -109,7 +109,7 @@
'previous_unique_id': None,
'supported_features': 0,
'translation_key': 'smart_standby_time',
- 'unique_id': 'GS012345_smart_standby_time',
+ 'unique_id': 'GS01234_smart_standby_time',
'unit_of_measurement': ,
})
# ---
@@ -117,7 +117,7 @@
StateSnapshot({
'attributes': ReadOnlyDict({
'device_class': 'temperature',
- 'friendly_name': 'GS012345 Steam target temperature',
+ 'friendly_name': 'GS01234 Steam target temperature',
'max': 131,
'min': 126,
'mode': ,
@@ -125,7 +125,7 @@
'unit_of_measurement': ,
}),
'context': ,
- 'entity_id': 'number.gs012345_steam_target_temperature',
+ 'entity_id': 'number.gs01234_steam_target_temperature',
'last_changed': ,
'last_reported': ,
'last_updated': ,
@@ -149,7 +149,7 @@
'disabled_by': None,
'domain': 'number',
'entity_category': None,
- 'entity_id': 'number.gs012345_steam_target_temperature',
+ 'entity_id': 'number.gs01234_steam_target_temperature',
'has_entity_name': True,
'hidden_by': None,
'icon': None,
@@ -166,7 +166,7 @@
'previous_unique_id': None,
'supported_features': 0,
'translation_key': 'steam_temp',
- 'unique_id': 'GS012345_steam_temp',
+ 'unique_id': 'GS01234_steam_temp',
'unit_of_measurement': ,
})
# ---
@@ -174,7 +174,7 @@
StateSnapshot({
'attributes': ReadOnlyDict({
'device_class': 'temperature',
- 'friendly_name': 'GS012345 Steam target temperature',
+ 'friendly_name': 'GS01234 Steam target temperature',
'max': 131,
'min': 126,
'mode': ,
@@ -182,7 +182,7 @@
'unit_of_measurement': ,
}),
'context': ,
- 'entity_id': 'number.gs012345_steam_target_temperature',
+ 'entity_id': 'number.gs01234_steam_target_temperature',
'last_changed': ,
'last_reported': ,
'last_updated': ,
@@ -206,7 +206,7 @@
'disabled_by': None,
'domain': 'number',
'entity_category': None,
- 'entity_id': 'number.gs012345_steam_target_temperature',
+ 'entity_id': 'number.gs01234_steam_target_temperature',
'has_entity_name': True,
'hidden_by': None,
'icon': None,
@@ -223,7 +223,7 @@
'previous_unique_id': None,
'supported_features': 0,
'translation_key': 'steam_temp',
- 'unique_id': 'GS012345_steam_temp',
+ 'unique_id': 'GS01234_steam_temp',
'unit_of_measurement': ,
})
# ---
@@ -231,7 +231,7 @@
StateSnapshot({
'attributes': ReadOnlyDict({
'device_class': 'duration',
- 'friendly_name': 'GS012345 Tea water duration',
+ 'friendly_name': 'GS01234 Tea water duration',
'max': 30,
'min': 0,
'mode': ,
@@ -239,7 +239,7 @@
'unit_of_measurement': ,
}),
'context': ,
- 'entity_id': 'number.gs012345_tea_water_duration',
+ 'entity_id': 'number.gs01234_tea_water_duration',
'last_changed': ,
'last_reported': ,
'last_updated': ,
@@ -263,7 +263,7 @@
'disabled_by': None,
'domain': 'number',
'entity_category': None,
- 'entity_id': 'number.gs012345_tea_water_duration',
+ 'entity_id': 'number.gs01234_tea_water_duration',
'has_entity_name': True,
'hidden_by': None,
'icon': None,
@@ -280,7 +280,7 @@
'previous_unique_id': None,
'supported_features': 0,
'translation_key': 'tea_water_duration',
- 'unique_id': 'GS012345_tea_water_duration',
+ 'unique_id': 'GS01234_tea_water_duration',
'unit_of_measurement':