jarvis-ai-assistant 0.1.189__py3-none-any.whl → 0.1.190__py3-none-any.whl

jarvis/__init__.py

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

jarvis/jarvis_git_utils/git_commiter.py

@@ -77,6 +77,7 @@ class GitCommitTool:
     def execute(self, args: Dict) -> Dict[str, Any]:
         """Execute automatic commit process with support for multi-line messages and special characters"""
         try:
+            original_dir = os.getcwd()
             root_dir = args.get("root_dir", ".")
             prefix = args.get("prefix", "")
             suffix = args.get("suffix", "")

jarvis/jarvis_tools/generate_new_tool.py

@@ -1,7 +1,6 @@
 # -*- coding: utf-8 -*-
-import re
 from pathlib import Path
-from typing import Any, Dict, Tuple
+from typing import Any, Dict
 
 from jarvis.jarvis_utils.config import get_data_dir
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
@@ -14,20 +13,20 @@ class generate_new_tool:
     并自动注册到当前的工具注册表中。适用场景：1. 需要创建新的自定义工具；
     2. 扩展Jarvis功能；3. 自动化重复性操作；4. 封装特定领域的功能。
     """
-    
+
     parameters = {
         "type": "object",
         "properties": {
             "tool_name": {
                 "type": "string",
-                "description": "新工具的名称，将用作文件名和工具类名"
+                "description": "新工具的名称，将用作文件名和工具类名",
             },
             "tool_code": {
                 "type": "string",
-                "description": "工具的完整Python代码，包含类定义、名称、描述、参数和execute方法"
-            }
+                "description": "工具的完整Python代码，包含类定义、名称、描述、参数和execute方法",
+            },
         },
-        "required": ["tool_name", "tool_code"]
+        "required": ["tool_name", "tool_code"],
     }
 
     @staticmethod
@@ -36,16 +35,18 @@ class generate_new_tool:
         # 检查数据目录是否存在
         data_dir = get_data_dir()
         tools_dir = Path(data_dir) / "tools"
-        
+
         # 如果tools目录不存在，尝试创建
         if not tools_dir.exists():
             try:
                 tools_dir.mkdir(parents=True, exist_ok=True)
                 return True
             except Exception as e:
-                PrettyOutput.print(f"无法创建工具目录 {tools_dir}: {e}", OutputType.ERROR)
+                PrettyOutput.print(
+                    f"无法创建工具目录 {tools_dir}: {e}", OutputType.ERROR
+                )
                 return False
-        
+
         return True
 
     def execute(self, args: Dict[str, Any]) -> Dict[str, Any]:
@@ -64,83 +65,130 @@ class generate_new_tool:
             tool_name = args["tool_name"]
             tool_code = args["tool_code"]
             agent = args.get("agent", None)
-            
+
             # 验证工具名称
             if not tool_name.isidentifier():
                 return {
                     "success": False,
                     "stdout": "",
-                    "stderr": f"工具名称 '{tool_name}' 不是有效的Python标识符"
+                    "stderr": f"工具名称 '{tool_name}' 不是有效的Python标识符",
                 }
-            
+
             # 准备工具目录
             tools_dir = Path(get_data_dir()) / "tools"
             tools_dir.mkdir(parents=True, exist_ok=True)
-            
+
             # 生成工具文件路径
             tool_file_path = tools_dir / f"{tool_name}.py"
-            
+
             # 检查是否已存在同名工具
             if tool_file_path.exists():
                 return {
                     "success": False,
                     "stdout": "",
-                    "stderr": f"工具 '{tool_name}' 已经存在于 {tool_file_path}"
+                    "stderr": f"工具 '{tool_name}' 已经存在于 {tool_file_path}",
                 }
-            
+
             # 写入工具文件
             with open(tool_file_path, "w", encoding="utf-8") as f:
                 f.write(tool_code)
-            
+
             # 注册新工具到当前的工具注册表
             success_message = f"工具 '{tool_name}' 已成功生成在 {tool_file_path}"
-            
+
             registration_successful = False
             if agent:
                 tool_registry = agent.get_tool_registry()
                 if tool_registry:
                     # 尝试加载并注册新工具
-                    PrettyOutput.print(f"正在注册工具 '{tool_name}'...", OutputType.INFO)
+                    PrettyOutput.print(
+                        f"正在注册工具 '{tool_name}'...", OutputType.INFO
+                    )
                     if tool_registry.register_tool_by_file(str(tool_file_path)):
                         success_message += f"\n已成功注册到当前会话的工具注册表中"
                         registration_successful = True
                     else:
                         # 注册失败，删除已创建的文件
-                        PrettyOutput.print(f"注册工具 '{tool_name}' 失败，正在删除文件...", OutputType.WARNING)
+                        PrettyOutput.print(
+                            f"注册工具 '{tool_name}' 失败，正在删除文件...",
+                            OutputType.WARNING,
+                        )
                         if tool_file_path.exists():
                             tool_file_path.unlink()
                         return {
                             "success": False,
                             "stdout": "",
-                            "stderr": f"工具文件已生成，但注册失败。文件已被删除。"
+                            "stderr": f"工具文件已生成，但注册失败。文件已被删除。",
                         }
                 else:
-                    PrettyOutput.print("未找到工具注册表，无法自动注册工具", OutputType.WARNING)
+                    PrettyOutput.print(
+                        "未找到工具注册表，无法自动注册工具", OutputType.WARNING
+                    )
                     success_message += f"\n注册到当前会话失败，可能需要重新启动Jarvis"
-            
-            PrettyOutput.print(f"工具 '{tool_name}' 创建" + ("并注册" if registration_successful else "") + "成功！", OutputType.SUCCESS)
-            return {
-                "success": True,
-                "stdout": success_message,
-                "stderr": ""
-            }
-            
+
+            PrettyOutput.print(
+                f"工具 '{tool_name}' 创建"
+                + ("并注册" if registration_successful else "")
+                + "成功！",
+                OutputType.SUCCESS,
+            )
+
+            # 检查并安装缺失的依赖
+            try:
+                import re
+
+                required_packages = set()
+
+                # 从代码中提取import语句
+                for line in tool_code.split("\n"):
+                    if line.strip().startswith("import "):
+                        # 处理 import a.b.c 形式
+                        pkg = line.split()[1].split(".")[0]
+                        required_packages.add(pkg)
+                    elif line.strip().startswith("from "):
+                        # 处理 from a.b.c import d 形式
+                        parts = line.split()
+                        if (
+                            len(parts) >= 4
+                            and parts[0] == "from"
+                            and parts[2] == "import"
+                        ):
+                            pkg = parts[1].split(".")[0]
+                            required_packages.add(pkg)
+
+                # 检查并安装缺失的包
+                for pkg in required_packages:
+                    try:
+                        __import__(pkg)
+                    except ImportError:
+                        PrettyOutput.print(
+                            f"检测到缺失依赖: {pkg}, 正在尝试安装...", OutputType.INFO
+                        )
+                        import subprocess
+
+                        subprocess.run(["pip", "install", pkg], check=True)
+                        PrettyOutput.print(f"成功安装依赖: {pkg}", OutputType.SUCCESS)
+            except Exception as e:
+                PrettyOutput.print(f"依赖检查/安装失败: {str(e)}", OutputType.WARNING)
+
+            return {"success": True, "stdout": success_message, "stderr": ""}
+
         except Exception as e:
             # 如果发生异常，删除已创建的文件并返回失败响应
             error_msg = f"生成工具失败: {str(e)}"
             PrettyOutput.print(error_msg, OutputType.ERROR)
-            
+
             # 删除已创建的文件
             if tool_file_path and tool_file_path.exists():
                 try:
-                    PrettyOutput.print(f"正在删除已创建的文件 {tool_file_path}...", OutputType.INFO)
+                    PrettyOutput.print(
+                        f"正在删除已创建的文件 {tool_file_path}...", OutputType.INFO
+                    )
                     tool_file_path.unlink()
                     PrettyOutput.print(f"文件已删除", OutputType.SUCCESS)
                 except Exception as delete_error:
-                    PrettyOutput.print(f"删除文件失败: {str(delete_error)}", OutputType.ERROR)
-            
-            return {
-                "success": False,
-                "stdout": "",
-                "stderr": error_msg
-            }
+                    PrettyOutput.print(
+                        f"删除文件失败: {str(delete_error)}", OutputType.ERROR
+                    )
+
+            return {"success": False, "stdout": "", "stderr": error_msg}

jarvis/jarvis_tools/registry.py

@@ -685,6 +685,8 @@ class ToolRegistry(OutputHandlerProtocol):
                         agent_instance.clear_history()
                         upload_success = agent_instance.model.upload_files([output_file])
                         if upload_success:
+                            # 删除args的agent键
+                            args.pop("agent", None)
                             prompt = f"""
 以下是之前对话的关键信息总结：
 

{jarvis_ai_assistant-0.1.189.dist-info → jarvis_ai_assistant-0.1.190.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.1.189
+Version: 0.1.190
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -113,6 +113,18 @@ pip3 install -e .
 pip3 install jarvis-ai-assistant
 ```
 
+### 预定义任务(pre-command)
+
+您可以创建预定义任务文件来快速执行常用命令：
+
+1. 在`~/.jarvis/pre-command`或当前目录的`.jarvis/pre-command`文件中定义任务
+2. 使用YAML格式定义任务，例如：
+```yaml
+build: "构建项目并运行测试"
+deploy: "部署应用到生产环境"
+```
+3. 运行`jarvis`命令时会自动加载这些任务并提示选择执行
+
 ### 最小化配置
 
 将以下配置写入到`~/.jarvis/config.yaml`文件中。
@@ -215,7 +227,6 @@ OPENAI_API_BASE: https://api.openai.com/v1  # 可选，默认为官方API地址
 | `jarvis-multi-agent` | - | 使用多代理功能 |
 | `jarvis-agent` | - | 使用agent功能 |
 | `jarvis-tool` | - | 使用工具功能 |
-| `jarvis-ask-codebase` | `jac` | 使用代码库查询功能 |
 | `jarvis-git-details` | - | 使用git details功能 |
 | `jarvis-methodology` | - | 使用方法论功能 |
 

{jarvis_ai_assistant-0.1.189.dist-info → jarvis_ai_assistant-0.1.190.dist-info}/RECORD

@@ -1,4 +1,4 @@
-jarvis/__init__.py,sha256=3RRAnaRmOaQpveMGk6AbLpN-Ndluqiwh0tdrx6SLMdg,74
+jarvis/__init__.py,sha256=4h6TNgKLF0A6znYlkXoPrVCeP9Pj6DTrNF6NbH9Oroo,74
 jarvis/jarvis_agent/__init__.py,sha256=utqI92rkiqiVR2zk5N-IQe2CeMSl-sNiLU429dLoGVw,30487
 jarvis/jarvis_agent/builtin_input_handler.py,sha256=f4DaEHPakXcAbgykFP-tiOQP6fh_yGFlZx_h91_j2tQ,1529
 jarvis/jarvis_agent/file_input_handler.py,sha256=OfoYI5on6w5BDUUg4OadFcfWzMsUF70GNrlt9QyauvA,4181
@@ -38,7 +38,7 @@ jarvis/jarvis_git_details/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 jarvis/jarvis_git_details/main.py,sha256=4L60eVDBMv6RbocnVlzfOx7JZkHTzop3q7qui9d9LuU,9005
 jarvis/jarvis_git_squash/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_git_squash/main.py,sha256=q8-r0TtVOaCqY_uYwnWAY76k8YCDd5se_feB6ZWKo9M,2278
-jarvis/jarvis_git_utils/git_commiter.py,sha256=BpJ8py2JMnp8jcukyM3vxGNWtjOLTIvgqYOx-5OhvZo,13037
+jarvis/jarvis_git_utils/git_commiter.py,sha256=CPIBfTJw10VRZRxREqnSnUhooOVGwobUCOzEjZ1kWas,13076
 jarvis/jarvis_mcp/__init__.py,sha256=NF_vqRxaNyz8ColcpRh0bOkinV90YLAKHEN--jkP-B8,2114
 jarvis/jarvis_mcp/sse_mcp_client.py,sha256=QNA7HqFvLbvhNaFp3ZsXzs2Rm6_gHUMcpd4t4qAzymY,23485
 jarvis/jarvis_mcp/stdio_mcp_client.py,sha256=IEkas4ojP5J0TdVaUglvlEp61RyezBtuejv4lN3n1I4,11831
@@ -69,11 +69,11 @@ jarvis/jarvis_tools/edit_file.py,sha256=s8HqG8qHDrYjCwIioeBpGvw7Aw-iEEZoUyRJFqdj
 jarvis/jarvis_tools/execute_script.py,sha256=IA1SkcnwBB9PKG2voBNx5N9GXL303OC7OOtdqRfqWOk,6428
 jarvis/jarvis_tools/file_analyzer.py,sha256=UuQmti-eBocJB6ivMINmOvSuXxBxOqmbQ3RsQlyueWs,4918
 jarvis/jarvis_tools/file_operation.py,sha256=WloC1-oPJLwgICu4WBc9f7XA8N_Ggl73QQ5CxM2XTlE,9464
-jarvis/jarvis_tools/generate_new_tool.py,sha256=dLfOliIUm0ovLrHcZAhKm7lqhxwACv8mnGxxGtLJ--o,5960
+jarvis/jarvis_tools/generate_new_tool.py,sha256=KZX4wpSpBZ4S5817zAN5j7AAirtgBCrNUmjrpfL9dNI,7706
 jarvis/jarvis_tools/methodology.py,sha256=m7cQmVhhQpUUl_uYTVvcW0JBovQLx5pWTXh_8K77HsU,5237
 jarvis/jarvis_tools/read_code.py,sha256=pL2SwZDsJbJMXo4stW96quFsLgbtPVIAW-h4sDKsLtM,6274
 jarvis/jarvis_tools/read_webpage.py,sha256=PFAYuKjay9j6phWzyuZ99ZfNaHJljmRWAgS0bsvbcvE,2219
-jarvis/jarvis_tools/registry.py,sha256=kSl41tvwdiHaE3nwR9BI94GibjsKWczogZ76y0nFycw,25058
+jarvis/jarvis_tools/registry.py,sha256=339NBh4qZHsiBKMHgKV2kgDVhEkeZqiSJnZTedGMK8o,25162
 jarvis/jarvis_tools/rewrite_file.py,sha256=3V2l7kG5DG9iRimBce-1qCRuJPL0QM32SBTzOl2zCqM,7004
 jarvis/jarvis_tools/search_web.py,sha256=rzxrCOTEo-MmLQrKI4k-AbfidUfJUeCPK4f5ZJy48G8,952
 jarvis/jarvis_tools/virtual_tty.py,sha256=8E_n-eC-RRPTqYx6BI5Q2RnorY8dbhKFBfAjIiRQROA,16397
@@ -91,9 +91,9 @@ jarvis/jarvis_utils/methodology.py,sha256=6vf__ahwJZ2I62mWGAvh2C-G6pq930Dh_EkrY1
 jarvis/jarvis_utils/output.py,sha256=QboL42GtG_dnvd1O64sl8o72mEBhXNRADPXQMXgDE7Q,9661
 jarvis/jarvis_utils/tag.py,sha256=YJHmuedLb7_AiqvKQetHr4R1FxyzIh7HN0RRkWMmYbU,429
 jarvis/jarvis_utils/utils.py,sha256=dTFIN6EV48BuC4VOyvcVcj4P0tsWysc9ennbMRhLJjk,10960
-jarvis_ai_assistant-0.1.189.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.189.dist-info/METADATA,sha256=5e88_48MijaBca9j4CP0kRRaAwtt6H6WSJOf0BsrYtQ,15922
-jarvis_ai_assistant-0.1.189.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jarvis_ai_assistant-0.1.189.dist-info/entry_points.txt,sha256=Gy3DOP1PYLMK0GCj4rrP_9lkOyBQ39EK_lKGUSwn41E,869
-jarvis_ai_assistant-0.1.189.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.189.dist-info/RECORD,,
+jarvis_ai_assistant-0.1.190.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.190.dist-info/METADATA,sha256=3Dz7yIwWszneilEi9OfdiqzumWW0ruMLLjbzqZKC7RA,16257
+jarvis_ai_assistant-0.1.190.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jarvis_ai_assistant-0.1.190.dist-info/entry_points.txt,sha256=Gy3DOP1PYLMK0GCj4rrP_9lkOyBQ39EK_lKGUSwn41E,869
+jarvis_ai_assistant-0.1.190.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.190.dist-info/RECORD,,