homeassistant 2025.9.0b0__py3-none-any.whl → 2025.9.0b1__py3-none-any.whl

homeassistant/components/zha/translations/pt.json

@@ -258,6 +258,9 @@
             }
         },
         "button": {
+            "calibrate_valve": {
+                "name": "Calibrar a v\u00e1lvula"
+            },
             "feed": {
                 "name": "Alimenta\u00e7\u00e3o"
             },
@@ -399,6 +402,9 @@
             "calibration_vertical_run_time_up": {
                 "name": "Calibra\u00e7\u00e3o do tempo de movimento vertical para cima"
             },
+            "closing_duration": {
+                "name": "Dura\u00e7\u00e3o do fecho"
+            },
             "comfort_humidity_max": {
                 "name": "Humidade de conforto m\u00e1x"
             },
@@ -459,6 +465,9 @@
             "display_inactive_brightness": {
                 "name": "Brilho do ecr\u00e3 quando inativo"
             },
+            "display_on_time": {
+                "name": "Exibir tempo ligado"
+            },
             "double_tap_down_level": {
                 "name": "Duplo toque para descer de n\u00edvel"
             },
@@ -582,6 +591,12 @@
             "local_temperature_calibration": {
                 "name": "Corre\u00e7\u00e3o da temperatura local"
             },
+            "long_press_duration": {
+                "name": "Dura\u00e7\u00e3o da press\u00e3o longa"
+            },
+            "max_brightness": {
+                "name": "Brilho m\u00e1ximo"
+            },
             "max_heat_setpoint_limit": {
                 "name": "Limite m\u00e1ximo do ponto de regula\u00e7\u00e3o do calor"
             },
@@ -603,6 +618,9 @@
             "medium_motion_detection_sensitivity": {
                 "name": "Sensibilidade m\u00e9dia de dete\u00e7\u00e3o de movimento"
             },
+            "min_brightness": {
+                "name": "Brilho m\u00ednimo"
+            },
             "min_heat_setpoint_limit": {
                 "name": "Limite m\u00ednimo do ponto de regula\u00e7\u00e3o do calor"
             },
@@ -627,6 +645,9 @@
             "motionless_sensitivity": {
                 "name": "Sensibilidade de dete\u00e7\u00e3o sem movimento"
             },
+            "motor_start_delay": {
+                "name": "Atraso no arranque do motor"
+            },
             "move_sensitivity": {
                 "name": "Sensibilidade ao movimento"
             },
@@ -663,6 +684,9 @@
             "open_window_event_duration": {
                 "name": "Dura\u00e7\u00e3o do evento de janela aberta"
             },
+            "opening_duration": {
+                "name": "Dura\u00e7\u00e3o da abertura"
+            },
             "output_time": {
                 "name": "Hora de sa\u00edda"
             },
@@ -705,6 +729,12 @@
             "regulator_set_point": {
                 "name": "Ponto de regula\u00e7\u00e3o do regulador"
             },
+            "reporting_interval": {
+                "name": "Intervalo de reporte"
+            },
+            "sensitivity": {
+                "name": "Sensibilidade"
+            },
             "serving_size": {
                 "name": "Servir para dispensar"
             },
@@ -848,12 +878,18 @@
             "breaker_status": {
                 "name": "Estado do disjuntor"
             },
+            "calibration_mode": {
+                "name": "Modo de calibra\u00e7\u00e3o"
+            },
             "click_mode": {
                 "name": "Modo de clique"
             },
             "control_type": {
                 "name": "Tipo de controlo"
             },
+            "ctrl_sequence_of_oper": {
+                "name": "Sequ\u00eancia de controlo"
+            },
             "decoupled_mode": {
                 "name": "Modo desligado"
             },
@@ -887,6 +923,9 @@
             "display_unit": {
                 "name": "Unidade de visualiza\u00e7\u00e3o"
             },
+            "displayed_temperature": {
+                "name": "Temperatura indicada"
+            },
             "eco_mode": {
                 "name": "Modo Eco"
             },
@@ -947,6 +986,9 @@
             "mode": {
                 "name": "Modo"
             },
+            "mode_switch": {
+                "name": "Interruptor de modo"
+            },
             "monitoring_mode": {
                 "name": "Modo de monitoriza\u00e7\u00e3o"
             },
@@ -974,6 +1016,9 @@
             "output_mode": {
                 "name": "Modo de sa\u00edda"
             },
+            "phase": {
+                "name": "Fase"
+            },
             "pilot_wire_mode": {
                 "name": "Modo de fio piloto"
             },
@@ -1239,6 +1284,9 @@
             "motion_distance": {
                 "name": "Dist\u00e2ncia de movimento"
             },
+            "motor_state": {
+                "name": "Estado do motor"
+            },
             "motor_stepcount": {
                 "name": "N\u00famero de passos do motor"
             },
@@ -1248,6 +1296,9 @@
             "opening": {
                 "name": "A abrir"
             },
+            "operating_mode": {
+                "name": "Modo de funcionamento"
+            },
             "overheated": {
                 "name": "Prote\u00e7\u00e3o de sobreaquecimento"
             },
@@ -1407,6 +1458,9 @@
             "total_power_factor": {
                 "name": "Fator de pot\u00eancia total"
             },
+            "valve_adapt_status": {
+                "name": "Estado de adapta\u00e7\u00e3o da v\u00e1lvula"
+            },
             "valve_duration": {
                 "name": "Dura\u00e7\u00e3o da irriga\u00e7\u00e3o"
             },
@@ -1469,6 +1523,9 @@
             "detach_relay": {
                 "name": "Desanexar rel\u00e9"
             },
+            "dimmer_mode": {
+                "name": "Modo de atenua\u00e7\u00e3o"
+            },
             "disable_clear_notifications_double_tap": {
                 "name": "Desativar op\u00e7\u00e3o de 2 toques para limpar notifica\u00e7\u00f5es"
             },
@@ -1511,6 +1568,9 @@
             "firmware_progress_led": {
                 "name": "LED de progresso do firmware"
             },
+            "flip_indicator_light": {
+                "name": "Luz indicadora de mudan\u00e7a de dire\u00e7\u00e3o"
+            },
             "frient_com_1": {
                 "name": "COM 1"
             },
@@ -1640,6 +1700,12 @@
             "turbo_mode": {
                 "name": "Modo turbo"
             },
+            "turn_on_led_when_off": {
+                "name": "Ligar o LED quando desligado"
+            },
+            "turn_on_led_when_on": {
+                "name": "Ligar o LED quando ligado"
+            },
             "use_internal_window_detection": {
                 "name": "Usar dete\u00e7\u00e3o de janela interna"
             },
@@ -1663,6 +1729,9 @@
             },
             "window_detection_function": {
                 "name": "Inverter dete\u00e7\u00e3o de janela"
+            },
+            "window_open": {
+                "name": "Janela aberta"
             }
         }
     },

