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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tina-python
-Version: 0.6.6
+Version: 0.6.8
 Summary: tina is in your computer!
 Home-page: https://gitee.com/wang-churi/tina
 Author: 王出日
@@ -20,14 +20,14 @@ Requires-Dist: python-dotenv
 Provides-Extra: tui
 Requires-Dist: textual>=0.80; extra == "tui"
 Provides-Extra: mcp
-Requires-Dist: mcp; extra == "mcp"
+Requires-Dist: mcp>=2.0; 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"
+Requires-Dist: mcp>=2.0; extra == "all"
 Dynamic: author
 Dynamic: home-page
 Dynamic: license-file
@@ -716,23 +716,31 @@ mcp = MCPClient()
 # 添加 stdio 类型 MCP 服务
 mcp.add_server(
     server_id="playwright",
-    config={
-        "type": "stdio",
-        "command": "npx",
-        "args": ["@playwright/mcp@latest"]
-    }
+    type="stdio",
+    command="npx",
+    args=["@playwright/mcp@latest"],
 )
 
-# 添加 SSE 类型 MCP 服务
+# 添加 Streamable HTTP 类型 MCP 服务（推荐，取代旧 SSE）
 mcp.add_server(
     server_id="my-service",
-    config={
-        "type": "sse",
-        "url": "http://localhost:8080/sse"
-    }
+    type="http",  # 也支持 streamable_http / streamableHttp
+    url="http://localhost:8080/mcp",
+    headers={"Authorization": "Bearer YOUR_API_KEY"},  # 可选
+)
+
+# 添加 SSE 类型 MCP 服务（旧传输，仍兼容）
+mcp.add_server(
+    server_id="my-legacy-service",
+    type="sse",
+    url="http://localhost:8080/sse",
+    headers={"Authorization": "Bearer YOUR_API_KEY"},  # 可选
 )
 ```
 
+> `type` 为必填项，用于区分传输类型；`command`/`args`/`env` 与 `url`/`headers`
+> 分别对应 stdio 与远程类型，编辑器会根据 `type` 给出对应的参数提示。
+
 ### 4.3 在 Agent 中使用 MCP
 
 ```python
@@ -743,11 +751,9 @@ from tina.mcp import MCPClient
 mcp = MCPClient()
 mcp.add_server(
     server_id="playwright",
-    config={
-        "type": "stdio",
-        "command": "npx",
-        "args": ["@playwright/mcp@latest"]
-    }
+    type="stdio",
+    command="npx",
+    args=["@playwright/mcp@latest"],
 )
 
 llm = BaseAPI()
@@ -768,8 +774,8 @@ for chunk in result:
 ### 4.4 MCP 服务管理
 
 ```python
-# 添加服务
-agent.add_mcp_server("server_id", config)
+# 添加服务（参数与 MCPClient.add_server 一致）
+agent.add_mcp_server("server_id", type="http", url="http://localhost:8080/mcp")
 
 # 移除服务
 agent.remove_mcp_server("server_id")

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

@@ -681,23 +681,31 @@ mcp = MCPClient()
 # 添加 stdio 类型 MCP 服务
 mcp.add_server(
     server_id="playwright",
-    config={
-        "type": "stdio",
-        "command": "npx",
-        "args": ["@playwright/mcp@latest"]
-    }
+    type="stdio",
+    command="npx",
+    args=["@playwright/mcp@latest"],
 )
 
-# 添加 SSE 类型 MCP 服务
+# 添加 Streamable HTTP 类型 MCP 服务（推荐，取代旧 SSE）
 mcp.add_server(
     server_id="my-service",
-    config={
-        "type": "sse",
-        "url": "http://localhost:8080/sse"
-    }
+    type="http",  # 也支持 streamable_http / streamableHttp
+    url="http://localhost:8080/mcp",
+    headers={"Authorization": "Bearer YOUR_API_KEY"},  # 可选
+)
+
+# 添加 SSE 类型 MCP 服务（旧传输，仍兼容）
+mcp.add_server(
+    server_id="my-legacy-service",
+    type="sse",
+    url="http://localhost:8080/sse",
+    headers={"Authorization": "Bearer YOUR_API_KEY"},  # 可选
 )
 ```
 
+> `type` 为必填项，用于区分传输类型；`command`/`args`/`env` 与 `url`/`headers`
+> 分别对应 stdio 与远程类型，编辑器会根据 `type` 给出对应的参数提示。
+
 ### 4.3 在 Agent 中使用 MCP
 
 ```python
@@ -708,11 +716,9 @@ from tina.mcp import MCPClient
 mcp = MCPClient()
 mcp.add_server(
     server_id="playwright",
-    config={
-        "type": "stdio",
-        "command": "npx",
-        "args": ["@playwright/mcp@latest"]
-    }
+    type="stdio",
+    command="npx",
+    args=["@playwright/mcp@latest"],
 )
 
 llm = BaseAPI()
@@ -733,8 +739,8 @@ for chunk in result:
 ### 4.4 MCP 服务管理
 
 ```python
-# 添加服务
-agent.add_mcp_server("server_id", config)
+# 添加服务（参数与 MCPClient.add_server 一致）
+agent.add_mcp_server("server_id", type="http", url="http://localhost:8080/mcp")
 
 # 移除服务
 agent.remove_mcp_server("server_id")

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

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

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

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

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

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

{tina_python-0.6.6 → tina_python-0.6.8}/tina/agent/agent.py

@@ -10,7 +10,17 @@ Agent类：基础智能体类，默认支持API调用
 from __future__ import annotations
 
 import re
-from typing import List, Literal, Union, Generator, Dict, Any, AsyncGenerator, overload
+from typing import (
+    List,
+    Literal,
+    Union,
+    Generator,
+    Dict,
+    Any,
+    Optional,
+    AsyncGenerator,
+    overload,
+)
 
 from tina.agent.core.agent_response import AgentResponse, ToolCall
 from tina.agent.core.state import AgentState
@@ -18,7 +28,7 @@ from tina.agent.core.state import AgentState
 from ..llm.base_api import BaseAPI
 from .core.tools import Tools
 from .core.keyword_actions import KeywordActions
-from ..mcp.client import MCPClient
+from ..mcp.client import MCPClient, RemoteType, StdioType
 from .core.prompt import Prompt
 from .core.context_manager import ContextManager
 from .core.agent_runtime import ToolCallingAgentRuntime, BaseAgentRuntime
@@ -466,19 +476,69 @@ class Agent:
     def get_tools_call(self) -> list:
         return self.context_manager.get_tool_calls()
 
+    @overload
+    def add_mcp_server(
+        self,
+        server_id: str,
+        *,
+        type: StdioType,
+        command: str,
+        args: Optional[List[str]] = None,
+        env: Optional[Dict[str, str]] = None,
+        max_retries: int = 3,
+        timeout: int = 90,
+    ) -> bool: ...
+
+    @overload
     def add_mcp_server(
-        self, server_id: str, config: Dict[str, Any], max_retries=3, timeout=90
+        self,
+        server_id: str,
+        *,
+        type: RemoteType,
+        url: str,
+        headers: Optional[Dict[str, str]] = None,
+        max_retries: int = 3,
+        timeout: int = 90,
+    ) -> bool: ...
+
+    def add_mcp_server(
+        self,
+        server_id: str,
+        *,
+        type: str,
+        command: Optional[str] = None,
+        args: Optional[List[str]] = None,
+        env: Optional[Dict[str, str]] = None,
+        url: Optional[str] = None,
+        headers: Optional[Dict[str, str]] = None,
+        max_retries: int = 3,
+        timeout: int = 90,
     ) -> bool:
         """
         添加MCP服务器
         Args:
             server_id:服务器ID
-            config:服务器配置
+            type:传输类型（`stdio` / `sse` / `http`）
+            command:`stdio` 类型的启动命令
+            args:`stdio` 类型的命令参数
+            env:`stdio` 类型的环境变量
+            url:`sse` / `http` 类型的服务地址
+            headers:`sse` / `http` 类型的请求头
             max_retries:最大重试次数
             timeout:超时时间
         """
         if self.mcp_client is not None:
-            return self.mcp_client.add_server(server_id, config, max_retries, timeout)
+            return self.mcp_client.add_server(
+                server_id,
+                type=type,
+                command=command,
+                args=args,
+                env=env,
+                url=url,
+                headers=headers,
+                max_retries=max_retries,
+                timeout=timeout,
+            )
         else:
             raise ValueError("MCP客户端未初始化，请先初始化MCP客户端")
 

{tina_python-0.6.6 → tina_python-0.6.8}/tina/mcp/client.py

@@ -3,7 +3,16 @@ import concurrent.futures
 import json
 import uuid
 import threading
-from typing import Dict, List, Any, Optional, Union, Tuple
+from typing import (
+    Dict,
+    List,
+    Any,
+    Optional,
+    Union,
+    Tuple,
+    Literal,
+    overload,
+)
 from contextlib import AsyncExitStack
 from datetime import datetime
 from ..core import logger  # 假设你有统一的logger
@@ -12,12 +21,78 @@ try:
     from mcp import ClientSession, StdioServerParameters
     from mcp.client.stdio import stdio_client
     from mcp.client.sse import sse_client
+    from mcp.client.streamable_http import (
+        streamable_http_client,
+        create_mcp_http_client,
+    )
 
     MCP_AVAILABLE = True
 except ImportError:
     MCP_AVAILABLE = False
 
 
+# 远程传输类型别名：Streamable HTTP 在不同客户端里叫法不一，这里统一归一化。
+# 官方新规范为 Streamable HTTP，`sse` 为旧版（已废弃）传输。
+_REMOTE_TYPE_ALIASES = {
+    "sse": "sse",
+    "http": "http",
+    "https": "http",
+    "streamable_http": "http",
+    "streamablehttp": "http",
+    "streamable-http": "http",
+}
+
+
+def _normalize_server_type(server_type: str) -> str:
+    return _REMOTE_TYPE_ALIASES.get(str(server_type).lower(), str(server_type).lower())
+
+
+StdioType = Literal["stdio"]
+RemoteType = Literal[
+    "sse",
+    "http",
+    "https",
+    "streamable_http",
+    "streamableHttp",
+    "streamable-http",
+]
+
+
+def _build_server_config(
+    server_type: str,
+    *,
+    command: Optional[str] = None,
+    args: Optional[List[str]] = None,
+    env: Optional[Dict[str, str]] = None,
+    url: Optional[str] = None,
+    headers: Optional[Dict[str, str]] = None,
+) -> Dict[str, Any]:
+    """把扁平化参数组装为内部 config 字典，并做必要校验。"""
+    stype = _normalize_server_type(server_type)
+    if stype == "stdio":
+        if not command:
+            raise ValueError("stdio 类型必须提供 command 参数")
+        config: Dict[str, Any] = {
+            "type": "stdio",
+            "command": command,
+            "args": list(args) if args else [],
+        }
+        if env:
+            config["env"] = dict(env)
+        return config
+    if stype in ("sse", "http"):
+        if not url:
+            raise ValueError(f"{server_type} 类型必须提供 url 参数")
+        config = {"type": stype, "url": url}
+        if headers:
+            config["headers"] = dict(headers)
+        return config
+    raise ValueError(
+        f"Unsupported server type: {server_type} "
+        f"(supported: stdio, sse, http/streamable_http)"
+    )
+
+
 def _tool_input_schema(tool: Any) -> Dict[str, Any]:
     """获取 MCP 工具的输入 schema，兼容 SDK 的字段改名
 
@@ -143,7 +218,8 @@ class MCPClient:
         stack = AsyncExitStack()
         stop = asyncio.Event()
         try:
-            server_type = config.get("type", "").lower()
+            server_type = _normalize_server_type(config.get("type", ""))
+            headers = config.get("headers") or None
             if server_type == "stdio":
                 params = StdioServerParameters(
                     command=config["command"],
@@ -155,12 +231,28 @@ class MCPClient:
                     ClientSession(transport[0], transport[1])
                 )
             elif server_type == "sse":
-                transport = await stack.enter_async_context(sse_client(config["url"]))
+                transport = await stack.enter_async_context(
+                    sse_client(config["url"], headers=headers)
+                )
+                session = await stack.enter_async_context(
+                    ClientSession(transport[0], transport[1])
+                )
+            elif server_type == "http":
+                # Streamable HTTP：单端点，取代旧的 SSE 传输。
+                # headers 需通过预配置的 httpx 客户端传入；该客户端由 stack 负责关闭。
+                http_client = create_mcp_http_client(headers=headers)
+                await stack.enter_async_context(http_client)
+                transport = await stack.enter_async_context(
+                    streamable_http_client(config["url"], http_client=http_client)
+                )
                 session = await stack.enter_async_context(
                     ClientSession(transport[0], transport[1])
                 )
             else:
-                raise ValueError(f"Unsupported server type: {server_type}")
+                raise ValueError(
+                    f"Unsupported server type: {server_type} "
+                    f"(supported: stdio, sse, http/streamable_http)"
+                )
 
             await session.initialize()
             res = await session.list_tools()
@@ -191,14 +283,61 @@ class MCPClient:
 
     # --- 同步接口桥接 ---
 
+    @overload
     def add_server(
         self,
         server_id: str,
-        config: Dict[str, Any],
+        *,
+        type: StdioType,
+        command: str,
+        args: Optional[List[str]] = None,
+        env: Optional[Dict[str, str]] = None,
+        max_retries: int = 1,
+        timeout: int = 90,
+    ) -> bool: ...
+
+    @overload
+    def add_server(
+        self,
+        server_id: str,
+        *,
+        type: RemoteType,
+        url: str,
+        headers: Optional[Dict[str, str]] = None,
+        max_retries: int = 1,
+        timeout: int = 90,
+    ) -> bool: ...
+
+    def add_server(
+        self,
+        server_id: str,
+        *,
+        type: str,
+        command: Optional[str] = None,
+        args: Optional[List[str]] = None,
+        env: Optional[Dict[str, str]] = None,
+        url: Optional[str] = None,
+        headers: Optional[Dict[str, str]] = None,
         max_retries: int = 1,
         timeout: int = 90,
     ) -> bool:
-        """添加并连接一个 MCP 服务器，失败时按 max_retries 重试"""
+        """添加并连接一个 MCP 服务器，失败时按 max_retries 重试。
+
+        参数按传输类型扁平化：
+
+        - ``type="stdio"``：需要 ``command``，可选 ``args`` / ``env``。
+        - ``type="http"``（或 ``streamable_http`` 等别名）/ ``type="sse"``：
+          需要 ``url``，可选 ``headers``。
+        """
+        config = _build_server_config(
+            type,
+            command=command,
+            args=args,
+            env=env,
+            url=url,
+            headers=headers,
+        )
+
         with self._lock:
             if server_id in self.servers:
                 return True

{tina_python-0.6.6 → tina_python-0.6.8}/tina/utils/tui/context_manager.py

@@ -378,8 +378,9 @@ class TuiMessageStore:
         index = chunk.get("tool_index")
 
         if index is not None:
-            # 并发调用：按 index 定位，绝不按名字串到别的调用上
-            block = self._tool_by_index.get(index)
+            # 并发调用：按 index 定位，绝不按名字串到别的调用上。
+            # 已完成的旧卡片不复用（每次 LLM 响应的 index 都从 0 重新开始）
+            block = self._routed_tool_by_index(index)
             if block is None:
                 block = self._start_tool(name or "unknown", index=index)
         else:
@@ -403,7 +404,7 @@ class TuiMessageStore:
             index = call.get("index")
             call_id = call.get("id")
 
-            block = self._tool_by_index.get(index) if index is not None else None
+            block = self._routed_tool_by_index(index)
             if block is None and call_id:
                 block = self._tool_by_id.get(call_id)
             if block is None and name:
@@ -449,6 +450,20 @@ class TuiMessageStore:
         self._notify("update", block)
         return block
 
+    @staticmethod
+    def _is_active_tool(block: TuiBlock | None) -> bool:
+        """工具卡片是否仍在进行中（可用于承接后续流式片段）"""
+        return block is not None and block["status"] in ("building", "calling")
+
+    def _routed_tool_by_index(self, index: int | None) -> TuiBlock | None:
+        """按 index 取当前轮次的工具卡片；已完成的不复用，避免跨轮次串卡"""
+        if index is None:
+            return None
+        block = self._tool_by_index.get(index)
+        if not self._is_active_tool(block):
+            return None
+        return block
+
     def _start_tool(
         self, name: str, index: int | None = None, tool_id: str | None = None
     ) -> TuiBlock: