refactor(writer): remove trigger_type parameter from run_blueprint_via_api and streamline trigger selection logic - AB-881

Author: madeindjs

src/writer/blueprints.py

@@ -232,15 +232,13 @@ def _gather_cron_blueprints(self):
     def run_blueprint_via_api(
         self,
         blueprint_id: str,
-        trigger_type: Literal["API", "Cron"],
         branch_id: Optional[str] = None,
         execution_environment: Optional[Dict[str, Any]] = None
     ):
         """
         Executes a blueprint by its key via the API.
 
         :param blueprint_id: The blueprint identifier.
-        :param trigger_type: The type of trigger ("API" or "Cron").
         :param branch_id: Optional branch ID to start execution from.
         :param execution_environment: The execution environment for
         the blueprint.
@@ -250,13 +248,24 @@ def run_blueprint_via_api(
             execution_environment = {}
 
         trigger_id = branch_id
-        if trigger_id is None:
-            if trigger_type == "Cron" or not self.is_blueprint_api_available(blueprint_id):
-                trigger_id = self.get_blueprint_cron_trigger(blueprint_id)
+        if trigger_id is not None:
+            # Determine trigger type from the component
+            component = self.session.session_component_tree.get_component(trigger_id)
+            if component and component.type == "blueprints_apitrigger":
+                trigger_type = "API"
+            elif component and component.type == "blueprints_crontrigger":
                 trigger_type = "Cron"
             else:
-                trigger_id = self.get_blueprint_api_trigger(blueprint_id)
-
+                trigger_type = "Branch"
+        elif self.is_blueprint_api_available(blueprint_id):
+            # Prioritize API trigger over Cron if both exist
+            trigger_id = self.get_blueprint_api_trigger(blueprint_id)
+            trigger_type = "API"
+        elif self.is_blueprint_cron_available(blueprint_id):
+            trigger_id = self.get_blueprint_cron_trigger(blueprint_id)
+            trigger_type = "Cron"
+        else:
+            raise ValueError(f'No trigger found for blueprint "{blueprint_id}".')
         return self.run_branch(
             trigger_id,
             None,

src/writer/core.py

@@ -1283,15 +1283,11 @@ def run_blueprint_via_api(
         blueprint_id = payload.pop("blueprint_id", None)
         if not blueprint_id:
             raise ValueError("Missing blueprint_id in payload")
-        trigger_type = payload.pop("trigger_type", None)
-        if not trigger_type:
-            raise ValueError("Missing trigger_type in payload")
         execution_environment = EventHandler._get_blueprint_execution_environment(
             payload, context, session, vault
         )
         return blueprint_runner.run_blueprint_via_api(
             blueprint_id=blueprint_id,
-            trigger_type=trigger_type,
             branch_id=payload.pop("branch_id", None),
             execution_environment=execution_environment,
         )

src/writer/serve.py

@@ -539,39 +539,21 @@ async def event_logic(queue: asyncio.Queue):
 
                 await queue.put(await format_event("status", {"status": "executing", "msg": (f"Executing branch: {branch_id}..." if branch_id else f"Executing blueprint: {blueprint_id}...")}))
 
-                if branch_id:
-                    task = asyncio.create_task(
-                        app_runner.handle_event(
-                            session_id,
-                            WriterEvent(
-                                type="wf-run-blueprint-via-api",
-                                isSafe=True,
-                                handler="run_blueprint_via_api",
-                                payload={
-                                    "blueprint_id": blueprint_id,
-                                    "trigger_type": "Cron",
-                                    "branch_id": branch_id,
-                                    **(payload or {})
-                                },
-                            )
-                        )
-                    )
-                else:
-                    task = asyncio.create_task(
-                        app_runner.handle_event(
-                            session_id,
-                            WriterEvent(
-                                type="wf-run-blueprint-via-api",
-                                isSafe=True,
-                                handler="run_blueprint_via_api",
-                                payload={
-                                    "blueprint_id": blueprint_id,
-                                    "trigger_type": "API",
-                                    **(payload or {})
-                                },
-                            )
+                task = asyncio.create_task(
+                    app_runner.handle_event(
+                        session_id,
+                        WriterEvent(
+                            type="wf-run-blueprint-via-api",
+                            isSafe=True,
+                            handler="run_blueprint_via_api",
+                            payload={
+                                "blueprint_id": blueprint_id,
+                                "branch_id": branch_id,
+                                **(payload or {})
+                            },
                         )
                     )
+                )
 
                 await queue.put(await format_event("status", {"status": "running", "msg": ("Branch is running. Awaiting output..." if branch_id else "Blueprint is running. Awaiting output...")}))