jarvis-ai-assistant 0.1.57__tar.gz → 0.1.58__tar.gz

{jarvis_ai_assistant-0.1.57/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.58}/PKG-INFO

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.57"
+version = "0.1.58"
 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.57 → jarvis_ai_assistant-0.1.58}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.57",
+    version="0.1.58",
     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.57 → jarvis_ai_assistant-0.1.58}/src/jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.57" 
+__version__ = "0.1.58" 

{jarvis_ai_assistant-0.1.57 → jarvis_ai_assistant-0.1.58}/src/jarvis/jarvis_coder/main.py

@@ -1,7 +1,9 @@
+from concurrent.futures import ThreadPoolExecutor, as_completed
 import hashlib
 import os
 import re
 import sqlite3
+import threading
 import time
 from typing import Dict, Any, List, Optional, Tuple
 
@@ -10,15 +12,16 @@ from jarvis.models.base import BasePlatform
 from jarvis.utils import OutputType, PrettyOutput, get_multiline_input, load_env_from_file
 from jarvis.models.registry import PlatformRegistry
 
+# 全局锁对象
+index_lock = threading.Lock()
+
 class JarvisCoder:
     def __init__(self, root_dir: str, language: str):
         """初始化代码修改工具"""
-        self.main_model = None
-        self.db_path = ""
+
         self.root_dir = root_dir
         self.platform = os.environ.get("JARVIS_CODEGEN_PLATFORM")
         self.model = os.environ.get("JARVIS_CODEGEN_MODEL")
-        self.language = language
 
         self.root_dir = self._find_git_root_dir(self.root_dir)
         if not self.root_dir:
@@ -117,6 +120,7 @@ class JarvisCoder:
             Optional[Dict[str, Any]]: 文件信息，包含文件描述
         """
         model = self._new_model()  # 创建新的模型实例
+        model.set_suppress_output(True)
         
         prompt = f"""你是一个资深程序员，请根据文件内容，生成文件的关键信息，要求如下，除了代码，不要输出任何内容：
 
@@ -125,20 +129,10 @@ class JarvisCoder:
 <CONTENT_START>
 {content}
 <CONTENT_END>
-3. 关键信息: 请生成文件的功能描述，仅输出以下格式内容
-<FILE_INFO_START>
-file_description: 这个文件的主要功能和作用描述
-<FILE_INFO_END>
+3. 关键信息: 请生成这个文件的主要功能和作用描述，包含的特征符号（函数和类、变量等），不超过100字
 """
         try:
-            response = model.chat(prompt)
-            model.delete_chat()  # 删除会话历史
-            old_response = response
-            response = response.replace("<FILE_INFO_START>", "").replace("<FILE_INFO_END>", "")
-            if old_response != response:
-                return yaml.safe_load(response)
-            else:
-                return None
+            return model.chat(prompt)
         except Exception as e:
             PrettyOutput.print(f"解析文件信息失败: {str(e)}", OutputType.ERROR)
             return None
@@ -155,49 +149,57 @@ file_description: 这个文件的主要功能和作用描述
         """获取文件MD5"""
         return hashlib.md5(open(file_path, "rb").read()).hexdigest()
 
+    
     def _create_index_db(self):
         """创建索引数据库"""
-        if not os.path.exists(self.index_db_path):
-            PrettyOutput.print("Index database does not exist, creating...", OutputType.INFO)
-            index_db = sqlite3.connect(self.index_db_path)
-            index_db.execute(
-                "CREATE TABLE files (file_path TEXT PRIMARY KEY, file_md5 TEXT, file_description TEXT)")
-            index_db.commit()
-            index_db.close()
-            PrettyOutput.print("Index database created", OutputType.SUCCESS)
-            # commit
-            os.chdir(self.root_dir)
-            os.system(f"git add .gitignore -f")
-            os.system(f"git commit -m 'add index database'")
+        with index_lock:
+            if not os.path.exists(self.index_db_path):
+                PrettyOutput.print("Index database does not exist, creating...", OutputType.INFO)
+                index_db = sqlite3.connect(self.index_db_path)
+                index_db.execute(
+                    "CREATE TABLE files (file_path TEXT PRIMARY KEY, file_md5 TEXT, file_description TEXT)")
+                index_db.commit()
+                index_db.close()
+                PrettyOutput.print("Index database created", OutputType.SUCCESS)
+                # commit
+                os.chdir(self.root_dir)
+                os.system(f"git add .gitignore -f")
+                os.system(f"git commit -m 'add index database'")
 
+    
     def _find_file_by_md5(self, file_md5: str) -> Optional[str]:
         """根据文件MD5查找文件路径"""
-        index_db = sqlite3.connect(self.index_db_path)
-        cursor = index_db.cursor()
-        cursor.execute(
-            "SELECT file_path FROM files WHERE file_md5 = ?", (file_md5,))
-        result = cursor.fetchone()
-        index_db.close()
-        return result[0] if result else None
+        with index_lock:
+            index_db = sqlite3.connect(self.index_db_path)
+            cursor = index_db.cursor()
+            cursor.execute(
+                "SELECT file_path FROM files WHERE file_md5 = ?", (file_md5,))
+            result = cursor.fetchone()
+            index_db.close()
+            return result[0] if result else None
 
+    
     def _update_file_path(self, file_path: str, file_md5: str):
         """更新文件路径"""
-        index_db = sqlite3.connect(self.index_db_path)
-        cursor = index_db.cursor()
-        cursor.execute(
-            "UPDATE files SET file_path = ? WHERE file_md5 = ?", (file_path, file_md5))
-        index_db.commit()
-        index_db.close()
+        with index_lock:
+            index_db = sqlite3.connect(self.index_db_path)
+            cursor = index_db.cursor()
+            cursor.execute(
+                "UPDATE files SET file_path = ? WHERE file_md5 = ?", (file_path, file_md5))
+            index_db.commit()
+            index_db.close()
 
+    
     def _insert_info(self, file_path: str, file_md5: str, file_description: str):
         """插入文件信息"""
-        index_db = sqlite3.connect(self.index_db_path)
-        cursor = index_db.cursor()
-        cursor.execute("DELETE FROM files WHERE file_path = ?", (file_path,))
-        cursor.execute("INSERT INTO files (file_path, file_md5, file_description) VALUES (?, ?, ?)",
-                       (file_path, file_md5, file_description))
-        index_db.commit()
-        index_db.close()
+        with index_lock:
+            index_db = sqlite3.connect(self.index_db_path)
+            cursor = index_db.cursor()
+            cursor.execute("DELETE FROM files WHERE file_path = ?", (file_path,))
+            cursor.execute("INSERT INTO files (file_path, file_md5, file_description) VALUES (?, ?, ?)",
+                           (file_path, file_md5, file_description))
+            index_db.commit()
+            index_db.close()
 
     def _is_text_file(self, file_path: str) -> bool:
         """判断文件是否是文本文件"""
@@ -216,6 +218,9 @@ file_description: 这个文件的主要功能和作用描述
 
     def _index_project(self):
         """建立代码库索引"""
+        import threading
+        from concurrent.futures import ThreadPoolExecutor, as_completed
+
         git_files = os.popen("git ls-files").read().splitlines()
 
         index_db = sqlite3.connect(self.index_db_path)
@@ -229,59 +234,113 @@ file_description: 这个文件的主要功能和作用描述
         index_db.commit()
         index_db.close()
 
-        # 3. 遍历git管理的文件
-        for file_path in git_files:
-            if self._is_text_file(file_path):
-                # 计算文件MD5
-                file_md5 = self._get_file_md5(file_path)
+        def process_file(file_path: str):
+            """处理单个文件的索引任务"""
+            if not self._is_text_file(file_path):
+                return
+
+            # 计算文件MD5
+            file_md5 = self._get_file_md5(file_path)
+
+            # 查找文件
+            file_path_in_db = self._find_file_by_md5(file_md5)
+            if file_path_in_db:
+                PrettyOutput.print(
+                    f"文件 {file_path} 重复，跳过", OutputType.INFO)
+                if file_path_in_db != file_path:
+                    self._update_file_path(file_path, file_md5)
+                    PrettyOutput.print(
+                        f"文件 {file_path} 重复，更新路径为 {file_path}", OutputType.INFO)
+                return
 
-                # 查找文件
-                file_path_in_db = self._find_file_by_md5(file_md5)
-                if file_path_in_db:
+            with open(file_path, "r", encoding="utf-8") as f:
+                file_content = f.read()
+                key_info = self._get_key_info(file_path, file_content)
+                if not key_info:
                     PrettyOutput.print(
-                        f"文件 {file_path} 重复，跳过", OutputType.INFO)
-                    if file_path_in_db != file_path:
-                        self._update_file_path(file_path, file_md5)
-                        PrettyOutput.print(
-                            f"文件 {file_path} 重复，更新路径为 {file_path}", OutputType.INFO)
-                    continue
+                        f"文件 {file_path} 索引失败", OutputType.INFO)
+                    return
+
+                self._insert_info(file_path, file_md5, key_info)
+                PrettyOutput.print(
+                    f"文件 {file_path} 已建立索引", OutputType.INFO)
+
+
+        # 使用线程池处理文件索引
+        with ThreadPoolExecutor(max_workers=10) as executor:
+            futures = [executor.submit(process_file, file_path) for file_path in git_files]
+            for future in as_completed(futures):
+                try:
+                    future.result()
+                except Exception as e:
+                    PrettyOutput.print(f"处理文件时发生错误: {str(e)}", OutputType.ERROR)
 
-                with open(file_path, "r", encoding="utf-8") as f:
-                    file_content = f.read()
-                    key_info = self._get_key_info(file_path, file_content)
-                    if not key_info:
-                        PrettyOutput.print(
-                            f"文件 {file_path} 索引失败", OutputType.INFO)
-                        continue
-                    if "file_description" in key_info:
-                        self._insert_info(file_path, file_md5, key_info["file_description"])
-                        PrettyOutput.print(
-                            f"文件 {file_path} 已建立索引", OutputType.INFO)
-                    else:
-                        PrettyOutput.print(
-                            f"文件 {file_path} 不是代码文件，跳过", OutputType.INFO)
         PrettyOutput.print("项目索引完成", OutputType.INFO)
 
-    def _find_related_files(self, feature: str) -> List[Dict]:
-        """根据需求描述，查找相关文件"""
+    def _get_files_from_db(self) -> List[Tuple[str, str]]:
+        """从数据库获取所有文件信息
+        
+        Returns:
+            List[Tuple[str, str]]: [(file_path, file_description), ...]
+        """
         try:
-            # Get all files from database
             index_db = sqlite3.connect(self.index_db_path)
             cursor = index_db.cursor()
             cursor.execute("SELECT file_path, file_description FROM files")
             all_files = cursor.fetchall()
             index_db.close()
+            return all_files
         except sqlite3.Error as e:
             PrettyOutput.print(f"数据库操作失败: {str(e)}", OutputType.ERROR)
             return []
 
-        batch_size = 100
-        batch_results = []  # Store results from each batch with their scores
+    def _analyze_files_in_batches(self, all_files: List[Tuple[str, str]], feature: str, batch_size: int = 100) -> List[Dict]:
+        """批量分析文件相关性
+        
+        Args:
+            all_files: 所有文件列表
+            feature: 需求描述
+            batch_size: 批处理大小
+            
+        Returns:
+            List[Dict]: 带评分的文件列表
+        """
+        batch_results = []
+        
+        with ThreadPoolExecutor(max_workers=10) as executor:
+            futures = []
+            for i in range(0, len(all_files), batch_size):
+                batch_files = all_files[i:i + batch_size]
+                prompt = self._create_batch_analysis_prompt(batch_files, feature)
+                model = self._new_model()
+                model.set_suppress_output(True)
+                futures.append(executor.submit(self._call_model_with_retry, model, prompt))
+
+            for future in as_completed(futures):
+                success, response = future.result()
+                if not success:
+                    continue
+                
+                batch_start = futures.index(future) * batch_size
+                batch_end = min(batch_start + batch_size, len(all_files))
+                current_batch = all_files[batch_start:batch_end]
+                
+                results = self._process_batch_response(response, current_batch)
+                batch_results.extend(results)
+        
+        return batch_results
+
+    def _create_batch_analysis_prompt(self, batch_files: List[Tuple[str, str]], feature: str) -> str:
+        """创建批量分析的提示词
         
