2023.6.2 (#94621)

* started work to update keyboard_remote to work with python 3.11

* updated function names

* all checks pass

* fixed asyncio for python 3.11

* cleanup

* Update homeassistant/components/keyboard_remote/__init__.py

Co-authored-by: Martin Hjelmare <marhje52@gmail.com>

* Update __init__.py

added:
from __future__ import annotations

* Fix typing

---------

Co-authored-by: Martin Hjelmare <marhje52@gmail.com>

.core_files.yaml

@@ -20,6 +20,8 @@ base_platforms: &base_platforms
   - homeassistant/components/camera/**
   - homeassistant/components/climate/**
   - homeassistant/components/cover/**
+  - homeassistant/components/date/**
+  - homeassistant/components/datetime/**
   - homeassistant/components/device_tracker/**
   - homeassistant/components/diagnostics/**
   - homeassistant/components/fan/**
@@ -39,6 +41,7 @@ base_platforms: &base_platforms
   - homeassistant/components/stt/**
   - homeassistant/components/switch/**
   - homeassistant/components/text/**
+  - homeassistant/components/time/**
   - homeassistant/components/tts/**
   - homeassistant/components/update/**
   - homeassistant/components/vacuum/**
@@ -137,7 +140,6 @@ other: &other
 requirements: &requirements
   - .github/workflows/**
   - homeassistant/package_constraints.txt
-  - script/pip_check
   - requirements*.txt
   - pyproject.toml
 

.coveragerc

@@ -226,6 +226,8 @@ omit =
     homeassistant/components/dublin_bus_transport/sensor.py
     homeassistant/components/dunehd/__init__.py
     homeassistant/components/dunehd/media_player.py
+    homeassistant/components/dwd_weather_warnings/const.py
+    homeassistant/components/dwd_weather_warnings/coordinator.py
     homeassistant/components/dwd_weather_warnings/sensor.py
     homeassistant/components/dweet/*
     homeassistant/components/ebox/sensor.py
@@ -326,9 +328,11 @@ omit =
     homeassistant/components/ezviz/binary_sensor.py
     homeassistant/components/ezviz/camera.py
     homeassistant/components/ezviz/coordinator.py
+    homeassistant/components/ezviz/number.py
     homeassistant/components/ezviz/entity.py
     homeassistant/components/ezviz/sensor.py
     homeassistant/components/ezviz/switch.py
+    homeassistant/components/ezviz/update.py
     homeassistant/components/faa_delays/__init__.py
     homeassistant/components/faa_delays/binary_sensor.py
     homeassistant/components/familyhub/camera.py
@@ -385,7 +389,10 @@ omit =
     homeassistant/components/foscam/camera.py
     homeassistant/components/foursquare/*
     homeassistant/components/free_mobile/notify.py
+    homeassistant/components/freebox/camera.py
     homeassistant/components/freebox/device_tracker.py
+    homeassistant/components/freebox/home_base.py
+    homeassistant/components/freebox/router.py
     homeassistant/components/freebox/sensor.py
     homeassistant/components/freebox/switch.py
     homeassistant/components/fritz/common.py
@@ -413,7 +420,6 @@ omit =
     homeassistant/components/gitlab_ci/sensor.py
     homeassistant/components/gitter/sensor.py
     homeassistant/components/glances/sensor.py
-    homeassistant/components/goalfeed/*
     homeassistant/components/goodwe/__init__.py
     homeassistant/components/goodwe/button.py
     homeassistant/components/goodwe/coordinator.py
@@ -479,8 +485,6 @@ omit =
     homeassistant/components/homematic/sensor.py
     homeassistant/components/homematic/switch.py
     homeassistant/components/homeworks/*
-    homeassistant/components/honeywell/__init__.py
-    homeassistant/components/honeywell/climate.py
     homeassistant/components/horizon/media_player.py
     homeassistant/components/hp_ilo/sensor.py
     homeassistant/components/huawei_lte/__init__.py
@@ -786,6 +790,7 @@ omit =
     homeassistant/components/nibe_heatpump/select.py
     homeassistant/components/nibe_heatpump/sensor.py
     homeassistant/components/nibe_heatpump/switch.py
+    homeassistant/components/nibe_heatpump/water_heater.py
     homeassistant/components/niko_home_control/light.py
     homeassistant/components/nilu/air_quality.py
     homeassistant/components/nissan_leaf/*
@@ -831,6 +836,7 @@ omit =
     homeassistant/components/onvif/event.py
     homeassistant/components/onvif/parsers.py
     homeassistant/components/onvif/sensor.py
+    homeassistant/components/onvif/util.py
     homeassistant/components/open_meteo/weather.py
     homeassistant/components/opencv/*
     homeassistant/components/openevse/sensor.py
@@ -938,6 +944,7 @@ omit =
     homeassistant/components/pushover/notify.py
     homeassistant/components/pushsafer/notify.py
     homeassistant/components/pyload/sensor.py
+    homeassistant/components/qbittorrent/__init__.py
     homeassistant/components/qbittorrent/sensor.py
     homeassistant/components/qnap/sensor.py
     homeassistant/components/qrcode/image_processing.py
@@ -995,6 +1002,7 @@ omit =
     homeassistant/components/ridwell/switch.py
     homeassistant/components/ring/camera.py
     homeassistant/components/ripple/sensor.py
+    homeassistant/components/roborock/coordinator.py
     homeassistant/components/rocketchat/notify.py
     homeassistant/components/roomba/__init__.py
     homeassistant/components/roomba/binary_sensor.py
@@ -1100,7 +1108,9 @@ omit =
     homeassistant/components/sms/notify.py
     homeassistant/components/sms/sensor.py
     homeassistant/components/smtp/notify.py
-    homeassistant/components/snapcast/*
+    homeassistant/components/snapcast/__init__.py
+    homeassistant/components/snapcast/media_player.py
+    homeassistant/components/snapcast/server.py
     homeassistant/components/snmp/device_tracker.py
     homeassistant/components/snmp/sensor.py
     homeassistant/components/snmp/switch.py
@@ -1285,10 +1295,10 @@ omit =
     homeassistant/components/toon/switch.py
     homeassistant/components/torque/sensor.py
     homeassistant/components/totalconnect/__init__.py
-    homeassistant/components/totalconnect/binary_sensor.py
     homeassistant/components/touchline/climate.py
     homeassistant/components/tplink_lte/*
     homeassistant/components/tplink_omada/__init__.py
+    homeassistant/components/tplink_omada/binary_sensor.py
     homeassistant/components/tplink_omada/controller.py
     homeassistant/components/tplink_omada/coordinator.py
     homeassistant/components/tplink_omada/entity.py
@@ -1379,7 +1389,6 @@ omit =
     homeassistant/components/verisure/sensor.py
     homeassistant/components/verisure/switch.py
     homeassistant/components/versasense/*
-    homeassistant/components/vesync/common.py
     homeassistant/components/vesync/fan.py
     homeassistant/components/vesync/light.py
     homeassistant/components/vesync/sensor.py
@@ -1435,7 +1444,6 @@ omit =
     homeassistant/components/xbox/media_player.py
     homeassistant/components/xbox/remote.py
     homeassistant/components/xbox/sensor.py
-    homeassistant/components/xbox_live/sensor.py
     homeassistant/components/xeoma/camera.py
     homeassistant/components/xiaomi/camera.py
     homeassistant/components/xiaomi_aqara/__init__.py
@@ -1509,7 +1517,7 @@ omit =
     homeassistant/components/zeversolar/entity.py
     homeassistant/components/zeversolar/sensor.py
     homeassistant/components/zha/websocket_api.py
-    homeassistant/components/zha/core/channels/*
+    homeassistant/components/zha/core/cluster_handlers/*
     homeassistant/components/zha/core/device.py
     homeassistant/components/zha/core/gateway.py
     homeassistant/components/zha/core/helpers.py
@@ -1530,6 +1538,8 @@ omit =
     homeassistant/components/zwave_me/sensor.py
     homeassistant/components/zwave_me/siren.py
     homeassistant/components/zwave_me/switch.py
+    homeassistant/components/electrasmart/climate.py
+    homeassistant/components/electrasmart/__init__.py
 
 [report]
 # Regexes for lines to exclude from consideration

.gitattributes

@@ -8,5 +8,6 @@
 *.png binary
 *.zip binary
 *.mp3 binary
+*.pcm binary
 
 Dockerfile.dev linguist-language=Dockerfile

.github/PULL_REQUEST_TEMPLATE.md

@@ -104,8 +104,8 @@ To help with the load of incoming pull requests:
 
   Below, some useful links you could explore:
 -->
-[dev-checklist]: https://developers.home-assistant.io/docs/en/development_checklist.html
-[manifest-docs]: https://developers.home-assistant.io/docs/en/creating_integration_manifest.html
-[quality-scale]: https://developers.home-assistant.io/docs/en/next/integration_quality_scale_index.html
+[dev-checklist]: https://developers.home-assistant.io/docs/development_checklist/
+[manifest-docs]: https://developers.home-assistant.io/docs/creating_integration_manifest/
+[quality-scale]: https://developers.home-assistant.io/docs/integration_quality_scale_index/
 [docs-repository]: https://github.com/home-assistant/home-assistant.io
 [perfect-pr]: https://developers.home-assistant.io/docs/review-process/#creating-the-perfect-pr

.github/workflows/builder.yml

@@ -24,12 +24,12 @@ jobs:
       publish: ${{ steps.version.outputs.publish }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v3.5.2
         with:
           fetch-depth: 0
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v4.5.0
+        uses: actions/setup-python@v4.6.1
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 
@@ -62,15 +62,16 @@ jobs:
 
   build_python:
     name: Build PyPi package
-    needs: init
+    environment: ${{ needs.init.outputs.channel }}
+    needs: ["init", "build_base"]
     runs-on: ubuntu-latest
     if: github.repository_owner == 'home-assistant' && needs.init.outputs.publish == 'true'
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v3.5.2
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v4.5.0
+        uses: actions/setup-python@v4.6.1
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 
@@ -105,7 +106,7 @@ jobs:
         arch: ${{ fromJson(needs.init.outputs.architectures) }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v3.5.2
 
       - name: Download nightly wheels of frontend
         if: needs.init.outputs.channel == 'dev'
@@ -123,7 +124,7 @@ jobs:
         uses: dawidd6/action-download-artifact@v2
         with:
           github_token: ${{secrets.GITHUB_TOKEN}}
-          repo: home-assistant/intents
+          repo: home-assistant/intents-package
           branch: main
           workflow: nightly.yaml
           workflow_conclusion: success
@@ -131,7 +132,7 @@ jobs:
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         if: needs.init.outputs.channel == 'dev'
-        uses: actions/setup-python@v4.5.0
+        uses: actions/setup-python@v4.6.1
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 
@@ -140,7 +141,7 @@ jobs:
         shell: bash
         run: |
           python3 -m pip install packaging tomli
-          python3 -m pip install --use-deprecated=legacy-resolver .
+          python3 -m pip install .
           version="$(python3 script/version_bump.py nightly)"
 
           if [[ "$(ls home_assistant_frontend*.whl)" =~ ^home_assistant_frontend-(.*)-py3-none-any.whl$ ]]; then
@@ -174,6 +175,18 @@ jobs:
             python -m script.gen_requirements_all
           fi
 
+      - name: Adjustments for armhf
+        if: matrix.arch == 'armhf'
+        run: |
+          # Pandas has issues building on armhf, it is expected they
+          # will drop the platform in the near future (they consider it
+          # "flimsy" on 386). The following packages depend on pandas,
+          # so we comment them out.
+          sed -i "s|env_canada|# env_canada|g" requirements_all.txt
+          sed -i "s|noaa-coops|# noaa-coops|g" requirements_all.txt
+          sed -i "s|pyezviz|# pyezviz|g" requirements_all.txt
+          sed -i "s|pykrakenapi|# pykrakenapi|g" requirements_all.txt
+
       - name: Download Translations
         run: python3 -m script.translations download
         env:
@@ -249,7 +262,7 @@ jobs:
           - yellow
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v3.5.2
 
       - name: Set build additional args
         run: |
@@ -287,12 +300,13 @@ jobs:
 
   publish_ha:
     name: Publish version files
+    environment: ${{ needs.init.outputs.channel }}
     if: github.repository_owner == 'home-assistant'
     needs: ["init", "build_machine"]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v3.5.2
 
       - name: Initialize git
         uses: home-assistant/actions/helpers/git-init@master
@@ -320,6 +334,7 @@ jobs:
 
   publish_container:
     name: Publish meta container for ${{ matrix.registry }}
+    environment: ${{ needs.init.outputs.channel }}
     if: github.repository_owner == 'home-assistant'
     needs: ["init", "build_base"]
     runs-on: ubuntu-latest
@@ -331,7 +346,7 @@ jobs:
           - "homeassistant"
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v3.5.2
 
       - name: Login to DockerHub
         if: matrix.registry == 'homeassistant'

.github/workflows/ci.yaml

@@ -1,4 +1,5 @@
 name: CI
+run-name: "${{ github.event_name == 'workflow_dispatch' && format('CI: {0}', github.ref_name) || '' }}"
 
 # yamllint disable-line rule:truthy
 on:
@@ -31,7 +32,7 @@ env:
   CACHE_VERSION: 5
   PIP_CACHE_VERSION: 4
   MYPY_CACHE_VERSION: 4
-  HA_SHORT_VERSION: 2023.4
+  HA_SHORT_VERSION: 2023.6
   DEFAULT_PYTHON: "3.10"
   ALL_PYTHON_VERSIONS: "['3.10', '3.11']"
   # 10.3 is the oldest supported version
@@ -40,7 +41,9 @@ env:
   # - 10.6.10 is the version currently shipped with the Add-on (as of 31 Jan 2023)
   # 10.10 is the latest short-term-support
   # - 10.10.3 is the latest (as of 6 Feb 2023)
-  MARIADB_VERSIONS: "['mariadb:10.3.32','mariadb:10.6.10','mariadb:10.10.3']"
+  # mysql 8.0.32 does not always behave the same as MariaDB
+  # and some queries that work on MariaDB do not work on MySQL
+  MARIADB_VERSIONS: "['mariadb:10.3.32','mariadb:10.6.10','mariadb:10.10.3','mysql:8.0.32']"
   # 12 is the oldest supported version
   # - 12.14 is the latest (as of 9 Feb 2023)
   # 15 is the latest version
@@ -79,7 +82,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v3.5.2
       - name: Generate partial Python venv restore key
         id: generate_python_cache_key
         run: >-
@@ -203,10 +206,10 @@ jobs:
       - info
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v3.5.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v4.5.0
+        uses: actions/setup-python@v4.6.1
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -248,9 +251,9 @@ jobs:
       - pre-commit
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v3.5.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v4.5.0
+        uses: actions/setup-python@v4.6.1
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
@@ -294,9 +297,9 @@ jobs:
       - pre-commit
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v3.5.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v4.5.0
+        uses: actions/setup-python@v4.6.1
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
@@ -343,9 +346,9 @@ jobs:
       - pre-commit
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v3.5.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v4.5.0
+        uses: actions/setup-python@v4.6.1
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
@@ -381,9 +384,9 @@ jobs:
       - pre-commit
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v3.5.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v4.5.0
+        uses: actions/setup-python@v4.6.1
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
@@ -434,6 +437,7 @@ jobs:
         shell: bash
         run: |
           . venv/bin/activate
+          shopt -s globstar
           pre-commit run --hook-stage manual prettier --files {homeassistant,tests}/components/${{ needs.info.outputs.integrations_glob }}/{*,**/*}
 
       - name: Register check executables problem matcher
@@ -487,10 +491,10 @@ jobs:
         python-version: ${{ fromJSON(needs.info.outputs.python_versions) }}
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v3.5.2
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v4.5.0
+        uses: actions/setup-python@v4.6.1
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
@@ -539,9 +543,9 @@ jobs:
           python -m venv venv
           . venv/bin/activate
           python --version
-          pip install --cache-dir=$PIP_CACHE -U "pip>=21.0,<23.1" setuptools wheel
-          pip install --cache-dir=$PIP_CACHE -r requirements_all.txt --use-deprecated=legacy-resolver
-          pip install --cache-dir=$PIP_CACHE -r requirements_test.txt --use-deprecated=legacy-resolver
+          pip install --cache-dir=$PIP_CACHE -U "pip>=21.0,<23.2" setuptools wheel
+          pip install --cache-dir=$PIP_CACHE -r requirements_all.txt
+          pip install --cache-dir=$PIP_CACHE -r requirements_test.txt
           pip install -e .
 
   hassfest:
@@ -555,10 +559,10 @@ jobs:
       - base
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v3.5.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v4.5.0
+        uses: actions/setup-python@v4.6.1
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -587,10 +591,10 @@ jobs:
       - base
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v3.5.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v4.5.0
+        uses: actions/setup-python@v4.6.1
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -620,10 +624,10 @@ jobs:
       - base
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v3.5.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v4.5.0
+        uses: actions/setup-python@v4.6.1
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -664,10 +668,10 @@ jobs:
       - base
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v3.5.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v4.5.0
+        uses: actions/setup-python@v4.6.1
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -715,42 +719,6 @@ jobs:
           python --version
           mypy homeassistant/components/${{ needs.info.outputs.integrations_glob }}
 
-  pip-check:
-    runs-on: ubuntu-22.04
-    if: |
-      github.event.inputs.pylint-only != 'true'
-      && github.event.inputs.mypy-only != 'true'
-    needs:
-      - info
-      - base
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: ${{ fromJson(needs.info.outputs.python_versions) }}
-    name: Run pip check ${{ matrix.python-version }}
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.0
-      - name: Set up Python ${{ matrix.python-version }}
-        id: python
-        uses: actions/setup-python@v4.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@v3.3.1
-        with:
-          path: venv
-          fail-on-cache-miss: true
-          key: >-
-            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
-            needs.info.outputs.python_cache_key }}
-      - name: Run pip check
-        run: |
-          . venv/bin/activate
-          ./script/pip_check $PIP_CACHE
-
   pytest:
     runs-on: ubuntu-22.04
     if: |
@@ -783,10 +751,10 @@ jobs:
             bluez \
             ffmpeg
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v3.5.2
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v4.5.0
+        uses: actions/setup-python@v4.6.1
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
@@ -909,10 +877,10 @@ jobs:
             ffmpeg \
             libmariadb-dev-compat
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v3.5.2
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v4.5.0
+        uses: actions/setup-python@v4.6.1
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
@@ -1017,10 +985,10 @@ jobs:
             ffmpeg \
             postgresql-server-dev-14
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v3.5.2
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v4.5.0
+        uses: actions/setup-python@v4.6.1
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
@@ -1091,19 +1059,28 @@ jobs:
     needs:
       - info
       - pytest
+    timeout-minutes: 10
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v3.5.2
       - name: Download all coverage artifacts
         uses: actions/download-artifact@v3
       - name: Upload coverage to Codecov (full coverage)
         if: needs.info.outputs.test_full_suite == 'true'
-        uses: codecov/codecov-action@v3.1.1
+        uses: Wandalen/wretry.action@v1.0.36
         with:
-          fail_ci_if_error: true
-          flags: full-suite
+          action: codecov/codecov-action@v3.1.3
+          with: |
+            fail_ci_if_error: true
+            flags: full-suite
+          attempt_limit: 5
+          attempt_delay: 30000
       - name: Upload coverage to Codecov (partial coverage)
         if: needs.info.outputs.test_full_suite == 'false'
-        uses: codecov/codecov-action@v3.1.1
+        uses: Wandalen/wretry.action@v1.0.36
         with:
-          fail_ci_if_error: true
+          action: codecov/codecov-action@v3.1.3
+          with: |
+            fail_ci_if_error: true
+          attempt_limit: 5
+          attempt_delay: 30000

.github/workflows/translations.yml

@@ -19,10 +19,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v3.5.2
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v4.5.0
+        uses: actions/setup-python@v4.6.1
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 

.github/workflows/wheels.yml

@@ -13,6 +13,10 @@ on:
       - "requirements.txt"
       - "requirements_all.txt"
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref_name}}
+  cancel-in-progress: true
+
 jobs:
   init:
     name: Initialize wheels builder
@@ -22,7 +26,7 @@ jobs:
       architectures: ${{ steps.info.outputs.architectures }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v3.5.2
 
       - name: Get information
         id: info
@@ -72,17 +76,18 @@ jobs:
           path: ./requirements_diff.txt
 
   core:
-    name: Build musllinux wheels with musllinux_1_2 / cp310 at ${{ matrix.arch }} for core
+    name: Build Core wheels ${{ matrix.abi }} for ${{ matrix.arch }} (musllinux_1_2)
     if: github.repository_owner == 'home-assistant'
     needs: init
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
+        abi: ["cp310", "cp311"]
         arch: ${{ fromJson(needs.init.outputs.architectures) }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v3.5.2
 
       - name: Download env_file
         uses: actions/download-artifact@v3
@@ -95,9 +100,9 @@ jobs:
           name: requirements_diff
 
       - name: Build wheels
-        uses: home-assistant/wheels@2022.10.1
+        uses: home-assistant/wheels@2023.04.0
         with:
-          abi: cp310
+          abi: ${{ matrix.abi }}
           tag: musllinux_1_2
           arch: ${{ matrix.arch }}
           wheels-key: ${{ secrets.WHEELS_KEY }}
@@ -108,18 +113,19 @@ jobs:
           requirements-diff: "requirements_diff.txt"
           requirements: "requirements.txt"
 
-  integrations:
-    name: Build musllinux wheels with musllinux_1_2 / cp310 at ${{ matrix.arch }} for integrations
+  integrations_cp310:
+    name: Build wheels ${{ matrix.abi }} for ${{ matrix.arch }}
     if: github.repository_owner == 'home-assistant'
     needs: init
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
+        abi: ["cp310"]
         arch: ${{ fromJson(needs.init.outputs.architectures) }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.5.0
+        uses: actions/checkout@v3.5.2
 
       - name: Download env_file
         uses: actions/download-artifact@v3
@@ -171,31 +177,168 @@ jobs:
           sed -i "/numpy/d" homeassistant/package_constraints.txt
 
       - name: Build wheels (part 1)
-        uses: home-assistant/wheels@2022.10.1
+        uses: home-assistant/wheels@2023.04.0
         with:
-          abi: cp310
+          abi: ${{ matrix.abi }}
           tag: musllinux_1_2
           arch: ${{ matrix.arch }}
           wheels-key: ${{ secrets.WHEELS_KEY }}
           env-file: true
-          apk: "libexecinfo-dev;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"
-          skip-binary: aiohttp;grpcio;sqlalchemy
-          legacy: 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"
+          skip-binary: aiohttp;grpcio;sqlalchemy;protobuf
           constraints: "homeassistant/package_constraints.txt"
           requirements-diff: "requirements_diff.txt"
           requirements: "requirements_all.txtaa"
 
       - name: Build wheels (part 2)
-        uses: home-assistant/wheels@2022.10.1
+        uses: home-assistant/wheels@2023.04.0
         with:
-          abi: cp310
+          abi: ${{ matrix.abi }}
           tag: musllinux_1_2
           arch: ${{ matrix.arch }}
           wheels-key: ${{ secrets.WHEELS_KEY }}
           env-file: true
-          apk: "libexecinfo-dev;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"
-          skip-binary: aiohttp;grpcio;sqlalchemy
-          legacy: 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"
+          skip-binary: aiohttp;grpcio;sqlalchemy;protobuf
+          constraints: "homeassistant/package_constraints.txt"
+          requirements-diff: "requirements_diff.txt"
+          requirements: "requirements_all.txtab"
+
+  # Wheels building for the cp311 ABI is currently split
+  # This is mainly until we have figured out to get all wheels built.
+  # Without harming our current workflow.
+  integrations_cp311:
+    name: Build wheels ${{ matrix.abi }} for ${{ matrix.arch }}
+    if: github.repository_owner == 'home-assistant'
+    needs: init
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        abi: ["cp311"]
+        arch: ${{ fromJson(needs.init.outputs.architectures) }}
+    steps:
+      - name: Checkout the repository
+        uses: actions/checkout@v3.5.2
+
+      - name: Write alternative env-file for cp311
+        run: |
+          (
+            echo "GRPC_BUILD_WITH_BORING_SSL_ASM=false"
+            echo "GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=true"
+            echo "GRPC_PYTHON_BUILD_WITH_CYTHON=true"
+            echo "GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY=true"
+
+            # GRPC on armv7 needed -lexecinfo (issue #56669) since home assistant installed
+            # execinfo-dev when building wheels. However, this package is no longer available
+            # Alpine 3.17, which we use for the cp311 ABI, so the flag should no longer be needed.
+            echo "GRPC_PYTHON_LDFLAGS=-lpthread -Wl,-wrap,memcpy -static-libgcc" # -lexecinfo
+
+            # Fix out of memory issues with rust
+            echo "CARGO_NET_GIT_FETCH_WITH_CLI=true"
+
+            # OpenCV headless installation
+            echo "CI_BUILD=1"
+            echo "ENABLE_HEADLESS=1"
+
+            # Use C-Extension for sqlalchemy
+            echo "REQUIRE_SQLALCHEMY_CEXT=1"
+          ) > .env_file
+
+      - name: Download requirements_diff
+        uses: actions/download-artifact@v3
+        with:
+          name: requirements_diff
+
+      - name: (Un)comment packages
+        run: |
+          requirement_files="requirements_all.txt requirements_diff.txt"
+          for requirement_file in ${requirement_files}; do
+
+            # PyBluez no longer compiles. Commented it out for now.
+            # It need further cleanup down the line, as all machine images
+            # try to install it.
+            # sed -i "s|# pybluez|pybluez|g" ${requirement_file}
+
+            # beacontools requires PyBluez.
+            # sed -i "s|# beacontools|beacontools|g" ${requirement_file}
+
+            # It doesn't build for some reason, so we skip it for now.
+            # Bumping to the latest version (4.7.0.72) supporting Python 3.11
+            # doesn't help. Reverted bump in #91871. There are 8 registered
+            # instances using this integration according to analytics.
+            # sed -i "s|# opencv-python-headless|opencv-python-headless|g" ${requirement_file}
+
+            sed -i "s|# fritzconnection|fritzconnection|g" ${requirement_file}
+            sed -i "s|# pyuserinput|pyuserinput|g" ${requirement_file}
+            sed -i "s|# evdev|evdev|g" ${requirement_file}
+            sed -i "s|# pycups|pycups|g" ${requirement_file}
+            sed -i "s|# homekit|homekit|g" ${requirement_file}
+            sed -i "s|# decora_wifi|decora_wifi|g" ${requirement_file}
+            sed -i "s|# python-gammu|python-gammu|g" ${requirement_file}
+
+            # Some packages are not buildable on armhf anymore
+            if [ "${{ matrix.arch }}" = "armhf" ]; then
+
+              # Pandas has issues building on armhf, it is expected they
+              # will drop the platform in the near future (they consider it
+              # "flimsy" on 386). The following packages depend on pandas,
+              # so we comment them out.
+              sed -i "s|env_canada|# env_canada|g" ${requirement_file}
+              sed -i "s|noaa-coops|# noaa-coops|g" ${requirement_file}
+              sed -i "s|pyezviz|# pyezviz|g" ${requirement_file}
+              sed -i "s|pykrakenapi|# pykrakenapi|g" ${requirement_file}
+            fi
+          done
+
+      - name: Split requirements all
+        run: |
+          # We split requirements all into two different 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) / 2) requirements_all.txt requirements_all.txt
+
+      - name: Adjust build env
+        run: |
+          if [ "${{ matrix.arch }}" = "i386" ]; then
+            echo "NPY_DISABLE_SVML=1" >> .env_file
+          fi
+
+          # Probably not an issue anymore. Removing for now.
+          # (
+          #   # cmake > 3.22.2 have issue on arm
+          #   # Tested until 3.22.5
+          #   echo "cmake==3.22.2"
+          # ) >> homeassistant/package_constraints.txt
+
+          # Do not pin numpy in wheels building
+          sed -i "/numpy/d" homeassistant/package_constraints.txt
+
+      - name: Build wheels (part 1)
+        uses: home-assistant/wheels@2023.04.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"
+          skip-binary: aiohttp;grpcio;sqlalchemy;protobuf
+          constraints: "homeassistant/package_constraints.txt"
+          requirements-diff: "requirements_diff.txt"
+          requirements: "requirements_all.txtaa"
+
+      - name: Build wheels (part 2)
+        uses: home-assistant/wheels@2023.04.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"
+          skip-binary: aiohttp;grpcio;sqlalchemy;protobuf
           constraints: "homeassistant/package_constraints.txt"
           requirements-diff: "requirements_diff.txt"
           requirements: "requirements_all.txtab"

.pre-commit-config.yaml

@@ -1,12 +1,12 @@
 repos:
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.256
+    rev: v0.0.262
     hooks:
       - id: ruff
         args:
           - --fix
   - repo: https://github.com/psf/black
-    rev: 23.1.0
+    rev: 23.3.0
     hooks:
       - id: black
         args:

.strict-typing

@@ -49,6 +49,7 @@ homeassistant.components.air_quality.*
 homeassistant.components.airly.*
 homeassistant.components.airvisual.*
 homeassistant.components.airzone.*
+homeassistant.components.airzone_cloud.*
 homeassistant.components.aladdin_connect.*
 homeassistant.components.alarm_control_panel.*
 homeassistant.components.alert.*
@@ -57,10 +58,12 @@ homeassistant.components.ambient_station.*
 homeassistant.components.amcrest.*
 homeassistant.components.ampio.*
 homeassistant.components.analytics.*
+homeassistant.components.anova.*
 homeassistant.components.anthemav.*
 homeassistant.components.apcupsd.*
 homeassistant.components.aqualogic.*
 homeassistant.components.aseko_pool_live.*
+homeassistant.components.assist_pipeline.*
 homeassistant.components.asuswrt.*
 homeassistant.components.auth.*
 homeassistant.components.automation.*
@@ -84,6 +87,7 @@ homeassistant.components.camera.*
 homeassistant.components.canary.*
 homeassistant.components.clickatell.*
 homeassistant.components.clicksend.*
+homeassistant.components.cloud.*
 homeassistant.components.configurator.*
 homeassistant.components.cover.*
 homeassistant.components.cpuspeed.*
@@ -103,6 +107,7 @@ homeassistant.components.dormakaba_dkey.*
 homeassistant.components.dsmr.*
 homeassistant.components.dunehd.*
 homeassistant.components.efergy.*
+homeassistant.components.electrasmart.*
 homeassistant.components.elgato.*
 homeassistant.components.elkm1.*
 homeassistant.components.emulated_hue.*
@@ -137,6 +142,7 @@ homeassistant.components.hardkernel.*
 homeassistant.components.hardware.*
 homeassistant.components.here_travel_time.*
 homeassistant.components.history.*
+homeassistant.components.homeassistant.exposed_entities
 homeassistant.components.homeassistant.triggers.event
 homeassistant.components.homeassistant_alerts.*
 homeassistant.components.homeassistant_hardware.*
@@ -163,10 +169,12 @@ homeassistant.components.homekit_controller.utils
 homeassistant.components.homewizard.*
 homeassistant.components.http.*
 homeassistant.components.huawei_lte.*
+homeassistant.components.hydrawise.*
 homeassistant.components.hyperion.*
 homeassistant.components.ibeacon.*
 homeassistant.components.image_processing.*
 homeassistant.components.image_upload.*
+homeassistant.components.imap.*
 homeassistant.components.input_button.*
 homeassistant.components.input_select.*
 homeassistant.components.integration.*
@@ -174,6 +182,7 @@ homeassistant.components.iqvia.*
 homeassistant.components.isy994.*
 homeassistant.components.jellyfin.*
 homeassistant.components.jewish_calendar.*
+homeassistant.components.jvc_projector.*
 homeassistant.components.kaleidescape.*
 homeassistant.components.knx.*
 homeassistant.components.kraken.*
@@ -227,6 +236,7 @@ homeassistant.components.oncue.*
 homeassistant.components.onewire.*
 homeassistant.components.open_meteo.*
 homeassistant.components.openexchangerates.*
+homeassistant.components.opensky.*
 homeassistant.components.openuv.*
 homeassistant.components.otbr.*
 homeassistant.components.overkiz.*
@@ -281,6 +291,7 @@ homeassistant.components.smhi.*
 homeassistant.components.snooz.*
 homeassistant.components.sonarr.*
 homeassistant.components.speedtestdotnet.*
+homeassistant.components.sql.*
 homeassistant.components.ssdp.*
 homeassistant.components.statistics.*
 homeassistant.components.steamist.*

.vscode/launch.json

@@ -23,7 +23,7 @@
       "preLaunchTask": "Compile English translations"
     },
     {
-      // Debug by attaching to local Home Asistant server using Remote Python Debugger.
+      // Debug by attaching to local Home Assistant server using Remote Python Debugger.
       // See https://www.home-assistant.io/integrations/debugpy/
       "name": "Home Assistant: Attach Local",
       "type": "python",
@@ -38,7 +38,7 @@
       ]
     },
     {
-      // Debug by attaching to remote Home Asistant server using Remote Python Debugger.
+      // Debug by attaching to remote Home Assistant server using Remote Python Debugger.
       // See https://www.home-assistant.io/integrations/debugpy/
       "name": "Home Assistant: Attach Remote",
       "type": "python",

.vscode/tasks.json

@@ -103,7 +103,7 @@
     {
       "label": "Install all Requirements",
       "type": "shell",
-      "command": "pip3 install --use-deprecated=legacy-resolver -r requirements_all.txt",
+      "command": "pip3 install -r requirements_all.txt",
       "group": {
         "kind": "build",
         "isDefault": true
@@ -117,7 +117,7 @@
     {
       "label": "Install all Test Requirements",
       "type": "shell",
-      "command": "pip3 install --use-deprecated=legacy-resolver -r requirements_test_all.txt",
+      "command": "pip3 install -r requirements_test_all.txt",
       "group": {
         "kind": "build",
         "isDefault": true
@@ -137,6 +137,26 @@
         "kind": "build",
         "isDefault": true
       }
+    },
+    {
+      "label": "Run scaffold",
+      "detail": "Add new functionality to a integration using a scaffold.",
+      "type": "shell",
+      "command": "python3 -m script.scaffold ${input:scaffoldName} --integration ${input:integrationName}",
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      }
+    },
+    {
+      "label": "Create new integration",
+      "detail": "Use the scaffold to create a new integration.",
+      "type": "shell",
+      "command": "python3 -m script.scaffold integration",
+      "group": {
+        "kind": "build",
+        "isDefault": true
+      }
     }
   ],
   "inputs": [
@@ -144,6 +164,23 @@
       "id": "integrationName",
       "type": "promptString",
       "description": "For which integration should the task run?"
+    },
+    {
+      "id": "scaffoldName",
+      "type": "pickString",
+      "options": [
+        "backup",
+        "config_flow",
+        "config_flow_discovery",
+        "config_flow_helper",
+        "config_flow_oauth2",
+        "device_action",
+        "device_condition",
+        "device_trigger",
+        "reproduce_state",
+        "significant_change"
+      ],
+      "description": "Which scaffold should be run?"
     }
   ]
 }

CODEOWNERS

@@ -59,6 +59,8 @@ build.json @home-assistant/supervisor
 /tests/components/airvisual_pro/ @bachya
 /homeassistant/components/airzone/ @Noltari
 /tests/components/airzone/ @Noltari
+/homeassistant/components/airzone_cloud/ @Noltari
+/tests/components/airzone_cloud/ @Noltari
 /homeassistant/components/aladdin_connect/ @mkmer
 /tests/components/aladdin_connect/ @mkmer
 /homeassistant/components/alarm_control_panel/ @home-assistant/core
@@ -80,6 +82,10 @@ build.json @home-assistant/supervisor
 /tests/components/android_ip_webcam/ @engrbm87
 /homeassistant/components/androidtv/ @JeffLIrion @ollo69
 /tests/components/androidtv/ @JeffLIrion @ollo69
+/homeassistant/components/androidtv_remote/ @tronikos @Drafteed
+/tests/components/androidtv_remote/ @tronikos @Drafteed
+/homeassistant/components/anova/ @Lash-L
+/tests/components/anova/ @Lash-L
 /homeassistant/components/anthemav/ @hyralex
 /tests/components/anthemav/ @hyralex
 /homeassistant/components/apache_kafka/ @bachya
@@ -103,6 +109,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/arris_tg2492lg/ @vanbalken
 /homeassistant/components/aseko_pool_live/ @milanmeu
 /tests/components/aseko_pool_live/ @milanmeu
+/homeassistant/components/assist_pipeline/ @balloob @synesthesiam
+/tests/components/assist_pipeline/ @balloob @synesthesiam
 /homeassistant/components/asuswrt/ @kennedyshead @ollo69
 /tests/components/asuswrt/ @kennedyshead @ollo69
 /homeassistant/components/atag/ @MatsNL
@@ -168,6 +176,8 @@ build.json @home-assistant/supervisor
 /tests/components/broadlink/ @danielhiversen @felipediel @L-I-Am
 /homeassistant/components/brother/ @bieniu
 /tests/components/brother/ @bieniu
+/homeassistant/components/brottsplatskartan/ @gjohansson-ST
+/tests/components/brottsplatskartan/ @gjohansson-ST
 /homeassistant/components/brunt/ @eavanvalkenburg
 /tests/components/brunt/ @eavanvalkenburg
 /homeassistant/components/bsblan/ @liudger
@@ -203,6 +213,8 @@ build.json @home-assistant/supervisor
 /tests/components/color_extractor/ @GenericStudent
 /homeassistant/components/comfoconnect/ @michaelarnauts
 /tests/components/comfoconnect/ @michaelarnauts
+/homeassistant/components/command_line/ @gjohansson-ST
+/tests/components/command_line/ @gjohansson-ST
 /homeassistant/components/compensation/ @Petro31
 /tests/components/compensation/ @Petro31
 /homeassistant/components/config/ @home-assistant/core
@@ -215,8 +227,6 @@ build.json @home-assistant/supervisor
 /tests/components/conversation/ @home-assistant/core @synesthesiam
 /homeassistant/components/coolmaster/ @OnFreund
 /tests/components/coolmaster/ @OnFreund
-/homeassistant/components/coronavirus/ @home-assistant/core
-/tests/components/coronavirus/ @home-assistant/core
 /homeassistant/components/counter/ @fabaff
 /tests/components/counter/ @fabaff
 /homeassistant/components/cover/ @home-assistant/core
@@ -228,6 +238,10 @@ build.json @home-assistant/supervisor
 /homeassistant/components/cups/ @fabaff
 /homeassistant/components/daikin/ @fredrike
 /tests/components/daikin/ @fredrike
+/homeassistant/components/date/ @home-assistant/core
+/tests/components/date/ @home-assistant/core
+/homeassistant/components/datetime/ @home-assistant/core
+/tests/components/datetime/ @home-assistant/core
 /homeassistant/components/debugpy/ @frenck
 /tests/components/debugpy/ @frenck
 /homeassistant/components/deconz/ @Kane610
@@ -281,7 +295,8 @@ build.json @home-assistant/supervisor
 /tests/components/dsmr_reader/ @depl0y @glodenox
 /homeassistant/components/dunehd/ @bieniu
 /tests/components/dunehd/ @bieniu
-/homeassistant/components/dwd_weather_warnings/ @runningman84 @stephan192 @Hummel95
+/homeassistant/components/dwd_weather_warnings/ @runningman84 @stephan192 @Hummel95 @andarotajo
+/tests/components/dwd_weather_warnings/ @runningman84 @stephan192 @Hummel95 @andarotajo
 /homeassistant/components/dynalite/ @ziv1234
 /tests/components/dynalite/ @ziv1234
 /homeassistant/components/eafm/ @Jc2k
@@ -300,6 +315,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/egardia/ @jeroenterheerdt
 /homeassistant/components/eight_sleep/ @mezz64 @raman325
 /tests/components/eight_sleep/ @mezz64 @raman325
+/homeassistant/components/electrasmart/ @jafar-atili
+/tests/components/electrasmart/ @jafar-atili
 /homeassistant/components/elgato/ @frenck
 /tests/components/elgato/ @frenck
 /homeassistant/components/elkm1/ @gwww @bdraco
@@ -442,6 +459,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/google_assistant_sdk/ @tronikos
 /tests/components/google_assistant_sdk/ @tronikos
 /homeassistant/components/google_cloud/ @lufton
+/homeassistant/components/google_generative_ai_conversation/ @tronikos
+/tests/components/google_generative_ai_conversation/ @tronikos
 /homeassistant/components/google_mail/ @tkdrob
 /tests/components/google_mail/ @tkdrob
 /homeassistant/components/google_sheets/ @tkdrob
@@ -526,7 +545,7 @@ build.json @home-assistant/supervisor
 /tests/components/hunterdouglas_powerview/ @bdraco @kingy444 @trullock
 /homeassistant/components/hvv_departures/ @vigonotion
 /tests/components/hvv_departures/ @vigonotion
-/homeassistant/components/hydrawise/ @ptcryan
+/homeassistant/components/hydrawise/ @dknowles2 @ptcryan
 /homeassistant/components/hyperion/ @dermotduffy
 /tests/components/hyperion/ @dermotduffy
 /homeassistant/components/ialarm/ @RyuzakiKK
@@ -544,8 +563,8 @@ build.json @home-assistant/supervisor
 /tests/components/image_processing/ @home-assistant/core
 /homeassistant/components/image_upload/ @home-assistant/core
 /tests/components/image_upload/ @home-assistant/core
-/homeassistant/components/imap/ @engrbm87
-/tests/components/imap/ @engrbm87
+/homeassistant/components/imap/ @engrbm87 @jbouwh
+/tests/components/imap/ @engrbm87 @jbouwh
 /homeassistant/components/incomfort/ @zxdavb
 /homeassistant/components/influxdb/ @mdegat01
 /tests/components/influxdb/ @mdegat01
@@ -600,6 +619,8 @@ build.json @home-assistant/supervisor
 /tests/components/juicenet/ @jesserockz
 /homeassistant/components/justnimbus/ @kvanzuijlen
 /tests/components/justnimbus/ @kvanzuijlen
+/homeassistant/components/jvc_projector/ @SteveEasley
+/tests/components/jvc_projector/ @SteveEasley
 /homeassistant/components/kaiterra/ @Michsior14
 /homeassistant/components/kaleidescape/ @SteveEasley
 /tests/components/kaleidescape/ @SteveEasley
@@ -634,6 +655,8 @@ build.json @home-assistant/supervisor
 /tests/components/lametric/ @robbiet480 @frenck @bachya
 /homeassistant/components/landisgyr_heat_meter/ @vpathuis
 /tests/components/landisgyr_heat_meter/ @vpathuis
+/homeassistant/components/lastfm/ @joostlek
+/tests/components/lastfm/ @joostlek
 /homeassistant/components/launch_library/ @ludeeus @DurgNomis-drol
 /tests/components/launch_library/ @ludeeus @DurgNomis-drol
 /homeassistant/components/laundrify/ @xLarry
@@ -649,8 +672,8 @@ build.json @home-assistant/supervisor
 /tests/components/lidarr/ @tkdrob
 /homeassistant/components/life360/ @pnbruckner
 /tests/components/life360/ @pnbruckner
-/homeassistant/components/lifx/ @bdraco @Djelibeybi
-/tests/components/lifx/ @bdraco @Djelibeybi
+/homeassistant/components/lifx/ @bdraco
+/tests/components/lifx/ @bdraco
 /homeassistant/components/light/ @home-assistant/core
 /tests/components/light/ @home-assistant/core
 /homeassistant/components/linux_battery/ @fabaff
@@ -777,6 +800,7 @@ build.json @home-assistant/supervisor
 /homeassistant/components/netdata/ @fabaff
 /homeassistant/components/netgear/ @hacf-fr @Quentame @starkillerOG
 /tests/components/netgear/ @hacf-fr @Quentame @starkillerOG
+/homeassistant/components/netgear_lte/ @tkdrob
 /homeassistant/components/network/ @home-assistant/core
 /tests/components/network/ @home-assistant/core
 /homeassistant/components/nexia/ @bdraco
@@ -819,8 +843,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
-/tests/components/nut/ @bdraco @ollo69
+/homeassistant/components/nut/ @bdraco @ollo69 @pestevez
+/tests/components/nut/ @bdraco @ollo69 @pestevez
 /homeassistant/components/nws/ @MatthewFlamm @kamiyo
 /tests/components/nws/ @MatthewFlamm @kamiyo
 /homeassistant/components/nzbget/ @chriscla
@@ -854,6 +878,7 @@ build.json @home-assistant/supervisor
 /homeassistant/components/opengarage/ @danielhiversen
 /tests/components/opengarage/ @danielhiversen
 /homeassistant/components/openhome/ @bazwilliams
+/homeassistant/components/opensky/ @joostlek
 /homeassistant/components/opentherm_gw/ @mvn23
 /tests/components/opentherm_gw/ @mvn23
 /homeassistant/components/openuv/ @bachya
@@ -893,8 +918,8 @@ build.json @home-assistant/supervisor
 /tests/components/plaato/ @JohNan
 /homeassistant/components/plex/ @jjlawren
 /tests/components/plex/ @jjlawren
-/homeassistant/components/plugwise/ @CoMPaTech @bouwew @brefra @frenck
-/tests/components/plugwise/ @CoMPaTech @bouwew @brefra @frenck
+/homeassistant/components/plugwise/ @CoMPaTech @bouwew @frenck
+/tests/components/plugwise/ @CoMPaTech @bouwew @frenck
 /homeassistant/components/plum_lightpad/ @ColinHarrington @prystupa
 /tests/components/plum_lightpad/ @ColinHarrington @prystupa
 /homeassistant/components/point/ @fredrike
@@ -931,6 +956,7 @@ build.json @home-assistant/supervisor
 /homeassistant/components/pvpc_hourly_pricing/ @azogue
 /tests/components/pvpc_hourly_pricing/ @azogue
 /homeassistant/components/qbittorrent/ @geoffreylagaisse
+/tests/components/qbittorrent/ @geoffreylagaisse
 /homeassistant/components/qingping/ @bdraco @skgsergio
 /tests/components/qingping/ @bdraco @skgsergio
 /homeassistant/components/qld_bushfire/ @exxamalte
@@ -947,8 +973,8 @@ build.json @home-assistant/supervisor
 /tests/components/radarr/ @tkdrob
 /homeassistant/components/radio_browser/ @frenck
 /tests/components/radio_browser/ @frenck
-/homeassistant/components/radiotherm/ @bdraco @vinnyfuria
-/tests/components/radiotherm/ @bdraco @vinnyfuria
+/homeassistant/components/radiotherm/ @vinnyfuria
+/tests/components/radiotherm/ @vinnyfuria
 /homeassistant/components/rainbird/ @konikvranik @allenporter
 /tests/components/rainbird/ @konikvranik @allenporter
 /homeassistant/components/raincloud/ @vanstinator
@@ -958,6 +984,8 @@ build.json @home-assistant/supervisor
 /tests/components/rainmachine/ @bachya
 /homeassistant/components/random/ @fabaff
 /tests/components/random/ @fabaff
+/homeassistant/components/rapt_ble/ @sairon
+/tests/components/rapt_ble/ @sairon
 /homeassistant/components/raspberry_pi/ @home-assistant/core
 /tests/components/raspberry_pi/ @home-assistant/core
 /homeassistant/components/rdw/ @frenck
@@ -976,6 +1004,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/repairs/ @home-assistant/core
 /tests/components/repairs/ @home-assistant/core
 /homeassistant/components/repetier/ @MTrab @ShadowBr0ther
+/homeassistant/components/rest/ @epenet
+/tests/components/rest/ @epenet
 /homeassistant/components/rflink/ @javicalle
 /tests/components/rflink/ @javicalle
 /homeassistant/components/rfxtrx/ @danielhiversen @elupus @RobBie1221
@@ -986,10 +1016,12 @@ build.json @home-assistant/supervisor
 /tests/components/ridwell/ @bachya
 /homeassistant/components/risco/ @OnFreund
 /tests/components/risco/ @OnFreund
-/homeassistant/components/rituals_perfume_genie/ @milanmeu
-/tests/components/rituals_perfume_genie/ @milanmeu
+/homeassistant/components/rituals_perfume_genie/ @milanmeu @frenck
+/tests/components/rituals_perfume_genie/ @milanmeu @frenck
 /homeassistant/components/rmvtransport/ @cgtobi
 /tests/components/rmvtransport/ @cgtobi
+/homeassistant/components/roborock/ @humbertogontijo @Lash-L
+/tests/components/roborock/ @humbertogontijo @Lash-L
 /homeassistant/components/roku/ @ctalkington
 /tests/components/roku/ @ctalkington
 /homeassistant/components/roomba/ @pschmitt @cyr-ius @shenxn
@@ -1080,8 +1112,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/sky_hub/ @rogerselwyn
 /homeassistant/components/skybell/ @tkdrob
 /tests/components/skybell/ @tkdrob
-/homeassistant/components/slack/ @bachya @tkdrob
-/tests/components/slack/ @bachya @tkdrob
+/homeassistant/components/slack/ @tkdrob
+/tests/components/slack/ @tkdrob
 /homeassistant/components/sleepiq/ @mfugate1 @kbickar
 /tests/components/sleepiq/ @mfugate1 @kbickar
 /homeassistant/components/slide/ @ualex73
@@ -1102,6 +1134,7 @@ build.json @home-assistant/supervisor
 /tests/components/smhi/ @gjohansson-ST
 /homeassistant/components/sms/ @ocalvo
 /homeassistant/components/snapcast/ @luar123
+/tests/components/snapcast/ @luar123
 /homeassistant/components/snooz/ @AustinBrunkhorst
 /tests/components/snooz/ @AustinBrunkhorst
 /homeassistant/components/solaredge/ @frenck
@@ -1130,8 +1163,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/splunk/ @Bre77
 /homeassistant/components/spotify/ @frenck
 /tests/components/spotify/ @frenck
-/homeassistant/components/sql/ @dgomes @gjohansson-ST
-/tests/components/sql/ @dgomes @gjohansson-ST
+/homeassistant/components/sql/ @gjohansson-ST @dougiteixeira
+/tests/components/sql/ @gjohansson-ST @dougiteixeira
 /homeassistant/components/squeezebox/ @rajlaud
 /tests/components/squeezebox/ @rajlaud
 /homeassistant/components/srp_energy/ @briglx
@@ -1153,8 +1186,8 @@ build.json @home-assistant/supervisor
 /tests/components/stookwijzer/ @fwestenberg
 /homeassistant/components/stream/ @hunterjm @uvjustin @allenporter
 /tests/components/stream/ @hunterjm @uvjustin @allenporter
-/homeassistant/components/stt/ @pvizeli
-/tests/components/stt/ @pvizeli
+/homeassistant/components/stt/ @home-assistant/core @pvizeli
+/tests/components/stt/ @home-assistant/core @pvizeli
 /homeassistant/components/subaru/ @G-Two
 /tests/components/subaru/ @G-Two
 /homeassistant/components/suez_water/ @ooii
@@ -1173,8 +1206,8 @@ build.json @home-assistant/supervisor
 /tests/components/switchbee/ @jafar-atili
 /homeassistant/components/switchbot/ @bdraco @danielhiversen @RenierM26 @murtas @Eloston @dsypniewski
 /tests/components/switchbot/ @bdraco @danielhiversen @RenierM26 @murtas @Eloston @dsypniewski
-/homeassistant/components/switcher_kis/ @tomerfi @thecode
-/tests/components/switcher_kis/ @tomerfi @thecode
+/homeassistant/components/switcher_kis/ @thecode
+/tests/components/switcher_kis/ @thecode
 /homeassistant/components/switchmate/ @danielhiversen @qiz-li
 /homeassistant/components/syncthing/ @zhulik
 /tests/components/syncthing/ @zhulik
@@ -1185,8 +1218,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/synology_srm/ @aerialls
 /homeassistant/components/system_bridge/ @timmo001
 /tests/components/system_bridge/ @timmo001
-/homeassistant/components/tado/ @michaelarnauts
-/tests/components/tado/ @michaelarnauts
+/homeassistant/components/tado/ @michaelarnauts @chiefdragon
+/tests/components/tado/ @michaelarnauts @chiefdragon
 /homeassistant/components/tag/ @balloob @dmulcahey
 /tests/components/tag/ @balloob @dmulcahey
 /homeassistant/components/tailscale/ @frenck
@@ -1220,6 +1253,8 @@ build.json @home-assistant/supervisor
 /tests/components/tile/ @bachya
 /homeassistant/components/tilt_ble/ @apt-itude
 /tests/components/tilt_ble/ @apt-itude
+/homeassistant/components/time/ @home-assistant/core
+/tests/components/time/ @home-assistant/core
 /homeassistant/components/time_date/ @fabaff
 /tests/components/time_date/ @fabaff
 /homeassistant/components/tmb/ @alemuro
@@ -1249,8 +1284,8 @@ build.json @home-assistant/supervisor
 /tests/components/trafikverket_weatherstation/ @endor-force @gjohansson-ST
 /homeassistant/components/transmission/ @engrbm87 @JPHutchins
 /tests/components/transmission/ @engrbm87 @JPHutchins
-/homeassistant/components/tts/ @pvizeli
-/tests/components/tts/ @pvizeli
+/homeassistant/components/tts/ @home-assistant/core @pvizeli
+/tests/components/tts/ @home-assistant/core @pvizeli
 /homeassistant/components/tuya/ @Tuya @zlinoliver @frenck
 /tests/components/tuya/ @Tuya @zlinoliver @frenck
 /homeassistant/components/twentemilieu/ @frenck
@@ -1262,8 +1297,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/unifi/ @Kane610
 /tests/components/unifi/ @Kane610
 /homeassistant/components/unifiled/ @florisvdk
-/homeassistant/components/unifiprotect/ @briis @AngellusMortis @bdraco
-/tests/components/unifiprotect/ @briis @AngellusMortis @bdraco
+/homeassistant/components/unifiprotect/ @AngellusMortis @bdraco
+/tests/components/unifiprotect/ @AngellusMortis @bdraco
 /homeassistant/components/upb/ @gwww
 /tests/components/upb/ @gwww
 /homeassistant/components/upc_connect/ @pvizeli @fabaff
@@ -1299,8 +1334,6 @@ build.json @home-assistant/supervisor
 /tests/components/version/ @ludeeus
 /homeassistant/components/vesync/ @markperdue @webdjoe @thegardenmonkey
 /tests/components/vesync/ @markperdue @webdjoe @thegardenmonkey
-/homeassistant/components/vicare/ @oischinger
-/tests/components/vicare/ @oischinger
 /homeassistant/components/vilfo/ @ManneW
 /tests/components/vilfo/ @ManneW
 /homeassistant/components/vivotek/ @HarlemSquirrel
@@ -1308,8 +1341,8 @@ build.json @home-assistant/supervisor
 /tests/components/vizio/ @raman325
 /homeassistant/components/vlc_telnet/ @rodripf @MartinHjelmare
 /tests/components/vlc_telnet/ @rodripf @MartinHjelmare
-/homeassistant/components/voice_assistant/ @balloob @synesthesiam
-/tests/components/voice_assistant/ @balloob @synesthesiam
+/homeassistant/components/voip/ @balloob @synesthesiam
+/tests/components/voip/ @balloob @synesthesiam
 /homeassistant/components/volumio/ @OnFreund
 /tests/components/volumio/ @OnFreund
 /homeassistant/components/volvooncall/ @molobrakos
@@ -1361,9 +1394,10 @@ build.json @home-assistant/supervisor
 /tests/components/worldclock/ @fabaff
 /homeassistant/components/ws66i/ @ssaenger
 /tests/components/ws66i/ @ssaenger
+/homeassistant/components/wyoming/ @balloob @synesthesiam
+/tests/components/wyoming/ @balloob @synesthesiam
 /homeassistant/components/xbox/ @hunterjm
 /tests/components/xbox/ @hunterjm
-/homeassistant/components/xbox_live/ @MartinHjelmare
 /homeassistant/components/xiaomi_aqara/ @danielhiversen @syssi
 /tests/components/xiaomi_aqara/ @danielhiversen @syssi
 /homeassistant/components/xiaomi_ble/ @Jc2k @Ernst79
@@ -1388,6 +1422,8 @@ build.json @home-assistant/supervisor
 /tests/components/yolink/ @matrixd2
 /homeassistant/components/youless/ @gjong
 /tests/components/youless/ @gjong
+/homeassistant/components/youtube/ @joostlek
+/tests/components/youtube/ @joostlek
 /homeassistant/components/zamg/ @killer0071234
 /tests/components/zamg/ @killer0071234
 /homeassistant/components/zengge/ @emontnemery

CODE_OF_CONDUCT.md

@@ -132,8 +132,8 @@ For answers to common questions about this code of conduct, see the FAQ at
 <https://www.contributor-covenant.org/faq>. Translations are available at
 <https://www.contributor-covenant.org/translations>.
 
-[coc-blog]: /blog/2017/01/21/home-assistant-governance/
-[coc2-blog]: /blog/2020/05/25/code-of-conduct-updated/
+[coc-blog]: https://www.home-assistant.io/blog/2017/01/21/home-assistant-governance/
+[coc2-blog]: https://www.home-assistant.io/blog/2020/05/25/code-of-conduct-updated/
 [email]: mailto:safety@home-assistant.io
 [homepage]: http://contributor-covenant.org
 [mozilla]: https://github.com/mozilla/diversity

Dockerfile

@@ -18,7 +18,6 @@ RUN \
         --no-index \
         --only-binary=:all: \
         --find-links "${WHEELS_LINKS}" \
-        --use-deprecated=legacy-resolver \
         -r homeassistant/requirements.txt
 
 COPY requirements_all.txt home_assistant_frontend-* home_assistant_intents-* homeassistant/
@@ -43,7 +42,6 @@ RUN \
             --no-index \
             --only-binary=:all: \
             --find-links "${WHEELS_LINKS}" \
-            --use-deprecated=legacy-resolver \
             -r homeassistant/requirements_all.txt
 
 ## Setup Home Assistant Core
@@ -54,7 +52,6 @@ RUN \
         --no-index \
         --only-binary=:all: \
         --find-links "${WHEELS_LINKS}" \
-        --use-deprecated=legacy-resolver \
         -e ./homeassistant \
     && python3 -m compileall \
         homeassistant/homeassistant

Dockerfile.dev

@@ -4,11 +4,12 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 # Uninstall pre-installed formatting and linting tools
 # They would conflict with our pinned versions
-RUN pipx uninstall black
-RUN pipx uninstall pydocstyle
-RUN pipx uninstall pycodestyle
-RUN pipx uninstall mypy
-RUN pipx uninstall pylint
+RUN \
+    pipx uninstall black \
+    && pipx uninstall pydocstyle \
+    && pipx uninstall pycodestyle \
+    && pipx uninstall mypy \
+    && pipx uninstall pylint
 
 RUN \
     curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
@@ -44,9 +45,9 @@ WORKDIR /workspaces
 # Install Python dependencies from requirements
 COPY requirements.txt ./
 COPY homeassistant/package_constraints.txt homeassistant/package_constraints.txt
-RUN pip3 install -r requirements.txt --use-deprecated=legacy-resolver
+RUN pip3 install -r requirements.txt
 COPY requirements_test.txt requirements_test_pre_commit.txt ./
-RUN pip3 install -r requirements_test.txt --use-deprecated=legacy-resolver
+RUN pip3 install -r requirements_test.txt
 RUN rm -rf requirements.txt requirements_test.txt requirements_test_pre_commit.txt homeassistant/
 
 # Set the default shell to bash instead of sh

