jarvis-ai-assistant 0.1.159__py3-none-any.whl → 0.1.160__py3-none-any.whl

jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.159"
+__version__ = "0.1.160"

jarvis/jarvis_agent/file_input_handler.py

@@ -7,9 +7,8 @@ from typing import Any, Tuple
 from yaspin import yaspin
 
 from jarvis.jarvis_tools.file_operation import FileOperationTool
-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 is_context_overflow
 
 
 def file_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:
@@ -86,7 +85,7 @@ def file_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:
                 spinner.text = "文件读取完成"
                 spinner.ok("✅")
                 prompt = result["stdout"] + "\n" + prompt
-                if get_context_token_count(prompt) > get_max_input_token_count() - INPUT_WINDOW_REVERSE_SIZE:
+                if is_context_overflow(prompt):
                     return old_prompt, False
 
     return prompt, False

jarvis/jarvis_agent/patch.py

@@ -2,20 +2,19 @@ import re
 from typing import Dict, Any, Tuple
 import os
 
-from yaspin import yaspin
+from yaspin import yaspin # type: ignore
 
 from jarvis.jarvis_agent.output_handler import OutputHandler
 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 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.config import is_confirm_before_apply_patch
 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
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
-from jarvis.jarvis_utils.utils import get_file_line_count, user_confirm, chat_with_files
+from jarvis.jarvis_utils.utils import is_context_overflow, get_file_line_count, user_confirm
 from jarvis.jarvis_utils.tag import ot, ct
 
 
@@ -95,7 +94,7 @@ def add(a, b):
 - 保持代码风格一致性，遵循项目现有的编码规范
 - 在修改前仔细分析原代码的格式风格，确保补丁与之完全兼容
 - 绝不提供完整文件内容，除非是新建文件
-- 每个文件的修改是独立的，不能出现"参照xxx文件的修改"这样的描述
+- 每个文件的修改是独立的，不能出现“参照xxx文件的修改”这样的描述
 - 不要出现未实现的代码，如：TODO
 """
     
@@ -377,6 +376,7 @@ def handle_small_code_operation(filepath: str, patch_content: str) -> bool:
         try:
             model = PlatformRegistry().get_normal_platform()
             file_content = FileOperationTool().execute({"operation":"read", "files":[{"path":filepath}]})["stdout"]
+
             model.set_suppress_output(True)
 
             prompt = f"""
@@ -407,6 +407,7 @@ def handle_small_code_operation(filepath: str, patch_content: str) -> bool:
 {ot("MERGED_CODE")}
 [合并后的完整代码，包括所有空行和缩进]
 {ct("MERGED_CODE")}
+
 # 原始代码
 {file_content}
 """
@@ -466,18 +467,23 @@ def handle_small_code_operation(filepath: str, patch_content: str) -> bool:
             return False
 
 
+
 def handle_large_code_operation(filepath: str, patch_content: str, model: BasePlatform) -> bool:
     """处理大型代码文件的补丁操作，使用差异化补丁格式"""
     with yaspin(text=f"正在处理文件 {filepath}...", color="cyan") as spinner:
         try:
             file_content = FileOperationTool().execute({"operation":"read", "files":[{"path":filepath}]})["stdout"]
-            
-            # 检查是否需要特殊处理大文件
-            need_special_handling = get_context_token_count(file_content) > get_max_input_token_count() - INPUT_WINDOW_REVERSE_SIZE
-            
+            need_upload_file = is_context_overflow(file_content)
+            upload_success = False
+            # 读取原始文件内容
+            with spinner.hidden():  
+                if need_upload_file and model.upload_files([filepath]):
+                    upload_success = True
+
+
             model.set_suppress_output(True)
 
-            prompt = f"""
+            main_prompt = f"""
 # 代码补丁生成专家指南
 
 ## 任务描述
@@ -487,8 +493,7 @@ def handle_large_code_operation(filepath: str, patch_content: str, model: BasePl
 ```
 {patch_content}
 ```
-"""
-            suffix_prompt = """
+
 ## 补丁生成要求
 1. **精确性**：严格按照补丁的意图修改代码
 2. **格式一致性**：严格保持原始代码的格式风格
@@ -523,77 +528,68 @@ def handle_large_code_operation(filepath: str, patch_content: str, model: BasePl
 <<<<<< REPLACE
 {ct("DIFF")}
 """
-            if need_special_handling:
-                # 尝试上传文件
-                upload_success = False
-                with spinner.hidden():  
-                    if model.upload_files([filepath]):
-                        upload_success = True
-
-                if upload_success:
-                    response = model.chat_until_success(prompt + suffix_prompt)
+            
+            for _ in range(3):
+                file_prompt = ""
+                if not need_upload_file:
+                    file_prompt = f"""
+    # 原始代码
+    {file_content}
+    """
+                    response = model.chat_until_success(main_prompt + file_prompt)
                 else:
