Apply PR #144 review round 2: settings-based service kwargs, required settings, shim removal, hardened AST scan

P2: services._generation_kwargs now reads runtime.settings.horizon_days
instead of re-implementing the bool/non-int/<1 fallback against
runtime.options; drop the now-unused CONF_HORIZON_DAYS/DEFAULT_HORIZON_DAYS
imports. Remove NestQuestRuntimeData.options (kept only for that read; the
admin-id path reads entry.options directly) and the matching test assertion.

P3: _run_horizon_materialization's settings param is now REQUIRED (drop the
'| None = None' default + the NestQuestSettings() substitution branch);
update the test_timezones callers to pass NestQuestSettings() explicitly.

P3: __post_init__ normalises notify_target via _resolve_optional_str (strip)
so a hand-built NestQuestSettings(notify_target=' x ') behaves like the
options flow; keep the docstring accurate.

P3: delete the custom_components/nestquest/settings.py shim (settings is a
new module with no legacy import path) and import NestQuestSettings from
.core.settings directly in __init__.py, in alphabetical position.

P3: harden the AST scan for importlib.import_module('homeassistant...')
(string-based import) and call keyword names like hass= (ast.keyword);
add negative-control cases for each; explain in the failure message why
.config/.options/.data are banned (HA config-entry attributes with no
legitimate core use).

P3: drive from_options and from_options_resilient from one _FIELDS table of
(field, key, default, validator) to avoid three-way drift.

uv run pytest -q: 1573 passed.

custom_components/nestquest/__init__.py

@@ -24,7 +24,7 @@ from .const import (
     LOGGER,
     PLATFORMS,
 )
-from .settings import NestQuestSettings
+from .core.settings import NestQuestSettings
 from .frontend import async_register_frontend
 from .coordinator import NestQuestCoordinator
 from .db import NestQuestDatabase, make_database
@@ -237,7 +237,6 @@ class NestQuestRuntimeData:
     """Runtime data stored on a NestQuest config entry."""
 
     entry_id: str
-    options: dict[str, Any]
     settings: NestQuestSettings
     database: NestQuestDatabase
     remove_update_listener: Callable[[], Any]
@@ -270,7 +269,7 @@ async def _async_owner_user_ids(hass: HomeAssistant) -> list[str]:
 async def _run_horizon_materialization(
     hass: HomeAssistant,
     database: NestQuestDatabase,
-    settings: NestQuestSettings | None = None,
+    settings: NestQuestSettings,
 ) -> None:
     """Materialize the rolling horizon ``[today, today + horizon_days]``.
 
@@ -281,14 +280,12 @@ async def _run_horizon_materialization(
 
     This is the ONE generation path: the startup backfill, the daily rollover
     listener and the ``regenerate`` service all funnel through it, so there is
-    no duplicated materialization logic.  ``settings`` carries the entry's
-    validated ``horizon_days``; when omitted a default
-    :class:`NestQuestSettings` is used (its horizon is the configured
-    default).  The window itself comes from :meth:`settings.horizon_window`
-    so the helper is real and shared (not recomputed inline here).
+    no duplicated materialization logic.  ``settings`` (REQUIRED — there is no
+    silent default; every caller already passes the entry's validated
+    :class:`NestQuestSettings`) carries the configured ``horizon_days``.  The
+    window itself comes from :meth:`settings.horizon_window` so the helper is
+    real and shared (not recomputed inline here).
     """
-    if settings is None:
-        settings = NestQuestSettings()
     time_zone = ZoneInfo(hass.config.time_zone)
     today = datetime.datetime.now(time_zone).date()
     start, end = settings.horizon_window(today)
@@ -329,7 +326,9 @@ def _find_live_runtime_data(hass: HomeAssistant) -> NestQuestRuntimeData | None:
     their own; they resolve whichever config entry's runtime data is
     currently live at call time, so none of them can hold a stale handle
     to a closed connection after another entry unloads.  The record also
-    carries that entry's options (e.g. the configured horizon).
+    carries that entry's validated ``settings`` (e.g. the configured
+    horizon) so service handlers read horizon days off it rather than
+    re-reading HA config.
     """
     for runtime_data in hass.data.get(DOMAIN, {}).values():
         database = getattr(runtime_data, "database", None)
@@ -505,7 +504,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         await coordinator.async_config_entry_first_refresh()
         runtime_data = NestQuestRuntimeData(
             entry_id=entry.entry_id,
-            options=dict(entry.options),
             settings=settings,
             database=database,
             remove_update_listener=remove_update_listener,

custom_components/nestquest/core/settings.py

@@ -142,13 +142,81 @@ def _resolve_optional_str(value: Any) -> str:
     padded value (e.g. one migrated from an older schema) by normalizing
     it rather than crashing setup.  The ``None``-as-absent mapping lives
     ONLY in :meth:`NestQuestSettings.from_options` (via
-    :func:`_option_value`).
+    :func:`_option_value`).  :meth:`NestQuestSettings.__post_init__`
+    applies this SAME normalizer so a hand-built
+    ``NestQuestSettings(notify_target=' x ')`` is stripped to ``'x'``
+    exactly like the options-flow path (no padded value can slip through
+    direct construction either).
     """
     if not isinstance(value, str):
         raise ValueError(f"notify_target must be a string, got {value!r}")
     return value.strip()
 
 
+#: The single field table the two builders share.  Each row is
+#: ``(field_name, CONF_* key, default, validator)``.  ``from_options``
+#: applies every validator (raising on the first invalid value) while
+#: ``from_options_resilient`` wraps each in its own try/except so a single
+#: bad sibling falls back to its default alone.  Driving both builders
+#: from this table avoids three-way drift between ``__post_init__``'s
+#: inline checks and the two option builders' field lists: the only
+#: places that enumerate the fields are this table and
+#: ``__post_init__`` (which validates a hand-built instance without the
+#: None->default mapping, so it stays inline).
+_FIELDS: tuple[tuple[str, str, Any, Callable[[Any], Any]], ...] = (
+    ("horizon_days", CONF_HORIZON_DAYS, DEFAULT_HORIZON_DAYS, _resolve_horizon_days),
+    (
+        "day_rollover_time",
+        CONF_DAY_ROLLOVER_TIME,
+        DEFAULT_DAY_ROLLOVER_TIME,
+        lambda v: _validate_hhmm(v, field="day_rollover_time"),
+    ),
+    ("notify_target", CONF_NOTIFY_TARGET, "", _resolve_optional_str),
+    (
+        "morning_summary_time",
+        CONF_MORNING_SUMMARY_TIME,
+        DEFAULT_MORNING_SUMMARY_TIME,
+        lambda v: _validate_hhmm(v, field="morning_summary_time"),
+    ),
+    (
+        "afternoon_reminder_time",
+        CONF_AFTERNOON_REMINDER_TIME,
+        DEFAULT_AFTERNOON_REMINDER_TIME,
+        lambda v: _validate_hhmm(v, field="afternoon_reminder_time"),
+    ),
+    (
+        "end_of_day_report_time",
+        CONF_END_OF_DAY_REPORT_TIME,
+        DEFAULT_END_OF_DAY_REPORT_TIME,
+        lambda v: _validate_hhmm(v, field="end_of_day_report_time"),
+    ),
+    (
+        "morning_summary_enabled",
+        CONF_MORNING_SUMMARY_ENABLED,
+        DEFAULT_AUTOMATION_ENABLED,
+        _resolve_bool,
+    ),
+    (
+        "afternoon_reminder_enabled",
+        CONF_AFTERNOON_REMINDER_ENABLED,
+        DEFAULT_AUTOMATION_ENABLED,
+        _resolve_bool,
+    ),
+    (
+        "end_of_day_report_enabled",
+        CONF_END_OF_DAY_REPORT_ENABLED,
+        DEFAULT_AUTOMATION_ENABLED,
+        _resolve_bool,
+    ),
+    (
+        "celebration_enabled",
+        CONF_CELEBRATION_ENABLED,
+        DEFAULT_AUTOMATION_ENABLED,
+        _resolve_bool,
+    ),
+)
+
+
 @dataclass(frozen=True)
 class NestQuestSettings:
     """Explicit, HA-free configuration carried into core paths.
@@ -181,14 +249,20 @@ class NestQuestSettings:
         # cannot carry an invalid value: the same rules from_options
         # applies, but WITHOUT the None->default mapping (that lives
         # only in from_options via _option_value).  A None horizon, time,
-        # toggle, or notify target raises here rather than later blowing
-        # up horizon_window or the rollover listener.
+        # or toggle raises here rather than later blowing up
+        # horizon_window or the rollover listener.
         _resolve_horizon_days(self.horizon_days)
         _validate_hhmm(self.day_rollover_time, field="day_rollover_time")
-        if not isinstance(self.notify_target, str):
-            raise ValueError(
-                f"notify_target must be a string, got {self.notify_target!r}"
-            )
+        # ``notify_target`` is normalised the SAME way as from_options
+        # (via _resolve_optional_str): a non-str is rejected and a
+        # padded/whitespace-only value is STRIPPED to its trim.  This
+        # keeps a hand-built ``NestQuestSettings(notify_target=' x ')``
+        # behaving like the options flow (which strips on persist) so a
+        # padded value cannot slip through direct construction either.
+        # The dataclass is frozen, so the stripped value is written via
+        # object.__setattr__.
+        stripped_notify_target = _resolve_optional_str(self.notify_target)
+        object.__setattr__(self, "notify_target", stripped_notify_target)
         _validate_hhmm(self.morning_summary_time, field="morning_summary_time")
         _validate_hhmm(
             self.afternoon_reminder_time, field="afternoon_reminder_time"
@@ -259,66 +333,10 @@ class NestQuestSettings:
             MappingProxyType({}) if options is None else MappingProxyType(options)
         )
         return cls(
-            horizon_days=_resolve_horizon_days(
-                _option_value(opts, CONF_HORIZON_DAYS, DEFAULT_HORIZON_DAYS)
-            ),
-            day_rollover_time=_validate_hhmm(
-                _option_value(
-                    opts, CONF_DAY_ROLLOVER_TIME, DEFAULT_DAY_ROLLOVER_TIME
-                ),
-                field="day_rollover_time",
-            ),
-            notify_target=_resolve_optional_str(
-                _option_value(opts, CONF_NOTIFY_TARGET, "")
-            ),
-            morning_summary_time=_validate_hhmm(
-                _option_value(
-                    opts,
-                    CONF_MORNING_SUMMARY_TIME,
-                    DEFAULT_MORNING_SUMMARY_TIME,
-                ),
-                field="morning_summary_time",
-            ),
-            afternoon_reminder_time=_validate_hhmm(
-                _option_value(
-                    opts,
-                    CONF_AFTERNOON_REMINDER_TIME,
-                    DEFAULT_AFTERNOON_REMINDER_TIME,
-                ),
-                field="afternoon_reminder_time",
-            ),
-            end_of_day_report_time=_validate_hhmm(
-                _option_value(
-                    opts,
-                    CONF_END_OF_DAY_REPORT_TIME,
-                    DEFAULT_END_OF_DAY_REPORT_TIME,
-                ),
-                field="end_of_day_report_time",
-            ),
-            morning_summary_enabled=_resolve_bool(
-                _option_value(
-                    opts, CONF_MORNING_SUMMARY_ENABLED, DEFAULT_AUTOMATION_ENABLED
-                )
-            ),
-            afternoon_reminder_enabled=_resolve_bool(
-                _option_value(
-                    opts,
-                    CONF_AFTERNOON_REMINDER_ENABLED,
-                    DEFAULT_AUTOMATION_ENABLED,
-                )
-            ),
-            end_of_day_report_enabled=_resolve_bool(
-                _option_value(
-                    opts,
-                    CONF_END_OF_DAY_REPORT_ENABLED,
-                    DEFAULT_AUTOMATION_ENABLED,
-                )
-            ),
-            celebration_enabled=_resolve_bool(
-                _option_value(
-                    opts, CONF_CELEBRATION_ENABLED, DEFAULT_AUTOMATION_ENABLED
-                )
-            ),
+            **{
+                field: validator(_option_value(opts, key, default))
+                for field, key, default, validator in _FIELDS
+            }
         )
 
     @classmethod
@@ -345,13 +363,10 @@ class NestQuestSettings:
             MappingProxyType({}) if options is None else MappingProxyType(options)
         )
         resolved: dict[str, Any] = {}
-
-        def _resolve(
-            field: str, key: str, default: Any, fn: Callable[[Any], Any]
-        ) -> None:
+        for field, key, default, validator in _FIELDS:
             raw = _option_value(opts, key, default)
             try:
-                resolved[field] = fn(raw)
+                resolved[field] = validator(raw)
             except ValueError as err:
                 LOGGER.warning(
                     "NestQuest option %s is invalid (%s); falling back "
@@ -361,65 +376,4 @@ class NestQuestSettings:
                     default,
                 )
                 resolved[field] = default
-
-        _resolve(
-            "horizon_days",
-            CONF_HORIZON_DAYS,
-            DEFAULT_HORIZON_DAYS,
-            _resolve_horizon_days,
-        )
-        _resolve(
-            "day_rollover_time",
-            CONF_DAY_ROLLOVER_TIME,
-            DEFAULT_DAY_ROLLOVER_TIME,
-            lambda v: _validate_hhmm(v, field="day_rollover_time"),
-        )
-        _resolve(
-            "notify_target",
-            CONF_NOTIFY_TARGET,
-            "",
-            _resolve_optional_str,
-        )
-        _resolve(
-            "morning_summary_time",
-            CONF_MORNING_SUMMARY_TIME,
-            DEFAULT_MORNING_SUMMARY_TIME,
-            lambda v: _validate_hhmm(v, field="morning_summary_time"),
-        )
-        _resolve(
-            "afternoon_reminder_time",
-            CONF_AFTERNOON_REMINDER_TIME,
-            DEFAULT_AFTERNOON_REMINDER_TIME,
-            lambda v: _validate_hhmm(v, field="afternoon_reminder_time"),
-        )
-        _resolve(
-            "end_of_day_report_time",
-            CONF_END_OF_DAY_REPORT_TIME,
-            DEFAULT_END_OF_DAY_REPORT_TIME,
-            lambda v: _validate_hhmm(v, field="end_of_day_report_time"),
-        )
-        _resolve(
-            "morning_summary_enabled",
-            CONF_MORNING_SUMMARY_ENABLED,
-            DEFAULT_AUTOMATION_ENABLED,
-            _resolve_bool,
-        )
-        _resolve(
-            "afternoon_reminder_enabled",
-            CONF_AFTERNOON_REMINDER_ENABLED,
-            DEFAULT_AUTOMATION_ENABLED,
-            _resolve_bool,
-        )
-        _resolve(
-            "end_of_day_report_enabled",
-            CONF_END_OF_DAY_REPORT_ENABLED,
-            DEFAULT_AUTOMATION_ENABLED,
-            _resolve_bool,
-        )
-        _resolve(
-            "celebration_enabled",
-            CONF_CELEBRATION_ENABLED,
-            DEFAULT_AUTOMATION_ENABLED,
-            _resolve_bool,
-        )
         return cls(**resolved)

custom_components/nestquest/services.py

@@ -24,8 +24,6 @@ from . import children as children_layer
 from . import completion as completion_layer
 from . import quest_definitions as quest_definitions_layer
 from .const import (
-    CONF_HORIZON_DAYS,
-    DEFAULT_HORIZON_DAYS,
     DOMAIN,
     DOMAIN_SERVICES,
     QUEST_WINDOWS,
@@ -258,12 +256,7 @@ async def _refresh_entities(runtime: Any) -> None:
 def _generation_kwargs(hass: HomeAssistant, runtime: Any) -> dict[str, Any]:
     time_zone = ZoneInfo(hass.config.time_zone)
     today = datetime.datetime.now(time_zone).date()
-    value = runtime.options.get(CONF_HORIZON_DAYS, DEFAULT_HORIZON_DAYS)
-    if isinstance(value, bool) or not isinstance(value, int) or value < 1:
-        horizon_days = DEFAULT_HORIZON_DAYS
-    else:
-        horizon_days = value
-    return {"today": today, "horizon_days": horizon_days}
+    return {"today": today, "horizon_days": runtime.settings.horizon_days}
 
 
 def _actor_kwargs(call: Any) -> dict[str, Any]:

custom_components/nestquest/settings.py

@@ -1,13 +0,0 @@
-"""Re-export of :mod:`custom_components.nestquest.core.settings` for the integration package.
-
-The explicit, Home-Assistant-free settings object lives in
-:mod:`custom_components.nestquest.core.settings` (introduced in task
-4dd8f870); this module re-exports it so the integration constructs the
-settings object from ``entry.options`` and threads it into the core
-paths without core ever reading HA config itself.
-"""
-from __future__ import annotations
-
-from .core.settings import NestQuestSettings
-
-__all__ = ["NestQuestSettings"]