Merge pull request #153 from basbruss/fix-time-state-converter

Fix `input_datetime` helper error

custom_components/adaptive_cover/config_flow.py

@@ -446,9 +446,13 @@ async def async_step_init(
     async def async_step_automation(self, user_input: dict[str, Any] | None = None):
         """Manage automation options."""
         if user_input is not None:
+            entities = [
+                CONF_START_ENTITY
+            ]
+            self.optional_entities(entities, user_input)
             self.options.update(user_input)
             return await self._update_options()
-        return self.async_show_form(
+        return self.async_show_form( 
             step_id="automation",
             data_schema=self.add_suggested_values_to_schema(
                 AUTOMATION_CONFIG, user_input or self.options

custom_components/adaptive_cover/coordinator.py

@@ -62,7 +62,7 @@
     DOMAIN,
     LOGGER,
 )
-from .helpers import get_datetime_from_state, get_last_updated, get_safe_state, get_time
+from .helpers import get_datetime_from_str, get_last_updated, get_safe_state
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -307,14 +307,13 @@ def get_blind_data(self):
     def after_start_time(self):
         """Check if time is after start time."""
         if self.start_time_entity is not None:
-            time = get_datetime_from_state(
+            time = get_datetime_from_str(
                 get_safe_state(self.hass, self.start_time_entity)
             )
-            now = dt.datetime.now(dt.UTC)
-            if now.date() == time.date():
-                return now >= time
+            now = dt.datetime.now()
+            return now >= time
         if self.start_time is not None:
-            time = get_time(self.start_time).time()
+            time = get_datetime_from_str(self.start_time).time()
             now = dt.datetime.now().time()
             return now >= time
         return True

custom_components/adaptive_cover/helpers.py

@@ -3,6 +3,7 @@
 import datetime as dt
 
 import pandas as pd
+from dateutil import parser
 from homeassistant.core import HomeAssistant, split_entity_id
 
 
@@ -21,22 +22,16 @@ def get_domain(entity: str):
         return domain
 
 
-def get_time(time: str):
-    """Convert string to datetime.time."""
-    if time is not None:
-        return dt.datetime.strptime(time, "%H:%M:%S")
-
-
 def get_timedelta_str(string: str):
     """Convert string to timedelta."""
     if string is not None:
         return pd.to_timedelta(string)
 
 
-def get_datetime_from_state(state: str):
+def get_datetime_from_str(string: str):
     """Convert datetime string to datetime."""
-    if state is not None:
-        return dt.datetime.strptime(state, "%Y-%m-%dT%H:%M:%S%z")
+    if string is not None:
+        return parser.parse(string, ignoretz=True)
 
 
 def get_last_updated(entity_id: str, hass: HomeAssistant):

custom_components/adaptive_cover/switch.py

@@ -135,7 +135,7 @@ async def async_turn_on(self, **kwargs: Any) -> None:
         setattr(self.coordinator, self._key, True)
         if self._key == "control_toggle" and kwargs.get("added") is not True:
             for entity in self.coordinator.entities:
-                if not self.coordinator.manager.is_cover_manual(entity):
+                if not self.coordinator.manager.is_cover_manual(entity) and self.coordinator.after_start_time:
                     await self.coordinator.async_set_position(entity)
         await self.coordinator.async_refresh()
         self.schedule_update_ha_state()