homeassistant/components/zha/translations/sk.json

@@ -367,7 +367,7 @@
                 "name": "\u010casova\u010d automatick\u00e9ho vypnutia vyp\u00edna\u010da"
             },
             "away_preset_temperature": {
-                "name": "Prednastaven\u00e1 teplota (mimo)"
+                "name": "Prednastaven\u00e1 teplota mimo"
             },
             "block_time": {
                 "name": "\u010cas blokovania"
@@ -1974,7 +1974,7 @@
                     "name": "QR k\u00f3d"
                 },
                 "source_ieee": {
-                    "description": "IEEE adresa prip\u00e1jaj\u00faceho sa zariadenia (mus\u00ed by\u0165 kombinovan\u00e1 s po\u013eom \"Install code\").",
+                    "description": "IEEE adresa prip\u00e1jaj\u00faceho sa zariadenia (mus\u00ed by\u0165 kombinovan\u00e1 s po\u013eom 'In\u0161tala\u010dn\u00fd k\u00f3d').",
                     "name": "Zdroj IEEE"
                 }
             },
@@ -2098,7 +2098,7 @@
                     "name": "Re\u017eim"
                 },
                 "strobe": {
-                    "description": "Pole Strobe sa pou\u017e\u00edva ako 2-bitov\u00fd v\u00fdpo\u010det a ur\u010duje, \u010di sa okrem zvukovej sir\u00e9ny vy\u017eaduje aj vizu\u00e1lna indik\u00e1cia, ako je uveden\u00e9 v tabu\u013eke 8-21 \u0161pecifik\u00e1cie ZCL. \"0\" znamen\u00e1 bez stroboskopu, \"1\" znamen\u00e1 stroboskop. Ak je pole strobe (stroboskop) \"1\" a Warning Mode (V\u00fdstra\u017en\u00fd re\u017eim) \"0\" (\"Stop\"), aktivuje sa iba stroboskop.",
+                    "description": "Pole Strobe sa pou\u017e\u00edva ako 2-bitov\u00fd v\u00fdpo\u010det a ur\u010duje, \u010di sa okrem zvukovej sir\u00e9ny vy\u017eaduje aj vizu\u00e1lna indik\u00e1cia, ako je uveden\u00e9 v tabu\u013eke 8-21 \u0161pecifik\u00e1cie ZCL. \"0\" znamen\u00e1 bez stroboskopu, \"1\" znamen\u00e1 stroboskop. Ak je pole strobe (stroboskop) \u201d1\u201d a Warning Mode (V\u00fdstra\u017en\u00fd re\u017eim) \"0\" (\u201dStop\u201d), aktivuje sa iba stroboskop.",
                     "name": "Stroboskop"
                 }
             },

