jarvis-ai-assistant 0.1.89__py3-none-any.whl → 0.1.90__py3-none-any.whl

jarvis/jarvis_coder/patch_handler.py

@@ -1,390 +0,0 @@
-import re
-import os
-from typing import List, Tuple, Dict
-from jarvis.utils import OutputType, PrettyOutput
-from .model_utils import call_model_with_retry
-
-class PatchHandler:
-    def __init__(self, model):
-        self.model = model
-
-    def _extract_patches(self, response: str) -> List[Tuple[str, str, str]]:
-        """从响应中提取补丁
-        
-        Args:
-            response: 模型响应内容
-            
-        Returns:
-            List[Tuple[str, str, str]]: 补丁列表，每个补丁是 (格式, 文件路径, 补丁内容) 的元组
-        """
-        patches = []
-        
-        # 匹配两种格式的补丁
-        fmt1_patches = re.finditer(r'<PATCH_FMT1>\n?(.*?)\n?</PATCH_FMT1>', response, re.DOTALL)
-        fmt2_patches = re.finditer(r'<PATCH_FMT2>\n?(.*?)\n?</PATCH_FMT2>', response, re.DOTALL)
-        
-        # 处理 FMT1 格式的补丁
-        for match in fmt1_patches:
-            patch_content = match.group(1)
-            if not patch_content:
-                continue
-                
-            # 提取文件路径和补丁内容
-            lines = patch_content.split('\n')
-            file_path_match = re.search(r'> (.*)', lines[0])
-            if not file_path_match:
-                continue
-                
-            file_path = file_path_match.group(1).strip()
-            patch_content = '\n'.join(lines[1:])
-            patches.append(("FMT1", file_path, patch_content))
-        
-        # 处理 FMT2 格式的补丁
-        for match in fmt2_patches:
-            patch_content = match.group(1)
-            if not patch_content:
-                continue
-                
-            # 提取文件路径和补丁内容
-            lines = patch_content.split('\n')
-            file_path_match = re.search(r'> (.*)', lines[0])
-            if not file_path_match:
-                continue
-                
-            file_path = file_path_match.group(1).strip()
-            patch_content = '\n'.join(lines[1:])
-            patches.append(("FMT2", file_path, patch_content))
-        
-        return patches
-
-    def make_patch(self, related_files: List[Dict], feature: str) -> List[Tuple[str, str, str]]:
-        """生成修改方案"""
-        prompt = """你是一个资深程序员，请根据需求描述，修改文件内容。
-
-修改格式说明：
-1. 第一种格式 - 完整代码块替换：
-<PATCH_FMT1>
-> path/to/file
-old_content
-@@@@@@
-new_content
-</PATCH_FMT1>
-
-例：
-<PATCH_FMT1>
-> src/main.py
-def old_function():
-    print("old code")
-    return False
-@@@@@@
-def old_function():
-    print("new code")
-    return True
-</PATCH_FMT1>
-
-2. 第二种格式 - 通过首尾行定位要修改的代码范围：
-<PATCH_FMT2>
-> path/to/file
-start_line_content
-end_line_content
-new_content
-...
-</PATCH_FMT2>
-
-例：
-<PATCH_FMT2>
-> src/main.py
-def old_function():
-    return False
-def new_function():
-    print("new code")
-    return True
-</PATCH_FMT2>
-
-例子中 `def old_function():` 是首行内容，`return False` 是尾行内容，第三行开始是新的代码内容，将替换第一行到最后一行之间的所有内容
-
-注意事项：
-1、仅输出补丁内容，不要输出任何其他内容
-2、如果在大段代码中有零星修改，生成多个补丁
-3、要替换的内容，一定要与文件内容完全一致，不要有任何多余或者缺失的内容
-4、每个patch不超过20行，超出20行，请生成多个patch
-5、务必保留原始文件的缩进和格式
-6、优先使用第二种格式（PATCH_FMT2），因为它更准确地定位要修改的代码范围
-7、第二种格式（PATCH_FMT2）的前两行必须完全匹配文件中要修改的代码块的首尾行
-8、如果第二种格式无法准确定位到要修改的代码（比如有重复的行），请使用第一种格式（PATCH_FMT1）
-"""
-        # 添加文件内容到提示
-        for i, file in enumerate(related_files):
-            prompt += f"""\n{i}. {file["file_path"]}\n"""
-            prompt += f"""文件内容:\n"""
-            prompt += f"<FILE_CONTENT>\n"
-            prompt += f'{file["file_content"]}\n'
-            prompt += f"</FILE_CONTENT>\n"
-        
-        prompt += f"\n需求描述: {feature}\n"
-
-        # 调用模型生成补丁
-        success, response = call_model_with_retry(self.model, prompt)
-        if not success:
-            PrettyOutput.print("生成补丁失败", OutputType.ERROR)
-            return []
-            
-        try:
-            patches = self._extract_patches(response)
-            
-            if not patches:
-                PrettyOutput.print("未生成任何有效补丁", OutputType.WARNING)
-                return []
-                
-            PrettyOutput.print(f"生成了 {len(patches)} 个补丁", OutputType.SUCCESS)
-            return patches
-            
-        except Exception as e:
-            PrettyOutput.print(f"解析patch失败: {str(e)}", OutputType.WARNING)
-            return []
-
-    def apply_patch(self, related_files: List[Dict], patches: List[Tuple[str, str, str]]) -> Tuple[bool, str]:
-        """应用补丁
-        
-        Args:
-            related_files: 相关文件列表
-            patches: 补丁列表，每个补丁是 (格式, 文件路径, 补丁内容) 的元组
-            
-        Returns:
-            Tuple[bool, str]: (是否成功, 错误信息)
-        """
-        error_info = []
-        modified_files = set()
-
-        # 创建文件内容映射
-        file_map = {file["file_path"]: file["file_content"] for file in related_files}
-        temp_map = file_map.copy()  # 创建临时映射用于尝试应用
-        
-        # 尝试应用所有补丁
-        for i, (fmt, file_path, patch_content) in enumerate(patches):
-            PrettyOutput.print(f"正在应用补丁 {i+1}/{len(patches)}", OutputType.INFO)
-            
-            try:
-                # 处理文件修改
-                if file_path not in temp_map:
-                    error_info.append(f"文件不存在: {file_path}")
-                    return False, "\n".join(error_info)
-                
-                current_content = temp_map[file_path]
-                
-                if fmt == "FMT1":  # 完整代码块替换格式
-                    parts = patch_content.split("@@@@@@")
-                    if len(parts) != 2:
-                        error_info.append(f"FMT1补丁格式错误: {file_path}，缺少分隔符")
-                        return False, "\n".join(error_info)
-                        
-                    old_content, new_content = parts
-                    
-                    # 处理新文件
-                    if not old_content:
-                        temp_map[file_path] = new_content
-                        modified_files.add(file_path)
-                        continue
-                    
-                    # 查找并替换代码块
-                    if old_content not in current_content:
-                        error_info.append(
-                            f"补丁应用失败: {file_path}\n"
-                            f"原因: 未找到要替换的代码\n"
-                            f"期望找到的代码:\n{old_content}\n"
-                            f"实际文件内容:\n{current_content[:200]}..."
-                        )
-                        return False, "\n".join(error_info)
-                    
-                    # 应用更改
-                    temp_map[file_path] = current_content.replace(old_content, new_content)
-                    
-                else:  # FMT2 - 首尾行定位格式
-                    lines = patch_content.splitlines()
-                    if len(lines) < 3:
-                        error_info.append(f"FMT2补丁格式错误: {file_path}，行数不足")
-                        return False, "\n".join(error_info)
-                        
-                    first_line = lines[0]
-                    last_line = lines[1]
-                    new_content = '\n'.join(lines[2:])
-                    
-                    # 在文件内容中定位要替换的区域
-                    content_lines = current_content.splitlines()
-                    start_idx = -1
-                    end_idx = -1
-                    
-                    # 查找匹配的起始行和结束行
-                    for idx, line in enumerate(content_lines):
-                        if line.rstrip() == first_line.rstrip():
-                            start_idx = idx
-                        if start_idx != -1 and line.rstrip() == last_line.rstrip():
-                            end_idx = idx
-                            break
-                    
-                    if start_idx == -1 or end_idx == -1:
-                        error_info.append(
-                            f"补丁应用失败: {file_path}\n"
-                            f"原因: 未找到匹配的代码范围\n"
-                            f"起始行: {first_line}\n"
-                            f"结束行: {last_line}"
-                        )
-                        return False, "\n".join(error_info)
-                    
-                    # 替换内容
-                    content_lines[start_idx:end_idx + 1] = new_content.splitlines()
-                    temp_map[file_path] = "\n".join(content_lines)
-                
-                modified_files.add(file_path)
-                
-            except Exception as e:
-                error_info.append(f"处理补丁时发生错误: {str(e)}")
-                return False, "\n".join(error_info)
-        
-        # 所有补丁都应用成功，更新实际文件
-        for file_path in modified_files:
-            try:
-                dir_path = os.path.dirname(file_path)
-                if dir_path and not os.path.exists(dir_path):
-                    os.makedirs(dir_path, exist_ok=True)
-                    
-                with open(file_path, "w", encoding="utf-8") as f:
-                    f.write(temp_map[file_path])
-                    
-                PrettyOutput.print(f"成功修改文件: {file_path}", OutputType.SUCCESS)
-                
-            except Exception as e:
-                error_info.append(f"写入文件失败 {file_path}: {str(e)}")
-                return False, "\n".join(error_info)
-        
-        return True, ""
-
-    def handle_patch_feedback(self, error_msg: str, feature: str) -> List[Tuple[str, str, str]]:
-        """处理补丁应用失败的反馈
-        
-        Args:
-            error_msg: 错误信息
-            feature: 功能描述
-            
-        Returns:
-            List[Tuple[str, str, str]]: 新的补丁列表
-        """
-        PrettyOutput.print("补丁应用失败，尝试重新生成", OutputType.WARNING)
-        
-        # 获取用户补充信息
-        additional_info = input("\n请输入补充信息(直接回车跳过):")
-        PrettyOutput.print(f"开始重新生成补丁", OutputType.INFO)
-        
-        # 构建重试提示
-        retry_prompt = f"""补丁应用失败，请根据以下信息重新生成补丁：
-
-错误信息：
-{error_msg}
-
-原始需求：
-{feature}
-
-用户补充信息：
-{additional_info}
-
-请重新生成补丁，确保：
-1. 代码匹配完全准确
-2. 保持正确的缩进和格式
-3. 避免之前的错误
-"""
-        success, response = call_model_with_retry(self.model, retry_prompt)
-        if not success:
-            return []
-            
-        try:
-            patches = self._extract_patches(response)
-            return patches
-            
-        except Exception as e:
-            PrettyOutput.print(f"解析patch失败: {str(e)}", OutputType.WARNING)
-            return []
-
-    def monitor_patch_result(self, success: bool, error_msg: str) -> bool:
-        """监控补丁应用结果
-        
-        Args:
-            success: 是否成功
-            error_msg: 错误信息
-            
-        Returns:
-            bool: 是否继续尝试
-        """
-        if success:
-            PrettyOutput.print("补丁应用成功", OutputType.SUCCESS)
-            return False
-            
-        PrettyOutput.print(f"补丁应用失败: {error_msg}", OutputType.ERROR)
-        
-        # 询问是否继续尝试
-        retry = input("\n是否重新尝试？(y/n) [y]: ").lower() or "y"
-        return retry == "y"
-
-    def handle_patch_application(self, related_files: List[Dict], feature: str) -> bool:
-        """处理补丁应用流程
-        
-        Args:
-            related_files: 相关文件列表
-            feature: 功能描述
-            
-        Returns:
-            bool: 是否成功应用补丁
-        """
-        max_attempts = 3
-        attempt = 0
-        
-        while attempt < max_attempts:
-            attempt += 1
-            
-            while True:  # 在当前尝试中循环，直到成功或用户放弃
-                # 1. 生成补丁
-                patches = self.make_patch(related_files, feature)
-                if not patches:
-                    return False
-                
-                # 2. 显示补丁内容
-                PrettyOutput.print("\n将要应用以下补丁:", OutputType.INFO)
-                for fmt, file_path, patch_content in patches:
-                    PrettyOutput.print(f"\n文件: {file_path}", OutputType.INFO)
-                    PrettyOutput.print(f"格式: {fmt}", OutputType.INFO)
-                    PrettyOutput.print("补丁内容:", OutputType.INFO)
-                    print(patch_content)
-                
-                # 3. 应用补丁
-                success, error_msg = self.apply_patch(related_files, patches)
-                if not success:
-                    # 4. 如果应用失败，询问是否重试
-                    should_retry = self.monitor_patch_result(success, error_msg)
-                    if not should_retry:
-                        break  # 退出内层循环，尝试下一次完整的迭代
-                        
-                    # 5. 处理失败反馈
-                    patches = self.handle_patch_feedback(error_msg, feature)
-                    if not patches:
-                        return False
-                    continue  # 继续当前迭代
-                
-                # 6. 应用成功，让用户确认修改
-                PrettyOutput.print("\n补丁已应用，请检查修改效果。", OutputType.SUCCESS)
-                confirm = input("\n是否保留这些修改？(y/n) [y]: ").lower() or "y"
-                if confirm != "y":
-                    PrettyOutput.print("用户取消修改，正在回退", OutputType.WARNING)
-                    os.system("git reset --hard")  # 回退所有修改
-                    
-                    # 询问是否要在当前迭代中重试
-                    retry = input("\n是否要重新生成补丁？(y/n) [y]: ").lower() or "y"
-                    if retry != "y":
-                        break  # 退出内层循环，尝试下一次完整的迭代
-                    continue  # 继续当前迭代
-                
-                return True  # 用户确认修改，返回成功
-            
-            # 如果内层循环正常退出（非return），继续外层循环
-            continue
-        
-        PrettyOutput.print(f"达到最大重试次数 ({max_attempts})", OutputType.WARNING)
-        return False 

jarvis/tools/coder.py

@@ -1,69 +0,0 @@
-import os
-from typing import Dict, Any, Optional
-from jarvis.jarvis_coder.main import JarvisCoder
-from jarvis.utils import PrettyOutput, OutputType
-
-class CoderTool:
-    """代码修改工具"""
-    
-    name = "coder"
-    description = "分析并修改现有代码，用于实现新功能、修复bug、重构代码等。能理解代码上下文并进行精确的代码编辑。"
-    parameters = {
-        "feature": {
-            "type": "string",
-            "description": "要实现的功能描述或需要修改的内容，例如：'添加日志功能'、'修复内存泄漏'、'优化性能'等",
-            "required": True
-        },
-        "dir": {
-            "type": "string", 
-            "description": "项目根目录，默认为当前目录",
-            "required": False
-        },
-        "language": {
-            "type": "string",
-            "description": "项目的主要编程语言，默认为python",
-            "required": False
-        }
-    }
-
-    def __init__(self):
-        self._coder = None
-
-
-    def _init_coder(self, dir: Optional[str] = None, language: Optional[str] = "python") -> None:
-        """初始化JarvisCoder实例"""
-        if not self._coder:
-            import os
-            work_dir = dir or os.getcwd()
-            self._coder = JarvisCoder(work_dir, language)
-
-    def execute(self, args: Dict) -> Dict[str, Any]:
-        """执行代码修改
-        
-        Args:
-            feature: 要实现的功能描述
-            dir: 可选，项目根目录
-            language: 可选，编程语言
-            
-        Returns:
-            Dict[str, Any]: 执行结果
-        """
-        feature = args.get("feature")
-        dir = args.get("dir")
-        language = args.get("language", "python")
-        
-        try:
-            self.current_dir = os.getcwd()
-            self._init_coder(dir, language)
-            result = self._coder.execute(feature)
-            return result
-        except Exception as e:
-            PrettyOutput.print(f"代码修改失败: {str(e)}", OutputType.ERROR)
-            return {
-                "success": False,
-                "stdout": "",
-                "stderr": f"执行失败: {str(e)}",
-                "error": e
-            } 
-        finally:
-            os.chdir(self.current_dir)

jarvis_ai_assistant-0.1.89.dist-info/RECORD

@@ -1,43 +0,0 @@
-jarvis/__init__.py,sha256=_3MqMWMf232eVTukktJrSn128MkK9jyds0HMhYHti94,50
-jarvis/agent.py,sha256=_qh4mSojAgClOEz5pTiRIfRJU-5_3QGzBAU09roCjtk,19095
-jarvis/main.py,sha256=72od8757A3bhe0ncE38S7u-YZsAh0y50w9ozMhgqIU8,5423
-jarvis/utils.py,sha256=Y5zig7AgIzdWHF31qHaMUziezythfjVKjxFRtMzd1m4,10357
-jarvis/jarvis_codebase/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_codebase/main.py,sha256=hYdDwREfFW5KPbIbLZ75MFCth6VqrwxSeNfXiQavdzE,26473
-jarvis/jarvis_coder/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_coder/git_utils.py,sha256=tJ25kIzglGaPBqu42rZZSsXk0tpOFTiaG8q-bq4CSF0,2343
-jarvis/jarvis_coder/main.py,sha256=5uxexKziA5kMZLNkGPEzz8hKQvarKVflNqRcXZVWnT8,13406
-jarvis/jarvis_coder/model_utils.py,sha256=XXg5ZPlgRsq9K6iJb4vPoZqSiAJbAUIZffmgaLFnLCw,1104
-jarvis/jarvis_coder/patch_handler.py,sha256=U8I19Aq2U3LAU3FE94C3tlFQNtGYA_luwnBU7OnX7pw,15253
-jarvis/jarvis_rag/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_rag/main.py,sha256=a8TtPVCh5Xd6W1AaRFGeXvU_1hEnHQdoMElxnMuq0ew,24773
-jarvis/jarvis_smart_shell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_smart_shell/main.py,sha256=QgR1CZRcTVfC8a5hMso3onH3pFdDoniRjr0YQvY2jXQ,3809
-jarvis/models/__init__.py,sha256=mrOt67nselz_H1gX9wdAO4y2DY5WPXzABqJbr5Des8k,63
-jarvis/models/ai8.py,sha256=Te-zqUVTTsismsoS8yXljAMwxKY5BVHdfwJyzPrIYSc,12216
-jarvis/models/base.py,sha256=vQmgr-l0fRzVTUX4orbQZIKsXEInagjFdYv1cL9Hp7U,1511
-jarvis/models/kimi.py,sha256=ltYoHQDn9vfZyhZ25eUVKMBpxKKlqlw4kManozVF7uo,16135
-jarvis/models/ollama.py,sha256=iPCsJKZs3kXtuJyVBo6d6Ls5qBkSRgtuqF38PDFadso,6097
-jarvis/models/openai.py,sha256=Ns_kpJcWoQuxdKScOFlfkSGjrL2dVGzgmvcnP44sEgs,4044
-jarvis/models/oyi.py,sha256=vV3IMsdegxQqhS2vvG6MB648fec6bVopdNZC5xcdY_c,14678
-jarvis/models/registry.py,sha256=Lt8IdVBAEx_CCFtfZJPgw3nxSEjfFcqI47I-U64kIbg,8257
-jarvis/tools/__init__.py,sha256=7Rqyj5hBAv5cWDVr5T9ZTZASO7ssBHeQNm2_4ZARdkA,72
-jarvis/tools/ask_user.py,sha256=OELDt7oTCjI2G-CebvnBSxFJhqkIWcugLStU-XxouzE,1998
-jarvis/tools/base.py,sha256=EGRGbdfbLXDLwtyoWdvp9rlxNX7bzc20t0Vc2VkwIEY,652
-jarvis/tools/chdir.py,sha256=TjfPbX8yvNKgUNJEMXh3ZlVDEIse_Fo8xMoVsiK7_dA,2688
-jarvis/tools/codebase_qa.py,sha256=LsowsgL7HBmdBwa7zXcYi_OkwOok4qbnzYWYsuZxHtU,2413
-jarvis/tools/coder.py,sha256=kmotT2Klsug44S51QoSW9DzkxLzcF-XonyYAEoWZV6c,2295
-jarvis/tools/file_ops.py,sha256=h8g0eT9UvlJf4kt0DLXvdSsjcPj7x19lxWdDApeDfpg,3842
-jarvis/tools/generator.py,sha256=TB1zcw_JmRL2W9w6L4IxtrLF3gjnNw5Jj2Zrowj0eSg,5763
-jarvis/tools/methodology.py,sha256=UG6s5VYRcd9wrKX4cg6f7zJhet5AIcthFGMOAdevBiw,5175
-jarvis/tools/registry.py,sha256=AbADf8pcjHqfNoQNJkWqEuVg6zHRdryhJyDQ5w4O2sc,9177
-jarvis/tools/search.py,sha256=c9dXtyICdl8Lm8shNPNyIx9k67uY0rMF8xnIKu2RsnE,8787
-jarvis/tools/shell.py,sha256=UPKshPyOaUwTngresUw-ot1jHjQIb4wCY5nkJqa38lU,2520
-jarvis/tools/sub_agent.py,sha256=rEtAmSVY2ZjFOZEKr5m5wpACOQIiM9Zr_3dT92FhXYU,2621
-jarvis/tools/webpage.py,sha256=d3w3Jcjcu1ESciezTkz3n3Zf-rp_l91PrVoDEZnckOo,2391
-jarvis_ai_assistant-0.1.89.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.89.dist-info/METADATA,sha256=aG0WNMCBnK4O5fPKrNiq7Nj3wlsU5mx2xy1tQUSlmAU,12589
-jarvis_ai_assistant-0.1.89.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-jarvis_ai_assistant-0.1.89.dist-info/entry_points.txt,sha256=sdmIO86MrIUepJTGyHs0i_Ho9VGf1q9YRP4RgQvGWcI,280
-jarvis_ai_assistant-0.1.89.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.89.dist-info/RECORD,,