jarvis-ai-assistant 0.1.88__tar.gz → 0.1.89__tar.gz

{jarvis_ai_assistant-0.1.88/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.89}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.88
+Version: 0.1.89
 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.1.88 → jarvis_ai_assistant-0.1.89}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.88"
+version = "0.1.89"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "Your Name", email = "your.email@example.com" }]

{jarvis_ai_assistant-0.1.88 → jarvis_ai_assistant-0.1.89}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.88",
+    version="0.1.89",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",

{jarvis_ai_assistant-0.1.88 → jarvis_ai_assistant-0.1.89}/src/jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.88" 
+__version__ = "0.1.89" 

jarvis_ai_assistant-0.1.89/src/jarvis/jarvis_coder/git_utils.py

@@ -0,0 +1,67 @@
+import os
+from typing import List
+import yaml
+import time
+from jarvis.utils import OutputType, PrettyOutput
+from jarvis.models.registry import PlatformRegistry
+from .model_utils import call_model_with_retry
+
+def has_uncommitted_files() -> bool:
+    """判断代码库是否有未提交的文件"""
+    # 获取未暂存的修改
+    unstaged = os.popen("git diff --name-only").read()
+    # 获取已暂存但未提交的修改
+    staged = os.popen("git diff --cached --name-only").read()
+    # 获取未跟踪的文件
+    untracked = os.popen("git ls-files --others --exclude-standard").read()
+    
+    return bool(unstaged or staged or untracked)
+
+def generate_commit_message(git_diff: str, feature: str) -> str:
+    """根据git diff和功能描述生成commit信息"""
+    prompt = f"""你是一个经验丰富的程序员，请根据以下代码变更和功能描述生成简洁明了的commit信息：
+
+功能描述：
+{feature}
+
+代码变更：
+Git Diff:
+{git_diff}
+
+请遵循以下规则：
+1. 使用英文编写
+2. 采用常规的commit message格式：<type>(<scope>): <subject>
+3. 保持简洁，不超过50个字符
+4. 准确描述代码变更的主要内容
+5. 优先考虑功能描述和git diff中的变更内容
+"""
+    
+    model = PlatformRegistry().get_global_platform_registry().get_codegen_platform()
+    model.set_suppress_output(True)
+    success, response = call_model_with_retry(model, prompt)
+    if not success:
+        return "Update code changes"
+        
+    return response.strip().split("\n")[0]
+
+def save_edit_record(record_dir: str, commit_message: str, git_diff: str) -> None:
+    """保存代码修改记录"""
+    # 获取下一个序号
+    existing_records = [f for f in os.listdir(record_dir) if f.endswith('.yaml')]
+    next_num = 1
+    if existing_records:
+        last_num = max(int(f[:4]) for f in existing_records)
+        next_num = last_num + 1
+    
+    # 创建记录文件
+    record = {
+        "timestamp": time.strftime("%Y-%m-%d %H:%M:%S"),
+        "commit_message": commit_message,
+        "git_diff": git_diff
+    }
+    
+    record_path = os.path.join(record_dir, f"{next_num:04d}.yaml")
+    with open(record_path, "w", encoding="utf-8") as f:
+        yaml.safe_dump(record, f, allow_unicode=True)
+    
+    PrettyOutput.print(f"已保存修改记录: {record_path}", OutputType.SUCCESS) 

jarvis_ai_assistant-0.1.89/src/jarvis/jarvis_coder/main.py

@@ -0,0 +1,358 @@
+import os
+import re
+import threading
+import time
+from typing import Dict, Any, List, Tuple
+
+import yaml
+from jarvis.models.base import BasePlatform
+from jarvis.utils import OutputType, PrettyOutput, find_git_root, get_max_context_length, get_multiline_input, load_env_from_file
+from jarvis.models.registry import PlatformRegistry
+from jarvis.jarvis_codebase.main import CodeBase
+from prompt_toolkit import PromptSession
+from prompt_toolkit.completion import WordCompleter, Completer, Completion
+from prompt_toolkit.formatted_text import FormattedText
+from prompt_toolkit.styles import Style
+import fnmatch
+from .patch_handler import PatchHandler
+from .git_utils import has_uncommitted_files, generate_commit_message, save_edit_record
+
+# 全局锁对象
+index_lock = threading.Lock()
+
+class JarvisCoder:
+    def __init__(self, root_dir: str, language: str):
+        """初始化代码修改工具"""
+        self.root_dir = root_dir
+        self.language = language
+        self._init_directories()
+        self._init_codebase()
+        
+    def _init_directories(self):
+        """初始化目录"""
+        self.max_context_length = get_max_context_length()
+
+        self.root_dir = find_git_root(self.root_dir)
+        if not self.root_dir:
+            self.root_dir = self.root_dir
+
+        PrettyOutput.print(f"Git根目录: {self.root_dir}", OutputType.INFO)
+
+        # 1. 判断代码库路径是否存在，如果不存在，创建
+        if not os.path.exists(self.root_dir):
+            PrettyOutput.print(
+                "Root directory does not exist, creating...", OutputType.INFO)
+            os.makedirs(self.root_dir)
+
+        os.chdir(self.root_dir)
+
+        self.jarvis_dir = os.path.join(self.root_dir, ".jarvis-coder")
+        if not os.path.exists(self.jarvis_dir):
+            os.makedirs(self.jarvis_dir)
+
+        self.record_dir = os.path.join(self.jarvis_dir, "record")
+        if not os.path.exists(self.record_dir):
+            os.makedirs(self.record_dir)
+
+        # 2. 判断代码库是否是git仓库，如果不是，初始化git仓库
+        if not os.path.exists(os.path.join(self.root_dir, ".git")):
+            PrettyOutput.print(
+                "Git repository does not exist, initializing...", OutputType.INFO)
+            os.system(f"git init")
+            # 2.1 添加所有的文件
+            os.system(f"git add .")
+            # 2.2 提交
+            os.system(f"git commit -m 'Initial commit'")
+
+            PrettyOutput.print("代码库有未提交的文件，提交一次", OutputType.INFO)
+            os.system(f"git add .")
+            os.system(f"git commit -m 'commit before code edit'")
+        # 3. 查看代码库是否有未提交的文件，如果有，提交一次
+        if self._has_uncommitted_files():
+            PrettyOutput.print("代码库有未提交的文件，提交一次", OutputType.INFO)
+            os.system(f"git add .")
+            git_diff = os.popen("git diff --cached").read()
+            commit_message = generate_commit_message(git_diff, "Pre-edit commit")
+            os.system(f"git commit -m '{commit_message}'")
+            PrettyOutput.print("代码库有未提交的文件，提交一次", OutputType.INFO)
+            os.system(f"git add .")
+            os.system(f"git commit -m 'commit before code edit'")
+
+    def _init_codebase(self):
+        """初始化代码库"""
+        self._codebase = CodeBase(self.root_dir)
+
+    def _new_model(self):
+        """获取大模型"""
+        model = PlatformRegistry().get_global_platform_registry().get_codegen_platform()
+        return model
+
+    def _has_uncommitted_files(self) -> bool:
+        """判断代码库是否有未提交的文件"""
+        # 获取未暂存的修改
+        unstaged = os.popen("git diff --name-only").read()
+        # 获取已暂存但未提交的修改
+        staged = os.popen("git diff --cached --name-only").read()
+        # 获取未跟踪的文件
+        untracked = os.popen("git ls-files --others --exclude-standard").read()
+        
+        return bool(unstaged or staged or untracked)
+
+    def _prepare_execution(self) -> None:
+        """准备执行环境"""
+        self.main_model = self._new_model()
+        self._codebase.generate_codebase()
+
+    def _load_related_files(self, feature: str) -> List[Dict]:
+        """加载相关文件内容"""
+        ret = []
+        # 确保索引数据库已生成
+        if not self._codebase.is_index_generated():
+            PrettyOutput.print("检测到索引数据库未生成，正在生成...", OutputType.WARNING)
+            self._codebase.generate_codebase()
+            
+        related_files = self._codebase.search_similar(feature)
+        for file, score, _ in related_files:
+            PrettyOutput.print(f"相关文件: {file} 相关度: {score:.3f}", OutputType.SUCCESS)
+            with open(file, "r", encoding="utf-8") as f:
+                content = f.read()
+            ret.append({"file_path": file, "file_content": content})
+        return ret
+
+    def _finalize_changes(self, feature: str) -> None:
+        """完成修改并提交"""
+        PrettyOutput.print("修改确认成功，提交修改", OutputType.INFO)
+
+        # 只添加已经在 git 控制下的修改文件
+        os.system("git add -u")
+        
+        # 然后获取 git diff
+        git_diff = os.popen("git diff --cached").read()
+        
+        # 自动生成commit信息，传入feature
+        commit_message = generate_commit_message(git_diff, feature)
+        
+        # 显示并确认commit信息
+        PrettyOutput.print(f"自动生成的commit信息: {commit_message}", OutputType.INFO)
+        user_confirm = input("是否使用该commit信息？(y/n) [y]: ") or "y"
+        
+        if user_confirm.lower() != "y":
+            commit_message = input("请输入新的commit信息: ")
+        
+        # 不需要再次 git add，因为已经添加过了
+        os.system(f"git commit -m '{commit_message}'")
+        save_edit_record(self.record_dir, commit_message, git_diff)
+
+    def _revert_changes(self) -> None:
+        """回退所有修改"""
+        PrettyOutput.print("修改已取消，回退更改", OutputType.INFO)
+        os.system(f"git reset --hard")
+        os.system(f"git clean -df")
+
+    def execute(self, feature: str) -> Dict[str, Any]:
+        """执行代码修改
+
+        Args:
+            feature: 要实现的功能描述
+
+        Returns:
+            Dict[str, Any]: 包含执行结果的字典
+        """
+        try:
+            self._prepare_execution()
+            related_files = self._load_related_files(feature)
+            
+            patch_handler = PatchHandler(self.main_model)
+            if patch_handler.handle_patch_application(related_files, feature):
+                self._finalize_changes(feature)
+                return {
+                    "success": True,
+                    "stdout": "代码修改成功",
+                    "stderr": "",
+                }
+            else:
+                self._revert_changes()
+                return {
+                    "success": False,
+                    "stdout": "",
+                    "stderr": "代码修改失败，请修改需求后重试",
+                }
+                
+        except Exception as e:
+            self._revert_changes()
+            return {
+                "success": False,
+                "stdout": "",
+                "stderr": f"执行失败: {str(e)}，请修改需求后重试",
+                "error": e
+            }
+
+def main():
+    """命令行入口"""
+    import argparse
+
+    load_env_from_file()
+    
+    parser = argparse.ArgumentParser(description='代码修改工具')
+    parser.add_argument('-d', '--dir', help='项目根目录', default=os.getcwd())
+    parser.add_argument('-l', '--language', help='编程语言', default="python")
+    args = parser.parse_args()
+    
+    tool = JarvisCoder(args.dir, args.language)
+    
+    # 循环处理需求
+    while True:
+        try:
+            # 获取需求，传入项目根目录
+            feature = get_multiline_input("请输入开发需求 (输入空行退出):", tool.root_dir)
+            
+            if not feature or feature == "__interrupt__":
+                break
+                
+            # 执行修改
+            result = tool.execute(feature)
+            
+            # 显示结果
+            if result["success"]:
+                PrettyOutput.print(result["stdout"], OutputType.SUCCESS)
+            else:
+                if result.get("stderr"):
+                    PrettyOutput.print(result["stderr"], OutputType.WARNING)
+                if result.get("error"):  # 使用 get() 方法避免 KeyError
+                    error = result["error"]
+                    PrettyOutput.print(f"错误类型: {type(error).__name__}", OutputType.WARNING)
+                    PrettyOutput.print(f"错误信息: {str(error)}", OutputType.WARNING)
+                # 提示用户可以继续输入
+                PrettyOutput.print("\n您可以修改需求后重试", OutputType.INFO)
+                
+        except KeyboardInterrupt:
+            print("\n用户中断执行")
+            break
+        except Exception as e:
+            PrettyOutput.print(f"执行出错: {str(e)}", OutputType.ERROR)
+            PrettyOutput.print("\n您可以修改需求后重试", OutputType.INFO)
+            continue
+            
+    return 0
+
+if __name__ == "__main__":
+    exit(main())
+
+class FilePathCompleter(Completer):
+    """文件路径自动完成器"""
+    
+    def __init__(self, root_dir: str):
+        self.root_dir = root_dir
+        self._file_list = None
+        
+    def _get_files(self) -> List[str]:
+        """获取git管理的文件列表"""
+        if self._file_list is None:
+            try:
+                # 切换到项目根目录
+                old_cwd = os.getcwd()
+                os.chdir(self.root_dir)
+                
+                # 获取git管理的文件列表
+                self._file_list = os.popen("git ls-files").read().splitlines()
+                
+                # 恢复工作目录
+                os.chdir(old_cwd)
+            except Exception as e:
+                PrettyOutput.print(f"获取文件列表失败: {str(e)}", OutputType.WARNING)
+                self._file_list = []
+        return self._file_list
+    
+    def get_completions(self, document, complete_event):
+        """获取补全建议"""
+        text_before_cursor = document.text_before_cursor
+        
+        # 检查是否刚输入了@
+        if text_before_cursor.endswith('@'):
+            # 显示所有文件
+            for path in self._get_files():
+                yield Completion(path, start_position=0)
+            return
+            
+        # 检查之前是否有@，并获取@后的搜索词
+        at_pos = text_before_cursor.rfind('@')
+        if at_pos == -1:
+            return
+            
+        search = text_before_cursor[at_pos + 1:].lower().strip()
+        
+        # 提供匹配的文件建议
+        for path in self._get_files():
+            path_lower = path.lower()
+            if (search in path_lower or  # 直接包含
+                search in os.path.basename(path_lower) or  # 文件名包含
+                any(fnmatch.fnmatch(path_lower, f'*{s}*') for s in search.split())): # 通配符匹配
+                # 计算正确的start_position
+                yield Completion(path, start_position=-(len(search)))
+
+class SmartCompleter(Completer):
+    """智能自动完成器，组合词语和文件路径补全"""
+    
+    def __init__(self, word_completer: WordCompleter, file_completer: FilePathCompleter):
+        self.word_completer = word_completer
+        self.file_completer = file_completer
+        
+    def get_completions(self, document, complete_event):
+        """获取补全建议"""
+        # 如果当前行以@结尾，使用文件补全
+        if document.text_before_cursor.strip().endswith('@'):
+            yield from self.file_completer.get_completions(document, complete_event)
+        else:
+            # 否则使用词语补全
+            yield from self.word_completer.get_completions(document, complete_event)
+
+def get_multiline_input(prompt_text: str, root_dir: str = None) -> str:
+    """获取多行输入，支持文件路径自动完成功能
+    
+    Args:
+        prompt_text: 提示文本
+        root_dir: 项目根目录，用于文件补全
+        
+    Returns:
+        str: 用户输入的文本
+    """
+    # 创建文件补全器
+    file_completer = FilePathCompleter(root_dir or os.getcwd())
+    
+    # 创建提示样式
+    style = Style.from_dict({
+        'prompt': 'ansicyan bold',
+        'input': 'ansiwhite',
+    })
+    
+    # 创建会话
+    session = PromptSession(
+        completer=file_completer,
+        style=style,
+        multiline=False,
+        enable_history_search=True,
+        complete_while_typing=True
+    )
+    
+    # 显示初始提示文本
+    print(f"\n{prompt_text}")
+    
+    # 创建提示符
+    prompt = FormattedText([
+        ('class:prompt', ">>> ")
+    ])
+    
+    # 获取输入
+    lines = []
+    try:
+        while True:
+            line = session.prompt(prompt).strip()
+            if not line:  # 空行表示输入结束
+                break
+            lines.append(line)
+    except KeyboardInterrupt:
+        return "__interrupt__"
+    except EOFError:
+        pass
+    
+    return "\n".join(lines)

jarvis_ai_assistant-0.1.89/src/jarvis/jarvis_coder/model_utils.py

@@ -0,0 +1,30 @@
+from typing import Tuple
+import time
+from jarvis.models.base import BasePlatform
+from jarvis.utils import OutputType, PrettyOutput
+
+def call_model_with_retry(model: BasePlatform, prompt: str, max_retries: int = 3, initial_delay: float = 1.0) -> Tuple[bool, str]:
+    """调用模型并支持重试
+    
+    Args:
+        model: 模型实例
+        prompt: 提示词
+        max_retries: 最大重试次数
+        initial_delay: 初始延迟时间(秒)
+        
+    Returns:
+        Tuple[bool, str]: (是否成功, 响应内容)
+    """
+    delay = initial_delay
+    for attempt in range(max_retries):
+        try:
+            response = model.chat(prompt)
+            return True, response
+        except Exception as e:
+            if attempt == max_retries - 1:  # 最后一次尝试
+                PrettyOutput.print(f"调用模型失败: {str(e)}", OutputType.ERROR)
+                return False, str(e)
+                
+            PrettyOutput.print(f"调用模型失败，{delay}秒后重试: {str(e)}", OutputType.WARNING)
+            time.sleep(delay)
+            delay *= 2  # 指数退避