homeassistant/components/zwave_js/binary_sensor.py

@@ -122,6 +122,13 @@ class NewNotificationZWaveJSEntityDescription(BinarySensorEntityDescription):
 # - Replace water filter
 # - Sump pump failure
 
+
+# This set can be removed once all notification sensors have been migrated
+# to use the new discovery schema and we've removed the old discovery code.
+MIGRATED_NOTIFICATION_TYPES = {
+    NotificationType.SMOKE_ALARM,
+}
+
 NOTIFICATION_SENSOR_MAPPINGS: tuple[NotificationZWaveJSEntityDescription, ...] = (
     NotificationZWaveJSEntityDescription(
         # NotificationType 2: Carbon Monoxide - State Id's 1 and 2
@@ -402,6 +409,12 @@ async def async_setup_entry(
             # ensure the notification CC Value is valid as binary sensor
             if not is_valid_notification_binary_sensor(info):
                 return
+            if (
+                notification_type := info.primary_value.metadata.cc_specific[
+                    CC_SPECIFIC_NOTIFICATION_TYPE
+                ]
+            ) in MIGRATED_NOTIFICATION_TYPES:
+                return
             # Get all sensors from Notification CC states
             for state_key in info.primary_value.metadata.states:
                 if TYPE_CHECKING:
@@ -414,12 +427,7 @@ async def async_setup_entry(
                     NotificationZWaveJSEntityDescription | None
                 ) = None
                 for description in NOTIFICATION_SENSOR_MAPPINGS:
-                    if (
-                        int(description.key)
-                        == info.primary_value.metadata.cc_specific[
-                            CC_SPECIFIC_NOTIFICATION_TYPE
-                        ]
-                    ) and (
+                    if (int(description.key) == notification_type) and (
                         not description.states or int(state_key) in description.states
                     ):
                         notification_description = description

homeassistant/components/zwave_js/translations/lt.json

@@ -147,6 +147,16 @@
                 "submit": "Bandykite dar kart\u0105",
                 "title": "Atkurti nepavyko"
             },
+            "rf_region": {
+                "data": {
+                    "rf_region": "RF regionas"
+                },
+                "data_description": {
+                    "rf_region": "J\u016bs\u0173 Z-Wave tinklo radijo da\u017eni\u0173 regionas. Jis turi sutapti su j\u016bs\u0173 Z-Wave \u012frengini\u0173 regionu."
+                },
+                "description": "Pasirinkite savo Z-Wave tinklo RF region\u0105.",
+                "title": "Z bangos regionas"
+            },
             "start_addon": {
                 "title": "Priedo konfig\u016bravimas"
             },

homeassistant/components/zwave_js/translations/pt.json

@@ -148,6 +148,16 @@
                 "submit": "Tentar novamente",
                 "title": "Restauro sem \u00eaxito"
             },
+            "rf_region": {
+                "data": {
+                    "rf_region": "Regi\u00e3o RF"
+                },
+                "data_description": {
+                    "rf_region": "A regi\u00e3o de radiofrequ\u00eancia da sua rede Z-Wave. Esta deve corresponder \u00e0 regi\u00e3o dos seus dispositivos Z-Wave."
+                },
+                "description": "Selecione a regi\u00e3o de RF para a sua rede Z-Wave.",
+                "title": "Regi\u00e3o Z-Wave"
+            },
             "start_addon": {
                 "title": "Configura\u00e7\u00e3o do suplemento"
             },

homeassistant/components/zwave_js/translations/sk.json

@@ -144,7 +144,7 @@
                 "title": "Migr\u00e1cia alebo zmena konfigur\u00e1cie"
             },
             "restore_failed": {
-                "description": "Va\u0161u sie\u0165 Z-Wave nebolo mo\u017en\u00e9 obnovi\u0165 na nov\u00fd adapt\u00e9r. \n\nTo znamen\u00e1, \u017ee va\u0161e zariadenia Z-Wave nie s\u00fa pripojen\u00e9 k aplik\u00e1cii Home Assistant. \n\nZ\u00e1loha je ulo\u017een\u00e1 na \"{file_path}\" \n\n'<'a href=\"{file_url}\" download=\"{file_name}\"'>'Stiahnu\u0165 s\u00fabor z\u00e1lohy'<'/a'>'",
+                "description": "Va\u0161u sie\u0165 Z-Wave nebolo mo\u017en\u00e9 obnovi\u0165 na nov\u00fd adapt\u00e9r. \nTo znamen\u00e1, \u017ee va\u0161e zariadenia Z-Wave nie s\u00fa pripojen\u00e9 k aplik\u00e1cii Home Assistant. \n\nZ\u00e1loha je ulo\u017een\u00e1 na \u201d{file_path}\u201d \n\n'<'a href=\"{file_url}\" download=\"{file_name}\"'>'Stiahnu\u0165 s\u00fabor z\u00e1lohy'<'/a'>'",
                 "submit": "Sk\u00faste to znova",
                 "title": "Obnovenie ne\u00faspe\u0161n\u00e9"
             },
@@ -311,7 +311,7 @@
             "fix_flow": {
                 "step": {
                     "confirm": {
-                        "description": "K polo\u017eke konfigur\u00e1cie {config_entry_title} bol pripojen\u00fd adapt\u00e9r Z-Wave modelu {controller_model}. Tento adapt\u00e9r m\u00e1 in\u00e9 ID ({new_unique_id}) ako predt\u00fdm pripojen\u00fd adapt\u00e9r ({old_unique_id}). \n\nD\u00f4vody pre in\u00e9 ID adapt\u00e9ra m\u00f4\u017eu by\u0165: \n\n1. Adapt\u00e9r bol resetovan\u00fd do tov\u00e1rensk\u00e9ho nastavenia pomocou aplik\u00e1cie tretej strany. \n2. Z\u00e1loha nevolatilnej pam\u00e4te adapt\u00e9ra bola obnoven\u00e1 do adapt\u00e9ra pomocou aplik\u00e1cie tretej strany. \n3. K tejto konfigura\u010dnej polo\u017eke bol pripojen\u00fd in\u00fd adapt\u00e9r. \n\nAk bol pripojen\u00fd in\u00fd adapt\u00e9r, mali by ste namiesto toho nastavi\u0165 nov\u00fa konfigura\u010dn\u00fa polo\u017eku pre nov\u00fd adapt\u00e9r. \n\nAk ste si ist\u00ed, \u017ee aktu\u00e1lny adapt\u00e9r je spr\u00e1vny adapt\u00e9r, potvr\u010fte stla\u010den\u00edm tla\u010didla Submit. Konfigura\u010dn\u00e1 polo\u017eka si bude pam\u00e4ta\u0165 ID nov\u00e9ho adapt\u00e9ra.",
+                        "description": "K polo\u017eke konfigur\u00e1cie {config_entry_title} bol pripojen\u00fd adapt\u00e9r Z-Wave modelu {controller_model}. Tento adapt\u00e9r m\u00e1 in\u00e9 ID ({new_unique_id}) ako predt\u00fdm pripojen\u00fd adapt\u00e9r ({old_unique_id}). \n\nD\u00f4vody pre in\u00e9 ID adapt\u00e9ra m\u00f4\u017eu by\u0165: \n\n1. Adapt\u00e9r bol resetovan\u00fd do tov\u00e1rensk\u00e9ho nastavenia pomocou aplik\u00e1cie tretej strany. \n2. Z\u00e1loha nevolatilnej pam\u00e4te adapt\u00e9ra bola obnoven\u00e1 do adapt\u00e9ra pomocou aplik\u00e1cie tretej strany. \n3. K tejto konfigura\u010dnej polo\u017eke bol pripojen\u00fd in\u00fd adapt\u00e9r. \n\nAk bol pripojen\u00fd in\u00fd adapt\u00e9r, mali by ste namiesto toho nastavi\u0165 nov\u00fa konfigura\u010dn\u00fa polo\u017eku pre nov\u00fd adapt\u00e9r. \n\nAk ste si ist\u00ed, \u017ee aktu\u00e1lny adapt\u00e9r je spr\u00e1vny adapt\u00e9r, potvr\u010fte stla\u010den\u00edm tla\u010didla Odosla\u0165. Konfigura\u010dn\u00e1 polo\u017eka si bude pam\u00e4ta\u0165 ID nov\u00e9ho adapt\u00e9ra.",
                         "title": "Bol zisten\u00fd nezn\u00e1my adapt\u00e9r"
                     }
                 }

homeassistant/components/zwave_me/translations/sk.json

@@ -13,7 +13,7 @@
                     "token": "API token",
                     "url": "URL"
                 },
-                "description": "Zadajte IP adresu s portom a pr\u00edstupov\u00fd token servera Z-Way. Token z\u00edskate v pou\u017e\u00edvate\u013eskom rozhran\u00ed Z-Way Smart Home UI > Menu > Nastavenia > Pou\u017e\u00edvatelia > Spr\u00e1vca > API token. \n\nPr\u00edklad pripojenia k Z-Way spusten\u00e9ho ako doplnok: URL: {add_on_url}\nToken: {local_token}\n\nPr\u00edklad pripojenia k Z-Way v lok\u00e1lnej sieti: URL: {local_url}\nToken: Z-Way: {local_token}\n\nPr\u00edklad pripojenia k Z-Way prostredn\u00edctvom vzdialen\u00e9ho pr\u00edstupu find.z-wave.me: URL: {find_url}\nToken: {find_token}\n\nPr\u00edklad pripojenia k Z-Way pomocou statickej verejnej IP adresy: URL: {remote_url}\nToken: {local_token}\n\nPri prip\u00e1jan\u00ed cez find.z-wave.me mus\u00edte pou\u017ei\u0165 token s glob\u00e1lnym rozsahom (prihl\u00e1ste sa do Z-Way cez find.z-wave.me)."
+                "description": "Zadajte IP adresu s portom a pr\u00edstupov\u00fd token servera Z-Way. Token z\u00edskate v pou\u017e\u00edvate\u013eskom rozhran\u00ed Z-Way Smart Home UI > Menu > Nastavenia > Pou\u017e\u00edvatelia > Spr\u00e1vca > API token. \n\nPr\u00edklad pripojenia k Z-Way spusten\u00e9ho ako doplnok: \nURL: {add_on_url}\nToken: {local_token}\n\nPr\u00edklad pripojenia k Z-Way v lok\u00e1lnej sieti: \nURL: {local_url}\nToken: Z-Way: {local_token}\n\nPr\u00edklad pripojenia k Z-Way prostredn\u00edctvom vzdialen\u00e9ho pr\u00edstupu find.z-wave.me: URL: {find_url}\nToken: {find_token}\n\nPr\u00edklad pripojenia k Z-Way pomocou statickej verejnej IP adresy: \nURL: {remote_url}\nToken: {local_token}\n\nPri prip\u00e1jan\u00ed cez find.z-wave.me mus\u00edte pou\u017ei\u0165 token s glob\u00e1lnym rozsahom (prihl\u00e1ste sa do Z-Way cez find.z-wave.me)."
             }
         }
     }

homeassistant/const.py

@@ -25,7 +25,7 @@ if TYPE_CHECKING:
 APPLICATION_NAME: Final = "HomeAssistant"
 MAJOR_VERSION: Final = 2025
 MINOR_VERSION: Final = 9
-PATCH_VERSION: Final = "0b0"
+PATCH_VERSION: Final = "0b1"
 __short_version__: Final = f"{MAJOR_VERSION}.{MINOR_VERSION}"
 __version__: Final = f"{__short_version__}.{PATCH_VERSION}"
 REQUIRED_PYTHON_VER: Final[tuple[int, int, int]] = (3, 13, 2)

homeassistant/helpers/device_registry.py

@@ -9,7 +9,7 @@ from enum import StrEnum
 from functools import lru_cache
 import logging
 import time
-from typing import TYPE_CHECKING, Any, Literal, TypedDict
+from typing import TYPE_CHECKING, Any, Final, Literal, TypedDict
 
 import attr
 from yarl import URL
@@ -68,6 +68,8 @@ CONNECTION_ZIGBEE = "zigbee"
 
 ORPHANED_DEVICE_KEEP_SECONDS = 86400 * 30
 
+UNDEFINED_STR: Final = "UNDEFINED"
+
 # Can be removed when suggested_area is removed from DeviceEntry
 RUNTIME_ONLY_ATTRS = {"suggested_area"}
 
@@ -465,7 +467,7 @@ class DeletedDeviceEntry:
         validator=_normalize_connections_validator
     )
     created_at: datetime = attr.ib()
-    disabled_by: DeviceEntryDisabler | None = attr.ib()
+    disabled_by: DeviceEntryDisabler | UndefinedType | None = attr.ib()
     id: str = attr.ib()
     identifiers: set[tuple[str, str]] = attr.ib()
     labels: set[str] = attr.ib()
@@ -480,15 +482,19 @@ class DeletedDeviceEntry:
         config_subentry_id: str | None,
         connections: set[tuple[str, str]],
         identifiers: set[tuple[str, str]],
+        disabled_by: DeviceEntryDisabler | UndefinedType | None,
     ) -> DeviceEntry:
         """Create DeviceEntry from DeletedDeviceEntry."""
         # Adjust disabled_by based on config entry state
-        disabled_by = self.disabled_by
-        if config_entry.disabled_by:
-            if disabled_by is None:
-                disabled_by = DeviceEntryDisabler.CONFIG_ENTRY
-        elif disabled_by == DeviceEntryDisabler.CONFIG_ENTRY:
-            disabled_by = None
+        if self.disabled_by is not UNDEFINED:
+            disabled_by = self.disabled_by
+            if config_entry.disabled_by:
+                if disabled_by is None:
+                    disabled_by = DeviceEntryDisabler.CONFIG_ENTRY
+            elif disabled_by == DeviceEntryDisabler.CONFIG_ENTRY:
+                disabled_by = None
+        else:
+            disabled_by = disabled_by if disabled_by is not UNDEFINED else None
         return DeviceEntry(
             area_id=self.area_id,
             # type ignores: likely https://github.com/python/mypy/issues/8625
@@ -520,7 +526,9 @@ class DeletedDeviceEntry:
                     },
                     "connections": list(self.connections),
                     "created_at": self.created_at,
-                    "disabled_by": self.disabled_by,
+                    "disabled_by": self.disabled_by
+                    if self.disabled_by is not UNDEFINED
+                    else UNDEFINED_STR,
                     "identifiers": list(self.identifiers),
                     "id": self.id,
                     "labels": list(self.labels),
@@ -608,7 +616,7 @@ class DeviceRegistryStore(storage.Store[dict[str, list[dict[str, Any]]]]):
                 # Introduced in 2025.6
                 for device in old_data["deleted_devices"]:
                     device["area_id"] = None
-                    device["disabled_by"] = None
+                    device["disabled_by"] = UNDEFINED_STR
                     device["labels"] = []
                     device["name_by_user"] = None
             if old_minor_version < 11:
@@ -934,7 +942,10 @@ class DeviceRegistry(BaseRegistry[dict[str, list[dict[str, Any]]]]):
                     config_subentry_id if config_subentry_id is not UNDEFINED else None,
                     connections,
                     identifiers,
+                    disabled_by,
                 )
+                disabled_by = UNDEFINED
+
             self.devices[device.id] = device
             # If creating a new device, default to the config entry name
             if device_info_type == "primary" and (not name or name is UNDEFINED):
@@ -1442,7 +1453,21 @@ class DeviceRegistry(BaseRegistry[dict[str, list[dict[str, Any]]]]):
                     sw_version=device["sw_version"],
                     via_device_id=device["via_device_id"],
                 )
+
             # Introduced in 0.111
+            def get_optional_enum[_EnumT: StrEnum](
+                cls: type[_EnumT], value: str | None
+            ) -> _EnumT | UndefinedType | None:
+                """Convert string to the passed enum, UNDEFINED or None."""
+                if value is None:
+                    return None
+                if value == UNDEFINED_STR:
+                    return UNDEFINED
+                try:
+                    return cls(value)
+                except ValueError:
+                    return None
+
             for device in data["deleted_devices"]:
                 deleted_devices[device["id"]] = DeletedDeviceEntry(
                     area_id=device["area_id"],
@@ -1455,10 +1480,8 @@ class DeviceRegistry(BaseRegistry[dict[str, list[dict[str, Any]]]]):
                     },
                     connections={tuple(conn) for conn in device["connections"]},
                     created_at=datetime.fromisoformat(device["created_at"]),
-                    disabled_by=(
-                        DeviceEntryDisabler(device["disabled_by"])
-                        if device["disabled_by"]
-                        else None
+                    disabled_by=get_optional_enum(
+                        DeviceEntryDisabler, device["disabled_by"]
                     ),
                     identifiers={tuple(iden) for iden in device["identifiers"]},
                     id=device["id"],

homeassistant/helpers/entity_registry.py

@@ -16,7 +16,7 @@ from datetime import datetime, timedelta
 from enum import StrEnum
 import logging
 import time
-from typing import TYPE_CHECKING, Any, Literal, NotRequired, TypedDict
+from typing import TYPE_CHECKING, Any, Final, Literal, NotRequired, TypedDict
 
 import attr
 import voluptuous as vol
@@ -85,6 +85,8 @@ STORAGE_KEY = "core.entity_registry"
 CLEANUP_INTERVAL = 3600 * 24
 ORPHANED_ENTITY_KEEP_SECONDS = 3600 * 24 * 30
 
+UNDEFINED_STR: Final = "UNDEFINED"
+
 ENTITY_CATEGORY_VALUE_TO_INDEX: dict[EntityCategory | None, int] = {
     val: idx for idx, val in enumerate(EntityCategory)
 }
@@ -164,6 +166,17 @@ def _protect_entity_options(
     return ReadOnlyDict({key: ReadOnlyDict(val) for key, val in data.items()})
 
 
+def _protect_optional_entity_options(
+    data: EntityOptionsType | UndefinedType | None,
+) -> ReadOnlyEntityOptionsType | UndefinedType:
+    """Protect entity options from being modified."""
+    if data is UNDEFINED:
+        return UNDEFINED
+    if data is None:
+        return ReadOnlyDict({})
+    return ReadOnlyDict({key: ReadOnlyDict(val) for key, val in data.items()})
+
+
 @attr.s(frozen=True, kw_only=True, slots=True)
 class RegistryEntry:
     """Entity Registry Entry."""
@@ -414,15 +427,17 @@ class DeletedRegistryEntry:
     config_subentry_id: str | None = attr.ib()
     created_at: datetime = attr.ib()
     device_class: str | None = attr.ib()
-    disabled_by: RegistryEntryDisabler | None = attr.ib()
+    disabled_by: RegistryEntryDisabler | UndefinedType | None = attr.ib()
     domain: str = attr.ib(init=False, repr=False)
-    hidden_by: RegistryEntryHider | None = attr.ib()
+    hidden_by: RegistryEntryHider | UndefinedType | None = attr.ib()
     icon: str | None = attr.ib()
     id: str = attr.ib()
     labels: set[str] = attr.ib()
     modified_at: datetime = attr.ib()
     name: str | None = attr.ib()
-    options: ReadOnlyEntityOptionsType = attr.ib(converter=_protect_entity_options)
+    options: ReadOnlyEntityOptionsType | UndefinedType = attr.ib(
+        converter=_protect_optional_entity_options
+    )
     orphaned_timestamp: float | None = attr.ib()
 
     _cache: dict[str, Any] = attr.ib(factory=dict, eq=False, init=False)
@@ -445,15 +460,21 @@ class DeletedRegistryEntry:
                     "config_subentry_id": self.config_subentry_id,
                     "created_at": self.created_at,
                     "device_class": self.device_class,
-                    "disabled_by": self.disabled_by,
+                    "disabled_by": self.disabled_by
+                    if self.disabled_by is not UNDEFINED
+                    else UNDEFINED_STR,
                     "entity_id": self.entity_id,
-                    "hidden_by": self.hidden_by,
+                    "hidden_by": self.hidden_by
+                    if self.hidden_by is not UNDEFINED
+                    else UNDEFINED_STR,
                     "icon": self.icon,
                     "id": self.id,
                     "labels": list(self.labels),
                     "modified_at": self.modified_at,
                     "name": self.name,
-                    "options": self.options,
+                    "options": self.options
+                    if self.options is not UNDEFINED
+                    else UNDEFINED_STR,
                     "orphaned_timestamp": self.orphaned_timestamp,
                     "platform": self.platform,
                     "unique_id": self.unique_id,
@@ -584,12 +605,12 @@ class EntityRegistryStore(storage.Store[dict[str, list[dict[str, Any]]]]):
                     entity["area_id"] = None
                     entity["categories"] = {}
                     entity["device_class"] = None
-                    entity["disabled_by"] = None
-                    entity["hidden_by"] = None
+                    entity["disabled_by"] = UNDEFINED_STR
+                    entity["hidden_by"] = UNDEFINED_STR
                     entity["icon"] = None
                     entity["labels"] = []
                     entity["name"] = None
-                    entity["options"] = {}
+                    entity["options"] = UNDEFINED_STR
 
         if old_major_version > 1:
             raise NotImplementedError
@@ -958,25 +979,30 @@ class EntityRegistry(BaseRegistry):
             categories = deleted_entity.categories
             created_at = deleted_entity.created_at
             device_class = deleted_entity.device_class
-            disabled_by = deleted_entity.disabled_by
-            # Adjust disabled_by based on config entry state
-            if config_entry and config_entry is not UNDEFINED:
-                if config_entry.disabled_by:
-                    if disabled_by is None:
-                        disabled_by = RegistryEntryDisabler.CONFIG_ENTRY
+            if deleted_entity.disabled_by is not UNDEFINED:
+                disabled_by = deleted_entity.disabled_by
+                # Adjust disabled_by based on config entry state
+                if config_entry and config_entry is not UNDEFINED:
+                    if config_entry.disabled_by:
+                        if disabled_by is None:
+                            disabled_by = RegistryEntryDisabler.CONFIG_ENTRY
+                    elif disabled_by == RegistryEntryDisabler.CONFIG_ENTRY:
+                        disabled_by = None
                 elif disabled_by == RegistryEntryDisabler.CONFIG_ENTRY:
                     disabled_by = None
-            elif disabled_by == RegistryEntryDisabler.CONFIG_ENTRY:
-                disabled_by = None
             # Restore entity_id if it's available
             if self._entity_id_available(deleted_entity.entity_id):
                 entity_id = deleted_entity.entity_id
             entity_registry_id = deleted_entity.id
-            hidden_by = deleted_entity.hidden_by
+            if deleted_entity.hidden_by is not UNDEFINED:
+                hidden_by = deleted_entity.hidden_by
             icon = deleted_entity.icon
             labels = deleted_entity.labels
             name = deleted_entity.name
-            options = deleted_entity.options
+            if deleted_entity.options is not UNDEFINED:
+                options = deleted_entity.options
+            else:
+                options = get_initial_options() if get_initial_options else None
         else:
             aliases = set()
             area_id = None
@@ -1529,6 +1555,20 @@ class EntityRegistry(BaseRegistry):
                     previous_unique_id=entity["previous_unique_id"],
                     unit_of_measurement=entity["unit_of_measurement"],
                 )
+
+            def get_optional_enum[_EnumT: StrEnum](
+                cls: type[_EnumT], value: str | None
+            ) -> _EnumT | UndefinedType | None:
+                """Convert string to the passed enum, UNDEFINED or None."""
+                if value is None:
+                    return None
+                if value == UNDEFINED_STR:
+                    return UNDEFINED
+                try:
+                    return cls(value)
+                except ValueError:
+                    return None
+
             for entity in data["deleted_entities"]:
                 try:
                     domain = split_entity_id(entity["entity_id"])[0]
@@ -1546,6 +1586,7 @@ class EntityRegistry(BaseRegistry):
                     entity["platform"],
                     entity["unique_id"],
                 )
+
                 deleted_entities[key] = DeletedRegistryEntry(
                     aliases=set(entity["aliases"]),
                     area_id=entity["area_id"],
@@ -1554,23 +1595,21 @@ class EntityRegistry(BaseRegistry):
                     config_subentry_id=entity["config_subentry_id"],
                     created_at=datetime.fromisoformat(entity["created_at"]),
                     device_class=entity["device_class"],
-                    disabled_by=(
-                        RegistryEntryDisabler(entity["disabled_by"])
-                        if entity["disabled_by"]
-                        else None
+                    disabled_by=get_optional_enum(
+                        RegistryEntryDisabler, entity["disabled_by"]
                     ),
                     entity_id=entity["entity_id"],
-                    hidden_by=(
-                        RegistryEntryHider(entity["hidden_by"])
-                        if entity["hidden_by"]
-                        else None
+                    hidden_by=get_optional_enum(
+                        RegistryEntryHider, entity["hidden_by"]
                     ),
                     icon=entity["icon"],
                     id=entity["id"],
                     labels=set(entity["labels"]),
                     modified_at=datetime.fromisoformat(entity["modified_at"]),
                     name=entity["name"],
-                    options=entity["options"],
+                    options=entity["options"]
+                    if entity["options"] is not UNDEFINED_STR
+                    else UNDEFINED,
                     orphaned_timestamp=entity["orphaned_timestamp"],
                     platform=entity["platform"],
                     unique_id=entity["unique_id"],