build.yaml

@@ -1,11 +1,11 @@
 image: homeassistant/{arch}-homeassistant
 shadow_repository: ghcr.io/home-assistant
 build_from:
-  aarch64: ghcr.io/home-assistant/aarch64-homeassistant-base:2023.02.0
-  armhf: ghcr.io/home-assistant/armhf-homeassistant-base:2023.02.0
-  armv7: ghcr.io/home-assistant/armv7-homeassistant-base:2023.02.0
-  amd64: ghcr.io/home-assistant/amd64-homeassistant-base:2023.02.0
-  i386: ghcr.io/home-assistant/i386-homeassistant-base:2023.02.0
+  aarch64: ghcr.io/home-assistant/aarch64-homeassistant-base:2023.06.0
+  armhf: ghcr.io/home-assistant/armhf-homeassistant-base:2023.06.0
+  armv7: ghcr.io/home-assistant/armv7-homeassistant-base:2023.06.0
+  amd64: ghcr.io/home-assistant/amd64-homeassistant-base:2023.06.0
+  i386: ghcr.io/home-assistant/i386-homeassistant-base:2023.06.0
 codenotary:
   signer: notary@home-assistant.io
   base_image: notary@home-assistant.io

homeassistant/auth/jwt_wrapper.py

@@ -93,7 +93,7 @@ class _PyJWTWithVerify(PyJWT):
         # nothing slips through.
         assert "exp" in payload, "exp claim is required"
         assert "iat" in payload, "iat claim is required"
-        self._validate_claims(  # type: ignore[no-untyped-call]
+        self._validate_claims(
             payload=payload,
             options=merged_options,
             issuer=issuer,
@@ -102,7 +102,7 @@ class _PyJWTWithVerify(PyJWT):
         return payload
 
 
-_jwt = _PyJWTWithVerify()  # type: ignore[no-untyped-call]
+_jwt = _PyJWTWithVerify()
 verify_and_decode = _jwt.verify_and_decode
 unverified_hs256_token_decode = lru_cache(maxsize=JWT_TOKEN_CACHE_SIZE)(
     partial(

homeassistant/auth/providers/trusted_networks.py

@@ -46,7 +46,7 @@ CONFIG_SCHEMA = AUTH_PROVIDER_SCHEMA.extend(
                     [
                         vol.Or(
                             cv.uuid4_hex,
-                            vol.Schema({vol.Required(CONF_GROUP): cv.uuid4_hex}),
+                            vol.Schema({vol.Required(CONF_GROUP): str}),
                         )
                     ],
                 )

homeassistant/bootstrap.py

@@ -19,6 +19,7 @@ import yarl
 from . import config as conf_util, config_entries, core, loader
 from .components import http
 from .const import (
+    FORMAT_DATETIME,
     REQUIRED_NEXT_PYTHON_HA_RELEASE,
     REQUIRED_NEXT_PYTHON_VER,
     SIGNAL_BOOTSTRAP_INTEGRATIONS,
@@ -31,6 +32,7 @@ from .helpers import (
     entity_registry,
     issue_registry,
     recorder,
+    restore_state,
     template,
 )
 from .helpers.dispatcher import async_dispatcher_send
@@ -247,6 +249,7 @@ async def load_registries(hass: core.HomeAssistant) -> None:
         issue_registry.async_load(hass),
         hass.async_add_executor_job(_cache_uname_processor),
         template.async_load_custom_templates(hass),
+        restore_state.async_load(hass),
     )
 
 
@@ -347,7 +350,6 @@ def async_enable_logging(
     fmt = (
         "%(asctime)s.%(msecs)03d %(levelname)s (%(threadName)s) [%(name)s] %(message)s"
     )
-    datefmt = "%Y-%m-%d %H:%M:%S"
 
     if not log_no_color:
         try:
@@ -362,7 +364,7 @@ def async_enable_logging(
             logging.getLogger().handlers[0].setFormatter(
                 ColoredFormatter(
                     colorfmt,
-                    datefmt=datefmt,
+                    datefmt=FORMAT_DATETIME,
                     reset=True,
                     log_colors={
                         "DEBUG": "cyan",
@@ -378,12 +380,18 @@ def async_enable_logging(
 
     # If the above initialization failed for any reason, setup the default
     # formatting.  If the above succeeds, this will result in a no-op.
-    logging.basicConfig(format=fmt, datefmt=datefmt, level=logging.INFO)
+    logging.basicConfig(format=fmt, datefmt=FORMAT_DATETIME, level=logging.INFO)
+
+    # Capture warnings.warn(...) and friends messages in logs.
+    # The standard destination for them is stderr, which may end up unnoticed.
+    # This way they're where other messages are, and can be filtered as usual.
+    logging.captureWarnings(True)
 
     # Suppress overly verbose logs from libraries that aren't helpful
     logging.getLogger("requests").setLevel(logging.WARNING)
     logging.getLogger("urllib3").setLevel(logging.WARNING)
     logging.getLogger("aiohttp.access").setLevel(logging.WARNING)
+    logging.getLogger("httpx").setLevel(logging.WARNING)
 
     sys.excepthook = lambda *args: logging.getLogger(None).exception(
         "Uncaught exception", exc_info=args  # type: ignore[arg-type]
@@ -430,7 +438,7 @@ def async_enable_logging(
             _LOGGER.error("Error rolling over log file: %s", err)
 
         err_handler.setLevel(logging.INFO if verbose else logging.WARNING)
-        err_handler.setFormatter(logging.Formatter(fmt, datefmt=datefmt))
+        err_handler.setFormatter(logging.Formatter(fmt, datefmt=FORMAT_DATETIME))
 
         logger = logging.getLogger("")
         logger.addHandler(err_handler)
@@ -629,6 +637,9 @@ async def _async_set_up_integrations(
         - stage_1_domains
     )
 
+    # 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)
@@ -640,7 +651,7 @@ async def _async_set_up_integrations(
         except asyncio.TimeoutError:
             _LOGGER.warning("Setup timed out for stage 1 - moving forward")
 
-    # Enables after dependencies
+    # Add after dependencies when setting up stage 2 domains
     async_set_domains_to_be_loaded(hass, stage_2_domains)
 
     if stage_2_domains:

homeassistant/brands/airzone.json

@@ -0,0 +1,5 @@
+{
+  "domain": "airzone",
+  "name": "Airzone",
+  "integrations": ["airzone", "airzone_cloud"]
+}

homeassistant/brands/google.json

@@ -6,6 +6,7 @@
     "google_assistant_sdk",
     "google_cloud",
     "google_domains",
+    "google_generative_ai_conversation",
     "google_mail",
     "google_maps",
     "google_pubsub",
@@ -16,6 +17,7 @@
     "google",
     "nest",
     "cast",
-    "dialogflow"
+    "dialogflow",
+    "youtube"
   ]
 }

homeassistant/brands/microsoft.json

@@ -10,7 +10,6 @@
     "microsoft_face",
     "microsoft",
     "msteams",
-    "xbox",
-    "xbox_live"
+    "xbox"
   ]
 }

homeassistant/brands/yale.json

@@ -1,5 +1,5 @@
 {
   "domain": "yale",
   "name": "Yale",
-  "integrations": ["august", "yale_smart_alarm", "yalexs_ble"]
+  "integrations": ["august", "yale_smart_alarm", "yalexs_ble", "yale_home"]
 }

homeassistant/components/abode/sensor.py

@@ -12,6 +12,7 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
 )
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import LIGHT_LUX
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
@@ -71,7 +72,7 @@ class AbodeSensor(AbodeDevice, SensorEntity):
         elif description.key == CONST.HUMI_STATUS_KEY:
             self._attr_native_unit_of_measurement = device.humidity_unit
         elif description.key == CONST.LUX_STATUS_KEY:
-            self._attr_native_unit_of_measurement = device.lux_unit
+            self._attr_native_unit_of_measurement = LIGHT_LUX
 
     @property
     def native_value(self) -> float | None:

homeassistant/components/accuweather/__init__.py

@@ -10,14 +10,15 @@ from aiohttp import ClientSession
 from aiohttp.client_exceptions import ClientConnectorError
 from async_timeout import timeout
 
+from homeassistant.components.sensor import DOMAIN as SENSOR_PLATFORM
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_API_KEY, CONF_NAME, Platform
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.device_registry import DeviceEntryType
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-from homeassistant.util.unit_system import METRIC_SYSTEM
 
 from .const import ATTR_FORECAST, CONF_FORECAST, DOMAIN, MANUFACTURER
 
@@ -49,6 +50,14 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
+    # Remove ozone sensors from registry if they exist
+    ent_reg = er.async_get(hass)
+    for day in range(0, 5):
+        unique_id = f"{coordinator.location_key}-ozone-{day}"
+        if entity_id := ent_reg.async_get_entity_id(SENSOR_PLATFORM, DOMAIN, unique_id):
+            _LOGGER.debug("Removing ozone sensor entity %s", entity_id)
+            ent_reg.async_remove(entity_id)
+
     return True
 
 
@@ -112,16 +121,12 @@ class AccuWeatherDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
 
     async def _async_update_data(self) -> dict[str, Any]:
         """Update data via library."""
+        forecast: list[dict[str, Any]] = []
         try:
             async with timeout(10):
                 current = await self.accuweather.async_get_current_conditions()
-                forecast = (
-                    await self.accuweather.async_get_forecast(
-                        metric=self.hass.config.units is METRIC_SYSTEM
-                    )
-                    if self.forecast
-                    else {}
-                )
+                if self.forecast:
+                    forecast = await self.accuweather.async_get_daily_forecast()
         except (
             ApiError,
             ClientConnectorError,

homeassistant/components/accuweather/const.py

@@ -20,7 +20,6 @@ from homeassistant.components.weather import (
     ATTR_CONDITION_WINDY,
 )
 
-API_IMPERIAL: Final = "Imperial"
 API_METRIC: Final = "Metric"
 ATTRIBUTION: Final = "Data provided by AccuWeather"
 ATTR_CATEGORY: Final = "Category"

homeassistant/components/accuweather/manifest.json

@@ -8,5 +8,5 @@
   "iot_class": "cloud_polling",
   "loggers": ["accuweather"],
   "quality_scale": "platinum",
-  "requirements": ["accuweather==0.5.0"]
+  "requirements": ["accuweather==1.0.0"]
 }

homeassistant/components/accuweather/sensor.py

@@ -16,6 +16,7 @@ from homeassistant.const import (
     CONCENTRATION_PARTS_PER_CUBIC_METER,
     PERCENTAGE,
     UV_INDEX,
+    UnitOfIrradiance,
     UnitOfLength,
     UnitOfSpeed,
     UnitOfTemperature,
@@ -26,11 +27,9 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
-from homeassistant.util.unit_system import METRIC_SYSTEM
 
 from . import AccuWeatherDataUpdateCoordinator
 from .const import (
-    API_IMPERIAL,
     API_METRIC,
     ATTR_CATEGORY,
     ATTR_DIRECTION,
@@ -51,7 +50,7 @@ PARALLEL_UPDATES = 1
 class AccuWeatherSensorDescriptionMixin:
     """Mixin for AccuWeather sensor."""
 
-    value_fn: Callable[[dict[str, Any], str], StateType]
+    value_fn: Callable[[dict[str, Any]], StateType]
 
 
 @dataclass
@@ -61,18 +60,25 @@ class AccuWeatherSensorDescription(
     """Class describing AccuWeather sensor entities."""
 
     attr_fn: Callable[[dict[str, Any]], dict[str, StateType]] = lambda _: {}
-    metric_unit: str | None = None
-    us_customary_unit: str | None = None
 
 
 FORECAST_SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
+    AccuWeatherSensorDescription(
+        key="AirQuality",
+        icon="mdi:air-filter",
+        name="Air quality",
+        value_fn=lambda data: cast(str, data[ATTR_CATEGORY]),
+        device_class=SensorDeviceClass.ENUM,
+        options=["good", "hazardous", "high", "low", "moderate", "unhealthy"],
+        translation_key="air_quality",
+    ),
     AccuWeatherSensorDescription(
         key="CloudCoverDay",
         icon="mdi:weather-cloudy",
         name="Cloud cover day",
         entity_registry_enabled_default=False,
         native_unit_of_measurement=PERCENTAGE,
-        value_fn=lambda data, _: cast(int, data),
+        value_fn=lambda data: cast(int, data),
     ),
     AccuWeatherSensorDescription(
         key="CloudCoverNight",
@@ -80,7 +86,7 @@ FORECAST_SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
         name="Cloud cover night",
         entity_registry_enabled_default=False,
         native_unit_of_measurement=PERCENTAGE,
-        value_fn=lambda data, _: cast(int, data),
+        value_fn=lambda data: cast(int, data),
     ),
     AccuWeatherSensorDescription(
         key="Grass",
@@ -88,15 +94,26 @@ FORECAST_SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
         name="Grass pollen",
         entity_registry_enabled_default=False,
         native_unit_of_measurement=CONCENTRATION_PARTS_PER_CUBIC_METER,
-        value_fn=lambda data, _: cast(int, data[ATTR_VALUE]),
+        value_fn=lambda data: cast(int, data[ATTR_VALUE]),
         attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
+        translation_key="grass_pollen",
     ),
     AccuWeatherSensorDescription(
         key="HoursOfSun",
         icon="mdi:weather-partly-cloudy",
         name="Hours of sun",
         native_unit_of_measurement=UnitOfTime.HOURS,
-        value_fn=lambda data, _: cast(float, data),
+        value_fn=lambda data: cast(float, data),
+    ),
+    AccuWeatherSensorDescription(
+        key="LongPhraseDay",
+        name="Condition day",
+        value_fn=lambda data: cast(str, data),
+    ),
+    AccuWeatherSensorDescription(
+        key="LongPhraseNight",
+        name="Condition night",
+        value_fn=lambda data: cast(str, data),
     ),
     AccuWeatherSensorDescription(
         key="Mold",
@@ -104,16 +121,9 @@ FORECAST_SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
         name="Mold pollen",
         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]},
-    ),
-    AccuWeatherSensorDescription(
-        key="Ozone",
-        icon="mdi:vector-triangle",
-        name="Ozone",
-        entity_registry_enabled_default=False,
-        value_fn=lambda data, _: cast(int, data[ATTR_VALUE]),
+        value_fn=lambda data: cast(int, data[ATTR_VALUE]),
         attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
+        translation_key="mold_pollen",
     ),
     AccuWeatherSensorDescription(
         key="Ragweed",
@@ -121,56 +131,69 @@ FORECAST_SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
         name="Ragweed pollen",
         native_unit_of_measurement=CONCENTRATION_PARTS_PER_CUBIC_METER,
         entity_registry_enabled_default=False,
-        value_fn=lambda data, _: cast(int, data[ATTR_VALUE]),
+        value_fn=lambda data: cast(int, data[ATTR_VALUE]),
         attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
+        translation_key="ragweed_pollen",
     ),
     AccuWeatherSensorDescription(
         key="RealFeelTemperatureMax",
         device_class=SensorDeviceClass.TEMPERATURE,
         name="RealFeel temperature max",
-        metric_unit=UnitOfTemperature.CELSIUS,
-        us_customary_unit=UnitOfTemperature.FAHRENHEIT,
-        value_fn=lambda data, _: cast(float, data[ATTR_VALUE]),
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        value_fn=lambda data: cast(float, data[ATTR_VALUE]),
     ),
     AccuWeatherSensorDescription(
         key="RealFeelTemperatureMin",
         device_class=SensorDeviceClass.TEMPERATURE,
         name="RealFeel temperature min",
-        metric_unit=UnitOfTemperature.CELSIUS,
-        us_customary_unit=UnitOfTemperature.FAHRENHEIT,
-        value_fn=lambda data, _: cast(float, data[ATTR_VALUE]),
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        value_fn=lambda data: cast(float, data[ATTR_VALUE]),
     ),
     AccuWeatherSensorDescription(
         key="RealFeelTemperatureShadeMax",
         device_class=SensorDeviceClass.TEMPERATURE,
         name="RealFeel temperature shade max",
         entity_registry_enabled_default=False,
-        metric_unit=UnitOfTemperature.CELSIUS,
-        us_customary_unit=UnitOfTemperature.FAHRENHEIT,
-        value_fn=lambda data, _: cast(float, data[ATTR_VALUE]),
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        value_fn=lambda data: cast(float, data[ATTR_VALUE]),
     ),
     AccuWeatherSensorDescription(
         key="RealFeelTemperatureShadeMin",
         device_class=SensorDeviceClass.TEMPERATURE,
         name="RealFeel temperature shade min",
         entity_registry_enabled_default=False,
-        metric_unit=UnitOfTemperature.CELSIUS,
-        us_customary_unit=UnitOfTemperature.FAHRENHEIT,
-        value_fn=lambda data, _: cast(float, data[ATTR_VALUE]),
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        value_fn=lambda data: cast(float, data[ATTR_VALUE]),
+    ),
+    AccuWeatherSensorDescription(
+        key="SolarIrradianceDay",
+        icon="mdi:weather-sunny",
+        name="Solar irradiance day",
+        entity_registry_enabled_default=False,
+        native_unit_of_measurement=UnitOfIrradiance.WATTS_PER_SQUARE_METER,
+        value_fn=lambda data: cast(float, data[ATTR_VALUE]),
+    ),
+    AccuWeatherSensorDescription(
+        key="SolarIrradianceNight",
+        icon="mdi:weather-sunny",
+        name="Solar irradiance night",
+        entity_registry_enabled_default=False,
+        native_unit_of_measurement=UnitOfIrradiance.WATTS_PER_SQUARE_METER,
+        value_fn=lambda data: cast(float, data[ATTR_VALUE]),
     ),
     AccuWeatherSensorDescription(
         key="ThunderstormProbabilityDay",
         icon="mdi:weather-lightning",
         name="Thunderstorm probability day",
         native_unit_of_measurement=PERCENTAGE,
-        value_fn=lambda data, _: cast(int, data),
+        value_fn=lambda data: cast(int, data),
     ),
     AccuWeatherSensorDescription(
         key="ThunderstormProbabilityNight",
         icon="mdi:weather-lightning",
         name="Thunderstorm probability night",
         native_unit_of_measurement=PERCENTAGE,
-        value_fn=lambda data, _: cast(int, data),
+        value_fn=lambda data: cast(int, data),
     ),
     AccuWeatherSensorDescription(
         key="Tree",
@@ -178,25 +201,26 @@ FORECAST_SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
         name="Tree pollen",
         native_unit_of_measurement=CONCENTRATION_PARTS_PER_CUBIC_METER,
         entity_registry_enabled_default=False,
-        value_fn=lambda data, _: cast(int, data[ATTR_VALUE]),
+        value_fn=lambda data: cast(int, data[ATTR_VALUE]),
         attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
+        translation_key="tree_pollen",
     ),
     AccuWeatherSensorDescription(
         key="UVIndex",
         icon="mdi:weather-sunny",
         name="UV index",
         native_unit_of_measurement=UV_INDEX,
-        value_fn=lambda data, _: cast(int, data[ATTR_VALUE]),
+        value_fn=lambda data: cast(int, data[ATTR_VALUE]),
         attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
+        translation_key="uv_index",
     ),
     AccuWeatherSensorDescription(
         key="WindGustDay",
         device_class=SensorDeviceClass.WIND_SPEED,
         name="Wind gust day",
         entity_registry_enabled_default=False,
-        metric_unit=UnitOfSpeed.KILOMETERS_PER_HOUR,
-        us_customary_unit=UnitOfSpeed.MILES_PER_HOUR,
-        value_fn=lambda data, _: cast(float, data[ATTR_SPEED][ATTR_VALUE]),
+        native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
+        value_fn=lambda data: cast(float, data[ATTR_SPEED][ATTR_VALUE]),
         attr_fn=lambda data: {"direction": data[ATTR_DIRECTION][ATTR_ENGLISH]},
     ),
     AccuWeatherSensorDescription(
@@ -204,27 +228,24 @@ FORECAST_SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
         device_class=SensorDeviceClass.WIND_SPEED,
         name="Wind gust night",
         entity_registry_enabled_default=False,
-        metric_unit=UnitOfSpeed.KILOMETERS_PER_HOUR,
-        us_customary_unit=UnitOfSpeed.MILES_PER_HOUR,
-        value_fn=lambda data, _: cast(float, data[ATTR_SPEED][ATTR_VALUE]),
+        native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
+        value_fn=lambda data: cast(float, data[ATTR_SPEED][ATTR_VALUE]),
         attr_fn=lambda data: {"direction": data[ATTR_DIRECTION][ATTR_ENGLISH]},
     ),
     AccuWeatherSensorDescription(
         key="WindDay",
         device_class=SensorDeviceClass.WIND_SPEED,
         name="Wind day",
-        metric_unit=UnitOfSpeed.KILOMETERS_PER_HOUR,
-        us_customary_unit=UnitOfSpeed.MILES_PER_HOUR,
-        value_fn=lambda data, _: cast(float, data[ATTR_SPEED][ATTR_VALUE]),
+        native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
+        value_fn=lambda data: cast(float, data[ATTR_SPEED][ATTR_VALUE]),
         attr_fn=lambda data: {"direction": data[ATTR_DIRECTION][ATTR_ENGLISH]},
     ),
     AccuWeatherSensorDescription(
         key="WindNight",
         device_class=SensorDeviceClass.WIND_SPEED,
         name="Wind night",
-        metric_unit=UnitOfSpeed.KILOMETERS_PER_HOUR,
-        us_customary_unit=UnitOfSpeed.MILES_PER_HOUR,
-        value_fn=lambda data, _: cast(float, data[ATTR_SPEED][ATTR_VALUE]),
+        native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
+        value_fn=lambda data: cast(float, data[ATTR_SPEED][ATTR_VALUE]),
         attr_fn=lambda data: {"direction": data[ATTR_DIRECTION][ATTR_ENGLISH]},
     ),
 )
@@ -236,9 +257,8 @@ SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
         name="Apparent temperature",
         entity_registry_enabled_default=False,
         state_class=SensorStateClass.MEASUREMENT,
-        metric_unit=UnitOfTemperature.CELSIUS,
-        us_customary_unit=UnitOfTemperature.FAHRENHEIT,
-        value_fn=lambda data, unit: cast(float, data[unit][ATTR_VALUE]),
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        value_fn=lambda data: cast(float, data[API_METRIC][ATTR_VALUE]),
     ),
     AccuWeatherSensorDescription(
         key="Ceiling",
@@ -246,9 +266,8 @@ SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
         icon="mdi:weather-fog",
         name="Cloud ceiling",
         state_class=SensorStateClass.MEASUREMENT,
-        metric_unit=UnitOfLength.METERS,
-        us_customary_unit=UnitOfLength.FEET,
-        value_fn=lambda data, unit: cast(float, data[unit][ATTR_VALUE]),
+        native_unit_of_measurement=UnitOfLength.METERS,
+        value_fn=lambda data: cast(float, data[API_METRIC][ATTR_VALUE]),
         suggested_display_precision=0,
     ),
     AccuWeatherSensorDescription(
@@ -258,7 +277,7 @@ SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
         entity_registry_enabled_default=False,
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=PERCENTAGE,
-        value_fn=lambda data, _: cast(int, data),
+        value_fn=lambda data: cast(int, data),
     ),
     AccuWeatherSensorDescription(
         key="DewPoint",
@@ -266,18 +285,16 @@ SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
         name="Dew point",
         entity_registry_enabled_default=False,
         state_class=SensorStateClass.MEASUREMENT,
-        metric_unit=UnitOfTemperature.CELSIUS,
-        us_customary_unit=UnitOfTemperature.FAHRENHEIT,
-        value_fn=lambda data, unit: cast(float, data[unit][ATTR_VALUE]),
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        value_fn=lambda data: cast(float, data[API_METRIC][ATTR_VALUE]),
     ),
     AccuWeatherSensorDescription(
         key="RealFeelTemperature",
         device_class=SensorDeviceClass.TEMPERATURE,
         name="RealFeel temperature",
         state_class=SensorStateClass.MEASUREMENT,
-        metric_unit=UnitOfTemperature.CELSIUS,
-        us_customary_unit=UnitOfTemperature.FAHRENHEIT,
-        value_fn=lambda data, unit: cast(float, data[unit][ATTR_VALUE]),
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        value_fn=lambda data: cast(float, data[API_METRIC][ATTR_VALUE]),
     ),
     AccuWeatherSensorDescription(
         key="RealFeelTemperatureShade",
@@ -285,18 +302,16 @@ SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
         name="RealFeel temperature shade",
         entity_registry_enabled_default=False,
         state_class=SensorStateClass.MEASUREMENT,
-        metric_unit=UnitOfTemperature.CELSIUS,
-        us_customary_unit=UnitOfTemperature.FAHRENHEIT,
-        value_fn=lambda data, unit: cast(float, data[unit][ATTR_VALUE]),
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        value_fn=lambda data: cast(float, data[API_METRIC][ATTR_VALUE]),
     ),
     AccuWeatherSensorDescription(
         key="Precipitation",
         device_class=SensorDeviceClass.PRECIPITATION_INTENSITY,
         name="Precipitation",
         state_class=SensorStateClass.MEASUREMENT,
-        metric_unit=UnitOfVolumetricFlux.MILLIMETERS_PER_HOUR,
-        us_customary_unit=UnitOfVolumetricFlux.INCHES_PER_HOUR,
-        value_fn=lambda data, unit: cast(float, data[unit][ATTR_VALUE]),
+        native_unit_of_measurement=UnitOfVolumetricFlux.MILLIMETERS_PER_HOUR,
+        value_fn=lambda data: cast(float, data[API_METRIC][ATTR_VALUE]),
         attr_fn=lambda data: {"type": data["PrecipitationType"]},
     ),
     AccuWeatherSensorDescription(
@@ -306,7 +321,7 @@ SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
         name="Pressure tendency",
         options=["falling", "rising", "steady"],
         translation_key="pressure_tendency",
-        value_fn=lambda data, _: cast(str, data["LocalizedText"]).lower(),
+        value_fn=lambda data: cast(str, data["LocalizedText"]).lower(),
     ),
     AccuWeatherSensorDescription(
         key="UVIndex",
@@ -314,7 +329,7 @@ SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
         name="UV index",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UV_INDEX,
-        value_fn=lambda data, _: cast(int, data),
+        value_fn=lambda data: cast(int, data),
         attr_fn=lambda data: {ATTR_LEVEL: data["UVIndexText"]},
     ),
     AccuWeatherSensorDescription(
@@ -323,9 +338,8 @@ SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
         name="Wet bulb temperature",
         entity_registry_enabled_default=False,
         state_class=SensorStateClass.MEASUREMENT,
-        metric_unit=UnitOfTemperature.CELSIUS,
-        us_customary_unit=UnitOfTemperature.FAHRENHEIT,
-        value_fn=lambda data, unit: cast(float, data[unit][ATTR_VALUE]),
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        value_fn=lambda data: cast(float, data[API_METRIC][ATTR_VALUE]),
     ),
     AccuWeatherSensorDescription(
         key="WindChillTemperature",
@@ -333,18 +347,16 @@ SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
         name="Wind chill temperature",
         entity_registry_enabled_default=False,
         state_class=SensorStateClass.MEASUREMENT,
-        metric_unit=UnitOfTemperature.CELSIUS,
-        us_customary_unit=UnitOfTemperature.FAHRENHEIT,
-        value_fn=lambda data, unit: cast(float, data[unit][ATTR_VALUE]),
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        value_fn=lambda data: cast(float, data[API_METRIC][ATTR_VALUE]),
     ),
     AccuWeatherSensorDescription(
         key="Wind",
         device_class=SensorDeviceClass.WIND_SPEED,
         name="Wind",
         state_class=SensorStateClass.MEASUREMENT,
-        metric_unit=UnitOfSpeed.KILOMETERS_PER_HOUR,
-        us_customary_unit=UnitOfSpeed.MILES_PER_HOUR,
-        value_fn=lambda data, unit: cast(float, data[ATTR_SPEED][unit][ATTR_VALUE]),
+        native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
+        value_fn=lambda data: cast(float, data[ATTR_SPEED][API_METRIC][ATTR_VALUE]),
     ),
     AccuWeatherSensorDescription(
         key="WindGust",
@@ -352,9 +364,8 @@ SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
         name="Wind gust",
         entity_registry_enabled_default=False,
         state_class=SensorStateClass.MEASUREMENT,
-        metric_unit=UnitOfSpeed.KILOMETERS_PER_HOUR,
-        us_customary_unit=UnitOfSpeed.MILES_PER_HOUR,
-        value_fn=lambda data, unit: cast(float, data[ATTR_SPEED][unit][ATTR_VALUE]),
+        native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
+        value_fn=lambda data: cast(float, data[ATTR_SPEED][API_METRIC][ATTR_VALUE]),
     ),
 )
 
@@ -374,7 +385,7 @@ async def async_setup_entry(
         # Some air quality/allergy sensors are only available for certain
         # locations.
         sensors.extend(
-            AccuWeatherForecastSensor(coordinator, description, forecast_day=day)
+            AccuWeatherSensor(coordinator, description, forecast_day=day)
             for day in range(MAX_FORECAST_DAYS + 1)
             for description in FORECAST_SENSOR_TYPES
             if description.key in coordinator.data[ATTR_FORECAST][0]
@@ -413,34 +424,27 @@ class AccuWeatherSensor(
             self._attr_unique_id = (
                 f"{coordinator.location_key}-{description.key}".lower()
             )
-        self._attr_native_unit_of_measurement = description.native_unit_of_measurement
-        if self.coordinator.hass.config.units is METRIC_SYSTEM:
-            self._unit_system = API_METRIC
-            if metric_unit := description.metric_unit:
-                self._attr_native_unit_of_measurement = metric_unit
-        else:
-            self._unit_system = API_IMPERIAL
-            if us_customary_unit := description.us_customary_unit:
-                self._attr_native_unit_of_measurement = us_customary_unit
         self._attr_device_info = coordinator.device_info
-        if forecast_day is not None:
-            self.forecast_day = forecast_day
+        self.forecast_day = forecast_day
 
     @property
     def native_value(self) -> StateType:
         """Return the state."""
-        return self.entity_description.value_fn(self._sensor_data, self._unit_system)
+        return self.entity_description.value_fn(self._sensor_data)
 
     @property
     def extra_state_attributes(self) -> dict[str, Any]:
         """Return the state attributes."""
+        if self.forecast_day is not None:
+            return self.entity_description.attr_fn(self._sensor_data)
+
         return self.entity_description.attr_fn(self.coordinator.data)
 
     @callback
     def _handle_coordinator_update(self) -> None:
         """Handle data update."""
         self._sensor_data = _get_sensor_data(
-            self.coordinator.data, self.entity_description.key
+            self.coordinator.data, self.entity_description.key, self.forecast_day
         )
         self.async_write_ha_state()
 
@@ -458,20 +462,3 @@ def _get_sensor_data(
         return sensors["PrecipitationSummary"]["PastHour"]
 
     return sensors[kind]
-
-
-class AccuWeatherForecastSensor(AccuWeatherSensor):
-    """Define an AccuWeather forecast entity."""
-
-    @property
-    def extra_state_attributes(self) -> dict[str, Any]:
-        """Return the state attributes."""
-        return self.entity_description.attr_fn(self._sensor_data)
-
-    @callback
-    def _handle_coordinator_update(self) -> None:
-        """Handle data update."""
-        self._sensor_data = _get_sensor_data(
-            self.coordinator.data, self.entity_description.key, self.forecast_day
-        )
-        self.async_write_ha_state()

homeassistant/components/accuweather/strings.json

@@ -30,6 +30,91 @@
           "rising": "Rising",
           "falling": "Falling"
         }
+      },
+      "air_quality": {
+        "state": {
+          "good": "Good",
+          "hazardous": "Hazardous",
+          "high": "High",
+          "low": "Low",
+          "moderate": "Moderate",
+          "unhealthy": "Unhealthy"
+        }
+      },
+      "grass_pollen": {
+        "state_attributes": {
+          "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%]"
+            }
+          }
+        }
+      },
+      "mold_pollen": {
+        "state_attributes": {
+          "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%]"
+            }
+          }
+        }
+      },
+      "ragweed_pollen": {
+        "state_attributes": {
+          "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%]"
+            }
+          }
+        }
+      },
+      "tree_pollen": {
+        "state_attributes": {
+          "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%]"
+            }
+          }
+        }
+      },
+      "uv_index": {
+        "state_attributes": {
+          "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%]"
+            }
+          }
+        }
       }
     }
   },

