agstack 1.21.0__tar.gz → 1.22.0__tar.gz

{agstack-1.21.0 → agstack-1.22.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agstack
-Version: 1.21.0
+Version: 1.22.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>
@@ -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.0 → agstack-1.22.0}/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.0 → agstack-1.22.0}/agstack/llm/flow/agent.py

@@ -245,13 +245,13 @@ class Agent:
                     context.add_message(
                         self.name,
                         "tool",
-                        content=json.dumps({"error": error_msg}),
+                        content=json.dumps({"error": error_msg}, ensure_ascii=False),
                         tool_call_id=tool_call["id"],
                     )
                     # AG-UI: TOOL_CALL_RESULT (错误)
                     yield event.tool_call_result(
                         tool_call_id=tool_call["id"],
-                        content=json.dumps({"error": error_msg}),
+                        content=json.dumps({"error": error_msg}, ensure_ascii=False),
                     )
                     continue
 
@@ -288,7 +288,9 @@ class Agent:
 
                 # 使用 result.content 作为 LLM 上下文（Tool 已计算好）
                 result_content = result.content or (
-                    json.dumps(result.result) if result.success else json.dumps({"error": result.error})
+                    json.dumps(result.result, ensure_ascii=False)
+                    if result.success
+                    else json.dumps({"error": result.error}, ensure_ascii=False)
                 )
                 context.add_message(
                     self.name,

{agstack-1.21.0 → agstack-1.22.0}/agstack/llm/flow/tool.py

@@ -93,9 +93,17 @@ class Tool:
             try:
                 result.content = self.result_formatter(result)
             except Exception:
-                result.content = json.dumps(result.result) if result.success else json.dumps({"error": result.error})
+                result.content = (
+                    json.dumps(result.result, ensure_ascii=False)
+                    if result.success
+                    else json.dumps({"error": result.error}, ensure_ascii=False)
+                )
         else:
-            result.content = json.dumps(result.result) if result.success else json.dumps({"error": result.error})
+            result.content = (
+                json.dumps(result.result, ensure_ascii=False)
+                if result.success
+                else json.dumps({"error": result.error}, ensure_ascii=False)
+            )
 
         # 生成面向用户的摘要
         if self.summary_fn:

{agstack-1.21.0 → agstack-1.22.0}/agstack.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agstack
-Version: 1.21.0
+Version: 1.22.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>
@@ -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.0 → agstack-1.22.0}/agstack.egg-info/requires.txt

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

{agstack-1.21.0 → agstack-1.22.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "agstack"
-version = "1.21.0"
+version = "1.22.0"
 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]"]