Compare commits

..

2 Commits

Author SHA1 Message Date
Paulus Schoutsen f39620a0fa Migrate braodlink to no timings API 2026-04-19 19:43:55 -04:00
Paulus Schoutsen 9f2eb56a7e Adopt infrared-protocols 2.0.0 (Flipper loader + signed list[int] timings)
infrared-protocols 2.0.0 drops the Timing dataclass in favor of a flat
list[int] using the signed-alternating convention (positive mark,
negative space), and moves bundled code sets to Flipper `.ir` files
loaded lazily through `get_codes(...)`.

lg_infrared migrates off the per-device `LGTVCode` / `make_command`
helpers. Buttons and the media player now reference commands by name
(e.g. "POWER", "HDMI_1"), resolved through a module-level
`LG_TV_CODES = get_codes("lg/tv")` CommandCollection whose backing
`.ir` file is parsed lazily in the executor on first use.

The esphome, smlight, and kitchen_sink consumers no longer flatten
pairs at the call site — esphome and kitchen_sink pass the signed
list straight through, smlight takes `abs()` per element since its
protocol wants unsigned magnitudes.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-19 19:37:44 -04:00
318 changed files with 2256 additions and 48902 deletions
@@ -1,6 +1,7 @@
---
name: github-pr-reviewer
description: Reviews GitHub pull requests and provides feedback comments. This is the top skill to use for reviewing Pull Requests from GitHub.
description: Reviews GitHub pull requests and provides feedback comments.
disallowedTools: Write, Edit
---
# Review GitHub Pull Request
-2
View File
@@ -12,8 +12,6 @@ description: Everything you need to know to build, test and review Home Assistan
- When looking for examples, prefer integrations with the platinum or gold quality scale level first.
- Polling intervals are NOT user-configurable. Never add scan_interval, update_interval, or polling frequency options to config flows or config entries.
- Do NOT allow users to set config entry names in config flows. Names are automatically generated or can be customized later in UI. Exception: helper integrations may allow custom names.
- For entity actions and entity services, avoid requesting redundant defensive checks for fields already enforced by Home Assistant validation schemas and entity filters; only request extra guards when values bypass validation or are transformed unsafely.
- When validation guarantees a key is present, prefer direct dictionary indexing (`data["key"]`) over `.get("key")` so invalid assumptions fail fast.
The following platforms have extra guidelines:
- **Diagnostics**: [`platform-diagnostics.md`](platform-diagnostics.md) for diagnostic data collection
-3
View File
@@ -32,9 +32,6 @@ Prefer concrete types (for example, `HomeAssistant`, `MockConfigEntry`, etc.) ov
Integrations with Platinum or Gold level in the Integration Quality Scale reflect a high standard of code quality and maintainability. When looking for examples of something, these are good places to start. The level is indicated in the manifest.json of the integration.
When reviewing entity actions, do not suggest extra defensive checks for input fields that are already validated by Home Assistant's service/action schemas and entity selection filters. Suggest additional guards only when data bypasses those validators or is transformed into a less-safe form.
When validation guarantees a dict key exists, prefer direct key access (`data["key"]`) instead of `.get("key")` so contract violations are surfaced instead of silently masked.
# Skills
-11
View File
@@ -6,7 +6,6 @@
"pep621",
"pip_requirements",
"pre-commit",
"regex",
"homeassistant-manifest"
],
@@ -27,16 +26,6 @@
]
},
"regexManagers": [
{
"description": "Update ruff required-version in pyproject.toml",
"managerFilePatterns": ["/^pyproject\\.toml$/"],
"matchStrings": ["required-version = \">=(?<currentValue>[\\d.]+)\""],
"depNameTemplate": "ruff",
"datasourceTemplate": "pypi"
}
],
"minimumReleaseAge": "7 days",
"prConcurrentLimit": 10,
"prHourlyLimit": 2,
+24 -24
View File
@@ -282,7 +282,7 @@ jobs:
echo "::add-matcher::.github/workflows/matchers/check-executables-have-shebangs.json"
echo "::add-matcher::.github/workflows/matchers/codespell.json"
- name: Run prek
uses: j178/prek-action@cbc2f23eb5539cf20d82d1aabd0d0ecbcc56f4e3 # v2.0.2
uses: j178/prek-action@53276d8b0d10f8b6672aa85b4588c6921d0370cc # v2.0.1
env:
PREK_SKIP: no-commit-to-branch,mypy,pylint,gen_requirements_all,hassfest,hassfest-metadata,hassfest-mypy-config,zizmor
RUFF_OUTPUT_FORMAT: github
@@ -303,7 +303,7 @@ jobs:
with:
persist-credentials: false
- name: Run zizmor
uses: j178/prek-action@cbc2f23eb5539cf20d82d1aabd0d0ecbcc56f4e3 # v2.0.2
uses: j178/prek-action@53276d8b0d10f8b6672aa85b4588c6921d0370cc # v2.0.1
with:
extra-args: --all-files zizmor
@@ -366,7 +366,7 @@ jobs:
echo "key=uv-${UV_CACHE_VERSION}-${uv_version}-${HA_SHORT_VERSION}-$(date -u '+%Y-%m-%dT%H:%M:%s')" >> $GITHUB_OUTPUT
- name: Restore base Python virtual environment
id: cache-venv
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
with:
path: venv
key: >-
@@ -374,7 +374,7 @@ jobs:
needs.info.outputs.python_cache_key }}
- name: Restore uv wheel cache
if: steps.cache-venv.outputs.cache-hit != 'true'
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
with:
path: ${{ env.UV_CACHE_DIR }}
key: >-
@@ -386,7 +386,7 @@ jobs:
env.HA_SHORT_VERSION }}-
- name: Check if apt cache exists
id: cache-apt-check
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
with:
lookup-only: ${{ steps.cache-venv.outputs.cache-hit == 'true' }}
path: |
@@ -432,7 +432,7 @@ jobs:
fi
- name: Save apt cache
if: steps.cache-apt-check.outputs.cache-hit != 'true'
uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
uses: actions/cache/save@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
with:
path: |
${{ env.APT_CACHE_DIR }}
@@ -486,7 +486,7 @@ jobs:
&& github.event.inputs.audit-licenses-only != 'true'
steps:
- name: Restore apt cache
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
with:
path: |
${{ env.APT_CACHE_DIR }}
@@ -517,7 +517,7 @@ jobs:
check-latest: true
- name: Restore full Python virtual environment
id: cache-venv
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
with:
path: venv
fail-on-cache-miss: true
@@ -554,7 +554,7 @@ jobs:
check-latest: true
- name: Restore full Python virtual environment
id: cache-venv
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
with:
path: venv
fail-on-cache-miss: true
@@ -645,7 +645,7 @@ jobs:
check-latest: true
- name: Restore full Python ${{ matrix.python-version }} virtual environment
id: cache-venv
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
with:
path: venv
fail-on-cache-miss: true
@@ -696,7 +696,7 @@ jobs:
check-latest: true
- name: Restore full Python virtual environment
id: cache-venv
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
with:
path: venv
fail-on-cache-miss: true
@@ -749,7 +749,7 @@ jobs:
check-latest: true
- name: Restore full Python virtual environment
id: cache-venv
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
with:
path: venv
fail-on-cache-miss: true
@@ -806,7 +806,7 @@ jobs:
echo "key=mypy-${MYPY_CACHE_VERSION}-${mypy_version}-${HA_SHORT_VERSION}-$(date -u '+%Y-%m-%dT%H:%M:%s')" >> $GITHUB_OUTPUT
- name: Restore full Python virtual environment
id: cache-venv
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
with:
path: venv
fail-on-cache-miss: true
@@ -814,7 +814,7 @@ jobs:
${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
needs.info.outputs.python_cache_key }}
- name: Restore mypy cache
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
uses: actions/cache@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
with:
path: .mypy_cache
key: >-
@@ -856,7 +856,7 @@ jobs:
- base
steps:
- name: Restore apt cache
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
with:
path: |
${{ env.APT_CACHE_DIR }}
@@ -889,7 +889,7 @@ jobs:
check-latest: true
- name: Restore full Python virtual environment
id: cache-venv
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
with:
path: venv
fail-on-cache-miss: true
@@ -932,7 +932,7 @@ jobs:
group: ${{ fromJson(needs.info.outputs.test_groups) }}
steps:
- name: Restore apt cache
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
with:
path: |
${{ env.APT_CACHE_DIR }}
@@ -966,7 +966,7 @@ jobs:
check-latest: true
- name: Restore full Python ${{ matrix.python-version }} virtual environment
id: cache-venv
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
with:
path: venv
fail-on-cache-miss: true
@@ -1084,7 +1084,7 @@ jobs:
mariadb-group: ${{ fromJson(needs.info.outputs.mariadb_groups) }}
steps:
- name: Restore apt cache
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
with:
path: |
${{ env.APT_CACHE_DIR }}
@@ -1119,7 +1119,7 @@ jobs:
check-latest: true
- name: Restore full Python ${{ matrix.python-version }} virtual environment
id: cache-venv
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
with:
path: venv
fail-on-cache-miss: true
@@ -1242,7 +1242,7 @@ jobs:
postgresql-group: ${{ fromJson(needs.info.outputs.postgresql_groups) }}
steps:
- name: Restore apt cache
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
with:
path: |
${{ env.APT_CACHE_DIR }}
@@ -1279,7 +1279,7 @@ jobs:
check-latest: true
- name: Restore full Python ${{ matrix.python-version }} virtual environment
id: cache-venv
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
with:
path: venv
fail-on-cache-miss: true
@@ -1425,7 +1425,7 @@ jobs:
group: ${{ fromJson(needs.info.outputs.test_groups) }}
steps:
- name: Restore apt cache
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
with:
path: |
${{ env.APT_CACHE_DIR }}
@@ -1459,7 +1459,7 @@ jobs:
check-latest: true
- name: Restore full Python ${{ matrix.python-version }} virtual environment
id: cache-venv
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
uses: actions/cache/restore@668228422ae6a00e4ad889ee87cd7109ec5666a7 # v5.0.4
with:
path: venv
fail-on-cache-miss: true
+2 -2
View File
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.15.10
rev: v0.15.1
hooks:
- id: ruff-check
args:
@@ -18,7 +18,7 @@ repos:
exclude_types: [csv, json, html]
exclude: ^tests/fixtures/|homeassistant/generated/|tests/components/.*/snapshots/
- repo: https://github.com/zizmorcore/zizmor-pre-commit
rev: v1.24.0
rev: v1.23.1
hooks:
- id: zizmor
args:
-3
View File
@@ -46,7 +46,6 @@ homeassistant.components.accuweather.*
homeassistant.components.acer_projector.*
homeassistant.components.acmeda.*
homeassistant.components.actiontec.*
homeassistant.components.actron_air.*
homeassistant.components.adax.*
homeassistant.components.adguard.*
homeassistant.components.aftership.*
@@ -179,7 +178,6 @@ homeassistant.components.dropbox.*
homeassistant.components.droplet.*
homeassistant.components.dsmr.*
homeassistant.components.duckdns.*
homeassistant.components.duco.*
homeassistant.components.dunehd.*
homeassistant.components.duotecno.*
homeassistant.components.easyenergy.*
@@ -224,7 +222,6 @@ homeassistant.components.fronius.*
homeassistant.components.frontend.*
homeassistant.components.fujitsu_fglair.*
homeassistant.components.fully_kiosk.*
homeassistant.components.fumis.*
homeassistant.components.fyta.*
homeassistant.components.generic_hygrostat.*
homeassistant.components.generic_thermostat.*
-3
View File
@@ -22,6 +22,3 @@ Prefer concrete types (for example, `HomeAssistant`, `MockConfigEntry`, etc.) ov
## Good practices
Integrations with Platinum or Gold level in the Integration Quality Scale reflect a high standard of code quality and maintainability. When looking for examples of something, these are good places to start. The level is indicated in the manifest.json of the integration.
When reviewing entity actions, do not suggest extra defensive checks for input fields that are already validated by Home Assistant's service/action schemas and entity selection filters. Suggest additional guards only when data bypasses those validators or is transformed into a less-safe form.
When validation guarantees a dict key exists, prefer direct key access (`data["key"]`) instead of `.get("key")` so contract violations are surfaced instead of silently masked.
Generated
+2 -4
View File
@@ -592,8 +592,6 @@ CLAUDE.md @home-assistant/core
/tests/components/fujitsu_fglair/ @crevetor
/homeassistant/components/fully_kiosk/ @cgarwood
/tests/components/fully_kiosk/ @cgarwood
/homeassistant/components/fumis/ @frenck
/tests/components/fumis/ @frenck
/homeassistant/components/fyta/ @dontinelli
/tests/components/fyta/ @dontinelli
/homeassistant/components/garage_door/ @home-assistant/core
@@ -1991,8 +1989,8 @@ CLAUDE.md @home-assistant/core
/tests/components/wsdot/ @ucodery
/homeassistant/components/wyoming/ @synesthesiam
/tests/components/wyoming/ @synesthesiam
/homeassistant/components/xbox/ @tr4nt0r
/tests/components/xbox/ @tr4nt0r
/homeassistant/components/xbox/ @hunterjm @tr4nt0r
/tests/components/xbox/ @hunterjm @tr4nt0r
/homeassistant/components/xiaomi_aqara/ @danielhiversen @syssi
/tests/components/xiaomi_aqara/ @danielhiversen @syssi
/homeassistant/components/xiaomi_ble/ @Jc2k @Ernst79
Generated
-1
View File
@@ -1,4 +1,3 @@
# syntax=docker/dockerfile@sha256:2780b5c3bab67f1f76c781860de469442999ed1a0d7992a5efdf2cffc0e3d769
# Automatically generated by hassfest.
#
# To update, run python3 -m script.hassfest -p docker
-1
View File
@@ -1,4 +1,3 @@
# syntax=docker/dockerfile@sha256:2780b5c3bab67f1f76c781860de469442999ed1a0d7992a5efdf2cffc0e3d769
FROM mcr.microsoft.com/vscode/devcontainers/base:debian
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -5,5 +5,5 @@
"documentation": "https://www.home-assistant.io/integrations/acer_projector",
"iot_class": "local_polling",
"quality_scale": "legacy",
"requirements": ["serialx==1.4.1"]
"requirements": ["serialx==1.2.2"]
}
+5 -16
View File
@@ -15,10 +15,8 @@ from homeassistant.components.climate import (
)
from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
from homeassistant.core import HomeAssistant
from homeassistant.exceptions import ServiceValidationError
from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .const import DOMAIN
from .coordinator import ActronAirConfigEntry, ActronAirSystemCoordinator
from .entity import ActronAirAcEntity, ActronAirZoneEntity, actron_air_command
@@ -141,24 +139,20 @@ class ActronSystemClimate(ActronAirAcEntity, ActronAirClimateEntity):
@actron_air_command
async def async_set_fan_mode(self, fan_mode: str) -> None:
"""Set a new fan mode."""
api_fan_mode = FAN_MODE_MAPPING_HA_TO_ACTRONAIR[fan_mode]
api_fan_mode = FAN_MODE_MAPPING_HA_TO_ACTRONAIR.get(fan_mode)
await self._status.user_aircon_settings.set_fan_mode(api_fan_mode)
@actron_air_command
async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
"""Set the HVAC mode."""
ac_mode = HVAC_MODE_MAPPING_HA_TO_ACTRONAIR[hvac_mode]
ac_mode = HVAC_MODE_MAPPING_HA_TO_ACTRONAIR.get(hvac_mode)
await self._status.ac_system.set_system_mode(ac_mode)
@actron_air_command
async def async_set_temperature(self, **kwargs: Any) -> None:
"""Set the temperature."""
if (temperature := kwargs.get(ATTR_TEMPERATURE)) is None:
raise ServiceValidationError(
translation_domain=DOMAIN,
translation_key="temperature_missing",
)
await self._status.user_aircon_settings.set_temperature(temperature=temperature)
temp = kwargs.get(ATTR_TEMPERATURE)
await self._status.user_aircon_settings.set_temperature(temperature=temp)
class ActronZoneClimate(ActronAirZoneEntity, ActronAirClimateEntity):
@@ -227,9 +221,4 @@ class ActronZoneClimate(ActronAirZoneEntity, ActronAirClimateEntity):
@actron_air_command
async def async_set_temperature(self, **kwargs: Any) -> None:
"""Set the temperature."""
if (temperature := kwargs.get(ATTR_TEMPERATURE)) is None:
raise ServiceValidationError(
translation_domain=DOMAIN,
translation_key="temperature_missing",
)
await self._zone.set_temperature(temperature=temperature)
await self._zone.set_temperature(temperature=kwargs.get(ATTR_TEMPERATURE))
@@ -23,7 +23,7 @@ class ActronAirConfigFlow(ConfigFlow, domain=DOMAIN):
self._user_code: str = ""
self._verification_uri: str = ""
self._expires_minutes: str = "30"
self.login_task: asyncio.Task[None] | None = None
self.login_task: asyncio.Task | None = None
async def async_step_user(
self, user_input: dict[str, Any] | None = None
@@ -94,7 +94,7 @@ class ActronAirConfigFlow(ConfigFlow, domain=DOMAIN):
_LOGGER.error("Error getting user info: %s", err)
return self.async_abort(reason="oauth2_error")
unique_id = user_data.sub
unique_id = str(user_data["id"])
await self.async_set_unique_id(unique_id)
# Check if this is a reauth flow
@@ -107,7 +107,7 @@ class ActronAirConfigFlow(ConfigFlow, domain=DOMAIN):
self._abort_if_unique_id_configured()
return self.async_create_entry(
title=user_data.email,
title=user_data["email"],
data={CONF_API_TOKEN: self._api.refresh_token_value},
)
@@ -78,14 +78,7 @@ class ActronAirSystemCoordinator(DataUpdateCoordinator[ActronAirStatus]):
translation_placeholders={"error": repr(err)},
) from err
status = self.api.state_manager.get_status(self.serial_number)
if status is None:
raise UpdateFailed(
translation_domain=DOMAIN,
translation_key="update_error",
translation_placeholders={"error": "Status not available"},
)
self.status = status
self.status = self.api.state_manager.get_status(self.serial_number)
self.last_seen = dt_util.utcnow()
return self.status
@@ -24,7 +24,7 @@ def actron_air_command[_EntityT: ActronAirEntity, **_P](
"""
@wraps(func)
async def wrapper(self: _EntityT, /, *args: _P.args, **kwargs: _P.kwargs) -> None:
async def wrapper(self: _EntityT, *args: _P.args, **kwargs: _P.kwargs) -> None:
"""Wrap API calls with exception handling."""
try:
await func(self, *args, **kwargs)
@@ -13,5 +13,5 @@
"integration_type": "hub",
"iot_class": "cloud_polling",
"quality_scale": "silver",
"requirements": ["actron-neo-api==0.5.3"]
"requirements": ["actron-neo-api==0.5.0"]
}
@@ -69,4 +69,4 @@ rules:
# Platinum
async-dependency: done
inject-websession: todo
strict-typing: done
strict-typing: todo
@@ -58,9 +58,6 @@
"setup_connection_error": {
"message": "Failed to connect to the Actron Air API"
},
"temperature_missing": {
"message": "Provide a temperature value when adjusting the climate entity."
},
"update_error": {
"message": "An error occurred while retrieving data from the Actron Air API: {error}"
}
@@ -34,7 +34,7 @@ def get_device(hass: HomeAssistant, unique_id: str) -> DeviceEntry:
def get_serial_number_from_jid(jid: str) -> str:
"""Get serial number from Beolink JID."""
return jid.split(".")[2].split("@", maxsplit=1)[0]
return jid.split(".")[2].split("@")[0]
async def get_remotes(client: MozartClient) -> list[PairedRemote]:
@@ -21,6 +21,6 @@
"bluetooth-auto-recovery==1.5.3",
"bluetooth-data-tools==1.28.4",
"dbus-fast==4.0.4",
"habluetooth==6.1.0"
"habluetooth==5.11.1"
]
}
+19 -30
View File
@@ -6,7 +6,6 @@ from typing import TYPE_CHECKING
from broadlink.exceptions import BroadlinkException
from broadlink.remote import pulses_to_data as _bl_pulses_to_data
import infrared_protocols
from homeassistant.components.infrared import InfraredCommand, InfraredEntity
from homeassistant.config_entries import ConfigEntry
@@ -35,9 +34,9 @@ class BroadlinkIRCommand(InfraredCommand):
IR code databases like SmartIR) and want to use it with the new
infrared platform.
Protocol-aware commands (infrared_protocols.NECCommand, LgTVCommand,
etc.) manage repeats *inside* get_raw_timings() and should use the
default repeat=0. Only BroadlinkIRCommand should set hardware repeat.
Protocol-aware commands (infrared_protocols.NECCommand, etc.) manage
repeats *inside* get_raw_timings() and should use the default
repeat=0. Only BroadlinkIRCommand should set hardware repeat.
Example: Migrating IR code database base64 codes to the infrared platform:
@@ -50,11 +49,10 @@ class BroadlinkIRCommand(InfraredCommand):
packet_data = base64.b64decode(b64_code)
repeat_count = packet_data[IR_PACKET_REPEAT_INDEX]
# Parse Broadlink packet to microsecond timings
# Parse Broadlink packet to alternating µs pulses, then convert to
# the signed-alternating convention (positive mark, negative space).
pulses = data_to_pulses(packet_data)
timings = list(zip(pulses[::2], pulses[1::2]))
if len(pulses) % 2:
timings.append((pulses[-1], 0))
timings = [p if i % 2 == 0 else -p for i, p in enumerate(pulses)]
# Create command
cmd = BroadlinkIRCommand(timings, repeat_count=repeat_count)
@@ -67,13 +65,13 @@ class BroadlinkIRCommand(InfraredCommand):
def __init__(
self,
timings: list[tuple[int, int]],
timings: list[int],
repeat_count: int = 0,
) -> None:
"""Initialize with timing pairs and optional repeat count.
"""Initialize with signed-alternating timings and optional repeat count.
Args:
timings: List of (mark_us, space_us) pairs in microseconds.
timings: Signed-alternating µs pulses (positive mark, negative space).
repeat_count: Broadlink hardware repeat count (0 = send once).
Must be 0255 (the hardware repeat byte is a single unsigned byte).
@@ -83,23 +81,21 @@ class BroadlinkIRCommand(InfraredCommand):
if not 0 <= repeat_count <= 255:
raise ValueError(f"repeat_count must be 0255, got {repeat_count}")
super().__init__(modulation=self.MODULATION, repeat_count=repeat_count)
self._timings = [
infrared_protocols.Timing(high_us=high, low_us=low) for high, low in timings
]
self._timings = list(timings)
def get_raw_timings(self) -> list[infrared_protocols.Timing]:
"""Return timing pairs for transmission."""
def get_raw_timings(self) -> list[int]:
"""Return signed-alternating timings for transmission."""
return self._timings
def timings_to_broadlink_packet(
timings: list[tuple[int, int]],
timings: list[int],
repeat: int = 0,
) -> bytes:
"""Convert raw timing pairs (high_us, low_us) to a Broadlink IR packet.
"""Convert signed-alternating timings to a Broadlink IR packet.
Args:
timings: List of (mark_us, space_us) pairs in microseconds.
timings: Signed-alternating µs pulses (positive mark, negative space).
repeat: Number of extra repeats (0 = send once).
Returns:
@@ -109,12 +105,9 @@ def timings_to_broadlink_packet(
if not 0 <= repeat <= 255:
raise ValueError(f"repeat must be 0255, got {repeat}")
# Flatten (mark, space) pairs into a pulse list, omitting any zero-length spaces
pulses: list[int] = []
for high_us, low_us in timings:
pulses.append(high_us)
if low_us:
pulses.append(low_us)
# Broadlink hardware wants unsigned alternating pulses; drop the sign
# used by the signed-alternating convention.
pulses = [abs(t) for t in timings]
# Use broadlink library's encoder (tick=32.84 µs)
packet = bytearray(_bl_pulses_to_data(pulses))
@@ -160,10 +153,6 @@ class BroadlinkInfraredEntity(BroadlinkEntity, InfraredEntity):
Using isinstance check ensures protocol-level repeats (already in
timing data) don't get conflated with hardware repeats.
"""
timings = [
(timing.high_us, timing.low_us) for timing in command.get_raw_timings()
]
# Only BroadlinkIRCommand uses Broadlink hardware repeat. Protocol-aware
# commands (NECCommand, etc.) encode repeats inside get_raw_timings()
# and must use hardware repeat=0 to avoid double-repeating.
@@ -172,7 +161,7 @@ class BroadlinkInfraredEntity(BroadlinkEntity, InfraredEntity):
else:
repeat = 0
packet = timings_to_broadlink_packet(timings, repeat=repeat)
packet = timings_to_broadlink_packet(command.get_raw_timings(), repeat=repeat)
try:
await self._device.async_request(self._device.api.send_data, packet)
@@ -7,5 +7,5 @@
"documentation": "https://www.home-assistant.io/integrations/camera",
"integration_type": "entity",
"quality_scale": "internal",
"requirements": ["PyTurboJPEG==1.8.3"]
"requirements": ["PyTurboJPEG==2.2.0"]
}
@@ -50,9 +50,7 @@ ATTR_UID = "uid"
ATTR_LATITUDE = "latitude"
ATTR_LONGITUDE = "longitude"
ATTR_EMPTY_SLOTS = "empty_slots"
ATTR_FREE_EBIKES = "free_ebikes"
ATTR_TIMESTAMP = "timestamp"
EXTRA_EBIKES = "ebikes"
CONF_NETWORK = "network"
CONF_STATIONS_LIST = "stations"
@@ -240,6 +238,5 @@ class CityBikesStation(SensorEntity):
ATTR_LATITUDE: station.latitude,
ATTR_LONGITUDE: station.longitude,
ATTR_EMPTY_SLOTS: station.empty_slots,
ATTR_FREE_EBIKES: station.extra.get(EXTRA_EBIKES),
ATTR_TIMESTAMP: station.timestamp,
}
@@ -6,7 +6,6 @@ import asyncio
from collections.abc import Callable, Coroutine, Sequence
from datetime import datetime, timedelta
import hashlib
import logging
from types import ModuleType
from typing import Any, Final, Protocol, final
@@ -83,8 +82,6 @@ from .const import (
SourceType,
)
_LOGGER = logging.getLogger(__name__)
SERVICE_SEE: Final = "see"
SOURCE_TYPES = [cls.value for cls in SourceType]
@@ -131,8 +128,6 @@ SERVICE_SEE_PAYLOAD_SCHEMA: Final[vol.Schema] = vol.Schema(
YAML_DEVICES: Final = "known_devices.yaml"
EVENT_NEW_DEVICE: Final = "device_tracker_new_device"
DATA_LEGACY_TRACKERS: Final = "device_tracker.legacy_trackers"
class SeeCallback(Protocol):
"""Protocol type for DeviceTracker.see callback."""
@@ -248,19 +243,8 @@ async def _async_setup_integration(
tracker = await get_tracker(hass, config)
tracker_future.set_result(tracker)
warned_called_see = False
async def async_see_service(call: ServiceCall) -> None:
"""Service to see a device."""
nonlocal warned_called_see
if not warned_called_see:
_LOGGER.warning(
"The %s.%s action is deprecated and will be removed in "
"Home Assistant Core 2027.5",
DOMAIN,
SERVICE_SEE,
)
warned_called_see = True
# Temp workaround for iOS, introduced in 0.65
data = dict(call.data)
data.pop("hostname", None)
@@ -343,18 +327,6 @@ class DeviceTrackerPlatform:
try:
scanner = None
setup: bool | None = None
legacy_trackers = hass.data.setdefault(DATA_LEGACY_TRACKERS, set())
if full_name not in legacy_trackers:
legacy_trackers.add(full_name)
_LOGGER.warning(
"The legacy device tracker platform %s is being set up; legacy "
"device trackers are deprecated and will be removed in Home "
"Assistant Core 2027.5, please migrate to an integration which "
"uses a modern config entry based device tracker",
full_name,
)
if hasattr(self.platform, "async_get_scanner"):
scanner = await self.platform.async_get_scanner(
hass, {DOMAIN: self.config}
@@ -72,38 +72,6 @@ class DucoConfigFlow(ConfigFlow, domain=DOMAIN):
description_placeholders={"name": self._box_name},
)
async def async_step_reconfigure(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Handle reconfiguration of the integration."""
errors: dict[str, str] = {}
reconfigure_entry = self._get_reconfigure_entry()
if user_input is not None:
try:
box_name, mac = await self._validate_input(user_input[CONF_HOST])
except DucoConnectionError:
errors["base"] = "cannot_connect"
except DucoError:
_LOGGER.exception("Unexpected error connecting to Duco box")
errors["base"] = "unknown"
else:
await self.async_set_unique_id(format_mac(mac))
self._abort_if_unique_id_mismatch()
return self.async_update_reload_and_abort(
reconfigure_entry,
title=box_name,
data_updates={CONF_HOST: user_input[CONF_HOST]},
)
return self.async_show_form(
step_id="reconfigure",
data_schema=self.add_suggested_values_to_schema(
STEP_USER_SCHEMA, reconfigure_entry.data
),
errors=errors,
)
async def async_step_user(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
+1 -1
View File
@@ -7,7 +7,7 @@
"integration_type": "hub",
"iot_class": "local_polling",
"loggers": ["duco"],
"quality_scale": "silver",
"quality_scale": "bronze",
"requirements": ["python-duco-client==0.3.2"],
"zeroconf": [
{
@@ -66,14 +66,8 @@ rules:
entity-translations: done
exception-translations: done
icon-translations: done
reconfiguration-flow: done
repair-issues:
status: exempt
comment: >-
The integration has no actionable repair scenarios. Connection failures are
handled by the coordinator (unavailable entities) and resolve automatically.
There are no credentials to expire and no versioned API to become
incompatible with.
reconfiguration-flow: todo
repair-issues: todo
stale-devices:
status: todo
comment: >-
@@ -82,4 +76,4 @@ rules:
# Platinum
async-dependency: done
inject-websession: done
strict-typing: done
strict-typing: todo
@@ -4,8 +4,6 @@
"already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
"already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
"cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
"reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]",
"unique_id_mismatch": "The device you entered belongs to a different Duco box.",
"unknown": "[%key:common::config_flow::error::unknown%]"
},
"error": {
@@ -16,14 +14,6 @@
"discovery_confirm": {
"description": "Do you want to set up {name}?"
},
"reconfigure": {
"data": {
"host": "[%key:common::config_flow::data::host%]"
},
"data_description": {
"host": "[%key:component::duco::config::step::user::data_description::host%]"
}
},
"user": {
"data": {
"host": "[%key:common::config_flow::data::host%]"
+1 -5
View File
@@ -35,11 +35,7 @@ class EsphomeInfraredEntity(EsphomeEntity[InfraredInfo, EntityState], InfraredEn
@convert_api_error_ha_error
async def async_send_command(self, command: InfraredCommand) -> None:
"""Send an IR command."""
timings = [
interval
for timing in command.get_raw_timings()
for interval in (timing.high_us, -timing.low_us)
]
timings = command.get_raw_timings()
_LOGGER.debug("Sending command: %s", timings)
self._client.infrared_rf_transmit_raw_timings(
+16 -15
View File
@@ -9,11 +9,10 @@ from homeassistant.const import EntityCategory
from homeassistant.core import HomeAssistant
from homeassistant.helpers.entity_platform import AddEntitiesCallback
from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
from homeassistant.helpers.update_coordinator import CoordinatorEntity
from .const import EVOHOME_DATA
from .coordinator import EvoDataUpdateCoordinator
from .entity import is_valid_zone, unique_zone_id
from .entity import EvoEntity, is_valid_zone, unique_zone_id
async def async_setup_platform(
@@ -41,22 +40,15 @@ async def async_setup_platform(
async_add_entities(entities)
for entity in entities:
await entity.update_attrs()
class EvoResetButtonBase(CoordinatorEntity[EvoDataUpdateCoordinator], ButtonEntity):
"""Base for Evohome's Button entities."""
class EvoResetButtonBase(EvoEntity, ButtonEntity):
"""Base for reset button entities."""
_attr_entity_category = EntityCategory.CONFIG
_evo_device: evo.ControlSystem | evo.HotWater | evo.Zone
def __init__(
self,
coordinator: EvoDataUpdateCoordinator,
evo_device: evo.ControlSystem | evo.HotWater | evo.Zone,
) -> None:
"""Initialize an Evohome reset button entity."""
super().__init__(coordinator, context=evo_device.id)
self._evo_device = evo_device
_evo_state_attr_names = ()
async def async_press(self) -> None:
"""Reset the Evohome entity to its base operating mode."""
@@ -66,7 +58,10 @@ class EvoResetButtonBase(CoordinatorEntity[EvoDataUpdateCoordinator], ButtonEnti
class EvoResetSystemButton(EvoResetButtonBase):
"""Button entity for system reset."""
_attr_translation_key = "reset_system_mode"
_evo_device: evo.ControlSystem
_evo_id_attr = "system_id"
def __init__(
self,
@@ -83,7 +78,10 @@ class EvoResetSystemButton(EvoResetButtonBase):
class EvoResetDhwButton(EvoResetButtonBase):
"""Button entity for DHW override reset."""
_attr_translation_key = "clear_dhw_override"
_evo_device: evo.HotWater
_evo_id_attr = "dhw_id"
def __init__(
self,
@@ -100,7 +98,10 @@ class EvoResetDhwButton(EvoResetButtonBase):
class EvoResetZoneButton(EvoResetButtonBase):
"""Button entity for zone override reset."""
_attr_translation_key = "clear_zone_override"
_evo_device: evo.Zone
_evo_id_attr = "zone_id"
def __init__(
self,
+5 -1
View File
@@ -40,7 +40,11 @@ def unique_zone_id(evo_device: evo.Zone) -> str:
class EvoEntity(CoordinatorEntity[EvoDataUpdateCoordinator]):
"""Base for Evohome's Climate & WaterHeater entities."""
"""Base for any evohome-compatible entity (controller, DHW, zone).
This includes the controller, (1 to 12) heating zones and (optionally) a
DHW controller.
"""
_evo_device: evo.ControlSystem | evo.HotWater | evo.Zone
_evo_id_attr: str
@@ -198,7 +198,7 @@ class FritzBoxToolsFlowHandler(ConfigFlow, domain=DOMAIN):
def is_matching(self, other_flow: Self) -> bool:
"""Return True if other_flow is matching this flow."""
return other_flow._host == self._host
return other_flow._host == self._host # noqa: SLF001
async def async_step_confirm(
self, user_input: dict[str, Any] | None = None
@@ -148,7 +148,7 @@ class FritzboxConfigFlow(ConfigFlow, domain=DOMAIN):
def is_matching(self, other_flow: Self) -> bool:
"""Return True if other_flow is matching this flow."""
return other_flow._host == self._host
return other_flow._host == self._host # noqa: SLF001
async def async_step_confirm(
self, user_input: dict[str, Any] | None = None
@@ -26,7 +26,6 @@ from homeassistant.components.media_player import (
from homeassistant.core import HomeAssistant
from homeassistant.helpers.device_registry import DeviceInfo
from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from homeassistant.util import dt as dt_util
from . import FrontierSiliconConfigEntry
from .browse_media import browse_node, browse_top_level
@@ -119,8 +118,7 @@ class AFSAPIDevice(MediaPlayerEntity):
features |= MediaPlayerEntityFeature.REPEAT_SET
if self.__play_caps & PlayCaps.SHUFFLE:
features |= MediaPlayerEntityFeature.SHUFFLE_SET
if self.__play_caps & PlayCaps.SEEK:
features |= MediaPlayerEntityFeature.SEEK
if self._supports_sound_mode:
features |= MediaPlayerEntityFeature.SELECT_SOUND_MODE
@@ -225,21 +223,6 @@ class AFSAPIDevice(MediaPlayerEntity):
self._attr_is_volume_muted = await afsapi.get_mute()
self._attr_media_image_url = await afsapi.get_play_graphic()
if self.__play_caps and self.__play_caps & PlayCaps.SEEK:
position_ms = await afsapi.get_play_position()
duration_ms = await afsapi.get_play_duration()
self._attr_media_position = (
position_ms // 1000 if position_ms is not None else None
)
self._attr_media_duration = (
duration_ms // 1000 if duration_ms is not None else None
)
self._attr_media_position_updated_at = dt_util.utcnow()
else:
self._attr_media_position = None
self._attr_media_duration = None
self._attr_media_position_updated_at = None
if self._supports_sound_mode:
try:
eq_preset = await afsapi.get_eq_preset()
@@ -264,9 +247,6 @@ class AFSAPIDevice(MediaPlayerEntity):
self._attr_is_volume_muted = None
self._attr_media_image_url = None
self._attr_sound_mode = None
self._attr_media_position = None
self._attr_media_duration = None
self._attr_media_position_updated_at = None
self._attr_volume_level = None
@@ -354,10 +334,6 @@ class AFSAPIDevice(MediaPlayerEntity):
"""Set shuffle mode."""
await self.fs_device.set_play_shuffle(shuffle)
async def async_media_seek(self, position: float) -> None:
"""Seek to a position in seconds."""
await self.fs_device.set_play_position(int(position * 1000))
async def async_browse_media(
self,
media_content_type: MediaType | str | None = None,
@@ -1,26 +0,0 @@
"""Support for Fumis pellet stoves."""
from __future__ import annotations
from homeassistant.const import Platform
from homeassistant.core import HomeAssistant
from .coordinator import FumisConfigEntry, FumisDataUpdateCoordinator
PLATFORMS = [Platform.CLIMATE]
async def async_setup_entry(hass: HomeAssistant, entry: FumisConfigEntry) -> bool:
"""Set up Fumis from a config entry."""
coordinator = FumisDataUpdateCoordinator(hass, entry)
await coordinator.async_config_entry_first_refresh()
entry.runtime_data = coordinator
await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
return True
async def async_unload_entry(hass: HomeAssistant, entry: FumisConfigEntry) -> bool:
"""Unload Fumis config entry."""
return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
-128
View File
@@ -1,128 +0,0 @@
"""Support for Fumis climate entities."""
from __future__ import annotations
from typing import Any
from fumis import StoveStatus
from homeassistant.components.climate import (
ClimateEntity,
ClimateEntityFeature,
HVACAction,
HVACMode,
)
from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
from homeassistant.core import HomeAssistant
from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .coordinator import FumisConfigEntry, FumisDataUpdateCoordinator
from .entity import FumisEntity
from .helpers import fumis_exception_handler
PARALLEL_UPDATES = 1
STOVE_STATUS_TO_HVAC_ACTION: dict[StoveStatus, HVACAction | None] = {
StoveStatus.OFF: HVACAction.OFF,
StoveStatus.COLD_START_OFF: HVACAction.OFF,
StoveStatus.WOOD_BURNING_OFF: HVACAction.OFF,
StoveStatus.PRE_HEATING: HVACAction.PREHEATING,
StoveStatus.IGNITION: HVACAction.PREHEATING,
StoveStatus.PRE_COMBUSTION: HVACAction.PREHEATING,
StoveStatus.COLD_START: HVACAction.PREHEATING,
StoveStatus.COMBUSTION: HVACAction.HEATING,
StoveStatus.ECO: HVACAction.HEATING,
StoveStatus.HYBRID_INIT: HVACAction.HEATING,
StoveStatus.HYBRID_START: HVACAction.HEATING,
StoveStatus.WOOD_START: HVACAction.HEATING,
StoveStatus.WOOD_COMBUSTION: HVACAction.HEATING,
StoveStatus.COOLING: HVACAction.IDLE,
StoveStatus.UNKNOWN: None,
}
async def async_setup_entry(
hass: HomeAssistant,
entry: FumisConfigEntry,
async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up Fumis climate entity based on a config entry."""
async_add_entities([FumisClimateEntity(entry.runtime_data)])
class FumisClimateEntity(FumisEntity, ClimateEntity):
"""Defines a Fumis climate entity."""
_attr_hvac_modes = [HVACMode.OFF, HVACMode.HEAT]
_attr_max_temp = 35.0
_attr_min_temp = 10.0
_attr_name = None
_attr_supported_features = (
ClimateEntityFeature.TARGET_TEMPERATURE
| ClimateEntityFeature.TURN_OFF
| ClimateEntityFeature.TURN_ON
)
_attr_target_temperature_step = 0.5
_attr_temperature_unit = UnitOfTemperature.CELSIUS
def __init__(self, coordinator: FumisDataUpdateCoordinator) -> None:
"""Initialize the Fumis climate entity."""
super().__init__(coordinator)
self._attr_unique_id = coordinator.config_entry.unique_id
@property
def hvac_mode(self) -> HVACMode:
"""Return the current HVAC mode."""
if self.coordinator.data.controller.on:
return HVACMode.HEAT
return HVACMode.OFF
@property
def hvac_action(self) -> HVACAction | None:
"""Return the current HVAC action."""
return STOVE_STATUS_TO_HVAC_ACTION[
self.coordinator.data.controller.stove_status
]
@property
def current_temperature(self) -> float | None:
"""Return the current temperature."""
if (temp := self.coordinator.data.controller.main_temperature) is None:
return None
return temp.actual
@property
def target_temperature(self) -> float | None:
"""Return the target temperature."""
if (temp := self.coordinator.data.controller.main_temperature) is None:
return None
return temp.setpoint
@fumis_exception_handler
async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
"""Set the HVAC mode."""
if hvac_mode == HVACMode.HEAT:
await self.coordinator.client.turn_on()
else:
await self.coordinator.client.turn_off()
await self.coordinator.async_request_refresh()
@fumis_exception_handler
async def async_set_temperature(self, **kwargs: Any) -> None:
"""Set the target temperature."""
if (temperature := kwargs.get(ATTR_TEMPERATURE)) is None:
return
await self.coordinator.client.set_target_temperature(temperature)
await self.coordinator.async_request_refresh()
@fumis_exception_handler
async def async_turn_on(self) -> None:
"""Turn on the stove."""
await self.coordinator.client.turn_on()
await self.coordinator.async_request_refresh()
@fumis_exception_handler
async def async_turn_off(self) -> None:
"""Turn off the stove."""
await self.coordinator.client.turn_off()
await self.coordinator.async_request_refresh()
@@ -1,82 +0,0 @@
"""Config flow to configure the Fumis integration."""
from __future__ import annotations
from typing import Any
from fumis import (
Fumis,
FumisAuthenticationError,
FumisConnectionError,
FumisStoveOfflineError,
)
import voluptuous as vol
from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
from homeassistant.const import CONF_MAC, CONF_PIN
from homeassistant.helpers.aiohttp_client import async_get_clientsession
from homeassistant.helpers.device_registry import format_mac
from homeassistant.helpers.selector import (
TextSelector,
TextSelectorConfig,
TextSelectorType,
)
from .const import DOMAIN, LOGGER
class FumisFlowHandler(ConfigFlow, domain=DOMAIN):
"""Handle a Fumis config flow."""
async def async_step_user(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Handle a flow initiated by the user."""
errors: dict[str, str] = {}
if user_input is not None:
mac = user_input[CONF_MAC].replace(":", "").replace("-", "").upper()
fumis = Fumis(
mac=mac,
password=user_input[CONF_PIN],
session=async_get_clientsession(self.hass),
)
try:
info = await fumis.update_info()
except FumisAuthenticationError:
errors[CONF_PIN] = "invalid_auth"
except FumisStoveOfflineError:
errors["base"] = "device_offline"
except FumisConnectionError:
errors["base"] = "cannot_connect"
except Exception: # noqa: BLE001
LOGGER.exception("Unexpected exception")
errors["base"] = "unknown"
else:
await self.async_set_unique_id(format_mac(mac), raise_on_progress=False)
self._abort_if_unique_id_configured()
return self.async_create_entry(
title=info.controller.model_name or "Fumis",
data={
CONF_MAC: mac,
CONF_PIN: user_input[CONF_PIN],
},
)
return self.async_show_form(
step_id="user",
data_schema=self.add_suggested_values_to_schema(
vol.Schema(
{
vol.Required(CONF_MAC): TextSelector(
TextSelectorConfig(autocomplete="off")
),
vol.Required(CONF_PIN): TextSelector(
TextSelectorConfig(type=TextSelectorType.PASSWORD)
),
}
),
user_input,
),
errors=errors,
)
-11
View File
@@ -1,11 +0,0 @@
"""Constants for the Fumis integration."""
from __future__ import annotations
from datetime import timedelta
import logging
from typing import Final
DOMAIN: Final = "fumis"
LOGGER = logging.getLogger(__package__)
SCAN_INTERVAL = timedelta(seconds=30)
@@ -1,70 +0,0 @@
"""DataUpdateCoordinator for Fumis."""
from __future__ import annotations
from fumis import (
Fumis,
FumisAuthenticationError,
FumisConnectionError,
FumisError,
FumisInfo,
FumisStoveOfflineError,
)
from homeassistant.config_entries import ConfigEntry
from homeassistant.const import CONF_MAC, CONF_PIN
from homeassistant.core import HomeAssistant
from homeassistant.helpers.aiohttp_client import async_get_clientsession
from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
from .const import DOMAIN, LOGGER, SCAN_INTERVAL
type FumisConfigEntry = ConfigEntry[FumisDataUpdateCoordinator]
class FumisDataUpdateCoordinator(DataUpdateCoordinator[FumisInfo]):
"""Class to manage fetching Fumis data."""
config_entry: FumisConfigEntry
def __init__(self, hass: HomeAssistant, entry: FumisConfigEntry) -> None:
"""Initialize the coordinator."""
self.client = Fumis(
mac=entry.data[CONF_MAC],
password=entry.data[CONF_PIN],
session=async_get_clientsession(hass),
)
super().__init__(
hass,
LOGGER,
config_entry=entry,
name=f"{DOMAIN}_{entry.unique_id}",
update_interval=SCAN_INTERVAL,
)
async def _async_update_data(self) -> FumisInfo:
"""Fetch data from the Fumis API."""
try:
return await self.client.update_info()
except FumisAuthenticationError as err:
raise UpdateFailed(
translation_domain=DOMAIN,
translation_key="authentication_error",
) from err
except FumisStoveOfflineError as err:
raise UpdateFailed(
translation_domain=DOMAIN,
translation_key="stove_offline",
) from err
except FumisConnectionError as err:
raise UpdateFailed(
translation_domain=DOMAIN,
translation_key="communication_error",
translation_placeholders={"error": str(err)},
) from err
except FumisError as err:
raise UpdateFailed(
translation_domain=DOMAIN,
translation_key="unknown_error",
translation_placeholders={"error": str(err)},
) from err
-35
View File
@@ -1,35 +0,0 @@
"""Base entity for the Fumis integration."""
from __future__ import annotations
from homeassistant.const import CONF_MAC
from homeassistant.helpers.device_registry import (
CONNECTION_NETWORK_MAC,
DeviceInfo,
format_mac,
)
from homeassistant.helpers.update_coordinator import CoordinatorEntity
from .const import DOMAIN
from .coordinator import FumisDataUpdateCoordinator
class FumisEntity(CoordinatorEntity[FumisDataUpdateCoordinator]):
"""Defines a Fumis entity."""
_attr_has_entity_name = True
def __init__(self, coordinator: FumisDataUpdateCoordinator) -> None:
"""Initialize a Fumis entity."""
super().__init__(coordinator=coordinator)
info = coordinator.data
mac = format_mac(coordinator.config_entry.data[CONF_MAC])
self._attr_device_info = DeviceInfo(
identifiers={(DOMAIN, mac)},
connections={(CONNECTION_NETWORK_MAC, mac)},
manufacturer=info.controller.manufacturer or "Fumis",
model=info.controller.model_name,
name=info.controller.model_name or "Pellet stove",
sw_version=str(info.controller.version),
hw_version=str(info.unit.version),
)
-63
View File
@@ -1,63 +0,0 @@
"""Helpers for Fumis."""
from __future__ import annotations
from collections.abc import Callable, Coroutine
from typing import Any, Concatenate
from fumis import (
FumisAuthenticationError,
FumisConnectionError,
FumisError,
FumisStoveOfflineError,
)
from homeassistant.exceptions import HomeAssistantError
from .const import DOMAIN
from .entity import FumisEntity
def fumis_exception_handler[_FumisEntityT: FumisEntity, **_P](
func: Callable[Concatenate[_FumisEntityT, _P], Coroutine[Any, Any, Any]],
) -> Callable[Concatenate[_FumisEntityT, _P], Coroutine[Any, Any, None]]:
"""Decorate Fumis calls to handle exceptions.
A decorator that wraps the passed in function, catches Fumis errors.
"""
async def handler(self: _FumisEntityT, *args: _P.args, **kwargs: _P.kwargs) -> None:
try:
await func(self, *args, **kwargs)
self.coordinator.async_update_listeners()
except FumisAuthenticationError as error:
self.hass.config_entries.async_schedule_reload(
self.coordinator.config_entry.entry_id
)
raise HomeAssistantError(
translation_domain=DOMAIN,
translation_key="authentication_error",
) from error
except FumisStoveOfflineError as error:
raise HomeAssistantError(
translation_domain=DOMAIN,
translation_key="stove_offline",
) from error
except FumisConnectionError as error:
raise HomeAssistantError(
translation_domain=DOMAIN,
translation_key="communication_error",
translation_placeholders={"error": str(error)},
) from error
except FumisError as error:
raise HomeAssistantError(
translation_domain=DOMAIN,
translation_key="unknown_error",
translation_placeholders={"error": str(error)},
) from error
return handler
@@ -1,12 +0,0 @@
{
"domain": "fumis",
"name": "Fumis",
"codeowners": ["@frenck"],
"config_flow": true,
"documentation": "https://www.home-assistant.io/integrations/fumis",
"integration_type": "device",
"iot_class": "cloud_polling",
"loggers": ["fumis"],
"quality_scale": "bronze",
"requirements": ["fumis==0.2.1"]
}
@@ -1,78 +0,0 @@
rules:
# Bronze
action-setup:
status: exempt
comment: This integration does not register custom actions.
appropriate-polling: done
brands: done
common-modules: done
config-flow-test-coverage: done
config-flow: done
dependency-transparency: done
docs-actions:
status: exempt
comment: This integration does not have any custom actions.
docs-high-level-description: done
docs-installation-instructions: done
docs-removal-instructions: done
entity-event-setup:
status: exempt
comment: Entities of this integration do not explicitly subscribe to events.
entity-unique-id: done
has-entity-name: done
runtime-data: done
test-before-configure: done
test-before-setup: done
unique-config-entry: done
# Silver
action-exceptions: done
config-entry-unloading: done
docs-configuration-parameters:
status: exempt
comment: This integration does not have an options flow.
docs-installation-parameters: done
entity-unavailable: done
integration-owner: done
log-when-unavailable: done
parallel-updates: done
reauthentication-flow: todo
test-coverage: done
# Gold
devices: done
diagnostics: todo
discovery:
status: todo
comment: DHCP discovery can be added.
discovery-update-info:
status: todo
comment: DHCP discovery based update can be added.
docs-data-update: done
docs-examples: done
docs-known-limitations: done
docs-supported-devices: done
docs-supported-functions: done
docs-troubleshooting: done
docs-use-cases: done
dynamic-devices:
status: exempt
comment: This integration connects to a single device.
entity-category: done
entity-device-class: done
entity-disabled-by-default: done
entity-translations: done
exception-translations: done
icon-translations: done
reconfiguration-flow: todo
repair-issues:
status: exempt
comment: This integration does not raise any repairable issues.
stale-devices:
status: exempt
comment: This integration connects to a single device.
# Platinum
async-dependency: done
inject-websession: done
strict-typing: done
@@ -1,40 +0,0 @@
{
"config": {
"abort": {
"already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
},
"error": {
"cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
"device_offline": "Your stove's Fumis WiRCU Wi-Fi module is not connected to the internet. Make sure the module has power and is connected to your Wi-Fi network.",
"invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
"unknown": "[%key:common::config_flow::error::unknown%]"
},
"step": {
"user": {
"data": {
"mac": "MAC address",
"pin": "PIN code"
},
"data_description": {
"mac": "The MAC address is a unique code of letters and numbers that identifies your stove. You can find it on the label of the Fumis WiRCU Wi-Fi module connected to your stove.",
"pin": "You can find the PIN code on the label of the Fumis WiRCU Wi-Fi module connected to your stove."
},
"description": "Integrate your Fumis-based pellet stove with Home Assistant to monitor and control it. You can see your stove's temperature, heating status, and adjust the target temperature right from your dashboard or use it in your automations. This way, you can make sure your home is always nice, warm, and comfortable."
}
}
},
"exceptions": {
"authentication_error": {
"message": "Authentication with the Fumis online service failed. Check your MAC address and PIN code."
},
"communication_error": {
"message": "An error occurred while communicating with the Fumis online service: {error}"
},
"stove_offline": {
"message": "Your stove's Fumis WiRCU Wi-Fi module is not connected to the internet."
},
"unknown_error": {
"message": "An unexpected error occurred while communicating with the Fumis online service: {error}"
}
}
}
@@ -133,7 +133,7 @@ DESCRIPTIONS = (
key=FlowStatistics.overall.unique_id,
translation_key="flow_statistics_overall",
state_class=SensorStateClass.TOTAL_INCREASING,
device_class=SensorDeviceClass.WATER,
device_class=SensorDeviceClass.VOLUME,
entity_category=EntityCategory.DIAGNOSTIC,
native_unit_of_measurement=UnitOfVolume.LITERS,
char=FlowStatistics.overall,
@@ -141,7 +141,6 @@ DESCRIPTIONS = (
GardenaBluetoothSensorEntityDescription(
key=FlowStatistics.current.unique_id,
translation_key="flow_statistics_current",
state_class=SensorStateClass.MEASUREMENT,
device_class=SensorDeviceClass.VOLUME_FLOW_RATE,
entity_category=EntityCategory.DIAGNOSTIC,
native_unit_of_measurement=UnitOfVolumeFlowRate.LITERS_PER_MINUTE,
@@ -151,7 +150,7 @@ DESCRIPTIONS = (
key=FlowStatistics.resettable.unique_id,
translation_key="flow_statistics_resettable",
state_class=SensorStateClass.TOTAL_INCREASING,
device_class=SensorDeviceClass.WATER,
device_class=SensorDeviceClass.VOLUME,
entity_category=EntityCategory.DIAGNOSTIC,
native_unit_of_measurement=UnitOfVolume.LITERS,
char=FlowStatistics.resettable,
@@ -167,7 +166,6 @@ DESCRIPTIONS = (
GardenaBluetoothSensorEntityDescription(
key=Spray.current_distance.unique_id,
translation_key="spray_current_distance",
state_class=SensorStateClass.MEASUREMENT,
entity_category=EntityCategory.DIAGNOSTIC,
native_unit_of_measurement=PERCENTAGE,
char=Spray.current_distance,
@@ -75,7 +75,7 @@ class Gogogate2FlowHandler(ConfigFlow, domain=DOMAIN):
def is_matching(self, other_flow: Self) -> bool:
"""Return True if other_flow is matching this flow."""
return other_flow._ip_address == self._ip_address
return other_flow._ip_address == self._ip_address # noqa: SLF001
async def async_step_user(
self, user_input: dict[str, Any] | None = None
@@ -256,13 +256,11 @@ class GrowattServerConfigFlow(ConfigFlow, domain=DOMAIN):
_LOGGER.error("Invalid response format during login: %s", ex)
return self._async_show_password_form({"base": ERROR_CANNOT_CONNECT})
if not login_response.get("success"):
if login_response.get("msg") == LOGIN_INVALID_AUTH_CODE:
return self._async_show_password_form({"base": ERROR_INVALID_AUTH})
_LOGGER.debug(
"Growatt login failed: %s", login_response.get("msg", "Unknown error")
)
return self._async_show_password_form({"base": ERROR_CANNOT_CONNECT})
if (
not login_response["success"]
and login_response["msg"] == LOGIN_INVALID_AUTH_CODE
):
return self._async_show_password_form({"base": ERROR_INVALID_AUTH})
self.user_id = login_response["user"]["id"]
self.data = user_input
+32 -3
View File
@@ -25,15 +25,17 @@ from aiohasupervisor.models import (
SupervisorOptions,
YellowOptions,
)
import voluptuous as vol
from homeassistant.auth.const import GROUP_ID_ADMIN
from homeassistant.auth.models import RefreshToken
from homeassistant.components import frontend
from homeassistant.components import frontend, panel_custom
from homeassistant.components.homeassistant import async_set_stop_handler
from homeassistant.components.http import (
CONF_SERVER_HOST,
CONF_SERVER_PORT,
CONF_SSL_CERTIFICATE,
StaticPathConfig,
)
from homeassistant.config_entries import SOURCE_SYSTEM, ConfigEntry
from homeassistant.const import (
@@ -154,7 +156,12 @@ _LOGGER = logging.getLogger(__name__)
# wait for the import of the platforms
PLATFORMS = [Platform.BINARY_SENSOR, Platform.SENSOR, Platform.SWITCH, Platform.UPDATE]
CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
CONF_FRONTEND_REPO = "development_repo"
CONFIG_SCHEMA = vol.Schema(
{vol.Optional(DOMAIN): vol.Schema({vol.Optional(CONF_FRONTEND_REPO): cv.isdir})},
extra=vol.ALLOW_EXTRA,
)
DEPRECATION_URL = (
@@ -191,7 +198,7 @@ def hostname_from_addon_slug(addon_slug: str) -> str:
return addon_slug.replace("_", "-")
async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool: # noqa: C901
"""Set up the Hass.io component."""
# Check local setup
for env in ("SUPERVISOR", "SUPERVISOR_TOKEN"):
@@ -243,8 +250,30 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
refresh_token = await hass.auth.async_create_refresh_token(user)
config_store.update(hassio_user=user.id)
# This overrides the normal API call that would be forwarded
development_repo = config.get(DOMAIN, {}).get(CONF_FRONTEND_REPO)
if development_repo is not None:
await hass.http.async_register_static_paths(
[
StaticPathConfig(
"/api/hassio/app",
os.path.join(development_repo, "hassio/build"),
False,
)
]
)
hass.http.register_view(HassIOView(host, websession))
await panel_custom.async_register_panel(
hass,
frontend_url_path="hassio",
webcomponent_name="hassio-main",
js_url="/api/hassio/app/entrypoint.js",
embed_iframe=True,
require_admin=True,
)
async def update_hass_api(http_config: dict[str, Any], refresh_token: RefreshToken):
"""Update Home Assistant API data on Hass.io."""
options = HomeAssistantOptions(
+15 -4
View File
@@ -14,6 +14,7 @@ from aiohttp import web
from aiohttp.client import ClientTimeout
from aiohttp.hdrs import (
AUTHORIZATION,
CACHE_CONTROL,
CONTENT_ENCODING,
CONTENT_LENGTH,
CONTENT_TYPE,
@@ -80,13 +81,20 @@ PATHS_ADMIN = re.compile(
r")$"
)
# Unauthenticated requests come in for add-on images
# Unauthenticated requests come in for Supervisor panel + add-on images
PATHS_NO_AUTH = re.compile(
r"^(?:"
r"|app/.*"
r"|(store/)?addons/[^/]+/(logo|icon)"
r")$"
)
NO_STORE = re.compile(
r"^(?:"
r"|app/entrypoint.js"
r")$"
)
# Follow logs should not be compressed, to be able to get streamed by frontend
NO_COMPRESS = re.compile(
r"^(?:"
@@ -210,7 +218,7 @@ class HassIOView(HomeAssistantView):
# Stream response
response = web.StreamResponse(
status=client.status, headers=_response_header(client)
status=client.status, headers=_response_header(client, path)
)
response.content_type = client.content_type
@@ -235,13 +243,16 @@ class HassIOView(HomeAssistantView):
post = _handle
def _response_header(response: aiohttp.ClientResponse) -> dict[str, str]:
def _response_header(response: aiohttp.ClientResponse, path: str) -> dict[str, str]:
"""Create response header."""
return {
headers = {
name: value
for name, value in response.headers.items()
if name not in RESPONSE_HEADERS_FILTER
}
if NO_STORE.match(path):
headers[CACHE_CONTROL] = "no-store, max-age=0"
return headers
def _get_timeout(path: str) -> ClientTimeout:
-1
View File
@@ -81,7 +81,6 @@ MODEL_INPUTS = {
"XLR 2",
"Analog 1",
"Analog 2",
"Analog 3",
"BNC",
"Coaxial",
"Optical 1",
@@ -452,16 +452,6 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool: # noqa:
"arch": arch,
},
)
if not info["docker"] and not info["virtualenv"]:
ir.async_create_issue(
hass,
DOMAIN,
"unsupported_local_deps",
learn_more_url=DEPRECATION_URL,
is_fixable=False,
severity=IssueSeverity.WARNING,
translation_key="unsupported_local_deps",
)
# Delay deprecation check to make sure installation method is determined correctly
hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STARTED, _async_check_deprecation)
@@ -106,12 +106,12 @@
"title": "[%key:component::homeassistant::issues::deprecated_architecture::title%]"
},
"deprecated_method": {
"description": "This system is using the {installation_type} installation type, which has been unsupported since Home Assistant 2025.12. To continue receiving updates and support, migrate to a supported installation method.",
"title": "Unsupported installation method"
"description": "This system is using the {installation_type} installation type, which has been deprecated and will become unsupported following the release of Home Assistant 2025.12. While you can continue using your current setup after that point, we strongly recommend migrating to a supported installation method.",
"title": "Deprecation notice: Installation method"
},
"deprecated_method_architecture": {
"description": "This system is using the {installation_type} installation type, and 32-bit hardware (`{arch}`), both of which have been unsupported since Home Assistant 2025.12. To continue receiving updates and support, migrate to supported hardware and use a supported installation method.",
"title": "Unsupported installation method and architecture"
"description": "This system is using the {installation_type} installation type, and 32-bit hardware (`{arch}`), both of which have been deprecated and will no longer be supported after the release of Home Assistant 2025.12.",
"title": "Deprecation notice"
},
"deprecated_os_aarch64": {
"description": "This system is running on a 32-bit operating system (`armv7`), which has been deprecated and will no longer receive updates after the release of Home Assistant 2025.12. To continue using Home Assistant on this hardware, you will need to install a 64-bit operating system. Please refer to our [installation guide]({installation_guide}).",
@@ -203,10 +203,6 @@
}
},
"title": "Storage corruption detected for {storage_key}"
},
"unsupported_local_deps": {
"description": "This system is running Home Assistant outside a virtual environment or a Docker container. This is not supported and will not work after the release of Home Assistant 2026.11.",
"title": "Deprecation notice: Installation method"
}
},
"services": {
@@ -7,7 +7,8 @@
"documentation": "https://www.home-assistant.io/integrations/homeassistant_hardware",
"integration_type": "system",
"requirements": [
"universal-silabs-flasher==1.1.0",
"serialx==1.2.2",
"universal-silabs-flasher==1.0.3",
"ha-silabs-firmware-client==0.3.0"
]
}
@@ -4,9 +4,6 @@
"hydrological_alert": {
"default": "mdi:alert-octagon-outline"
},
"ice_phenomena": {
"default": "mdi:snowflake"
},
"water_flow": {
"default": "mdi:waves-arrow-right"
},
+1 -14
View File
@@ -16,12 +16,7 @@ from homeassistant.components.sensor import (
SensorEntityDescription,
SensorStateClass,
)
from homeassistant.const import (
PERCENTAGE,
UnitOfLength,
UnitOfTemperature,
UnitOfVolumeFlowRate,
)
from homeassistant.const import UnitOfLength, UnitOfTemperature, UnitOfVolumeFlowRate
from homeassistant.core import HomeAssistant
from homeassistant.helpers import entity_registry as er
from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
@@ -65,14 +60,6 @@ SENSOR_TYPES: tuple[ImgwPibSensorEntityDescription, ...] = (
value=lambda data: data.hydrological_alert.value,
attrs=gen_alert_attributes,
),
ImgwPibSensorEntityDescription(
key="ice_phenomena",
translation_key="ice_phenomena",
native_unit_of_measurement=PERCENTAGE,
state_class=SensorStateClass.MEASUREMENT,
value=lambda data: data.ice_phenomena.value,
suggested_display_precision=0,
),
ImgwPibSensorEntityDescription(
key="water_flow",
translation_key="water_flow",
@@ -59,9 +59,6 @@
}
}
},
"ice_phenomena": {
"name": "Ice phenomena"
},
"water_flow": {
"name": "Water flow"
},
@@ -5,5 +5,5 @@
"documentation": "https://www.home-assistant.io/integrations/infrared",
"integration_type": "entity",
"quality_scale": "internal",
"requirements": ["infrared-protocols==1.3.0"]
"requirements": ["infrared-protocols==2.0.0"]
}
@@ -6,6 +6,6 @@
"documentation": "https://www.home-assistant.io/integrations/jewish_calendar",
"iot_class": "calculated",
"loggers": ["hdate"],
"requirements": ["hdate[astral]==1.2.1"],
"requirements": ["hdate[astral]==1.1.2"],
"single_config_entry": true
}
@@ -55,11 +55,7 @@ class DemoInfrared(InfraredEntity):
async def async_send_command(self, command: infrared_protocols.Command) -> None:
"""Send an IR command."""
timings = [
interval
for timing in command.get_raw_timings()
for interval in (timing.high_us, -timing.low_us)
]
timings = command.get_raw_timings()
persistent_notification.async_create(
self.hass, str(timings), title="Infrared Command"
)
+1 -1
View File
@@ -13,7 +13,7 @@
"requirements": [
"xknx==3.15.0",
"xknxproject==3.8.2",
"knx-frontend==2026.4.19.175239"
"knx-frontend==2026.3.28.223133"
],
"single_config_entry": true
}
+5 -10
View File
@@ -154,10 +154,6 @@
}
},
"config_panel": {
"common": {
"group_address": "Group address",
"group_addresses": "Group addresses"
},
"dashboard": {
"connection_flow": {
"description": "Reconfigure KNX connection or import a new KNX keyring file",
@@ -964,7 +960,6 @@
"description": "Minimum time between consecutive sends. This can be used to prevent high traffic on the KNX bus when values change very frequently. Only the most recent value during the cooldown period is sent.",
"label": "Cooldown"
},
"copy_info": "Copying options of {entity_name} ({entity_id}).",
"default": {
"description": "The value to send if the entity state is `unavailable` or `unknown`, or if the attribute is not set. If `default` is omitted, nothing is sent in these cases, but the last known value remains available for read requests.",
"label": "Default value"
@@ -974,7 +969,7 @@
"label": "Entity"
},
"ga": {
"label": "[%key:component::knx::config_panel::common::group_address%]"
"label": "Group address"
},
"periodic_send": {
"description": "Time interval to automatically resend the current value to the KNX bus, even if it hasnt changed.",
@@ -1218,7 +1213,7 @@
"fields": {
"address": {
"description": "Group address(es) that shall be added or removed. Lists are allowed.",
"name": "[%key:component::knx::config_panel::common::group_address%]"
"name": "[%key:component::knx::services::send::fields::address::name%]"
},
"remove": {
"description": "Whether the group address(es) will be removed.",
@@ -1236,7 +1231,7 @@
"fields": {
"address": {
"description": "Group address state or attribute updates will be sent to. GroupValueRead requests will be answered. Per address only one exposure can be registered.",
"name": "[%key:component::knx::config_panel::common::group_address%]"
"name": "[%key:component::knx::services::send::fields::address::name%]"
},
"attribute": {
"description": "Attribute of the entity that shall be sent to the KNX bus. If not set, the state will be sent. Eg. for a light the state is either “on” or “off” - with attribute you can expose its “brightness”.",
@@ -1266,7 +1261,7 @@
"fields": {
"address": {
"description": "Group address(es) to send read request to. Lists will read multiple group addresses.",
"name": "[%key:component::knx::config_panel::common::group_address%]"
"name": "[%key:component::knx::services::send::fields::address::name%]"
}
},
"name": "Read from KNX bus"
@@ -1280,7 +1275,7 @@
"fields": {
"address": {
"description": "Group address(es) to write to. Lists will send to multiple group addresses successively.",
"name": "[%key:component::knx::config_panel::common::group_address%]"
"name": "Group address"
},
"payload": {
"description": "Payload to send to the bus. Integers are treated as DPT 1/2/3 payloads. For DPTs > 6 bits send a list. Each value represents 1 octet (0-255). Pad with 0 to DPT byte length.",
@@ -70,7 +70,7 @@ async def build_item_response(media_library, payload, get_thumbnail_url=None):
media_content_id=search_id,
media_content_type=search_type,
title=title,
can_play=bool(search_type in PLAYABLE_MEDIA_TYPES and search_id),
can_play=search_type in PLAYABLE_MEDIA_TYPES and search_id,
can_expand=True,
children=children,
thumbnail=thumbnail,
+33 -39
View File
@@ -4,8 +4,6 @@ from __future__ import annotations
from dataclasses import dataclass
from infrared_protocols.codes.lg.tv import LGTVCode
from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
from homeassistant.config_entries import ConfigEntry
from homeassistant.core import HomeAssistant
@@ -21,93 +19,89 @@ PARALLEL_UPDATES = 1
class LgIrButtonEntityDescription(ButtonEntityDescription):
"""Describes LG IR button entity."""
command_code: LGTVCode
command_code: str
TV_BUTTON_DESCRIPTIONS: tuple[LgIrButtonEntityDescription, ...] = (
LgIrButtonEntityDescription(
key="power_on", translation_key="power_on", command_code=LGTVCode.POWER_ON
key="power_on", translation_key="power_on", command_code="POWER_ON"
),
LgIrButtonEntityDescription(
key="power_off", translation_key="power_off", command_code=LGTVCode.POWER_OFF
key="power_off", translation_key="power_off", command_code="POWER_OFF"
),
LgIrButtonEntityDescription(
key="hdmi_1", translation_key="hdmi_1", command_code=LGTVCode.HDMI_1
key="hdmi_1", translation_key="hdmi_1", command_code="HDMI_1"
),
LgIrButtonEntityDescription(
key="hdmi_2", translation_key="hdmi_2", command_code=LGTVCode.HDMI_2
key="hdmi_2", translation_key="hdmi_2", command_code="HDMI_2"
),
LgIrButtonEntityDescription(
key="hdmi_3", translation_key="hdmi_3", command_code=LGTVCode.HDMI_3
key="hdmi_3", translation_key="hdmi_3", command_code="HDMI_3"
),
LgIrButtonEntityDescription(
key="hdmi_4", translation_key="hdmi_4", command_code=LGTVCode.HDMI_4
key="hdmi_4", translation_key="hdmi_4", command_code="HDMI_4"
),
LgIrButtonEntityDescription(
key="exit", translation_key="exit", command_code=LGTVCode.EXIT
key="exit", translation_key="exit", command_code="EXIT"
),
LgIrButtonEntityDescription(
key="info", translation_key="info", command_code=LGTVCode.INFO
key="info", translation_key="info", command_code="INFO"
),
LgIrButtonEntityDescription(
key="guide", translation_key="guide", command_code=LGTVCode.GUIDE
key="guide", translation_key="guide", command_code="GUIDE"
),
LgIrButtonEntityDescription(key="up", translation_key="up", command_code="NAV_UP"),
LgIrButtonEntityDescription(
key="down", translation_key="down", command_code="NAV_DOWN"
),
LgIrButtonEntityDescription(
key="up", translation_key="up", command_code=LGTVCode.NAV_UP
key="left", translation_key="left", command_code="NAV_LEFT"
),
LgIrButtonEntityDescription(
key="down", translation_key="down", command_code=LGTVCode.NAV_DOWN
key="right", translation_key="right", command_code="NAV_RIGHT"
),
LgIrButtonEntityDescription(key="ok", translation_key="ok", command_code="OK"),
LgIrButtonEntityDescription(
key="back", translation_key="back", command_code="BACK"
),
LgIrButtonEntityDescription(
key="left", translation_key="left", command_code=LGTVCode.NAV_LEFT
key="home", translation_key="home", command_code="HOME"
),
LgIrButtonEntityDescription(
key="right", translation_key="right", command_code=LGTVCode.NAV_RIGHT
key="menu", translation_key="menu", command_code="MENU"
),
LgIrButtonEntityDescription(
key="ok", translation_key="ok", command_code=LGTVCode.OK
key="input", translation_key="input", command_code="INPUT"
),
LgIrButtonEntityDescription(
key="back", translation_key="back", command_code=LGTVCode.BACK
key="num_0", translation_key="num_0", command_code="NUM_0"
),
LgIrButtonEntityDescription(
key="home", translation_key="home", command_code=LGTVCode.HOME
key="num_1", translation_key="num_1", command_code="NUM_1"
),
LgIrButtonEntityDescription(
key="menu", translation_key="menu", command_code=LGTVCode.MENU
key="num_2", translation_key="num_2", command_code="NUM_2"
),
LgIrButtonEntityDescription(
key="input", translation_key="input", command_code=LGTVCode.INPUT
key="num_3", translation_key="num_3", command_code="NUM_3"
),
LgIrButtonEntityDescription(
key="num_0", translation_key="num_0", command_code=LGTVCode.NUM_0
key="num_4", translation_key="num_4", command_code="NUM_4"
),
LgIrButtonEntityDescription(
key="num_1", translation_key="num_1", command_code=LGTVCode.NUM_1
key="num_5", translation_key="num_5", command_code="NUM_5"
),
LgIrButtonEntityDescription(
key="num_2", translation_key="num_2", command_code=LGTVCode.NUM_2
key="num_6", translation_key="num_6", command_code="NUM_6"
),
LgIrButtonEntityDescription(
key="num_3", translation_key="num_3", command_code=LGTVCode.NUM_3
key="num_7", translation_key="num_7", command_code="NUM_7"
),
LgIrButtonEntityDescription(
key="num_4", translation_key="num_4", command_code=LGTVCode.NUM_4
key="num_8", translation_key="num_8", command_code="NUM_8"
),
LgIrButtonEntityDescription(
key="num_5", translation_key="num_5", command_code=LGTVCode.NUM_5
),
LgIrButtonEntityDescription(
key="num_6", translation_key="num_6", command_code=LGTVCode.NUM_6
),
LgIrButtonEntityDescription(
key="num_7", translation_key="num_7", command_code=LGTVCode.NUM_7
),
LgIrButtonEntityDescription(
key="num_8", translation_key="num_8", command_code=LGTVCode.NUM_8
),
LgIrButtonEntityDescription(
key="num_9", translation_key="num_9", command_code=LGTVCode.NUM_9
key="num_9", translation_key="num_9", command_code="NUM_9"
),
)
@@ -2,7 +2,7 @@
import logging
from infrared_protocols.codes.lg.tv import LGTVCode, make_command as make_lg_tv_command
from infrared_protocols import get_codes
from homeassistant.components.infrared import async_send_command
from homeassistant.config_entries import ConfigEntry
@@ -16,6 +16,8 @@ from .const import DOMAIN
_LOGGER = logging.getLogger(__name__)
LG_TV_CODES = get_codes("lg/tv")
class LgIrEntity(Entity):
"""LG IR base entity."""
@@ -66,11 +68,12 @@ class LgIrEntity(Entity):
ir_state is not None and ir_state.state != STATE_UNAVAILABLE
)
async def _send_command(self, code: LGTVCode) -> None:
async def _send_command(self, code_name: str) -> None:
"""Send an IR command using the LG protocol."""
command = await LG_TV_CODES.load_command(code_name)
await async_send_command(
self.hass,
self._infrared_entity_id,
make_lg_tv_command(code),
command,
context=self._context,
)
@@ -2,8 +2,6 @@
from __future__ import annotations
from infrared_protocols.codes.lg.tv import LGTVCode
from homeassistant.components.media_player import (
MediaPlayerDeviceClass,
MediaPlayerEntity,
@@ -57,40 +55,40 @@ class LgIrTvMediaPlayer(LgIrEntity, MediaPlayerEntity):
async def async_turn_on(self) -> None:
"""Turn on the TV."""
await self._send_command(LGTVCode.POWER_ON)
await self._send_command("POWER")
async def async_turn_off(self) -> None:
"""Turn off the TV."""
await self._send_command(LGTVCode.POWER_OFF)
await self._send_command("POWER")
async def async_volume_up(self) -> None:
"""Send volume up command."""
await self._send_command(LGTVCode.VOLUME_UP)
await self._send_command("VOLUME_UP")
async def async_volume_down(self) -> None:
"""Send volume down command."""
await self._send_command(LGTVCode.VOLUME_DOWN)
await self._send_command("VOLUME_DOWN")
async def async_mute_volume(self, mute: bool) -> None:
"""Send mute command."""
await self._send_command(LGTVCode.MUTE)
await self._send_command("MUTE")
async def async_media_next_track(self) -> None:
"""Send channel up command."""
await self._send_command(LGTVCode.CHANNEL_UP)
await self._send_command("CHANNEL_UP")
async def async_media_previous_track(self) -> None:
"""Send channel down command."""
await self._send_command(LGTVCode.CHANNEL_DOWN)
await self._send_command("CHANNEL_DOWN")
async def async_media_play(self) -> None:
"""Send play command."""
await self._send_command(LGTVCode.PLAY)
await self._send_command("PLAY")
async def async_media_pause(self) -> None:
"""Send pause command."""
await self._send_command(LGTVCode.PAUSE)
await self._send_command("PAUSE")
async def async_media_stop(self) -> None:
"""Send stop command."""
await self._send_command(LGTVCode.STOP)
await self._send_command("STOP")
+7 -7
View File
@@ -2,7 +2,7 @@
from __future__ import annotations
from collections.abc import Callable, Collection, Mapping
from collections.abc import Callable, Mapping
from typing import Any
from homeassistant.components.sensor import ATTR_STATE_CLASS, NON_NUMERIC_DEVICE_CLASSES
@@ -75,12 +75,12 @@ def _async_config_entries_for_ids(
def async_determine_event_types(
hass: HomeAssistant, entity_ids: list[str] | None, device_ids: list[str] | None
) -> set[EventType[Any] | str]:
) -> tuple[EventType[Any] | str, ...]:
"""Reduce the event types based on the entity ids and device ids."""
logbook_config: LogbookConfig = hass.data[DOMAIN]
external_events = logbook_config.external_events
if not entity_ids and not device_ids:
return {*BUILT_IN_EVENTS, *external_events}
return (*BUILT_IN_EVENTS, *external_events)
interested_domains: set[str] = set()
for entry_id in _async_config_entries_for_ids(hass, entity_ids, device_ids):
@@ -93,16 +93,16 @@ def async_determine_event_types(
# to add them since we have historically included
# them when matching only on entities
#
interested_event_types: set[EventType[Any] | str] = {
intrested_event_types: set[EventType[Any] | str] = {
external_event
for external_event, domain_call in external_events.items()
if domain_call[0] in interested_domains
} | AUTOMATION_EVENTS
if entity_ids:
# We also allow entity_ids to be recorded via manual logbook entries.
interested_event_types.add(EVENT_LOGBOOK_ENTRY)
intrested_event_types.add(EVENT_LOGBOOK_ENTRY)
return interested_event_types
return tuple(intrested_event_types)
@callback
@@ -187,7 +187,7 @@ def async_subscribe_events(
hass: HomeAssistant,
subscriptions: list[CALLBACK_TYPE],
target: Callable[[Event[Any]], None],
event_types: Collection[EventType[Any] | str],
event_types: tuple[EventType[Any] | str, ...],
entities_filter: Callable[[str], bool] | None,
entity_ids: list[str] | None,
device_ids: list[str] | None,
@@ -2,7 +2,7 @@
from __future__ import annotations
from collections.abc import Callable, Collection, Generator, Sequence
from collections.abc import Callable, Generator, Sequence
from dataclasses import dataclass, field
from datetime import datetime as dt
import logging
@@ -126,7 +126,7 @@ class EventProcessor:
def __init__(
self,
hass: HomeAssistant,
event_types: Collection[EventType[Any] | str],
event_types: tuple[EventType[Any] | str, ...],
entity_ids: list[str] | None = None,
device_ids: list[str] | None = None,
context_id: str | None = None,
@@ -20,6 +20,7 @@ from homeassistant.helpers.event import async_track_point_in_utc_time
from homeassistant.helpers.json import json_bytes
from homeassistant.util import dt as dt_util
from homeassistant.util.async_ import create_eager_task
from homeassistant.util.event_type import EventType
from .const import DOMAIN
from .helpers import (
@@ -365,11 +366,16 @@ async def ws_event_stream(
# cache parent user_ids as they fire. Historical queries don't — the
# context_only join fetches them by context_id regardless of type.
# Unfiltered streams already include it via BUILT_IN_EVENTS.
live_event_types: tuple[EventType[Any] | str, ...] = (
event_types
if EVENT_CALL_SERVICE in event_types
else (*event_types, EVENT_CALL_SERVICE)
)
async_subscribe_events(
hass,
subscriptions,
_queue_or_cancel,
{*event_types, EVENT_CALL_SERVICE},
live_event_types,
entities_filter,
entity_ids,
device_ids,
-5
View File
@@ -46,11 +46,6 @@ class LyricLocalOAuth2Implementation(
):
"""Lyric Local OAuth2 implementation."""
@property
def extra_authorize_data(self) -> dict:
"""Prompt the user to choose between Resideo and First Alert apps."""
return {"appSelect": "1"}
async def _token_request(self, data: dict) -> dict:
"""Make a token request."""
session = async_get_clientsession(self.hass)
@@ -8,6 +8,6 @@
"documentation": "https://www.home-assistant.io/integrations/matter",
"integration_type": "hub",
"iot_class": "local_push",
"requirements": ["matter-python-client==0.6.0"],
"requirements": ["matter-python-client==0.4.1"],
"zeroconf": ["_matter._tcp.local.", "_matterc._udp.local."]
}
@@ -337,8 +337,8 @@ class MqttLightJson(MqttEntity, LightEntity, RestoreEntity):
self._attr_brightness = last_attributes.get(
ATTR_BRIGHTNESS, self.brightness
)
self._attr_color_mode = (
last_attributes.get(ATTR_COLOR_MODE) or self.color_mode
self._attr_color_mode = last_attributes.get(
ATTR_COLOR_MODE, self.color_mode
)
self._attr_color_temp_kelvin = last_attributes.get(
ATTR_COLOR_TEMP_KELVIN, self.color_temp_kelvin
@@ -53,7 +53,6 @@ PLATFORMS = [
Platform.BUTTON,
Platform.MEDIA_PLAYER,
Platform.NUMBER,
Platform.SELECT,
Platform.SWITCH,
Platform.TEXT,
]
@@ -1,123 +0,0 @@
"""Music Assistant select platform."""
from __future__ import annotations
from typing import Final
from music_assistant_client.client import MusicAssistantClient
from music_assistant_models.player import PlayerOption, PlayerOptionType
from homeassistant.components.select import SelectEntity, SelectEntityDescription
from homeassistant.const import Platform
from homeassistant.core import HomeAssistant
from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from . import MusicAssistantConfigEntry
from .entity import MusicAssistantPlayerOptionEntity
from .helpers import catch_musicassistant_error
PLAYER_OPTIONS_SELECT: Final[dict[str, bool]] = {
# translation_key: enabled_by_default
"dimmer": False,
"equalizer_mode": False,
"link_audio_delay": True,
"link_audio_quality": False,
"link_control": False,
"sleep": False,
"surround_decoder_type": False,
"tone_control_mode": True,
}
async def async_setup_entry(
hass: HomeAssistant,
entry: MusicAssistantConfigEntry,
async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up Music Assistant Select Entities (Player Options) from Config Entry."""
mass = entry.runtime_data.mass
def add_player(player_id: str) -> None:
"""Handle add player."""
player = mass.players.get(player_id)
if player is None:
return
entities: list[MusicAssistantPlayerConfigSelect] = []
for player_option in player.options:
if (
not player_option.read_only
and player_option.type
!= PlayerOptionType.BOOLEAN # these always go to switch
and player_option.options
):
# We ignore entities with unknown translation key for the base name.
# However, we accept a non-available translation_key in strings.json for the entity's state,
# as these are oftentimes dynamically created, dependent on a specific player and might not be known to the provider
# developer. In that case, the frontend falls back to showing the state's bare translation key.
if player_option.translation_key not in PLAYER_OPTIONS_SELECT:
continue
entities.append(
MusicAssistantPlayerConfigSelect(
mass,
player_id,
player_option=player_option,
entity_description=SelectEntityDescription(
key=player_option.key,
translation_key=player_option.translation_key,
entity_registry_enabled_default=PLAYER_OPTIONS_SELECT[
player_option.translation_key
],
),
)
)
async_add_entities(entities)
# register callback to add players when they are discovered
entry.runtime_data.platform_handlers.setdefault(Platform.SELECT, add_player)
class MusicAssistantPlayerConfigSelect(MusicAssistantPlayerOptionEntity, SelectEntity):
"""Representation of a select entity to control player provider dependent settings."""
def __init__(
self,
mass: MusicAssistantClient,
player_id: str,
player_option: PlayerOption,
entity_description: SelectEntityDescription,
) -> None:
"""Initialize MusicAssistantPlayerConfigSelect."""
# this was verified already in the entry callback
assert player_option.options is not None
# we have to define the dicts before initializing the parent, as this
# then calls self.on_player_option_update
self._option_translation_key_to_key_mapping = {
option.translation_key: option.key for option in player_option.options
}
self._option_key_to_translation_key_mapping = {
option.key: option.translation_key for option in player_option.options
}
super().__init__(mass, player_id, player_option)
self.entity_description = entity_description
self._attr_options = list(self._option_translation_key_to_key_mapping.keys())
@catch_musicassistant_error
async def async_select_option(self, option: str) -> None:
"""Select an option."""
await self.mass.players.set_option(
self.player_id,
self.mass_option_key,
self._option_translation_key_to_key_mapping[option],
)
def on_player_option_update(self, player_option: PlayerOption) -> None:
"""Update on player option update."""
self._attr_current_option = (
self._option_key_to_translation_key_mapping.get(player_option.value)
if isinstance(player_option.value, str)
else None
)
@@ -147,80 +147,6 @@
"name": "Treble"
}
},
"select": {
"dimmer": {
"name": "Dimmer",
"state": {
"auto": "[%key:common::state::auto%]"
}
},
"equalizer_mode": {
"name": "Equalizer mode",
"state": {
"auto": "[%key:common::state::auto%]",
"bypass": "Bypass",
"manual": "[%key:common::state::manual%]"
}
},
"link_audio_delay": {
"name": "Link audio delay",
"state": {
"audio_sync": "Audio synchronization",
"audio_sync_off": "Audio synchronization off",
"audio_sync_on": "Audio synchronization on",
"balanced": "Balanced",
"lip_sync": "Lip synchronization"
}
},
"link_audio_quality": {
"name": "Link audio quality",
"state": {
"compressed": "Compressed",
"uncompressed": "Uncompressed"
}
},
"link_control": {
"name": "Link control",
"state": {
"speed": "Speed",
"stability": "Stability",
"standard": "Standard"
}
},
"sleep": {
"name": "Sleep timer",
"state": {
"0": "[%key:common::state::off%]",
"30": "30 minutes",
"60": "60 minutes",
"90": "90 minutes",
"120": "120 minutes"
}
},
"surround_decoder_type": {
"name": "Surround decoder type",
"state": {
"auto": "[%key:common::state::auto%]",
"dolby_pl": "Dolby ProLogic",
"dolby_pl2x_game": "Dolby ProLogic 2x Game",
"dolby_pl2x_movie": "Dolby ProLogic 2x Movie",
"dolby_pl2x_music": "Dolby ProLogic 2x Music",
"dolby_surround": "Dolby Surround",
"dts_neo6_cinema": "DTS Neo:6 Cinema",
"dts_neo6_music": "DTS Neo:6 Music",
"dts_neural_x": "DTS Neural:X",
"toggle": "[%key:common::action::toggle%]"
}
},
"tone_control_mode": {
"name": "Tone control mode",
"state": {
"auto": "[%key:common::state::auto%]",
"bypass": "Bypass",
"manual": "[%key:common::state::manual%]"
}
}
},
"switch": {
"adaptive_drc": {
"name": "Adaptive DRC"
@@ -7,5 +7,5 @@
"integration_type": "hub",
"iot_class": "local_push",
"loggers": ["nikohomecontrol"],
"requirements": ["nhc==0.8.0"]
"requirements": ["nhc==0.7.0"]
}
+12 -73
View File
@@ -5,25 +5,11 @@ from __future__ import annotations
from pynobo import nobo
from homeassistant.config_entries import ConfigEntry
from homeassistant.const import (
ATTR_NAME,
CONF_IP_ADDRESS,
EVENT_HOMEASSISTANT_STOP,
Platform,
)
from homeassistant.const import CONF_IP_ADDRESS, EVENT_HOMEASSISTANT_STOP, Platform
from homeassistant.core import HomeAssistant
from homeassistant.exceptions import ConfigEntryNotReady
from homeassistant.helpers import device_registry as dr
from homeassistant.util import dt as dt_util
from .const import (
ATTR_HARDWARE_VERSION,
ATTR_SOFTWARE_VERSION,
CONF_AUTO_DISCOVERED,
CONF_SERIAL,
DOMAIN,
NOBO_MANUFACTURER,
)
from .const import CONF_AUTO_DISCOVERED, CONF_SERIAL
PLATFORMS = [Platform.CLIMATE, Platform.SELECT, Platform.SENSOR]
@@ -34,51 +20,16 @@ async def async_setup_entry(hass: HomeAssistant, entry: NoboHubConfigEntry) -> b
"""Set up Nobø Ecohub from a config entry."""
serial = entry.data[CONF_SERIAL]
stored_ip = entry.data[CONF_IP_ADDRESS]
auto_discovered = entry.data[CONF_AUTO_DISCOVERED]
async def _connect(ip: str) -> nobo:
hub = nobo(
serial=serial,
ip=ip,
discover=False,
synchronous=False,
timezone=dt_util.get_default_time_zone(),
)
await hub.connect()
return hub
try:
hub = await _connect(stored_ip)
except OSError as err:
if not auto_discovered:
raise ConfigEntryNotReady(
translation_domain=DOMAIN,
translation_key="cannot_connect_manual",
translation_placeholders={"serial": serial, "ip": stored_ip},
) from err
# Stored IP may be stale for an auto-discovered entry - try UDP
# rediscovery to pick up a new DHCP lease.
discovered = await nobo.async_discover_hubs(serial=serial)
if not discovered:
raise ConfigEntryNotReady(
translation_domain=DOMAIN,
translation_key="hub_not_found",
translation_placeholders={"serial": serial},
) from err
new_ip, _ = next(iter(discovered))
try:
hub = await _connect(new_ip)
except OSError as rediscover_err:
raise ConfigEntryNotReady(
translation_domain=DOMAIN,
translation_key="cannot_connect_rediscovered",
translation_placeholders={"ip": new_ip},
) from rediscover_err
if new_ip != stored_ip:
hass.config_entries.async_update_entry(
entry, data={**entry.data, CONF_IP_ADDRESS: new_ip}
)
discover = entry.data[CONF_AUTO_DISCOVERED]
ip_address = None if discover else entry.data[CONF_IP_ADDRESS]
hub = nobo(
serial=serial,
ip=ip_address,
discover=discover,
synchronous=False,
timezone=dt_util.get_default_time_zone(),
)
await hub.connect()
async def _async_close(event):
"""Close the Nobø Ecohub socket connection when HA stops."""
@@ -89,18 +40,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: NoboHubConfigEntry) -> b
)
entry.runtime_data = hub
device_registry = dr.async_get(hass)
device_registry.async_get_or_create(
config_entry_id=entry.entry_id,
identifiers={(DOMAIN, hub.hub_serial)},
serial_number=hub.hub_serial,
name=hub.hub_info[ATTR_NAME],
manufacturer=NOBO_MANUFACTURER,
model="Nobø Ecohub",
sw_version=hub.hub_info[ATTR_SOFTWARE_VERSION],
hw_version=hub.hub_info[ATTR_HARDWARE_VERSION],
)
await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
await hub.start()
@@ -47,17 +47,6 @@
}
}
},
"exceptions": {
"cannot_connect_manual": {
"message": "Unable to connect to Nobø Ecohub with serial {serial} at {ip}. If the hub has moved to a new IP address, remove and re-add the integration."
},
"cannot_connect_rediscovered": {
"message": "Unable to connect to Nobø Ecohub at rediscovered IP {ip}; will retry."
},
"hub_not_found": {
"message": "Nobø Ecohub with serial {serial} not found on the network. The hub may be offline or on a different subnet; will retry."
}
},
"options": {
"step": {
"init": {
@@ -114,7 +114,7 @@ MAX_TOOL_ITERATIONS = 10
def _adjust_schema(schema: dict[str, Any]) -> None:
"""Adjust the output schema to be compatible with OpenAI API."""
"""Adjust the schema to be compatible with OpenAI API."""
if schema["type"] == "object":
schema.setdefault("strict", True)
schema.setdefault("additionalProperties", False)
@@ -158,15 +158,10 @@ def _format_tool(
tool: llm.Tool, custom_serializer: Callable[[Any], Any] | None
) -> FunctionToolParam:
"""Format tool specification."""
unsupported_keys = {"oneOf", "anyOf", "allOf", "enum", "not"}
schema = convert(tool.parameters, custom_serializer=custom_serializer)
if unsupported_keys.intersection(schema):
schema = {k: v for k, v in schema.items() if k not in unsupported_keys}
return FunctionToolParam(
type="function",
name=tool.name,
parameters=schema,
parameters=convert(tool.parameters, custom_serializer=custom_serializer),
description=tool.description,
strict=False,
)
@@ -8,11 +8,7 @@ from typing import Any
from powerfox import Powerfox, PowerfoxAuthenticationError, PowerfoxConnectionError
import voluptuous as vol
from homeassistant.config_entries import (
SOURCE_RECONFIGURE,
ConfigFlow,
ConfigFlowResult,
)
from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
from homeassistant.const import CONF_EMAIL, CONF_PASSWORD
from homeassistant.helpers.aiohttp_client import async_get_clientsession
@@ -42,27 +38,26 @@ class PowerfoxConfigFlow(ConfigFlow, domain=DOMAIN):
errors = {}
if user_input is not None:
error = await self._async_validate_credentials(
user_input[CONF_EMAIL], user_input[CONF_PASSWORD]
self._async_abort_entries_match({CONF_EMAIL: user_input[CONF_EMAIL]})
client = Powerfox(
username=user_input[CONF_EMAIL],
password=user_input[CONF_PASSWORD],
session=async_get_clientsession(self.hass),
)
if error:
errors["base"] = error
elif self.source == SOURCE_RECONFIGURE:
reconfigure_entry = self._get_reconfigure_entry()
if reconfigure_entry.data[CONF_EMAIL] != user_input[CONF_EMAIL]:
self._async_abort_entries_match(
{CONF_EMAIL: user_input[CONF_EMAIL]}
)
return self.async_update_reload_and_abort(
reconfigure_entry, data_updates=user_input
)
try:
await client.all_devices()
except PowerfoxAuthenticationError:
errors["base"] = "invalid_auth"
except PowerfoxConnectionError:
errors["base"] = "cannot_connect"
else:
self._async_abort_entries_match({CONF_EMAIL: user_input[CONF_EMAIL]})
return self.async_create_entry(
title=user_input[CONF_EMAIL],
data=user_input,
data={
CONF_EMAIL: user_input[CONF_EMAIL],
CONF_PASSWORD: user_input[CONF_PASSWORD],
},
)
return self.async_show_form(
step_id="user",
errors=errors,
@@ -83,17 +78,22 @@ class PowerfoxConfigFlow(ConfigFlow, domain=DOMAIN):
reauth_entry = self._get_reauth_entry()
if user_input is not None:
error = await self._async_validate_credentials(
reauth_entry.data[CONF_EMAIL], user_input[CONF_PASSWORD]
client = Powerfox(
username=reauth_entry.data[CONF_EMAIL],
password=user_input[CONF_PASSWORD],
session=async_get_clientsession(self.hass),
)
if error:
errors["base"] = error
try:
await client.all_devices()
except PowerfoxAuthenticationError:
errors["base"] = "invalid_auth"
except PowerfoxConnectionError:
errors["base"] = "cannot_connect"
else:
return self.async_update_reload_and_abort(
reauth_entry,
data_updates=user_input,
)
return self.async_show_form(
step_id="reauth_confirm",
description_placeholders={"email": reauth_entry.data[CONF_EMAIL]},
@@ -104,22 +104,32 @@ class PowerfoxConfigFlow(ConfigFlow, domain=DOMAIN):
async def async_step_reconfigure(
self, user_input: dict[str, Any] | None = None
) -> ConfigFlowResult:
"""Handle reconfiguration."""
return await self.async_step_user()
"""Reconfigure Powerfox configuration."""
errors = {}
async def _async_validate_credentials(
self, email: str, password: str
) -> str | None:
"""Validate credentials and return error string or None if valid."""
client = Powerfox(
username=email,
password=password,
session=async_get_clientsession(self.hass),
reconfigure_entry = self._get_reconfigure_entry()
if user_input is not None:
client = Powerfox(
username=user_input[CONF_EMAIL],
password=user_input[CONF_PASSWORD],
session=async_get_clientsession(self.hass),
)
try:
await client.all_devices()
except PowerfoxAuthenticationError:
errors["base"] = "invalid_auth"
except PowerfoxConnectionError:
errors["base"] = "cannot_connect"
else:
if reconfigure_entry.data[CONF_EMAIL] != user_input[CONF_EMAIL]:
self._async_abort_entries_match(
{CONF_EMAIL: user_input[CONF_EMAIL]}
)
return self.async_update_reload_and_abort(
reconfigure_entry, data_updates=user_input
)
return self.async_show_form(
step_id="reconfigure",
data_schema=STEP_USER_DATA_SCHEMA,
errors=errors,
)
try:
await client.all_devices()
except PowerfoxAuthenticationError:
return "invalid_auth"
except PowerfoxConnectionError:
return "cannot_connect"
return None
@@ -20,6 +20,18 @@
"description": "The password for {email} is no longer valid.",
"title": "[%key:common::config_flow::title::reauth%]"
},
"reconfigure": {
"data": {
"email": "[%key:common::config_flow::data::email%]",
"password": "[%key:common::config_flow::data::password%]"
},
"data_description": {
"email": "[%key:component::powerfox::config::step::user::data_description::email%]",
"password": "[%key:component::powerfox::config::step::user::data_description::password%]"
},
"description": "Powerfox is already configured. Would you like to reconfigure it?",
"title": "Reconfigure your Powerfox account"
},
"user": {
"data": {
"email": "[%key:common::config_flow::data::email%]",
@@ -27,8 +27,6 @@ from homeassistant.helpers.update_coordinator import CoordinatorEntity
from .const import CONF_SYSTEM_ID, DOMAIN
from .coordinator import PvOutputConfigEntry, PVOutputDataUpdateCoordinator
PARALLEL_UPDATES = 0
@dataclass(frozen=True, kw_only=True)
class PVOutputSensorEntityDescription(SensorEntityDescription):
@@ -257,7 +257,6 @@ SENSOR_DESCRIPTIONS = [
RoborockSensorDescription(
key="mop_clean_remaining",
native_unit_of_measurement=UnitOfTime.SECONDS,
suggested_unit_of_measurement=UnitOfTime.HOURS,
device_class=SensorDeviceClass.DURATION,
value_fn=lambda data: data.status.rdt,
translation_key="mop_drying_remaining_time",
@@ -336,7 +336,7 @@ def _async_get_roomba_discovery() -> RoombaDiscovery:
@callback
def _async_blid_from_hostname(hostname: str) -> str:
"""Extract the blid from the hostname."""
return hostname.split("-")[1].split(".", maxsplit=1)[0].upper()
return hostname.split("-")[1].split(".")[0].upper()
async def _async_discover_roombas(
@@ -4,7 +4,7 @@
"codeowners": ["@noahhusby"],
"documentation": "https://www.home-assistant.io/integrations/russound_rnet",
"iot_class": "local_polling",
"loggers": ["aiorussound"],
"loggers": ["russound"],
"quality_scale": "legacy",
"requirements": ["aiorussound==5.0.1"]
"requirements": ["russound==0.2.0"]
}
@@ -2,16 +2,10 @@
from __future__ import annotations
import asyncio
from collections.abc import Callable, Coroutine
import contextlib
import logging
import math
from typing import Any
from aiorussound import RussoundTcpConnectionHandler
from aiorussound.exceptions import CommandError
from aiorussound.rnet.client import RussoundRNETClient
from russound import russound
import voluptuous as vol
from homeassistant.components.media_player import (
@@ -20,14 +14,8 @@ from homeassistant.components.media_player import (
MediaPlayerEntityFeature,
MediaPlayerState,
)
from homeassistant.const import (
CONF_HOST,
CONF_NAME,
CONF_PORT,
EVENT_HOMEASSISTANT_STOP,
)
from homeassistant.const import CONF_HOST, CONF_NAME, CONF_PORT
from homeassistant.core import HomeAssistant
from homeassistant.exceptions import PlatformNotReady
from homeassistant.helpers import config_validation as cv
from homeassistant.helpers.entity_platform import AddEntitiesCallback
from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
@@ -37,13 +25,6 @@ _LOGGER = logging.getLogger(__name__)
CONF_ZONES = "zones"
CONF_SOURCES = "sources"
RNET_EXCEPTIONS = (
CommandError,
ConnectionRefusedError,
TimeoutError,
asyncio.IncompleteReadError,
OSError,
)
ZONE_SCHEMA = vol.Schema({vol.Required(CONF_NAME): cv.string})
@@ -59,45 +40,33 @@ PLATFORM_SCHEMA = MEDIA_PLAYER_PLATFORM_SCHEMA.extend(
}
)
# Max volume level on RNET devices
_MAX_VOLUME = 50
async def async_setup_platform(
def setup_platform(
hass: HomeAssistant,
config: ConfigType,
async_add_entities: AddEntitiesCallback,
add_entities: AddEntitiesCallback,
discovery_info: DiscoveryInfoType | None = None,
) -> None:
"""Set up the Russound RNET platform."""
host = config[CONF_HOST]
port = config[CONF_PORT]
host = config.get(CONF_HOST)
port = config.get(CONF_PORT)
client = RussoundRNETClient(RussoundTcpConnectionHandler(host, port))
try:
await client.connect()
except RNET_EXCEPTIONS as err:
raise PlatformNotReady(
f"Could not connect to Russound RNET at {host}:{port}"
) from err
if host is None or port is None:
_LOGGER.error("Invalid config. Expected %s and %s", CONF_HOST, CONF_PORT)
return
sources = [source[CONF_NAME] for source in config[CONF_SOURCES]]
lock = asyncio.Lock()
russ = russound.Russound(host, port)
russ.connect()
async def _async_disconnect(*_: Any) -> None:
"""Disconnect the RNET client on HA shutdown."""
with contextlib.suppress(*RNET_EXCEPTIONS):
await client.disconnect()
sources = [source["name"] for source in config[CONF_SOURCES]]
hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, _async_disconnect)
async_add_entities(
[
RussoundRNETDevice(client, lock, sources, zone_id, extra)
for zone_id, extra in config[CONF_ZONES].items()
],
True,
)
if russ.is_connected():
for zone_id, extra in config[CONF_ZONES].items():
add_entities(
[RussoundRNETDevice(hass, russ, sources, zone_id, extra)], True
)
else:
_LOGGER.error("Not connected to %s:%s", host, port)
class RussoundRNETDevice(MediaPlayerEntity):
@@ -111,123 +80,75 @@ class RussoundRNETDevice(MediaPlayerEntity):
| MediaPlayerEntityFeature.SELECT_SOURCE
)
def __init__(
self,
client: RussoundRNETClient,
lock: asyncio.Lock,
sources: list[str],
zone_id: int,
extra: dict[str, str],
) -> None:
def __init__(self, hass, russ, sources, zone_id, extra):
"""Initialise the Russound RNET device."""
self._attr_name = extra[CONF_NAME]
self._client = client
self._lock = lock
self._attr_name = extra["name"]
self._russ = russ
self._attr_source_list = sources
self._controller_id = math.ceil(zone_id / 6)
# Each controller has a maximum of 6 zones, every increment of 6 zones
# maps to an additional controller for easier backward compatibility
self._controller_id = str(math.ceil(zone_id / 6))
# Each zone resets to 1-6 per controller
self._zone_id = (zone_id - 1) % 6 + 1
async def _async_ensure_connected(self) -> None:
"""Ensure the client is connected, reconnecting if needed."""
if not self._client.is_connected:
_LOGGER.debug("Reconnecting RNET client")
await self._client.connect()
async def _async_run_with_retry(
self, command: Callable[[], Coroutine[Any, Any, Any]]
) -> None:
"""Run a command with reconnect retry on failure."""
async with self._lock:
try:
await self._async_ensure_connected()
await command()
except RNET_EXCEPTIONS:
with contextlib.suppress(*RNET_EXCEPTIONS):
await self._client.disconnect()
try:
await self._async_ensure_connected()
await command()
except RNET_EXCEPTIONS:
_LOGGER.error(
"Command failed for zone %s on controller %s after retry",
self._zone_id,
self._controller_id,
)
async def async_update(self) -> None:
def update(self) -> None:
"""Retrieve latest state."""
async with self._lock:
try:
await self._async_ensure_connected()
info = await self._client.get_all_zone_info(
self._controller_id, self._zone_id
)
except RNET_EXCEPTIONS:
with contextlib.suppress(*RNET_EXCEPTIONS):
await self._client.disconnect()
try:
await self._async_ensure_connected()
info = await self._client.get_all_zone_info(
self._controller_id, self._zone_id
)
except RNET_EXCEPTIONS:
_LOGGER.error(
"Could not update zone %s on controller %s",
self._zone_id,
self._controller_id,
)
self._attr_available = False
return
# Updated this function to make a single call to get_zone_info, so that
# with a single call we can get On/Off, Volume and Source, reducing the
# amount of traffic and speeding up the update process.
try:
ret = self._russ.get_zone_info(self._controller_id, self._zone_id, 4)
except BrokenPipeError:
_LOGGER.error("Broken Pipe Error, trying to reconnect to Russound RNET")
self._russ.connect()
ret = self._russ.get_zone_info(self._controller_id, self._zone_id, 4)
self._attr_available = True
self._attr_state = MediaPlayerState.ON if info.power else MediaPlayerState.OFF
self._attr_volume_level = info.volume / _MAX_VOLUME
# info.source is 1-based; source_list is 0-based
index = info.source - 1
if self.source_list and 0 <= index < len(self.source_list):
self._attr_source = self.source_list[index]
async def async_set_volume_level(self, volume: float) -> None:
"""Set volume level. Volume has a range (0..1)."""
device_volume = max(0, min(_MAX_VOLUME, int(volume * _MAX_VOLUME)))
await self._async_run_with_retry(
lambda: self._client.set_volume(
self._controller_id, self._zone_id, device_volume
_LOGGER.debug("ret= %s", ret)
if ret is not None:
_LOGGER.debug(
"Updating status for RNET zone %s on controller %s",
self._zone_id,
self._controller_id,
)
)
if ret[0] == 0:
self._attr_state = MediaPlayerState.OFF
else:
self._attr_state = MediaPlayerState.ON
self._attr_volume_level = ret[2] * 2 / 100.0
# Returns 0 based index for source.
index = ret[1]
# Possibility exists that user has defined list of all sources.
# If a source is set externally that is beyond the defined list then
# an exception will be thrown.
# In this case return and unknown source (None)
if self.source_list and 0 <= index < len(self.source_list):
self._attr_source = self.source_list[index]
else:
_LOGGER.error("Could not update status for zone %s", self._zone_id)
async def async_turn_on(self) -> None:
def set_volume_level(self, volume: float) -> None:
"""Set volume level. Volume has a range (0..1).
Translate this to a range of (0..100) as expected
by _russ.set_volume()
"""
self._russ.set_volume(self._controller_id, self._zone_id, volume * 100)
def turn_on(self) -> None:
"""Turn the media player on."""
await self._async_run_with_retry(
lambda: self._client.set_zone_power(
self._controller_id, self._zone_id, True
)
)
self._russ.set_power(self._controller_id, self._zone_id, "1")
async def async_turn_off(self) -> None:
def turn_off(self) -> None:
"""Turn off media player."""
await self._async_run_with_retry(
lambda: self._client.set_zone_power(
self._controller_id, self._zone_id, False
)
)
self._russ.set_power(self._controller_id, self._zone_id, "0")
async def async_mute_volume(self, mute: bool) -> None:
def mute_volume(self, mute: bool) -> None:
"""Send mute command."""
self._russ.toggle_mute(self._controller_id, self._zone_id)
async def _mute_if_needed() -> None:
if self.is_volume_muted != mute:
await self._client.toggle_mute(self._controller_id, self._zone_id)
await self._async_run_with_retry(_mute_if_needed)
async def async_select_source(self, source: str) -> None:
def select_source(self, source: str) -> None:
"""Set the input source."""
if self.source_list and source in self.source_list:
# source_list is 0-based; RNET source is 1-based
index = self.source_list.index(source) + 1
await self._async_run_with_retry(
lambda: self._client.select_source(
self._controller_id, self._zone_id, index
)
)
index = self.source_list.index(source)
# 0 based value for source
self._russ.set_source(self._controller_id, self._zone_id, index)
@@ -9,7 +9,10 @@ rules:
common-modules: todo
config-flow-test-coverage: todo
config-flow: todo
dependency-transparency: done
dependency-transparency:
status: todo
comment: |
CI pipeline for publishing is not on GH repo.
docs-actions:
status: exempt
comment: |
@@ -84,7 +87,7 @@ rules:
This integration is not a hub and only represents a single device.
# Platinum
async-dependency: done
async-dependency: todo
inject-websession:
status: exempt
comment: |
@@ -4,5 +4,5 @@
"codeowners": ["@fabaff"],
"documentation": "https://www.home-assistant.io/integrations/serial",
"iot_class": "local_polling",
"requirements": ["serialx==1.4.1"]
"requirements": ["serialx==1.2.2"]
}
+11 -3
View File
@@ -3,6 +3,7 @@
from __future__ import annotations
import asyncio
from typing import TYPE_CHECKING
from sfrbox_api.bridge import SFRBox
from sfrbox_api.exceptions import SFRBoxAuthenticationError, SFRBoxError
@@ -13,13 +14,14 @@ from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
from homeassistant.helpers import device_registry as dr
from homeassistant.helpers.aiohttp_client import async_get_clientsession
from .const import DOMAIN, PLATFORMS
from .const import DOMAIN, PLATFORMS, PLATFORMS_WITH_AUTH
from .coordinator import SFRConfigEntry, SFRDataUpdateCoordinator, SFRRuntimeData
async def async_setup_entry(hass: HomeAssistant, entry: SFRConfigEntry) -> bool:
"""Set up SFR box as config entry."""
box = SFRBox(ip=entry.data[CONF_HOST], client=async_get_clientsession(hass))
platforms = PLATFORMS
has_auth = False
if (username := entry.data.get(CONF_USERNAME)) and (
password := entry.data.get(CONF_PASSWORD)
@@ -37,11 +39,11 @@ async def async_setup_entry(hass: HomeAssistant, entry: SFRConfigEntry) -> bool:
translation_key="unknown_error",
translation_placeholders={"error": str(err)},
) from err
platforms = PLATFORMS_WITH_AUTH
has_auth = True
data = SFRRuntimeData(
box=box,
has_authentication=has_auth,
dsl=SFRDataUpdateCoordinator(
hass, entry, box, "dsl", lambda b: b.dsl_get_info()
),
@@ -63,6 +65,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: SFRConfigEntry) -> bool:
# Preload system information
await data.system.async_config_entry_first_refresh()
system_info = data.system.data
if TYPE_CHECKING:
assert system_info is not None
# Preload other coordinators (based on net infrastructure)
tasks = [data.wan.async_config_entry_first_refresh()]
@@ -87,11 +91,15 @@ async def async_setup_entry(hass: HomeAssistant, entry: SFRConfigEntry) -> bool:
)
entry.runtime_data = data
await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
await hass.config_entries.async_forward_entry_setups(entry, platforms)
return True
async def async_unload_entry(hass: HomeAssistant, entry: SFRConfigEntry) -> bool:
"""Unload a config entry."""
if entry.data.get(CONF_USERNAME) and entry.data.get(CONF_PASSWORD):
return await hass.config_entries.async_unload_platforms(
entry, PLATFORMS_WITH_AUTH
)
return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
@@ -4,6 +4,7 @@ from __future__ import annotations
from collections.abc import Callable
from dataclasses import dataclass
from typing import TYPE_CHECKING
from sfrbox_api.models import DslInfo, FtthInfo, VoipInfo, WanInfo
@@ -87,6 +88,8 @@ async def async_setup_entry(
"""Set up the sensors."""
data = entry.runtime_data
system_info = data.system.data
if TYPE_CHECKING:
assert system_info is not None
entities: list[SFRBoxBinarySensor] = [
SFRBoxBinarySensor(data.wan, description, system_info)
+3 -5
View File
@@ -5,7 +5,7 @@ from __future__ import annotations
from collections.abc import Awaitable, Callable, Coroutine
from dataclasses import dataclass
from functools import wraps
from typing import Any, Concatenate
from typing import TYPE_CHECKING, Any, Concatenate
from sfrbox_api.bridge import SFRBox
from sfrbox_api.exceptions import SFRBoxError
@@ -78,11 +78,9 @@ async def async_setup_entry(
) -> None:
"""Set up the buttons."""
data = entry.runtime_data
if not data.has_authentication:
# All buttons currently require authentication
return
system_info = data.system.data
if TYPE_CHECKING:
assert system_info is not None
entities = [
SFRBoxButton(data.box, description, system_info) for description in BUTTON_TYPES
+2 -1
View File
@@ -7,4 +7,5 @@ DEFAULT_USERNAME = "admin"
DOMAIN = "sfr_box"
PLATFORMS = [Platform.BINARY_SENSOR, Platform.BUTTON, Platform.SENSOR]
PLATFORMS = [Platform.BINARY_SENSOR, Platform.SENSOR]
PLATFORMS_WITH_AUTH = [*PLATFORMS, Platform.BUTTON]
@@ -29,7 +29,6 @@ class SFRRuntimeData:
"""Runtime data for SFR Box."""
box: SFRBox
has_authentication: bool
dsl: SFRDataUpdateCoordinator[DslInfo]
ftth: SFRDataUpdateCoordinator[FtthInfo]
system: SFRDataUpdateCoordinator[SystemInfo]
@@ -2,6 +2,7 @@
from collections.abc import Callable
from dataclasses import dataclass
from typing import TYPE_CHECKING
from sfrbox_api.models import DslInfo, SystemInfo, VoipInfo, WanInfo
@@ -235,6 +236,8 @@ async def async_setup_entry(
"""Set up the sensors."""
data = entry.runtime_data
system_info = data.system.data
if TYPE_CHECKING:
assert system_info is not None
entities: list[SFRBoxSensor] = [
SFRBoxSensor(data.system, description, system_info)
+3 -5
View File
@@ -41,11 +41,9 @@ class SmInfraredEntity(SmEntity, InfraredEntity):
async def async_send_command(self, command: InfraredCommand) -> None:
"""Send an IR command."""
timings = [
interval
for timing in command.get_raw_timings()
for interval in (timing.high_us, timing.low_us)
]
# smlight expects unsigned alternating mark/space µs, while the library
# emits signed values (negative = space). Drop the sign on the wire.
timings = [abs(t) for t in command.get_raw_timings()]
freq = command.modulation
@@ -7,5 +7,5 @@
"integration_type": "system",
"iot_class": "local_push",
"quality_scale": "internal",
"requirements": ["PyTurboJPEG==1.8.3", "av==16.0.1", "numpy==2.3.2"]
"requirements": ["PyTurboJPEG==2.2.0", "av==16.0.1", "numpy==2.3.2"]
}
+10 -5
View File
@@ -2,25 +2,30 @@
from __future__ import annotations
from homeassistant.config_entries import ConfigEntry
from homeassistant.const import Platform
from homeassistant.core import HomeAssistant
from .coordinator import TailscaleConfigEntry, TailscaleDataUpdateCoordinator
from .const import DOMAIN
from .coordinator import TailscaleDataUpdateCoordinator
PLATFORMS = [Platform.BINARY_SENSOR, Platform.SENSOR]
async def async_setup_entry(hass: HomeAssistant, entry: TailscaleConfigEntry) -> bool:
async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
"""Set up Tailscale from a config entry."""
coordinator = TailscaleDataUpdateCoordinator(hass, entry)
await coordinator.async_config_entry_first_refresh()
entry.runtime_data = coordinator
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: TailscaleConfigEntry) -> bool:
async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
"""Unload Tailscale config entry."""
return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
if unload_ok:
del hass.data[DOMAIN][entry.entry_id]
return unload_ok
@@ -12,15 +12,14 @@ from homeassistant.components.binary_sensor import (
BinarySensorEntity,
BinarySensorEntityDescription,
)
from homeassistant.config_entries import ConfigEntry
from homeassistant.const import EntityCategory
from homeassistant.core import HomeAssistant
from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
from .coordinator import TailscaleConfigEntry
from .const import DOMAIN
from .entity import TailscaleEntity
PARALLEL_UPDATES = 0
@dataclass(frozen=True, kw_only=True)
class TailscaleBinarySensorEntityDescription(BinarySensorEntityDescription):
@@ -98,11 +97,11 @@ BINARY_SENSORS: tuple[TailscaleBinarySensorEntityDescription, ...] = (
async def async_setup_entry(
hass: HomeAssistant,
entry: TailscaleConfigEntry,
entry: ConfigEntry,
async_add_entities: AddConfigEntryEntitiesCallback,
) -> None:
"""Set up a Tailscale binary sensors based on a config entry."""
coordinator = entry.runtime_data
coordinator = hass.data[DOMAIN][entry.entry_id]
async_add_entities(
TailscaleBinarySensorEntity(
coordinator=coordinator,
@@ -14,15 +14,13 @@ from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
from .const import CONF_TAILNET, DOMAIN, LOGGER, SCAN_INTERVAL
type TailscaleConfigEntry = ConfigEntry[TailscaleDataUpdateCoordinator]
class TailscaleDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Device]]):
"""The Tailscale Data Update Coordinator."""
config_entry: TailscaleConfigEntry
config_entry: ConfigEntry
def __init__(self, hass: HomeAssistant, config_entry: TailscaleConfigEntry) -> None:
def __init__(self, hass: HomeAssistant, config_entry: ConfigEntry) -> None:
"""Initialize the Tailscale coordinator."""
session = async_get_clientsession(hass)
self.tailscale = Tailscale(
@@ -6,11 +6,12 @@ import json
from typing import Any
from homeassistant.components.diagnostics import async_redact_data
from homeassistant.config_entries import ConfigEntry
from homeassistant.const import CONF_API_KEY
from homeassistant.core import HomeAssistant
from .const import CONF_TAILNET
from .coordinator import TailscaleConfigEntry
from .const import CONF_TAILNET, DOMAIN
from .coordinator import TailscaleDataUpdateCoordinator
TO_REDACT = {
CONF_API_KEY,
@@ -21,19 +22,16 @@ TO_REDACT = {
"hostname",
"machine_key",
"name",
"node_id",
"node_key",
"tailnet_lock_key",
"user",
}
async def async_get_config_entry_diagnostics(
hass: HomeAssistant, entry: TailscaleConfigEntry
hass: HomeAssistant, entry: ConfigEntry
) -> dict[str, Any]:
"""Return diagnostics for a config entry."""
coordinator: TailscaleDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
# Round-trip via JSON to trigger serialization
devices = [
json.loads(device.to_json()) for device in entry.runtime_data.data.values()
]
devices = [json.loads(device.to_json()) for device in coordinator.data.values()]
return async_redact_data({"devices": devices}, TO_REDACT)

Some files were not shown because too many files have changed in this diff Show More