jarvis-ai-assistant 0.1.207__py3-none-any.whl → 0.1.208__py3-none-any.whl

jarvis/jarvis_tools/edit_file.py

@@ -19,8 +19,6 @@
 """
 from typing import Any, Dict
 
-from yaspin import yaspin
-
 from jarvis.jarvis_agent.edit_file_handler import EditFileHandler
 
 
@@ -62,12 +60,18 @@ class FileSearchReplaceTool:
                             "items": {
                                 "type": "object",
                                 "properties": {
-                                    "reason": {"type": "string", "description": "修改的原因"},
+                                    "reason": {
+                                        "type": "string",
+                                        "description": "修改的原因",
+                                    },
                                     "search": {
                                         "type": "string",
                                         "description": "需要查找的原始代码",
                                     },
-                                    "replace": {"type": "string", "description": "替换后的新代码"},
+                                    "replace": {
+                                        "type": "string",
+                                        "description": "替换后的新代码",
+                                    },
                                 },
                             },
                         },
@@ -79,7 +83,6 @@ class FileSearchReplaceTool:
         "required": ["files"],
     }
 
-
     def execute(self, args: Dict) -> Dict[str, Any]:
         """执行文件编辑操作，支持快速编辑和AI辅助编辑两种模式。
 
@@ -152,46 +155,46 @@ class FileSearchReplaceTool:
                     if file_exists and agent:
                         files = agent.get_user_data("files")
                         if not files or file_path not in files:
-                            file_results.append({
-                                "file": file_path,
-                                "success": False,
-                                "stdout": "",
-                                "stderr": f"请先读取文件 {file_path} 的内容后再编辑"
-                            })
+                            file_results.append(
+                                {
+                                    "file": file_path,
+                                    "success": False,
+                                    "stdout": "",
+                                    "stderr": f"请先读取文件 {file_path} 的内容后再编辑",
+                                }
+                            )
                             continue
 
-                    with yaspin(
-                        text=f"正在处理文件 {file_path}...", color="cyan"
-                    ) as spinner:
-                        # 首先尝试fast_edit模式
-                        success, temp_content = EditFileHandler._fast_edit(file_path, changes, spinner)
+                    print(f"⚙️ 正在处理文件 {file_path}...")
+                    # 首先尝试fast_edit模式
+                    success, temp_content = EditFileHandler._fast_edit(
+                        file_path, changes
+                    )
+                    if not success:
+                        # 如果fast_edit失败，尝试slow_edit模式
+                        success, temp_content = EditFileHandler._slow_edit(
+                            file_path, changes, agent
+                        )
                         if not success:
-                            # 如果fast_edit失败，尝试slow_edit模式
-                            success, temp_content = EditFileHandler._slow_edit(
-                                file_path,
-                                changes,
-                                spinner,
-                                agent
-                            )
-                            if not success:
-                                spinner.text = f"文件 {file_path} 处理失败"
-                                spinner.fail("❌")
-                                file_results.append({
+                            print(f"❌ 文件 {file_path} 处理失败")
+                            file_results.append(
+                                {
                                     "file": file_path,
                                     "success": False,
                                     "stdout": "",
-                                    "stderr": temp_content
-                                })
-                                continue
-                            else:
-                                spinner.text = f"文件 {file_path} 内容生成完成"
-                                spinner.ok("✅")
+                                    "stderr": temp_content,
+                                }
+                            )
+                            continue
                         else:
-                            spinner.text = f"文件 {file_path} 内容生成完成"
-                            spinner.ok("✅")
+                            print(f"✅ 文件 {file_path} 内容生成完成")
+                    else:
+                        print(f"✅ 文件 {file_path} 内容生成完成")
 
                     # 只有当所有替换操作都成功时，才写回文件
-                    if success and (temp_content != original_content or not file_exists):
+                    if success and (
+                        temp_content != original_content or not file_exists
+                    ):
                         # 确保目录存在
                         os.makedirs(
                             os.path.dirname(os.path.abspath(file_path)), exist_ok=True
@@ -208,24 +211,28 @@ class FileSearchReplaceTool:
                         PrettyOutput.print(stdout_message, OutputType.SUCCESS)
                         overall_success = True
 
-                        file_results.append({
-                            "file": file_path,
-                            "success": True,
-                            "stdout": stdout_message,
-                            "stderr": ""
-                        })
+                        file_results.append(
+                            {
+                                "file": file_path,
+                                "success": True,
+                                "stdout": stdout_message,
+                                "stderr": "",
+                            }
+                        )
 
                 except Exception as e:
                     stderr_message = f"处理文件 {file_path} 时出错: {str(e)}"
                     stderr_messages.append(stderr_message)
                     PrettyOutput.print(stderr_message, OutputType.WARNING)
                     file_success = False
-                    file_results.append({
-                        "file": file_path,
-                        "success": False,
-                        "stdout": "",
-                        "stderr": stderr_message
-                    })
+                    file_results.append(
+                        {
+                            "file": file_path,
+                            "success": False,
+                            "stdout": "",
+                            "stderr": stderr_message,
+                        }
+                    )
 
             except Exception as e:
                 error_msg = f"文件搜索替换操作失败: {str(e)}"
@@ -251,12 +258,14 @@ class FileSearchReplaceTool:
                     except:
                         stderr_messages.append(f"回滚文件失败: {file_path}")
 
-                file_results.append({
-                    "file": file_path,
-                    "success": False,
-                    "stdout": "",
-                    "stderr": error_msg
-                })
+                file_results.append(
+                    {
+                        "file": file_path,
+                        "success": False,
+                        "stdout": "",
+                        "stderr": error_msg,
+                    }
+                )
 
         # 整合所有错误信息到stderr
         all_stderr = []
@@ -267,5 +276,5 @@ class FileSearchReplaceTool:
         return {
             "success": overall_success,
             "stdout": "\n".join(stdout_messages) if overall_success else "",
-            "stderr": "\n".join(all_stderr) if not overall_success else ""
+            "stderr": "\n".join(all_stderr) if not overall_success else "",
         }

jarvis/jarvis_tools/file_analyzer.py

@@ -2,8 +2,6 @@
 import os
 from typing import Any, Dict
 
-from yaspin import yaspin  # type: ignore
-from yaspin.spinners import Spinners  # type: ignore
 
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
@@ -78,28 +76,24 @@ class FileAnalyzerTool:
             platform.set_system_prompt(system_message)
 
             # 上传文件
-            with yaspin(Spinners.dots, text="正在上传文件...") as spinner:
-                try:
-                    with spinner.hidden():
-                        upload_result = platform.upload_files(valid_files)
-                    if not upload_result:
-                        spinner.text = "文件上传失败"
-                        spinner.fail("❌")
-                        return {
-                            "success": False,
-                            "stdout": "",
-                            "stderr": "文件上传失败",
-                        }
-                    spinner.text = "文件上传成功"
-                    spinner.ok("✅")
-                except Exception as e:
-                    spinner.text = "文件上传失败"
-                    spinner.fail("❌")
+            print(f"📤 正在上传文件...")
+            try:
+                upload_result = platform.upload_files(valid_files)
+                if not upload_result:
+                    print(f"❌ 文件上传失败")
                     return {
                         "success": False,
                         "stdout": "",
-                        "stderr": f"文件上传失败: {str(e)}",
+                        "stderr": "文件上传失败",
                     }
+                print(f"✅ 文件上传成功")
+            except Exception as e:
+                print(f"❌ 文件上传失败: {str(e)}")
+                return {
+                    "success": False,
+                    "stdout": "",
+                    "stderr": f"文件上传失败: {str(e)}",
+                }
 
             platform.set_suppress_output(False)
 
@@ -111,11 +105,9 @@ class FileAnalyzerTool:
 请提供详细的分析结果和理由。"""
 
             # 发送请求并获取分析结果
-            with yaspin(Spinners.dots, text="正在分析文件...") as spinner:
-                with spinner.hidden():
-                    analysis_result = platform.chat_until_success(analysis_request)
-                spinner.text = "分析完成"
-                spinner.ok("✅")
+            print(f"🔍 正在分析文件...")
+            analysis_result = platform.chat_until_success(analysis_request)
+            print(f"✅ 分析完成")
 
             # 清理会话
             platform.delete_chat()

jarvis/jarvis_tools/read_code.py

@@ -2,8 +2,6 @@
 import os
 from typing import Any, Dict
 
-from yaspin import yaspin
-
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 
@@ -46,89 +44,90 @@ class ReadCodeTool:
         """
         try:
             abs_path = os.path.abspath(filepath)
-            with yaspin(text=f"正在读取文件: {abs_path}...", color="cyan") as spinner:
-                # 文件存在性检查
-                if not os.path.exists(abs_path):
-                    return {
-                        "success": False,
-                        "stdout": "",
-                        "stderr": f"文件不存在: {abs_path}",
-                    }
-
-                # 文件大小限制检查（10MB）
-                if os.path.getsize(abs_path) > 10 * 1024 * 1024:
-                    return {
-                        "success": False,
-                        "stdout": "",
-                        "stderr": "文件过大 (>10MB)",
-                    }
-
-                # 读取文件内容
-                with open(abs_path, "r", encoding="utf-8", errors="ignore") as f:
-                    lines = f.readlines()
-
-                total_lines = len(lines)
-
-                # 处理空文件情况
-                if total_lines == 0:
-                    spinner.ok("✅")
-                    return {
-                        "success": True,
-                        "stdout": f"\n🔍 文件: {abs_path}\n📄 文件为空 (0行)\n",
-                        "stderr": "",
-                    }
-
-                # 处理特殊值-1表示文件末尾
-                if end_line == -1:
-                    end_line = total_lines
-                else:
-                    end_line = (
-                        max(1, min(end_line, total_lines))
-                        if end_line >= 0
-                        else total_lines + end_line + 1
-                    )
-
-                start_line = (
-                    max(1, min(start_line, total_lines))
-                    if start_line >= 0
-                    else total_lines + start_line + 1
-                )
+            print(f"📖 正在读取文件: {abs_path}...")
+            # 文件存在性检查
+            if not os.path.exists(abs_path):
+                return {
+                    "success": False,
+                    "stdout": "",
+                    "stderr": f"文件不存在: {abs_path}",
+                }
+
+            # 文件大小限制检查（10MB）
+            if os.path.getsize(abs_path) > 10 * 1024 * 1024:
+                return {
+                    "success": False,
+                    "stdout": "",
+                    "stderr": "文件过大 (>10MB)",
+                }
+
+            # 读取文件内容
+            with open(abs_path, "r", encoding="utf-8", errors="ignore") as f:
+                lines = f.readlines()
 
-                if start_line > end_line:
-                    spinner.fail("❌")
-                    return {
-                        "success": False,
-                        "stdout": "",
-                        "stderr": f"无效的行范围 [{start_line}-{end_line}] (总行数: {total_lines})",
-                    }
-
-                # 添加行号并构建输出内容
-                selected_lines = lines[start_line - 1 : end_line]
-                numbered_content = "".join(
-                    [
-                        f"{i:4d}:{line}"
-                        for i, line in enumerate(selected_lines, start=start_line)
-                    ]
+            total_lines = len(lines)
+
+            # 处理空文件情况
+            if total_lines == 0:
+                print(f"✅ 文件读取完成: {abs_path}")
+                return {
+                    "success": True,
+                    "stdout": f"\n🔍 文件: {abs_path}\n📄 文件为空 (0行)\n",
+                    "stderr": "",
+                }
+
+            # 处理特殊值-1表示文件末尾
+            if end_line == -1:
+                end_line = total_lines
+            else:
+                end_line = (
+                    max(1, min(end_line, total_lines))
+                    if end_line >= 0
+                    else total_lines + end_line + 1
                 )
 
-                # 构建输出格式
-                output = (
-                    f"\n🔍 文件: {abs_path}\n"
-                    f"📄 原始行号: {start_line}-{end_line} (共{total_lines}行) \n\n"
-                    f"{numbered_content}\n\n"
+            start_line = (
+                max(1, min(start_line, total_lines))
+                if start_line >= 0
+                else total_lines + start_line + 1
+            )
+
+            if start_line > end_line:
+                print(
+                    f"❌ 无效的行范围 [{start_line}-{end_line}] (总行数: {total_lines})"
                 )
-                spinner.text = f"文件读取完成: {abs_path}"
-                spinner.ok("✅")
-
-                if agent:
-                    files = agent.get_user_data("files")
-                    if files:
-                        files.append(abs_path)
-                    else:
-                        files = [abs_path]
-                    agent.set_user_data("files", files)
-
-                return {"success": True, "stdout": output, "stderr": ""}
+                return {
+                    "success": False,
+                    "stdout": "",
+                    "stderr": f"无效的行范围 [{start_line}-{end_line}] (总行数: {total_lines})",
+                }
+
+            # 添加行号并构建输出内容
+            selected_lines = lines[start_line - 1 : end_line]
+            numbered_content = "".join(
+                [
+                    f"{i:4d}:{line}"
+                    for i, line in enumerate(selected_lines, start=start_line)
+                ]
+            )
+
+            # 构建输出格式
+            output = (
+                f"\n🔍 文件: {abs_path}\n"
+                f"📄 原始行号: {start_line}-{end_line} (共{total_lines}行) \n\n"
+                f"{numbered_content}\n\n"
+            )
+            print(f"✅ 文件读取完成: {abs_path}")
+
+            if agent:
+                files = agent.get_user_data("files")
+                if files:
+                    files.append(abs_path)
+                else:
+                    files = [abs_path]
+                agent.set_user_data("files", files)
+
+            return {"success": True, "stdout": output, "stderr": ""}
 
         except Exception as e:
             PrettyOutput.print(str(e), OutputType.ERROR)

jarvis/jarvis_utils/builtin_replace_map.py

@@ -29,42 +29,7 @@ arguments:
 """,
         "description": "网页搜索",
     },
-    "Plan": {
-        "append": True,
-        "template": f"""
-请使用code_plan工具生成代码修改计划，必须严格遵守以下工具调用格式：
-
-{ot("TOOL_CALL")}
-want: 想要从执行结果中获取到的信息
-name: code_plan
-arguments:
-    requirement: "需要实现用户登录功能，包括用户名密码验证和JWT生成"
-{ct("TOOL_CALL")}
-
-请提供详细的需求描述和完整上下文信息：
-
-必须包含的上下文信息：
-1. 当前会话状态 - 当前正在处理的任务和进度
-2. 用户历史请求 - 与本任务相关的历史请求
-3. 系统状态 - 相关的系统配置和环境状态
-4. 已确定的相关文件 - 已经分析出的需要修改的文件列表
-
-示例：
-1. 需要实现用户登录功能，包括用户名密码验证和JWT生成
-2. 重构订单处理模块以提高性能
-3. 优化数据库查询性能，减少响应时间
-4. 添加支付网关集成功能
-5. 修改用户权限管理系统
-
-code_plan工具将：
-1. 分析项目结构确定相关文件
-2. 理解需求后制定详细修改步骤
-3. 按功能模块分组修改内容
-4. 评估修改影响范围
-5. 生成可执行的开发计划
-""",
-        "description": "生成代码修改计划",
-    },
+    
     "FindRelatedFiles": {
         "append": False,
         "template": f"""

jarvis/jarvis_utils/config.py

@@ -111,10 +111,20 @@ def get_shell_name() -> str:
     获取系统shell名称。
 
     返回：
-        str: Shell名称（例如bash, zsh），默认为bash
-    """
-    shell_path = GLOBAL_CONFIG_DATA.get("SHELL", "/bin/bash")
-    return os.path.basename(shell_path)
+        str: Shell名称（例如bash, zsh, fish），默认为bash
+
+    获取顺序：
+    1. 先从GLOBAL_CONFIG_DATA中获取JARVIS_SHELL配置
+    2. 再从GLOBAL_CONFIG_DATA中获取SHELL配置
+    3. 最后从环境变量SHELL获取
+    4. 如果都未配置，则默认返回bash
+    """
+    shell_name = GLOBAL_CONFIG_DATA.get("JARVIS_SHELL")
+    if shell_name:
+        return shell_name.lower()
+    
+    shell_path = GLOBAL_CONFIG_DATA.get("SHELL", os.getenv("SHELL", "/bin/bash"))
+    return os.path.basename(shell_path).lower()
 
 
 def get_normal_platform_name() -> str:

jarvis/jarvis_utils/git_utils.py

@@ -12,9 +12,10 @@ Git工具模块
 import os
 import re
 import subprocess
-from typing import Any, Dict, List, Tuple
+from typing import Any, Dict, List, Set, Tuple
 
-from jarvis.jarvis_utils.config import get_auto_update, is_confirm_before_apply_patch
+from jarvis.jarvis_utils.config import (get_auto_update,
+                                        is_confirm_before_apply_patch)
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import user_confirm
 
@@ -219,7 +220,6 @@ def handle_commit_workflow() -> bool:
     import subprocess
 
     try:
-
         confirm_add_new_files()
 
         if not has_uncommitted_changes():
@@ -411,7 +411,7 @@ def get_diff_file_list() -> List[str]:
     """
     try:
         confirm_add_new_files()
-        
+
         # 暂存新增文件
         subprocess.run(["git", "add", "-N", "."], check=True)
 
@@ -488,14 +488,15 @@ def get_recent_commits_with_files() -> List[Dict[str, Any]]:
             )
             if files_result.returncode == 0:
                 file_lines = files_result.stdout.splitlines()
-                unique_files = set(filter(None, file_lines))
-                commit["files"] = list(unique_files)[:20]  # 限制最多20个文件
+                unique_files: Set[str] = set(filter(None, file_lines))
+                commit["files"] = list(unique_files)[:20]  # type: ignore[list-item] # 限制最多20个文件
 
         return commits
 
     except subprocess.CalledProcessError:
         return []
 
+
 def _get_new_files() -> List[str]:
     """获取新增文件列表"""
     return subprocess.run(
@@ -505,8 +506,10 @@ def _get_new_files() -> List[str]:
         check=True,
     ).stdout.splitlines()
 
+
 def confirm_add_new_files() -> None:
     """确认新增文件、代码行数和二进制文件"""
+
     def _get_added_lines() -> int:
         """获取新增代码行数"""
         diff_stats = subprocess.run(
@@ -515,7 +518,7 @@ def confirm_add_new_files() -> None:
             text=True,
             check=True,
         ).stdout.splitlines()
-        
+
         added_lines = 0
         for stat in diff_stats:
             parts = stat.split()
@@ -531,55 +534,53 @@ def confirm_add_new_files() -> None:
         binary_files = []
         for file in files:
             try:
-                with open(file, 'rb') as f:
-                    if b'\x00' in f.read(1024):
+                with open(file, "rb") as f:
+                    if b"\x00" in f.read(1024):
                         binary_files.append(file)
             except (IOError, PermissionError):
                 continue
         return binary_files
 
-    def _check_conditions(new_files: List[str], added_lines: int, binary_files: List[str]) -> bool:
+    def _check_conditions(
+        new_files: List[str], added_lines: int, binary_files: List[str]
+    ) -> bool:
         """检查各种条件并打印提示信息"""
         need_confirm = False
-        
+        output_lines = []
+
         if len(new_files) > 20:
-            PrettyOutput.print(
-                f"检测到{len(new_files)}个新增文件(选择N将重新检测)",
-                OutputType.WARNING
-            )
-            PrettyOutput.print("新增文件列表:", OutputType.INFO)
-            for file in new_files:
-                PrettyOutput.print(f"  - {file}", OutputType.INFO)
+            output_lines.append(f"检测到{len(new_files)}个新增文件(选择N将重新检测)")
+            output_lines.append("新增文件列表:")
+            output_lines.extend(f"  - {file}" for file in new_files)
             need_confirm = True
-        
+
         if added_lines > 500:
-            PrettyOutput.print(
-                f"检测到{added_lines}行新增代码(选择N将重新检测)",
-                OutputType.WARNING
-            )
+            output_lines.append(f"检测到{added_lines}行新增代码(选择N将重新检测)")
             need_confirm = True
-        
+
         if binary_files:
+            output_lines.append(f"检测到{len(binary_files)}个二进制文件(选择N将重新检测)")
+            output_lines.append("二进制文件列表:")
+            output_lines.extend(f"  - {file}" for file in binary_files)
+            need_confirm = True
+
+        if output_lines:
             PrettyOutput.print(
-                f"检测到{len(binary_files)}个二进制文件(选择N将重新检测)",
-                OutputType.WARNING
+                "\n".join(output_lines),
+                OutputType.WARNING if need_confirm else OutputType.INFO,
             )
-            PrettyOutput.print("二进制文件列表:", OutputType.INFO)
-            for file in binary_files:
-                PrettyOutput.print(f"  - {file}", OutputType.INFO)
-            need_confirm = True
-        
+
         return need_confirm
 
     while True:
         new_files = _get_new_files()
         added_lines = _get_added_lines()
         binary_files = _get_binary_files(new_files)
-        
+
         if not _check_conditions(new_files, added_lines, binary_files):
             break
-            
+
         if not user_confirm("是否要添加这些变更（如果不需要请修改.gitignore文件以忽略不需要的文件）？", False):
             continue
-            
-        break
+
+        break