From 8cead00bc718bd156ea09d58b9a60fe6d871b5d0 Mon Sep 17 00:00:00 2001 From: Michael <35783820+mib1185@users.noreply.github.com> Date: Sun, 22 Jun 2025 12:19:03 +0200 Subject: [PATCH 1/4] Bump aioimmich to 0.10.1 (#147293) bump aioimmich to 0.10.1 --- homeassistant/components/immich/__init__.py | 1 + homeassistant/components/immich/manifest.json | 2 +- requirements_all.txt | 2 +- requirements_test_all.txt | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/homeassistant/components/immich/__init__.py b/homeassistant/components/immich/__init__.py index 18782ec6fd3d54..ced4aa4444992e 100644 --- a/homeassistant/components/immich/__init__.py +++ b/homeassistant/components/immich/__init__.py @@ -33,6 +33,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ImmichConfigEntry) -> bo entry.data[CONF_HOST], entry.data[CONF_PORT], entry.data[CONF_SSL], + "home-assistant", ) try: diff --git a/homeassistant/components/immich/manifest.json b/homeassistant/components/immich/manifest.json index 36c993e9c8f6f3..80dcd87cd88005 100644 --- a/homeassistant/components/immich/manifest.json +++ b/homeassistant/components/immich/manifest.json @@ -8,5 +8,5 @@ "iot_class": "local_polling", "loggers": ["aioimmich"], "quality_scale": "silver", - "requirements": ["aioimmich==0.9.1"] + "requirements": ["aioimmich==0.10.1"] } diff --git a/requirements_all.txt b/requirements_all.txt index e008b8ec249f79..0a4627f2e597f3 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -280,7 +280,7 @@ aiohue==4.7.4 aioimaplib==2.0.1 # homeassistant.components.immich -aioimmich==0.9.1 +aioimmich==0.10.1 # homeassistant.components.apache_kafka aiokafka==0.10.0 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index 77aee9cf055d00..fceefd04355db1 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -265,7 +265,7 @@ aiohue==4.7.4 aioimaplib==2.0.1 # homeassistant.components.immich -aioimmich==0.9.1 +aioimmich==0.10.1 # homeassistant.components.apache_kafka aiokafka==0.10.0 From daa4ddabfe9ca16f46cd6ab45021f5c819ff75c9 Mon Sep 17 00:00:00 2001 From: Ravaka Razafimanantsoa <3774520+SeraphicRav@users.noreply.github.com> Date: Sun, 22 Jun 2025 21:12:09 +0900 Subject: [PATCH 2/4] Switchbot Cloud: Fix device type filtering in sensor (#146945) * Add Smart Lock Ultra support and fix device type filtering in sensor integration * Adding fix in binary sensor * Fix --------- Co-authored-by: Joostlek --- .../switchbot_cloud/binary_sensor.py | 1 + .../components/switchbot_cloud/sensor.py | 1 + .../switchbot_cloud/test_binary_sensor.py | 39 +++++++++++++++++++ .../components/switchbot_cloud/test_sensor.py | 26 +++++++++++++ 4 files changed, 67 insertions(+) create mode 100644 tests/components/switchbot_cloud/test_binary_sensor.py diff --git a/homeassistant/components/switchbot_cloud/binary_sensor.py b/homeassistant/components/switchbot_cloud/binary_sensor.py index 14278072c8321f..752c428fa6c062 100644 --- a/homeassistant/components/switchbot_cloud/binary_sensor.py +++ b/homeassistant/components/switchbot_cloud/binary_sensor.py @@ -69,6 +69,7 @@ async def async_setup_entry( for description in BINARY_SENSOR_DESCRIPTIONS_BY_DEVICE_TYPES[ device.device_type ] + if device.device_type in BINARY_SENSOR_DESCRIPTIONS_BY_DEVICE_TYPES ) diff --git a/homeassistant/components/switchbot_cloud/sensor.py b/homeassistant/components/switchbot_cloud/sensor.py index 9975bd491868b3..9920717a8d7278 100644 --- a/homeassistant/components/switchbot_cloud/sensor.py +++ b/homeassistant/components/switchbot_cloud/sensor.py @@ -151,6 +151,7 @@ async def async_setup_entry( SwitchBotCloudSensor(data.api, device, coordinator, description) for device, coordinator in data.devices.sensors for description in SENSOR_DESCRIPTIONS_BY_DEVICE_TYPES[device.device_type] + if device.device_type in SENSOR_DESCRIPTIONS_BY_DEVICE_TYPES ) diff --git a/tests/components/switchbot_cloud/test_binary_sensor.py b/tests/components/switchbot_cloud/test_binary_sensor.py new file mode 100644 index 00000000000000..753653af9a8b0f --- /dev/null +++ b/tests/components/switchbot_cloud/test_binary_sensor.py @@ -0,0 +1,39 @@ +"""Test for the switchbot_cloud binary sensors.""" + +from unittest.mock import patch + +from switchbot_api import Device + +from homeassistant.const import Platform +from homeassistant.core import HomeAssistant +from homeassistant.helpers import entity_registry as er + +from . import configure_integration + + +async def test_unsupported_device_type( + hass: HomeAssistant, + entity_registry: er.EntityRegistry, + mock_list_devices, + mock_get_status, +) -> None: + """Test that unsupported device types do not create sensors.""" + mock_list_devices.return_value = [ + Device( + version="V1.0", + deviceId="unsupported-id-1", + deviceName="unsupported-device", + deviceType="UnsupportedDevice", + hubDeviceId="test-hub-id", + ), + ] + mock_get_status.return_value = {} + + with patch( + "homeassistant.components.switchbot_cloud.PLATFORMS", [Platform.BINARY_SENSOR] + ): + entry = await configure_integration(hass) + + # Assert no binary sensor entities were created for unsupported device type + entities = er.async_entries_for_config_entry(entity_registry, entry.entry_id) + assert len([e for e in entities if e.domain == "binary_sensor"]) == 0 diff --git a/tests/components/switchbot_cloud/test_sensor.py b/tests/components/switchbot_cloud/test_sensor.py index 440e71f3124cca..99b6acc7401e0f 100644 --- a/tests/components/switchbot_cloud/test_sensor.py +++ b/tests/components/switchbot_cloud/test_sensor.py @@ -67,3 +67,29 @@ async def test_meter_no_coordinator_data( entry = await configure_integration(hass) await snapshot_platform(hass, entity_registry, snapshot, entry.entry_id) + + +async def test_unsupported_device_type( + hass: HomeAssistant, + entity_registry: er.EntityRegistry, + mock_list_devices, + mock_get_status, +) -> None: + """Test that unsupported device types do not create sensors.""" + mock_list_devices.return_value = [ + Device( + version="V1.0", + deviceId="unsupported-id-1", + deviceName="unsupported-device", + deviceType="UnsupportedDevice", + hubDeviceId="test-hub-id", + ), + ] + mock_get_status.return_value = {} + + with patch("homeassistant.components.switchbot_cloud.PLATFORMS", [Platform.SENSOR]): + entry = await configure_integration(hass) + + # Assert no sensor entities were created for unsupported device type + entities = er.async_entries_for_config_entry(entity_registry, entry.entry_id) + assert len([e for e in entities if e.domain == "sensor"]) == 0 From d4e7667ea01894926715e6929d113cea4c0c43fe Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Sun, 22 Jun 2025 16:24:16 +0200 Subject: [PATCH 3/4] Bump aioesphomeapi to 33.0.0 (#147296) fixes compat warning with protobuf 6.x changelog: https://github.com/esphome/aioesphomeapi/compare/v32.2.4...v33.0.0 Not a breaking change for HA since we are already on protobuf 6 --- homeassistant/components/esphome/manifest.json | 2 +- requirements_all.txt | 2 +- requirements_test_all.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/homeassistant/components/esphome/manifest.json b/homeassistant/components/esphome/manifest.json index 6142b9ce5ec165..0577ed10c19a80 100644 --- a/homeassistant/components/esphome/manifest.json +++ b/homeassistant/components/esphome/manifest.json @@ -17,7 +17,7 @@ "mqtt": ["esphome/discover/#"], "quality_scale": "platinum", "requirements": [ - "aioesphomeapi==32.2.4", + "aioesphomeapi==33.0.0", "esphome-dashboard-api==1.3.0", "bleak-esphome==2.16.0" ], diff --git a/requirements_all.txt b/requirements_all.txt index 0a4627f2e597f3..0c485b79a81201 100644 --- a/requirements_all.txt +++ b/requirements_all.txt @@ -244,7 +244,7 @@ aioelectricitymaps==0.4.0 aioemonitor==1.0.5 # homeassistant.components.esphome -aioesphomeapi==32.2.4 +aioesphomeapi==33.0.0 # homeassistant.components.flo aioflo==2021.11.0 diff --git a/requirements_test_all.txt b/requirements_test_all.txt index fceefd04355db1..51b55d206af48d 100644 --- a/requirements_test_all.txt +++ b/requirements_test_all.txt @@ -232,7 +232,7 @@ aioelectricitymaps==0.4.0 aioemonitor==1.0.5 # homeassistant.components.esphome -aioesphomeapi==32.2.4 +aioesphomeapi==33.0.0 # homeassistant.components.flo aioflo==2021.11.0 From 41e53297c22d57cbf0c344e21f074ee83f29bd35 Mon Sep 17 00:00:00 2001 From: Michael <35783820+mib1185@users.noreply.github.com> Date: Sun, 22 Jun 2025 16:54:48 +0200 Subject: [PATCH 4/4] Add update entity to immich integration (#147273) * add update entity * remove unneccessary entity description * rename update entity to version * simplify test * define static attribute outside of the constructor * move min version check into coordinator --- homeassistant/components/immich/__init__.py | 2 +- .../components/immich/coordinator.py | 12 +++- homeassistant/components/immich/strings.json | 5 ++ homeassistant/components/immich/update.py | 57 +++++++++++++++++ tests/components/immich/conftest.py | 25 +++++--- .../immich/snapshots/test_diagnostics.ambr | 22 ++++--- .../immich/snapshots/test_update.ambr | 61 +++++++++++++++++++ tests/components/immich/test_update.py | 45 ++++++++++++++ 8 files changed, 209 insertions(+), 20 deletions(-) create mode 100644 homeassistant/components/immich/update.py create mode 100644 tests/components/immich/snapshots/test_update.ambr create mode 100644 tests/components/immich/test_update.py diff --git a/homeassistant/components/immich/__init__.py b/homeassistant/components/immich/__init__.py index ced4aa4444992e..d40615dbe88786 100644 --- a/homeassistant/components/immich/__init__.py +++ b/homeassistant/components/immich/__init__.py @@ -20,7 +20,7 @@ from .coordinator import ImmichConfigEntry, ImmichDataUpdateCoordinator -PLATFORMS: list[Platform] = [Platform.SENSOR] +PLATFORMS: list[Platform] = [Platform.SENSOR, Platform.UPDATE] async def async_setup_entry(hass: HomeAssistant, entry: ImmichConfigEntry) -> bool: diff --git a/homeassistant/components/immich/coordinator.py b/homeassistant/components/immich/coordinator.py index 2e89b0dae2968d..eaa24ec94c1db2 100644 --- a/homeassistant/components/immich/coordinator.py +++ b/homeassistant/components/immich/coordinator.py @@ -13,7 +13,9 @@ ImmichServerAbout, ImmichServerStatistics, ImmichServerStorage, + ImmichServerVersionCheck, ) +from awesomeversion import AwesomeVersion from homeassistant.config_entries import ConfigEntry from homeassistant.const import CONF_HOST, CONF_PORT, CONF_SSL @@ -33,6 +35,7 @@ class ImmichData: server_about: ImmichServerAbout server_storage: ImmichServerStorage server_usage: ImmichServerStatistics | None + server_version_check: ImmichServerVersionCheck | None type ImmichConfigEntry = ConfigEntry[ImmichDataUpdateCoordinator] @@ -71,9 +74,16 @@ async def _async_update_data(self) -> ImmichData: if self.is_admin else None ) + server_version_check = ( + await self.api.server.async_get_version_check() + if AwesomeVersion(server_about.version) >= AwesomeVersion("v1.134.0") + else None + ) except ImmichUnauthorizedError as err: raise ConfigEntryAuthFailed from err except CONNECT_ERRORS as err: raise UpdateFailed from err - return ImmichData(server_about, server_storage, server_usage) + return ImmichData( + server_about, server_storage, server_usage, server_version_check + ) diff --git a/homeassistant/components/immich/strings.json b/homeassistant/components/immich/strings.json index 875eb79f50b0d1..83ee7574630be9 100644 --- a/homeassistant/components/immich/strings.json +++ b/homeassistant/components/immich/strings.json @@ -68,6 +68,11 @@ "usage_by_videos": { "name": "Disk used by videos" } + }, + "update": { + "update": { + "name": "Version" + } } } } diff --git a/homeassistant/components/immich/update.py b/homeassistant/components/immich/update.py new file mode 100644 index 00000000000000..9955e355c96f6c --- /dev/null +++ b/homeassistant/components/immich/update.py @@ -0,0 +1,57 @@ +"""Update platform for the Immich integration.""" + +from __future__ import annotations + +from homeassistant.components.update import UpdateEntity +from homeassistant.core import HomeAssistant +from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback + +from .coordinator import ImmichConfigEntry, ImmichDataUpdateCoordinator +from .entity import ImmichEntity + +# Coordinator is used to centralize the data updates +PARALLEL_UPDATES = 0 + + +async def async_setup_entry( + hass: HomeAssistant, + entry: ImmichConfigEntry, + async_add_entities: AddConfigEntryEntitiesCallback, +) -> None: + """Add immich server update entity.""" + coordinator = entry.runtime_data + + if coordinator.data.server_version_check is not None: + async_add_entities([ImmichUpdateEntity(coordinator)]) + + +class ImmichUpdateEntity(ImmichEntity, UpdateEntity): + """Define Immich update entity.""" + + _attr_translation_key = "update" + + def __init__( + self, + coordinator: ImmichDataUpdateCoordinator, + ) -> None: + """Initialize.""" + super().__init__(coordinator) + self._attr_unique_id = f"{coordinator.config_entry.unique_id}_update" + + @property + def installed_version(self) -> str: + """Current installed immich server version.""" + return self.coordinator.data.server_about.version + + @property + def latest_version(self) -> str: + """Available new immich server version.""" + assert self.coordinator.data.server_version_check + return self.coordinator.data.server_version_check.release_version + + @property + def release_url(self) -> str | None: + """URL to the full release notes of the new immich server version.""" + return ( + f"https://github.com/immich-app/immich/releases/tag/{self.latest_version}" + ) diff --git a/tests/components/immich/conftest.py b/tests/components/immich/conftest.py index f8f959e0b0a11a..6c7813cbd85559 100644 --- a/tests/components/immich/conftest.py +++ b/tests/components/immich/conftest.py @@ -8,6 +8,7 @@ ImmichServerAbout, ImmichServerStatistics, ImmichServerStorage, + ImmichServerVersionCheck, ) from aioimmich.users.models import ImmichUserObject import pytest @@ -79,21 +80,21 @@ def mock_immich_server() -> AsyncMock: mock = AsyncMock(spec=ImmichServer) mock.async_get_about_info.return_value = ImmichServerAbout.from_dict( { - "version": "v1.132.3", - "versionUrl": "https://github.com/immich-app/immich/releases/tag/v1.132.3", + "version": "v1.134.0", + "versionUrl": "https://github.com/immich-app/immich/releases/tag/v1.134.0", "licensed": False, - "build": "14709928600", - "buildUrl": "https://github.com/immich-app/immich/actions/runs/14709928600", - "buildImage": "v1.132.3", + "build": "15281783550", + "buildUrl": "https://github.com/immich-app/immich/actions/runs/15281783550", + "buildImage": "v1.134.0", "buildImageUrl": "https://github.com/immich-app/immich/pkgs/container/immich-server", "repository": "immich-app/immich", "repositoryUrl": "https://github.com/immich-app/immich", - "sourceRef": "v1.132.3", - "sourceCommit": "02994883fe3f3972323bb6759d0170a4062f5236", - "sourceUrl": "https://github.com/immich-app/immich/commit/02994883fe3f3972323bb6759d0170a4062f5236", + "sourceRef": "v1.134.0", + "sourceCommit": "58ae77ec9204a2e43a8cb2f1fd27482af40d0891", + "sourceUrl": "https://github.com/immich-app/immich/commit/58ae77ec9204a2e43a8cb2f1fd27482af40d0891", "nodejs": "v22.14.0", "exiftool": "13.00", - "ffmpeg": "7.0.2-7", + "ffmpeg": "7.0.2-9", "libvips": "8.16.1", "imagemagick": "7.1.1-47", } @@ -130,6 +131,12 @@ def mock_immich_server() -> AsyncMock: ], } ) + mock.async_get_version_check.return_value = ImmichServerVersionCheck.from_dict( + { + "checkedAt": "2025-06-21T16:35:10.352Z", + "releaseVersion": "v1.135.3", + } + ) return mock diff --git a/tests/components/immich/snapshots/test_diagnostics.ambr b/tests/components/immich/snapshots/test_diagnostics.ambr index b3dd3c47db6870..4f09e5fbe8649f 100644 --- a/tests/components/immich/snapshots/test_diagnostics.ambr +++ b/tests/components/immich/snapshots/test_diagnostics.ambr @@ -3,23 +3,23 @@ dict({ 'data': dict({ 'server_about': dict({ - 'build': '14709928600', - 'build_image': 'v1.132.3', + 'build': '15281783550', + 'build_image': 'v1.134.0', 'build_image_url': 'https://github.com/immich-app/immich/pkgs/container/immich-server', - 'build_url': 'https://github.com/immich-app/immich/actions/runs/14709928600', + 'build_url': 'https://github.com/immich-app/immich/actions/runs/15281783550', 'exiftool': '13.00', - 'ffmpeg': '7.0.2-7', + 'ffmpeg': '7.0.2-9', 'imagemagick': '7.1.1-47', 'libvips': '8.16.1', 'licensed': False, 'nodejs': 'v22.14.0', 'repository': 'immich-app/immich', 'repository_url': 'https://github.com/immich-app/immich', - 'source_commit': '02994883fe3f3972323bb6759d0170a4062f5236', - 'source_ref': 'v1.132.3', - 'source_url': 'https://github.com/immich-app/immich/commit/02994883fe3f3972323bb6759d0170a4062f5236', - 'version': 'v1.132.3', - 'version_url': 'https://github.com/immich-app/immich/releases/tag/v1.132.3', + 'source_commit': '58ae77ec9204a2e43a8cb2f1fd27482af40d0891', + 'source_ref': 'v1.134.0', + 'source_url': 'https://github.com/immich-app/immich/commit/58ae77ec9204a2e43a8cb2f1fd27482af40d0891', + 'version': 'v1.134.0', + 'version_url': 'https://github.com/immich-app/immich/releases/tag/v1.134.0', }), 'server_storage': dict({ 'disk_available': '136.3 GiB', @@ -49,6 +49,10 @@ 'usage_videos': 65234281361, 'videos': 1836, }), + 'server_version_check': dict({ + 'checked_at': '2025-06-21T16:35:10.352000+00:00', + 'release_version': 'v1.135.3', + }), }), 'entry': dict({ 'data': dict({ diff --git a/tests/components/immich/snapshots/test_update.ambr b/tests/components/immich/snapshots/test_update.ambr new file mode 100644 index 00000000000000..f3864511d13fed --- /dev/null +++ b/tests/components/immich/snapshots/test_update.ambr @@ -0,0 +1,61 @@ +# serializer version: 1 +# name: test_update[update.someone_version-entry] + EntityRegistryEntrySnapshot({ + 'aliases': set({ + }), + 'area_id': None, + 'capabilities': None, + 'config_entry_id': , + 'config_subentry_id': , + 'device_class': None, + 'device_id': , + 'disabled_by': None, + 'domain': 'update', + 'entity_category': , + 'entity_id': 'update.someone_version', + 'has_entity_name': True, + 'hidden_by': None, + 'icon': None, + 'id': , + 'labels': set({ + }), + 'name': None, + 'options': dict({ + }), + 'original_device_class': None, + 'original_icon': None, + 'original_name': 'Version', + 'platform': 'immich', + 'previous_unique_id': None, + 'suggested_object_id': None, + 'supported_features': 0, + 'translation_key': 'update', + 'unique_id': 'e7ef5713-9dab-4bd4-b899-715b0ca4379e_update', + 'unit_of_measurement': None, + }) +# --- +# name: test_update[update.someone_version-state] + StateSnapshot({ + 'attributes': ReadOnlyDict({ + 'auto_update': False, + 'display_precision': 0, + 'entity_picture': 'https://brands.home-assistant.io/_/immich/icon.png', + 'friendly_name': 'Someone Version', + 'in_progress': False, + 'installed_version': 'v1.134.0', + 'latest_version': 'v1.135.3', + 'release_summary': None, + 'release_url': 'https://github.com/immich-app/immich/releases/tag/v1.135.3', + 'skipped_version': None, + 'supported_features': , + 'title': None, + 'update_percentage': None, + }), + 'context': , + 'entity_id': 'update.someone_version', + 'last_changed': , + 'last_reported': , + 'last_updated': , + 'state': 'on', + }) +# --- diff --git a/tests/components/immich/test_update.py b/tests/components/immich/test_update.py new file mode 100644 index 00000000000000..95b4044850ded1 --- /dev/null +++ b/tests/components/immich/test_update.py @@ -0,0 +1,45 @@ +"""Test the Immich update platform.""" + +from unittest.mock import Mock, patch + +from syrupy.assertion import SnapshotAssertion + +from homeassistant.const import Platform +from homeassistant.core import HomeAssistant +from homeassistant.helpers import entity_registry as er + +from . import setup_integration + +from tests.common import MockConfigEntry, snapshot_platform + + +async def test_update( + hass: HomeAssistant, + entity_registry: er.EntityRegistry, + snapshot: SnapshotAssertion, + mock_immich: Mock, + mock_config_entry: MockConfigEntry, +) -> None: + """Test the Immich update platform.""" + + with patch("homeassistant.components.immich.PLATFORMS", [Platform.UPDATE]): + await setup_integration(hass, mock_config_entry) + + await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id) + + +async def test_update_min_version( + hass: HomeAssistant, + entity_registry: er.EntityRegistry, + snapshot: SnapshotAssertion, + mock_immich: Mock, + mock_config_entry: MockConfigEntry, +) -> None: + """Test the Immich update platform with min version not installed.""" + + mock_immich.server.async_get_about_info.return_value.version = "v1.132.3" + + with patch("homeassistant.components.immich.PLATFORMS", [Platform.UPDATE]): + await setup_integration(hass, mock_config_entry) + + assert not hass.states.async_all()