-                    # 使用chat_with_files生成补丁
-                    response = chat_with_files(
-                        [filepath],
-                        model,
-                        prompt,
-                        suffix_prompt
-                    )
-            else:
-                # 上下文足够，直接在prompt中包含文件内容
-                prompt += f"""
-# 原始文件内容
-```
-{file_content}
-```
-"""
-                response = model.chat_until_success(prompt + suffix_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:
-                        prompt = f"补丁 #{patch_count} 应用失败：找到多个匹配的代码段"
-                        spinner.write(f"❌ 补丁 #{patch_count} 应用失败：找到多个匹配的代码段")
+                    if upload_success:
+                        response = model.chat_until_success(main_prompt)
+                    else:
+                        response = model.chat_big_content(file_content, main_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:
+                            prompt = f"补丁 #{patch_count} 应用失败：找到多个匹配的代码段"
+                            spinner.write(f"❌ 补丁 #{patch_count} 应用失败：找到多个匹配的代码段")
+                            success = False
+                            break
+                        # 应用替换
+                        modified_content = modified_content.replace(
+                            search_text, replace_text)
+                        spinner.write(f"✅ 补丁 #{patch_count} 应用成功")
+                    else:
+                        spinner.write(f"❌ 补丁 #{patch_count} 应用失败：无法找到匹配的代码段")
+                        prompt = f"补丁 #{patch_count} 应用失败：无法找到匹配的代码段"
                         success = False
                         break
-                    # 应用替换
-                    modified_content = modified_content.replace(
-                        search_text, replace_text)
-                    spinner.write(f"✅ 补丁 #{patch_count} 应用成功")
-                else:
-                    spinner.write(f"❌ 补丁 #{patch_count} 应用失败：无法找到匹配的代码段")
-                    prompt = f"补丁 #{patch_count} 应用失败：无法找到匹配的代码段"
-                    success = False
-                    break
-            if not success:
-                revert_file(filepath)
-                return False
+                if not success:
+                    revert_file(filepath)
+                    continue
 
-            # 写入修改后的内容
-            with open(filepath, 'w', encoding='utf-8', errors="ignore") as f:
-                f.write(modified_content)
+                # 写入修改后的内容
+                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
+                spinner.text = f"文件 {filepath} 修改完成，应用了 {patch_count} 个补丁"
+                spinner.ok("✅")
+                return True
+            spinner.text = f"文件 {filepath} 修改失败"
+            spinner.fail("❌")
+            return False
 
         except Exception as e:
             spinner.text = f"文件修改失败: {str(e)}"

jarvis/jarvis_code_analysis/code_review.py

@@ -10,10 +10,8 @@ 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 init_env, chat_with_files
+from jarvis.jarvis_utils.utils import init_env, is_context_overflow
 from jarvis.jarvis_utils.tag import ot, ct
 from jarvis.jarvis_code_analysis.checklists.loader import get_language_checklist
 
@@ -587,28 +585,27 @@ class CodeReviewTool:
                     temp_file.flush()
                 
                 try:
-                    # 检查文件大小
-                    is_large_file = get_context_token_count(diff_output) > get_max_input_token_count() - INPUT_WINDOW_REVERSE_SIZE
+                    upload_success = False
+                    # Check if content is too large
+                    is_large_content = is_context_overflow(diff_output)
                     
-                    if is_large_file:
-                        # 文件较大，尝试上传
-                        upload_success = False
-                        with yaspin(text="正在上传代码差异文件...", color="cyan") as spinner:
-                            if 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)
-                                else:
-                                    spinner.fail("❌")
-                                    PrettyOutput.print(f"文件上传失败，将使用chat_with_files处理", OutputType.WARNING)
+                    # Upload the file to the agent's model
+                    with yaspin(text="正在上传代码差异文件...", color="cyan") as spinner:
+                        if is_large_content 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)
                             else:
                                 spinner.fail("❌")
-                                PrettyOutput.print(f"模型不支持文件上传，将使用chat_with_files处理", OutputType.WARNING)
-                        
-                        if upload_success:
-                            # 文件上传成功，使用上传的文件
-                            complete_prompt = user_prompt + f"""
+                                PrettyOutput.print(f"上传代码差异文件失败，将使用分块处理", OutputType.WARNING)
+                        else:
+                            upload_success = False
+                    
+                    # Prepare the prompt based on upload status
+                    if upload_success:
+                        # When file is uploaded, reference it in the prompt
+                        complete_prompt = user_prompt + f"""
 
 我已上传了一个包含代码差异的文件。该文件包含:
 - 审查类型: {review_type}
@@ -616,20 +613,17 @@ class CodeReviewTool:
 - 检测到的编程语言: {', '.join(detected_languages) if detected_languages else '未检测到特定语言'}
 
 请基于上传的代码差异文件进行全面审查，并生成详细的代码审查报告。"""
-                            result = agent.run(complete_prompt)
-                        else:
-                            # 文件上传失败，使用chat_with_files
-                            PrettyOutput.print("使用chat_with_files处理大文件...", OutputType.INFO)
-                            result = chat_with_files(
-                                [temp_file_path],
-                                agent.model,
-                                user_prompt,
-                                "请基于以上代码差异进行全面审查，并生成详细的代码审查报告。"
-                            )
-                    else:
-                        # 文件较小，直接包含在prompt中
-                        complete_prompt = user_prompt + "\n\n代码差异内容:\n```diff\n" + diff_output + "\n```"
+                        # Run the agent with the prompt
                         result = agent.run(complete_prompt)
+                    else:
+                        # If upload failed or not needed, handle based on context size
+                        if is_large_content and agent.model and hasattr(agent.model, 'chat_big_content'):
+                            # Use chat_big_content for large content when upload fails
+                            result = agent.model.chat_big_content(diff_output, user_prompt)
+                        else:
+                            # Include the diff directly in the prompt for smaller content
+                            complete_prompt = user_prompt + "\n\n代码差异内容:\n```diff\n" + diff_output + "\n```"
+                            result = agent.run(complete_prompt)
                 finally:
                     # Clean up the temporary file
                     if os.path.exists(temp_file_path):

jarvis/jarvis_git_utils/git_commiter.py

@@ -10,11 +10,9 @@ import sys
 import argparse
 import os
 
-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
-from jarvis.jarvis_utils.utils import init_env, chat_with_files
+from jarvis.jarvis_utils.utils import init_env, is_context_overflow
 from jarvis.jarvis_utils.tag import ot, ct
 
 
@@ -107,7 +105,7 @@ class GitCommitTool:
                     diff = process.communicate()[0].decode()
                     spinner.write(f"✅ 获取差异 ({file_count} 个文件)")
                     try:
-                        temp_diff_file = None
+                        temp_diff_file_path = None
                         # 生成提交信息
                         spinner.text = "正在生成提交消息..."
                         
@@ -132,13 +130,12 @@ class GitCommitTool:
 
                         # 获取模型并尝试上传文件
                         platform = PlatformRegistry().get_normal_platform()
+                        upload_success = False
                         
-                        # 检查文件大小
-                        is_large_file = get_context_token_count(diff) > get_max_input_token_count() - INPUT_WINDOW_REVERSE_SIZE
+                        # Check if content is too large
+                        is_large_content = is_context_overflow(diff)
                         
-                        if is_large_file:
-                            # 文件较大，尝试上传
-                            upload_success = False
+                        if is_large_content and hasattr(platform, 'upload_files'):
                             spinner.text = "正在上传代码差异文件..."
                             try:
                                 with spinner.hidden():
@@ -148,72 +145,43 @@ class GitCommitTool:
                                         temp_diff_file.write(diff)
                                         temp_diff_file.flush()
                                         spinner.write(f"✅ 差异内容已写入临时文件")
-                                    
-                                    if hasattr(platform, 'upload_files'):
-                                        upload_success = platform.upload_files([temp_diff_file_path])
-                                        if upload_success:
-                                            spinner.write("✅ 成功上传代码差异文件")
-                                        else:
-                                            spinner.write("⚠️ 上传代码差异文件失败，将使用chat_with_files处理")
-                                    else:
-                                        spinner.write("⚠️ 模型不支持文件上传，将使用chat_with_files处理")
+                                    upload_success = platform.upload_files([temp_diff_file_path])
+                                if upload_success:
+                                    spinner.write("✅ 成功上传代码差异文件")
+                                else:
+                                    spinner.write("⚠️ 上传代码差异文件失败，将使用分块处理")
                             except Exception as e:
                                 spinner.write(f"⚠️ 上传文件时出错: {str(e)}")
                                 upload_success = False
-                            
-                            if upload_success:
-                                # 使用上传的文件
-                                prompt = base_prompt + f'''
+                        
+                        # 根据上传状态准备完整的提示
+                        if upload_success:
+                            # 使用上传的文件
+                            prompt = base_prompt + f'''
         # 变更概述
         - 变更文件数量: {file_count} 个文件
         - 已上传包含完整代码差异的文件
         
         请详细分析已上传的代码差异文件，生成符合上述格式的提交信息。
         '''
-                            else:
-                                # 使用chat_with_files处理大文件
-                                spinner.write("使用chat_with_files处理大文件...")
-                                commit_message = chat_with_files(
-                                    [temp_diff_file_path],
-                                    platform,
-                                    base_prompt,
-                                    "请基于以上代码差异生成符合格式的提交信息。"
-                                )
-                                commit_message = self._extract_commit_message(commit_message)
-                                if commit_message:
-                                    spinner.write("✅ 生成提交消息")
-                                    # 执行提交
-                                    spinner.text = "正在准备提交..."
-                                    with tempfile.NamedTemporaryFile(mode='w', delete=True) as tmp_file:
-                                        tmp_file.write(commit_message)
-                                        tmp_file.flush()
-                                        spinner.text = "正在执行提交..."
-                                        commit_cmd = ["git", "commit", "-F", tmp_file.name]
-                                        subprocess.Popen(
-                                            commit_cmd,
-                                            stdout=subprocess.DEVNULL,
-                                            stderr=subprocess.DEVNULL
-                                        ).wait()
-                                        spinner.write("✅ 提交")
-                                    return {
-                                        "success": True,
-                                        "stdout": yaml.safe_dump({
-                                            "commit_hash": self._get_last_commit_hash(),
-                                            "commit_message": commit_message
-                                        }),
-                                        "stderr": ""
-                                    }
                         else:
-                            # 文件较小，直接在提示中包含差异内容
-                            prompt = base_prompt + f'''
+                            # 如果上传失败但内容较大，使用chat_big_content
+                            if is_large_content and hasattr(platform, 'chat_big_content'):
+                                spinner.text = "正在使用分块处理生成提交信息..."
+                                commit_message = platform.chat_big_content(diff, base_prompt)
+                            else:
+                                # 直接在提示中包含差异内容
+                                prompt = base_prompt + f'''
         # 分析材料
         {diff}
         '''
+                                commit_message = platform.chat_until_success(prompt)
                         
                         # 尝试生成提交信息
                         spinner.text = "正在生成提交消息..."
                         while True:
-                            commit_message = platform.chat_until_success(prompt)
+                            if not upload_success and not is_large_content:
+                                commit_message = platform.chat_until_success(prompt)
                             commit_message = self._extract_commit_message(commit_message)
                             # 如果成功提取，就跳出循环
                             if commit_message:
@@ -246,7 +214,7 @@ class GitCommitTool:
                         spinner.ok("✅")
                     finally:
                         # 清理临时差异文件
-                        if temp_diff_file is not None and os.path.exists(temp_diff_file_path):
+                        if temp_diff_file_path is not None and os.path.exists(temp_diff_file_path):
                             try:
                                 os.unlink(temp_diff_file_path)
                             except Exception as e:

jarvis/jarvis_methodology/main.py

@@ -11,14 +11,14 @@ import hashlib
 import os
 import json
 import argparse
-import yaml
+import yaml # type: ignore
 from jarvis.jarvis_utils.methodology import (
     _get_methodology_directory,
     _load_all_methodologies
 )
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_utils.output import PrettyOutput, OutputType
-from yaspin import yaspin
+from yaspin import yaspin # type: ignore
 
 def import_methodology(input_file):
     """导入方法论文件（合并策略）"""

jarvis/jarvis_platform/base.py

@@ -1,6 +1,8 @@
 from abc import ABC, abstractmethod
 import re
 from typing import List, Tuple
+from jarvis.jarvis_utils.config import get_max_input_token_count
+from jarvis.jarvis_utils.embedding import split_text_into_chunks
 from jarvis.jarvis_utils.globals import clear_read_file_record
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import get_context_token_count, while_success, while_true
@@ -37,38 +39,49 @@ class BasePlatform(ABC):
     @abstractmethod
     def upload_files(self, file_list: List[str]) -> bool:
         raise NotImplementedError("upload_files is not implemented")
+    
+    def chat_big_content(self, content: str, prompt: str) -> str:
+        prefix_prompt = f"""
+        我将分多次提供大量的上下文内容，在我明确告诉你内容已经全部提供完毕之前，每次仅需要输出“已收到”。
+        """
+        self.chat_until_success(prefix_prompt)
+        split_content = split_text_into_chunks(content, get_max_input_token_count() - 1024)
+        for chunk in split_content:
+            self.chat_until_success(f"<part_content>{chunk}</part_content>")
+        return self.chat_until_success(f"内容已经全部提供完毕\n\n{prompt}")
 
+    
+    def _chat(self, message: str):
+        import time
+        start_time = time.time()
+        response = self.chat(message)
+
+        end_time = time.time()
+        duration = end_time - start_time
+        char_count = len(response)
+
+        # Calculate token count and tokens per second
+        try:
+            token_count = get_context_token_count(response)
+            tokens_per_second = token_count / duration if duration > 0 else 0
+        except Exception as e:
+            PrettyOutput.print(f"Tokenization failed: {str(e)}", OutputType.WARNING)
+            token_count = 0
+            tokens_per_second = 0
+
+        # Print statistics
+        if not self.suppress_output:
+            PrettyOutput.print(
+                f"对话完成 - 耗时: {duration:.2f}秒, 输出字符数: {char_count}, 输出Token数量: {token_count}, 每秒Token数量: {tokens_per_second:.2f}",
+                OutputType.INFO,
+            )
+
+        # Keep original think tag handling
+        response = re.sub(ot("think")+r'.*?'+ct("think"), '', response, flags=re.DOTALL)
+        return response
+    
     def chat_until_success(self, message: str) -> str:
-        def _chat():
-            import time
-            start_time = time.time()
-            response = self.chat(message)
-
-            end_time = time.time()
-            duration = end_time - start_time
-            char_count = len(response)
-
-            # Calculate token count and tokens per second
-            try:
-                token_count = get_context_token_count(response)
-                tokens_per_second = token_count / duration if duration > 0 else 0
-            except Exception as e:
-                PrettyOutput.print(f"Tokenization failed: {str(e)}", OutputType.WARNING)
-                token_count = 0
-                tokens_per_second = 0
-
-            # Print statistics
-            if not self.suppress_output:
-                PrettyOutput.print(
-                    f"对话完成 - 耗时: {duration:.2f}秒, 输出字符数: {char_count}, 输出Token数量: {token_count}, 每秒Token数量: {tokens_per_second:.2f}",
-                    OutputType.INFO,
-                )
-
-            # Keep original think tag handling
-            response = re.sub(ot("think")+r'.*?'+ct("think"), '', response, flags=re.DOTALL)
-            return response
-
-        return while_true(lambda: while_success(lambda: _chat(), 5), 5)
+        return while_true(lambda: while_success(lambda: self._chat(message), 5), 5)
 
     @abstractmethod
     def name(self) -> str:

jarvis/jarvis_platform/kimi.py

@@ -1,5 +1,5 @@
 from typing import Dict, List, Tuple
-import requests
+import requests # type: ignore
 import json
 import os
 import mimetypes
@@ -178,7 +178,7 @@ class KimiModel(BasePlatform):
         if not file_list:
             return True
 
-        from yaspin import yaspin
+        from yaspin import yaspin # type: ignore
         
         if not self.chat_id:
             with yaspin(text="创建聊天会话...", color="yellow") as spinner:

jarvis/jarvis_tools/file_analyzer.py

@@ -3,8 +3,8 @@ import os
 
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
-from yaspin import yaspin
-from yaspin.spinners import Spinners
+from yaspin import yaspin # type: ignore
+from yaspin.spinners import Spinners # type: ignore
 
 class FileAnalyzerTool:
     name = "file_analyzer"

jarvis/jarvis_tools/file_operation.py

@@ -2,7 +2,7 @@ from typing import Dict, Any
 import os
 from pathlib import Path
 
-from yaspin import yaspin
+from yaspin import yaspin # type: ignore
 
 from jarvis.jarvis_utils.globals import add_read_file_record
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput

jarvis/jarvis_tools/read_webpage.py

@@ -31,7 +31,7 @@ class WebpageTool:
             
             # Create Yuanbao model instance
             model = PlatformRegistry().get_normal_platform()
-            model.web = True
+            model.set_web(True)
             model.set_suppress_output(False)  # type: ignore
 
             # Construct prompt based on want parameter

jarvis/jarvis_tools/registry.py

@@ -3,6 +3,7 @@ from pathlib import Path
 import re
 import sys
 import tempfile
+import os
 from typing import Any, Callable, Dict, List, Optional, Tuple
 
 import yaml
@@ -10,14 +11,9 @@ import yaml
 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 (
-    INPUT_WINDOW_REVERSE_SIZE,
-    get_max_input_token_count,
-    get_data_dir,
-)
-from jarvis.jarvis_utils.embedding import get_context_token_count
+from jarvis.jarvis_utils.config import get_data_dir
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
-from jarvis.jarvis_utils.utils import init_env
+from jarvis.jarvis_utils.utils import init_env, is_context_overflow
 from jarvis.jarvis_utils.tag import ot, ct
 from jarvis.jarvis_mcp.stdio_mcp_client import StdioMcpClient
 from jarvis.jarvis_mcp.sse_mcp_client import SSEMcpClient
@@ -175,9 +171,6 @@ class ToolRegistry(OutputHandler):
         self._load_builtin_tools()
         self._load_external_tools()
         self._load_mcp_tools()
-        self.max_input_token_count = (
-            get_max_input_token_count() - INPUT_WINDOW_REVERSE_SIZE
-        )
 
     def use_tools(self, name: List[str]) -> None:
         """使用指定工具
@@ -618,46 +611,45 @@ class ToolRegistry(OutputHandler):
                 result["stdout"], result.get("stderr", "")
             )
 
-            # 处理结果
-            if get_context_token_count(output) > self.max_input_token_count:
-                with tempfile.NamedTemporaryFile(
-                    mode="w", suffix=".txt", delete=False
-                ) as tmp_file:
+            # 检查内容是否过大
+            is_large_content = is_context_overflow(output)
+            
+            if is_large_content:
+                # 创建临时文件
+                with tempfile.NamedTemporaryFile(mode="w", suffix=".txt", delete=False) as tmp_file:
                     output_file = tmp_file.name
                     tmp_file.write(output)
                     tmp_file.flush()
-                platform: Any = PlatformRegistry().get_normal_platform()
-                if platform:
-                    platform.set_suppress_output(False)
-                    try:
+                
+                try:
+                    # 获取平台实例
+                    platform = PlatformRegistry().get_normal_platform()
+                    if platform and hasattr(platform, 'upload_files'):
+                        platform.set_suppress_output(False)
                         # 尝试上传文件
-                        if platform.upload_files([output_file]):
-                            prompt = f"""该文件为工具执行结果，请阅读文件内容，并根据文件提取出以下信息：{want}
-
-注意：
-1. 请仔细阅读文件内容，确保提取的信息准确完整
-2. 如果文件内容包含错误信息，请特别关注并提取
-3. 提取的信息应该直接回答用户的问题，不要包含无关内容"""
+                        upload_success = platform.upload_files([output_file])
+                        
+                        if upload_success:
+                            # 使用上传的文件生成摘要
+                            prompt = f"该文件为工具执行结果，请阅读文件内容，并根据文件提取出以下信息：{want}"
                             return f"""工具调用原始输出过长，以下是根据输出提出的信息：
 
 {platform.chat_until_success(prompt)}"""
-                        else:
-                            # 上传失败，使用chat_with_files
-                            PrettyOutput.print("⚠️ 上传文件失败，将使用chat_with_files处理", OutputType.WARNING)
-                            from jarvis.jarvis_utils.utils import chat_with_files
-                            prompt = f"""请阅读以下文件内容，并根据文件提取出以下信息：{want}
-
-注意：
-1. 请仔细阅读文件内容，确保提取的信息准确完整
-2. 如果文件内容包含错误信息，请特别关注并提取
-3. 提取的信息应该直接回答用户的问题，不要包含无关内容"""
+                        elif hasattr(platform, 'chat_big_content'):
+                            # 如果上传失败但支持大内容处理，使用chat_big_content
+                            prompt = f"以下内容为工具执行结果，请阅读内容，并根据内容提取出以下信息：{want}\n\n{output}"
                             return f"""工具调用原始输出过长，以下是根据输出提出的信息：
 
-{chat_with_files([output_file], platform, prompt, "")}"""
-                    except Exception as e:
-                        PrettyOutput.print(f"处理大文件时出错: {str(e)}", OutputType.ERROR)
-                        return self._truncate_output(output)
-                return self._truncate_output(output)
+{platform.chat_big_content(output, prompt)}"""
+                    
+                    # 如果都不支持，返回截断的输出
+                    return self._truncate_output(output)
+                finally:
+                    # 清理临时文件
+                    try:
+                        os.unlink(output_file)
+                    except Exception:
+                        pass
 
             return output
 

jarvis/jarvis_tools/search_web.py

@@ -16,7 +16,7 @@ class SearchWebTool:
     def execute(self, args: Dict[str, Any]) -> Dict[str, Any]: # type: ignore
         query = args.get("query")
         model = PlatformRegistry().get_normal_platform()
-        model.web = True
+        model.set_web(True)
         model.set_suppress_output(False) # type: ignore
         return {
             "stdout": model.chat_until_success(query), # type: ignore

jarvis/jarvis_utils/methodology.py

@@ -11,10 +11,10 @@ import json
 import tempfile
 from typing import Dict, Optional
 
-from jarvis.jarvis_utils.config import INPUT_WINDOW_REVERSE_SIZE, get_max_input_token_count, get_data_dir
-from jarvis.jarvis_utils.embedding import get_context_token_count
+from jarvis.jarvis_utils.config import get_data_dir
 from jarvis.jarvis_utils.output import PrettyOutput, OutputType
 from jarvis.jarvis_platform.registry import PlatformRegistry
+from jarvis.jarvis_utils.utils import is_context_overflow
 
 def _get_methodology_directory() -> str:
     """
@@ -101,7 +101,7 @@ def load_methodology(user_input: str) -> str:
     返回：
         str: 相关的方法论提示，如果未找到方法论则返回空字符串
     """
-    from yaspin import yaspin
+    from yaspin import yaspin # type: ignore
 
     # 获取方法论目录
     methodology_dir = _get_methodology_directory()
@@ -121,33 +121,21 @@ def load_methodology(user_input: str) -> str:
 
         # 获取当前平台
         platform = PlatformRegistry().get_normal_platform()
+        if not platform:
+            return ""
+
+        # 构建基础提示信息
+        base_prompt = f"""以下是所有可用的方法论内容：
+
+"""
+        # 构建完整内容
+        full_content = base_prompt
+        for problem_type, content in methodologies.items():
+            full_content += f"## {problem_type}\n\n{content}\n\n---\n\n"
         
-        # 检查是否需要特殊处理大文件
-        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("✅")
-
-            # 尝试上传文件
-            upload_success = False
-            try:
-                if platform.upload_files([temp_file_path]):
-                    upload_success = True
-                    spinner.write("✅ 成功上传方法论文件")
-                else:
-                    spinner.write("⚠️ 上传方法论文件失败，将使用chat_with_files处理")
-            except Exception as e:
-                spinner.write(f"⚠️ 上传文件时出错: {str(e)}")
-                upload_success = False
-
-            # 构建提示信息
-            prompt = f"""请根据以下方法论内容，总结出与以下用户需求相关的方法论: {user_input}
+        # 添加用户输入和输出要求
+        full_content += f"""
+请根据以上方法论内容，总结出与以下用户需求相关的方法论: {user_input}
 
 请按以下格式回复：
 ### 与该任务/需求相关的方法论
@@ -157,24 +145,48 @@ def load_methodology(user_input: str) -> str:
 [总结的方法论内容]
 
 如果没有匹配的方法论，请输出：没有历史方法论可参考
-除以上要求外，不要输出任何内容"""
-
-            if upload_success:
-                # 使用上传的文件
-                return platform.chat_until_success(prompt)
-            else:
-                # 使用chat_with_files处理大文件
-                from jarvis.jarvis_utils.utils import chat_with_files
-                return chat_with_files([temp_file_path], platform, prompt, "")
-        else:
-            # 上下文足够，直接在prompt中包含方法论内容
-            prompt = f"""以下是所有可用的方法论内容：
-
+除以上要求外，不要输出任何内容
 """
-            for problem_type, content in methodologies.items():
-                prompt += f"## {problem_type}\n\n{content}\n\n---\n\n"
-            
-            prompt += f"""
+
+        # 检查内容是否过大
+        is_large_content = is_context_overflow(full_content)
+        temp_file_path = None
+        
+        try:
+            if is_large_content:
+                # 创建临时文件
+                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 hasattr(platform, 'upload_files'):
+                    platform.set_suppress_output(False)
+                    upload_success = platform.upload_files([temp_file_path])
+                    
+                    if upload_success:
+                        # 使用上传的文件生成摘要
+                        return platform.chat_until_success(base_prompt + f"""
+请根据已上传的方法论文件内容，总结出与以下用户需求相关的方法论: {user_input}
+
+请按以下格式回复：
+### 与该任务/需求相关的方法论
+1. [方法论名字]
+2. [方法论名字]
+### 根据以上方法论，总结出方法论内容
+[总结的方法论内容]
+
+如果没有匹配的方法论，请输出：没有历史方法论可参考
+除以上要求外，不要输出任何内容
+""")
+                    elif hasattr(platform, 'chat_big_content'):
+                        # 如果上传失败但支持大内容处理，使用chat_big_content
+                        return platform.chat_big_content(full_content, base_prompt + f"""
 请根据以上方法论内容，总结出与以下用户需求相关的方法论: {user_input}
 
 请按以下格式回复：
@@ -185,22 +197,20 @@ def load_methodology(user_input: str) -> str:
 [总结的方法论内容]
 
 如果没有匹配的方法论，请输出：没有历史方法论可参考
-除以上要求外，不要输出任何内容"""
-            return platform.chat_until_success(prompt)
+除以上要求外，不要输出任何内容
+""")
+            
+            # 如果内容不大或上传失败，直接使用chat_until_success
+            return platform.chat_until_success(full_content)
+        
+        finally:
+            # 清理临时文件
+            if temp_file_path and os.path.exists(temp_file_path):
+                try:
+                    os.remove(temp_file_path)
+                except Exception:
+                    pass
     
     except Exception as e:
         PrettyOutput.print(f"加载方法论失败: {str(e)}", OutputType.ERROR)
-        # 清理临时文件
-        if 'temp_file_path' in locals() and temp_file_path and os.path.exists(temp_file_path):
-            try:
-                os.remove(temp_file_path)
-            except:
-                pass
         return ""
-    finally:
-        # 确保清理临时文件
-        if 'temp_file_path' in locals() and temp_file_path and os.path.exists(temp_file_path):
-            try:
-                os.remove(temp_file_path)
-            except:
-                pass

jarvis/jarvis_utils/utils.py

@@ -3,8 +3,8 @@ import time
 import hashlib
 from pathlib import Path
 from typing import List, Any, Callable
-from jarvis.jarvis_utils.config import get_max_input_token_count, get_data_dir
-from jarvis.jarvis_utils.embedding import get_context_token_count, split_text_into_chunks
+from jarvis.jarvis_utils.config import INPUT_WINDOW_REVERSE_SIZE, get_max_input_token_count, get_data_dir
+from jarvis.jarvis_utils.embedding import get_context_token_count
 from jarvis.jarvis_utils.input import get_single_line_input
 from jarvis.jarvis_utils.output import PrettyOutput, OutputType
 def init_env() -> None:
@@ -130,13 +130,6 @@ def is_long_context(files: List[str]) -> bool:
     return total_tokens > threshold
 
 
-def chat_with_files(files: List[str], platform: Any, prompt_prefix: str, prompt_suffix: str) -> str:
-    from jarvis.jarvis_platform.base import BasePlatform
-    from jarvis.jarvis_tools.file_operation import FileOperationTool
-    platform_: BasePlatform = platform
-    file_content = FileOperationTool().execute({"operation":"read", "files":files})["stdout"]
-    file_content_chuck = split_text_into_chunks(file_content, get_max_input_token_count()-2048)
-    platform_.chat_until_success(prompt_prefix)
-    for file_content_chunk in file_content_chuck:
-        platform_.chat_until_success(file_content_chunk)
-    return platform_.chat_until_success(prompt_suffix)
+def is_context_overflow(file_content: str) -> bool:
+    """判断文件内容是否超出上下文限制"""
+    return get_context_token_count(file_content) > get_max_input_token_count() - INPUT_WINDOW_REVERSE_SIZE

{jarvis_ai_assistant-0.1.159.dist-info → jarvis_ai_assistant-0.1.160.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.1.159
+Version: 0.1.160
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -194,7 +194,7 @@ jarvis-methodology --help
 ### 环境变量配置
 | 变量名称 | 默认值 | 说明 |
 |----------|--------|------|
-| `JARVIS_MAX_TOKEN_COUNT` | 102400000 | 上下文最大token数量 |
+| `JARVIS_MAX_TOKEN_COUNT` | 102400000 | 上下文窗口的最大token数量 |
 | `JARVIS_MAX_INPUT_TOKEN_COUNT` | 32000 | 输入的最大token数量 |
 | `JARVIS_AUTO_COMPLETE` | false | 是否启用自动完成功能（任务判定完成的时候会自动终止） |
 | `JARVIS_SHELL_NAME` | bash | 系统shell名称 |

{jarvis_ai_assistant-0.1.159.dist-info → jarvis_ai_assistant-0.1.160.dist-info}/RECORD

@@ -1,15 +1,15 @@
-jarvis/__init__.py,sha256=_IZ4qsot_luvb5GqI5sZmjlOdVcITvyPV8qcjgeUK4Y,50
+jarvis/__init__.py,sha256=2BC-X3PyDiJd9_Z7-M3Dz_vjF41hQuACD5kortAXRDM,50
 jarvis/jarvis_agent/__init__.py,sha256=tii6khwfG971MJiMfKSLwlKTjB3iEv8ITE3JqYSkfQA,24824
 jarvis/jarvis_agent/builtin_input_handler.py,sha256=3rRA-7v_VUSFG1s7tTKhriq9vv0nsa3t69ReV0xH5gs,1505
-jarvis/jarvis_agent/file_input_handler.py,sha256=auBbBfS4Ux5ksczeRe9LtsmMm4hKrPxinW5leE9Rtyc,3575
+jarvis/jarvis_agent/file_input_handler.py,sha256=88VqJLe3oO9GtIRsqyx3KwZl10Apob2ddFMH3HQ2RMg,3413
 jarvis/jarvis_agent/jarvis.py,sha256=6Bp_Y-E3RN6bDmDs5lN3uALL_Dhq-p_aIuVNELG1vtw,5898
 jarvis/jarvis_agent/main.py,sha256=Jlw_Tofh2C-sMVnkeOZBrwWJOWNH3IhsKDUn-WBlgU8,2602
 jarvis/jarvis_agent/output_handler.py,sha256=4limQ-Kf-YYvQjT5SMjJIyyvD1DVG8tINv1A_qbv4ho,405
-jarvis/jarvis_agent/patch.py,sha256=LjOlnd6AoG9RyzphmCdv9J514-aOX_bXG67lXXQxEvo,23673
+jarvis/jarvis_agent/patch.py,sha256=qeRZ6r1qpgHnWpX5uOX4dB3qRCPI1ibk4J50NmoJ74s,23531
 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=vi_g-LWdD5nn3RQsC1X8G2iNK8SrBADwFLUkflqtvKE,13723
-jarvis/jarvis_code_analysis/code_review.py,sha256=wCnj2qr4QhIvcItn8aOCqDqjrEjRnw7mtYHhlkK29xE,30599
+jarvis/jarvis_code_analysis/code_review.py,sha256=gB9Xo0-FT6zciDzZb3jF6zxxWA_Aj8QU5008Tmu_Tr4,30192
 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=hP4rQqqKtgu9kw46oK9V8rOwG2IqxAXgNuv0YHX-Qd0,13712
+jarvis/jarvis_git_utils/git_commiter.py,sha256=nOzM5Zio6CYxuo14YfZHrdr5rPS-yjM0_UbRhsXjPy4,11644
 jarvis/jarvis_lsp/base.py,sha256=f-76xgNijfQ4G3Q0t8IfOGtCu-q2TSQ7a_in6XwDb_8,2030
 jarvis/jarvis_lsp/cpp.py,sha256=ekci2M9_UtkCSEe9__72h26Gat93r9_knL2VmFr8X5M,3141
 jarvis/jarvis_lsp/go.py,sha256=sSypuQSP5X2YtrVMC8XCc5nXkgfG93SO7sC89lHzoR8,3458
@@ -45,13 +45,13 @@ jarvis/jarvis_lsp/rust.py,sha256=ICmQs5UVdMZwn5KjaF1YRXBCLUMtGF8Z9IwE5rqWkrU,368
 jarvis/jarvis_mcp/__init__.py,sha256=gi74_Yz5nsEFhrAyCg1Ovxsj-hLweLjMGoOaceL2yx4,2090
 jarvis/jarvis_mcp/sse_mcp_client.py,sha256=Qd09ymgZmxQvaFUzz8I3AI46v6AqmMbGaF0iBbExAGY,23459
 jarvis/jarvis_mcp/stdio_mcp_client.py,sha256=DtRO4dqBoxI8W0H0rVR5zxZLR0theKxRAQ-qzQE9qPg,11806
-jarvis/jarvis_methodology/main.py,sha256=i0sOKeGf9-87M0jY4q6sgw4dAPt800PHiZjseLAQmO0,11782
+jarvis/jarvis_methodology/main.py,sha256=JrUqWKN0gQeiO_tY2Tn14pnT_jClqlNgpbBfoc-q8SM,11812
 jarvis/jarvis_multi_agent/__init__.py,sha256=SX8lBErhltKyYRM-rymrMz3sJ0Zl3hBXrpsPdFgzkQc,4399
 jarvis/jarvis_multi_agent/main.py,sha256=aGuUC3YQmahabqwDwZXJjfQLYsZ3KIZdf8DZDlVNMe4,1543
 jarvis/jarvis_platform/__init__.py,sha256=oD9i4ugZ2q6Hys3noLOvzPUUHqE2PJ_Je1r2dLLTscw,80
-jarvis/jarvis_platform/base.py,sha256=um9_BZgOJSg0nlmywYGAxwFRL-8409OnlvfgQkh5RUo,3406
+jarvis/jarvis_platform/base.py,sha256=OfVG7jw-0han9yEooJLL0Sk3ZlgzItZwJOgRxZdFLfs,4085
 jarvis/jarvis_platform/human.py,sha256=WCzvBtQUMN7ys4rQl6UT7Zdp4x5RaGv1U4vBx7ROxfo,2438
-jarvis/jarvis_platform/kimi.py,sha256=GgUekusFzx2842K-PrES3c2oprLbPCjQhbyjU0UKycg,16637
+jarvis/jarvis_platform/kimi.py,sha256=Wno9PFZ92v9fjBHS29sFUwoc6gk6akD7yelVaWOpp-Q,16667
 jarvis/jarvis_platform/registry.py,sha256=wvXTKXqAoW6GPaLKCPYhRB9QhVe1xfoVbVPBZAxl_uA,7716
 jarvis/jarvis_platform/yuanbao.py,sha256=9nIyg5Xx9rdUaJAK_Tj8HumOT5mwpa-V907dZGot-4E,21811
 jarvis/jarvis_platform_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -67,15 +67,15 @@ jarvis/jarvis_tools/code_plan.py,sha256=jNa2rs4J3Fam8Q_RHE2_QvVch21TPp-Zfv-W6iQ3
 jarvis/jarvis_tools/create_code_agent.py,sha256=SRiQXZf57ViIDh6YSEmJkcoSKft0-y3iDfWF8f1bvZU,3387
 jarvis/jarvis_tools/create_sub_agent.py,sha256=wGiHukvi58wb1AKW5beP7R8VvApOn8TOeGmtXsmcETE,3001
 jarvis/jarvis_tools/execute_script.py,sha256=AeuC3yZIg-nBq_LTIyqxu-lG_uLG63lvwO28A6dRDYA,5715
-jarvis/jarvis_tools/file_analyzer.py,sha256=XCsFB4dZ9qy2q929hqi1rTngj6AtRtIaPx_W7lJAcpQ,4814
-jarvis/jarvis_tools/file_operation.py,sha256=sB1x0zI1dULXV7FG17wkiMQ7mQAEnXVd_5rakQ0Thik,9109
+jarvis/jarvis_tools/file_analyzer.py,sha256=EVl7WqGgZoaQXqEX8vLynpqZDE3aug1hVBJbycT7YiY,4844
+jarvis/jarvis_tools/file_operation.py,sha256=zbc1zX_aJ-9x1wpuUUbZOgg0aN8f5sd9ryaCQ-bi870,9124
 jarvis/jarvis_tools/find_methodology.py,sha256=TIUrezAql6wY3-wqnOPfGrO0tqS5N_-eU6YimCzaepM,2268
 jarvis/jarvis_tools/lsp_get_diagnostics.py,sha256=IYqv8jQwSK71sZpDBRolSDnYii8t0M7fzLthhMYTeGk,5322
 jarvis/jarvis_tools/methodology.py,sha256=gnlJojY4Dg5v9AAB5xcpKqpPIHs0tOYVtzTHkwOrWk0,5214
 jarvis/jarvis_tools/read_code.py,sha256=_X6D3AIgRD9YplSDnFhXOm8wQAZMA3pkkXy31SG33l0,6041
-jarvis/jarvis_tools/read_webpage.py,sha256=1AXXEX69fPJsPL7PBZDM1G4Z-MM13pUt34JXitsAFM4,2022
-jarvis/jarvis_tools/registry.py,sha256=ZI5MHhtHm6UvdarvIVu0Kg8BuqV4MIVvVGwOa8yWh74,27531
-jarvis/jarvis_tools/search_web.py,sha256=hMrcSnKcjH6YcV8WY4tangEid7y1L-QbyeXDlBofoy8,756
+jarvis/jarvis_tools/read_webpage.py,sha256=ECcMnPnUpIeiSA1IRdUf7uLWMe34Ian9pExSxekwpcg,2025
+jarvis/jarvis_tools/registry.py,sha256=6md5Fm-Uv0dhTHj0qubHRj0VQkNIcNn0A1cshBOQY5o,27109
+jarvis/jarvis_tools/search_web.py,sha256=p1oahjSmSeBO9ZzgWkxIHsfcAGah22ju0xipXmuqnzg,759
 jarvis/jarvis_tools/virtual_tty.py,sha256=Rpn9VXUG17LQsY87F_O6UCjN_opXB05mpwozxYf-xVI,16372
 jarvis/jarvis_utils/__init__.py,sha256=KMg-KY5rZIhGTeOD5e2Xo5CU7DX1DUz4ULWAaTQ-ZNw,825
 jarvis/jarvis_utils/builtin_replace_map.py,sha256=Dt8YL4Sk5uALTMPT_n-lhshRWvFWPRPwV4stASOecQ8,4290
@@ -85,13 +85,13 @@ jarvis/jarvis_utils/file_processors.py,sha256=oNtVlz2JHcQ60NS6sgI-VsvYXOnsQgFUEV
 jarvis/jarvis_utils/git_utils.py,sha256=j_Jw6h7JD91XhMf0WD3MAH4URkLUBrrYCLnuLm1GeN4,5630
 jarvis/jarvis_utils/globals.py,sha256=Ed2d6diWXCgI74HVV_tI4qW7yXxLpNvQKN2yG0IH9hc,3388
 jarvis/jarvis_utils/input.py,sha256=zvL-JQSJvkmsZB7ApJsaVpk46BkpmJA3I_BnWSl_D-4,7299
-jarvis/jarvis_utils/methodology.py,sha256=OKD3OwScJgpTilrAt38Iu5Xlp3_i6joPZB82TE8PAZw,7592
+jarvis/jarvis_utils/methodology.py,sha256=a1QJLqZ-_RwhL6i7C6mixhT1BmOvZ0mKmh3PTOiNT9M,7744
 jarvis/jarvis_utils/output.py,sha256=BmWdB1bmizv0xfU4Z___9p_xQodorriIcEgADVq9fk0,8416
 jarvis/jarvis_utils/tag.py,sha256=YtXBYuZWy8j8YbeQX2qRrHRQl6Gp2Vt7W4p-2yjo0a4,405
-jarvis/jarvis_utils/utils.py,sha256=Qds24SeHJZShb1w4CBp3uKT3zUiltAUFyvh_KfxvBkM,4936
-jarvis_ai_assistant-0.1.159.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.159.dist-info/METADATA,sha256=gID-zAYn10pXQXEjVrrgbu8m188dW2HV7QhOMlcyyDU,12660
-jarvis_ai_assistant-0.1.159.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-jarvis_ai_assistant-0.1.159.dist-info/entry_points.txt,sha256=cKz_9SEpOvElTubKPMZMAdskD4GHz-NyKWRNssIVAWE,973
-jarvis_ai_assistant-0.1.159.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.159.dist-info/RECORD,,
+jarvis/jarvis_utils/utils.py,sha256=neokG_C9Djw6shwLcBxpQmRF5KFp9P6v52bMJMEFozg,4487
+jarvis_ai_assistant-0.1.160.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.160.dist-info/METADATA,sha256=yjL-ZV1dnisJxbtkjiQH9fOeGGv0hI7SUGKIPWnz_h8,12669
+jarvis_ai_assistant-0.1.160.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+jarvis_ai_assistant-0.1.160.dist-info/entry_points.txt,sha256=cKz_9SEpOvElTubKPMZMAdskD4GHz-NyKWRNssIVAWE,973
+jarvis_ai_assistant-0.1.160.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.160.dist-info/RECORD,,