add tests.

Author: JDOxygen

docs/docs_en/examples/other/create_flow_image_demo.md

@@ -13,7 +13,7 @@ This example builds an interactive flowchart assistant that generates and displa
 
 - Environment variables: `OPENAI_API_KEY`, `OPENAI_BASE_URL`, `OPENAI_MODEL_NAME` (note: this example uses OpenAI-style variable names, not the default `DEFAULT_LLM_*` names)
 - Python packages listed in `requirements.txt`
-- The `oxygent.chart` module (provides `flow_image_gen_tools`, `open_chart_tools`, `create_static_files`, and `flowchart_api`)
+- The `function_hubs.chart` module (provides `flow_image_gen_tools`, `open_chart_tools`, `create_static_files`, and `flowchart_api`)
 - A web browser for viewing generated flowcharts
 
 ## How to Run
@@ -58,8 +58,8 @@ The `MASTER_AGENT_PROMPT` is a detailed Chinese-language system prompt that inst
 | Component | Type | Key Parameters |
 |-----------|------|----------------|
 | `default_llm` | `HttpLLM` | `OPENAI_API_KEY`, `OPENAI_BASE_URL`, `OPENAI_MODEL_NAME` from env vars |
-| `flow_image_gen_tools` | FunctionHub | Imported from `oxygent.chart.flow_image_gen_tools`; generates Mermaid flowcharts |
-| `open_chart_tools` | FunctionHub | Imported from `oxygent.chart.open_chart_tools`; opens HTML files in browser |
+| `flow_image_gen_tools` | FunctionHub | Imported from `function_hubs.chart.flow_image_gen_tools`; generates Mermaid flowcharts |
+| `open_chart_tools` | FunctionHub | Imported from `function_hubs.chart.open_chart_tools`; opens HTML files in browser |
 | `image_gen_agent` | `ReActAgent` | `tools=["flow_image_gen_tools"]`, desc: flowchart generation agent |
 | `open_chart_agent` | `ReActAgent` | `tools=["open_chart_tools"]`, desc: open flowchart in browser |
 | `master_agent` | `ReActAgent` | `is_master=True`, `sub_agents=["image_gen_agent", "open_chart_agent"]`, `prompt_template=MASTER_AGENT_PROMPT`, also has direct tool access to both tool sets |
@@ -69,19 +69,19 @@ The `MASTER_AGENT_PROMPT` is a detailed Chinese-language system prompt that inst
 The script creates a custom FastAPI application alongside the OxyGent MAS:
 
 1. **CORS middleware** -- Allows all origins for development convenience.
-2. **Flowchart API router** -- Mounted at `/api` from `oxygent.chart.flowchart_api`.
+2. **Flowchart API router** -- Mounted at `/api` from `function_hubs.chart.flowchart_api`.
 3. **Root redirect** -- `GET /` redirects to `/static/index.html`.
-4. **Static files** -- The web UI is served from `oxygent/chart/web/` at the `/static` path.
+4. **Static files** -- The web UI is served from `function_hubs/chart/web/` at the `/static` path.
 
 ### Entry Point
 
 ```python
 async def main():
-    os.makedirs("../../oxygent/chart/web", exist_ok=True)
-    os.makedirs("../../oxygent/chart/web/css", exist_ok=True)
-    os.makedirs("../../oxygent/chart/web/js", exist_ok=True)
-    create_static_files("../../oxygent/chart")
-    app.mount("/static", StaticFiles(directory="../../oxygent/chart/web"), name="web")
+    os.makedirs("../../function_hubs/chart/web", exist_ok=True)
+    os.makedirs("../../function_hubs/chart/web/css", exist_ok=True)
+    os.makedirs("../../function_hubs/chart/web/js", exist_ok=True)
+    create_static_files("../../function_hubs/chart")
+    app.mount("/static", StaticFiles(directory="../../function_hubs/chart/web"), name="web")
 
     async with MAS(oxy_space=oxy_space) as mas:
         await mas.start_web_service(

docs/docs_zh/examples/other/create_flow_image_demo.md

@@ -13,7 +13,7 @@
 
 - 环境变量：`OPENAI_API_KEY`、`OPENAI_BASE_URL`、`OPENAI_MODEL_NAME`（注意：本示例使用 OpenAI 风格的变量名，而非默认的 `DEFAULT_LLM_*` 名称）
 - `requirements.txt` 中列出的 Python 依赖包
-- `oxygent.chart` 模块（提供 `flow_image_gen_tools`、`open_chart_tools`、`create_static_files` 和 `flowchart_api`）
+- `function_hubs.chart` 模块（提供 `flow_image_gen_tools`、`open_chart_tools`、`create_static_files` 和 `flowchart_api`）
 - Web 浏览器，用于查看生成的流程图
 
 ## 运行方式
@@ -58,8 +58,8 @@ Config.set_agent_llm_model("default_llm")
 | 组件 | 类型 | 关键参数 |
 |------|------|----------|
 | `default_llm` | `HttpLLM` | 来自环境变量的 `OPENAI_API_KEY`、`OPENAI_BASE_URL`、`OPENAI_MODEL_NAME` |
-| `flow_image_gen_tools` | FunctionHub | 从 `oxygent.chart.flow_image_gen_tools` 导入；生成 Mermaid 流程图 |
-| `open_chart_tools` | FunctionHub | 从 `oxygent.chart.open_chart_tools` 导入；在浏览器中打开 HTML 文件 |
+| `flow_image_gen_tools` | FunctionHub | 从 `function_hubs.chart.flow_image_gen_tools` 导入；生成 Mermaid 流程图 |
+| `open_chart_tools` | FunctionHub | 从 `function_hubs.chart.open_chart_tools` 导入；在浏览器中打开 HTML 文件 |
 | `image_gen_agent` | `ReActAgent` | `tools=["flow_image_gen_tools"]`，描述：流程图生成代理 |
 | `open_chart_agent` | `ReActAgent` | `tools=["open_chart_tools"]`，描述：在浏览器中打开流程图 |
 | `master_agent` | `ReActAgent` | `is_master=True`，`sub_agents=["image_gen_agent", "open_chart_agent"]`，`prompt_template=MASTER_AGENT_PROMPT`，同时拥有两个工具集的直接访问权限 |
@@ -69,19 +69,19 @@ Config.set_agent_llm_model("default_llm")
 脚本在 OxyGent MAS 之外创建了自定义 FastAPI 应用：
 
 1. **CORS 中间件** -- 允许所有来源，方便开发调试。
-2. **流程图 API 路由** -- 从 `oxygent.chart.flowchart_api` 挂载到 `/api` 路径。
+2. **流程图 API 路由** -- 从 `function_hubs.chart.flowchart_api` 挂载到 `/api` 路径。
 3. **根路径重定向** -- `GET /` 重定向到 `/static/index.html`。
-4. **静态文件服务** -- Web UI 从 `oxygent/chart/web/` 目录提供服务，挂载到 `/static` 路径。
+4. **静态文件服务** -- Web UI 从 `function_hubs/chart/web/` 目录提供服务，挂载到 `/static` 路径。
 
 ### 入口函数
 
 ```python
 async def main():
-    os.makedirs("../../oxygent/chart/web", exist_ok=True)
-    os.makedirs("../../oxygent/chart/web/css", exist_ok=True)
-    os.makedirs("../../oxygent/chart/web/js", exist_ok=True)
-    create_static_files("../../oxygent/chart")
-    app.mount("/static", StaticFiles(directory="../../oxygent/chart/web"), name="web")
+    os.makedirs("../../function_hubs/chart/web", exist_ok=True)
+    os.makedirs("../../function_hubs/chart/web/css", exist_ok=True)
+    os.makedirs("../../function_hubs/chart/web/js", exist_ok=True)
+    create_static_files("../../function_hubs/chart")
+    app.mount("/static", StaticFiles(directory="../../function_hubs/chart/web"), name="web")
 
     async with MAS(oxy_space=oxy_space) as mas:
         await mas.start_web_service(

examples/other/create_flow_image_demo.py

@@ -1,35 +1,16 @@
 import asyncio
 import os
-import sys
 
-# 将项目根目录添加到 Python 的模块搜索路径中
-project_root = os.path.abspath(os.path.join(os.path.dirname(__file__), "../.."))
-sys.path.insert(0, project_root)
-
-# 加载环境变量
-try:
-    from dotenv import load_dotenv
-
-    load_dotenv()
-except ImportError:
-    print(
-        "Warning: python-dotenv not installed. Environment variables should be set manually."
-    )
-    pass
-
-# 导入必要的模块
-from oxygent import MAS, Config, oxy
-
-# 导入自定义模块
-sys.path.append(project_root)
-# FastAPI 相关导入
 from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.staticfiles import StaticFiles
 
-from oxygent.chart.flow_image_gen_tools import flow_image_gen_tools
-from oxygent.chart.open_chart_tools import open_chart_tools
-from oxygent.chart.static_files_utils import create_static_files
+from function_hubs.chart.flow_image_gen_tools import flow_image_gen_tools
+from function_hubs.chart.open_chart_tools import open_chart_tools
+from function_hubs.chart.static_files_utils import create_static_files
+
+# 导入必要的模块
+from oxygent import MAS, Config, oxy
 
 Config.set_agent_llm_model("default_llm")
 # Config.set_server_auto_open_webpage(False)  # 禁用自动打开浏览器
@@ -142,6 +123,7 @@
         api_key=os.getenv("OPENAI_API_KEY"),
         base_url=os.getenv("OPENAI_BASE_URL"),
         model_name=os.getenv("OPENAI_MODEL_NAME"),
+        llm_params={"stream": False},
     ),
     flow_image_gen_tools,
     open_chart_tools,
@@ -183,7 +165,7 @@
 )
 
 # 添加API路由
-from oxygent.chart.flowchart_api import router as flowchart_router
+from function_hubs.chart.flowchart_api import router as flowchart_router
 
 app.include_router(flowchart_router, prefix="/api")
 
@@ -198,16 +180,18 @@ async def read_root():
 
 async def main():
     # 创建web目录（如果不存在）
-    os.makedirs("../../oxygent/chart/web", exist_ok=True)
-    os.makedirs("../../oxygent/chart/web/css", exist_ok=True)
-    os.makedirs("../../oxygent/chart/web/js", exist_ok=True)
+    os.makedirs("../../function_hubs/chart/web", exist_ok=True)
+    os.makedirs("../../function_hubs/chart/web/css", exist_ok=True)
+    os.makedirs("../../function_hubs/chart/web/js", exist_ok=True)
 
     # 创建静态文件
-    create_static_files("../../oxygent/chart")
+    create_static_files("../../function_hubs/chart")
 
     # 使用MAS启动Web服务
     # 注意：静态文件挂载必须在API路由之后，否则会覆盖API路由
-    app.mount("/static", StaticFiles(directory="../../oxygent/chart/web"), name="web")
+    app.mount(
+        "/static", StaticFiles(directory="../../function_hubs/chart/web"), name="web"
+    )
 
     async with MAS(oxy_space=oxy_space) as mas:
         # 启动Web服务，但不使用默认的 first_query 处理方式

function_hubs/chart/__init__.py

@@ -7,7 +7,6 @@
 tool_modules = [
     "flow_image_gen_tools",
     "open_chart_tools",
-    "flowchart_api"
 ]
 
 __all__ = []

function_hubs/chart/flowchart_api.py

@@ -35,7 +35,7 @@ async def save_flowchart(request: SaveFlowchartRequest):
             file_name = f"flowchart-{timestamp}.html"
 
         # 创建HTML内容
-        from oxygent.chart.create_flow_image import create_html_with_mermaid
+        from function_hubs.chart.flow_image_gen_tools import create_html_with_mermaid
 
         success = create_html_with_mermaid(request.mermaid_code, file_name)
 
@@ -51,7 +51,7 @@ async def generate_flowchart(request: GenerateFlowchartRequest):
     """根据描述生成流程图"""
     try:
         # 导入生成函数
-        from oxygent.chart.create_flow_image import generate_flow_chart, call_ollama_api, create_html_with_mermaid
+        from function_hubs.chart.flow_image_gen_tools import create_html_with_mermaid, call_openai_api
 
         # 生成文件名
         if request.file_name:
@@ -65,8 +65,8 @@ async def generate_flowchart(request: GenerateFlowchartRequest):
         # 确保使用绝对路径
         file_name = os.path.abspath(file_name)
 
-        # 调用 Ollama API 生成 Mermaid 代码
-        mermaid_code = call_ollama_api(request.description)
+        # 调用 OpenAI 兼容 API 生成 Mermaid 代码
+        mermaid_code = call_openai_api(request.description)
 
         # 创建 HTML 文件
         success = create_html_with_mermaid(mermaid_code, file_name)
@@ -75,7 +75,7 @@ async def generate_flowchart(request: GenerateFlowchartRequest):
             abs_path = os.path.abspath(file_name)
 
             # 每次请求都打开浏览器
-            from oxygent.chart.open_chart_tools import open_chart_tools
+            from function_hubs.chart.open_chart_tools import open_chart_tools
             print(f"准备打开文件: {abs_path}")
             await open_chart_tools.open_html_chart(abs_path)
 

oxygent/oxy/mcp_tools/base_mcp_client.py

@@ -167,22 +167,44 @@ async def cleanup(self) -> None:
         Safely closes the MCP server session and all associated resources. Uses a
         cleanup lock to prevent concurrent cleanup operations and handles cancellation
         and other exceptions gracefully.
+
+        When ``init()`` ran inside ``asyncio.gather`` (which creates a child
+        task), the anyio cancel-scope was entered in that child task.  Closing
+        the exit stack from the current (different) task raises a
+        ``RuntimeError``.  In that case we fall back to
+        ``_on_cross_task_cleanup`` so subclasses can do transport-specific
+        teardown (e.g. killing a subprocess).
         """
         async with self._cleanup_lock:
             try:
                 await self._exit_stack.aclose()
+            except RuntimeError as e:
+                if "cancel scope" in str(e) or "different task" in str(e):
+                    await self._on_cross_task_cleanup()
+                else:
+                    logger.warning(
+                        f"MCP client cleanup failed for server '{self.name}': {e}",
+                        exc_info=True,
+                    )
             except asyncio.CancelledError:
-                # TODO cleanup(): Operation was cancelled
                 logger.error(
                     f"MCP client cleanup was cancelled for server '{self.name}'",
                     exc_info=True,
                 )
             except Exception as e:
-                # Suppress cleanup exceptions to prevent cascading failures
                 logger.warning(
                     f"MCP client cleanup failed for server '{self.name}': {e}",
                     exc_info=True,
                 )
             finally:
                 self._session = None
                 self._stdio_context = None
+
+    async def _on_cross_task_cleanup(self) -> None:
+        """Hook for subclasses to handle cleanup when the exit stack cannot
+        be closed because it was entered in a different asyncio task.
+
+        The default implementation is a no-op (suitable for HTTP-based
+        transports where the connection simply goes away).  ``StdioMCPClient``
+        overrides this to terminate the child process.
+        """

oxygent/oxy/mcp_tools/stdio_mcp_client.py

@@ -6,9 +6,11 @@
 through stdin/stdout pipes.
 """
 
+import asyncio
 import logging
 import os
 import shutil
+import signal
 from typing import Any, Optional
 
 from mcp import ClientSession, StdioServerParameters
@@ -19,6 +21,8 @@
 
 logger = logging.getLogger(__name__)
 
+_TERMINATE_TIMEOUT = 2.0
+
 
 class StdioMCPClient(BaseMCPClient):
     """MCP client implementation using standard I/O transport.
@@ -87,6 +91,48 @@ async def init(self, is_fetch_tools: bool = True) -> None:
             await self.cleanup()
             raise Exception(f"Server {self.name} error")
 
+    async def _on_cross_task_cleanup(self) -> None:
+        """Terminate the MCP subprocess directly via signals.
+
+        Used as a fallback when the exit-stack teardown cannot run in the
+        original task.
+        """
+        process = self._find_stdio_process()
+        if process is None:
+            return
+
+        pid = process.pid
+        try:
+            os.killpg(os.getpgid(pid), signal.SIGTERM)
+        except (ProcessLookupError, PermissionError, OSError):
+            pass
+
+        try:
+            await asyncio.wait_for(process.wait(), timeout=_TERMINATE_TIMEOUT)
+        except asyncio.TimeoutError:
+            try:
+                os.killpg(os.getpgid(pid), signal.SIGKILL)
+            except (ProcessLookupError, PermissionError, OSError):
+                pass
+        except ProcessLookupError:
+            pass
+
+    def _find_stdio_process(self) -> Any:
+        """Walk the exit-stack callbacks to locate the anyio Process handle."""
+        for cb in reversed(self._exit_stack._exit_callbacks):
+            wrapper = getattr(cb[1], "__self__", None)
+            if wrapper is None:
+                continue
+            gen = getattr(wrapper, "gen", None)
+            if gen is None:
+                continue
+            frame = getattr(gen, "ag_frame", None) or getattr(gen, "gi_frame", None)
+            if frame and "process" in frame.f_locals:
+                proc = frame.f_locals["process"]
+                if hasattr(proc, "pid"):
+                    return proc
+        return None
+
     async def call_tool(self, tool_name: str, arguments: dict[str, Any], headers: Optional[dict[str, str]] = None) -> Any:
         server_params = await self.get_server_params()
         async with stdio_client(server_params) as streams: