Adjust device disabled_by flag when changing config entry (home-assistant#151155)

emontnemery · web-flow · commit 5bb96f7f0617 · 2025-08-26T12:37:56.000+02:00
diff --git a/homeassistant/components/anthropic/__init__.py b/homeassistant/components/anthropic/__init__.py
@@ -129,9 +129,9 @@ async def async_migrate_integration(hass: HomeAssistant) -> None:
                 entity_disabled_by is er.RegistryEntryDisabler.CONFIG_ENTRY
                 and not all_disabled
             ):
-                # Device and entity registries don't update the disabled_by flag
-                # when moving a device or entity from one config entry to another,
-                # so we need to do it manually.
+                # Device and entity registries will set the disabled_by flag to None
+                # when moving a device or entity disabled by CONFIG_ENTRY to an enabled
+                # config entry, but we want to set it to DEVICE or USER instead,
                 entity_disabled_by = (
                     er.RegistryEntryDisabler.DEVICE
                     if device
@@ -146,9 +146,9 @@ async def async_migrate_integration(hass: HomeAssistant) -> None:
             )
 
         if device is not None:
-            # Device and entity registries don't update the disabled_by flag when
-            # moving a device or entity from one config entry to another, so we
-            # need to do it manually.
+            # Device and entity registries will set the disabled_by flag to None
+            # when moving a device or entity disabled by CONFIG_ENTRY to an enabled
+            # config entry, but we want to set it to USER instead,
             device_disabled_by = device.disabled_by
             if (
                 device.disabled_by is dr.DeviceEntryDisabler.CONFIG_ENTRY
diff --git a/homeassistant/components/google_generative_ai_conversation/__init__.py b/homeassistant/components/google_generative_ai_conversation/__init__.py
@@ -260,9 +260,9 @@ async def async_migrate_integration(hass: HomeAssistant) -> None:
                 entity_disabled_by is er.RegistryEntryDisabler.CONFIG_ENTRY
                 and not all_disabled
             ):
-                # Device and entity registries don't update the disabled_by flag
-                # when moving a device or entity from one config entry to another,
-                # so we need to do it manually.
+                # Device and entity registries will set the disabled_by flag to None
+                # when moving a device or entity disabled by CONFIG_ENTRY to an enabled
+                # config entry, but we want to set it to DEVICE or USER instead,
                 entity_disabled_by = (
                     er.RegistryEntryDisabler.DEVICE
                     if device
@@ -277,9 +277,9 @@ async def async_migrate_integration(hass: HomeAssistant) -> None:
             )
 
         if device is not None:
-            # Device and entity registries don't update the disabled_by flag when
-            # moving a device or entity from one config entry to another, so we
-            # need to do it manually.
+            # Device and entity registries will set the disabled_by flag to None
+            # when moving a device or entity disabled by CONFIG_ENTRY to an enabled
+            # config entry, but we want to set it to USER instead,
             device_disabled_by = device.disabled_by
             if (
                 device.disabled_by is dr.DeviceEntryDisabler.CONFIG_ENTRY
diff --git a/homeassistant/components/ollama/__init__.py b/homeassistant/components/ollama/__init__.py
@@ -145,9 +145,9 @@ async def async_migrate_integration(hass: HomeAssistant) -> None:
                 entity_disabled_by is er.RegistryEntryDisabler.CONFIG_ENTRY
                 and not all_disabled
             ):
-                # Device and entity registries don't update the disabled_by flag
-                # when moving a device or entity from one config entry to another,
-                # so we need to do it manually.
+                # Device and entity registries will set the disabled_by flag to None
+                # when moving a device or entity disabled by CONFIG_ENTRY to an enabled
+                # config entry, but we want to set it to DEVICE or USER instead,
                 entity_disabled_by = (
                     er.RegistryEntryDisabler.DEVICE
                     if device
@@ -162,9 +162,9 @@ async def async_migrate_integration(hass: HomeAssistant) -> None:
             )
 
         if device is not None:
-            # Device and entity registries don't update the disabled_by flag when
-            # moving a device or entity from one config entry to another, so we
-            # need to do it manually.
+            # Device and entity registries will set the disabled_by flag to None
+            # when moving a device or entity disabled by CONFIG_ENTRY to an enabled
+            # config entry, but we want to set it to USER instead,
             device_disabled_by = device.disabled_by
             if (
                 device.disabled_by is dr.DeviceEntryDisabler.CONFIG_ENTRY
diff --git a/homeassistant/components/openai_conversation/__init__.py b/homeassistant/components/openai_conversation/__init__.py
@@ -320,9 +320,9 @@ async def async_migrate_integration(hass: HomeAssistant) -> None:
                 entity_disabled_by is er.RegistryEntryDisabler.CONFIG_ENTRY
                 and not all_disabled
             ):
-                # Device and entity registries don't update the disabled_by flag
-                # when moving a device or entity from one config entry to another,
-                # so we need to do it manually.
+                # Device and entity registries will set the disabled_by flag to None
+                # when moving a device or entity disabled by CONFIG_ENTRY to an enabled
+                # config entry, but we want to set it to DEVICE or USER instead,
                 entity_disabled_by = (
                     er.RegistryEntryDisabler.DEVICE
                     if device
@@ -337,9 +337,9 @@ async def async_migrate_integration(hass: HomeAssistant) -> None:
             )
 
         if device is not None:
-            # Device and entity registries don't update the disabled_by flag when
-            # moving a device or entity from one config entry to another, so we
-            # need to do it manually.
+            # Device and entity registries will set the disabled_by flag to None
+            # when moving a device or entity disabled by CONFIG_ENTRY to an enabled
+            # config entry, but we want to set it to USER instead,
             device_disabled_by = device.disabled_by
             if (
                 device.disabled_by is dr.DeviceEntryDisabler.CONFIG_ENTRY
diff --git a/homeassistant/helpers/device_registry.py b/homeassistant/helpers/device_registry.py
@@ -1115,6 +1115,16 @@ def async_update_device(  # noqa: C901
                 config_entries_subentries = old.config_entries_subentries | {
                     add_config_entry_id: {add_config_subentry_id}
                 }
+                # Enable the device if it was disabled by config entry and we're adding
+                # a non disabled config entry
+                if (
+                    # mypy says add_config_entry can be None. That's impossible, because we
+                    # raise above if that happens
+                    not add_config_entry.disabled_by  # type: ignore[union-attr]
+                    and old.disabled_by is DeviceEntryDisabler.CONFIG_ENTRY
+                ):
+                    new_values["disabled_by"] = None
+                    old_values["disabled_by"] = old.disabled_by
             elif (
                 add_config_subentry_id
                 not in old.config_entries_subentries[add_config_entry_id]
@@ -1157,6 +1167,22 @@ def async_update_device(  # noqa: C901
 
                 config_entries = config_entries - {remove_config_entry_id}
 
+                # Disable the device if it is enabled and all remaining config entries
+                # are disabled
+                has_enabled_config_entries = any(
+                    config_entry.disabled_by is None
+                    for config_entry_id in config_entries
+                    if (
+                        config_entry := self.hass.config_entries.async_get_entry(
+                            config_entry_id
+                        )
+                    )
+                    is not None
+                )
+                if not has_enabled_config_entries and old.disabled_by is None:
+                    new_values["disabled_by"] = DeviceEntryDisabler.CONFIG_ENTRY
+                    old_values["disabled_by"] = old.disabled_by
+
         if config_entries != old.config_entries:
             new_values["config_entries"] = config_entries
             old_values["config_entries"] = old.config_entries
diff --git a/tests/components/anthropic/test_init.py b/tests/components/anthropic/test_init.py
@@ -156,13 +156,17 @@ async def test_migration_from_v1_to_v2(
 @pytest.mark.parametrize(
     (
         "config_entry_disabled_by",
+        "device_disabled_by",
+        "entity_disabled_by",
         "merged_config_entry_disabled_by",
         "conversation_subentry_data",
         "main_config_entry",
     ),
     [
         (
             [ConfigEntryDisabler.USER, None],
+            [DeviceEntryDisabler.CONFIG_ENTRY, None],
+            [RegistryEntryDisabler.CONFIG_ENTRY, None],
             None,
             [
                 {
@@ -182,25 +186,29 @@ async def test_migration_from_v1_to_v2(
         ),
         (
             [None, ConfigEntryDisabler.USER],
+            [None, DeviceEntryDisabler.CONFIG_ENTRY],
+            [None, RegistryEntryDisabler.CONFIG_ENTRY],
             None,
             [
                 {
                     "conversation_entity_id": "conversation.claude",
-                    "device_disabled_by": DeviceEntryDisabler.USER,
-                    "entity_disabled_by": RegistryEntryDisabler.DEVICE,
+                    "device_disabled_by": None,
+                    "entity_disabled_by": None,
                     "device": 0,
                 },
                 {
                     "conversation_entity_id": "conversation.claude_2",
-                    "device_disabled_by": None,
-                    "entity_disabled_by": None,
+                    "device_disabled_by": DeviceEntryDisabler.USER,
+                    "entity_disabled_by": RegistryEntryDisabler.DEVICE,
                     "device": 1,
                 },
             ],
             0,
         ),
         (
             [ConfigEntryDisabler.USER, ConfigEntryDisabler.USER],
+            [DeviceEntryDisabler.CONFIG_ENTRY, DeviceEntryDisabler.CONFIG_ENTRY],
+            [RegistryEntryDisabler.CONFIG_ENTRY, RegistryEntryDisabler.CONFIG_ENTRY],
             ConfigEntryDisabler.USER,
             [
                 {
@@ -211,8 +219,8 @@ async def test_migration_from_v1_to_v2(
                 },
                 {
                     "conversation_entity_id": "conversation.claude_2",
-                    "device_disabled_by": None,
-                    "entity_disabled_by": None,
+                    "device_disabled_by": DeviceEntryDisabler.CONFIG_ENTRY,
+                    "entity_disabled_by": RegistryEntryDisabler.CONFIG_ENTRY,
                     "device": 1,
                 },
             ],
@@ -225,6 +233,8 @@ async def test_migration_from_v1_disabled(
     device_registry: dr.DeviceRegistry,
     entity_registry: er.EntityRegistry,
     config_entry_disabled_by: list[ConfigEntryDisabler | None],
+    device_disabled_by: list[DeviceEntryDisabler | None],
+    entity_disabled_by: list[RegistryEntryDisabler | None],
     merged_config_entry_disabled_by: ConfigEntryDisabler | None,
     conversation_subentry_data: list[dict[str, Any]],
     main_config_entry: int,
@@ -264,7 +274,7 @@ async def test_migration_from_v1_disabled(
         manufacturer="Anthropic",
         model="Claude",
         entry_type=dr.DeviceEntryType.SERVICE,
-        disabled_by=DeviceEntryDisabler.CONFIG_ENTRY,
+        disabled_by=device_disabled_by[0],
     )
     entity_registry.async_get_or_create(
         "conversation",
@@ -273,7 +283,7 @@ async def test_migration_from_v1_disabled(
         config_entry=mock_config_entry,
         device_id=device_1.id,
         suggested_object_id="claude",
-        disabled_by=RegistryEntryDisabler.CONFIG_ENTRY,
+        disabled_by=entity_disabled_by[0],
     )
 
     device_2 = device_registry.async_get_or_create(
@@ -283,6 +293,7 @@ async def test_migration_from_v1_disabled(
         manufacturer="Anthropic",
         model="Claude",
         entry_type=dr.DeviceEntryType.SERVICE,
+        disabled_by=device_disabled_by[1],
     )
     entity_registry.async_get_or_create(
         "conversation",
@@ -291,6 +302,7 @@ async def test_migration_from_v1_disabled(
         config_entry=mock_config_entry_2,
         device_id=device_2.id,
         suggested_object_id="claude",
+        disabled_by=entity_disabled_by[1],
     )
 
     devices = [device_1, device_2]
diff --git a/tests/components/google_generative_ai_conversation/test_init.py b/tests/components/google_generative_ai_conversation/test_init.py
@@ -576,13 +576,17 @@ async def test_migration_from_v1(
 @pytest.mark.parametrize(
     (
         "config_entry_disabled_by",
+        "device_disabled_by",
+        "entity_disabled_by",
         "merged_config_entry_disabled_by",
         "conversation_subentry_data",
         "main_config_entry",
     ),
     [
         (
             [ConfigEntryDisabler.USER, None],
+            [DeviceEntryDisabler.CONFIG_ENTRY, None],
+            [RegistryEntryDisabler.CONFIG_ENTRY, None],
             None,
             [
                 {
@@ -602,25 +606,29 @@ async def test_migration_from_v1(
         ),
         (
             [None, ConfigEntryDisabler.USER],
+            [None, DeviceEntryDisabler.CONFIG_ENTRY],
+            [None, RegistryEntryDisabler.CONFIG_ENTRY],
             None,
             [
                 {
                     "conversation_entity_id": "conversation.google_generative_ai_conversation",
-                    "device_disabled_by": DeviceEntryDisabler.USER,
-                    "entity_disabled_by": RegistryEntryDisabler.DEVICE,
+                    "device_disabled_by": None,
+                    "entity_disabled_by": None,
                     "device": 0,
                 },
                 {
                     "conversation_entity_id": "conversation.google_generative_ai_conversation_2",
-                    "device_disabled_by": None,
-                    "entity_disabled_by": None,
+                    "device_disabled_by": DeviceEntryDisabler.USER,
+                    "entity_disabled_by": RegistryEntryDisabler.DEVICE,
                     "device": 1,
                 },
             ],
             0,
         ),
         (
             [ConfigEntryDisabler.USER, ConfigEntryDisabler.USER],
+            [DeviceEntryDisabler.CONFIG_ENTRY, DeviceEntryDisabler.CONFIG_ENTRY],
+            [RegistryEntryDisabler.CONFIG_ENTRY, RegistryEntryDisabler.CONFIG_ENTRY],
             ConfigEntryDisabler.USER,
             [
                 {
@@ -631,8 +639,8 @@ async def test_migration_from_v1(
                 },
                 {
                     "conversation_entity_id": "conversation.google_generative_ai_conversation_2",
-                    "device_disabled_by": None,
-                    "entity_disabled_by": None,
+                    "device_disabled_by": DeviceEntryDisabler.CONFIG_ENTRY,
+                    "entity_disabled_by": RegistryEntryDisabler.CONFIG_ENTRY,
                     "device": 1,
                 },
             ],
@@ -645,6 +653,8 @@ async def test_migration_from_v1_disabled(
     device_registry: dr.DeviceRegistry,
     entity_registry: er.EntityRegistry,
     config_entry_disabled_by: list[ConfigEntryDisabler | None],
+    device_disabled_by: list[DeviceEntryDisabler | None],
+    entity_disabled_by: list[RegistryEntryDisabler | None],
     merged_config_entry_disabled_by: ConfigEntryDisabler | None,
     conversation_subentry_data: list[dict[str, Any]],
     main_config_entry: int,
@@ -684,7 +694,7 @@ async def test_migration_from_v1_disabled(
         manufacturer="Google",
         model="Generative AI",
         entry_type=dr.DeviceEntryType.SERVICE,
-        disabled_by=DeviceEntryDisabler.CONFIG_ENTRY,
+        disabled_by=device_disabled_by[0],
     )
     entity_registry.async_get_or_create(
         "conversation",
@@ -693,7 +703,7 @@ async def test_migration_from_v1_disabled(
         config_entry=mock_config_entry,
         device_id=device_1.id,
         suggested_object_id="google_generative_ai_conversation",
-        disabled_by=RegistryEntryDisabler.CONFIG_ENTRY,
+        disabled_by=entity_disabled_by[0],
     )
 
     device_2 = device_registry.async_get_or_create(
@@ -703,6 +713,7 @@ async def test_migration_from_v1_disabled(
         manufacturer="Google",
         model="Generative AI",
         entry_type=dr.DeviceEntryType.SERVICE,
+        disabled_by=device_disabled_by[1],
     )
     entity_registry.async_get_or_create(
         "conversation",
@@ -711,6 +722,7 @@ async def test_migration_from_v1_disabled(
         config_entry=mock_config_entry_2,
         device_id=device_2.id,
         suggested_object_id="google_generative_ai_conversation_2",
+        disabled_by=entity_disabled_by[1],
     )
 
     devices = [device_1, device_2]
diff --git a/tests/components/ollama/test_init.py b/tests/components/ollama/test_init.py
diff --git a/tests/components/openai_conversation/test_init.py b/tests/components/openai_conversation/test_init.py
diff --git a/tests/helpers/test_device_registry.py b/tests/helpers/test_device_registry.py
