refactor(automations): bind action handlers via ActionContext factory

surfsense_backend/app/automations/runtime/executor.py

@@ -8,7 +8,9 @@ from sqlalchemy.ext.asyncio import AsyncSession
 
 from app.automations.persistence.enums.run_status import RunStatus
 from app.automations.persistence.models.run import AutomationRun
+from app.automations.registries.actions.types import ActionContext
 from app.automations.schemas.definition.envelope import AutomationDefinition
+from app.automations.schemas.definition.plan_step import PlanStep
 from app.automations.templating import build_run_context
 
 from . import repository
@@ -41,10 +43,12 @@ async def execute_run(session: AsyncSession, run_id: int) -> None:
     step_outputs: dict[str, Any] = {}
 
     for step in definition.plan:
-        ctx = _build_ctx(run, step_outputs)
+        template_ctx = _build_template_ctx(run, step_outputs)
+        action_ctx = _build_action_ctx(session, run, step)
         result = await execute_step(
             step=step,
-            template_context=ctx,
+            template_context=template_ctx,
+            action_context=action_ctx,
             default_max_retries=definition.execution.max_retries,
             default_retry_backoff=definition.execution.retry_backoff,
             default_timeout_seconds=definition.execution.timeout_seconds,
@@ -73,11 +77,13 @@ async def _run_on_failure(
     """Run the on_failure steps. Their failures don't recurse into more on_failure."""
     if not definition.execution.on_failure:
         return
-    ctx = _build_ctx(run, step_outputs={})
+    template_ctx = _build_template_ctx(run, step_outputs={})
     for step in definition.execution.on_failure:
+        action_ctx = _build_action_ctx(session, run, step)
         result = await execute_step(
             step=step,
-            template_context=ctx,
+            template_context=template_ctx,
+            action_context=action_ctx,
             default_max_retries=definition.execution.max_retries,
             default_retry_backoff=definition.execution.retry_backoff,
             default_timeout_seconds=definition.execution.timeout_seconds,
@@ -86,7 +92,7 @@ async def _run_on_failure(
         await session.commit()
 
 
-def _build_ctx(run: AutomationRun, step_outputs: dict[str, Any]) -> dict[str, Any]:
+def _build_template_ctx(run: AutomationRun, step_outputs: dict[str, Any]) -> dict[str, Any]:
     automation = run.automation
     trigger = run.trigger
     return build_run_context(
@@ -103,3 +109,16 @@ def _build_ctx(run: AutomationRun, step_outputs: dict[str, Any]) -> dict[str, An
         resolved_inputs=run.resolved_inputs or {},
         step_outputs=step_outputs,
     )
+
+
+def _build_action_ctx(
+    session: AsyncSession, run: AutomationRun, step: PlanStep
+) -> ActionContext:
+    automation = run.automation
+    return ActionContext(
+        session=session,
+        run_id=run.id,
+        step_id=step.step_id,
+        search_space_id=automation.search_space_id,
+        creator_user_id=automation.created_by_user_id,
+    )

surfsense_backend/app/automations/runtime/step.py

@@ -7,6 +7,7 @@ from datetime import UTC, datetime
 from typing import Any
 
 from app.automations.registries import get_action
+from app.automations.registries.actions.types import ActionContext
 from app.automations.schemas.definition.plan_step import PlanStep
 from app.automations.templating import evaluate_predicate, render_value
 
@@ -17,6 +18,7 @@ async def execute_step(
     *,
     step: PlanStep,
     template_context: Mapping[str, Any],
+    action_context: ActionContext,
     default_max_retries: int,
     default_retry_backoff: str,
     default_timeout_seconds: int,
@@ -47,12 +49,14 @@ async def execute_step(
             error={"message": f"action not registered: {step.action}", "type": "ActionNotFound"},
         )
 
+    handler = action.build_handler(action_context)
+
     max_retries = step.max_retries if step.max_retries is not None else default_max_retries
     timeout = step.timeout_seconds or default_timeout_seconds
 
     try:
         result, attempts = await with_retries(
-            lambda: action.handler(resolved_params),
+            lambda: handler(resolved_params),
             max_retries=max_retries,
             backoff=default_retry_backoff,
             timeout=timeout,