homeassistant/components/accuweather/weather.py

@@ -1,8 +1,7 @@
 """Support for the AccuWeather service."""
 from __future__ import annotations
 
-from statistics import mean
-from typing import Any, cast
+from typing import cast
 
 from homeassistant.components.weather import (
     ATTR_FORECAST_CONDITION,
@@ -28,17 +27,9 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.util.dt import utc_from_timestamp
-from homeassistant.util.unit_system import METRIC_SYSTEM
 
 from . import AccuWeatherDataUpdateCoordinator
-from .const import (
-    API_IMPERIAL,
-    API_METRIC,
-    ATTR_FORECAST,
-    ATTRIBUTION,
-    CONDITION_CLASSES,
-    DOMAIN,
-)
+from .const import API_METRIC, ATTR_FORECAST, ATTRIBUTION, CONDITION_CLASSES, DOMAIN
 
 PARALLEL_UPDATES = 1
 
@@ -66,20 +57,11 @@ class AccuWeatherEntity(
         # Coordinator data is used also for sensors which don't have units automatically
         # converted, hence the weather entity's native units follow the configured unit
         # system
-        if coordinator.hass.config.units is METRIC_SYSTEM:
-            self._attr_native_precipitation_unit = UnitOfPrecipitationDepth.MILLIMETERS
-            self._attr_native_pressure_unit = UnitOfPressure.HPA
-            self._attr_native_temperature_unit = UnitOfTemperature.CELSIUS
-            self._attr_native_visibility_unit = UnitOfLength.KILOMETERS
-            self._attr_native_wind_speed_unit = UnitOfSpeed.KILOMETERS_PER_HOUR
-            self._unit_system = API_METRIC
-        else:
-            self._unit_system = API_IMPERIAL
-            self._attr_native_precipitation_unit = UnitOfPrecipitationDepth.INCHES
-            self._attr_native_pressure_unit = UnitOfPressure.INHG
-            self._attr_native_temperature_unit = UnitOfTemperature.FAHRENHEIT
-            self._attr_native_visibility_unit = UnitOfLength.MILES
-            self._attr_native_wind_speed_unit = UnitOfSpeed.MILES_PER_HOUR
+        self._attr_native_precipitation_unit = UnitOfPrecipitationDepth.MILLIMETERS
+        self._attr_native_pressure_unit = UnitOfPressure.HPA
+        self._attr_native_temperature_unit = UnitOfTemperature.CELSIUS
+        self._attr_native_visibility_unit = UnitOfLength.KILOMETERS
+        self._attr_native_wind_speed_unit = UnitOfSpeed.KILOMETERS_PER_HOUR
         self._attr_unique_id = coordinator.location_key
         self._attr_attribution = ATTRIBUTION
         self._attr_device_info = coordinator.device_info
@@ -99,16 +81,12 @@ class AccuWeatherEntity(
     @property
     def native_temperature(self) -> float:
         """Return the temperature."""
-        return cast(
-            float, self.coordinator.data["Temperature"][self._unit_system]["Value"]
-        )
+        return cast(float, self.coordinator.data["Temperature"][API_METRIC]["Value"])
 
     @property
     def native_pressure(self) -> float:
         """Return the pressure."""
-        return cast(
-            float, self.coordinator.data["Pressure"][self._unit_system]["Value"]
-        )
+        return cast(float, self.coordinator.data["Pressure"][API_METRIC]["Value"])
 
     @property
     def humidity(self) -> int:
@@ -118,9 +96,7 @@ class AccuWeatherEntity(
     @property
     def native_wind_speed(self) -> float:
         """Return the wind speed."""
-        return cast(
-            float, self.coordinator.data["Wind"]["Speed"][self._unit_system]["Value"]
-        )
+        return cast(float, self.coordinator.data["Wind"]["Speed"][API_METRIC]["Value"])
 
     @property
     def wind_bearing(self) -> int:
@@ -130,19 +106,7 @@ class AccuWeatherEntity(
     @property
     def native_visibility(self) -> float:
         """Return the visibility."""
-        return cast(
-            float, self.coordinator.data["Visibility"][self._unit_system]["Value"]
-        )
-
-    @property
-    def ozone(self) -> int | None:
-        """Return the ozone level."""
-        # We only have ozone data for certain locations and only in the forecast data.
-        if self.coordinator.forecast and self.coordinator.data[ATTR_FORECAST][0].get(
-            "Ozone"
-        ):
-            return cast(int, self.coordinator.data[ATTR_FORECAST][0]["Ozone"]["Value"])
-        return None
+        return cast(float, self.coordinator.data["Visibility"][API_METRIC]["Value"])
 
     @property
     def forecast(self) -> list[Forecast] | None:
@@ -155,15 +119,10 @@ class AccuWeatherEntity(
                 ATTR_FORECAST_TIME: utc_from_timestamp(item["EpochDate"]).isoformat(),
                 ATTR_FORECAST_NATIVE_TEMP: item["TemperatureMax"]["Value"],
                 ATTR_FORECAST_NATIVE_TEMP_LOW: item["TemperatureMin"]["Value"],
-                ATTR_FORECAST_NATIVE_PRECIPITATION: self._calc_precipitation(item),
-                ATTR_FORECAST_PRECIPITATION_PROBABILITY: round(
-                    mean(
-                        [
-                            item["PrecipitationProbabilityDay"],
-                            item["PrecipitationProbabilityNight"],
-                        ]
-                    )
-                ),
+                ATTR_FORECAST_NATIVE_PRECIPITATION: item["TotalLiquidDay"]["Value"],
+                ATTR_FORECAST_PRECIPITATION_PROBABILITY: item[
+                    "PrecipitationProbabilityDay"
+                ],
                 ATTR_FORECAST_NATIVE_WIND_SPEED: item["WindDay"]["Speed"]["Value"],
                 ATTR_FORECAST_WIND_BEARING: item["WindDay"]["Direction"]["Degrees"],
                 ATTR_FORECAST_CONDITION: [
@@ -172,18 +131,3 @@ class AccuWeatherEntity(
             }
             for item in self.coordinator.data[ATTR_FORECAST]
         ]
-
-    @staticmethod
-    def _calc_precipitation(day: dict[str, Any]) -> float:
-        """Return sum of the precipitation."""
-        precip_sum = 0
-        precip_types = ["Rain", "Snow", "Ice"]
-        for precip in precip_types:
-            precip_sum = sum(
-                [
-                    precip_sum,
-                    day[f"{precip}Day"]["Value"],
-                    day[f"{precip}Night"]["Value"],
-                ]
-            )
-        return round(precip_sum, 1)

homeassistant/components/advantage_air/__init__.py

@@ -7,11 +7,11 @@ from advantage_air import ApiError, advantage_air
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_IP_ADDRESS, CONF_PORT, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import ADVANTAGE_AIR_RETRY, DOMAIN
+from .models import AdvantageAirData
 
 ADVANTAGE_AIR_SYNC_INTERVAL = 15
 PLATFORMS = [
@@ -53,29 +53,10 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         update_interval=timedelta(seconds=ADVANTAGE_AIR_SYNC_INTERVAL),
     )
 
-    def error_handle_factory(func):
-        """Return the provided API function wrapped.
-
-        Adds an error handler and coordinator refresh.
-        """
-
-        async def error_handle(param):
-            try:
-                if await func(param):
-                    await coordinator.async_refresh()
-            except ApiError as err:
-                raise HomeAssistantError(err) from err
-
-        return error_handle
-
     await coordinator.async_config_entry_first_refresh()
 
     hass.data.setdefault(DOMAIN, {})
-    hass.data[DOMAIN][entry.entry_id] = {
-        "coordinator": coordinator,
-        "aircon": error_handle_factory(api.aircon.async_set),
-        "lights": error_handle_factory(api.lights.async_set),
-    }
+    hass.data[DOMAIN][entry.entry_id] = AdvantageAirData(coordinator, api)
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 

homeassistant/components/advantage_air/binary_sensor.py

@@ -1,8 +1,6 @@
 """Binary Sensor platform for Advantage Air integration."""
 from __future__ import annotations
 
-from typing import Any
-
 from homeassistant.components.binary_sensor import (
     BinarySensorDeviceClass,
     BinarySensorEntity,
@@ -14,6 +12,7 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from .const import DOMAIN as ADVANTAGE_AIR_DOMAIN
 from .entity import AdvantageAirAcEntity, AdvantageAirZoneEntity
+from .models import AdvantageAirData
 
 PARALLEL_UPDATES = 0
 
@@ -25,10 +24,10 @@ async def async_setup_entry(
 ) -> None:
     """Set up AdvantageAir Binary Sensor platform."""
 
-    instance = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]
+    instance: AdvantageAirData = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]
 
     entities: list[BinarySensorEntity] = []
-    if aircons := instance["coordinator"].data.get("aircons"):
+    if aircons := instance.coordinator.data.get("aircons"):
         for ac_key, ac_device in aircons.items():
             entities.append(AdvantageAirFilter(instance, ac_key))
             for zone_key, zone in ac_device["zones"].items():
@@ -48,7 +47,7 @@ class AdvantageAirFilter(AdvantageAirAcEntity, BinarySensorEntity):
     _attr_entity_category = EntityCategory.DIAGNOSTIC
     _attr_name = "Filter"
 
-    def __init__(self, instance: dict[str, Any], ac_key: str) -> None:
+    def __init__(self, instance: AdvantageAirData, ac_key: str) -> None:
         """Initialize an Advantage Air Filter sensor."""
         super().__init__(instance, ac_key)
         self._attr_unique_id += "-filter"
@@ -64,7 +63,7 @@ class AdvantageAirZoneMotion(AdvantageAirZoneEntity, BinarySensorEntity):
 
     _attr_device_class = BinarySensorDeviceClass.MOTION
 
-    def __init__(self, instance: dict[str, Any], ac_key: str, zone_key: str) -> None:
+    def __init__(self, instance: AdvantageAirData, ac_key: str, zone_key: str) -> None:
         """Initialize an Advantage Air Zone Motion sensor."""
         super().__init__(instance, ac_key, zone_key)
         self._attr_name = f'{self._zone["name"]} motion'
@@ -82,7 +81,7 @@ class AdvantageAirZoneMyZone(AdvantageAirZoneEntity, BinarySensorEntity):
     _attr_entity_registry_enabled_default = False
     _attr_entity_category = EntityCategory.DIAGNOSTIC
 
-    def __init__(self, instance: dict[str, Any], ac_key: str, zone_key: str) -> None:
+    def __init__(self, instance: AdvantageAirData, ac_key: str, zone_key: str) -> None:
         """Initialize an Advantage Air Zone MyZone sensor."""
         super().__init__(instance, ac_key, zone_key)
         self._attr_name = f'{self._zone["name"]} myZone'

homeassistant/components/advantage_air/climate.py

@@ -5,6 +5,8 @@ import logging
 from typing import Any
 
 from homeassistant.components.climate import (
+    ATTR_TARGET_TEMP_HIGH,
+    ATTR_TARGET_TEMP_LOW,
     FAN_AUTO,
     FAN_HIGH,
     FAN_LOW,
@@ -26,24 +28,17 @@ from .const import (
     DOMAIN as ADVANTAGE_AIR_DOMAIN,
 )
 from .entity import AdvantageAirAcEntity, AdvantageAirZoneEntity
+from .models import AdvantageAirData
 
 ADVANTAGE_AIR_HVAC_MODES = {
     "heat": HVACMode.HEAT,
     "cool": HVACMode.COOL,
     "vent": HVACMode.FAN_ONLY,
     "dry": HVACMode.DRY,
-    "myauto": HVACMode.AUTO,
+    "myauto": HVACMode.HEAT_COOL,
 }
 HASS_HVAC_MODES = {v: k for k, v in ADVANTAGE_AIR_HVAC_MODES.items()}
 
-AC_HVAC_MODES = [
-    HVACMode.OFF,
-    HVACMode.COOL,
-    HVACMode.HEAT,
-    HVACMode.FAN_ONLY,
-    HVACMode.DRY,
-]
-
 ADVANTAGE_AIR_FAN_MODES = {
     "autoAA": FAN_AUTO,
     "low": FAN_LOW,
@@ -53,7 +48,14 @@ ADVANTAGE_AIR_FAN_MODES = {
 HASS_FAN_MODES = {v: k for k, v in ADVANTAGE_AIR_FAN_MODES.items()}
 FAN_SPEEDS = {FAN_LOW: 30, FAN_MEDIUM: 60, FAN_HIGH: 100}
 
-ZONE_HVAC_MODES = [HVACMode.OFF, HVACMode.HEAT_COOL]
+ADVANTAGE_AIR_AUTOFAN = "aaAutoFanModeEnabled"
+ADVANTAGE_AIR_MYZONE = "MyZone"
+ADVANTAGE_AIR_MYAUTO = "MyAuto"
+ADVANTAGE_AIR_MYAUTO_ENABLED = "myAutoModeEnabled"
+ADVANTAGE_AIR_MYTEMP = "MyTemp"
+ADVANTAGE_AIR_MYTEMP_ENABLED = "climateControlModeEnabled"
+ADVANTAGE_AIR_HEAT_TARGET = "myAutoHeatTargetTemp"
+ADVANTAGE_AIR_COOL_TARGET = "myAutoCoolTargetTemp"
 
 PARALLEL_UPDATES = 0
 
@@ -67,15 +69,15 @@ async def async_setup_entry(
 ) -> None:
     """Set up AdvantageAir climate platform."""
 
-    instance = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]
+    instance: AdvantageAirData = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]
 
     entities: list[ClimateEntity] = []
-    if aircons := instance["coordinator"].data.get("aircons"):
+    if aircons := instance.coordinator.data.get("aircons"):
         for ac_key, ac_device in aircons.items():
             entities.append(AdvantageAirAC(instance, ac_key))
             for zone_key, zone in ac_device["zones"].items():
                 # Only add zone climate control when zone is in temperature control
-                if zone["type"] != 0:
+                if zone["type"] > 0:
                     entities.append(AdvantageAirZone(instance, ac_key, zone_key))
     async_add_entities(entities)
 
@@ -83,24 +85,44 @@ async def async_setup_entry(
 class AdvantageAirAC(AdvantageAirAcEntity, ClimateEntity):
     """AdvantageAir AC unit."""
 
+    _attr_fan_modes = [FAN_LOW, FAN_MEDIUM, FAN_HIGH]
     _attr_temperature_unit = UnitOfTemperature.CELSIUS
     _attr_target_temperature_step = PRECISION_WHOLE
     _attr_max_temp = 32
     _attr_min_temp = 16
-    _attr_fan_modes = [FAN_AUTO, FAN_LOW, FAN_MEDIUM, FAN_HIGH]
-    _attr_hvac_modes = AC_HVAC_MODES
-    _attr_supported_features = (
-        ClimateEntityFeature.TARGET_TEMPERATURE | ClimateEntityFeature.FAN_MODE
-    )
 
-    def __init__(self, instance: dict[str, Any], ac_key: str) -> None:
+    _attr_hvac_modes = [
+        HVACMode.OFF,
+        HVACMode.COOL,
+        HVACMode.HEAT,
+        HVACMode.FAN_ONLY,
+        HVACMode.DRY,
+    ]
+
+    _attr_supported_features = ClimateEntityFeature.FAN_MODE
+
+    def __init__(self, instance: AdvantageAirData, ac_key: str) -> None:
         """Initialize an AdvantageAir AC unit."""
         super().__init__(instance, ac_key)
-        if self._ac.get("myAutoModeEnabled"):
-            self._attr_hvac_modes = AC_HVAC_MODES + [HVACMode.AUTO]
+
+        # Set supported features and HVAC modes based on current operating mode
+        if self._ac.get(ADVANTAGE_AIR_MYAUTO_ENABLED):
+            # MyAuto
+            self._attr_supported_features |= (
+                ClimateEntityFeature.TARGET_TEMPERATURE
+                | ClimateEntityFeature.TARGET_TEMPERATURE_RANGE
+            )
+            self._attr_hvac_modes += [HVACMode.HEAT_COOL]
+        elif not self._ac.get(ADVANTAGE_AIR_MYTEMP_ENABLED):
+            # MyZone
+            self._attr_supported_features |= ClimateEntityFeature.TARGET_TEMPERATURE
+
+        # Add "ezfan" mode if supported
+        if self._ac.get(ADVANTAGE_AIR_AUTOFAN):
+            self._attr_fan_modes += [FAN_AUTO]
 
     @property
-    def target_temperature(self) -> float:
+    def target_temperature(self) -> float | None:
         """Return the current target temperature."""
         return self._ac["setTemp"]
 
@@ -116,77 +138,71 @@ class AdvantageAirAC(AdvantageAirAcEntity, ClimateEntity):
         """Return the current fan modes."""
         return ADVANTAGE_AIR_FAN_MODES.get(self._ac["fan"])
 
+    @property
+    def target_temperature_high(self) -> float | None:
+        """Return the temperature cool mode is enabled."""
+        return self._ac.get(ADVANTAGE_AIR_COOL_TARGET)
+
+    @property
+    def target_temperature_low(self) -> float | None:
+        """Return the temperature heat mode is enabled."""
+        return self._ac.get(ADVANTAGE_AIR_HEAT_TARGET)
+
     async def async_turn_on(self) -> None:
         """Set the HVAC State to on."""
-        await self.aircon(
-            {
-                self.ac_key: {
-                    "info": {
-                        "state": ADVANTAGE_AIR_STATE_ON,
-                    }
-                }
-            }
-        )
+        await self.async_update_ac({"state": ADVANTAGE_AIR_STATE_ON})
 
     async def async_turn_off(self) -> None:
         """Set the HVAC State to off."""
-        await self.aircon(
+        await self.async_update_ac(
             {
-                self.ac_key: {
-                    "info": {
-                        "state": ADVANTAGE_AIR_STATE_OFF,
-                    }
-                }
+                "state": ADVANTAGE_AIR_STATE_OFF,
             }
         )
 
     async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
         """Set the HVAC Mode and State."""
         if hvac_mode == HVACMode.OFF:
-            await self.aircon(
-                {self.ac_key: {"info": {"state": ADVANTAGE_AIR_STATE_OFF}}}
-            )
+            await self.async_update_ac({"state": ADVANTAGE_AIR_STATE_OFF})
         else:
-            await self.aircon(
+            await self.async_update_ac(
                 {
-                    self.ac_key: {
-                        "info": {
-                            "state": ADVANTAGE_AIR_STATE_ON,
-                            "mode": HASS_HVAC_MODES.get(hvac_mode),
-                        }
-                    }
+                    "state": ADVANTAGE_AIR_STATE_ON,
+                    "mode": HASS_HVAC_MODES.get(hvac_mode),
                 }
             )
 
     async def async_set_fan_mode(self, fan_mode: str) -> None:
         """Set the Fan Mode."""
-        await self.aircon(
-            {self.ac_key: {"info": {"fan": HASS_FAN_MODES.get(fan_mode)}}}
-        )
+        await self.async_update_ac({"fan": HASS_FAN_MODES.get(fan_mode)})
 
     async def async_set_temperature(self, **kwargs: Any) -> None:
         """Set the Temperature."""
-        temp = kwargs.get(ATTR_TEMPERATURE)
-        await self.aircon({self.ac_key: {"info": {"setTemp": temp}}})
+        if ATTR_TEMPERATURE in kwargs:
+            await self.async_update_ac({"setTemp": kwargs[ATTR_TEMPERATURE]})
+        if ATTR_TARGET_TEMP_LOW in kwargs and ATTR_TARGET_TEMP_HIGH in kwargs:
+            await self.async_update_ac(
+                {
+                    ADVANTAGE_AIR_COOL_TARGET: kwargs[ATTR_TARGET_TEMP_HIGH],
+                    ADVANTAGE_AIR_HEAT_TARGET: kwargs[ATTR_TARGET_TEMP_LOW],
+                }
+            )
 
 
 class AdvantageAirZone(AdvantageAirZoneEntity, ClimateEntity):
-    """AdvantageAir Zone control."""
+    """AdvantageAir MyTemp Zone control."""
 
+    _attr_hvac_modes = [HVACMode.OFF, HVACMode.HEAT_COOL]
+    _attr_supported_features = ClimateEntityFeature.TARGET_TEMPERATURE
     _attr_temperature_unit = UnitOfTemperature.CELSIUS
     _attr_target_temperature_step = PRECISION_WHOLE
     _attr_max_temp = 32
     _attr_min_temp = 16
-    _attr_hvac_modes = ZONE_HVAC_MODES
-    _attr_supported_features = ClimateEntityFeature.TARGET_TEMPERATURE
 
-    def __init__(self, instance: dict[str, Any], ac_key: str, zone_key: str) -> None:
+    def __init__(self, instance: AdvantageAirData, ac_key: str, zone_key: str) -> None:
         """Initialize an AdvantageAir Zone control."""
         super().__init__(instance, ac_key, zone_key)
         self._attr_name = self._zone["name"]
-        self._attr_unique_id = (
-            f'{self.coordinator.data["system"]["rid"]}-{ac_key}-{zone_key}'
-        )
 
     @property
     def hvac_mode(self) -> HVACMode:
@@ -196,7 +212,7 @@ class AdvantageAirZone(AdvantageAirZoneEntity, ClimateEntity):
         return HVACMode.OFF
 
     @property
-    def current_temperature(self) -> float:
+    def current_temperature(self) -> float | None:
         """Return the current temperature."""
         return self._zone["measuredTemp"]
 
@@ -207,23 +223,11 @@ class AdvantageAirZone(AdvantageAirZoneEntity, ClimateEntity):
 
     async def async_turn_on(self) -> None:
         """Set the HVAC State to on."""
-        await self.aircon(
-            {
-                self.ac_key: {
-                    "zones": {self.zone_key: {"state": ADVANTAGE_AIR_STATE_OPEN}}
-                }
-            }
-        )
+        await self.async_update_zone({"state": ADVANTAGE_AIR_STATE_OPEN})
 
     async def async_turn_off(self) -> None:
         """Set the HVAC State to off."""
-        await self.aircon(
-            {
-                self.ac_key: {
-                    "zones": {self.zone_key: {"state": ADVANTAGE_AIR_STATE_CLOSE}}
-                }
-            }
-        )
+        await self.async_update_zone({"state": ADVANTAGE_AIR_STATE_CLOSE})
 
     async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
         """Set the HVAC Mode and State."""
@@ -235,4 +239,4 @@ class AdvantageAirZone(AdvantageAirZoneEntity, ClimateEntity):
     async def async_set_temperature(self, **kwargs: Any) -> None:
         """Set the Temperature."""
         temp = kwargs.get(ATTR_TEMPERATURE)
-        await self.aircon({self.ac_key: {"zones": {self.zone_key: {"setTemp": temp}}}})
+        await self.async_update_zone({"setTemp": temp})

homeassistant/components/advantage_air/cover.py

@@ -16,7 +16,8 @@ from .const import (
     ADVANTAGE_AIR_STATE_OPEN,
     DOMAIN as ADVANTAGE_AIR_DOMAIN,
 )
-from .entity import AdvantageAirZoneEntity
+from .entity import AdvantageAirThingEntity, AdvantageAirZoneEntity
+from .models import AdvantageAirData
 
 PARALLEL_UPDATES = 0
 
@@ -28,15 +29,25 @@ async def async_setup_entry(
 ) -> None:
     """Set up AdvantageAir cover platform."""
 
-    instance = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]
+    instance: AdvantageAirData = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]
 
     entities: list[CoverEntity] = []
-    if aircons := instance["coordinator"].data.get("aircons"):
+    if aircons := instance.coordinator.data.get("aircons"):
         for ac_key, ac_device in aircons.items():
             for zone_key, zone in ac_device["zones"].items():
                 # Only add zone vent controls when zone in vent control mode.
                 if zone["type"] == 0:
                     entities.append(AdvantageAirZoneVent(instance, ac_key, zone_key))
+    if things := instance.coordinator.data.get("myThings"):
+        for thing in things["things"].values():
+            if thing["channelDipState"] in [1, 2]:  # 1 = "Blind", 2 = "Blind 2"
+                entities.append(
+                    AdvantageAirThingCover(instance, thing, CoverDeviceClass.BLIND)
+                )
+            elif thing["channelDipState"] == 3:  # 3 = "Garage door"
+                entities.append(
+                    AdvantageAirThingCover(instance, thing, CoverDeviceClass.GARAGE)
+                )
     async_add_entities(entities)
 
 
@@ -50,7 +61,7 @@ class AdvantageAirZoneVent(AdvantageAirZoneEntity, CoverEntity):
         | CoverEntityFeature.SET_POSITION
     )
 
-    def __init__(self, instance: dict[str, Any], ac_key: str, zone_key: str) -> None:
+    def __init__(self, instance: AdvantageAirData, ac_key: str, zone_key: str) -> None:
         """Initialize an Advantage Air Zone Vent."""
         super().__init__(instance, ac_key, zone_key)
         self._attr_name = self._zone["name"]
@@ -69,47 +80,52 @@ class AdvantageAirZoneVent(AdvantageAirZoneEntity, CoverEntity):
 
     async def async_open_cover(self, **kwargs: Any) -> None:
         """Fully open zone vent."""
-        await self.aircon(
-            {
-                self.ac_key: {
-                    "zones": {
-                        self.zone_key: {"state": ADVANTAGE_AIR_STATE_OPEN, "value": 100}
-                    }
-                }
-            }
+        await self.async_update_zone(
+            {"state": ADVANTAGE_AIR_STATE_OPEN, "value": 100},
         )
 
     async def async_close_cover(self, **kwargs: Any) -> None:
         """Fully close zone vent."""
-        await self.aircon(
-            {
-                self.ac_key: {
-                    "zones": {self.zone_key: {"state": ADVANTAGE_AIR_STATE_CLOSE}}
-                }
-            }
-        )
+        await self.async_update_zone({"state": ADVANTAGE_AIR_STATE_CLOSE})
 
     async def async_set_cover_position(self, **kwargs: Any) -> None:
         """Change vent position."""
         position = round(kwargs[ATTR_POSITION] / 5) * 5
         if position == 0:
-            await self.aircon(
-                {
-                    self.ac_key: {
-                        "zones": {self.zone_key: {"state": ADVANTAGE_AIR_STATE_CLOSE}}
-                    }
-                }
-            )
+            await self.async_update_zone({"state": ADVANTAGE_AIR_STATE_CLOSE})
         else:
-            await self.aircon(
+            await self.async_update_zone(
                 {
-                    self.ac_key: {
-                        "zones": {
-                            self.zone_key: {
-                                "state": ADVANTAGE_AIR_STATE_OPEN,
-                                "value": position,
-                            }
-                        }
-                    }
+                    "state": ADVANTAGE_AIR_STATE_OPEN,
+                    "value": position,
                 }
             )
+
+
+class AdvantageAirThingCover(AdvantageAirThingEntity, CoverEntity):
+    """Representation of Advantage Air Cover controlled by MyPlace."""
+
+    _attr_supported_features = CoverEntityFeature.OPEN | CoverEntityFeature.CLOSE
+
+    def __init__(
+        self,
+        instance: AdvantageAirData,
+        thing: dict[str, Any],
+        device_class: CoverDeviceClass,
+    ) -> None:
+        """Initialize an Advantage Air Things Cover."""
+        super().__init__(instance, thing)
+        self._attr_device_class = device_class
+
+    @property
+    def is_closed(self) -> bool:
+        """Return if cover is fully closed."""
+        return self._data["value"] == 0
+
+    async def async_open_cover(self, **kwargs: Any) -> None:
+        """Fully open zone vent."""
+        return await self.async_turn_on()
+
+    async def async_close_cover(self, **kwargs: Any) -> None:
+        """Fully close zone vent."""
+        return await self.async_turn_off()

homeassistant/components/advantage_air/entity.py

@@ -1,11 +1,14 @@
 """Advantage Air parent entity class."""
-
 from typing import Any
 
+from advantage_air import ApiError
+
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN
+from .models import AdvantageAirData
 
 
 class AdvantageAirEntity(CoordinatorEntity):
@@ -13,19 +16,34 @@ class AdvantageAirEntity(CoordinatorEntity):
 
     _attr_has_entity_name = True
 
-    def __init__(self, instance: dict[str, Any]) -> None:
+    def __init__(self, instance: AdvantageAirData) -> None:
         """Initialize common aspects of an Advantage Air entity."""
-        super().__init__(instance["coordinator"])
+        super().__init__(instance.coordinator)
         self._attr_unique_id: str = self.coordinator.data["system"]["rid"]
 
+    def update_handle_factory(self, func, *keys):
+        """Return the provided API function wrapped.
+
+        Adds an error handler and coordinator refresh, and presets keys.
+        """
+
+        async def update_handle(*values):
+            try:
+                if await func(*keys, *values):
+                    await self.coordinator.async_refresh()
+            except ApiError as err:
+                raise HomeAssistantError(err) from err
+
+        return update_handle
+
 
 class AdvantageAirAcEntity(AdvantageAirEntity):
     """Parent class for Advantage Air AC Entities."""
 
-    def __init__(self, instance: dict[str, Any], ac_key: str) -> None:
+    def __init__(self, instance: AdvantageAirData, ac_key: str) -> None:
         """Initialize common aspects of an Advantage Air ac entity."""
         super().__init__(instance)
-        self.aircon = instance["aircon"]
+
         self.ac_key: str = ac_key
         self._attr_unique_id += f"-{ac_key}"
 
@@ -36,6 +54,9 @@ class AdvantageAirAcEntity(AdvantageAirEntity):
             model=self.coordinator.data["system"]["sysType"],
             name=self.coordinator.data["aircons"][self.ac_key]["info"]["name"],
         )
+        self.async_update_ac = self.update_handle_factory(
+            instance.api.aircon.async_update_ac, self.ac_key
+        )
 
     @property
     def _ac(self) -> dict[str, Any]:
@@ -45,12 +66,56 @@ class AdvantageAirAcEntity(AdvantageAirEntity):
 class AdvantageAirZoneEntity(AdvantageAirAcEntity):
     """Parent class for Advantage Air Zone Entities."""
 
-    def __init__(self, instance: dict[str, Any], ac_key: str, zone_key: str) -> None:
+    def __init__(self, instance: AdvantageAirData, ac_key: str, zone_key: str) -> None:
         """Initialize common aspects of an Advantage Air zone entity."""
         super().__init__(instance, ac_key)
+
         self.zone_key: str = zone_key
         self._attr_unique_id += f"-{zone_key}"
+        self.async_update_zone = self.update_handle_factory(
+            instance.api.aircon.async_update_zone, self.ac_key, self.zone_key
+        )
 
     @property
     def _zone(self) -> dict[str, Any]:
         return self.coordinator.data["aircons"][self.ac_key]["zones"][self.zone_key]
+
+
+class AdvantageAirThingEntity(AdvantageAirEntity):
+    """Parent class for Advantage Air Things Entities."""
+
+    def __init__(self, instance: AdvantageAirData, thing: dict[str, Any]) -> None:
+        """Initialize common aspects of an Advantage Air Things entity."""
+        super().__init__(instance)
+
+        self._id = thing["id"]
+        self._attr_unique_id += f"-{self._id}"
+
+        self._attr_device_info = DeviceInfo(
+            via_device=(DOMAIN, self.coordinator.data["system"]["rid"]),
+            identifiers={(DOMAIN, self._attr_unique_id)},
+            manufacturer="Advantage Air",
+            model="MyPlace",
+            name=thing["name"],
+        )
+        self.async_update_value = self.update_handle_factory(
+            instance.api.things.async_update_value, self._id
+        )
+
+    @property
+    def _data(self) -> dict:
+        """Return the thing data."""
+        return self.coordinator.data["myThings"]["things"][self._id]
+
+    @property
+    def is_on(self):
+        """Return if the thing is considered on."""
+        return self._data["value"] > 0
+
+    async def async_turn_on(self, **kwargs: Any) -> None:
+        """Turn the thing on."""
+        await self.async_update_value(True)
+
+    async def async_turn_off(self, **kwargs: Any) -> None:
+        """Turn the thing off."""
+        await self.async_update_value(False)

homeassistant/components/advantage_air/light.py

@@ -7,12 +7,9 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from .const import (
-    ADVANTAGE_AIR_STATE_OFF,
-    ADVANTAGE_AIR_STATE_ON,
-    DOMAIN as ADVANTAGE_AIR_DOMAIN,
-)
-from .entity import AdvantageAirEntity
+from .const import ADVANTAGE_AIR_STATE_ON, DOMAIN as ADVANTAGE_AIR_DOMAIN
+from .entity import AdvantageAirEntity, AdvantageAirThingEntity
+from .models import AdvantageAirData
 
 
 async def async_setup_entry(
@@ -22,15 +19,21 @@ async def async_setup_entry(
 ) -> None:
     """Set up AdvantageAir light platform."""
 
-    instance = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]
+    instance: AdvantageAirData = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]
 
     entities: list[LightEntity] = []
-    if my_lights := instance["coordinator"].data.get("myLights"):
+    if my_lights := instance.coordinator.data.get("myLights"):
         for light in my_lights["lights"].values():
             if light.get("relay"):
                 entities.append(AdvantageAirLight(instance, light))
             else:
                 entities.append(AdvantageAirLightDimmable(instance, light))
+    if things := instance.coordinator.data.get("myThings"):
+        for thing in things["things"].values():
+            if thing["channelDipState"] == 4:  # 4 = "Light (on/off)""
+                entities.append(AdvantageAirThingLight(instance, thing))
+            elif thing["channelDipState"] == 5:  # 5 = "Light (Dimmable)""
+                entities.append(AdvantageAirThingLightDimmable(instance, thing))
     async_add_entities(entities)
 
 
@@ -39,10 +42,10 @@ class AdvantageAirLight(AdvantageAirEntity, LightEntity):
 
     _attr_supported_color_modes = {ColorMode.ONOFF}
 
-    def __init__(self, instance: dict[str, Any], light: dict[str, Any]) -> None:
+    def __init__(self, instance: AdvantageAirData, light: dict[str, Any]) -> None:
         """Initialize an Advantage Air Light."""
         super().__init__(instance)
-        self.lights = instance["lights"]
+
         self._id: str = light["id"]
         self._attr_unique_id += f"-{self._id}"
         self._attr_device_info = DeviceInfo(
@@ -52,24 +55,27 @@ class AdvantageAirLight(AdvantageAirEntity, LightEntity):
             model=light.get("moduleType"),
             name=light["name"],
         )
+        self.async_update_state = self.update_handle_factory(
+            instance.api.lights.async_update_state, self._id
+        )
 
     @property
-    def _light(self) -> dict[str, Any]:
+    def _data(self) -> dict[str, Any]:
         """Return the light object."""
         return self.coordinator.data["myLights"]["lights"][self._id]
 
     @property
     def is_on(self) -> bool:
         """Return if the light is on."""
-        return self._light["state"] == ADVANTAGE_AIR_STATE_ON
+        return self._data["state"] == ADVANTAGE_AIR_STATE_ON
 
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn the light on."""
-        await self.lights({"id": self._id, "state": ADVANTAGE_AIR_STATE_ON})
+        await self.async_update_state(True)
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn the light off."""
-        await self.lights({"id": self._id, "state": ADVANTAGE_AIR_STATE_OFF})
+        await self.async_update_state(False)
 
 
 class AdvantageAirLightDimmable(AdvantageAirLight):
@@ -77,14 +83,41 @@ class AdvantageAirLightDimmable(AdvantageAirLight):
 
     _attr_supported_color_modes = {ColorMode.ONOFF, ColorMode.BRIGHTNESS}
 
+    def __init__(self, instance: AdvantageAirData, light: dict[str, Any]) -> None:
+        """Initialize an Advantage Air Dimmable Light."""
+        super().__init__(instance, light)
+        self.async_update_value = self.update_handle_factory(
+            instance.api.lights.async_update_value, self._id
+        )
+
     @property
     def brightness(self) -> int:
         """Return the brightness of this light between 0..255."""
-        return round(self._light["value"] * 255 / 100)
+        return round(self._data["value"] * 255 / 100)
 
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn the light on and optionally set the brightness."""
-        data: dict[str, Any] = {"id": self._id, "state": ADVANTAGE_AIR_STATE_ON}
         if ATTR_BRIGHTNESS in kwargs:
-            data["value"] = round(kwargs[ATTR_BRIGHTNESS] * 100 / 255)
-        await self.lights(data)
+            return await self.async_update_value(round(kwargs[ATTR_BRIGHTNESS] / 2.55))
+        return await self.async_update_state(True)
+
+
+class AdvantageAirThingLight(AdvantageAirThingEntity, LightEntity):
+    """Representation of Advantage Air Light controlled by myThings."""
+
+    _attr_supported_color_modes = {ColorMode.ONOFF}
+
+
+class AdvantageAirThingLightDimmable(AdvantageAirThingEntity, LightEntity):
+    """Representation of Advantage Air Dimmable Light controlled by myThings."""
+
+    _attr_supported_color_modes = {ColorMode.ONOFF, ColorMode.BRIGHTNESS}
+
+    @property
+    def brightness(self) -> int:
+        """Return the brightness of this light between 0..255."""
+        return round(self._data["value"] * 255 / 100)
+
+    async def async_turn_on(self, **kwargs: Any) -> None:
+        """Turn the light on by setting the brightness."""
+        await self.async_update_value(round(kwargs.get(ATTR_BRIGHTNESS, 255) / 2.55))

homeassistant/components/advantage_air/manifest.json

@@ -7,5 +7,5 @@
   "iot_class": "local_polling",
   "loggers": ["advantage_air"],
   "quality_scale": "platinum",
-  "requirements": ["advantage_air==0.4.1"]
+  "requirements": ["advantage_air==0.4.4"]
 }

homeassistant/components/advantage_air/models.py

@@ -0,0 +1,16 @@
+"""The Advantage Air integration models."""
+from __future__ import annotations
+
+from dataclasses import dataclass
+
+from advantage_air import advantage_air
+
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
+
+
+@dataclass
+class AdvantageAirData:
+    """Data for the Advantage Air integration."""
+
+    coordinator: DataUpdateCoordinator
+    api: advantage_air

homeassistant/components/advantage_air/select.py

@@ -1,5 +1,4 @@
 """Select platform for Advantage Air integration."""
-from typing import Any
 
 from homeassistant.components.select import SelectEntity
 from homeassistant.config_entries import ConfigEntry
@@ -8,6 +7,7 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from .const import DOMAIN as ADVANTAGE_AIR_DOMAIN
 from .entity import AdvantageAirAcEntity
+from .models import AdvantageAirData
 
 ADVANTAGE_AIR_INACTIVE = "Inactive"
 
@@ -19,10 +19,10 @@ async def async_setup_entry(
 ) -> None:
     """Set up AdvantageAir select platform."""
 
-    instance = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]
+    instance: AdvantageAirData = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]
 
     entities: list[SelectEntity] = []
-    if aircons := instance["coordinator"].data.get("aircons"):
+    if aircons := instance.coordinator.data.get("aircons"):
         for ac_key in aircons:
             entities.append(AdvantageAirMyZone(instance, ac_key))
     async_add_entities(entities)
@@ -34,7 +34,7 @@ class AdvantageAirMyZone(AdvantageAirAcEntity, SelectEntity):
     _attr_icon = "mdi:home-thermometer"
     _attr_name = "MyZone"
 
-    def __init__(self, instance: dict[str, Any], ac_key: str) -> None:
+    def __init__(self, instance: AdvantageAirData, ac_key: str) -> None:
         """Initialize an Advantage Air MyZone control."""
         super().__init__(instance, ac_key)
         self._attr_unique_id += "-myzone"
@@ -42,11 +42,12 @@ class AdvantageAirMyZone(AdvantageAirAcEntity, SelectEntity):
         self._number_to_name = {0: ADVANTAGE_AIR_INACTIVE}
         self._name_to_number = {ADVANTAGE_AIR_INACTIVE: 0}
 
-        for zone in instance["coordinator"].data["aircons"][ac_key]["zones"].values():
-            if zone["type"] > 0:
-                self._name_to_number[zone["name"]] = zone["number"]
-                self._number_to_name[zone["number"]] = zone["name"]
-                self._attr_options.append(zone["name"])
+        if "aircons" in instance.coordinator.data:
+            for zone in instance.coordinator.data["aircons"][ac_key]["zones"].values():
+                if zone["type"] > 0:
+                    self._name_to_number[zone["name"]] = zone["number"]
+                    self._number_to_name[zone["number"]] = zone["name"]
+                    self._attr_options.append(zone["name"])
 
     @property
     def current_option(self) -> str:
@@ -55,6 +56,4 @@ class AdvantageAirMyZone(AdvantageAirAcEntity, SelectEntity):
 
     async def async_select_option(self, option: str) -> None:
         """Set the MyZone."""
-        await self.aircon(
-            {self.ac_key: {"info": {"myZone": self._name_to_number[option]}}}
-        )
+        await self.async_update_ac({"myZone": self._name_to_number[option]})

homeassistant/components/advantage_air/sensor.py

@@ -19,6 +19,7 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from .const import ADVANTAGE_AIR_STATE_OPEN, DOMAIN as ADVANTAGE_AIR_DOMAIN
 from .entity import AdvantageAirAcEntity, AdvantageAirZoneEntity
+from .models import AdvantageAirData
 
 ADVANTAGE_AIR_SET_COUNTDOWN_VALUE = "minutes"
 ADVANTAGE_AIR_SET_COUNTDOWN_UNIT = "min"
@@ -34,10 +35,10 @@ async def async_setup_entry(
 ) -> None:
     """Set up AdvantageAir sensor platform."""
 
-    instance = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]
+    instance: AdvantageAirData = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]
 
     entities: list[SensorEntity] = []
-    if aircons := instance["coordinator"].data.get("aircons"):
+    if aircons := instance.coordinator.data.get("aircons"):
         for ac_key, ac_device in aircons.items():
             entities.append(AdvantageAirTimeTo(instance, ac_key, "On"))
             entities.append(AdvantageAirTimeTo(instance, ac_key, "Off"))
@@ -65,7 +66,7 @@ class AdvantageAirTimeTo(AdvantageAirAcEntity, SensorEntity):
     _attr_native_unit_of_measurement = ADVANTAGE_AIR_SET_COUNTDOWN_UNIT
     _attr_entity_category = EntityCategory.DIAGNOSTIC
 
-    def __init__(self, instance: dict[str, Any], ac_key: str, action: str) -> None:
+    def __init__(self, instance: AdvantageAirData, ac_key: str, action: str) -> None:
         """Initialize the Advantage Air timer control."""
         super().__init__(instance, ac_key)
         self.action = action
@@ -88,7 +89,7 @@ class AdvantageAirTimeTo(AdvantageAirAcEntity, SensorEntity):
     async def set_time_to(self, **kwargs: Any) -> None:
         """Set the timer value."""
         value = min(720, max(0, int(kwargs[ADVANTAGE_AIR_SET_COUNTDOWN_VALUE])))
-        await self.aircon({self.ac_key: {"info": {self._time_key: value}}})
+        await self.async_update_ac({self._time_key: value})
 
 
 class AdvantageAirZoneVent(AdvantageAirZoneEntity, SensorEntity):
@@ -98,7 +99,7 @@ class AdvantageAirZoneVent(AdvantageAirZoneEntity, SensorEntity):
     _attr_state_class = SensorStateClass.MEASUREMENT
     _attr_entity_category = EntityCategory.DIAGNOSTIC
 
-    def __init__(self, instance: dict[str, Any], ac_key: str, zone_key: str) -> None:
+    def __init__(self, instance: AdvantageAirData, ac_key: str, zone_key: str) -> None:
         """Initialize an Advantage Air Zone Vent Sensor."""
         super().__init__(instance, ac_key, zone_key=zone_key)
         self._attr_name = f'{self._zone["name"]} vent'
@@ -126,7 +127,7 @@ class AdvantageAirZoneSignal(AdvantageAirZoneEntity, SensorEntity):
     _attr_state_class = SensorStateClass.MEASUREMENT
     _attr_entity_category = EntityCategory.DIAGNOSTIC
 
-    def __init__(self, instance: dict[str, Any], ac_key: str, zone_key: str) -> None:
+    def __init__(self, instance: AdvantageAirData, ac_key: str, zone_key: str) -> None:
         """Initialize an Advantage Air Zone wireless signal sensor."""
         super().__init__(instance, ac_key, zone_key)
         self._attr_name = f'{self._zone["name"]} signal'
@@ -160,7 +161,7 @@ class AdvantageAirZoneTemp(AdvantageAirZoneEntity, SensorEntity):
     _attr_entity_registry_enabled_default = False
     _attr_entity_category = EntityCategory.DIAGNOSTIC
 
-    def __init__(self, instance: dict[str, Any], ac_key: str, zone_key: str) -> None:
+    def __init__(self, instance: AdvantageAirData, ac_key: str, zone_key: str) -> None:
         """Initialize an Advantage Air Zone Temp Sensor."""
         super().__init__(instance, ac_key, zone_key)
         self._attr_name = f'{self._zone["name"]} temperature'

homeassistant/components/advantage_air/switch.py

@@ -1,7 +1,7 @@
 """Switch platform for Advantage Air integration."""
 from typing import Any
 
-from homeassistant.components.switch import SwitchEntity
+from homeassistant.components.switch import SwitchDeviceClass, SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
@@ -11,7 +11,8 @@ from .const import (
     ADVANTAGE_AIR_STATE_ON,
     DOMAIN as ADVANTAGE_AIR_DOMAIN,
 )
-from .entity import AdvantageAirAcEntity
+from .entity import AdvantageAirAcEntity, AdvantageAirThingEntity
+from .models import AdvantageAirData
 
 
 async def async_setup_entry(
@@ -21,13 +22,17 @@ async def async_setup_entry(
 ) -> None:
     """Set up AdvantageAir switch platform."""
 
-    instance = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]
+    instance: AdvantageAirData = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]
 
     entities: list[SwitchEntity] = []
-    if aircons := instance["coordinator"].data.get("aircons"):
+    if aircons := instance.coordinator.data.get("aircons"):
         for ac_key, ac_device in aircons.items():
             if ac_device["info"]["freshAirStatus"] != "none":
                 entities.append(AdvantageAirFreshAir(instance, ac_key))
+    if things := instance.coordinator.data.get("myThings"):
+        for thing in things["things"].values():
+            if thing["channelDipState"] == 8:  # 8 = Other relay
+                entities.append(AdvantageAirRelay(instance, thing))
     async_add_entities(entities)
 
 
@@ -36,8 +41,9 @@ class AdvantageAirFreshAir(AdvantageAirAcEntity, SwitchEntity):
 
     _attr_icon = "mdi:air-filter"
     _attr_name = "Fresh air"
+    _attr_device_class = SwitchDeviceClass.SWITCH
 
-    def __init__(self, instance: dict[str, Any], ac_key: str) -> None:
+    def __init__(self, instance: AdvantageAirData, ac_key: str) -> None:
         """Initialize an Advantage Air fresh air control."""
         super().__init__(instance, ac_key)
         self._attr_unique_id += "-freshair"
@@ -49,12 +55,14 @@ class AdvantageAirFreshAir(AdvantageAirAcEntity, SwitchEntity):
 
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn fresh air on."""
-        await self.aircon(
-            {self.ac_key: {"info": {"freshAirStatus": ADVANTAGE_AIR_STATE_ON}}}
-        )
+        await self.async_update_ac({"freshAirStatus": ADVANTAGE_AIR_STATE_ON})
 
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn fresh air off."""
-        await self.aircon(
-            {self.ac_key: {"info": {"freshAirStatus": ADVANTAGE_AIR_STATE_OFF}}}
-        )
+        await self.async_update_ac({"freshAirStatus": ADVANTAGE_AIR_STATE_OFF})
+
+
+class AdvantageAirRelay(AdvantageAirThingEntity, SwitchEntity):
+    """Representation of Advantage Air Thing."""
+
+    _attr_device_class = SwitchDeviceClass.SWITCH

homeassistant/components/advantage_air/update.py

@@ -1,5 +1,4 @@
 """Advantage Air Update platform."""
-from typing import Any
 
 from homeassistant.components.update import UpdateEntity
 from homeassistant.config_entries import ConfigEntry
@@ -9,6 +8,7 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from .const import DOMAIN as ADVANTAGE_AIR_DOMAIN
 from .entity import AdvantageAirEntity
+from .models import AdvantageAirData
 
 
 async def async_setup_entry(
@@ -18,7 +18,7 @@ async def async_setup_entry(
 ) -> None:
     """Set up AdvantageAir update platform."""
 
-    instance = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]
+    instance: AdvantageAirData = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]
 
     async_add_entities([AdvantageAirApp(instance)])
 
@@ -28,7 +28,7 @@ class AdvantageAirApp(AdvantageAirEntity, UpdateEntity):
 
     _attr_name = "App"
 
-    def __init__(self, instance: dict[str, Any]) -> None:
+    def __init__(self, instance: AdvantageAirData) -> None:
         """Initialize the Advantage Air App."""
         super().__init__(instance)
         self._attr_device_info = DeviceInfo(

homeassistant/components/aemet/weather_update_coordinator.py

@@ -26,6 +26,7 @@ from aemet_opendata.const import (
     AEMET_ATTR_STATION_DATE,
     AEMET_ATTR_STATION_HUMIDITY,
     AEMET_ATTR_STATION_LOCATION,
+    AEMET_ATTR_STATION_PRESSURE,
     AEMET_ATTR_STATION_PRESSURE_SEA,
     AEMET_ATTR_STATION_TEMPERATURE,
     AEMET_ATTR_STORM_PROBABILITY,
@@ -318,6 +319,8 @@ class WeatherUpdateCoordinator(DataUpdateCoordinator):
                     pressure = format_float(
                         station_data[AEMET_ATTR_STATION_PRESSURE_SEA]
                     )
+                elif AEMET_ATTR_STATION_PRESSURE in station_data:
+                    pressure = format_float(station_data[AEMET_ATTR_STATION_PRESSURE])
                 if AEMET_ATTR_STATION_TEMPERATURE in station_data:
                     temperature = format_float(
                         station_data[AEMET_ATTR_STATION_TEMPERATURE]

homeassistant/components/airthings/sensor.py

@@ -150,10 +150,14 @@ class AirthingsHeaterEnergySensor(CoordinatorEntity, SensorEntity):
         self._attr_unique_id = f"{airthings_device.device_id}_{entity_description.key}"
         self._id = airthings_device.device_id
         self._attr_device_info = DeviceInfo(
-            configuration_url="https://dashboard.airthings.com/",
+            configuration_url=(
+                "https://dashboard.airthings.com/devices/"
+                f"{airthings_device.device_id}"
+            ),
             identifiers={(DOMAIN, airthings_device.device_id)},
             name=airthings_device.name,
             manufacturer="Airthings",
+            model=airthings_device.device_type.replace("_", " ").lower().title(),
         )
 
     @property

homeassistant/components/airthings_ble/sensor.py

@@ -65,24 +65,28 @@ SENSORS_MAPPING_TEMPLATE: dict[str, SensorEntityDescription] = {
         key="temperature",
         device_class=SensorDeviceClass.TEMPERATURE,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        state_class=SensorStateClass.MEASUREMENT,
         name="Temperature",
     ),
     "humidity": SensorEntityDescription(
         key="humidity",
         device_class=SensorDeviceClass.HUMIDITY,
         native_unit_of_measurement=PERCENTAGE,
+        state_class=SensorStateClass.MEASUREMENT,
         name="Humidity",
     ),
     "pressure": SensorEntityDescription(
         key="pressure",
         device_class=SensorDeviceClass.PRESSURE,
         native_unit_of_measurement=UnitOfPressure.MBAR,
+        state_class=SensorStateClass.MEASUREMENT,
         name="Pressure",
     ),
     "battery": SensorEntityDescription(
         key="battery",
         device_class=SensorDeviceClass.BATTERY,
         native_unit_of_measurement=PERCENTAGE,
+        state_class=SensorStateClass.MEASUREMENT,
         entity_category=EntityCategory.DIAGNOSTIC,
         name="Battery",
     ),
@@ -90,12 +94,13 @@ SENSORS_MAPPING_TEMPLATE: dict[str, SensorEntityDescription] = {
         key="co2",
         device_class=SensorDeviceClass.CO2,
         native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        state_class=SensorStateClass.MEASUREMENT,
         name="co2",
     ),
     "voc": SensorEntityDescription(
         key="voc",
-        device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS,
         native_unit_of_measurement=CONCENTRATION_PARTS_PER_BILLION,
+        state_class=SensorStateClass.MEASUREMENT,
         name="VOC",
         icon="mdi:cloud",
     ),
@@ -103,6 +108,7 @@ SENSORS_MAPPING_TEMPLATE: dict[str, SensorEntityDescription] = {
         key="illuminance",
         device_class=SensorDeviceClass.ILLUMINANCE,
         native_unit_of_measurement=LIGHT_LUX,
+        state_class=SensorStateClass.MEASUREMENT,
         name="Illuminance",
     ),
 }
@@ -150,7 +156,6 @@ class AirthingsSensor(
 ):
     """Airthings BLE sensors for the device."""
 
-    _attr_state_class = SensorStateClass.MEASUREMENT
     _attr_has_entity_name = True
 
     def __init__(

homeassistant/components/airvisual/__init__.py

@@ -380,7 +380,6 @@ async def async_migrate_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
                 )
         else:
             entry.version = version
-            hass.config_entries.async_update_entry(entry)
 
     LOGGER.info("Migration to version %s successful", version)
 

homeassistant/components/airzone/climate.py

@@ -3,18 +3,26 @@ from __future__ import annotations
 
 from typing import Any, Final
 
-from aioairzone.common import OperationMode
+from aioairzone.common import OperationAction, OperationMode
 from aioairzone.const import (
+    API_COOL_SET_POINT,
+    API_HEAT_SET_POINT,
     API_MODE,
     API_ON,
     API_SET_POINT,
-    AZD_DEMAND,
+    API_SPEED,
+    AZD_ACTION,
+    AZD_COOL_TEMP_SET,
+    AZD_DOUBLE_SET_POINT,
+    AZD_HEAT_TEMP_SET,
     AZD_HUMIDITY,
     AZD_MASTER,
     AZD_MODE,
     AZD_MODES,
     AZD_NAME,
     AZD_ON,
+    AZD_SPEED,
+    AZD_SPEEDS,
     AZD_TEMP,
     AZD_TEMP_MAX,
     AZD_TEMP_MIN,
@@ -24,6 +32,12 @@ from aioairzone.const import (
 )
 
 from homeassistant.components.climate import (
+    ATTR_TARGET_TEMP_HIGH,
+    ATTR_TARGET_TEMP_LOW,
+    FAN_AUTO,
+    FAN_HIGH,
+    FAN_LOW,
+    FAN_MEDIUM,
     ClimateEntity,
     ClimateEntityFeature,
     HVACAction,
@@ -39,12 +53,29 @@ from .const import API_TEMPERATURE_STEP, DOMAIN, TEMP_UNIT_LIB_TO_HASS
 from .coordinator import AirzoneUpdateCoordinator
 from .entity import AirzoneZoneEntity
 
-HVAC_ACTION_LIB_TO_HASS: Final[dict[OperationMode, HVACAction]] = {
-    OperationMode.STOP: HVACAction.OFF,
-    OperationMode.COOLING: HVACAction.COOLING,
-    OperationMode.HEATING: HVACAction.HEATING,
-    OperationMode.FAN: HVACAction.FAN,
-    OperationMode.DRY: HVACAction.DRYING,
+BASE_FAN_SPEEDS: Final[dict[int, str]] = {
+    0: FAN_AUTO,
+    1: FAN_LOW,
+}
+FAN_SPEED_MAPS: Final[dict[int, dict[int, str]]] = {
+    2: BASE_FAN_SPEEDS
+    | {
+        2: FAN_HIGH,
+    },
+    3: BASE_FAN_SPEEDS
+    | {
+        2: FAN_MEDIUM,
+        3: FAN_HIGH,
+    },
+}
+
+HVAC_ACTION_LIB_TO_HASS: Final[dict[OperationAction, HVACAction]] = {
+    OperationAction.COOLING: HVACAction.COOLING,
+    OperationAction.DRYING: HVACAction.DRYING,
+    OperationAction.FAN: HVACAction.FAN,
+    OperationAction.HEATING: HVACAction.HEATING,
+    OperationAction.IDLE: HVACAction.IDLE,
+    OperationAction.OFF: HVACAction.OFF,
 }
 HVAC_MODE_LIB_TO_HASS: Final[dict[OperationMode, HVACMode]] = {
     OperationMode.STOP: HVACMode.OFF,
@@ -83,6 +114,9 @@ async def async_setup_entry(
 class AirzoneClimate(AirzoneZoneEntity, ClimateEntity):
     """Define an Airzone sensor."""
 
+    _speeds: dict[int, str] = {}
+    _speeds_reverse: dict[str, int] = {}
+
     def __init__(
         self,
         coordinator: AirzoneUpdateCoordinator,
@@ -97,16 +131,45 @@ class AirzoneClimate(AirzoneZoneEntity, ClimateEntity):
         self._attr_unique_id = f"{self._attr_unique_id}_{system_zone_id}"
         self._attr_supported_features = ClimateEntityFeature.TARGET_TEMPERATURE
         self._attr_target_temperature_step = API_TEMPERATURE_STEP
-        self._attr_max_temp = self.get_airzone_value(AZD_TEMP_MAX)
-        self._attr_min_temp = self.get_airzone_value(AZD_TEMP_MIN)
         self._attr_temperature_unit = TEMP_UNIT_LIB_TO_HASS[
             self.get_airzone_value(AZD_TEMP_UNIT)
         ]
         self._attr_hvac_modes = [
             HVAC_MODE_LIB_TO_HASS[mode] for mode in self.get_airzone_value(AZD_MODES)
         ]
+        if (
+            self.get_airzone_value(AZD_SPEED) is not None
+            and self.get_airzone_value(AZD_SPEEDS) is not None
+        ):
+            self._set_fan_speeds()
+        if self.get_airzone_value(AZD_DOUBLE_SET_POINT):
+            self._attr_supported_features |= (
+                ClimateEntityFeature.TARGET_TEMPERATURE_RANGE
+            )
+
         self._async_update_attrs()
 
+    def _set_fan_speeds(self) -> None:
+        self._attr_supported_features |= ClimateEntityFeature.FAN_MODE
+
+        speeds = self.get_airzone_value(AZD_SPEEDS)
+        max_speed = max(speeds)
+        if _speeds := FAN_SPEED_MAPS.get(max_speed):
+            self._speeds = _speeds
+        else:
+            for speed in speeds:
+                if speed == 0:
+                    self._speeds[speed] = FAN_AUTO
+                else:
+                    self._speeds[speed] = f"{int(round((speed * 100) / max_speed, 0))}%"
+
+            self._speeds[1] = FAN_LOW
+            self._speeds[int(round((max_speed + 1) / 2, 0))] = FAN_MEDIUM
+            self._speeds[max_speed] = FAN_HIGH
+
+        self._speeds_reverse = {v: k for k, v in self._speeds.items()}
+        self._attr_fan_modes = list(self._speeds_reverse)
+
     async def async_turn_on(self) -> None:
         """Turn the entity on."""
         params = {
@@ -121,6 +184,13 @@ class AirzoneClimate(AirzoneZoneEntity, ClimateEntity):
         }
         await self._async_update_hvac_params(params)
 
+    async def async_set_fan_mode(self, fan_mode: str) -> None:
+        """Set fan mode."""
+        params = {
+            API_SPEED: self._speeds_reverse.get(fan_mode),
+        }
+        await self._async_update_hvac_params(params)
+
     async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
         """Set hvac mode."""
         params = {}
@@ -140,9 +210,12 @@ class AirzoneClimate(AirzoneZoneEntity, ClimateEntity):
 
     async def async_set_temperature(self, **kwargs: Any) -> None:
         """Set new target temperature."""
-        params = {
-            API_SET_POINT: kwargs.get(ATTR_TEMPERATURE),
-        }
+        params = {}
+        if ATTR_TEMPERATURE in kwargs:
+            params[API_SET_POINT] = kwargs[ATTR_TEMPERATURE]
+        if ATTR_TARGET_TEMP_LOW in kwargs and ATTR_TARGET_TEMP_HIGH in kwargs:
+            params[API_COOL_SET_POINT] = kwargs[ATTR_TARGET_TEMP_LOW]
+            params[API_HEAT_SET_POINT] = kwargs[ATTR_TARGET_TEMP_HIGH]
         await self._async_update_hvac_params(params)
 
     @callback
@@ -156,14 +229,24 @@ class AirzoneClimate(AirzoneZoneEntity, ClimateEntity):
         """Update climate attributes."""
         self._attr_current_temperature = self.get_airzone_value(AZD_TEMP)
         self._attr_current_humidity = self.get_airzone_value(AZD_HUMIDITY)
+        self._attr_hvac_action = HVAC_ACTION_LIB_TO_HASS[
+            self.get_airzone_value(AZD_ACTION)
+        ]
         if self.get_airzone_value(AZD_ON):
-            mode = self.get_airzone_value(AZD_MODE)
-            self._attr_hvac_mode = HVAC_MODE_LIB_TO_HASS[mode]
-            if self.get_airzone_value(AZD_DEMAND):
-                self._attr_hvac_action = HVAC_ACTION_LIB_TO_HASS[mode]
-            else:
-                self._attr_hvac_action = HVACAction.IDLE
+            self._attr_hvac_mode = HVAC_MODE_LIB_TO_HASS[
+                self.get_airzone_value(AZD_MODE)
+            ]
         else:
-            self._attr_hvac_action = HVACAction.OFF
             self._attr_hvac_mode = HVACMode.OFF
+        self._attr_max_temp = self.get_airzone_value(AZD_TEMP_MAX)
+        self._attr_min_temp = self.get_airzone_value(AZD_TEMP_MIN)
         self._attr_target_temperature = self.get_airzone_value(AZD_TEMP_SET)
+        if self.supported_features & ClimateEntityFeature.FAN_MODE:
+            self._attr_fan_mode = self._speeds.get(self.get_airzone_value(AZD_SPEED))
+        if self.supported_features & ClimateEntityFeature.TARGET_TEMPERATURE_RANGE:
+            self._attr_target_temperature_high = self.get_airzone_value(
+                AZD_HEAT_TEMP_SET
+            )
+            self._attr_target_temperature_low = self.get_airzone_value(
+                AZD_COOL_TEMP_SET
+            )

homeassistant/components/airzone/entity.py

@@ -7,6 +7,7 @@ from typing import Any
 from aioairzone.const import (
     API_SYSTEM_ID,
     API_ZONE_ID,
+    AZD_AVAILABLE,
     AZD_FIRMWARE,
     AZD_FULL_NAME,
     AZD_ID,
@@ -66,6 +67,11 @@ class AirzoneSystemEntity(AirzoneEntity):
         )
         self._attr_unique_id = entry.unique_id or entry.entry_id
 
+    @property
+    def available(self) -> bool:
+        """Return system availability."""
+        return super().available and self.get_airzone_value(AZD_AVAILABLE)
+
     def get_airzone_value(self, key: str) -> Any:
         """Return system value by key."""
         value = None
@@ -130,6 +136,11 @@ class AirzoneZoneEntity(AirzoneEntity):
         )
         self._attr_unique_id = entry.unique_id or entry.entry_id
 
+    @property
+    def available(self) -> bool:
+        """Return zone availability."""
+        return super().available and self.get_airzone_value(AZD_AVAILABLE)
+
     def get_airzone_value(self, key: str) -> Any:
         """Return zone value by key."""
         value = None

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

homeassistant/components/airzone/select.py

@@ -1,7 +1,7 @@
 """Support for the Airzone sensors."""
 from __future__ import annotations
 
-from dataclasses import dataclass, replace
+from dataclasses import dataclass
 from typing import Any, Final
 
 from aioairzone.common import GrilleAngle, SleepTimeout
@@ -41,14 +41,14 @@ class AirzoneSelectDescription(SelectEntityDescription, AirzoneSelectDescription
 
 
 GRILLE_ANGLE_DICT: Final[dict[str, int]] = {
-    "90º": GrilleAngle.DEG_90,
-    "50º": GrilleAngle.DEG_50,
-    "45º": GrilleAngle.DEG_45,
-    "40º": GrilleAngle.DEG_40,
+    "90deg": GrilleAngle.DEG_90,
+    "50deg": GrilleAngle.DEG_50,
+    "45deg": GrilleAngle.DEG_45,
+    "40deg": GrilleAngle.DEG_40,
 }
 
 SLEEP_DICT: Final[dict[str, int]] = {
-    "Off": SleepTimeout.SLEEP_OFF,
+    "off": SleepTimeout.SLEEP_OFF,
     "30m": SleepTimeout.SLEEP_30,
     "60m": SleepTimeout.SLEEP_60,
     "90m": SleepTimeout.SLEEP_90,
@@ -61,21 +61,27 @@ ZONE_SELECT_TYPES: Final[tuple[AirzoneSelectDescription, ...]] = (
         entity_category=EntityCategory.CONFIG,
         key=AZD_COLD_ANGLE,
         name="Cold Angle",
+        options=list(GRILLE_ANGLE_DICT),
         options_dict=GRILLE_ANGLE_DICT,
+        translation_key="grille_angles",
     ),
     AirzoneSelectDescription(
         api_param=API_HEAT_ANGLE,
         entity_category=EntityCategory.CONFIG,
         key=AZD_HEAT_ANGLE,
         name="Heat Angle",
+        options=list(GRILLE_ANGLE_DICT),
         options_dict=GRILLE_ANGLE_DICT,
+        translation_key="grille_angles",
     ),
     AirzoneSelectDescription(
         api_param=API_SLEEP,
         entity_category=EntityCategory.CONFIG,
         key=AZD_SLEEP,
         name="Sleep",
+        options=list(SLEEP_DICT),
         options_dict=SLEEP_DICT,
+        translation_key="sleep_times",
     ),
 )
 
@@ -91,14 +97,10 @@ async def async_setup_entry(
     for system_zone_id, zone_data in coordinator.data[AZD_ZONES].items():
         for description in ZONE_SELECT_TYPES:
             if description.key in zone_data:
-                _desc = replace(
-                    description,
-                    options=list(description.options_dict.keys()),
-                )
                 entities.append(
                     AirzoneZoneSelect(
                         coordinator,
-                        _desc,
+                        description,
                         entry,
                         system_zone_id,
                         zone_data,

homeassistant/components/airzone/strings.json

@@ -23,5 +23,25 @@
         }
       }
     }
+  },
+  "entity": {
+    "select": {
+      "grille_angles": {
+        "state": {
+          "90deg": "90°",
+          "50deg": "50°",
+          "45deg": "45°",
+          "40deg": "40°"
+        }
+      },
+      "sleep_times": {
+        "state": {
+          "off": "[%key:common::state::off%]",
+          "30m": "30 minutes",
+          "60m": "60 minutes",
+          "90m": "90 minutes"
+        }
+      }
+    }
   }
 }

homeassistant/components/airzone_cloud/__init__.py

@@ -0,0 +1,48 @@
+"""The Airzone Cloud integration."""
+from __future__ import annotations
+
+from aioairzone_cloud.cloudapi import AirzoneCloudApi
+from aioairzone_cloud.common import ConnectionOptions
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_ID, CONF_PASSWORD, CONF_USERNAME, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import aiohttp_client
+
+from .const import DOMAIN
+from .coordinator import AirzoneUpdateCoordinator
+
+PLATFORMS: list[Platform] = [Platform.SENSOR]
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Set up Airzone Cloud from a config entry."""
+    options = ConnectionOptions(
+        entry.data[CONF_USERNAME],
+        entry.data[CONF_PASSWORD],
+    )
+
+    airzone = AirzoneCloudApi(aiohttp_client.async_get_clientsession(hass), options)
+    await airzone.login()
+    inst_list = await airzone.list_installations()
+    for inst in inst_list:
+        if inst.get_id() == entry.data[CONF_ID]:
+            airzone.select_installation(inst)
+            await airzone.update_installation(inst)
+
+    coordinator = AirzoneUpdateCoordinator(hass, airzone)
+    await coordinator.async_config_entry_first_refresh()
+
+    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
+
+    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+
+    return True
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Unload a config entry."""
+    if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
+        hass.data[DOMAIN].pop(entry.entry_id)
+
+    return unload_ok

homeassistant/components/airzone_cloud/config_flow.py

@@ -0,0 +1,116 @@
+"""Config flow for Airzone Cloud."""
+from __future__ import annotations
+
+from typing import Any
+
+from aioairzone_cloud.cloudapi import AirzoneCloudApi
+from aioairzone_cloud.common import ConnectionOptions
+from aioairzone_cloud.const import AZD_ID, AZD_NAME, AZD_WEBSERVERS
+from aioairzone_cloud.exceptions import AirzoneCloudError, LoginError
+import voluptuous as vol
+
+from homeassistant import config_entries
+from homeassistant.const import CONF_ID, CONF_PASSWORD, CONF_USERNAME
+from homeassistant.data_entry_flow import FlowResult
+from homeassistant.helpers import aiohttp_client
+from homeassistant.helpers.selector import (
+    SelectOptionDict,
+    SelectSelector,
+    SelectSelectorConfig,
+    SelectSelectorMode,
+)
+
+from .const import DOMAIN
+
+
+class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
+    """Handle config flow for an Airzone Cloud device."""
+
+    airzone: AirzoneCloudApi
+
+    async def async_step_inst_pick(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """Handle the installation selection."""
+        errors = {}
+        options: dict[str, str] = {}
+
+        inst_desc = None
+        inst_id = None
+        if user_input is not None:
+            inst_id = user_input[CONF_ID]
+
+        try:
+            inst_list = await self.airzone.list_installations()
+        except AirzoneCloudError:
+            errors["base"] = "cannot_connect"
+        else:
+            for inst in inst_list:
+                _data = inst.data()
+                _id = _data[AZD_ID]
+                options[_id] = f"{_data[AZD_NAME]} {_data[AZD_WEBSERVERS][0]} ({_id})"
+                if _id is not None and _id == inst_id:
+                    inst_desc = options[_id]
+
+        if user_input is not None and inst_desc is not None:
+            await self.async_set_unique_id(inst_id)
+            self._abort_if_unique_id_configured()
+
+            user_input[CONF_USERNAME] = self.airzone.options.username
+            user_input[CONF_PASSWORD] = self.airzone.options.password
+
+            return self.async_create_entry(title=inst_desc, data=user_input)
+
+        return self.async_show_form(
+            step_id="user",
+            data_schema=vol.Schema(
+                {
+                    vol.Required(CONF_ID): SelectSelector(
+                        SelectSelectorConfig(
+                            options=[
+                                SelectOptionDict(value=k, label=v)
+                                for k, v in options.items()
+                            ],
+                            mode=SelectSelectorMode.DROPDOWN,
+                        )
+                    ),
+                }
+            ),
+            errors=errors,
+        )
+
+    async def async_step_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """Handle the initial step."""
+        errors = {}
+
+        if user_input is not None:
+            if CONF_ID in user_input:
+                return await self.async_step_inst_pick(user_input)
+
+            self.airzone = AirzoneCloudApi(
+                aiohttp_client.async_get_clientsession(self.hass),
+                ConnectionOptions(
+                    user_input[CONF_USERNAME],
+                    user_input[CONF_PASSWORD],
+                ),
+            )
+
+            try:
+                await self.airzone.login()
+            except (AirzoneCloudError, LoginError):
+                errors["base"] = "cannot_connect"
+            else:
+                return await self.async_step_inst_pick()
+
+        return self.async_show_form(
+            step_id="user",
+            data_schema=vol.Schema(
+                {
+                    vol.Required(CONF_USERNAME): str,
+                    vol.Required(CONF_PASSWORD): str,
+                }
+            ),
+            errors=errors,
+        )

homeassistant/components/airzone_cloud/const.py

@@ -0,0 +1,8 @@
+"""Constants for the Airzone Cloud integration."""
+
+from typing import Final
+
+DOMAIN: Final[str] = "airzone_cloud"
+MANUFACTURER: Final[str] = "Airzone"
+
+AIOAIRZONE_CLOUD_TIMEOUT_SEC: Final[int] = 30

homeassistant/components/airzone_cloud/coordinator.py

@@ -0,0 +1,43 @@
+"""The Airzone Cloud integration coordinator."""
+from __future__ import annotations
+
+from datetime import timedelta
+import logging
+from typing import Any
+
+from aioairzone_cloud.cloudapi import AirzoneCloudApi
+from aioairzone_cloud.exceptions import AirzoneCloudError
+import async_timeout
+
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+
+from .const import AIOAIRZONE_CLOUD_TIMEOUT_SEC, DOMAIN
+
+SCAN_INTERVAL = timedelta(seconds=60)
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class AirzoneUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
+    """Class to manage fetching data from the Airzone Cloud device."""
+
+    def __init__(self, hass: HomeAssistant, airzone: AirzoneCloudApi) -> None:
+        """Initialize."""
+        self.airzone = airzone
+
+        super().__init__(
+            hass,
+            _LOGGER,
+            name=DOMAIN,
+            update_interval=SCAN_INTERVAL,
+        )
+
+    async def _async_update_data(self) -> dict[str, Any]:
+        """Update data via library."""
+        async with async_timeout.timeout(AIOAIRZONE_CLOUD_TIMEOUT_SEC):
+            try:
+                await self.airzone.update()
+            except AirzoneCloudError as error:
+                raise UpdateFailed(error) from error
+            return self.airzone.data()

homeassistant/components/airzone_cloud/diagnostics.py

@@ -0,0 +1,144 @@
+"""Support for the Airzone Cloud diagnostics."""
+from __future__ import annotations
+
+from collections.abc import Mapping
+from typing import Any
+
+from aioairzone_cloud.const import (
+    API_CITY,
+    API_GROUP_ID,
+    API_LOCATION_ID,
+    API_OLD_ID,
+    API_PIN,
+    API_STAT_AP_MAC,
+    API_STAT_SSID,
+    API_USER_ID,
+    AZD_WIFI_MAC,
+    RAW_DEVICES_STATUS,
+    RAW_INSTALLATIONS,
+    RAW_WEBSERVERS,
+)
+
+from homeassistant.components.diagnostics.util import async_redact_data
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
+from homeassistant.core import HomeAssistant
+
+from .const import DOMAIN
+from .coordinator import AirzoneUpdateCoordinator
+
+TO_REDACT_API = [
+    API_CITY,
+    API_GROUP_ID,
+    API_LOCATION_ID,
+    API_OLD_ID,
+    API_PIN,
+    API_STAT_AP_MAC,
+    API_STAT_SSID,
+    API_USER_ID,
+]
+
+TO_REDACT_CONFIG = [
+    CONF_PASSWORD,
+    CONF_USERNAME,
+]
+
+TO_REDACT_COORD = [
+    AZD_WIFI_MAC,
+]
+
+
+def gather_ids(api_data: dict[str, Any]) -> dict[str, Any]:
+    """Return dict with IDs."""
+    ids: dict[str, Any] = {}
+
+    dev_idx = 1
+    for dev_id in api_data[RAW_DEVICES_STATUS]:
+        if dev_id not in ids:
+            ids[dev_id] = f"device{dev_idx}"
+            dev_idx += 1
+
+    inst_idx = 1
+    for inst_id in api_data[RAW_INSTALLATIONS]:
+        if inst_id not in ids:
+            ids[inst_id] = f"installation{inst_idx}"
+            inst_idx += 1
+
+    ws_idx = 1
+    for ws_id in api_data[RAW_WEBSERVERS]:
+        if ws_id not in ids:
+            ids[ws_id] = f"webserver{ws_idx}"
+            ws_idx += 1
+
+    return ids
+
+
+def redact_keys(data: Any, ids: dict[str, Any]) -> Any:
+    """Redact sensitive keys in a dict."""
+    if not isinstance(data, (Mapping, list)):
+        return data
+
+    if isinstance(data, list):
+        return [redact_keys(val, ids) for val in data]
+
+    redacted = {**data}
+
+    keys = list(redacted)
+    for key in keys:
+        if key in ids:
+            redacted[ids[key]] = redacted.pop(key)
+        elif isinstance(redacted[key], Mapping):
+            redacted[key] = redact_keys(redacted[key], ids)
+        elif isinstance(redacted[key], list):
+            redacted[key] = [redact_keys(item, ids) for item in redacted[key]]
+
+    return redacted
+
+
+def redact_values(data: Any, ids: dict[str, Any]) -> Any:
+    """Redact sensitive values in a dict."""
+    if not isinstance(data, (Mapping, list)):
+        if data in ids:
+            return ids[data]
+        return data
+
+    if isinstance(data, list):
+        return [redact_values(val, ids) for val in data]
+
+    redacted = {**data}
+
+    for key, value in redacted.items():
+        if value is None:
+            continue
+        if isinstance(value, Mapping):
+            redacted[key] = redact_values(value, ids)
+        elif isinstance(value, list):
+            redacted[key] = [redact_values(item, ids) for item in value]
+        elif value in ids:
+            redacted[key] = ids[value]
+
+    return redacted
+
+
+def redact_all(
+    data: dict[str, Any], ids: dict[str, Any], to_redact: list[str]
+) -> dict[str, Any]:
+    """Redact sensitive data."""
+    _data = redact_keys(data, ids)
+    _data = redact_values(_data, ids)
+    return async_redact_data(_data, to_redact)
+
+
+async def async_get_config_entry_diagnostics(
+    hass: HomeAssistant, config_entry: ConfigEntry
+) -> dict[str, Any]:
+    """Return diagnostics for a config entry."""
+    coordinator: AirzoneUpdateCoordinator = hass.data[DOMAIN][config_entry.entry_id]
+    raw_data = coordinator.airzone.raw_data()
+    ids = gather_ids(raw_data)
+
+    return {
+        "api_data": redact_all(raw_data, ids, TO_REDACT_API),
+        "config_entry": redact_all(config_entry.as_dict(), ids, TO_REDACT_CONFIG),
+        "coord_data": redact_all(coordinator.data, ids, TO_REDACT_COORD),
+    }

homeassistant/components/airzone_cloud/entity.py

@@ -0,0 +1,129 @@
+"""Entity classes for the Airzone Cloud integration."""
+from __future__ import annotations
+
+from abc import ABC, abstractmethod
+from typing import Any
+
+from aioairzone_cloud.const import (
+    AZD_AIDOOS,
+    AZD_AVAILABLE,
+    AZD_FIRMWARE,
+    AZD_NAME,
+    AZD_SYSTEM_ID,
+    AZD_WEBSERVER,
+    AZD_WEBSERVERS,
+    AZD_ZONES,
+)
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.helpers import device_registry as dr
+from homeassistant.helpers.entity import DeviceInfo
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
+
+from .const import DOMAIN, MANUFACTURER
+from .coordinator import AirzoneUpdateCoordinator
+
+
+class AirzoneEntity(CoordinatorEntity[AirzoneUpdateCoordinator], ABC):
+    """Define an Airzone Cloud entity."""
+
+    @property
+    def available(self) -> bool:
+        """Return Airzone Cloud entity availability."""
+        return super().available and self.get_airzone_value(AZD_AVAILABLE)
+
+    @abstractmethod
+    def get_airzone_value(self, key: str) -> Any:
+        """Return Airzone Cloud entity value by key."""
+
+
+class AirzoneAidooEntity(AirzoneEntity):
+    """Define an Airzone Cloud Aidoo entity."""
+
+    def __init__(
+        self,
+        coordinator: AirzoneUpdateCoordinator,
+        entry: ConfigEntry,
+        aidoo_id: str,
+        aidoo_data: dict[str, Any],
+    ) -> None:
+        """Initialize."""
+        super().__init__(coordinator)
+
+        self.aidoo_id = aidoo_id
+
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, aidoo_id)},
+            manufacturer=MANUFACTURER,
+            name=aidoo_data[AZD_NAME],
+            via_device=(DOMAIN, aidoo_data[AZD_WEBSERVER]),
+        )
+
+    def get_airzone_value(self, key: str) -> Any:
+        """Return Aidoo value by key."""
+        value = None
+        if aidoo := self.coordinator.data[AZD_AIDOOS].get(self.aidoo_id):
+            value = aidoo.get(key)
+        return value
+
+
+class AirzoneWebServerEntity(AirzoneEntity):
+    """Define an Airzone Cloud WebServer entity."""
+
+    def __init__(
+        self,
+        coordinator: AirzoneUpdateCoordinator,
+        entry: ConfigEntry,
+        ws_id: str,
+        ws_data: dict[str, Any],
+    ) -> None:
+        """Initialize."""
+        super().__init__(coordinator)
+
+        self.ws_id = ws_id
+
+        self._attr_device_info = DeviceInfo(
+            connections={(dr.CONNECTION_NETWORK_MAC, ws_id)},
+            identifiers={(DOMAIN, ws_id)},
+            manufacturer=MANUFACTURER,
+            name=f"WebServer {ws_id}",
+            sw_version=ws_data[AZD_FIRMWARE],
+        )
+
+    def get_airzone_value(self, key: str) -> Any:
+        """Return WebServer value by key."""
+        value = None
+        if webserver := self.coordinator.data[AZD_WEBSERVERS].get(self.ws_id):
+            value = webserver.get(key)
+        return value
+
+
+class AirzoneZoneEntity(AirzoneEntity):
+    """Define an Airzone Cloud Zone entity."""
+
+    def __init__(
+        self,
+        coordinator: AirzoneUpdateCoordinator,
+        entry: ConfigEntry,
+        zone_id: str,
+        zone_data: dict[str, Any],
+    ) -> None:
+        """Initialize."""
+        super().__init__(coordinator)
+
+        self.system_id = zone_data[AZD_SYSTEM_ID]
+        self.zone_id = zone_id
+
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, zone_id)},
+            manufacturer=MANUFACTURER,
+            name=zone_data[AZD_NAME],
+            via_device=(DOMAIN, self.system_id),
+        )
+
+    def get_airzone_value(self, key: str) -> Any:
+        """Return zone value by key."""
+        value = None
+        if zone := self.coordinator.data[AZD_ZONES].get(self.zone_id):
+            value = zone.get(key)
+        return value

homeassistant/components/airzone_cloud/manifest.json

@@ -0,0 +1,10 @@
+{
+  "domain": "airzone_cloud",
+  "name": "Airzone Cloud",
+  "codeowners": ["@Noltari"],
+  "config_flow": true,
+  "documentation": "https://www.home-assistant.io/integrations/airzone_cloud",
+  "iot_class": "cloud_polling",
+  "loggers": ["aioairzone_cloud"],
+  "requirements": ["aioairzone-cloud==0.1.8"]
+}

homeassistant/components/airzone_cloud/sensor.py

@@ -0,0 +1,209 @@
+"""Support for the Airzone Cloud sensors."""
+from __future__ import annotations
+
+from typing import Any, Final
+
+from aioairzone_cloud.const import (
+    AZD_AIDOOS,
+    AZD_HUMIDITY,
+    AZD_NAME,
+    AZD_TEMP,
+    AZD_WEBSERVERS,
+    AZD_WIFI_RSSI,
+    AZD_ZONES,
+)
+
+from homeassistant.components.sensor import (
+    SensorDeviceClass,
+    SensorEntity,
+    SensorEntityDescription,
+    SensorStateClass,
+)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import (
+    PERCENTAGE,
+    SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
+    EntityCategory,
+    UnitOfTemperature,
+)
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+
+from .const import DOMAIN
+from .coordinator import AirzoneUpdateCoordinator
+from .entity import (
+    AirzoneAidooEntity,
+    AirzoneEntity,
+    AirzoneWebServerEntity,
+    AirzoneZoneEntity,
+)
+
+AIDOO_SENSOR_TYPES: Final[tuple[SensorEntityDescription, ...]] = (
+    SensorEntityDescription(
+        device_class=SensorDeviceClass.TEMPERATURE,
+        key=AZD_TEMP,
+        name="Temperature",
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+)
+
+WEBSERVER_SENSOR_TYPES: Final[tuple[SensorEntityDescription, ...]] = (
+    SensorEntityDescription(
+        device_class=SensorDeviceClass.SIGNAL_STRENGTH,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        entity_registry_enabled_default=False,
+        has_entity_name=True,
+        key=AZD_WIFI_RSSI,
+        name="RSSI",
+        native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+)
+
+ZONE_SENSOR_TYPES: Final[tuple[SensorEntityDescription, ...]] = (
+    SensorEntityDescription(
+        device_class=SensorDeviceClass.TEMPERATURE,
+        key=AZD_TEMP,
+        name="Temperature",
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    SensorEntityDescription(
+        device_class=SensorDeviceClass.HUMIDITY,
+        key=AZD_HUMIDITY,
+        name="Humidity",
+        native_unit_of_measurement=PERCENTAGE,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+) -> None:
+    """Add Airzone Cloud sensors from a config_entry."""
+    coordinator: AirzoneUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
+
+    sensors: list[AirzoneSensor] = []
+
+    # Aidoos
+    for aidoo_id, aidoo_data in coordinator.data.get(AZD_AIDOOS, {}).items():
+        for description in AIDOO_SENSOR_TYPES:
+            if description.key in aidoo_data:
+                sensors.append(
+                    AirzoneAidooSensor(
+                        coordinator,
+                        description,
+                        entry,
+                        aidoo_id,
+                        aidoo_data,
+                    )
+                )
+
+    # WebServers
+    for ws_id, ws_data in coordinator.data.get(AZD_WEBSERVERS, {}).items():
+        for description in WEBSERVER_SENSOR_TYPES:
+            if description.key in ws_data:
+                sensors.append(
+                    AirzoneWebServerSensor(
+                        coordinator,
+                        description,
+                        entry,
+                        ws_id,
+                        ws_data,
+                    )
+                )
+
+    # Zones
+    for zone_id, zone_data in coordinator.data.get(AZD_ZONES, {}).items():
+        for description in ZONE_SENSOR_TYPES:
+            if description.key in zone_data:
+                sensors.append(
+                    AirzoneZoneSensor(
+                        coordinator,
+                        description,
+                        entry,
+                        zone_id,
+                        zone_data,
+                    )
+                )
+
+    async_add_entities(sensors)
+
+
+class AirzoneSensor(AirzoneEntity, SensorEntity):
+    """Define an Airzone Cloud sensor."""
+
+    @callback
+    def _handle_coordinator_update(self) -> None:
+        """Update attributes when the coordinator updates."""
+        self._async_update_attrs()
+        super()._handle_coordinator_update()
+
+    @callback
+    def _async_update_attrs(self) -> None:
+        """Update sensor attributes."""
+        self._attr_native_value = self.get_airzone_value(self.entity_description.key)
+
+
+class AirzoneAidooSensor(AirzoneAidooEntity, AirzoneSensor):
+    """Define an Airzone Cloud Aidoo sensor."""
+
+    def __init__(
+        self,
+        coordinator: AirzoneUpdateCoordinator,
+        description: SensorEntityDescription,
+        entry: ConfigEntry,
+        aidoo_id: str,
+        aidoo_data: dict[str, Any],
+    ) -> None:
+        """Initialize."""
+        super().__init__(coordinator, entry, aidoo_id, aidoo_data)
+
+        self._attr_name = f"{aidoo_data[AZD_NAME]} {description.name}"
+        self._attr_unique_id = f"{aidoo_id}_{description.key}"
+        self.entity_description = description
+
+        self._async_update_attrs()
+
+
+class AirzoneWebServerSensor(AirzoneWebServerEntity, AirzoneSensor):
+    """Define an Airzone Cloud WebServer sensor."""
+
+    def __init__(
+        self,
+        coordinator: AirzoneUpdateCoordinator,
+        description: SensorEntityDescription,
+        entry: ConfigEntry,
+        ws_id: str,
+        ws_data: dict[str, Any],
+    ) -> None:
+        """Initialize."""
+        super().__init__(coordinator, entry, ws_id, ws_data)
+
+        self._attr_unique_id = f"{ws_id}_{description.key}"
+        self.entity_description = description
+
+        self._async_update_attrs()
+
+
+class AirzoneZoneSensor(AirzoneZoneEntity, AirzoneSensor):
+    """Define an Airzone Cloud Zone sensor."""
+
+    def __init__(
+        self,
+        coordinator: AirzoneUpdateCoordinator,
+        description: SensorEntityDescription,
+        entry: ConfigEntry,
+        zone_id: str,
+        zone_data: dict[str, Any],
+    ) -> None:
+        """Initialize."""
+        super().__init__(coordinator, entry, zone_id, zone_data)
+
+        self._attr_name = f"{zone_data[AZD_NAME]} {description.name}"
+        self._attr_unique_id = f"{zone_id}_{description.key}"
+        self.entity_description = description
+
+        self._async_update_attrs()

homeassistant/components/airzone_cloud/strings.json

@@ -0,0 +1,19 @@
+{
+  "config": {
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
+    },
+    "step": {
+      "user": {
+        "data": {
+          "id": "Installation",
+          "username": "[%key:common::config_flow::data::username%]",
+          "password": "[%key:common::config_flow::data::password%]"
+        }
+      }
+    }
+  }
+}

homeassistant/components/aladdin_connect/cover.py

@@ -89,15 +89,9 @@ class AladdinDevice(CoverEntity):
             await self._acc.get_doors(self._serial)
             self._attr_available = True
 
-        except session_manager.ConnectionError:
+        except (session_manager.ConnectionError, session_manager.InvalidPasswordError):
             self._attr_available = False
 
-        except session_manager.InvalidPasswordError:
-            self._attr_available = False
-            await self.hass.async_create_task(
-                self.hass.config_entries.async_reload(self._entry_id)
-            )
-
     @property
     def is_closed(self) -> bool | None:
         """Update is closed attribute."""

homeassistant/components/alarm_control_panel/strings.json

@@ -62,5 +62,11 @@
         }
       }
     }
+  },
+  "issues": {
+    "platform_integration_no_support": {
+      "title": "[%key:common::issues::platform_integration_no_support_title%]",
+      "description": "[%key:common::issues::platform_integration_no_support_description%]"
+    }
   }
 }

homeassistant/components/alert/__init__.py

@@ -25,7 +25,7 @@ from homeassistant.const import (
     STATE_OFF,
     STATE_ON,
 )
-from homeassistant.core import Event, HomeAssistant
+from homeassistant.core import Event, HassJob, HomeAssistant
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.entity_component import EntityComponent
@@ -237,7 +237,13 @@ class Alert(Entity):
         """Schedule a notification."""
         delay = self._delay[self._next_delay]
         next_msg = now() + delay
-        self._cancel = async_track_point_in_time(self.hass, self._notify, next_msg)
+        self._cancel = async_track_point_in_time(
+            self.hass,
+            HassJob(
+                self._notify, name="Schedule notify alert", cancel_on_shutdown=True
+            ),
+            next_msg,
+        )
         self._next_delay = min(self._next_delay + 1, len(self._delay) - 1)
 
     async def _notify(self, *args: Any) -> None:

homeassistant/components/alexa/auth.py

@@ -12,7 +12,7 @@ from homeassistant.const import CONF_CLIENT_ID, CONF_CLIENT_SECRET
 from homeassistant.core import callback
 from homeassistant.helpers import aiohttp_client
 from homeassistant.helpers.storage import Store
-from homeassistant.util import dt
+from homeassistant.util import dt as dt_util
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -95,12 +95,12 @@ class Auth:
         if not self._prefs[STORAGE_ACCESS_TOKEN]:
             return False
 
-        expire_time = dt.parse_datetime(self._prefs[STORAGE_EXPIRE_TIME])
+        expire_time = dt_util.parse_datetime(self._prefs[STORAGE_EXPIRE_TIME])
         preemptive_expire_time = expire_time - timedelta(
             seconds=PREEMPTIVE_REFRESH_TTL_IN_SECONDS
         )
 
-        return dt.utcnow() < preemptive_expire_time
+        return dt_util.utcnow() < preemptive_expire_time
 
     async def _async_request_new_token(self, lwa_params):
         try:
@@ -130,7 +130,7 @@ class Auth:
         access_token = response_json["access_token"]
         refresh_token = response_json["refresh_token"]
         expires_in = response_json["expires_in"]
-        expire_time = dt.utcnow() + timedelta(seconds=expires_in)
+        expire_time = dt_util.utcnow() + timedelta(seconds=expires_in)
 
         await self._async_update_preferences(
             access_token, refresh_token, expire_time.isoformat()

homeassistant/components/alexa/config.py

@@ -1,9 +1,11 @@
 """Config helpers for Alexa."""
+from __future__ import annotations
+
 from abc import ABC, abstractmethod
 import asyncio
 import logging
 
-from homeassistant.core import CALLBACK_TYPE, callback
+from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback
 from homeassistant.helpers.storage import Store
 
 from .const import DOMAIN
@@ -17,14 +19,15 @@ _LOGGER = logging.getLogger(__name__)
 class AbstractConfig(ABC):
     """Hold the configuration for Alexa."""
 
-    _unsub_proactive_report: asyncio.Task[CALLBACK_TYPE] | None = None
+    _store: AlexaConfigStore
+    _unsub_proactive_report: CALLBACK_TYPE | None = None
 
-    def __init__(self, hass):
+    def __init__(self, hass: HomeAssistant) -> None:
         """Initialize abstract config."""
         self.hass = hass
-        self._store = None
+        self._enable_proactive_mode_lock = asyncio.Lock()
 
-    async def async_initialize(self):
+    async def async_initialize(self) -> None:
         """Perform async initialization of config."""
         self._store = AlexaConfigStore(self.hass)
         await self._store.async_load()
@@ -64,23 +67,20 @@ class AbstractConfig(ABC):
     def user_identifier(self):
         """Return an identifier for the user that represents this config."""
 
-    async def async_enable_proactive_mode(self):
+    async def async_enable_proactive_mode(self) -> None:
         """Enable proactive mode."""
         _LOGGER.debug("Enable proactive mode")
-        if self._unsub_proactive_report is None:
-            self._unsub_proactive_report = self.hass.async_create_task(
-                async_enable_proactive_mode(self.hass, self)
+        async with self._enable_proactive_mode_lock:
+            if self._unsub_proactive_report is not None:
+                return
+            self._unsub_proactive_report = await async_enable_proactive_mode(
+                self.hass, self
             )
-        try:
-            await self._unsub_proactive_report
-        except Exception:
-            self._unsub_proactive_report = None
-            raise
 
-    async def async_disable_proactive_mode(self):
+    async def async_disable_proactive_mode(self) -> None:
         """Disable proactive mode."""
         _LOGGER.debug("Disable proactive mode")
-        if unsub_func := await self._unsub_proactive_report:
+        if unsub_func := self._unsub_proactive_report:
             unsub_func()
         self._unsub_proactive_report = None
 
@@ -107,7 +107,7 @@ class AbstractConfig(ABC):
         """Return authorization status."""
         return self._store.authorized
 
-    async def set_authorized(self, authorized):
+    async def set_authorized(self, authorized) -> None:
         """Set authorization status.
 
         - Set when an incoming message is received from Alexa.

homeassistant/components/alexa/intent.py

@@ -1,6 +1,7 @@
 """Support for Alexa skill service end point."""
 import enum
 import logging
+from typing import Any
 
 from homeassistant.components import http
 from homeassistant.core import callback
@@ -180,12 +181,15 @@ async def async_handle_intent(hass, message):
     return alexa_response.as_dict()
 
 
-def resolve_slot_synonyms(key, request):
+def resolve_slot_data(key: str, request: dict[str, Any]) -> dict[str, str]:
     """Check slot request for synonym resolutions."""
-    # Default to the spoken slot value if more than one or none are found. For
+    # Default to the spoken slot value if more than one or none are found. Always
+    # passes the id and name of the nearest possible slot resolution. For
     # reference to the request object structure, see the Alexa docs:
     # https://tinyurl.com/ybvm7jhs
-    resolved_value = request["value"]
+    resolved_data = {}
+    resolved_data["value"] = request["value"]
+    resolved_data["id"] = ""
 
     if (
         "resolutions" in request
@@ -200,20 +204,26 @@ def resolve_slot_synonyms(key, request):
             if entry["status"]["code"] != SYN_RESOLUTION_MATCH:
                 continue
 
-            possible_values.extend([item["value"]["name"] for item in entry["values"]])
+            possible_values.extend([item["value"] for item in entry["values"]])
+
+        # Always set id if available, otherwise an empty string is used as id
+        if len(possible_values) >= 1:
+            # Set ID if available
+            if "id" in possible_values[0]:
+                resolved_data["id"] = possible_values[0]["id"]
 
         # If there is only one match use the resolved value, otherwise the
-        # resolution cannot be determined, so use the spoken slot value
+        # resolution cannot be determined, so use the spoken slot value and empty string as id
         if len(possible_values) == 1:
-            resolved_value = possible_values[0]
+            resolved_data["value"] = possible_values[0]["name"]
         else:
             _LOGGER.debug(
                 "Found multiple synonym resolutions for slot value: {%s: %s}",
                 key,
-                resolved_value,
+                resolved_data["value"],
             )
 
-    return resolved_value
+    return resolved_data
 
 
 class AlexaResponse:
@@ -237,8 +247,10 @@ class AlexaResponse:
                     continue
 
                 _key = key.replace(".", "_")
+                _slot_data = resolve_slot_data(key, value)
 
-                self.variables[_key] = resolve_slot_synonyms(key, value)
+                self.variables[_key] = _slot_data["value"]
+                self.variables[_key + "_Id"] = _slot_data["id"]
 
     def add_card(self, card_type, title, content):
         """Add a card to the response."""

homeassistant/components/alexa/smart_home_http.py

@@ -60,6 +60,7 @@ class AlexaConfig(AbstractConfig):
         """Return an identifier for the user that represents this config."""
         return ""
 
+    @core.callback
     def should_expose(self, entity_id):
         """If an entity should be exposed."""
         if not self._config[CONF_FILTER].empty_filter:

homeassistant/components/alexa/state_report.py

@@ -5,7 +5,7 @@ import asyncio
 from http import HTTPStatus
 import json
 import logging
-from typing import cast
+from typing import TYPE_CHECKING, cast
 
 import aiohttp
 import async_timeout
@@ -23,6 +23,9 @@ from .entities import ENTITY_ADAPTERS, AlexaEntity, generate_alexa_id
 from .errors import NoTokenAvailable, RequireRelink
 from .messages import AlexaResponse
 
+if TYPE_CHECKING:
+    from .config import AbstractConfig
+
 _LOGGER = logging.getLogger(__name__)
 DEFAULT_TIMEOUT = 10
 
@@ -188,7 +191,9 @@ async def async_send_changereport_message(
     )
 
 
-async def async_send_add_or_update_message(hass, config, entity_ids):
+async def async_send_add_or_update_message(
+    hass: HomeAssistant, config: AbstractConfig, entity_ids: list[str]
+) -> aiohttp.ClientResponse:
     """Send an AddOrUpdateReport message for entities.
 
     https://developer.amazon.com/docs/device-apis/alexa-discovery.html#add-or-update-report
@@ -223,7 +228,9 @@ async def async_send_add_or_update_message(hass, config, entity_ids):
     )
 
 
-async def async_send_delete_message(hass, config, entity_ids):
+async def async_send_delete_message(
+    hass: HomeAssistant, config: AbstractConfig, entity_ids: list[str]
+) -> aiohttp.ClientResponse:
     """Send an DeleteReport message for entities.
 
     https://developer.amazon.com/docs/device-apis/alexa-discovery.html#deletereport-event

homeassistant/components/amazon_polly/tts.py

@@ -167,12 +167,9 @@ class AmazonPollyProvider(Provider):
         self,
         message: str,
         language: str,
-        options: dict[str, Any] | None = None,
+        options: dict[str, Any],
     ) -> TtsAudioType:
         """Request TTS file from Polly."""
-        if options is None or language is None:
-            _LOGGER.debug("language and/or options were missing")
-            return None, None
         voice_id = options.get(CONF_VOICE, self.default_voice)
         voice_in_dict = self.all_voices[voice_id]
         if language != voice_in_dict.get("LanguageCode"):

homeassistant/components/ambiclimate/climate.py

@@ -98,7 +98,7 @@ async def async_setup_entry(
 
     tasks = []
     for heater in data_connection.get_devices():
-        tasks.append(heater.update_device_info())
+        tasks.append(asyncio.create_task(heater.update_device_info()))
     await asyncio.wait(tasks)
 
     devs = []

homeassistant/components/ambient_station/__init__.py

@@ -117,7 +117,6 @@ async def async_migrate_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         en_reg.async_clear_config_entry(entry.entry_id)
 
         version = entry.version = 2
-        hass.config_entries.async_update_entry(entry)
 
     LOGGER.info("Migration to version %s successful", version)
 

homeassistant/components/ambient_station/manifest.json

@@ -7,5 +7,5 @@
   "integration_type": "hub",
   "iot_class": "cloud_push",
   "loggers": ["aioambient"],
-  "requirements": ["aioambient==2021.11.0"]
+  "requirements": ["aioambient==2023.04.0"]
 }

homeassistant/components/ampio/air_quality.py

@@ -19,7 +19,7 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import Throttle
 
-from .const import ATTRIBUTION, CONF_STATION_ID, SCAN_INTERVAL
+from .const import CONF_STATION_ID, SCAN_INTERVAL
 
 _LOGGER: Final = logging.getLogger(__name__)
 
@@ -54,6 +54,8 @@ async def async_setup_platform(
 class AmpioSmogQuality(AirQualityEntity):
     """Implementation of an Ampio Smog air quality entity."""
 
+    _attr_attribution = "Data provided by Ampio"
+
     def __init__(
         self, api: AmpioSmogMapData, station_id: str, name: str | None
     ) -> None:
@@ -82,11 +84,6 @@ class AmpioSmogQuality(AirQualityEntity):
         """Return the particulate matter 10 level."""
         return self._ampio.api.pm10  # type: ignore[no-any-return]
 
-    @property
-    def attribution(self) -> str:
-        """Return the attribution."""
-        return ATTRIBUTION
-
     async def async_update(self) -> None:
         """Get the latest data from the AmpioMap API."""
         await self._ampio.async_update()

homeassistant/components/ampio/const.py

@@ -2,6 +2,5 @@
 from datetime import timedelta
 from typing import Final
 
-ATTRIBUTION: Final = "Data provided by Ampio"
 CONF_STATION_ID: Final = "station_id"
 SCAN_INTERVAL: Final = timedelta(minutes=10)

homeassistant/components/analytics/__init__.py

@@ -5,13 +5,16 @@ import voluptuous as vol
 
 from homeassistant.components import websocket_api
 from homeassistant.const import EVENT_HOMEASSISTANT_STARTED
-from homeassistant.core import Event, HomeAssistant, callback
+from homeassistant.core import Event, HassJob, HomeAssistant, callback
+import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.event import async_call_later, async_track_time_interval
 from homeassistant.helpers.typing import ConfigType
 
 from .analytics import Analytics
 from .const import ATTR_ONBOARDED, ATTR_PREFERENCES, DOMAIN, INTERVAL, PREFERENCE_SCHEMA
 
+CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
+
 
 async def async_setup(hass: HomeAssistant, _: ConfigType) -> bool:
     """Set up the analytics integration."""
@@ -24,11 +27,23 @@ async def async_setup(hass: HomeAssistant, _: ConfigType) -> bool:
     def start_schedule(_event: Event) -> None:
         """Start the send schedule after the started event."""
         # Wait 15 min after started
-        async_call_later(hass, 900, analytics.send_analytics)
+        async_call_later(
+            hass,
+            900,
+            HassJob(
+                analytics.send_analytics,
+                name="analytics schedule",
+                cancel_on_shutdown=True,
+            ),
+        )
 
         # Send every day
         async_track_time_interval(
-            hass, analytics.send_analytics, INTERVAL, name="analytics daily"
+            hass,
+            analytics.send_analytics,
+            INTERVAL,
+            name="analytics daily",
+            cancel_on_shutdown=True,
         )
 
     hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STARTED, start_schedule)

homeassistant/components/androidtv/__init__.py

@@ -1,4 +1,4 @@
-"""Support for functionality to interact with Android TV/Fire TV devices."""
+"""Support for functionality to interact with Android/Fire TV devices."""
 from __future__ import annotations
 
 from collections.abc import Mapping
@@ -135,11 +135,11 @@ async def async_connect_androidtv(
     if not aftv.available:
         # Determine the name that will be used for the device in the log
         if config[CONF_DEVICE_CLASS] == DEVICE_ANDROIDTV:
-            device_name = "Android TV device"
+            device_name = "Android device"
         elif config[CONF_DEVICE_CLASS] == DEVICE_FIRETV:
             device_name = "Fire TV device"
         else:
-            device_name = "Android TV / Fire TV device"
+            device_name = "Android / Fire TV device"
 
         error_message = f"Could not connect to {device_name} at {address} {adb_log}"
         return None, error_message
@@ -148,7 +148,7 @@ async def async_connect_androidtv(
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
-    """Set up Android TV platform."""
+    """Set up Android Debug Bridge platform."""
 
     state_det_rules = entry.options.get(CONF_STATE_DETECTION_RULES)
     if CONF_ADB_SERVER_IP not in entry.data:
@@ -167,7 +167,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         raise ConfigEntryNotReady(error_message)
 
     async def async_close_connection(event):
-        """Close Android TV connection on HA Stop."""
+        """Close Android Debug Bridge connection on HA Stop."""
         await aftv.adb_close()
 
     entry.async_on_unload(

homeassistant/components/androidtv/config_flow.py

@@ -1,4 +1,4 @@
-"""Config flow to configure the Android TV integration."""
+"""Config flow to configure the Android Debug Bridge integration."""
 from __future__ import annotations
 
 import logging
@@ -114,13 +114,14 @@ class AndroidTVFlowHandler(ConfigFlow, domain=DOMAIN):
     async def _async_check_connection(
         self, user_input: dict[str, Any]
     ) -> tuple[str | None, str | None]:
-        """Attempt to connect the Android TV."""
+        """Attempt to connect the Android device."""
 
         try:
             aftv, error_message = await async_connect_androidtv(self.hass, user_input)
         except Exception:  # pylint: disable=broad-except
             _LOGGER.exception(
-                "Unknown error connecting with Android TV at %s", user_input[CONF_HOST]
+                "Unknown error connecting with Android device at %s",
+                user_input[CONF_HOST],
             )
             return RESULT_UNKNOWN, None
 
@@ -130,7 +131,7 @@ class AndroidTVFlowHandler(ConfigFlow, domain=DOMAIN):
 
         dev_prop = aftv.device_properties
         _LOGGER.info(
-            "Android TV at %s: %s = %r, %s = %r",
+            "Android device at %s: %s = %r, %s = %r",
             user_input[CONF_HOST],
             PROP_ETHMAC,
             dev_prop.get(PROP_ETHMAC),
@@ -184,7 +185,7 @@ class AndroidTVFlowHandler(ConfigFlow, domain=DOMAIN):
 
 
 class OptionsFlowHandler(OptionsFlowWithConfigEntry):
-    """Handle an option flow for Android TV."""
+    """Handle an option flow for Android Debug Bridge."""
 
     def __init__(self, config_entry: ConfigEntry) -> None:
         """Initialize options flow."""

homeassistant/components/androidtv/const.py

@@ -1,4 +1,4 @@
-"""Android TV component constants."""
+"""Android Debug Bridge component constants."""
 DOMAIN = "androidtv"
 
 ANDROID_DEV = DOMAIN

homeassistant/components/androidtv/manifest.json

@@ -1,6 +1,6 @@
 {
   "domain": "androidtv",
-  "name": "Android TV",
+  "name": "Android Debug Bridge",
   "codeowners": ["@JeffLIrion", "@ollo69"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/androidtv",

homeassistant/components/androidtv/media_player.py

@@ -1,4 +1,4 @@
-"""Support for functionality to interact with Android TV / Fire TV devices."""
+"""Support for functionality to interact with Android / Fire TV devices."""
 from __future__ import annotations
 
 from collections.abc import Awaitable, Callable, Coroutine
@@ -87,7 +87,7 @@ async def async_setup_entry(
     entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
-    """Set up the Android TV entity."""
+    """Set up the Android Debug Bridge entity."""
     aftv = hass.data[DOMAIN][entry.entry_id][ANDROID_DEV]
     device_class = aftv.DEVICE_CLASS
     device_type = (
@@ -201,7 +201,7 @@ def adb_decorator(
 
 
 class ADBDevice(MediaPlayerEntity):
-    """Representation of an Android TV or Fire TV device."""
+    """Representation of an Android or Fire TV device."""
 
     _attr_device_class = MediaPlayerDeviceClass.TV
 
@@ -214,7 +214,7 @@ class ADBDevice(MediaPlayerEntity):
         entry_id,
         entry_data,
     ):
-        """Initialize the Android TV / Fire TV device."""
+        """Initialize the Android / Fire TV device."""
         self.aftv = aftv
         self._attr_name = name
         self._attr_unique_id = unique_id
@@ -384,7 +384,7 @@ class ADBDevice(MediaPlayerEntity):
 
     @adb_decorator()
     async def adb_command(self, command):
-        """Send an ADB command to an Android TV / Fire TV device."""
+        """Send an ADB command to an Android / Fire TV device."""
         if key := KEYS.get(command):
             await self.aftv.adb_shell(f"input keyevent {key}")
             return
@@ -422,13 +422,13 @@ class ADBDevice(MediaPlayerEntity):
             persistent_notification.async_create(
                 self.hass,
                 msg,
-                title="Android TV",
+                title="Android Debug Bridge",
             )
             _LOGGER.info("%s", msg)
 
     @adb_decorator()
     async def service_download(self, device_path, local_path):
-        """Download a file from your Android TV / Fire TV device to your Home Assistant instance."""
+        """Download a file from your Android / Fire TV device to your Home Assistant instance."""
         if not self.hass.config.is_allowed_path(local_path):
             _LOGGER.warning("'%s' is not secure to load data from!", local_path)
             return
@@ -437,7 +437,7 @@ class ADBDevice(MediaPlayerEntity):
 
     @adb_decorator()
     async def service_upload(self, device_path, local_path):
-        """Upload a file from your Home Assistant instance to an Android TV / Fire TV device."""
+        """Upload a file from your Home Assistant instance to an Android / Fire TV device."""
         if not self.hass.config.is_allowed_path(local_path):
             _LOGGER.warning("'%s' is not secure to load data from!", local_path)
             return
@@ -446,7 +446,7 @@ class ADBDevice(MediaPlayerEntity):
 
 
 class AndroidTVDevice(ADBDevice):
-    """Representation of an Android TV device."""
+    """Representation of an Android device."""
 
     _attr_supported_features = (
         MediaPlayerEntityFeature.PAUSE

homeassistant/components/androidtv/services.yaml

@@ -1,8 +1,8 @@
-# Describes the format for available Android TV and Fire TV services
+# Describes the format for available Android and Fire TV services
 
 adb_command:
   name: ADB command
-  description: Send an ADB command to an Android TV / Fire TV device.
+  description: Send an ADB command to an Android / Fire TV device.
   target:
     entity:
       integration: androidtv
@@ -17,7 +17,7 @@ adb_command:
         text:
 download:
   name: Download
-  description: Download a file from your Android TV / Fire TV device to your Home Assistant instance.
+  description: Download a file from your Android / Fire TV device to your Home Assistant instance.
   target:
     entity:
       integration: androidtv
@@ -25,7 +25,7 @@ download:
   fields:
     device_path:
       name: Device path
-      description: The filepath on the Android TV / Fire TV device.
+      description: The filepath on the Android / Fire TV device.
       required: true
       example: "/storage/emulated/0/Download/example.txt"
       selector:
@@ -39,7 +39,7 @@ download:
         text:
 upload:
   name: Upload
-  description: Upload a file from your Home Assistant instance to an Android TV / Fire TV device.
+  description: Upload a file from your Home Assistant instance to an Android / Fire TV device.
   target:
     entity:
       integration: androidtv
@@ -47,7 +47,7 @@ upload:
   fields:
     device_path:
       name: Device path
-      description: The filepath on the Android TV / Fire TV device.
+      description: The filepath on the Android / Fire TV device.
       required: true
       example: "/storage/emulated/0/Download/example.txt"
       selector:

homeassistant/components/androidtv/strings.json

@@ -38,7 +38,7 @@
         }
       },
       "apps": {
-        "title": "Configure Android TV Apps",
+        "title": "Configure Android Apps",
         "description": "Configure application id {app_id}",
         "data": {
           "app_name": "Application Name",
@@ -47,7 +47,7 @@
         }
       },
       "rules": {
-        "title": "Configure Android TV state detection rules",
+        "title": "Configure Android state detection rules",
         "description": "Configure detection rule for application id {rule_id}",
         "data": {
           "rule_id": "Application ID",

homeassistant/components/androidtv_remote/__init__.py

@@ -0,0 +1,86 @@
+"""The Android TV Remote integration."""
+from __future__ import annotations
+
+import logging
+
+from androidtvremote2 import (
+    AndroidTVRemote,
+    CannotConnect,
+    ConnectionClosed,
+    InvalidAuth,
+)
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_HOST, CONF_NAME, EVENT_HOMEASSISTANT_STOP, Platform
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
+
+from .const import DOMAIN
+from .helpers import create_api
+
+_LOGGER = logging.getLogger(__name__)
+
+PLATFORMS: list[Platform] = [Platform.MEDIA_PLAYER, Platform.REMOTE]
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Set up Android TV Remote from a config entry."""
+    api = create_api(hass, entry.data[CONF_HOST])
+
+    @callback
+    def is_available_updated(is_available: bool) -> None:
+        if is_available:
+            _LOGGER.info(
+                "Reconnected to %s at %s", entry.data[CONF_NAME], entry.data[CONF_HOST]
+            )
+        else:
+            _LOGGER.warning(
+                "Disconnected from %s at %s",
+                entry.data[CONF_NAME],
+                entry.data[CONF_HOST],
+            )
+
+    api.add_is_available_updated_callback(is_available_updated)
+
+    try:
+        await api.async_connect()
+    except InvalidAuth as exc:
+        # The Android TV is hard reset or the certificate and key files were deleted.
+        raise ConfigEntryAuthFailed from exc
+    except (CannotConnect, ConnectionClosed) as exc:
+        # The Android TV is network unreachable. Raise exception and let Home Assistant retry
+        # later. If device gets a new IP address the zeroconf flow will update the config.
+        raise ConfigEntryNotReady from exc
+
+    def reauth_needed() -> None:
+        """Start a reauth flow if Android TV is hard reset while reconnecting."""
+        entry.async_start_reauth(hass)
+
+    # Start a task (canceled in disconnect) to keep reconnecting if device becomes
+    # network unreachable. If device gets a new IP address the zeroconf flow will
+    # update the config entry data and reload the config entry.
+    api.keep_reconnecting(reauth_needed)
+
+    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = api
+
+    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+
+    @callback
+    def on_hass_stop(event) -> None:
+        """Stop push updates when hass stops."""
+        api.disconnect()
+
+    entry.async_on_unload(
+        hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, on_hass_stop)
+    )
+
+    return True
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Unload a config entry."""
+    if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
+        api: AndroidTVRemote = hass.data[DOMAIN].pop(entry.entry_id)
+        api.disconnect()
+
+    return unload_ok

homeassistant/components/androidtv_remote/config_flow.py

@@ -0,0 +1,188 @@
+"""Config flow for Android TV Remote integration."""
+from __future__ import annotations
+
+from collections.abc import Mapping
+from typing import Any
+
+from androidtvremote2 import (
+    AndroidTVRemote,
+    CannotConnect,
+    ConnectionClosed,
+    InvalidAuth,
+)
+import voluptuous as vol
+
+from homeassistant import config_entries
+from homeassistant.components import zeroconf
+from homeassistant.const import CONF_HOST, CONF_MAC, CONF_NAME
+from homeassistant.data_entry_flow import FlowResult
+from homeassistant.helpers.device_registry import format_mac
+
+from .const import DOMAIN
+from .helpers import create_api
+
+STEP_USER_DATA_SCHEMA = vol.Schema(
+    {
+        vol.Required("host"): str,
+    }
+)
+
+STEP_PAIR_DATA_SCHEMA = vol.Schema(
+    {
+        vol.Required("pin"): str,
+    }
+)
+
+
+class AndroidTVRemoteConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
+    """Handle a config flow for Android TV Remote."""
+
+    VERSION = 1
+
+    def __init__(self) -> None:
+        """Initialize a new AndroidTVRemoteConfigFlow."""
+        self.api: AndroidTVRemote | None = None
+        self.reauth_entry: config_entries.ConfigEntry | None = None
+        self.host: str | None = None
+        self.name: str | None = None
+        self.mac: str | None = None
+
+    async def async_step_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """Handle the initial step."""
+        errors: dict[str, str] = {}
+        if user_input is not None:
+            self.host = user_input["host"]
+            assert self.host
+            api = create_api(self.hass, self.host)
+            try:
+                self.name, self.mac = await api.async_get_name_and_mac()
+                assert self.mac
+                await self.async_set_unique_id(format_mac(self.mac))
+                self._abort_if_unique_id_configured(updates={CONF_HOST: self.host})
+                return await self._async_start_pair()
+            except (CannotConnect, ConnectionClosed):
+                # Likely invalid IP address or device is network unreachable. Stay
+                # in the user step allowing the user to enter a different host.
+                errors["base"] = "cannot_connect"
+        return self.async_show_form(
+            step_id="user",
+            data_schema=STEP_USER_DATA_SCHEMA,
+            errors=errors,
+        )
+
+    async def _async_start_pair(self) -> FlowResult:
+        """Start pairing with the Android TV. Navigate to the pair flow to enter the PIN shown on screen."""
+        assert self.host
+        self.api = create_api(self.hass, self.host)
+        await self.api.async_generate_cert_if_missing()
+        await self.api.async_start_pairing()
+        return await self.async_step_pair()
+
+    async def async_step_pair(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """Handle the pair step."""
+        errors: dict[str, str] = {}
+        if user_input is not None:
+            try:
+                pin = user_input["pin"]
+                assert self.api
+                await self.api.async_finish_pairing(pin)
+                if self.reauth_entry:
+                    await self.hass.config_entries.async_reload(
+                        self.reauth_entry.entry_id
+                    )
+                    return self.async_abort(reason="reauth_successful")
+                assert self.name
+                return self.async_create_entry(
+                    title=self.name,
+                    data={
+                        CONF_HOST: self.host,
+                        CONF_NAME: self.name,
+                        CONF_MAC: self.mac,
+                    },
+                )
+            except InvalidAuth:
+                # Invalid PIN. Stay in the pair step allowing the user to enter
+                # a different PIN.
+                errors["base"] = "invalid_auth"
+            except ConnectionClosed:
+                # Either user canceled pairing on the Android TV itself (most common)
+                # or device doesn't respond to the specified host (device was unplugged,
+                # network was unplugged, or device got a new IP address).
+                # Attempt to pair again.
+                try:
+                    return await self._async_start_pair()
+                except (CannotConnect, ConnectionClosed):
+                    # Device doesn't respond to the specified host. Abort.
+                    # If we are in the user flow we could go back to the user step to allow
+                    # them to enter a new IP address but we cannot do that for the zeroconf
+                    # flow. Simpler to abort for both flows.
+                    return self.async_abort(reason="cannot_connect")
+        return self.async_show_form(
+            step_id="pair",
+            data_schema=STEP_PAIR_DATA_SCHEMA,
+            description_placeholders={CONF_NAME: self.name},
+            errors=errors,
+        )
+
+    async def async_step_zeroconf(
+        self, discovery_info: zeroconf.ZeroconfServiceInfo
+    ) -> FlowResult:
+        """Handle zeroconf discovery."""
+        self.host = discovery_info.host
+        self.name = discovery_info.name.removesuffix("._androidtvremote2._tcp.local.")
+        self.mac = discovery_info.properties.get("bt")
+        if not self.mac:
+            return self.async_abort(reason="cannot_connect")
+        await self.async_set_unique_id(format_mac(self.mac))
+        self._abort_if_unique_id_configured(
+            updates={CONF_HOST: self.host, CONF_NAME: self.name}
+        )
+        self.context.update({"title_placeholders": {CONF_NAME: self.name}})
+        return await self.async_step_zeroconf_confirm()
+
+    async def async_step_zeroconf_confirm(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """Handle a flow initiated by zeroconf."""
+        if user_input is not None:
+            try:
+                return await self._async_start_pair()
+            except (CannotConnect, ConnectionClosed):
+                # Device became network unreachable after discovery.
+                # Abort and let discovery find it again later.
+                return self.async_abort(reason="cannot_connect")
+        return self.async_show_form(
+            step_id="zeroconf_confirm",
+            description_placeholders={CONF_NAME: self.name},
+        )
+
+    async def async_step_reauth(self, entry_data: Mapping[str, Any]) -> FlowResult:
+        """Handle configuration by re-auth."""
+        self.host = entry_data[CONF_HOST]
+        self.name = entry_data[CONF_NAME]
+        self.mac = entry_data[CONF_MAC]
+        self.reauth_entry = self.hass.config_entries.async_get_entry(
+            self.context["entry_id"]
+        )
+        return await self.async_step_reauth_confirm()
+
+    async def async_step_reauth_confirm(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """Dialog that informs the user that reauth is required."""
+        errors: dict[str, str] = {}
+        if user_input is not None:
+            try:
+                return await self._async_start_pair()
+            except (CannotConnect, ConnectionClosed):
+                # Device is network unreachable. Abort.
+                errors["base"] = "cannot_connect"
+        return self.async_show_form(
+            step_id="reauth_confirm",
+            description_placeholders={CONF_NAME: self.name},
+            errors=errors,
+        )

homeassistant/components/androidtv_remote/const.py

@@ -0,0 +1,6 @@
+"""Constants for the Android TV Remote integration."""
+from __future__ import annotations
+
+from typing import Final
+
+DOMAIN: Final = "androidtv_remote"

homeassistant/components/androidtv_remote/diagnostics.py

@@ -0,0 +1,29 @@
+"""Diagnostics support for Android TV Remote."""
+from __future__ import annotations
+
+from typing import Any
+
+from androidtvremote2 import AndroidTVRemote
+
+from homeassistant.components.diagnostics import async_redact_data
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_HOST, CONF_MAC
+from homeassistant.core import HomeAssistant
+
+from .const import DOMAIN
+
+TO_REDACT = {CONF_HOST, CONF_MAC}
+
+
+async def async_get_config_entry_diagnostics(
+    hass: HomeAssistant, entry: ConfigEntry
+) -> dict[str, Any]:
+    """Return diagnostics for a config entry."""
+    api: AndroidTVRemote = hass.data[DOMAIN].pop(entry.entry_id)
+    return async_redact_data(
+        {
+            "api_device_info": api.device_info,
+            "config_entry_data": entry.data,
+        },
+        TO_REDACT,
+    )

homeassistant/components/androidtv_remote/entity.py

@@ -0,0 +1,84 @@
+"""Base entity for Android TV Remote."""
+from __future__ import annotations
+
+from androidtvremote2 import AndroidTVRemote, ConnectionClosed
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_HOST, CONF_MAC, CONF_NAME
+from homeassistant.core import callback
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC
+from homeassistant.helpers.entity import DeviceInfo, Entity
+
+from .const import DOMAIN
+
+
+class AndroidTVRemoteBaseEntity(Entity):
+    """Android TV Remote Base Entity."""
+
+    _attr_has_entity_name = True
+    _attr_should_poll = False
+
+    def __init__(self, api: AndroidTVRemote, config_entry: ConfigEntry) -> None:
+        """Initialize the entity."""
+        self._api = api
+        self._host = config_entry.data[CONF_HOST]
+        self._name = config_entry.data[CONF_NAME]
+        self._attr_unique_id = config_entry.unique_id
+        self._attr_is_on = api.is_on
+        device_info = api.device_info
+        assert config_entry.unique_id
+        assert device_info
+        self._attr_device_info = DeviceInfo(
+            connections={(CONNECTION_NETWORK_MAC, config_entry.data[CONF_MAC])},
+            identifiers={(DOMAIN, config_entry.unique_id)},
+            name=self._name,
+            manufacturer=device_info["manufacturer"],
+            model=device_info["model"],
+        )
+
+    @callback
+    def _is_available_updated(self, is_available: bool) -> None:
+        """Update the state when the device is ready to receive commands or is unavailable."""
+        self._attr_available = is_available
+        self.async_write_ha_state()
+
+    @callback
+    def _is_on_updated(self, is_on: bool) -> None:
+        """Update the state when device turns on or off."""
+        self._attr_is_on = is_on
+        self.async_write_ha_state()
+
+    async def async_added_to_hass(self) -> None:
+        """Register callbacks."""
+        self._api.add_is_available_updated_callback(self._is_available_updated)
+        self._api.add_is_on_updated_callback(self._is_on_updated)
+
+    async def async_will_remove_from_hass(self) -> None:
+        """Remove callbacks."""
+        self._api.remove_is_available_updated_callback(self._is_available_updated)
+        self._api.remove_is_on_updated_callback(self._is_on_updated)
+
+    def _send_key_command(self, key_code: str, direction: str = "SHORT") -> None:
+        """Send a key press to Android TV.
+
+        This does not block; it buffers the data and arranges for it to be sent out asynchronously.
+        """
+        try:
+            self._api.send_key_command(key_code, direction)
+        except ConnectionClosed as exc:
+            raise HomeAssistantError(
+                "Connection to Android TV device is closed"
+            ) from exc
+
+    def _send_launch_app_command(self, app_link: str) -> None:
+        """Launch an app on Android TV.
+
+        This does not block; it buffers the data and arranges for it to be sent out asynchronously.
+        """
+        try:
+            self._api.send_launch_app_command(app_link)
+        except ConnectionClosed as exc:
+            raise HomeAssistantError(
+                "Connection to Android TV device is closed"
+            ) from exc

homeassistant/components/androidtv_remote/helpers.py

@@ -0,0 +1,18 @@
+"""Helper functions for Android TV Remote integration."""
+from __future__ import annotations
+
+from androidtvremote2 import AndroidTVRemote
+
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.storage import STORAGE_DIR
+
+
+def create_api(hass: HomeAssistant, host: str) -> AndroidTVRemote:
+    """Create an AndroidTVRemote instance."""
+    return AndroidTVRemote(
+        client_name="Home Assistant",
+        certfile=hass.config.path(STORAGE_DIR, "androidtv_remote_cert.pem"),
+        keyfile=hass.config.path(STORAGE_DIR, "androidtv_remote_key.pem"),
+        host=host,
+        loop=hass.loop,
+    )

homeassistant/components/androidtv_remote/manifest.json

@@ -0,0 +1,13 @@
+{
+  "domain": "androidtv_remote",
+  "name": "Android TV Remote",
+  "codeowners": ["@tronikos", "@Drafteed"],
+  "config_flow": true,
+  "documentation": "https://www.home-assistant.io/integrations/androidtv_remote",
+  "integration_type": "device",
+  "iot_class": "local_push",
+  "loggers": ["androidtvremote2"],
+  "quality_scale": "platinum",
+  "requirements": ["androidtvremote2==0.0.9"],
+  "zeroconf": ["_androidtvremote2._tcp.local."]
+}

homeassistant/components/androidtv_remote/media_player.py

@@ -0,0 +1,198 @@
+"""Media player support for Android TV Remote."""
+from __future__ import annotations
+
+import asyncio
+from typing import Any
+
+from androidtvremote2 import AndroidTVRemote, ConnectionClosed
+
+from homeassistant.components.media_player import (
+    MediaPlayerDeviceClass,
+    MediaPlayerEntity,
+    MediaPlayerEntityFeature,
+    MediaPlayerState,
+    MediaType,
+)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+
+from .const import DOMAIN
+from .entity import AndroidTVRemoteBaseEntity
+
+PARALLEL_UPDATES = 0
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Set up the Android TV media player entity based on a config entry."""
+    api: AndroidTVRemote = hass.data[DOMAIN][config_entry.entry_id]
+    async_add_entities([AndroidTVRemoteMediaPlayerEntity(api, config_entry)])
+
+
+class AndroidTVRemoteMediaPlayerEntity(AndroidTVRemoteBaseEntity, MediaPlayerEntity):
+    """Android TV Remote Media Player Entity."""
+
+    _attr_assumed_state = True
+    _attr_device_class = MediaPlayerDeviceClass.TV
+    _attr_supported_features = (
+        MediaPlayerEntityFeature.PAUSE
+        | MediaPlayerEntityFeature.VOLUME_STEP
+        | MediaPlayerEntityFeature.VOLUME_MUTE
+        | MediaPlayerEntityFeature.PREVIOUS_TRACK
+        | MediaPlayerEntityFeature.NEXT_TRACK
+        | MediaPlayerEntityFeature.TURN_ON
+        | MediaPlayerEntityFeature.TURN_OFF
+        | MediaPlayerEntityFeature.PLAY
+        | MediaPlayerEntityFeature.STOP
+        | MediaPlayerEntityFeature.PLAY_MEDIA
+    )
+
+    def __init__(self, api: AndroidTVRemote, config_entry: ConfigEntry) -> None:
+        """Initialize the entity."""
+        super().__init__(api, config_entry)
+
+        # This task is needed to create a job that sends a key press
+        # sequence that can be canceled if concurrency occurs
+        self._channel_set_task: asyncio.Task | None = None
+
+    def _update_current_app(self, current_app: str) -> None:
+        """Update current app info."""
+        self._attr_app_id = current_app
+        self._attr_app_name = current_app
+
+    def _update_volume_info(self, volume_info: dict[str, str | bool]) -> None:
+        """Update volume info."""
+        if volume_info.get("max"):
+            self._attr_volume_level = int(volume_info["level"]) / int(
+                volume_info["max"]
+            )
+            self._attr_is_volume_muted = bool(volume_info["muted"])
+        else:
+            self._attr_volume_level = None
+            self._attr_is_volume_muted = None
+
+    @callback
+    def _current_app_updated(self, current_app: str) -> None:
+        """Update the state when the current app changes."""
+        self._update_current_app(current_app)
+        self.async_write_ha_state()
+
+    @callback
+    def _volume_info_updated(self, volume_info: dict[str, str | bool]) -> None:
+        """Update the state when the volume info changes."""
+        self._update_volume_info(volume_info)
+        self.async_write_ha_state()
+
+    async def async_added_to_hass(self) -> None:
+        """Register callbacks."""
+        await super().async_added_to_hass()
+
+        self._update_current_app(self._api.current_app)
+        self._update_volume_info(self._api.volume_info)
+
+        self._api.add_current_app_updated_callback(self._current_app_updated)
+        self._api.add_volume_info_updated_callback(self._volume_info_updated)
+
+    async def async_will_remove_from_hass(self) -> None:
+        """Remove callbacks."""
+        await super().async_will_remove_from_hass()
+
+        self._api.remove_current_app_updated_callback(self._current_app_updated)
+        self._api.remove_volume_info_updated_callback(self._volume_info_updated)
+
+    @property
+    def state(self) -> MediaPlayerState:
+        """Return the state of the device."""
+        if self._attr_is_on:
+            return MediaPlayerState.ON
+        return MediaPlayerState.OFF
+
+    async def async_turn_on(self) -> None:
+        """Turn the Android TV on."""
+        if not self._attr_is_on:
+            self._send_key_command("POWER")
+
+    async def async_turn_off(self) -> None:
+        """Turn the Android TV off."""
+        if self._attr_is_on:
+            self._send_key_command("POWER")
+
+    async def async_volume_up(self) -> None:
+        """Turn volume up for media player."""
+        self._send_key_command("VOLUME_UP")
+
+    async def async_volume_down(self) -> None:
+        """Turn volume down for media player."""
+        self._send_key_command("VOLUME_DOWN")
+
+    async def async_mute_volume(self, mute: bool) -> None:
+        """Mute the volume."""
+        if mute != self.is_volume_muted:
+            self._send_key_command("VOLUME_MUTE")
+
+    async def async_media_play(self) -> None:
+        """Send play command."""
+        self._send_key_command("MEDIA_PLAY")
+
+    async def async_media_pause(self) -> None:
+        """Send pause command."""
+        self._send_key_command("MEDIA_PAUSE")
+
+    async def async_media_play_pause(self) -> None:
+        """Send play/pause command."""
+        self._send_key_command("MEDIA_PLAY_PAUSE")
+
+    async def async_media_stop(self) -> None:
+        """Send stop command."""
+        self._send_key_command("MEDIA_STOP")
+
+    async def async_media_previous_track(self) -> None:
+        """Send previous track command."""
+        self._send_key_command("MEDIA_PREVIOUS")
+
+    async def async_media_next_track(self) -> None:
+        """Send next track command."""
+        self._send_key_command("MEDIA_NEXT")
+
+    async def async_play_media(
+        self, media_type: MediaType | str, media_id: str, **kwargs: Any
+    ) -> None:
+        """Play a piece of media."""
+        if media_type == MediaType.CHANNEL:
+            if not media_id.isnumeric():
+                raise ValueError(f"Channel must be numeric: {media_id}")
+            if self._channel_set_task:
+                self._channel_set_task.cancel()
+            self._channel_set_task = asyncio.create_task(
+                self._send_key_commands(list(media_id))
+            )
+            await self._channel_set_task
+            return
+
+        if media_type == MediaType.URL:
+            self._send_launch_app_command(media_id)
+            return
+
+        raise ValueError(f"Invalid media type: {media_type}")
+
+    async def _send_key_commands(
+        self, key_codes: list[str], delay_secs: float = 0.1
+    ) -> None:
+        """Send a key press sequence to Android TV.
+
+        The delay is necessary because device may ignore
+        some commands if we send the sequence without delay.
+        """
+        try:
+            for key_code in key_codes:
+                self._api.send_key_command(key_code)
+                await asyncio.sleep(delay_secs)
+        except ConnectionClosed as exc:
+            raise HomeAssistantError(
+                "Connection to Android TV device is closed"
+            ) from exc

homeassistant/components/androidtv_remote/remote.py

@@ -0,0 +1,92 @@
+"""Remote control support for Android TV Remote."""
+from __future__ import annotations
+
+import asyncio
+from collections.abc import Iterable
+from typing import Any
+
+from androidtvremote2 import AndroidTVRemote
+
+from homeassistant.components.remote import (
+    ATTR_ACTIVITY,
+    ATTR_DELAY_SECS,
+    ATTR_HOLD_SECS,
+    ATTR_NUM_REPEATS,
+    DEFAULT_DELAY_SECS,
+    DEFAULT_HOLD_SECS,
+    DEFAULT_NUM_REPEATS,
+    RemoteEntity,
+    RemoteEntityFeature,
+)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+
+from .const import DOMAIN
+from .entity import AndroidTVRemoteBaseEntity
+
+PARALLEL_UPDATES = 0
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Set up the Android TV remote entity based on a config entry."""
+    api: AndroidTVRemote = hass.data[DOMAIN][config_entry.entry_id]
+    async_add_entities([AndroidTVRemoteEntity(api, config_entry)])
+
+
+class AndroidTVRemoteEntity(AndroidTVRemoteBaseEntity, RemoteEntity):
+    """Android TV Remote Entity."""
+
+    _attr_supported_features = RemoteEntityFeature.ACTIVITY
+
+    @callback
+    def _current_app_updated(self, current_app: str) -> None:
+        """Update the state when the current app changes."""
+        self._attr_current_activity = current_app
+        self.async_write_ha_state()
+
+    async def async_added_to_hass(self) -> None:
+        """Register callbacks."""
+        await super().async_added_to_hass()
+
+        self._attr_current_activity = self._api.current_app
+        self._api.add_current_app_updated_callback(self._current_app_updated)
+
+    async def async_will_remove_from_hass(self) -> None:
+        """Remove callbacks."""
+        await super().async_will_remove_from_hass()
+
+        self._api.remove_current_app_updated_callback(self._current_app_updated)
+
+    async def async_turn_on(self, **kwargs: Any) -> None:
+        """Turn the Android TV on."""
+        if not self.is_on:
+            self._send_key_command("POWER")
+        activity = kwargs.get(ATTR_ACTIVITY, "")
+        if activity:
+            self._send_launch_app_command(activity)
+
+    async def async_turn_off(self, **kwargs: Any) -> None:
+        """Turn the Android TV off."""
+        if self.is_on:
+            self._send_key_command("POWER")
+
+    async def async_send_command(self, command: Iterable[str], **kwargs: Any) -> None:
+        """Send commands to one device."""
+        num_repeats = kwargs.get(ATTR_NUM_REPEATS, DEFAULT_NUM_REPEATS)
+        delay_secs = kwargs.get(ATTR_DELAY_SECS, DEFAULT_DELAY_SECS)
+        hold_secs = kwargs.get(ATTR_HOLD_SECS, DEFAULT_HOLD_SECS)
+
+        for _ in range(num_repeats):
+            for single_command in command:
+                if hold_secs:
+                    self._send_key_command(single_command, "START_LONG")
+                    await asyncio.sleep(hold_secs)
+                    self._send_key_command(single_command, "END_LONG")
+                else:
+                    self._send_key_command(single_command, "SHORT")
+                await asyncio.sleep(delay_secs)

homeassistant/components/androidtv_remote/strings.json

@@ -0,0 +1,38 @@
+{
+  "config": {
+    "flow_title": "{name}",
+    "step": {
+      "user": {
+        "description": "Enter the IP address of the Android TV you want to add to Home Assistant. It will turn on and a pairing code will be displayed on it that you will need to enter in the next screen.",
+        "data": {
+          "host": "[%key:common::config_flow::data::host%]"
+        }
+      },
+      "zeroconf_confirm": {
+        "title": "Discovered Android TV",
+        "description": "Do you want to add the Android TV ({name}) to Home Assistant?  It will turn on and a pairing code will be displayed on it that you will need to enter in the next screen."
+      },
+      "pair": {
+        "description": "Enter the pairing code displayed on the Android TV ({name}).",
+        "data": {
+          "pin": "[%key:common::config_flow::data::pin%]"
+        }
+      },
+      "reauth_confirm": {
+        "title": "[%key:common::config_flow::title::reauth%]",
+        "description": "You need to pair again with the Android TV ({name})."
+      }
+    },
+    "error": {
+      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
+      "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%]",
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
+    }
+  }
+}

homeassistant/components/anova/__init__.py

@@ -0,0 +1,78 @@
+"""The Anova integration."""
+from __future__ import annotations
+
+import logging
+
+from anova_wifi import AnovaApi, AnovaPrecisionCooker, InvalidLogin, NoDevicesFound
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_PASSWORD, CONF_USERNAME, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers import aiohttp_client
+
+from .const import DOMAIN
+from .coordinator import AnovaCoordinator
+from .models import AnovaData
+from .util import serialize_device_list
+
+PLATFORMS = [Platform.SENSOR]
+
+_LOGGER = logging.getLogger(__name__)
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Set up Anova from a config entry."""
+    api = AnovaApi(
+        aiohttp_client.async_get_clientsession(hass),
+        entry.data[CONF_USERNAME],
+        entry.data[CONF_PASSWORD],
+    )
+    try:
+        await api.authenticate()
+    except InvalidLogin as err:
+        _LOGGER.error(
+            "Login was incorrect - please log back in through the config flow. %s", err
+        )
+        return False
+    assert api.jwt
+    api.existing_devices = [
+        AnovaPrecisionCooker(
+            aiohttp_client.async_get_clientsession(hass),
+            device[0],
+            device[1],
+            api.jwt,
+        )
+        for device in entry.data["devices"]
+    ]
+    try:
+        new_devices = await api.get_devices()
+    except NoDevicesFound:
+        # get_devices raises an exception if no devices are online
+        new_devices = []
+    devices = api.existing_devices
+    if new_devices:
+        hass.config_entries.async_update_entry(
+            entry,
+            data={
+                **entry.data,
+                **{"devices": serialize_device_list(devices)},
+            },
+        )
+    coordinators = [AnovaCoordinator(hass, device) for device in devices]
+    for coordinator in coordinators:
+        await coordinator.async_config_entry_first_refresh()
+        firmware_version = coordinator.data.sensor.firmware_version
+        coordinator.async_setup(str(firmware_version))
+    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = AnovaData(
+        api_jwt=api.jwt, precision_cookers=devices, coordinators=coordinators
+    )
+    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+    return True
+
+
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Unload a config entry."""
+    if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
+        hass.data[DOMAIN].pop(entry.entry_id)
+
+    return unload_ok

homeassistant/components/anova/config_flow.py

@@ -0,0 +1,61 @@
+"""Config flow for Anova."""
+from __future__ import annotations
+
+from anova_wifi import AnovaApi, InvalidLogin, NoDevicesFound
+import voluptuous as vol
+
+from homeassistant import config_entries
+from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
+from homeassistant.data_entry_flow import FlowResult
+from homeassistant.helpers import aiohttp_client
+
+from .const import DOMAIN
+from .util import serialize_device_list
+
+
+class AnovaConfligFlow(config_entries.ConfigFlow, domain=DOMAIN):
+    """Sets up a config flow for Anova."""
+
+    VERSION = 1
+
+    async def async_step_user(
+        self, user_input: dict[str, str] | None = None
+    ) -> FlowResult:
+        """Handle a flow initiated by the user."""
+        errors: dict[str, str] = {}
+        if user_input is not None:
+            api = AnovaApi(
+                aiohttp_client.async_get_clientsession(self.hass),
+                user_input[CONF_USERNAME],
+                user_input[CONF_PASSWORD],
+            )
+            await self.async_set_unique_id(user_input[CONF_USERNAME].lower())
+            self._abort_if_unique_id_configured()
+            try:
+                await api.authenticate()
+                devices = await api.get_devices()
+            except InvalidLogin:
+                errors["base"] = "invalid_auth"
+            except NoDevicesFound:
+                errors["base"] = "no_devices_found"
+            except Exception:  # pylint: disable=broad-except
+                errors["base"] = "unknown"
+            else:
+                # We store device list in config flow in order to persist found devices on restart, as the Anova api get_devices does not return any devices that are offline.
+                device_list = serialize_device_list(devices)
+                return self.async_create_entry(
+                    title="Anova",
+                    data={
+                        CONF_USERNAME: api.username,
+                        CONF_PASSWORD: api.password,
+                        "devices": device_list,
+                    },
+                )
+
+        return self.async_show_form(
+            step_id="user",
+            data_schema=vol.Schema(
+                {vol.Required(CONF_USERNAME): str, vol.Required(CONF_PASSWORD): str}
+            ),
+            errors=errors,
+        )

homeassistant/components/anova/const.py

@@ -0,0 +1,6 @@
+"""Constants for the Anova integration."""
+
+DOMAIN = "anova"
+
+ANOVA_CLIENT = "anova_api_client"
+ANOVA_FIRMWARE_VERSION = "anova_firmware_version"

homeassistant/components/anova/coordinator.py

@@ -0,0 +1,53 @@
+"""Support for Anova Coordinators."""
+from datetime import timedelta
+import logging
+
+from anova_wifi import AnovaOffline, AnovaPrecisionCooker, APCUpdate
+import async_timeout
+
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.entity import DeviceInfo
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+
+from .const import DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class AnovaCoordinator(DataUpdateCoordinator[APCUpdate]):
+    """Anova custom coordinator."""
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        anova_device: AnovaPrecisionCooker,
+    ) -> None:
+        """Set up Anova Coordinator."""
+        super().__init__(
+            hass,
+            name="Anova Precision Cooker",
+            logger=_LOGGER,
+            update_interval=timedelta(seconds=30),
+        )
+        assert self.config_entry is not None
+        self._device_unique_id = anova_device.device_key
+        self.anova_device = anova_device
+        self.device_info: DeviceInfo | None = None
+
+    @callback
+    def async_setup(self, firmware_version: str) -> None:
+        """Set the firmware version info."""
+        self.device_info = DeviceInfo(
+            identifiers={(DOMAIN, self._device_unique_id)},
+            name="Anova Precision Cooker",
+            manufacturer="Anova",
+            model="Precision Cooker",
+            sw_version=firmware_version,
+        )
+
+    async def _async_update_data(self) -> APCUpdate:
+        try:
+            async with async_timeout.timeout(5):
+                return await self.anova_device.update()
+        except AnovaOffline as err:
+            raise UpdateFailed(err) from err

homeassistant/components/anova/entity.py

@@ -0,0 +1,30 @@
+"""Base entity for the Anova integration."""
+from __future__ import annotations
+
+from homeassistant.helpers.entity import Entity, EntityDescription
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
+
+from .coordinator import AnovaCoordinator
+
+
+class AnovaEntity(CoordinatorEntity[AnovaCoordinator], Entity):
+    """Defines a Anova entity."""
+
+    def __init__(self, coordinator: AnovaCoordinator) -> None:
+        """Initialize the Anova entity."""
+        super().__init__(coordinator)
+        self.device = coordinator.anova_device
+        self._attr_device_info = coordinator.device_info
+        self._attr_has_entity_name = True
+
+
+class AnovaDescriptionEntity(AnovaEntity, Entity):
+    """Defines a Anova entity that uses a description."""
+
+    def __init__(
+        self, coordinator: AnovaCoordinator, description: EntityDescription
+    ) -> None:
+        """Initialize the entity and declare unique id based on description key."""
+        super().__init__(coordinator)
+        self.entity_description = description
+        self._attr_unique_id = f"{coordinator._device_unique_id}_{description.key}"

homeassistant/components/anova/manifest.json

@@ -0,0 +1,10 @@
+{
+  "domain": "anova",
+  "name": "Anova",
+  "codeowners": ["@Lash-L"],
+  "config_flow": true,
+  "documentation": "https://www.home-assistant.io/integrations/anova",
+  "iot_class": "cloud_polling",
+  "loggers": ["anova_wifi"],
+  "requirements": ["anova-wifi==0.10.0"]
+}