-        for i in range(0, len(all_files), batch_size):
-            batch_files = all_files[i:i + batch_size]
+        Args:
+            batch_files: 批次文件列表
+            feature: 需求描述
             
-            prompt = """你是资深程序员，请根据需求描述，从以下文件路径中选出最相关的文件，按相关度从高到低排序。
+        Returns:
+            str: 提示词
+        """
+        prompt = """你是资深程序员，请根据需求描述，从以下文件路径中选出最相关的文件，按相关度从高到低排序。
 
 相关度打分标准(0-9分)：
 - 9分：文件名直接包含需求中的关键词，且文件功能与需求完全匹配
@@ -299,102 +358,92 @@ file2.py: 7
 
 文件列表：
 """
-            for file_path, _ in batch_files:
-                prompt += f"- {file_path}\n"
-            prompt += f"\n需求描述: {feature}\n"
-            prompt += "\n注意：\n1. 只输出最相关的文件，不超过5个\n2. 根据上述打分标准判断相关性\n3. 相关度必须是0-9的整数"
-            
-            success, response = self._call_model_with_retry(self._new_model(), prompt)
-            if not success:
-                continue
-            
-            try:
-                response = response.replace("<RELEVANT_FILES_START>", "").replace("<RELEVANT_FILES_END>", "")
-                result = yaml.safe_load(response)
-                
-                # Convert results to file objects with scores
-                batch_files_dict = {f[0]: f[1] for f in batch_files}
-                for file_path, score in result.items():
-                    if isinstance(file_path, str) and isinstance(score, int):
-                        score = max(0, min(9, score))  # Ensure score is between 0-9
-                        if file_path in batch_files_dict:
-                            batch_results.append({
-                                "file_path": file_path,
-                                "file_description": batch_files_dict[file_path],
-                                "score": score
-                            })
-                            
-            except Exception as e:
-                PrettyOutput.print(f"处理批次文件失败: {str(e)}", OutputType.ERROR)
-                continue
-        
-        # Sort all results by score
-        batch_results.sort(key=lambda x: x["score"], reverse=True)
-        top_files = batch_results[:5]
+        for file_path, _ in batch_files:
+            prompt += f"- {file_path}\n"
+        prompt += f"\n需求描述: {feature}\n"
+        prompt += "\n注意：\n1. 只输出最相关的文件，不超过5个\n2. 根据上述打分标准判断相关性\n3. 相关度必须是0-9的整数"
         
-        # If we don't have enough files, add more from database
-        if len(top_files) < 5:
-            remaining_files = [f for f in all_files if f[0] not in [tf["file_path"] for tf in top_files]]
-            top_files.extend([{
-                "file_path": f[0],
-                "file_description": f[1],
-                "score": 0
-            } for f in remaining_files[:5-len(top_files)]])
-
-        # Now do content relevance analysis on these files
-        score = [[], [], [], [], [], [], [], [], [], []]
+        return prompt
+
+    def _process_batch_response(self, response: str, batch_files: List[Tuple[str, str]]) -> List[Dict]:
+        """处理批量分析的响应
         
-        prompt = """你是资深程序员，请根据需求描述，分析文件的相关性。
+        Args:
+            response: 模型响应
+            batch_files: 批次文件列表
+            
+        Returns:
+            List[Dict]: 处理后的文件列表
+        """
+        try:
+            response = response.replace("<RELEVANT_FILES_START>", "").replace("<RELEVANT_FILES_END>", "")
+            result = yaml.safe_load(response)
+            
+            batch_files_dict = {f[0]: f[1] for f in batch_files}
+            results = []
+            for file_path, score in result.items():
+                if isinstance(file_path, str) and isinstance(score, int):
+                    score = max(0, min(9, score))  # Ensure score is between 0-9
+                    if file_path in batch_files_dict:
+                        results.append({
+                            "file_path": file_path,
+                            "file_description": batch_files_dict[file_path],
+                            "score": score
+                        })
+            return results
+        except Exception as e:
+            PrettyOutput.print(f"处理批次文件失败: {str(e)}", OutputType.ERROR)
+            return []
 
-相关度打分标准(0-9分)：
-- 9分：文件内容与需求完全匹配，是实现需求的核心文件
-- 7-8分：文件内容与需求高度相关，需要较大改动
-- 5-6分：文件内容与需求部分相关，需要中等改动
-- 3-4分：文件内容与需求相关性较低，但需要配合修改
-- 1-2分：文件内容与需求关系较远，只需极少改动
-- 0分：文件内容与需求完全无关
 
-文件列表如下：
-<FILE_LIST_START>
-"""
-        for i, file in enumerate(top_files):
-            prompt += f"""{i}. {file["file_path"]} : {file["file_description"]}\n"""
-        prompt += f"""需求描述: {feature}\n"""
-        prompt += "<FILE_LIST_END>\n"
-        prompt += """请根据需求描述和文件描述，分析文件的相关性，输出每个编号的相关性[0~9]，仅输出以下格式内容(key为文件编号，value为相关性)：
-<FILE_RELATION_START>
-"0": 5
-"1": 3
-<FILE_RELATION_END>"""
-        
-        success, response = self._call_model_with_retry(self._new_model(), prompt)
-        if not success:
-            return top_files[:5]  # Return top 5 files from filename matching if model fails
-        
+    def _process_content_response(self, response: str, top_files: List[Dict]) -> List[Dict]:
+        """处理内容分析的响应"""
         try:
             response = response.replace("<FILE_RELATION_START>", "").replace("<FILE_RELATION_END>", "")
             file_relation = yaml.safe_load(response)
             if not file_relation:
                 return top_files[:5]
             
