tina-python 0.6.4__tar.gz → 0.6.6__tar.gz

{tina_python-0.6.4/tina_python.egg-info → tina_python-0.6.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tina-python
-Version: 0.6.4
+Version: 0.6.6
 Summary: tina is in your computer!
 Home-page: https://gitee.com/wang-churi/tina
 Author: 王出日
@@ -20,11 +20,14 @@ Requires-Dist: python-dotenv
 Provides-Extra: tui
 Requires-Dist: textual>=0.80; extra == "tui"
 Provides-Extra: mcp
-Requires-Dist: mcp-python; extra == "mcp"
+Requires-Dist: mcp; extra == "mcp"
 Provides-Extra: test
 Requires-Dist: pytest>=9.0; extra == "test"
 Requires-Dist: pytest-asyncio>=1.4; extra == "test"
 Requires-Dist: pytest-cov>=7.0; extra == "test"
+Provides-Extra: all
+Requires-Dist: textual>=0.80; extra == "all"
+Requires-Dist: mcp; extra == "all"
 Dynamic: author
 Dynamic: home-page
 Dynamic: license-file
@@ -47,6 +50,12 @@ pip install tina-python
 # 如果需要使用 MCP（模型上下文协议）服务
 pip install tina-python[mcp]
 
+# 如果需要 TUI 终端界面
+pip install tina-python[tui]
+
+# 一次装齐所有可选功能（TUI + MCP）
+pip install tina-python[all]
+
 # 如果需要运行测试
 pip install tina-python[test]
 ```
@@ -208,8 +217,9 @@ result = await llm.apredict(
     stream=False
 )
 
-# 异步流式
-async for chunk in llm.apredict(input_text="讲个故事", stream=True):
+# 异步流式：先 await 拿到异步生成器
+result = await llm.apredict(input_text="讲个故事", stream=True)
+async for chunk in result:
     print(chunk["content"], end="")
 ```
 
@@ -239,8 +249,6 @@ async for chunk in llm.apredict(input_text="讲个故事", stream=True):
 {
     "role": "assistant",
     "content": "回复内容",
-    # 推理模型时会出现
-    "reasoning_content": "推理链...",
     # 有工具调用时会出现
     "tool_calls": [
         {
@@ -252,7 +260,8 @@ async for chunk in llm.apredict(input_text="讲个故事", stream=True):
     ]
 }
 
-# 流式：逐块返回，格式与非流式一致
+# 流式：逐块返回片段，工具调用以 tool_name / tool_arguments 片段给出；
+# 推理模型的思维链在 reasoning_content 中，末尾可能带有 usage
 ```
 
 ### 1.8 获取可用模型列表
@@ -389,9 +398,12 @@ tool_calls = [
         }
     }
 ]
-results = tools.execute(tool_calls)
+# execute 需要事件对象（Agent 内部会自动传入）
+from tina import AgentEvents
+
+results = tools.execute(tool_calls, events=AgentEvents())
 # [
-#   {"role": "tool", "tool_call_id": "call_123", "name": "get_weather", "content": "北京今天天气晴朗"}
+#   {"role": "tool", "tool_call_id": "call_123", "tool_name": "get_weather", "content": "北京今天天气晴朗"}
 # ]
 ```
 
@@ -539,7 +551,7 @@ elif agent.state == AgentState.ERROR:
 # 获取消息列表
 messages = agent.get_messages()
 
-# 清空消息（保留系统提示词）
+# 清空全部消息（含系统提示词，之后需重新 set_system_prompt）
 agent.clear_messages()
 
 # 获取系统提示词
@@ -627,7 +639,7 @@ def on_turn_end():
 agent_a = Agent(llm=llm, tools=tools, name="agent_a")
 agent_b = Agent(llm=llm, tools=tools, name="agent_b")
 
-# 连接：共享消息列表
+# 关联另一个 Agent（记录到 other_agents，目前不会自动共享消息列表）
 agent_a.connect_agent(agent_b)
 
 # 断开连接
@@ -692,6 +704,8 @@ tina 支持通过 MCP（Model Context Protocol）连接外部工具生态。
 pip install tina-python[mcp]
 ```
 
+> 想一次装齐所有可选功能（TUI + MCP）：`pip install tina-python[all]`
+
 ### 4.2 使用 MCP 客户端
 
 ```python
@@ -884,8 +898,8 @@ from tina import Agent, Tools
 from tina.llm import BaseAPI
 from tina.utils.system_tools import system_tools
 
-tools = Tools()
-tools += system_tools  # 添加 tina 自带的系统工具包
+tools = Tools(name="my_tools")
+tools += system_tools  # 添加 tina 自带的系统工具包（工具集需命名）
 
 agent = Agent(
     llm=BaseAPI(),
@@ -987,7 +1001,7 @@ run_agent_in_cli(agent)
 |------|------|
 | `#context` | 查看当前对话上下文（消息列表） |
 | `#clear` | 清屏 |
-| `#exit` | 退出（或直接输入 `exit` / `quit`） |
+| `exit` / `quit` | 退出对话（`#exit` 不支持，会被当作普通输入） |
 
 ### 6.4 多模态消息构建器 `build_multimodal_message`
 
@@ -1077,7 +1091,7 @@ MAX_INPUT=8000
 | 用途 | 依赖 |
 |------|------|
 | 核心功能 | `httpx`, `python-dotenv` |
-| MCP 支持 | `mcp` (包名: `mcp-python`) |
+| MCP 支持 | `mcp` |
 | TUI 界面（可选） | `textual` |
 | 测试 | `pytest`, `pytest-asyncio`, `pytest-cov` |
 

{tina_python-0.6.4 → tina_python-0.6.6}/README.md

@@ -15,6 +15,12 @@ pip install tina-python
 # 如果需要使用 MCP（模型上下文协议）服务
 pip install tina-python[mcp]
 
+# 如果需要 TUI 终端界面
+pip install tina-python[tui]
+
+# 一次装齐所有可选功能（TUI + MCP）
+pip install tina-python[all]
+
 # 如果需要运行测试
 pip install tina-python[test]
 ```
@@ -176,8 +182,9 @@ result = await llm.apredict(
     stream=False
 )
 
-# 异步流式
-async for chunk in llm.apredict(input_text="讲个故事", stream=True):
+# 异步流式：先 await 拿到异步生成器
+result = await llm.apredict(input_text="讲个故事", stream=True)
+async for chunk in result:
     print(chunk["content"], end="")
 ```
 
@@ -207,8 +214,6 @@ async for chunk in llm.apredict(input_text="讲个故事", stream=True):
 {
     "role": "assistant",
     "content": "回复内容",
-    # 推理模型时会出现
-    "reasoning_content": "推理链...",
     # 有工具调用时会出现
     "tool_calls": [
         {
@@ -220,7 +225,8 @@ async for chunk in llm.apredict(input_text="讲个故事", stream=True):
     ]
 }
 
-# 流式：逐块返回，格式与非流式一致
+# 流式：逐块返回片段，工具调用以 tool_name / tool_arguments 片段给出；
+# 推理模型的思维链在 reasoning_content 中，末尾可能带有 usage
 ```
 
 ### 1.8 获取可用模型列表
@@ -357,9 +363,12 @@ tool_calls = [
         }
     }
 ]
-results = tools.execute(tool_calls)
+# execute 需要事件对象（Agent 内部会自动传入）
+from tina import AgentEvents
+
+results = tools.execute(tool_calls, events=AgentEvents())
 # [
-#   {"role": "tool", "tool_call_id": "call_123", "name": "get_weather", "content": "北京今天天气晴朗"}
+#   {"role": "tool", "tool_call_id": "call_123", "tool_name": "get_weather", "content": "北京今天天气晴朗"}
 # ]
 ```
 
@@ -507,7 +516,7 @@ elif agent.state == AgentState.ERROR:
 # 获取消息列表
 messages = agent.get_messages()
 
-# 清空消息（保留系统提示词）
+# 清空全部消息（含系统提示词，之后需重新 set_system_prompt）
 agent.clear_messages()
 
 # 获取系统提示词
@@ -595,7 +604,7 @@ def on_turn_end():
 agent_a = Agent(llm=llm, tools=tools, name="agent_a")
 agent_b = Agent(llm=llm, tools=tools, name="agent_b")
 
-# 连接：共享消息列表
+# 关联另一个 Agent（记录到 other_agents，目前不会自动共享消息列表）
 agent_a.connect_agent(agent_b)
 
 # 断开连接
@@ -660,6 +669,8 @@ tina 支持通过 MCP（Model Context Protocol）连接外部工具生态。
 pip install tina-python[mcp]
 ```
 
+> 想一次装齐所有可选功能（TUI + MCP）：`pip install tina-python[all]`
+
 ### 4.2 使用 MCP 客户端
 
 ```python
@@ -852,8 +863,8 @@ from tina import Agent, Tools
 from tina.llm import BaseAPI
 from tina.utils.system_tools import system_tools
 
-tools = Tools()
-tools += system_tools  # 添加 tina 自带的系统工具包
+tools = Tools(name="my_tools")
+tools += system_tools  # 添加 tina 自带的系统工具包（工具集需命名）
 
 agent = Agent(
     llm=BaseAPI(),
@@ -955,7 +966,7 @@ run_agent_in_cli(agent)
 |------|------|
 | `#context` | 查看当前对话上下文（消息列表） |
 | `#clear` | 清屏 |
-| `#exit` | 退出（或直接输入 `exit` / `quit`） |
+| `exit` / `quit` | 退出对话（`#exit` 不支持，会被当作普通输入） |
 
 ### 6.4 多模态消息构建器 `build_multimodal_message`
 
@@ -1045,7 +1056,7 @@ MAX_INPUT=8000
 | 用途 | 依赖 |
 |------|------|
 | 核心功能 | `httpx`, `python-dotenv` |
-| MCP 支持 | `mcp` (包名: `mcp-python`) |
+| MCP 支持 | `mcp` |
 | TUI 界面（可选） | `textual` |
 | 测试 | `pytest`, `pytest-asyncio`, `pytest-cov` |
 

{tina_python-0.6.4 → tina_python-0.6.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "tina-python"
-version = "0.6.4"
+version = "0.6.6"
 description = "tina is in your computer!"
 readme = { file = "README.md", content-type = "text/markdown" }
 requires-python = ">=3.10"
@@ -32,13 +32,17 @@ tui = [
     "textual>=0.80",
 ]
 mcp = [
-    "mcp-python", 
+    "mcp",
 ]
 test = [
     "pytest>=9.0",
     "pytest-asyncio>=1.4",
     "pytest-cov>=7.0",
 ]
+all = [
+    "textual>=0.80",
+    "mcp",
+]
 
 [tool.pytest.ini_options]
 testpaths = ["test"]

{tina_python-0.6.4 → tina_python-0.6.6}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="tina-python",
-    version="0.6.4",
+    version="0.6.6",
     packages=find_packages(),
     package_data={"tina": ["py.typed"]},
     install_requires=["httpx", "python-dotenv"],

{tina_python-0.6.4 → tina_python-0.6.6}/tina/__init__.py

@@ -19,4 +19,4 @@ __all__ = [
     "AgentState",
     "AgentEvents",
 ]
-__version__ = "0.6.4"
+__version__ = "0.6.6"

tina_python-0.6.6/tina/mcp/client.py

@@ -0,0 +1,364 @@
+import asyncio
+import concurrent.futures
+import json
+import uuid
+import threading
+from typing import Dict, List, Any, Optional, Union, Tuple
+from contextlib import AsyncExitStack
+from datetime import datetime
+from ..core import logger  # 假设你有统一的logger
+
+try:
+    from mcp import ClientSession, StdioServerParameters
+    from mcp.client.stdio import stdio_client
+    from mcp.client.sse import sse_client
+
+    MCP_AVAILABLE = True
+except ImportError:
+    MCP_AVAILABLE = False
+
+
+def _tool_input_schema(tool: Any) -> Dict[str, Any]:
+    """获取 MCP 工具的输入 schema，兼容 SDK 的字段改名
+
+    MCP Python SDK 早期版本用驼峰 `inputSchema`，新版本（pydantic 模型）改为
+    下划线 `input_schema`。这里两种都取，取不到返回空 dict。
+    """
+    schema = getattr(tool, "input_schema", None)
+    if schema is None:
+        schema = getattr(tool, "inputSchema", None)
+    return schema or {}
+
+
+def _normalize_property(prop: Any) -> Dict[str, Any]:
+    """将单个 MCP 属性 schema 归一化为 Tina/大模型友好的形式。
+
+    修复原先只保留 `type` 且缺省退化为 Python 类型名 ``"str"`` 的问题：
+    - 缺少顶层 `type` 时，从 enum / anyOf 推断，最后回退为 JSON Schema 的
+      ``"string"``，不再输出 ``"str"``；
+    - 保留 `enum` 等约束信息，避免模型失去取值范围；
+    - 将带 null 的 `anyOf`/`oneOf` 及 ``["string", "null"]`` 形式的 type
+      压平为 `type` + `nullable`，提升对不支持联合类型的模型兼容性。
+    """
+    prop = dict(prop) if isinstance(prop, dict) else {}
+    description = prop.get("description", "")
+
+    # 压平 nullable 联合类型（例如 zod 的 z.enum([...]).nullable()）
+    variants = prop.get("anyOf") or prop.get("oneOf")
+    if isinstance(variants, list):
+        non_null = [
+            v for v in variants if isinstance(v, dict) and v.get("type") != "null"
+        ]
+        has_null = any(
+            isinstance(v, dict) and v.get("type") == "null" for v in variants
+        )
+        if len(non_null) == 1 and has_null:
+            merged = dict(non_null[0])
+            merged.setdefault("description", description)
+            merged["nullable"] = True
+            return _normalize_property(merged)
+
+    # 压平 type 为数组的形式，如 ["string", "null"]
+    raw_type = prop.get("type")
+    if isinstance(raw_type, list):
+        types = [t for t in raw_type if t != "null"]
+        prop["nullable"] = prop.get("nullable", "null" in raw_type)
+        if len(types) == 1:
+            prop["type"] = types[0]
+        else:
+            prop.pop("type", None)
+
+    # 缺少 type 时从 enum 推断，否则回退 "string"（而非 Python 的 "str"）
+    if "type" not in prop:
+        values = prop.get("enum")
+        if isinstance(values, list) and values:
+            if all(isinstance(v, str) for v in values):
+                prop["type"] = "string"
+            elif all(
+                isinstance(v, (int, float)) and not isinstance(v, bool)
+                for v in values
+            ):
+                prop["type"] = "number"
+        elif not (
+            prop.get("anyOf") or prop.get("oneOf") or prop.get("$ref")
+        ):
+            prop["type"] = "string"
+
+    prop["description"] = description
+    return prop
+
+
+def _convert_input_schema(schema: Dict[str, Any]) -> Dict[str, Any]:
+    """将 MCP 工具的 input schema.properties 转为 Tina 工具参数格式"""
+    properties = schema.get("properties", {}) or {}
+    return {name: _normalize_property(prop) for name, prop in properties.items()}
+
+
+class MCPClient:
+    def __init__(self):
+        if not MCP_AVAILABLE:
+            raise ImportError("请先安装MCP依赖: pip install mcp")
+
+        self.servers = (
+            {}
+        )  # {server_id: {"session": s, "tools": [], "config": {}, "stop": Event}}
+        self.request_history = []
+        self._server_futures = {}  # {server_id: concurrent.futures.Future}
+        self.loop = asyncio.new_event_loop()
+        self._loop_is_running = False
+        self._lock = threading.Lock()  # 保护 servers 字典的线程安全
+
+        self.start_loop_thread()
+
+    def start_loop_thread(self):
+        """启动专用后台线程运行事件循环"""
+
+        def run_event_loop():
+            asyncio.set_event_loop(self.loop)
+            self._loop_is_running = True
+            try:
+                self.loop.run_forever()
+            finally:
+                # 最后的清理逻辑
+                self._loop_is_running = False
+                self.loop.close()
+
+        thread = threading.Thread(target=run_event_loop, daemon=True)
+        thread.start()
+
+    # --- 核心内部异步实现 ---
+
+    async def _serve_server(
+        self,
+        server_id: str,
+        config: Dict[str, Any],
+        ready: concurrent.futures.Future,
+    ) -> None:
+        """在同一个 task 内完成 MCP 会话的进入与退出。
+
+        mcp 2.x 基于 anyio，context 的进入/退出必须在同一个 task，
+        否则退出时会报 "Attempted to exit cancel scope in a different task"。
+        因此这里用一个常驻 task 持有会话，直到 stop 事件触发再统一关闭。
+        """
+        stack = AsyncExitStack()
+        stop = asyncio.Event()
+        try:
+            server_type = config.get("type", "").lower()
+            if server_type == "stdio":
+                params = StdioServerParameters(
+                    command=config["command"],
+                    args=config.get("args", []),
+                    env=config.get("env"),
+                )
+                transport = await stack.enter_async_context(stdio_client(params))
+                session = await stack.enter_async_context(
+                    ClientSession(transport[0], transport[1])
+                )
+            elif server_type == "sse":
+                transport = await stack.enter_async_context(sse_client(config["url"]))
+                session = await stack.enter_async_context(
+                    ClientSession(transport[0], transport[1])
+                )
+            else:
+                raise ValueError(f"Unsupported server type: {server_type}")
+
+            await session.initialize()
+            res = await session.list_tools()
+
+            with self._lock:
+                self.servers[server_id] = {
+                    "session": session,
+                    "tools": res.tools,
+                    "config": config,
+                    "added_at": datetime.now(),
+                    "stop": stop,
+                }
+
+            ready.set_result(True)
+            await stop.wait()
+        except Exception as e:
+            logger.error(f"MCP Server Error [{server_id}]: {e}")
+            if not ready.done():
+                ready.set_result(False)
+        finally:
+            with self._lock:
+                self.servers.pop(server_id, None)
+                self._server_futures.pop(server_id, None)
+            try:
+                await stack.aclose()
+            except Exception as e:
+                logger.error(f"MCP Cleanup Error [{server_id}]: {e}")
+
+    # --- 同步接口桥接 ---
+
+    def add_server(
+        self,
+        server_id: str,
+        config: Dict[str, Any],
+        max_retries: int = 1,
+        timeout: int = 90,
+    ) -> bool:
+        """添加并连接一个 MCP 服务器，失败时按 max_retries 重试"""
+        with self._lock:
+            if server_id in self.servers:
+                return True
+
+        for attempt in range(1, max(1, max_retries) + 1):
+            ready: concurrent.futures.Future = concurrent.futures.Future()
+            future = asyncio.run_coroutine_threadsafe(
+                self._serve_server(server_id, config, ready), self.loop
+            )
+            try:
+                ok = ready.result(timeout=timeout)
+            except Exception as e:
+                logger.error(f"Sync add_server timeout/error [{server_id}]: {e}")
+                ok = False
+
+            if ok:
+                with self._lock:
+                    self._server_futures[server_id] = future
+                return True
+
+            if attempt < max_retries:
+                logger.warning(
+                    f"MCP 添加服务器 '{server_id}' 第 {attempt} 次失败，重试中..."
+                )
+        return False
+
+    def remove_server(self, server_id: str, timeout: int = 10) -> bool:
+        """移除服务器并等待其资源（子进程/连接）释放"""
+        with self._lock:
+            info = self.servers.get(server_id)
+            if info is None:
+                return False
+            stop = info["stop"]
+            future = self._server_futures.get(server_id)
+
+        self.loop.call_soon_threadsafe(stop.set)
+        if future is not None:
+            try:
+                future.result(timeout=timeout)
+            except Exception as e:
+                logger.error(f"Sync remove_server timeout/error [{server_id}]: {e}")
+        return True
+
+    @staticmethod
+    def _format_server_info(server_id: str, info: Dict[str, Any]) -> Dict[str, Any]:
+        return {
+            "server_id": server_id,
+            "config": info["config"],
+            "tools": [t.name for t in info["tools"]],
+            "added_at": info["added_at"].isoformat(),
+        }
+
+    def get_server_info(
+        self, server_id: Optional[str] = None
+    ) -> Optional[Union[Dict[str, Any], List[Dict[str, Any]]]]:
+        """获取已连接 MCP 服务器的信息；不传 server_id 时返回全部"""
+        with self._lock:
+            if server_id is not None:
+                info = self.servers.get(server_id)
+                return self._format_server_info(server_id, info) if info else None
+            return [
+                self._format_server_info(sid, info)
+                for sid, info in self.servers.items()
+            ]
+
+    def call_tool(
+        self,
+        tool_name: str,
+        tool_args: Dict[str, Any],
+        server_id: Optional[str] = None,
+        timeout=60,
+    ):
+        future = asyncio.run_coroutine_threadsafe(
+            self._call_tool_async(tool_name, tool_args, server_id), self.loop
+        )
+        return future.result(timeout=timeout)
+
+    # --- 异步接口 (a开头，保持Tina风格) ---
+
+    async def acall_tool(
+        self, tool_name: str, tool_args: Dict[str, Any], server_id: Optional[str] = None
+    ):
+        return await self._call_tool_async(tool_name, tool_args, server_id)
+
+    async def _call_tool_async(
+        self, tool_name: str, tool_args: Dict[str, Any], server_id: Optional[str] = None
+    ):
+        target_sid = server_id
+        # 自动寻址逻辑
+        if not target_sid:
+            with self._lock:
+                for sid, info in self.servers.items():
+                    if any(t.name == tool_name for t in info["tools"]):
+                        target_sid = sid
+                        break
+
+        if not target_sid or target_sid not in self.servers:
+            return {"success": False, "error": f"Tool {tool_name} not found"}
+
+        session = self.servers[target_sid]["session"]
+        try:
+            # 记录历史
+            res = await session.call_tool(tool_name, tool_args)
+            # 这里统一处理结果，避免 TextContent 对象导致后续 JSON 序列化失败
+
+            history_item = {
+                "id": str(uuid.uuid4()),
+                "timestamp": datetime.now().isoformat(),
+                "tool": tool_name,
+                "server": target_sid,
+                "success": True,
+            }
+            self.request_history.append(history_item)
+
+            return {"success": True, "content": res.content, "server_id": target_sid}
+        except Exception as e:
+            return {"success": False, "error": str(e)}
+
+    def to_tina_tools(self):
+        """
+        将当前已连接的所有 MCP 工具转换为 Tina 格式
+        确保指定 name="mcp" 以避免 ToolsNotNamed 异常
+        """
+        from ..agent.core.tools import Tools
+
+        # 必须指定 name，这样 self.tools = _tools + self.tools 才能正常工作
+        tina_tools = Tools(name="mcp")
+
+        with self._lock:
+            for sid, info in self.servers.items():
+                for tool in info["tools"]:
+                    # 注意：Tina Tools 内部可能还会根据包名加一层前缀
+                    # 这里的 register_no_function 保持你习惯的格式
+                    schema = _tool_input_schema(tool)
+                    tina_tools.register_no_function(
+                        name=f"{sid}_{tool.name}",  # 外部包名是mcp，内部就是 mcp_sid_name
+                        description=f"[MCP:{sid}] {tool.description}",
+                        parameters=_convert_input_schema(schema),
+                        required_parameters=schema.get("required", []) or [],
+                    )
+        return tina_tools
+
+    def close(self):
+        """优雅关闭所有资源"""
+        if not self._loop_is_running:
+            return
+
+        with self._lock:
+            ids = list(self.servers.keys())
+
+        # 通知各 server 的常驻 task 退出，并在原 task 内完成资源清理
+        for sid in ids:
+            self.remove_server(sid)
+
+        self.loop.call_soon_threadsafe(self.loop.stop)
+
+    def __del__(self):
+        # 析构时尽量尝试静默关闭
+        try:
+            if hasattr(self, "loop") and self.loop.is_running():
+                self.loop.call_soon_threadsafe(self.loop.stop)
+        except:
+            pass

{tina_python-0.6.4 → tina_python-0.6.6}/tina/mcp/mcp_tools_executor.py

@@ -3,6 +3,15 @@ from ..core import logger
 from typing import Dict, Any
 
 
+def _content_to_text(result: Dict[str, Any]) -> str:
+    """将 MCP 返回的 TextContent 列表拼接为纯文本"""
+    parts = []
+    for item in result.get("content") or []:
+        text = getattr(item, "text", None)
+        parts.append(text if text is not None else str(item))
+    return "\n".join(parts)
+
+
 class MCPToolExecutor:
     """
     MCP工具执行器，用于执行MCP工具调用
@@ -36,7 +45,7 @@ class MCPToolExecutor:
                 logger.debug(
                     f"MCPToolExecutor - 工具 '{_tool_name}' 执行结果: {result}：参数 {_tool_args}"
                 )
-                return result["content"]
+                return _content_to_text(result)
             else:
                 logger.error(
                     f"MCPToolExecutor - 工具'{_tool_name}' 执行错误: {result.get('error', '未知错误')}"
@@ -57,7 +66,7 @@ class MCPToolExecutor:
                 logger.debug(
                     f"MCPToolExecutor - 工具 '{_tool_name}' 执行结果: {result}：参数 {_tool_args}"
                 )
-                return result["content"]
+                return _content_to_text(result)
             else:
                 logger.error(
                     f"MCPToolExecutor - 工具'{_tool_name}' 执行错误: {result.get('error', '未知错误')}"

{tina_python-0.6.4 → tina_python-0.6.6/tina_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tina-python
-Version: 0.6.4
+Version: 0.6.6
 Summary: tina is in your computer!
 Home-page: https://gitee.com/wang-churi/tina
 Author: 王出日
@@ -20,11 +20,14 @@ Requires-Dist: python-dotenv
 Provides-Extra: tui
 Requires-Dist: textual>=0.80; extra == "tui"
 Provides-Extra: mcp
-Requires-Dist: mcp-python; extra == "mcp"
+Requires-Dist: mcp; extra == "mcp"
 Provides-Extra: test
 Requires-Dist: pytest>=9.0; extra == "test"
 Requires-Dist: pytest-asyncio>=1.4; extra == "test"
 Requires-Dist: pytest-cov>=7.0; extra == "test"
+Provides-Extra: all
+Requires-Dist: textual>=0.80; extra == "all"
+Requires-Dist: mcp; extra == "all"
 Dynamic: author
 Dynamic: home-page
 Dynamic: license-file
@@ -47,6 +50,12 @@ pip install tina-python
 # 如果需要使用 MCP（模型上下文协议）服务
 pip install tina-python[mcp]
 
+# 如果需要 TUI 终端界面
+pip install tina-python[tui]
+
+# 一次装齐所有可选功能（TUI + MCP）
+pip install tina-python[all]
+
 # 如果需要运行测试
 pip install tina-python[test]
 ```
@@ -208,8 +217,9 @@ result = await llm.apredict(
     stream=False
 )
 
-# 异步流式
-async for chunk in llm.apredict(input_text="讲个故事", stream=True):
+# 异步流式：先 await 拿到异步生成器
+result = await llm.apredict(input_text="讲个故事", stream=True)
+async for chunk in result:
     print(chunk["content"], end="")
 ```
 
@@ -239,8 +249,6 @@ async for chunk in llm.apredict(input_text="讲个故事", stream=True):
 {
     "role": "assistant",
     "content": "回复内容",
-    # 推理模型时会出现
-    "reasoning_content": "推理链...",
     # 有工具调用时会出现
     "tool_calls": [
         {
@@ -252,7 +260,8 @@ async for chunk in llm.apredict(input_text="讲个故事", stream=True):
     ]
 }
 
-# 流式：逐块返回，格式与非流式一致
+# 流式：逐块返回片段，工具调用以 tool_name / tool_arguments 片段给出；
+# 推理模型的思维链在 reasoning_content 中，末尾可能带有 usage
 ```
 
 ### 1.8 获取可用模型列表
@@ -389,9 +398,12 @@ tool_calls = [
         }
     }
 ]
-results = tools.execute(tool_calls)
+# execute 需要事件对象（Agent 内部会自动传入）
+from tina import AgentEvents
+
+results = tools.execute(tool_calls, events=AgentEvents())
 # [
-#   {"role": "tool", "tool_call_id": "call_123", "name": "get_weather", "content": "北京今天天气晴朗"}
+#   {"role": "tool", "tool_call_id": "call_123", "tool_name": "get_weather", "content": "北京今天天气晴朗"}
 # ]
 ```
 
@@ -539,7 +551,7 @@ elif agent.state == AgentState.ERROR:
 # 获取消息列表
 messages = agent.get_messages()
 
-# 清空消息（保留系统提示词）
+# 清空全部消息（含系统提示词，之后需重新 set_system_prompt）
 agent.clear_messages()
 
 # 获取系统提示词
@@ -627,7 +639,7 @@ def on_turn_end():
 agent_a = Agent(llm=llm, tools=tools, name="agent_a")
 agent_b = Agent(llm=llm, tools=tools, name="agent_b")
 
-# 连接：共享消息列表
+# 关联另一个 Agent（记录到 other_agents，目前不会自动共享消息列表）
 agent_a.connect_agent(agent_b)
 
 # 断开连接
@@ -692,6 +704,8 @@ tina 支持通过 MCP（Model Context Protocol）连接外部工具生态。
 pip install tina-python[mcp]
 ```
 
+> 想一次装齐所有可选功能（TUI + MCP）：`pip install tina-python[all]`
+
 ### 4.2 使用 MCP 客户端
 
 ```python
@@ -884,8 +898,8 @@ from tina import Agent, Tools
 from tina.llm import BaseAPI
 from tina.utils.system_tools import system_tools
 
-tools = Tools()
-tools += system_tools  # 添加 tina 自带的系统工具包
+tools = Tools(name="my_tools")
+tools += system_tools  # 添加 tina 自带的系统工具包（工具集需命名）
 
 agent = Agent(
     llm=BaseAPI(),
@@ -987,7 +1001,7 @@ run_agent_in_cli(agent)
 |------|------|
 | `#context` | 查看当前对话上下文（消息列表） |
 | `#clear` | 清屏 |
-| `#exit` | 退出（或直接输入 `exit` / `quit`） |
+| `exit` / `quit` | 退出对话（`#exit` 不支持，会被当作普通输入） |
 
 ### 6.4 多模态消息构建器 `build_multimodal_message`
 
@@ -1077,7 +1091,7 @@ MAX_INPUT=8000
 | 用途 | 依赖 |
 |------|------|
 | 核心功能 | `httpx`, `python-dotenv` |
-| MCP 支持 | `mcp` (包名: `mcp-python`) |
+| MCP 支持 | `mcp` |
 | TUI 界面（可选） | `textual` |
 | 测试 | `pytest`, `pytest-asyncio`, `pytest-cov` |
 

{tina_python-0.6.4 → tina_python-0.6.6}/tina_python.egg-info/requires.txt

@@ -1,8 +1,12 @@
 httpx
 python-dotenv
 
+[all]
+textual>=0.80
+mcp
+
 [mcp]
-mcp-python
+mcp
 
 [test]
 pytest>=9.0

tina_python-0.6.4/tina/mcp/client.py

@@ -1,239 +0,0 @@
-import asyncio
-import json
-import uuid
-import threading
-from typing import Dict, List, Any, Optional, Union, Tuple
-from contextlib import AsyncExitStack
-from datetime import datetime
-from ..core import logger  # 假设你有统一的logger
-
-try:
-    from mcp import ClientSession, StdioServerParameters
-    from mcp.client.stdio import stdio_client
-    from mcp.client.sse import sse_client
-
-    MCP_AVAILABLE = True
-except ImportError:
-    MCP_AVAILABLE = False
-
-
-def _tool_input_schema(tool: Any) -> Dict[str, Any]:
-    """获取 MCP 工具的输入 schema，兼容 SDK 的字段改名
-
-    MCP Python SDK 早期版本用驼峰 `inputSchema`，新版本（pydantic 模型）改为
-    下划线 `input_schema`。这里两种都取，取不到返回空 dict。
-    """
-    schema = getattr(tool, "input_schema", None)
-    if schema is None:
-        schema = getattr(tool, "inputSchema", None)
-    return schema or {}
-
-
-class MCPClient:
-    def __init__(self):
-        if not MCP_AVAILABLE:
-            raise ImportError("请先安装MCP依赖: pip install mcp-python")
-
-        self.servers = (
-            {}
-        )  # {server_id: {"session": s, "stack": stack, "tools": [], "config": {}}}
-        self.request_history = []
-        self.loop = asyncio.new_event_loop()
-        self._loop_is_running = False
-        self._lock = threading.Lock()  # 保护 servers 字典的线程安全
-
-        self.start_loop_thread()
-
-    def start_loop_thread(self):
-        """启动专用后台线程运行事件循环"""
-
-        def run_event_loop():
-            asyncio.set_event_loop(self.loop)
-            self._loop_is_running = True
-            try:
-                self.loop.run_forever()
-            finally:
-                # 最后的清理逻辑
-                self._loop_is_running = False
-                self.loop.close()
-
-        thread = threading.Thread(target=run_event_loop, daemon=True)
-        thread.start()
-
-    # --- 核心内部异步实现 (解决资源残留) ---
-
-    async def _add_server_async(self, server_id: str, config: Dict[str, Any]) -> bool:
-        if server_id in self.servers:
-            return True
-
-        # 为每个 Server 创建独立的 Stack
-        stack = AsyncExitStack()
-        try:
-            server_type = config.get("type", "").lower()
-            if server_type == "stdio":
-                params = StdioServerParameters(
-                    command=config["command"],
-                    args=config.get("args", []),
-                    env=config.get("env"),
-                )
-                # 进入 stdio 上下文 (管理子进程)
-                transport = await stack.enter_async_context(stdio_client(params))
-                # 进入 session 上下文 (管理协议)
-                session = await stack.enter_async_context(
-                    ClientSession(transport[0], transport[1])
-                )
-            elif server_type == "sse":
-                transport = await stack.enter_async_context(sse_client(config["url"]))
-                session = await stack.enter_async_context(
-                    ClientSession(transport[0], transport[1])
-                )
-            else:
-                raise ValueError(f"Unsupported server type: {server_type}")
-
-            await session.initialize()
-            res = await session.list_tools()
-
-            with self._lock:
-                self.servers[server_id] = {
-                    "session": session,
-                    "stack": stack,  # 这里的 stack 包含了这个 server 的所有资源
-                    "tools": res.tools,
-                    "config": config,
-                    "added_at": datetime.now(),
-                }
-            return True
-        except Exception as e:
-            await stack.aclose()  # 出错时立即清理已打开的资源
-            logger.error(f"MCP Add Server Error [{server_id}]: {e}")
-            return False
-
-    async def _close_server_async(self, server_id: str) -> bool:
-        """物理杀掉子进程并移除服务器"""
-        with self._lock:
-            server_info = self.servers.pop(server_id, None)
-
-        if server_info:
-            # 这一步是关键：调用 stack.aclose() 会按相反顺序关闭 session 和 transport
-            # 对于 stdio 来说，这会发送信号给子进程并等待其退出
-            await server_info["stack"].aclose()
-            return True
-        return False
-
-    # --- 同步接口桥接 ---
-
-    def add_server(self, server_id: str, config: Dict[str, Any], timeout=30) -> bool:
-        future = asyncio.run_coroutine_threadsafe(
-            self._add_server_async(server_id, config), self.loop
-        )
-        try:
-            return future.result(timeout=timeout)
-        except Exception as e:
-            logger.error(f"Sync add_server timeout/error: {e}")
-            return False
-
-    def call_tool(
-        self,
-        tool_name: str,
-        tool_args: Dict[str, Any],
-        server_id: Optional[str] = None,
-        timeout=60,
-    ):
-        future = asyncio.run_coroutine_threadsafe(
-            self._call_tool_async(tool_name, tool_args, server_id), self.loop
-        )
-        return future.result(timeout=timeout)
-
-    # --- 异步接口 (a开头，保持Tina风格) ---
-
-    async def acall_tool(
-        self, tool_name: str, tool_args: Dict[str, Any], server_id: Optional[str] = None
-    ):
-        return await self._call_tool_async(tool_name, tool_args, server_id)
-
-    async def _call_tool_async(
-        self, tool_name: str, tool_args: Dict[str, Any], server_id: Optional[str] = None
-    ):
-        target_sid = server_id
-        # 自动寻址逻辑
-        if not target_sid:
-            with self._lock:
-                for sid, info in self.servers.items():
-                    if any(t.name == tool_name for t in info["tools"]):
-                        target_sid = sid
-                        break
-
-        if not target_sid or target_sid not in self.servers:
-            return {"success": False, "error": f"Tool {tool_name} not found"}
-
-        session = self.servers[target_sid]["session"]
-        try:
-            # 记录历史
-            res = await session.call_tool(tool_name, tool_args)
-            # 这里统一处理结果，避免 TextContent 对象导致后续 JSON 序列化失败
-
-            history_item = {
-                "id": str(uuid.uuid4()),
-                "timestamp": datetime.now().isoformat(),
-                "tool": tool_name,
-                "server": target_sid,
-                "success": True,
-            }
-            self.request_history.append(history_item)
-
-            return {"success": True, "content": res.content, "server_id": target_sid}
-        except Exception as e:
-            return {"success": False, "error": str(e)}
-
-    def to_tina_tools(self):
-        """
-        将当前已连接的所有 MCP 工具转换为 Tina 格式
-        确保指定 name="mcp" 以避免 ToolsNotNamed 异常
-        """
-        from ..agent.core.tools import Tools
-
-        # 必须指定 name，这样 self.tools = _tools + self.tools 才能正常工作
-        tina_tools = Tools(name="mcp")
-
-        with self._lock:
-            for sid, info in self.servers.items():
-                for tool in info["tools"]:
-                    # 注意：Tina Tools 内部可能还会根据包名加一层前缀
-                    # 这里的 register_no_function 保持你习惯的格式
-                    schema = _tool_input_schema(tool)
-                    properties = schema.get("properties", {}) or {}
-                    tina_tools.register_no_function(
-                        name=f"{sid}_{tool.name}",  # 外部包名是mcp，内部就是 mcp_sid_name
-                        description=f"[MCP:{sid}] {tool.description}",
-                        parameters={
-                            k: {
-                                "type": v.get("type", "str"),
-                                "description": v.get("description", ""),
-                            }
-                            for k, v in properties.items()
-                        },
-                        required_parameters=schema.get("required", []) or [],
-                    )
-        return tina_tools
-
-    def close(self):
-        """优雅关闭所有资源"""
-        if self._loop_is_running:
-            # 获取所有服务器 ID
-            with self._lock:
-                ids = list(self.servers.keys())
-
-            # 提交清理任务
-            tasks = [self._close_server_async(sid) for sid in ids]
-            future = asyncio.run_coroutine_threadsafe(asyncio.gather(*tasks), self.loop)
-            future.result(timeout=10)
-
-            # 停止循环
-            self.loop.call_soon_threadsafe(self.loop.stop)
-
-    def __del__(self):
-        # 析构时尽量尝试静默关闭
-        try:
-            if hasattr(self, "loop") and self.loop.is_running():
-                self.loop.call_soon_threadsafe(self.loop.stop)
-        except:
-            pass