jarvis-ai-assistant 0.3.13__tar.gz → 0.3.15__tar.gz

{jarvis_ai_assistant-0.3.13/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.3.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.3.13
+Version: 0.3.15
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire

{jarvis_ai_assistant-0.3.13 → jarvis_ai_assistant-0.3.15}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.3.13"
+version = "0.3.15"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "skyfire", email = "skyfireitdiy@hotmail.com" }]

{jarvis_ai_assistant-0.3.13 → jarvis_ai_assistant-0.3.15}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages  # type: ignore
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.3.13",
+    version="0.3.15",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",

{jarvis_ai_assistant-0.3.13 → jarvis_ai_assistant-0.3.15}/src/jarvis/__init__.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 """Jarvis AI Assistant"""
 
-__version__ = "0.3.13"
+__version__ = "0.3.15"

{jarvis_ai_assistant-0.3.13 → jarvis_ai_assistant-0.3.15}/src/jarvis/jarvis_agent/__init__.py

@@ -51,10 +51,12 @@ from jarvis.jarvis_utils.globals import (
 )
 from jarvis.jarvis_utils.input import get_multiline_input, user_confirm
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
-from jarvis.jarvis_utils.tag import ct, ot
+from jarvis.jarvis_utils.tag import ot
 
 
-def show_agent_startup_stats(agent_name: str, model_name: str) -> None:
+def show_agent_startup_stats(
+    agent_name: str, model_name: str, tool_registry_instance: Optional[Any] = None
+) -> None:
     """输出启动时的统计信息
 
     参数:
@@ -87,8 +89,11 @@ def show_agent_startup_stats(agent_name: str, model_name: str) -> None:
         total_tool_count = len(tool_registry_all.tools)
 
         # 获取可用工具的数量（应用过滤）
-        tool_registry = ToolRegistry()
-        available_tool_count = len(tool_registry.get_all_tools())
+        if tool_registry_instance is not None:
+            available_tool_count = len(tool_registry_instance.get_all_tools())
+        else:
+            tool_registry = ToolRegistry()
+            available_tool_count = len(tool_registry.get_all_tools())
 
         global_memory_dir = Path(get_data_dir()) / "memory" / "global_long_term"
         global_memory_count = 0
@@ -188,7 +193,12 @@ class Agent:
 
     def __del__(self):
         # 只有在记录启动时才停止记录
-        delete_agent(self.name)
+        try:
+            name = getattr(self, "name", None)
+            if name:
+                delete_agent(name)
+        except Exception:
+            pass
 
     def get_tool_usage_prompt(self) -> str:
         """获取工具使用提示"""
@@ -203,8 +213,8 @@ class Agent:
         model_group: Optional[str] = None,
         summary_prompt: Optional[str] = None,
         auto_complete: bool = False,
-        output_handler: List[OutputHandlerProtocol] = [],
-        use_tools: List[str] = [],
+        output_handler: Optional[List[OutputHandlerProtocol]] = None,
+        use_tools: Optional[List[str]] = None,
         input_handler: Optional[List[Callable[[str, Any], Tuple[str, bool]]]] = None,
         execute_tool_confirm: Optional[bool] = None,
         need_summary: bool = True,
@@ -212,7 +222,7 @@ class Agent:
         use_methodology: Optional[bool] = None,
         use_analysis: Optional[bool] = None,
         force_save_memory: Optional[bool] = None,
-        files: List[str] = [],
+        files: Optional[List[str]] = None,
     ):
         """初始化Jarvis Agent实例
 
@@ -225,7 +235,6 @@ class Agent:
             auto_complete: 是否自动完成任务
             output_handler: 输出处理器列表
             input_handler: 输入处理器列表
-            max_context_length: 最大上下文长度
             execute_tool_confirm: 执行工具前是否需要确认
             need_summary: 是否需要生成总结
             multiline_inputer: 多行输入处理器
@@ -234,7 +243,7 @@ class Agent:
             force_save_memory: 是否强制保存记忆
         """
         # 基础属性初始化
-        self.files = files
+        self.files = files or []
         self.name = make_agent_name(name)
         self.description = description
         self.system_prompt = system_prompt
@@ -250,7 +259,15 @@ class Agent:
         self._init_session()
 
         # 初始化处理器
-        self._init_handlers(output_handler, input_handler, multiline_inputer, use_tools)
+        safe_output_handlers: List[OutputHandlerProtocol] = []
+        if output_handler:
+            safe_output_handlers = output_handler
+        safe_use_tools: List[str] = []
+        if use_tools:
+            safe_use_tools = use_tools
+        self._init_handlers(
+            safe_output_handlers, input_handler, multiline_inputer, safe_use_tools
+        )
 
         # 初始化配置
         self._init_config(
@@ -271,7 +288,7 @@ class Agent:
         self._setup_system_prompt()
 
         # 输出统计信息（包含欢迎信息）
-        show_agent_startup_stats(name, self.model.name())  # type: ignore
+        show_agent_startup_stats(name, self.model.name(), self.get_tool_registry())  # type: ignore
 
     def _init_model(self, llm_type: str, model_group: Optional[str]):
         """初始化模型平台"""
@@ -528,7 +545,7 @@ class Agent:
 
         该方法将:
         1. 提示用户保存重要记忆
-        2. 调用_generate_summary生成摘要
+        2. 调用 generate_summary 生成摘要
         3. 清除对话历史
         4. 保留系统消息
         5. 添加摘要作为新上下文
@@ -566,6 +583,8 @@ class Agent:
         # 清理历史（但不清理prompt，因为prompt会在builtin_input_handler中设置）
         if self.model:
             self.model.reset()
+            # 重置后重新设置系统提示词，确保系统约束仍然生效
+            self._setup_system_prompt()
         # 重置会话
         self.session.clear_history()
 

{jarvis_ai_assistant-0.3.13 → jarvis_ai_assistant-0.3.15}/src/jarvis/jarvis_code_agent/code_agent.py

@@ -68,13 +68,15 @@ class CodeAgent:
             "retrieve_memory",
             "clear_memory",
         ]
-        
+
         if append_tools:
-            additional_tools = [tool.strip() for tool in append_tools.split(",")]
+            additional_tools = [
+                t for t in (tool.strip() for tool in append_tools.split(",")) if t
+            ]
             base_tools.extend(additional_tools)
             # 去重
             base_tools = list(dict.fromkeys(base_tools))
-            
+
         tool_registry.use_tools(base_tools)
         code_system_prompt = self._get_system_prompt()
         self.agent = Agent(
@@ -231,18 +233,21 @@ class CodeAgent:
                 else:
                     print("ℹ️ .jarvis已在.gitignore中")
 
-    def _handle_git_changes(self) -> None:
+    def _handle_git_changes(self, prefix: str, suffix: str) -> None:
         """处理git仓库中的未提交修改"""
         print("🔄 正在检查未提交的修改...")
         if has_uncommitted_changes():
             print("⏳ 发现未提交修改，正在处理...")
             git_commiter = GitCommitTool()
-            git_commiter.execute({})
+            git_commiter.execute({
+                "prefix": prefix,
+                "suffix": suffix
+            })
             print("✅ 未提交修改已处理完成")
         else:
             print("✅ 没有未提交的修改")
 
-    def _init_env(self) -> None:
+    def _init_env(self, prefix: str, suffix: str) -> None:
         """初始化环境，组合以下功能：
         1. 查找git根目录
         2. 检查并更新.gitignore文件
@@ -252,7 +257,7 @@ class CodeAgent:
         print("🚀 正在初始化环境...")
         git_dir = self._find_git_root()
         self._update_gitignore(git_dir)
-        self._handle_git_changes()
+        self._handle_git_changes(prefix, suffix)
         # 配置git对换行符变化不敏感
         self._configure_line_ending_settings()
         print("✅ 环境初始化完成")
@@ -412,18 +417,23 @@ class CodeAgent:
                     return
 
                 # 获取当前分支的提交总数
-                commit_result = subprocess.run(
-                    ["git", "rev-list", "--count", "HEAD"],
-                    capture_output=True,
-                    text=True,
-                    encoding="utf-8",
-                    errors="replace",
-                    check=True,
-                )
-                if commit_result.returncode != 0:
-                    return
-
-                commit_count = int(commit_result.stdout.strip())
+                # 兼容空仓库或无 HEAD 的场景：失败时将提交计数视为 0，继续执行提交流程
+                commit_count = 0
+                try:
+                    commit_result = subprocess.run(
+                        ["git", "rev-list", "--count", "HEAD"],
+                        capture_output=True,
+                        text=True,
+                        encoding="utf-8",
+                        errors="replace",
+                        check=False,
+                    )
+                    if commit_result.returncode == 0:
+                        out = commit_result.stdout.strip()
+                        if out.isdigit():
+                            commit_count = int(out)
+                except Exception:
+                    commit_count = 0
 
                 # 暂存所有修改
                 subprocess.run(["git", "add", "."], check=True)
@@ -466,7 +476,11 @@ class CodeAgent:
         return commits
 
     def _handle_commit_confirmation(
-        self, commits: List[Tuple[str, str]], start_commit: Optional[str]
+        self,
+        commits: List[Tuple[str, str]],
+        start_commit: Optional[str],
+        prefix: str,
+        suffix: str,
     ) -> None:
         """处理提交确认和可能的重置"""
         if commits and user_confirm("是否接受以上提交记录？", True):
@@ -482,7 +496,10 @@ class CodeAgent:
                 check=True,
             )
             git_commiter = GitCommitTool()
-            git_commiter.execute({})
+            git_commiter.execute({
+                "prefix": prefix,
+                "suffix": suffix
+            })
 
             # 在用户接受commit后，根据配置决定是否保存记忆
             if self.agent.force_save_memory:
@@ -491,7 +508,7 @@ class CodeAgent:
             os.system(f"git reset --hard {str(start_commit)}")  # 确保转换为字符串
             PrettyOutput.print("已重置到初始提交", OutputType.INFO)
 
-    def run(self, user_input: str) -> Optional[str]:
+    def run(self, user_input: str, prefix: str = "", suffix: str = "") -> Optional[str]:
         """使用给定的用户输入运行代码代理。
 
         参数:
@@ -501,7 +518,7 @@ class CodeAgent:
             str: 描述执行结果的输出，成功时返回None
         """
         try:
-            self._init_env()
+            self._init_env(prefix, suffix)
             start_commit = get_latest_commit_hash()
 
             # 获取项目统计信息并附加到用户输入
@@ -550,7 +567,7 @@ class CodeAgent:
             self._handle_uncommitted_changes()
             end_commit = get_latest_commit_hash()
             commits = self._show_commit_history(start_commit, end_commit)
-            self._handle_commit_confirmation(commits, start_commit)
+            self._handle_commit_confirmation(commits, start_commit, prefix, suffix)
             return None
 
         except RuntimeError as e:
@@ -634,11 +651,12 @@ class CodeAgent:
         ):
             agent.session.prompt += final_ret
             return
-        agent.session.prompt += final_ret
+        # 用户未确认，允许输入自定义回复作为附加提示
         custom_reply = get_multiline_input("请输入自定义回复")
-        if custom_reply.strip():  # 如果自定义回复为空，返回空字符串
+        if custom_reply.strip():  # 如果自定义回复为空，不设置附加提示
             agent.set_addon_prompt(custom_reply)
         agent.session.prompt += final_ret
+        return
 
 
 @app.command()
@@ -663,6 +681,16 @@ def cli(
         "--restore-session",
         help="从 .jarvis/saved_session.json 恢复会话状态",
     ),
+    prefix: str = typer.Option(
+        "",
+        "--prefix",
+        help="提交信息前缀（用空格分隔）",
+    ),
+    suffix: str = typer.Option(
+        "",
+        "--suffix",
+        help="提交信息后缀（用换行分隔）",
+    ),
 ) -> None:
     """Jarvis主入口点。"""
     init_env("欢迎使用 Jarvis-CodeAgent，您的代码工程助手已准备就绪！")
@@ -723,13 +751,13 @@ def cli(
                 )
 
         if requirement:
-            agent.run(requirement)
+            agent.run(requirement, prefix=prefix, suffix=suffix)
         else:
             while True:
                 user_input = get_multiline_input("请输入你的需求（输入空行退出）:")
                 if not user_input:
                     raise typer.Exit(code=0)
-                agent.run(user_input)
+                agent.run(user_input, prefix=prefix, suffix=suffix)
 
     except typer.Exit:
         raise

{jarvis_ai_assistant-0.3.13 → jarvis_ai_assistant-0.3.15}/src/jarvis/jarvis_mcp/streamable_mcp_client.py

@@ -4,7 +4,7 @@ import threading
 from typing import Any, Callable, Dict, List
 from urllib.parse import urljoin
 
-import requests
+import requests  # type: ignore[import-untyped]
 
 from jarvis.jarvis_mcp import McpClient
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
@@ -25,6 +25,8 @@ class StreamableMcpClient(McpClient):
         self.base_url = config.get("base_url", "")
         if not self.base_url:
             raise ValueError("No base_url specified in config")
+        # Normalize base_url to ensure trailing slash for urljoin correctness
+        self.base_url = self.base_url.rstrip("/") + "/"
 
         # 设置HTTP客户端
         self.session = requests.Session()
@@ -43,6 +45,8 @@ class StreamableMcpClient(McpClient):
         # 添加额外的HTTP头
         extra_headers = config.get("headers", {})
         self.session.headers.update(extra_headers)
+        # Request timeouts (connect, read) in seconds; can be overridden via config["timeout"]
+        self.timeout = config.get("timeout", (10, 300))
 
         # 请求相关属性
         self.pending_requests: Dict[str, threading.Event] = {}  # 存储等待响应的请求 {id: Event}
@@ -141,7 +145,9 @@ class StreamableMcpClient(McpClient):
 
             # 发送请求到Streamable HTTP端点
             mcp_url = urljoin(self.base_url, "mcp")
-            response = self.session.post(mcp_url, json=request, stream=True)  # 启用流式传输
+            response = self.session.post(
+                mcp_url, json=request, stream=True, timeout=self.timeout
+            )  # 启用流式传输
             response.raise_for_status()
 
             # 处理流式响应
@@ -149,17 +155,21 @@ class StreamableMcpClient(McpClient):
             for line in response.iter_lines(decode_unicode=True):
                 if line:
                     try:
-                        data = json.loads(line)
+                        line_data = line
+                        if isinstance(line_data, str) and line_data.startswith("data:"):
+                            # Handle SSE-formatted lines like "data: {...}"
+                            line_data = line_data.split(":", 1)[1].strip()
+                        data = json.loads(line_data)
                         if "id" in data and data["id"] == req_id:
                             # 这是我们的请求响应
                             result = data
                             break
                         elif "method" in data:
                             # 这是一个通知
-                            method = data.get("method", "")
+                            notify_method = data.get("method", "")
                             params = data.get("params", {})
-                            if method in self.notification_handlers:
-                                for handler in self.notification_handlers[method]:
+                            if notify_method in self.notification_handlers:
+                                for handler in self.notification_handlers[notify_method]:
                                     try:
                                         handler(params)
                                     except Exception as e:
@@ -171,6 +181,8 @@ class StreamableMcpClient(McpClient):
                         PrettyOutput.print(f"无法解析响应: {line}", OutputType.WARNING)
                         continue
 
+            # Ensure response is closed after streaming
+            response.close()
             if result is None:
                 raise RuntimeError(f"未收到响应: {method}")
 
@@ -198,8 +210,9 @@ class StreamableMcpClient(McpClient):
 
             # 发送通知到Streamable HTTP端点
             mcp_url = urljoin(self.base_url, "mcp")
-            response = self.session.post(mcp_url, json=notification)
+            response = self.session.post(mcp_url, json=notification, timeout=self.timeout)
             response.raise_for_status()
+            response.close()
 
         except Exception as e:
             PrettyOutput.print(f"发送通知失败: {str(e)}", OutputType.ERROR)

{jarvis_ai_assistant-0.3.13 → jarvis_ai_assistant-0.3.15}/src/jarvis/jarvis_platform_manager/service.py

@@ -7,6 +7,7 @@ import asyncio
 import json
 import os
 import time
+import threading
 import uuid
 from datetime import datetime
 from typing import Any, Dict, List, Optional, Union
@@ -72,8 +73,16 @@ def start_service(
 ) -> None:
     """Start OpenAI-compatible API server."""
     # Create logs directory if it doesn't exist
-    logs_dir = os.path.join(os.path.dirname(os.path.abspath(__file__)), "logs")
-    os.makedirs(logs_dir, exist_ok=True)
+    # Prefer environment variable, then user directory, fall back to CWD
+    logs_dir = os.environ.get("JARVIS_LOG_DIR")
+    if not logs_dir:
+        logs_dir = os.path.join(os.path.expanduser("~"), ".jarvis", "logs")
+    try:
+        os.makedirs(logs_dir, exist_ok=True)
+    except Exception:
+        # As a last resort, use current working directory
+        logs_dir = os.path.join(os.getcwd(), "logs")
+        os.makedirs(logs_dir, exist_ok=True)
 
     app = FastAPI(title="Jarvis API Server")
 
@@ -81,7 +90,7 @@ def start_service(
     app.add_middleware(
         CORSMiddleware,
         allow_origins=["*"],
-        allow_credentials=True,
+        allow_credentials=False,
         allow_methods=["*"],
         allow_headers=["*"],
     )
@@ -228,23 +237,23 @@ def start_service(
             "messages": [{"role": m.role, "content": m.content} for m in messages],
         }
 
-        # Log the conversation
-        log_conversation(
-            conversation_id,
-            [{"role": m.role, "content": m.content} for m in messages],
-            model,
-        )
+        # Logging moved to post-response to avoid duplicates
 
         if stream:
             # Return streaming response
             return StreamingResponse(
                 stream_chat_response(platform, message_text, model),  # type: ignore
                 media_type="text/event-stream",
+                headers={"Cache-Control": "no-cache", "Connection": "keep-alive"},
             )
 
         # Get chat response
         try:
-            response_text = platform.chat_until_success(message_text)
+            # Run potentially blocking call in a thread to avoid blocking the event loop
+            loop = asyncio.get_running_loop()
+            response_text = await loop.run_in_executor(
+                None, lambda: platform.chat_until_success(message_text)
+            )
 
             # Create response in OpenAI format
             completion_id = f"chatcmpl-{str(uuid.uuid4())}"
@@ -287,11 +296,31 @@ def start_service(
             raise HTTPException(status_code=500, detail=str(exc))
 
     async def stream_chat_response(platform: Any, message: str, model_name: str) -> Any:
-        """Stream chat response in OpenAI-compatible format."""
+        """Stream chat response in OpenAI-compatible format without blocking the event loop."""
         completion_id = f"chatcmpl-{str(uuid.uuid4())}"
         created_time = int(time.time())
         conversation_id = str(uuid.uuid4())
 
+        loop = asyncio.get_running_loop()
+        queue: asyncio.Queue = asyncio.Queue()
+        SENTINEL = object()
+
+        def producer() -> None:
+            try:
+                for chunk in platform.chat(message):
+                    if chunk:
+                        asyncio.run_coroutine_threadsafe(queue.put(chunk), loop)
+            except Exception as exc:
+                # Use a special dict to pass error across thread boundary
+                asyncio.run_coroutine_threadsafe(
+                    queue.put({"__error__": str(exc)}), loop
+                )
+            finally:
+                asyncio.run_coroutine_threadsafe(queue.put(SENTINEL), loop)
+
+        # Start producer thread
+        threading.Thread(target=producer, daemon=True).start()
+
         # Send the initial chunk with the role
         initial_data = {
             "id": completion_id,
@@ -304,36 +333,20 @@ def start_service(
         }
         yield f"data: {json.dumps(initial_data)}\n\n"
 
-        try:
-            # Use the streaming-capable chat method
-            response_generator = platform.chat(message)
-
-            full_response = ""
-            has_content = False
-
-            # Iterate over the generator and stream chunks
-            for chunk in response_generator:
-                if chunk:
-                    has_content = True
-                    full_response += chunk
-                    chunk_data = {
-                        "id": completion_id,
-                        "object": "chat.completion.chunk",
-                        "created": created_time,
-                        "model": model_name,
-                        "choices": [
-                            {
-                                "index": 0,
-                                "delta": {"content": chunk},
-                                "finish_reason": None,
-                            }
-                        ],
-                    }
-                    yield f"data: {json.dumps(chunk_data)}\n\n"
+        full_response = ""
+        has_content = False
+
+        while True:
+            item = await queue.get()
+            if item is SENTINEL:
+                break
+
+            if isinstance(item, dict) and "__error__" in item:
+                error_msg = f"Error during streaming: {item['__error__']}"
+                PrettyOutput.print(error_msg, OutputType.ERROR)
 
-            if not has_content:
-                no_response_message = "No response from model."
-                chunk_data = {
+                # Send error information in the stream
+                error_chunk = {
                     "id": completion_id,
                     "object": "chat.completion.chunk",
                     "created": created_time,
@@ -341,41 +354,45 @@ def start_service(
                     "choices": [
                         {
                             "index": 0,
-                            "delta": {"content": no_response_message},
-                            "finish_reason": None,
+                            "delta": {"content": error_msg},
+                            "finish_reason": "stop",
                         }
                     ],
                 }
-                yield f"data: {json.dumps(chunk_data)}\n\n"
-                full_response = no_response_message
+                yield f"data: {json.dumps(error_chunk)}\n\n"
+                yield "data: [DONE]\n\n"
+
+                # Log the error
+                log_conversation(
+                    conversation_id,
+                    [{"role": "user", "content": message}],
+                    model_name,
+                    response=f"ERROR: {error_msg}",
+                )
+                return
 
-            # Send the final chunk with finish_reason
-            final_data = {
+            # Normal chunk
+            chunk = item
+            has_content = True
+            full_response += chunk
+            chunk_data = {
                 "id": completion_id,
                 "object": "chat.completion.chunk",
                 "created": created_time,
                 "model": model_name,
-                "choices": [{"index": 0, "delta": {}, "finish_reason": "stop"}],
+                "choices": [
+                    {
+                        "index": 0,
+                        "delta": {"content": chunk},
+                        "finish_reason": None,
+                    }
+                ],
             }
-            yield f"data: {json.dumps(final_data)}\n\n"
+            yield f"data: {json.dumps(chunk_data)}\n\n"
 
-            # Send the [DONE] marker
-            yield "data: [DONE]\n\n"
-
-            # Log the full conversation
-            log_conversation(
-                conversation_id,
-                [{"role": "user", "content": message}],
-                model_name,
-                full_response,
-            )
-
-        except Exception as exc:
-            error_msg = f"Error during streaming: {str(exc)}"
-            PrettyOutput.print(error_msg, OutputType.ERROR)
-
-            # Send error information in the stream
-            error_chunk = {
+        if not has_content:
+            no_response_message = "No response from model."
+            chunk_data = {
                 "id": completion_id,
                 "object": "chat.completion.chunk",
                 "created": created_time,
@@ -383,21 +400,34 @@ def start_service(
                 "choices": [
                     {
                         "index": 0,
-                        "delta": {"content": error_msg},
-                        "finish_reason": "stop",
+                        "delta": {"content": no_response_message},
+                        "finish_reason": None,
                     }
                 ],
             }
-            yield f"data: {json.dumps(error_chunk)}\n\n"
-            yield "data: [DONE]\n\n"
+            yield f"data: {json.dumps(chunk_data)}\n\n"
+            full_response = no_response_message
 
-            # Log the error
-            log_conversation(
-                conversation_id,
-                [{"role": "user", "content": message}],
-                model_name,
-                response=f"ERROR: {error_msg}",
-            )
+        # Send the final chunk with finish_reason
+        final_data = {
+            "id": completion_id,
+            "object": "chat.completion.chunk",
+            "created": created_time,
+            "model": model_name,
+            "choices": [{"index": 0, "delta": {}, "finish_reason": "stop"}],
+        }
+        yield f"data: {json.dumps(final_data)}\n\n"
+
+        # Send the [DONE] marker
+        yield "data: [DONE]\n\n"
+
+        # Log the full conversation
+        log_conversation(
+            conversation_id,
+            [{"role": "user", "content": message}],
+            model_name,
+            full_response,
+        )
 
     # Run the server
     uvicorn.run(app, host=host, port=port)

{jarvis_ai_assistant-0.3.13 → jarvis_ai_assistant-0.3.15}/src/jarvis/jarvis_tools/registry.py

@@ -79,7 +79,7 @@ want: 当前的git状态，期望获取xxx的提交记录
 name: execute_script
 arguments:
   interpreter: bash
-  script_cotent: |2
+  script_content: |2
     git status --porcelain
 {ct("TOOL_CALL")}
 </string_format>
@@ -630,7 +630,9 @@ class ToolRegistry(OutputHandlerProtocol):
             content: 包含工具调用的内容
 
         返回:
-            List[Dict]: 包含名称和参数的提取工具调用列表
+            Tuple[Dict[str, Dict[str, Any]], str]: 
+                - 第一个元素是提取的工具调用字典
+                - 第二个元素是错误消息字符串(成功时为"")
 
         异常:
             Exception: 如果工具调用缺少必要字段

{jarvis_ai_assistant-0.3.13 → jarvis_ai_assistant-0.3.15/src/jarvis_ai_assistant.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.3.13
+Version: 0.3.15
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire