diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 80291c73e61..87fed908c6e 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,5 +1,6 @@
name: Report an issue with Home Assistant Core
description: Report an issue with Home Assistant Core.
+type: Bug
body:
- type: markdown
attributes:
diff --git a/.github/assets/screenshot-integrations.png b/.github/assets/screenshot-integrations.png
index 8d71bf538d6..abbc0f76ff0 100644
Binary files a/.github/assets/screenshot-integrations.png and b/.github/assets/screenshot-integrations.png differ
diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
new file mode 100644
index 00000000000..06499d62b9e
--- /dev/null
+++ b/.github/copilot-instructions.md
@@ -0,0 +1,100 @@
+# Instructions for GitHub Copilot
+
+This repository holds the core of Home Assistant, a Python 3 based home
+automation application.
+
+- Python code must be compatible with Python 3.13
+- Use the newest Python language features if possible:
+ - Pattern matching
+ - Type hints
+ - f-strings for string formatting over `%` or `.format()`
+ - Dataclasses
+ - Walrus operator
+- Code quality tools:
+ - Formatting: Ruff
+ - Linting: PyLint and Ruff
+ - Type checking: MyPy
+ - Testing: pytest with plain functions and fixtures
+- Inline code documentation:
+ - File headers should be short and concise:
+ ```python
+ """Integration for Peblar EV chargers."""
+ ```
+ - Every method and function needs a docstring:
+ ```python
+ async def async_setup_entry(hass: HomeAssistant, entry: PeblarConfigEntry) -> bool:
+ """Set up Peblar from a config entry."""
+ ...
+ ```
+- All code and comments and other text are written in American English
+- Follow existing code style patterns as much as possible
+- Core locations:
+ - Shared constants: `homeassistant/const.py`, use them instead of hardcoding
+ strings or creating duplicate integration constants.
+ - Integration files:
+ - Constants: `homeassistant/components/{domain}/const.py`
+ - Models: `homeassistant/components/{domain}/models.py`
+ - Coordinator: `homeassistant/components/{domain}/coordinator.py`
+ - Config flow: `homeassistant/components/{domain}/config_flow.py`
+ - Platform code: `homeassistant/components/{domain}/{platform}.py`
+- All external I/O operations must be async
+- Async patterns:
+ - Avoid sleeping in loops
+ - Avoid awaiting in loops, gather instead
+ - No blocking calls
+- Polling:
+ - Follow update coordinator pattern, when possible
+ - Polling interval may not be configurable by the user
+ - For local network polling, the minimum interval is 5 seconds
+ - For cloud polling, the minimum interval is 60 seconds
+- Error handling:
+ - Use specific exceptions from `homeassistant.exceptions`
+ - Setup failures:
+ - Temporary: Raise `ConfigEntryNotReady`
+ - Permanent: Use `ConfigEntryError`
+- Logging:
+ - Message format:
+ - No periods at end
+ - No integration names or domains (added automatically)
+ - No sensitive data (keys, tokens, passwords), even when those are incorrect.
+ - Be very restrictive on the use of logging info messages, use debug for
+ anything which is not targeting the user.
+ - Use lazy logging (no f-strings):
+ ```python
+ _LOGGER.debug("This is a log message with %s", variable)
+ ```
+- Entities:
+ - Ensure unique IDs for state persistence:
+ - Unique IDs should not contain values that are subject to user or network change.
+ - An ID needs to be unique per platform, not per integration.
+ - The ID does not have to contain the integration domain or platform.
+ - Acceptable examples:
+ - Serial number of a device
+ - MAC address of a device formatted using `homeassistant.helpers.device_registry.format_mac`
+ Do not obtain the MAC address through arp cache of local network access,
+ only use the MAC address provided by discovery or the device itself.
+ - Unique identifier that is physically printed on the device or burned into an EEPROM
+ - Not acceptable examples:
+ - IP Address
+ - Device name
+ - Hostname
+ - URL
+ - Email address
+ - Username
+ - For entities that are setup by a config entry, the config entry ID
+ can be used as a last resort if no other Unique ID is available.
+ For example: `f"{entry.entry_id}-battery"`
+ - If the state value is unknown, use `None`
+ - Do not use the `unavailable` string as a state value,
+ implement the `available()` property method instead
+ - Do not use the `unknown` string as a state value, use `None` instead
+- Extra entity state attributes:
+ - The keys of all state attributes should always be present
+ - If the value is unknown, use `None`
+ - Provide descriptive state attributes
+- Testing:
+ - Test location: `tests/components/{domain}/`
+ - Use pytest fixtures from `tests.common`
+ - Mock external dependencies
+ - Use snapshots for complex data
+ - Follow existing test patterns
diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
index cdffcbe4d5b..ce89d8c2b10 100644
--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@@ -32,7 +32,7 @@ jobs:
fetch-depth: 0
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
- uses: actions/setup-python@v5.4.0
+ uses: actions/setup-python@v5.5.0
with:
python-version: ${{ env.DEFAULT_PYTHON }}
@@ -69,7 +69,7 @@ jobs:
run: find ./homeassistant/components/*/translations -name "*.json" | tar zcvf translations.tar.gz -T -
- name: Upload translations
- uses: actions/upload-artifact@v4.6.0
+ uses: actions/upload-artifact@v4.6.2
with:
name: translations
path: translations.tar.gz
@@ -94,7 +94,7 @@ jobs:
- name: Download nightly wheels of frontend
if: needs.init.outputs.channel == 'dev'
- uses: dawidd6/action-download-artifact@v8
+ uses: dawidd6/action-download-artifact@v9
with:
github_token: ${{secrets.GITHUB_TOKEN}}
repo: home-assistant/frontend
@@ -105,7 +105,7 @@ jobs:
- name: Download nightly wheels of intents
if: needs.init.outputs.channel == 'dev'
- uses: dawidd6/action-download-artifact@v8
+ uses: dawidd6/action-download-artifact@v9
with:
github_token: ${{secrets.GITHUB_TOKEN}}
repo: home-assistant/intents-package
@@ -116,7 +116,7 @@ jobs:
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
if: needs.init.outputs.channel == 'dev'
- uses: actions/setup-python@v5.4.0
+ uses: actions/setup-python@v5.5.0
with:
python-version: ${{ env.DEFAULT_PYTHON }}
@@ -175,7 +175,7 @@ jobs:
sed -i "s|pykrakenapi|# pykrakenapi|g" requirements_all.txt
- name: Download translations
- uses: actions/download-artifact@v4.1.8
+ uses: actions/download-artifact@v4.2.1
with:
name: translations
@@ -190,14 +190,14 @@ jobs:
echo "${{ github.sha }};${{ github.ref }};${{ github.event_name }};${{ github.actor }}" > rootfs/OFFICIAL_IMAGE
- name: Login to GitHub Container Registry
- uses: docker/login-action@v3.3.0
+ uses: docker/login-action@v3.4.0
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build base image
- uses: home-assistant/builder@2024.08.2
+ uses: home-assistant/builder@2025.03.0
with:
args: |
$BUILD_ARGS \
@@ -256,14 +256,14 @@ jobs:
fi
- name: Login to GitHub Container Registry
- uses: docker/login-action@v3.3.0
+ uses: docker/login-action@v3.4.0
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build base image
- uses: home-assistant/builder@2024.08.2
+ uses: home-assistant/builder@2025.03.0
with:
args: |
$BUILD_ARGS \
@@ -324,20 +324,20 @@ jobs:
uses: actions/checkout@v4.2.2
- name: Install Cosign
- uses: sigstore/cosign-installer@v3.8.0
+ uses: sigstore/cosign-installer@v3.8.1
with:
cosign-release: "v2.2.3"
- name: Login to DockerHub
if: matrix.registry == 'docker.io/homeassistant'
- uses: docker/login-action@v3.3.0
+ uses: docker/login-action@v3.4.0
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Login to GitHub Container Registry
if: matrix.registry == 'ghcr.io/home-assistant'
- uses: docker/login-action@v3.3.0
+ uses: docker/login-action@v3.4.0
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
@@ -448,18 +448,21 @@ jobs:
environment: ${{ needs.init.outputs.channel }}
needs: ["init", "build_base"]
runs-on: ubuntu-latest
+ permissions:
+ contents: read
+ id-token: write
if: github.repository_owner == 'home-assistant' && needs.init.outputs.publish == 'true'
steps:
- name: Checkout the repository
uses: actions/checkout@v4.2.2
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
- uses: actions/setup-python@v5.4.0
+ uses: actions/setup-python@v5.5.0
with:
python-version: ${{ env.DEFAULT_PYTHON }}
- name: Download translations
- uses: actions/download-artifact@v4.1.8
+ uses: actions/download-artifact@v4.2.1
with:
name: translations
@@ -473,16 +476,13 @@ jobs:
run: |
# Remove dist, build, and homeassistant.egg-info
# when build locally for testing!
- pip install twine build
+ pip install build
python -m build
- - name: Upload package
- shell: bash
- run: |
- export TWINE_USERNAME="__token__"
- export TWINE_PASSWORD="${{ secrets.TWINE_TOKEN }}"
-
- twine upload dist/* --skip-existing
+ - name: Upload package to PyPI
+ uses: pypa/gh-action-pypi-publish@v1.12.4
+ with:
+ skip-existing: true
hassfest-image:
name: Build and test hassfest image
@@ -502,14 +502,14 @@ jobs:
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Login to GitHub Container Registry
- uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
+ uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build Docker image
- uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
+ uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
with:
context: . # So action will not pull the repository again
file: ./script/hassfest/docker/Dockerfile
@@ -522,7 +522,7 @@ jobs:
- name: Push Docker image
if: needs.init.outputs.channel != 'dev' && needs.init.outputs.publish == 'true'
id: push
- uses: docker/build-push-action@ca877d9245402d1537745e0e356eab47c3520991 # v6.13.0
+ uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
with:
context: . # So action will not pull the repository again
file: ./script/hassfest/docker/Dockerfile
@@ -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@520d128f165991a6c774bcb264f323e3d70747f4 # v2.2.0
+ uses: actions/attest-build-provenance@c074443f1aee8d4aeeae555aebba3282517141b2 # v2.2.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 2a9f1571830..d8fdda601dd 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -37,10 +37,10 @@ on:
type: boolean
env:
- CACHE_VERSION: 11
+ CACHE_VERSION: 12
UV_CACHE_VERSION: 1
MYPY_CACHE_VERSION: 9
- HA_SHORT_VERSION: "2025.3"
+ HA_SHORT_VERSION: "2025.5"
DEFAULT_PYTHON: "3.13"
ALL_PYTHON_VERSIONS: "['3.13']"
# 10.3 is the oldest supported version
@@ -89,6 +89,7 @@ jobs:
test_groups: ${{ steps.info.outputs.test_groups }}
tests_glob: ${{ steps.info.outputs.tests_glob }}
tests: ${{ steps.info.outputs.tests }}
+ lint_only: ${{ steps.info.outputs.lint_only }}
skip_coverage: ${{ steps.info.outputs.skip_coverage }}
runs-on: ubuntu-24.04
steps:
@@ -142,6 +143,7 @@ jobs:
test_group_count=10
tests="[]"
tests_glob=""
+ lint_only=""
skip_coverage=""
if [[ "${{ steps.integrations.outputs.changes }}" != "[]" ]];
@@ -192,6 +194,17 @@ jobs:
test_full_suite="true"
fi
+ if [[ "${{ github.event.inputs.lint-only }}" == "true" ]] \
+ || [[ "${{ github.event.inputs.pylint-only }}" == "true" ]] \
+ || [[ "${{ github.event.inputs.mypy-only }}" == "true" ]] \
+ || [[ "${{ github.event.inputs.audit-licenses-only }}" == "true" ]] \
+ || [[ "${{ github.event_name }}" == "push" \
+ && "${{ github.event.repository.full_name }}" != "home-assistant/core" ]];
+ then
+ lint_only="true"
+ skip_coverage="true"
+ fi
+
if [[ "${{ github.event.inputs.skip-coverage }}" == "true" ]] \
|| [[ "${{ contains(github.event.pull_request.labels.*.name, 'ci-skip-coverage') }}" == "true" ]];
then
@@ -217,6 +230,8 @@ jobs:
echo "tests=${tests}" >> $GITHUB_OUTPUT
echo "tests_glob: ${tests_glob}"
echo "tests_glob=${tests_glob}" >> $GITHUB_OUTPUT
+ echo "lint_only": ${lint_only}
+ echo "lint_only=${lint_only}" >> $GITHUB_OUTPUT
echo "skip_coverage: ${skip_coverage}"
echo "skip_coverage=${skip_coverage}" >> $GITHUB_OUTPUT
@@ -234,13 +249,13 @@ jobs:
uses: actions/checkout@v4.2.2
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
id: python
- uses: actions/setup-python@v5.4.0
+ uses: actions/setup-python@v5.5.0
with:
python-version: ${{ env.DEFAULT_PYTHON }}
check-latest: true
- name: Restore base Python virtual environment
id: cache-venv
- uses: actions/cache@v4.2.0
+ uses: actions/cache@v4.2.3
with:
path: venv
key: >-
@@ -256,7 +271,7 @@ jobs:
uv pip install "$(cat requirements_test.txt | grep pre-commit)"
- name: Restore pre-commit environment from cache
id: cache-precommit
- uses: actions/cache@v4.2.0
+ uses: actions/cache@v4.2.3
with:
path: ${{ env.PRE_COMMIT_CACHE }}
lookup-only: true
@@ -279,14 +294,14 @@ jobs:
- name: Check out code from GitHub
uses: actions/checkout@v4.2.2
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
- uses: actions/setup-python@v5.4.0
+ uses: actions/setup-python@v5.5.0
id: python
with:
python-version: ${{ env.DEFAULT_PYTHON }}
check-latest: true
- name: Restore base Python virtual environment
id: cache-venv
- uses: actions/cache/restore@v4.2.0
+ uses: actions/cache/restore@v4.2.3
with:
path: venv
fail-on-cache-miss: true
@@ -295,7 +310,7 @@ jobs:
needs.info.outputs.pre-commit_cache_key }}
- name: Restore pre-commit environment from cache
id: cache-precommit
- uses: actions/cache/restore@v4.2.0
+ uses: actions/cache/restore@v4.2.3
with:
path: ${{ env.PRE_COMMIT_CACHE }}
fail-on-cache-miss: true
@@ -319,14 +334,14 @@ jobs:
- name: Check out code from GitHub
uses: actions/checkout@v4.2.2
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
- uses: actions/setup-python@v5.4.0
+ uses: actions/setup-python@v5.5.0
id: python
with:
python-version: ${{ env.DEFAULT_PYTHON }}
check-latest: true
- name: Restore base Python virtual environment
id: cache-venv
- uses: actions/cache/restore@v4.2.0
+ uses: actions/cache/restore@v4.2.3
with:
path: venv
fail-on-cache-miss: true
@@ -335,7 +350,7 @@ jobs:
needs.info.outputs.pre-commit_cache_key }}
- name: Restore pre-commit environment from cache
id: cache-precommit
- uses: actions/cache/restore@v4.2.0
+ uses: actions/cache/restore@v4.2.3
with:
path: ${{ env.PRE_COMMIT_CACHE }}
fail-on-cache-miss: true
@@ -359,14 +374,14 @@ jobs:
- name: Check out code from GitHub
uses: actions/checkout@v4.2.2
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
- uses: actions/setup-python@v5.4.0
+ uses: actions/setup-python@v5.5.0
id: python
with:
python-version: ${{ env.DEFAULT_PYTHON }}
check-latest: true
- name: Restore base Python virtual environment
id: cache-venv
- uses: actions/cache/restore@v4.2.0
+ uses: actions/cache/restore@v4.2.3
with:
path: venv
fail-on-cache-miss: true
@@ -375,7 +390,7 @@ jobs:
needs.info.outputs.pre-commit_cache_key }}
- name: Restore pre-commit environment from cache
id: cache-precommit
- uses: actions/cache/restore@v4.2.0
+ uses: actions/cache/restore@v4.2.3
with:
path: ${{ env.PRE_COMMIT_CACHE }}
fail-on-cache-miss: true
@@ -469,7 +484,7 @@ jobs:
uses: actions/checkout@v4.2.2
- name: Set up Python ${{ matrix.python-version }}
id: python
- uses: actions/setup-python@v5.4.0
+ uses: actions/setup-python@v5.5.0
with:
python-version: ${{ matrix.python-version }}
check-latest: true
@@ -482,7 +497,7 @@ jobs:
env.HA_SHORT_VERSION }}-$(date -u '+%Y-%m-%dT%H:%M:%s')" >> $GITHUB_OUTPUT
- name: Restore base Python virtual environment
id: cache-venv
- uses: actions/cache@v4.2.0
+ uses: actions/cache@v4.2.3
with:
path: venv
key: >-
@@ -490,7 +505,7 @@ jobs:
needs.info.outputs.python_cache_key }}
- name: Restore uv wheel cache
if: steps.cache-venv.outputs.cache-hit != 'true'
- uses: actions/cache@v4.2.0
+ uses: actions/cache@v4.2.3
with:
path: ${{ env.UV_CACHE_DIR }}
key: >-
@@ -537,7 +552,7 @@ jobs:
python --version
uv pip freeze >> pip_freeze.txt
- name: Upload pip_freeze artifact
- uses: actions/upload-artifact@v4.6.0
+ uses: actions/upload-artifact@v4.6.2
with:
name: pip-freeze-${{ matrix.python-version }}
path: pip_freeze.txt
@@ -572,13 +587,13 @@ jobs:
uses: actions/checkout@v4.2.2
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
id: python
- uses: actions/setup-python@v5.4.0
+ uses: actions/setup-python@v5.5.0
with:
python-version: ${{ env.DEFAULT_PYTHON }}
check-latest: true
- name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
id: cache-venv
- uses: actions/cache/restore@v4.2.0
+ uses: actions/cache/restore@v4.2.3
with:
path: venv
fail-on-cache-miss: true
@@ -605,13 +620,13 @@ jobs:
uses: actions/checkout@v4.2.2
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
id: python
- uses: actions/setup-python@v5.4.0
+ uses: actions/setup-python@v5.5.0
with:
python-version: ${{ env.DEFAULT_PYTHON }}
check-latest: true
- name: Restore base Python virtual environment
id: cache-venv
- uses: actions/cache/restore@v4.2.0
+ uses: actions/cache/restore@v4.2.3
with:
path: venv
fail-on-cache-miss: true
@@ -623,6 +638,25 @@ jobs:
. venv/bin/activate
python -m script.gen_requirements_all validate
+ dependency-review:
+ name: Dependency review
+ runs-on: ubuntu-24.04
+ needs:
+ - info
+ - base
+ if: |
+ github.event.inputs.pylint-only != 'true'
+ && github.event.inputs.mypy-only != 'true'
+ && needs.info.outputs.requirements == 'true'
+ && github.event_name == 'pull_request'
+ steps:
+ - name: Check out code from GitHub
+ uses: actions/checkout@v4.2.2
+ - name: Dependency review
+ uses: actions/dependency-review-action@v4.6.0
+ with:
+ license-check: false # We use our own license audit checks
+
audit-licenses:
name: Audit licenses
runs-on: ubuntu-24.04
@@ -643,13 +677,13 @@ jobs:
uses: actions/checkout@v4.2.2
- name: Set up Python ${{ matrix.python-version }}
id: python
- uses: actions/setup-python@v5.4.0
+ uses: actions/setup-python@v5.5.0
with:
python-version: ${{ matrix.python-version }}
check-latest: true
- name: Restore full Python ${{ matrix.python-version }} virtual environment
id: cache-venv
- uses: actions/cache/restore@v4.2.0
+ uses: actions/cache/restore@v4.2.3
with:
path: venv
fail-on-cache-miss: true
@@ -661,7 +695,7 @@ jobs:
. venv/bin/activate
python -m script.licenses extract --output-file=licenses-${{ matrix.python-version }}.json
- name: Upload licenses
- uses: actions/upload-artifact@v4.6.0
+ uses: actions/upload-artifact@v4.6.2
with:
name: licenses-${{ github.run_number }}-${{ matrix.python-version }}
path: licenses-${{ matrix.python-version }}.json
@@ -686,13 +720,13 @@ jobs:
uses: actions/checkout@v4.2.2
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
id: python
- uses: actions/setup-python@v5.4.0
+ uses: actions/setup-python@v5.5.0
with:
python-version: ${{ env.DEFAULT_PYTHON }}
check-latest: true
- name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
id: cache-venv
- uses: actions/cache/restore@v4.2.0
+ uses: actions/cache/restore@v4.2.3
with:
path: venv
fail-on-cache-miss: true
@@ -733,13 +767,13 @@ jobs:
uses: actions/checkout@v4.2.2
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
id: python
- uses: actions/setup-python@v5.4.0
+ uses: actions/setup-python@v5.5.0
with:
python-version: ${{ env.DEFAULT_PYTHON }}
check-latest: true
- name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
id: cache-venv
- uses: actions/cache/restore@v4.2.0
+ uses: actions/cache/restore@v4.2.3
with:
path: venv
fail-on-cache-miss: true
@@ -778,7 +812,7 @@ jobs:
uses: actions/checkout@v4.2.2
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
id: python
- uses: actions/setup-python@v5.4.0
+ uses: actions/setup-python@v5.5.0
with:
python-version: ${{ env.DEFAULT_PYTHON }}
check-latest: true
@@ -791,7 +825,7 @@ jobs:
env.HA_SHORT_VERSION }}-$(date -u '+%Y-%m-%dT%H:%M:%s')" >> $GITHUB_OUTPUT
- name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
id: cache-venv
- uses: actions/cache/restore@v4.2.0
+ uses: actions/cache/restore@v4.2.3
with:
path: venv
fail-on-cache-miss: true
@@ -799,7 +833,7 @@ jobs:
${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
needs.info.outputs.python_cache_key }}
- name: Restore mypy cache
- uses: actions/cache@v4.2.0
+ uses: actions/cache@v4.2.3
with:
path: .mypy_cache
key: >-
@@ -829,11 +863,7 @@ jobs:
prepare-pytest-full:
runs-on: ubuntu-24.04
if: |
- (github.event_name != 'push' || github.event.repository.full_name == 'home-assistant/core')
- && github.event.inputs.lint-only != 'true'
- && github.event.inputs.pylint-only != 'true'
- && github.event.inputs.mypy-only != 'true'
- && github.event.inputs.audit-licenses-only != 'true'
+ needs.info.outputs.lint_only != 'true'
&& needs.info.outputs.test_full_suite == 'true'
needs:
- info
@@ -859,13 +889,13 @@ jobs:
uses: actions/checkout@v4.2.2
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
id: python
- uses: actions/setup-python@v5.4.0
+ uses: actions/setup-python@v5.5.0
with:
python-version: ${{ env.DEFAULT_PYTHON }}
check-latest: true
- name: Restore base Python virtual environment
id: cache-venv
- uses: actions/cache/restore@v4.2.0
+ uses: actions/cache/restore@v4.2.3
with:
path: venv
fail-on-cache-miss: true
@@ -877,7 +907,7 @@ jobs:
. venv/bin/activate
python -m script.split_tests ${{ needs.info.outputs.test_group_count }} tests
- name: Upload pytest_buckets
- uses: actions/upload-artifact@v4.6.0
+ uses: actions/upload-artifact@v4.6.2
with:
name: pytest_buckets
path: pytest_buckets.txt
@@ -886,11 +916,7 @@ jobs:
pytest-full:
runs-on: ubuntu-24.04
if: |
- (github.event_name != 'push' || github.event.repository.full_name == 'home-assistant/core')
- && github.event.inputs.lint-only != 'true'
- && github.event.inputs.pylint-only != 'true'
- && github.event.inputs.mypy-only != 'true'
- && github.event.inputs.audit-licenses-only != 'true'
+ needs.info.outputs.lint_only != 'true'
&& needs.info.outputs.test_full_suite == 'true'
needs:
- info
@@ -923,13 +949,13 @@ jobs:
uses: actions/checkout@v4.2.2
- name: Set up Python ${{ matrix.python-version }}
id: python
- uses: actions/setup-python@v5.4.0
+ uses: actions/setup-python@v5.5.0
with:
python-version: ${{ matrix.python-version }}
check-latest: true
- name: Restore full Python ${{ matrix.python-version }} virtual environment
id: cache-venv
- uses: actions/cache/restore@v4.2.0
+ uses: actions/cache/restore@v4.2.3
with:
path: venv
fail-on-cache-miss: true
@@ -942,7 +968,7 @@ jobs:
run: |
echo "::add-matcher::.github/workflows/matchers/pytest-slow.json"
- name: Download pytest_buckets
- uses: actions/download-artifact@v4.1.8
+ uses: actions/download-artifact@v4.2.1
with:
name: pytest_buckets
- name: Compile English translations
@@ -962,6 +988,7 @@ jobs:
if [[ "${{ needs.info.outputs.skip_coverage }}" != "true" ]]; then
cov_params+=(--cov="homeassistant")
cov_params+=(--cov-report=xml)
+ cov_params+=(--junitxml=junit.xml -o junit_family=legacy)
fi
echo "Test group ${{ matrix.group }}: $(sed -n "${{ matrix.group }},1p" pytest_buckets.txt)"
@@ -980,18 +1007,24 @@ jobs:
2>&1 | tee pytest-${{ matrix.python-version }}-${{ matrix.group }}.txt
- name: Upload pytest output
if: success() || failure() && steps.pytest-full.conclusion == 'failure'
- uses: actions/upload-artifact@v4.6.0
+ uses: actions/upload-artifact@v4.6.2
with:
name: pytest-${{ github.run_number }}-${{ matrix.python-version }}-${{ matrix.group }}
path: pytest-*.txt
overwrite: true
- name: Upload coverage artifact
if: needs.info.outputs.skip_coverage != 'true'
- uses: actions/upload-artifact@v4.6.0
+ uses: actions/upload-artifact@v4.6.2
with:
name: coverage-${{ matrix.python-version }}-${{ matrix.group }}
path: coverage.xml
overwrite: true
+ - name: Upload test results artifact
+ if: needs.info.outputs.skip_coverage != 'true' && !cancelled()
+ uses: actions/upload-artifact@v4.6.2
+ with:
+ name: test-results-full-${{ matrix.python-version }}-${{ matrix.group }}
+ path: junit.xml
- name: Remove pytest_buckets
run: rm pytest_buckets.txt
- name: Check dirty
@@ -1009,11 +1042,7 @@ jobs:
MYSQL_ROOT_PASSWORD: password
options: --health-cmd="mysqladmin ping -uroot -ppassword" --health-interval=5s --health-timeout=2s --health-retries=3
if: |
- (github.event_name != 'push' || github.event.repository.full_name == 'home-assistant/core')
- && github.event.inputs.lint-only != 'true'
- && github.event.inputs.pylint-only != 'true'
- && github.event.inputs.mypy-only != 'true'
- && github.event.inputs.audit-licenses-only != 'true'
+ needs.info.outputs.lint_only != 'true'
&& needs.info.outputs.mariadb_groups != '[]'
needs:
- info
@@ -1045,13 +1074,13 @@ jobs:
uses: actions/checkout@v4.2.2
- name: Set up Python ${{ matrix.python-version }}
id: python
- uses: actions/setup-python@v5.4.0
+ uses: actions/setup-python@v5.5.0
with:
python-version: ${{ matrix.python-version }}
check-latest: true
- name: Restore full Python ${{ matrix.python-version }} virtual environment
id: cache-venv
- uses: actions/cache/restore@v4.2.0
+ uses: actions/cache/restore@v4.2.3
with:
path: venv
fail-on-cache-miss: true
@@ -1088,6 +1117,7 @@ jobs:
cov_params+=(--cov="homeassistant.components.recorder")
cov_params+=(--cov-report=xml)
cov_params+=(--cov-report=term-missing)
+ cov_params+=(--junitxml=junit.xml -o junit_family=legacy)
fi
python3 -b -X dev -m pytest \
@@ -1108,7 +1138,7 @@ jobs:
2>&1 | tee pytest-${{ matrix.python-version }}-${mariadb}.txt
- name: Upload pytest output
if: success() || failure() && steps.pytest-partial.conclusion == 'failure'
- uses: actions/upload-artifact@v4.6.0
+ uses: actions/upload-artifact@v4.6.2
with:
name: pytest-${{ github.run_number }}-${{ matrix.python-version }}-${{
steps.pytest-partial.outputs.mariadb }}
@@ -1116,12 +1146,19 @@ jobs:
overwrite: true
- name: Upload coverage artifact
if: needs.info.outputs.skip_coverage != 'true'
- uses: actions/upload-artifact@v4.6.0
+ uses: actions/upload-artifact@v4.6.2
with:
name: coverage-${{ matrix.python-version }}-${{
steps.pytest-partial.outputs.mariadb }}
path: coverage.xml
overwrite: true
+ - name: Upload test results artifact
+ if: needs.info.outputs.skip_coverage != 'true' && !cancelled()
+ uses: actions/upload-artifact@v4.6.2
+ with:
+ name: test-results-mariadb-${{ matrix.python-version }}-${{
+ steps.pytest-partial.outputs.mariadb }}
+ path: junit.xml
- name: Check dirty
run: |
./script/check_dirty
@@ -1137,11 +1174,7 @@ jobs:
POSTGRES_PASSWORD: password
options: --health-cmd="pg_isready -hlocalhost -Upostgres" --health-interval=5s --health-timeout=2s --health-retries=3
if: |
- (github.event_name != 'push' || github.event.repository.full_name == 'home-assistant/core')
- && github.event.inputs.lint-only != 'true'
- && github.event.inputs.pylint-only != 'true'
- && github.event.inputs.mypy-only != 'true'
- && github.event.inputs.audit-licenses-only != 'true'
+ needs.info.outputs.lint_only != 'true'
&& needs.info.outputs.postgresql_groups != '[]'
needs:
- info
@@ -1175,13 +1208,13 @@ jobs:
uses: actions/checkout@v4.2.2
- name: Set up Python ${{ matrix.python-version }}
id: python
- uses: actions/setup-python@v5.4.0
+ uses: actions/setup-python@v5.5.0
with:
python-version: ${{ matrix.python-version }}
check-latest: true
- name: Restore full Python ${{ matrix.python-version }} virtual environment
id: cache-venv
- uses: actions/cache/restore@v4.2.0
+ uses: actions/cache/restore@v4.2.3
with:
path: venv
fail-on-cache-miss: true
@@ -1218,6 +1251,7 @@ jobs:
cov_params+=(--cov="homeassistant.components.recorder")
cov_params+=(--cov-report=xml)
cov_params+=(--cov-report=term-missing)
+ cov_params+=(--junitxml=junit.xml -o junit_family=legacy)
fi
python3 -b -X dev -m pytest \
@@ -1239,7 +1273,7 @@ jobs:
2>&1 | tee pytest-${{ matrix.python-version }}-${postgresql}.txt
- name: Upload pytest output
if: success() || failure() && steps.pytest-partial.conclusion == 'failure'
- uses: actions/upload-artifact@v4.6.0
+ uses: actions/upload-artifact@v4.6.2
with:
name: pytest-${{ github.run_number }}-${{ matrix.python-version }}-${{
steps.pytest-partial.outputs.postgresql }}
@@ -1247,12 +1281,19 @@ jobs:
overwrite: true
- name: Upload coverage artifact
if: needs.info.outputs.skip_coverage != 'true'
- uses: actions/upload-artifact@v4.6.0
+ uses: actions/upload-artifact@v4.6.2
with:
name: coverage-${{ matrix.python-version }}-${{
steps.pytest-partial.outputs.postgresql }}
path: coverage.xml
overwrite: true
+ - name: Upload test results artifact
+ if: needs.info.outputs.skip_coverage != 'true' && !cancelled()
+ uses: actions/upload-artifact@v4.6.2
+ with:
+ name: test-results-postgres-${{ matrix.python-version }}-${{
+ steps.pytest-partial.outputs.postgresql }}
+ path: junit.xml
- name: Check dirty
run: |
./script/check_dirty
@@ -1271,12 +1312,12 @@ jobs:
- name: Check out code from GitHub
uses: actions/checkout@v4.2.2
- name: Download all coverage artifacts
- uses: actions/download-artifact@v4.1.8
+ uses: actions/download-artifact@v4.2.1
with:
pattern: coverage-*
- name: Upload coverage to Codecov
if: needs.info.outputs.test_full_suite == 'true'
- uses: codecov/codecov-action@v5.3.1
+ uses: codecov/codecov-action@v5.4.2
with:
fail_ci_if_error: true
flags: full-suite
@@ -1285,11 +1326,7 @@ jobs:
pytest-partial:
runs-on: ubuntu-24.04
if: |
- (github.event_name != 'push' || github.event.repository.full_name == 'home-assistant/core')
- && github.event.inputs.lint-only != 'true'
- && github.event.inputs.pylint-only != 'true'
- && github.event.inputs.mypy-only != 'true'
- && github.event.inputs.audit-licenses-only != 'true'
+ needs.info.outputs.lint_only != 'true'
&& needs.info.outputs.tests_glob
&& needs.info.outputs.test_full_suite == 'false'
needs:
@@ -1322,13 +1359,13 @@ jobs:
uses: actions/checkout@v4.2.2
- name: Set up Python ${{ matrix.python-version }}
id: python
- uses: actions/setup-python@v5.4.0
+ uses: actions/setup-python@v5.5.0
with:
python-version: ${{ matrix.python-version }}
check-latest: true
- name: Restore full Python ${{ matrix.python-version }} virtual environment
id: cache-venv
- uses: actions/cache/restore@v4.2.0
+ uses: actions/cache/restore@v4.2.3
with:
path: venv
fail-on-cache-miss: true
@@ -1365,6 +1402,7 @@ jobs:
cov_params+=(--cov="homeassistant.components.${{ matrix.group }}")
cov_params+=(--cov-report=xml)
cov_params+=(--cov-report=term-missing)
+ cov_params+=(--junitxml=junit.xml -o junit_family=legacy)
fi
python3 -b -X dev -m pytest \
@@ -1382,18 +1420,24 @@ jobs:
2>&1 | tee pytest-${{ matrix.python-version }}-${{ matrix.group }}.txt
- name: Upload pytest output
if: success() || failure() && steps.pytest-partial.conclusion == 'failure'
- uses: actions/upload-artifact@v4.6.0
+ uses: actions/upload-artifact@v4.6.2
with:
name: pytest-${{ github.run_number }}-${{ matrix.python-version }}-${{ matrix.group }}
path: pytest-*.txt
overwrite: true
- name: Upload coverage artifact
if: needs.info.outputs.skip_coverage != 'true'
- uses: actions/upload-artifact@v4.6.0
+ uses: actions/upload-artifact@v4.6.2
with:
name: coverage-${{ matrix.python-version }}-${{ matrix.group }}
path: coverage.xml
overwrite: true
+ - name: Upload test results artifact
+ if: needs.info.outputs.skip_coverage != 'true' && !cancelled()
+ uses: actions/upload-artifact@v4.6.2
+ with:
+ name: test-results-partial-${{ matrix.python-version }}-${{ matrix.group }}
+ path: junit.xml
- name: Check dirty
run: |
./script/check_dirty
@@ -1410,12 +1454,37 @@ jobs:
- name: Check out code from GitHub
uses: actions/checkout@v4.2.2
- name: Download all coverage artifacts
- uses: actions/download-artifact@v4.1.8
+ uses: actions/download-artifact@v4.2.1
with:
pattern: coverage-*
- name: Upload coverage to Codecov
if: needs.info.outputs.test_full_suite == 'false'
- uses: codecov/codecov-action@v5.3.1
+ uses: codecov/codecov-action@v5.4.2
with:
fail_ci_if_error: true
token: ${{ secrets.CODECOV_TOKEN }}
+
+ upload-test-results:
+ name: Upload test results to Codecov
+ # codecov/test-results-action currently doesn't support tokenless uploads
+ # therefore we can't run it on forks
+ if: ${{ (github.event_name != 'pull_request' || !github.event.pull_request.head.repo.fork) && needs.info.outputs.skip_coverage != 'true' && !cancelled() }}
+ runs-on: ubuntu-24.04
+ needs:
+ - info
+ - pytest-partial
+ - pytest-full
+ - pytest-postgres
+ - pytest-mariadb
+ timeout-minutes: 10
+ steps:
+ - name: Download all coverage artifacts
+ uses: actions/download-artifact@v4.2.1
+ with:
+ pattern: test-results-*
+ - name: Upload test results to Codecov
+ uses: codecov/test-results-action@v1
+ with:
+ fail_ci_if_error: true
+ verbose: true
+ token: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index c1272759acc..9a926c18d76 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.28.8
+ uses: github/codeql-action/init@v3.28.15
with:
languages: python
- name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@v3.28.8
+ uses: github/codeql-action/analyze@v3.28.15
with:
category: "/language:python"
diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml
index 619d83aef51..0b6abe8fe2c 100644
--- a/.github/workflows/translations.yml
+++ b/.github/workflows/translations.yml
@@ -22,7 +22,7 @@ jobs:
uses: actions/checkout@v4.2.2
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
- uses: actions/setup-python@v5.4.0
+ uses: actions/setup-python@v5.5.0
with:
python-version: ${{ env.DEFAULT_PYTHON }}
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 41e7b351184..d27a62bab80 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -36,7 +36,7 @@ jobs:
- name: Set up Python ${{ env.DEFAULT_PYTHON }}
id: python
- uses: actions/setup-python@v5.4.0
+ uses: actions/setup-python@v5.5.0
with:
python-version: ${{ env.DEFAULT_PYTHON }}
check-latest: true
@@ -91,7 +91,7 @@ jobs:
) > build_constraints.txt
- name: Upload env_file
- uses: actions/upload-artifact@v4.6.0
+ uses: actions/upload-artifact@v4.6.2
with:
name: env_file
path: ./.env_file
@@ -99,14 +99,14 @@ jobs:
overwrite: true
- name: Upload build_constraints
- uses: actions/upload-artifact@v4.6.0
+ uses: actions/upload-artifact@v4.6.2
with:
name: build_constraints
path: ./build_constraints.txt
overwrite: true
- name: Upload requirements_diff
- uses: actions/upload-artifact@v4.6.0
+ uses: actions/upload-artifact@v4.6.2
with:
name: requirements_diff
path: ./requirements_diff.txt
@@ -118,7 +118,7 @@ jobs:
python -m script.gen_requirements_all ci
- name: Upload requirements_all_wheels
- uses: actions/upload-artifact@v4.6.0
+ uses: actions/upload-artifact@v4.6.2
with:
name: requirements_all_wheels
path: ./requirements_all_wheels_*.txt
@@ -138,17 +138,17 @@ jobs:
uses: actions/checkout@v4.2.2
- name: Download env_file
- uses: actions/download-artifact@v4.1.8
+ uses: actions/download-artifact@v4.2.1
with:
name: env_file
- name: Download build_constraints
- uses: actions/download-artifact@v4.1.8
+ uses: actions/download-artifact@v4.2.1
with:
name: build_constraints
- name: Download requirements_diff
- uses: actions/download-artifact@v4.1.8
+ uses: actions/download-artifact@v4.2.1
with:
name: requirements_diff
@@ -159,7 +159,7 @@ jobs:
sed -i "/uv/d" requirements_diff.txt
- name: Build wheels
- uses: home-assistant/wheels@2024.11.0
+ uses: home-assistant/wheels@2025.03.0
with:
abi: ${{ matrix.abi }}
tag: musllinux_1_2
@@ -187,22 +187,22 @@ jobs:
uses: actions/checkout@v4.2.2
- name: Download env_file
- uses: actions/download-artifact@v4.1.8
+ uses: actions/download-artifact@v4.2.1
with:
name: env_file
- name: Download build_constraints
- uses: actions/download-artifact@v4.1.8
+ uses: actions/download-artifact@v4.2.1
with:
name: build_constraints
- name: Download requirements_diff
- uses: actions/download-artifact@v4.1.8
+ uses: actions/download-artifact@v4.2.1
with:
name: requirements_diff
- name: Download requirements_all_wheels
- uses: actions/download-artifact@v4.1.8
+ uses: actions/download-artifact@v4.2.1
with:
name: requirements_all_wheels
@@ -218,16 +218,8 @@ jobs:
sed -i "/uv/d" requirements.txt
sed -i "/uv/d" requirements_diff.txt
- - name: Split requirements all
- run: |
- # We split requirements all into multiple files.
- # This is to prevent the build from running out of memory when
- # resolving packages on 32-bits systems (like armhf, armv7).
-
- split -l $(expr $(expr $(cat requirements_all.txt | wc -l) + 1) / 3) requirements_all_wheels_${{ matrix.arch }}.txt requirements_all.txt
-
- - name: Build wheels (part 1)
- uses: home-assistant/wheels@2024.11.0
+ - name: Build wheels
+ uses: home-assistant/wheels@2025.03.0
with:
abi: ${{ matrix.abi }}
tag: musllinux_1_2
@@ -238,32 +230,4 @@ jobs:
skip-binary: aiohttp;charset-normalizer;grpcio;multidict;SQLAlchemy;propcache;protobuf;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
- 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-ng-dev"
- skip-binary: aiohttp;charset-normalizer;grpcio;multidict;SQLAlchemy;propcache;protobuf;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
- 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-ng-dev"
- skip-binary: aiohttp;charset-normalizer;grpcio;multidict;SQLAlchemy;propcache;protobuf;pymicro-vad;yarl
- constraints: "homeassistant/package_constraints.txt"
- requirements-diff: "requirements_diff.txt"
- requirements: "requirements_all.txtac"
+ requirements: "requirements_all.txt"
diff --git a/.gitignore b/.gitignore
index 241255253c5..5aa51c9d762 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,6 +69,7 @@ test-reports/
test-results.xml
test-output.xml
pytest-*.txt
+junit.xml
# Translations
*.mo
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index a059710d3d7..42e05a869c3 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.9.1
+ rev: v0.11.0
hooks:
- id: ruff
args:
diff --git a/.strict-typing b/.strict-typing
index 1e3187980cc..69d46958882 100644
--- a/.strict-typing
+++ b/.strict-typing
@@ -103,6 +103,7 @@ homeassistant.components.auth.*
homeassistant.components.automation.*
homeassistant.components.awair.*
homeassistant.components.axis.*
+homeassistant.components.azure_storage.*
homeassistant.components.backup.*
homeassistant.components.baf.*
homeassistant.components.bang_olufsen.*
@@ -118,6 +119,7 @@ homeassistant.components.bluetooth_adapters.*
homeassistant.components.bluetooth_tracker.*
homeassistant.components.bmw_connected_drive.*
homeassistant.components.bond.*
+homeassistant.components.bosch_alarm.*
homeassistant.components.braviatv.*
homeassistant.components.bring.*
homeassistant.components.brother.*
@@ -135,6 +137,7 @@ homeassistant.components.clicksend.*
homeassistant.components.climate.*
homeassistant.components.cloud.*
homeassistant.components.co2signal.*
+homeassistant.components.comelit.*
homeassistant.components.command_line.*
homeassistant.components.config.*
homeassistant.components.configurator.*
@@ -234,6 +237,7 @@ homeassistant.components.here_travel_time.*
homeassistant.components.history.*
homeassistant.components.history_stats.*
homeassistant.components.holiday.*
+homeassistant.components.home_connect.*
homeassistant.components.homeassistant.*
homeassistant.components.homeassistant_alerts.*
homeassistant.components.homeassistant_green.*
@@ -287,6 +291,7 @@ homeassistant.components.kaleidescape.*
homeassistant.components.knocki.*
homeassistant.components.knx.*
homeassistant.components.kraken.*
+homeassistant.components.kulersky.*
homeassistant.components.lacrosse.*
homeassistant.components.lacrosse_view.*
homeassistant.components.lamarzocco.*
@@ -360,6 +365,7 @@ homeassistant.components.notify.*
homeassistant.components.notion.*
homeassistant.components.number.*
homeassistant.components.nut.*
+homeassistant.components.ohme.*
homeassistant.components.onboarding.*
homeassistant.components.oncue.*
homeassistant.components.onedrive.*
@@ -394,6 +400,7 @@ homeassistant.components.pure_energie.*
homeassistant.components.purpleair.*
homeassistant.components.pushbullet.*
homeassistant.components.pvoutput.*
+homeassistant.components.pyload.*
homeassistant.components.python_script.*
homeassistant.components.qbus.*
homeassistant.components.qnap_qsw.*
@@ -406,7 +413,9 @@ homeassistant.components.raspberry_pi.*
homeassistant.components.rdw.*
homeassistant.components.recollect_waste.*
homeassistant.components.recorder.*
+homeassistant.components.remember_the_milk.*
homeassistant.components.remote.*
+homeassistant.components.remote_calendar.*
homeassistant.components.renault.*
homeassistant.components.reolink.*
homeassistant.components.repairs.*
@@ -437,6 +446,7 @@ homeassistant.components.select.*
homeassistant.components.sensibo.*
homeassistant.components.sensirion_ble.*
homeassistant.components.sensor.*
+homeassistant.components.sensorpush_cloud.*
homeassistant.components.sensoterra.*
homeassistant.components.senz.*
homeassistant.components.sfr_box.*
@@ -524,6 +534,7 @@ homeassistant.components.vallox.*
homeassistant.components.valve.*
homeassistant.components.velbus.*
homeassistant.components.vlc_telnet.*
+homeassistant.components.vodafone_station.*
homeassistant.components.wake_on_lan.*
homeassistant.components.wake_word.*
homeassistant.components.wallbox.*
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 7b77a1c9bfd..459a9e6acc5 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -38,10 +38,17 @@
"module": "pytest",
"justMyCode": false,
"args": [
- "--timeout=10",
"--picked"
],
},
+ {
+ "name": "Home Assistant: Debug Current Test File",
+ "type": "debugpy",
+ "request": "launch",
+ "module": "pytest",
+ "console": "integratedTerminal",
+ "args": ["-vv", "${file}"]
+ },
{
// Debug by attaching to local Home Assistant server using Remote Python Debugger.
// See https://www.home-assistant.io/integrations/debugpy/
@@ -77,4 +84,4 @@
]
}
]
-}
\ No newline at end of file
+}
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 7425e7a2533..09c1d374299 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -4,7 +4,7 @@
{
"label": "Run Home Assistant Core",
"type": "shell",
- "command": "hass -c ./config",
+ "command": "${command:python.interpreterPath} -m homeassistant -c ./config",
"group": "test",
"presentation": {
"reveal": "always",
@@ -148,7 +148,7 @@
{
"label": "Install all Test Requirements",
"type": "shell",
- "command": "uv pip install -r requirements_test_all.txt",
+ "command": "uv pip install -r requirements.txt -r requirements_test_all.txt",
"group": {
"kind": "build",
"isDefault": true
diff --git a/CODEOWNERS b/CODEOWNERS
index e510eec6dfa..1ac564a6991 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -180,6 +180,8 @@ build.json @home-assistant/supervisor
/homeassistant/components/azure_event_hub/ @eavanvalkenburg
/tests/components/azure_event_hub/ @eavanvalkenburg
/homeassistant/components/azure_service_bus/ @hfurubotten
+/homeassistant/components/azure_storage/ @zweckj
+/tests/components/azure_storage/ @zweckj
/homeassistant/components/backup/ @home-assistant/core
/tests/components/backup/ @home-assistant/core
/homeassistant/components/baf/ @bdraco @jfroy
@@ -214,6 +216,8 @@ build.json @home-assistant/supervisor
/tests/components/bmw_connected_drive/ @gerard33 @rikroe
/homeassistant/components/bond/ @bdraco @prystupa @joshs85 @marciogranzotto
/tests/components/bond/ @bdraco @prystupa @joshs85 @marciogranzotto
+/homeassistant/components/bosch_alarm/ @mag1024 @sanjay900
+/tests/components/bosch_alarm/ @mag1024 @sanjay900
/homeassistant/components/bosch_shc/ @tschamm
/tests/components/bosch_shc/ @tschamm
/homeassistant/components/braviatv/ @bieniu @Drafteed
@@ -428,7 +432,7 @@ build.json @home-assistant/supervisor
/homeassistant/components/entur_public_transport/ @hfurubotten
/homeassistant/components/environment_canada/ @gwww @michaeldavie
/tests/components/environment_canada/ @gwww @michaeldavie
-/homeassistant/components/ephember/ @ttroy50
+/homeassistant/components/ephember/ @ttroy50 @roberty99
/homeassistant/components/epic_games_store/ @hacf-fr @Quentame
/tests/components/epic_games_store/ @hacf-fr @Quentame
/homeassistant/components/epion/ @lhgravendeel
@@ -568,8 +572,8 @@ build.json @home-assistant/supervisor
/tests/components/google_cloud/ @lufton @tronikos
/homeassistant/components/google_drive/ @tronikos
/tests/components/google_drive/ @tronikos
-/homeassistant/components/google_generative_ai_conversation/ @tronikos
-/tests/components/google_generative_ai_conversation/ @tronikos
+/homeassistant/components/google_generative_ai_conversation/ @tronikos @ivanlh
+/tests/components/google_generative_ai_conversation/ @tronikos @ivanlh
/homeassistant/components/google_mail/ @tkdrob
/tests/components/google_mail/ @tkdrob
/homeassistant/components/google_photos/ @allenporter
@@ -700,6 +704,8 @@ build.json @home-assistant/supervisor
/tests/components/image_upload/ @home-assistant/core
/homeassistant/components/imap/ @jbouwh
/tests/components/imap/ @jbouwh
+/homeassistant/components/imeon_inverter/ @Imeon-Energy
+/tests/components/imeon_inverter/ @Imeon-Energy
/homeassistant/components/imgw_pib/ @bieniu
/tests/components/imgw_pib/ @bieniu
/homeassistant/components/improv_ble/ @emontnemery
@@ -931,6 +937,8 @@ build.json @home-assistant/supervisor
/tests/components/metoffice/ @MrHarcombe @avee87
/homeassistant/components/microbees/ @microBeesTech
/tests/components/microbees/ @microBeesTech
+/homeassistant/components/miele/ @astrandb
+/tests/components/miele/ @astrandb
/homeassistant/components/mikrotik/ @engrbm87
/tests/components/mikrotik/ @engrbm87
/homeassistant/components/mill/ @danielhiversen
@@ -967,8 +975,8 @@ build.json @home-assistant/supervisor
/tests/components/motionblinds_ble/ @LennP @jerrybboy
/homeassistant/components/motioneye/ @dermotduffy
/tests/components/motioneye/ @dermotduffy
-/homeassistant/components/motionmount/ @RJPoelstra
-/tests/components/motionmount/ @RJPoelstra
+/homeassistant/components/motionmount/ @laiho-vogels
+/tests/components/motionmount/ @laiho-vogels
/homeassistant/components/mqtt/ @emontnemery @jbouwh @bdraco
/tests/components/mqtt/ @emontnemery @jbouwh @bdraco
/homeassistant/components/msteams/ @peroyvind
@@ -1051,8 +1059,8 @@ build.json @home-assistant/supervisor
/tests/components/numato/ @clssn
/homeassistant/components/number/ @home-assistant/core @Shulyaka
/tests/components/number/ @home-assistant/core @Shulyaka
-/homeassistant/components/nut/ @bdraco @ollo69 @pestevez
-/tests/components/nut/ @bdraco @ollo69 @pestevez
+/homeassistant/components/nut/ @bdraco @ollo69 @pestevez @tdfountain
+/tests/components/nut/ @bdraco @ollo69 @pestevez @tdfountain
/homeassistant/components/nws/ @MatthewFlamm @kamiyo
/tests/components/nws/ @MatthewFlamm @kamiyo
/homeassistant/components/nyt_games/ @joostlek
@@ -1138,12 +1146,14 @@ build.json @home-assistant/supervisor
/tests/components/permobil/ @IsakNyberg
/homeassistant/components/persistent_notification/ @home-assistant/core
/tests/components/persistent_notification/ @home-assistant/core
+/homeassistant/components/pglab/ @pglab-electronics
+/tests/components/pglab/ @pglab-electronics
/homeassistant/components/philips_js/ @elupus
/tests/components/philips_js/ @elupus
/homeassistant/components/pi_hole/ @shenxn
/tests/components/pi_hole/ @shenxn
-/homeassistant/components/picnic/ @corneyl
-/tests/components/picnic/ @corneyl
+/homeassistant/components/picnic/ @corneyl @codesalatdev
+/tests/components/picnic/ @corneyl @codesalatdev
/homeassistant/components/ping/ @jpbede
/tests/components/ping/ @jpbede
/homeassistant/components/plaato/ @JohNan
@@ -1179,6 +1189,8 @@ build.json @home-assistant/supervisor
/tests/components/prusalink/ @balloob
/homeassistant/components/ps4/ @ktnrg45
/tests/components/ps4/ @ktnrg45
+/homeassistant/components/pterodactyl/ @elmurato
+/tests/components/pterodactyl/ @elmurato
/homeassistant/components/pure_energie/ @klaasnicolaas
/tests/components/pure_energie/ @klaasnicolaas
/homeassistant/components/purpleair/ @bachya
@@ -1248,6 +1260,8 @@ build.json @home-assistant/supervisor
/tests/components/refoss/ @ashionky
/homeassistant/components/remote/ @home-assistant/core
/tests/components/remote/ @home-assistant/core
+/homeassistant/components/remote_calendar/ @Thomas55555
+/tests/components/remote_calendar/ @Thomas55555
/homeassistant/components/renault/ @epenet
/tests/components/renault/ @epenet
/homeassistant/components/renson/ @jimmyd-be
@@ -1340,6 +1354,8 @@ build.json @home-assistant/supervisor
/tests/components/sensorpro/ @bdraco
/homeassistant/components/sensorpush/ @bdraco
/tests/components/sensorpush/ @bdraco
+/homeassistant/components/sensorpush_cloud/ @sstallion
+/tests/components/sensorpush_cloud/ @sstallion
/homeassistant/components/sensoterra/ @markruys
/tests/components/sensoterra/ @markruys
/homeassistant/components/sentry/ @dcramer @frenck
@@ -1375,7 +1391,6 @@ build.json @home-assistant/supervisor
/homeassistant/components/siren/ @home-assistant/core @raman325
/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
@@ -1395,6 +1410,8 @@ build.json @home-assistant/supervisor
/tests/components/smappee/ @bsmappee
/homeassistant/components/smart_meter_texas/ @grahamwetzler
/tests/components/smart_meter_texas/ @grahamwetzler
+/homeassistant/components/smartthings/ @joostlek
+/tests/components/smartthings/ @joostlek
/homeassistant/components/smarttub/ @mdz
/tests/components/smarttub/ @mdz
/homeassistant/components/smarty/ @z0mbieprocess
@@ -1409,6 +1426,8 @@ build.json @home-assistant/supervisor
/tests/components/snapcast/ @luar123
/homeassistant/components/snmp/ @nmaggioni
/tests/components/snmp/ @nmaggioni
+/homeassistant/components/snoo/ @Lash-L
+/tests/components/snoo/ @Lash-L
/homeassistant/components/snooz/ @AustinBrunkhorst
/tests/components/snooz/ @AustinBrunkhorst
/homeassistant/components/solaredge/ @frenck @bdraco
@@ -1464,8 +1483,6 @@ build.json @home-assistant/supervisor
/tests/components/suez_water/ @ooii @jb101010-2
/homeassistant/components/sun/ @Swamp-Ig
/tests/components/sun/ @Swamp-Ig
-/homeassistant/components/sunweg/ @rokam
-/tests/components/sunweg/ @rokam
/homeassistant/components/supla/ @mwegrzynek
/homeassistant/components/surepetcare/ @benleb @danielhiversen
/tests/components/surepetcare/ @benleb @danielhiversen
@@ -1519,8 +1536,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/ @Petro31 @PhracturedBlue @home-assistant/core
+/tests/components/template/ @Petro31 @PhracturedBlue @home-assistant/core
/homeassistant/components/tesla_fleet/ @Bre77
/tests/components/tesla_fleet/ @Bre77
/homeassistant/components/tesla_wall_connector/ @einarhauks
@@ -1689,6 +1706,8 @@ build.json @home-assistant/supervisor
/tests/components/weatherflow_cloud/ @jeeftor
/homeassistant/components/weatherkit/ @tjhorner
/tests/components/weatherkit/ @tjhorner
+/homeassistant/components/webdav/ @jpbede
+/tests/components/webdav/ @jpbede
/homeassistant/components/webhook/ @home-assistant/core
/tests/components/webhook/ @home-assistant/core
/homeassistant/components/webmin/ @autinerd
diff --git a/Dockerfile b/Dockerfile
index 19b2c97b181..0a74e0a3aac 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,8 +12,26 @@ ENV \
ARG QEMU_CPU
+# Home Assistant S6-Overlay
+COPY rootfs /
+
+# Needs to be redefined inside the FROM statement to be set for RUN commands
+ARG BUILD_ARCH
+# Get go2rtc binary
+RUN \
+ case "${BUILD_ARCH}" in \
+ "aarch64") go2rtc_suffix='arm64' ;; \
+ "armhf") go2rtc_suffix='armv6' ;; \
+ "armv7") go2rtc_suffix='arm' ;; \
+ *) go2rtc_suffix=${BUILD_ARCH} ;; \
+ esac \
+ && curl -L https://github.com/AlexxIT/go2rtc/releases/download/v1.9.9/go2rtc_linux_${go2rtc_suffix} --output /bin/go2rtc \
+ && chmod +x /bin/go2rtc \
+ # Verify go2rtc can be executed
+ && go2rtc --version
+
# Install uv
-RUN pip3 install uv==0.5.27
+RUN pip3 install uv==0.6.10
WORKDIR /usr/src
@@ -42,22 +60,4 @@ RUN \
&& python3 -m compileall \
homeassistant/homeassistant
-# Home Assistant S6-Overlay
-COPY rootfs /
-
-# Needs to be redefined inside the FROM statement to be set for RUN commands
-ARG BUILD_ARCH
-# Get go2rtc binary
-RUN \
- case "${BUILD_ARCH}" in \
- "aarch64") go2rtc_suffix='arm64' ;; \
- "armhf") go2rtc_suffix='armv6' ;; \
- "armv7") go2rtc_suffix='arm' ;; \
- *) go2rtc_suffix=${BUILD_ARCH} ;; \
- esac \
- && curl -L https://github.com/AlexxIT/go2rtc/releases/download/v1.9.8/go2rtc_linux_${go2rtc_suffix} --output /bin/go2rtc \
- && chmod +x /bin/go2rtc \
- # Verify go2rtc can be executed
- && go2rtc --version
-
WORKDIR /config
diff --git a/build.yaml b/build.yaml
index e6e149cf700..87dad1bf5ef 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.12.0
- armhf: ghcr.io/home-assistant/armhf-homeassistant-base:2024.12.0
- armv7: ghcr.io/home-assistant/armv7-homeassistant-base:2024.12.0
- amd64: ghcr.io/home-assistant/amd64-homeassistant-base:2024.12.0
- i386: ghcr.io/home-assistant/i386-homeassistant-base:2024.12.0
+ aarch64: ghcr.io/home-assistant/aarch64-homeassistant-base:2025.02.1
+ armhf: ghcr.io/home-assistant/armhf-homeassistant-base:2025.02.1
+ armv7: ghcr.io/home-assistant/armv7-homeassistant-base:2025.02.1
+ amd64: ghcr.io/home-assistant/amd64-homeassistant-base:2025.02.1
+ i386: ghcr.io/home-assistant/i386-homeassistant-base:2025.02.1
codenotary:
signer: notary@home-assistant.io
base_image: notary@home-assistant.io
@@ -19,4 +19,4 @@ labels:
org.opencontainers.image.authors: The Home Assistant Authors
org.opencontainers.image.url: https://www.home-assistant.io/
org.opencontainers.image.documentation: https://www.home-assistant.io/docs/
- org.opencontainers.image.licenses: Apache License 2.0
+ org.opencontainers.image.licenses: Apache-2.0
diff --git a/homeassistant/block_async_io.py b/homeassistant/block_async_io.py
index d224b0b151d..eb81268434b 100644
--- a/homeassistant/block_async_io.py
+++ b/homeassistant/block_async_io.py
@@ -178,6 +178,15 @@ _BLOCKING_CALLS: tuple[BlockingCall, ...] = (
strict_core=False,
skip_for_tests=True,
),
+ BlockingCall(
+ original_func=SSLContext.set_default_verify_paths,
+ object=SSLContext,
+ function="set_default_verify_paths",
+ check_allowed=None,
+ strict=False,
+ strict_core=False,
+ skip_for_tests=True,
+ ),
BlockingCall(
original_func=Path.open,
object=Path,
diff --git a/homeassistant/bootstrap.py b/homeassistant/bootstrap.py
index 58150ae7926..f88912478a7 100644
--- a/homeassistant/bootstrap.py
+++ b/homeassistant/bootstrap.py
@@ -53,6 +53,7 @@ from .components import (
logbook as logbook_pre_import, # noqa: F401
lovelace as lovelace_pre_import, # noqa: F401
onboarding as onboarding_pre_import, # noqa: F401
+ person as person_pre_import, # noqa: F401
recorder as recorder_import, # noqa: F401 - not named pre_import since it has requirements
repairs as repairs_pre_import, # noqa: F401
search as search_pre_import, # noqa: F401
@@ -74,12 +75,14 @@ from .core_config import async_process_ha_core_config
from .exceptions import HomeAssistantError
from .helpers import (
area_registry,
+ backup,
category_registry,
config_validation as cv,
device_registry,
entity,
entity_registry,
floor_registry,
+ frame,
issue_registry,
label_registry,
recorder,
@@ -91,6 +94,7 @@ from .helpers.dispatcher import async_dispatcher_send_internal
from .helpers.storage import get_internal_store_manager
from .helpers.system_info import async_get_system_info
from .helpers.typing import ConfigType
+from .loader import Integration
from .setup import (
# _setup_started is marked as protected to make it clear
# that it is not part of the public API and should not be used
@@ -134,14 +138,12 @@ DATA_REGISTRIES_LOADED: HassKey[None] = HassKey("bootstrap_registries_loaded")
LOG_SLOW_STARTUP_INTERVAL = 60
SLOW_STARTUP_CHECK_INTERVAL = 1
+STAGE_0_SUBSTAGE_TIMEOUT = 60
STAGE_1_TIMEOUT = 120
STAGE_2_TIMEOUT = 300
WRAP_UP_TIMEOUT = 300
COOLDOWN_TIME = 60
-
-DEBUGGER_INTEGRATIONS = {"debugpy"}
-
# Core integrations are unconditionally loaded
CORE_INTEGRATIONS = {"homeassistant", "persistent_notification"}
@@ -152,6 +154,10 @@ LOGGING_AND_HTTP_DEPS_INTEGRATIONS = {
"isal",
# Set log levels
"logger",
+ # Ensure network config is available
+ # before hassio or any other integration is
+ # loaded that might create an aiohttp client session
+ "network",
# Error logging
"system_log",
"sentry",
@@ -161,23 +167,28 @@ FRONTEND_INTEGRATIONS = {
# integrations can be removed and database migration status is
# visible in frontend
"frontend",
- # Hassio is an after dependency of backup, after dependencies
- # are not promoted from stage 2 to earlier stages, so we need to
- # add it here. Hassio needs to be setup before backup, otherwise
- # the backup integration will think we are a container/core install
- # when using HAOS or Supervised install.
- "hassio",
- # Backup is an after dependency of frontend, after dependencies
- # are not promoted from stage 2 to earlier stages, so we need to
- # add it here.
- "backup",
}
-RECORDER_INTEGRATIONS = {
- # Setup after frontend
- # To record data
- "recorder",
-}
-DISCOVERY_INTEGRATIONS = ("bluetooth", "dhcp", "ssdp", "usb", "zeroconf")
+# Stage 0 is divided into substages. Each substage has a name, a set of integrations and a timeout.
+# The substage containing recorder should have no timeout, as it could cancel a database migration.
+# Recorder freezes "recorder" timeout during a migration, but it does not freeze other timeouts.
+# The substages preceding it should also have no timeout, until we ensure that the recorder
+# is not accidentally promoted as a dependency of any of the integrations in them.
+# If we add timeouts to the frontend substages, we should make sure they don't apply in recovery mode.
+STAGE_0_INTEGRATIONS = (
+ # Load logging and http deps as soon as possible
+ ("logging, http deps", LOGGING_AND_HTTP_DEPS_INTEGRATIONS, None),
+ # Setup frontend
+ ("frontend", FRONTEND_INTEGRATIONS, None),
+ # Setup recorder
+ ("recorder", {"recorder"}, None),
+ # Start up debuggers. Start these first in case they want to wait.
+ ("debugger", {"debugpy"}, STAGE_0_SUBSTAGE_TIMEOUT),
+ # Zeroconf is used for mdns resolution in aiohttp client helper.
+ ("zeroconf", {"zeroconf"}, STAGE_0_SUBSTAGE_TIMEOUT),
+)
+
+DISCOVERY_INTEGRATIONS = ("bluetooth", "dhcp", "ssdp", "usb")
+# Stage 1 integrations are not to be preimported in bootstrap.
STAGE_1_INTEGRATIONS = {
# We need to make sure discovery integrations
# update their deps before stage 2 integrations
@@ -192,6 +203,7 @@ STAGE_1_INTEGRATIONS = {
# Ensure supervisor is available
"hassio",
}
+
DEFAULT_INTEGRATIONS = {
# These integrations are set up unless recovery mode is activated.
#
@@ -232,22 +244,12 @@ DEFAULT_INTEGRATIONS_SUPERVISOR = {
# These integrations are set up if using the Supervisor
"hassio",
}
+
CRITICAL_INTEGRATIONS = {
# Recovery mode is activated if these integrations fail to set up
"frontend",
}
-SETUP_ORDER = (
- # Load logging and http deps as soon as possible
- ("logging, http deps", LOGGING_AND_HTTP_DEPS_INTEGRATIONS),
- # Setup frontend
- ("frontend", FRONTEND_INTEGRATIONS),
- # Setup recorder
- ("recorder", RECORDER_INTEGRATIONS),
- # Start up debuggers. Start these first in case they want to wait.
- ("debugger", DEBUGGER_INTEGRATIONS),
-)
-
#
# Storage keys we are likely to load during startup
# in order of when we expect to load them.
@@ -299,14 +301,6 @@ async def async_setup_hass(
return hass
- async def stop_hass(hass: core.HomeAssistant) -> None:
- """Stop hass."""
- # Ask integrations to shut down. It's messy but we can't
- # do a clean stop without knowing what is broken
- with contextlib.suppress(TimeoutError):
- async with hass.timeout.async_timeout(10):
- await hass.async_stop()
-
hass = await create_hass()
if runtime_config.skip_pip or runtime_config.skip_pip_packages:
@@ -322,10 +316,10 @@ async def async_setup_hass(
block_async_io.enable()
- config_dict = None
- basic_setup_success = False
-
if not (recovery_mode := runtime_config.recovery_mode):
+ config_dict = None
+ basic_setup_success = False
+
await hass.async_add_executor_job(conf_util.process_ha_config_upgrade, hass)
try:
@@ -343,39 +337,43 @@ async def async_setup_hass(
await async_from_config_dict(config_dict, hass) is not None
)
- if config_dict is None:
- recovery_mode = True
- await stop_hass(hass)
- hass = await create_hass()
+ if config_dict is None:
+ recovery_mode = True
+ await hass.async_stop(force=True)
+ hass = await create_hass()
- elif not basic_setup_success:
- _LOGGER.warning("Unable to set up core integrations. Activating recovery mode")
- recovery_mode = True
- await stop_hass(hass)
- hass = await create_hass()
+ elif not basic_setup_success:
+ _LOGGER.warning(
+ "Unable to set up core integrations. Activating recovery mode"
+ )
+ recovery_mode = True
+ await hass.async_stop(force=True)
+ hass = await create_hass()
- elif any(domain not in hass.config.components for domain in CRITICAL_INTEGRATIONS):
- _LOGGER.warning(
- "Detected that %s did not load. Activating recovery mode",
- ",".join(CRITICAL_INTEGRATIONS),
- )
+ elif any(
+ domain not in hass.config.components for domain in CRITICAL_INTEGRATIONS
+ ):
+ _LOGGER.warning(
+ "Detected that %s did not load. Activating recovery mode",
+ ",".join(CRITICAL_INTEGRATIONS),
+ )
- old_config = hass.config
- old_logging = hass.data.get(DATA_LOGGING)
+ old_config = hass.config
+ old_logging = hass.data.get(DATA_LOGGING)
- recovery_mode = True
- await stop_hass(hass)
- hass = await create_hass()
+ recovery_mode = True
+ await hass.async_stop(force=True)
+ hass = await create_hass()
- if old_logging:
- hass.data[DATA_LOGGING] = old_logging
- hass.config.debug = old_config.debug
- hass.config.skip_pip = old_config.skip_pip
- hass.config.skip_pip_packages = old_config.skip_pip_packages
- hass.config.internal_url = old_config.internal_url
- hass.config.external_url = old_config.external_url
- # Setup loader cache after the config dir has been set
- loader.async_setup(hass)
+ if old_logging:
+ hass.data[DATA_LOGGING] = old_logging
+ hass.config.debug = old_config.debug
+ hass.config.skip_pip = old_config.skip_pip
+ hass.config.skip_pip_packages = old_config.skip_pip_packages
+ hass.config.internal_url = old_config.internal_url
+ hass.config.external_url = old_config.external_url
+ # Setup loader cache after the config dir has been set
+ loader.async_setup(hass)
if recovery_mode:
_LOGGER.info("Starting in recovery mode")
@@ -438,9 +436,10 @@ async def async_load_base_functionality(hass: core.HomeAssistant) -> None:
if DATA_REGISTRIES_LOADED in hass.data:
return
hass.data[DATA_REGISTRIES_LOADED] = None
- translation.async_setup(hass)
entity.async_setup(hass)
+ frame.async_setup(hass)
template.async_setup(hass)
+ translation.async_setup(hass)
await asyncio.gather(
create_eager_task(get_internal_store_manager(hass).async_initialize()),
create_eager_task(area_registry.async_load(hass)),
@@ -661,11 +660,10 @@ def _create_log_file(
err_handler = _RotatingFileHandlerWithoutShouldRollOver(
err_log_path, backupCount=1
)
-
- try:
- err_handler.doRollover()
- except OSError as err:
- _LOGGER.error("Error rolling over log file: %s", err)
+ try:
+ err_handler.doRollover()
+ except OSError as err:
+ _LOGGER.error("Error rolling over log file: %s", err)
return err_handler
@@ -694,7 +692,6 @@ async def async_mount_local_lib_path(config_dir: str) -> str:
return deps_dir
-@core.callback
def _get_domains(hass: core.HomeAssistant, config: dict[str, Any]) -> set[str]:
"""Get domains of components to set up."""
# Filter out the repeating and common config section [homeassistant]
@@ -716,20 +713,25 @@ def _get_domains(hass: core.HomeAssistant, config: dict[str, Any]) -> set[str]:
return domains
-async def _async_resolve_domains_to_setup(
+async def _async_resolve_domains_and_preload(
hass: core.HomeAssistant, config: dict[str, Any]
-) -> tuple[set[str], dict[str, loader.Integration]]:
- """Resolve all dependencies and return list of domains to set up."""
+) -> tuple[dict[str, Integration], dict[str, Integration]]:
+ """Resolve all dependencies and return integrations to set up.
+
+ The return value is a tuple of two dictionaries:
+ - The first dictionary contains integrations
+ specified by the configuration (including config entries).
+ - The second dictionary contains the same integrations as the first dictionary
+ together with all their dependencies.
+ """
domains_to_setup = _get_domains(hass, config)
- needed_requirements: set[str] = set()
platform_integrations = conf_util.extract_platform_integrations(
config, BASE_PLATFORMS
)
- # Ensure base platforms that have platform integrations are added to
- # to `domains_to_setup so they can be setup first instead of
- # discovering them when later when a config entry setup task
- # notices its needed and there is already a long line to use
- # the import executor.
+ # Ensure base platforms that have platform integrations are added to `domains`,
+ # so they can be setup first instead of discovering them later when a config
+ # entry setup task notices that it's needed and there is already a long line
+ # to use the import executor.
#
# For example if we have
# sensor:
@@ -745,111 +747,78 @@ async def _async_resolve_domains_to_setup(
# so this will be less of a problem in the future.
domains_to_setup.update(platform_integrations)
- # Load manifests for base platforms and platform based integrations
- # that are defined under base platforms right away since we do not require
- # the manifest to list them as dependencies and we want to avoid the lock
- # contention when multiple integrations try to load them at once
- additional_manifests_to_load = {
+ # Additionally process base platforms since we do not require the manifest
+ # to list them as dependencies.
+ # We want to later avoid lock contention when multiple integrations try to load
+ # their manifests at once.
+ # Also process integrations that are defined under base platforms
+ # to speed things up.
+ additional_domains_to_process = {
*BASE_PLATFORMS,
*chain.from_iterable(platform_integrations.values()),
}
- translations_to_load = additional_manifests_to_load.copy()
-
# Resolve all dependencies so we know all integrations
# that will have to be loaded and start right-away
- integration_cache: dict[str, loader.Integration] = {}
- to_resolve: set[str] = domains_to_setup
- while to_resolve or additional_manifests_to_load:
- old_to_resolve: set[str] = to_resolve
- to_resolve = set()
+ integrations_or_excs = await loader.async_get_integrations(
+ hass, {*domains_to_setup, *additional_domains_to_process}
+ )
+ # Eliminate those missing or with invalid manifest
+ integrations_to_process = {
+ domain: itg
+ for domain, itg in integrations_or_excs.items()
+ if isinstance(itg, Integration)
+ }
+ integrations_dependencies = await loader.resolve_integrations_dependencies(
+ hass, integrations_to_process.values()
+ )
+ # Eliminate those without valid dependencies
+ integrations_to_process = {
+ domain: integrations_to_process[domain] for domain in integrations_dependencies
+ }
- if additional_manifests_to_load:
- to_get = {*old_to_resolve, *additional_manifests_to_load}
- additional_manifests_to_load.clear()
- else:
- to_get = old_to_resolve
+ integrations_to_setup = {
+ domain: itg
+ for domain, itg in integrations_to_process.items()
+ if domain in domains_to_setup
+ }
+ all_integrations_to_setup = integrations_to_setup.copy()
+ all_integrations_to_setup.update(
+ (dep, loader.async_get_loaded_integration(hass, dep))
+ for domain in integrations_to_setup
+ for dep in integrations_dependencies[domain].difference(
+ all_integrations_to_setup
+ )
+ )
- manifest_deps: set[str] = set()
- resolve_dependencies_tasks: list[asyncio.Task[bool]] = []
- integrations_to_process: list[loader.Integration] = []
-
- for domain, itg in (await loader.async_get_integrations(hass, to_get)).items():
- if not isinstance(itg, loader.Integration):
- continue
- integration_cache[domain] = itg
- needed_requirements.update(itg.requirements)
-
- # Make sure manifests for dependencies are loaded in the next
- # loop to try to group as many as manifest loads in a single
- # call to avoid the creating one-off executor jobs later in
- # the setup process
- additional_manifests_to_load.update(
- dep
- for dep in chain(itg.dependencies, itg.after_dependencies)
- if dep not in integration_cache
- )
-
- if domain not in old_to_resolve:
- continue
-
- integrations_to_process.append(itg)
- manifest_deps.update(itg.dependencies)
- manifest_deps.update(itg.after_dependencies)
- if not itg.all_dependencies_resolved:
- resolve_dependencies_tasks.append(
- create_eager_task(
- itg.resolve_dependencies(),
- name=f"resolve dependencies {domain}",
- loop=hass.loop,
- )
- )
-
- if unseen_deps := manifest_deps - integration_cache.keys():
- # If there are dependencies, try to preload all
- # the integrations manifest at once and add them
- # to the list of requirements we need to install
- # so we can try to check if they are already installed
- # in a single call below which avoids each integration
- # having to wait for the lock to do it individually
- deps = await loader.async_get_integrations(hass, unseen_deps)
- for dependant_domain, dependant_itg in deps.items():
- if isinstance(dependant_itg, loader.Integration):
- integration_cache[dependant_domain] = dependant_itg
- needed_requirements.update(dependant_itg.requirements)
-
- if resolve_dependencies_tasks:
- await asyncio.gather(*resolve_dependencies_tasks)
-
- for itg in integrations_to_process:
- try:
- all_deps = itg.all_dependencies
- except RuntimeError:
- # Integration.all_dependencies raises RuntimeError if
- # dependencies could not be resolved
- continue
- for dep in all_deps:
- if dep in domains_to_setup:
- continue
- domains_to_setup.add(dep)
- to_resolve.add(dep)
-
- _LOGGER.info("Domains to be set up: %s", domains_to_setup)
+ # Gather requirements for all integrations,
+ # their dependencies and after dependencies.
+ # To gather all the requirements we must ignore exceptions here.
+ # The exceptions will be detected and handled later in the bootstrap process.
+ integrations_after_dependencies = (
+ await loader.resolve_integrations_after_dependencies(
+ hass, integrations_to_process.values(), ignore_exceptions=True
+ )
+ )
+ integrations_requirements = {
+ domain: itg.requirements for domain, itg in integrations_to_process.items()
+ }
+ integrations_requirements.update(
+ (dep, loader.async_get_loaded_integration(hass, dep).requirements)
+ for deps in integrations_after_dependencies.values()
+ for dep in deps.difference(integrations_requirements)
+ )
+ all_requirements = set(chain.from_iterable(integrations_requirements.values()))
# Optimistically check if requirements are already installed
# ahead of setting up the integrations so we can prime the cache
- # We do not wait for this since its an optimization only
+ # We do not wait for this since it's an optimization only
hass.async_create_background_task(
- requirements.async_load_installed_versions(hass, needed_requirements),
+ requirements.async_load_installed_versions(hass, all_requirements),
"check installed requirements",
eager_start=True,
)
- #
- # Only add the domains_to_setup after we finish resolving
- # as new domains are likely to added in the process
- #
- translations_to_load.update(domains_to_setup)
# Start loading translations for all integrations we are going to set up
# in the background so they are ready when we need them. This avoids a
# lot of waiting for the translation load lock and a thundering herd of
@@ -860,6 +829,7 @@ async def _async_resolve_domains_to_setup(
# hold the translation load lock and if anything is fast enough to
# wait for the translation load lock, loading will be done by the
# time it gets to it.
+ translations_to_load = {*all_integrations_to_setup, *additional_domains_to_process}
hass.async_create_background_task(
translation.async_load_integrations(hass, translations_to_load),
"load translations",
@@ -871,13 +841,13 @@ async def _async_resolve_domains_to_setup(
# in the setup process.
hass.async_create_background_task(
get_internal_store_manager(hass).async_preload(
- [*PRELOAD_STORAGE, *domains_to_setup]
+ [*PRELOAD_STORAGE, *all_integrations_to_setup]
),
"preload storage",
eager_start=True,
)
- return domains_to_setup, integration_cache
+ return integrations_to_setup, all_integrations_to_setup
async def _async_set_up_integrations(
@@ -887,86 +857,84 @@ async def _async_set_up_integrations(
watcher = _WatchPendingSetups(hass, _setup_started(hass))
watcher.async_start()
- domains_to_setup, integration_cache = await _async_resolve_domains_to_setup(
+ integrations, all_integrations = await _async_resolve_domains_and_preload(
hass, config
)
+ # Detect all cycles
+ integrations_after_dependencies = (
+ await loader.resolve_integrations_after_dependencies(
+ hass, all_integrations.values(), set(all_integrations)
+ )
+ )
+ all_domains = set(integrations_after_dependencies)
+ domains = set(integrations) & all_domains
+
+ _LOGGER.info(
+ "Domains to be set up: %s | %s",
+ domains,
+ all_domains - domains,
+ )
+
+ async_set_domains_to_be_loaded(hass, all_domains)
# Initialize recorder
- if "recorder" in domains_to_setup:
+ if "recorder" in all_domains:
recorder.async_initialize_recorder(hass)
- pre_stage_domains = [
- (name, domains_to_setup & domain_group) for name, domain_group in SETUP_ORDER
+ # Initialize backup
+ if "backup" in all_domains:
+ backup.async_initialize_backup(hass)
+
+ stages: list[tuple[str, set[str], int | None]] = [
+ *(
+ (name, domain_group, timeout)
+ for name, domain_group, timeout in STAGE_0_INTEGRATIONS
+ ),
+ ("1", STAGE_1_INTEGRATIONS, STAGE_1_TIMEOUT),
+ ("2", domains, STAGE_2_TIMEOUT),
]
- # calculate what components to setup in what stage
- stage_1_domains: set[str] = set()
+ _LOGGER.info("Setting up stage 0")
+ for name, domain_group, timeout in stages:
+ stage_domains_unfiltered = domain_group & all_domains
+ if not stage_domains_unfiltered:
+ _LOGGER.info("Nothing to set up in stage %s: %s", name, domain_group)
+ continue
- # Find all dependencies of any dependency of any stage 1 integration that
- # we plan on loading and promote them to stage 1. This is done only to not
- # get misleading log messages
- deps_promotion: set[str] = STAGE_1_INTEGRATIONS
- while deps_promotion:
- old_deps_promotion = deps_promotion
- deps_promotion = set()
+ stage_domains = stage_domains_unfiltered - hass.config.components
+ if not stage_domains:
+ _LOGGER.info("Already set up stage %s: %s", name, stage_domains_unfiltered)
+ continue
- for domain in old_deps_promotion:
- if domain not in domains_to_setup or domain in stage_1_domains:
- continue
+ stage_dep_domains_unfiltered = {
+ dep
+ for domain in stage_domains
+ for dep in integrations_after_dependencies[domain]
+ if dep not in stage_domains
+ }
+ stage_dep_domains = stage_dep_domains_unfiltered - hass.config.components
- stage_1_domains.add(domain)
+ stage_all_domains = stage_domains | stage_dep_domains
- if (dep_itg := integration_cache.get(domain)) is None:
- continue
+ _LOGGER.info(
+ "Setting up stage %s: %s | %s\nDependencies: %s | %s",
+ name,
+ stage_domains,
+ stage_domains_unfiltered - stage_domains,
+ stage_dep_domains,
+ stage_dep_domains_unfiltered - stage_dep_domains,
+ )
- deps_promotion.update(dep_itg.all_dependencies)
-
- stage_2_domains = domains_to_setup - stage_1_domains
-
- for name, domain_group in pre_stage_domains:
- if domain_group:
- stage_2_domains -= domain_group
- _LOGGER.info("Setting up %s: %s", name, domain_group)
- to_be_loaded = domain_group.copy()
- to_be_loaded.update(
- dep
- for domain in domain_group
- if (integration := integration_cache.get(domain)) is not None
- for dep in integration.all_dependencies
- )
- async_set_domains_to_be_loaded(hass, to_be_loaded)
- await _async_setup_multi_components(hass, domain_group, config)
-
- # Enables after dependencies when setting up stage 1 domains
- async_set_domains_to_be_loaded(hass, stage_1_domains)
-
- # Start setup
- if stage_1_domains:
- _LOGGER.info("Setting up stage 1: %s", stage_1_domains)
+ if timeout is None:
+ await _async_setup_multi_components(hass, stage_all_domains, config)
+ continue
try:
- async with hass.timeout.async_timeout(
- STAGE_1_TIMEOUT, cool_down=COOLDOWN_TIME
- ):
- await _async_setup_multi_components(hass, stage_1_domains, config)
+ async with hass.timeout.async_timeout(timeout, cool_down=COOLDOWN_TIME):
+ await _async_setup_multi_components(hass, stage_all_domains, config)
except TimeoutError:
_LOGGER.warning(
- "Setup timed out for stage 1 waiting on %s - moving forward",
- hass._active_tasks, # noqa: SLF001
- )
-
- # Add after dependencies when setting up stage 2 domains
- async_set_domains_to_be_loaded(hass, stage_2_domains)
-
- if stage_2_domains:
- _LOGGER.info("Setting up stage 2: %s", stage_2_domains)
- try:
- async with hass.timeout.async_timeout(
- STAGE_2_TIMEOUT, cool_down=COOLDOWN_TIME
- ):
- await _async_setup_multi_components(hass, stage_2_domains, config)
- except TimeoutError:
- _LOGGER.warning(
- "Setup timed out for stage 2 waiting on %s - moving forward",
+ "Setup timed out for stage %s waiting on %s - moving forward",
+ name,
hass._active_tasks, # noqa: SLF001
)
@@ -1068,8 +1036,6 @@ async def _async_setup_multi_components(
config: dict[str, Any],
) -> None:
"""Set up multiple domains. Log on failure."""
- # Avoid creating tasks for domains that were setup in a previous stage
- domains_not_yet_setup = domains - hass.config.components
# Create setup tasks for base platforms first since everything will have
# to wait to be imported, and the sooner we can get the base platforms
# loaded the sooner we can start loading the rest of the integrations.
@@ -1079,9 +1045,7 @@ async def _async_setup_multi_components(
f"setup component {domain}",
eager_start=True,
)
- for domain in sorted(
- domains_not_yet_setup, key=SETUP_ORDER_SORT_KEY, reverse=True
- )
+ for domain in sorted(domains, key=SETUP_ORDER_SORT_KEY, reverse=True)
}
results = await asyncio.gather(*futures.values(), return_exceptions=True)
for idx, domain in enumerate(futures):
diff --git a/homeassistant/brands/bosch.json b/homeassistant/brands/bosch.json
new file mode 100644
index 00000000000..090cc2af7c3
--- /dev/null
+++ b/homeassistant/brands/bosch.json
@@ -0,0 +1,5 @@
+{
+ "domain": "bosch",
+ "name": "Bosch",
+ "integrations": ["bosch_alarm", "bosch_shc", "home_connect"]
+}
diff --git a/homeassistant/brands/eve.json b/homeassistant/brands/eve.json
new file mode 100644
index 00000000000..f27c8b3d849
--- /dev/null
+++ b/homeassistant/brands/eve.json
@@ -0,0 +1,5 @@
+{
+ "domain": "eve",
+ "name": "Eve",
+ "iot_standards": ["matter"]
+}
diff --git a/homeassistant/brands/microsoft.json b/homeassistant/brands/microsoft.json
index 0e00c4a7bc3..918f67f06dd 100644
--- a/homeassistant/brands/microsoft.json
+++ b/homeassistant/brands/microsoft.json
@@ -6,6 +6,7 @@
"azure_devops",
"azure_event_hub",
"azure_service_bus",
+ "azure_storage",
"microsoft_face_detect",
"microsoft_face_identify",
"microsoft_face",
diff --git a/homeassistant/brands/motionblinds.json b/homeassistant/brands/motionblinds.json
index 67013e75966..5a48b573b4d 100644
--- a/homeassistant/brands/motionblinds.json
+++ b/homeassistant/brands/motionblinds.json
@@ -1,5 +1,6 @@
{
"domain": "motionblinds",
"name": "Motionblinds",
- "integrations": ["motion_blinds", "motionblinds_ble"]
+ "integrations": ["motion_blinds", "motionblinds_ble"],
+ "iot_standards": ["matter"]
}
diff --git a/homeassistant/brands/sensorpush.json b/homeassistant/brands/sensorpush.json
new file mode 100644
index 00000000000..b7e528948f8
--- /dev/null
+++ b/homeassistant/brands/sensorpush.json
@@ -0,0 +1,5 @@
+{
+ "domain": "sensorpush",
+ "name": "SensorPush",
+ "integrations": ["sensorpush", "sensorpush_cloud"]
+}
diff --git a/homeassistant/components/abode/alarm_control_panel.py b/homeassistant/components/abode/alarm_control_panel.py
index 4ec59ca4c39..554cf932fca 100644
--- a/homeassistant/components/abode/alarm_control_panel.py
+++ b/homeassistant/components/abode/alarm_control_panel.py
@@ -11,7 +11,7 @@ from homeassistant.components.alarm_control_panel import (
)
from homeassistant.config_entries import ConfigEntry
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import AbodeSystem
from .const import DOMAIN
@@ -19,7 +19,9 @@ from .entity import AbodeDevice
async def async_setup_entry(
- hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+ hass: HomeAssistant,
+ entry: ConfigEntry,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up Abode alarm control panel device."""
data: AbodeSystem = hass.data[DOMAIN]
diff --git a/homeassistant/components/abode/binary_sensor.py b/homeassistant/components/abode/binary_sensor.py
index ca9679a5aaa..6f64fa46c0a 100644
--- a/homeassistant/components/abode/binary_sensor.py
+++ b/homeassistant/components/abode/binary_sensor.py
@@ -12,7 +12,7 @@ from homeassistant.components.binary_sensor import (
)
from homeassistant.config_entries import ConfigEntry
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.util.enum import try_parse_enum
from . import AbodeSystem
@@ -21,7 +21,9 @@ from .entity import AbodeDevice
async def async_setup_entry(
- hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+ hass: HomeAssistant,
+ entry: ConfigEntry,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up Abode binary sensor devices."""
data: AbodeSystem = hass.data[DOMAIN]
diff --git a/homeassistant/components/abode/camera.py b/homeassistant/components/abode/camera.py
index 58107f16462..3587c8c1799 100644
--- a/homeassistant/components/abode/camera.py
+++ b/homeassistant/components/abode/camera.py
@@ -15,7 +15,7 @@ from homeassistant.components.camera import Camera
from homeassistant.config_entries import ConfigEntry
from homeassistant.core import Event, HomeAssistant
from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.util import Throttle
from . import AbodeSystem
@@ -26,7 +26,9 @@ MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=90)
async def async_setup_entry(
- hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+ hass: HomeAssistant,
+ entry: ConfigEntry,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up Abode camera devices."""
data: AbodeSystem = hass.data[DOMAIN]
diff --git a/homeassistant/components/abode/cover.py b/homeassistant/components/abode/cover.py
index b5b1e878b96..bc9df9d4a25 100644
--- a/homeassistant/components/abode/cover.py
+++ b/homeassistant/components/abode/cover.py
@@ -7,7 +7,7 @@ from jaraco.abode.devices.cover import Cover
from homeassistant.components.cover import CoverEntity
from homeassistant.config_entries import ConfigEntry
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import AbodeSystem
from .const import DOMAIN
@@ -15,7 +15,9 @@ from .entity import AbodeDevice
async def async_setup_entry(
- hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+ hass: HomeAssistant,
+ entry: ConfigEntry,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up Abode cover devices."""
data: AbodeSystem = hass.data[DOMAIN]
diff --git a/homeassistant/components/abode/light.py b/homeassistant/components/abode/light.py
index e2d0a331f0a..9614e84ebad 100644
--- a/homeassistant/components/abode/light.py
+++ b/homeassistant/components/abode/light.py
@@ -18,7 +18,7 @@ from homeassistant.components.light import (
)
from homeassistant.config_entries import ConfigEntry
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import AbodeSystem
from .const import DOMAIN
@@ -26,7 +26,9 @@ from .entity import AbodeDevice
async def async_setup_entry(
- hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+ hass: HomeAssistant,
+ entry: ConfigEntry,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up Abode light devices."""
data: AbodeSystem = hass.data[DOMAIN]
diff --git a/homeassistant/components/abode/lock.py b/homeassistant/components/abode/lock.py
index ceff263e6b5..94832ed41f9 100644
--- a/homeassistant/components/abode/lock.py
+++ b/homeassistant/components/abode/lock.py
@@ -7,7 +7,7 @@ from jaraco.abode.devices.lock import Lock
from homeassistant.components.lock import LockEntity
from homeassistant.config_entries import ConfigEntry
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import AbodeSystem
from .const import DOMAIN
@@ -15,7 +15,9 @@ from .entity import AbodeDevice
async def async_setup_entry(
- hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+ hass: HomeAssistant,
+ entry: ConfigEntry,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up Abode lock devices."""
data: AbodeSystem = hass.data[DOMAIN]
diff --git a/homeassistant/components/abode/sensor.py b/homeassistant/components/abode/sensor.py
index d6a5389029b..ee168c16509 100644
--- a/homeassistant/components/abode/sensor.py
+++ b/homeassistant/components/abode/sensor.py
@@ -16,7 +16,7 @@ from homeassistant.components.sensor import (
from homeassistant.config_entries import ConfigEntry
from homeassistant.const import LIGHT_LUX, PERCENTAGE, UnitOfTemperature
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import AbodeSystem
from .const import DOMAIN
@@ -61,7 +61,9 @@ SENSOR_TYPES: tuple[AbodeSensorDescription, ...] = (
async def async_setup_entry(
- hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+ hass: HomeAssistant,
+ entry: ConfigEntry,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up Abode sensor devices."""
data: AbodeSystem = hass.data[DOMAIN]
diff --git a/homeassistant/components/abode/switch.py b/homeassistant/components/abode/switch.py
index 7dad750c8d5..f6018d99fc8 100644
--- a/homeassistant/components/abode/switch.py
+++ b/homeassistant/components/abode/switch.py
@@ -10,7 +10,7 @@ from homeassistant.components.switch import SwitchEntity
from homeassistant.config_entries import ConfigEntry
from homeassistant.core import HomeAssistant
from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import AbodeSystem
from .const import DOMAIN
@@ -20,7 +20,9 @@ DEVICE_TYPES = ["switch", "valve"]
async def async_setup_entry(
- hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+ hass: HomeAssistant,
+ entry: ConfigEntry,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up Abode switch devices."""
data: AbodeSystem = hass.data[DOMAIN]
diff --git a/homeassistant/components/acaia/binary_sensor.py b/homeassistant/components/acaia/binary_sensor.py
index ecb7ac06eb5..d720488faa0 100644
--- a/homeassistant/components/acaia/binary_sensor.py
+++ b/homeassistant/components/acaia/binary_sensor.py
@@ -11,7 +11,7 @@ from homeassistant.components.binary_sensor import (
BinarySensorEntityDescription,
)
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .coordinator import AcaiaConfigEntry
from .entity import AcaiaEntity
@@ -40,7 +40,7 @@ BINARY_SENSORS: tuple[AcaiaBinarySensorEntityDescription, ...] = (
async def async_setup_entry(
hass: HomeAssistant,
entry: AcaiaConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up binary sensors."""
diff --git a/homeassistant/components/acaia/button.py b/homeassistant/components/acaia/button.py
index a41233bfc17..446f6134789 100644
--- a/homeassistant/components/acaia/button.py
+++ b/homeassistant/components/acaia/button.py
@@ -8,7 +8,7 @@ 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 homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .coordinator import AcaiaConfigEntry
from .entity import AcaiaEntity
@@ -45,7 +45,7 @@ BUTTONS: tuple[AcaiaButtonEntityDescription, ...] = (
async def async_setup_entry(
hass: HomeAssistant,
entry: AcaiaConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up button entities and services."""
diff --git a/homeassistant/components/acaia/sensor.py b/homeassistant/components/acaia/sensor.py
index 7ba44958eca..f62b93ddf1d 100644
--- a/homeassistant/components/acaia/sensor.py
+++ b/homeassistant/components/acaia/sensor.py
@@ -16,7 +16,7 @@ from homeassistant.components.sensor import (
)
from homeassistant.const import PERCENTAGE, UnitOfMass, UnitOfVolumeFlowRate
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .coordinator import AcaiaConfigEntry
from .entity import AcaiaEntity
@@ -77,7 +77,7 @@ RESTORE_SENSORS: tuple[AcaiaSensorEntityDescription, ...] = (
async def async_setup_entry(
hass: HomeAssistant,
entry: AcaiaConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up sensors."""
diff --git a/homeassistant/components/accuweather/const.py b/homeassistant/components/accuweather/const.py
index 1bbf5a36187..7216f5a0b9b 100644
--- a/homeassistant/components/accuweather/const.py
+++ b/homeassistant/components/accuweather/const.py
@@ -24,7 +24,7 @@ from homeassistant.components.weather import (
API_METRIC: Final = "Metric"
ATTRIBUTION: Final = "Data provided by AccuWeather"
-ATTR_CATEGORY: Final = "Category"
+ATTR_CATEGORY_VALUE = "CategoryValue"
ATTR_DIRECTION: Final = "Direction"
ATTR_ENGLISH: Final = "English"
ATTR_LEVEL: Final = "level"
@@ -55,5 +55,18 @@ CONDITION_MAP = {
for cond_ha, cond_codes in CONDITION_CLASSES.items()
for cond_code in cond_codes
}
+AIR_QUALITY_CATEGORY_MAP = {
+ 1: "good",
+ 2: "moderate",
+ 3: "unhealthy",
+ 4: "very_unhealthy",
+ 5: "hazardous",
+}
+POLLEN_CATEGORY_MAP = {
+ 1: "low",
+ 2: "moderate",
+ 3: "high",
+ 4: "very_high",
+}
UPDATE_INTERVAL_OBSERVATION = timedelta(minutes=40)
UPDATE_INTERVAL_DAILY_FORECAST = timedelta(hours=6)
diff --git a/homeassistant/components/accuweather/coordinator.py b/homeassistant/components/accuweather/coordinator.py
index 40ff3ad2c87..780c977f930 100644
--- a/homeassistant/components/accuweather/coordinator.py
+++ b/homeassistant/components/accuweather/coordinator.py
@@ -75,7 +75,11 @@ class AccuWeatherObservationDataUpdateCoordinator(
async with timeout(10):
result = await self.accuweather.async_get_current_conditions()
except EXCEPTIONS as error:
- raise UpdateFailed(error) from error
+ raise UpdateFailed(
+ translation_domain=DOMAIN,
+ translation_key="current_conditions_update_error",
+ translation_placeholders={"error": repr(error)},
+ ) from error
_LOGGER.debug("Requests remaining: %d", self.accuweather.requests_remaining)
@@ -117,9 +121,15 @@ class AccuWeatherDailyForecastDataUpdateCoordinator(
"""Update data via library."""
try:
async with timeout(10):
- result = await self.accuweather.async_get_daily_forecast()
+ result = await self.accuweather.async_get_daily_forecast(
+ language=self.hass.config.language
+ )
except EXCEPTIONS as error:
- raise UpdateFailed(error) from error
+ raise UpdateFailed(
+ translation_domain=DOMAIN,
+ translation_key="forecast_update_error",
+ translation_placeholders={"error": repr(error)},
+ ) from error
_LOGGER.debug("Requests remaining: %d", self.accuweather.requests_remaining)
diff --git a/homeassistant/components/accuweather/manifest.json b/homeassistant/components/accuweather/manifest.json
index 75f4a265b5f..810557519eb 100644
--- a/homeassistant/components/accuweather/manifest.json
+++ b/homeassistant/components/accuweather/manifest.json
@@ -7,6 +7,6 @@
"integration_type": "service",
"iot_class": "cloud_polling",
"loggers": ["accuweather"],
- "requirements": ["accuweather==4.0.0"],
+ "requirements": ["accuweather==4.2.0"],
"single_config_entry": true
}
diff --git a/homeassistant/components/accuweather/sensor.py b/homeassistant/components/accuweather/sensor.py
index 001edc5f197..415df402d55 100644
--- a/homeassistant/components/accuweather/sensor.py
+++ b/homeassistant/components/accuweather/sensor.py
@@ -25,12 +25,13 @@ from homeassistant.const import (
UnitOfVolumetricFlux,
)
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.update_coordinator import CoordinatorEntity
from .const import (
+ AIR_QUALITY_CATEGORY_MAP,
API_METRIC,
- ATTR_CATEGORY,
+ ATTR_CATEGORY_VALUE,
ATTR_DIRECTION,
ATTR_ENGLISH,
ATTR_LEVEL,
@@ -38,6 +39,7 @@ from .const import (
ATTR_VALUE,
ATTRIBUTION,
MAX_FORECAST_DAYS,
+ POLLEN_CATEGORY_MAP,
)
from .coordinator import (
AccuWeatherConfigEntry,
@@ -59,9 +61,9 @@ class AccuWeatherSensorDescription(SensorEntityDescription):
FORECAST_SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
AccuWeatherSensorDescription(
key="AirQuality",
- value_fn=lambda data: cast(str, data[ATTR_CATEGORY]),
+ value_fn=lambda data: AIR_QUALITY_CATEGORY_MAP[data[ATTR_CATEGORY_VALUE]],
device_class=SensorDeviceClass.ENUM,
- options=["good", "hazardous", "high", "low", "moderate", "unhealthy"],
+ options=list(AIR_QUALITY_CATEGORY_MAP.values()),
translation_key="air_quality",
),
AccuWeatherSensorDescription(
@@ -83,7 +85,9 @@ FORECAST_SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
entity_registry_enabled_default=False,
native_unit_of_measurement=CONCENTRATION_PARTS_PER_CUBIC_METER,
value_fn=lambda data: cast(int, data[ATTR_VALUE]),
- attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
+ attr_fn=lambda data: {
+ ATTR_LEVEL: POLLEN_CATEGORY_MAP[data[ATTR_CATEGORY_VALUE]]
+ },
translation_key="grass_pollen",
),
AccuWeatherSensorDescription(
@@ -107,7 +111,9 @@ FORECAST_SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
entity_registry_enabled_default=False,
native_unit_of_measurement=CONCENTRATION_PARTS_PER_CUBIC_METER,
value_fn=lambda data: cast(int, data[ATTR_VALUE]),
- attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
+ attr_fn=lambda data: {
+ ATTR_LEVEL: POLLEN_CATEGORY_MAP[data[ATTR_CATEGORY_VALUE]]
+ },
translation_key="mold_pollen",
),
AccuWeatherSensorDescription(
@@ -115,7 +121,9 @@ FORECAST_SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
native_unit_of_measurement=CONCENTRATION_PARTS_PER_CUBIC_METER,
entity_registry_enabled_default=False,
value_fn=lambda data: cast(int, data[ATTR_VALUE]),
- attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
+ attr_fn=lambda data: {
+ ATTR_LEVEL: POLLEN_CATEGORY_MAP[data[ATTR_CATEGORY_VALUE]]
+ },
translation_key="ragweed_pollen",
),
AccuWeatherSensorDescription(
@@ -181,14 +189,18 @@ FORECAST_SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
native_unit_of_measurement=CONCENTRATION_PARTS_PER_CUBIC_METER,
entity_registry_enabled_default=False,
value_fn=lambda data: cast(int, data[ATTR_VALUE]),
- attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
+ attr_fn=lambda data: {
+ ATTR_LEVEL: POLLEN_CATEGORY_MAP[data[ATTR_CATEGORY_VALUE]]
+ },
translation_key="tree_pollen",
),
AccuWeatherSensorDescription(
key="UVIndex",
native_unit_of_measurement=UV_INDEX,
value_fn=lambda data: cast(int, data[ATTR_VALUE]),
- attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
+ attr_fn=lambda data: {
+ ATTR_LEVEL: POLLEN_CATEGORY_MAP[data[ATTR_CATEGORY_VALUE]]
+ },
translation_key="uv_index_forecast",
),
AccuWeatherSensorDescription(
@@ -375,7 +387,7 @@ SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
async def async_setup_entry(
hass: HomeAssistant,
entry: AccuWeatherConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Add AccuWeather entities from a config_entry."""
observation_coordinator: AccuWeatherObservationDataUpdateCoordinator = (
diff --git a/homeassistant/components/accuweather/strings.json b/homeassistant/components/accuweather/strings.json
index d0250a382e9..e81ef782d98 100644
--- a/homeassistant/components/accuweather/strings.json
+++ b/homeassistant/components/accuweather/strings.json
@@ -26,10 +26,20 @@
"state": {
"good": "Good",
"hazardous": "Hazardous",
- "high": "High",
- "low": "Low",
"moderate": "Moderate",
- "unhealthy": "Unhealthy"
+ "unhealthy": "Unhealthy",
+ "very_unhealthy": "Very unhealthy"
+ },
+ "state_attributes": {
+ "options": {
+ "state": {
+ "good": "[%key:component::accuweather::entity::sensor::air_quality::state::good%]",
+ "hazardous": "[%key:component::accuweather::entity::sensor::air_quality::state::hazardous%]",
+ "moderate": "[%key:component::accuweather::entity::sensor::air_quality::state::moderate%]",
+ "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality::state::unhealthy%]",
+ "very_unhealthy": "[%key:component::accuweather::entity::sensor::air_quality::state::very_unhealthy%]"
+ }
+ }
}
},
"apparent_temperature": {
@@ -62,12 +72,10 @@
"level": {
"name": "Level",
"state": {
- "good": "[%key:component::accuweather::entity::sensor::air_quality::state::good%]",
- "hazardous": "[%key:component::accuweather::entity::sensor::air_quality::state::hazardous%]",
- "high": "[%key:component::accuweather::entity::sensor::air_quality::state::high%]",
- "low": "[%key:component::accuweather::entity::sensor::air_quality::state::low%]",
- "moderate": "[%key:component::accuweather::entity::sensor::air_quality::state::moderate%]",
- "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality::state::unhealthy%]"
+ "high": "[%key:common::state::high%]",
+ "low": "[%key:common::state::low%]",
+ "moderate": "Moderate",
+ "very_high": "[%key:common::state::very_high%]"
}
}
}
@@ -81,12 +89,10 @@
"level": {
"name": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::name%]",
"state": {
- "good": "[%key:component::accuweather::entity::sensor::air_quality::state::good%]",
- "hazardous": "[%key:component::accuweather::entity::sensor::air_quality::state::hazardous%]",
- "high": "[%key:component::accuweather::entity::sensor::air_quality::state::high%]",
- "low": "[%key:component::accuweather::entity::sensor::air_quality::state::low%]",
- "moderate": "[%key:component::accuweather::entity::sensor::air_quality::state::moderate%]",
- "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality::state::unhealthy%]"
+ "high": "[%key:common::state::high%]",
+ "low": "[%key:common::state::low%]",
+ "moderate": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::moderate%]",
+ "very_high": "[%key:common::state::very_high%]"
}
}
}
@@ -100,6 +106,15 @@
"steady": "Steady",
"rising": "Rising",
"falling": "Falling"
+ },
+ "state_attributes": {
+ "options": {
+ "state": {
+ "falling": "[%key:component::accuweather::entity::sensor::pressure_tendency::state::falling%]",
+ "rising": "[%key:component::accuweather::entity::sensor::pressure_tendency::state::rising%]",
+ "steady": "[%key:component::accuweather::entity::sensor::pressure_tendency::state::steady%]"
+ }
+ }
}
},
"ragweed_pollen": {
@@ -108,12 +123,10 @@
"level": {
"name": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::name%]",
"state": {
- "good": "[%key:component::accuweather::entity::sensor::air_quality::state::good%]",
- "hazardous": "[%key:component::accuweather::entity::sensor::air_quality::state::hazardous%]",
- "high": "[%key:component::accuweather::entity::sensor::air_quality::state::high%]",
- "low": "[%key:component::accuweather::entity::sensor::air_quality::state::low%]",
- "moderate": "[%key:component::accuweather::entity::sensor::air_quality::state::moderate%]",
- "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality::state::unhealthy%]"
+ "high": "[%key:common::state::high%]",
+ "low": "[%key:common::state::low%]",
+ "moderate": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::moderate%]",
+ "very_high": "[%key:common::state::very_high%]"
}
}
}
@@ -154,12 +167,10 @@
"level": {
"name": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::name%]",
"state": {
- "good": "[%key:component::accuweather::entity::sensor::air_quality::state::good%]",
- "hazardous": "[%key:component::accuweather::entity::sensor::air_quality::state::hazardous%]",
- "high": "[%key:component::accuweather::entity::sensor::air_quality::state::high%]",
- "low": "[%key:component::accuweather::entity::sensor::air_quality::state::low%]",
- "moderate": "[%key:component::accuweather::entity::sensor::air_quality::state::moderate%]",
- "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality::state::unhealthy%]"
+ "high": "[%key:common::state::high%]",
+ "low": "[%key:common::state::low%]",
+ "moderate": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::moderate%]",
+ "very_high": "[%key:common::state::very_high%]"
}
}
}
@@ -170,12 +181,10 @@
"level": {
"name": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::name%]",
"state": {
- "good": "[%key:component::accuweather::entity::sensor::air_quality::state::good%]",
- "hazardous": "[%key:component::accuweather::entity::sensor::air_quality::state::hazardous%]",
- "high": "[%key:component::accuweather::entity::sensor::air_quality::state::high%]",
- "low": "[%key:component::accuweather::entity::sensor::air_quality::state::low%]",
- "moderate": "[%key:component::accuweather::entity::sensor::air_quality::state::moderate%]",
- "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality::state::unhealthy%]"
+ "high": "[%key:common::state::high%]",
+ "low": "[%key:common::state::low%]",
+ "moderate": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::moderate%]",
+ "very_high": "[%key:common::state::very_high%]"
}
}
}
@@ -186,12 +195,10 @@
"level": {
"name": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::name%]",
"state": {
- "good": "[%key:component::accuweather::entity::sensor::air_quality::state::good%]",
- "hazardous": "[%key:component::accuweather::entity::sensor::air_quality::state::hazardous%]",
- "high": "[%key:component::accuweather::entity::sensor::air_quality::state::high%]",
- "low": "[%key:component::accuweather::entity::sensor::air_quality::state::low%]",
- "moderate": "[%key:component::accuweather::entity::sensor::air_quality::state::moderate%]",
- "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality::state::unhealthy%]"
+ "high": "[%key:common::state::high%]",
+ "low": "[%key:common::state::low%]",
+ "moderate": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::moderate%]",
+ "very_high": "[%key:common::state::very_high%]"
}
}
}
@@ -222,6 +229,14 @@
}
}
},
+ "exceptions": {
+ "current_conditions_update_error": {
+ "message": "An error occurred while retrieving weather current conditions data from the AccuWeather API: {error}"
+ },
+ "forecast_update_error": {
+ "message": "An error occurred while retrieving weather forecast data from the AccuWeather API: {error}"
+ }
+ },
"system_health": {
"info": {
"can_reach_server": "Reach AccuWeather server",
diff --git a/homeassistant/components/accuweather/weather.py b/homeassistant/components/accuweather/weather.py
index 7d754278d91..770f2b64f20 100644
--- a/homeassistant/components/accuweather/weather.py
+++ b/homeassistant/components/accuweather/weather.py
@@ -30,7 +30,7 @@ from homeassistant.const import (
UnitOfTemperature,
)
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.util.dt import utc_from_timestamp
from .const import (
@@ -54,7 +54,7 @@ PARALLEL_UPDATES = 1
async def async_setup_entry(
hass: HomeAssistant,
entry: AccuWeatherConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Add a AccuWeather weather entity from a config_entry."""
async_add_entities([AccuWeatherEntity(entry.runtime_data)])
diff --git a/homeassistant/components/acmeda/cover.py b/homeassistant/components/acmeda/cover.py
index 77099e86adc..d09ba4bac08 100644
--- a/homeassistant/components/acmeda/cover.py
+++ b/homeassistant/components/acmeda/cover.py
@@ -11,7 +11,7 @@ from homeassistant.components.cover import (
)
from homeassistant.core import HomeAssistant, callback
from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import AcmedaConfigEntry
from .const import ACMEDA_HUB_UPDATE
@@ -22,7 +22,7 @@ from .helpers import async_add_acmeda_entities
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AcmedaConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the Acmeda Rollers from a config entry."""
hub = config_entry.runtime_data
diff --git a/homeassistant/components/acmeda/helpers.py b/homeassistant/components/acmeda/helpers.py
index 52af7d586de..4c0f9b32cff 100644
--- a/homeassistant/components/acmeda/helpers.py
+++ b/homeassistant/components/acmeda/helpers.py
@@ -9,7 +9,7 @@ from aiopulse import Roller
from homeassistant.config_entries import ConfigEntry
from homeassistant.core import HomeAssistant, callback
from homeassistant.helpers import device_registry as dr
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .const import DOMAIN, LOGGER
@@ -23,7 +23,7 @@ def async_add_acmeda_entities(
entity_class: type,
config_entry: AcmedaConfigEntry,
current: set[int],
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Add any new entities."""
hub = config_entry.runtime_data
diff --git a/homeassistant/components/acmeda/sensor.py b/homeassistant/components/acmeda/sensor.py
index f5df1bf013d..515146f3d1a 100644
--- a/homeassistant/components/acmeda/sensor.py
+++ b/homeassistant/components/acmeda/sensor.py
@@ -6,7 +6,7 @@ from homeassistant.components.sensor import SensorDeviceClass, SensorEntity
from homeassistant.const import PERCENTAGE
from homeassistant.core import HomeAssistant, callback
from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import AcmedaConfigEntry
from .const import ACMEDA_HUB_UPDATE
@@ -17,7 +17,7 @@ from .helpers import async_add_acmeda_entities
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AcmedaConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the Acmeda Rollers from a config entry."""
hub = config_entry.runtime_data
diff --git a/homeassistant/components/adax/climate.py b/homeassistant/components/adax/climate.py
index 15022ba3c9f..078640cd367 100644
--- a/homeassistant/components/adax/climate.py
+++ b/homeassistant/components/adax/climate.py
@@ -25,7 +25,7 @@ from homeassistant.const import (
from homeassistant.core import HomeAssistant
from homeassistant.helpers.aiohttp_client import async_get_clientsession
from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .const import ACCOUNT_ID, CONNECTION_TYPE, DOMAIN, LOCAL
@@ -33,7 +33,7 @@ from .const import ACCOUNT_ID, CONNECTION_TYPE, DOMAIN, LOCAL
async def async_setup_entry(
hass: HomeAssistant,
entry: ConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the Adax thermostat with config flow."""
if entry.data.get(CONNECTION_TYPE) == LOCAL:
diff --git a/homeassistant/components/adax/strings.json b/homeassistant/components/adax/strings.json
index 6157b7dfc91..9ba497a9aca 100644
--- a/homeassistant/components/adax/strings.json
+++ b/homeassistant/components/adax/strings.json
@@ -5,14 +5,14 @@
"data": {
"connection_type": "Select connection type"
},
- "description": "Select connection type. Local requires heaters with bluetooth"
+ "description": "Select connection type. Local requires heaters with Bluetooth"
},
"local": {
"data": {
"wifi_ssid": "Wi-Fi SSID",
- "wifi_pswd": "Wi-Fi Password"
+ "wifi_pswd": "Wi-Fi password"
},
- "description": "Reset the heater by pressing + and OK until display shows 'Reset'. Then press and hold OK button on the heater until the blue led starts blinking before pressing Submit. Configuring heater might take some minutes."
+ "description": "Reset the heater by pressing + and OK until display shows 'Reset'. Then press and hold OK button on the heater until the blue LED starts blinking before pressing Submit. Configuring heater might take some minutes."
},
"cloud": {
"data": {
diff --git a/homeassistant/components/adguard/__init__.py b/homeassistant/components/adguard/__init__.py
index f8ddeba6767..bbc763d7ec3 100644
--- a/homeassistant/components/adguard/__init__.py
+++ b/homeassistant/components/adguard/__init__.py
@@ -7,7 +7,7 @@ from dataclasses import dataclass
from adguardhome import AdGuardHome, AdGuardHomeConnectionError
import voluptuous as vol
-from homeassistant.config_entries import ConfigEntry, ConfigEntryState
+from homeassistant.config_entries import ConfigEntry
from homeassistant.const import (
CONF_HOST,
CONF_NAME,
@@ -123,12 +123,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: AdGuardConfigEntry) -> b
async def async_unload_entry(hass: HomeAssistant, entry: AdGuardConfigEntry) -> bool:
"""Unload AdGuard Home config entry."""
unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
- loaded_entries = [
- entry
- for entry in hass.config_entries.async_entries(DOMAIN)
- if entry.state == ConfigEntryState.LOADED
- ]
- if len(loaded_entries) == 1:
+ if not hass.config_entries.async_loaded_entries(DOMAIN):
# This is the last loaded instance of AdGuard, deregister any services
hass.services.async_remove(DOMAIN, SERVICE_ADD_URL)
hass.services.async_remove(DOMAIN, SERVICE_REMOVE_URL)
diff --git a/homeassistant/components/adguard/sensor.py b/homeassistant/components/adguard/sensor.py
index b2404a88278..f1af8ac32a4 100644
--- a/homeassistant/components/adguard/sensor.py
+++ b/homeassistant/components/adguard/sensor.py
@@ -12,7 +12,7 @@ from adguardhome import AdGuardHome
from homeassistant.components.sensor import SensorEntity, SensorEntityDescription
from homeassistant.const import PERCENTAGE, UnitOfTime
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import AdGuardConfigEntry, AdGuardData
from .const import DOMAIN
@@ -85,7 +85,7 @@ SENSORS: tuple[AdGuardHomeEntityDescription, ...] = (
async def async_setup_entry(
hass: HomeAssistant,
entry: AdGuardConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up AdGuard Home sensor based on a config entry."""
data = entry.runtime_data
diff --git a/homeassistant/components/adguard/switch.py b/homeassistant/components/adguard/switch.py
index 3ea4f9d1d93..5128102a955 100644
--- a/homeassistant/components/adguard/switch.py
+++ b/homeassistant/components/adguard/switch.py
@@ -11,7 +11,7 @@ from adguardhome import AdGuardHome, AdGuardHomeError
from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import AdGuardConfigEntry, AdGuardData
from .const import DOMAIN, LOGGER
@@ -79,7 +79,7 @@ SWITCHES: tuple[AdGuardHomeSwitchEntityDescription, ...] = (
async def async_setup_entry(
hass: HomeAssistant,
entry: AdGuardConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up AdGuard Home switch based on a config entry."""
data = entry.runtime_data
diff --git a/homeassistant/components/advantage_air/binary_sensor.py b/homeassistant/components/advantage_air/binary_sensor.py
index 601b10aeb4a..dd306b82c8a 100644
--- a/homeassistant/components/advantage_air/binary_sensor.py
+++ b/homeassistant/components/advantage_air/binary_sensor.py
@@ -8,7 +8,7 @@ from homeassistant.components.binary_sensor import (
)
from homeassistant.const import EntityCategory
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import AdvantageAirDataConfigEntry
from .entity import AdvantageAirAcEntity, AdvantageAirZoneEntity
@@ -20,7 +20,7 @@ PARALLEL_UPDATES = 0
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AdvantageAirDataConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up AdvantageAir Binary Sensor platform."""
diff --git a/homeassistant/components/advantage_air/climate.py b/homeassistant/components/advantage_air/climate.py
index d07a3182ed7..1d593c5c3c8 100644
--- a/homeassistant/components/advantage_air/climate.py
+++ b/homeassistant/components/advantage_air/climate.py
@@ -2,6 +2,7 @@
from __future__ import annotations
+from decimal import Decimal
import logging
from typing import Any
@@ -14,12 +15,13 @@ from homeassistant.components.climate import (
FAN_MEDIUM,
ClimateEntity,
ClimateEntityFeature,
+ HVACAction,
HVACMode,
)
from homeassistant.const import ATTR_TEMPERATURE, PRECISION_WHOLE, UnitOfTemperature
from homeassistant.core import HomeAssistant, callback
from homeassistant.exceptions import ServiceValidationError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import AdvantageAirDataConfigEntry
from .const import (
@@ -49,6 +51,14 @@ ADVANTAGE_AIR_MYTEMP_ENABLED = "climateControlModeEnabled"
ADVANTAGE_AIR_HEAT_TARGET = "myAutoHeatTargetTemp"
ADVANTAGE_AIR_COOL_TARGET = "myAutoCoolTargetTemp"
ADVANTAGE_AIR_MYFAN = "autoAA"
+ADVANTAGE_AIR_MYAUTO_MODE_SET = "myAutoModeCurrentSetMode"
+
+HVAC_ACTIONS = {
+ "cool": HVACAction.COOLING,
+ "heat": HVACAction.HEATING,
+ "vent": HVACAction.FAN,
+ "dry": HVACAction.DRYING,
+}
HVAC_MODES = [
HVACMode.OFF,
@@ -76,7 +86,7 @@ _LOGGER = logging.getLogger(__name__)
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AdvantageAirDataConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up AdvantageAir climate platform."""
@@ -175,6 +185,17 @@ class AdvantageAirAC(AdvantageAirAcEntity, ClimateEntity):
return ADVANTAGE_AIR_HVAC_MODES.get(self._ac["mode"])
return HVACMode.OFF
+ @property
+ def hvac_action(self) -> HVACAction | None:
+ """Return the current running HVAC action."""
+ if self._ac["state"] == ADVANTAGE_AIR_STATE_OFF:
+ return HVACAction.OFF
+ if self._ac["mode"] == "myauto":
+ return HVAC_ACTIONS.get(
+ self._ac.get(ADVANTAGE_AIR_MYAUTO_MODE_SET, HVACAction.OFF)
+ )
+ return HVAC_ACTIONS.get(self._ac["mode"])
+
@property
def fan_mode(self) -> str | None:
"""Return the current fan modes."""
@@ -273,6 +294,22 @@ class AdvantageAirZone(AdvantageAirZoneEntity, ClimateEntity):
return HVACMode.HEAT_COOL
return HVACMode.OFF
+ @property
+ def hvac_action(self) -> HVACAction | None:
+ """Return the HVAC action, inheriting from master AC if zone is open but idle if air is <= 5%."""
+ if self._ac["state"] == ADVANTAGE_AIR_STATE_OFF:
+ return HVACAction.OFF
+ master_action = HVAC_ACTIONS.get(self._ac["mode"], HVACAction.OFF)
+ if self._ac["mode"] == "myauto":
+ master_action = HVAC_ACTIONS.get(
+ str(self._ac.get(ADVANTAGE_AIR_MYAUTO_MODE_SET)), HVACAction.OFF
+ )
+ if self._zone["state"] == ADVANTAGE_AIR_STATE_OPEN:
+ if self._zone["value"] <= Decimal(5):
+ return HVACAction.IDLE
+ return master_action
+ return HVACAction.OFF
+
@property
def current_temperature(self) -> float | None:
"""Return the current temperature."""
diff --git a/homeassistant/components/advantage_air/const.py b/homeassistant/components/advantage_air/const.py
index 6ae0a0e06d5..103ca57f6ef 100644
--- a/homeassistant/components/advantage_air/const.py
+++ b/homeassistant/components/advantage_air/const.py
@@ -7,3 +7,4 @@ ADVANTAGE_AIR_STATE_CLOSE = "close"
ADVANTAGE_AIR_STATE_ON = "on"
ADVANTAGE_AIR_STATE_OFF = "off"
ADVANTAGE_AIR_AUTOFAN_ENABLED = "aaAutoFanModeEnabled"
+ADVANTAGE_AIR_NIGHT_MODE_ENABLED = "quietNightModeEnabled"
diff --git a/homeassistant/components/advantage_air/cover.py b/homeassistant/components/advantage_air/cover.py
index b091f0077a1..e764d484128 100644
--- a/homeassistant/components/advantage_air/cover.py
+++ b/homeassistant/components/advantage_air/cover.py
@@ -9,7 +9,7 @@ from homeassistant.components.cover import (
CoverEntityFeature,
)
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import AdvantageAirDataConfigEntry
from .const import ADVANTAGE_AIR_STATE_CLOSE, ADVANTAGE_AIR_STATE_OPEN
@@ -22,7 +22,7 @@ PARALLEL_UPDATES = 0
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AdvantageAirDataConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up AdvantageAir cover platform."""
@@ -41,7 +41,7 @@ async def async_setup_entry(
entities.append(
AdvantageAirThingCover(instance, thing, CoverDeviceClass.BLIND)
)
- elif thing["channelDipState"] == 3: # 3 = "Garage door"
+ elif thing["channelDipState"] in [3, 10]: # 3 & 10 = "Garage door"
entities.append(
AdvantageAirThingCover(instance, thing, CoverDeviceClass.GARAGE)
)
diff --git a/homeassistant/components/advantage_air/light.py b/homeassistant/components/advantage_air/light.py
index 7dd0a0a183b..ffd502663b0 100644
--- a/homeassistant/components/advantage_air/light.py
+++ b/homeassistant/components/advantage_air/light.py
@@ -5,7 +5,7 @@ from typing import Any
from homeassistant.components.light import ATTR_BRIGHTNESS, ColorMode, LightEntity
from homeassistant.core import HomeAssistant
from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import AdvantageAirDataConfigEntry
from .const import ADVANTAGE_AIR_STATE_ON, DOMAIN as ADVANTAGE_AIR_DOMAIN
@@ -16,7 +16,7 @@ from .models import AdvantageAirData
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AdvantageAirDataConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up AdvantageAir light platform."""
diff --git a/homeassistant/components/advantage_air/select.py b/homeassistant/components/advantage_air/select.py
index 84c37f38d7f..320bfd35aba 100644
--- a/homeassistant/components/advantage_air/select.py
+++ b/homeassistant/components/advantage_air/select.py
@@ -2,7 +2,7 @@
from homeassistant.components.select import SelectEntity
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import AdvantageAirDataConfigEntry
from .entity import AdvantageAirAcEntity
@@ -14,7 +14,7 @@ ADVANTAGE_AIR_INACTIVE = "Inactive"
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AdvantageAirDataConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up AdvantageAir select platform."""
diff --git a/homeassistant/components/advantage_air/sensor.py b/homeassistant/components/advantage_air/sensor.py
index ab1a1c4f9a0..2abcc3b5a68 100644
--- a/homeassistant/components/advantage_air/sensor.py
+++ b/homeassistant/components/advantage_air/sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.sensor import (
from homeassistant.const import PERCENTAGE, EntityCategory, UnitOfTemperature
from homeassistant.core import HomeAssistant
from homeassistant.helpers import config_validation as cv, entity_platform
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import AdvantageAirDataConfigEntry
from .const import ADVANTAGE_AIR_STATE_OPEN
@@ -32,7 +32,7 @@ PARALLEL_UPDATES = 0
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AdvantageAirDataConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up AdvantageAir sensor platform."""
diff --git a/homeassistant/components/advantage_air/switch.py b/homeassistant/components/advantage_air/switch.py
index 876875a2510..8560c9a9138 100644
--- a/homeassistant/components/advantage_air/switch.py
+++ b/homeassistant/components/advantage_air/switch.py
@@ -4,11 +4,12 @@ from typing import Any
from homeassistant.components.switch import SwitchDeviceClass, SwitchEntity
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import AdvantageAirDataConfigEntry
from .const import (
ADVANTAGE_AIR_AUTOFAN_ENABLED,
+ ADVANTAGE_AIR_NIGHT_MODE_ENABLED,
ADVANTAGE_AIR_STATE_OFF,
ADVANTAGE_AIR_STATE_ON,
)
@@ -19,7 +20,7 @@ from .models import AdvantageAirData
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AdvantageAirDataConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up AdvantageAir switch platform."""
@@ -32,6 +33,8 @@ async def async_setup_entry(
entities.append(AdvantageAirFreshAir(instance, ac_key))
if ADVANTAGE_AIR_AUTOFAN_ENABLED in ac_device["info"]:
entities.append(AdvantageAirMyFan(instance, ac_key))
+ if ADVANTAGE_AIR_NIGHT_MODE_ENABLED in ac_device["info"]:
+ entities.append(AdvantageAirNightMode(instance, ac_key))
if things := instance.coordinator.data.get("myThings"):
entities.extend(
AdvantageAirRelay(instance, thing)
@@ -93,6 +96,32 @@ class AdvantageAirMyFan(AdvantageAirAcEntity, SwitchEntity):
await self.async_update_ac({ADVANTAGE_AIR_AUTOFAN_ENABLED: False})
+class AdvantageAirNightMode(AdvantageAirAcEntity, SwitchEntity):
+ """Representation of Advantage 'MySleep$aver' Mode control."""
+
+ _attr_icon = "mdi:weather-night"
+ _attr_name = "MySleep$aver"
+ _attr_device_class = SwitchDeviceClass.SWITCH
+
+ def __init__(self, instance: AdvantageAirData, ac_key: str) -> None:
+ """Initialize an Advantage Air Night Mode control."""
+ super().__init__(instance, ac_key)
+ self._attr_unique_id += "-nightmode"
+
+ @property
+ def is_on(self) -> bool:
+ """Return the Night Mode status."""
+ return self._ac[ADVANTAGE_AIR_NIGHT_MODE_ENABLED]
+
+ async def async_turn_on(self, **kwargs: Any) -> None:
+ """Turn Night Mode on."""
+ await self.async_update_ac({ADVANTAGE_AIR_NIGHT_MODE_ENABLED: True})
+
+ async def async_turn_off(self, **kwargs: Any) -> None:
+ """Turn Night Mode off."""
+ await self.async_update_ac({ADVANTAGE_AIR_NIGHT_MODE_ENABLED: False})
+
+
class AdvantageAirRelay(AdvantageAirThingEntity, SwitchEntity):
"""Representation of Advantage Air Thing."""
diff --git a/homeassistant/components/advantage_air/update.py b/homeassistant/components/advantage_air/update.py
index b639e4df867..92a162303dd 100644
--- a/homeassistant/components/advantage_air/update.py
+++ b/homeassistant/components/advantage_air/update.py
@@ -3,7 +3,7 @@
from homeassistant.components.update import UpdateEntity
from homeassistant.core import HomeAssistant
from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import AdvantageAirDataConfigEntry
from .const import DOMAIN as ADVANTAGE_AIR_DOMAIN
@@ -14,7 +14,7 @@ from .models import AdvantageAirData
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AdvantageAirDataConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up AdvantageAir update platform."""
diff --git a/homeassistant/components/aemet/image.py b/homeassistant/components/aemet/image.py
index ffc53022e4c..ba9986a5ccc 100644
--- a/homeassistant/components/aemet/image.py
+++ b/homeassistant/components/aemet/image.py
@@ -9,7 +9,7 @@ from aemet_opendata.helpers import dict_nested_value
from homeassistant.components.image import Image, ImageEntity, ImageEntityDescription
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .coordinator import AemetConfigEntry, WeatherUpdateCoordinator
from .entity import AemetEntity
@@ -25,7 +25,7 @@ AEMET_IMAGES: Final[tuple[ImageEntityDescription, ...]] = (
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AemetConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up AEMET OpenData image entities based on a config entry."""
domain_data = config_entry.runtime_data
diff --git a/homeassistant/components/aemet/sensor.py b/homeassistant/components/aemet/sensor.py
index 88eb34b6f84..9077b2bc44d 100644
--- a/homeassistant/components/aemet/sensor.py
+++ b/homeassistant/components/aemet/sensor.py
@@ -52,7 +52,7 @@ from homeassistant.const import (
UnitOfVolumetricFlux,
)
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.util import dt as dt_util
from .const import (
@@ -358,7 +358,7 @@ WEATHER_SENSORS: Final[tuple[AemetSensorEntityDescription, ...]] = (
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AemetConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up AEMET OpenData sensor entities based on a config entry."""
domain_data = config_entry.runtime_data
diff --git a/homeassistant/components/aemet/weather.py b/homeassistant/components/aemet/weather.py
index a156652eadd..3a17430300d 100644
--- a/homeassistant/components/aemet/weather.py
+++ b/homeassistant/components/aemet/weather.py
@@ -25,7 +25,7 @@ from homeassistant.const import (
UnitOfTemperature,
)
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .const import CONDITIONS_MAP
from .coordinator import AemetConfigEntry, WeatherUpdateCoordinator
@@ -35,7 +35,7 @@ from .entity import AemetEntity
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AemetConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up AEMET OpenData weather entity based on a config entry."""
domain_data = config_entry.runtime_data
diff --git a/homeassistant/components/aftership/sensor.py b/homeassistant/components/aftership/sensor.py
index 085be2499d4..7e0c6f524ab 100644
--- a/homeassistant/components/aftership/sensor.py
+++ b/homeassistant/components/aftership/sensor.py
@@ -14,7 +14,7 @@ from homeassistant.helpers.dispatcher import (
async_dispatcher_connect,
async_dispatcher_send,
)
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.util import Throttle
from . import AfterShipConfigEntry
@@ -42,7 +42,7 @@ PLATFORM_SCHEMA: Final = cv.removed(DOMAIN, raise_if_present=False)
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AfterShipConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up AfterShip sensor entities based on a config entry."""
aftership = config_entry.runtime_data
diff --git a/homeassistant/components/aftership/strings.json b/homeassistant/components/aftership/strings.json
index ace8eb6d2d3..c3817a0cd24 100644
--- a/homeassistant/components/aftership/strings.json
+++ b/homeassistant/components/aftership/strings.json
@@ -51,7 +51,7 @@
"issues": {
"deprecated_yaml_import_issue_cannot_connect": {
"title": "The {integration_title} YAML configuration import failed",
- "description": "Configuring {integration_title} using YAML is being removed but there was an connection error importing your YAML configuration.\n\nEnsure connection to {integration_title} works and restart Home Assistant to try again or remove the {integration_title} YAML configuration from your configuration.yaml file and continue to [set up the integration]({url}) manually."
+ "description": "Configuring {integration_title} using YAML is being removed but there was a connection error importing your YAML configuration.\n\nEnsure connection to {integration_title} works and restart Home Assistant to try again or remove the {integration_title} YAML configuration from your configuration.yaml file and continue to [set up the integration]({url}) manually."
}
}
}
diff --git a/homeassistant/components/agent_dvr/alarm_control_panel.py b/homeassistant/components/agent_dvr/alarm_control_panel.py
index 23328315e42..1ac808c87ad 100644
--- a/homeassistant/components/agent_dvr/alarm_control_panel.py
+++ b/homeassistant/components/agent_dvr/alarm_control_panel.py
@@ -9,7 +9,7 @@ from homeassistant.components.alarm_control_panel import (
)
from homeassistant.core import HomeAssistant
from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import AgentDVRConfigEntry
from .const import DOMAIN as AGENT_DOMAIN
@@ -24,7 +24,7 @@ CONST_ALARM_CONTROL_PANEL_NAME = "Alarm Panel"
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AgentDVRConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the Agent DVR Alarm Control Panels."""
async_add_entities([AgentBaseStation(config_entry.runtime_data)])
diff --git a/homeassistant/components/agent_dvr/camera.py b/homeassistant/components/agent_dvr/camera.py
index 933d0c6b40b..3de7f095b13 100644
--- a/homeassistant/components/agent_dvr/camera.py
+++ b/homeassistant/components/agent_dvr/camera.py
@@ -10,7 +10,7 @@ from homeassistant.components.mjpeg import MjpegCamera, filter_urllib3_logging
from homeassistant.core import HomeAssistant
from homeassistant.helpers.device_registry import DeviceInfo
from homeassistant.helpers.entity_platform import (
- AddEntitiesCallback,
+ AddConfigEntryEntitiesCallback,
async_get_current_platform,
)
@@ -39,7 +39,7 @@ CAMERA_SERVICES = {
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AgentDVRConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the Agent cameras."""
filter_urllib3_logging()
diff --git a/homeassistant/components/airgradient/button.py b/homeassistant/components/airgradient/button.py
index ea7b12062e8..5e6f857f686 100644
--- a/homeassistant/components/airgradient/button.py
+++ b/homeassistant/components/airgradient/button.py
@@ -13,7 +13,7 @@ from homeassistant.components.button import (
from homeassistant.const import EntityCategory
from homeassistant.core import HomeAssistant, callback
from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import AirGradientConfigEntry
from .const import DOMAIN
@@ -47,7 +47,7 @@ LED_BAR_TEST = AirGradientButtonEntityDescription(
async def async_setup_entry(
hass: HomeAssistant,
entry: AirGradientConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up AirGradient button entities based on a config entry."""
coordinator = entry.runtime_data
diff --git a/homeassistant/components/airgradient/manifest.json b/homeassistant/components/airgradient/manifest.json
index 13764142697..afaf2698ced 100644
--- a/homeassistant/components/airgradient/manifest.json
+++ b/homeassistant/components/airgradient/manifest.json
@@ -6,6 +6,6 @@
"documentation": "https://www.home-assistant.io/integrations/airgradient",
"integration_type": "device",
"iot_class": "local_polling",
- "requirements": ["airgradient==0.9.1"],
+ "requirements": ["airgradient==0.9.2"],
"zeroconf": ["_airgradient._tcp.local."]
}
diff --git a/homeassistant/components/airgradient/number.py b/homeassistant/components/airgradient/number.py
index 4265215fa25..eeb24867845 100644
--- a/homeassistant/components/airgradient/number.py
+++ b/homeassistant/components/airgradient/number.py
@@ -14,7 +14,7 @@ from homeassistant.components.number import (
from homeassistant.const import PERCENTAGE, EntityCategory
from homeassistant.core import HomeAssistant, callback
from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import AirGradientConfigEntry
from .const import DOMAIN
@@ -60,7 +60,7 @@ LED_BAR_BRIGHTNESS = AirGradientNumberEntityDescription(
async def async_setup_entry(
hass: HomeAssistant,
entry: AirGradientConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up AirGradient number entities based on a config entry."""
diff --git a/homeassistant/components/airgradient/select.py b/homeassistant/components/airgradient/select.py
index 8c15102ad3a..f288055ebf4 100644
--- a/homeassistant/components/airgradient/select.py
+++ b/homeassistant/components/airgradient/select.py
@@ -14,7 +14,7 @@ from homeassistant.components.select import (
from homeassistant.const import EntityCategory
from homeassistant.core import HomeAssistant, callback
from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import AirGradientConfigEntry
from .const import DOMAIN, PM_STANDARD, PM_STANDARD_REVERSE
@@ -142,7 +142,7 @@ CONTROL_ENTITIES: tuple[AirGradientSelectEntityDescription, ...] = (
async def async_setup_entry(
hass: HomeAssistant,
entry: AirGradientConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up AirGradient select entities based on a config entry."""
diff --git a/homeassistant/components/airgradient/sensor.py b/homeassistant/components/airgradient/sensor.py
index 3b20b31f923..a4944a6196e 100644
--- a/homeassistant/components/airgradient/sensor.py
+++ b/homeassistant/components/airgradient/sensor.py
@@ -27,7 +27,7 @@ from homeassistant.const import (
UnitOfTime,
)
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.typing import StateType
from . import AirGradientConfigEntry
@@ -225,7 +225,7 @@ CONFIG_DISPLAY_SENSOR_TYPES: tuple[AirGradientConfigSensorEntityDescription, ...
async def async_setup_entry(
hass: HomeAssistant,
entry: AirGradientConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up AirGradient sensor entities based on a config entry."""
diff --git a/homeassistant/components/airgradient/strings.json b/homeassistant/components/airgradient/strings.json
index 4cf3a6a34ea..cef4db57358 100644
--- a/homeassistant/components/airgradient/strings.json
+++ b/homeassistant/components/airgradient/strings.json
@@ -11,7 +11,7 @@
}
},
"discovery_confirm": {
- "description": "Do you want to setup {model}?"
+ "description": "Do you want to set up {model}?"
}
},
"abort": {
@@ -68,8 +68,8 @@
"led_bar_mode": {
"name": "LED bar mode",
"state": {
- "off": "Off",
- "co2": "Carbon dioxide",
+ "off": "[%key:common::state::off%]",
+ "co2": "[%key:component::sensor::entity_component::carbon_dioxide::name%]",
"pm": "Particulate matter"
}
},
@@ -143,8 +143,8 @@
"led_bar_mode": {
"name": "[%key:component::airgradient::entity::select::led_bar_mode::name%]",
"state": {
- "off": "[%key:component::airgradient::entity::select::led_bar_mode::state::off%]",
- "co2": "[%key:component::airgradient::entity::select::led_bar_mode::state::co2%]",
+ "off": "[%key:common::state::off%]",
+ "co2": "[%key:component::sensor::entity_component::carbon_dioxide::name%]",
"pm": "[%key:component::airgradient::entity::select::led_bar_mode::state::pm%]"
}
},
diff --git a/homeassistant/components/airgradient/switch.py b/homeassistant/components/airgradient/switch.py
index 55835fa30a6..0d404ed0f15 100644
--- a/homeassistant/components/airgradient/switch.py
+++ b/homeassistant/components/airgradient/switch.py
@@ -15,7 +15,7 @@ from homeassistant.components.switch import (
from homeassistant.const import EntityCategory
from homeassistant.core import HomeAssistant, callback
from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import AirGradientConfigEntry
from .const import DOMAIN
@@ -45,7 +45,7 @@ POST_DATA_TO_AIRGRADIENT = AirGradientSwitchEntityDescription(
async def async_setup_entry(
hass: HomeAssistant,
entry: AirGradientConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up AirGradient switch entities based on a config entry."""
coordinator = entry.runtime_data
diff --git a/homeassistant/components/airgradient/update.py b/homeassistant/components/airgradient/update.py
index 12cec65f791..97cb8576e79 100644
--- a/homeassistant/components/airgradient/update.py
+++ b/homeassistant/components/airgradient/update.py
@@ -6,7 +6,7 @@ from propcache.api import cached_property
from homeassistant.components.update import UpdateDeviceClass, UpdateEntity
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import AirGradientConfigEntry, AirGradientCoordinator
from .entity import AirGradientEntity
@@ -18,7 +18,7 @@ SCAN_INTERVAL = timedelta(hours=1)
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AirGradientConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up Airgradient update platform."""
diff --git a/homeassistant/components/airly/coordinator.py b/homeassistant/components/airly/coordinator.py
index b255c5f078f..668cabdae63 100644
--- a/homeassistant/components/airly/coordinator.py
+++ b/homeassistant/components/airly/coordinator.py
@@ -105,7 +105,14 @@ class AirlyDataUpdateCoordinator(DataUpdateCoordinator[dict[str, str | float | i
try:
await measurements.update()
except (AirlyError, ClientConnectorError) as error:
- raise UpdateFailed(error) from error
+ raise UpdateFailed(
+ translation_domain=DOMAIN,
+ translation_key="update_error",
+ translation_placeholders={
+ "entry": self.config_entry.title,
+ "error": repr(error),
+ },
+ ) from error
_LOGGER.debug(
"Requests remaining: %s/%s",
@@ -126,7 +133,11 @@ class AirlyDataUpdateCoordinator(DataUpdateCoordinator[dict[str, str | float | i
standards = measurements.current["standards"]
if index["description"] == NO_AIRLY_SENSORS:
- raise UpdateFailed("Can't retrieve data: no Airly sensors in this area")
+ raise UpdateFailed(
+ translation_domain=DOMAIN,
+ translation_key="no_station",
+ translation_placeholders={"entry": self.config_entry.title},
+ )
for value in values:
data[value["name"]] = value["value"]
for standard in standards:
diff --git a/homeassistant/components/airly/sensor.py b/homeassistant/components/airly/sensor.py
index fbf73ed753e..2aa99d9c792 100644
--- a/homeassistant/components/airly/sensor.py
+++ b/homeassistant/components/airly/sensor.py
@@ -21,7 +21,7 @@ from homeassistant.const import (
)
from homeassistant.core import HomeAssistant, callback
from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.update_coordinator import CoordinatorEntity
from .const import (
@@ -175,7 +175,7 @@ SENSOR_TYPES: tuple[AirlySensorEntityDescription, ...] = (
async def async_setup_entry(
hass: HomeAssistant,
entry: AirlyConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up Airly sensor entities based on a config entry."""
name = entry.data[CONF_NAME]
diff --git a/homeassistant/components/airly/strings.json b/homeassistant/components/airly/strings.json
index 33ee8bbe4c9..fe4ccbb4745 100644
--- a/homeassistant/components/airly/strings.json
+++ b/homeassistant/components/airly/strings.json
@@ -36,5 +36,13 @@
"name": "[%key:component::sensor::entity_component::carbon_monoxide::name%]"
}
}
+ },
+ "exceptions": {
+ "update_error": {
+ "message": "An error occurred while retrieving data from the Airly API for {entry}: {error}"
+ },
+ "no_station": {
+ "message": "An error occurred while retrieving data from the Airly API for {entry}: no measuring stations in this area"
+ }
}
}
diff --git a/homeassistant/components/airnow/coordinator.py b/homeassistant/components/airnow/coordinator.py
index ee5bf4a1dd7..1e73bc7551e 100644
--- a/homeassistant/components/airnow/coordinator.py
+++ b/homeassistant/components/airnow/coordinator.py
@@ -8,7 +8,7 @@ from aiohttp import ClientSession
from aiohttp.client_exceptions import ClientConnectorError
from pyairnow import WebServiceAPI
from pyairnow.conv import aqi_to_concentration
-from pyairnow.errors import AirNowError
+from pyairnow.errors import AirNowError, InvalidJsonError
from homeassistant.config_entries import ConfigEntry
from homeassistant.core import HomeAssistant
@@ -79,7 +79,7 @@ class AirNowDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
distance=self.distance,
)
- except (AirNowError, ClientConnectorError) as error:
+ except (AirNowError, ClientConnectorError, InvalidJsonError) as error:
raise UpdateFailed(error) from error
if not obs:
diff --git a/homeassistant/components/airnow/sensor.py b/homeassistant/components/airnow/sensor.py
index c8b1c985c8b..db579de4976 100644
--- a/homeassistant/components/airnow/sensor.py
+++ b/homeassistant/components/airnow/sensor.py
@@ -21,7 +21,7 @@ from homeassistant.const import (
)
from homeassistant.core import HomeAssistant
from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.typing import StateType
from homeassistant.helpers.update_coordinator import CoordinatorEntity
@@ -130,7 +130,7 @@ SENSOR_TYPES: tuple[AirNowEntityDescription, ...] = (
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AirNowConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up AirNow sensor entities based on a config entry."""
coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/airnow/strings.json b/homeassistant/components/airnow/strings.json
index d5fb22106f9..a69f67948cb 100644
--- a/homeassistant/components/airnow/strings.json
+++ b/homeassistant/components/airnow/strings.json
@@ -7,7 +7,7 @@
"api_key": "[%key:common::config_flow::data::api_key%]",
"latitude": "[%key:common::config_flow::data::latitude%]",
"longitude": "[%key:common::config_flow::data::longitude%]",
- "radius": "Station Radius (miles; optional)"
+ "radius": "Station radius (miles; optional)"
}
}
},
@@ -25,7 +25,7 @@
"step": {
"init": {
"data": {
- "radius": "Station Radius (miles)"
+ "radius": "Station radius (miles)"
}
}
}
diff --git a/homeassistant/components/airq/config_flow.py b/homeassistant/components/airq/config_flow.py
index 0c57b399b1b..f87b73b5283 100644
--- a/homeassistant/components/airq/config_flow.py
+++ b/homeassistant/components/airq/config_flow.py
@@ -83,6 +83,7 @@ class AirQConfigFlow(ConfigFlow, domain=DOMAIN):
await self.async_set_unique_id(device_info["id"])
self._abort_if_unique_id_configured()
+ _LOGGER.debug("Creating an entry for %s", device_info["name"])
return self.async_create_entry(title=device_info["name"], data=user_input)
return self.async_show_form(
diff --git a/homeassistant/components/airq/coordinator.py b/homeassistant/components/airq/coordinator.py
index b48d8047910..743d12d40e5 100644
--- a/homeassistant/components/airq/coordinator.py
+++ b/homeassistant/components/airq/coordinator.py
@@ -5,7 +5,7 @@ from __future__ import annotations
from datetime import timedelta
import logging
-from aioairq import AirQ
+from aioairq.core import AirQ, identify_warming_up_sensors
from homeassistant.config_entries import ConfigEntry
from homeassistant.const import CONF_IP_ADDRESS, CONF_PASSWORD
@@ -55,6 +55,9 @@ class AirQCoordinator(DataUpdateCoordinator):
async def _async_update_data(self) -> dict:
"""Fetch the data from the device."""
if "name" not in self.device_info:
+ _LOGGER.debug(
+ "'name' not found in AirQCoordinator.device_info, fetching from the device"
+ )
info = await self.airq.fetch_device_info()
self.device_info.update(
DeviceInfo(
@@ -64,7 +67,16 @@ class AirQCoordinator(DataUpdateCoordinator):
hw_version=info["hw_version"],
)
)
- return await self.airq.get_latest_data( # type: ignore[no-any-return]
+ _LOGGER.debug(
+ "Updated AirQCoordinator.device_info for 'name' %s",
+ self.device_info.get("name"),
+ )
+ data: dict = await self.airq.get_latest_data(
return_average=self.return_average,
clip_negative_values=self.clip_negative,
)
+ if warming_up_sensors := identify_warming_up_sensors(data):
+ _LOGGER.debug(
+ "Following sensors are still warming up: %s", warming_up_sensors
+ )
+ return data
diff --git a/homeassistant/components/airq/sensor.py b/homeassistant/components/airq/sensor.py
index c465d710406..08a344ae9f4 100644
--- a/homeassistant/components/airq/sensor.py
+++ b/homeassistant/components/airq/sensor.py
@@ -24,7 +24,7 @@ from homeassistant.const import (
UnitOfTemperature,
)
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.update_coordinator import CoordinatorEntity
from . import AirQConfigEntry, AirQCoordinator
@@ -399,7 +399,7 @@ SENSOR_TYPES: list[AirQEntityDescription] = [
async def async_setup_entry(
hass: HomeAssistant,
entry: AirQConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up sensor entities based on a config entry."""
diff --git a/homeassistant/components/airq/strings.json b/homeassistant/components/airq/strings.json
index 26b944467e6..9c16975a3ab 100644
--- a/homeassistant/components/airq/strings.json
+++ b/homeassistant/components/airq/strings.json
@@ -91,7 +91,7 @@
"name": "Hydrogen fluoride"
},
"health_index": {
- "name": "Health Index"
+ "name": "Health index"
},
"absolute_humidity": {
"name": "Absolute humidity"
@@ -112,10 +112,10 @@
"name": "Oxygen"
},
"performance_index": {
- "name": "Performance Index"
+ "name": "Performance index"
},
"hydrogen_phosphide": {
- "name": "Hydrogen Phosphide"
+ "name": "Hydrogen phosphide"
},
"relative_pressure": {
"name": "Relative pressure"
@@ -127,22 +127,22 @@
"name": "Refrigerant"
},
"silicon_hydride": {
- "name": "Silicon Hydride"
+ "name": "Silicon hydride"
},
"noise": {
"name": "Noise"
},
"maximum_noise": {
- "name": "Noise (Maximum)"
+ "name": "Noise (maximum)"
},
"radon": {
"name": "Radon"
},
"industrial_volatile_organic_compounds": {
- "name": "VOCs (Industrial)"
+ "name": "VOCs (industrial)"
},
"virus_index": {
- "name": "Virus Index"
+ "name": "Virus index"
}
}
}
diff --git a/homeassistant/components/airthings/sensor.py b/homeassistant/components/airthings/sensor.py
index 1b604d72032..a0d9c97c8c8 100644
--- a/homeassistant/components/airthings/sensor.py
+++ b/homeassistant/components/airthings/sensor.py
@@ -22,7 +22,7 @@ from homeassistant.const import (
)
from homeassistant.core import HomeAssistant
from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.typing import StateType
from homeassistant.helpers.update_coordinator import CoordinatorEntity
@@ -114,7 +114,7 @@ SENSORS: dict[str, SensorEntityDescription] = {
async def async_setup_entry(
hass: HomeAssistant,
entry: AirthingsConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the Airthings sensor."""
diff --git a/homeassistant/components/airthings_ble/config_flow.py b/homeassistant/components/airthings_ble/config_flow.py
index 3e7b659bff1..2d32fa6e7df 100644
--- a/homeassistant/components/airthings_ble/config_flow.py
+++ b/homeassistant/components/airthings_ble/config_flow.py
@@ -102,7 +102,8 @@ class AirthingsConfigFlow(ConfigFlow, domain=DOMAIN):
device = await self._get_device_data(discovery_info)
except AirthingsDeviceUpdateError:
return self.async_abort(reason="cannot_connect")
- except Exception: # noqa: BLE001
+ except Exception:
+ _LOGGER.exception("Unknown error occurred")
return self.async_abort(reason="unknown")
name = get_name(device)
@@ -160,7 +161,8 @@ class AirthingsConfigFlow(ConfigFlow, domain=DOMAIN):
device = await self._get_device_data(discovery_info)
except AirthingsDeviceUpdateError:
return self.async_abort(reason="cannot_connect")
- except Exception: # noqa: BLE001
+ except Exception:
+ _LOGGER.exception("Unknown error occurred")
return self.async_abort(reason="unknown")
name = get_name(device)
self._discovered_devices[address] = Discovery(name, discovery_info, device)
diff --git a/homeassistant/components/airthings_ble/sensor.py b/homeassistant/components/airthings_ble/sensor.py
index 248561706a3..9c1a2af7a9f 100644
--- a/homeassistant/components/airthings_ble/sensor.py
+++ b/homeassistant/components/airthings_ble/sensor.py
@@ -25,7 +25,7 @@ from homeassistant.const import (
from homeassistant.core import HomeAssistant, callback
from homeassistant.helpers import device_registry as dr, entity_registry as er
from homeassistant.helpers.device_registry import CONNECTION_BLUETOOTH, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.entity_registry import (
RegistryEntry,
async_entries_for_device,
@@ -153,7 +153,7 @@ def async_migrate(hass: HomeAssistant, address: str, sensor_name: str) -> None:
async def async_setup_entry(
hass: HomeAssistant,
entry: AirthingsBLEConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the Airthings BLE sensors."""
is_metric = hass.config.units is METRIC_SYSTEM
diff --git a/homeassistant/components/airtouch4/climate.py b/homeassistant/components/airtouch4/climate.py
index 0af920bd7a9..6d393ed0c99 100644
--- a/homeassistant/components/airtouch4/climate.py
+++ b/homeassistant/components/airtouch4/climate.py
@@ -19,7 +19,7 @@ from homeassistant.components.climate import (
from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
from homeassistant.core import HomeAssistant, callback
from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.update_coordinator import CoordinatorEntity
from . import AirTouch4ConfigEntry
@@ -64,7 +64,7 @@ _LOGGER = logging.getLogger(__name__)
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AirTouch4ConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the Airtouch 4."""
coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/airtouch5/climate.py b/homeassistant/components/airtouch5/climate.py
index 16566f5d664..f3b914bf341 100644
--- a/homeassistant/components/airtouch5/climate.py
+++ b/homeassistant/components/airtouch5/climate.py
@@ -37,7 +37,7 @@ from homeassistant.components.climate import (
from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
from homeassistant.core import HomeAssistant, callback
from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import Airtouch5ConfigEntry
from .const import DOMAIN, FAN_INTELLIGENT_AUTO, FAN_TURBO
@@ -93,7 +93,7 @@ FAN_MODE_TO_SET_AC_FAN_SPEED = {
async def async_setup_entry(
hass: HomeAssistant,
config_entry: Airtouch5ConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the Airtouch 5 Climate entities."""
client = config_entry.runtime_data
diff --git a/homeassistant/components/airtouch5/config_flow.py b/homeassistant/components/airtouch5/config_flow.py
index d96aaed96b7..38c85e45fb8 100644
--- a/homeassistant/components/airtouch5/config_flow.py
+++ b/homeassistant/components/airtouch5/config_flow.py
@@ -32,7 +32,8 @@ class AirTouch5ConfigFlow(ConfigFlow, domain=DOMAIN):
client = Airtouch5SimpleClient(user_input[CONF_HOST])
try:
await client.test_connection()
- except Exception: # noqa: BLE001
+ except Exception:
+ _LOGGER.exception("Unexpected exception")
errors = {"base": "cannot_connect"}
else:
await self.async_set_unique_id(user_input[CONF_HOST])
diff --git a/homeassistant/components/airtouch5/cover.py b/homeassistant/components/airtouch5/cover.py
index 62cf7938fc2..b811ed5c451 100644
--- a/homeassistant/components/airtouch5/cover.py
+++ b/homeassistant/components/airtouch5/cover.py
@@ -20,7 +20,7 @@ from homeassistant.components.cover import (
)
from homeassistant.core import HomeAssistant, callback
from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import Airtouch5ConfigEntry
from .const import DOMAIN
@@ -32,7 +32,7 @@ _LOGGER = logging.getLogger(__name__)
async def async_setup_entry(
hass: HomeAssistant,
config_entry: Airtouch5ConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the Airtouch 5 Cover entities."""
client = config_entry.runtime_data
diff --git a/homeassistant/components/airvisual/sensor.py b/homeassistant/components/airvisual/sensor.py
index 88a670edb82..1f406bd8f36 100644
--- a/homeassistant/components/airvisual/sensor.py
+++ b/homeassistant/components/airvisual/sensor.py
@@ -23,7 +23,7 @@ from homeassistant.const import (
CONF_STATE,
)
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
from . import AirVisualConfigEntry
@@ -108,7 +108,7 @@ POLLUTANT_UNITS = {
async def async_setup_entry(
hass: HomeAssistant,
entry: AirVisualConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up AirVisual sensors based on a config entry."""
coordinator = entry.runtime_data
diff --git a/homeassistant/components/airvisual/strings.json b/homeassistant/components/airvisual/strings.json
index 148b1368a19..9d53be4dee7 100644
--- a/homeassistant/components/airvisual/strings.json
+++ b/homeassistant/components/airvisual/strings.json
@@ -2,7 +2,7 @@
"config": {
"step": {
"geography_by_coords": {
- "title": "Configure a Geography",
+ "title": "Configure a geography",
"description": "Use the AirVisual cloud API to monitor a latitude/longitude.",
"data": {
"api_key": "[%key:common::config_flow::data::api_key%]",
@@ -16,8 +16,8 @@
"data": {
"api_key": "[%key:common::config_flow::data::api_key%]",
"city": "City",
- "country": "Country",
- "state": "State"
+ "state": "State",
+ "country": "[%key:common::config_flow::data::country%]"
}
},
"reauth_confirm": {
@@ -56,12 +56,12 @@
"sensor": {
"pollutant_label": {
"state": {
- "co": "Carbon Monoxide",
- "n2": "Nitrogen Dioxide",
- "o3": "Ozone",
- "p1": "PM10",
- "p2": "PM2.5",
- "s2": "Sulfur Dioxide"
+ "co": "[%key:component::sensor::entity_component::carbon_monoxide::name%]",
+ "n2": "[%key:component::sensor::entity_component::nitrogen_dioxide::name%]",
+ "o3": "[%key:component::sensor::entity_component::ozone::name%]",
+ "p1": "[%key:component::sensor::entity_component::pm10::name%]",
+ "p2": "[%key:component::sensor::entity_component::pm25::name%]",
+ "s2": "[%key:component::sensor::entity_component::sulphur_dioxide::name%]"
}
},
"pollutant_level": {
diff --git a/homeassistant/components/airvisual_pro/sensor.py b/homeassistant/components/airvisual_pro/sensor.py
index 58ad730bc31..215370736fe 100644
--- a/homeassistant/components/airvisual_pro/sensor.py
+++ b/homeassistant/components/airvisual_pro/sensor.py
@@ -20,7 +20,7 @@ from homeassistant.const import (
UnitOfTemperature,
)
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import AirVisualProConfigEntry
from .entity import AirVisualProEntity
@@ -130,7 +130,7 @@ def async_get_aqi_locale(settings: dict[str, Any]) -> str:
async def async_setup_entry(
hass: HomeAssistant,
entry: AirVisualProConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up AirVisual sensors based on a config entry."""
async_add_entities(
diff --git a/homeassistant/components/airzone/binary_sensor.py b/homeassistant/components/airzone/binary_sensor.py
index 48f6ce8fd94..7274df44261 100644
--- a/homeassistant/components/airzone/binary_sensor.py
+++ b/homeassistant/components/airzone/binary_sensor.py
@@ -23,7 +23,7 @@ from homeassistant.components.binary_sensor import (
from homeassistant.config_entries import ConfigEntry
from homeassistant.const import EntityCategory
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .coordinator import AirzoneConfigEntry, AirzoneUpdateCoordinator
from .entity import AirzoneEntity, AirzoneSystemEntity, AirzoneZoneEntity
@@ -76,7 +76,7 @@ ZONE_BINARY_SENSOR_TYPES: Final[tuple[AirzoneBinarySensorEntityDescription, ...]
async def async_setup_entry(
hass: HomeAssistant,
entry: AirzoneConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Add Airzone binary sensors from a config_entry."""
coordinator = entry.runtime_data
diff --git a/homeassistant/components/airzone/climate.py b/homeassistant/components/airzone/climate.py
index 23355a070ab..39e70e58e6d 100644
--- a/homeassistant/components/airzone/climate.py
+++ b/homeassistant/components/airzone/climate.py
@@ -48,7 +48,7 @@ from homeassistant.config_entries import ConfigEntry
from homeassistant.const import ATTR_TEMPERATURE
from homeassistant.core import HomeAssistant, callback
from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .const import API_TEMPERATURE_STEP, TEMP_UNIT_LIB_TO_HASS
from .coordinator import AirzoneConfigEntry, AirzoneUpdateCoordinator
@@ -100,7 +100,7 @@ HVAC_MODE_HASS_TO_LIB: Final[dict[HVACMode, OperationMode]] = {
async def async_setup_entry(
hass: HomeAssistant,
entry: AirzoneConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Add Airzone climate from a config_entry."""
coordinator = entry.runtime_data
diff --git a/homeassistant/components/airzone/manifest.json b/homeassistant/components/airzone/manifest.json
index 95ed9d200f4..1b636de0a47 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.9"]
+ "requirements": ["aioairzone==1.0.0"]
}
diff --git a/homeassistant/components/airzone/select.py b/homeassistant/components/airzone/select.py
index 56a9b06ea21..c00e83f2c5b 100644
--- a/homeassistant/components/airzone/select.py
+++ b/homeassistant/components/airzone/select.py
@@ -25,7 +25,7 @@ from homeassistant.components.select import SelectEntity, SelectEntityDescriptio
from homeassistant.config_entries import ConfigEntry
from homeassistant.const import EntityCategory
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .coordinator import AirzoneConfigEntry, AirzoneUpdateCoordinator
from .entity import AirzoneEntity, AirzoneZoneEntity
@@ -117,7 +117,7 @@ ZONE_SELECT_TYPES: Final[tuple[AirzoneSelectDescription, ...]] = (
async def async_setup_entry(
hass: HomeAssistant,
entry: AirzoneConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Add Airzone select from a config_entry."""
coordinator = entry.runtime_data
diff --git a/homeassistant/components/airzone/sensor.py b/homeassistant/components/airzone/sensor.py
index 0b5c5666c89..66657836b74 100644
--- a/homeassistant/components/airzone/sensor.py
+++ b/homeassistant/components/airzone/sensor.py
@@ -9,6 +9,8 @@ from aioairzone.const import (
AZD_HUMIDITY,
AZD_TEMP,
AZD_TEMP_UNIT,
+ AZD_THERMOSTAT_BATTERY,
+ AZD_THERMOSTAT_SIGNAL,
AZD_WEBSERVER,
AZD_WIFI_RSSI,
AZD_ZONES,
@@ -28,7 +30,7 @@ from homeassistant.const import (
UnitOfTemperature,
)
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .const import TEMP_UNIT_LIB_TO_HASS
from .coordinator import AirzoneConfigEntry, AirzoneUpdateCoordinator
@@ -73,13 +75,27 @@ ZONE_SENSOR_TYPES: Final[tuple[SensorEntityDescription, ...]] = (
native_unit_of_measurement=PERCENTAGE,
state_class=SensorStateClass.MEASUREMENT,
),
+ SensorEntityDescription(
+ device_class=SensorDeviceClass.BATTERY,
+ key=AZD_THERMOSTAT_BATTERY,
+ native_unit_of_measurement=PERCENTAGE,
+ state_class=SensorStateClass.MEASUREMENT,
+ ),
+ SensorEntityDescription(
+ entity_category=EntityCategory.DIAGNOSTIC,
+ entity_registry_enabled_default=False,
+ key=AZD_THERMOSTAT_SIGNAL,
+ native_unit_of_measurement=PERCENTAGE,
+ state_class=SensorStateClass.MEASUREMENT,
+ translation_key="thermostat_signal",
+ ),
)
async def async_setup_entry(
hass: HomeAssistant,
entry: AirzoneConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Add Airzone sensors from a config_entry."""
coordinator = entry.runtime_data
diff --git a/homeassistant/components/airzone/strings.json b/homeassistant/components/airzone/strings.json
index cd313b821aa..c7d9701aa83 100644
--- a/homeassistant/components/airzone/strings.json
+++ b/homeassistant/components/airzone/strings.json
@@ -76,6 +76,9 @@
"sensor": {
"rssi": {
"name": "RSSI"
+ },
+ "thermostat_signal": {
+ "name": "Signal strength"
}
}
}
diff --git a/homeassistant/components/airzone/switch.py b/homeassistant/components/airzone/switch.py
index 69bf33666a5..07278970e03 100644
--- a/homeassistant/components/airzone/switch.py
+++ b/homeassistant/components/airzone/switch.py
@@ -14,7 +14,7 @@ from homeassistant.components.switch import (
)
from homeassistant.config_entries import ConfigEntry
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .coordinator import AirzoneConfigEntry, AirzoneUpdateCoordinator
from .entity import AirzoneEntity, AirzoneZoneEntity
@@ -39,7 +39,7 @@ ZONE_SWITCH_TYPES: Final[tuple[AirzoneSwitchDescription, ...]] = (
async def async_setup_entry(
hass: HomeAssistant,
entry: AirzoneConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Add Airzone switch from a config_entry."""
coordinator = entry.runtime_data
diff --git a/homeassistant/components/airzone/water_heater.py b/homeassistant/components/airzone/water_heater.py
index 2a1ca72db21..eb1537dc222 100644
--- a/homeassistant/components/airzone/water_heater.py
+++ b/homeassistant/components/airzone/water_heater.py
@@ -28,7 +28,7 @@ from homeassistant.components.water_heater import (
from homeassistant.config_entries import ConfigEntry
from homeassistant.const import ATTR_TEMPERATURE, STATE_OFF
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .const import TEMP_UNIT_LIB_TO_HASS
from .coordinator import AirzoneConfigEntry, AirzoneUpdateCoordinator
@@ -58,7 +58,7 @@ OPERATION_MODE_TO_DHW_PARAMS: Final[dict[str, dict[str, Any]]] = {
async def async_setup_entry(
hass: HomeAssistant,
entry: AirzoneConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Add Airzone Water Heater from a config_entry."""
coordinator = entry.runtime_data
diff --git a/homeassistant/components/airzone_cloud/binary_sensor.py b/homeassistant/components/airzone_cloud/binary_sensor.py
index 4a7b5441b68..64fa8cb5151 100644
--- a/homeassistant/components/airzone_cloud/binary_sensor.py
+++ b/homeassistant/components/airzone_cloud/binary_sensor.py
@@ -26,7 +26,7 @@ from homeassistant.components.binary_sensor import (
)
from homeassistant.const import EntityCategory
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .coordinator import AirzoneCloudConfigEntry, AirzoneUpdateCoordinator
from .entity import (
@@ -111,7 +111,7 @@ ZONE_BINARY_SENSOR_TYPES: Final[tuple[AirzoneBinarySensorEntityDescription, ...]
async def async_setup_entry(
hass: HomeAssistant,
entry: AirzoneCloudConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Add Airzone Cloud binary sensors from a config_entry."""
coordinator = entry.runtime_data
diff --git a/homeassistant/components/airzone_cloud/climate.py b/homeassistant/components/airzone_cloud/climate.py
index 69b10d2a69e..115f6e32dbf 100644
--- a/homeassistant/components/airzone_cloud/climate.py
+++ b/homeassistant/components/airzone_cloud/climate.py
@@ -56,7 +56,7 @@ from homeassistant.components.climate import (
from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
from homeassistant.core import HomeAssistant, callback
from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .coordinator import AirzoneCloudConfigEntry, AirzoneUpdateCoordinator
from .entity import (
@@ -119,7 +119,7 @@ HVAC_MODE_HASS_TO_LIB: Final[dict[HVACMode, OperationMode]] = {
async def async_setup_entry(
hass: HomeAssistant,
entry: AirzoneCloudConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Add Airzone climate from a config_entry."""
coordinator = entry.runtime_data
diff --git a/homeassistant/components/airzone_cloud/manifest.json b/homeassistant/components/airzone_cloud/manifest.json
index 0e21e57ec52..3b6f94df57c 100644
--- a/homeassistant/components/airzone_cloud/manifest.json
+++ b/homeassistant/components/airzone_cloud/manifest.json
@@ -6,5 +6,5 @@
"documentation": "https://www.home-assistant.io/integrations/airzone_cloud",
"iot_class": "cloud_push",
"loggers": ["aioairzone_cloud"],
- "requirements": ["aioairzone-cloud==0.6.10"]
+ "requirements": ["aioairzone-cloud==0.6.11"]
}
diff --git a/homeassistant/components/airzone_cloud/select.py b/homeassistant/components/airzone_cloud/select.py
index e0c595a80e8..816544efdf8 100644
--- a/homeassistant/components/airzone_cloud/select.py
+++ b/homeassistant/components/airzone_cloud/select.py
@@ -21,7 +21,7 @@ from aioairzone_cloud.const import (
from homeassistant.components.select import SelectEntity, SelectEntityDescription
from homeassistant.const import EntityCategory
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .coordinator import AirzoneCloudConfigEntry, AirzoneUpdateCoordinator
from .entity import AirzoneEntity, AirzoneZoneEntity
@@ -89,7 +89,7 @@ ZONE_SELECT_TYPES: Final[tuple[AirzoneSelectDescription, ...]] = (
async def async_setup_entry(
hass: HomeAssistant,
entry: AirzoneCloudConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Add Airzone Cloud select from a config_entry."""
coordinator = entry.runtime_data
diff --git a/homeassistant/components/airzone_cloud/sensor.py b/homeassistant/components/airzone_cloud/sensor.py
index 4b13e09d126..43526c3aa52 100644
--- a/homeassistant/components/airzone_cloud/sensor.py
+++ b/homeassistant/components/airzone_cloud/sensor.py
@@ -47,7 +47,7 @@ from homeassistant.const import (
UnitOfTemperature,
)
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .coordinator import AirzoneCloudConfigEntry, AirzoneUpdateCoordinator
from .entity import (
@@ -221,7 +221,7 @@ ZONE_SENSOR_TYPES: Final[tuple[SensorEntityDescription, ...]] = (
async def async_setup_entry(
hass: HomeAssistant,
entry: AirzoneCloudConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Add Airzone Cloud sensors from a config_entry."""
coordinator = entry.runtime_data
diff --git a/homeassistant/components/airzone_cloud/strings.json b/homeassistant/components/airzone_cloud/strings.json
index 6e0f9adcd66..5481bfbc984 100644
--- a/homeassistant/components/airzone_cloud/strings.json
+++ b/homeassistant/components/airzone_cloud/strings.json
@@ -32,9 +32,9 @@
"air_quality": {
"name": "Air Quality mode",
"state": {
- "off": "Off",
- "on": "On",
- "auto": "Auto"
+ "off": "[%key:common::state::off%]",
+ "on": "[%key:common::state::on%]",
+ "auto": "[%key:common::state::auto%]"
}
},
"modes": {
diff --git a/homeassistant/components/airzone_cloud/switch.py b/homeassistant/components/airzone_cloud/switch.py
index 8de0685e15e..ab703cd537a 100644
--- a/homeassistant/components/airzone_cloud/switch.py
+++ b/homeassistant/components/airzone_cloud/switch.py
@@ -13,7 +13,7 @@ from homeassistant.components.switch import (
SwitchEntityDescription,
)
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .coordinator import AirzoneCloudConfigEntry, AirzoneUpdateCoordinator
from .entity import AirzoneEntity, AirzoneZoneEntity
@@ -38,7 +38,7 @@ ZONE_SWITCH_TYPES: Final[tuple[AirzoneSwitchDescription, ...]] = (
async def async_setup_entry(
hass: HomeAssistant,
entry: AirzoneCloudConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Add Airzone Cloud switch from a config_entry."""
coordinator = entry.runtime_data
diff --git a/homeassistant/components/airzone_cloud/water_heater.py b/homeassistant/components/airzone_cloud/water_heater.py
index 381dce913fe..41d43002569 100644
--- a/homeassistant/components/airzone_cloud/water_heater.py
+++ b/homeassistant/components/airzone_cloud/water_heater.py
@@ -29,7 +29,7 @@ from homeassistant.components.water_heater import (
)
from homeassistant.const import ATTR_TEMPERATURE, STATE_OFF, UnitOfTemperature
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .coordinator import AirzoneCloudConfigEntry, AirzoneUpdateCoordinator
from .entity import AirzoneHotWaterEntity
@@ -68,7 +68,7 @@ OPERATION_MODE_TO_DHW_PARAMS: Final[dict[str, dict[str, Any]]] = {
async def async_setup_entry(
hass: HomeAssistant,
entry: AirzoneCloudConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Add Airzone Cloud Water Heater from a config_entry."""
coordinator = entry.runtime_data
diff --git a/homeassistant/components/aladdin_connect/__init__.py b/homeassistant/components/aladdin_connect/__init__.py
index 6d3f1d642b5..af50147a8ef 100644
--- a/homeassistant/components/aladdin_connect/__init__.py
+++ b/homeassistant/components/aladdin_connect/__init__.py
@@ -2,7 +2,7 @@
from __future__ import annotations
-from homeassistant.config_entries import ConfigEntry, ConfigEntryState
+from homeassistant.config_entries import ConfigEntry
from homeassistant.core import HomeAssistant
from homeassistant.helpers import issue_registry as ir
@@ -28,11 +28,13 @@ async def async_setup_entry(hass: HomeAssistant, _: ConfigEntry) -> bool:
async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
"""Unload a config entry."""
- if all(
- config_entry.state is ConfigEntryState.NOT_LOADED
- for config_entry in hass.config_entries.async_entries(DOMAIN)
- if config_entry.entry_id != entry.entry_id
- ):
- ir.async_delete_issue(hass, DOMAIN, DOMAIN)
-
return True
+
+
+async def async_remove_entry(hass: HomeAssistant, entry: ConfigEntry) -> None:
+ """Remove a config entry."""
+ if not hass.config_entries.async_loaded_entries(DOMAIN):
+ ir.async_delete_issue(hass, DOMAIN, DOMAIN)
+ # Remove any remaining disabled or ignored entries
+ for _entry in hass.config_entries.async_entries(DOMAIN):
+ hass.async_create_task(hass.config_entries.async_remove(_entry.entry_id))
diff --git a/homeassistant/components/alarm_control_panel/strings.json b/homeassistant/components/alarm_control_panel/strings.json
index 5f718280566..ed02b2d0ee8 100644
--- a/homeassistant/components/alarm_control_panel/strings.json
+++ b/homeassistant/components/alarm_control_panel/strings.json
@@ -90,7 +90,7 @@
},
"alarm_arm_home": {
"name": "Arm home",
- "description": "Sets the alarm to: _armed, but someone is home_.",
+ "description": "Arms the alarm in the home mode.",
"fields": {
"code": {
"name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]",
@@ -100,7 +100,7 @@
},
"alarm_arm_away": {
"name": "Arm away",
- "description": "Sets the alarm to: _armed, no one home_.",
+ "description": "Arms the alarm in the away mode.",
"fields": {
"code": {
"name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]",
@@ -110,7 +110,7 @@
},
"alarm_arm_night": {
"name": "Arm night",
- "description": "Sets the alarm to: _armed for the night_.",
+ "description": "Arms the alarm in the night mode.",
"fields": {
"code": {
"name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]",
@@ -120,7 +120,7 @@
},
"alarm_arm_vacation": {
"name": "Arm vacation",
- "description": "Sets the alarm to: _armed for vacation_.",
+ "description": "Arms the alarm in the vacation mode.",
"fields": {
"code": {
"name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]",
@@ -130,7 +130,7 @@
},
"alarm_trigger": {
"name": "Trigger",
- "description": "Trigger the alarm manually.",
+ "description": "Triggers the alarm manually.",
"fields": {
"code": {
"name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]",
diff --git a/homeassistant/components/alarmdecoder/alarm_control_panel.py b/homeassistant/components/alarmdecoder/alarm_control_panel.py
index d7092bbe1c4..52687f04bf9 100644
--- a/homeassistant/components/alarmdecoder/alarm_control_panel.py
+++ b/homeassistant/components/alarmdecoder/alarm_control_panel.py
@@ -14,7 +14,7 @@ from homeassistant.const import ATTR_CODE
from homeassistant.core import HomeAssistant
from homeassistant.helpers import config_validation as cv, entity_platform
from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import AlarmDecoderConfigEntry
from .const import (
@@ -36,7 +36,7 @@ ATTR_KEYPRESS = "keypress"
async def async_setup_entry(
hass: HomeAssistant,
entry: AlarmDecoderConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up for AlarmDecoder alarm panels."""
options = entry.options
diff --git a/homeassistant/components/alarmdecoder/binary_sensor.py b/homeassistant/components/alarmdecoder/binary_sensor.py
index 1234c9f349b..b025da70d59 100644
--- a/homeassistant/components/alarmdecoder/binary_sensor.py
+++ b/homeassistant/components/alarmdecoder/binary_sensor.py
@@ -5,7 +5,7 @@ import logging
from homeassistant.components.binary_sensor import BinarySensorEntity
from homeassistant.core import HomeAssistant
from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import AlarmDecoderConfigEntry
from .const import (
@@ -40,7 +40,7 @@ ATTR_RF_LOOP1 = "rf_loop1"
async def async_setup_entry(
hass: HomeAssistant,
entry: AlarmDecoderConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up for AlarmDecoder sensor."""
diff --git a/homeassistant/components/alarmdecoder/manifest.json b/homeassistant/components/alarmdecoder/manifest.json
index ae1a2f4684d..c2c12792801 100644
--- a/homeassistant/components/alarmdecoder/manifest.json
+++ b/homeassistant/components/alarmdecoder/manifest.json
@@ -7,5 +7,5 @@
"integration_type": "device",
"iot_class": "local_push",
"loggers": ["adext", "alarmdecoder"],
- "requirements": ["adext==0.4.3"]
+ "requirements": ["adext==0.4.4"]
}
diff --git a/homeassistant/components/alarmdecoder/sensor.py b/homeassistant/components/alarmdecoder/sensor.py
index f5e744457fd..8fdc6d57c67 100644
--- a/homeassistant/components/alarmdecoder/sensor.py
+++ b/homeassistant/components/alarmdecoder/sensor.py
@@ -3,7 +3,7 @@
from homeassistant.components.sensor import SensorEntity
from homeassistant.core import HomeAssistant
from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import AlarmDecoderConfigEntry
from .const import SIGNAL_PANEL_MESSAGE
@@ -13,7 +13,7 @@ from .entity import AlarmDecoderEntity
async def async_setup_entry(
hass: HomeAssistant,
entry: AlarmDecoderConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up for AlarmDecoder sensor."""
diff --git a/homeassistant/components/alert/entity.py b/homeassistant/components/alert/entity.py
index 629047b15ba..a11b281428f 100644
--- a/homeassistant/components/alert/entity.py
+++ b/homeassistant/components/alert/entity.py
@@ -14,7 +14,7 @@ from homeassistant.components.notify import (
)
from homeassistant.const import STATE_IDLE, STATE_OFF, STATE_ON
from homeassistant.core import Event, EventStateChangedData, HassJob, HomeAssistant
-from homeassistant.exceptions import ServiceNotFound
+from homeassistant.exceptions import ServiceNotFound, ServiceValidationError
from homeassistant.helpers.entity import Entity
from homeassistant.helpers.event import (
async_track_point_in_time,
@@ -195,7 +195,8 @@ class AlertEntity(Entity):
async def async_turn_off(self, **kwargs: Any) -> None:
"""Async Acknowledge alert."""
- LOGGER.debug("Acknowledged Alert: %s", self._attr_name)
+ if not self._can_ack:
+ raise ServiceValidationError("This alert cannot be acknowledged")
self._ack = True
self.async_write_ha_state()
diff --git a/homeassistant/components/alexa/capabilities.py b/homeassistant/components/alexa/capabilities.py
index e70055c20b1..897037987a7 100644
--- a/homeassistant/components/alexa/capabilities.py
+++ b/homeassistant/components/alexa/capabilities.py
@@ -1438,7 +1438,7 @@ class AlexaModeController(AlexaCapability):
# Fan preset_mode
if self.instance == f"{fan.DOMAIN}.{fan.ATTR_PRESET_MODE}":
mode = self.entity.attributes.get(fan.ATTR_PRESET_MODE, None)
- if mode in self.entity.attributes.get(fan.ATTR_PRESET_MODES, None):
+ if mode in self.entity.attributes.get(fan.ATTR_PRESET_MODES, ()):
return f"{fan.ATTR_PRESET_MODE}.{mode}"
# Humidifier mode
diff --git a/homeassistant/components/amazon_polly/manifest.json b/homeassistant/components/amazon_polly/manifest.json
index e7fbf8edc74..f684292d9a2 100644
--- a/homeassistant/components/amazon_polly/manifest.json
+++ b/homeassistant/components/amazon_polly/manifest.json
@@ -6,5 +6,5 @@
"iot_class": "cloud_push",
"loggers": ["boto3", "botocore", "s3transfer"],
"quality_scale": "legacy",
- "requirements": ["boto3==1.34.131"]
+ "requirements": ["boto3==1.37.1"]
}
diff --git a/homeassistant/components/amberelectric/binary_sensor.py b/homeassistant/components/amberelectric/binary_sensor.py
index 66292ea5524..3ee27f19849 100644
--- a/homeassistant/components/amberelectric/binary_sensor.py
+++ b/homeassistant/components/amberelectric/binary_sensor.py
@@ -9,7 +9,7 @@ from homeassistant.components.binary_sensor import (
BinarySensorEntityDescription,
)
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.update_coordinator import CoordinatorEntity
from .const import ATTRIBUTION
@@ -85,7 +85,7 @@ class AmberDemandWindowBinarySensor(AmberPriceGridSensor):
async def async_setup_entry(
hass: HomeAssistant,
entry: AmberConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up a config entry."""
coordinator = entry.runtime_data
diff --git a/homeassistant/components/amberelectric/sensor.py b/homeassistant/components/amberelectric/sensor.py
index 49d6e5f4eac..7276ddb26a5 100644
--- a/homeassistant/components/amberelectric/sensor.py
+++ b/homeassistant/components/amberelectric/sensor.py
@@ -19,7 +19,7 @@ from homeassistant.components.sensor import (
)
from homeassistant.const import CURRENCY_DOLLAR, PERCENTAGE, UnitOfEnergy
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.update_coordinator import CoordinatorEntity
from .const import ATTRIBUTION
@@ -196,7 +196,7 @@ class AmberGridSensor(CoordinatorEntity[AmberUpdateCoordinator], SensorEntity):
async def async_setup_entry(
hass: HomeAssistant,
entry: AmberConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up a config entry."""
coordinator = entry.runtime_data
diff --git a/homeassistant/components/ambient_network/sensor.py b/homeassistant/components/ambient_network/sensor.py
index 9d262e5a987..b96da9863a1 100644
--- a/homeassistant/components/ambient_network/sensor.py
+++ b/homeassistant/components/ambient_network/sensor.py
@@ -25,7 +25,7 @@ from homeassistant.const import (
UnitOfVolumetricFlux,
)
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.util import dt as dt_util
from .coordinator import AmbientNetworkConfigEntry, AmbientNetworkDataUpdateCoordinator
@@ -239,6 +239,8 @@ SENSOR_DESCRIPTIONS = (
native_unit_of_measurement=DEGREE,
suggested_display_precision=0,
entity_registry_enabled_default=False,
+ device_class=SensorDeviceClass.WIND_DIRECTION,
+ state_class=SensorStateClass.MEASUREMENT_ANGLE,
),
SensorEntityDescription(
key=TYPE_WINDGUSTMPH,
@@ -270,7 +272,7 @@ SENSOR_DESCRIPTIONS = (
async def async_setup_entry(
hass: HomeAssistant,
entry: AmbientNetworkConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the Ambient Network sensor entities."""
diff --git a/homeassistant/components/ambient_station/binary_sensor.py b/homeassistant/components/ambient_station/binary_sensor.py
index a79788a4c38..9a7c89db95e 100644
--- a/homeassistant/components/ambient_station/binary_sensor.py
+++ b/homeassistant/components/ambient_station/binary_sensor.py
@@ -12,7 +12,7 @@ from homeassistant.components.binary_sensor import (
)
from homeassistant.const import ATTR_NAME, EntityCategory
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import AmbientStationConfigEntry
from .const import ATTR_LAST_DATA
@@ -381,7 +381,7 @@ BINARY_SENSOR_DESCRIPTIONS = (
async def async_setup_entry(
hass: HomeAssistant,
entry: AmbientStationConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up Ambient PWS binary sensors based on a config entry."""
ambient = entry.runtime_data
diff --git a/homeassistant/components/ambient_station/sensor.py b/homeassistant/components/ambient_station/sensor.py
index dfbd2d1b4a0..1b4334774d4 100644
--- a/homeassistant/components/ambient_station/sensor.py
+++ b/homeassistant/components/ambient_station/sensor.py
@@ -27,7 +27,7 @@ from homeassistant.const import (
)
from homeassistant.core import HomeAssistant, callback
from homeassistant.helpers.entity import EntityDescription
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import AmbientStation, AmbientStationConfigEntry
from .const import ATTR_LAST_DATA, TYPE_SOLARRADIATION, TYPE_SOLARRADIATION_LX
@@ -608,21 +608,26 @@ SENSOR_DESCRIPTIONS = (
key=TYPE_WINDDIR,
translation_key="wind_direction",
native_unit_of_measurement=DEGREE,
+ device_class=SensorDeviceClass.WIND_DIRECTION,
+ state_class=SensorStateClass.MEASUREMENT_ANGLE,
),
SensorEntityDescription(
key=TYPE_WINDDIR_AVG10M,
translation_key="wind_direction_average_10m",
native_unit_of_measurement=DEGREE,
+ device_class=SensorDeviceClass.WIND_DIRECTION,
),
SensorEntityDescription(
key=TYPE_WINDDIR_AVG2M,
translation_key="wind_direction_average_2m",
native_unit_of_measurement=DEGREE,
+ device_class=SensorDeviceClass.WIND_DIRECTION,
),
SensorEntityDescription(
key=TYPE_WINDGUSTDIR,
translation_key="wind_gust_direction",
native_unit_of_measurement=DEGREE,
+ device_class=SensorDeviceClass.WIND_DIRECTION,
),
SensorEntityDescription(
key=TYPE_WINDGUSTMPH,
@@ -662,7 +667,7 @@ SENSOR_DESCRIPTIONS = (
async def async_setup_entry(
hass: HomeAssistant,
entry: AmbientStationConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up Ambient PWS sensors based on a config entry."""
ambient = entry.runtime_data
diff --git a/homeassistant/components/analytics_insights/config_flow.py b/homeassistant/components/analytics_insights/config_flow.py
index da77a35f789..b2648f7c13c 100644
--- a/homeassistant/components/analytics_insights/config_flow.py
+++ b/homeassistant/components/analytics_insights/config_flow.py
@@ -8,7 +8,7 @@ from python_homeassistant_analytics import (
HomeassistantAnalyticsClient,
HomeassistantAnalyticsConnectionError,
)
-from python_homeassistant_analytics.models import IntegrationType
+from python_homeassistant_analytics.models import Environment, IntegrationType
import voluptuous as vol
from homeassistant.config_entries import ConfigFlow, ConfigFlowResult, OptionsFlow
@@ -81,7 +81,7 @@ class HomeassistantAnalyticsConfigFlow(ConfigFlow, domain=DOMAIN):
)
try:
addons = await client.get_addons()
- integrations = await client.get_integrations()
+ integrations = await client.get_integrations(Environment.NEXT)
custom_integrations = await client.get_custom_integrations()
except HomeassistantAnalyticsConnectionError:
LOGGER.exception("Error connecting to Home Assistant analytics")
@@ -165,7 +165,7 @@ class HomeassistantAnalyticsOptionsFlowHandler(OptionsFlow):
)
try:
addons = await client.get_addons()
- integrations = await client.get_integrations()
+ integrations = await client.get_integrations(Environment.NEXT)
custom_integrations = await client.get_custom_integrations()
except HomeassistantAnalyticsConnectionError:
LOGGER.exception("Error connecting to Home Assistant analytics")
diff --git a/homeassistant/components/analytics_insights/sensor.py b/homeassistant/components/analytics_insights/sensor.py
index 324ca6991d2..830d914b311 100644
--- a/homeassistant/components/analytics_insights/sensor.py
+++ b/homeassistant/components/analytics_insights/sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.sensor import (
from homeassistant.const import EntityCategory
from homeassistant.core import HomeAssistant
from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.typing import StateType
from homeassistant.helpers.update_coordinator import CoordinatorEntity
@@ -94,7 +94,7 @@ GENERAL_SENSORS = [
async def async_setup_entry(
hass: HomeAssistant,
entry: AnalyticsInsightsConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Initialize the entries."""
diff --git a/homeassistant/components/android_ip_webcam/binary_sensor.py b/homeassistant/components/android_ip_webcam/binary_sensor.py
index 1846889bfda..67816664752 100644
--- a/homeassistant/components/android_ip_webcam/binary_sensor.py
+++ b/homeassistant/components/android_ip_webcam/binary_sensor.py
@@ -8,7 +8,7 @@ from homeassistant.components.binary_sensor import (
BinarySensorEntityDescription,
)
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .const import MOTION_ACTIVE
from .coordinator import AndroidIPCamConfigEntry, AndroidIPCamDataUpdateCoordinator
@@ -24,7 +24,7 @@ BINARY_SENSOR_DESCRIPTION = BinarySensorEntityDescription(
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AndroidIPCamConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the IP Webcam sensors from config entry."""
diff --git a/homeassistant/components/android_ip_webcam/camera.py b/homeassistant/components/android_ip_webcam/camera.py
index 95d4fb9f67a..833b9a0d296 100644
--- a/homeassistant/components/android_ip_webcam/camera.py
+++ b/homeassistant/components/android_ip_webcam/camera.py
@@ -11,7 +11,7 @@ from homeassistant.const import (
)
from homeassistant.core import HomeAssistant
from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .const import DOMAIN
from .coordinator import AndroidIPCamConfigEntry, AndroidIPCamDataUpdateCoordinator
@@ -20,7 +20,7 @@ from .coordinator import AndroidIPCamConfigEntry, AndroidIPCamDataUpdateCoordina
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AndroidIPCamConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the IP Webcam camera from config entry."""
filter_urllib3_logging()
diff --git a/homeassistant/components/android_ip_webcam/manifest.json b/homeassistant/components/android_ip_webcam/manifest.json
index 57af567ec51..d7a9f8ad97a 100644
--- a/homeassistant/components/android_ip_webcam/manifest.json
+++ b/homeassistant/components/android_ip_webcam/manifest.json
@@ -5,5 +5,5 @@
"config_flow": true,
"documentation": "https://www.home-assistant.io/integrations/android_ip_webcam",
"iot_class": "local_polling",
- "requirements": ["pydroid-ipcam==2.0.0"]
+ "requirements": ["pydroid-ipcam==3.0.0"]
}
diff --git a/homeassistant/components/android_ip_webcam/sensor.py b/homeassistant/components/android_ip_webcam/sensor.py
index 9b2454d6c09..e9d5f8514e8 100644
--- a/homeassistant/components/android_ip_webcam/sensor.py
+++ b/homeassistant/components/android_ip_webcam/sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.sensor import (
)
from homeassistant.const import EntityCategory
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.typing import StateType
from .coordinator import AndroidIPCamConfigEntry, AndroidIPCamDataUpdateCoordinator
@@ -119,7 +119,7 @@ SENSOR_TYPES: tuple[AndroidIPWebcamSensorEntityDescription, ...] = (
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AndroidIPCamConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the IP Webcam sensors from config entry."""
diff --git a/homeassistant/components/android_ip_webcam/switch.py b/homeassistant/components/android_ip_webcam/switch.py
index f813415df0b..3ceaf6e59b9 100644
--- a/homeassistant/components/android_ip_webcam/switch.py
+++ b/homeassistant/components/android_ip_webcam/switch.py
@@ -11,7 +11,7 @@ from pydroid_ipcam import PyDroidIPCam
from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
from homeassistant.const import EntityCategory
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .coordinator import AndroidIPCamConfigEntry, AndroidIPCamDataUpdateCoordinator
from .entity import AndroidIPCamBaseEntity
@@ -112,7 +112,7 @@ SWITCH_TYPES: tuple[AndroidIPWebcamSwitchEntityDescription, ...] = (
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AndroidIPCamConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the IP Webcam switches from config entry."""
diff --git a/homeassistant/components/androidtv/media_player.py b/homeassistant/components/androidtv/media_player.py
index 728411ddf42..c9e62908cac 100644
--- a/homeassistant/components/androidtv/media_player.py
+++ b/homeassistant/components/androidtv/media_player.py
@@ -21,7 +21,7 @@ from homeassistant.const import ATTR_COMMAND
from homeassistant.core import HomeAssistant
from homeassistant.helpers import config_validation as cv, entity_platform
from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.util.dt import utcnow
from . import AndroidTVConfigEntry
@@ -65,7 +65,7 @@ ANDROIDTV_STATES = {
async def async_setup_entry(
hass: HomeAssistant,
entry: AndroidTVConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the Android Debug Bridge entity."""
device_class = entry.runtime_data.aftv.DEVICE_CLASS
diff --git a/homeassistant/components/androidtv/remote.py b/homeassistant/components/androidtv/remote.py
index db48b0cf1b6..026d1485e07 100644
--- a/homeassistant/components/androidtv/remote.py
+++ b/homeassistant/components/androidtv/remote.py
@@ -12,7 +12,7 @@ from homeassistant.components.remote import ATTR_NUM_REPEATS, RemoteEntity
from homeassistant.config_entries import ConfigEntry
from homeassistant.core import HomeAssistant
from homeassistant.exceptions import ServiceValidationError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .const import CONF_TURN_OFF_COMMAND, CONF_TURN_ON_COMMAND, DOMAIN
from .entity import AndroidTVEntity, adb_decorator
@@ -21,7 +21,9 @@ _LOGGER = logging.getLogger(__name__)
async def async_setup_entry(
- hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+ hass: HomeAssistant,
+ entry: ConfigEntry,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the AndroidTV remote from a config entry."""
async_add_entities([AndroidTVRemote(entry)])
diff --git a/homeassistant/components/androidtv_remote/entity.py b/homeassistant/components/androidtv_remote/entity.py
index 44b2d2a5f20..bf146a11e13 100644
--- a/homeassistant/components/androidtv_remote/entity.py
+++ b/homeassistant/components/androidtv_remote/entity.py
@@ -73,7 +73,7 @@ class AndroidTVRemoteBaseEntity(Entity):
self._api.send_key_command(key_code, direction)
except ConnectionClosed as exc:
raise HomeAssistantError(
- "Connection to Android TV device is closed"
+ translation_domain=DOMAIN, translation_key="connection_closed"
) from exc
def _send_launch_app_command(self, app_link: str) -> None:
@@ -85,5 +85,5 @@ class AndroidTVRemoteBaseEntity(Entity):
self._api.send_launch_app_command(app_link)
except ConnectionClosed as exc:
raise HomeAssistantError(
- "Connection to Android TV device is closed"
+ translation_domain=DOMAIN, translation_key="connection_closed"
) from exc
diff --git a/homeassistant/components/androidtv_remote/manifest.json b/homeassistant/components/androidtv_remote/manifest.json
index d9c2dd05c44..89cc0fc3965 100644
--- a/homeassistant/components/androidtv_remote/manifest.json
+++ b/homeassistant/components/androidtv_remote/manifest.json
@@ -7,6 +7,6 @@
"integration_type": "device",
"iot_class": "local_push",
"loggers": ["androidtvremote2"],
- "requirements": ["androidtvremote2==0.1.2"],
+ "requirements": ["androidtvremote2==0.2.1"],
"zeroconf": ["_androidtvremote2._tcp.local."]
}
diff --git a/homeassistant/components/androidtv_remote/media_player.py b/homeassistant/components/androidtv_remote/media_player.py
index cdc307a0472..5bc205b32df 100644
--- a/homeassistant/components/androidtv_remote/media_player.py
+++ b/homeassistant/components/androidtv_remote/media_player.py
@@ -18,10 +18,10 @@ from homeassistant.components.media_player import (
)
from homeassistant.core import HomeAssistant, callback
from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import AndroidTVRemoteConfigEntry
-from .const import CONF_APP_ICON, CONF_APP_NAME
+from .const import CONF_APP_ICON, CONF_APP_NAME, DOMAIN
from .entity import AndroidTVRemoteBaseEntity
PARALLEL_UPDATES = 0
@@ -30,7 +30,7 @@ PARALLEL_UPDATES = 0
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AndroidTVRemoteConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the Android TV media player entity based on a config entry."""
api = config_entry.runtime_data
@@ -233,5 +233,5 @@ class AndroidTVRemoteMediaPlayerEntity(AndroidTVRemoteBaseEntity, MediaPlayerEnt
await asyncio.sleep(delay_secs)
except ConnectionClosed as exc:
raise HomeAssistantError(
- "Connection to Android TV device is closed"
+ translation_domain=DOMAIN, translation_key="connection_closed"
) from exc
diff --git a/homeassistant/components/androidtv_remote/remote.py b/homeassistant/components/androidtv_remote/remote.py
index c9a261c8735..212b0491d2d 100644
--- a/homeassistant/components/androidtv_remote/remote.py
+++ b/homeassistant/components/androidtv_remote/remote.py
@@ -18,7 +18,7 @@ from homeassistant.components.remote import (
RemoteEntityFeature,
)
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import AndroidTVRemoteConfigEntry
from .const import CONF_APP_NAME
@@ -30,7 +30,7 @@ PARALLEL_UPDATES = 0
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AndroidTVRemoteConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the Android TV remote entity based on a config entry."""
api = config_entry.runtime_data
diff --git a/homeassistant/components/androidtv_remote/strings.json b/homeassistant/components/androidtv_remote/strings.json
index e41cbcf9a76..106cac3a63d 100644
--- a/homeassistant/components/androidtv_remote/strings.json
+++ b/homeassistant/components/androidtv_remote/strings.json
@@ -54,5 +54,10 @@
}
}
}
+ },
+ "exceptions": {
+ "connection_closed": {
+ "message": "Connection to the Android TV device is closed"
+ }
}
}
diff --git a/homeassistant/components/anova/config_flow.py b/homeassistant/components/anova/config_flow.py
index bc4723b1dba..f382606baba 100644
--- a/homeassistant/components/anova/config_flow.py
+++ b/homeassistant/components/anova/config_flow.py
@@ -2,6 +2,8 @@
from __future__ import annotations
+import logging
+
from anova_wifi import AnovaApi, InvalidLogin
import voluptuous as vol
@@ -11,8 +13,10 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession
from .const import DOMAIN
+_LOGGER = logging.getLogger(__name__)
-class AnovaConfligFlow(ConfigFlow, domain=DOMAIN):
+
+class AnovaConfigFlow(ConfigFlow, domain=DOMAIN):
"""Sets up a config flow for Anova."""
VERSION = 1
@@ -35,7 +39,8 @@ class AnovaConfligFlow(ConfigFlow, domain=DOMAIN):
await api.authenticate()
except InvalidLogin:
errors["base"] = "invalid_auth"
- except Exception: # noqa: BLE001
+ except Exception:
+ _LOGGER.exception("Unexpected exception")
errors["base"] = "unknown"
else:
return self.async_create_entry(
diff --git a/homeassistant/components/anova/sensor.py b/homeassistant/components/anova/sensor.py
index 7365e4597ba..c3a3d3861f2 100644
--- a/homeassistant/components/anova/sensor.py
+++ b/homeassistant/components/anova/sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.sensor import (
)
from homeassistant.const import UnitOfTemperature, UnitOfTime
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.typing import StateType
from .coordinator import AnovaConfigEntry, AnovaCoordinator
@@ -97,7 +97,7 @@ SENSOR_DESCRIPTIONS: list[AnovaSensorEntityDescription] = [
async def async_setup_entry(
hass: HomeAssistant,
entry: AnovaConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up Anova device."""
anova_data = entry.runtime_data
@@ -108,7 +108,7 @@ async def async_setup_entry(
def setup_coordinator(
coordinator: AnovaCoordinator,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up an individual Anova Coordinator."""
diff --git a/homeassistant/components/anthemav/media_player.py b/homeassistant/components/anthemav/media_player.py
index be5a6ad2258..317498e96b5 100644
--- a/homeassistant/components/anthemav/media_player.py
+++ b/homeassistant/components/anthemav/media_player.py
@@ -16,18 +16,19 @@ from homeassistant.const import CONF_MAC, CONF_MODEL
from homeassistant.core import HomeAssistant, callback
from homeassistant.helpers.device_registry import DeviceInfo
from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import AnthemavConfigEntry
from .const import ANTHEMAV_UPDATE_SIGNAL, DOMAIN, MANUFACTURER
_LOGGER = logging.getLogger(__name__)
+VOLUME_STEP = 0.01
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AnthemavConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up entry."""
name = config_entry.title
@@ -60,6 +61,7 @@ class AnthemAVR(MediaPlayerEntity):
| MediaPlayerEntityFeature.TURN_OFF
| MediaPlayerEntityFeature.SELECT_SOURCE
)
+ _attr_volume_step = VOLUME_STEP
def __init__(
self,
diff --git a/homeassistant/components/anthemav/strings.json b/homeassistant/components/anthemav/strings.json
index 1f1dd0ec75b..15e365b3e63 100644
--- a/homeassistant/components/anthemav/strings.json
+++ b/homeassistant/components/anthemav/strings.json
@@ -10,7 +10,7 @@
},
"error": {
"cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
- "cannot_receive_deviceinfo": "Failed to retreive MAC Address. Make sure the device is turned on"
+ "cannot_receive_deviceinfo": "Failed to retrieve MAC Address. Make sure the device is turned on"
},
"abort": {
"already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
diff --git a/homeassistant/components/anthropic/__init__.py b/homeassistant/components/anthropic/__init__.py
index aa6cf509fa1..a9745d1a6a5 100644
--- a/homeassistant/components/anthropic/__init__.py
+++ b/homeassistant/components/anthropic/__init__.py
@@ -2,6 +2,8 @@
from __future__ import annotations
+from functools import partial
+
import anthropic
from homeassistant.config_entries import ConfigEntry
@@ -10,7 +12,7 @@ from homeassistant.core import HomeAssistant
from homeassistant.exceptions import ConfigEntryNotReady
from homeassistant.helpers import config_validation as cv
-from .const import DOMAIN, LOGGER
+from .const import CONF_CHAT_MODEL, DOMAIN, LOGGER, RECOMMENDED_CHAT_MODEL
PLATFORMS = (Platform.CONVERSATION,)
CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
@@ -20,14 +22,13 @@ type AnthropicConfigEntry = ConfigEntry[anthropic.AsyncClient]
async def async_setup_entry(hass: HomeAssistant, entry: AnthropicConfigEntry) -> bool:
"""Set up Anthropic from a config entry."""
- client = anthropic.AsyncAnthropic(api_key=entry.data[CONF_API_KEY])
+ client = await hass.async_add_executor_job(
+ partial(anthropic.AsyncAnthropic, api_key=entry.data[CONF_API_KEY])
+ )
try:
- await client.messages.create(
- model="claude-3-haiku-20240307",
- max_tokens=1,
- messages=[{"role": "user", "content": "Hi"}],
- timeout=10.0,
- )
+ model_id = entry.options.get(CONF_CHAT_MODEL, RECOMMENDED_CHAT_MODEL)
+ model = await client.models.retrieve(model_id=model_id, timeout=10.0)
+ LOGGER.debug("Anthropic model: %s", model.display_name)
except anthropic.AuthenticationError as err:
LOGGER.error("Invalid API key: %s", err)
return False
diff --git a/homeassistant/components/anthropic/config_flow.py b/homeassistant/components/anthropic/config_flow.py
index fa43a3c4bcc..1b6289efe7c 100644
--- a/homeassistant/components/anthropic/config_flow.py
+++ b/homeassistant/components/anthropic/config_flow.py
@@ -2,6 +2,7 @@
from __future__ import annotations
+from functools import partial
import logging
from types import MappingProxyType
from typing import Any
@@ -33,10 +34,12 @@ from .const import (
CONF_PROMPT,
CONF_RECOMMENDED,
CONF_TEMPERATURE,
+ CONF_THINKING_BUDGET,
DOMAIN,
RECOMMENDED_CHAT_MODEL,
RECOMMENDED_MAX_TOKENS,
RECOMMENDED_TEMPERATURE,
+ RECOMMENDED_THINKING_BUDGET,
)
_LOGGER = logging.getLogger(__name__)
@@ -49,7 +52,7 @@ STEP_USER_DATA_SCHEMA = vol.Schema(
RECOMMENDED_OPTIONS = {
CONF_RECOMMENDED: True,
- CONF_LLM_HASS_API: llm.LLM_API_ASSIST,
+ CONF_LLM_HASS_API: [llm.LLM_API_ASSIST],
CONF_PROMPT: llm.DEFAULT_INSTRUCTIONS_PROMPT,
}
@@ -59,13 +62,10 @@ async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> None:
Data has the keys from STEP_USER_DATA_SCHEMA with values provided by the user.
"""
- client = anthropic.AsyncAnthropic(api_key=data[CONF_API_KEY])
- await client.messages.create(
- model="claude-3-haiku-20240307",
- max_tokens=1,
- messages=[{"role": "user", "content": "Hi"}],
- timeout=10.0,
+ client = await hass.async_add_executor_job(
+ partial(anthropic.AsyncAnthropic, api_key=data[CONF_API_KEY])
)
+ await client.models.list(timeout=10.0)
class AnthropicConfigFlow(ConfigFlow, domain=DOMAIN):
@@ -130,25 +130,36 @@ class AnthropicOptionsFlow(OptionsFlow):
) -> ConfigFlowResult:
"""Manage the options."""
options: dict[str, Any] | MappingProxyType[str, Any] = self.config_entry.options
+ errors: dict[str, str] = {}
if user_input is not None:
if user_input[CONF_RECOMMENDED] == self.last_rendered_recommended:
- if user_input[CONF_LLM_HASS_API] == "none":
- user_input.pop(CONF_LLM_HASS_API)
- return self.async_create_entry(title="", data=user_input)
+ if not user_input.get(CONF_LLM_HASS_API):
+ user_input.pop(CONF_LLM_HASS_API, None)
+ if user_input.get(
+ CONF_THINKING_BUDGET, RECOMMENDED_THINKING_BUDGET
+ ) >= user_input.get(CONF_MAX_TOKENS, RECOMMENDED_MAX_TOKENS):
+ errors[CONF_THINKING_BUDGET] = "thinking_budget_too_large"
- # Re-render the options again, now with the recommended options shown/hidden
- self.last_rendered_recommended = user_input[CONF_RECOMMENDED]
+ if not errors:
+ return self.async_create_entry(title="", data=user_input)
+ else:
+ # Re-render the options again, now with the recommended options shown/hidden
+ self.last_rendered_recommended = user_input[CONF_RECOMMENDED]
- options = {
- CONF_RECOMMENDED: user_input[CONF_RECOMMENDED],
- CONF_PROMPT: user_input[CONF_PROMPT],
- CONF_LLM_HASS_API: user_input[CONF_LLM_HASS_API],
- }
+ options = {
+ CONF_RECOMMENDED: user_input[CONF_RECOMMENDED],
+ CONF_PROMPT: user_input[CONF_PROMPT],
+ CONF_LLM_HASS_API: user_input.get(CONF_LLM_HASS_API),
+ }
suggested_values = options.copy()
if not suggested_values.get(CONF_PROMPT):
suggested_values[CONF_PROMPT] = llm.DEFAULT_INSTRUCTIONS_PROMPT
+ if (
+ suggested_llm_apis := suggested_values.get(CONF_LLM_HASS_API)
+ ) and isinstance(suggested_llm_apis, str):
+ suggested_values[CONF_LLM_HASS_API] = [suggested_llm_apis]
schema = self.add_suggested_values_to_schema(
vol.Schema(anthropic_config_option_schema(self.hass, options)),
@@ -158,6 +169,7 @@ class AnthropicOptionsFlow(OptionsFlow):
return self.async_show_form(
step_id="init",
data_schema=schema,
+ errors=errors or None,
)
@@ -167,24 +179,18 @@ def anthropic_config_option_schema(
) -> dict:
"""Return a schema for Anthropic completion options."""
hass_apis: list[SelectOptionDict] = [
- SelectOptionDict(
- label="No control",
- value="none",
- )
- ]
- hass_apis.extend(
SelectOptionDict(
label=api.name,
value=api.id,
)
for api in llm.async_get_apis(hass)
- )
+ ]
schema = {
vol.Optional(CONF_PROMPT): TemplateSelector(),
- vol.Optional(CONF_LLM_HASS_API, default="none"): SelectSelector(
- SelectSelectorConfig(options=hass_apis)
- ),
+ vol.Optional(
+ CONF_LLM_HASS_API,
+ ): SelectSelector(SelectSelectorConfig(options=hass_apis, multiple=True)),
vol.Required(
CONF_RECOMMENDED, default=options.get(CONF_RECOMMENDED, False)
): bool,
@@ -207,6 +213,10 @@ def anthropic_config_option_schema(
CONF_TEMPERATURE,
default=RECOMMENDED_TEMPERATURE,
): NumberSelector(NumberSelectorConfig(min=0, max=1, step=0.05)),
+ vol.Optional(
+ CONF_THINKING_BUDGET,
+ default=RECOMMENDED_THINKING_BUDGET,
+ ): int,
}
)
return schema
diff --git a/homeassistant/components/anthropic/const.py b/homeassistant/components/anthropic/const.py
index 0dbf9c51ac1..38e4270e6e1 100644
--- a/homeassistant/components/anthropic/const.py
+++ b/homeassistant/components/anthropic/const.py
@@ -13,3 +13,8 @@ CONF_MAX_TOKENS = "max_tokens"
RECOMMENDED_MAX_TOKENS = 1024
CONF_TEMPERATURE = "temperature"
RECOMMENDED_TEMPERATURE = 1.0
+CONF_THINKING_BUDGET = "thinking_budget"
+RECOMMENDED_THINKING_BUDGET = 0
+MIN_THINKING_BUDGET = 1024
+
+THINKING_MODELS = ["claude-3-7-sonnet-20250219", "claude-3-7-sonnet-latest"]
diff --git a/homeassistant/components/anthropic/conversation.py b/homeassistant/components/anthropic/conversation.py
index 259d1295809..288ec63509e 100644
--- a/homeassistant/components/anthropic/conversation.py
+++ b/homeassistant/components/anthropic/conversation.py
@@ -1,33 +1,46 @@
"""Conversation support for Anthropic."""
-from collections.abc import Callable
+from collections.abc import AsyncGenerator, Callable, Iterable
import json
from typing import Any, Literal, cast
import anthropic
+from anthropic import AsyncStream
from anthropic._types import NOT_GIVEN
from anthropic.types import (
- Message,
+ InputJSONDelta,
MessageParam,
+ MessageStreamEvent,
+ RawContentBlockDeltaEvent,
+ RawContentBlockStartEvent,
+ RawContentBlockStopEvent,
+ RawMessageStartEvent,
+ RawMessageStopEvent,
+ RedactedThinkingBlock,
+ RedactedThinkingBlockParam,
+ SignatureDelta,
TextBlock,
TextBlockParam,
+ TextDelta,
+ ThinkingBlock,
+ ThinkingBlockParam,
+ ThinkingConfigDisabledParam,
+ ThinkingConfigEnabledParam,
+ ThinkingDelta,
ToolParam,
ToolResultBlockParam,
ToolUseBlock,
ToolUseBlockParam,
)
-import voluptuous as vol
from voluptuous_openapi import convert
from homeassistant.components import conversation
-from homeassistant.components.conversation import trace
from homeassistant.config_entries import ConfigEntry
from homeassistant.const import CONF_LLM_HASS_API, MATCH_ALL
from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError, TemplateError
-from homeassistant.helpers import device_registry as dr, intent, llm, template
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.util import ulid as ulid_util
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import device_registry as dr, intent, llm
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import AnthropicConfigEntry
from .const import (
@@ -35,11 +48,15 @@ from .const import (
CONF_MAX_TOKENS,
CONF_PROMPT,
CONF_TEMPERATURE,
+ CONF_THINKING_BUDGET,
DOMAIN,
LOGGER,
+ MIN_THINKING_BUDGET,
RECOMMENDED_CHAT_MODEL,
RECOMMENDED_MAX_TOKENS,
RECOMMENDED_TEMPERATURE,
+ RECOMMENDED_THINKING_BUDGET,
+ THINKING_MODELS,
)
# Max number of back and forth with the LLM to generate a response
@@ -49,7 +66,7 @@ MAX_TOOL_ITERATIONS = 10
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AnthropicConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up conversation entities."""
agent = AnthropicConversationEntity(config_entry)
@@ -67,26 +84,211 @@ def _format_tool(
)
-def _message_convert(
- message: Message,
-) -> MessageParam:
- """Convert from class to TypedDict."""
- param_content: list[TextBlockParam | ToolUseBlockParam] = []
+def _convert_content(
+ chat_content: Iterable[conversation.Content],
+) -> list[MessageParam]:
+ """Transform HA chat_log content into Anthropic API format."""
+ messages: list[MessageParam] = []
- for message_content in message.content:
- if isinstance(message_content, TextBlock):
- param_content.append(TextBlockParam(type="text", text=message_content.text))
- elif isinstance(message_content, ToolUseBlock):
- param_content.append(
- ToolUseBlockParam(
- type="tool_use",
- id=message_content.id,
- name=message_content.name,
- input=message_content.input,
- )
+ for content in chat_content:
+ if isinstance(content, conversation.ToolResultContent):
+ tool_result_block = ToolResultBlockParam(
+ type="tool_result",
+ tool_use_id=content.tool_call_id,
+ content=json.dumps(content.tool_result),
)
+ if not messages or messages[-1]["role"] != "user":
+ messages.append(
+ MessageParam(
+ role="user",
+ content=[tool_result_block],
+ )
+ )
+ elif isinstance(messages[-1]["content"], str):
+ messages[-1]["content"] = [
+ TextBlockParam(type="text", text=messages[-1]["content"]),
+ tool_result_block,
+ ]
+ else:
+ messages[-1]["content"].append(tool_result_block) # type: ignore[attr-defined]
+ elif isinstance(content, conversation.UserContent):
+ # Combine consequent user messages
+ if not messages or messages[-1]["role"] != "user":
+ messages.append(
+ MessageParam(
+ role="user",
+ content=content.content,
+ )
+ )
+ elif isinstance(messages[-1]["content"], str):
+ messages[-1]["content"] = [
+ TextBlockParam(type="text", text=messages[-1]["content"]),
+ TextBlockParam(type="text", text=content.content),
+ ]
+ else:
+ messages[-1]["content"].append( # type: ignore[attr-defined]
+ TextBlockParam(type="text", text=content.content)
+ )
+ elif isinstance(content, conversation.AssistantContent):
+ # Combine consequent assistant messages
+ if not messages or messages[-1]["role"] != "assistant":
+ messages.append(
+ MessageParam(
+ role="assistant",
+ content=[],
+ )
+ )
- return MessageParam(role=message.role, content=param_content)
+ if content.content:
+ messages[-1]["content"].append( # type: ignore[union-attr]
+ TextBlockParam(type="text", text=content.content)
+ )
+ if content.tool_calls:
+ messages[-1]["content"].extend( # type: ignore[union-attr]
+ [
+ ToolUseBlockParam(
+ type="tool_use",
+ id=tool_call.id,
+ name=tool_call.tool_name,
+ input=tool_call.tool_args,
+ )
+ for tool_call in content.tool_calls
+ ]
+ )
+ else:
+ # Note: We don't pass SystemContent here as its passed to the API as the prompt
+ raise TypeError(f"Unexpected content type: {type(content)}")
+
+ return messages
+
+
+async def _transform_stream(
+ result: AsyncStream[MessageStreamEvent],
+ messages: list[MessageParam],
+) -> AsyncGenerator[conversation.AssistantContentDeltaDict]:
+ """Transform the response stream into HA format.
+
+ A typical stream of responses might look something like the following:
+ - RawMessageStartEvent with no content
+ - RawContentBlockStartEvent with an empty ThinkingBlock (if extended thinking is enabled)
+ - RawContentBlockDeltaEvent with a ThinkingDelta
+ - RawContentBlockDeltaEvent with a ThinkingDelta
+ - RawContentBlockDeltaEvent with a ThinkingDelta
+ - ...
+ - RawContentBlockDeltaEvent with a SignatureDelta
+ - RawContentBlockStopEvent
+ - RawContentBlockStartEvent with a RedactedThinkingBlock (occasionally)
+ - RawContentBlockStopEvent (RedactedThinkingBlock does not have a delta)
+ - RawContentBlockStartEvent with an empty TextBlock
+ - RawContentBlockDeltaEvent with a TextDelta
+ - RawContentBlockDeltaEvent with a TextDelta
+ - RawContentBlockDeltaEvent with a TextDelta
+ - ...
+ - RawContentBlockStopEvent
+ - RawContentBlockStartEvent with ToolUseBlock specifying the function name
+ - RawContentBlockDeltaEvent with a InputJSONDelta
+ - RawContentBlockDeltaEvent with a InputJSONDelta
+ - ...
+ - RawContentBlockStopEvent
+ - RawMessageDeltaEvent with a stop_reason='tool_use'
+ - RawMessageStopEvent(type='message_stop')
+
+ Each message could contain multiple blocks of the same type.
+ """
+ if result is None:
+ raise TypeError("Expected a stream of messages")
+
+ current_message: MessageParam | None = None
+ current_block: (
+ TextBlockParam
+ | ToolUseBlockParam
+ | ThinkingBlockParam
+ | RedactedThinkingBlockParam
+ | None
+ ) = None
+ current_tool_args: str
+
+ async for response in result:
+ LOGGER.debug("Received response: %s", response)
+
+ if isinstance(response, RawMessageStartEvent):
+ if response.message.role != "assistant":
+ raise ValueError("Unexpected message role")
+ current_message = MessageParam(role=response.message.role, content=[])
+ elif isinstance(response, RawContentBlockStartEvent):
+ if isinstance(response.content_block, ToolUseBlock):
+ current_block = ToolUseBlockParam(
+ type="tool_use",
+ id=response.content_block.id,
+ name=response.content_block.name,
+ input="",
+ )
+ current_tool_args = ""
+ elif isinstance(response.content_block, TextBlock):
+ current_block = TextBlockParam(
+ type="text", text=response.content_block.text
+ )
+ yield {"role": "assistant"}
+ if response.content_block.text:
+ yield {"content": response.content_block.text}
+ elif isinstance(response.content_block, ThinkingBlock):
+ current_block = ThinkingBlockParam(
+ type="thinking",
+ thinking=response.content_block.thinking,
+ signature=response.content_block.signature,
+ )
+ elif isinstance(response.content_block, RedactedThinkingBlock):
+ current_block = RedactedThinkingBlockParam(
+ type="redacted_thinking", data=response.content_block.data
+ )
+ LOGGER.debug(
+ "Some of Claude’s internal reasoning has been automatically "
+ "encrypted for safety reasons. This doesn’t affect the quality of "
+ "responses"
+ )
+ elif isinstance(response, RawContentBlockDeltaEvent):
+ if current_block is None:
+ raise ValueError("Unexpected delta without a block")
+ if isinstance(response.delta, InputJSONDelta):
+ current_tool_args += response.delta.partial_json
+ elif isinstance(response.delta, TextDelta):
+ text_block = cast(TextBlockParam, current_block)
+ text_block["text"] += response.delta.text
+ yield {"content": response.delta.text}
+ elif isinstance(response.delta, ThinkingDelta):
+ thinking_block = cast(ThinkingBlockParam, current_block)
+ thinking_block["thinking"] += response.delta.thinking
+ elif isinstance(response.delta, SignatureDelta):
+ thinking_block = cast(ThinkingBlockParam, current_block)
+ thinking_block["signature"] += response.delta.signature
+ elif isinstance(response, RawContentBlockStopEvent):
+ if current_block is None:
+ raise ValueError("Unexpected stop event without a current block")
+ if current_block["type"] == "tool_use":
+ tool_block = cast(ToolUseBlockParam, current_block)
+ tool_args = json.loads(current_tool_args) if current_tool_args else {}
+ tool_block["input"] = tool_args
+ yield {
+ "tool_calls": [
+ llm.ToolInput(
+ id=tool_block["id"],
+ tool_name=tool_block["name"],
+ tool_args=tool_args,
+ )
+ ]
+ }
+ elif current_block["type"] == "thinking":
+ thinking_block = cast(ThinkingBlockParam, current_block)
+ LOGGER.debug("Thinking: %s", thinking_block["thinking"])
+
+ if current_message is None:
+ raise ValueError("Unexpected stop event without a current message")
+ current_message["content"].append(current_block) # type: ignore[union-attr]
+ current_block = None
+ elif isinstance(response, RawMessageStopEvent):
+ if current_message is not None:
+ messages.append(current_message)
+ current_message = None
class AnthropicConversationEntity(
@@ -100,7 +302,6 @@ class AnthropicConversationEntity(
def __init__(self, entry: AnthropicConfigEntry) -> None:
"""Initialize the agent."""
self.entry = entry
- self.history: dict[str, list[MessageParam]] = {}
self._attr_unique_id = entry.entry_id
self._attr_device_info = dr.DeviceInfo(
identifiers={(DOMAIN, entry.entry_id)},
@@ -125,188 +326,92 @@ class AnthropicConversationEntity(
self.entry.add_update_listener(self._async_entry_update_listener)
)
- async def async_process(
- self, user_input: conversation.ConversationInput
+ async def _async_handle_message(
+ self,
+ user_input: conversation.ConversationInput,
+ chat_log: conversation.ChatLog,
) -> conversation.ConversationResult:
- """Process a sentence."""
+ """Call the API."""
options = self.entry.options
- intent_response = intent.IntentResponse(language=user_input.language)
- llm_api: llm.APIInstance | None = None
- tools: list[ToolParam] | None = None
- user_name: str | None = None
- llm_context = llm.LLMContext(
- platform=DOMAIN,
- context=user_input.context,
- user_prompt=user_input.text,
- language=user_input.language,
- assistant=conversation.DOMAIN,
- device_id=user_input.device_id,
- )
-
- if options.get(CONF_LLM_HASS_API):
- try:
- llm_api = await llm.async_get_api(
- self.hass,
- options[CONF_LLM_HASS_API],
- llm_context,
- )
- except HomeAssistantError as err:
- LOGGER.error("Error getting LLM API: %s", err)
- intent_response.async_set_error(
- intent.IntentResponseErrorCode.UNKNOWN,
- f"Error preparing LLM API: {err}",
- )
- return conversation.ConversationResult(
- response=intent_response, conversation_id=user_input.conversation_id
- )
- tools = [
- _format_tool(tool, llm_api.custom_serializer) for tool in llm_api.tools
- ]
-
- if user_input.conversation_id is None:
- conversation_id = ulid_util.ulid_now()
- messages = []
-
- elif user_input.conversation_id in self.history:
- conversation_id = user_input.conversation_id
- messages = self.history[conversation_id]
-
- else:
- # Conversation IDs are ULIDs. We generate a new one if not provided.
- # If an old OLID is passed in, we will generate a new one to indicate
- # a new conversation was started. If the user picks their own, they
- # want to track a conversation and we respect it.
- try:
- ulid_util.ulid_to_bytes(user_input.conversation_id)
- conversation_id = ulid_util.ulid_now()
- except ValueError:
- conversation_id = user_input.conversation_id
-
- messages = []
-
- if (
- user_input.context
- and user_input.context.user_id
- and (
- user := await self.hass.auth.async_get_user(user_input.context.user_id)
- )
- ):
- user_name = user.name
try:
- prompt_parts = [
- template.Template(
- llm.BASE_PROMPT
- + options.get(CONF_PROMPT, llm.DEFAULT_INSTRUCTIONS_PROMPT),
- self.hass,
- ).async_render(
- {
- "ha_name": self.hass.config.location_name,
- "user_name": user_name,
- "llm_context": llm_context,
- },
- parse_result=False,
- )
+ await chat_log.async_update_llm_data(
+ DOMAIN,
+ user_input,
+ options.get(CONF_LLM_HASS_API),
+ options.get(CONF_PROMPT),
+ )
+ except conversation.ConverseError as err:
+ return err.as_conversation_result()
+
+ tools: list[ToolParam] | None = None
+ if chat_log.llm_api:
+ tools = [
+ _format_tool(tool, chat_log.llm_api.custom_serializer)
+ for tool in chat_log.llm_api.tools
]
- except TemplateError as err:
- LOGGER.error("Error rendering prompt: %s", err)
- intent_response.async_set_error(
- intent.IntentResponseErrorCode.UNKNOWN,
- f"Sorry, I had a problem with my template: {err}",
- )
- return conversation.ConversationResult(
- response=intent_response, conversation_id=conversation_id
- )
-
- if llm_api:
- prompt_parts.append(llm_api.api_prompt)
-
- prompt = "\n".join(prompt_parts)
-
- # Create a copy of the variable because we attach it to the trace
- messages = [*messages, MessageParam(role="user", content=user_input.text)]
-
- LOGGER.debug("Prompt: %s", messages)
- LOGGER.debug("Tools: %s", tools)
- trace.async_conversation_trace_append(
- trace.ConversationTraceEventType.AGENT_DETAIL,
- {"system": prompt, "messages": messages},
- )
+ system = chat_log.content[0]
+ if not isinstance(system, conversation.SystemContent):
+ raise TypeError("First message must be a system message")
+ messages = _convert_content(chat_log.content[1:])
client = self.entry.runtime_data
+ thinking_budget = options.get(CONF_THINKING_BUDGET, RECOMMENDED_THINKING_BUDGET)
+ model = options.get(CONF_CHAT_MODEL, RECOMMENDED_CHAT_MODEL)
+
# To prevent infinite loops, we limit the number of iterations
for _iteration in range(MAX_TOOL_ITERATIONS):
+ model_args = {
+ "model": model,
+ "messages": messages,
+ "tools": tools or NOT_GIVEN,
+ "max_tokens": options.get(CONF_MAX_TOKENS, RECOMMENDED_MAX_TOKENS),
+ "system": system.content,
+ "stream": True,
+ }
+ if model in THINKING_MODELS and thinking_budget >= MIN_THINKING_BUDGET:
+ model_args["thinking"] = ThinkingConfigEnabledParam(
+ type="enabled", budget_tokens=thinking_budget
+ )
+ else:
+ model_args["thinking"] = ThinkingConfigDisabledParam(type="disabled")
+ model_args["temperature"] = options.get(
+ CONF_TEMPERATURE, RECOMMENDED_TEMPERATURE
+ )
+
try:
- response = await client.messages.create(
- model=options.get(CONF_CHAT_MODEL, RECOMMENDED_CHAT_MODEL),
- messages=messages,
- tools=tools or NOT_GIVEN,
- max_tokens=options.get(CONF_MAX_TOKENS, RECOMMENDED_MAX_TOKENS),
- system=prompt,
- temperature=options.get(CONF_TEMPERATURE, RECOMMENDED_TEMPERATURE),
- )
+ stream = await client.messages.create(**model_args)
except anthropic.AnthropicError as err:
- intent_response.async_set_error(
- intent.IntentResponseErrorCode.UNKNOWN,
- f"Sorry, I had a problem talking to Anthropic: {err}",
- )
- return conversation.ConversationResult(
- response=intent_response, conversation_id=conversation_id
+ raise HomeAssistantError(
+ f"Sorry, I had a problem talking to Anthropic: {err}"
+ ) from err
+
+ messages.extend(
+ _convert_content(
+ [
+ content
+ async for content in chat_log.async_add_delta_content_stream(
+ user_input.agent_id, _transform_stream(stream, messages)
+ )
+ if not isinstance(content, conversation.AssistantContent)
+ ]
)
+ )
- LOGGER.debug("Response %s", response)
-
- messages.append(_message_convert(response))
-
- if response.stop_reason != "tool_use" or not llm_api:
- break
-
- tool_results: list[ToolResultBlockParam] = []
- for tool_call in response.content:
- if isinstance(tool_call, TextBlock):
- LOGGER.info(tool_call.text)
-
- if not isinstance(tool_call, ToolUseBlock):
- continue
-
- tool_input = llm.ToolInput(
- id=tool_call.id,
- tool_name=tool_call.name,
- tool_args=cast(dict[str, Any], tool_call.input),
- )
- LOGGER.debug(
- "Tool call: %s(%s)", tool_input.tool_name, tool_input.tool_args
- )
-
- try:
- tool_response = await llm_api.async_call_tool(tool_input)
- except (HomeAssistantError, vol.Invalid) as e:
- tool_response = {"error": type(e).__name__}
- if str(e):
- tool_response["error_text"] = str(e)
-
- LOGGER.debug("Tool response: %s", tool_response)
- tool_results.append(
- ToolResultBlockParam(
- type="tool_result",
- tool_use_id=tool_call.id,
- content=json.dumps(tool_response),
- )
- )
-
- messages.append(MessageParam(role="user", content=tool_results))
-
- self.history[conversation_id] = messages
-
- for content in response.content:
- if isinstance(content, TextBlock):
- intent_response.async_set_speech(content.text)
+ if not chat_log.unresponded_tool_results:
break
+ response_content = chat_log.content[-1]
+ if not isinstance(response_content, conversation.AssistantContent):
+ raise TypeError("Last message must be an assistant message")
+ intent_response = intent.IntentResponse(language=user_input.language)
+ intent_response.async_set_speech(response_content.content or "")
return conversation.ConversationResult(
- response=intent_response, conversation_id=conversation_id
+ response=intent_response,
+ conversation_id=chat_log.conversation_id,
+ continue_conversation=chat_log.continue_conversation,
)
async def _async_entry_update_listener(
diff --git a/homeassistant/components/anthropic/manifest.json b/homeassistant/components/anthropic/manifest.json
index b5cbb36c034..797a7299d16 100644
--- a/homeassistant/components/anthropic/manifest.json
+++ b/homeassistant/components/anthropic/manifest.json
@@ -8,5 +8,5 @@
"documentation": "https://www.home-assistant.io/integrations/anthropic",
"integration_type": "service",
"iot_class": "cloud_polling",
- "requirements": ["anthropic==0.44.0"]
+ "requirements": ["anthropic==0.47.2"]
}
diff --git a/homeassistant/components/anthropic/strings.json b/homeassistant/components/anthropic/strings.json
index 9550a1a6672..c2caf3a6666 100644
--- a/homeassistant/components/anthropic/strings.json
+++ b/homeassistant/components/anthropic/strings.json
@@ -23,12 +23,17 @@
"max_tokens": "Maximum tokens to return in response",
"temperature": "Temperature",
"llm_hass_api": "[%key:common::config_flow::data::llm_hass_api%]",
- "recommended": "Recommended model settings"
+ "recommended": "Recommended model settings",
+ "thinking_budget_tokens": "Thinking budget"
},
"data_description": {
- "prompt": "Instruct how the LLM should respond. This can be a template."
+ "prompt": "Instruct how the LLM should respond. This can be a template.",
+ "thinking_budget_tokens": "The number of tokens the model can use to think about the response out of the total maximum number of tokens. Set to 1024 or greater to enable extended thinking."
}
}
+ },
+ "error": {
+ "thinking_budget_too_large": "Maximum tokens must be greater than the thinking budget."
}
}
}
diff --git a/homeassistant/components/aosmith/sensor.py b/homeassistant/components/aosmith/sensor.py
index 8a7a98115fa..071407e7b17 100644
--- a/homeassistant/components/aosmith/sensor.py
+++ b/homeassistant/components/aosmith/sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.sensor import (
)
from homeassistant.const import PERCENTAGE, UnitOfEnergy
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .coordinator import (
AOSmithConfigEntry,
@@ -43,7 +43,7 @@ STATUS_ENTITY_DESCRIPTIONS: tuple[AOSmithStatusSensorEntityDescription, ...] = (
async def async_setup_entry(
hass: HomeAssistant,
entry: AOSmithConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up A. O. Smith sensor platform."""
data = entry.runtime_data
diff --git a/homeassistant/components/aosmith/water_heater.py b/homeassistant/components/aosmith/water_heater.py
index 110f997065b..d29b00955b6 100644
--- a/homeassistant/components/aosmith/water_heater.py
+++ b/homeassistant/components/aosmith/water_heater.py
@@ -15,7 +15,7 @@ from homeassistant.components.water_heater import (
from homeassistant.const import UnitOfTemperature
from homeassistant.core import HomeAssistant
from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .coordinator import AOSmithConfigEntry, AOSmithStatusCoordinator
from .entity import AOSmithStatusEntity
@@ -45,7 +45,7 @@ DEFAULT_OPERATION_MODE_PRIORITY = [
async def async_setup_entry(
hass: HomeAssistant,
entry: AOSmithConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up A. O. Smith water heater platform."""
data = entry.runtime_data
diff --git a/homeassistant/components/apcupsd/binary_sensor.py b/homeassistant/components/apcupsd/binary_sensor.py
index 2a44845618e..dfeb56c8d06 100644
--- a/homeassistant/components/apcupsd/binary_sensor.py
+++ b/homeassistant/components/apcupsd/binary_sensor.py
@@ -9,7 +9,7 @@ from homeassistant.components.binary_sensor import (
BinarySensorEntityDescription,
)
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.update_coordinator import CoordinatorEntity
from .coordinator import APCUPSdConfigEntry, APCUPSdCoordinator
@@ -27,7 +27,7 @@ _VALUE_ONLINE_MASK: Final = 0b1000
async def async_setup_entry(
hass: HomeAssistant,
config_entry: APCUPSdConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up an APCUPSd Online Status binary sensor."""
coordinator = config_entry.runtime_data
@@ -53,10 +53,8 @@ class OnlineStatus(CoordinatorEntity[APCUPSdCoordinator], BinarySensorEntity):
"""Initialize the APCUPSd binary device."""
super().__init__(coordinator, context=description.key.upper())
- # Set up unique id and device info if serial number is available.
- if (serial_no := coordinator.data.serial_no) is not None:
- self._attr_unique_id = f"{serial_no}_{description.key}"
self.entity_description = description
+ self._attr_unique_id = f"{coordinator.unique_device_id}_{description.key}"
self._attr_device_info = coordinator.device_info
@property
diff --git a/homeassistant/components/apcupsd/coordinator.py b/homeassistant/components/apcupsd/coordinator.py
index e2c1af50cee..4e663725303 100644
--- a/homeassistant/components/apcupsd/coordinator.py
+++ b/homeassistant/components/apcupsd/coordinator.py
@@ -85,11 +85,16 @@ class APCUPSdCoordinator(DataUpdateCoordinator[APCUPSdData]):
self._host = host
self._port = port
+ @property
+ def unique_device_id(self) -> str:
+ """Return a unique ID of the device, which is the serial number (if available) or the config entry ID."""
+ return self.data.serial_no or self.config_entry.entry_id
+
@property
def device_info(self) -> DeviceInfo:
"""Return the DeviceInfo of this APC UPS, if serial number is available."""
return DeviceInfo(
- identifiers={(DOMAIN, self.data.serial_no or self.config_entry.entry_id)},
+ identifiers={(DOMAIN, self.unique_device_id)},
model=self.data.model,
manufacturer="APC",
name=self.data.name or "APC UPS",
diff --git a/homeassistant/components/apcupsd/sensor.py b/homeassistant/components/apcupsd/sensor.py
index b3c396daf5e..a3faf6b0268 100644
--- a/homeassistant/components/apcupsd/sensor.py
+++ b/homeassistant/components/apcupsd/sensor.py
@@ -21,7 +21,7 @@ from homeassistant.const import (
UnitOfTime,
)
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.update_coordinator import CoordinatorEntity
from .const import LAST_S_TEST
@@ -406,7 +406,7 @@ INFERRED_UNITS = {
async def async_setup_entry(
hass: HomeAssistant,
config_entry: APCUPSdConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the APCUPSd sensors from config entries."""
coordinator = config_entry.runtime_data
@@ -458,11 +458,8 @@ class APCUPSdSensor(CoordinatorEntity[APCUPSdCoordinator], SensorEntity):
"""Initialize the sensor."""
super().__init__(coordinator=coordinator, context=description.key.upper())
- # Set up unique id and device info if serial number is available.
- if (serial_no := coordinator.data.serial_no) is not None:
- self._attr_unique_id = f"{serial_no}_{description.key}"
-
self.entity_description = description
+ self._attr_unique_id = f"{coordinator.unique_device_id}_{description.key}"
self._attr_device_info = coordinator.device_info
# Initial update of attributes.
diff --git a/homeassistant/components/apcupsd/strings.json b/homeassistant/components/apcupsd/strings.json
index 93102ac1393..fb5df9ec390 100644
--- a/homeassistant/components/apcupsd/strings.json
+++ b/homeassistant/components/apcupsd/strings.json
@@ -57,7 +57,7 @@
"name": "Status date"
},
"dip_switch_settings": {
- "name": "Dip switch settings"
+ "name": "DIP switch settings"
},
"low_battery_signal": {
"name": "Low battery signal"
diff --git a/homeassistant/components/apollo_automation/__init__.py b/homeassistant/components/apollo_automation/__init__.py
new file mode 100644
index 00000000000..7815b17818f
--- /dev/null
+++ b/homeassistant/components/apollo_automation/__init__.py
@@ -0,0 +1 @@
+"""Virtual integration: Apollo Automation."""
diff --git a/homeassistant/components/apollo_automation/manifest.json b/homeassistant/components/apollo_automation/manifest.json
new file mode 100644
index 00000000000..8e4c58f3f3d
--- /dev/null
+++ b/homeassistant/components/apollo_automation/manifest.json
@@ -0,0 +1,6 @@
+{
+ "domain": "apollo_automation",
+ "name": "Apollo Automation",
+ "integration_type": "virtual",
+ "supported_by": "esphome"
+}
diff --git a/homeassistant/components/apple_tv/__init__.py b/homeassistant/components/apple_tv/__init__.py
index f4417134b37..b911b3cec99 100644
--- a/homeassistant/components/apple_tv/__init__.py
+++ b/homeassistant/components/apple_tv/__init__.py
@@ -233,7 +233,6 @@ class AppleTVManager(DeviceListener):
pass
except Exception:
_LOGGER.exception("Failed to connect")
- await self.disconnect()
async def _connect_loop(self) -> None:
"""Connect loop background task function."""
diff --git a/homeassistant/components/apple_tv/config_flow.py b/homeassistant/components/apple_tv/config_flow.py
index 76c4681a30d..b026da33231 100644
--- a/homeassistant/components/apple_tv/config_flow.py
+++ b/homeassistant/components/apple_tv/config_flow.py
@@ -20,6 +20,7 @@ import voluptuous as vol
from homeassistant.components import zeroconf
from homeassistant.config_entries import (
SOURCE_IGNORE,
+ SOURCE_REAUTH,
SOURCE_ZEROCONF,
ConfigEntry,
ConfigFlow,
@@ -381,7 +382,9 @@ class AppleTVConfigFlow(ConfigFlow, domain=DOMAIN):
CONF_IDENTIFIERS: list(combined_identifiers),
},
)
- if entry.source != SOURCE_IGNORE:
+ # Don't reload ignored entries or in the middle of reauth,
+ # e.g. if the user is entering a new PIN
+ if entry.source != SOURCE_IGNORE and self.source != SOURCE_REAUTH:
self.hass.config_entries.async_schedule_reload(entry.entry_id)
if not allow_exist:
raise DeviceAlreadyConfigured
diff --git a/homeassistant/components/apple_tv/media_player.py b/homeassistant/components/apple_tv/media_player.py
index 8a2336eea3b..b6d451a9ea0 100644
--- a/homeassistant/components/apple_tv/media_player.py
+++ b/homeassistant/components/apple_tv/media_player.py
@@ -39,7 +39,7 @@ from homeassistant.components.media_player import (
)
from homeassistant.const import CONF_NAME
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.util import dt as dt_util
from . import AppleTvConfigEntry, AppleTVManager
@@ -100,7 +100,7 @@ SUPPORT_FEATURE_MAPPING = {
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AppleTvConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Load Apple TV media player based on a config entry."""
name: str = config_entry.data[CONF_NAME]
@@ -120,6 +120,7 @@ class AppleTvMediaPlayer(
"""Initialize the Apple TV media player."""
super().__init__(name, identifier, manager)
self._playing: Playing | None = None
+ self._playing_last_updated: datetime | None = None
self._app_list: dict[str, str] = {}
@callback
@@ -209,6 +210,7 @@ class AppleTvMediaPlayer(
This is a callback function from pyatv.interface.PushListener.
"""
self._playing = playstatus
+ self._playing_last_updated = dt_util.utcnow()
self.async_write_ha_state()
@callback
@@ -316,7 +318,7 @@ class AppleTvMediaPlayer(
def media_position_updated_at(self) -> datetime | None:
"""Last valid time of media position."""
if self.state in {MediaPlayerState.PLAYING, MediaPlayerState.PAUSED}:
- return dt_util.utcnow()
+ return self._playing_last_updated
return None
async def async_play_media(
diff --git a/homeassistant/components/apple_tv/remote.py b/homeassistant/components/apple_tv/remote.py
index 7f2c9f1b591..97e31bd4bb0 100644
--- a/homeassistant/components/apple_tv/remote.py
+++ b/homeassistant/components/apple_tv/remote.py
@@ -17,7 +17,7 @@ from homeassistant.components.remote import (
)
from homeassistant.const import CONF_NAME
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import AppleTvConfigEntry
from .entity import AppleTVEntity
@@ -38,7 +38,7 @@ COMMAND_TO_ATTRIBUTE = {
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AppleTvConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Load Apple TV remote based on a config entry."""
name: str = config_entry.data[CONF_NAME]
diff --git a/homeassistant/components/aprilaire/climate.py b/homeassistant/components/aprilaire/climate.py
index 194453046e6..5116e06b58f 100644
--- a/homeassistant/components/aprilaire/climate.py
+++ b/homeassistant/components/aprilaire/climate.py
@@ -18,7 +18,7 @@ from homeassistant.components.climate import (
)
from homeassistant.const import PRECISION_HALVES, PRECISION_WHOLE, UnitOfTemperature
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .const import (
FAN_CIRCULATE,
@@ -63,7 +63,7 @@ FAN_MODE_MAP = {
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AprilaireConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Add climates for passed config_entry in HA."""
diff --git a/homeassistant/components/aprilaire/humidifier.py b/homeassistant/components/aprilaire/humidifier.py
index 8a173e5e95e..fdb9233a0e3 100644
--- a/homeassistant/components/aprilaire/humidifier.py
+++ b/homeassistant/components/aprilaire/humidifier.py
@@ -15,7 +15,7 @@ from homeassistant.components.humidifier import (
HumidifierEntityDescription,
)
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.typing import StateType
from .coordinator import AprilaireConfigEntry, AprilaireCoordinator
@@ -40,7 +40,7 @@ DEHUMIDIFIER_ACTION_MAP: dict[StateType, HumidifierAction] = {
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AprilaireConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up Aprilaire humidifier devices."""
diff --git a/homeassistant/components/aprilaire/manifest.json b/homeassistant/components/aprilaire/manifest.json
index 577de8ae88d..b40460dd61b 100644
--- a/homeassistant/components/aprilaire/manifest.json
+++ b/homeassistant/components/aprilaire/manifest.json
@@ -7,5 +7,5 @@
"integration_type": "device",
"iot_class": "local_push",
"loggers": ["pyaprilaire"],
- "requirements": ["pyaprilaire==0.7.7"]
+ "requirements": ["pyaprilaire==0.8.1"]
}
diff --git a/homeassistant/components/aprilaire/select.py b/homeassistant/components/aprilaire/select.py
index d8f6137f53d..c38c9e94501 100644
--- a/homeassistant/components/aprilaire/select.py
+++ b/homeassistant/components/aprilaire/select.py
@@ -10,7 +10,7 @@ from pyaprilaire.const import Attribute
from homeassistant.components.select import SelectEntity, SelectEntityDescription
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .coordinator import AprilaireConfigEntry, AprilaireCoordinator
from .entity import BaseAprilaireEntity
@@ -24,7 +24,7 @@ FRESH_AIR_MODE_MAP = {0: "off", 1: "automatic"}
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AprilaireConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up Aprilaire select devices."""
diff --git a/homeassistant/components/aprilaire/sensor.py b/homeassistant/components/aprilaire/sensor.py
index e1909746364..bf3bd12f43d 100644
--- a/homeassistant/components/aprilaire/sensor.py
+++ b/homeassistant/components/aprilaire/sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.sensor import (
)
from homeassistant.const import PERCENTAGE, UnitOfTemperature
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.typing import StateType
from .coordinator import AprilaireConfigEntry, AprilaireCoordinator
@@ -75,7 +75,7 @@ def get_entities(
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AprilaireConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up Aprilaire sensor devices."""
diff --git a/homeassistant/components/apsystems/binary_sensor.py b/homeassistant/components/apsystems/binary_sensor.py
index 863a50ca455..202d878014d 100644
--- a/homeassistant/components/apsystems/binary_sensor.py
+++ b/homeassistant/components/apsystems/binary_sensor.py
@@ -14,7 +14,7 @@ from homeassistant.components.binary_sensor import (
)
from homeassistant.const import EntityCategory
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.update_coordinator import CoordinatorEntity
from .coordinator import ApSystemsConfigEntry, ApSystemsData, ApSystemsDataCoordinator
@@ -63,7 +63,7 @@ BINARY_SENSORS: tuple[ApsystemsLocalApiBinarySensorDescription, ...] = (
async def async_setup_entry(
hass: HomeAssistant,
config_entry: ApSystemsConfigEntry,
- add_entities: AddEntitiesCallback,
+ add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the binary sensor platform."""
config = config_entry.runtime_data
diff --git a/homeassistant/components/apsystems/coordinator.py b/homeassistant/components/apsystems/coordinator.py
index ca423055176..f7f1039b8a4 100644
--- a/homeassistant/components/apsystems/coordinator.py
+++ b/homeassistant/components/apsystems/coordinator.py
@@ -43,6 +43,7 @@ class ApSystemsDataCoordinator(DataUpdateCoordinator[ApSystemsSensorData]):
config_entry: ApSystemsConfigEntry
device_version: str
+ battery_system: bool
def __init__(
self,
@@ -68,6 +69,7 @@ class ApSystemsDataCoordinator(DataUpdateCoordinator[ApSystemsSensorData]):
self.api.max_power = device_info.maxPower
self.api.min_power = device_info.minPower
self.device_version = device_info.devVer
+ self.battery_system = device_info.isBatterySystem
async def _async_update_data(self) -> ApSystemsSensorData:
try:
diff --git a/homeassistant/components/apsystems/entity.py b/homeassistant/components/apsystems/entity.py
index 9ba7d046b60..2ce8becbf80 100644
--- a/homeassistant/components/apsystems/entity.py
+++ b/homeassistant/components/apsystems/entity.py
@@ -19,10 +19,20 @@ class ApSystemsEntity(Entity):
data: ApSystemsData,
) -> None:
"""Initialize the APsystems entity."""
+
+ # Handle device version safely
+ sw_version = None
+ if data.coordinator.device_version:
+ version_parts = data.coordinator.device_version.split(" ")
+ if len(version_parts) > 1:
+ sw_version = version_parts[1]
+ else:
+ sw_version = version_parts[0]
+
self._attr_device_info = DeviceInfo(
identifiers={(DOMAIN, data.device_id)},
manufacturer="APsystems",
model="EZ1-M",
serial_number=data.device_id,
- sw_version=data.coordinator.device_version.split(" ")[1],
+ sw_version=sw_version,
)
diff --git a/homeassistant/components/apsystems/manifest.json b/homeassistant/components/apsystems/manifest.json
index a58530b05e2..934a155c500 100644
--- a/homeassistant/components/apsystems/manifest.json
+++ b/homeassistant/components/apsystems/manifest.json
@@ -6,5 +6,5 @@
"documentation": "https://www.home-assistant.io/integrations/apsystems",
"integration_type": "device",
"iot_class": "local_polling",
- "requirements": ["apsystems-ez1==2.4.0"]
+ "requirements": ["apsystems-ez1==2.5.0"]
}
diff --git a/homeassistant/components/apsystems/number.py b/homeassistant/components/apsystems/number.py
index f7bdc7c2711..b43b21f2b71 100644
--- a/homeassistant/components/apsystems/number.py
+++ b/homeassistant/components/apsystems/number.py
@@ -7,7 +7,7 @@ from aiohttp import ClientConnectorError
from homeassistant.components.number import NumberDeviceClass, NumberEntity, NumberMode
from homeassistant.const import UnitOfPower
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.typing import DiscoveryInfoType
from .coordinator import ApSystemsConfigEntry, ApSystemsData
@@ -17,7 +17,7 @@ from .entity import ApSystemsEntity
async def async_setup_entry(
hass: HomeAssistant,
config_entry: ApSystemsConfigEntry,
- add_entities: AddEntitiesCallback,
+ add_entities: AddConfigEntryEntitiesCallback,
discovery_info: DiscoveryInfoType | None = None,
) -> None:
"""Set up the sensor platform."""
diff --git a/homeassistant/components/apsystems/sensor.py b/homeassistant/components/apsystems/sensor.py
index 673dba05acc..6e654cfbf61 100644
--- a/homeassistant/components/apsystems/sensor.py
+++ b/homeassistant/components/apsystems/sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.sensor import (
)
from homeassistant.const import UnitOfEnergy, UnitOfPower
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.typing import DiscoveryInfoType, StateType
from homeassistant.helpers.update_coordinator import CoordinatorEntity
@@ -109,7 +109,7 @@ SENSORS: tuple[ApsystemsLocalApiSensorDescription, ...] = (
async def async_setup_entry(
hass: HomeAssistant,
config_entry: ApSystemsConfigEntry,
- add_entities: AddEntitiesCallback,
+ add_entities: AddConfigEntryEntitiesCallback,
discovery_info: DiscoveryInfoType | None = None,
) -> None:
"""Set up the sensor platform."""
diff --git a/homeassistant/components/apsystems/switch.py b/homeassistant/components/apsystems/switch.py
index 2d3b0cfd08f..5451f2885fe 100644
--- a/homeassistant/components/apsystems/switch.py
+++ b/homeassistant/components/apsystems/switch.py
@@ -9,7 +9,7 @@ from APsystemsEZ1 import InverterReturnedError
from homeassistant.components.switch import SwitchDeviceClass, SwitchEntity
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .coordinator import ApSystemsConfigEntry, ApSystemsData
from .entity import ApSystemsEntity
@@ -18,7 +18,7 @@ from .entity import ApSystemsEntity
async def async_setup_entry(
hass: HomeAssistant,
config_entry: ApSystemsConfigEntry,
- add_entities: AddEntitiesCallback,
+ add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the switch platform."""
@@ -36,6 +36,8 @@ class ApSystemsInverterSwitch(ApSystemsEntity, SwitchEntity):
super().__init__(data)
self._api = data.coordinator.api
self._attr_unique_id = f"{data.device_id}_inverter_status"
+ if data.coordinator.battery_system:
+ self._attr_available = False
async def async_update(self) -> None:
"""Update switch status and availability."""
diff --git a/homeassistant/components/aquacell/config_flow.py b/homeassistant/components/aquacell/config_flow.py
index 1ee89035d93..277cb742486 100644
--- a/homeassistant/components/aquacell/config_flow.py
+++ b/homeassistant/components/aquacell/config_flow.py
@@ -60,7 +60,7 @@ class AquaCellConfigFlow(ConfigFlow, domain=DOMAIN):
errors["base"] = "cannot_connect"
except AuthenticationFailed:
errors["base"] = "invalid_auth"
- except Exception: # pylint: disable=broad-except
+ except Exception:
_LOGGER.exception("Unexpected exception")
errors["base"] = "unknown"
else:
diff --git a/homeassistant/components/aquacell/sensor.py b/homeassistant/components/aquacell/sensor.py
index a76d26244ad..77cd3cdd60a 100644
--- a/homeassistant/components/aquacell/sensor.py
+++ b/homeassistant/components/aquacell/sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.sensor import (
)
from homeassistant.const import PERCENTAGE, UnitOfTime
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.typing import StateType
from .coordinator import AquacellConfigEntry, AquacellCoordinator
@@ -83,7 +83,7 @@ SENSORS: tuple[SoftenerSensorEntityDescription, ...] = (
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AquacellConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the sensors."""
softeners = config_entry.runtime_data.data
diff --git a/homeassistant/components/aquacell/strings.json b/homeassistant/components/aquacell/strings.json
index 53304d04804..e07adf3c199 100644
--- a/homeassistant/components/aquacell/strings.json
+++ b/homeassistant/components/aquacell/strings.json
@@ -36,9 +36,9 @@
"wi_fi_strength": {
"name": "Wi-Fi strength",
"state": {
- "low": "Low",
- "medium": "Medium",
- "high": "High"
+ "low": "[%key:common::state::low%]",
+ "medium": "[%key:common::state::medium%]",
+ "high": "[%key:common::state::high%]"
}
}
}
diff --git a/homeassistant/components/aranet/sensor.py b/homeassistant/components/aranet/sensor.py
index b5187cba1f4..ee2eb8c8a75 100644
--- a/homeassistant/components/aranet/sensor.py
+++ b/homeassistant/components/aranet/sensor.py
@@ -5,7 +5,7 @@ from __future__ import annotations
from dataclasses import dataclass
from typing import Any
-from aranet4.client import Aranet4Advertisement
+from aranet4.client import Aranet4Advertisement, Color
from bleak.backends.device import BLEDevice
from homeassistant.components.bluetooth.passive_update_processor import (
@@ -35,7 +35,7 @@ from homeassistant.const import (
from homeassistant.core import HomeAssistant
from homeassistant.helpers.device_registry import DeviceInfo
from homeassistant.helpers.entity import EntityDescription
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import AranetConfigEntry
from .const import ARANET_MANUFACTURER_NAME
@@ -74,6 +74,13 @@ SENSOR_DESCRIPTIONS = {
native_unit_of_measurement=UnitOfPressure.HPA,
state_class=SensorStateClass.MEASUREMENT,
),
+ "status": AranetSensorEntityDescription(
+ key="threshold",
+ translation_key="threshold",
+ name="Threshold",
+ device_class=SensorDeviceClass.ENUM,
+ options=[status.name.lower() for status in Color],
+ ),
"co2": AranetSensorEntityDescription(
key="co2",
name="Carbon Dioxide",
@@ -161,7 +168,10 @@ def sensor_update_to_bluetooth_data_update(
val = getattr(adv.readings, key)
if val == -1:
continue
- val *= desc.scale
+ if key == "status":
+ val = val.name.lower()
+ else:
+ val *= desc.scale
data[tag] = val
names[tag] = desc.name
descs[tag] = desc
@@ -176,7 +186,7 @@ def sensor_update_to_bluetooth_data_update(
async def async_setup_entry(
hass: HomeAssistant,
entry: AranetConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the Aranet sensors."""
processor = PassiveBluetoothDataProcessor(sensor_update_to_bluetooth_data_update)
diff --git a/homeassistant/components/aranet/strings.json b/homeassistant/components/aranet/strings.json
index 1cc695637d4..f786f4b2d4d 100644
--- a/homeassistant/components/aranet/strings.json
+++ b/homeassistant/components/aranet/strings.json
@@ -21,5 +21,17 @@
"no_devices_found": "No unconfigured Aranet devices found.",
"outdated_version": "This device is using outdated firmware. Please update it to at least v1.2.0 and try again."
}
+ },
+ "entity": {
+ "sensor": {
+ "threshold": {
+ "state": {
+ "error": "Error",
+ "green": "Green",
+ "yellow": "Yellow",
+ "red": "Red"
+ }
+ }
+ }
}
}
diff --git a/homeassistant/components/arcam_fmj/manifest.json b/homeassistant/components/arcam_fmj/manifest.json
index 39d289f9cb1..41396eca5d6 100644
--- a/homeassistant/components/arcam_fmj/manifest.json
+++ b/homeassistant/components/arcam_fmj/manifest.json
@@ -6,7 +6,7 @@
"documentation": "https://www.home-assistant.io/integrations/arcam_fmj",
"iot_class": "local_polling",
"loggers": ["arcam"],
- "requirements": ["arcam-fmj==1.5.2"],
+ "requirements": ["arcam-fmj==1.8.1"],
"ssdp": [
{
"deviceType": "urn:schemas-upnp-org:device:MediaRenderer:1",
diff --git a/homeassistant/components/arcam_fmj/media_player.py b/homeassistant/components/arcam_fmj/media_player.py
index 7a133777a0a..cd4ed7bbb05 100644
--- a/homeassistant/components/arcam_fmj/media_player.py
+++ b/homeassistant/components/arcam_fmj/media_player.py
@@ -24,7 +24,7 @@ from homeassistant.core import HomeAssistant, callback
from homeassistant.exceptions import HomeAssistantError
from homeassistant.helpers.device_registry import DeviceInfo
from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import ArcamFmjConfigEntry
from .const import (
@@ -41,7 +41,7 @@ _LOGGER = logging.getLogger(__name__)
async def async_setup_entry(
hass: HomeAssistant,
config_entry: ArcamFmjConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the configuration entry."""
diff --git a/homeassistant/components/arve/sensor.py b/homeassistant/components/arve/sensor.py
index 64d9f6f8874..dea7110f611 100644
--- a/homeassistant/components/arve/sensor.py
+++ b/homeassistant/components/arve/sensor.py
@@ -18,7 +18,7 @@ from homeassistant.const import (
UnitOfTemperature,
)
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .coordinator import ArveConfigEntry
from .entity import ArveDeviceEntity
@@ -83,7 +83,9 @@ SENSORS: tuple[ArveDeviceEntityDescription, ...] = (
async def async_setup_entry(
- hass: HomeAssistant, entry: ArveConfigEntry, async_add_entities: AddEntitiesCallback
+ hass: HomeAssistant,
+ entry: ArveConfigEntry,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up Arve device based on a config entry."""
coordinator = entry.runtime_data
diff --git a/homeassistant/components/arwn/sensor.py b/homeassistant/components/arwn/sensor.py
index ada96c07340..4cc4feed2d4 100644
--- a/homeassistant/components/arwn/sensor.py
+++ b/homeassistant/components/arwn/sensor.py
@@ -6,7 +6,11 @@ import logging
from typing import Any
from homeassistant.components import mqtt
-from homeassistant.components.sensor import SensorDeviceClass, SensorEntity
+from homeassistant.components.sensor import (
+ SensorDeviceClass,
+ SensorEntity,
+ SensorStateClass,
+)
from homeassistant.const import DEGREE, UnitOfPrecipitationDepth, UnitOfTemperature
from homeassistant.core import HomeAssistant, callback
from homeassistant.helpers.entity_platform import AddEntitiesCallback
@@ -92,7 +96,13 @@ def discover_sensors(topic: str, payload: dict[str, Any]) -> list[ArwnSensor] |
device_class=SensorDeviceClass.WIND_SPEED,
),
ArwnSensor(
- topic + "/dir", "Wind Direction", "direction", DEGREE, "mdi:compass"
+ topic + "/dir",
+ "Wind Direction",
+ "direction",
+ DEGREE,
+ "mdi:compass",
+ device_class=SensorDeviceClass.WIND_DIRECTION,
+ state_class=SensorStateClass.MEASUREMENT_ANGLE,
),
]
return None
@@ -173,6 +183,7 @@ class ArwnSensor(SensorEntity):
units: str,
icon: str | None = None,
device_class: SensorDeviceClass | None = None,
+ state_class: SensorStateClass | None = None,
) -> None:
"""Initialize the sensor."""
self.entity_id = _slug(name)
@@ -183,6 +194,7 @@ class ArwnSensor(SensorEntity):
self._attr_native_unit_of_measurement = units
self._attr_icon = icon
self._attr_device_class = device_class
+ self._attr_state_class = state_class
def set_event(self, event: dict[str, Any]) -> None:
"""Update the sensor with the most recent event."""
diff --git a/homeassistant/components/aseko_pool_live/binary_sensor.py b/homeassistant/components/aseko_pool_live/binary_sensor.py
index c8cc31dc795..15c72614ee1 100644
--- a/homeassistant/components/aseko_pool_live/binary_sensor.py
+++ b/homeassistant/components/aseko_pool_live/binary_sensor.py
@@ -12,7 +12,7 @@ from homeassistant.components.binary_sensor import (
BinarySensorEntityDescription,
)
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .coordinator import AsekoConfigEntry
from .entity import AsekoEntity
@@ -37,7 +37,7 @@ BINARY_SENSORS: tuple[AsekoBinarySensorEntityDescription, ...] = (
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AsekoConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the Aseko Pool Live binary sensors."""
coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/aseko_pool_live/sensor.py b/homeassistant/components/aseko_pool_live/sensor.py
index 3fe7cdd5272..f9a7287a9f1 100644
--- a/homeassistant/components/aseko_pool_live/sensor.py
+++ b/homeassistant/components/aseko_pool_live/sensor.py
@@ -15,7 +15,7 @@ from homeassistant.components.sensor import (
)
from homeassistant.const import UnitOfElectricPotential, UnitOfTemperature
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.typing import StateType
from .coordinator import AsekoConfigEntry
@@ -86,7 +86,7 @@ SENSORS: list[AsekoSensorEntityDescription] = [
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AsekoConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the Aseko Pool Live sensors."""
coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/assist_pipeline/__init__.py b/homeassistant/components/assist_pipeline/__init__.py
index 9a32821e3a0..59bd987d90e 100644
--- a/homeassistant/components/assist_pipeline/__init__.py
+++ b/homeassistant/components/assist_pipeline/__init__.py
@@ -117,7 +117,7 @@ async def async_pipeline_from_audio_stream(
"""
with chat_session.async_get_chat_session(hass, conversation_id) as session:
pipeline_input = PipelineInput(
- conversation_id=session.conversation_id,
+ session=session,
device_id=device_id,
stt_metadata=stt_metadata,
stt_stream=stt_stream,
diff --git a/homeassistant/components/assist_pipeline/pipeline.py b/homeassistant/components/assist_pipeline/pipeline.py
index ef26e1a5a6d..a205db4e615 100644
--- a/homeassistant/components/assist_pipeline/pipeline.py
+++ b/homeassistant/components/assist_pipeline/pipeline.py
@@ -13,24 +13,17 @@ from pathlib import Path
from queue import Empty, Queue
from threading import Thread
import time
-from typing import Any, Literal, cast
+from typing import TYPE_CHECKING, Any, Literal, cast
import wave
import hass_nabucasa
import voluptuous as vol
-from homeassistant.components import (
- conversation,
- media_source,
- stt,
- tts,
- wake_word,
- websocket_api,
-)
+from homeassistant.components import conversation, stt, tts, wake_word, websocket_api
from homeassistant.components.tts import (
generate_media_source_id as tts_generate_media_source_id,
)
-from homeassistant.const import MATCH_ALL
+from homeassistant.const import ATTR_SUPPORTED_FEATURES, MATCH_ALL
from homeassistant.core import Context, HomeAssistant, callback
from homeassistant.exceptions import HomeAssistantError
from homeassistant.helpers import chat_session, intent
@@ -81,6 +74,9 @@ from .error import (
)
from .vad import AudioBuffer, VoiceActivityTimeout, VoiceCommandSegmenter, chunk_samples
+if TYPE_CHECKING:
+ from hassil.recognize import RecognizeResult
+
_LOGGER = logging.getLogger(__name__)
STORAGE_KEY = f"{DOMAIN}.pipelines"
@@ -93,6 +89,9 @@ ENGINE_LANGUAGE_PAIRS = (
)
KEY_ASSIST_PIPELINE: HassKey[PipelineData] = HassKey(DOMAIN)
+KEY_PIPELINE_CONVERSATION_DATA: HassKey[dict[str, PipelineConversationData]] = HassKey(
+ "pipeline_conversation_data"
+)
def validate_language(data: dict[str, Any]) -> Any:
@@ -123,6 +122,12 @@ STORED_PIPELINE_RUNS = 10
SAVE_DELAY = 10
+@callback
+def _async_local_fallback_intent_filter(result: RecognizeResult) -> bool:
+ """Filter out intents that are not local fallback."""
+ return result.intent.name in (intent.INTENT_GET_STATE)
+
+
@callback
def _async_resolve_default_pipeline_settings(
hass: HomeAssistant,
@@ -374,6 +379,7 @@ class PipelineEventType(StrEnum):
STT_VAD_END = "stt-vad-end"
STT_END = "stt-end"
INTENT_START = "intent-start"
+ INTENT_PROGRESS = "intent-progress"
INTENT_END = "intent-end"
TTS_START = "tts-start"
TTS_END = "tts-end"
@@ -556,8 +562,7 @@ class PipelineRun:
id: str = field(default_factory=ulid_util.ulid_now)
stt_provider: stt.SpeechToTextEntity | stt.Provider = field(init=False, repr=False)
- tts_engine: str = field(init=False, repr=False)
- tts_options: dict | None = field(init=False, default=None)
+ tts_stream: tts.ResultStream | None = field(init=False, default=None)
wake_word_entity_id: str | None = field(init=False, default=None, repr=False)
wake_word_entity: wake_word.WakeWordDetectionEntity = field(init=False, repr=False)
@@ -580,6 +585,12 @@ class PipelineRun:
_device_id: str | None = None
"""Optional device id set during run start."""
+ _conversation_data: PipelineConversationData | None = None
+ """Data tied to the conversation ID."""
+
+ _intent_agent_only = False
+ """If request should only be handled by agent, ignoring sentence triggers and local processing."""
+
def __post_init__(self) -> None:
"""Set language for pipeline."""
self.language = self.pipeline.language or self.hass.config.language
@@ -629,13 +640,19 @@ class PipelineRun:
self._device_id = device_id
self._start_debug_recording_thread()
- data = {
+ data: dict[str, Any] = {
"pipeline": self.pipeline.id,
"language": self.language,
"conversation_id": conversation_id,
}
if self.runner_data is not None:
data["runner_data"] = self.runner_data
+ if self.tts_stream:
+ data["tts_output"] = {
+ "token": self.tts_stream.token,
+ "url": self.tts_stream.url,
+ "mime_type": self.tts_stream.content_type,
+ }
self.process_event(PipelineEvent(PipelineEventType.RUN_START, data))
@@ -997,19 +1014,36 @@ class PipelineRun:
yield chunk.audio
- async def prepare_recognize_intent(self) -> None:
+ async def prepare_recognize_intent(self, session: chat_session.ChatSession) -> None:
"""Prepare recognizing an intent."""
- agent_info = conversation.async_get_agent_info(
- self.hass,
- self.pipeline.conversation_engine or conversation.HOME_ASSISTANT_AGENT,
+ self._conversation_data = async_get_pipeline_conversation_data(
+ self.hass, session
)
- if agent_info is None:
- engine = self.pipeline.conversation_engine or "default"
- raise IntentRecognitionError(
- code="intent-not-supported",
- message=f"Intent recognition engine {engine} is not found",
+ if self._conversation_data.continue_conversation_agent is not None:
+ agent_info = conversation.async_get_agent_info(
+ self.hass, self._conversation_data.continue_conversation_agent
)
+ self._conversation_data.continue_conversation_agent = None
+ if agent_info is None:
+ raise IntentRecognitionError(
+ code="intent-agent-not-found",
+ message=f"Intent recognition engine {self._conversation_data.continue_conversation_agent} asked for follow-up but is no longer found",
+ )
+ self._intent_agent_only = True
+
+ else:
+ agent_info = conversation.async_get_agent_info(
+ self.hass,
+ self.pipeline.conversation_engine or conversation.HOME_ASSISTANT_AGENT,
+ )
+
+ if agent_info is None:
+ engine = self.pipeline.conversation_engine or "default"
+ raise IntentRecognitionError(
+ code="intent-not-supported",
+ message=f"Intent recognition engine {engine} is not found",
+ )
self.intent_agent = agent_info.id
@@ -1021,7 +1055,7 @@ class PipelineRun:
conversation_extra_system_prompt: str | None,
) -> str:
"""Run intent recognition portion of pipeline. Returns text to speak."""
- if self.intent_agent is None:
+ if self.intent_agent is None or self._conversation_data is None:
raise RuntimeError("Recognize intent was not prepared")
if self.pipeline.conversation_language == MATCH_ALL:
@@ -1068,7 +1102,7 @@ class PipelineRun:
agent_id = self.intent_agent
processed_locally = agent_id == conversation.HOME_ASSISTANT_AGENT
intent_response: intent.IntentResponse | None = None
- if not processed_locally:
+ if not processed_locally and not self._intent_agent_only:
# Sentence triggers override conversation agent
if (
trigger_response_text
@@ -1083,16 +1117,46 @@ class PipelineRun:
)
intent_response.async_set_speech(trigger_response_text)
- # Try local intents first, if preferred.
- elif self.pipeline.prefer_local_intents and (
- intent_response := await conversation.async_handle_intents(
- self.hass, user_input
+ intent_filter: Callable[[RecognizeResult], bool] | None = None
+ # If the LLM has API access, we filter out some sentences that are
+ # interfering with LLM operation.
+ if (
+ intent_agent_state := self.hass.states.get(self.intent_agent)
+ ) and intent_agent_state.attributes.get(
+ ATTR_SUPPORTED_FEATURES, 0
+ ) & conversation.ConversationEntityFeature.CONTROL:
+ intent_filter = _async_local_fallback_intent_filter
+
+ # Try local intents
+ if (
+ intent_response is None
+ and self.pipeline.prefer_local_intents
+ and (
+ intent_response := await conversation.async_handle_intents(
+ self.hass,
+ user_input,
+ intent_filter=intent_filter,
+ )
)
):
# Local intent matched
agent_id = conversation.HOME_ASSISTANT_AGENT
processed_locally = True
+ @callback
+ def chat_log_delta_listener(
+ chat_log: conversation.ChatLog, delta: dict
+ ) -> None:
+ """Handle chat log delta."""
+ self.process_event(
+ PipelineEvent(
+ PipelineEventType.INTENT_PROGRESS,
+ {
+ "chat_log_delta": delta,
+ },
+ )
+ )
+
with (
chat_session.async_get_chat_session(
self.hass, user_input.conversation_id
@@ -1101,6 +1165,7 @@ class PipelineRun:
self.hass,
session,
user_input,
+ chat_log_delta_listener=chat_log_delta_listener,
) as chat_log,
):
# It was already handled, create response and add to chat history
@@ -1154,6 +1219,9 @@ class PipelineRun:
)
)
+ if conversation_result.continue_conversation:
+ self._conversation_data.continue_conversation_agent = agent_id
+
return speech
async def prepare_text_to_speech(self) -> None:
@@ -1176,36 +1244,31 @@ class PipelineRun:
tts_options[tts.ATTR_PREFERRED_SAMPLE_BYTES] = SAMPLE_WIDTH
try:
- options_supported = await tts.async_support_options(
- self.hass,
- engine,
- self.pipeline.tts_language,
- tts_options,
+ self.tts_stream = tts.async_create_stream(
+ hass=self.hass,
+ engine=engine,
+ language=self.pipeline.tts_language,
+ options=tts_options,
)
except HomeAssistantError as err:
- raise TextToSpeechError(
- code="tts-not-supported",
- message=f"Text-to-speech engine '{engine}' not found",
- ) from err
- if not options_supported:
raise TextToSpeechError(
code="tts-not-supported",
message=(
f"Text-to-speech engine {engine} "
- f"does not support language {self.pipeline.tts_language} or options {tts_options}"
+ f"does not support language {self.pipeline.tts_language} or options {tts_options}:"
+ f" {err}"
),
- )
-
- self.tts_engine = engine
- self.tts_options = tts_options
+ ) from err
async def text_to_speech(self, tts_input: str) -> None:
"""Run text-to-speech portion of pipeline."""
+ assert self.tts_stream is not None
+
self.process_event(
PipelineEvent(
PipelineEventType.TTS_START,
{
- "engine": self.tts_engine,
+ "engine": self.tts_stream.engine,
"language": self.pipeline.tts_language,
"voice": self.pipeline.tts_voice,
"tts_input": tts_input,
@@ -1218,14 +1281,9 @@ class PipelineRun:
tts_media_id = tts_generate_media_source_id(
self.hass,
tts_input,
- engine=self.tts_engine,
- language=self.pipeline.tts_language,
- options=self.tts_options,
- )
- tts_media = await media_source.async_resolve_media(
- self.hass,
- tts_media_id,
- None,
+ engine=self.tts_stream.engine,
+ language=self.tts_stream.language,
+ options=self.tts_stream.options,
)
except Exception as src_error:
_LOGGER.exception("Unexpected error during text-to-speech")
@@ -1234,10 +1292,13 @@ class PipelineRun:
message="Unexpected error during text-to-speech",
) from src_error
- _LOGGER.debug("TTS result %s", tts_media)
+ self.tts_stream.async_set_message(tts_input)
+
tts_output = {
"media_id": tts_media_id,
- **asdict(tts_media),
+ "token": self.tts_stream.token,
+ "url": self.tts_stream.url,
+ "mime_type": self.tts_stream.content_type,
}
self.process_event(
@@ -1417,8 +1478,8 @@ class PipelineInput:
run: PipelineRun
- conversation_id: str
- """Identifier for the conversation."""
+ session: chat_session.ChatSession
+ """Session for the conversation."""
stt_metadata: stt.SpeechMetadata | None = None
"""Metadata of stt input audio. Required when start_stage = stt."""
@@ -1443,7 +1504,9 @@ class PipelineInput:
async def execute(self) -> None:
"""Run pipeline."""
- self.run.start(conversation_id=self.conversation_id, device_id=self.device_id)
+ self.run.start(
+ conversation_id=self.session.conversation_id, device_id=self.device_id
+ )
current_stage: PipelineStage | None = self.run.start_stage
stt_audio_buffer: list[EnhancedAudioChunk] = []
stt_processed_stream: AsyncIterable[EnhancedAudioChunk] | None = None
@@ -1527,7 +1590,7 @@ class PipelineInput:
assert intent_input is not None
tts_input = await self.run.recognize_intent(
intent_input,
- self.conversation_id,
+ self.session.conversation_id,
self.device_id,
self.conversation_extra_system_prompt,
)
@@ -1611,7 +1674,7 @@ class PipelineInput:
<= PIPELINE_STAGE_ORDER.index(PipelineStage.INTENT)
<= end_stage_index
):
- prepare_tasks.append(self.run.prepare_recognize_intent())
+ prepare_tasks.append(self.run.prepare_recognize_intent(self.session))
if (
start_stage_index
@@ -1890,7 +1953,7 @@ class PipelineRunDebug:
class PipelineStore(Store[SerializedPipelineStorageCollection]):
- """Store entity registry data."""
+ """Store pipeline data."""
async def _async_migrate_func(
self,
@@ -1972,3 +2035,37 @@ async def async_run_migrations(hass: HomeAssistant) -> None:
for pipeline, attr_updates in updates:
await async_update_pipeline(hass, pipeline, **attr_updates)
+
+
+@dataclass
+class PipelineConversationData:
+ """Hold data for the duration of a conversation."""
+
+ continue_conversation_agent: str | None = None
+ """The agent that requested the conversation to be continued."""
+
+
+@callback
+def async_get_pipeline_conversation_data(
+ hass: HomeAssistant, session: chat_session.ChatSession
+) -> PipelineConversationData:
+ """Get the pipeline data for a specific conversation."""
+ all_conversation_data = hass.data.get(KEY_PIPELINE_CONVERSATION_DATA)
+ if all_conversation_data is None:
+ all_conversation_data = {}
+ hass.data[KEY_PIPELINE_CONVERSATION_DATA] = all_conversation_data
+
+ data = all_conversation_data.get(session.conversation_id)
+
+ if data is not None:
+ return data
+
+ @callback
+ def do_cleanup() -> None:
+ """Handle cleanup."""
+ all_conversation_data.pop(session.conversation_id)
+
+ session.async_on_cleanup(do_cleanup)
+
+ data = all_conversation_data[session.conversation_id] = PipelineConversationData()
+ return data
diff --git a/homeassistant/components/assist_pipeline/websocket_api.py b/homeassistant/components/assist_pipeline/websocket_api.py
index d2d54a1b7c3..937b3a0ea45 100644
--- a/homeassistant/components/assist_pipeline/websocket_api.py
+++ b/homeassistant/components/assist_pipeline/websocket_api.py
@@ -239,7 +239,7 @@ async def websocket_run(
with chat_session.async_get_chat_session(
hass, msg.get("conversation_id")
) as session:
- input_args["conversation_id"] = session.conversation_id
+ input_args["session"] = session
pipeline_input = PipelineInput(**input_args)
try:
diff --git a/homeassistant/components/assist_satellite/__init__.py b/homeassistant/components/assist_satellite/__init__.py
index 038ff517264..3338f223bc9 100644
--- a/homeassistant/components/assist_satellite/__init__.py
+++ b/homeassistant/components/assist_satellite/__init__.py
@@ -1,9 +1,11 @@
"""Base class for assist satellite entities."""
import logging
+from pathlib import Path
import voluptuous as vol
+from homeassistant.components.http import StaticPathConfig
from homeassistant.config_entries import ConfigEntry
from homeassistant.core import HomeAssistant
from homeassistant.helpers import config_validation as cv
@@ -15,6 +17,8 @@ from .const import (
CONNECTION_TEST_DATA,
DATA_COMPONENT,
DOMAIN,
+ PREANNOUNCE_FILENAME,
+ PREANNOUNCE_URL,
AssistSatelliteEntityFeature,
)
from .entity import (
@@ -56,6 +60,8 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
{
vol.Optional("message"): str,
vol.Optional("media_id"): str,
+ vol.Optional("preannounce"): bool,
+ vol.Optional("preannounce_media_id"): str,
}
),
cv.has_at_least_one_key("message", "media_id"),
@@ -70,6 +76,8 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
{
vol.Optional("start_message"): str,
vol.Optional("start_media_id"): str,
+ vol.Optional("preannounce"): bool,
+ vol.Optional("preannounce_media_id"): str,
vol.Optional("extra_system_prompt"): str,
}
),
@@ -82,6 +90,15 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
async_register_websocket_api(hass)
hass.http.register_view(ConnectionTestView())
+ # Default preannounce sound
+ await hass.http.async_register_static_paths(
+ [
+ StaticPathConfig(
+ PREANNOUNCE_URL, str(Path(__file__).parent / PREANNOUNCE_FILENAME)
+ )
+ ]
+ )
+
return True
diff --git a/homeassistant/components/assist_satellite/const.py b/homeassistant/components/assist_satellite/const.py
index f7ac7e524b4..7fca88f3b12 100644
--- a/homeassistant/components/assist_satellite/const.py
+++ b/homeassistant/components/assist_satellite/const.py
@@ -20,6 +20,9 @@ CONNECTION_TEST_DATA: HassKey[dict[str, asyncio.Event]] = HassKey(
f"{DOMAIN}_connection_tests"
)
+PREANNOUNCE_FILENAME = "preannounce.mp3"
+PREANNOUNCE_URL = f"/api/assist_satellite/static/{PREANNOUNCE_FILENAME}"
+
class AssistSatelliteEntityFeature(IntFlag):
"""Supported features of Assist satellite entity."""
diff --git a/homeassistant/components/assist_satellite/entity.py b/homeassistant/components/assist_satellite/entity.py
index e43abb4539c..dc20c7650d7 100644
--- a/homeassistant/components/assist_satellite/entity.py
+++ b/homeassistant/components/assist_satellite/entity.py
@@ -23,15 +23,12 @@ from homeassistant.components.assist_pipeline import (
vad,
)
from homeassistant.components.media_player import async_process_play_media_url
-from homeassistant.components.tts import (
- generate_media_source_id as tts_generate_media_source_id,
-)
from homeassistant.core import Context, callback
from homeassistant.exceptions import HomeAssistantError
from homeassistant.helpers import chat_session, entity
from homeassistant.helpers.entity import EntityDescription
-from .const import AssistSatelliteEntityFeature
+from .const import PREANNOUNCE_URL, AssistSatelliteEntityFeature
from .errors import AssistSatelliteError, SatelliteBusyError
_LOGGER = logging.getLogger(__name__)
@@ -98,9 +95,15 @@ class AssistSatelliteAnnouncement:
original_media_id: str
"""The raw media ID before processing."""
+ tts_token: str | None
+ """The TTS token of the media."""
+
media_id_source: Literal["url", "media_id", "tts"]
"""Source of the media ID."""
+ preannounce_media_id: str | None = None
+ """Media ID to be played before announcement."""
+
class AssistSatelliteEntity(entity.Entity):
"""Entity encapsulating the state and functionality of an Assist satellite."""
@@ -177,6 +180,8 @@ class AssistSatelliteEntity(entity.Entity):
self,
message: str | None = None,
media_id: str | None = None,
+ preannounce: bool = True,
+ preannounce_media_id: str = PREANNOUNCE_URL,
) -> None:
"""Play and show an announcement on the satellite.
@@ -186,6 +191,9 @@ class AssistSatelliteEntity(entity.Entity):
If media_id is provided, it is played directly. It is possible
to omit the message and the satellite will not show any text.
+ If preannounce is True, a sound is played before the announcement.
+ If preannounce_media_id is provided, it overrides the default sound.
+
Calls async_announce with message and media id.
"""
await self._cancel_running_pipeline()
@@ -193,7 +201,11 @@ class AssistSatelliteEntity(entity.Entity):
if message is None:
message = ""
- announcement = await self._resolve_announcement_media_id(message, media_id)
+ announcement = await self._resolve_announcement_media_id(
+ message,
+ media_id,
+ preannounce_media_id=preannounce_media_id if preannounce else None,
+ )
if self._is_announcing:
raise SatelliteBusyError
@@ -220,6 +232,8 @@ class AssistSatelliteEntity(entity.Entity):
start_message: str | None = None,
start_media_id: str | None = None,
extra_system_prompt: str | None = None,
+ preannounce: bool = True,
+ preannounce_media_id: str = PREANNOUNCE_URL,
) -> None:
"""Start a conversation from the satellite.
@@ -229,6 +243,9 @@ class AssistSatelliteEntity(entity.Entity):
If start_media_id is provided, it is played directly. It is possible
to omit the message and the satellite will not show any text.
+ If preannounce is True, a sound is played before the start message or media.
+ If preannounce_media_id is provided, it overrides the default sound.
+
Calls async_start_conversation.
"""
await self._cancel_running_pipeline()
@@ -244,13 +261,17 @@ class AssistSatelliteEntity(entity.Entity):
start_message = ""
announcement = await self._resolve_announcement_media_id(
- start_message, start_media_id
+ start_message,
+ start_media_id,
+ preannounce_media_id=preannounce_media_id if preannounce else None,
)
if self._is_announcing:
raise SatelliteBusyError
self._is_announcing = True
+ self._set_state(AssistSatelliteState.RESPONDING)
+
# Provide our start info to the LLM so it understands context of incoming message
if extra_system_prompt is not None:
self._extra_system_prompt = extra_system_prompt
@@ -280,6 +301,7 @@ class AssistSatelliteEntity(entity.Entity):
raise
finally:
self._is_announcing = False
+ self._set_state(AssistSatelliteState.IDLE)
async def async_start_conversation(
self, start_announcement: AssistSatelliteAnnouncement
@@ -405,7 +427,10 @@ class AssistSatelliteEntity(entity.Entity):
def _internal_on_pipeline_event(self, event: PipelineEvent) -> None:
"""Set state based on pipeline stage."""
if event.type is PipelineEventType.WAKE_WORD_START:
- self._set_state(AssistSatelliteState.IDLE)
+ # Only return to idle if we're not currently responding.
+ # The state will return to idle in tts_response_finished.
+ if self.state != AssistSatelliteState.RESPONDING:
+ self._set_state(AssistSatelliteState.IDLE)
elif event.type is PipelineEventType.STT_START:
self._set_state(AssistSatelliteState.LISTENING)
elif event.type is PipelineEventType.INTENT_START:
@@ -467,20 +492,27 @@ class AssistSatelliteEntity(entity.Entity):
return vad.VadSensitivity.to_seconds(vad_sensitivity)
async def _resolve_announcement_media_id(
- self, message: str, media_id: str | None
+ self,
+ message: str,
+ media_id: str | None,
+ preannounce_media_id: str | None = None,
) -> AssistSatelliteAnnouncement:
"""Resolve the media ID."""
media_id_source: Literal["url", "media_id", "tts"] | None = None
+ tts_token: str | None = None
if media_id:
original_media_id = media_id
-
else:
media_id_source = "tts"
# Synthesize audio and get URL
pipeline_id = self._resolve_pipeline()
pipeline = async_get_pipeline(self.hass, pipeline_id)
+ engine = tts.async_resolve_engine(self.hass, pipeline.tts_engine)
+ if engine is None:
+ raise HomeAssistantError(f"TTS engine {pipeline.tts_engine} not found")
+
tts_options: dict[str, Any] = {}
if pipeline.tts_voice is not None:
tts_options[tts.ATTR_VOICE] = pipeline.tts_voice
@@ -488,14 +520,23 @@ class AssistSatelliteEntity(entity.Entity):
if self.tts_options is not None:
tts_options.update(self.tts_options)
- media_id = tts_generate_media_source_id(
+ stream = tts.async_create_stream(
self.hass,
- message,
- engine=pipeline.tts_engine,
+ engine=engine,
+ language=pipeline.tts_language,
+ options=tts_options,
+ )
+ stream.async_set_message(message)
+
+ tts_token = stream.token
+ media_id = stream.url
+ original_media_id = tts.generate_media_source_id(
+ self.hass,
+ message,
+ engine=engine,
language=pipeline.tts_language,
options=tts_options,
)
- original_media_id = media_id
if media_source.is_media_source_id(media_id):
if not media_id_source:
@@ -513,6 +554,26 @@ class AssistSatelliteEntity(entity.Entity):
# Resolve to full URL
media_id = async_process_play_media_url(self.hass, media_id)
+ # Resolve preannounce media id
+ if preannounce_media_id:
+ if media_source.is_media_source_id(preannounce_media_id):
+ preannounce_media = await media_source.async_resolve_media(
+ self.hass,
+ preannounce_media_id,
+ None,
+ )
+ preannounce_media_id = preannounce_media.url
+
+ # Resolve to full URL
+ preannounce_media_id = async_process_play_media_url(
+ self.hass, preannounce_media_id
+ )
+
return AssistSatelliteAnnouncement(
- message, media_id, original_media_id, media_id_source
+ message=message,
+ media_id=media_id,
+ original_media_id=original_media_id,
+ tts_token=tts_token,
+ media_id_source=media_id_source,
+ preannounce_media_id=preannounce_media_id,
)
diff --git a/homeassistant/components/assist_satellite/preannounce.mp3 b/homeassistant/components/assist_satellite/preannounce.mp3
new file mode 100644
index 00000000000..6e2fa0aba3e
Binary files /dev/null and b/homeassistant/components/assist_satellite/preannounce.mp3 differ
diff --git a/homeassistant/components/assist_satellite/services.yaml b/homeassistant/components/assist_satellite/services.yaml
index 89a20ada6f3..d88710c4c4e 100644
--- a/homeassistant/components/assist_satellite/services.yaml
+++ b/homeassistant/components/assist_satellite/services.yaml
@@ -8,12 +8,22 @@ announce:
message:
required: false
example: "Time to wake up!"
+ default: ""
selector:
text:
media_id:
required: false
selector:
text:
+ preannounce:
+ required: false
+ default: true
+ selector:
+ boolean:
+ preannounce_media_id:
+ required: false
+ selector:
+ text:
start_conversation:
target:
entity:
@@ -24,6 +34,7 @@ start_conversation:
start_message:
required: false
example: "You left the lights on in the living room. Turn them off?"
+ default: ""
selector:
text:
start_media_id:
@@ -34,3 +45,12 @@ start_conversation:
required: false
selector:
text:
+ preannounce:
+ required: false
+ default: true
+ selector:
+ boolean:
+ preannounce_media_id:
+ required: false
+ selector:
+ text:
diff --git a/homeassistant/components/assist_satellite/strings.json b/homeassistant/components/assist_satellite/strings.json
index fa2dc984ab7..b69711c7106 100644
--- a/homeassistant/components/assist_satellite/strings.json
+++ b/homeassistant/components/assist_satellite/strings.json
@@ -23,6 +23,14 @@
"media_id": {
"name": "Media ID",
"description": "The media ID to announce instead of using text-to-speech."
+ },
+ "preannounce": {
+ "name": "Preannounce",
+ "description": "Play a sound before the announcement."
+ },
+ "preannounce_media_id": {
+ "name": "Preannounce media ID",
+ "description": "Custom media ID to play before the announcement."
}
}
},
@@ -41,6 +49,14 @@
"extra_system_prompt": {
"name": "Extra system prompt",
"description": "Provide background information to the AI about the request."
+ },
+ "preannounce": {
+ "name": "Preannounce",
+ "description": "Play a sound before the start message or media."
+ },
+ "preannounce_media_id": {
+ "name": "Preannounce media ID",
+ "description": "Custom media ID to play before the start message or media."
}
}
}
diff --git a/homeassistant/components/assist_satellite/websocket_api.py b/homeassistant/components/assist_satellite/websocket_api.py
index 6cd7af2bbdb..6f8b3d723ad 100644
--- a/homeassistant/components/assist_satellite/websocket_api.py
+++ b/homeassistant/components/assist_satellite/websocket_api.py
@@ -19,6 +19,7 @@ from .const import (
DOMAIN,
AssistSatelliteEntityFeature,
)
+from .entity import AssistSatelliteConfiguration
CONNECTION_TEST_TIMEOUT = 30
@@ -91,7 +92,16 @@ def websocket_get_configuration(
)
return
- config_dict = asdict(satellite.async_get_configuration())
+ try:
+ config_dict = asdict(satellite.async_get_configuration())
+ except NotImplementedError:
+ # Stub configuration
+ config_dict = asdict(
+ AssistSatelliteConfiguration(
+ available_wake_words=[], active_wake_words=[], max_active_wake_words=1
+ )
+ )
+
config_dict["pipeline_entity_id"] = satellite.pipeline_entity_id
config_dict["vad_entity_id"] = satellite.vad_sensitivity_entity_id
@@ -188,7 +198,8 @@ async def websocket_test_connection(
hass.async_create_background_task(
satellite.async_internal_announce(
- media_id=f"{CONNECTION_TEST_URL_BASE}/{connection_id}"
+ media_id=f"{CONNECTION_TEST_URL_BASE}/{connection_id}",
+ preannounce=False,
),
f"assist_satellite_connection_test_{msg['entity_id']}",
)
diff --git a/homeassistant/components/asuswrt/device_tracker.py b/homeassistant/components/asuswrt/device_tracker.py
index 95d2e4c8000..ee6c3f96fc4 100644
--- a/homeassistant/components/asuswrt/device_tracker.py
+++ b/homeassistant/components/asuswrt/device_tracker.py
@@ -5,7 +5,7 @@ from __future__ import annotations
from homeassistant.components.device_tracker import ScannerEntity
from homeassistant.core import HomeAssistant, callback
from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import AsusWrtConfigEntry
from .router import AsusWrtDevInfo, AsusWrtRouter
@@ -18,7 +18,7 @@ DEFAULT_DEVICE_NAME = "Unknown device"
async def async_setup_entry(
hass: HomeAssistant,
entry: AsusWrtConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up device tracker for AsusWrt component."""
router = entry.runtime_data
@@ -38,7 +38,9 @@ async def async_setup_entry(
@callback
def add_entities(
- router: AsusWrtRouter, async_add_entities: AddEntitiesCallback, tracked: set[str]
+ router: AsusWrtRouter,
+ async_add_entities: AddConfigEntryEntitiesCallback,
+ tracked: set[str],
) -> None:
"""Add new tracker entities from the router."""
new_tracked = []
diff --git a/homeassistant/components/asuswrt/sensor.py b/homeassistant/components/asuswrt/sensor.py
index fb43e574379..c4bd5e4bded 100644
--- a/homeassistant/components/asuswrt/sensor.py
+++ b/homeassistant/components/asuswrt/sensor.py
@@ -19,7 +19,7 @@ from homeassistant.const import (
UnitOfTime,
)
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.update_coordinator import (
CoordinatorEntity,
DataUpdateCoordinator,
@@ -246,7 +246,7 @@ CONNECTION_SENSORS: tuple[AsusWrtSensorEntityDescription, ...] = (
async def async_setup_entry(
hass: HomeAssistant,
entry: AsusWrtConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the sensors."""
router = entry.runtime_data
diff --git a/homeassistant/components/asuswrt/strings.json b/homeassistant/components/asuswrt/strings.json
index 9d50f50c7e9..cac37c0cfd0 100644
--- a/homeassistant/components/asuswrt/strings.json
+++ b/homeassistant/components/asuswrt/strings.json
@@ -66,28 +66,28 @@
"name": "Upload"
},
"load_avg_1m": {
- "name": "Average load (1m)"
+ "name": "Average load (1 min)"
},
"load_avg_5m": {
- "name": "Average load (5m)"
+ "name": "Average load (5 min)"
},
"load_avg_15m": {
- "name": "Average load (15m)"
+ "name": "Average load (15 min)"
},
"24ghz_temperature": {
- "name": "2.4GHz Temperature"
+ "name": "2.4GHz temperature"
},
"5ghz_temperature": {
- "name": "5GHz Temperature"
+ "name": "5GHz temperature"
},
"cpu_temperature": {
- "name": "CPU Temperature"
+ "name": "CPU temperature"
},
"5ghz_2_temperature": {
- "name": "5GHz Temperature (Radio 2)"
+ "name": "5GHz temperature (Radio 2)"
},
"6ghz_temperature": {
- "name": "6GHz Temperature"
+ "name": "6GHz temperature"
},
"cpu_usage": {
"name": "CPU usage"
diff --git a/homeassistant/components/atag/climate.py b/homeassistant/components/atag/climate.py
index a362b71fbc8..8f1ded150f1 100644
--- a/homeassistant/components/atag/climate.py
+++ b/homeassistant/components/atag/climate.py
@@ -14,7 +14,7 @@ from homeassistant.components.climate import (
)
from homeassistant.const import ATTR_TEMPERATURE
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.util.enum import try_parse_enum
from .coordinator import AtagConfigEntry, AtagDataUpdateCoordinator
@@ -32,7 +32,9 @@ HVAC_MODES = [HVACMode.AUTO, HVACMode.HEAT]
async def async_setup_entry(
- hass: HomeAssistant, entry: AtagConfigEntry, async_add_entities: AddEntitiesCallback
+ hass: HomeAssistant,
+ entry: AtagConfigEntry,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Load a config entry."""
async_add_entities([AtagThermostat(entry.runtime_data, "climate")])
diff --git a/homeassistant/components/atag/sensor.py b/homeassistant/components/atag/sensor.py
index bd39f0b3458..ca5bbd5e614 100644
--- a/homeassistant/components/atag/sensor.py
+++ b/homeassistant/components/atag/sensor.py
@@ -8,7 +8,7 @@ from homeassistant.const import (
UnitOfTime,
)
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .coordinator import AtagConfigEntry, AtagDataUpdateCoordinator
from .entity import AtagEntity
@@ -28,7 +28,7 @@ SENSORS = {
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AtagConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Initialize sensor platform from config entry."""
coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/atag/water_heater.py b/homeassistant/components/atag/water_heater.py
index 6b013b36885..00761f47324 100644
--- a/homeassistant/components/atag/water_heater.py
+++ b/homeassistant/components/atag/water_heater.py
@@ -9,7 +9,7 @@ from homeassistant.components.water_heater import (
)
from homeassistant.const import ATTR_TEMPERATURE, STATE_OFF, Platform, UnitOfTemperature
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .coordinator import AtagConfigEntry
from .entity import AtagEntity
@@ -20,7 +20,7 @@ OPERATION_LIST = [STATE_OFF, STATE_ECO, STATE_PERFORMANCE]
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AtagConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Initialize DHW device from config entry."""
async_add_entities(
diff --git a/homeassistant/components/august/binary_sensor.py b/homeassistant/components/august/binary_sensor.py
index fb877252010..b4c440599c4 100644
--- a/homeassistant/components/august/binary_sensor.py
+++ b/homeassistant/components/august/binary_sensor.py
@@ -21,7 +21,7 @@ from homeassistant.components.binary_sensor import (
)
from homeassistant.const import EntityCategory
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.event import async_call_later
from . import AugustConfigEntry, AugustData
@@ -92,7 +92,7 @@ SENSOR_TYPES_DOORBELL: tuple[AugustDoorbellBinarySensorEntityDescription, ...] =
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AugustConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the August binary sensors."""
data = config_entry.runtime_data
diff --git a/homeassistant/components/august/button.py b/homeassistant/components/august/button.py
index 79f2b67888a..4971d0cccf5 100644
--- a/homeassistant/components/august/button.py
+++ b/homeassistant/components/august/button.py
@@ -2,7 +2,7 @@
from homeassistant.components.button import ButtonEntity
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import AugustConfigEntry
from .entity import AugustEntity
@@ -11,7 +11,7 @@ from .entity import AugustEntity
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AugustConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up August lock wake buttons."""
data = config_entry.runtime_data
diff --git a/homeassistant/components/august/camera.py b/homeassistant/components/august/camera.py
index f4398455256..7b013022299 100644
--- a/homeassistant/components/august/camera.py
+++ b/homeassistant/components/august/camera.py
@@ -12,7 +12,7 @@ from yalexs.util import update_doorbell_image_from_activity
from homeassistant.components.camera import Camera
from homeassistant.core import HomeAssistant, callback
from homeassistant.helpers import aiohttp_client
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import AugustConfigEntry, AugustData
from .const import DEFAULT_NAME, DEFAULT_TIMEOUT
@@ -24,7 +24,7 @@ _LOGGER = logging.getLogger(__name__)
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AugustConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up August cameras."""
data = config_entry.runtime_data
diff --git a/homeassistant/components/august/event.py b/homeassistant/components/august/event.py
index 49b14630337..0abc840bc69 100644
--- a/homeassistant/components/august/event.py
+++ b/homeassistant/components/august/event.py
@@ -16,7 +16,7 @@ from homeassistant.components.event import (
EventEntityDescription,
)
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import AugustConfigEntry, AugustData
from .entity import AugustDescriptionEntity
@@ -59,7 +59,7 @@ TYPES_DOORBELL: tuple[AugustEventEntityDescription, ...] = (
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AugustConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the august event platform."""
data = config_entry.runtime_data
diff --git a/homeassistant/components/august/lock.py b/homeassistant/components/august/lock.py
index c681cc98808..4a37149772a 100644
--- a/homeassistant/components/august/lock.py
+++ b/homeassistant/components/august/lock.py
@@ -14,7 +14,7 @@ from yalexs.util import get_latest_activity, update_lock_detail_from_activity
from homeassistant.components.lock import ATTR_CHANGED_BY, LockEntity, LockEntityFeature
from homeassistant.const import ATTR_BATTERY_LEVEL
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.restore_state import RestoreEntity
from homeassistant.util import dt as dt_util
@@ -29,7 +29,7 @@ LOCK_JAMMED_ERR = 531
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AugustConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up August locks."""
data = config_entry.runtime_data
diff --git a/homeassistant/components/august/sensor.py b/homeassistant/components/august/sensor.py
index b7c0d618492..94a5461149f 100644
--- a/homeassistant/components/august/sensor.py
+++ b/homeassistant/components/august/sensor.py
@@ -25,7 +25,7 @@ from homeassistant.const import (
EntityCategory,
)
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import AugustConfigEntry
from .const import (
@@ -82,7 +82,7 @@ SENSOR_TYPE_KEYPAD_BATTERY = AugustSensorEntityDescription[KeypadDetail](
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AugustConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the August sensors."""
data = config_entry.runtime_data
diff --git a/homeassistant/components/aurora/binary_sensor.py b/homeassistant/components/aurora/binary_sensor.py
index 648f6de08c9..73e732dc44a 100644
--- a/homeassistant/components/aurora/binary_sensor.py
+++ b/homeassistant/components/aurora/binary_sensor.py
@@ -4,7 +4,7 @@ from __future__ import annotations
from homeassistant.components.binary_sensor import BinarySensorEntity
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .coordinator import AuroraConfigEntry
from .entity import AuroraEntity
@@ -13,7 +13,7 @@ from .entity import AuroraEntity
async def async_setup_entry(
hass: HomeAssistant,
entry: AuroraConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the binary_sensor platform."""
async_add_entities(
diff --git a/homeassistant/components/aurora/sensor.py b/homeassistant/components/aurora/sensor.py
index ec1b82c3c4d..d424b7e98ab 100644
--- a/homeassistant/components/aurora/sensor.py
+++ b/homeassistant/components/aurora/sensor.py
@@ -5,7 +5,7 @@ from __future__ import annotations
from homeassistant.components.sensor import SensorEntity, SensorStateClass
from homeassistant.const import PERCENTAGE
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .coordinator import AuroraConfigEntry
from .entity import AuroraEntity
@@ -14,7 +14,7 @@ from .entity import AuroraEntity
async def async_setup_entry(
hass: HomeAssistant,
entry: AuroraConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the sensor platform."""
diff --git a/homeassistant/components/aurora_abb_powerone/sensor.py b/homeassistant/components/aurora_abb_powerone/sensor.py
index 29d5cab2667..d35d8a2d8cb 100644
--- a/homeassistant/components/aurora_abb_powerone/sensor.py
+++ b/homeassistant/components/aurora_abb_powerone/sensor.py
@@ -26,7 +26,7 @@ from homeassistant.const import (
)
from homeassistant.core import HomeAssistant
from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.typing import StateType
from homeassistant.helpers.update_coordinator import CoordinatorEntity
@@ -130,7 +130,7 @@ SENSOR_TYPES = [
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AuroraAbbConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up aurora_abb_powerone sensor based on a config entry."""
diff --git a/homeassistant/components/aurora_abb_powerone/strings.json b/homeassistant/components/aurora_abb_powerone/strings.json
index 319bcb0adc4..6b28d9d8c1c 100644
--- a/homeassistant/components/aurora_abb_powerone/strings.json
+++ b/homeassistant/components/aurora_abb_powerone/strings.json
@@ -11,7 +11,7 @@
},
"error": {
"cannot_connect": "Unable to connect, please check serial port, address, electrical connection and that inverter is on (in daylight)",
- "invalid_serial_port": "Serial port is not a valid device or could not be openned",
+ "invalid_serial_port": "Serial port is not a valid device or could not be opened",
"cannot_open_serial_port": "Cannot open serial port, please check and try again"
},
"abort": {
diff --git a/homeassistant/components/aussie_broadband/sensor.py b/homeassistant/components/aussie_broadband/sensor.py
index 49da78da8de..41a2f164095 100644
--- a/homeassistant/components/aussie_broadband/sensor.py
+++ b/homeassistant/components/aussie_broadband/sensor.py
@@ -16,7 +16,7 @@ from homeassistant.components.sensor import (
from homeassistant.const import UnitOfInformation, UnitOfTime
from homeassistant.core import HomeAssistant
from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.typing import StateType
from homeassistant.helpers.update_coordinator import CoordinatorEntity
@@ -123,7 +123,7 @@ SENSOR_DESCRIPTIONS: tuple[SensorValueEntityDescription, ...] = (
async def async_setup_entry(
hass: HomeAssistant,
entry: AussieBroadbandConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the Aussie Broadband sensor platform from a config entry."""
diff --git a/homeassistant/components/autarco/sensor.py b/homeassistant/components/autarco/sensor.py
index b7c4312815b..1635adefdb8 100644
--- a/homeassistant/components/autarco/sensor.py
+++ b/homeassistant/components/autarco/sensor.py
@@ -16,7 +16,7 @@ from homeassistant.components.sensor import (
from homeassistant.const import PERCENTAGE, UnitOfEnergy, UnitOfPower
from homeassistant.core import HomeAssistant
from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.typing import StateType
from homeassistant.helpers.update_coordinator import CoordinatorEntity
@@ -172,7 +172,7 @@ SENSORS_INVERTER: tuple[AutarcoInverterSensorEntityDescription, ...] = (
async def async_setup_entry(
hass: HomeAssistant,
entry: AutarcoConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up Autarco sensors based on a config entry."""
entities: list[SensorEntity] = []
diff --git a/homeassistant/components/awair/sensor.py b/homeassistant/components/awair/sensor.py
index c92009d9b1b..a0c4b5ba8fe 100644
--- a/homeassistant/components/awair/sensor.py
+++ b/homeassistant/components/awair/sensor.py
@@ -29,7 +29,7 @@ from homeassistant.const import (
from homeassistant.core import HomeAssistant
from homeassistant.helpers import device_registry as dr
from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.update_coordinator import CoordinatorEntity
from .const import (
@@ -133,7 +133,7 @@ SENSOR_TYPES_DUST: tuple[AwairSensorEntityDescription, ...] = (
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AwairConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up Awair sensor entity based on a config entry."""
coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/aws/manifest.json b/homeassistant/components/aws/manifest.json
index 12149e4388a..92ae37c857b 100644
--- a/homeassistant/components/aws/manifest.json
+++ b/homeassistant/components/aws/manifest.json
@@ -6,5 +6,5 @@
"iot_class": "cloud_push",
"loggers": ["aiobotocore", "botocore"],
"quality_scale": "legacy",
- "requirements": ["aiobotocore==2.13.1", "botocore==1.34.131"]
+ "requirements": ["aiobotocore==2.21.1", "botocore==1.37.1"]
}
diff --git a/homeassistant/components/axis/binary_sensor.py b/homeassistant/components/axis/binary_sensor.py
index d6f132874b6..6933380c094 100644
--- a/homeassistant/components/axis/binary_sensor.py
+++ b/homeassistant/components/axis/binary_sensor.py
@@ -18,7 +18,7 @@ from homeassistant.components.binary_sensor import (
BinarySensorEntityDescription,
)
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.event import async_call_later
from . import AxisConfigEntry
@@ -178,7 +178,7 @@ ENTITY_DESCRIPTIONS = (
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AxisConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up a Axis binary sensor."""
config_entry.runtime_data.entity_loader.register_platform(
diff --git a/homeassistant/components/axis/camera.py b/homeassistant/components/axis/camera.py
index a5a00bcd1ab..089a018ee5b 100644
--- a/homeassistant/components/axis/camera.py
+++ b/homeassistant/components/axis/camera.py
@@ -7,7 +7,7 @@ from homeassistant.components.mjpeg import MjpegCamera, filter_urllib3_logging
from homeassistant.const import HTTP_DIGEST_AUTHENTICATION
from homeassistant.core import HomeAssistant
from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import AxisConfigEntry
from .const import DEFAULT_STREAM_PROFILE, DEFAULT_VIDEO_SOURCE
@@ -18,7 +18,7 @@ from .hub import AxisHub
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AxisConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the Axis camera video stream."""
filter_urllib3_logging()
diff --git a/homeassistant/components/axis/light.py b/homeassistant/components/axis/light.py
index d0d144a28fa..0c6015efced 100644
--- a/homeassistant/components/axis/light.py
+++ b/homeassistant/components/axis/light.py
@@ -12,7 +12,7 @@ from homeassistant.components.light import (
LightEntityDescription,
)
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import AxisConfigEntry
from .entity import TOPIC_TO_EVENT_TYPE, AxisEventDescription, AxisEventEntity
@@ -46,7 +46,7 @@ ENTITY_DESCRIPTIONS = (
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AxisConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the Axis light platform."""
config_entry.runtime_data.entity_loader.register_platform(
diff --git a/homeassistant/components/axis/switch.py b/homeassistant/components/axis/switch.py
index 17824302871..55250b5f489 100644
--- a/homeassistant/components/axis/switch.py
+++ b/homeassistant/components/axis/switch.py
@@ -12,7 +12,7 @@ from homeassistant.components.switch import (
)
from homeassistant.const import EntityCategory
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import AxisConfigEntry
from .entity import AxisEventDescription, AxisEventEntity
@@ -39,7 +39,7 @@ ENTITY_DESCRIPTIONS = (
async def async_setup_entry(
hass: HomeAssistant,
config_entry: AxisConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the Axis switch platform."""
config_entry.runtime_data.entity_loader.register_platform(
diff --git a/homeassistant/components/azure_devops/sensor.py b/homeassistant/components/azure_devops/sensor.py
index 1d590032a85..55c821a119e 100644
--- a/homeassistant/components/azure_devops/sensor.py
+++ b/homeassistant/components/azure_devops/sensor.py
@@ -17,7 +17,7 @@ from homeassistant.components.sensor import (
SensorEntityDescription,
)
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.typing import StateType
from homeassistant.util import dt as dt_util
@@ -145,7 +145,7 @@ def parse_datetime(value: str | None) -> datetime | None:
async def async_setup_entry(
hass: HomeAssistant,
entry: AzureDevOpsConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up Azure DevOps sensor based on a config entry."""
coordinator = entry.runtime_data
diff --git a/homeassistant/components/azure_devops/strings.json b/homeassistant/components/azure_devops/strings.json
index f5fe5cd06a7..611a8b9a758 100644
--- a/homeassistant/components/azure_devops/strings.json
+++ b/homeassistant/components/azure_devops/strings.json
@@ -14,7 +14,7 @@
"personal_access_token": "Personal Access Token (PAT)"
},
"description": "Set up an Azure DevOps instance to access your project. A Personal Access Token is only required for a private project.",
- "title": "Add Azure DevOps Project"
+ "title": "Add Azure DevOps project"
},
"reauth_confirm": {
"data": {
@@ -32,7 +32,7 @@
"entity": {
"sensor": {
"build_id": {
- "name": "{definition_name} latest build id"
+ "name": "{definition_name} latest build ID"
},
"finish_time": {
"name": "{definition_name} latest build finish time"
@@ -59,7 +59,7 @@
"name": "{definition_name} latest build start time"
},
"url": {
- "name": "{definition_name} latest build url"
+ "name": "{definition_name} latest build URL"
},
"work_item_count": {
"name": "{item_type} {item_state} work items"
@@ -68,7 +68,7 @@
},
"exceptions": {
"authentication_failed": {
- "message": "Could not authorize with Azure DevOps for {title}. You will need to update your personal access token."
+ "message": "Could not authorize with Azure DevOps for {title}. You will need to update your Personal Access Token."
}
}
}
diff --git a/homeassistant/components/azure_storage/__init__.py b/homeassistant/components/azure_storage/__init__.py
new file mode 100644
index 00000000000..f22e7b70c12
--- /dev/null
+++ b/homeassistant/components/azure_storage/__init__.py
@@ -0,0 +1,86 @@
+"""The Azure Storage integration."""
+
+from aiohttp import ClientTimeout
+from azure.core.exceptions import (
+ ClientAuthenticationError,
+ HttpResponseError,
+ ResourceNotFoundError,
+)
+from azure.core.pipeline.transport._aiohttp import (
+ AioHttpTransport,
+) # need to import from private file, as it is not properly imported in the init
+from azure.storage.blob.aio import ContainerClient
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import (
+ ConfigEntryAuthFailed,
+ ConfigEntryError,
+ ConfigEntryNotReady,
+)
+from homeassistant.helpers.aiohttp_client import async_create_clientsession
+
+from .const import (
+ CONF_ACCOUNT_NAME,
+ CONF_CONTAINER_NAME,
+ CONF_STORAGE_ACCOUNT_KEY,
+ DATA_BACKUP_AGENT_LISTENERS,
+ DOMAIN,
+)
+
+type AzureStorageConfigEntry = ConfigEntry[ContainerClient]
+
+
+async def async_setup_entry(
+ hass: HomeAssistant, entry: AzureStorageConfigEntry
+) -> bool:
+ """Set up Azure Storage integration."""
+ # set increase aiohttp timeout for long running operations (up/download)
+ session = async_create_clientsession(
+ hass, timeout=ClientTimeout(connect=10, total=12 * 60 * 60)
+ )
+ container_client = ContainerClient(
+ account_url=f"https://{entry.data[CONF_ACCOUNT_NAME]}.blob.core.windows.net/",
+ container_name=entry.data[CONF_CONTAINER_NAME],
+ credential=entry.data[CONF_STORAGE_ACCOUNT_KEY],
+ transport=AioHttpTransport(session=session),
+ )
+
+ try:
+ if not await container_client.exists():
+ await container_client.create_container()
+ except ResourceNotFoundError as err:
+ raise ConfigEntryError(
+ translation_domain=DOMAIN,
+ translation_key="account_not_found",
+ translation_placeholders={CONF_ACCOUNT_NAME: entry.data[CONF_ACCOUNT_NAME]},
+ ) from err
+ except ClientAuthenticationError as err:
+ raise ConfigEntryAuthFailed(
+ translation_domain=DOMAIN,
+ translation_key="invalid_auth",
+ translation_placeholders={CONF_ACCOUNT_NAME: entry.data[CONF_ACCOUNT_NAME]},
+ ) from err
+ except HttpResponseError as err:
+ raise ConfigEntryNotReady(
+ translation_domain=DOMAIN,
+ translation_key="cannot_connect",
+ translation_placeholders={CONF_ACCOUNT_NAME: entry.data[CONF_ACCOUNT_NAME]},
+ ) from err
+
+ entry.runtime_data = container_client
+
+ def _async_notify_backup_listeners() -> None:
+ for listener in hass.data.get(DATA_BACKUP_AGENT_LISTENERS, []):
+ listener()
+
+ entry.async_on_unload(entry.async_on_state_change(_async_notify_backup_listeners))
+
+ return True
+
+
+async def async_unload_entry(
+ hass: HomeAssistant, entry: AzureStorageConfigEntry
+) -> bool:
+ """Unload an Azure Storage config entry."""
+ return True
diff --git a/homeassistant/components/azure_storage/backup.py b/homeassistant/components/azure_storage/backup.py
new file mode 100644
index 00000000000..4a9254213dc
--- /dev/null
+++ b/homeassistant/components/azure_storage/backup.py
@@ -0,0 +1,183 @@
+"""Support for Azure Storage backup."""
+
+from __future__ import annotations
+
+from collections.abc import AsyncIterator, Callable, Coroutine
+from functools import wraps
+import json
+import logging
+from typing import Any, Concatenate
+
+from azure.core.exceptions import HttpResponseError
+from azure.storage.blob import BlobProperties
+
+from homeassistant.components.backup import (
+ AgentBackup,
+ BackupAgent,
+ BackupAgentError,
+ BackupNotFound,
+ suggested_filename,
+)
+from homeassistant.core import HomeAssistant, callback
+
+from . import AzureStorageConfigEntry
+from .const import DATA_BACKUP_AGENT_LISTENERS, DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+METADATA_VERSION = "1"
+
+
+async def async_get_backup_agents(
+ hass: HomeAssistant,
+) -> list[BackupAgent]:
+ """Return a list of backup agents."""
+ entries: list[AzureStorageConfigEntry] = hass.config_entries.async_loaded_entries(
+ DOMAIN
+ )
+ return [AzureStorageBackupAgent(hass, entry) for entry in entries]
+
+
+@callback
+def async_register_backup_agents_listener(
+ hass: HomeAssistant,
+ *,
+ listener: Callable[[], None],
+ **kwargs: Any,
+) -> Callable[[], None]:
+ """Register a listener to be called when agents are added or removed."""
+ hass.data.setdefault(DATA_BACKUP_AGENT_LISTENERS, []).append(listener)
+
+ @callback
+ def remove_listener() -> None:
+ """Remove the listener."""
+ hass.data[DATA_BACKUP_AGENT_LISTENERS].remove(listener)
+ if not hass.data[DATA_BACKUP_AGENT_LISTENERS]:
+ hass.data.pop(DATA_BACKUP_AGENT_LISTENERS)
+
+ return remove_listener
+
+
+def handle_backup_errors[_R, **P](
+ func: Callable[Concatenate[AzureStorageBackupAgent, P], Coroutine[Any, Any, _R]],
+) -> Callable[Concatenate[AzureStorageBackupAgent, P], Coroutine[Any, Any, _R]]:
+ """Handle backup errors."""
+
+ @wraps(func)
+ async def wrapper(
+ self: AzureStorageBackupAgent, *args: P.args, **kwargs: P.kwargs
+ ) -> _R:
+ try:
+ return await func(self, *args, **kwargs)
+ except HttpResponseError as err:
+ _LOGGER.debug(
+ "Error during backup in %s: Status %s, message %s",
+ func.__name__,
+ err.status_code,
+ err.message,
+ exc_info=True,
+ )
+ raise BackupAgentError(
+ f"Error during backup operation in {func.__name__}:"
+ f" Status {err.status_code}, message: {err.message}"
+ ) from err
+
+ return wrapper
+
+
+class AzureStorageBackupAgent(BackupAgent):
+ """Azure storage backup agent."""
+
+ domain = DOMAIN
+
+ def __init__(self, hass: HomeAssistant, entry: AzureStorageConfigEntry) -> None:
+ """Initialize the Azure storage backup agent."""
+ super().__init__()
+ self._client = entry.runtime_data
+ self.name = entry.title
+ self.unique_id = entry.entry_id
+
+ @handle_backup_errors
+ async def async_download_backup(
+ self,
+ backup_id: str,
+ **kwargs: Any,
+ ) -> AsyncIterator[bytes]:
+ """Download a backup file."""
+ blob = await self._find_blob_by_backup_id(backup_id)
+ if blob is None:
+ raise BackupNotFound(f"Backup {backup_id} not found")
+ download_stream = await self._client.download_blob(blob.name)
+ return download_stream.chunks()
+
+ @handle_backup_errors
+ async def async_upload_backup(
+ self,
+ *,
+ open_stream: Callable[[], Coroutine[Any, Any, AsyncIterator[bytes]]],
+ backup: AgentBackup,
+ **kwargs: Any,
+ ) -> None:
+ """Upload a backup."""
+
+ metadata = {
+ "metadata_version": METADATA_VERSION,
+ "backup_id": backup.backup_id,
+ "backup_metadata": json.dumps(backup.as_dict()),
+ }
+
+ await self._client.upload_blob(
+ name=suggested_filename(backup),
+ metadata=metadata,
+ data=await open_stream(),
+ length=backup.size,
+ )
+
+ @handle_backup_errors
+ async def async_delete_backup(
+ self,
+ backup_id: str,
+ **kwargs: Any,
+ ) -> None:
+ """Delete a backup file."""
+ blob = await self._find_blob_by_backup_id(backup_id)
+ if blob is None:
+ raise BackupNotFound(f"Backup {backup_id} not found")
+ await self._client.delete_blob(blob.name)
+
+ @handle_backup_errors
+ async def async_list_backups(self, **kwargs: Any) -> list[AgentBackup]:
+ """List backups."""
+ backups: list[AgentBackup] = []
+ async for blob in self._client.list_blobs(include="metadata"):
+ metadata = blob.metadata
+
+ if metadata.get("metadata_version") == METADATA_VERSION:
+ backups.append(
+ AgentBackup.from_dict(json.loads(metadata["backup_metadata"]))
+ )
+
+ return backups
+
+ @handle_backup_errors
+ async def async_get_backup(
+ self,
+ backup_id: str,
+ **kwargs: Any,
+ ) -> AgentBackup:
+ """Return a backup."""
+ blob = await self._find_blob_by_backup_id(backup_id)
+ if blob is None:
+ raise BackupNotFound(f"Backup {backup_id} not found")
+
+ return AgentBackup.from_dict(json.loads(blob.metadata["backup_metadata"]))
+
+ async def _find_blob_by_backup_id(self, backup_id: str) -> BlobProperties | None:
+ """Find a blob by backup id."""
+ async for blob in self._client.list_blobs(include="metadata"):
+ if (
+ blob.metadata is not None
+ and backup_id == blob.metadata.get("backup_id", "")
+ and blob.metadata.get("metadata_version") == METADATA_VERSION
+ ):
+ return blob
+ return None
diff --git a/homeassistant/components/azure_storage/config_flow.py b/homeassistant/components/azure_storage/config_flow.py
new file mode 100644
index 00000000000..2862d290f95
--- /dev/null
+++ b/homeassistant/components/azure_storage/config_flow.py
@@ -0,0 +1,160 @@
+"""Config flow for Azure Storage integration."""
+
+from collections.abc import Mapping
+import logging
+from typing import Any
+
+from azure.core.exceptions import ClientAuthenticationError, ResourceNotFoundError
+from azure.core.pipeline.transport._aiohttp import (
+ AioHttpTransport,
+) # need to import from private file, as it is not properly imported in the init
+from azure.storage.blob.aio import ContainerClient
+import voluptuous as vol
+
+from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+
+from .const import (
+ CONF_ACCOUNT_NAME,
+ CONF_CONTAINER_NAME,
+ CONF_STORAGE_ACCOUNT_KEY,
+ DOMAIN,
+)
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class AzureStorageConfigFlow(ConfigFlow, domain=DOMAIN):
+ """Handle a config flow for azure storage."""
+
+ def get_account_url(self, account_name: str) -> str:
+ """Get the account URL."""
+ return f"https://{account_name}.blob.core.windows.net/"
+
+ async def validate_config(
+ self, container_client: ContainerClient
+ ) -> dict[str, str]:
+ """Validate the configuration."""
+ errors: dict[str, str] = {}
+ try:
+ await container_client.exists()
+ except ResourceNotFoundError:
+ errors["base"] = "cannot_connect"
+ except ClientAuthenticationError:
+ errors[CONF_STORAGE_ACCOUNT_KEY] = "invalid_auth"
+ except Exception:
+ _LOGGER.exception("Unknown exception occurred")
+ errors["base"] = "unknown"
+ return errors
+
+ async def async_step_user(
+ self, user_input: dict[str, Any] | None = None
+ ) -> ConfigFlowResult:
+ """User step for Azure Storage."""
+
+ errors: dict[str, str] = {}
+
+ if user_input is not None:
+ self._async_abort_entries_match(
+ {CONF_ACCOUNT_NAME: user_input[CONF_ACCOUNT_NAME]}
+ )
+ container_client = ContainerClient(
+ account_url=self.get_account_url(user_input[CONF_ACCOUNT_NAME]),
+ container_name=user_input[CONF_CONTAINER_NAME],
+ credential=user_input[CONF_STORAGE_ACCOUNT_KEY],
+ transport=AioHttpTransport(session=async_get_clientsession(self.hass)),
+ )
+ errors = await self.validate_config(container_client)
+
+ if not errors:
+ return self.async_create_entry(
+ title=f"{user_input[CONF_ACCOUNT_NAME]}/{user_input[CONF_CONTAINER_NAME]}",
+ data=user_input,
+ )
+
+ return self.async_show_form(
+ data_schema=vol.Schema(
+ {
+ vol.Required(CONF_ACCOUNT_NAME): str,
+ vol.Required(
+ CONF_CONTAINER_NAME, default="home-assistant-backups"
+ ): str,
+ vol.Required(CONF_STORAGE_ACCOUNT_KEY): str,
+ }
+ ),
+ errors=errors,
+ )
+
+ async def async_step_reauth(
+ self, entry_data: Mapping[str, Any]
+ ) -> ConfigFlowResult:
+ """Perform reauth upon an API authentication error."""
+ return await self.async_step_reauth_confirm()
+
+ async def async_step_reauth_confirm(
+ self, user_input: dict[str, Any] | None = None
+ ) -> ConfigFlowResult:
+ """Confirm reauth dialog."""
+ errors: dict[str, str] = {}
+ reauth_entry = self._get_reauth_entry()
+
+ if user_input is not None:
+ container_client = ContainerClient(
+ account_url=self.get_account_url(reauth_entry.data[CONF_ACCOUNT_NAME]),
+ container_name=reauth_entry.data[CONF_CONTAINER_NAME],
+ credential=user_input[CONF_STORAGE_ACCOUNT_KEY],
+ transport=AioHttpTransport(session=async_get_clientsession(self.hass)),
+ )
+ errors = await self.validate_config(container_client)
+ if not errors:
+ return self.async_update_reload_and_abort(
+ reauth_entry,
+ data={**reauth_entry.data, **user_input},
+ )
+ return self.async_show_form(
+ step_id="reauth_confirm",
+ data_schema=vol.Schema(
+ {
+ vol.Required(CONF_STORAGE_ACCOUNT_KEY): str,
+ }
+ ),
+ errors=errors,
+ )
+
+ async def async_step_reconfigure(
+ self, user_input: dict[str, Any] | None = None
+ ) -> ConfigFlowResult:
+ """Reconfigure the entry."""
+ errors: dict[str, str] = {}
+ reconfigure_entry = self._get_reconfigure_entry()
+
+ if user_input is not None:
+ container_client = ContainerClient(
+ account_url=self.get_account_url(
+ reconfigure_entry.data[CONF_ACCOUNT_NAME]
+ ),
+ container_name=user_input[CONF_CONTAINER_NAME],
+ credential=user_input[CONF_STORAGE_ACCOUNT_KEY],
+ transport=AioHttpTransport(session=async_get_clientsession(self.hass)),
+ )
+ errors = await self.validate_config(container_client)
+ if not errors:
+ return self.async_update_reload_and_abort(
+ reconfigure_entry,
+ data={**reconfigure_entry.data, **user_input},
+ )
+ return self.async_show_form(
+ data_schema=vol.Schema(
+ {
+ vol.Required(
+ CONF_CONTAINER_NAME,
+ default=reconfigure_entry.data[CONF_CONTAINER_NAME],
+ ): str,
+ vol.Required(
+ CONF_STORAGE_ACCOUNT_KEY,
+ default=reconfigure_entry.data[CONF_STORAGE_ACCOUNT_KEY],
+ ): str,
+ }
+ ),
+ errors=errors,
+ )
diff --git a/homeassistant/components/azure_storage/const.py b/homeassistant/components/azure_storage/const.py
new file mode 100644
index 00000000000..efcb338a096
--- /dev/null
+++ b/homeassistant/components/azure_storage/const.py
@@ -0,0 +1,16 @@
+"""Constants for the Azure Storage integration."""
+
+from collections.abc import Callable
+from typing import Final
+
+from homeassistant.util.hass_dict import HassKey
+
+DOMAIN: Final = "azure_storage"
+
+CONF_STORAGE_ACCOUNT_KEY: Final = "storage_account_key"
+CONF_ACCOUNT_NAME: Final = "account_name"
+CONF_CONTAINER_NAME: Final = "container_name"
+
+DATA_BACKUP_AGENT_LISTENERS: HassKey[list[Callable[[], None]]] = HassKey(
+ f"{DOMAIN}.backup_agent_listeners"
+)
diff --git a/homeassistant/components/azure_storage/manifest.json b/homeassistant/components/azure_storage/manifest.json
new file mode 100644
index 00000000000..729334f851d
--- /dev/null
+++ b/homeassistant/components/azure_storage/manifest.json
@@ -0,0 +1,12 @@
+{
+ "domain": "azure_storage",
+ "name": "Azure Storage",
+ "codeowners": ["@zweckj"],
+ "config_flow": true,
+ "documentation": "https://www.home-assistant.io/integrations/azure_storage",
+ "integration_type": "service",
+ "iot_class": "cloud_polling",
+ "loggers": ["azure-storage-blob"],
+ "quality_scale": "platinum",
+ "requirements": ["azure-storage-blob==12.24.0"]
+}
diff --git a/homeassistant/components/azure_storage/quality_scale.yaml b/homeassistant/components/azure_storage/quality_scale.yaml
new file mode 100644
index 00000000000..6199ba514a3
--- /dev/null
+++ b/homeassistant/components/azure_storage/quality_scale.yaml
@@ -0,0 +1,133 @@
+rules:
+ # Bronze
+ action-setup:
+ status: exempt
+ comment: Integration does not register custom actions.
+ appropriate-polling:
+ status: exempt
+ comment: |
+ This integration does not poll.
+ brands: done
+ common-modules: done
+ config-flow-test-coverage: done
+ config-flow: done
+ dependency-transparency: done
+ docs-actions:
+ status: exempt
+ comment: |
+ This integration does not have any custom actions.
+ docs-high-level-description: done
+ docs-installation-instructions: done
+ docs-removal-instructions: done
+ entity-event-setup:
+ status: exempt
+ comment: |
+ Entities of this integration does not explicitly subscribe to events.
+ entity-unique-id:
+ status: exempt
+ comment: |
+ This integration does not have entities.
+ has-entity-name:
+ status: exempt
+ comment: |
+ This integration does not have entities.
+ runtime-data: done
+ test-before-configure: done
+ test-before-setup: done
+ unique-config-entry: done
+
+ # Silver
+ action-exceptions: done
+ config-entry-unloading: done
+ docs-configuration-parameters:
+ status: exempt
+ comment: |
+ This integration does not have any configuration parameters.
+ docs-installation-parameters: done
+ entity-unavailable:
+ status: exempt
+ comment: |
+ This integration does not have entities.
+ integration-owner: done
+ log-when-unavailable:
+ status: exempt
+ comment: |
+ This integration does not have entities.
+ parallel-updates:
+ status: exempt
+ comment: |
+ This integration does not have platforms.
+ reauthentication-flow: done
+ test-coverage: done
+
+ # Gold
+ devices:
+ status: exempt
+ comment: |
+ This integration connects to a single service.
+ diagnostics:
+ status: exempt
+ comment: |
+ There is no data to diagnose.
+ discovery-update-info:
+ status: exempt
+ comment: |
+ This integration is a cloud service and does not support discovery.
+ discovery:
+ status: exempt
+ comment: |
+ This integration is a cloud service and does not support discovery.
+ docs-data-update:
+ status: exempt
+ comment: |
+ This integration does not poll or push.
+ docs-examples:
+ status: exempt
+ comment: |
+ This integration only serves backup.
+ docs-known-limitations: done
+ docs-supported-devices:
+ status: exempt
+ comment: |
+ This integration is a cloud service.
+ docs-supported-functions:
+ status: exempt
+ comment: |
+ This integration does not have entities.
+ docs-troubleshooting: done
+ docs-use-cases: done
+ dynamic-devices:
+ status: exempt
+ comment: |
+ This integration connects to a single service.
+ entity-category:
+ status: exempt
+ comment: |
+ This integration does not have entities.
+ entity-device-class:
+ status: exempt
+ comment: |
+ This integration does not have entities.
+ entity-disabled-by-default:
+ status: exempt
+ comment: |
+ This integration does not have entities.
+ entity-translations:
+ status: exempt
+ comment: |
+ This integration does not have entities.
+ exception-translations: done
+ icon-translations:
+ status: exempt
+ comment: |
+ This integration does not have entities.
+ reconfiguration-flow: done
+ repair-issues: done
+ stale-devices:
+ status: exempt
+ comment: |
+ This integration connects to a single service.
+ # Platinum
+ async-dependency: done
+ inject-websession: done
+ strict-typing: done
diff --git a/homeassistant/components/azure_storage/strings.json b/homeassistant/components/azure_storage/strings.json
new file mode 100644
index 00000000000..e9053f113cc
--- /dev/null
+++ b/homeassistant/components/azure_storage/strings.json
@@ -0,0 +1,72 @@
+{
+ "config": {
+ "error": {
+ "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
+ "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+ "unknown": "[%key:common::config_flow::error::unknown%]"
+ },
+ "step": {
+ "user": {
+ "data": {
+ "storage_account_key": "Storage account key",
+ "account_name": "Account name",
+ "container_name": "Container name"
+ },
+ "data_description": {
+ "storage_account_key": "Storage account access key used for authorization",
+ "account_name": "Name of the storage account",
+ "container_name": "Name of the storage container to be used (will be created if it does not exist)"
+ },
+ "description": "Set up an Azure (Blob) storage account to be used for backups.",
+ "title": "Add Azure storage account"
+ },
+ "reauth_confirm": {
+ "data": {
+ "storage_account_key": "[%key:component::azure_storage::config::step::user::data::storage_account_key%]"
+ },
+ "data_description": {
+ "storage_account_key": "[%key:component::azure_storage::config::step::user::data_description::storage_account_key%]"
+ },
+ "description": "Provide a new storage account key.",
+ "title": "Reauthenticate Azure storage account"
+ },
+ "reconfigure": {
+ "data": {
+ "container_name": "[%key:component::azure_storage::config::step::user::data::container_name%]",
+ "storage_account_key": "[%key:component::azure_storage::config::step::user::data::storage_account_key%]"
+ },
+ "data_description": {
+ "container_name": "[%key:component::azure_storage::config::step::user::data_description::container_name%]",
+ "storage_account_key": "[%key:component::azure_storage::config::step::user::data_description::storage_account_key%]"
+ },
+ "description": "Change the settings of the Azure storage integration.",
+ "title": "Reconfigure Azure storage account"
+ }
+ },
+ "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%]"
+ }
+ },
+ "issues": {
+ "container_not_found": {
+ "title": "Storage container not found",
+ "description": "The storage container {container_name} has not been found in the storage account. Please re-create it manually, then fix this issue."
+ }
+ },
+ "exceptions": {
+ "account_not_found": {
+ "message": "Storage account {account_name} not found"
+ },
+ "cannot_connect": {
+ "message": "Can not connect to storage account {account_name}"
+ },
+ "invalid_auth": {
+ "message": "Authentication failed for storage account {account_name}"
+ },
+ "container_not_found": {
+ "message": "Storage container {container_name} not found"
+ }
+ }
+}
diff --git a/homeassistant/components/backup/__init__.py b/homeassistant/components/backup/__init__.py
index 71a4f5ea41a..124ce8b872c 100644
--- a/homeassistant/components/backup/__init__.py
+++ b/homeassistant/components/backup/__init__.py
@@ -1,8 +1,10 @@
"""The Backup integration."""
-from homeassistant.core import HomeAssistant, ServiceCall, callback
-from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import config_validation as cv
+from homeassistant.config_entries import SOURCE_SYSTEM
+from homeassistant.const import Platform
+from homeassistant.core import HomeAssistant, ServiceCall
+from homeassistant.helpers import config_validation as cv, discovery_flow
+from homeassistant.helpers.backup import DATA_BACKUP
from homeassistant.helpers.hassio import is_hassio
from homeassistant.helpers.typing import ConfigType
@@ -16,11 +18,14 @@ from .agent import (
BackupAgentPlatformProtocol,
LocalBackupAgent,
)
+from .config import BackupConfig, CreateBackupParametersDict
from .const import DATA_MANAGER, DOMAIN
+from .coordinator import BackupConfigEntry, BackupDataUpdateCoordinator
from .http import async_register_http_views
from .manager import (
BackupManager,
BackupManagerError,
+ BackupPlatformEvent,
BackupPlatformProtocol,
BackupReaderWriter,
BackupReaderWriterError,
@@ -31,6 +36,7 @@ from .manager import (
IdleEvent,
IncorrectPasswordError,
ManagerBackup,
+ ManagerStateEvent,
NewBackup,
RestoreBackupEvent,
RestoreBackupStage,
@@ -47,12 +53,15 @@ __all__ = [
"BackupAgent",
"BackupAgentError",
"BackupAgentPlatformProtocol",
+ "BackupConfig",
"BackupManagerError",
"BackupNotFound",
+ "BackupPlatformEvent",
"BackupPlatformProtocol",
"BackupReaderWriter",
"BackupReaderWriterError",
"CreateBackupEvent",
+ "CreateBackupParametersDict",
"CreateBackupStage",
"CreateBackupState",
"Folder",
@@ -60,16 +69,18 @@ __all__ = [
"IncorrectPasswordError",
"LocalBackupAgent",
"ManagerBackup",
+ "ManagerStateEvent",
"NewBackup",
"RestoreBackupEvent",
"RestoreBackupStage",
"RestoreBackupState",
"WrittenBackup",
- "async_get_manager",
"suggested_filename",
"suggested_filename_from_name_date",
]
+PLATFORMS = [Platform.SENSOR]
+
CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
@@ -88,7 +99,13 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
backup_manager = BackupManager(hass, reader_writer)
hass.data[DATA_MANAGER] = backup_manager
- await backup_manager.async_setup()
+ try:
+ await backup_manager.async_setup()
+ except Exception as err:
+ hass.data[DATA_BACKUP].manager_ready.set_exception(err)
+ raise
+ else:
+ hass.data[DATA_BACKUP].manager_ready.set_result(None)
async_register_websocket_handlers(hass, with_hassio)
@@ -118,16 +135,28 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
async_register_http_views(hass)
+ discovery_flow.async_create_flow(
+ hass, DOMAIN, context={"source": SOURCE_SYSTEM}, data={}
+ )
+
return True
-@callback
-def async_get_manager(hass: HomeAssistant) -> BackupManager:
- """Get the backup manager instance.
+async def async_setup_entry(hass: HomeAssistant, entry: BackupConfigEntry) -> bool:
+ """Set up a config entry."""
+ backup_manager: BackupManager = hass.data[DATA_MANAGER]
+ coordinator = BackupDataUpdateCoordinator(hass, entry, backup_manager)
+ await coordinator.async_config_entry_first_refresh()
- Raises HomeAssistantError if the backup integration is not available.
- """
- if DATA_MANAGER not in hass.data:
- raise HomeAssistantError("Backup integration is not available")
+ entry.async_on_unload(coordinator.async_unsubscribe)
- return hass.data[DATA_MANAGER]
+ entry.runtime_data = coordinator
+
+ await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+
+ return True
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: BackupConfigEntry) -> bool:
+ """Unload a config entry."""
+ return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
diff --git a/homeassistant/components/backup/agent.py b/homeassistant/components/backup/agent.py
index 9530f386c7b..8093ac88338 100644
--- a/homeassistant/components/backup/agent.py
+++ b/homeassistant/components/backup/agent.py
@@ -41,6 +41,8 @@ class BackupAgent(abc.ABC):
) -> AsyncIterator[bytes]:
"""Download a backup file.
+ Raises BackupNotFound if the backup does not exist.
+
:param backup_id: The ID of the backup that was returned in async_list_backups.
:return: An async iterator that yields bytes.
"""
@@ -67,6 +69,8 @@ class BackupAgent(abc.ABC):
) -> None:
"""Delete a backup file.
+ Raises BackupNotFound if the backup does not exist.
+
:param backup_id: The ID of the backup that was returned in async_list_backups.
"""
@@ -79,8 +83,11 @@ class BackupAgent(abc.ABC):
self,
backup_id: str,
**kwargs: Any,
- ) -> AgentBackup | None:
- """Return a backup."""
+ ) -> AgentBackup:
+ """Return a backup.
+
+ Raises BackupNotFound if the backup does not exist.
+ """
class LocalBackupAgent(BackupAgent):
diff --git a/homeassistant/components/backup/backup.py b/homeassistant/components/backup/backup.py
index c3a46a6ab1f..de2cfecb1a5 100644
--- a/homeassistant/components/backup/backup.py
+++ b/homeassistant/components/backup/backup.py
@@ -88,13 +88,13 @@ class CoreLocalBackupAgent(LocalBackupAgent):
self,
backup_id: str,
**kwargs: Any,
- ) -> AgentBackup | None:
+ ) -> AgentBackup:
"""Return a backup."""
if not self._loaded_backups:
await self._load_backups()
if backup_id not in self._backups:
- return None
+ raise BackupNotFound(f"Backup {backup_id} not found")
backup, backup_path = self._backups[backup_id]
if not await self._hass.async_add_executor_job(backup_path.exists):
@@ -107,7 +107,7 @@ class CoreLocalBackupAgent(LocalBackupAgent):
backup_path,
)
self._backups.pop(backup_id)
- return None
+ raise BackupNotFound(f"Backup {backup_id} not found")
return backup
@@ -130,10 +130,7 @@ class CoreLocalBackupAgent(LocalBackupAgent):
if not self._loaded_backups:
await self._load_backups()
- try:
- backup_path = self.get_backup_path(backup_id)
- except BackupNotFound:
- return
+ backup_path = self.get_backup_path(backup_id)
await self._hass.async_add_executor_job(backup_path.unlink, True)
LOGGER.debug("Deleted backup located at %s", backup_path)
self._backups.pop(backup_id)
diff --git a/homeassistant/components/backup/basic_websocket.py b/homeassistant/components/backup/basic_websocket.py
new file mode 100644
index 00000000000..614dc23a927
--- /dev/null
+++ b/homeassistant/components/backup/basic_websocket.py
@@ -0,0 +1,38 @@
+"""Websocket commands for the Backup integration."""
+
+from typing import Any
+
+import voluptuous as vol
+
+from homeassistant.components import websocket_api
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.backup import async_subscribe_events
+
+from .const import DATA_MANAGER
+from .manager import ManagerStateEvent
+
+
+@callback
+def async_register_websocket_handlers(hass: HomeAssistant) -> None:
+ """Register websocket commands."""
+ websocket_api.async_register_command(hass, handle_subscribe_events)
+
+
+@websocket_api.require_admin
+@websocket_api.websocket_command({vol.Required("type"): "backup/subscribe_events"})
+@websocket_api.async_response
+async def handle_subscribe_events(
+ hass: HomeAssistant,
+ connection: websocket_api.ActiveConnection,
+ msg: dict[str, Any],
+) -> None:
+ """Subscribe to backup events."""
+
+ def on_event(event: ManagerStateEvent) -> None:
+ connection.send_message(websocket_api.event_message(msg["id"], event))
+
+ if DATA_MANAGER in hass.data:
+ manager = hass.data[DATA_MANAGER]
+ on_event(manager.last_event)
+ connection.subscriptions[msg["id"]] = async_subscribe_events(hass, on_event)
+ connection.send_result(msg["id"])
diff --git a/homeassistant/components/backup/config.py b/homeassistant/components/backup/config.py
index 4d0cd82bc44..f4fa2e8bac6 100644
--- a/homeassistant/components/backup/config.py
+++ b/homeassistant/components/backup/config.py
@@ -12,16 +12,19 @@ from typing import TYPE_CHECKING, Self, TypedDict
from cronsim import CronSim
from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers import issue_registry as ir
from homeassistant.helpers.event import async_call_later, async_track_point_in_time
from homeassistant.helpers.typing import UNDEFINED, UndefinedType
from homeassistant.util import dt as dt_util
-from .const import LOGGER
+from .const import DOMAIN, LOGGER
from .models import BackupManagerError, Folder
if TYPE_CHECKING:
from .manager import BackupManager, ManagerBackup
+AUTOMATIC_BACKUP_AGENTS_UNAVAILABLE_ISSUE_ID = "automatic_backup_agents_unavailable"
+
CRON_PATTERN_DAILY = "{m} {h} * * *"
CRON_PATTERN_WEEKLY = "{m} {h} * * {d}"
@@ -39,6 +42,7 @@ class StoredBackupConfig(TypedDict):
"""Represent the stored backup config."""
agents: dict[str, StoredAgentConfig]
+ automatic_backups_configured: bool
create_backup: StoredCreateBackupConfig
last_attempted_automatic_backup: str | None
last_completed_automatic_backup: str | None
@@ -51,6 +55,7 @@ class BackupConfigData:
"""Represent loaded backup config data."""
agents: dict[str, AgentConfig]
+ automatic_backups_configured: bool # only used by frontend
create_backup: CreateBackupConfig
last_attempted_automatic_backup: datetime | None = None
last_completed_automatic_backup: datetime | None = None
@@ -88,6 +93,7 @@ class BackupConfigData:
agent_id: AgentConfig(protected=agent_data["protected"])
for agent_id, agent_data in data["agents"].items()
},
+ automatic_backups_configured=data["automatic_backups_configured"],
create_backup=CreateBackupConfig(
agent_ids=data["create_backup"]["agent_ids"],
include_addons=data["create_backup"]["include_addons"],
@@ -127,6 +133,7 @@ class BackupConfigData:
agents={
agent_id: agent.to_dict() for agent_id, agent in self.agents.items()
},
+ automatic_backups_configured=self.automatic_backups_configured,
create_backup=self.create_backup.to_dict(),
last_attempted_automatic_backup=last_attempted,
last_completed_automatic_backup=last_completed,
@@ -142,10 +149,12 @@ class BackupConfig:
"""Initialize backup config."""
self.data = BackupConfigData(
agents={},
+ automatic_backups_configured=False,
create_backup=CreateBackupConfig(),
retention=RetentionConfig(),
schedule=BackupSchedule(),
)
+ self._hass = hass
self._manager = manager
def load(self, stored_config: StoredBackupConfig) -> None:
@@ -154,10 +163,12 @@ class BackupConfig:
self.data.retention.apply(self._manager)
self.data.schedule.apply(self._manager)
- async def update(
+ @callback
+ def update(
self,
*,
agents: dict[str, AgentParametersDict] | UndefinedType = UNDEFINED,
+ automatic_backups_configured: bool | UndefinedType = UNDEFINED,
create_backup: CreateBackupParametersDict | UndefinedType = UNDEFINED,
retention: RetentionParametersDict | UndefinedType = UNDEFINED,
schedule: ScheduleParametersDict | UndefinedType = UNDEFINED,
@@ -171,8 +182,12 @@ class BackupConfig:
self.data.agents[agent_id] = replace(
self.data.agents[agent_id], **agent_config
)
+ if automatic_backups_configured is not UNDEFINED:
+ self.data.automatic_backups_configured = automatic_backups_configured
if create_backup is not UNDEFINED:
self.data.create_backup = replace(self.data.create_backup, **create_backup)
+ if "agent_ids" in create_backup:
+ check_unavailable_agents(self._hass, self._manager)
if retention is not UNDEFINED:
new_retention = RetentionConfig(**retention)
if new_retention != self.data.retention:
@@ -553,3 +568,46 @@ async def delete_backups_exceeding_configured_count(manager: BackupManager) -> N
await manager.async_delete_filtered_backups(
include_filter=_automatic_backups_filter, delete_filter=_delete_filter
)
+
+
+@callback
+def check_unavailable_agents(hass: HomeAssistant, manager: BackupManager) -> None:
+ """Check for unavailable agents."""
+ if missing_agent_ids := set(manager.config.data.create_backup.agent_ids) - set(
+ manager.backup_agents
+ ):
+ LOGGER.debug(
+ "Agents %s are configured for automatic backup but are unavailable",
+ missing_agent_ids,
+ )
+
+ # Remove issues for unavailable agents that are not unavailable anymore.
+ issue_registry = ir.async_get(hass)
+ existing_missing_agent_issue_ids = {
+ issue_id
+ for domain, issue_id in issue_registry.issues
+ if domain == DOMAIN
+ and issue_id.startswith(AUTOMATIC_BACKUP_AGENTS_UNAVAILABLE_ISSUE_ID)
+ }
+ current_missing_agent_issue_ids = {
+ f"{AUTOMATIC_BACKUP_AGENTS_UNAVAILABLE_ISSUE_ID}_{agent_id}": agent_id
+ for agent_id in missing_agent_ids
+ }
+ for issue_id in existing_missing_agent_issue_ids - set(
+ current_missing_agent_issue_ids
+ ):
+ ir.async_delete_issue(hass, DOMAIN, issue_id)
+ for issue_id, agent_id in current_missing_agent_issue_ids.items():
+ ir.async_create_issue(
+ hass,
+ DOMAIN,
+ issue_id,
+ is_fixable=False,
+ learn_more_url="homeassistant://config/backup",
+ severity=ir.IssueSeverity.WARNING,
+ translation_key="automatic_backup_agents_unavailable",
+ translation_placeholders={
+ "agent_id": agent_id,
+ "backup_settings": "/config/backup/settings",
+ },
+ )
diff --git a/homeassistant/components/backup/config_flow.py b/homeassistant/components/backup/config_flow.py
new file mode 100644
index 00000000000..ab1f884ea86
--- /dev/null
+++ b/homeassistant/components/backup/config_flow.py
@@ -0,0 +1,21 @@
+"""Config flow for Home Assistant Backup integration."""
+
+from __future__ import annotations
+
+from typing import Any
+
+from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
+
+from .const import DOMAIN
+
+
+class BackupConfigFlow(ConfigFlow, domain=DOMAIN):
+ """Handle a config flow for Home Assistant Backup."""
+
+ VERSION = 1
+
+ async def async_step_system(
+ self, user_input: dict[str, Any] | None = None
+ ) -> ConfigFlowResult:
+ """Handle the initial step."""
+ return self.async_create_entry(title="Backup", data={})
diff --git a/homeassistant/components/backup/const.py b/homeassistant/components/backup/const.py
index c2070a37b2d..773deaef174 100644
--- a/homeassistant/components/backup/const.py
+++ b/homeassistant/components/backup/const.py
@@ -16,8 +16,8 @@ DATA_MANAGER: HassKey[BackupManager] = HassKey(DOMAIN)
LOGGER = getLogger(__package__)
EXCLUDE_FROM_BACKUP = [
- "__pycache__/*",
- ".DS_Store",
+ "**/__pycache__/*",
+ "**/.DS_Store",
".HA_RESTORE",
"*.db-shm",
"*.log.*",
diff --git a/homeassistant/components/backup/coordinator.py b/homeassistant/components/backup/coordinator.py
new file mode 100644
index 00000000000..377f23567e0
--- /dev/null
+++ b/homeassistant/components/backup/coordinator.py
@@ -0,0 +1,81 @@
+"""Coordinator for Home Assistant Backup integration."""
+
+from __future__ import annotations
+
+from collections.abc import Callable
+from dataclasses import dataclass
+from datetime import datetime
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.backup import (
+ async_subscribe_events,
+ async_subscribe_platform_events,
+)
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
+
+from .const import DOMAIN, LOGGER
+from .manager import (
+ BackupManager,
+ BackupManagerState,
+ BackupPlatformEvent,
+ ManagerStateEvent,
+)
+
+type BackupConfigEntry = ConfigEntry[BackupDataUpdateCoordinator]
+
+
+@dataclass
+class BackupCoordinatorData:
+ """Class to hold backup data."""
+
+ backup_manager_state: BackupManagerState
+ last_successful_automatic_backup: datetime | None
+ next_scheduled_automatic_backup: datetime | None
+
+
+class BackupDataUpdateCoordinator(DataUpdateCoordinator[BackupCoordinatorData]):
+ """Class to retrieve backup status."""
+
+ config_entry: ConfigEntry
+
+ def __init__(
+ self,
+ hass: HomeAssistant,
+ config_entry: ConfigEntry,
+ backup_manager: BackupManager,
+ ) -> None:
+ """Initialize coordinator."""
+ super().__init__(
+ hass,
+ LOGGER,
+ config_entry=config_entry,
+ name=DOMAIN,
+ update_interval=None,
+ )
+ self.unsubscribe: list[Callable[[], None]] = [
+ async_subscribe_events(hass, self._on_event),
+ async_subscribe_platform_events(hass, self._on_event),
+ ]
+
+ self.backup_manager = backup_manager
+
+ @callback
+ def _on_event(self, event: ManagerStateEvent | BackupPlatformEvent) -> None:
+ """Handle new event."""
+ LOGGER.debug("Received backup event: %s", event)
+ self.config_entry.async_create_task(self.hass, self.async_refresh())
+
+ async def _async_update_data(self) -> BackupCoordinatorData:
+ """Update backup manager data."""
+ return BackupCoordinatorData(
+ self.backup_manager.state,
+ self.backup_manager.config.data.last_completed_automatic_backup,
+ self.backup_manager.config.data.schedule.next_automatic_backup,
+ )
+
+ @callback
+ def async_unsubscribe(self) -> None:
+ """Unsubscribe from events."""
+ for unsub in self.unsubscribe:
+ unsub()
diff --git a/homeassistant/components/backup/diagnostics.py b/homeassistant/components/backup/diagnostics.py
new file mode 100644
index 00000000000..9c3e28bde5b
--- /dev/null
+++ b/homeassistant/components/backup/diagnostics.py
@@ -0,0 +1,27 @@
+"""Diagnostics support for Home Assistant Backup integration."""
+
+from __future__ import annotations
+
+from typing import Any
+
+from homeassistant.components.diagnostics import async_redact_data
+from homeassistant.const import CONF_PASSWORD
+from homeassistant.core import HomeAssistant
+
+from .coordinator import BackupConfigEntry
+
+
+async def async_get_config_entry_diagnostics(
+ hass: HomeAssistant, entry: BackupConfigEntry
+) -> dict[str, Any]:
+ """Return diagnostics for a config entry."""
+ coordinator = entry.runtime_data
+ return {
+ "backup_agents": [
+ {"name": agent.name, "agent_id": agent.agent_id}
+ for agent in coordinator.backup_manager.backup_agents.values()
+ ],
+ "backup_config": async_redact_data(
+ coordinator.backup_manager.config.data.to_dict(), [CONF_PASSWORD]
+ ),
+ }
diff --git a/homeassistant/components/backup/entity.py b/homeassistant/components/backup/entity.py
new file mode 100644
index 00000000000..ff7c7889dc5
--- /dev/null
+++ b/homeassistant/components/backup/entity.py
@@ -0,0 +1,36 @@
+"""Base for backup entities."""
+
+from __future__ import annotations
+
+from homeassistant.const import __version__ as HA_VERSION
+from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
+from homeassistant.helpers.entity import EntityDescription
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
+
+from .const import DOMAIN
+from .coordinator import BackupDataUpdateCoordinator
+
+
+class BackupManagerEntity(CoordinatorEntity[BackupDataUpdateCoordinator]):
+ """Base entity for backup manager."""
+
+ _attr_has_entity_name = True
+
+ def __init__(
+ self,
+ coordinator: BackupDataUpdateCoordinator,
+ entity_description: EntityDescription,
+ ) -> None:
+ """Initialize base entity."""
+ super().__init__(coordinator)
+ self.entity_description = entity_description
+ self._attr_unique_id = entity_description.key
+ self._attr_device_info = DeviceInfo(
+ identifiers={(DOMAIN, "backup_manager")},
+ manufacturer="Home Assistant",
+ model="Home Assistant Backup",
+ sw_version=HA_VERSION,
+ name="Backup",
+ entry_type=DeviceEntryType.SERVICE,
+ configuration_url="homeassistant://config/backup",
+ )
diff --git a/homeassistant/components/backup/http.py b/homeassistant/components/backup/http.py
index 58f44d4a449..8f241e6363d 100644
--- a/homeassistant/components/backup/http.py
+++ b/homeassistant/components/backup/http.py
@@ -15,6 +15,7 @@ from multidict import istr
from homeassistant.components.http import KEY_HASS, HomeAssistantView, require_admin
from homeassistant.core import HomeAssistant, callback
from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import frame
from homeassistant.util import slugify
from . import util
@@ -59,11 +60,19 @@ class DownloadBackupView(HomeAssistantView):
if agent_id not in manager.backup_agents:
return Response(status=HTTPStatus.BAD_REQUEST)
agent = manager.backup_agents[agent_id]
- backup = await agent.async_get_backup(backup_id)
+ try:
+ backup = await agent.async_get_backup(backup_id)
+ except BackupNotFound:
+ return Response(status=HTTPStatus.NOT_FOUND)
- # We don't need to check if the path exists, aiohttp.FileResponse will handle
- # that
- if backup is None:
+ # Check for None to be backwards compatible with the old BackupAgent API,
+ # this can be removed in HA Core 2025.10
+ if not backup:
+ frame.report_usage(
+ "returns None from BackupAgent.async_get_backup",
+ breaks_in_ha_version="2025.10",
+ integration_domain=agent_id.partition(".")[0],
+ )
return Response(status=HTTPStatus.NOT_FOUND)
headers = {
@@ -92,6 +101,8 @@ class DownloadBackupView(HomeAssistantView):
) -> StreamResponse | FileResponse | Response:
if agent_id in manager.local_backup_agents:
local_agent = manager.local_backup_agents[agent_id]
+ # We don't need to check if the path exists, aiohttp.FileResponse will
+ # handle that
path = local_agent.get_backup_path(backup_id)
return FileResponse(path=path.as_posix(), headers=headers)
diff --git a/homeassistant/components/backup/manager.py b/homeassistant/components/backup/manager.py
index 25393a872cc..43a7be6db8d 100644
--- a/homeassistant/components/backup/manager.py
+++ b/homeassistant/components/backup/manager.py
@@ -4,6 +4,7 @@ from __future__ import annotations
import abc
import asyncio
+from collections import defaultdict
from collections.abc import AsyncIterator, Callable, Coroutine
from dataclasses import dataclass, replace
from enum import StrEnum
@@ -13,6 +14,7 @@ from itertools import chain
import json
from pathlib import Path, PurePath
import shutil
+import sys
import tarfile
import time
from typing import IO, TYPE_CHECKING, Any, Protocol, TypedDict, cast
@@ -28,10 +30,13 @@ from homeassistant.backup_restore import (
from homeassistant.const import __version__ as HAVERSION
from homeassistant.core import HomeAssistant, callback
from homeassistant.helpers import (
+ frame,
instance_id,
integration_platform,
issue_registry as ir,
+ start,
)
+from homeassistant.helpers.backup import DATA_BACKUP
from homeassistant.helpers.json import json_bytes
from homeassistant.util import dt as dt_util, json as json_util
@@ -42,7 +47,12 @@ from .agent import (
BackupAgentPlatformProtocol,
LocalBackupAgent,
)
-from .config import BackupConfig, delete_backups_exceeding_configured_count
+from .config import (
+ BackupConfig,
+ CreateBackupParametersDict,
+ check_unavailable_agents,
+ delete_backups_exceeding_configured_count,
+)
from .const import (
BUF_SIZE,
DATA_MANAGER,
@@ -55,6 +65,7 @@ from .models import (
AgentBackup,
BackupError,
BackupManagerError,
+ BackupNotFound,
BackupReaderWriterError,
BaseBackup,
Folder,
@@ -109,6 +120,7 @@ class BackupManagerState(StrEnum):
IDLE = "idle"
CREATE_BACKUP = "create_backup"
+ BLOCKED = "blocked"
RECEIVE_BACKUP = "receive_backup"
RESTORE_BACKUP = "restore_backup"
@@ -217,6 +229,20 @@ class RestoreBackupEvent(ManagerStateEvent):
state: RestoreBackupState
+@dataclass(frozen=True, kw_only=True, slots=True)
+class BackupPlatformEvent:
+ """Backup platform class."""
+
+ domain: str
+
+
+@dataclass(frozen=True, kw_only=True, slots=True)
+class BlockedEvent(ManagerStateEvent):
+ """Backup manager blocked, Home Assistant is starting."""
+
+ manager_state: BackupManagerState = BackupManagerState.BLOCKED
+
+
class BackupPlatformProtocol(Protocol):
"""Define the format that backup platforms can have."""
@@ -281,6 +307,10 @@ class BackupReaderWriter(abc.ABC):
) -> None:
"""Get restore events after core restart."""
+ @abc.abstractmethod
+ async def async_validate_config(self, *, config: BackupConfig) -> None:
+ """Validate backup config."""
+
class IncorrectPasswordError(BackupReaderWriterError):
"""Raised when the password is incorrect."""
@@ -296,6 +326,12 @@ class DecryptOnDowloadNotSupported(BackupManagerError):
_message = "On-the-fly decryption is not supported for this backup."
+class BackupManagerExceptionGroup(BackupManagerError, ExceptionGroup):
+ """Raised when multiple exceptions occur."""
+
+ error_code = "multiple_errors"
+
+
class BackupManager:
"""Define the format that backup managers can have."""
@@ -321,9 +357,14 @@ class BackupManager:
self.remove_next_delete_event: Callable[[], None] | None = None
# Latest backup event and backup event subscribers
- self.last_event: ManagerStateEvent = IdleEvent()
- self.last_non_idle_event: ManagerStateEvent | None = None
- self._backup_event_subscriptions: list[Callable[[ManagerStateEvent], None]] = []
+ self.last_event: ManagerStateEvent = BlockedEvent()
+ self.last_action_event: ManagerStateEvent | None = None
+ self._backup_event_subscriptions = hass.data[
+ DATA_BACKUP
+ ].backup_event_subscriptions
+ self._backup_platform_event_subscriptions = hass.data[
+ DATA_BACKUP
+ ].backup_platform_event_subscriptions
async def async_setup(self) -> None:
"""Set up the backup manager."""
@@ -332,10 +373,20 @@ class BackupManager:
self.config.load(stored["config"])
self.known_backups.load(stored["backups"])
+ await self._reader_writer.async_validate_config(config=self.config)
+
await self._reader_writer.async_resume_restore_progress_after_restart(
on_progress=self.async_on_backup_event
)
+ async def set_manager_idle_after_start(hass: HomeAssistant) -> None:
+ """Set manager to idle after start."""
+ self.async_on_backup_event(IdleEvent())
+
+ if self.state == BackupManagerState.BLOCKED:
+ # If we're not finishing a restore job, set the manager to idle after start
+ start.async_at_started(self.hass, set_manager_idle_after_start)
+
await self.load_platforms()
@property
@@ -404,6 +455,13 @@ class BackupManager:
}
)
+ @callback
+ def check_unavailable_agents_after_start(hass: HomeAssistant) -> None:
+ """Check unavailable agents after start."""
+ check_unavailable_agents(hass, self)
+
+ start.async_at_started(self.hass, check_unavailable_agents_after_start)
+
async def _add_platform(
self,
hass: HomeAssistant,
@@ -417,6 +475,9 @@ class BackupManager:
LOGGER.debug("%s platforms loaded in total", len(self.platforms))
LOGGER.debug("%s agents loaded in total", len(self.backup_agents))
LOGGER.debug("%s local agents loaded in total", len(self.local_backup_agents))
+ event = BackupPlatformEvent(domain=integration_domain)
+ for subscription in self._backup_platform_event_subscriptions:
+ subscription(event)
async def async_pre_backup_actions(self) -> None:
"""Perform pre backup actions."""
@@ -560,8 +621,15 @@ class BackupManager:
return_exceptions=True,
)
for idx, result in enumerate(list_backups_results):
+ agent_id = agent_ids[idx]
if isinstance(result, BackupAgentError):
- agent_errors[agent_ids[idx]] = result
+ agent_errors[agent_id] = result
+ continue
+ if isinstance(result, Exception):
+ agent_errors[agent_id] = result
+ LOGGER.error(
+ "Unexpected error for %s: %s", agent_id, result, exc_info=result
+ )
continue
if isinstance(result, BaseException):
raise result # unexpected error
@@ -588,7 +656,7 @@ class BackupManager:
name=agent_backup.name,
with_automatic_settings=with_automatic_settings,
)
- backups[backup_id].agents[agent_ids[idx]] = AgentBackupStatus(
+ backups[backup_id].agents[agent_id] = AgentBackupStatus(
protected=agent_backup.protected,
size=agent_backup.size,
)
@@ -611,12 +679,28 @@ class BackupManager:
return_exceptions=True,
)
for idx, result in enumerate(get_backup_results):
+ agent_id = agent_ids[idx]
+ if isinstance(result, BackupNotFound):
+ continue
if isinstance(result, BackupAgentError):
- agent_errors[agent_ids[idx]] = result
+ agent_errors[agent_id] = result
+ continue
+ if isinstance(result, Exception):
+ agent_errors[agent_id] = result
+ LOGGER.error(
+ "Unexpected error for %s: %s", agent_id, result, exc_info=result
+ )
continue
if isinstance(result, BaseException):
raise result # unexpected error
+ # Check for None to be backwards compatible with the old BackupAgent API,
+ # this can be removed in HA Core 2025.10
if not result:
+ frame.report_usage(
+ "returns None from BackupAgent.async_get_backup",
+ breaks_in_ha_version="2025.10",
+ integration_domain=agent_id.partition(".")[0],
+ )
continue
if backup is None:
if known_backup := self.known_backups.get(backup_id):
@@ -640,7 +724,7 @@ class BackupManager:
name=result.name,
with_automatic_settings=with_automatic_settings,
)
- backup.agents[agent_ids[idx]] = AgentBackupStatus(
+ backup.agents[agent_id] = AgentBackupStatus(
protected=result.protected,
size=result.size,
)
@@ -663,21 +747,33 @@ class BackupManager:
return None
return with_automatic_settings
- async def async_delete_backup(self, backup_id: str) -> dict[str, Exception]:
+ async def async_delete_backup(
+ self, backup_id: str, *, agent_ids: list[str] | None = None
+ ) -> dict[str, Exception]:
"""Delete a backup."""
agent_errors: dict[str, Exception] = {}
- agent_ids = list(self.backup_agents)
+ if agent_ids is None:
+ agent_ids = list(self.backup_agents)
delete_backup_results = await asyncio.gather(
*(
- agent.async_delete_backup(backup_id)
- for agent in self.backup_agents.values()
+ self.backup_agents[agent_id].async_delete_backup(backup_id)
+ for agent_id in agent_ids
),
return_exceptions=True,
)
for idx, result in enumerate(delete_backup_results):
+ agent_id = agent_ids[idx]
+ if isinstance(result, BackupNotFound):
+ continue
if isinstance(result, BackupAgentError):
- agent_errors[agent_ids[idx]] = result
+ agent_errors[agent_id] = result
+ continue
+ if isinstance(result, Exception):
+ agent_errors[agent_id] = result
+ LOGGER.error(
+ "Unexpected error for %s: %s", agent_id, result, exc_info=result
+ )
continue
if isinstance(result, BaseException):
raise result # unexpected error
@@ -710,40 +806,76 @@ class BackupManager:
# Run the include filter first to ensure we only consider backups that
# should be included in the deletion process.
backups = include_filter(backups)
+ backups_by_agent: dict[str, dict[str, ManagerBackup]] = defaultdict(dict)
+ for backup_id, backup in backups.items():
+ for agent_id in backup.agents:
+ backups_by_agent[agent_id][backup_id] = backup
- LOGGER.debug("Total automatic backups: %s", backups)
+ LOGGER.debug("Backups returned by include filter: %s", backups)
+ LOGGER.debug(
+ "Backups returned by include filter by agent: %s",
+ {agent_id: list(backups) for agent_id, backups in backups_by_agent.items()},
+ )
backups_to_delete = delete_filter(backups)
+ LOGGER.debug("Backups returned by delete filter: %s", backups_to_delete)
+
if not backups_to_delete:
return
# always delete oldest backup first
- backups_to_delete = dict(
- sorted(
- backups_to_delete.items(),
- key=lambda backup_item: backup_item[1].date,
- )
+ backups_to_delete_by_agent: dict[str, dict[str, ManagerBackup]] = defaultdict(
+ dict
+ )
+ for backup_id, backup in sorted(
+ backups_to_delete.items(),
+ key=lambda backup_item: backup_item[1].date,
+ ):
+ for agent_id in backup.agents:
+ backups_to_delete_by_agent[agent_id][backup_id] = backup
+ LOGGER.debug(
+ "Backups returned by delete filter by agent: %s",
+ {
+ agent_id: list(backups)
+ for agent_id, backups in backups_to_delete_by_agent.items()
+ },
+ )
+ for agent_id, to_delete_from_agent in backups_to_delete_by_agent.items():
+ if len(to_delete_from_agent) >= len(backups_by_agent[agent_id]):
+ # Never delete the last backup.
+ last_backup = to_delete_from_agent.popitem()
+ LOGGER.debug(
+ "Keeping the last backup %s for agent %s", last_backup, agent_id
+ )
+
+ LOGGER.debug(
+ "Backups to delete by agent: %s",
+ {
+ agent_id: list(backups)
+ for agent_id, backups in backups_to_delete_by_agent.items()
+ },
)
- if len(backups_to_delete) >= len(backups):
- # Never delete the last backup.
- last_backup = backups_to_delete.popitem()
- LOGGER.debug("Keeping the last backup: %s", last_backup)
+ backup_ids_to_delete: dict[str, set[str]] = defaultdict(set)
+ for agent_id, to_delete in backups_to_delete_by_agent.items():
+ for backup_id in to_delete:
+ backup_ids_to_delete[backup_id].add(agent_id)
- LOGGER.debug("Backups to delete: %s", backups_to_delete)
-
- if not backups_to_delete:
+ if not backup_ids_to_delete:
return
- backup_ids = list(backups_to_delete)
+ backup_ids = list(backup_ids_to_delete)
delete_results = await asyncio.gather(
- *(self.async_delete_backup(backup_id) for backup_id in backups_to_delete)
+ *(
+ self.async_delete_backup(backup_id, agent_ids=list(agent_ids))
+ for backup_id, agent_ids in backup_ids_to_delete.items()
+ )
)
agent_errors = {
backup_id: error
for backup_id, error in zip(backup_ids, delete_results, strict=True)
- if error
+ if error and not isinstance(error, BackupNotFound)
}
if agent_errors:
LOGGER.error(
@@ -1175,7 +1307,20 @@ class BackupManager:
) -> None:
"""Initiate restoring a backup."""
agent = self.backup_agents[agent_id]
- if not await agent.async_get_backup(backup_id):
+ try:
+ backup = await agent.async_get_backup(backup_id)
+ except BackupNotFound as err:
+ raise BackupManagerError(
+ f"Backup {backup_id} not found in agent {agent_id}"
+ ) from err
+ # Check for None to be backwards compatible with the old BackupAgent API,
+ # this can be removed in HA Core 2025.10
+ if not backup:
+ frame.report_usage(
+ "returns None from BackupAgent.async_get_backup",
+ breaks_in_ha_version="2025.10",
+ integration_domain=agent_id.partition(".")[0],
+ )
raise BackupManagerError(
f"Backup {backup_id} not found in agent {agent_id}"
)
@@ -1204,24 +1349,11 @@ class BackupManager:
if (current_state := self.state) != (new_state := event.manager_state):
LOGGER.debug("Backup state: %s -> %s", current_state, new_state)
self.last_event = event
- if not isinstance(event, IdleEvent):
- self.last_non_idle_event = event
+ if not isinstance(event, (BlockedEvent, IdleEvent)):
+ self.last_action_event = event
for subscription in self._backup_event_subscriptions:
subscription(event)
- @callback
- def async_subscribe_events(
- self,
- on_event: Callable[[ManagerStateEvent], None],
- ) -> Callable[[], None]:
- """Subscribe events."""
-
- def remove_subscription() -> None:
- self._backup_event_subscriptions.remove(on_event)
-
- self._backup_event_subscriptions.append(on_event)
- return remove_subscription
-
def _update_issue_backup_failed(self) -> None:
"""Update issue registry when a backup fails."""
ir.async_create_issue(
@@ -1276,7 +1408,20 @@ class BackupManager:
agent = self.backup_agents[agent_id]
except KeyError as err:
raise BackupManagerError(f"Invalid agent selected: {agent_id}") from err
- if not await agent.async_get_backup(backup_id):
+ try:
+ backup = await agent.async_get_backup(backup_id)
+ except BackupNotFound as err:
+ raise BackupManagerError(
+ f"Backup {backup_id} not found in agent {agent_id}"
+ ) from err
+ # Check for None to be backwards compatible with the old BackupAgent API,
+ # this can be removed in HA Core 2025.10
+ if not backup:
+ frame.report_usage(
+ "returns None from BackupAgent.async_get_backup",
+ breaks_in_ha_version="2025.10",
+ integration_domain=agent_id.partition(".")[0],
+ )
raise BackupManagerError(
f"Backup {backup_id} not found in agent {agent_id}"
)
@@ -1536,10 +1681,24 @@ class CoreBackupReaderWriter(BackupReaderWriter):
)
finally:
# Inform integrations the backup is done
+ # If there's an unhandled exception, we keep it so we can rethrow it in case
+ # the post backup actions also fail.
+ unhandled_exc = sys.exception()
try:
- await manager.async_post_backup_actions()
- except BackupManagerError as err:
- raise BackupReaderWriterError(str(err)) from err
+ try:
+ await manager.async_post_backup_actions()
+ except BackupManagerError as err:
+ raise BackupReaderWriterError(str(err)) from err
+ except Exception as err:
+ if not unhandled_exc:
+ raise
+ # If there's an unhandled exception, we wrap both that and the exception
+ # from the post backup actions in an ExceptionGroup so the caller is
+ # aware of both exceptions.
+ raise BackupManagerExceptionGroup(
+ f"Multiple errors when creating backup: {unhandled_exc}, {err}",
+ [unhandled_exc, err],
+ ) from None
def _mkdir_and_generate_backup_contents(
self,
@@ -1551,7 +1710,13 @@ class CoreBackupReaderWriter(BackupReaderWriter):
"""Generate backup contents and return the size."""
if not tar_file_path:
tar_file_path = self.temp_backup_dir / f"{backup_data['slug']}.tar"
- make_backup_dir(tar_file_path.parent)
+ try:
+ make_backup_dir(tar_file_path.parent)
+ except OSError as err:
+ raise BackupReaderWriterError(
+ f"Failed to create dir {tar_file_path.parent}: "
+ f"{err} ({err.__class__.__name__})"
+ ) from err
excludes = EXCLUDE_FROM_BACKUP
if not database_included:
@@ -1561,7 +1726,9 @@ class CoreBackupReaderWriter(BackupReaderWriter):
"""Filter to filter excludes."""
for exclude in excludes:
- if not path.match(exclude):
+ # The home assistant core configuration directory is added as "data"
+ # in the tar file, so we need to prefix that path to the filters.
+ if not path.full_match(f"data/{exclude}"):
continue
LOGGER.debug("Ignoring %s because of %s", path, exclude)
return True
@@ -1589,7 +1756,14 @@ class CoreBackupReaderWriter(BackupReaderWriter):
file_filter=is_excluded_by_filter,
arcname="data",
)
- return (tar_file_path, tar_file_path.stat().st_size)
+ try:
+ stat_result = tar_file_path.stat()
+ except OSError as err:
+ raise BackupReaderWriterError(
+ f"Error getting size of {tar_file_path}: "
+ f"{err} ({err.__class__.__name__})"
+ ) from err
+ return (tar_file_path, stat_result.st_size)
async def async_receive_backup(
self,
@@ -1771,6 +1945,44 @@ class CoreBackupReaderWriter(BackupReaderWriter):
)
on_progress(IdleEvent())
+ async def async_validate_config(self, *, config: BackupConfig) -> None:
+ """Validate backup config.
+
+ Update automatic backup settings to not include addons or folders and remove
+ hassio agents in case a backup created by supervisor was restored.
+ """
+ create_backup = config.data.create_backup
+ if (
+ not create_backup.include_addons
+ and not create_backup.include_all_addons
+ and not create_backup.include_folders
+ and not any(a_id.startswith("hassio.") for a_id in create_backup.agent_ids)
+ ):
+ LOGGER.debug("Backup settings don't need to be adjusted")
+ return
+
+ LOGGER.info(
+ "Adjusting backup settings to not include addons, folders or supervisor locations"
+ )
+ automatic_agents = [
+ agent_id
+ for agent_id in create_backup.agent_ids
+ if not agent_id.startswith("hassio.")
+ ]
+ if (
+ self._local_agent_id not in automatic_agents
+ and "hassio.local" in create_backup.agent_ids
+ ):
+ automatic_agents = [self._local_agent_id, *automatic_agents]
+ config.update(
+ create_backup=CreateBackupParametersDict(
+ agent_ids=automatic_agents,
+ include_addons=None,
+ include_all_addons=False,
+ include_folders=None,
+ )
+ )
+
def _generate_backup_id(date: str, name: str) -> str:
"""Generate a backup ID."""
diff --git a/homeassistant/components/backup/manifest.json b/homeassistant/components/backup/manifest.json
index 6cbfb834c7f..3c7b1e5e014 100644
--- a/homeassistant/components/backup/manifest.json
+++ b/homeassistant/components/backup/manifest.json
@@ -5,8 +5,9 @@
"codeowners": ["@home-assistant/core"],
"dependencies": ["http", "websocket_api"],
"documentation": "https://www.home-assistant.io/integrations/backup",
- "integration_type": "system",
+ "integration_type": "service",
"iot_class": "calculated",
"quality_scale": "internal",
- "requirements": ["cronsim==2.6", "securetar==2025.1.4"]
+ "requirements": ["cronsim==2.6", "securetar==2025.2.1"],
+ "single_config_entry": true
}
diff --git a/homeassistant/components/backup/onboarding.py b/homeassistant/components/backup/onboarding.py
new file mode 100644
index 00000000000..ad7027c988c
--- /dev/null
+++ b/homeassistant/components/backup/onboarding.py
@@ -0,0 +1,136 @@
+"""Backup onboarding views."""
+
+from __future__ import annotations
+
+from collections.abc import Callable, Coroutine
+from functools import wraps
+from http import HTTPStatus
+from typing import TYPE_CHECKING, Any, Concatenate
+
+from aiohttp import web
+from aiohttp.web_exceptions import HTTPUnauthorized
+import voluptuous as vol
+
+from homeassistant.components.http import KEY_HASS
+from homeassistant.components.http.data_validator import RequestDataValidator
+from homeassistant.components.onboarding import (
+ BaseOnboardingView,
+ NoAuthBaseOnboardingView,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.backup import async_get_manager as async_get_backup_manager
+
+from . import BackupManager, Folder, IncorrectPasswordError, http as backup_http
+
+if TYPE_CHECKING:
+ from homeassistant.components.onboarding import OnboardingStoreData
+
+
+async def async_setup_views(hass: HomeAssistant, data: OnboardingStoreData) -> None:
+ """Set up the backup views."""
+
+ hass.http.register_view(BackupInfoView(data))
+ hass.http.register_view(RestoreBackupView(data))
+ hass.http.register_view(UploadBackupView(data))
+
+
+def with_backup_manager[_ViewT: BaseOnboardingView, **_P](
+ func: Callable[
+ Concatenate[_ViewT, BackupManager, web.Request, _P],
+ Coroutine[Any, Any, web.Response],
+ ],
+) -> Callable[Concatenate[_ViewT, web.Request, _P], Coroutine[Any, Any, web.Response]]:
+ """Home Assistant API decorator to check onboarding and inject manager."""
+
+ @wraps(func)
+ async def with_backup(
+ self: _ViewT,
+ request: web.Request,
+ *args: _P.args,
+ **kwargs: _P.kwargs,
+ ) -> web.Response:
+ """Check admin and call function."""
+ if self._data["done"]:
+ raise HTTPUnauthorized
+
+ manager = await async_get_backup_manager(request.app[KEY_HASS])
+ return await func(self, manager, request, *args, **kwargs)
+
+ return with_backup
+
+
+class BackupInfoView(NoAuthBaseOnboardingView):
+ """Get backup info view."""
+
+ url = "/api/onboarding/backup/info"
+ name = "api:onboarding:backup:info"
+
+ @with_backup_manager
+ async def get(self, manager: BackupManager, request: web.Request) -> web.Response:
+ """Return backup info."""
+ backups, _ = await manager.async_get_backups()
+ return self.json(
+ {
+ "backups": list(backups.values()),
+ "state": manager.state,
+ "last_action_event": manager.last_action_event,
+ }
+ )
+
+
+class RestoreBackupView(NoAuthBaseOnboardingView):
+ """Restore backup view."""
+
+ url = "/api/onboarding/backup/restore"
+ name = "api:onboarding:backup:restore"
+
+ @RequestDataValidator(
+ vol.Schema(
+ {
+ vol.Required("backup_id"): str,
+ vol.Required("agent_id"): str,
+ vol.Optional("password"): str,
+ vol.Optional("restore_addons"): [str],
+ vol.Optional("restore_database", default=True): bool,
+ vol.Optional("restore_folders"): [vol.Coerce(Folder)],
+ }
+ )
+ )
+ @with_backup_manager
+ async def post(
+ self, manager: BackupManager, request: web.Request, data: dict[str, Any]
+ ) -> web.Response:
+ """Restore a backup."""
+ try:
+ await manager.async_restore_backup(
+ data["backup_id"],
+ agent_id=data["agent_id"],
+ password=data.get("password"),
+ restore_addons=data.get("restore_addons"),
+ restore_database=data["restore_database"],
+ restore_folders=data.get("restore_folders"),
+ restore_homeassistant=True,
+ )
+ except IncorrectPasswordError:
+ return self.json(
+ {"code": "incorrect_password"}, status_code=HTTPStatus.BAD_REQUEST
+ )
+ except HomeAssistantError as err:
+ return self.json(
+ {"code": "restore_failed", "message": str(err)},
+ status_code=HTTPStatus.BAD_REQUEST,
+ )
+ return web.Response(status=HTTPStatus.OK)
+
+
+class UploadBackupView(NoAuthBaseOnboardingView, backup_http.UploadBackupView):
+ """Upload backup view."""
+
+ url = "/api/onboarding/backup/upload"
+ name = "api:onboarding:backup:upload"
+
+ @with_backup_manager
+ async def post(self, manager: BackupManager, request: web.Request) -> web.Response:
+ """Upload a backup file."""
+ return await self._post(request)
diff --git a/homeassistant/components/backup/sensor.py b/homeassistant/components/backup/sensor.py
new file mode 100644
index 00000000000..59e98ae7c2d
--- /dev/null
+++ b/homeassistant/components/backup/sensor.py
@@ -0,0 +1,75 @@
+"""Sensor platform for Home Assistant Backup integration."""
+
+from __future__ import annotations
+
+from collections.abc import Callable
+from dataclasses import dataclass
+from datetime import datetime
+
+from homeassistant.components.sensor import (
+ SensorDeviceClass,
+ SensorEntity,
+ SensorEntityDescription,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from .coordinator import BackupConfigEntry, BackupCoordinatorData
+from .entity import BackupManagerEntity
+from .manager import BackupManagerState
+
+
+@dataclass(kw_only=True, frozen=True)
+class BackupSensorEntityDescription(SensorEntityDescription):
+ """Description for Home Assistant Backup sensor entities."""
+
+ value_fn: Callable[[BackupCoordinatorData], str | datetime | None]
+
+
+BACKUP_MANAGER_DESCRIPTIONS = (
+ BackupSensorEntityDescription(
+ key="backup_manager_state",
+ translation_key="backup_manager_state",
+ device_class=SensorDeviceClass.ENUM,
+ options=[state.value for state in BackupManagerState],
+ value_fn=lambda data: data.backup_manager_state,
+ ),
+ BackupSensorEntityDescription(
+ key="next_scheduled_automatic_backup",
+ translation_key="next_scheduled_automatic_backup",
+ device_class=SensorDeviceClass.TIMESTAMP,
+ value_fn=lambda data: data.next_scheduled_automatic_backup,
+ ),
+ BackupSensorEntityDescription(
+ key="last_successful_automatic_backup",
+ translation_key="last_successful_automatic_backup",
+ device_class=SensorDeviceClass.TIMESTAMP,
+ value_fn=lambda data: data.last_successful_automatic_backup,
+ ),
+)
+
+
+async def async_setup_entry(
+ hass: HomeAssistant,
+ config_entry: BackupConfigEntry,
+ async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+ """Sensor set up for backup config entry."""
+
+ coordinator = config_entry.runtime_data
+
+ async_add_entities(
+ BackupManagerSensor(coordinator, description)
+ for description in BACKUP_MANAGER_DESCRIPTIONS
+ )
+
+
+class BackupManagerSensor(BackupManagerEntity, SensorEntity):
+ """Sensor to track backup manager state."""
+
+ entity_description: BackupSensorEntityDescription
+
+ @property
+ def native_value(self) -> str | datetime | None:
+ """Return native value of entity."""
+ return self.entity_description.value_fn(self.coordinator.data)
diff --git a/homeassistant/components/backup/store.py b/homeassistant/components/backup/store.py
index 9b4af823c77..883447853e6 100644
--- a/homeassistant/components/backup/store.py
+++ b/homeassistant/components/backup/store.py
@@ -16,7 +16,7 @@ if TYPE_CHECKING:
STORE_DELAY_SAVE = 30
STORAGE_KEY = DOMAIN
STORAGE_VERSION = 1
-STORAGE_VERSION_MINOR = 3
+STORAGE_VERSION_MINOR = 5
class StoredBackupData(TypedDict):
@@ -60,6 +60,18 @@ class _BackupStore(Store[StoredBackupData]):
else:
data["config"]["schedule"]["days"] = [state]
data["config"]["schedule"]["recurrence"] = "custom_days"
+ if old_minor_version < 4:
+ # Workaround for a bug in frontend which incorrectly set days to 0
+ # instead of to None for unlimited retention.
+ if data["config"]["retention"]["copies"] == 0:
+ data["config"]["retention"]["copies"] = None
+ if data["config"]["retention"]["days"] == 0:
+ data["config"]["retention"]["days"] = None
+ if old_minor_version < 5:
+ # Version 1.5 adds automatic_backups_configured
+ data["config"]["automatic_backups_configured"] = (
+ data["config"]["create_backup"]["password"] is not None
+ )
# Note: We allow reading data with major version 2.
# Reject if major version is higher than 2.
diff --git a/homeassistant/components/backup/strings.json b/homeassistant/components/backup/strings.json
index 32d76ded049..357bcdbb72f 100644
--- a/homeassistant/components/backup/strings.json
+++ b/homeassistant/components/backup/strings.json
@@ -1,5 +1,9 @@
{
"issues": {
+ "automatic_backup_agents_unavailable": {
+ "title": "The backup location {agent_id} is unavailable",
+ "description": "The backup location `{agent_id}` is unavailable but is still configured for automatic backups.\n\nPlease visit the [automatic backup configuration page]({backup_settings}) to review and update your backup locations. Backups will not be uploaded to selected locations that are unavailable."
+ },
"automatic_backup_failed_create": {
"title": "Automatic backup could not be created",
"description": "The automatic backup could not be created. Please check the logs for more information. Another attempt will be made at the next scheduled time if a backup schedule is configured."
@@ -18,5 +22,24 @@
"name": "Create automatic backup",
"description": "Creates a new backup with automatic backup settings."
}
+ },
+ "entity": {
+ "sensor": {
+ "backup_manager_state": {
+ "name": "Backup Manager state",
+ "state": {
+ "idle": "[%key:common::state::idle%]",
+ "create_backup": "Creating a backup",
+ "receive_backup": "Receiving a backup",
+ "restore_backup": "Restoring a backup"
+ }
+ },
+ "next_scheduled_automatic_backup": {
+ "name": "Next scheduled automatic backup"
+ },
+ "last_successful_automatic_backup": {
+ "name": "Last successful automatic backup"
+ }
+ }
}
}
diff --git a/homeassistant/components/backup/util.py b/homeassistant/components/backup/util.py
index 9d8f6e815dc..bd77880738e 100644
--- a/homeassistant/components/backup/util.py
+++ b/homeassistant/components/backup/util.py
@@ -104,12 +104,15 @@ def read_backup(backup_path: Path) -> AgentBackup:
bool, homeassistant.get("exclude_database", False)
)
+ extra_metadata = cast(dict[str, bool | str], data.get("extra", {}))
+ date = extra_metadata.get("supervisor.backup_request_date", data["date"])
+
return AgentBackup(
addons=addons,
backup_id=cast(str, data["slug"]),
database_included=database_included,
- date=cast(str, data["date"]),
- extra_metadata=cast(dict[str, bool | str], data.get("extra", {})),
+ date=cast(str, date),
+ extra_metadata=extra_metadata,
folders=folders,
homeassistant_included=homeassistant_included,
homeassistant_version=homeassistant_version,
diff --git a/homeassistant/components/backup/websocket.py b/homeassistant/components/backup/websocket.py
index b6d092e1913..4c370a4224d 100644
--- a/homeassistant/components/backup/websocket.py
+++ b/homeassistant/components/backup/websocket.py
@@ -10,11 +10,7 @@ from homeassistant.helpers import config_validation as cv
from .config import Day, ScheduleRecurrence
from .const import DATA_MANAGER, LOGGER
-from .manager import (
- DecryptOnDowloadNotSupported,
- IncorrectPasswordError,
- ManagerStateEvent,
-)
+from .manager import DecryptOnDowloadNotSupported, IncorrectPasswordError
from .models import BackupNotFound, Folder
@@ -34,7 +30,6 @@ def async_register_websocket_handlers(hass: HomeAssistant, with_hassio: bool) ->
websocket_api.async_register_command(hass, handle_create_with_automatic_settings)
websocket_api.async_register_command(hass, handle_delete)
websocket_api.async_register_command(hass, handle_restore)
- websocket_api.async_register_command(hass, handle_subscribe_events)
websocket_api.async_register_command(hass, handle_config_info)
websocket_api.async_register_command(hass, handle_config_update)
@@ -60,7 +55,7 @@ async def handle_info(
"backups": list(backups.values()),
"last_attempted_automatic_backup": manager.config.data.last_attempted_automatic_backup,
"last_completed_automatic_backup": manager.config.data.last_completed_automatic_backup,
- "last_non_idle_event": manager.last_non_idle_event,
+ "last_action_event": manager.last_action_event,
"next_automatic_backup": manager.config.data.schedule.next_automatic_backup,
"next_automatic_backup_additional": manager.config.data.schedule.next_automatic_backup_additional,
"state": manager.state,
@@ -346,11 +341,13 @@ async def handle_config_info(
)
+@callback
@websocket_api.require_admin
@websocket_api.websocket_command(
{
vol.Required("type"): "backup/config/update",
vol.Optional("agents"): vol.Schema({str: {"protected": bool}}),
+ vol.Optional("automatic_backups_configured"): bool,
vol.Optional("create_backup"): vol.Schema(
{
vol.Optional("agent_ids"): vol.All([str], vol.Unique()),
@@ -368,8 +365,10 @@ async def handle_config_info(
),
vol.Optional("retention"): vol.Schema(
{
- vol.Optional("copies"): vol.Any(int, None),
- vol.Optional("days"): vol.Any(int, None),
+ # Note: We can't use cv.positive_int because it allows 0 even
+ # though 0 is not positive.
+ vol.Optional("copies"): vol.Any(vol.All(int, vol.Range(min=1)), None),
+ vol.Optional("days"): vol.Any(vol.All(int, vol.Range(min=1)), None),
},
),
vol.Optional("schedule"): vol.Schema(
@@ -385,8 +384,7 @@ async def handle_config_info(
),
}
)
-@websocket_api.async_response
-async def handle_config_update(
+def handle_config_update(
hass: HomeAssistant,
connection: websocket_api.ActiveConnection,
msg: dict[str, Any],
@@ -396,24 +394,5 @@ async def handle_config_update(
changes = dict(msg)
changes.pop("id")
changes.pop("type")
- await manager.config.update(**changes)
- connection.send_result(msg["id"])
-
-
-@websocket_api.require_admin
-@websocket_api.websocket_command({vol.Required("type"): "backup/subscribe_events"})
-@websocket_api.async_response
-async def handle_subscribe_events(
- hass: HomeAssistant,
- connection: websocket_api.ActiveConnection,
- msg: dict[str, Any],
-) -> None:
- """Subscribe to backup events."""
-
- def on_event(event: ManagerStateEvent) -> None:
- connection.send_message(websocket_api.event_message(msg["id"], event))
-
- manager = hass.data[DATA_MANAGER]
- on_event(manager.last_event)
- connection.subscriptions[msg["id"]] = manager.async_subscribe_events(on_event)
+ manager.config.update(**changes)
connection.send_result(msg["id"])
diff --git a/homeassistant/components/baf/binary_sensor.py b/homeassistant/components/baf/binary_sensor.py
index 7c855711712..e12bfd8b90c 100644
--- a/homeassistant/components/baf/binary_sensor.py
+++ b/homeassistant/components/baf/binary_sensor.py
@@ -14,7 +14,7 @@ from homeassistant.components.binary_sensor import (
BinarySensorEntityDescription,
)
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import BAFConfigEntry
from .entity import BAFDescriptionEntity
@@ -41,7 +41,7 @@ OCCUPANCY_SENSORS = (
async def async_setup_entry(
hass: HomeAssistant,
entry: BAFConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up BAF binary sensors."""
device = entry.runtime_data
diff --git a/homeassistant/components/baf/climate.py b/homeassistant/components/baf/climate.py
index c30d49e8c9d..abcc2afe254 100644
--- a/homeassistant/components/baf/climate.py
+++ b/homeassistant/components/baf/climate.py
@@ -12,7 +12,7 @@ from homeassistant.components.climate import (
)
from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import BAFConfigEntry
from .entity import BAFEntity
@@ -21,7 +21,7 @@ from .entity import BAFEntity
async def async_setup_entry(
hass: HomeAssistant,
entry: BAFConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up BAF fan auto comfort."""
device = entry.runtime_data
diff --git a/homeassistant/components/baf/fan.py b/homeassistant/components/baf/fan.py
index 8f7aab40b79..c990a248588 100644
--- a/homeassistant/components/baf/fan.py
+++ b/homeassistant/components/baf/fan.py
@@ -14,7 +14,7 @@ from homeassistant.components.fan import (
FanEntityFeature,
)
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.util.percentage import (
percentage_to_ranged_value,
ranged_value_to_percentage,
@@ -28,7 +28,7 @@ from .entity import BAFEntity
async def async_setup_entry(
hass: HomeAssistant,
entry: BAFConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up SenseME fans."""
device = entry.runtime_data
diff --git a/homeassistant/components/baf/light.py b/homeassistant/components/baf/light.py
index 4c0b1e353fe..e8298a8e4d4 100644
--- a/homeassistant/components/baf/light.py
+++ b/homeassistant/components/baf/light.py
@@ -13,7 +13,7 @@ from homeassistant.components.light import (
LightEntity,
)
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import BAFConfigEntry
from .entity import BAFEntity
@@ -22,7 +22,7 @@ from .entity import BAFEntity
async def async_setup_entry(
hass: HomeAssistant,
entry: BAFConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up BAF lights."""
device = entry.runtime_data
diff --git a/homeassistant/components/baf/number.py b/homeassistant/components/baf/number.py
index a2e5e704e4d..87b5cdc095b 100644
--- a/homeassistant/components/baf/number.py
+++ b/homeassistant/components/baf/number.py
@@ -15,7 +15,7 @@ from homeassistant.components.number import (
)
from homeassistant.const import EntityCategory, UnitOfTime
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import BAFConfigEntry
from .const import HALF_DAY_SECS, ONE_DAY_SECS, ONE_MIN_SECS, SPEED_RANGE
@@ -116,7 +116,7 @@ LIGHT_NUMBER_DESCRIPTIONS = (
async def async_setup_entry(
hass: HomeAssistant,
entry: BAFConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up BAF numbers."""
device = entry.runtime_data
diff --git a/homeassistant/components/baf/sensor.py b/homeassistant/components/baf/sensor.py
index 7e664254a38..e9b8965b7c4 100644
--- a/homeassistant/components/baf/sensor.py
+++ b/homeassistant/components/baf/sensor.py
@@ -21,7 +21,7 @@ from homeassistant.const import (
UnitOfTemperature,
)
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import BAFConfigEntry
from .entity import BAFDescriptionEntity
@@ -93,7 +93,7 @@ FAN_SENSORS = (
async def async_setup_entry(
hass: HomeAssistant,
entry: BAFConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up BAF fan sensors."""
device = entry.runtime_data
diff --git a/homeassistant/components/baf/strings.json b/homeassistant/components/baf/strings.json
index e2f02a6095e..629a3041df5 100644
--- a/homeassistant/components/baf/strings.json
+++ b/homeassistant/components/baf/strings.json
@@ -23,7 +23,7 @@
"entity": {
"climate": {
"auto_comfort": {
- "name": "Auto comfort"
+ "name": "Auto Comfort"
}
},
"fan": {
@@ -31,7 +31,7 @@
"state_attributes": {
"preset_mode": {
"state": {
- "auto": "[%key:component::climate::entity_component::_::state_attributes::fan_mode::state::auto%]"
+ "auto": "[%key:common::state::auto%]"
}
}
}
@@ -39,25 +39,25 @@
},
"number": {
"comfort_min_speed": {
- "name": "Auto Comfort Minimum Speed"
+ "name": "Auto Comfort minimum speed"
},
"comfort_max_speed": {
- "name": "Auto Comfort Maximum Speed"
+ "name": "Auto Comfort maximum speed"
},
"comfort_heat_assist_speed": {
- "name": "Auto Comfort Heat Assist Speed"
+ "name": "Auto Comfort Heat Assist speed"
},
"return_to_auto_timeout": {
- "name": "Return to Auto Timeout"
+ "name": "Return to Auto timeout"
},
"motion_sense_timeout": {
- "name": "Motion Sense Timeout"
+ "name": "Motion sense timeout"
},
"light_return_to_auto_timeout": {
- "name": "Light Return to Auto Timeout"
+ "name": "Light return to Auto timeout"
},
"light_auto_motion_timeout": {
- "name": "Light Motion Sense Timeout"
+ "name": "Light motion sense timeout"
}
},
"sensor": {
@@ -76,10 +76,10 @@
},
"switch": {
"legacy_ir_remote_enable": {
- "name": "Legacy IR Remote"
+ "name": "Legacy IR remote"
},
"led_indicators_enable": {
- "name": "Led Indicators"
+ "name": "LED indicators"
},
"comfort_heat_assist_enable": {
"name": "Auto Comfort Heat Assist"
@@ -88,10 +88,10 @@
"name": "Beep"
},
"eco_enable": {
- "name": "Eco Mode"
+ "name": "Eco mode"
},
"motion_sense_enable": {
- "name": "Motion Sense"
+ "name": "Motion sense"
},
"return_to_auto_enable": {
"name": "Return to Auto"
@@ -103,7 +103,7 @@
"name": "Dim to Warm"
},
"light_return_to_auto_enable": {
- "name": "Light Return to Auto"
+ "name": "Light return to Auto"
}
}
}
diff --git a/homeassistant/components/baf/switch.py b/homeassistant/components/baf/switch.py
index e18e26ddcaa..50bd90a6107 100644
--- a/homeassistant/components/baf/switch.py
+++ b/homeassistant/components/baf/switch.py
@@ -11,7 +11,7 @@ from aiobafi6 import Device
from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
from homeassistant.const import EntityCategory
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import BAFConfigEntry
from .entity import BAFDescriptionEntity
@@ -103,7 +103,7 @@ LIGHT_SWITCHES = [
async def async_setup_entry(
hass: HomeAssistant,
entry: BAFConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up BAF fan switches."""
device = entry.runtime_data
diff --git a/homeassistant/components/balay/__init__.py b/homeassistant/components/balay/__init__.py
new file mode 100644
index 00000000000..e7fa8bba86d
--- /dev/null
+++ b/homeassistant/components/balay/__init__.py
@@ -0,0 +1 @@
+"""Balay virtual integration."""
diff --git a/homeassistant/components/balay/manifest.json b/homeassistant/components/balay/manifest.json
new file mode 100644
index 00000000000..98e4f521c7a
--- /dev/null
+++ b/homeassistant/components/balay/manifest.json
@@ -0,0 +1,6 @@
+{
+ "domain": "balay",
+ "name": "Balay",
+ "integration_type": "virtual",
+ "supported_by": "home_connect"
+}
diff --git a/homeassistant/components/balboa/__init__.py b/homeassistant/components/balboa/__init__.py
index c982d59d513..54ae569bb78 100644
--- a/homeassistant/components/balboa/__init__.py
+++ b/homeassistant/components/balboa/__init__.py
@@ -21,12 +21,14 @@ _LOGGER = logging.getLogger(__name__)
PLATFORMS = [
Platform.BINARY_SENSOR,
Platform.CLIMATE,
+ Platform.EVENT,
Platform.FAN,
Platform.LIGHT,
Platform.SELECT,
+ Platform.SWITCH,
+ Platform.TIME,
]
-
KEEP_ALIVE_INTERVAL = timedelta(minutes=1)
SYNC_TIME_INTERVAL = timedelta(hours=1)
diff --git a/homeassistant/components/balboa/binary_sensor.py b/homeassistant/components/balboa/binary_sensor.py
index b8c62ce8abf..437a01866b8 100644
--- a/homeassistant/components/balboa/binary_sensor.py
+++ b/homeassistant/components/balboa/binary_sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.binary_sensor import (
BinarySensorEntityDescription,
)
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import BalboaConfigEntry
from .entity import BalboaEntity
@@ -22,7 +22,7 @@ from .entity import BalboaEntity
async def async_setup_entry(
hass: HomeAssistant,
entry: BalboaConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the spa's binary sensors."""
spa = entry.runtime_data
diff --git a/homeassistant/components/balboa/climate.py b/homeassistant/components/balboa/climate.py
index 76b02f0e165..3fb2457d610 100644
--- a/homeassistant/components/balboa/climate.py
+++ b/homeassistant/components/balboa/climate.py
@@ -21,7 +21,7 @@ from homeassistant.const import (
UnitOfTemperature,
)
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import BalboaConfigEntry
from .const import DOMAIN
@@ -47,7 +47,7 @@ TEMPERATURE_UNIT_MAP = {
async def async_setup_entry(
hass: HomeAssistant,
entry: BalboaConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the spa climate entity."""
async_add_entities([BalboaClimateEntity(entry.runtime_data)])
diff --git a/homeassistant/components/balboa/event.py b/homeassistant/components/balboa/event.py
new file mode 100644
index 00000000000..57263c34783
--- /dev/null
+++ b/homeassistant/components/balboa/event.py
@@ -0,0 +1,91 @@
+"""Support for Balboa events."""
+
+from __future__ import annotations
+
+from datetime import datetime, timedelta
+
+from pybalboa import EVENT_UPDATE, SpaClient
+
+from homeassistant.components.event import EventEntity
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.helpers.event import async_track_time_interval
+
+from . import BalboaConfigEntry
+from .entity import BalboaEntity
+
+FAULT = "fault"
+FAULT_DATE = "fault_date"
+REQUEST_FAULT_LOG_INTERVAL = timedelta(minutes=5)
+
+FAULT_MESSAGE_CODE_MAP: dict[int, str] = {
+ 15: "sensor_out_of_sync",
+ 16: "low_flow",
+ 17: "flow_failed",
+ 18: "settings_reset",
+ 19: "priming_mode",
+ 20: "clock_failed",
+ 21: "settings_reset",
+ 22: "memory_failure",
+ 26: "service_sensor_sync",
+ 27: "heater_dry",
+ 28: "heater_may_be_dry",
+ 29: "water_too_hot",
+ 30: "heater_too_hot",
+ 31: "sensor_a_fault",
+ 32: "sensor_b_fault",
+ 34: "pump_stuck",
+ 35: "hot_fault",
+ 36: "gfci_test_failed",
+ 37: "standby_mode",
+}
+FAULT_EVENT_TYPES = sorted(set(FAULT_MESSAGE_CODE_MAP.values()))
+
+
+async def async_setup_entry(
+ hass: HomeAssistant,
+ entry: BalboaConfigEntry,
+ async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+ """Set up the spa's events."""
+ async_add_entities([BalboaEventEntity(entry.runtime_data)])
+
+
+class BalboaEventEntity(BalboaEntity, EventEntity):
+ """Representation of a Balboa event entity."""
+
+ _attr_event_types = FAULT_EVENT_TYPES
+ _attr_translation_key = FAULT
+
+ def __init__(self, spa: SpaClient) -> None:
+ """Initialize a Balboa event entity."""
+ super().__init__(spa, FAULT)
+
+ @callback
+ def _async_handle_event(self) -> None:
+ """Handle the fault event."""
+ if not (fault := self._client.fault):
+ return
+ fault_date = fault.fault_datetime.isoformat()
+ if self.state_attributes.get(FAULT_DATE) != fault_date:
+ self._trigger_event(
+ FAULT_MESSAGE_CODE_MAP.get(fault.message_code, fault.message),
+ {FAULT_DATE: fault_date, "code": fault.message_code},
+ )
+ self.async_write_ha_state()
+
+ async def async_added_to_hass(self) -> None:
+ """Run when entity about to be added to hass."""
+ await super().async_added_to_hass()
+ self.async_on_remove(self._client.on(EVENT_UPDATE, self._async_handle_event))
+
+ async def request_fault_log(now: datetime | None = None) -> None:
+ """Request the most recent fault log."""
+ await self._client.request_fault_log()
+
+ await request_fault_log()
+ self.async_on_remove(
+ async_track_time_interval(
+ self.hass, request_fault_log, REQUEST_FAULT_LOG_INTERVAL
+ )
+ )
diff --git a/homeassistant/components/balboa/fan.py b/homeassistant/components/balboa/fan.py
index 3ecfec53a1e..b0d4379594b 100644
--- a/homeassistant/components/balboa/fan.py
+++ b/homeassistant/components/balboa/fan.py
@@ -10,7 +10,7 @@ from pybalboa.enums import OffOnState, UnknownState
from homeassistant.components.fan import FanEntity, FanEntityFeature
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.util.percentage import (
percentage_to_ranged_value,
ranged_value_to_percentage,
@@ -23,7 +23,7 @@ from .entity import BalboaEntity
async def async_setup_entry(
hass: HomeAssistant,
entry: BalboaConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the spa's pumps."""
spa = entry.runtime_data
diff --git a/homeassistant/components/balboa/light.py b/homeassistant/components/balboa/light.py
index 21e4dfc5e08..2f48747c084 100644
--- a/homeassistant/components/balboa/light.py
+++ b/homeassistant/components/balboa/light.py
@@ -9,7 +9,7 @@ from pybalboa.enums import OffOnState, UnknownState
from homeassistant.components.light import ColorMode, LightEntity
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import BalboaConfigEntry
from .entity import BalboaEntity
@@ -18,7 +18,7 @@ from .entity import BalboaEntity
async def async_setup_entry(
hass: HomeAssistant,
entry: BalboaConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the spa's lights."""
spa = entry.runtime_data
diff --git a/homeassistant/components/balboa/manifest.json b/homeassistant/components/balboa/manifest.json
index 867e277358c..38d32adc4af 100644
--- a/homeassistant/components/balboa/manifest.json
+++ b/homeassistant/components/balboa/manifest.json
@@ -14,5 +14,5 @@
"documentation": "https://www.home-assistant.io/integrations/balboa",
"iot_class": "local_push",
"loggers": ["pybalboa"],
- "requirements": ["pybalboa==1.0.2"]
+ "requirements": ["pybalboa==1.1.3"]
}
diff --git a/homeassistant/components/balboa/select.py b/homeassistant/components/balboa/select.py
index e88e40ab063..ea82760744c 100644
--- a/homeassistant/components/balboa/select.py
+++ b/homeassistant/components/balboa/select.py
@@ -5,7 +5,7 @@ from pybalboa.enums import LowHighRange
from homeassistant.components.select import SelectEntity
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import BalboaConfigEntry
from .entity import BalboaEntity
@@ -14,7 +14,7 @@ from .entity import BalboaEntity
async def async_setup_entry(
hass: HomeAssistant,
entry: BalboaConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the spa select entity."""
spa = entry.runtime_data
diff --git a/homeassistant/components/balboa/strings.json b/homeassistant/components/balboa/strings.json
index c00567a6052..8297e2e3b9f 100644
--- a/homeassistant/components/balboa/strings.json
+++ b/homeassistant/components/balboa/strings.json
@@ -57,6 +57,35 @@
}
}
},
+ "event": {
+ "fault": {
+ "name": "Fault",
+ "state_attributes": {
+ "event_type": {
+ "state": {
+ "sensor_out_of_sync": "Sensors are out of sync",
+ "low_flow": "The water flow is low",
+ "flow_failed": "The water flow has failed",
+ "settings_reset": "The settings have been reset",
+ "priming_mode": "Priming mode",
+ "clock_failed": "The clock has failed",
+ "memory_failure": "Program memory failure",
+ "service_sensor_sync": "Sensors are out of sync -- call for service",
+ "heater_dry": "The heater is dry",
+ "heater_may_be_dry": "The heater may be dry",
+ "water_too_hot": "The water is too hot",
+ "heater_too_hot": "The heater is too hot",
+ "sensor_a_fault": "Sensor A fault",
+ "sensor_b_fault": "Sensor B fault",
+ "pump_stuck": "A pump may be stuck on",
+ "hot_fault": "Hot fault",
+ "gfci_test_failed": "The GFCI test failed",
+ "standby_mode": "Standby mode (hold mode)"
+ }
+ }
+ }
+ }
+ },
"fan": {
"pump": {
"name": "Pump {index}"
@@ -74,10 +103,23 @@
"temperature_range": {
"name": "Temperature range",
"state": {
- "low": "Low",
- "high": "High"
+ "low": "[%key:common::state::low%]",
+ "high": "[%key:common::state::high%]"
}
}
+ },
+ "switch": {
+ "filter_cycle_2_enabled": {
+ "name": "Filter cycle 2 enabled"
+ }
+ },
+ "time": {
+ "filter_cycle_start": {
+ "name": "Filter cycle {index} start"
+ },
+ "filter_cycle_end": {
+ "name": "Filter cycle {index} end"
+ }
}
}
}
diff --git a/homeassistant/components/balboa/switch.py b/homeassistant/components/balboa/switch.py
new file mode 100644
index 00000000000..c8c947f499d
--- /dev/null
+++ b/homeassistant/components/balboa/switch.py
@@ -0,0 +1,48 @@
+"""Support for Balboa switches."""
+
+from __future__ import annotations
+
+from typing import Any
+
+from pybalboa import SpaClient
+
+from homeassistant.components.switch import SwitchEntity
+from homeassistant.const import EntityCategory
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from . import BalboaConfigEntry
+from .entity import BalboaEntity
+
+
+async def async_setup_entry(
+ hass: HomeAssistant,
+ entry: BalboaConfigEntry,
+ async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+ """Set up the spa's switches."""
+ spa = entry.runtime_data
+ async_add_entities([BalboaSwitchEntity(spa)])
+
+
+class BalboaSwitchEntity(BalboaEntity, SwitchEntity):
+ """Representation of a Balboa switch entity."""
+
+ def __init__(self, spa: SpaClient) -> None:
+ """Initialize a Balboa switch entity."""
+ super().__init__(spa, "filter_cycle_2_enabled")
+ self._attr_entity_category = EntityCategory.CONFIG
+ self._attr_translation_key = "filter_cycle_2_enabled"
+
+ @property
+ def is_on(self) -> bool:
+ """Return True if entity is on."""
+ return self._client.filter_cycle_2_enabled
+
+ async def async_turn_on(self, **kwargs: Any) -> None:
+ """Turn the entity on."""
+ await self._client.configure_filter_cycle(2, enabled=True)
+
+ async def async_turn_off(self, **kwargs: Any) -> None:
+ """Turn the entity off."""
+ await self._client.configure_filter_cycle(2, enabled=False)
diff --git a/homeassistant/components/balboa/time.py b/homeassistant/components/balboa/time.py
new file mode 100644
index 00000000000..83467de8777
--- /dev/null
+++ b/homeassistant/components/balboa/time.py
@@ -0,0 +1,56 @@
+"""Support for Balboa times."""
+
+from __future__ import annotations
+
+from datetime import time
+import itertools
+from typing import Any
+
+from pybalboa import SpaClient
+
+from homeassistant.components.time import TimeEntity
+from homeassistant.const import EntityCategory
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from . import BalboaConfigEntry
+from .entity import BalboaEntity
+
+FILTER_CYCLE = "filter_cycle_"
+
+
+async def async_setup_entry(
+ hass: HomeAssistant,
+ entry: BalboaConfigEntry,
+ async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+ """Set up the spa's times."""
+ spa = entry.runtime_data
+ async_add_entities(
+ BalboaTimeEntity(spa, index, period)
+ for index, period in itertools.product((1, 2), ("start", "end"))
+ )
+
+
+class BalboaTimeEntity(BalboaEntity, TimeEntity):
+ """Representation of a Balboa time entity."""
+
+ entity_category = EntityCategory.CONFIG
+
+ def __init__(self, spa: SpaClient, index: int, period: str) -> None:
+ """Initialize a Balboa time entity."""
+ super().__init__(spa, f"{FILTER_CYCLE}{index}_{period}")
+ self.index = index
+ self.period = period
+ self._attr_translation_key = f"{FILTER_CYCLE}{period}"
+ self._attr_translation_placeholders = {"index": str(index)}
+
+ @property
+ def native_value(self) -> time | None:
+ """Return the value reported by the time."""
+ return getattr(self._client, f"{FILTER_CYCLE}{self.index}_{self.period}")
+
+ async def async_set_value(self, value: time) -> None:
+ """Change the time."""
+ args: dict[str, Any] = {self.period: value}
+ await self._client.configure_filter_cycle(self.index, **args)
diff --git a/homeassistant/components/bang_olufsen/diagnostics.py b/homeassistant/components/bang_olufsen/diagnostics.py
index bf7b06e694a..3835de7c551 100644
--- a/homeassistant/components/bang_olufsen/diagnostics.py
+++ b/homeassistant/components/bang_olufsen/diagnostics.py
@@ -4,12 +4,13 @@ from __future__ import annotations
from typing import TYPE_CHECKING, Any
+from homeassistant.components.event import DOMAIN as EVENT_DOMAIN
from homeassistant.components.media_player import DOMAIN as MEDIA_PLAYER_DOMAIN
from homeassistant.core import HomeAssistant
from homeassistant.helpers import entity_registry as er
from . import BangOlufsenConfigEntry
-from .const import DOMAIN
+from .const import DEVICE_BUTTONS, DOMAIN
async def async_get_config_entry_diagnostics(
@@ -25,8 +26,9 @@ async def async_get_config_entry_diagnostics(
if TYPE_CHECKING:
assert config_entry.unique_id
- # Add media_player entity's state
entity_registry = er.async_get(hass)
+
+ # Add media_player entity's state
if entity_id := entity_registry.async_get_entity_id(
MEDIA_PLAYER_DOMAIN, DOMAIN, config_entry.unique_id
):
@@ -37,4 +39,16 @@ async def async_get_config_entry_diagnostics(
state_dict.pop("context")
data["media_player"] = state_dict
+ # Add button Event entity states (if enabled)
+ for device_button in DEVICE_BUTTONS:
+ if entity_id := entity_registry.async_get_entity_id(
+ EVENT_DOMAIN, DOMAIN, f"{config_entry.unique_id}_{device_button}"
+ ):
+ if state := hass.states.get(entity_id):
+ state_dict = dict(state.as_dict())
+
+ # Remove context as it is not relevant
+ state_dict.pop("context")
+ data[f"{device_button}_event"] = state_dict
+
return data
diff --git a/homeassistant/components/bang_olufsen/event.py b/homeassistant/components/bang_olufsen/event.py
index 99e5c8bb6fd..91e04b92330 100644
--- a/homeassistant/components/bang_olufsen/event.py
+++ b/homeassistant/components/bang_olufsen/event.py
@@ -6,7 +6,7 @@ from homeassistant.components.event import EventDeviceClass, EventEntity
from homeassistant.const import CONF_MODEL
from homeassistant.core import HomeAssistant, callback
from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import BangOlufsenConfigEntry
from .const import (
@@ -25,7 +25,7 @@ PARALLEL_UPDATES = 0
async def async_setup_entry(
hass: HomeAssistant,
config_entry: BangOlufsenConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up Sensor entities from config entry."""
diff --git a/homeassistant/components/bang_olufsen/media_player.py b/homeassistant/components/bang_olufsen/media_player.py
index 282ecdd2ae5..efb6843356b 100644
--- a/homeassistant/components/bang_olufsen/media_player.py
+++ b/homeassistant/components/bang_olufsen/media_player.py
@@ -64,7 +64,7 @@ from homeassistant.helpers import (
from homeassistant.helpers.device_registry import DeviceInfo
from homeassistant.helpers.dispatcher import async_dispatcher_connect
from homeassistant.helpers.entity_platform import (
- AddEntitiesCallback,
+ AddConfigEntryEntitiesCallback,
async_get_current_platform,
)
from homeassistant.util.dt import utcnow
@@ -118,7 +118,7 @@ BANG_OLUFSEN_FEATURES = (
async def async_setup_entry(
hass: HomeAssistant,
config_entry: BangOlufsenConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up a Media Player entity from config entry."""
# Add MediaPlayer entity
diff --git a/homeassistant/components/bang_olufsen/strings.json b/homeassistant/components/bang_olufsen/strings.json
index 57ab828f9fb..422dc4be567 100644
--- a/homeassistant/components/bang_olufsen/strings.json
+++ b/homeassistant/components/bang_olufsen/strings.json
@@ -29,7 +29,7 @@
"description": "Manually configure your Bang & Olufsen device."
},
"zeroconf_confirm": {
- "title": "Setup Bang & Olufsen device",
+ "title": "Set up Bang & Olufsen device",
"description": "Confirm the configuration of the {model}-{serial_number} @ {host}."
}
}
@@ -197,11 +197,11 @@
"services": {
"beolink_allstandby": {
"name": "Beolink all standby",
- "description": "Set all Connected Beolink devices to standby."
+ "description": "Sets all connected Beolink devices to standby."
},
"beolink_expand": {
"name": "Beolink expand",
- "description": "Expand current Beolink experience.",
+ "description": "Adds devices to the current Beolink experience.",
"fields": {
"all_discovered": {
"name": "All discovered",
@@ -221,7 +221,7 @@
},
"beolink_join": {
"name": "Beolink join",
- "description": "Join a Beolink experience.",
+ "description": "Joins a Beolink experience.",
"fields": {
"beolink_jid": {
"name": "Beolink JID",
@@ -241,11 +241,11 @@
},
"beolink_leave": {
"name": "Beolink leave",
- "description": "Leave a Beolink experience."
+ "description": "Leaves a Beolink experience."
},
"beolink_unexpand": {
"name": "Beolink unexpand",
- "description": "Unexpand from current Beolink experience.",
+ "description": "Removes devices from the current Beolink experience.",
"fields": {
"beolink_jids": {
"name": "Beolink JIDs",
@@ -274,7 +274,7 @@
"message": "An error occurred while attempting to play {media_type}: {error_message}."
},
"invalid_grouping_entity": {
- "message": "Entity with id: {entity_id} can't be added to the Beolink session. Is the entity a Bang & Olufsen media_player?"
+ "message": "Entity with ID {entity_id} can't be added to the Beolink session. Is the entity a Bang & Olufsen media_player?"
},
"invalid_sound_mode": {
"message": "{invalid_sound_mode} is an invalid sound mode. Valid values are: {valid_sound_modes}."
diff --git a/homeassistant/components/bayesian/strings.json b/homeassistant/components/bayesian/strings.json
index 9ebccedc88d..00de79a2229 100644
--- a/homeassistant/components/bayesian/strings.json
+++ b/homeassistant/components/bayesian/strings.json
@@ -5,14 +5,14 @@
"title": "Manual YAML fix required for Bayesian"
},
"no_prob_given_false": {
- "description": "In the Bayesian integration `prob_given_false` is now a required configuration variable as there was no mathematical rationale for the previous default value. Please add this to your `configuration.yml` for `bayesian/{entity}`. These observations will be ignored until you do.",
+ "description": "In the Bayesian integration `prob_given_false` is now a required configuration variable as there was no mathematical rationale for the previous default value. Please add this to your `configuration.yaml` for `bayesian/{entity}`. These observations will be ignored until you do.",
"title": "Manual YAML addition required for Bayesian"
}
},
"services": {
"reload": {
"name": "[%key:common::action::reload%]",
- "description": "Reloads bayesian sensors from the YAML-configuration."
+ "description": "Reloads Bayesian sensors from the YAML-configuration."
}
}
}
diff --git a/homeassistant/components/binary_sensor/strings.json b/homeassistant/components/binary_sensor/strings.json
index b86a6374f28..ea897ed1c49 100644
--- a/homeassistant/components/binary_sensor/strings.json
+++ b/homeassistant/components/binary_sensor/strings.json
@@ -124,15 +124,15 @@
"battery": {
"name": "Battery",
"state": {
- "off": "Normal",
- "on": "Low"
+ "off": "[%key:common::state::normal%]",
+ "on": "[%key:common::state::low%]"
}
},
"battery_charging": {
"name": "Charging",
"state": {
"off": "Not charging",
- "on": "Charging"
+ "on": "[%key:common::state::charging%]"
}
},
"carbon_monoxide": {
@@ -145,7 +145,7 @@
"cold": {
"name": "Cold",
"state": {
- "off": "[%key:component::binary_sensor::entity_component::battery::state::off%]",
+ "off": "[%key:common::state::normal%]",
"on": "Cold"
}
},
@@ -180,7 +180,7 @@
"heat": {
"name": "Heat",
"state": {
- "off": "[%key:component::binary_sensor::entity_component::battery::state::off%]",
+ "off": "[%key:common::state::normal%]",
"on": "Hot"
}
},
diff --git a/homeassistant/components/blebox/binary_sensor.py b/homeassistant/components/blebox/binary_sensor.py
index 2aa86059ee2..b9032e6e705 100644
--- a/homeassistant/components/blebox/binary_sensor.py
+++ b/homeassistant/components/blebox/binary_sensor.py
@@ -8,7 +8,7 @@ from homeassistant.components.binary_sensor import (
BinarySensorEntityDescription,
)
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import BleBoxConfigEntry
from .entity import BleBoxEntity
@@ -24,7 +24,7 @@ BINARY_SENSOR_TYPES = (
async def async_setup_entry(
hass: HomeAssistant,
config_entry: BleBoxConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up a BleBox entry."""
entities = [
diff --git a/homeassistant/components/blebox/button.py b/homeassistant/components/blebox/button.py
index 90356c8ae14..15867f84029 100644
--- a/homeassistant/components/blebox/button.py
+++ b/homeassistant/components/blebox/button.py
@@ -6,7 +6,7 @@ import blebox_uniapi.button
from homeassistant.components.button import ButtonEntity
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import BleBoxConfigEntry
from .entity import BleBoxEntity
@@ -15,7 +15,7 @@ from .entity import BleBoxEntity
async def async_setup_entry(
hass: HomeAssistant,
config_entry: BleBoxConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up a BleBox button entry."""
entities = [
diff --git a/homeassistant/components/blebox/climate.py b/homeassistant/components/blebox/climate.py
index 2c528d50e3e..dbf4a326990 100644
--- a/homeassistant/components/blebox/climate.py
+++ b/homeassistant/components/blebox/climate.py
@@ -13,7 +13,7 @@ from homeassistant.components.climate import (
)
from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import BleBoxConfigEntry
from .entity import BleBoxEntity
@@ -38,7 +38,7 @@ BLEBOX_TO_HVACACTION = {
async def async_setup_entry(
hass: HomeAssistant,
config_entry: BleBoxConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up a BleBox climate entity."""
entities = [
diff --git a/homeassistant/components/blebox/cover.py b/homeassistant/components/blebox/cover.py
index 4f2a7eeef11..c52c551bbac 100644
--- a/homeassistant/components/blebox/cover.py
+++ b/homeassistant/components/blebox/cover.py
@@ -16,7 +16,7 @@ from homeassistant.components.cover import (
CoverState,
)
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import BleBoxConfigEntry
from .entity import BleBoxEntity
@@ -45,7 +45,7 @@ BLEBOX_TO_HASS_COVER_STATES = {
async def async_setup_entry(
hass: HomeAssistant,
config_entry: BleBoxConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up a BleBox entry."""
entities = [
diff --git a/homeassistant/components/blebox/light.py b/homeassistant/components/blebox/light.py
index c3c9de8be51..86ec8993779 100644
--- a/homeassistant/components/blebox/light.py
+++ b/homeassistant/components/blebox/light.py
@@ -21,7 +21,7 @@ from homeassistant.components.light import (
LightEntityFeature,
)
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.util import color as color_util
from . import BleBoxConfigEntry
@@ -35,7 +35,7 @@ SCAN_INTERVAL = timedelta(seconds=5)
async def async_setup_entry(
hass: HomeAssistant,
config_entry: BleBoxConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up a BleBox entry."""
entities = [
diff --git a/homeassistant/components/blebox/sensor.py b/homeassistant/components/blebox/sensor.py
index c0abff31257..5120a7a3c98 100644
--- a/homeassistant/components/blebox/sensor.py
+++ b/homeassistant/components/blebox/sensor.py
@@ -23,7 +23,7 @@ from homeassistant.const import (
UnitOfTemperature,
)
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import BleBoxConfigEntry
from .entity import BleBoxEntity
@@ -116,7 +116,7 @@ SENSOR_TYPES = (
async def async_setup_entry(
hass: HomeAssistant,
config_entry: BleBoxConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up a BleBox entry."""
entities = [
diff --git a/homeassistant/components/blebox/switch.py b/homeassistant/components/blebox/switch.py
index c6f439e27c5..1598d4db6fa 100644
--- a/homeassistant/components/blebox/switch.py
+++ b/homeassistant/components/blebox/switch.py
@@ -7,7 +7,7 @@ import blebox_uniapi.switch
from homeassistant.components.switch import SwitchDeviceClass, SwitchEntity
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import BleBoxConfigEntry
from .entity import BleBoxEntity
@@ -18,7 +18,7 @@ SCAN_INTERVAL = timedelta(seconds=5)
async def async_setup_entry(
hass: HomeAssistant,
config_entry: BleBoxConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up a BleBox switch entity."""
entities = [
diff --git a/homeassistant/components/blink/alarm_control_panel.py b/homeassistant/components/blink/alarm_control_panel.py
index bfb8aa9a3a0..17fd003742f 100644
--- a/homeassistant/components/blink/alarm_control_panel.py
+++ b/homeassistant/components/blink/alarm_control_panel.py
@@ -15,7 +15,7 @@ from homeassistant.const import ATTR_ATTRIBUTION
from homeassistant.core import HomeAssistant, callback
from homeassistant.exceptions import HomeAssistantError
from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.update_coordinator import CoordinatorEntity
from .const import DEFAULT_ATTRIBUTION, DEFAULT_BRAND, DOMAIN
@@ -27,7 +27,7 @@ _LOGGER = logging.getLogger(__name__)
async def async_setup_entry(
hass: HomeAssistant,
config_entry: BlinkConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the Blink Alarm Control Panels."""
coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/blink/binary_sensor.py b/homeassistant/components/blink/binary_sensor.py
index c11d4cfea23..3d5430c8d1f 100644
--- a/homeassistant/components/blink/binary_sensor.py
+++ b/homeassistant/components/blink/binary_sensor.py
@@ -12,7 +12,7 @@ from homeassistant.components.binary_sensor import (
from homeassistant.const import EntityCategory
from homeassistant.core import HomeAssistant, callback
from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.update_coordinator import CoordinatorEntity
from .const import (
@@ -48,7 +48,7 @@ BINARY_SENSORS_TYPES: tuple[BinarySensorEntityDescription, ...] = (
async def async_setup_entry(
hass: HomeAssistant,
config_entry: BlinkConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the blink binary sensors."""
diff --git a/homeassistant/components/blink/camera.py b/homeassistant/components/blink/camera.py
index e35dd20eea7..04bd125d249 100644
--- a/homeassistant/components/blink/camera.py
+++ b/homeassistant/components/blink/camera.py
@@ -15,7 +15,7 @@ from homeassistant.core import HomeAssistant
from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
from homeassistant.helpers import config_validation as cv, entity_platform
from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.update_coordinator import CoordinatorEntity
from .const import (
@@ -38,7 +38,7 @@ PARALLEL_UPDATES = 1
async def async_setup_entry(
hass: HomeAssistant,
config_entry: BlinkConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up a Blink Camera."""
diff --git a/homeassistant/components/blink/sensor.py b/homeassistant/components/blink/sensor.py
index e0b5989cc80..1df708c3a10 100644
--- a/homeassistant/components/blink/sensor.py
+++ b/homeassistant/components/blink/sensor.py
@@ -17,7 +17,7 @@ from homeassistant.const import (
)
from homeassistant.core import HomeAssistant, callback
from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.update_coordinator import CoordinatorEntity
from .const import DEFAULT_BRAND, DOMAIN, TYPE_TEMPERATURE, TYPE_WIFI_STRENGTH
@@ -47,7 +47,7 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
async def async_setup_entry(
hass: HomeAssistant,
config_entry: BlinkConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Initialize a Blink sensor."""
diff --git a/homeassistant/components/blink/switch.py b/homeassistant/components/blink/switch.py
index 8eabd5c0e59..4f490e28310 100644
--- a/homeassistant/components/blink/switch.py
+++ b/homeassistant/components/blink/switch.py
@@ -12,7 +12,7 @@ from homeassistant.components.switch import (
from homeassistant.core import HomeAssistant
from homeassistant.exceptions import HomeAssistantError
from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.update_coordinator import CoordinatorEntity
from .const import DEFAULT_BRAND, DOMAIN, TYPE_CAMERA_ARMED
@@ -30,7 +30,7 @@ SWITCH_TYPES: tuple[SwitchEntityDescription, ...] = (
async def async_setup_entry(
hass: HomeAssistant,
config_entry: BlinkConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the Blink switches."""
coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/blue_current/sensor.py b/homeassistant/components/blue_current/sensor.py
index be39e9571ec..9ea444f9ec2 100644
--- a/homeassistant/components/blue_current/sensor.py
+++ b/homeassistant/components/blue_current/sensor.py
@@ -16,7 +16,7 @@ from homeassistant.const import (
UnitOfPower,
)
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import BlueCurrentConfigEntry, Connector
from .const import DOMAIN
@@ -212,7 +212,7 @@ PARALLEL_UPDATES = 1
async def async_setup_entry(
hass: HomeAssistant,
entry: BlueCurrentConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up Blue Current sensors."""
connector = entry.runtime_data
diff --git a/homeassistant/components/blue_current/strings.json b/homeassistant/components/blue_current/strings.json
index 0154c794c33..a8a9aff7f08 100644
--- a/homeassistant/components/blue_current/strings.json
+++ b/homeassistant/components/blue_current/strings.json
@@ -28,20 +28,20 @@
"name": "Activity",
"state": {
"available": "Available",
- "charging": "Charging",
+ "charging": "[%key:common::state::charging%]",
"unavailable": "Unavailable",
- "error": "Error",
+ "error": "[%key:common::state::error%]",
"offline": "Offline"
}
},
"vehicle_status": {
"name": "Vehicle status",
"state": {
- "standby": "Standby",
+ "standby": "[%key:common::state::standby%]",
"vehicle_detected": "Detected",
"ready": "Ready",
"no_power": "No power",
- "vehicle_error": "Error"
+ "vehicle_error": "[%key:common::state::error%]"
}
},
"actual_v1": {
diff --git a/homeassistant/components/bluemaestro/sensor.py b/homeassistant/components/bluemaestro/sensor.py
index 57702d4ff31..1163f8a1ff6 100644
--- a/homeassistant/components/bluemaestro/sensor.py
+++ b/homeassistant/components/bluemaestro/sensor.py
@@ -27,7 +27,7 @@ from homeassistant.const import (
UnitOfTemperature,
)
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.sensor import sensor_device_info_to_hass_device_info
from . import BlueMaestroConfigEntry
@@ -116,7 +116,7 @@ def sensor_update_to_bluetooth_data_update(
async def async_setup_entry(
hass: HomeAssistant,
entry: BlueMaestroConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the BlueMaestro BLE sensors."""
coordinator = entry.runtime_data
diff --git a/homeassistant/components/blueprint/importer.py b/homeassistant/components/blueprint/importer.py
index 8582761bafb..83afa511b68 100644
--- a/homeassistant/components/blueprint/importer.py
+++ b/homeassistant/components/blueprint/importer.py
@@ -6,6 +6,7 @@ from contextlib import suppress
from dataclasses import dataclass
import html
import re
+from typing import TYPE_CHECKING
import voluptuous as vol
import yarl
@@ -195,8 +196,8 @@ async def fetch_blueprint_from_github_gist_url(
)
gist = await resp.json()
- blueprint = None
- filename = None
+ blueprint: Blueprint | None = None
+ filename: str | None = None
content: str
for filename, info in gist["files"].items():
@@ -218,6 +219,8 @@ async def fetch_blueprint_from_github_gist_url(
"No valid blueprint found in the gist. The blueprint file needs to end with"
" '.yaml'"
)
+ if TYPE_CHECKING:
+ assert isinstance(filename, str)
return ImportedBlueprint(
f"{gist['owner']['login']}/{filename[:-5]}", content, blueprint
diff --git a/homeassistant/components/bluesound/config_flow.py b/homeassistant/components/bluesound/config_flow.py
index 2f002b70e1d..cfb6646d829 100644
--- a/homeassistant/components/bluesound/config_flow.py
+++ b/homeassistant/components/bluesound/config_flow.py
@@ -75,6 +75,9 @@ class BluesoundConfigFlow(ConfigFlow, domain=DOMAIN):
self, discovery_info: ZeroconfServiceInfo
) -> ConfigFlowResult:
"""Handle a flow initialized by zeroconf discovery."""
+ # the player can have an ipv6 address, but the api is only available on ipv4
+ if discovery_info.ip_address.version != 4:
+ return self.async_abort(reason="no_ipv4_address")
if discovery_info.port is not None:
self._port = discovery_info.port
diff --git a/homeassistant/components/bluesound/manifest.json b/homeassistant/components/bluesound/manifest.json
index 151c1512b74..caf5cc7541d 100644
--- a/homeassistant/components/bluesound/manifest.json
+++ b/homeassistant/components/bluesound/manifest.json
@@ -6,7 +6,7 @@
"config_flow": true,
"documentation": "https://www.home-assistant.io/integrations/bluesound",
"iot_class": "local_polling",
- "requirements": ["pyblu==2.0.0"],
+ "requirements": ["pyblu==2.0.1"],
"zeroconf": [
{
"type": "_musc._tcp.local."
diff --git a/homeassistant/components/bluesound/media_player.py b/homeassistant/components/bluesound/media_player.py
index 6bb3c101cd1..337dc3d3a33 100644
--- a/homeassistant/components/bluesound/media_player.py
+++ b/homeassistant/components/bluesound/media_player.py
@@ -32,7 +32,7 @@ from homeassistant.helpers.dispatcher import (
async_dispatcher_connect,
async_dispatcher_send,
)
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.update_coordinator import CoordinatorEntity
from homeassistant.util import dt as dt_util
@@ -61,7 +61,7 @@ POLL_TIMEOUT = 120
async def async_setup_entry(
hass: HomeAssistant,
config_entry: BluesoundConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the Bluesound entry."""
bluesound_player = BluesoundPlayer(
@@ -330,7 +330,12 @@ class BluesoundPlayer(CoordinatorEntity[BluesoundCoordinator], MediaPlayerEntity
if self._status.input_id is not None:
for input_ in self._inputs:
- if input_.id == self._status.input_id:
+ # the input might not have an id => also try to match on the stream_url/url
+ # we have to use both because neither matches all the time
+ if (
+ input_.id == self._status.input_id
+ or input_.url == self._status.stream_url
+ ):
return input_.text
for preset in self._presets:
@@ -501,18 +506,16 @@ class BluesoundPlayer(CoordinatorEntity[BluesoundCoordinator], MediaPlayerEntity
return
# presets and inputs might have the same name; presets have priority
- url: str | None = None
for input_ in self._inputs:
if input_.text == source:
- url = input_.url
+ await self._player.play_url(input_.url)
+ return
for preset in self._presets:
if preset.name == source:
- url = preset.url
+ await self._player.load_preset(preset.id)
+ return
- if url is None:
- raise ServiceValidationError(f"Source {source} not found")
-
- await self._player.play_url(url)
+ raise ServiceValidationError(f"Source {source} not found")
async def async_clear_playlist(self) -> None:
"""Clear players playlist."""
diff --git a/homeassistant/components/bluesound/strings.json b/homeassistant/components/bluesound/strings.json
index b50c01a11bf..1170e0b92e0 100644
--- a/homeassistant/components/bluesound/strings.json
+++ b/homeassistant/components/bluesound/strings.json
@@ -19,7 +19,8 @@
"abort": {
"already_configured": "[%key:common::config_flow::abort::already_configured_service%]",
"cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
- "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]"
+ "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
+ "no_ipv4_address": "No IPv4 address found."
},
"error": {
"cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
diff --git a/homeassistant/components/bluetooth/__init__.py b/homeassistant/components/bluetooth/__init__.py
index c46ef22803e..7abc929fde5 100644
--- a/homeassistant/components/bluetooth/__init__.py
+++ b/homeassistant/components/bluetooth/__init__.py
@@ -311,11 +311,24 @@ async def async_update_device(
update the device with the new location so they can
figure out where the adapter is.
"""
+ address = details[ADAPTER_ADDRESS]
+ connections = {(dr.CONNECTION_BLUETOOTH, address)}
device_registry = dr.async_get(hass)
+ # We only have one device for the config entry
+ # so if the address has been corrected, make
+ # sure the device entry reflects the correct
+ # address
+ for device in dr.async_entries_for_config_entry(device_registry, entry.entry_id):
+ for conn_type, conn_value in device.connections:
+ if conn_type == dr.CONNECTION_BLUETOOTH and conn_value != address:
+ device_registry.async_update_device(
+ device.id, new_connections=connections
+ )
+ break
device_entry = device_registry.async_get_or_create(
config_entry_id=entry.entry_id,
- name=adapter_human_name(adapter, details[ADAPTER_ADDRESS]),
- connections={(dr.CONNECTION_BLUETOOTH, details[ADAPTER_ADDRESS])},
+ name=adapter_human_name(adapter, address),
+ connections=connections,
manufacturer=details[ADAPTER_MANUFACTURER],
model=adapter_model(details),
sw_version=details.get(ADAPTER_SW_VERSION),
@@ -342,9 +355,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
)
)
)
+ return True
address = entry.unique_id
assert address is not None
- assert source_entry is not None
source_domain = entry.data[CONF_SOURCE_DOMAIN]
if mac_manufacturer := await get_manufacturer_from_mac(address):
manufacturer = f"{mac_manufacturer} ({source_domain})"
diff --git a/homeassistant/components/bluetooth/config_flow.py b/homeassistant/components/bluetooth/config_flow.py
index e76277306f5..328707bd722 100644
--- a/homeassistant/components/bluetooth/config_flow.py
+++ b/homeassistant/components/bluetooth/config_flow.py
@@ -186,16 +186,28 @@ class BluetoothConfigFlow(ConfigFlow, domain=DOMAIN):
"""Handle a flow initialized by an external scanner."""
source = user_input[CONF_SOURCE]
await self.async_set_unique_id(source)
+ source_config_entry_id = user_input[CONF_SOURCE_CONFIG_ENTRY_ID]
data = {
CONF_SOURCE: source,
CONF_SOURCE_MODEL: user_input[CONF_SOURCE_MODEL],
CONF_SOURCE_DOMAIN: user_input[CONF_SOURCE_DOMAIN],
- CONF_SOURCE_CONFIG_ENTRY_ID: user_input[CONF_SOURCE_CONFIG_ENTRY_ID],
+ CONF_SOURCE_CONFIG_ENTRY_ID: source_config_entry_id,
CONF_SOURCE_DEVICE_ID: user_input[CONF_SOURCE_DEVICE_ID],
}
self._abort_if_unique_id_configured(updates=data)
- manager = get_manager()
- scanner = manager.async_scanner_by_source(source)
+ for entry in self._async_current_entries(include_ignore=False):
+ # If the mac address needs to be corrected, migrate
+ # the config entry to the new mac address
+ if (
+ entry.data.get(CONF_SOURCE_CONFIG_ENTRY_ID) == source_config_entry_id
+ and entry.unique_id != source
+ ):
+ self.hass.config_entries.async_update_entry(
+ entry, unique_id=source, data={**entry.data, **data}
+ )
+ self.hass.config_entries.async_schedule_reload(entry.entry_id)
+ return self.async_abort(reason="already_configured")
+ scanner = get_manager().async_scanner_by_source(source)
assert scanner is not None
return self.async_create_entry(title=scanner.name, data=data)
diff --git a/homeassistant/components/bluetooth/manifest.json b/homeassistant/components/bluetooth/manifest.json
index 5d2b8ab6285..b83bc37e473 100644
--- a/homeassistant/components/bluetooth/manifest.json
+++ b/homeassistant/components/bluetooth/manifest.json
@@ -16,11 +16,11 @@
"quality_scale": "internal",
"requirements": [
"bleak==0.22.3",
- "bleak-retry-connector==3.8.1",
+ "bleak-retry-connector==3.9.0",
"bluetooth-adapters==0.21.4",
- "bluetooth-auto-recovery==1.4.2",
- "bluetooth-data-tools==1.23.4",
- "dbus-fast==2.33.0",
- "habluetooth==3.21.1"
+ "bluetooth-auto-recovery==1.4.5",
+ "bluetooth-data-tools==1.27.0",
+ "dbus-fast==2.43.0",
+ "habluetooth==3.39.0"
]
}
diff --git a/homeassistant/components/bluetooth/passive_update_processor.py b/homeassistant/components/bluetooth/passive_update_processor.py
index 8f66a3582ea..09e953a8676 100644
--- a/homeassistant/components/bluetooth/passive_update_processor.py
+++ b/homeassistant/components/bluetooth/passive_update_processor.py
@@ -374,6 +374,27 @@ class PassiveBluetoothProcessorCoordinator[_DataT](BasePassiveBluetoothCoordinat
self.logger.exception("Unexpected error updating %s data", self.name)
return
+ self._process_update(update, was_available)
+
+ @callback
+ def async_set_updated_data(self, update: _DataT) -> None:
+ """Manually update the processor with new data.
+
+ If the data comes in via a different method, like a
+ notification, this method can be used to update the
+ processor with the new data.
+
+ This is useful for devices that retrieve
+ some of their data via notifications.
+ """
+ was_available = self._available
+ self._available = True
+ self._process_update(update, was_available)
+
+ def _process_update(
+ self, update: _DataT, was_available: bool | None = None
+ ) -> None:
+ """Process the update from the bluetooth device."""
if not self.last_update_success:
self.last_update_success = True
self.logger.info("Coordinator %s recovered", self.name)
diff --git a/homeassistant/components/bmw_connected_drive/binary_sensor.py b/homeassistant/components/bmw_connected_drive/binary_sensor.py
index 5a58c707d6a..01cdbbdc94d 100644
--- a/homeassistant/components/bmw_connected_drive/binary_sensor.py
+++ b/homeassistant/components/bmw_connected_drive/binary_sensor.py
@@ -18,7 +18,7 @@ from homeassistant.components.binary_sensor import (
BinarySensorEntityDescription,
)
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.util.unit_system import UnitSystem
from . import BMWConfigEntry
@@ -200,7 +200,7 @@ SENSOR_TYPES: tuple[BMWBinarySensorEntityDescription, ...] = (
async def async_setup_entry(
hass: HomeAssistant,
config_entry: BMWConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the BMW binary sensors from config entry."""
coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/bmw_connected_drive/button.py b/homeassistant/components/bmw_connected_drive/button.py
index a7c31d0ef79..f8980201f3f 100644
--- a/homeassistant/components/bmw_connected_drive/button.py
+++ b/homeassistant/components/bmw_connected_drive/button.py
@@ -14,7 +14,7 @@ from bimmer_connected.vehicle.remote_services import RemoteServiceStatus
from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
from homeassistant.core import HomeAssistant
from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import DOMAIN as BMW_DOMAIN, BMWConfigEntry
from .entity import BMWBaseEntity
@@ -69,7 +69,7 @@ BUTTON_TYPES: tuple[BMWButtonEntityDescription, ...] = (
async def async_setup_entry(
hass: HomeAssistant,
config_entry: BMWConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the BMW buttons from config entry."""
coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/bmw_connected_drive/device_tracker.py b/homeassistant/components/bmw_connected_drive/device_tracker.py
index 74df8693f7a..23273cc8ba9 100644
--- a/homeassistant/components/bmw_connected_drive/device_tracker.py
+++ b/homeassistant/components/bmw_connected_drive/device_tracker.py
@@ -9,7 +9,7 @@ from bimmer_connected.vehicle import MyBMWVehicle
from homeassistant.components.device_tracker import TrackerEntity
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import BMWConfigEntry
from .const import ATTR_DIRECTION
@@ -24,7 +24,7 @@ _LOGGER = logging.getLogger(__name__)
async def async_setup_entry(
hass: HomeAssistant,
config_entry: BMWConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the MyBMW tracker from config entry."""
coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/bmw_connected_drive/lock.py b/homeassistant/components/bmw_connected_drive/lock.py
index 4bec12e796b..9d8965d6ebf 100644
--- a/homeassistant/components/bmw_connected_drive/lock.py
+++ b/homeassistant/components/bmw_connected_drive/lock.py
@@ -12,7 +12,7 @@ from bimmer_connected.vehicle.doors_windows import LockState
from homeassistant.components.lock import LockEntity
from homeassistant.core import HomeAssistant, callback
from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import DOMAIN as BMW_DOMAIN, BMWConfigEntry
from .coordinator import BMWDataUpdateCoordinator
@@ -28,7 +28,7 @@ _LOGGER = logging.getLogger(__name__)
async def async_setup_entry(
hass: HomeAssistant,
config_entry: BMWConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the MyBMW lock from config entry."""
coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/bmw_connected_drive/number.py b/homeassistant/components/bmw_connected_drive/number.py
index c6a328ecc20..8361306ba9d 100644
--- a/homeassistant/components/bmw_connected_drive/number.py
+++ b/homeassistant/components/bmw_connected_drive/number.py
@@ -16,7 +16,7 @@ from homeassistant.components.number import (
)
from homeassistant.core import HomeAssistant
from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import DOMAIN as BMW_DOMAIN, BMWConfigEntry
from .coordinator import BMWDataUpdateCoordinator
@@ -58,7 +58,7 @@ NUMBER_TYPES: list[BMWNumberEntityDescription] = [
async def async_setup_entry(
hass: HomeAssistant,
config_entry: BMWConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the MyBMW number from config entry."""
coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/bmw_connected_drive/select.py b/homeassistant/components/bmw_connected_drive/select.py
index 385b45fd9fa..f144d3a71df 100644
--- a/homeassistant/components/bmw_connected_drive/select.py
+++ b/homeassistant/components/bmw_connected_drive/select.py
@@ -13,7 +13,7 @@ from homeassistant.components.select import SelectEntity, SelectEntityDescriptio
from homeassistant.const import UnitOfElectricCurrent
from homeassistant.core import HomeAssistant, callback
from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import DOMAIN as BMW_DOMAIN, BMWConfigEntry
from .coordinator import BMWDataUpdateCoordinator
@@ -65,7 +65,7 @@ SELECT_TYPES: tuple[BMWSelectEntityDescription, ...] = (
async def async_setup_entry(
hass: HomeAssistant,
config_entry: BMWConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the MyBMW lock from config entry."""
coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/bmw_connected_drive/sensor.py b/homeassistant/components/bmw_connected_drive/sensor.py
index b7be367d57d..114412ef9f2 100644
--- a/homeassistant/components/bmw_connected_drive/sensor.py
+++ b/homeassistant/components/bmw_connected_drive/sensor.py
@@ -27,7 +27,7 @@ from homeassistant.const import (
UnitOfVolume,
)
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.util import dt as dt_util
from . import BMWConfigEntry
@@ -190,7 +190,7 @@ SENSOR_TYPES: list[BMWSensorEntityDescription] = [
async def async_setup_entry(
hass: HomeAssistant,
config_entry: BMWConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the MyBMW sensors from config entry."""
coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/bmw_connected_drive/strings.json b/homeassistant/components/bmw_connected_drive/strings.json
index edb0d5cfb12..bd9814476f5 100644
--- a/homeassistant/components/bmw_connected_drive/strings.json
+++ b/homeassistant/components/bmw_connected_drive/strings.json
@@ -6,7 +6,7 @@
"data": {
"username": "[%key:common::config_flow::data::username%]",
"password": "[%key:common::config_flow::data::password%]",
- "region": "ConnectedDrive Region"
+ "region": "ConnectedDrive region"
},
"data_description": {
"username": "The email address of your MyBMW/MINI Connected account.",
@@ -113,10 +113,10 @@
},
"select": {
"ac_limit": {
- "name": "AC Charging Limit"
+ "name": "AC charging limit"
},
"charging_mode": {
- "name": "Charging Mode",
+ "name": "Charging mode",
"state": {
"immediate_charging": "Immediate charging",
"delayed_charging": "Delayed charging",
@@ -138,7 +138,7 @@
"name": "Charging status",
"state": {
"default": "Default",
- "charging": "Charging",
+ "charging": "[%key:common::state::charging%]",
"error": "Error",
"complete": "Complete",
"fully_charged": "Fully charged",
@@ -181,7 +181,7 @@
"cooling": "Cooling",
"heating": "Heating",
"inactive": "Inactive",
- "standby": "Standby",
+ "standby": "[%key:common::state::standby%]",
"ventilation": "Ventilation"
}
},
diff --git a/homeassistant/components/bmw_connected_drive/switch.py b/homeassistant/components/bmw_connected_drive/switch.py
index 600ad41165a..f46969f3e9b 100644
--- a/homeassistant/components/bmw_connected_drive/switch.py
+++ b/homeassistant/components/bmw_connected_drive/switch.py
@@ -12,7 +12,7 @@ from bimmer_connected.vehicle.fuel_and_battery import ChargingState
from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
from homeassistant.core import HomeAssistant
from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import DOMAIN as BMW_DOMAIN, BMWConfigEntry
from .coordinator import BMWDataUpdateCoordinator
@@ -66,7 +66,7 @@ NUMBER_TYPES: list[BMWSwitchEntityDescription] = [
async def async_setup_entry(
hass: HomeAssistant,
config_entry: BMWConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the MyBMW switch from config entry."""
coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/bond/button.py b/homeassistant/components/bond/button.py
index 42915c7dc0b..9cea0251b41 100644
--- a/homeassistant/components/bond/button.py
+++ b/homeassistant/components/bond/button.py
@@ -8,7 +8,7 @@ from bond_async import Action
from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import BondConfigEntry
from .entity import BondEntity
@@ -91,6 +91,13 @@ BUTTONS: tuple[BondButtonEntityDescription, ...] = (
mutually_exclusive=Action.SET_BRIGHTNESS,
argument=None,
),
+ BondButtonEntityDescription(
+ key=Action.TOGGLE_LIGHT_TEMP,
+ name="Toggle Light Temperature",
+ translation_key="toggle_light_temp",
+ mutually_exclusive=None, # No mutually exclusive action
+ argument=None,
+ ),
BondButtonEntityDescription(
key=Action.START_UP_LIGHT_DIMMER,
name="Start Up Light Dimmer",
@@ -257,7 +264,7 @@ BUTTONS: tuple[BondButtonEntityDescription, ...] = (
async def async_setup_entry(
hass: HomeAssistant,
entry: BondConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up Bond button devices."""
data = entry.runtime_data
diff --git a/homeassistant/components/bond/config_flow.py b/homeassistant/components/bond/config_flow.py
index 38abd63186a..ffa0098840c 100644
--- a/homeassistant/components/bond/config_flow.py
+++ b/homeassistant/components/bond/config_flow.py
@@ -16,6 +16,7 @@ from homeassistant.const import CONF_ACCESS_TOKEN, CONF_HOST, CONF_NAME
from homeassistant.core import HomeAssistant
from homeassistant.exceptions import HomeAssistantError
from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.service_info.dhcp import DhcpServiceInfo
from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
from .const import DOMAIN
@@ -91,11 +92,22 @@ class BondConfigFlow(ConfigFlow, domain=DOMAIN):
self._discovered[CONF_ACCESS_TOKEN] = token
try:
- _, hub_name = await _validate_input(self.hass, self._discovered)
+ bond_id, hub_name = await _validate_input(self.hass, self._discovered)
except InputValidationError:
return
+ await self.async_set_unique_id(bond_id)
+ self._abort_if_unique_id_configured(updates={CONF_HOST: host})
self._discovered[CONF_NAME] = hub_name
+ async def async_step_dhcp(
+ self, discovery_info: DhcpServiceInfo
+ ) -> ConfigFlowResult:
+ """Handle a flow initialized by dhcp discovery."""
+ host = discovery_info.ip
+ bond_id = discovery_info.hostname.partition("-")[2].upper()
+ await self.async_set_unique_id(bond_id)
+ return await self.async_step_any_discovery(bond_id, host)
+
async def async_step_zeroconf(
self, discovery_info: ZeroconfServiceInfo
) -> ConfigFlowResult:
@@ -104,11 +116,17 @@ class BondConfigFlow(ConfigFlow, domain=DOMAIN):
host: str = discovery_info.host
bond_id = name.partition(".")[0]
await self.async_set_unique_id(bond_id)
+ return await self.async_step_any_discovery(bond_id, host)
+
+ async def async_step_any_discovery(
+ self, bond_id: str, host: str
+ ) -> ConfigFlowResult:
+ """Handle a flow initialized by discovery."""
for entry in self._async_current_entries():
if entry.unique_id != bond_id:
continue
updates = {CONF_HOST: host}
- if entry.state == ConfigEntryState.SETUP_ERROR and (
+ if entry.state is ConfigEntryState.SETUP_ERROR and (
token := await async_get_token(self.hass, host)
):
updates[CONF_ACCESS_TOKEN] = token
@@ -153,10 +171,14 @@ class BondConfigFlow(ConfigFlow, domain=DOMAIN):
CONF_HOST: self._discovered[CONF_HOST],
}
try:
- _, hub_name = await _validate_input(self.hass, data)
+ bond_id, hub_name = await _validate_input(self.hass, data)
except InputValidationError as error:
errors["base"] = error.base
else:
+ await self.async_set_unique_id(bond_id)
+ self._abort_if_unique_id_configured(
+ updates={CONF_HOST: self._discovered[CONF_HOST]}
+ )
return self.async_create_entry(
title=hub_name,
data=data,
@@ -185,8 +207,10 @@ class BondConfigFlow(ConfigFlow, domain=DOMAIN):
except InputValidationError as error:
errors["base"] = error.base
else:
- await self.async_set_unique_id(bond_id)
- self._abort_if_unique_id_configured()
+ await self.async_set_unique_id(bond_id, raise_on_progress=False)
+ self._abort_if_unique_id_configured(
+ updates={CONF_HOST: user_input[CONF_HOST]}
+ )
return self.async_create_entry(title=hub_name, data=user_input)
return self.async_show_form(
diff --git a/homeassistant/components/bond/cover.py b/homeassistant/components/bond/cover.py
index 66344a1913d..d2a78819fae 100644
--- a/homeassistant/components/bond/cover.py
+++ b/homeassistant/components/bond/cover.py
@@ -13,7 +13,7 @@ from homeassistant.components.cover import (
CoverEntityFeature,
)
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import BondConfigEntry
from .entity import BondEntity
@@ -34,7 +34,7 @@ def _hass_to_bond_position(hass_position: int) -> int:
async def async_setup_entry(
hass: HomeAssistant,
entry: BondConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up Bond cover devices."""
data = entry.runtime_data
diff --git a/homeassistant/components/bond/fan.py b/homeassistant/components/bond/fan.py
index 76a0daa46f9..c228c7355dd 100644
--- a/homeassistant/components/bond/fan.py
+++ b/homeassistant/components/bond/fan.py
@@ -19,7 +19,7 @@ from homeassistant.components.fan import (
from homeassistant.core import HomeAssistant
from homeassistant.exceptions import HomeAssistantError
from homeassistant.helpers import entity_platform
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.util.percentage import (
percentage_to_ranged_value,
ranged_value_to_percentage,
@@ -40,7 +40,7 @@ PRESET_MODE_BREEZE = "Breeze"
async def async_setup_entry(
hass: HomeAssistant,
entry: BondConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up Bond fan devices."""
data = entry.runtime_data
diff --git a/homeassistant/components/bond/light.py b/homeassistant/components/bond/light.py
index c3cf23e4fad..9c51165ebdb 100644
--- a/homeassistant/components/bond/light.py
+++ b/homeassistant/components/bond/light.py
@@ -14,7 +14,7 @@ from homeassistant.core import HomeAssistant, callback
from homeassistant.exceptions import HomeAssistantError
from homeassistant.helpers import config_validation as cv, entity_platform
from homeassistant.helpers.entity import Entity
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import BondConfigEntry
from .const import (
@@ -42,7 +42,7 @@ ENTITY_SERVICES = [
async def async_setup_entry(
hass: HomeAssistant,
entry: BondConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up Bond light devices."""
data = entry.runtime_data
diff --git a/homeassistant/components/bond/manifest.json b/homeassistant/components/bond/manifest.json
index 1d4c110f4fd..704b9934970 100644
--- a/homeassistant/components/bond/manifest.json
+++ b/homeassistant/components/bond/manifest.json
@@ -3,6 +3,16 @@
"name": "Bond",
"codeowners": ["@bdraco", "@prystupa", "@joshs85", "@marciogranzotto"],
"config_flow": true,
+ "dhcp": [
+ {
+ "hostname": "bond-*",
+ "macaddress": "3C6A2C1*"
+ },
+ {
+ "hostname": "bond-*",
+ "macaddress": "F44E38*"
+ }
+ ],
"documentation": "https://www.home-assistant.io/integrations/bond",
"iot_class": "local_push",
"loggers": ["bond_async"],
diff --git a/homeassistant/components/bond/strings.json b/homeassistant/components/bond/strings.json
index 8986905c6ee..d65966d7701 100644
--- a/homeassistant/components/bond/strings.json
+++ b/homeassistant/components/bond/strings.json
@@ -31,7 +31,7 @@
"services": {
"set_fan_speed_tracked_state": {
"name": "Set fan speed tracked state",
- "description": "Sets the tracked fan speed for a bond fan.",
+ "description": "Sets the tracked fan speed for a Bond fan.",
"fields": {
"entity_id": {
"name": "Entity",
@@ -45,7 +45,7 @@
},
"set_switch_power_tracked_state": {
"name": "Set switch power tracked state",
- "description": "Sets the tracked power state of a bond switch.",
+ "description": "Sets the tracked power state of a Bond switch.",
"fields": {
"entity_id": {
"name": "Entity",
@@ -59,7 +59,7 @@
},
"set_light_power_tracked_state": {
"name": "Set light power tracked state",
- "description": "Sets the tracked power state of a bond light.",
+ "description": "Sets the tracked power state of a Bond light.",
"fields": {
"entity_id": {
"name": "Entity",
@@ -73,7 +73,7 @@
},
"set_light_brightness_tracked_state": {
"name": "Set light brightness tracked state",
- "description": "Sets the tracked brightness state of a bond light.",
+ "description": "Sets the tracked brightness state of a Bond light.",
"fields": {
"entity_id": {
"name": "Entity",
@@ -87,15 +87,15 @@
},
"start_increasing_brightness": {
"name": "Start increasing brightness",
- "description": "Start increasing the brightness of the light. (deprecated)."
+ "description": "Starts increasing the brightness of the light (deprecated)."
},
"start_decreasing_brightness": {
"name": "Start decreasing brightness",
- "description": "Start decreasing the brightness of the light. (deprecated)."
+ "description": "Starts decreasing the brightness of the light (deprecated)."
},
"stop": {
"name": "[%key:common::action::stop%]",
- "description": "Stop any in-progress action and empty the queue. (deprecated)."
+ "description": "Stops any in-progress action and empty the queue (deprecated)."
}
}
}
diff --git a/homeassistant/components/bond/switch.py b/homeassistant/components/bond/switch.py
index ace6d307e6d..fa2ccd2ca93 100644
--- a/homeassistant/components/bond/switch.py
+++ b/homeassistant/components/bond/switch.py
@@ -12,7 +12,7 @@ from homeassistant.components.switch import SwitchEntity
from homeassistant.core import HomeAssistant
from homeassistant.exceptions import HomeAssistantError
from homeassistant.helpers import config_validation as cv, entity_platform
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import BondConfigEntry
from .const import ATTR_POWER_STATE, SERVICE_SET_POWER_TRACKED_STATE
@@ -22,7 +22,7 @@ from .entity import BondEntity
async def async_setup_entry(
hass: HomeAssistant,
entry: BondConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up Bond generic devices."""
data = entry.runtime_data
diff --git a/homeassistant/components/bosch_alarm/__init__.py b/homeassistant/components/bosch_alarm/__init__.py
new file mode 100644
index 00000000000..602c801701d
--- /dev/null
+++ b/homeassistant/components/bosch_alarm/__init__.py
@@ -0,0 +1,67 @@
+"""The Bosch Alarm integration."""
+
+from __future__ import annotations
+
+from ssl import SSLError
+
+from bosch_alarm_mode2 import Panel
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PORT, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
+from homeassistant.helpers import device_registry as dr
+
+from .const import CONF_INSTALLER_CODE, CONF_USER_CODE, DOMAIN
+
+PLATFORMS: list[Platform] = [Platform.ALARM_CONTROL_PANEL, Platform.SENSOR]
+
+type BoschAlarmConfigEntry = ConfigEntry[Panel]
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: BoschAlarmConfigEntry) -> bool:
+ """Set up Bosch Alarm from a config entry."""
+
+ panel = Panel(
+ host=entry.data[CONF_HOST],
+ port=entry.data[CONF_PORT],
+ automation_code=entry.data.get(CONF_PASSWORD),
+ installer_or_user_code=entry.data.get(
+ CONF_INSTALLER_CODE, entry.data.get(CONF_USER_CODE)
+ ),
+ )
+ try:
+ await panel.connect()
+ except (PermissionError, ValueError) as err:
+ await panel.disconnect()
+ raise ConfigEntryAuthFailed(
+ translation_domain=DOMAIN, translation_key="authentication_failed"
+ ) from err
+ except (TimeoutError, OSError, ConnectionRefusedError, SSLError) as err:
+ await panel.disconnect()
+ raise ConfigEntryNotReady(
+ translation_domain=DOMAIN,
+ translation_key="cannot_connect",
+ ) from err
+
+ entry.runtime_data = panel
+
+ device_registry = dr.async_get(hass)
+
+ device_registry.async_get_or_create(
+ config_entry_id=entry.entry_id,
+ identifiers={(DOMAIN, entry.unique_id or entry.entry_id)},
+ name=f"Bosch {panel.model}",
+ manufacturer="Bosch Security Systems",
+ model=panel.model,
+ sw_version=panel.firmware_version,
+ )
+ await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+ return True
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: BoschAlarmConfigEntry) -> bool:
+ """Unload a config entry."""
+ if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
+ await entry.runtime_data.disconnect()
+ return unload_ok
diff --git a/homeassistant/components/bosch_alarm/alarm_control_panel.py b/homeassistant/components/bosch_alarm/alarm_control_panel.py
new file mode 100644
index 00000000000..2854298f815
--- /dev/null
+++ b/homeassistant/components/bosch_alarm/alarm_control_panel.py
@@ -0,0 +1,80 @@
+"""Support for Bosch Alarm Panel."""
+
+from __future__ import annotations
+
+from bosch_alarm_mode2 import Panel
+
+from homeassistant.components.alarm_control_panel import (
+ AlarmControlPanelEntity,
+ AlarmControlPanelEntityFeature,
+ AlarmControlPanelState,
+)
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from . import BoschAlarmConfigEntry
+from .entity import BoschAlarmAreaEntity
+
+
+async def async_setup_entry(
+ hass: HomeAssistant,
+ config_entry: BoschAlarmConfigEntry,
+ async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+ """Set up control panels for each area."""
+ panel = config_entry.runtime_data
+
+ async_add_entities(
+ AreaAlarmControlPanel(
+ panel,
+ area_id,
+ config_entry.unique_id or config_entry.entry_id,
+ )
+ for area_id in panel.areas
+ )
+
+
+class AreaAlarmControlPanel(BoschAlarmAreaEntity, AlarmControlPanelEntity):
+ """An alarm control panel entity for a bosch alarm panel."""
+
+ _attr_has_entity_name = True
+ _attr_supported_features = (
+ AlarmControlPanelEntityFeature.ARM_HOME
+ | AlarmControlPanelEntityFeature.ARM_AWAY
+ )
+ _attr_code_arm_required = False
+ _attr_name = None
+
+ def __init__(self, panel: Panel, area_id: int, unique_id: str) -> None:
+ """Initialise a Bosch Alarm control panel entity."""
+ super().__init__(panel, area_id, unique_id, False, False, True)
+ self._attr_unique_id = self._area_unique_id
+
+ @property
+ def alarm_state(self) -> AlarmControlPanelState | None:
+ """Return the state of the alarm."""
+ if self._area.is_triggered():
+ return AlarmControlPanelState.TRIGGERED
+ if self._area.is_disarmed():
+ return AlarmControlPanelState.DISARMED
+ if self._area.is_arming():
+ return AlarmControlPanelState.ARMING
+ if self._area.is_pending():
+ return AlarmControlPanelState.PENDING
+ if self._area.is_part_armed():
+ return AlarmControlPanelState.ARMED_HOME
+ if self._area.is_all_armed():
+ return AlarmControlPanelState.ARMED_AWAY
+ return None
+
+ async def async_alarm_disarm(self, code: str | None = None) -> None:
+ """Disarm this panel."""
+ await self.panel.area_disarm(self._area_id)
+
+ async def async_alarm_arm_home(self, code: str | None = None) -> None:
+ """Send arm home command."""
+ await self.panel.area_arm_part(self._area_id)
+
+ async def async_alarm_arm_away(self, code: str | None = None) -> None:
+ """Send arm away command."""
+ await self.panel.area_arm_all(self._area_id)
diff --git a/homeassistant/components/bosch_alarm/config_flow.py b/homeassistant/components/bosch_alarm/config_flow.py
new file mode 100644
index 00000000000..9e664e49ca9
--- /dev/null
+++ b/homeassistant/components/bosch_alarm/config_flow.py
@@ -0,0 +1,248 @@
+"""Config flow for Bosch Alarm integration."""
+
+from __future__ import annotations
+
+import asyncio
+from collections.abc import Mapping
+import logging
+import ssl
+from typing import Any
+
+from bosch_alarm_mode2 import Panel
+import voluptuous as vol
+
+from homeassistant.config_entries import (
+ SOURCE_RECONFIGURE,
+ SOURCE_USER,
+ ConfigFlow,
+ ConfigFlowResult,
+)
+from homeassistant.const import (
+ CONF_CODE,
+ CONF_HOST,
+ CONF_MODEL,
+ CONF_PASSWORD,
+ CONF_PORT,
+)
+import homeassistant.helpers.config_validation as cv
+
+from .const import CONF_INSTALLER_CODE, CONF_USER_CODE, DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+STEP_USER_DATA_SCHEMA = vol.Schema(
+ {
+ vol.Required(CONF_HOST): str,
+ vol.Required(CONF_PORT, default=7700): cv.positive_int,
+ }
+)
+
+STEP_AUTH_DATA_SCHEMA_SOLUTION = vol.Schema(
+ {
+ vol.Required(CONF_USER_CODE): str,
+ }
+)
+
+STEP_AUTH_DATA_SCHEMA_AMAX = vol.Schema(
+ {
+ vol.Required(CONF_INSTALLER_CODE): str,
+ vol.Required(CONF_PASSWORD): str,
+ }
+)
+
+STEP_AUTH_DATA_SCHEMA_BG = vol.Schema(
+ {
+ vol.Required(CONF_PASSWORD): str,
+ }
+)
+
+STEP_INIT_DATA_SCHEMA = vol.Schema({vol.Optional(CONF_CODE): str})
+
+
+async def try_connect(
+ data: dict[str, Any], load_selector: int = 0
+) -> tuple[str, int | None]:
+ """Validate the user input allows us to connect.
+
+ Data has the keys from STEP_USER_DATA_SCHEMA with values provided by the user.
+ """
+ panel = Panel(
+ host=data[CONF_HOST],
+ port=data[CONF_PORT],
+ automation_code=data.get(CONF_PASSWORD),
+ installer_or_user_code=data.get(CONF_INSTALLER_CODE, data.get(CONF_USER_CODE)),
+ )
+
+ try:
+ await panel.connect(load_selector)
+ finally:
+ await panel.disconnect()
+
+ return (panel.model, panel.serial_number)
+
+
+class BoschAlarmConfigFlow(ConfigFlow, domain=DOMAIN):
+ """Handle a config flow for Bosch Alarm."""
+
+ def __init__(self) -> None:
+ """Init config flow."""
+
+ self._data: dict[str, Any] = {}
+
+ 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:
+ # Use load_selector = 0 to fetch the panel model without authentication.
+ (model, serial) = await try_connect(user_input, 0)
+ except (
+ OSError,
+ ConnectionRefusedError,
+ ssl.SSLError,
+ asyncio.exceptions.TimeoutError,
+ ) as e:
+ _LOGGER.error("Connection Error: %s", e)
+ errors["base"] = "cannot_connect"
+ except Exception:
+ _LOGGER.exception("Unexpected exception")
+ errors["base"] = "unknown"
+ else:
+ self._data = user_input
+ self._data[CONF_MODEL] = model
+
+ if self.source == SOURCE_RECONFIGURE:
+ if (
+ self._get_reconfigure_entry().data[CONF_MODEL]
+ != self._data[CONF_MODEL]
+ ):
+ return self.async_abort(reason="device_mismatch")
+ return await self.async_step_auth()
+ return self.async_show_form(
+ step_id="user",
+ data_schema=self.add_suggested_values_to_schema(
+ STEP_USER_DATA_SCHEMA, user_input
+ ),
+ errors=errors,
+ )
+
+ async def async_step_reconfigure(
+ self, user_input: dict[str, Any] | None = None
+ ) -> ConfigFlowResult:
+ """Handle the reconfigure step."""
+ return await self.async_step_user()
+
+ async def async_step_auth(
+ self, user_input: dict[str, Any] | None = None
+ ) -> ConfigFlowResult:
+ """Handle the auth step."""
+ errors: dict[str, str] = {}
+
+ # Each model variant requires a different authentication flow
+ if "Solution" in self._data[CONF_MODEL]:
+ schema = STEP_AUTH_DATA_SCHEMA_SOLUTION
+ elif "AMAX" in self._data[CONF_MODEL]:
+ schema = STEP_AUTH_DATA_SCHEMA_AMAX
+ else:
+ schema = STEP_AUTH_DATA_SCHEMA_BG
+
+ if user_input is not None:
+ self._data.update(user_input)
+ try:
+ (model, serial_number) = await try_connect(
+ self._data, Panel.LOAD_EXTENDED_INFO
+ )
+ except (PermissionError, ValueError) as e:
+ errors["base"] = "invalid_auth"
+ _LOGGER.error("Authentication Error: %s", e)
+ except (
+ OSError,
+ ConnectionRefusedError,
+ ssl.SSLError,
+ TimeoutError,
+ ) as e:
+ _LOGGER.error("Connection Error: %s", e)
+ errors["base"] = "cannot_connect"
+ except Exception:
+ _LOGGER.exception("Unexpected exception")
+ errors["base"] = "unknown"
+ else:
+ if serial_number:
+ await self.async_set_unique_id(str(serial_number))
+ if self.source == SOURCE_USER:
+ if serial_number:
+ self._abort_if_unique_id_configured()
+ else:
+ self._async_abort_entries_match(
+ {CONF_HOST: self._data[CONF_HOST]}
+ )
+ return self.async_create_entry(
+ title=f"Bosch {model}", data=self._data
+ )
+ if serial_number:
+ self._abort_if_unique_id_mismatch(reason="device_mismatch")
+ return self.async_update_reload_and_abort(
+ self._get_reconfigure_entry(),
+ data=self._data,
+ )
+
+ return self.async_show_form(
+ step_id="auth",
+ data_schema=self.add_suggested_values_to_schema(schema, user_input),
+ errors=errors,
+ )
+
+ async def async_step_reauth(
+ self, entry_data: Mapping[str, Any]
+ ) -> ConfigFlowResult:
+ """Perform reauth upon an authentication error."""
+ self._data = dict(entry_data)
+ return await self.async_step_reauth_confirm()
+
+ async def async_step_reauth_confirm(
+ self, user_input: dict[str, Any] | None = None
+ ) -> ConfigFlowResult:
+ """Handle the reauth step."""
+ errors: dict[str, str] = {}
+
+ # Each model variant requires a different authentication flow
+ if "Solution" in self._data[CONF_MODEL]:
+ schema = STEP_AUTH_DATA_SCHEMA_SOLUTION
+ elif "AMAX" in self._data[CONF_MODEL]:
+ schema = STEP_AUTH_DATA_SCHEMA_AMAX
+ else:
+ schema = STEP_AUTH_DATA_SCHEMA_BG
+
+ if user_input is not None:
+ reauth_entry = self._get_reauth_entry()
+ self._data.update(user_input)
+ try:
+ (_, _) = await try_connect(self._data, Panel.LOAD_EXTENDED_INFO)
+ except (PermissionError, ValueError) as e:
+ errors["base"] = "invalid_auth"
+ _LOGGER.error("Authentication Error: %s", e)
+ except (
+ OSError,
+ ConnectionRefusedError,
+ ssl.SSLError,
+ TimeoutError,
+ ) as e:
+ _LOGGER.error("Connection Error: %s", e)
+ errors["base"] = "cannot_connect"
+ except Exception:
+ _LOGGER.exception("Unexpected exception")
+ errors["base"] = "unknown"
+ else:
+ return self.async_update_reload_and_abort(
+ reauth_entry,
+ data_updates=user_input,
+ )
+
+ return self.async_show_form(
+ step_id="reauth_confirm",
+ data_schema=self.add_suggested_values_to_schema(schema, user_input),
+ errors=errors,
+ )
diff --git a/homeassistant/components/bosch_alarm/const.py b/homeassistant/components/bosch_alarm/const.py
new file mode 100644
index 00000000000..7205831391c
--- /dev/null
+++ b/homeassistant/components/bosch_alarm/const.py
@@ -0,0 +1,6 @@
+"""Constants for the Bosch Alarm integration."""
+
+DOMAIN = "bosch_alarm"
+HISTORY_ATTR = "history"
+CONF_INSTALLER_CODE = "installer_code"
+CONF_USER_CODE = "user_code"
diff --git a/homeassistant/components/bosch_alarm/diagnostics.py b/homeassistant/components/bosch_alarm/diagnostics.py
new file mode 100644
index 00000000000..2e93052ea95
--- /dev/null
+++ b/homeassistant/components/bosch_alarm/diagnostics.py
@@ -0,0 +1,73 @@
+"""Diagnostics for bosch alarm."""
+
+from typing import Any
+
+from homeassistant.components.diagnostics import async_redact_data
+from homeassistant.const import CONF_PASSWORD
+from homeassistant.core import HomeAssistant
+
+from . import BoschAlarmConfigEntry
+from .const import CONF_INSTALLER_CODE, CONF_USER_CODE
+
+TO_REDACT = [CONF_INSTALLER_CODE, CONF_USER_CODE, CONF_PASSWORD]
+
+
+async def async_get_config_entry_diagnostics(
+ hass: HomeAssistant, entry: BoschAlarmConfigEntry
+) -> dict[str, Any]:
+ """Return diagnostics for a config entry."""
+
+ return {
+ "entry_data": async_redact_data(entry.data, TO_REDACT),
+ "data": {
+ "model": entry.runtime_data.model,
+ "serial_number": entry.runtime_data.serial_number,
+ "protocol_version": entry.runtime_data.protocol_version,
+ "firmware_version": entry.runtime_data.firmware_version,
+ "areas": [
+ {
+ "id": area_id,
+ "name": area.name,
+ "all_ready": area.all_ready,
+ "part_ready": area.part_ready,
+ "faults": area.faults,
+ "alarms": area.alarms,
+ "disarmed": area.is_disarmed(),
+ "arming": area.is_arming(),
+ "pending": area.is_pending(),
+ "part_armed": area.is_part_armed(),
+ "all_armed": area.is_all_armed(),
+ "armed": area.is_armed(),
+ "triggered": area.is_triggered(),
+ }
+ for area_id, area in entry.runtime_data.areas.items()
+ ],
+ "points": [
+ {
+ "id": point_id,
+ "name": point.name,
+ "open": point.is_open(),
+ "normal": point.is_normal(),
+ }
+ for point_id, point in entry.runtime_data.points.items()
+ ],
+ "doors": [
+ {
+ "id": door_id,
+ "name": door.name,
+ "open": door.is_open(),
+ "locked": door.is_locked(),
+ }
+ for door_id, door in entry.runtime_data.doors.items()
+ ],
+ "outputs": [
+ {
+ "id": output_id,
+ "name": output.name,
+ "active": output.is_active(),
+ }
+ for output_id, output in entry.runtime_data.outputs.items()
+ ],
+ "history_events": entry.runtime_data.events,
+ },
+ }
diff --git a/homeassistant/components/bosch_alarm/entity.py b/homeassistant/components/bosch_alarm/entity.py
new file mode 100644
index 00000000000..f74634125c4
--- /dev/null
+++ b/homeassistant/components/bosch_alarm/entity.py
@@ -0,0 +1,88 @@
+"""Support for Bosch Alarm Panel History as a sensor."""
+
+from __future__ import annotations
+
+from bosch_alarm_mode2 import Panel
+
+from homeassistant.components.sensor import Entity
+from homeassistant.helpers.device_registry import DeviceInfo
+
+from .const import DOMAIN
+
+PARALLEL_UPDATES = 0
+
+
+class BoschAlarmEntity(Entity):
+ """A base entity for a bosch alarm panel."""
+
+ _attr_has_entity_name = True
+
+ def __init__(self, panel: Panel, unique_id: str) -> None:
+ """Set up a entity for a bosch alarm panel."""
+ self.panel = panel
+ self._attr_device_info = DeviceInfo(
+ identifiers={(DOMAIN, unique_id)},
+ name=f"Bosch {panel.model}",
+ manufacturer="Bosch Security Systems",
+ )
+
+ @property
+ def available(self) -> bool:
+ """Return True if entity is available."""
+ return self.panel.connection_status()
+
+ async def async_added_to_hass(self) -> None:
+ """Observe state changes."""
+ self.panel.connection_status_observer.attach(self.schedule_update_ha_state)
+
+ async def async_will_remove_from_hass(self) -> None:
+ """Stop observing state changes."""
+ self.panel.connection_status_observer.detach(self.schedule_update_ha_state)
+
+
+class BoschAlarmAreaEntity(BoschAlarmEntity):
+ """A base entity for area related entities within a bosch alarm panel."""
+
+ def __init__(
+ self,
+ panel: Panel,
+ area_id: int,
+ unique_id: str,
+ observe_alarms: bool,
+ observe_ready: bool,
+ observe_status: bool,
+ ) -> None:
+ """Set up a area related entity for a bosch alarm panel."""
+ super().__init__(panel, unique_id)
+ self._area_id = area_id
+ self._area_unique_id = f"{unique_id}_area_{area_id}"
+ self._observe_alarms = observe_alarms
+ self._observe_ready = observe_ready
+ self._observe_status = observe_status
+ self._area = panel.areas[area_id]
+ self._attr_device_info = DeviceInfo(
+ identifiers={(DOMAIN, self._area_unique_id)},
+ name=self._area.name,
+ manufacturer="Bosch Security Systems",
+ via_device=(DOMAIN, unique_id),
+ )
+
+ async def async_added_to_hass(self) -> None:
+ """Observe state changes."""
+ await super().async_added_to_hass()
+ if self._observe_alarms:
+ self._area.alarm_observer.attach(self.schedule_update_ha_state)
+ if self._observe_ready:
+ self._area.ready_observer.attach(self.schedule_update_ha_state)
+ if self._observe_status:
+ self._area.status_observer.attach(self.schedule_update_ha_state)
+
+ async def async_will_remove_from_hass(self) -> None:
+ """Stop observing state changes."""
+ await super().async_added_to_hass()
+ if self._observe_alarms:
+ self._area.alarm_observer.detach(self.schedule_update_ha_state)
+ if self._observe_ready:
+ self._area.ready_observer.detach(self.schedule_update_ha_state)
+ if self._observe_status:
+ self._area.status_observer.detach(self.schedule_update_ha_state)
diff --git a/homeassistant/components/bosch_alarm/icons.json b/homeassistant/components/bosch_alarm/icons.json
new file mode 100644
index 00000000000..1e207310713
--- /dev/null
+++ b/homeassistant/components/bosch_alarm/icons.json
@@ -0,0 +1,9 @@
+{
+ "entity": {
+ "sensor": {
+ "faulting_points": {
+ "default": "mdi:alert-circle-outline"
+ }
+ }
+ }
+}
diff --git a/homeassistant/components/bosch_alarm/manifest.json b/homeassistant/components/bosch_alarm/manifest.json
new file mode 100644
index 00000000000..eefcc400ee7
--- /dev/null
+++ b/homeassistant/components/bosch_alarm/manifest.json
@@ -0,0 +1,11 @@
+{
+ "domain": "bosch_alarm",
+ "name": "Bosch Alarm",
+ "codeowners": ["@mag1024", "@sanjay900"],
+ "config_flow": true,
+ "documentation": "https://www.home-assistant.io/integrations/bosch_alarm",
+ "integration_type": "device",
+ "iot_class": "local_push",
+ "quality_scale": "bronze",
+ "requirements": ["bosch-alarm-mode2==0.4.6"]
+}
diff --git a/homeassistant/components/bosch_alarm/quality_scale.yaml b/homeassistant/components/bosch_alarm/quality_scale.yaml
new file mode 100644
index 00000000000..3a64667a407
--- /dev/null
+++ b/homeassistant/components/bosch_alarm/quality_scale.yaml
@@ -0,0 +1,84 @@
+rules:
+ # Bronze
+ action-setup:
+ status: exempt
+ comment: |
+ No custom actions defined
+ appropriate-polling:
+ status: exempt
+ comment: |
+ No polling
+ brands: done
+ common-modules: done
+ config-flow-test-coverage: done
+ config-flow: done
+ dependency-transparency: done
+ docs-actions:
+ status: exempt
+ comment: |
+ No custom actions are defined.
+ docs-high-level-description: done
+ docs-installation-instructions: done
+ docs-removal-instructions: done
+ entity-event-setup: done
+ entity-unique-id: done
+ has-entity-name: done
+ runtime-data: done
+ test-before-configure: done
+ test-before-setup: done
+ unique-config-entry: done
+
+ # Silver
+ action-exceptions:
+ status: exempt
+ comment: |
+ No custom actions are defined.
+ config-entry-unloading: done
+ docs-configuration-parameters: todo
+ docs-installation-parameters: todo
+ entity-unavailable: todo
+ integration-owner: done
+ log-when-unavailable: todo
+ parallel-updates: todo
+ reauthentication-flow: done
+ test-coverage: done
+
+ # Gold
+ devices: done
+ diagnostics: todo
+ discovery-update-info: todo
+ discovery: todo
+ docs-data-update: todo
+ docs-examples: todo
+ docs-known-limitations: todo
+ docs-supported-devices: todo
+ docs-supported-functions: todo
+ docs-troubleshooting: todo
+ docs-use-cases: todo
+ dynamic-devices:
+ status: exempt
+ comment: |
+ Device type integration
+ entity-category: todo
+ entity-device-class: todo
+ entity-disabled-by-default: todo
+ entity-translations: done
+ exception-translations: todo
+ icon-translations: done
+ reconfiguration-flow: todo
+ repair-issues:
+ status: exempt
+ comment: |
+ No repairs
+ stale-devices:
+ status: exempt
+ comment: |
+ Device type integration
+
+ # Platinum
+ async-dependency: done
+ inject-websession:
+ status: exempt
+ comment: |
+ Integration does not make any HTTP requests.
+ strict-typing: done
diff --git a/homeassistant/components/bosch_alarm/sensor.py b/homeassistant/components/bosch_alarm/sensor.py
new file mode 100644
index 00000000000..3d61c72a883
--- /dev/null
+++ b/homeassistant/components/bosch_alarm/sensor.py
@@ -0,0 +1,86 @@
+"""Support for Bosch Alarm Panel History as a sensor."""
+
+from __future__ import annotations
+
+from collections.abc import Callable
+from dataclasses import dataclass
+
+from bosch_alarm_mode2 import Panel
+from bosch_alarm_mode2.panel import Area
+
+from homeassistant.components.sensor import SensorEntity, SensorEntityDescription
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from . import BoschAlarmConfigEntry
+from .entity import BoschAlarmAreaEntity
+
+
+@dataclass(kw_only=True, frozen=True)
+class BoschAlarmSensorEntityDescription(SensorEntityDescription):
+ """Describes Bosch Alarm sensor entity."""
+
+ value_fn: Callable[[Area], int]
+ observe_alarms: bool = False
+ observe_ready: bool = False
+ observe_status: bool = False
+
+
+SENSOR_TYPES: list[BoschAlarmSensorEntityDescription] = [
+ BoschAlarmSensorEntityDescription(
+ key="faulting_points",
+ translation_key="faulting_points",
+ value_fn=lambda area: area.faults,
+ observe_ready=True,
+ ),
+]
+
+
+async def async_setup_entry(
+ hass: HomeAssistant,
+ config_entry: BoschAlarmConfigEntry,
+ async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+ """Set up bosch alarm sensors."""
+
+ panel = config_entry.runtime_data
+ unique_id = config_entry.unique_id or config_entry.entry_id
+
+ async_add_entities(
+ BoschAreaSensor(panel, area_id, unique_id, template)
+ for area_id in panel.areas
+ for template in SENSOR_TYPES
+ )
+
+
+PARALLEL_UPDATES = 0
+
+
+class BoschAreaSensor(BoschAlarmAreaEntity, SensorEntity):
+ """An area sensor entity for a bosch alarm panel."""
+
+ entity_description: BoschAlarmSensorEntityDescription
+
+ def __init__(
+ self,
+ panel: Panel,
+ area_id: int,
+ unique_id: str,
+ entity_description: BoschAlarmSensorEntityDescription,
+ ) -> None:
+ """Set up an area sensor entity for a bosch alarm panel."""
+ super().__init__(
+ panel,
+ area_id,
+ unique_id,
+ entity_description.observe_alarms,
+ entity_description.observe_ready,
+ entity_description.observe_status,
+ )
+ self.entity_description = entity_description
+ self._attr_unique_id = f"{self._area_unique_id}_{entity_description.key}"
+
+ @property
+ def native_value(self) -> int:
+ """Return the state of the sensor."""
+ return self.entity_description.value_fn(self._area)
diff --git a/homeassistant/components/bosch_alarm/strings.json b/homeassistant/components/bosch_alarm/strings.json
new file mode 100644
index 00000000000..6b916dad4fa
--- /dev/null
+++ b/homeassistant/components/bosch_alarm/strings.json
@@ -0,0 +1,67 @@
+{
+ "config": {
+ "step": {
+ "user": {
+ "data": {
+ "host": "[%key:common::config_flow::data::host%]",
+ "port": "[%key:common::config_flow::data::port%]"
+ },
+ "data_description": {
+ "host": "The hostname or IP address of your Bosch alarm panel",
+ "port": "The port used to connect to your Bosch alarm panel. This is usually 7700"
+ }
+ },
+ "auth": {
+ "data": {
+ "password": "[%key:common::config_flow::data::password%]",
+ "installer_code": "Installer code",
+ "user_code": "User code"
+ },
+ "data_description": {
+ "password": "The Mode 2 automation code from your panel",
+ "installer_code": "The installer code from your panel",
+ "user_code": "The user code from your panel"
+ }
+ },
+ "reauth_confirm": {
+ "data": {
+ "password": "[%key:common::config_flow::data::password%]",
+ "installer_code": "[%key:component::bosch_alarm::config::step::auth::data::installer_code%]",
+ "user_code": "[%key:component::bosch_alarm::config::step::auth::data::user_code%]"
+ },
+ "data_description": {
+ "password": "[%key:component::bosch_alarm::config::step::auth::data_description::password%]",
+ "installer_code": "[%key:component::bosch_alarm::config::step::auth::data_description::installer_code%]",
+ "user_code": "[%key:component::bosch_alarm::config::step::auth::data_description::user_code%]"
+ }
+ }
+ },
+ "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%]"
+ },
+ "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%]",
+ "device_mismatch": "Please ensure you reconfigure against the same device."
+ }
+ },
+ "exceptions": {
+ "cannot_connect": {
+ "message": "Could not connect to panel."
+ },
+ "authentication_failed": {
+ "message": "Incorrect credentials for panel."
+ }
+ },
+ "entity": {
+ "sensor": {
+ "faulting_points": {
+ "name": "Faulting points",
+ "unit_of_measurement": "points"
+ }
+ }
+ }
+}
diff --git a/homeassistant/components/bosch_shc/binary_sensor.py b/homeassistant/components/bosch_shc/binary_sensor.py
index dd0f31ea6f9..30d823fd608 100644
--- a/homeassistant/components/bosch_shc/binary_sensor.py
+++ b/homeassistant/components/bosch_shc/binary_sensor.py
@@ -10,7 +10,7 @@ from homeassistant.components.binary_sensor import (
BinarySensorEntity,
)
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import BoschConfigEntry
from .entity import SHCEntity
@@ -19,7 +19,7 @@ from .entity import SHCEntity
async def async_setup_entry(
hass: HomeAssistant,
config_entry: BoschConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the SHC binary sensor platform."""
session = config_entry.runtime_data
diff --git a/homeassistant/components/bosch_shc/cover.py b/homeassistant/components/bosch_shc/cover.py
index 55d6bfc35de..766dcf37ce9 100644
--- a/homeassistant/components/bosch_shc/cover.py
+++ b/homeassistant/components/bosch_shc/cover.py
@@ -11,7 +11,7 @@ from homeassistant.components.cover import (
CoverEntityFeature,
)
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import BoschConfigEntry
from .entity import SHCEntity
@@ -20,7 +20,7 @@ from .entity import SHCEntity
async def async_setup_entry(
hass: HomeAssistant,
config_entry: BoschConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the SHC cover platform."""
session = config_entry.runtime_data
diff --git a/homeassistant/components/bosch_shc/sensor.py b/homeassistant/components/bosch_shc/sensor.py
index 6408e21654e..885908804c0 100644
--- a/homeassistant/components/bosch_shc/sensor.py
+++ b/homeassistant/components/bosch_shc/sensor.py
@@ -22,7 +22,7 @@ from homeassistant.const import (
UnitOfTemperature,
)
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.typing import StateType
from . import BoschConfigEntry
@@ -126,7 +126,7 @@ SENSOR_DESCRIPTIONS: dict[str, SHCSensorEntityDescription] = {
async def async_setup_entry(
hass: HomeAssistant,
config_entry: BoschConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the SHC sensor platform."""
session = config_entry.runtime_data
diff --git a/homeassistant/components/bosch_shc/switch.py b/homeassistant/components/bosch_shc/switch.py
index 76b1da3e534..bf1d5d39ee5 100644
--- a/homeassistant/components/bosch_shc/switch.py
+++ b/homeassistant/components/bosch_shc/switch.py
@@ -21,7 +21,7 @@ from homeassistant.components.switch import (
)
from homeassistant.const import EntityCategory
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.typing import StateType
from . import BoschConfigEntry
@@ -79,7 +79,7 @@ SWITCH_TYPES: dict[str, SHCSwitchEntityDescription] = {
async def async_setup_entry(
hass: HomeAssistant,
config_entry: BoschConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the SHC switch platform."""
session = config_entry.runtime_data
diff --git a/homeassistant/components/braviatv/button.py b/homeassistant/components/braviatv/button.py
index 626e5a225b7..20250949bcb 100644
--- a/homeassistant/components/braviatv/button.py
+++ b/homeassistant/components/braviatv/button.py
@@ -12,7 +12,7 @@ from homeassistant.components.button import (
)
from homeassistant.const import EntityCategory
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .coordinator import BraviaTVConfigEntry, BraviaTVCoordinator
from .entity import BraviaTVEntity
@@ -44,7 +44,7 @@ BUTTONS: tuple[BraviaTVButtonDescription, ...] = (
async def async_setup_entry(
hass: HomeAssistant,
config_entry: BraviaTVConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the Bravia TV Button entities."""
diff --git a/homeassistant/components/braviatv/media_player.py b/homeassistant/components/braviatv/media_player.py
index ca48c6ee639..fe9c386b060 100644
--- a/homeassistant/components/braviatv/media_player.py
+++ b/homeassistant/components/braviatv/media_player.py
@@ -16,7 +16,7 @@ from homeassistant.components.media_player import (
MediaType,
)
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .const import SourceType
from .coordinator import BraviaTVConfigEntry
@@ -26,7 +26,7 @@ from .entity import BraviaTVEntity
async def async_setup_entry(
hass: HomeAssistant,
config_entry: BraviaTVConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up Bravia TV Media Player from a config_entry."""
diff --git a/homeassistant/components/braviatv/remote.py b/homeassistant/components/braviatv/remote.py
index 9f4a573827b..0611e367445 100644
--- a/homeassistant/components/braviatv/remote.py
+++ b/homeassistant/components/braviatv/remote.py
@@ -7,7 +7,7 @@ from typing import Any
from homeassistant.components.remote import ATTR_NUM_REPEATS, RemoteEntity
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .coordinator import BraviaTVConfigEntry
from .entity import BraviaTVEntity
@@ -16,7 +16,7 @@ from .entity import BraviaTVEntity
async def async_setup_entry(
hass: HomeAssistant,
config_entry: BraviaTVConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up Bravia TV Remote from a config entry."""
diff --git a/homeassistant/components/bring/diagnostics.py b/homeassistant/components/bring/diagnostics.py
index 6c2f779ef05..e5cafd30ab5 100644
--- a/homeassistant/components/bring/diagnostics.py
+++ b/homeassistant/components/bring/diagnostics.py
@@ -4,10 +4,14 @@ from __future__ import annotations
from typing import Any
+from homeassistant.components.diagnostics import async_redact_data
+from homeassistant.const import CONF_EMAIL, CONF_NAME
from homeassistant.core import HomeAssistant
from .coordinator import BringConfigEntry
+TO_REDACT = {CONF_NAME, CONF_EMAIL}
+
async def async_get_config_entry_diagnostics(
hass: HomeAssistant, config_entry: BringConfigEntry
@@ -15,7 +19,10 @@ async def async_get_config_entry_diagnostics(
"""Return diagnostics for a config entry."""
return {
- "data": {k: v.to_dict() for k, v in config_entry.runtime_data.data.items()},
+ "data": {
+ k: async_redact_data(v.to_dict(), TO_REDACT)
+ for k, v in config_entry.runtime_data.data.items()
+ },
"lists": [lst.to_dict() for lst in config_entry.runtime_data.lists],
"user_settings": config_entry.runtime_data.user_settings.to_dict(),
}
diff --git a/homeassistant/components/bring/event.py b/homeassistant/components/bring/event.py
index 699dba9015a..403856405ce 100644
--- a/homeassistant/components/bring/event.py
+++ b/homeassistant/components/bring/event.py
@@ -9,7 +9,7 @@ from bring_api import ActivityType, BringList
from homeassistant.components.event import EventEntity
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import BringConfigEntry
from .coordinator import BringDataUpdateCoordinator
@@ -21,7 +21,7 @@ PARALLEL_UPDATES = 0
async def async_setup_entry(
hass: HomeAssistant,
config_entry: BringConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the event platform."""
coordinator = config_entry.runtime_data
@@ -77,9 +77,12 @@ class BringEventEntity(BringBaseEntity, EventEntity):
attributes = asdict(activity.content)
attributes["last_activity_by"] = next(
- x.name
- for x in bring_list.users.users
- if x.publicUuid == activity.content.publicUserUuid
+ (
+ x.name
+ for x in bring_list.users.users
+ if x.publicUuid == activity.content.publicUserUuid
+ ),
+ None,
)
self._trigger_event(
diff --git a/homeassistant/components/bring/manifest.json b/homeassistant/components/bring/manifest.json
index b846cb1c5ca..b2d42835cce 100644
--- a/homeassistant/components/bring/manifest.json
+++ b/homeassistant/components/bring/manifest.json
@@ -7,5 +7,6 @@
"integration_type": "service",
"iot_class": "cloud_polling",
"loggers": ["bring_api"],
- "requirements": ["bring-api==1.0.2"]
+ "quality_scale": "platinum",
+ "requirements": ["bring-api==1.1.0"]
}
diff --git a/homeassistant/components/bring/quality_scale.yaml b/homeassistant/components/bring/quality_scale.yaml
index 58e67ab0e11..2d7d67be12e 100644
--- a/homeassistant/components/bring/quality_scale.yaml
+++ b/homeassistant/components/bring/quality_scale.yaml
@@ -10,9 +10,9 @@ rules:
config-flow: done
dependency-transparency: done
docs-actions: done
- docs-high-level-description: todo
- docs-installation-instructions: todo
- docs-removal-instructions: todo
+ docs-high-level-description: done
+ docs-installation-instructions: done
+ docs-removal-instructions: done
entity-event-setup:
status: exempt
comment: The integration registers no events
@@ -26,8 +26,10 @@ rules:
# Silver
action-exceptions: done
config-entry-unloading: done
- docs-configuration-parameters: todo
- docs-installation-parameters: todo
+ docs-configuration-parameters:
+ status: exempt
+ comment: Integration has no configuration parameters
+ docs-installation-parameters: done
entity-unavailable: done
integration-owner: done
log-when-unavailable:
@@ -46,13 +48,15 @@ rules:
discovery:
status: exempt
comment: Integration is a service and has no devices.
- docs-data-update: todo
- docs-examples: todo
- docs-known-limitations: todo
- docs-supported-devices: todo
- docs-supported-functions: todo
- docs-troubleshooting: todo
- docs-use-cases: todo
+ docs-data-update: done
+ docs-examples: done
+ docs-known-limitations: done
+ docs-supported-devices:
+ status: exempt
+ comment: Integration is a service and has no devices.
+ docs-supported-functions: done
+ docs-troubleshooting: done
+ docs-use-cases: done
dynamic-devices: done
entity-category: done
entity-device-class: done
diff --git a/homeassistant/components/bring/sensor.py b/homeassistant/components/bring/sensor.py
index bfe93619dbb..2a09d574607 100644
--- a/homeassistant/components/bring/sensor.py
+++ b/homeassistant/components/bring/sensor.py
@@ -16,7 +16,7 @@ from homeassistant.components.sensor import (
)
from homeassistant.const import EntityCategory
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.typing import StateType
from .coordinator import BringConfigEntry, BringData, BringDataUpdateCoordinator
@@ -85,7 +85,7 @@ SENSOR_DESCRIPTIONS: tuple[BringSensorEntityDescription, ...] = (
async def async_setup_entry(
hass: HomeAssistant,
config_entry: BringConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the sensor platform."""
coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/bring/strings.json b/homeassistant/components/bring/strings.json
index 1dbe0adbf6c..2c30af5adce 100644
--- a/homeassistant/components/bring/strings.json
+++ b/homeassistant/components/bring/strings.json
@@ -13,7 +13,7 @@
},
"data_description": {
"email": "The email address associated with your Bring! account.",
- "password": "The password to login to your Bring! account."
+ "password": "The password to log in to your Bring! account."
}
},
"reauth_confirm": {
diff --git a/homeassistant/components/bring/todo.py b/homeassistant/components/bring/todo.py
index 4de306273f3..d1eb9e78341 100644
--- a/homeassistant/components/bring/todo.py
+++ b/homeassistant/components/bring/todo.py
@@ -24,7 +24,7 @@ from homeassistant.components.todo import (
from homeassistant.core import HomeAssistant, callback
from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
from homeassistant.helpers import config_validation as cv, entity_platform
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .const import (
ATTR_ITEM_NAME,
@@ -41,7 +41,7 @@ PARALLEL_UPDATES = 0
async def async_setup_entry(
hass: HomeAssistant,
config_entry: BringConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the sensor from a config entry created in the integrations UI."""
coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/broadlink/climate.py b/homeassistant/components/broadlink/climate.py
index 25a6bbd60a5..5be04c24f0d 100644
--- a/homeassistant/components/broadlink/climate.py
+++ b/homeassistant/components/broadlink/climate.py
@@ -13,7 +13,7 @@ from homeassistant.components.climate import (
from homeassistant.config_entries import ConfigEntry
from homeassistant.const import PRECISION_HALVES, Platform, UnitOfTemperature
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .const import DOMAIN, DOMAINS_AND_TYPES
from .device import BroadlinkDevice
@@ -31,7 +31,7 @@ class SensorMode(IntEnum):
async def async_setup_entry(
hass: HomeAssistant,
config_entry: ConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the Broadlink climate entities."""
device = hass.data[DOMAIN].devices[config_entry.entry_id]
diff --git a/homeassistant/components/broadlink/entity.py b/homeassistant/components/broadlink/entity.py
index 6c956d8c80a..a97374680f9 100644
--- a/homeassistant/components/broadlink/entity.py
+++ b/homeassistant/components/broadlink/entity.py
@@ -17,13 +17,13 @@ class BroadlinkEntity(Entity):
self._device = device
self._coordinator = device.update_manager.coordinator
- async def async_added_to_hass(self):
+ async def async_added_to_hass(self) -> None:
"""Call when the entity is added to hass."""
self.async_on_remove(self._coordinator.async_add_listener(self._recv_data))
if self._coordinator.data:
self._update_state(self._coordinator.data)
- async def async_update(self):
+ async def async_update(self) -> None:
"""Update the state of the entity."""
await self._coordinator.async_request_refresh()
@@ -49,7 +49,7 @@ class BroadlinkEntity(Entity):
"""
@property
- def available(self):
+ def available(self) -> bool:
"""Return True if the entity is available."""
return self._device.available
diff --git a/homeassistant/components/broadlink/light.py b/homeassistant/components/broadlink/light.py
index 39d6caaa49f..64698e57249 100644
--- a/homeassistant/components/broadlink/light.py
+++ b/homeassistant/components/broadlink/light.py
@@ -14,7 +14,7 @@ from homeassistant.components.light import (
)
from homeassistant.config_entries import ConfigEntry
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .const import DOMAIN
from .entity import BroadlinkEntity
@@ -29,7 +29,7 @@ BROADLINK_COLOR_MODE_SCENES = 2
async def async_setup_entry(
hass: HomeAssistant,
config_entry: ConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the Broadlink light."""
device = hass.data[DOMAIN].devices[config_entry.entry_id]
diff --git a/homeassistant/components/broadlink/remote.py b/homeassistant/components/broadlink/remote.py
index 18a3a82017c..c1196b03310 100644
--- a/homeassistant/components/broadlink/remote.py
+++ b/homeassistant/components/broadlink/remote.py
@@ -37,7 +37,7 @@ from homeassistant.config_entries import ConfigEntry
from homeassistant.const import ATTR_COMMAND, STATE_OFF
from homeassistant.core import HomeAssistant, callback
from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.restore_state import RestoreEntity
from homeassistant.helpers.storage import Store
from homeassistant.util import dt as dt_util
@@ -92,7 +92,7 @@ SERVICE_DELETE_SCHEMA = COMMAND_SCHEMA.extend(
async def async_setup_entry(
hass: HomeAssistant,
config_entry: ConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up a Broadlink remote."""
device = hass.data[DOMAIN].devices[config_entry.entry_id]
diff --git a/homeassistant/components/broadlink/select.py b/homeassistant/components/broadlink/select.py
index 6253adc308a..661fc62600d 100644
--- a/homeassistant/components/broadlink/select.py
+++ b/homeassistant/components/broadlink/select.py
@@ -7,7 +7,7 @@ from typing import Any
from homeassistant.components.select import SelectEntity
from homeassistant.config_entries import ConfigEntry
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import BroadlinkDevice
from .const import DOMAIN
@@ -28,7 +28,7 @@ DAY_NAME_TO_ID = {v: k for k, v in DAY_ID_TO_NAME.items()}
async def async_setup_entry(
hass: HomeAssistant,
config_entry: ConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the Broadlink select."""
device = hass.data[DOMAIN].devices[config_entry.entry_id]
diff --git a/homeassistant/components/broadlink/sensor.py b/homeassistant/components/broadlink/sensor.py
index b7ae71ff803..e7d420f0c0e 100644
--- a/homeassistant/components/broadlink/sensor.py
+++ b/homeassistant/components/broadlink/sensor.py
@@ -18,7 +18,7 @@ from homeassistant.const import (
UnitOfTemperature,
)
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .const import DOMAIN
from .entity import BroadlinkEntity
@@ -86,7 +86,7 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
async def async_setup_entry(
hass: HomeAssistant,
config_entry: ConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the Broadlink sensor."""
device = hass.data[DOMAIN].devices[config_entry.entry_id]
diff --git a/homeassistant/components/broadlink/switch.py b/homeassistant/components/broadlink/switch.py
index 9098440a5c4..d6869ac4c9c 100644
--- a/homeassistant/components/broadlink/switch.py
+++ b/homeassistant/components/broadlink/switch.py
@@ -30,7 +30,10 @@ from homeassistant.const import (
from homeassistant.core import HomeAssistant
from homeassistant.exceptions import PlatformNotReady
from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+ AddConfigEntryEntitiesCallback,
+ AddEntitiesCallback,
+)
from homeassistant.helpers.restore_state import RestoreEntity
from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
@@ -85,7 +88,7 @@ async def async_setup_platform(
if switches := config.get(CONF_SWITCHES):
platform_data = hass.data[DOMAIN].platforms.get(Platform.SWITCH, {})
- async_add_entities_config_entry: AddEntitiesCallback
+ async_add_entities_config_entry: AddConfigEntryEntitiesCallback
device: BroadlinkDevice
async_add_entities_config_entry, device = platform_data.get(
mac_addr, (None, None)
@@ -111,7 +114,7 @@ async def async_setup_platform(
async def async_setup_entry(
hass: HomeAssistant,
config_entry: ConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the Broadlink switch."""
device = hass.data[DOMAIN].devices[config_entry.entry_id]
diff --git a/homeassistant/components/broadlink/time.py b/homeassistant/components/broadlink/time.py
index 3dcb045fead..4687df6b8b6 100644
--- a/homeassistant/components/broadlink/time.py
+++ b/homeassistant/components/broadlink/time.py
@@ -8,7 +8,7 @@ from typing import Any
from homeassistant.components.time import TimeEntity
from homeassistant.config_entries import ConfigEntry
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.util import dt as dt_util
from . import BroadlinkDevice
@@ -19,7 +19,7 @@ from .entity import BroadlinkEntity
async def async_setup_entry(
hass: HomeAssistant,
config_entry: ConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the Broadlink time."""
device = hass.data[DOMAIN].devices[config_entry.entry_id]
diff --git a/homeassistant/components/brother/__init__.py b/homeassistant/components/brother/__init__.py
index 464e6629224..1c1768b58fd 100644
--- a/homeassistant/components/brother/__init__.py
+++ b/homeassistant/components/brother/__init__.py
@@ -9,6 +9,7 @@ from homeassistant.const import CONF_HOST, CONF_TYPE, Platform
from homeassistant.core import HomeAssistant
from homeassistant.exceptions import ConfigEntryNotReady
+from .const import DOMAIN
from .coordinator import BrotherConfigEntry, BrotherDataUpdateCoordinator
PLATFORMS = [Platform.SENSOR]
@@ -25,7 +26,14 @@ async def async_setup_entry(hass: HomeAssistant, entry: BrotherConfigEntry) -> b
host, printer_type=printer_type, snmp_engine=snmp_engine
)
except (ConnectionError, SnmpError, TimeoutError) as error:
- raise ConfigEntryNotReady from error
+ raise ConfigEntryNotReady(
+ translation_domain=DOMAIN,
+ translation_key="cannot_connect",
+ translation_placeholders={
+ "device": entry.title,
+ "error": repr(error),
+ },
+ ) from error
coordinator = BrotherDataUpdateCoordinator(hass, entry, brother)
await coordinator.async_config_entry_first_refresh()
diff --git a/homeassistant/components/brother/coordinator.py b/homeassistant/components/brother/coordinator.py
index 4f518ba8a25..a3c337f27f7 100644
--- a/homeassistant/components/brother/coordinator.py
+++ b/homeassistant/components/brother/coordinator.py
@@ -26,6 +26,7 @@ class BrotherDataUpdateCoordinator(DataUpdateCoordinator[BrotherSensors]):
) -> None:
"""Initialize."""
self.brother = brother
+ self.device_name = config_entry.title
super().__init__(
hass,
@@ -41,5 +42,12 @@ class BrotherDataUpdateCoordinator(DataUpdateCoordinator[BrotherSensors]):
async with timeout(20):
data = await self.brother.async_update()
except (ConnectionError, SnmpError, UnsupportedModelError) as error:
- raise UpdateFailed(error) from error
+ raise UpdateFailed(
+ translation_domain=DOMAIN,
+ translation_key="update_error",
+ translation_placeholders={
+ "device": self.device_name,
+ "error": repr(error),
+ },
+ ) from error
return data
diff --git a/homeassistant/components/brother/sensor.py b/homeassistant/components/brother/sensor.py
index 087a971f928..a09fe8ebc60 100644
--- a/homeassistant/components/brother/sensor.py
+++ b/homeassistant/components/brother/sensor.py
@@ -20,7 +20,7 @@ from homeassistant.const import PERCENTAGE, EntityCategory
from homeassistant.core import HomeAssistant, callback
from homeassistant.helpers import entity_registry as er
from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.typing import StateType
from homeassistant.helpers.update_coordinator import CoordinatorEntity
@@ -303,7 +303,7 @@ SENSOR_TYPES: tuple[BrotherSensorEntityDescription, ...] = (
async def async_setup_entry(
hass: HomeAssistant,
entry: BrotherConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Add Brother entities from a config_entry."""
coordinator = entry.runtime_data
diff --git a/homeassistant/components/brother/strings.json b/homeassistant/components/brother/strings.json
index b502ed7e3b9..d0714a199c4 100644
--- a/homeassistant/components/brother/strings.json
+++ b/homeassistant/components/brother/strings.json
@@ -159,5 +159,13 @@
"name": "Last restart"
}
}
+ },
+ "exceptions": {
+ "cannot_connect": {
+ "message": "An error occurred while connecting to the {device} printer: {error}"
+ },
+ "update_error": {
+ "message": "An error occurred while retrieving data from the {device} printer: {error}"
+ }
}
}
diff --git a/homeassistant/components/brottsplatskartan/sensor.py b/homeassistant/components/brottsplatskartan/sensor.py
index 6725a32bb40..60f9a8163de 100644
--- a/homeassistant/components/brottsplatskartan/sensor.py
+++ b/homeassistant/components/brottsplatskartan/sensor.py
@@ -13,7 +13,7 @@ from homeassistant.config_entries import ConfigEntry
from homeassistant.const import CONF_LATITUDE, CONF_LONGITUDE
from homeassistant.core import HomeAssistant
from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .const import CONF_APP_ID, CONF_AREA, DOMAIN, LOGGER
@@ -21,7 +21,9 @@ SCAN_INTERVAL = timedelta(minutes=30)
async def async_setup_entry(
- hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+ hass: HomeAssistant,
+ entry: ConfigEntry,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the Brottsplatskartan sensor entry."""
diff --git a/homeassistant/components/brunt/cover.py b/homeassistant/components/brunt/cover.py
index bb97f42bd36..95931d3449e 100644
--- a/homeassistant/components/brunt/cover.py
+++ b/homeassistant/components/brunt/cover.py
@@ -16,7 +16,7 @@ from homeassistant.components.cover import (
from homeassistant.core import HomeAssistant, callback
from homeassistant.exceptions import HomeAssistantError
from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.update_coordinator import CoordinatorEntity
from .const import (
@@ -34,7 +34,7 @@ from .coordinator import BruntConfigEntry, BruntCoordinator
async def async_setup_entry(
hass: HomeAssistant,
entry: BruntConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the brunt platform."""
coordinator = entry.runtime_data
diff --git a/homeassistant/components/bryant_evolution/climate.py b/homeassistant/components/bryant_evolution/climate.py
index 2d54ced8217..bd053229a1a 100644
--- a/homeassistant/components/bryant_evolution/climate.py
+++ b/homeassistant/components/bryant_evolution/climate.py
@@ -17,7 +17,7 @@ from homeassistant.core import HomeAssistant
from homeassistant.exceptions import HomeAssistantError
from homeassistant.helpers.device_registry import DeviceInfo
from homeassistant.helpers.entity import Entity
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import BryantEvolutionConfigEntry, names
from .const import CONF_SYSTEM_ZONE, DOMAIN
@@ -31,7 +31,7 @@ SCAN_INTERVAL = timedelta(seconds=60)
async def async_setup_entry(
hass: HomeAssistant,
config_entry: BryantEvolutionConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up a config entry."""
diff --git a/homeassistant/components/bsblan/climate.py b/homeassistant/components/bsblan/climate.py
index 2833d6549b4..bef0388a57d 100644
--- a/homeassistant/components/bsblan/climate.py
+++ b/homeassistant/components/bsblan/climate.py
@@ -19,7 +19,7 @@ from homeassistant.const import ATTR_TEMPERATURE
from homeassistant.core import HomeAssistant
from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
from homeassistant.helpers.device_registry import format_mac
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.util.enum import try_parse_enum
from . import BSBLanConfigEntry, BSBLanData
@@ -43,7 +43,7 @@ PRESET_MODES = [
async def async_setup_entry(
hass: HomeAssistant,
entry: BSBLanConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up BSBLAN device based on a config entry."""
data = entry.runtime_data
diff --git a/homeassistant/components/bsblan/sensor.py b/homeassistant/components/bsblan/sensor.py
index c13b4ad7650..6a6784a4542 100644
--- a/homeassistant/components/bsblan/sensor.py
+++ b/homeassistant/components/bsblan/sensor.py
@@ -13,7 +13,7 @@ from homeassistant.components.sensor import (
)
from homeassistant.const import UnitOfTemperature
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.typing import StateType
from . import BSBLanConfigEntry, BSBLanData
@@ -51,7 +51,7 @@ SENSOR_TYPES: tuple[BSBLanSensorEntityDescription, ...] = (
async def async_setup_entry(
hass: HomeAssistant,
entry: BSBLanConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up BSB-Lan sensor based on a config entry."""
data = entry.runtime_data
diff --git a/homeassistant/components/bsblan/strings.json b/homeassistant/components/bsblan/strings.json
index a73a89ca1cc..93562763999 100644
--- a/homeassistant/components/bsblan/strings.json
+++ b/homeassistant/components/bsblan/strings.json
@@ -30,7 +30,7 @@
"message": "Can't set preset mode to {preset_mode} when HVAC mode is not set to auto"
},
"set_data_error": {
- "message": "An error occurred while sending the data to the BSBLAN device"
+ "message": "An error occurred while sending the data to the BSB-Lan device"
},
"set_temperature_error": {
"message": "An error occurred while setting the temperature"
diff --git a/homeassistant/components/bsblan/water_heater.py b/homeassistant/components/bsblan/water_heater.py
index 318408a9124..a3aee4cdc15 100644
--- a/homeassistant/components/bsblan/water_heater.py
+++ b/homeassistant/components/bsblan/water_heater.py
@@ -16,7 +16,7 @@ from homeassistant.const import ATTR_TEMPERATURE, STATE_ON
from homeassistant.core import HomeAssistant
from homeassistant.exceptions import HomeAssistantError
from homeassistant.helpers.device_registry import format_mac
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import BSBLanConfigEntry, BSBLanData
from .const import DOMAIN
@@ -37,7 +37,7 @@ OPERATION_MODES_REVERSE = {v: k for k, v in OPERATION_MODES.items()}
async def async_setup_entry(
hass: HomeAssistant,
entry: BSBLanConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up BSBLAN water heater based on a config entry."""
data = entry.runtime_data
diff --git a/homeassistant/components/bthome/binary_sensor.py b/homeassistant/components/bthome/binary_sensor.py
index bcc420df4a8..97ed85c1204 100644
--- a/homeassistant/components/bthome/binary_sensor.py
+++ b/homeassistant/components/bthome/binary_sensor.py
@@ -17,7 +17,7 @@ from homeassistant.components.bluetooth.passive_update_processor import (
PassiveBluetoothProcessorEntity,
)
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.sensor import sensor_device_info_to_hass_device_info
from .coordinator import BTHomePassiveBluetoothDataProcessor
@@ -169,7 +169,7 @@ def sensor_update_to_bluetooth_data_update(
async def async_setup_entry(
hass: HomeAssistant,
entry: BTHomeConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the BTHome BLE binary sensors."""
coordinator = entry.runtime_data
diff --git a/homeassistant/components/bthome/event.py b/homeassistant/components/bthome/event.py
index a6ee79f4e05..99799819e43 100644
--- a/homeassistant/components/bthome/event.py
+++ b/homeassistant/components/bthome/event.py
@@ -12,7 +12,7 @@ from homeassistant.components.event import (
from homeassistant.core import HomeAssistant, callback
from homeassistant.helpers import device_registry as dr, entity_registry as er
from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import format_discovered_event_class, format_event_dispatcher_name
from .const import (
@@ -104,7 +104,7 @@ class BTHomeEventEntity(EventEntity):
async def async_setup_entry(
hass: HomeAssistant,
entry: BTHomeConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up BTHome event."""
coordinator = entry.runtime_data
diff --git a/homeassistant/components/bthome/sensor.py b/homeassistant/components/bthome/sensor.py
index 23a058b0b0c..7025929abd8 100644
--- a/homeassistant/components/bthome/sensor.py
+++ b/homeassistant/components/bthome/sensor.py
@@ -42,7 +42,7 @@ from homeassistant.const import (
UnitOfVolumeFlowRate,
)
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.sensor import sensor_device_info_to_hass_device_info
from .coordinator import BTHomePassiveBluetoothDataProcessor
@@ -423,7 +423,7 @@ def sensor_update_to_bluetooth_data_update(
async def async_setup_entry(
hass: HomeAssistant,
entry: BTHomeConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the BTHome BLE sensors."""
coordinator = entry.runtime_data
diff --git a/homeassistant/components/buienradar/camera.py b/homeassistant/components/buienradar/camera.py
index 45ff2d6de52..15d08281911 100644
--- a/homeassistant/components/buienradar/camera.py
+++ b/homeassistant/components/buienradar/camera.py
@@ -13,7 +13,7 @@ from homeassistant.components.camera import Camera
from homeassistant.const import CONF_COUNTRY_CODE, CONF_LATITUDE, CONF_LONGITUDE
from homeassistant.core import HomeAssistant
from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.util import dt as dt_util
from . import BuienRadarConfigEntry
@@ -31,7 +31,7 @@ SUPPORTED_COUNTRY_CODES = ["NL", "BE"]
async def async_setup_entry(
hass: HomeAssistant,
entry: BuienRadarConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up buienradar radar-loop camera component."""
config = entry.data
diff --git a/homeassistant/components/buienradar/sensor.py b/homeassistant/components/buienradar/sensor.py
index 712f765237e..586543de129 100644
--- a/homeassistant/components/buienradar/sensor.py
+++ b/homeassistant/components/buienradar/sensor.py
@@ -45,7 +45,7 @@ from homeassistant.const import (
UnitOfVolumetricFlux,
)
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.util import dt as dt_util
from . import BuienRadarConfigEntry
@@ -169,6 +169,8 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
translation_key="windazimuth",
native_unit_of_measurement=DEGREE,
icon="mdi:compass-outline",
+ device_class=SensorDeviceClass.WIND_DIRECTION,
+ state_class=SensorStateClass.MEASUREMENT_ANGLE,
),
SensorEntityDescription(
key="pressure",
@@ -530,30 +532,35 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
translation_key="windazimuth_1d",
native_unit_of_measurement=DEGREE,
icon="mdi:compass-outline",
+ device_class=SensorDeviceClass.WIND_DIRECTION,
),
SensorEntityDescription(
key="windazimuth_2d",
translation_key="windazimuth_2d",
native_unit_of_measurement=DEGREE,
icon="mdi:compass-outline",
+ device_class=SensorDeviceClass.WIND_DIRECTION,
),
SensorEntityDescription(
key="windazimuth_3d",
translation_key="windazimuth_3d",
native_unit_of_measurement=DEGREE,
icon="mdi:compass-outline",
+ device_class=SensorDeviceClass.WIND_DIRECTION,
),
SensorEntityDescription(
key="windazimuth_4d",
translation_key="windazimuth_4d",
native_unit_of_measurement=DEGREE,
icon="mdi:compass-outline",
+ device_class=SensorDeviceClass.WIND_DIRECTION,
),
SensorEntityDescription(
key="windazimuth_5d",
translation_key="windazimuth_5d",
native_unit_of_measurement=DEGREE,
icon="mdi:compass-outline",
+ device_class=SensorDeviceClass.WIND_DIRECTION,
),
SensorEntityDescription(
key="condition_1d",
@@ -691,7 +698,7 @@ SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
async def async_setup_entry(
hass: HomeAssistant,
entry: BuienRadarConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Create the buienradar sensor."""
config = entry.data
diff --git a/homeassistant/components/buienradar/util.py b/homeassistant/components/buienradar/util.py
index a7267320de3..4d54c95fd6c 100644
--- a/homeassistant/components/buienradar/util.py
+++ b/homeassistant/components/buienradar/util.py
@@ -12,6 +12,7 @@ from buienradar.constants import (
CONDITION,
CONTENT,
DATA,
+ FEELTEMPERATURE,
FORECAST,
HUMIDITY,
MESSAGE,
@@ -22,6 +23,7 @@ from buienradar.constants import (
TEMPERATURE,
VISIBILITY,
WINDAZIMUTH,
+ WINDGUST,
WINDSPEED,
)
from buienradar.urls import JSON_FEED_URL, json_precipitation_forecast_url
@@ -200,6 +202,14 @@ class BrData:
except (ValueError, TypeError):
return None
+ @property
+ def feeltemperature(self):
+ """Return the feeltemperature, or None."""
+ try:
+ return float(self.data.get(FEELTEMPERATURE))
+ except (ValueError, TypeError):
+ return None
+
@property
def pressure(self):
"""Return the pressure, or None."""
@@ -224,6 +234,14 @@ class BrData:
except (ValueError, TypeError):
return None
+ @property
+ def wind_gust(self):
+ """Return the windgust, or None."""
+ try:
+ return float(self.data.get(WINDGUST))
+ except (ValueError, TypeError):
+ return None
+
@property
def wind_speed(self):
"""Return the windspeed, or None."""
diff --git a/homeassistant/components/buienradar/weather.py b/homeassistant/components/buienradar/weather.py
index 8b71032bace..568926ef0cd 100644
--- a/homeassistant/components/buienradar/weather.py
+++ b/homeassistant/components/buienradar/weather.py
@@ -9,6 +9,7 @@ from buienradar.constants import (
MAX_TEMP,
MIN_TEMP,
RAIN,
+ RAIN_CHANCE,
WINDAZIMUTH,
WINDSPEED,
)
@@ -33,6 +34,7 @@ from homeassistant.components.weather import (
ATTR_FORECAST_NATIVE_TEMP,
ATTR_FORECAST_NATIVE_TEMP_LOW,
ATTR_FORECAST_NATIVE_WIND_SPEED,
+ ATTR_FORECAST_PRECIPITATION_PROBABILITY,
ATTR_FORECAST_TIME,
ATTR_FORECAST_WIND_BEARING,
Forecast,
@@ -51,7 +53,7 @@ from homeassistant.const import (
UnitOfTemperature,
)
from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import BuienRadarConfigEntry
from .const import DEFAULT_TIMEFRAME
@@ -94,7 +96,7 @@ CONDITION_MAP = {
async def async_setup_entry(
hass: HomeAssistant,
entry: BuienRadarConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the buienradar platform."""
config = entry.data
@@ -153,7 +155,9 @@ class BrWeather(WeatherEntity):
)
self._attr_native_pressure = data.pressure
self._attr_native_temperature = data.temperature
+ self._attr_native_apparent_temperature = data.feeltemperature
self._attr_native_visibility = data.visibility
+ self._attr_native_wind_gust_speed = data.wind_gust
self._attr_native_wind_speed = data.wind_speed
self._attr_wind_bearing = data.wind_bearing
@@ -188,6 +192,7 @@ class BrWeather(WeatherEntity):
ATTR_FORECAST_NATIVE_TEMP_LOW: data_in.get(MIN_TEMP),
ATTR_FORECAST_NATIVE_TEMP: data_in.get(MAX_TEMP),
ATTR_FORECAST_NATIVE_PRECIPITATION: data_in.get(RAIN),
+ ATTR_FORECAST_PRECIPITATION_PROBABILITY: data_in.get(RAIN_CHANCE),
ATTR_FORECAST_WIND_BEARING: data_in.get(WINDAZIMUTH),
ATTR_FORECAST_NATIVE_WIND_SPEED: data_in.get(WINDSPEED),
}
diff --git a/homeassistant/components/burbank_water_and_power/__init__.py b/homeassistant/components/burbank_water_and_power/__init__.py
new file mode 100644
index 00000000000..2b82c8bd56b
--- /dev/null
+++ b/homeassistant/components/burbank_water_and_power/__init__.py
@@ -0,0 +1 @@
+"""Virtual integration: Burbank Water and Power (BWP)."""
diff --git a/homeassistant/components/burbank_water_and_power/manifest.json b/homeassistant/components/burbank_water_and_power/manifest.json
new file mode 100644
index 00000000000..7b938d3b98b
--- /dev/null
+++ b/homeassistant/components/burbank_water_and_power/manifest.json
@@ -0,0 +1,6 @@
+{
+ "domain": "burbank_water_and_power",
+ "name": "Burbank Water and Power (BWP)",
+ "integration_type": "virtual",
+ "supported_by": "opower"
+}
diff --git a/homeassistant/components/caldav/calendar.py b/homeassistant/components/caldav/calendar.py
index 7a426112d04..be909a02ea5 100644
--- a/homeassistant/components/caldav/calendar.py
+++ b/homeassistant/components/caldav/calendar.py
@@ -25,7 +25,10 @@ from homeassistant.const import (
from homeassistant.core import HomeAssistant, callback
from homeassistant.helpers import config_validation as cv
from homeassistant.helpers.entity import async_generate_entity_id
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import (
+ AddConfigEntryEntitiesCallback,
+ AddEntitiesCallback,
+)
from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
from homeassistant.helpers.update_coordinator import CoordinatorEntity
@@ -143,7 +146,7 @@ async def async_setup_platform(
async def async_setup_entry(
hass: HomeAssistant,
entry: CalDavConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the CalDav calendar platform for a config entry."""
calendars = await async_get_calendars(hass, entry.runtime_data, SUPPORTED_COMPONENT)
diff --git a/homeassistant/components/caldav/todo.py b/homeassistant/components/caldav/todo.py
index cbd7963b595..73f172dabec 100644
--- a/homeassistant/components/caldav/todo.py
+++ b/homeassistant/components/caldav/todo.py
@@ -20,7 +20,7 @@ from homeassistant.components.todo import (
)
from homeassistant.core import HomeAssistant
from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.util import dt as dt_util
from . import CalDavConfigEntry
@@ -46,7 +46,7 @@ TODO_STATUS_MAP_INV: dict[TodoItemStatus, str] = {
async def async_setup_entry(
hass: HomeAssistant,
entry: CalDavConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the CalDav todo platform for a config entry."""
calendars = await async_get_calendars(hass, entry.runtime_data, SUPPORTED_COMPONENT)
@@ -138,6 +138,8 @@ class WebDavTodoListEntity(TodoListEntity):
await self.hass.async_add_executor_job(
partial(self._calendar.save_todo, **item_data),
)
+ # refreshing async otherwise it would take too much time
+ self.hass.async_create_task(self.async_update_ha_state(force_refresh=True))
except (requests.ConnectionError, DAVError) as err:
raise HomeAssistantError(f"CalDAV save error: {err}") from err
@@ -172,6 +174,8 @@ class WebDavTodoListEntity(TodoListEntity):
obj_type="todo",
),
)
+ # refreshing async otherwise it would take too much time
+ self.hass.async_create_task(self.async_update_ha_state(force_refresh=True))
except (requests.ConnectionError, DAVError) as err:
raise HomeAssistantError(f"CalDAV save error: {err}") from err
@@ -195,3 +199,5 @@ class WebDavTodoListEntity(TodoListEntity):
await self.hass.async_add_executor_job(item.delete)
except (requests.ConnectionError, DAVError) as err:
raise HomeAssistantError(f"CalDAV delete error: {err}") from err
+ # refreshing async otherwise it would take too much time
+ self.hass.async_create_task(self.async_update_ha_state(force_refresh=True))
diff --git a/homeassistant/components/calendar/__init__.py b/homeassistant/components/calendar/__init__.py
index 40d6952fa64..96bf717c3ac 100644
--- a/homeassistant/components/calendar/__init__.py
+++ b/homeassistant/components/calendar/__init__.py
@@ -153,6 +153,27 @@ def _has_min_duration(
return validate
+def _has_positive_interval(
+ start_key: str, end_key: str, duration_key: str
+) -> Callable[[dict[str, Any]], dict[str, Any]]:
+ """Verify that the time span between start and end is greater than zero."""
+
+ def validate(obj: dict[str, Any]) -> dict[str, Any]:
+ if (duration := obj.get(duration_key)) is not None:
+ if duration <= datetime.timedelta(seconds=0):
+ raise vol.Invalid(f"Expected positive duration ({duration})")
+ return obj
+
+ if (start := obj.get(start_key)) and (end := obj.get(end_key)):
+ if start >= end:
+ raise vol.Invalid(
+ f"Expected end time to be after start time ({start}, {end})"
+ )
+ return obj
+
+ return validate
+
+
def _has_same_type(*keys: Any) -> Callable[[dict[str, Any]], dict[str, Any]]:
"""Verify that all values are of the same type."""
@@ -281,6 +302,7 @@ SERVICE_GET_EVENTS_SCHEMA: Final = vol.All(
),
}
),
+ _has_positive_interval(EVENT_START_DATETIME, EVENT_END_DATETIME, EVENT_DURATION),
)
@@ -870,6 +892,7 @@ async def async_get_events_service(
end = start + service_call.data[EVENT_DURATION]
else:
end = service_call.data[EVENT_END_DATETIME]
+
calendar_event_list = await calendar.async_get_events(
calendar.hass, dt_util.as_local(start), dt_util.as_local(end)
)
diff --git a/homeassistant/components/calendar/strings.json b/homeassistant/components/calendar/strings.json
index c0127c20d05..6612ea5209d 100644
--- a/homeassistant/components/calendar/strings.json
+++ b/homeassistant/components/calendar/strings.json
@@ -74,7 +74,7 @@
},
"get_events": {
"name": "Get events",
- "description": "Get events on a calendar within a time range.",
+ "description": "Retrieves events on a calendar within a time range.",
"fields": {
"start_date_time": {
"name": "Start time",
diff --git a/homeassistant/components/cambridge_audio/manifest.json b/homeassistant/components/cambridge_audio/manifest.json
index 14a389587d2..88d28e256aa 100644
--- a/homeassistant/components/cambridge_audio/manifest.json
+++ b/homeassistant/components/cambridge_audio/manifest.json
@@ -8,6 +8,6 @@
"iot_class": "local_push",
"loggers": ["aiostreammagic"],
"quality_scale": "platinum",
- "requirements": ["aiostreammagic==2.10.0"],
+ "requirements": ["aiostreammagic==2.11.0"],
"zeroconf": ["_stream-magic._tcp.local.", "_smoip._tcp.local."]
}
diff --git a/homeassistant/components/cambridge_audio/media_player.py b/homeassistant/components/cambridge_audio/media_player.py
index 042178d5781..5322ae7d9a2 100644
--- a/homeassistant/components/cambridge_audio/media_player.py
+++ b/homeassistant/components/cambridge_audio/media_player.py
@@ -23,7 +23,7 @@ from homeassistant.components.media_player import (
)
from homeassistant.core import HomeAssistant
from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import CambridgeAudioConfigEntry, media_browser
from .const import (
@@ -65,7 +65,7 @@ PARALLEL_UPDATES = 0
async def async_setup_entry(
hass: HomeAssistant,
entry: CambridgeAudioConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up Cambridge Audio device based on a config entry."""
client: StreamMagicClient = entry.runtime_data
@@ -142,6 +142,12 @@ class CambridgeAudioDevice(CambridgeAudioEntity, MediaPlayerEntity):
@property
def media_artist(self) -> str | None:
"""Artist of current playing media, music track only."""
+ if (
+ not self.client.play_state.metadata.artist
+ and self.client.state.source == "IR"
+ ):
+ # Return channel instead of artist when playing internet radio
+ return self.client.play_state.metadata.station
return self.client.play_state.metadata.artist
@property
@@ -169,6 +175,11 @@ class CambridgeAudioDevice(CambridgeAudioEntity, MediaPlayerEntity):
"""Last time the media position was updated."""
return self.client.position_last_updated
+ @property
+ def media_channel(self) -> str | None:
+ """Channel currently playing."""
+ return self.client.play_state.metadata.station
+
@property
def is_volume_muted(self) -> bool | None:
"""Volume mute status."""
diff --git a/homeassistant/components/cambridge_audio/select.py b/homeassistant/components/cambridge_audio/select.py
index 6bfe83c2539..e7d9136711f 100644
--- a/homeassistant/components/cambridge_audio/select.py
+++ b/homeassistant/components/cambridge_audio/select.py
@@ -9,7 +9,7 @@ from aiostreammagic.models import DisplayBrightness
from homeassistant.components.select import SelectEntity, SelectEntityDescription
from homeassistant.const import EntityCategory
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import CambridgeAudioConfigEntry
from .entity import CambridgeAudioEntity, command
@@ -82,7 +82,7 @@ CONTROL_ENTITIES: tuple[CambridgeAudioSelectEntityDescription, ...] = (
async def async_setup_entry(
hass: HomeAssistant,
entry: CambridgeAudioConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up Cambridge Audio select entities based on a config entry."""
diff --git a/homeassistant/components/cambridge_audio/switch.py b/homeassistant/components/cambridge_audio/switch.py
index 065a1da4f94..0cebe8266c4 100644
--- a/homeassistant/components/cambridge_audio/switch.py
+++ b/homeassistant/components/cambridge_audio/switch.py
@@ -9,7 +9,7 @@ from aiostreammagic import StreamMagicClient
from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
from homeassistant.const import EntityCategory
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import CambridgeAudioConfigEntry
from .entity import CambridgeAudioEntity, command
@@ -46,7 +46,7 @@ CONTROL_ENTITIES: tuple[CambridgeAudioSwitchEntityDescription, ...] = (
async def async_setup_entry(
hass: HomeAssistant,
entry: CambridgeAudioConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up Cambridge Audio switch entities based on a config entry."""
async_add_entities(
diff --git a/homeassistant/components/camera/img_util.py b/homeassistant/components/camera/img_util.py
index bbe85bf82db..971e6804add 100644
--- a/homeassistant/components/camera/img_util.py
+++ b/homeassistant/components/camera/img_util.py
@@ -2,17 +2,10 @@
from __future__ import annotations
-from contextlib import suppress
import logging
from typing import TYPE_CHECKING, Literal, cast
-with suppress(Exception):
- # TurboJPEG imports numpy which may or may not work so
- # we have to guard the import here. We still want
- # to import it at top level so it gets loaded
- # in the import executor and not in the event loop.
- from turbojpeg import TurboJPEG
-
+from turbojpeg import TurboJPEG
if TYPE_CHECKING:
from . import Image
diff --git a/homeassistant/components/canary/alarm_control_panel.py b/homeassistant/components/canary/alarm_control_panel.py
index 443944da8c3..9fe2dfb598d 100644
--- a/homeassistant/components/canary/alarm_control_panel.py
+++ b/homeassistant/components/canary/alarm_control_panel.py
@@ -13,7 +13,7 @@ from homeassistant.components.alarm_control_panel import (
AlarmControlPanelState,
)
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.update_coordinator import CoordinatorEntity
from .coordinator import CanaryConfigEntry, CanaryDataUpdateCoordinator
@@ -22,7 +22,7 @@ from .coordinator import CanaryConfigEntry, CanaryDataUpdateCoordinator
async def async_setup_entry(
hass: HomeAssistant,
entry: CanaryConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up Canary alarm control panels based on a config entry."""
coordinator = entry.runtime_data
diff --git a/homeassistant/components/canary/camera.py b/homeassistant/components/canary/camera.py
index 8f4a01c9968..07645f2f403 100644
--- a/homeassistant/components/canary/camera.py
+++ b/homeassistant/components/canary/camera.py
@@ -22,7 +22,7 @@ from homeassistant.core import HomeAssistant
from homeassistant.helpers import config_validation as cv
from homeassistant.helpers.aiohttp_client import async_aiohttp_proxy_stream
from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.update_coordinator import CoordinatorEntity
from homeassistant.util import dt as dt_util
@@ -48,7 +48,7 @@ _LOGGER = logging.getLogger(__name__)
async def async_setup_entry(
hass: HomeAssistant,
entry: CanaryConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up Canary sensors based on a config entry."""
coordinator = entry.runtime_data
diff --git a/homeassistant/components/canary/sensor.py b/homeassistant/components/canary/sensor.py
index 22f3eada2cb..d92166926e9 100644
--- a/homeassistant/components/canary/sensor.py
+++ b/homeassistant/components/canary/sensor.py
@@ -14,7 +14,7 @@ from homeassistant.const import (
)
from homeassistant.core import HomeAssistant
from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.update_coordinator import CoordinatorEntity
from .const import DOMAIN, MANUFACTURER
@@ -64,7 +64,7 @@ STATE_AIR_QUALITY_VERY_ABNORMAL: Final = "very_abnormal"
async def async_setup_entry(
hass: HomeAssistant,
entry: CanaryConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up Canary sensors based on a config entry."""
coordinator = entry.runtime_data
diff --git a/homeassistant/components/canary/strings.json b/homeassistant/components/canary/strings.json
index 699e8b25e11..8be11a48b5e 100644
--- a/homeassistant/components/canary/strings.json
+++ b/homeassistant/components/canary/strings.json
@@ -21,8 +21,8 @@
"step": {
"init": {
"data": {
- "ffmpeg_arguments": "Arguments passed to ffmpeg for cameras",
- "timeout": "Request Timeout (seconds)"
+ "ffmpeg_arguments": "Arguments passed to FFmpeg for cameras",
+ "timeout": "Request timeout (seconds)"
}
}
}
diff --git a/homeassistant/components/cast/config_flow.py b/homeassistant/components/cast/config_flow.py
index 034cf856023..6c33eac230f 100644
--- a/homeassistant/components/cast/config_flow.py
+++ b/homeassistant/components/cast/config_flow.py
@@ -16,12 +16,21 @@ from homeassistant.config_entries import (
from homeassistant.const import CONF_UUID
from homeassistant.core import callback
from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.selector import SelectSelector, SelectSelectorConfig
from homeassistant.helpers.service_info.zeroconf import ZeroconfServiceInfo
from .const import CONF_IGNORE_CEC, CONF_KNOWN_HOSTS, DOMAIN
IGNORE_CEC_SCHEMA = vol.Schema(vol.All(cv.ensure_list, [cv.string]))
-KNOWN_HOSTS_SCHEMA = vol.Schema(vol.All(cv.ensure_list, [cv.string]))
+KNOWN_HOSTS_SCHEMA = vol.Schema(
+ {
+ vol.Optional(
+ CONF_KNOWN_HOSTS,
+ ): SelectSelector(
+ SelectSelectorConfig(custom_value=True, options=[], multiple=True),
+ )
+ }
+)
WANTED_UUID_SCHEMA = vol.Schema(vol.All(cv.ensure_list, [cv.string]))
@@ -30,12 +39,6 @@ class FlowHandler(ConfigFlow, domain=DOMAIN):
VERSION = 1
- def __init__(self) -> None:
- """Initialize flow."""
- self._ignore_cec = set[str]()
- self._known_hosts = set[str]()
- self._wanted_uuid = set[str]()
-
@staticmethod
@callback
def async_get_options_flow(
@@ -62,48 +65,31 @@ class FlowHandler(ConfigFlow, domain=DOMAIN):
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Confirm the setup."""
- errors = {}
- data = {CONF_KNOWN_HOSTS: self._known_hosts}
-
if user_input is not None:
- bad_hosts = False
- known_hosts = user_input[CONF_KNOWN_HOSTS]
- known_hosts = [x.strip() for x in known_hosts.split(",") if x.strip()]
- try:
- known_hosts = KNOWN_HOSTS_SCHEMA(known_hosts)
- except vol.Invalid:
- errors["base"] = "invalid_known_hosts"
- bad_hosts = True
- else:
- self._known_hosts = known_hosts
- data = self._get_data()
- if not bad_hosts:
- return self.async_create_entry(title="Google Cast", data=data)
+ known_hosts = _trim_items(user_input.get(CONF_KNOWN_HOSTS, []))
+ return self.async_create_entry(
+ title="Google Cast",
+ data=self._get_data(known_hosts=known_hosts),
+ )
- fields = {}
- fields[vol.Optional(CONF_KNOWN_HOSTS, default="")] = str
-
- return self.async_show_form(
- step_id="config", data_schema=vol.Schema(fields), errors=errors
- )
+ return self.async_show_form(step_id="config", data_schema=KNOWN_HOSTS_SCHEMA)
async def async_step_confirm(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Confirm the setup."""
-
- data = self._get_data()
-
if user_input is not None or not onboarding.async_is_onboarded(self.hass):
- return self.async_create_entry(title="Google Cast", data=data)
+ return self.async_create_entry(title="Google Cast", data=self._get_data())
return self.async_show_form(step_id="confirm")
- def _get_data(self):
+ def _get_data(
+ self, *, known_hosts: list[str] | None = None
+ ) -> dict[str, list[str]]:
return {
- CONF_IGNORE_CEC: list(self._ignore_cec),
- CONF_KNOWN_HOSTS: list(self._known_hosts),
- CONF_UUID: list(self._wanted_uuid),
+ CONF_IGNORE_CEC: [],
+ CONF_KNOWN_HOSTS: known_hosts or [],
+ CONF_UUID: [],
}
@@ -123,31 +109,24 @@ class CastOptionsFlowHandler(OptionsFlow):
) -> ConfigFlowResult:
"""Manage the Google Cast options."""
errors: dict[str, str] = {}
- current_config = self.config_entry.data
if user_input is not None:
- bad_hosts, known_hosts = _string_to_list(
- user_input.get(CONF_KNOWN_HOSTS, ""), KNOWN_HOSTS_SCHEMA
+ known_hosts = _trim_items(user_input.get(CONF_KNOWN_HOSTS, []))
+ self.updated_config = dict(self.config_entry.data)
+ self.updated_config[CONF_KNOWN_HOSTS] = known_hosts
+
+ if self.show_advanced_options:
+ return await self.async_step_advanced_options()
+
+ self.hass.config_entries.async_update_entry(
+ self.config_entry, data=self.updated_config
)
-
- if not bad_hosts:
- self.updated_config = dict(current_config)
- self.updated_config[CONF_KNOWN_HOSTS] = known_hosts
-
- if self.show_advanced_options:
- return await self.async_step_advanced_options()
-
- self.hass.config_entries.async_update_entry(
- self.config_entry, data=self.updated_config
- )
- return self.async_create_entry(title="", data={})
-
- fields: dict[vol.Marker, type[str]] = {}
- suggested_value = _list_to_string(current_config.get(CONF_KNOWN_HOSTS))
- _add_with_suggestion(fields, CONF_KNOWN_HOSTS, suggested_value)
+ return self.async_create_entry(title="", data={})
return self.async_show_form(
step_id="basic_options",
- data_schema=vol.Schema(fields),
+ data_schema=self.add_suggested_values_to_schema(
+ KNOWN_HOSTS_SCHEMA, self.config_entry.data
+ ),
errors=errors,
last_step=not self.show_advanced_options,
)
@@ -206,6 +185,10 @@ def _string_to_list(string, schema):
return invalid, items
+def _trim_items(items: list[str]) -> list[str]:
+ return [x.strip() for x in items if x.strip()]
+
+
def _add_with_suggestion(
fields: dict[vol.Marker, type[str]], key: str, suggested_value: str
) -> None:
diff --git a/homeassistant/components/cast/const.py b/homeassistant/components/cast/const.py
index 056ee054d1d..0a85a0007b3 100644
--- a/homeassistant/components/cast/const.py
+++ b/homeassistant/components/cast/const.py
@@ -2,7 +2,7 @@
from __future__ import annotations
-from typing import TYPE_CHECKING, TypedDict
+from typing import TYPE_CHECKING, NotRequired, TypedDict
from homeassistant.util.signal_type import SignalType
@@ -46,3 +46,4 @@ class HomeAssistantControllerData(TypedDict):
hass_uuid: str
client_id: str | None
refresh_token: str
+ app_id: NotRequired[str]
diff --git a/homeassistant/components/cast/helpers.py b/homeassistant/components/cast/helpers.py
index 8f4af197b8e..c45bbb4fbbc 100644
--- a/homeassistant/components/cast/helpers.py
+++ b/homeassistant/components/cast/helpers.py
@@ -7,6 +7,7 @@ from dataclasses import dataclass
import logging
from typing import TYPE_CHECKING, ClassVar
from urllib.parse import urlparse
+from uuid import UUID
import aiohttp
import attr
@@ -40,7 +41,7 @@ class ChromecastInfo:
is_dynamic_group = attr.ib(type=bool | None, default=None)
@property
- def friendly_name(self) -> str:
+ def friendly_name(self) -> str | None:
"""Return the Friendly Name."""
return self.cast_info.friendly_name
@@ -50,7 +51,7 @@ class ChromecastInfo:
return self.cast_info.cast_type == CAST_TYPE_GROUP
@property
- def uuid(self) -> bool:
+ def uuid(self) -> UUID:
"""Return the UUID."""
return self.cast_info.uuid
@@ -80,7 +81,7 @@ class ChromecastInfo:
"+label%3A%22integration%3A+cast%22"
)
- _LOGGER.debug(
+ _LOGGER.info(
(
"Fetched cast details for unknown model '%s' manufacturer:"
" '%s', type: '%s'. Please %s"
@@ -111,7 +112,10 @@ class ChromecastInfo:
is_dynamic_group = False
http_group_status = None
http_group_status = dial.get_multizone_status(
- None,
+ # We pass services which will be used for the HTTP request, and we
+ # don't care about the host in http_group_status.dynamic_groups so
+ # we pass an empty string to simplify the code.
+ "",
services=self.cast_info.services,
zconf=ChromeCastZeroconf.get_zeroconf(),
)
diff --git a/homeassistant/components/cast/manifest.json b/homeassistant/components/cast/manifest.json
index 0650f267544..6c8b0536e2f 100644
--- a/homeassistant/components/cast/manifest.json
+++ b/homeassistant/components/cast/manifest.json
@@ -14,7 +14,7 @@
"documentation": "https://www.home-assistant.io/integrations/cast",
"iot_class": "local_polling",
"loggers": ["casttube", "pychromecast"],
- "requirements": ["PyChromecast==14.0.5"],
+ "requirements": ["PyChromecast==14.0.7"],
"single_config_entry": true,
"zeroconf": ["_googlecast._tcp.local."]
}
diff --git a/homeassistant/components/cast/media_player.py b/homeassistant/components/cast/media_player.py
index 3cc17fae43b..8ff078dfafd 100644
--- a/homeassistant/components/cast/media_player.py
+++ b/homeassistant/components/cast/media_player.py
@@ -51,7 +51,7 @@ from homeassistant.core import CALLBACK_TYPE, Event, HomeAssistant, callback
from homeassistant.exceptions import HomeAssistantError
from homeassistant.helpers.device_registry import DeviceInfo
from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.network import NoURLAvailableError, get_url, is_hass_url
from homeassistant.util import dt as dt_util
from homeassistant.util.logging import async_create_catching_coro
@@ -140,7 +140,7 @@ def _async_create_cast_device(hass: HomeAssistant, info: ChromecastInfo):
async def async_setup_entry(
hass: HomeAssistant,
config_entry: ConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up Cast from a config entry."""
hass.data.setdefault(ADDED_CAST_DEVICES_KEY, set())
diff --git a/homeassistant/components/cast/services.yaml b/homeassistant/components/cast/services.yaml
index e2e23ad40a2..45b36f6d983 100644
--- a/homeassistant/components/cast/services.yaml
+++ b/homeassistant/components/cast/services.yaml
@@ -7,11 +7,11 @@ show_lovelace_view:
integration: cast
domain: media_player
dashboard_path:
- required: true
example: lovelace-cast
selector:
text:
view_path:
+ required: true
example: downstairs
selector:
text:
diff --git a/homeassistant/components/cast/strings.json b/homeassistant/components/cast/strings.json
index 9c49813bd83..8c7c7c0cff0 100644
--- a/homeassistant/components/cast/strings.json
+++ b/homeassistant/components/cast/strings.json
@@ -6,9 +6,11 @@
},
"config": {
"title": "Google Cast configuration",
- "description": "Known Hosts - A comma-separated list of hostnames or IP-addresses of cast devices, use if mDNS discovery is not working.",
"data": {
- "known_hosts": "Known hosts"
+ "known_hosts": "Add known host"
+ },
+ "data_description": {
+ "known_hosts": "Hostnames or IP-addresses of cast devices, use if mDNS discovery is not working"
}
}
},
@@ -20,9 +22,11 @@
"step": {
"basic_options": {
"title": "[%key:component::cast::config::step::config::title%]",
- "description": "[%key:component::cast::config::step::config::description%]",
"data": {
"known_hosts": "[%key:component::cast::config::step::config::data::known_hosts%]"
+ },
+ "data_description": {
+ "known_hosts": "[%key:component::cast::config::step::config::data_description::known_hosts%]"
}
},
"advanced_options": {
@@ -49,7 +53,7 @@
},
"dashboard_path": {
"name": "Dashboard path",
- "description": "The URL path of the dashboard to show."
+ "description": "The URL path of the dashboard to show, defaults to lovelace if not specified."
},
"view_path": {
"name": "View path",
diff --git a/homeassistant/components/ccm15/climate.py b/homeassistant/components/ccm15/climate.py
index 099b91ec02c..df321395b9e 100644
--- a/homeassistant/components/ccm15/climate.py
+++ b/homeassistant/components/ccm15/climate.py
@@ -20,7 +20,7 @@ from homeassistant.components.climate import (
from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
from homeassistant.core import HomeAssistant
from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.helpers.update_coordinator import CoordinatorEntity
from .const import CONST_CMD_FAN_MAP, CONST_CMD_STATE_MAP, DOMAIN
@@ -32,7 +32,7 @@ _LOGGER = logging.getLogger(__name__)
async def async_setup_entry(
hass: HomeAssistant,
config_entry: CCM15ConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up all climate."""
coordinator = config_entry.runtime_data
diff --git a/homeassistant/components/cert_expiry/sensor.py b/homeassistant/components/cert_expiry/sensor.py
index a875e664fdd..3854dfc109e 100644
--- a/homeassistant/components/cert_expiry/sensor.py
+++ b/homeassistant/components/cert_expiry/sensor.py
@@ -7,7 +7,7 @@ from datetime import datetime
from homeassistant.components.sensor import SensorDeviceClass, SensorEntity
from homeassistant.core import HomeAssistant
from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .const import DOMAIN
from .coordinator import CertExpiryConfigEntry, CertExpiryDataUpdateCoordinator
@@ -17,7 +17,7 @@ from .entity import CertExpiryEntity
async def async_setup_entry(
hass: HomeAssistant,
entry: CertExpiryConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Add cert-expiry entry."""
coordinator = entry.runtime_data
diff --git a/homeassistant/components/chacon_dio/config_flow.py b/homeassistant/components/chacon_dio/config_flow.py
index 54604b81153..daaf38e0edc 100644
--- a/homeassistant/components/chacon_dio/config_flow.py
+++ b/homeassistant/components/chacon_dio/config_flow.py
@@ -44,7 +44,7 @@ class ChaconDioConfigFlow(ConfigFlow, domain=DOMAIN):
errors["base"] = "cannot_connect"
except DIOChaconInvalidAuthError:
errors["base"] = "invalid_auth"
- except Exception: # pylint: disable=broad-except
+ except Exception:
_LOGGER.exception("Unexpected exception")
errors["base"] = "unknown"
diff --git a/homeassistant/components/chacon_dio/cover.py b/homeassistant/components/chacon_dio/cover.py
index 3a4955adf5c..ea80116be8a 100644
--- a/homeassistant/components/chacon_dio/cover.py
+++ b/homeassistant/components/chacon_dio/cover.py
@@ -12,7 +12,7 @@ from homeassistant.components.cover import (
CoverEntityFeature,
)
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import ChaconDioConfigEntry
from .entity import ChaconDioEntity
@@ -23,7 +23,7 @@ _LOGGER = logging.getLogger(__name__)
async def async_setup_entry(
hass: HomeAssistant,
config_entry: ChaconDioConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up Chacon Dio cover devices."""
data = config_entry.runtime_data
diff --git a/homeassistant/components/chacon_dio/switch.py b/homeassistant/components/chacon_dio/switch.py
index be178c3c3b5..05b55552615 100644
--- a/homeassistant/components/chacon_dio/switch.py
+++ b/homeassistant/components/chacon_dio/switch.py
@@ -7,7 +7,7 @@ from dio_chacon_wifi_api.const import DeviceTypeEnum
from homeassistant.components.switch import SwitchDeviceClass, SwitchEntity
from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import ChaconDioConfigEntry
from .entity import ChaconDioEntity
@@ -18,7 +18,7 @@ _LOGGER = logging.getLogger(__name__)
async def async_setup_entry(
hass: HomeAssistant,
config_entry: ChaconDioConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up Chacon Dio switch devices."""
data = config_entry.runtime_data
diff --git a/homeassistant/components/cisco_ios/device_tracker.py b/homeassistant/components/cisco_ios/device_tracker.py
index 0477ebb111c..6cc403817cf 100644
--- a/homeassistant/components/cisco_ios/device_tracker.py
+++ b/homeassistant/components/cisco_ios/device_tracker.py
@@ -104,7 +104,7 @@ class CiscoDeviceScanner(DeviceScanner):
"""Open connection to the router and get arp entries."""
try:
- cisco_ssh: pxssh.pxssh[str] = pxssh.pxssh(encoding="uft-8")
+ cisco_ssh: pxssh.pxssh[str] = pxssh.pxssh(encoding="utf-8")
cisco_ssh.login(
self.host,
self.username,
diff --git a/homeassistant/components/climate/__init__.py b/homeassistant/components/climate/__init__.py
index 3ea0f887e76..287a2397121 100644
--- a/homeassistant/components/climate/__init__.py
+++ b/homeassistant/components/climate/__init__.py
@@ -68,7 +68,6 @@ from .const import ( # noqa: F401
FAN_ON,
FAN_TOP,
HVAC_MODES,
- INTENT_GET_TEMPERATURE,
INTENT_SET_TEMPERATURE,
PRESET_ACTIVITY,
PRESET_AWAY,
diff --git a/homeassistant/components/climate/const.py b/homeassistant/components/climate/const.py
index d347ccbbb29..ecc0066cd93 100644
--- a/homeassistant/components/climate/const.py
+++ b/homeassistant/components/climate/const.py
@@ -126,7 +126,6 @@ DEFAULT_MAX_HUMIDITY = 99
DOMAIN = "climate"
-INTENT_GET_TEMPERATURE = "HassClimateGetTemperature"
INTENT_SET_TEMPERATURE = "HassClimateSetTemperature"
SERVICE_SET_AUX_HEAT = "set_aux_heat"
diff --git a/homeassistant/components/climate/intent.py b/homeassistant/components/climate/intent.py
index 9837a326188..7691a2db0f1 100644
--- a/homeassistant/components/climate/intent.py
+++ b/homeassistant/components/climate/intent.py
@@ -1,4 +1,4 @@
-"""Intents for the client integration."""
+"""Intents for the climate integration."""
from __future__ import annotations
@@ -11,7 +11,6 @@ from homeassistant.helpers import config_validation as cv, intent
from . import (
ATTR_TEMPERATURE,
DOMAIN,
- INTENT_GET_TEMPERATURE,
INTENT_SET_TEMPERATURE,
SERVICE_SET_TEMPERATURE,
ClimateEntityFeature,
@@ -20,49 +19,9 @@ from . import (
async def async_setup_intents(hass: HomeAssistant) -> None:
"""Set up the climate intents."""
- intent.async_register(hass, GetTemperatureIntent())
intent.async_register(hass, SetTemperatureIntent())
-class GetTemperatureIntent(intent.IntentHandler):
- """Handle GetTemperature intents."""
-
- intent_type = INTENT_GET_TEMPERATURE
- description = "Gets the current temperature of a climate device or entity"
- slot_schema = {
- vol.Optional("area"): intent.non_empty_string,
- vol.Optional("name"): intent.non_empty_string,
- }
- platforms = {DOMAIN}
-
- async def async_handle(self, intent_obj: intent.Intent) -> intent.IntentResponse:
- """Handle the intent."""
- hass = intent_obj.hass
- slots = self.async_validate_slots(intent_obj.slots)
-
- name: str | None = None
- if "name" in slots:
- name = slots["name"]["value"]
-
- area: str | None = None
- if "area" in slots:
- area = slots["area"]["value"]
-
- match_constraints = intent.MatchTargetsConstraints(
- name=name, area_name=area, domains=[DOMAIN], assistant=intent_obj.assistant
- )
- match_result = intent.async_match_targets(hass, match_constraints)
- if not match_result.is_match:
- raise intent.MatchFailedError(
- result=match_result, constraints=match_constraints
- )
-
- response = intent_obj.create_response()
- response.response_type = intent.IntentResponseType.QUERY_ANSWER
- response.async_set_states(matched_states=match_result.states)
- return response
-
-
class SetTemperatureIntent(intent.IntentHandler):
"""Handle SetTemperature intents."""
diff --git a/homeassistant/components/climate/strings.json b/homeassistant/components/climate/strings.json
index 6d8b2c5449d..250b2a67efe 100644
--- a/homeassistant/components/climate/strings.json
+++ b/homeassistant/components/climate/strings.json
@@ -28,10 +28,10 @@
"name": "Thermostat",
"state": {
"off": "[%key:common::state::off%]",
+ "auto": "[%key:common::state::auto%]",
"heat": "Heat",
"cool": "Cool",
"heat_cool": "Heat/Cool",
- "auto": "Auto",
"dry": "Dry",
"fan_only": "Fan only"
},
@@ -50,10 +50,10 @@
"state": {
"off": "[%key:common::state::off%]",
"on": "[%key:common::state::on%]",
- "auto": "Auto",
- "low": "Low",
- "medium": "Medium",
- "high": "High",
+ "auto": "[%key:common::state::auto%]",
+ "low": "[%key:common::state::low%]",
+ "medium": "[%key:common::state::medium%]",
+ "high": "[%key:common::state::high%]",
"top": "Top",
"middle": "Middle",
"focus": "Focus",
@@ -69,13 +69,13 @@
"hvac_action": {
"name": "Current action",
"state": {
+ "off": "[%key:common::state::off%]",
+ "idle": "[%key:common::state::idle%]",
"cooling": "Cooling",
"defrosting": "Defrosting",
"drying": "Drying",
"fan": "Fan",
"heating": "Heating",
- "idle": "[%key:common::state::idle%]",
- "off": "[%key:common::state::off%]",
"preheating": "Preheating"
}
},
@@ -98,13 +98,13 @@
"name": "Preset",
"state": {
"none": "None",
- "eco": "Eco",
- "away": "Away",
+ "home": "[%key:common::state::home%]",
+ "away": "[%key:common::state::not_home%]",
+ "activity": "Activity",
"boost": "Boost",
"comfort": "Comfort",
- "home": "[%key:common::state::home%]",
- "sleep": "Sleep",
- "activity": "Activity"
+ "eco": "Eco",
+ "sleep": "Sleep"
}
},
"preset_modes": {
@@ -257,8 +257,8 @@
"selector": {
"hvac_mode": {
"options": {
- "off": "Off",
- "auto": "Auto",
+ "off": "[%key:common::state::off%]",
+ "auto": "[%key:common::state::auto%]",
"cool": "Cool",
"dry": "Dry",
"fan_only": "Fan only",
diff --git a/homeassistant/components/cloud/__init__.py b/homeassistant/components/cloud/__init__.py
index 55ffedd2781..97210b4197c 100644
--- a/homeassistant/components/cloud/__init__.py
+++ b/homeassistant/components/cloud/__init__.py
@@ -6,6 +6,7 @@ import asyncio
from collections.abc import Awaitable, Callable
from datetime import datetime, timedelta
from enum import Enum
+import logging
from typing import cast
from hass_nabucasa import Cloud
@@ -19,6 +20,7 @@ from homeassistant.const import (
CONF_NAME,
CONF_REGION,
EVENT_HOMEASSISTANT_STOP,
+ FORMAT_DATETIME,
Platform,
)
from homeassistant.core import Event, HassJob, HomeAssistant, ServiceCall, callback
@@ -33,7 +35,7 @@ from homeassistant.helpers.dispatcher import (
from homeassistant.helpers.event import async_call_later
from homeassistant.helpers.service import async_register_admin_service
from homeassistant.helpers.typing import ConfigType
-from homeassistant.loader import bind_hass
+from homeassistant.loader import async_get_integration, bind_hass
from homeassistant.util.signal_type import SignalType
# Pre-import backup to avoid it being imported
@@ -62,11 +64,13 @@ from .const import (
CONF_THINGTALK_SERVER,
CONF_USER_POOL_ID,
DATA_CLOUD,
+ DATA_CLOUD_LOG_HANDLER,
DATA_PLATFORMS_SETUP,
DOMAIN,
MODE_DEV,
MODE_PROD,
)
+from .helpers import FixedSizeQueueLogHandler
from .prefs import CloudPreferences
from .repairs import async_manage_legacy_subscription_issue
from .subscription import async_subscription_info
@@ -245,6 +249,8 @@ def async_remote_ui_url(hass: HomeAssistant) -> str:
async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
"""Initialize the Home Assistant cloud."""
+ log_handler = hass.data[DATA_CLOUD_LOG_HANDLER] = await _setup_log_handler(hass)
+
# Process configs
if DOMAIN in config:
kwargs = dict(config[DOMAIN])
@@ -267,6 +273,8 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
async def _shutdown(event: Event) -> None:
"""Shutdown event."""
await cloud.stop()
+ logging.root.removeHandler(log_handler)
+ del hass.data[DATA_CLOUD_LOG_HANDLER]
hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, _shutdown)
@@ -405,3 +413,19 @@ def _setup_services(hass: HomeAssistant, prefs: CloudPreferences) -> None:
async_register_admin_service(
hass, DOMAIN, SERVICE_REMOTE_DISCONNECT, _service_handler
)
+
+
+async def _setup_log_handler(hass: HomeAssistant) -> FixedSizeQueueLogHandler:
+ fmt = (
+ "%(asctime)s.%(msecs)03d %(levelname)s (%(threadName)s) [%(name)s] %(message)s"
+ )
+ handler = FixedSizeQueueLogHandler()
+ handler.setFormatter(logging.Formatter(fmt, datefmt=FORMAT_DATETIME))
+
+ integration = await async_get_integration(hass, DOMAIN)
+ loggers: set[str] = {integration.pkg_path, *(integration.loggers or [])}
+
+ for logger_name in loggers:
+ logging.getLogger(logger_name).addHandler(handler)
+
+ return handler
diff --git a/homeassistant/components/cloud/account_link.py b/homeassistant/components/cloud/account_link.py
index 851d658f8e0..3c3d944d479 100644
--- a/homeassistant/components/cloud/account_link.py
+++ b/homeassistant/components/cloud/account_link.py
@@ -127,7 +127,11 @@ class CloudOAuth2Implementation(config_entry_oauth2_flow.AbstractOAuth2Implement
flow_id=flow_id, user_input=tokens
)
- self.hass.async_create_task(await_tokens())
+ # It's a background task because it should be cancelled on shutdown and there's nothing else
+ # we can do in such case. There's also no need to wait for this during setup.
+ self.hass.async_create_background_task(
+ await_tokens(), name="Awaiting OAuth tokens"
+ )
return authorize_url
diff --git a/homeassistant/components/cloud/backup.py b/homeassistant/components/cloud/backup.py
index 9531604ccc7..f4426eabeed 100644
--- a/homeassistant/components/cloud/backup.py
+++ b/homeassistant/components/cloud/backup.py
@@ -3,19 +3,28 @@
from __future__ import annotations
import asyncio
-import base64
from collections.abc import AsyncIterator, Callable, Coroutine, Mapping
-import hashlib
+from http import HTTPStatus
import logging
import random
-from typing import Any, Literal
+from typing import Any
-from aiohttp import ClientError
+from aiohttp import ClientError, ClientResponseError
from hass_nabucasa import Cloud, CloudError
-from hass_nabucasa.api import CloudApiNonRetryableError
-from hass_nabucasa.cloud_api import async_files_delete_file, async_files_list
+from hass_nabucasa.api import CloudApiError, CloudApiNonRetryableError
+from hass_nabucasa.cloud_api import (
+ FilesHandlerListEntry,
+ async_files_delete_file,
+ async_files_list,
+)
+from hass_nabucasa.files import FilesError, StorageType, calculate_b64md5
-from homeassistant.components.backup import AgentBackup, BackupAgent, BackupAgentError
+from homeassistant.components.backup import (
+ AgentBackup,
+ BackupAgent,
+ BackupAgentError,
+ BackupNotFound,
+)
from homeassistant.core import HomeAssistant, callback
from homeassistant.helpers.aiohttp_client import ChunkAsyncStreamIterator
from homeassistant.helpers.dispatcher import async_dispatcher_connect
@@ -24,20 +33,11 @@ from .client import CloudClient
from .const import DATA_CLOUD, DOMAIN, EVENT_CLOUD_EVENT
_LOGGER = logging.getLogger(__name__)
-_STORAGE_BACKUP: Literal["backup"] = "backup"
_RETRY_LIMIT = 5
_RETRY_SECONDS_MIN = 60
_RETRY_SECONDS_MAX = 600
-async def _b64md5(stream: AsyncIterator[bytes]) -> str:
- """Calculate the MD5 hash of a file."""
- file_hash = hashlib.md5()
- async for chunk in stream:
- file_hash.update(chunk)
- return base64.b64encode(file_hash.digest()).decode()
-
-
async def async_get_backup_agents(
hass: HomeAssistant,
**kwargs: Any,
@@ -86,11 +86,6 @@ class CloudBackupAgent(BackupAgent):
self._cloud = cloud
self._hass = hass
- @callback
- def _get_backup_filename(self) -> str:
- """Return the backup filename."""
- return f"{self._cloud.client.prefs.instance_id}.tar"
-
async def async_download_backup(
self,
backup_id: str,
@@ -101,13 +96,11 @@ class CloudBackupAgent(BackupAgent):
:param backup_id: The ID of the backup that was returned in async_list_backups.
:return: An async iterator that yields bytes.
"""
- if not await self.async_get_backup(backup_id):
- raise BackupAgentError("Backup not found")
-
+ backup = await self._async_get_backup(backup_id)
try:
content = await self._cloud.files.download(
- storage_type=_STORAGE_BACKUP,
- filename=self._get_backup_filename(),
+ storage_type=StorageType.BACKUP,
+ filename=backup["Key"],
)
except CloudError as err:
raise BackupAgentError(f"Failed to download backup: {err}") from err
@@ -128,17 +121,22 @@ class CloudBackupAgent(BackupAgent):
"""
if not backup.protected:
raise BackupAgentError("Cloud backups must be protected")
+ if self._cloud.subscription_expired:
+ raise BackupAgentError("Cloud subscription has expired")
- base64md5hash = await _b64md5(await open_stream())
- filename = self._get_backup_filename()
- metadata = backup.as_dict()
size = backup.size
+ try:
+ base64md5hash = await calculate_b64md5(open_stream, size)
+ except FilesError as err:
+ raise BackupAgentError(err) from err
+ filename = f"{self._cloud.client.prefs.instance_id}.tar"
+ metadata = backup.as_dict()
tries = 1
while tries <= _RETRY_LIMIT:
try:
await self._cloud.files.upload(
- storage_type=_STORAGE_BACKUP,
+ storage_type=StorageType.BACKUP,
open_stream=open_stream,
filename=filename,
base64md5hash=base64md5hash,
@@ -157,6 +155,13 @@ class CloudBackupAgent(BackupAgent):
) from err
raise BackupAgentError(f"Failed to upload backup {err}") from err
except CloudError as err:
+ if (
+ isinstance(err, CloudApiError)
+ and isinstance(err.orig_exc, ClientResponseError)
+ and err.orig_exc.status == HTTPStatus.FORBIDDEN
+ and self._cloud.subscription_expired
+ ):
+ raise BackupAgentError("Cloud subscription has expired") from err
if tries == _RETRY_LIMIT:
raise BackupAgentError(f"Failed to upload backup {err}") from err
tries += 1
@@ -179,38 +184,48 @@ class CloudBackupAgent(BackupAgent):
:param backup_id: The ID of the backup that was returned in async_list_backups.
"""
- if not await self.async_get_backup(backup_id):
- return
-
+ backup = await self._async_get_backup(backup_id)
try:
await async_files_delete_file(
self._cloud,
- storage_type=_STORAGE_BACKUP,
- filename=self._get_backup_filename(),
+ storage_type=StorageType.BACKUP,
+ filename=backup["Key"],
)
except (ClientError, CloudError) as err:
raise BackupAgentError("Failed to delete backup") from err
async def async_list_backups(self, **kwargs: Any) -> list[AgentBackup]:
+ """List backups."""
+ backups = await self._async_list_backups()
+ return [AgentBackup.from_dict(backup["Metadata"]) for backup in backups]
+
+ async def _async_list_backups(self) -> list[FilesHandlerListEntry]:
"""List backups."""
try:
- backups = await async_files_list(self._cloud, storage_type=_STORAGE_BACKUP)
- _LOGGER.debug("Cloud backups: %s", backups)
+ backups = await async_files_list(
+ self._cloud, storage_type=StorageType.BACKUP
+ )
except (ClientError, CloudError) as err:
raise BackupAgentError("Failed to list backups") from err
- return [AgentBackup.from_dict(backup["Metadata"]) for backup in backups]
+ _LOGGER.debug("Cloud backups: %s", backups)
+ return backups
async def async_get_backup(
self,
backup_id: str,
**kwargs: Any,
- ) -> AgentBackup | None:
+ ) -> AgentBackup:
"""Return a backup."""
- backups = await self.async_list_backups()
+ backup = await self._async_get_backup(backup_id)
+ return AgentBackup.from_dict(backup["Metadata"])
+
+ async def _async_get_backup(self, backup_id: str) -> FilesHandlerListEntry:
+ """Return a backup."""
+ backups = await self._async_list_backups()
for backup in backups:
- if backup.backup_id == backup_id:
+ if backup["Metadata"]["backup_id"] == backup_id:
return backup
- return None
+ raise BackupNotFound(f"Backup {backup_id} not found")
diff --git a/homeassistant/components/cloud/binary_sensor.py b/homeassistant/components/cloud/binary_sensor.py
index 75cbd3c9f3d..0df13fe4c7b 100644
--- a/homeassistant/components/cloud/binary_sensor.py
+++ b/homeassistant/components/cloud/binary_sensor.py
@@ -15,7 +15,7 @@ from homeassistant.config_entries import ConfigEntry
from homeassistant.const import EntityCategory
from homeassistant.core import HomeAssistant
from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .client import CloudClient
from .const import DATA_CLOUD, DISPATCHER_REMOTE_UPDATE
@@ -26,7 +26,7 @@ WAIT_UNTIL_CHANGE = 3
async def async_setup_entry(
hass: HomeAssistant,
config_entry: ConfigEntry,
- async_add_entities: AddEntitiesCallback,
+ async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up the Home Assistant Cloud binary sensors."""
cloud = hass.data[DATA_CLOUD]
diff --git a/homeassistant/components/cloud/const.py b/homeassistant/components/cloud/const.py
index 3883f19d1b7..e0c15c74cab 100644
--- a/homeassistant/components/cloud/const.py
+++ b/homeassistant/components/cloud/const.py
@@ -12,12 +12,14 @@ if TYPE_CHECKING:
from hass_nabucasa import Cloud
from .client import CloudClient
+ from .helpers import FixedSizeQueueLogHandler
DOMAIN = "cloud"
DATA_CLOUD: HassKey[Cloud[CloudClient]] = HassKey(DOMAIN)
DATA_PLATFORMS_SETUP: HassKey[dict[str, asyncio.Event]] = HassKey(
"cloud_platforms_setup"
)
+DATA_CLOUD_LOG_HANDLER: HassKey[FixedSizeQueueLogHandler] = HassKey("cloud_log_handler")
EVENT_CLOUD_EVENT = "cloud_event"
REQUEST_TIMEOUT = 10
diff --git a/homeassistant/components/cloud/helpers.py b/homeassistant/components/cloud/helpers.py
new file mode 100644
index 00000000000..7795a314fb7
--- /dev/null
+++ b/homeassistant/components/cloud/helpers.py
@@ -0,0 +1,31 @@
+"""Helpers for the cloud component."""
+
+from collections import deque
+import logging
+
+from homeassistant.core import HomeAssistant
+
+
+class FixedSizeQueueLogHandler(logging.Handler):
+ """Log handler to store messages, with auto rotation."""
+
+ MAX_RECORDS = 500
+
+ def __init__(self) -> None:
+ """Initialize a new LogHandler."""
+ super().__init__()
+ self._records: deque[logging.LogRecord] = deque(maxlen=self.MAX_RECORDS)
+
+ def emit(self, record: logging.LogRecord) -> None:
+ """Store log message."""
+ self._records.append(record)
+
+ async def get_logs(self, hass: HomeAssistant) -> list[str]:
+ """Get stored logs."""
+
+ def _get_logs() -> list[str]:
+ # copy the queue since it can mutate while iterating
+ records = self._records.copy()
+ return [self.format(record) for record in records]
+
+ return await hass.async_add_executor_job(_get_logs)
diff --git a/homeassistant/components/cloud/http_api.py b/homeassistant/components/cloud/http_api.py
index b1a845ef8b0..6f18cc424cd 100644
--- a/homeassistant/components/cloud/http_api.py
+++ b/homeassistant/components/cloud/http_api.py
@@ -8,14 +8,15 @@ from contextlib import suppress
import dataclasses
from functools import wraps
from http import HTTPStatus
+import json
import logging
import time
-from typing import Any, Concatenate
+from typing import Any, Concatenate, cast
import aiohttp
from aiohttp import web
import attr
-from hass_nabucasa import Cloud, auth, thingtalk
+from hass_nabucasa import AlreadyConnectedError, Cloud, auth, thingtalk
from hass_nabucasa.const import STATE_DISCONNECTED
from hass_nabucasa.voice import TTS_VOICES
import voluptuous as vol
@@ -43,6 +44,7 @@ from .assist_pipeline import async_create_cloud_pipeline
from .client import CloudClient
from .const import (
DATA_CLOUD,
+ DATA_CLOUD_LOG_HANDLER,
EVENT_CLOUD_EVENT,
LOGIN_MFA_TIMEOUT,
PREF_ALEXA_REPORT_STATE,
@@ -63,7 +65,9 @@ from .subscription import async_subscription_info
_LOGGER = logging.getLogger(__name__)
-_CLOUD_ERRORS: dict[type[Exception], tuple[HTTPStatus, str]] = {
+_CLOUD_ERRORS: dict[
+ type[Exception], tuple[HTTPStatus, Callable[[Exception], str] | str]
+] = {
TimeoutError: (
HTTPStatus.BAD_GATEWAY,
"Unable to reach the Home Assistant cloud.",
@@ -132,6 +136,10 @@ def async_setup(hass: HomeAssistant) -> None:
HTTPStatus.BAD_REQUEST,
"Multi-factor authentication expired, or not started. Please try again.",
),
+ AlreadyConnectedError: (
+ HTTPStatus.CONFLICT,
+ lambda x: json.dumps(cast(AlreadyConnectedError, x).details),
+ ),
}
)
@@ -196,7 +204,11 @@ def _process_cloud_exception(exc: Exception, where: str) -> tuple[HTTPStatus, st
for err, value_info in _CLOUD_ERRORS.items():
if isinstance(exc, err):
- err_info = value_info
+ status, content = value_info
+ err_info = (
+ status,
+ content if isinstance(content, str) else content(exc),
+ )
break
if err_info is None:
@@ -233,12 +245,17 @@ class CloudLoginView(HomeAssistantView):
name = "api:cloud:login"
@require_admin
+ async def post(self, request: web.Request) -> web.Response:
+ """Handle login request."""
+ return await self._post(request)
+
@_handle_cloud_errors
@RequestDataValidator(
vol.Schema(
vol.All(
{
vol.Required("email"): str,
+ vol.Optional("check_connection", default=False): bool,
vol.Exclusive("password", "login"): str,
vol.Exclusive("code", "login"): str,
},
@@ -246,7 +263,7 @@ class CloudLoginView(HomeAssistantView):
)
)
)
- async def post(self, request: web.Request, data: dict[str, Any]) -> web.Response:
+ async def _post(self, request: web.Request, data: dict[str, Any]) -> web.Response:
"""Handle login request."""
hass = request.app[KEY_HASS]
cloud = hass.data[DATA_CLOUD]
@@ -257,7 +274,11 @@ class CloudLoginView(HomeAssistantView):
code = data.get("code")
if email and password:
- await cloud.login(email, password)
+ await cloud.login(
+ email,
+ password,
+ check_connection=data["check_connection"],
+ )
else:
if (
@@ -269,7 +290,12 @@ class CloudLoginView(HomeAssistantView):
# Voluptuous should ensure that code is not None because password is
assert code is not None
- await cloud.login_verify_totp(email, code, self._mfa_tokens)
+ await cloud.login_verify_totp(
+ email,
+ code,
+ self._mfa_tokens,
+ check_connection=data["check_connection"],
+ )
self._mfa_tokens = {}
self._mfa_tokens_set_time = 0
@@ -294,8 +320,12 @@ class CloudLogoutView(HomeAssistantView):
name = "api:cloud:logout"
@require_admin
- @_handle_cloud_errors
async def post(self, request: web.Request) -> web.Response:
+ """Handle logout request."""
+ return await self._post(request)
+
+ @_handle_cloud_errors
+ async def _post(self, request: web.Request) -> web.Response:
"""Handle logout request."""
hass = request.app[KEY_HASS]
cloud = hass.data[DATA_CLOUD]
@@ -378,9 +408,13 @@ class CloudForgotPasswordView(HomeAssistantView):
name = "api:cloud:forgot_password"
@require_admin
+ async def post(self, request: web.Request) -> web.Response:
+ """Handle forgot password request."""
+ return await self._post(request)
+
@_handle_cloud_errors
@RequestDataValidator(vol.Schema({vol.Required("email"): str}))
- async def post(self, request: web.Request, data: dict[str, Any]) -> web.Response:
+ async def _post(self, request: web.Request, data: dict[str, Any]) -> web.Response:
"""Handle forgot password request."""
hass = request.app[KEY_HASS]
cloud = hass.data[DATA_CLOUD]
@@ -397,8 +431,11 @@ class DownloadSupportPackageView(HomeAssistantView):
url = "/api/cloud/support_package"
name = "api:cloud:support_package"
- def _generate_markdown(
- self, hass_info: dict[str, Any], domains_info: dict[str, dict[str, str]]
+ async def _generate_markdown(
+ self,
+ hass: HomeAssistant,
+ hass_info: dict[str, Any],
+ domains_info: dict[str, dict[str, str]],
) -> str:
def get_domain_table_markdown(domain_info: dict[str, Any]) -> str:
if len(domain_info) == 0:
@@ -424,6 +461,17 @@ class DownloadSupportPackageView(HomeAssistantView):
"\n\n"
)
+ log_handler = hass.data[DATA_CLOUD_LOG_HANDLER]
+ logs = "\n".join(await log_handler.get_logs(hass))
+ markdown += (
+ "## Full logs\n\n"
+ "Logs
\n\n"
+ "```logs\n"
+ f"{logs}\n"
+ "```\n\n"
+ "