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

jarvis/jarvis_git_utils/git_commiter.py

@@ -12,8 +12,7 @@ from yaspin import yaspin
 
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_utils.config import get_git_commit_prompt
-from jarvis.jarvis_utils.git_utils import (find_git_root,
-                                           has_uncommitted_changes)
+from jarvis.jarvis_utils.git_utils import find_git_root, has_uncommitted_changes
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.tag import ct, ot
 from jarvis.jarvis_utils.utils import init_env, is_context_overflow
@@ -22,263 +21,301 @@ from jarvis.jarvis_utils.utils import init_env, is_context_overflow
 class GitCommitTool:
     name = "git_commit_agent"
     description = "根据代码变更自动生成并执行Git提交"
-    labels = ['git', 'version_control']
+    labels = ["git", "version_control"]
     parameters = {
         "type": "object",
         "properties": {
             "root_dir": {
                 "type": "string",
                 "description": "Git仓库的根目录路径（可选）",
-                "default": "."
+                "default": ".",
             },
-            "prefix": {
-                "type": "string",
-                "description": "提交信息前缀（可选）",
-                "default": ""
-            },
-            "suffix": {
-                "type": "string",
-                "description": "提交信息后缀（可选）",
-                "default": ""
-            }
+            "prefix": {"type": "string", "description": "提交信息前缀（可选）", "default": ""},
+            "suffix": {"type": "string", "description": "提交信息后缀（可选）", "default": ""},
         },
-        "required": []
+        "required": [],
     }
-    def _extract_commit_message(self, message)->Optional[str]:
+
+    def _extract_commit_message(self, message) -> Optional[str]:
         """Raw extraction preserving all characters"""
         r = re.search(
             r"(?i)" + ot("COMMIT_MESSAGE") + r"\s*([\s\S]*?)\s*" + ct("COMMIT_MESSAGE"),
-            message
+            message,
         )
         if r:
             # 直接返回原始内容，仅去除外围空白
             return r.group(1).strip()
         return None
 
-    def _get_last_commit_hash(self):
+    def _get_last_commit_hash(self) -> str:
         process = subprocess.Popen(
             ["git", "log", "-1", "--pretty=%H"],
             stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE
+            stderr=subprocess.PIPE,
         )
         stdout, _ = process.communicate()
         return stdout.decode().strip()
 
+    def _prepare_git_environment(self, root_dir: str) -> Optional[str]:
+        """Prepare git environment by changing directory and checking for changes"""
+        original_dir = os.getcwd()
+        os.chdir(root_dir)
+        find_git_root()
+        if not has_uncommitted_changes():
+            PrettyOutput.print("没有未提交的更改", OutputType.SUCCESS)
+            return None
+        return original_dir
+
+    def _stage_changes(self, spinner) -> None:
+        """Stage all changes for commit"""
+        spinner.text = "正在添加文件到提交..."
+        subprocess.Popen(
+            ["git", "add", "."], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL
+        ).wait()
+        spinner.write("✅ 添加文件到提交")
+
     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", "")
 
-            # Store current directory
-            original_dir = os.getcwd()
+            # Prepare git environment
+            result = self._prepare_git_environment(root_dir)
+            if result is None:
+                return {"success": True, "stdout": "No changes to commit", "stderr": ""}
+            original_dir = result
 
-            try:
-                # Change to root_dir
-                os.chdir(root_dir)
+            with yaspin(text="正在初始化提交流程...", color="cyan") as spinner:
+                # 添加文件到暂存区
+                self._stage_changes(spinner)
 
-                find_git_root()
-                if not has_uncommitted_changes():
-                    PrettyOutput.print("没有未提交的更改", OutputType.SUCCESS)
-                    return {"success": True, "stdout": "No changes to commit", "stderr": ""}
+                # 获取差异
+                spinner.text = "正在获取代码差异..."
+                # 获取文件列表
+                files_cmd = ["git", "diff", "--cached", "--name-only"]
+                process = subprocess.Popen(
+                    files_cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE
+                )
+                files_output = process.communicate()[0].decode()
+                files = [f.strip() for f in files_output.split("\n") if f.strip()]
+                file_count = len(files)
 
-                with yaspin(text="正在初始化提交流程...", color="cyan") as spinner:
-                    # 添加文件
-                    spinner.text = "正在添加文件到提交..."
-                    subprocess.Popen(
-                        ["git", "add", "."],
-                        stdout=subprocess.DEVNULL,
-                        stderr=subprocess.DEVNULL
-                    ).wait()
-                    spinner.write("✅ 添加文件到提交")
+                # 获取完整差异
+                process = subprocess.Popen(
+                    ["git", "diff", "--cached", "--exit-code"],
+                    stdout=subprocess.PIPE,
+                    stderr=subprocess.PIPE,
+                )
+                diff = process.communicate()[0].decode()
+                spinner.write(f"✅ 获取差异 ({file_count} 个文件)")
+                try:
+                    temp_diff_file_path = None
+                    # 生成提交信息
+                    spinner.text = "正在生成提交消息..."
 
-                    # 获取差异
-                    spinner.text = "正在获取代码差异..."
-                    # 获取文件列表
-                    files_cmd = ["git", "diff", "--cached", "--name-only"]
-                    process = subprocess.Popen(
-                        files_cmd,
-                        stdout=subprocess.PIPE,
-                        stderr=subprocess.PIPE
-                    )
-                    files_output = process.communicate()[0].decode()
-                    files = [f.strip() for f in files_output.split("\n") if f.strip()]
-                    file_count = len(files)
-                    
-                    # 获取完整差异
-                    process = subprocess.Popen(
-                        ["git", "diff", "--cached", "--exit-code"],
-                        stdout=subprocess.PIPE,
-                        stderr=subprocess.PIPE
+                    # 准备提示信息
+                    custom_prompt = get_git_commit_prompt()
+                    base_prompt = (
+                        custom_prompt
+                        if custom_prompt
+                        else f"""根据代码差异生成提交信息：
+                    提交信息应使用中文书写
+# 格式模板
+必须使用以下格式：
+
+<类型>(<范围>): <主题>
+
+[可选] 详细描述变更内容和原因
+
+# 格式规则
+1. 类型: fix(修复bug), feat(新功能), docs(文档), style(格式), refactor(重构), test(测试), chore(其他)
+2. 范围表示变更的模块或组件 (例如: auth, database, ui)
+3. 主题行不超过72个字符，不以句号结尾，使用祈使语气
+4. 如有详细描述，使用空行分隔主题和详细描述
+5. 详细描述部分应解释"是什么"和"为什么"，而非"如何"
+6. 仅输出提交信息，不要输出其他内容
+"""
                     )
-                    diff = process.communicate()[0].decode()
-                    spinner.write(f"✅ 获取差异 ({file_count} 个文件)")
-                    try:
-                        temp_diff_file_path = None
-                        # 生成提交信息
-                        spinner.text = "正在生成提交消息..."
-                        
-                        # 准备提示信息
-                        custom_prompt = get_git_commit_prompt()
-                        base_prompt = custom_prompt if custom_prompt else f'''根据代码差异生成提交信息：
-                        提交信息应使用中文书写
-    # 格式模板
-    必须使用以下格式：
+                    base_prompt += f"""
+# 输出格式
+{ot("COMMIT_MESSAGE")}
+commit信息
+{ct("COMMIT_MESSAGE")}
+                    """
 
-    <类型>(<范围>): <主题>
-    
-    [可选] 详细描述变更内容和原因
+                    # 获取模型并尝试上传文件
+                    platform = PlatformRegistry().get_normal_platform()
+                    upload_success = False
 
-    # 格式规则
-    1. 类型: fix(修复bug), feat(新功能), docs(文档), style(格式), refactor(重构), test(测试), chore(其他)
-    2. 范围表示变更的模块或组件 (例如: auth, database, ui)
-    3. 主题行不超过72个字符，不以句号结尾，使用祈使语气
-    4. 如有详细描述，使用空行分隔主题和详细描述
-    5. 详细描述部分应解释"是什么"和"为什么"，而非"如何"
-    6. 仅输出提交信息，不要输出其他内容
-    '''
-                        base_prompt += f"""
-    # 输出格式
-    {ot("COMMIT_MESSAGE")}
-    commit信息
-    {ct("COMMIT_MESSAGE")}
-                        """
+                    # Check if content is too large
+                    is_large_content = is_context_overflow(diff)
 
-                        # 获取模型并尝试上传文件
-                        platform = PlatformRegistry().get_normal_platform()
-                        upload_success = False
-                        
-                        # Check if content is too large
-                        is_large_content = is_context_overflow(diff)
-                        
-                        if is_large_content and hasattr(platform, 'upload_files'):
-                            spinner.text = "正在上传代码差异文件..."
-                            try:
-                                with spinner.hidden():
-                                    # 创建临时文件并写入差异内容
-                                    with tempfile.NamedTemporaryFile(mode='w', suffix='.diff', delete=False) as temp_diff_file: 
-                                        temp_diff_file_path = temp_diff_file.name
-                                        temp_diff_file.write(diff)
-                                        temp_diff_file.flush()
-                                        spinner.write(f"✅ 差异内容已写入临时文件")
-                                    upload_success = platform.upload_files([temp_diff_file_path])
-                                if upload_success:
-                                    spinner.write("✅ 成功上传代码差异文件")
-                                else:
-                                    spinner.write("⚠️ 上传代码差异文件失败，将使用分块处理")
-                            except Exception as e:
-                                spinner.write(f"⚠️ 上传文件时出错: {str(e)}")
-                                upload_success = False
-                        # 根据上传状态准备完整的提示
+                    if is_large_content:
+                        if not platform.support_upload_files():
+                            spinner.text = "差异文件太大，无法处理"
+                            spinner.fail("❌")
+                            return {
+                                "success": False,
+                                "stdout": "",
+                                "stderr": "错误：差异文件太大，无法处理",
+                            }
+                        spinner.text = "正在上传代码差异文件..."
+                        with spinner.hidden():
+                            # 创建临时文件并写入差异内容
+                            with tempfile.NamedTemporaryFile(
+                                mode="w", suffix=".diff", delete=False
+                            ) as temp_diff_file:
+                                temp_diff_file_path = temp_diff_file.name
+                                temp_diff_file.write(diff)
+                                temp_diff_file.flush()
+                                spinner.write(f"✅ 差异内容已写入临时文件")
+                            upload_success = platform.upload_files(
+                                [temp_diff_file_path]
+                            )
                         if upload_success:
-                            # 尝试生成提交信息
-                            spinner.text = "正在生成提交消息..."
-                            # 使用上传的文件
-                            prompt = base_prompt + f'''
-    # 变更概述
-    - 变更文件数量: {file_count} 个文件
-    - 已上传包含完整代码差异的文件
-    
-    请详细分析已上传的代码差异文件，生成符合上述格式的提交信息。
-    '''
-                            commit_message = platform.chat_until_success(prompt)
+                            spinner.write("✅ 成功上传代码差异文件")
                         else:
-                                if is_large_content:
-                                    return {
-                                        "success": False,
-                                        "stdout": "",
-                                        "stderr": "错误：上传代码差异文件失败"
-                                    }
-                                # 直接在提示中包含差异内容
-                                prompt = base_prompt + f'''
-    # 分析材料
-    {diff}
-    '''
-                                commit_message = platform.chat_until_success(prompt)
-                        
-                        while True:
-                            # 只在特定情况下重新获取commit_message
-                            if not upload_success and not is_large_content and not commit_message:
-                                commit_message = platform.chat_until_success(prompt)
-                            extracted_message = self._extract_commit_message(commit_message)
-                            # 如果成功提取，就跳出循环
-                            if extracted_message:
-                                commit_message = extracted_message
-                                # 应用prefix和suffix
-                                if prefix:
-                                    commit_message = f"{prefix} {commit_message}"
-                                if suffix:
-                                    commit_message = f"{commit_message}\n{suffix}"
-                                break
-                            prompt = f"""格式错误，请按照以下格式重新生成提交信息：
-                            {ot("COMMIT_MESSAGE")}
-                            commit信息
-                            {ct("COMMIT_MESSAGE")}
-                            """
-                            commit_message = platform.chat_until_success(prompt)
-                        spinner.write("✅ 生成提交消息")
+                            spinner.text = "上传代码差异文件失败"
+                            spinner.fail("❌")
+                            return {
+                                "success": False,
+                                "stdout": "",
+                                "stderr": "错误：上传代码差异文件失败",
+                            }
+                    # 根据上传状态准备完整的提示
+                    if is_large_content:
+                        # 尝试生成提交信息
+                        spinner.text = "正在生成提交消息..."
+                        # 使用上传的文件
+                        prompt = (
+                            base_prompt
+                            + f"""
+# 变更概述
+- 变更文件数量: {file_count} 个文件
+- 已上传包含完整代码差异的文件
+
+请详细分析已上传的代码差异文件，生成符合上述格式的提交信息。
+"""
+                        )
+                        commit_message = platform.chat_until_success(prompt)
+                    else:
+                        prompt = (
+                            base_prompt
+                            + f"""
+# 分析材料
+{diff}
+"""
+                        )
+                        commit_message = platform.chat_until_success(prompt)
 
-                        # 执行提交
-                        spinner.text = "正在准备提交..."
-                        with tempfile.NamedTemporaryFile(mode='w', delete=True) as tmp_file:
-                            tmp_file.write(commit_message)
-                            tmp_file.flush()
-                            spinner.text = "正在执行提交..."
-                            commit_cmd = ["git", "commit", "-F", tmp_file.name]
-                            subprocess.Popen(
-                                commit_cmd,
-                                stdout=subprocess.DEVNULL,
-                                stderr=subprocess.DEVNULL
-                            ).wait()
-                            spinner.write("✅ 提交")
+                    while True:
+                        # 只在特定情况下重新获取commit_message
+                        if (
+                            not upload_success
+                            and not is_large_content
+                            and not commit_message
+                        ):
+                            commit_message = platform.chat_until_success(prompt)
+                        extracted_message = self._extract_commit_message(commit_message)
+                        # 如果成功提取，就跳出循环
+                        if extracted_message:
+                            commit_message = extracted_message
+                            # 应用prefix和suffix
+                            if prefix:
+                                commit_message = f"{prefix} {commit_message}"
+                            if suffix:
+                                commit_message = f"{commit_message}\n{suffix}"
+                            break
+                        prompt = f"""格式错误，请按照以下格式重新生成提交信息：
+                        {ot("COMMIT_MESSAGE")}
+                        commit信息
+                        {ct("COMMIT_MESSAGE")}
+                        """
+                        commit_message = platform.chat_until_success(prompt)
+                    spinner.write("✅ 生成提交消息")
 
-                        commit_hash = self._get_last_commit_hash()
-                        spinner.text = "完成提交"
-                        spinner.ok("✅")
-                    finally:
-                        # 清理临时差异文件
-                        if temp_diff_file_path is not None and os.path.exists(temp_diff_file_path):
-                            try:
-                                os.unlink(temp_diff_file_path)
-                            except Exception as e:
-                                spinner.write(f"⚠️ 无法删除临时文件: {str(e)}")
+                    # 执行提交
+                    spinner.text = "正在准备提交..."
+                    with tempfile.NamedTemporaryFile(mode="w", delete=True) as tmp_file:
+                        tmp_file.write(commit_message)
+                        tmp_file.flush()
+                        spinner.text = "正在执行提交..."
+                        commit_cmd = ["git", "commit", "-F", tmp_file.name]
+                        subprocess.Popen(
+                            commit_cmd,
+                            stdout=subprocess.DEVNULL,
+                            stderr=subprocess.DEVNULL,
+                        ).wait()
+                        spinner.write("✅ 提交")
 
-                PrettyOutput.print(f"提交哈希: {commit_hash}\n提交消息: {commit_message}", OutputType.SUCCESS)
+                    commit_hash = self._get_last_commit_hash()
+                    spinner.text = "完成提交"
+                    spinner.ok("✅")
+                finally:
+                    # 清理临时差异文件
+                    if temp_diff_file_path is not None and os.path.exists(
+                        temp_diff_file_path
+                    ):
+                        try:
+                            os.unlink(temp_diff_file_path)
+                        except Exception as e:
+                            spinner.write(f"⚠️ 无法删除临时文件: {str(e)}")
 
-                return {
-                    "success": True,
-                    "stdout": yaml.safe_dump({
-                        "commit_hash": commit_hash,
-                        "commit_message": commit_message
-                    }, allow_unicode=True),
-                    "stderr": ""
-                }
-            finally:
-                # Always restore original directory
-                os.chdir(original_dir)
+            PrettyOutput.print(
+                f"提交哈希: {commit_hash}\n提交消息: {commit_message}", OutputType.SUCCESS
+            )
 
+            return {
+                "success": True,
+                "stdout": yaml.safe_dump(
+                    {"commit_hash": commit_hash, "commit_message": commit_message},
+                    allow_unicode=True,
+                ),
+                "stderr": "",
+            }
         except Exception as e:
             PrettyOutput.print(f"提交失败: {str(e)}", OutputType.ERROR)
             return {
                 "success": False,
                 "stdout": "",
-                "stderr": f"Commit failed: {str(e)}"
+                "stderr": f"Commit failed: {str(e)}",
             }
+        finally:
+            # Always restore original directory
+            os.chdir(original_dir)
+
 
 def main():
     init_env("欢迎使用 Jarvis-GitCommitTool，您的Git提交助手已准备就绪！")
-    parser = argparse.ArgumentParser(description='Git commit tool')
-    parser.add_argument('--root-dir', type=str, default='.', help='Root directory of the Git repository')
-    parser.add_argument('--prefix', type=str, default='', help='Prefix to prepend to commit message (separated by space)')
-    parser.add_argument('--suffix', type=str, default='', help='Suffix to append to commit message (separated by newline)')
+    parser = argparse.ArgumentParser(description="Git commit tool")
+    parser.add_argument(
+        "--root-dir", type=str, default=".", help="Root directory of the Git repository"
+    )
+    parser.add_argument(
+        "--prefix",
+        type=str,
+        default="",
+        help="Prefix to prepend to commit message (separated by space)",
+    )
+    parser.add_argument(
+        "--suffix",
+        type=str,
+        default="",
+        help="Suffix to append to commit message (separated by newline)",
+    )
     args = parser.parse_args()
     tool = GitCommitTool()
-    tool.execute({
-        "root_dir": args.root_dir,
-        "prefix": args.prefix if hasattr(args, 'prefix') else '',
-        "suffix": args.suffix if hasattr(args, 'suffix') else ''
-    })
+    tool.execute(
+        {
+            "root_dir": args.root_dir,
+            "prefix": args.prefix if hasattr(args, "prefix") else "",
+            "suffix": args.suffix if hasattr(args, "suffix") else "",
+        }
+    )
+
 
 if __name__ == "__main__":
-    sys.exit(main())
+    sys.exit(main())

jarvis/jarvis_platform/base.py

@@ -49,6 +49,10 @@ class BasePlatform(ABC):
     def upload_files(self, file_list: List[str]) -> bool:
         raise NotImplementedError("upload_files is not implemented")
 
+    @abstractmethod
+    def support_upload_files(self) -> bool:
+        """Check if platform supports upload files"""
+        return False
 
     
     def _chat(self, message: str):
@@ -56,9 +60,6 @@ class BasePlatform(ABC):
         start_time = time.time()
 
         input_token_count = get_context_token_count(message)
-        if is_context_overflow(message):
-            PrettyOutput.print("错误：输入内容超过最大限制", OutputType.WARNING)
-            return "错误：输入内容超过最大限制"
 
         if input_token_count > get_max_input_token_count():
             max_chunk_size = get_max_input_token_count() - 1024  # 留出一些余量

jarvis/jarvis_platform/kimi.py

@@ -90,6 +90,10 @@ class KimiModel(BasePlatform):
         
         response = while_success(lambda: requests.post(url, headers=headers, data=payload), sleep_time=5)
         return response.json()
+    
+    def support_upload_files(self) -> bool:
+        """Check if platform supports upload files"""
+        return True
 
     def _upload_file(self, file_path: str, presigned_url: str) -> bool:
         """Upload file to presigned URL"""

jarvis/jarvis_platform/tongyi.py

@@ -67,6 +67,10 @@ class TongyiPlatform(BasePlatform):
     def _generate_request_id(self):
         self.request_id = str(uuid.uuid4()).replace("-", "")
 
+    def support_upload_files(self) -> bool:
+        """Check if platform supports upload files"""
+        return True
+
     def chat(self, message: str) -> Generator[str, None, None]:
         if not self.request_id:
             self._generate_request_id()

jarvis/jarvis_platform/yuanbao.py

@@ -107,6 +107,10 @@ class YuanbaoPlatform(BasePlatform):
             PrettyOutput.print(f"错误：创建会话失败：{e}", OutputType.ERROR)
             return False
 
+    def support_upload_files(self) -> bool:
+        """Check if platform supports upload files"""
+        return True
+
     def upload_files(self, file_list: List[str]) -> bool:
         """上传文件到元宝平台
         

jarvis/jarvis_platform_manager/main.py

@@ -105,6 +105,10 @@ def chat_with_model(platform_name: str, model_name: str):
                     # Remove quotes if present
                     if (file_path.startswith('"') and file_path.endswith('"')) or (file_path.startswith("'") and file_path.endswith("'")):
                         file_path = file_path[1:-1]
+
+                    if not platform.support_upload_files():
+                        PrettyOutput.print("平台不支持上传文件", OutputType.ERROR)
+                        continue
                     
                     PrettyOutput.print(f"正在上传文件: {file_path}", OutputType.INFO)
                     if platform.upload_files([file_path]):

jarvis/jarvis_tools/edit_file.py

@@ -286,11 +286,11 @@ def slow_edit(filepath: str, patch_content: str, spinner: Yaspin) -> Tuple[bool,
     model = PlatformRegistry().get_normal_platform()
     try:
         file_content = FileOperationTool().execute({"operation":"read", "files":[{"path":filepath}]})["stdout"]
-        need_upload_file = is_context_overflow(file_content)
+        is_large_context = is_context_overflow(file_content)
         upload_success = False
         # 读取原始文件内容
         with spinner.hidden():  
-            if need_upload_file and model.upload_files([filepath]):
+            if is_large_context and model.support_upload_files() and model.upload_files([filepath]):
                 upload_success = True
 
 
@@ -340,19 +340,21 @@ def slow_edit(filepath: str, patch_content: str, spinner: Yaspin) -> Tuple[bool,
 """
         
         for _ in range(3):
-            file_prompt = ""
-            if not need_upload_file:
+            if is_large_context:
+                if upload_success:
+                    response = model.chat_until_success(main_prompt)
+                else:
+                    file_prompt = f"""
+# 原始代码
+{file_content}
+"""
+                    response = model.chat_until_success(main_prompt + file_prompt)
+            else:
                 file_prompt = f"""
 # 原始代码
 {file_content}
 """
-                
                 response = model.chat_until_success(main_prompt + file_prompt)
-            else:
-                if upload_success:
-                    response = model.chat_until_success(main_prompt)
-                else:
-                    return False, "文件上传失败"
 
             # 解析差异化补丁
             diff_blocks = re.finditer(ot("DIFF")+r'\s*>{4,} SEARCH\n?(.*?)\n?={4,}\n?(.*?)\s*<{4,} REPLACE\n?'+ct("DIFF"),