jarvis-ai-assistant 0.1.159__tar.gz → 0.1.160__tar.gz

{jarvis_ai_assistant-0.1.159/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.160}/PKG-INFO

@@ -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 → jarvis_ai_assistant-0.1.160}/README.md

@@ -125,7 +125,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 → jarvis_ai_assistant-0.1.160}/pyproject.toml

@@ -8,7 +8,7 @@ default = true
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.159"
+version = "0.1.160"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "skyfire", email = "skyfireitdiy@hotmail.com" }]

{jarvis_ai_assistant-0.1.159 → jarvis_ai_assistant-0.1.160}/setup.py

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

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

{jarvis_ai_assistant-0.1.159 → jarvis_ai_assistant-0.1.160}/src/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_ai_assistant-0.1.159 → jarvis_ai_assistant-0.1.160}/src/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_ai_assistant-0.1.159 → jarvis_ai_assistant-0.1.160}/src/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_ai_assistant-0.1.159 → jarvis_ai_assistant-0.1.160}/src/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_ai_assistant-0.1.159 → jarvis_ai_assistant-0.1.160}/src/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_ai_assistant-0.1.159 → jarvis_ai_assistant-0.1.160}/src/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: