jarvis-ai-assistant 0.3.29__tar.gz → 0.3.30__tar.gz

{jarvis_ai_assistant-0.3.29/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.3.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.3.29
+Version: 0.3.30
 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.29 → jarvis_ai_assistant-0.3.30}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.3.29"
+version = "0.3.30"
 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.29 → jarvis_ai_assistant-0.3.30}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages  # type: ignore
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.3.29",
+    version="0.3.30",
     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.29 → jarvis_ai_assistant-0.3.30}/src/jarvis/__init__.py

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

{jarvis_ai_assistant-0.3.29 → jarvis_ai_assistant-0.3.30}/src/jarvis/jarvis_agent/__init__.py

@@ -4,6 +4,7 @@ import datetime
 import os
 import platform
 import re
+import sys
 from pathlib import Path
 from enum import Enum
 from typing import Any, Callable, Dict, List, Optional, Protocol, Tuple, Union
@@ -48,6 +49,7 @@ from jarvis.jarvis_agent.events import (
     INTERRUPT_TRIGGERED,
     BEFORE_TOOL_FILTER,
     TOOL_FILTERED,
+    AFTER_TOOL_CALL,
 )
 from jarvis.jarvis_agent.user_interaction import UserInteractionHandler
 from jarvis.jarvis_agent.utils import join_prompts
@@ -68,6 +70,7 @@ from jarvis.jarvis_utils.config import (
     is_use_analysis,
     is_use_methodology,
     get_tool_filter_threshold,
+    get_after_tool_call_cb_dirs,
 )
 from jarvis.jarvis_utils.embedding import get_context_token_count
 from jarvis.jarvis_utils.globals import (
@@ -310,7 +313,7 @@ class Agent:
         self.first = True
         self.run_input_handlers_next_turn = False
         self.user_data: Dict[str, Any] = {}
-        self.after_tool_call_cb: Optional[Callable[[Agent], None]] = None
+
 
         # 用户确认回调：默认使用 CLI 的 user_confirm，可由外部注入以支持 TUI/GUI
         self.user_confirm: Callable[[str, bool], bool] = (
@@ -361,6 +364,8 @@ class Agent:
             self.get_tool_registry(),  # type: ignore
             platform_name=self.model.platform_name(),  # type: ignore
         )
+        # 动态加载工具调用后回调
+        self._load_after_tool_callbacks()
 
     def _init_model(self, model_group: Optional[str]):
         """初始化模型平台（统一使用 normal 平台/模型）"""
@@ -502,13 +507,95 @@ class Agent:
             # Fallback for custom handlers that only accept one argument
             return self.multiline_inputer(tip)  # type: ignore
 
-    def set_after_tool_call_cb(self, cb: Callable[[Any], None]):  # type: ignore
-        """设置工具调用后回调函数。
-
-        参数:
-            cb: 回调函数
+    def _load_after_tool_callbacks(self) -> None:
         """
-        self.after_tool_call_cb = cb
+        扫描 JARVIS_AFTER_TOOL_CALL_CB_DIRS 中的 Python 文件并动态注册回调。
+        约定优先级（任一命中即注册）：
+        - 模块级可调用对象: after_tool_call_cb
+        - 工厂方法返回单个或多个可调用对象: get_after_tool_call_cb(), register_after_tool_call_cb()
+        """
+        try:
+            dirs = get_after_tool_call_cb_dirs()
+            if not dirs:
+                return
+            for d in dirs:
+                p_dir = Path(d)
+                if not p_dir.exists() or not p_dir.is_dir():
+                    continue
+                for file_path in p_dir.glob("*.py"):
+                    if file_path.name == "__init__.py":
+                        continue
+                    parent_dir = str(file_path.parent)
+                    added_path = False
+                    try:
+                        if parent_dir not in sys.path:
+                            sys.path.insert(0, parent_dir)
+                            added_path = True
+                        module_name = file_path.stem
+                        module = __import__(module_name)
+
+                        candidates: List[Callable[[Any], None]] = []
+
+                        # 1) 直接导出的回调
+                        if hasattr(module, "after_tool_call_cb"):
+                            obj = getattr(module, "after_tool_call_cb")
+                            if callable(obj):
+                                candidates.append(obj)  # type: ignore[arg-type]
+
+                        # 2) 工厂方法：get_after_tool_call_cb()
+                        if hasattr(module, "get_after_tool_call_cb"):
+                            factory = getattr(module, "get_after_tool_call_cb")
+                            if callable(factory):
+                                try:
+                                    ret = factory()
+                                    if callable(ret):
+                                        candidates.append(ret)
+                                    elif isinstance(ret, (list, tuple)):
+                                        for c in ret:
+                                            if callable(c):
+                                                candidates.append(c)
+                                except Exception:
+                                    pass
+
+                        # 3) 工厂方法：register_after_tool_call_cb()
+                        if hasattr(module, "register_after_tool_call_cb"):
+                            factory2 = getattr(module, "register_after_tool_call_cb")
+                            if callable(factory2):
+                                try:
+                                    ret2 = factory2()
+                                    if callable(ret2):
+                                        candidates.append(ret2)
+                                    elif isinstance(ret2, (list, tuple)):
+                                        for c in ret2:
+                                            if callable(c):
+                                                candidates.append(c)
+                                except Exception:
+                                    pass
+
+                        for cb in candidates:
+                            try:
+                                def _make_wrapper(callback):
+                                    def _wrapper(**kwargs: Any) -> None:
+                                        try:
+                                            agent = kwargs.get("agent")
+                                            callback(agent)
+                                        except Exception:
+                                            pass
+                                    return _wrapper
+                                self.event_bus.subscribe(AFTER_TOOL_CALL, _make_wrapper(cb))
+                            except Exception:
+                                pass
+
+                    except Exception as e:
+                        PrettyOutput.print(f"从 {file_path} 加载回调失败: {e}", OutputType.WARNING)
+                    finally:
+                        if added_path:
+                            try:
+                                sys.path.remove(parent_dir)
+                            except ValueError:
+                                pass
+        except Exception as e:
+            PrettyOutput.print(f"加载回调目录时发生错误: {e}", OutputType.WARNING)
 
     def save_session(self) -> bool:
         """Saves the current session state by delegating to the session manager."""

{jarvis_ai_assistant-0.3.29 → jarvis_ai_assistant-0.3.30}/src/jarvis/jarvis_agent/run_loop.py

@@ -78,9 +78,7 @@ class AgentRunLoop:
                 if need_return:
                     return ag.session.prompt
 
-                # 执行回调
-                if ag.after_tool_call_cb:
-                    ag.after_tool_call_cb(ag)
+
                 # 广播工具调用后的事件（不影响主流程）
                 try:
                     ag.event_bus.emit(

{jarvis_ai_assistant-0.3.29 → jarvis_ai_assistant-0.3.30}/src/jarvis/jarvis_code_agent/code_agent.py

@@ -12,6 +12,7 @@ from typing import List, Optional, Tuple
 import typer
 
 from jarvis.jarvis_agent import Agent
+from jarvis.jarvis_agent.events import AFTER_TOOL_CALL
 from jarvis.jarvis_agent.builtin_input_handler import builtin_input_handler
 from jarvis.jarvis_agent.edit_file_handler import EditFileHandler
 from jarvis.jarvis_agent.shell_input_handler import shell_input_handler
@@ -94,7 +95,7 @@ class CodeAgent:
             use_analysis=False,  # 禁用分析
         )
 
-        self.agent.set_after_tool_call_cb(self.after_tool_call_cb)
+        self.agent.event_bus.subscribe(AFTER_TOOL_CALL, self._on_after_tool_call)
 
     def _get_system_prompt(self) -> str:
         """获取代码工程师的系统提示词"""
@@ -598,7 +599,7 @@ class CodeAgent:
         except RuntimeError as e:
             return f"Error during execution: {str(e)}"
 
-    def after_tool_call_cb(self, agent: Agent) -> None:
+    def _on_after_tool_call(self, agent: Agent, current_response=None, need_return=None, tool_prompt=None, **kwargs) -> None:
         """工具调用后回调函数。"""
         final_ret = ""
         diff = get_diff()

{jarvis_ai_assistant-0.3.29 → jarvis_ai_assistant-0.3.30}/src/jarvis/jarvis_data/config_schema.json

@@ -247,6 +247,14 @@
       },
       "default": []
     },
+    "JARVIS_AFTER_TOOL_CALL_CB_DIRS": {
+      "type": "array",
+      "description": "工具调用后回调函数实现目录",
+      "items": {
+        "type": "string"
+      },
+      "default": []
+    },
     "JARVIS_CENTRAL_METHODOLOGY_REPO": {
       "type": "string",
       "description": "中心方法论Git仓库地址，该仓库会自动添加到方法论加载路径中",

{jarvis_ai_assistant-0.3.29 → jarvis_ai_assistant-0.3.30}/src/jarvis/jarvis_tools/generate_new_tool.py

@@ -173,9 +173,20 @@ class generate_new_tool:
                         __import__(pkg)
                     except ImportError:
 
-                        import subprocess
+                        import subprocess, sys, os
+                        from shutil import which as _which
+                        # 优先使用 uv 安装（先查 venv 内 uv，再查 PATH 中 uv），否则回退到 python -m pip
+                        if sys.platform == "win32":
+                            venv_uv = os.path.join(sys.prefix, "Scripts", "uv.exe")
+                        else:
+                            venv_uv = os.path.join(sys.prefix, "bin", "uv")
+                        uv_executable = venv_uv if os.path.exists(venv_uv) else (_which("uv") or None)
+                        if uv_executable:
+                            install_cmd = [uv_executable, "pip", "install", pkg]
+                        else:
+                            install_cmd = [sys.executable, "-m", "pip", "install", pkg]
+                        subprocess.run(install_cmd, check=True)
 
-                        subprocess.run(["pip", "install", pkg], check=True)
 
             except Exception as e:
                 PrettyOutput.print(f"依赖检查/安装失败: {str(e)}", OutputType.WARNING)

{jarvis_ai_assistant-0.3.29 → jarvis_ai_assistant-0.3.30}/src/jarvis/jarvis_utils/config.py

@@ -378,6 +378,20 @@ def get_roles_dirs() -> List[str]:
     ]
 
 
+def get_after_tool_call_cb_dirs() -> List[str]:
+    """
+    获取工具调用后回调函数实现目录。
+
+    返回:
+        List[str]: 工具调用后回调函数实现目录列表
+    """
+    return [
+        os.path.expanduser(os.path.expandvars(str(p)))
+        for p in GLOBAL_CONFIG_DATA.get("JARVIS_AFTER_TOOL_CALL_CB_DIRS", [])
+        if p
+    ]
+
+
 def get_central_methodology_repo() -> str:
     """
     获取中心方法论Git仓库地址。

{jarvis_ai_assistant-0.3.29 → jarvis_ai_assistant-0.3.30}/src/jarvis/jarvis_utils/git_utils.py

@@ -417,25 +417,32 @@ def check_and_update_git_repo(repo_path: str) -> bool:
                     hasattr(sys, "base_prefix") and sys.base_prefix != sys.prefix
                 )
 
-                is_uv_env = False
-                if in_venv:
-                    # 检查是否在uv创建的虚拟环境内
-                    if sys.platform == "win32":
-                        uv_path = os.path.join(sys.prefix, "Scripts", "uv.exe")
-                    else:
-                        uv_path = os.path.join(sys.prefix, "bin", "uv")
-                    if os.path.exists(uv_path):
-                        is_uv_env = True
+                # 检测 uv 可用性：优先虚拟环境内的 uv，其次 PATH 中的 uv
+                from shutil import which as _which
+                uv_executable = None
+                if sys.platform == "win32":
+                    venv_uv = os.path.join(sys.prefix, "Scripts", "uv.exe")
+                else:
+                    venv_uv = os.path.join(sys.prefix, "bin", "uv")
+                if os.path.exists(venv_uv):
+                    uv_executable = venv_uv
+                else:
+                    path_uv = _which("uv")
+                    if path_uv:
+                        uv_executable = path_uv
 
                 # 根据环境选择安装命令
                 # 检测是否安装了 RAG 特性（更精确）
                 rag_installed = is_rag_installed()
 
-                # 根据环境和 RAG 特性选择安装命令
-                if rag_installed:
-                    if is_uv_env:
-                        install_cmd = ["uv", "pip", "install", "-e", ".[rag]"]
+                # 根据 uv 可用性与 RAG 特性选择安装命令（优先使用 uv）
+                if uv_executable:
+                    if rag_installed:
+                        install_cmd = [uv_executable, "pip", "install", "-e", ".[rag]"]
                     else:
+                        install_cmd = [uv_executable, "pip", "install", "-e", "."]
+                else:
+                    if rag_installed:
                         install_cmd = [
                             sys.executable,
                             "-m",
@@ -444,9 +451,6 @@ def check_and_update_git_repo(repo_path: str) -> bool:
                             "-e",
                             ".[rag]",
                         ]
-                else:
-                    if is_uv_env:
-                        install_cmd = ["uv", "pip", "install", "-e", "."]
                     else:
                         install_cmd = [
                             sys.executable,

{jarvis_ai_assistant-0.3.29 → jarvis_ai_assistant-0.3.30}/src/jarvis/jarvis_utils/utils.py

@@ -252,17 +252,19 @@ def _check_pip_updates() -> bool:
                 hasattr(sys, "base_prefix") and sys.base_prefix != sys.prefix
             )
 
-            # 检测是否使用uv
-            is_uv_env = False
+            # 检测是否可用 uv（优先使用虚拟环境内的uv，其次PATH中的uv）
+            from shutil import which as _which
             uv_executable: Optional[str] = None
-            if in_venv:
-                if sys.platform == "win32":
-                    uv_path = Path(sys.prefix) / "Scripts" / "uv.exe"
-                else:
-                    uv_path = Path(sys.prefix) / "bin" / "uv"
-                if uv_path.exists():
-                    is_uv_env = True
-                    uv_executable = str(uv_path)
+            if sys.platform == "win32":
+                venv_uv = Path(sys.prefix) / "Scripts" / "uv.exe"
+            else:
+                venv_uv = Path(sys.prefix) / "bin" / "uv"
+            if venv_uv.exists():
+                uv_executable = str(venv_uv)
+            else:
+                path_uv = _which("uv")
+                if path_uv:
+                    uv_executable = path_uv
 
             # 检测是否安装了 RAG 特性（更精确）
             from jarvis.jarvis_utils.utils import (
@@ -274,7 +276,7 @@ def _check_pip_updates() -> bool:
             package_spec = (
                 "jarvis-ai-assistant[rag]" if rag_installed else "jarvis-ai-assistant"
             )
-            if is_uv_env and uv_executable:
+            if uv_executable:
                 cmd_list = [uv_executable, "pip", "install", "--upgrade", package_spec]
                 update_cmd = f"uv pip install --upgrade {package_spec}"
             else:

{jarvis_ai_assistant-0.3.29 → jarvis_ai_assistant-0.3.30/src/jarvis_ai_assistant.egg-info}/PKG-INFO

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