agstack 1.5.0__tar.gz → 1.7.0__tar.gz

{agstack-1.5.0 → agstack-1.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agstack
-Version: 1.5.0
+Version: 1.7.0
 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.5.0 → agstack-1.7.0}/agstack/llm/flow/__init__.py

@@ -18,6 +18,7 @@ from .exceptions import (
 from .factory import create_agent, create_tool
 from .flow import Flow
 from .loader import FlowLoader
+from .nodes import NodeHandler, register_node_handler
 from .records import Record, Status
 from .registry import registry
 from .state import FlowState
@@ -32,6 +33,9 @@ __all__ = [
     "Flow",
     "FlowContext",
     "Usage",
+    # 节点处理器
+    "NodeHandler",
+    "register_node_handler",
     # AG-UI 协议
     "EventType",
     "event",

{agstack-1.5.0 → agstack-1.7.0}/agstack/llm/flow/agent.py

@@ -64,23 +64,29 @@ class Agent:
                 return tool
         return None
 
-    async def run(self, context: "FlowContext") -> str:
+    async def run(self, context: "FlowContext", inputs: dict[str, Any] | None = None) -> dict[str, Any]:
         """执行 Agent 逻辑"""
         content_parts = []
-        async for evt in self.stream(context):
+        async for evt in self.stream(context, inputs):
             # AG-UI 事件格式
             if isinstance(evt, dict):
                 if evt.get("type") == EventType.TEXT_MESSAGE_CONTENT:
                     content_parts.append(evt.get("delta", ""))
                 elif evt.get("type") == EventType.RUN_ERROR:
                     raise FlowError("AGENT_EXECUTION_FAILED", 500, {"error": evt.get("message")})
-        return "".join(content_parts)
+        return {"result": "".join(content_parts)}
 
-    async def stream(self, context: "FlowContext") -> AsyncIterator[dict[str, Any]]:
+    async def stream(
+        self, context: "FlowContext", inputs: dict[str, Any] | None = None
+    ) -> AsyncIterator[dict[str, Any]]:
         """流式执行 Agent，输出 AG-UI 标准事件"""
 
-        # 输入来源：优先 input（A2A 传入），回退到 query
-        user_input = context.get_variable("input") or context.get_variable("query", "")
+        # 输入来源：优先 inputs 参数，回退到 context.variables
+        user_input = ""
+        if inputs:
+            user_input = inputs.get("input", "")
+        if not user_input:
+            user_input = context.get_variable("input") or context.get_variable("query", "")
         msg_id = context.message_id or str(uuid4())
 
         # 添加用户消息（scoped by agent name）
@@ -214,7 +220,7 @@ class Agent:
             # 如果没有工具调用，结束循环
             if not tool_calls:
                 # 存储结果供 Flow/A2A 使用
-                context.set_node_result(self.name, assistant_content)
+                context.set_output(self.name, {"result": assistant_content})
                 # AG-UI: TEXT_MESSAGE_END
                 yield event.text_message_end(message_id=msg_id)
                 return
@@ -237,15 +243,14 @@ class Agent:
                     )
                     continue
 
-                # 解析 LLM 返回的工具参数并注入 context
+                # 解析 LLM 返回的工具参数
                 try:
                     tool_args = json.loads(tool_call["arguments"]) if tool_call["arguments"] else {}
                 except json.JSONDecodeError:
                     tool_args = {}
-                context.update_variables(tool_args)
 
-                # 执行工具
-                result = await tool.execute_async(context)
+                # 执行工具（传入 LLM 解析的参数作为 inputs）
+                result = await tool.execute_async(context, tool_args)
 
                 # 保存工具结果
                 result_content = json.dumps(result.result) if result.success else json.dumps({"error": result.error})

{agstack-1.5.0 → agstack-1.7.0}/agstack/llm/flow/context.py

@@ -50,7 +50,7 @@ class FlowContext:
     message_id: str | None = None
 
     # 图执行状态
-    node_results: dict[str, Any] = field(default_factory=dict)
+    outputs: dict[str, Any] = field(default_factory=dict)
     current_node: str | None = None
 
     # 执行记录（可选）
@@ -115,33 +115,31 @@ class FlowContext:
             self.messages.clear()
             self.turn_count = 0
 
-    def resolve_reference(self, ref: str) -> Any:
-        """解析变量引用 {node@variable.field} 或 {node_id}"""
-        if not isinstance(ref, str) or not ref.startswith("{"):
-            return ref
+    def resolve_reference(self, ref: Any) -> Any:
+        """解析变量引用
 
-        ref_content = ref[1:-1]  # 移除 {}
-        if "@" not in ref_content:
-            # 先从 variables 查找，回退到 node_results
-            result = self.variables.get(ref_content)
-            if result is None:
-                result = self.node_results.get(ref_content)
+        $o.node_id.field.subfield  → context.outputs["node_id"]["field"]["subfield"]
+        $v.key                     → context.variables["key"]
+        其他字符串                  → 原样返回（字面值）
+        """
+        if not isinstance(ref, str):
+            return ref
+        if ref.startswith("$o."):
+            parts = ref[3:].split(".")
+            result = self.outputs.get(parts[0])
+            for part in parts[1:]:
+                if isinstance(result, dict):
+                    result = result.get(part)
+                else:
+                    result = getattr(result, part, None)
             return result
+        if ref.startswith("$v."):
+            return self.variables.get(ref[3:])
+        return ref
 
-        node_id, var_path = ref_content.split("@", 1)
-        result = self.node_results.get(node_id)
-
-        # 支持嵌套字段访问 variable.field.subfield
-        for field_name in var_path.split("."):
-            if isinstance(result, dict):
-                result = result.get(field_name)
-            else:
-                result = getattr(result, field_name, None)
-        return result
-
-    def set_node_result(self, node_id: str, result: Any):
-        """设置节点执行结果"""
-        self.node_results[node_id] = result
+    def set_output(self, node_id: str, result: Any):
+        """设置节点输出"""
+        self.outputs[node_id] = result
 
     def add_execution_record(self, task_id: str, status: str, **kwargs) -> None:
         """添加执行记录"""