jarvis-ai-assistant 0.1.141__py3-none-any.whl → 0.1.142__py3-none-any.whl

jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.141"
+__version__ = "0.1.142"

jarvis/jarvis_agent/patch.py

@@ -9,7 +9,8 @@ from jarvis.jarvis_platform.base import BasePlatform
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_git_utils.git_commiter import GitCommitTool
 from jarvis.jarvis_tools.file_operation import FileOperationTool
-from jarvis.jarvis_utils.config import is_confirm_before_apply_patch
+from jarvis.jarvis_utils.config import INPUT_WINDOW_REVERSE_SIZE, get_max_input_token_count, is_confirm_before_apply_patch
+from jarvis.jarvis_utils.embedding import get_context_token_count
 from jarvis.jarvis_utils.git_utils import get_commits_between, get_latest_commit_hash
 from jarvis.jarvis_utils.globals import add_read_file_record, has_read_file
 from jarvis.jarvis_utils.input import get_multiline_input
@@ -308,8 +309,11 @@ def handle_small_code_operation(filepath: str, patch_content: str) -> bool:
     with yaspin(text=f"正在修改文件 {filepath}...", color="cyan") as spinner:
         try:
             model = PlatformRegistry().get_normal_platform()
+            upload_success = False
+            file_content = FileOperationTool().execute({"operation":"read", "files":[{"path":filepath}]})["stdout"]
             with spinner.hidden():
-                model.upload_files([filepath])
+                if get_context_token_count(file_content) > get_max_input_token_count() - INPUT_WINDOW_REVERSE_SIZE and model.upload_files([filepath]):
+                    upload_success = True
 
             model.set_suppress_output(False)
 
@@ -342,7 +346,12 @@ def handle_small_code_operation(filepath: str, patch_content: str) -> bool:
 [合并后的完整代码，包括所有空行和缩进]
 {ct("MERGED_CODE")}
 """
-            
+            if not upload_success:
+                prompt += f"""
+# 原始代码
+{file_content}
+"""
+
             count = 30
             start_line = -1
             end_line = -1
@@ -403,9 +412,13 @@ def handle_large_code_operation(filepath: str, patch_content: str, model: BasePl
     """处理大型代码文件的补丁操作，使用差异化补丁格式"""
     with yaspin(text=f"正在处理文件 {filepath}...", color="cyan") as spinner:
         try:
+            file_content = FileOperationTool().execute({"operation":"read", "files":[{"path":filepath}]})["stdout"]
+            upload_success = False
             # 读取原始文件内容
             with spinner.hidden():  
-                model.upload_files([filepath])
+                if get_context_token_count(file_content) > get_max_input_token_count() - INPUT_WINDOW_REVERSE_SIZE and model.upload_files([filepath]):
+                    upload_success = True
+
 
             model.set_suppress_output(False)
 
@@ -434,13 +447,13 @@ def handle_large_code_operation(filepath: str, patch_content: str, model: BasePl
 - 每个{ot("DIFF")}块必须包含SEARCH部分和REPLACE部分
 - SEARCH部分是需要查找的原始代码
 - REPLACE部分是替换后的新代码
-- 确保SEARCH部分能在原文件中唯一匹配
+- 确保SEARCH部分能在原文件中**唯一匹配**
 - 如果修改较大，可以使用多个{ot("DIFF")}块
 
 ## 输出模板
 {ot("DIFF")}
 >>>>>> SEARCH
-[需要查找的原始代码，包含足够上下文]
+[需要查找的原始代码，包含足够上下文，避免出现可匹配多处的情况]
 ======
 [替换后的新代码]
 <<<<<< REPLACE
@@ -448,55 +461,69 @@ def handle_large_code_operation(filepath: str, patch_content: str, model: BasePl
 
 {ot("DIFF")}
 >>>>>> SEARCH
-[另一处需要查找的原始代码]
+[另一处需要查找的原始代码，包含足够上下文，避免出现可匹配多处的情况]
 ======
 [另一处替换后的新代码]
 <<<<<< REPLACE
 {ct("DIFF")}
 """
-            # 获取补丁内容
-            with spinner.hidden():
-                response = model.chat_until_success(prompt)
-
-            # 解析差异化补丁
-            diff_blocks = re.finditer(ot("DIFF")+r'\s*>{4,} SEARCH\n?(.*?)\n?={4,}\n?(.*?)\s*<{4,} REPLACE\n?'+ct("DIFF"),
-                                      response, re.DOTALL)
-
-            # 读取原始文件内容
-            with open(filepath, 'r', encoding='utf-8', errors="ignore") as f:
-                file_content = f.read()
-
-            # 应用所有差异化补丁
-            modified_content = file_content
-            patch_count = 0
-
-            for match in diff_blocks:
-                search_text = match.group(1).strip()
-                replace_text = match.group(2).strip()
-                patch_count += 1
-                # 检查搜索文本是否存在于文件中
-                if search_text in modified_content:
-                    # 如果有多处，报错
-                    if modified_content.count(search_text) > 1:
-                        spinner.text = f"补丁 #{patch_count} 应用失败：找到多个匹配的代码段"
+            if not upload_success:
+                prompt += f"""
+# 原始代码
+{file_content}
+"""
+            for _ in range(3):
+                # 获取补丁内容
+                with spinner.hidden():
+                    response = model.chat_until_success(prompt)
+
+                # 解析差异化补丁
+                diff_blocks = re.finditer(ot("DIFF")+r'\s*>{4,} SEARCH\n?(.*?)\n?={4,}\n?(.*?)\s*<{4,} REPLACE\n?'+ct("DIFF"),
+                                        response, re.DOTALL)
+
+                # 读取原始文件内容
+                with open(filepath, 'r', encoding='utf-8', errors="ignore") as f:
+                    file_content = f.read()
+
+                # 应用所有差异化补丁
+                modified_content = file_content
+                patch_count = 0
+                success = True
+                for match in diff_blocks:
+                    search_text = match.group(1).strip()
+                    replace_text = match.group(2).strip()
+                    patch_count += 1
+                    # 检查搜索文本是否存在于文件中
+                    if search_text in modified_content:
+                        # 如果有多处，报错
+                        if modified_content.count(search_text) > 1:
+                            spinner.text = f"补丁 #{patch_count} 应用失败：找到多个匹配的代码段"
+                            prompt = f"补丁 #{patch_count} 应用失败：找到多个匹配的代码段"
+                            spinner.fail("❌")
+                            success = False
+                            break
+                        # 应用替换
+                        modified_content = modified_content.replace(
+                            search_text, replace_text)
+                        spinner.write(f"✅ 补丁 #{patch_count} 应用成功")
+                    else:
+                        spinner.text = f"补丁 #{patch_count} 应用失败：无法找到匹配的代码段"
+                        prompt = f"补丁 #{patch_count} 应用失败：无法找到匹配的代码段"
                         spinner.fail("❌")
-                        return False
-                    # 应用替换
-                    modified_content = modified_content.replace(
-                        search_text, replace_text)
-                    spinner.write(f"✅ 补丁 #{patch_count} 应用成功")
-                else:
-                    spinner.text = f"补丁 #{patch_count} 应用失败：无法找到匹配的代码段"
-                    spinner.fail("❌")
-                    return False
-
-            # 写入修改后的内容
-            with open(filepath, 'w', encoding='utf-8', errors="ignore") as f:
-                f.write(modified_content)
-
-            spinner.text = f"文件 {filepath} 修改完成，应用了 {patch_count} 个补丁"
-            spinner.ok("✅")
-            return True
+                        success = False
+                        break
+                if not success:
+                    revert_file(filepath)
+                    continue
+
+                # 写入修改后的内容
+                with open(filepath, 'w', encoding='utf-8', errors="ignore") as f:
+                    f.write(modified_content)
+
+                spinner.text = f"文件 {filepath} 修改完成，应用了 {patch_count} 个补丁"
+                spinner.ok("✅")
+                return True
+            return False
 
         except Exception as e:
             spinner.text = f"文件修改失败: {str(e)}"

jarvis/jarvis_agent/shell_input_handler.py

@@ -16,6 +16,7 @@ def shell_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:
             from jarvis.jarvis_tools.registry import ToolRegistry
             output = ToolRegistry().handle_tool_calls({
                 "name": "execute_script",
+                "want": "提取命令执行结果关键信息",
                 "arguments": {
                     "interpreter": "bash",
                     "script_content": script

jarvis/jarvis_code_analysis/code_review.py

@@ -4,12 +4,15 @@ import os
 import re
 import tempfile
 
+from httpx import get
 from yaspin import yaspin
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_tools.read_code import ReadCodeTool
 from jarvis.jarvis_tools.registry import ToolRegistry
 from jarvis.jarvis_agent import Agent
 
+from jarvis.jarvis_utils.config import INPUT_WINDOW_REVERSE_SIZE, get_max_input_token_count
+from jarvis.jarvis_utils.embedding import get_context_token_count
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import ct, ot, init_env
 from jarvis.jarvis_code_analysis.checklists.loader import get_language_checklist
@@ -341,14 +344,7 @@ class CodeReviewTool:
                     # Add language-specific checklists
                     if detected_languages:
                         review_info += "\n\n----- 检测到的编程语言 -----"
-                        language_names = {
-                            'c_cpp': 'C/C++',
-                            'go': 'Go',
-                            'python': 'Python',
-                            'rust': 'Rust'
-                        }
-                        detected_lang_names = [language_names.get(lang, lang) for lang in detected_languages]
-                        review_info += f"\n检测到的语言: {', '.join(detected_lang_names)}"
+                        review_info += f"\n检测到的语言: {', '.join(detected_languages)}"
                         
                         review_info += "\n\n----- 语言特定审查清单 -----"
                         for lang in detected_languages:
@@ -533,22 +529,21 @@ class CodeReviewTool:
                 with tempfile.NamedTemporaryFile(mode='w', suffix='.diff', delete=False) as temp_file:
                     temp_file_path = temp_file.name
                     temp_file.write(diff_output)
+                    temp_file.flush()
                 
                 try:
+                    upload_success = False
                     # Upload the file to the agent's model
                     with yaspin(text="正在上传代码差异文件...", color="cyan") as spinner:
-                        if agent.model and hasattr(agent.model, 'upload_files'):
+                        if get_context_token_count(diff_output) > get_max_input_token_count() - INPUT_WINDOW_REVERSE_SIZE and agent.model and hasattr(agent.model, 'upload_files'):
                             upload_success = agent.model.upload_files([temp_file_path])
                             if upload_success:
                                 spinner.ok("✅")
                                 PrettyOutput.print(f"已成功上传代码差异文件", OutputType.SUCCESS)
+                                upload_success = True
                             else:
-                                spinner.fail("❌")
-                                PrettyOutput.print(f"上传代码差异文件失败", OutputType.WARNING)
                                 upload_success = False
                         else:
-                            spinner.fail("❌")
-                            PrettyOutput.print(f"当前模型不支持文件上传", OutputType.WARNING)
                             upload_success = False
                     
                     # Prepare the prompt based on upload status

jarvis/jarvis_git_utils/git_commiter.py

@@ -11,7 +11,7 @@ import sys
 import argparse
 import os
 
-from jarvis.jarvis_utils.config import get_max_input_token_count
+from jarvis.jarvis_utils.config import INPUT_WINDOW_REVERSE_SIZE, get_max_input_token_count
 from jarvis.jarvis_utils.embedding import get_context_token_count
 from jarvis.jarvis_utils.git_utils import find_git_root, has_uncommitted_changes
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
@@ -106,17 +106,8 @@ class GitCommitTool:
                     )
                     diff = process.communicate()[0].decode()
                     spinner.write(f"✅ 获取差异 ({file_count} 个文件)")
-
-                    # 写入差异文件
-                    temp_diff_file = None
                     try:
-                        # 创建临时文件并写入差异内容
-                        temp_diff_file = tempfile.NamedTemporaryFile(mode='w', suffix='.diff', delete=False)
-                        temp_diff_file_path = temp_diff_file.name
-                        temp_diff_file.write(diff)
-                        temp_diff_file.flush()
-                        temp_diff_file.close()
-                        spinner.write(f"✅ 差异内容已写入临时文件")
+                        temp_diff_file = None
                         # 生成提交信息
                         spinner.text = "正在生成提交消息..."
                         
@@ -143,10 +134,16 @@ class GitCommitTool:
                         platform = PlatformRegistry().get_normal_platform()
                         upload_success = False
                         
-                        if hasattr(platform, 'upload_files') and os.path.exists(temp_diff_file_path):
+                        if get_context_token_count(diff) > get_max_input_token_count() - INPUT_WINDOW_REVERSE_SIZE 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("✅ 成功上传代码差异文件")
@@ -217,12 +214,13 @@ class GitCommitTool:
                         "commit_message": commit_message
                     }),
                     "stderr": ""
-                    }
+                }
             finally:
                 # Always restore original directory
                 os.chdir(original_dir)
 
         except Exception as e:
+            PrettyOutput.print(f"提交失败: {str(e)}", OutputType.ERROR)
             return {
                 "success": False,
                 "stdout": "",

jarvis/jarvis_platform/kimi.py

@@ -231,7 +231,6 @@ class KimiModel(BasePlatform):
                     return False
         
         self.uploaded_files = uploaded_files
-        self.chat_until_success("我上传了文件，收到请回复“收到”")
         return True
 
 

jarvis/jarvis_platform/yuanbao.py

@@ -11,12 +11,13 @@ from pathlib import Path
 from PIL import Image
 from yaspin import yaspin
 from yaspin.spinners import Spinners
+from yaspin.api import Yaspin
 from jarvis.jarvis_platform.base import BasePlatform
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import while_success
 
 class YuanbaoPlatform(BasePlatform):
-    """Hunyuan model implementation"""
+    """Hunyuan模型实现"""
 
     platform_name = "yuanbao"
 
@@ -63,7 +64,7 @@ class YuanbaoPlatform(BasePlatform):
         self.multimedia = []
 
     def set_system_message(self, message: str):
-        """Set system message"""
+        """设置系统消息"""
         self.system_message = message
 
     def set_model_name(self, model_name: str):
@@ -76,7 +77,7 @@ class YuanbaoPlatform(BasePlatform):
             PrettyOutput.print(f"错误：不支持的模型: {model_name}", OutputType.ERROR)
 
     def _get_base_headers(self):
-        """Get base headers for API requests"""
+        """获取API请求的基础头部信息"""
         return {
             'Host': 'yuanbao.tencent.com',
             'X-Language': 'zh-CN',
@@ -101,7 +102,7 @@ class YuanbaoPlatform(BasePlatform):
         }
 
     def _create_conversation(self) -> bool:
-        """Create a new conversation session"""
+        """创建一个新的对话会话"""
         url = "https://yuanbao.tencent.com/api/user/agent/conversation/create"
 
         headers = self._get_base_headers()
@@ -125,13 +126,13 @@ class YuanbaoPlatform(BasePlatform):
             return False
 
     def upload_files(self, file_list: List[str]) -> bool:
-        """Upload files to Yuanbao platform
+        """上传文件到元宝平台
         
-        Args:
-            file_list: List of file paths to upload
+        参数:
+            file_list: 要上传的文件路径列表
             
-        Returns:
-            List of file metadata dictionaries for use in chat messages
+        返回:
+            用于聊天消息的文件元数据字典列表
         """
         if not self.cookies:
             PrettyOutput.print("未设置YUANBAO_COOKIES，无法上传文件", OutputType.ERROR)
@@ -149,27 +150,29 @@ class YuanbaoPlatform(BasePlatform):
                     file_size = os.path.getsize(file_path)
                     file_extension = os.path.splitext(file_path)[1].lower().lstrip('.')
                     
-                    # Determine file_type using mimetypes
-                    mime_type, _ = mimetypes.guess_type(file_path)
+                    # Determine file_type using file extension
+                    file_type = "txt"  # Default type
                     
-                    # Default to txt if mime_type couldn't be determined
-                    if not mime_type:
-                        file_type = "txt"
                     # Image types
-                    elif mime_type.startswith('image/'):
+                    if file_extension in ['jpg', 'jpeg', 'png', 'webp', 'bmp', 'gif']:
                         file_type = "image"
                     # PDF type
-                    elif mime_type == 'application/pdf':
+                    elif file_extension == 'pdf':
                         file_type = "pdf"
+                    # Spreadsheet types
+                    elif file_extension in ['xls', 'xlsx', 'csv']:
+                        file_type = "excel"
+                    # Presentation types 
+                    elif file_extension in ['ppt', 'pptx']:
+                        file_type = "ppt"
                     # Document types
-                    elif mime_type in ['application/msword', 
-                                     'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-                                     'application/rtf', 
-                                     'application/vnd.oasis.opendocument.text']:
+                    elif file_extension in ['doc', 'docx', 'txt', 'text', 'md']:
                         file_type = "doc"
-                    # Default to txt for all other types
-                    else:
-                        file_type = "txt"
+                    # Code file types
+                    elif file_extension in ['bat', 'c', 'cpp', 'cs', 'css', 'go', 'h', 'hpp', 'ini',
+                         'java', 'js', 'json', 'log', 'lua', 'php', 'pl', 'py', 'rb', 
+                         'sh', 'sql', 'swift', 'tex', 'toml', 'vue', 'yaml', 'yml']:
+                        file_type = "code"
                     
                     # 2. Generate upload information
                     spinner.text = f"获取上传信息: {file_name}"
@@ -181,7 +184,7 @@ class YuanbaoPlatform(BasePlatform):
                         
                     # 3. Upload the file to COS
                     spinner.text = f"上传文件到云存储: {file_name}"
-                    upload_success = self._upload_file_to_cos(file_path, upload_info)
+                    upload_success = self._upload_file_to_cos(file_path, upload_info, spinner)
                     if not upload_success:
                         spinner.text = f"上传文件 {file_name} 失败"
                         spinner.fail("❌")
@@ -200,7 +203,7 @@ class YuanbaoPlatform(BasePlatform):
                     }
                     
                     # Get image dimensions if it's an image file
-                    if file_type == "img":
+                    if file_type == "image":
                         try:
                             with Image.open(file_path) as img:
                                 file_metadata["width"] = img.width
@@ -221,13 +224,13 @@ class YuanbaoPlatform(BasePlatform):
         return True
         
     def _generate_upload_info(self, file_name: str) -> Dict:
-        """Generate upload information from Yuanbao API
+        """从元宝API生成上传信息
         
-        Args:
-            file_name: Name of the file to upload
+        参数:
+            file_name: 要上传的文件名
             
-        Returns:
-            Dictionary containing upload information or empty dict if failed
+        返回:
+            包含上传信息的字典，如果失败则返回空字典
         """
         url = "https://yuanbao.tencent.com/api/resource/genUploadInfo"
         
@@ -258,15 +261,15 @@ class YuanbaoPlatform(BasePlatform):
             PrettyOutput.print(f"获取上传信息时出错: {str(e)}", OutputType.ERROR)
             return {}
             
-    def _upload_file_to_cos(self, file_path: str, upload_info: Dict) -> bool:
-        """Upload file to Tencent COS using the provided upload information
+    def _upload_file_to_cos(self, file_path: str, upload_info: Dict, spinner: Yaspin) -> bool:
+        """使用提供的上传信息将文件上传到腾讯COS
         
-        Args:
-            file_path: Path to the file to upload
-            upload_info: Upload information from generate_upload_info
+        参数:
+            file_path: 要上传的文件路径
+            upload_info: 从generate_upload_info获取的上传信息
             
-        Returns:
-            Boolean indicating success or failure
+        返回:
+            布尔值表示成功或失败
         """
         try:
             # Extract required information from upload_info
@@ -285,6 +288,8 @@ class YuanbaoPlatform(BasePlatform):
             # Read file content
             with open(file_path, 'rb') as file:
                 file_content = file.read()
+
+            spinner.write(f"ℹ️ 上传文件大小: {len(file_content)}")
                 
             # Prepare headers for PUT request
             host = f"{upload_info['bucketName']}.{upload_info.get('accelerateDomain', 'cos.accelerate.myqcloud.com')}"
@@ -329,18 +334,18 @@ class YuanbaoPlatform(BasePlatform):
     
     def _generate_cos_signature(self, secret_key: str, method: str, path: str, 
                               params: Dict, headers: Dict, key_time: str) -> str:
-        """Generate COS signature according to Tencent Cloud COS documentation
+        """根据腾讯云COS文档生成COS签名
         
-        Args:
-            secret_key: Temporary secret key
-            method: HTTP method (GET, PUT, etc.)
-            path: Object path
-            params: URL parameters
-            headers: HTTP headers
-            key_time: Time range for signature
+        参数:
+            secret_key: 临时密钥
+            method: HTTP方法(GET, PUT等)
+            path: 对象路径
+            params: URL参数
+            headers: HTTP头部
+            key_time: 签名时间范围
             
-        Returns:
-            Signature string
+        返回:
+            签名字符串
         """
         try:
             # 1. Generate SignKey
@@ -377,14 +382,14 @@ class YuanbaoPlatform(BasePlatform):
             raise e
 
     def chat(self, message: str) -> str:
-        """Send message and get response with optional file attachments
+        """发送消息并获取响应，可选文件附件
         
-        Args:
-            message: Message text to send
-            file_list: Optional list of file paths to upload and attach
+        参数:
+            message: 要发送的消息文本
+            file_list: 可选的上传和附加文件路径列表
             
-        Returns:
-            Response from the model
+        返回:
+            模型的响应
         """
         if not self.conversation_id:
             if not self._create_conversation():
@@ -489,7 +494,7 @@ class YuanbaoPlatform(BasePlatform):
             raise Exception(f"对话失败: {str(e)}")
 
     def delete_chat(self) -> bool:
-        """Delete current session"""
+        """删除当前会话"""
         if not self.conversation_id:
             return True  # 如果没有会话ID，视为删除成功
 
@@ -526,5 +531,5 @@ class YuanbaoPlatform(BasePlatform):
             return False
 
     def name(self) -> str:
-        """Model name"""
+        """模型名称"""
         return self.model_name

jarvis/jarvis_tools/file_analyzer.py

@@ -79,7 +79,8 @@ class FileAnalyzerTool:
             # 上传文件
             with yaspin(Spinners.dots, text="正在上传文件...") as spinner:
                 try:
-                    upload_result = platform.upload_files(valid_files)
+                    with spinner.hidden():
+                        upload_result = platform.upload_files(valid_files)
                     if not upload_result:
                         spinner.text = "文件上传失败"
                         spinner.fail("❌")
@@ -88,6 +89,7 @@ class FileAnalyzerTool:
                             "stdout": "",
                             "stderr": "文件上传失败"
                         }
+                    spinner.text = "文件上传成功"
                     spinner.ok("✅")
                 except Exception as e:
                     spinner.text = "文件上传失败"
@@ -97,9 +99,6 @@ class FileAnalyzerTool:
                         "stdout": "",
                         "stderr": f"文件上传失败: {str(e)}"
                     }
-                
-            prompt = f"""我上传了文件，收到请回复“已接收到文件”"""
-            platform.chat_until_success(prompt)
 
             platform.set_suppress_output(False)
             
@@ -112,7 +111,8 @@ class FileAnalyzerTool:
 
             # 发送请求并获取分析结果
             with yaspin(Spinners.dots, text="正在分析文件...") as spinner:
-                analysis_result = platform.chat_until_success(analysis_request)
+                with spinner.hidden():
+                    analysis_result = platform.chat_until_success(analysis_request)
                 spinner.text = "分析完成"
                 spinner.ok("✅")
             

jarvis/jarvis_tools/registry.py

@@ -1,5 +1,4 @@
 import json
-import os
 from pathlib import Path
 import re
 import sys
@@ -12,7 +11,7 @@ from yaspin import yaspin
 from jarvis.jarvis_agent.output_handler import OutputHandler
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_tools.base import Tool
-from jarvis.jarvis_utils.config import get_max_input_token_count
+from jarvis.jarvis_utils.config import INPUT_WINDOW_REVERSE_SIZE, get_max_input_token_count
 from jarvis.jarvis_utils.embedding import get_context_token_count
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import ct, ot, init_env
@@ -133,7 +132,7 @@ class ToolRegistry(OutputHandler):
         # 加载内置工具和外部工具
         self._load_builtin_tools()
         self._load_external_tools()
-        self.max_input_token_count = get_max_input_token_count() - 2048
+        self.max_input_token_count = get_max_input_token_count() - INPUT_WINDOW_REVERSE_SIZE
 
     def use_tools(self, name: List[str]):
         """使用指定工具"""
@@ -336,12 +335,13 @@ class ToolRegistry(OutputHandler):
 
             # 处理结果
             if get_context_token_count(output) > self.max_input_token_count:
-                output_file = os.path.join(tempfile.gettempdir(), f"jarvis_output_{os.getpid()}.txt")
-                with open(output_file, "w", encoding="utf-8") as f:
-                    f.write(output)
+                with tempfile.NamedTemporaryFile(mode='w', suffix='.txt', delete=False) as tmp_file:
+                    output_file = tmp_file.name
+                    tmp_file.write(output)
+                    tmp_file.flush()
                 model = PlatformRegistry().get_normal_platform()
                 model.set_suppress_output(False)
-                model.upload_files([output_file])
+                model.upload_files([output_file]) # TODO 处理错误
                 prompt = f"该文件为工具执行结果，请阅读文件内容，并根据文件提取出以下信息：{want}"
                 return f"""工具调用原始输出过长，以下是根据输出提出的信息：
 

jarvis/jarvis_utils/config.py

@@ -9,6 +9,10 @@ import os
 - 执行配置
 - 文本处理配置
 """
+
+# 输出窗口预留大小
+INPUT_WINDOW_REVERSE_SIZE = 2048
+
 def get_max_token_count() -> int:
     """
     获取模型允许的最大token数量。

jarvis/jarvis_utils/methodology.py

@@ -8,9 +8,11 @@
 """
 import os
 import json
-import hashlib
 import tempfile
-from typing import Dict, List, Optional
+from typing import Dict, Optional
+
+from jarvis.jarvis_utils.config import INPUT_WINDOW_REVERSE_SIZE, get_max_input_token_count
+from jarvis.jarvis_utils.embedding import get_context_token_count
 from jarvis.jarvis_utils.output import PrettyOutput, OutputType
 from jarvis.jarvis_platform.registry import PlatformRegistry
 
@@ -82,6 +84,7 @@ def _create_methodology_temp_file(methodologies: Dict[str, str]) -> Optional[str
                 f.write(f"## {problem_type}\n\n")
                 f.write(f"{content}\n\n")
                 f.write("---\n\n")
+            f.flush()
         
         return temp_path
     except Exception as e:
@@ -115,33 +118,28 @@ def load_methodology(user_input: str) -> str:
                 return ""
             spinner.text = f"加载方法论文件完成 (共 {len(methodologies)} 个)"
             spinner.ok("✅")
-        
-        # 创建临时文件
-        with yaspin(text="创建方法论临时文件...", color="yellow") as spinner:
-            temp_file_path = _create_methodology_temp_file(methodologies)
-            if not temp_file_path:
-                spinner.text = "创建方法论临时文件失败"
-                spinner.fail("❌")
-                return ""
-            spinner.text = f"创建方法论临时文件完成: {temp_file_path}"
-            spinner.ok("✅")
 
         # 获取当前平台
-        platform = PlatformRegistry().get_thinking_platform()
+        platform = PlatformRegistry().get_normal_platform()
         
-        # 上传文件到大模型
-        with yaspin(text="上传方法论文件到大模型...", color="yellow") as spinner:
-            with spinner.hidden():
-            # 上传文件
-                upload_result = platform.upload_files([temp_file_path])
-                if not upload_result:
-                    spinner.text = "上传方法论文件失败"
+        upload_result = False
+        if get_context_token_count(user_input) > get_max_input_token_count() - INPUT_WINDOW_REVERSE_SIZE:
+            # 创建临时文件
+            with yaspin(text="创建方法论临时文件...", color="yellow") as spinner:
+                temp_file_path = _create_methodology_temp_file(methodologies)
+                if not temp_file_path:
+                    spinner.text = "创建方法论临时文件失败"
                     spinner.fail("❌")
                     return ""
+                spinner.text = f"创建方法论临时文件完成: {temp_file_path}"
+                spinner.ok("✅")
+            if platform.upload_files([temp_file_path]):
+                upload_result = True
             
             spinner.text = "上传方法论文件成功"
             spinner.ok("✅")
         
+        platform.set_suppress_output(False)
         # 构建提示信息
         prompt = f"""根据用户需求: {user_input}
 
@@ -151,13 +149,15 @@ def load_methodology(user_input: str) -> str:
 1. [步骤1描述]
 2. [步骤2描述]
 
-如果没有匹配的方法论，请提供执行计划并注明：
-(未参考任何现有方法论)
-
-### 执行计划
-1. [步骤1描述] 
-2. [步骤2描述]
+如果没有匹配的方法论，请输出：没有历史方法论可参考
+除以上要求外，不要输出任何内容
 """
+        if not upload_result:
+            prompt += f"""
+# 方法论内容
+"""
+            for problem_type, content in methodologies.items():
+                prompt += f"## {problem_type}\n\n{content}\n\n---\n\n"
         return platform.chat_until_success(prompt)
     
     except Exception as e:

{jarvis_ai_assistant-0.1.141.dist-info → jarvis_ai_assistant-0.1.142.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jarvis-ai-assistant
-Version: 0.1.141
+Version: 0.1.142
 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.141.dist-info → jarvis_ai_assistant-0.1.142.dist-info}/RECORD

@@ -1,15 +1,15 @@
-jarvis/__init__.py,sha256=qDMhmaE2-m_heV7fzBRSqmELTVxciZSojL01NXLJgCU,50
+jarvis/__init__.py,sha256=k7rfKx4vgw6yD017iMbhcRMd_XMauKsvdaFRUtuSXeM,50
 jarvis/jarvis_agent/__init__.py,sha256=doFjWa2a6nVGkKkuQkgrupswqqY8dBNJxUDxUfckvPo,23557
 jarvis/jarvis_agent/builtin_input_handler.py,sha256=aWb5RiKaY5-07LtiLi_mMh9Z-l4DaA_3nLbmFbBGb-w,2429
 jarvis/jarvis_agent/file_input_handler.py,sha256=6rIF_FgC9_3UcQhFCmoMoECG4tjKaLBZZ5zDtBl037I,3235
 jarvis/jarvis_agent/jarvis.py,sha256=NmxVJ8KwSc4fumntNL1T5TWj-FvcRgssLeBhG4sA3xk,5368
 jarvis/jarvis_agent/main.py,sha256=Hx1cavfGkrGVEk_HrOJX6FNE0fEh2CDLy7Efr_VSiKI,2636
 jarvis/jarvis_agent/output_handler.py,sha256=4limQ-Kf-YYvQjT5SMjJIyyvD1DVG8tINv1A_qbv4ho,405
-jarvis/jarvis_agent/patch.py,sha256=ZVde3b7MobwGWR0KFKaGXfeCrMQjmT47GWoGpt2nM3c,19796
-jarvis/jarvis_agent/shell_input_handler.py,sha256=Pcm__ldcBp7GcHm5r3hbRc4nKe86LLWvNl0UE5JlAiU,1173
+jarvis/jarvis_agent/patch.py,sha256=vwuSg93NZBHD7giucj1yqvKX9LYdxfZ9YrZhFONI-Us,21422
+jarvis/jarvis_agent/shell_input_handler.py,sha256=9IoGQCe6FF4HA2V5S11q63AtnWDZFpNeRd3hcqCAlBw,1237
 jarvis/jarvis_code_agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_code_agent/code_agent.py,sha256=c6UBBJku-yoH70f-uapsewewp4EKYxevTnMCZ-KqWKA,12599
-jarvis/jarvis_code_analysis/code_review.py,sha256=I_Bc0hDPz3m5textX9Yqreq7_f28CGd7KDW_-i4Cjgs,29543
+jarvis/jarvis_code_analysis/code_review.py,sha256=nS_GeT3RhkzeF6xvOdncqufMKG8OKDhYbLsnOiX1WcQ,29289
 jarvis/jarvis_code_analysis/checklists/__init__.py,sha256=PCjlyxLa939613cAzS7pfEPgP57setO-1RvcdzzPivw,54
 jarvis/jarvis_code_analysis/checklists/c_cpp.py,sha256=8lfWmhImAxeTBdHPOgVXDjMllaq280Qki1ZOOSDBnvk,1293
 jarvis/jarvis_code_analysis/checklists/csharp.py,sha256=fg35Iima2nIsirEmAjianfAybVjwRYml9BtbSQFff7w,2396
@@ -35,7 +35,7 @@ jarvis/jarvis_git_details/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 jarvis/jarvis_git_details/main.py,sha256=YowncVxYyJ3y2EvGrZhAJeR4yizXp6aB3dqvoYTepFY,6117
 jarvis/jarvis_git_squash/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_git_squash/main.py,sha256=xBNkAl7_8_pQC-C6RcUImA1mEU4KTqhjtA57rG_mMJ8,2179
-jarvis/jarvis_git_utils/git_commiter.py,sha256=6q70zosBrTM6vHqp01DV4780-y3zmazdSfJFGJT9jiw,10643
+jarvis/jarvis_git_utils/git_commiter.py,sha256=mBmrsbN6NrjdVPqa_tW7zLgx1vRWzYM2OMU__iACifw,10805
 jarvis/jarvis_init/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_init/main.py,sha256=Mb41DdhkWRYxdqEqCJPiQRAT4IspbRmak6la9ITcXdg,2102
 jarvis/jarvis_lsp/base.py,sha256=CWfiqiQ6ZBc_lrW64Y1YAsFQeNPGoWcgTBGKgOrPVQg,2047
@@ -49,10 +49,10 @@ jarvis/jarvis_multi_agent/__init__.py,sha256=SX8lBErhltKyYRM-rymrMz3sJ0Zl3hBXrps
 jarvis/jarvis_multi_agent/main.py,sha256=aGuUC3YQmahabqwDwZXJjfQLYsZ3KIZdf8DZDlVNMe4,1543
 jarvis/jarvis_platform/__init__.py,sha256=WIJtD5J7lOrWLX2bsgZGkmlMcN0NOJsnh_reybmHPjg,58
 jarvis/jarvis_platform/base.py,sha256=Ge-UgZGCHICFWOqrHzg-_qXQXjS1I2lZSxfYs5Angwo,3234
-jarvis/jarvis_platform/kimi.py,sha256=N2iNIjJzB57SMAgrfbCvRd595DvlbKtg038wXAz4BqU,16578
+jarvis/jarvis_platform/kimi.py,sha256=tytHhRSddPTNwkaPYPr59rBZfGMo7616QMcnFQxLRic,16494
 jarvis/jarvis_platform/openai.py,sha256=V_76W4hwKXRQ4Je7qj4nrTOedgQDc2_8l_NUuJq3Q2U,4115
 jarvis/jarvis_platform/registry.py,sha256=QuH8V65uwqf-x_Y-T_rmvIDtPLzkX_COWPfzsH1eH0s,7612
-jarvis/jarvis_platform/yuanbao.py,sha256=MjJVD0z28HHCSxpZaBFQAYxUCDIQdaYjuGv08uIWP-w,21754
+jarvis/jarvis_platform/yuanbao.py,sha256=VF_-OP8ViJgM6pA7pZrwm8NP36y_Sl9wYEwS-zGNrWM,21907
 jarvis/jarvis_platform_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_platform_manager/main.py,sha256=o7UDrcCkLf9dTh2LOO-_bQVHjWf2X6RuSY5XRtCGvZs,20245
 jarvis/jarvis_platform_manager/openai_test.py,sha256=8L9Xx-oR82X8l38NsVhkymYucICwMb-6yrH17Usk2TI,4954
@@ -66,29 +66,29 @@ jarvis/jarvis_tools/chdir.py,sha256=tijYhhGbaAiTcA877w9thlxt0smoK2SX2AntcBBETmA,
 jarvis/jarvis_tools/create_code_agent.py,sha256=7AOte1Ua6tOXjLYuetN6qwBx6ID0XX29IEjXmMAouxY,4295
 jarvis/jarvis_tools/create_sub_agent.py,sha256=Hpu50UO-ekakYHxD6-5Civi9lvti5aPnRpTwSxAbFVo,3046
 jarvis/jarvis_tools/execute_script.py,sha256=dMUwg_8nFkYqL-9gFO6LHM1kEKXYLW8PXHRtEWLFcBI,6485
-jarvis/jarvis_tools/file_analyzer.py,sha256=b8FuU6zRlAO_g2p_AbBaCyEfgc7U3yPwfoAKgHwvCiQ,4870
+jarvis/jarvis_tools/file_analyzer.py,sha256=ybmjKJGNdkNhIBSL-fgrhOVrbD4rCBDovQ-xrlJSmTg,4862
 jarvis/jarvis_tools/file_operation.py,sha256=efFTysX7G-4O8GyChZZRi_ozlDUV14ybflri_cGHRx0,10374
 jarvis/jarvis_tools/find_methodology.py,sha256=zLxDPhoxrkECu_K6OlUDgvOWKewokCOp8VJMdomQns0,2276
 jarvis/jarvis_tools/lsp_get_diagnostics.py,sha256=v_tnnaOgXBWog_73pbZdK-vR3MW2vC6BDmHVxlOF1GA,5363
 jarvis/jarvis_tools/methodology.py,sha256=Nh5dvsUuRaWuLtN9TjdSa1qdAtWk2eLj_bNpKZfQJKE,5200
 jarvis/jarvis_tools/read_code.py,sha256=8TFvORPxu_juMAPqj-UBa3qo810AMqXh8S3Gbq_IXaY,6133
 jarvis/jarvis_tools/read_webpage.py,sha256=6ILzxZm45lW1zke4_01RLclFUbxgI_7mKgaTQtTovYU,2231
-jarvis/jarvis_tools/registry.py,sha256=2rWau4Ib8AtJ2ZsckkNQp3CMC06wBQwSMktzGbv3v8I,17187
+jarvis/jarvis_tools/registry.py,sha256=arrAFzjMy4PlkFAOXHhlm5gpEuVVPVsC-g0JrfX1EPo,17268
 jarvis/jarvis_tools/search_web.py,sha256=ZM1LKb7VApSBn7H1a7oawkhkv7_KBPcCSBKfETED7vo,1397
 jarvis/jarvis_tools/virtual_tty.py,sha256=9aSA14thmJ1e0PVhi0TNAj5lICiVD5j8DVIvzknDupc,15524
 jarvis/jarvis_utils/__init__.py,sha256=KMg-KY5rZIhGTeOD5e2Xo5CU7DX1DUz4ULWAaTQ-ZNw,825
-jarvis/jarvis_utils/config.py,sha256=W0N7aD0uMAQPLLbFapzK02uzGFtjlfotBQt6FbCIlwA,5190
+jarvis/jarvis_utils/config.py,sha256=qw2Jr_yTbco6yhVq8fDuK4JYw37n4XoGHWuQuzOqucE,5252
 jarvis/jarvis_utils/embedding.py,sha256=NjbhqoUrSH0p0upQCalGO3O34CyXQ8MMvF1eQTRn5JQ,7129
 jarvis/jarvis_utils/file_processors.py,sha256=VchHOIXxxGWqSu5q0Q_epVWUHJTxaKz2wmqiDoRy5Ik,14324
 jarvis/jarvis_utils/git_utils.py,sha256=rAMXKlAYIvqF64iDFc_FDLxi5SMqEuKYH8GzC7RaZGY,4967
 jarvis/jarvis_utils/globals.py,sha256=DaQ-lfLtK8bDyGVlR6jtkenkkgxQVsIkSZCZwklelzc,2769
 jarvis/jarvis_utils/input.py,sha256=yBrak_UP9ZN3fgV7G19o6TDBjEYVdh3UOyjQ_IpRvz8,6585
-jarvis/jarvis_utils/methodology.py,sha256=A_LA-J2eOY22H0_NSTovcQA8f7BVwgpV6eWCoEZmvdM,6003
+jarvis/jarvis_utils/methodology.py,sha256=5YDfs5JN1TBb13nQYTrJ3WCEmEX4Lk5f_cHQuoFi3FI,6205
 jarvis/jarvis_utils/output.py,sha256=EUJQ1pnCj7PcD9-gXIXMFNrxAwyZBeUd8X-fNEJYJ1k,8443
 jarvis/jarvis_utils/utils.py,sha256=ZYclSrkrHBxatxYQkoNpAgIupO0j9CjiLIp8xBijWXc,12164
-jarvis_ai_assistant-0.1.141.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.141.dist-info/METADATA,sha256=McbbEQVqMZ1quCSQKwEbgQq21MvzZfVabCgSvo1N1wU,10004
-jarvis_ai_assistant-0.1.141.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-jarvis_ai_assistant-0.1.141.dist-info/entry_points.txt,sha256=vuvEtcYSta_LgCFHS4m0OjtF7z1jKX_Dy2pG0rOMNIE,972
-jarvis_ai_assistant-0.1.141.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.141.dist-info/RECORD,,
+jarvis_ai_assistant-0.1.142.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.142.dist-info/METADATA,sha256=7ADpL30GWjCXNC55ew2Yq55igYtChLZ5Ste2HgzGjhk,10004
+jarvis_ai_assistant-0.1.142.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+jarvis_ai_assistant-0.1.142.dist-info/entry_points.txt,sha256=vuvEtcYSta_LgCFHS4m0OjtF7z1jKX_Dy2pG0rOMNIE,972
+jarvis_ai_assistant-0.1.142.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.142.dist-info/RECORD,,