agstack 1.21.1__tar.gz → 1.22.1__tar.gz

{agstack-1.21.1 → agstack-1.22.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agstack
-Version: 1.21.1
+Version: 1.22.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>
@@ -43,6 +43,8 @@ Provides-Extra: graph
 Requires-Dist: nebula3-python>=3.8.3; extra == "graph"
 Provides-Extra: redis
 Requires-Dist: redis>=5.0; extra == "redis"
+Provides-Extra: yaml
+Requires-Dist: pyyaml>=6.0; extra == "yaml"
 Provides-Extra: std
 Requires-Dist: agstack[mq]; extra == "std"
 Requires-Dist: agstack[db]; extra == "std"

{agstack-1.21.1 → agstack-1.22.1}/agstack/config/manager.py

@@ -10,14 +10,42 @@ from .logger import setup_logger
 from .types import AppConfig
 
 
+_CONFIG_CANDIDATES = ("config.toml", "config.yaml", "config.yml")
+
+
+def _find_config_file(approot: Path) -> Path:
+    """按优先级查找配置文件"""
+    for name in _CONFIG_CANDIDATES:
+        path = approot / name
+        if path.exists():
+            return path
+    return approot / "config.toml"
+
+
 def _load_config_file(config_path: Path) -> dict[str, Any]:
-    """加载配置文件（容错处理）"""
+    """加载配置文件（支持 TOML 和 YAML 格式）"""
     if not config_path.exists():
         return {}
 
+    suffix = config_path.suffix.lower()
     try:
-        with open(config_path, "rb") as f:
-            return tomllib.load(f)
+        if suffix == ".toml":
+            with open(config_path, "rb") as f:
+                return tomllib.load(f)
+        elif suffix in (".yaml", ".yml"):
+            try:
+                import yaml
+            except ImportError as err:
+                raise ImportError(
+                    f"PyYAML is required to load {config_path}. Install it with: pip install agstack[yaml]"
+                ) from err
+            with open(config_path) as f:
+                return yaml.safe_load(f) or {}
+        else:
+            print(f"Unsupported config format: {suffix}")
+            return {}
+    except ImportError:
+        raise
     except Exception:  # noqa
         print(f"Failed to load config file: {config_path}")
         return {}
@@ -95,37 +123,45 @@ def _determine_log_level(config_data: dict[str, Any]) -> str:
     return config_data.get("logger", {}).get("level", "INFO")
 
 
-def setup_config(appname: str, envprefix: str = "APP") -> AppConfig:
+def setup_config(appname: str, envprefix: str = "APP", config_file: str | Path | None = None) -> AppConfig:
     """初始化配置
 
     Args:
         appname: 应用名称
         envprefix: 环境变量前缀
+        config_file: 配置文件路径（支持 .toml / .yaml / .yml），为 None 时自动查找
 
     Returns:
         AppConfig: 配置实例
     """
     approot = Path.cwd()
-    config_path = approot / "config.toml"
 
-    # 1. 加载配置文件（容错）
+    # 1. 确定配置文件路径
+    if config_file:
+        config_path = Path(config_file)
+        if not config_path.is_absolute():
+            config_path = approot / config_path
+    else:
+        config_path = _find_config_file(approot)
+
+    # 2. 加载配置文件（容错）
     config_data = _load_config_file(config_path)
 
-    # 2. 加载环境变量覆盖
+    # 3. 加载环境变量覆盖
     env_overrides = _load_env_overrides(envprefix)
     config_data.update(env_overrides)
 
-    # 3. 设置应用信息
+    # 4. 设置应用信息
     config_data.update({"appname": appname, "approot": approot})
 
-    # 4. 确定日志级别（优先级处理）
+    # 5. 确定日志级别（优先级处理）
     log_level = _determine_log_level(config_data)
     config_data.setdefault("logger", {})["level"] = log_level
 
-    # 5. 初始化日志（使用字典配置）
+    # 6. 初始化日志（使用字典配置）
     setup_logger(appname, **config_data["logger"])
 
-    # 8. 创建配置实例（最后验证）
+    # 7. 创建配置实例（最后验证）
     config = AppConfig.model_validate(config_data)
 
     return config

{agstack-1.21.1 → agstack-1.22.1}/agstack/llm/flow/event.py

@@ -97,12 +97,12 @@ def run_error(*, message: str, code: str | None = None) -> dict[str, Any]:
 # ── Step ──
 
 
-def step_started(*, step_name: str) -> dict[str, Any]:
-    return _ev(EventType.STEP_STARTED, step_name=step_name)
+def step_started(*, step_name: str, step_id: str | None = None) -> dict[str, Any]:
+    return _ev(EventType.STEP_STARTED, step_name=step_name, step_id=step_id or str(uuid4()))
 
 
-def step_finished(*, step_name: str) -> dict[str, Any]:
-    return _ev(EventType.STEP_FINISHED, step_name=step_name)
+def step_finished(*, step_name: str, step_id: str) -> dict[str, Any]:
+    return _ev(EventType.STEP_FINISHED, step_name=step_name, step_id=step_id)
 
 
 # ── State ──

{agstack-1.21.1 → agstack-1.22.1}/agstack/llm/flow/flow.py

@@ -370,7 +370,8 @@ class Flow:
     async def stream(self, context: "FlowContext") -> AsyncIterator[dict[str, Any]]:
         """流式执行 Flow（输出 AG-UI 标准事件）"""
         context.trace.started_at = time.time()
-        yield event.step_started(step_name=f"flow:{self.name}")
+        flow_sid = str(uuid4())
+        yield event.step_started(step_name=f"flow:{self.name}", step_id=flow_sid)
 
         try:
             if not self.edges:
@@ -386,7 +387,7 @@ class Flow:
             context.trace.finished_at = time.time()
             context.trace.total_usage = context.usage
 
-        yield event.step_finished(step_name=f"flow:{self.name}")
+        yield event.step_finished(step_name=f"flow:{self.name}", step_id=flow_sid)
 
     async def _stream_sequential(self, context: "FlowContext") -> AsyncIterator[dict[str, Any]]:
         """顺序流式执行"""
@@ -437,7 +438,8 @@ class Flow:
                 context.trace.record_node_start(current_node_id, "message", inputs=msg_config)
 
                 # message 节点增加 STEP 事件
-                step_evt = event.step_started(step_name=f"message:{current_node_id}")
+                msg_sid = str(uuid4())
+                step_evt = event.step_started(step_name=f"message:{current_node_id}", step_id=msg_sid)
                 step_evt["_node_id"] = current_node_id
                 step_evt["_label"] = msg_config.get("label")
                 step_evt["_echo"] = msg_config.get("echo", True)
@@ -454,7 +456,7 @@ class Flow:
                 text = template.format_map(_SafeFormatDict(context.variables))
                 context.set_output(current_node_id, {"result": text})
 
-                fin_evt = event.step_finished(step_name=f"message:{current_node_id}")
+                fin_evt = event.step_finished(step_name=f"message:{current_node_id}", step_id=msg_sid)
                 fin_evt["_node_id"] = current_node_id
                 fin_evt["_label"] = msg_config.get("label")
                 fin_evt["_echo"] = msg_config.get("echo", True)
@@ -469,7 +471,8 @@ class Flow:
 
                 context.trace.record_node_start(current_node_id, "parallel", inputs=config)
 
-                step_evt = event.step_started(step_name=f"parallel:{current_node_id}")
+                parallel_sid = str(uuid4())
+                step_evt = event.step_started(step_name=f"parallel:{current_node_id}", step_id=parallel_sid)
                 step_evt["_node_id"] = current_node_id
                 step_evt["_label"] = None
                 step_evt["_echo"] = False
@@ -510,7 +513,7 @@ class Flow:
                         merged.update(branch_result)
                 context.set_output(current_node_id, merged)
 
-                fin_evt = event.step_finished(step_name=f"parallel:{current_node_id}")
+                fin_evt = event.step_finished(step_name=f"parallel:{current_node_id}", step_id=parallel_sid)
                 fin_evt["_node_id"] = current_node_id
                 fin_evt["_label"] = None
                 fin_evt["_echo"] = False
@@ -533,7 +536,8 @@ class Flow:
 
                 context.trace.record_node_start(current_node_id, "iteration", inputs=config)
 
-                step_evt = event.step_started(step_name=f"iteration:{current_node_id}")
+                iter_sid = str(uuid4())
+                step_evt = event.step_started(step_name=f"iteration:{current_node_id}", step_id=iter_sid)
                 step_evt["_node_id"] = current_node_id
                 step_evt["_label"] = None
                 step_evt["_echo"] = False
@@ -574,7 +578,7 @@ class Flow:
                 iteration_output = {"results": results}
                 context.set_output(current_node_id, iteration_output)
 
-                fin_evt = event.step_finished(step_name=f"iteration:{current_node_id}")
+                fin_evt = event.step_finished(step_name=f"iteration:{current_node_id}", step_id=iter_sid)
                 fin_evt["_node_id"] = current_node_id
                 fin_evt["_label"] = None
                 fin_evt["_echo"] = False

{agstack-1.21.1 → agstack-1.22.1}/agstack/llm/flow/nodes/agent_node.py

@@ -3,6 +3,7 @@
 """Agent 节点处理器 — 从 flow.py 提取"""
 
 from typing import TYPE_CHECKING, Any, AsyncIterator
+from uuid import uuid4
 
 from .. import event
 from ..exceptions import FlowError
@@ -46,8 +47,9 @@ class AgentNodeHandler(NodeHandler):
     async def stream(self, node: dict, context: "FlowContext", node_id: str) -> AsyncIterator[dict[str, Any]]:
         config = node.get("config", {})
         step_name = self.get_step_name(node, node_id)
+        sid = str(uuid4())
 
-        yield event.step_started(step_name=step_name)
+        yield event.step_started(step_name=step_name, step_id=sid)
         resolved = self.resolve_inputs(config, context)
         ag = self._create_agent(config, context)
         async for evt in ag.stream(context, inputs=resolved):
@@ -63,4 +65,4 @@ class AgentNodeHandler(NodeHandler):
         tool_calls = context.pop_execution_records()
         context.set_variable("_last_node_tool_calls", tool_calls)
 
-        yield event.step_finished(step_name=step_name)
+        yield event.step_finished(step_name=step_name, step_id=sid)

{agstack-1.21.1 → agstack-1.22.1}/agstack/llm/flow/nodes/base.py

@@ -3,6 +3,7 @@
 """NodeHandler 基类 — 所有执行类节点的公共接口"""
 
 from typing import TYPE_CHECKING, Any, AsyncIterator
+from uuid import uuid4
 
 from .. import event
 
@@ -45,7 +46,8 @@ class NodeHandler:
         需要流式输出的节点（如 agent, llm_chat）应覆盖此方法。
         """
         step_name = self.get_step_name(node, node_id)
-        yield event.step_started(step_name=step_name)
+        sid = str(uuid4())
+        yield event.step_started(step_name=step_name, step_id=sid)
         result = await self.execute(node, context)
         context.set_output(node_id, result)
-        yield event.step_finished(step_name=step_name)
+        yield event.step_finished(step_name=step_name, step_id=sid)

{agstack-1.21.1 → agstack-1.22.1}/agstack/llm/flow/nodes/echo_node.py

@@ -32,8 +32,9 @@ class EchoNodeHandler(NodeHandler):
     async def stream(self, node: dict, context: "FlowContext", node_id: str) -> AsyncIterator[dict[str, Any]]:
         config = node.get("config", {})
         step_name = self.get_step_name(node, node_id)
+        sid = str(uuid4())
 
-        yield event.step_started(step_name=step_name)
+        yield event.step_started(step_name=step_name, step_id=sid)
 
         resolved = self.resolve_inputs(config, context)
         content = resolved.get("content", "")
@@ -51,4 +52,4 @@ class EchoNodeHandler(NodeHandler):
             yield event.text_message_end(message_id=msg_id)
 
         context.set_output(node_id, {"result": content})
-        yield event.step_finished(step_name=step_name)
+        yield event.step_finished(step_name=step_name, step_id=sid)

{agstack-1.21.1 → agstack-1.22.1}/agstack/llm/flow/nodes/llm_chat_node.py

@@ -92,15 +92,17 @@ class LLMChatNodeHandler(NodeHandler):
         if not use_stream:
             # 非流式：走默认 execute 路径
             step_name = self.get_step_name(node, node_id)
-            yield event.step_started(step_name=step_name)
+            sid = str(uuid4())
+            yield event.step_started(step_name=step_name, step_id=sid)
             result = await self.execute(node, context)
             context.set_output(node_id, result)
-            yield event.step_finished(step_name=step_name)
+            yield event.step_finished(step_name=step_name, step_id=sid)
             return
 
         # 流式输出
         step_name = self.get_step_name(node, node_id)
-        yield event.step_started(step_name=step_name)
+        sid = str(uuid4())
+        yield event.step_started(step_name=step_name, step_id=sid)
 
         resolved_inputs = self.resolve_inputs(config, context)
         prompt_text = self._build_prompt(config.get("prompt", ""), resolved_inputs)
@@ -153,4 +155,4 @@ class LLMChatNodeHandler(NodeHandler):
         result_text = "".join(content_parts)
         context.set_output(node_id, {"result": result_text})
 
-        yield event.step_finished(step_name=step_name)
+        yield event.step_finished(step_name=step_name, step_id=sid)

{agstack-1.21.1 → agstack-1.22.1}/agstack.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agstack
-Version: 1.21.1
+Version: 1.22.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>
@@ -43,6 +43,8 @@ Provides-Extra: graph
 Requires-Dist: nebula3-python>=3.8.3; extra == "graph"
 Provides-Extra: redis
 Requires-Dist: redis>=5.0; extra == "redis"
+Provides-Extra: yaml
+Requires-Dist: pyyaml>=6.0; extra == "yaml"
 Provides-Extra: std
 Requires-Dist: agstack[mq]; extra == "std"
 Requires-Dist: agstack[db]; extra == "std"

{agstack-1.21.1 → agstack-1.22.1}/agstack.egg-info/requires.txt

@@ -38,3 +38,6 @@ redis>=5.0
 [std]
 agstack[mq]
 agstack[db]
+
+[yaml]
+pyyaml>=6.0

{agstack-1.21.1 → agstack-1.22.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "agstack"
-version = "1.21.1"
+version = "1.22.1"
 description = "Production-ready toolkit for building FastAPI and LLM applications"
 readme = "README.md"
 license = "MIT"
@@ -60,6 +60,7 @@ db = ["asyncpg>=0.30.0"]
 es = ["elasticsearch[async]>=9.3.0"]
 graph = ["nebula3-python>=3.8.3"]
 redis = ["redis>=5.0"]
+yaml = ["pyyaml>=6.0"]
 std = ["agstack[mq]", "agstack[db]"]
 pro = ["agstack[std]", "agstack[es]"]
 ent = ["agstack[pro]", "agstack[graph]"]