Add option to force nightlatch operation mode

homeassistant/components/switchbot/config_flow.py

@@ -39,8 +39,10 @@
     CONF_ENCRYPTION_KEY,
     CONF_KEY_ID,
     CONF_RETRY_COUNT,
+    CONF_LOCK_NIGHTLATCH,
     CONNECTABLE_SUPPORTED_MODEL_TYPES,
     DEFAULT_RETRY_COUNT,
+    DEFAULT_LOCK_NIGHTLATCH,
     DOMAIN,
     NON_CONNECTABLE_SUPPORTED_MODEL_TYPES,
     SUPPORTED_LOCK_MODELS,
@@ -361,7 +363,13 @@ async def async_step_init(
                 default=self.config_entry.options.get(
                     CONF_RETRY_COUNT, DEFAULT_RETRY_COUNT
                 ),
-            ): int
+            ): int,
+            vol.Optional(
+                CONF_LOCK_NIGHTLATCH,
+                default=self.config_entry.options.get(
+                    CONF_LOCK_NIGHTLATCH, DEFAULT_LOCK_NIGHTLATCH
+                ),
+            ): bool
         }
 
         return self.async_show_form(step_id="init", data_schema=vol.Schema(options))

homeassistant/components/switchbot/const.py

@@ -64,11 +64,13 @@ class SupportedModels(StrEnum):
 
 # Config Defaults
 DEFAULT_RETRY_COUNT = 3
+DEFAULT_LOCK_NIGHTLATCH = False
 
 # Config Options
 CONF_RETRY_COUNT = "retry_count"
 CONF_KEY_ID = "key_id"
 CONF_ENCRYPTION_KEY = "encryption_key"
+CONF_LOCK_NIGHTLATCH = "lock_force_nightlatch"
 
 # Deprecated config Entry Options to be removed in 2023.4
 CONF_TIME_BETWEEN_UPDATE_COMMAND = "update_time"

homeassistant/components/switchbot/lock.py

@@ -12,14 +12,20 @@
 from .coordinator import SwitchbotConfigEntry, SwitchbotDataUpdateCoordinator
 from .entity import SwitchbotEntity
 
+from .const import (
+    CONF_LOCK_NIGHTLATCH,
+    DEFAULT_LOCK_NIGHTLATCH,
+)
+
 
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: SwitchbotConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up Switchbot lock based on a config entry."""
-    async_add_entities([(SwitchBotLock(entry.runtime_data))])
+    force_nightlatch = entry.options.get(CONF_LOCK_NIGHTLATCH, DEFAULT_LOCK_NIGHTLATCH)
+    async_add_entities([(SwitchBotLock(entry.runtime_data, force_nightlatch))])
 
 
 # noinspection PyAbstractClass
@@ -30,11 +36,11 @@ class SwitchBotLock(SwitchbotEntity, LockEntity):
     _attr_name = None
     _device: switchbot.SwitchbotLock
 
-    def __init__(self, coordinator: SwitchbotDataUpdateCoordinator) -> None:
+    def __init__(self, coordinator: SwitchbotDataUpdateCoordinator, force_nightlatch) -> None:
         """Initialize the entity."""
         super().__init__(coordinator)
         self._async_update_attrs()
-        if self._device.is_night_latch_enabled():
+        if self._device.is_night_latch_enabled() or force_nightlatch:
             self._attr_supported_features = LockEntityFeature.OPEN
 
     def _async_update_attrs(self) -> None:
@@ -55,7 +61,7 @@ async def async_lock(self, **kwargs: Any) -> None:
 
     async def async_unlock(self, **kwargs: Any) -> None:
         """Unlock the lock."""
-        if self._device.is_night_latch_enabled():
+        if self._attr_supported_features  & (LockEntityFeature.OPEN):
             self._last_run_success = await self._device.unlock_without_unlatch()
         else:
             self._last_run_success = await self._device.unlock()

homeassistant/components/switchbot/strings.json

@@ -54,7 +54,8 @@
     "step": {
       "init": {
         "data": {
-          "retry_count": "Retry count"
+          "retry_count": "Retry count",
+          "lock_force_nightlatch": "Force Nightlatch operation mode"
         }
       }
     }