agstack 1.15.0__tar.gz → 1.16.1__tar.gz

{agstack-1.15.0 → agstack-1.16.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agstack
-Version: 1.15.0
+Version: 1.16.1
 Summary: Production-ready toolkit for building FastAPI and LLM applications
 Author-email: XtraVisions <gitadmin@xtravisions.com>, Chen Hao <chenhao@xtravisions.com>
 Maintainer-email: XtraVisions <gitadmin@xtravisions.com>, Chen Hao <chenhao@xtravisions.com>

{agstack-1.15.0 → agstack-1.16.1}/agstack/llm/flow/flow.py

@@ -146,6 +146,34 @@ class Flow:
 
     # ── 带重试的节点执行（统一走 NodeHandler） ──
 
+    def _resolve_visibility(self, node_type: str, config: dict) -> tuple[str | None, bool]:
+        """从 node config 和 registry 解析可见性（label, echo）
+
+        优先级：flow node config > registry 注册属性
+        """
+        from .registry import registry
+
+        label = config.get("label")
+        explicit_echo = "echo" in config
+        echo = config.get("echo", False)
+
+        if not explicit_echo and label is None:
+            if node_type == "agent":
+                agent_name = config.get("agent_name", "")
+                label = registry.get_agent_label(agent_name)
+                if not label:
+                    echo = registry.get_agent_echo(agent_name)
+            elif node_type == "tool":
+                tool_name = config.get("tool_name", "")
+                label = registry.get_tool_label(tool_name)
+                if not label:
+                    echo = registry.get_tool_echo(tool_name)
+
+        if label and not explicit_echo:
+            echo = True
+
+        return label, echo
+
     async def _execute_node_with_retry(
         self,
         node: dict,
@@ -164,6 +192,7 @@ class Flow:
 
         policy = self._get_retry_policy(node)
         label = handler.get_step_name(node, node_id)
+        vis_label, vis_echo = self._resolve_visibility(node_type, node.get("config", {}))
         last_error: Exception | None = None
 
         for attempt in range(policy.max_retries + 1):
@@ -184,6 +213,9 @@ class Flow:
                     )
 
                 async for evt in handler.stream(node, context, node_id):
+                    evt["_node_id"] = node_id
+                    evt["_label"] = vis_label
+                    evt["_echo"] = vis_echo
                     yield evt
                 return
 
@@ -375,14 +407,22 @@ class Flow:
             node_type: str = node.get("type", "")
 
             if node_type == "message":
+                msg_config = node.get("config", {})
                 async for evt in self._emit_message(node, context):
+                    evt["_node_id"] = current_node_id
+                    evt["_label"] = msg_config.get("label")
+                    evt["_echo"] = msg_config.get("echo", True)
                     yield evt
                 current_node_id = self._resolve_next_node(current_node_id, context)
 
             elif node_type == "parallel":
                 config = node.get("config", {})
                 branches = config.get("branches", [])
-                yield event.step_started(step_name=f"parallel:{current_node_id}")
+                step_evt = event.step_started(step_name=f"parallel:{current_node_id}")
+                step_evt["_node_id"] = current_node_id
+                step_evt["_label"] = None
+                step_evt["_echo"] = False
+                yield step_evt
 
                 async def _exec_branch(branch_id: str) -> None:
                     branch_node = self.get_node_config(branch_id)
@@ -402,7 +442,11 @@ class Flow:
                     if isinstance(branch_result, dict):
                         merged.update(branch_result)
                 context.set_output(current_node_id, merged)
-                yield event.step_finished(step_name=f"parallel:{current_node_id}")
+                fin_evt = event.step_finished(step_name=f"parallel:{current_node_id}")
+                fin_evt["_node_id"] = current_node_id
+                fin_evt["_label"] = None
+                fin_evt["_echo"] = False
+                yield fin_evt
                 current_node_id = self._resolve_next_node(current_node_id, context)
 
             elif node_type == "iteration":
@@ -417,7 +461,11 @@ class Flow:
                 body_nodes: list[str] = config.get("body", [])
                 results: list[Any] = []
 
-                yield event.step_started(step_name=f"iteration:{current_node_id}")
+                step_evt = event.step_started(step_name=f"iteration:{current_node_id}")
+                step_evt["_node_id"] = current_node_id
+                step_evt["_label"] = None
+                step_evt["_echo"] = False
+                yield step_evt
                 for idx, item in enumerate(items):
                     context.set_variable(item_var, item)
                     context.set_variable(index_var, idx)
@@ -434,7 +482,11 @@ class Flow:
                         results.append(context.outputs.get(body_nodes[-1]))
 
                 context.set_output(current_node_id, {"results": results})
-                yield event.step_finished(step_name=f"iteration:{current_node_id}")
+                fin_evt = event.step_finished(step_name=f"iteration:{current_node_id}")
+                fin_evt["_node_id"] = current_node_id
+                fin_evt["_label"] = None
+                fin_evt["_echo"] = False
+                yield fin_evt
                 current_node_id = self._resolve_next_node(current_node_id, context)
 
             elif node_type in self._node_handlers:

{agstack-1.15.0 → agstack-1.16.1}/agstack/llm/flow/nodes/agent_node.py

@@ -19,13 +19,17 @@ class AgentNodeHandler(NodeHandler):
 
     node_type = "agent"
 
-    _NODE_KEYS = frozenset({"agent_name", "inputs"})
+    _NODE_KEYS = frozenset({"agent_name", "inputs", "label", "echo"})
 
-    def _create_agent(self, config: dict):
+    def _create_agent(self, config: dict, context: "FlowContext"):
         agent_name = config.get("agent_name")
         if not agent_name:
             raise FlowError("MISSING_AGENT_NAME", 400)
-        agent_kwargs = {k: v for k, v in config.items() if k not in self._NODE_KEYS}
+        agent_kwargs = {
+            k: context.resolve_reference(v) if isinstance(v, str) else v
+            for k, v in config.items()
+            if k not in self._NODE_KEYS
+        }
         agent = registry.create_agent(agent_name, **agent_kwargs)
         if not agent:
             raise FlowError("AGENT_NOT_FOUND", 404, {"agent_name": agent_name})
@@ -34,8 +38,10 @@ class AgentNodeHandler(NodeHandler):
     async def execute(self, node: dict, context: "FlowContext") -> Any:
         config = node.get("config", {})
         resolved = self.resolve_inputs(config, context)
-        ag = self._create_agent(config)
-        return await ag.run(context, inputs=resolved)
+        ag = self._create_agent(config, context)
+        result = await ag.run(context, inputs=resolved)
+        structured = context.outputs.pop(ag.name, None)
+        return structured if structured is not None else result
 
     async def stream(self, node: dict, context: "FlowContext", node_id: str) -> AsyncIterator[dict[str, Any]]:
         config = node.get("config", {})
@@ -43,9 +49,13 @@ class AgentNodeHandler(NodeHandler):
 
         yield event.step_started(step_name=step_name)
         resolved = self.resolve_inputs(config, context)
-        ag = self._create_agent(config)
+        ag = self._create_agent(config, context)
         async for evt in ag.stream(context, inputs=resolved):
             yield evt
-        result = context.get_last_output(ag.name) or ""
-        context.set_output(node_id, {"result": result})
+        structured = context.outputs.pop(ag.name, None)
+        if structured is not None:
+            context.set_output(node_id, structured)
+        else:
+            result = context.get_last_output(ag.name) or ""
+            context.set_output(node_id, {"result": result})
         yield event.step_finished(step_name=step_name)

{agstack-1.15.0 → agstack-1.16.1}/agstack.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agstack
-Version: 1.15.0
+Version: 1.16.1
 Summary: Production-ready toolkit for building FastAPI and LLM applications
 Author-email: XtraVisions <gitadmin@xtravisions.com>, Chen Hao <chenhao@xtravisions.com>
 Maintainer-email: XtraVisions <gitadmin@xtravisions.com>, Chen Hao <chenhao@xtravisions.com>

{agstack-1.15.0 → agstack-1.16.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "agstack"
-version = "1.15.0"
+version = "1.16.1"
 description = "Production-ready toolkit for building FastAPI and LLM applications"
 readme = "README.md"
 license = "MIT"