+            score = [[] for _ in range(10)]  # 创建10个空列表，对应0-9分
             for file_id, relation in file_relation.items():
                 id = int(file_id)
                 relation = max(0, min(9, relation))  # 确保范围在0-9之间
                 score[relation].append(top_files[id])
             
+            files = []
+            for scores in reversed(score):  # 从高分到低分遍历
+                files.extend(scores)
+                if len(files) >= 5:  # 直接取相关性最高的5个文件
+                    break
+            
+            return files[:5]
         except Exception as e:
             PrettyOutput.print(f"处理文件关系失败: {str(e)}", OutputType.ERROR)
             return top_files[:5]
+
+    def _find_related_files(self, feature: str) -> List[Dict]:
+        """根据需求描述，查找相关文件
         
-        files = []
-        score.reverse()
-        for i in score:
-            files.extend(i)
-            if len(files) >= 5:  # 直接取相关性最高的5个文件
-                break
+        Args:
+            feature: 需求描述
+            
+        Returns:
+            List[Dict]: 相关文件列表
+        """
+        # 1. 从数据库获取所有文件
+        all_files = self._get_files_from_db()
+        if not all_files:
+            return []
         
-        return files[:5]
-    
+        # 2. 批量分析文件相关性
+        batch_results = self._analyze_files_in_batches(all_files, feature)
+        
+        # 3. 排序并获取前5个文件
+        batch_results.sort(key=lambda x: x["score"], reverse=True)
+        return batch_results[:5]
+        
+        
+
     def _remake_patch(self, prompt: str) -> List[str]:
         success, response = self._call_model_with_retry(self.main_model, prompt, max_retries=5)  # 增加重试次数
         if not success:
@@ -417,7 +466,7 @@ file2.py: 7
 <PATCH_START>
 >>>>>> path/to/file
 要替换的内容
-======
+=======
 新的内容
 <<<<<<
 <PATCH_END>
@@ -425,7 +474,7 @@ file2.py: 7
 2. 如果是新文件，格式如下：
 <PATCH_START>
 >>>>>> path/to/new/file
-======
+=======
 新文件的完整内容
 <<<<<<
 <PATCH_END>
@@ -488,14 +537,14 @@ file2.py: 7
                 
                 # 解析补丁内容
                 patch_content = "\n".join(lines[1:])
-                parts = patch_content.split("======")
+                parts = patch_content.split("=======")
                 
                 if len(parts) != 2:
                     error_info.append(f"补丁格式错误: {file_path}")
                     return False, "\n".join(error_info)
                 
-                old_content = parts[0].strip()
-                new_content = parts[1].split("<<<<<<")[0].strip()
+                old_content = parts[0]
+                new_content = parts[1].split("<<<<<<")[0]
                 
                 # 处理新文件
                 if not old_content:
@@ -582,14 +631,85 @@ file2.py: 7
                 return None
         return root_dir
 
+
+    def _prepare_execution(self) -> None:
+        """准备执行环境"""
+        self.main_model = self._new_model()
+        self._index_project()
+
+    def _load_related_files(self, feature: str) -> List[Dict]:
+        """加载相关文件内容"""
+        related_files = self._find_related_files(feature)
+        for file in related_files:
+            PrettyOutput.print(f"Related file: {file['file_path']}", OutputType.INFO)
+            with open(file["file_path"], "r", encoding="utf-8") as f:
+                file["file_content"] = f.read()
+        return related_files
+
+    def _handle_patch_application(self, related_files: List[Dict], patches: List[str], feature: str) -> Dict[str, Any]:
+        """处理补丁应用流程"""
+        while True:
+            PrettyOutput.print(f"生成{len(patches)}个补丁", OutputType.INFO)
+            
+            if not patches:
+                retry_prompt = f"""未生成补丁，请重新生成补丁"""
+                patches = self._remake_patch(retry_prompt)
+                continue
+            
+            success, error_info = self._apply_patch(related_files, patches)
+            
+            if success:
+                user_confirm = input("是否确认修改？(y/n)")
+                if user_confirm.lower() == "y":
+                    self._finalize_changes(feature, patches)
+                    return {
+                        "success": True,
+                        "stdout": f"已完成功能开发{feature}",
+                        "stderr": "",
+                        "error": None
+                    }
+                else:
+                    self._revert_changes()
+                    return {
+                        "success": False,
+                        "stdout": "",
+                        "stderr": "修改被用户取消，文件未发生任何变化",
+                        "error": UserWarning("用户取消修改")
+                    }
+            else:
+                PrettyOutput.print(f"补丁应用失败，请求重新生成: {error_info}", OutputType.WARNING)
+                retry_prompt = f"""补丁应用失败，请根据以下错误信息重新生成补丁：
+
+错误信息：
+{error_info}
+
+请确保：
+1. 准确定位要修改的代码位置
+2. 正确处理代码缩进
+3. 考虑代码上下文
+4. 对新文件不要包含原始内容
+"""
+                patches = self._remake_patch(retry_prompt)
+
+    def _finalize_changes(self, feature: str, patches: List[str]) -> None:
+        """完成修改并提交"""
+        PrettyOutput.print("修改确认成功，提交修改", OutputType.INFO)
+        os.system(f"git add .")
+        os.system(f"git commit -m '{feature}'")
+        self._save_edit_record(feature, patches)
+        self._index_project()
+
+    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:
-            args: 包含操作参数的字典
-                - feature: 要实现的功能描述
-                - root_dir: 代码库根目录
-                - language: 编程语言
+            feature: 要实现的功能描述
 
         Returns:
             Dict[str, Any]: 包含执行结果的字典
@@ -599,81 +719,10 @@ file2.py: 7
                 - error: 错误对象(如果有)
         """
         try:
-            self.main_model = self._new_model()  # 每次执行时重新创建模型
-            
-
-            # 4. 开始建立代码库索引
-            self._index_project()
-
-            # 5. 根据索引和需求，查找相关文件
-            related_files = self._find_related_files(feature)
-            for file in related_files:
-                PrettyOutput.print(f"Related file: {file['file_path']}", OutputType.INFO)
-            for file in related_files:
-                with open(file["file_path"], "r", encoding="utf-8") as f:
-                    file_content = f.read()
-                    file["file_content"] = file_content
+            self._prepare_execution()
+            related_files = self._load_related_files(feature)
             patches = self._make_patch(related_files, feature)
-            while True:
-                # 生成修改方案
-                PrettyOutput.print(f"生成{len(patches)}个补丁", OutputType.INFO)
-                
-                if not patches:
-                    retry_prompt = f"""未生成补丁，请重新生成补丁"""
-                    patches = self._remake_patch(retry_prompt)
-                    continue
-                
-                # 尝试应用补丁
-                success, error_info = self._apply_patch(related_files, patches)
-                
-                if success:
-                    # 用户确认修改
-                    user_confirm = input("是否确认修改？(y/n)")
-                    if user_confirm.lower() == "y":
-                        PrettyOutput.print("修改确认成功，提交修改", OutputType.INFO)
-                        
-                        os.system(f"git add .")
-                        os.system(f"git commit -m '{feature}'")
-                        
-                        # 保存修改记录
-                        self._save_edit_record(feature, patches)
-                        # 重新建立代码库索引
-                        self._index_project()
-                        
-                        return {
-                            "success": True,
-                            "stdout": f"已完成功能开发{feature}",
-                            "stderr": "",
-                            "error": None
-                        }
-                    else:
-                        PrettyOutput.print("修改已取消，回退更改", OutputType.INFO)
-                        
-                        os.system(f"git reset --hard")  # 回退已修改的文件
-                        os.system(f"git clean -df")     # 删除新创建的文件和目录
-                        
-                        return {
-                            "success": False,
-                            "stdout": "",
-                            "stderr": "修改被用户取消，文件未发生任何变化",
-                            "error": UserWarning("用户取消修改")
-                        }
-                else:
-                    # 补丁应用失败，让模型重新生成
-                    PrettyOutput.print(f"补丁应用失败，请求重新生成: {error_info}", OutputType.WARNING)
-                    retry_prompt = f"""补丁应用失败，请根据以下错误信息重新生成补丁：
-
-错误信息：
-{error_info}
-
-请确保：
-1. 准确定位要修改的代码位置
-2. 正确处理代码缩进
-3. 考虑代码上下文
-4. 对新文件不要包含原始内容
-"""
-                    patches = self._remake_patch(retry_prompt)
-                    continue
+            return self._handle_patch_application(related_files, patches, feature)
                 
         except Exception as e:
             return {

{jarvis_ai_assistant-0.1.57 → jarvis_ai_assistant-0.1.58}/src/jarvis/models/ai8.py

@@ -14,6 +14,7 @@ class AI8Model(BasePlatform):
     
     def __init__(self):
         """Initialize model"""
+        super().__init__()
         self.system_message = ""
         self.conversation = None
         self.files = []
@@ -156,15 +157,11 @@ class AI8Model(BasePlatform):
         self.system_message = message
         
     def chat(self, message: str) -> str:
-        """Execute chat with the model
-        
-        Args:
-            message: User input message
-            
-        Returns:
-            str: Model response
-        """
+        """执行对话"""
         try:
+            if not self.suppress_output:
+                PrettyOutput.print("发送请求...", OutputType.PROGRESS)
+            
             # 确保有会话ID
             if not self.conversation:
                 if not self.create_conversation():
@@ -219,12 +216,14 @@ class AI8Model(BasePlatform):
                                 chunk = data.get('data', '')
                                 if chunk:
                                     full_response += chunk
-                                    PrettyOutput.print_stream(chunk)
+                                    if not self.suppress_output:
+                                        PrettyOutput.print_stream(chunk)
 
                         except json.JSONDecodeError:
                             continue
             
-            PrettyOutput.print_stream_end()
+            if not self.suppress_output:
+                PrettyOutput.print_stream_end()
 
             return full_response
             

{jarvis_ai_assistant-0.1.57 → jarvis_ai_assistant-0.1.58}/src/jarvis/models/base.py

@@ -7,6 +7,7 @@ class BasePlatform(ABC):
     
     def __init__(self):
         """初始化模型"""
+        self.suppress_output = False  # 添加输出控制标志
         pass
 
     def set_model_name(self, model_name: str):
@@ -39,3 +40,11 @@ class BasePlatform(ABC):
     def set_system_message(self, message: str):
         """设置系统消息"""
         raise NotImplementedError("set_system_message is not implemented")
+
+    def set_suppress_output(self, suppress: bool):
+        """设置是否屏蔽输出
+        
+        Args:
+            suppress: 是否屏蔽输出
+        """
+        self.suppress_output = suppress

{jarvis_ai_assistant-0.1.57 → jarvis_ai_assistant-0.1.58}/src/jarvis/models/kimi.py

@@ -17,6 +17,7 @@ class KimiModel(BasePlatform):
         """
         初始化Kimi模型
         """
+        super().__init__()
         self.api_key = os.getenv("KIMI_API_KEY")
         if not self.api_key:
             PrettyOutput.print("\n需要设置 KIMI_API_KEY 才能使用 Jarvis。请按以下步骤操作：", OutputType.INFO)
@@ -217,7 +218,8 @@ class KimiModel(BasePlatform):
     def chat(self, message: str) -> str:
         """发送消息并获取响应"""
         if not self.chat_id:
-            PrettyOutput.print("创建新的对话会话...", OutputType.PROGRESS)
+            if not self.suppress_output:
+                PrettyOutput.print("创建新的对话会话...", OutputType.PROGRESS)
             if not self._create_chat():
                 raise Exception("Failed to create chat session")
 
@@ -228,13 +230,15 @@ class KimiModel(BasePlatform):
         refs_file = []
         if self.first_chat:
             if self.uploaded_files:
-                PrettyOutput.print(f"首次对话，引用 {len(self.uploaded_files)} 个文件...", OutputType.PROGRESS)
+                if not self.suppress_output:
+                    PrettyOutput.print(f"首次对话，引用 {len(self.uploaded_files)} 个文件...", OutputType.PROGRESS)
                 refs = [f["id"] for f in self.uploaded_files]
                 refs_file = self.uploaded_files
             message = self.system_message + "\n" + message
             self.first_chat = False
         
-        PrettyOutput.print("发送请求...", OutputType.PROGRESS)
+        if not self.suppress_output:
+            PrettyOutput.print("发送请求...", OutputType.PROGRESS)
         payload = {
             "messages": [{"role": "user", "content": message}],
             "use_search": True,
@@ -259,7 +263,9 @@ class KimiModel(BasePlatform):
             search_results = []
             ref_sources = []
             
-            PrettyOutput.print("接收响应...", OutputType.PROGRESS)
+            if not self.suppress_output:
+                PrettyOutput.print("接收响应...", OutputType.PROGRESS)
+            
             for line in response.iter_lines():
                 if not line:
                     continue
@@ -276,7 +282,8 @@ class KimiModel(BasePlatform):
                         # 处理补全文本
                         text = data.get("text", "")
                         if text:
-                            PrettyOutput.print_stream(text)
+                            if not self.suppress_output:
+                                PrettyOutput.print_stream(text)
                             full_response += text
                             
                     elif event == "search_plus":
@@ -311,11 +318,12 @@ class KimiModel(BasePlatform):
                 except json.JSONDecodeError:
                     continue
                     
-            PrettyOutput.print_stream_end()
+            if not self.suppress_output:
+                PrettyOutput.print_stream_end()
             
 
             # 显示搜索结果摘要
-            if search_results:
+            if search_results and not self.suppress_output:
                 PrettyOutput.print("\n搜索结果:", OutputType.PROGRESS)
                 for result in search_results:
                     PrettyOutput.print(f"- {result['title']}", OutputType.PROGRESS)
@@ -328,7 +336,7 @@ class KimiModel(BasePlatform):
                     PrettyOutput.print("", OutputType.PROGRESS)
                         
             # 显示引用来源
-            if ref_sources:
+            if ref_sources and not self.suppress_output:
                 PrettyOutput.print("\n引用来源:", OutputType.PROGRESS)
                 for source in ref_sources:
                     PrettyOutput.print(f"- [{source['ref_id']}] {source['title']} ({source['source']})", OutputType.PROGRESS)

{jarvis_ai_assistant-0.1.57 → jarvis_ai_assistant-0.1.58}/src/jarvis/models/openai.py

@@ -13,6 +13,7 @@ class OpenAIModel(BasePlatform):
         """
         初始化DeepSeek模型
         """
+        super().__init__()
         self.api_key = os.getenv("OPENAI_API_KEY")
         if not self.api_key:
             PrettyOutput.print("\n需要设置以下环境变量才能使用 OpenAI 模型：", OutputType.INFO)
@@ -54,7 +55,8 @@ class OpenAIModel(BasePlatform):
     def chat(self, message: str) -> str:
         """执行对话"""
         try:
-            PrettyOutput.print("发送请求...", OutputType.PROGRESS)
+            if not self.suppress_output:
+                PrettyOutput.print("发送请求...", OutputType.PROGRESS)
             
             # 添加用户消息到历史记录
             self.messages.append({"role": "user", "content": message})
@@ -65,16 +67,19 @@ class OpenAIModel(BasePlatform):
                 stream=True
             )
             
-            PrettyOutput.print("接收响应...", OutputType.PROGRESS)
+            if not self.suppress_output:
+                PrettyOutput.print("接收响应...", OutputType.PROGRESS)
             full_response = ""
             
             for chunk in response:
                 if chunk.choices[0].delta.content:
                     text = chunk.choices[0].delta.content
-                    PrettyOutput.print_stream(text)
+                    if not self.suppress_output:
+                        PrettyOutput.print_stream(text)
                     full_response += text
                     
-            PrettyOutput.print_stream_end()
+            if not self.suppress_output:
+                PrettyOutput.print_stream_end()
             
             # 添加助手回复到历史记录
             self.messages.append({"role": "assistant", "content": full_response})

{jarvis_ai_assistant-0.1.57 → jarvis_ai_assistant-0.1.58}/src/jarvis/models/oyi.py

@@ -14,6 +14,7 @@ class OyiModel(BasePlatform):
     
     def __init__(self):
         """Initialize model"""
+        super().__init__()
         PrettyOutput.section("支持的模型", OutputType.SUCCESS)
         
         # 获取可用模型列表
@@ -114,6 +115,9 @@ class OyiModel(BasePlatform):
             str: Model response
         """
         try:
+            if not self.suppress_output:
+                PrettyOutput.print("发送请求...", OutputType.PROGRESS)
+            
             # 确保有会话ID
             if not self.conversation:
                 if not self.create_conversation():
@@ -182,7 +186,9 @@ class OyiModel(BasePlatform):
             )
             
             if response.status_code == 200:
-                PrettyOutput.print(response.text, OutputType.SYSTEM)
+                if not self.suppress_output:
+                    PrettyOutput.print("接收响应...", OutputType.PROGRESS)
+                    PrettyOutput.print(response.text, OutputType.SYSTEM)
                 self.messages.append({"role": "assistant", "content": response.text})
                 return response.text
             else:

{jarvis_ai_assistant-0.1.57 → jarvis_ai_assistant-0.1.58/src/jarvis_ai_assistant.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: jarvis-ai-assistant
-Version: 0.1.57
+Version: 0.1.58
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire