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

{jarvis_ai_assistant-0.1.158/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.158
+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

{jarvis_ai_assistant-0.1.158 → jarvis_ai_assistant-0.1.160}/pyproject.toml

@@ -8,7 +8,7 @@ default = true
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.158"
+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.158 → 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.158",
+    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.158 → jarvis_ai_assistant-0.1.160}/src/jarvis/__init__.py

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

{jarvis_ai_assistant-0.1.158 → 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.158 → 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
+from jarvis.jarvis_utils.utils import is_context_overflow, get_file_line_count, user_confirm
 from jarvis.jarvis_utils.tag import ot, ct
 
 
@@ -376,11 +375,7 @@ 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():
-                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(True)
 
@@ -412,9 +407,7 @@ def handle_small_code_operation(filepath: str, patch_content: str) -> bool:
 {ot("MERGED_CODE")}
 [合并后的完整代码，包括所有空行和缩进]
 {ct("MERGED_CODE")}
-"""
-            if not upload_success:
-                prompt += f"""
+
 # 原始代码
 {file_content}
 """
@@ -474,21 +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_upload_file = is_context_overflow(file_content)
             upload_success = False
             # 读取原始文件内容
             with spinner.hidden():  
-                if get_context_token_count(file_content) > get_max_input_token_count() - INPUT_WINDOW_REVERSE_SIZE and model.upload_files([filepath]):
+                if need_upload_file and model.upload_files([filepath]):
                     upload_success = True
 
 
             model.set_suppress_output(True)
 
-            prompt = f"""
+            main_prompt = f"""
 # 代码补丁生成专家指南
 
 ## 任务描述
@@ -533,14 +528,20 @@ def handle_large_code_operation(filepath: str, patch_content: str, model: BasePl
 <<<<<< REPLACE
 {ct("DIFF")}
 """
-            if not upload_success:
-                prompt += f"""
-# 原始代码
-{file_content}
-"""
+            
             for _ in range(3):
-                # 获取补丁内容
-                response = model.chat_until_success(prompt)
+                file_prompt = ""
+                if not need_upload_file:
+                    file_prompt = f"""
+    # 原始代码
+    {file_content}
+    """
+                    response = model.chat_until_success(main_prompt + file_prompt)
+                else:
+                    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"),

{jarvis_ai_assistant-0.1.158 → 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
+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
 
@@ -588,16 +586,19 @@ class CodeReviewTool:
                 
                 try:
                     upload_success = False
+                    # Check if content is too large
+                    is_large_content = is_context_overflow(diff_output)
+                    
                     # Upload the file to the agent's model
                     with yaspin(text="正在上传代码差异文件...", color="cyan") as spinner:
-                        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'):
+                        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)
-                                upload_success = True
                             else:
-                                upload_success = False
+                                spinner.fail("❌")
+                                PrettyOutput.print(f"上传代码差异文件失败，将使用分块处理", OutputType.WARNING)
                         else:
                             upload_success = False
                     
@@ -612,13 +613,17 @@ class CodeReviewTool:
 - 检测到的编程语言: {', '.join(detected_languages) if detected_languages else '未检测到特定语言'}
 
 请基于上传的代码差异文件进行全面审查，并生成详细的代码审查报告。"""
+                        # Run the agent with the prompt
+                        result = agent.run(complete_prompt)
                     else:
-                        # If upload failed, include the diff directly in the prompt
-                        complete_prompt = user_prompt + "\n\n代码差异内容:\n```diff\n" + diff_output + "\n```"
-                    
-                    # Run the agent with the prompt
-                    
-                    result = agent.run(complete_prompt)                    
+                        # 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.158 → 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
+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 = "正在生成提交消息..."
                         
@@ -134,7 +132,10 @@ class GitCommitTool:
                         platform = PlatformRegistry().get_normal_platform()
                         upload_success = False
                         
-                        if get_context_token_count(diff) > get_max_input_token_count() - INPUT_WINDOW_REVERSE_SIZE and hasattr(platform, 'upload_files'):
+                        # Check if content is too large
+                        is_large_content = is_context_overflow(diff)
+                        
+                        if is_large_content and hasattr(platform, 'upload_files'):
                             spinner.text = "正在上传代码差异文件..."
                             try:
                                 with spinner.hidden():
@@ -148,7 +149,7 @@ class GitCommitTool:
                                 if upload_success:
                                     spinner.write("✅ 成功上传代码差异文件")
                                 else:
-                                    spinner.write("⚠️ 上传代码差异文件失败，将回退到直接提供差异内容")
+                                    spinner.write("⚠️ 上传代码差异文件失败，将使用分块处理")
                             except Exception as e:
                                 spinner.write(f"⚠️ 上传文件时出错: {str(e)}")
                                 upload_success = False
@@ -164,16 +165,23 @@ class GitCommitTool:
         请详细分析已上传的代码差异文件，生成符合上述格式的提交信息。
         '''
                         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:
@@ -206,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.158 → 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.158 → 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:

{jarvis_ai_assistant-0.1.158 → jarvis_ai_assistant-0.1.160}/src/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_ai_assistant-0.1.158 → jarvis_ai_assistant-0.1.160}/src/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_ai_assistant-0.1.158 → jarvis_ai_assistant-0.1.160}/src/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_ai_assistant-0.1.158 → jarvis_ai_assistant-0.1.160}/src/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_ai_assistant-0.1.158 → jarvis_ai_assistant-0.1.160}/src/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,26 +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:
-                        if not platform.upload_files([output_file]):
-                            return self._truncate_output(output)
-                    except Exception:
-                        return self._truncate_output(output)
-                prompt = f"该文件为工具执行结果，请阅读文件内容，并根据文件提取出以下信息：{want}"
-                return f"""工具调用原始输出过长，以下是根据输出提出的信息：
+                
+                try:
+                    # 获取平台实例
+                    platform = PlatformRegistry().get_normal_platform()
+                    if platform and hasattr(platform, 'upload_files'):
+                        platform.set_suppress_output(False)
+                        # 尝试上传文件
+                        upload_success = platform.upload_files([output_file])
+                        
+                        if upload_success:
+                            # 使用上传的文件生成摘要
+                            prompt = f"该文件为工具执行结果，请阅读文件内容，并根据文件提取出以下信息：{want}"
+                            return f"""工具调用原始输出过长，以下是根据输出提出的信息：
 
 {platform.chat_until_success(prompt)}"""
+                        elif hasattr(platform, 'chat_big_content'):
+                            # 如果上传失败但支持大内容处理，使用chat_big_content
+                            prompt = f"以下内容为工具执行结果，请阅读内容，并根据内容提取出以下信息：{want}\n\n{output}"
+                            return f"""工具调用原始输出过长，以下是根据输出提出的信息：
+
+{platform.chat_big_content(output, prompt)}"""
+                    
+                    # 如果都不支持，返回截断的输出
+                    return self._truncate_output(output)
+                finally:
+                    # 清理临时文件
+                    try:
+                        os.unlink(output_file)
+                    except Exception:
+                        pass
 
             return output
 

{jarvis_ai_assistant-0.1.158 → jarvis_ai_assistant-0.1.160}/src/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_ai_assistant-0.1.158 → jarvis_ai_assistant-0.1.160}/src/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,34 +121,20 @@ def load_methodology(user_input: str) -> str:
 
         # 获取当前平台
         platform = PlatformRegistry().get_normal_platform()
-        
-        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"""以下是所有可用的方法论内容：
+        if not platform:
+            return ""
+
+        # 构建基础提示信息
+        base_prompt = f"""以下是所有可用的方法论内容：
 
 """
-        if not upload_result:
-            for problem_type, content in methodologies.items():
-                prompt += f"## {problem_type}\n\n{content}\n\n---\n\n"
+        # 构建完整内容
+        full_content = base_prompt
+        for problem_type, content in methodologies.items():
+            full_content += f"## {problem_type}\n\n{content}\n\n---\n\n"
         
-        prompt += f"""
+        # 添加用户输入和输出要求
+        full_content += f"""
 请根据以上方法论内容，总结出与以下用户需求相关的方法论: {user_input}
 
 请按以下格式回复：
@@ -161,21 +147,70 @@ def load_methodology(user_input: str) -> str:
 如果没有匹配的方法论，请输出：没有历史方法论可参考
 除以上要求外，不要输出任何内容
 """
-        return platform.chat_until_success(prompt)
+
+        # 检查内容是否过大
+        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}
+
+请按以下格式回复：
+### 与该任务/需求相关的方法论
+1. [方法论名字]
+2. [方法论名字]
+### 根据以上方法论，总结出方法论内容
+[总结的方法论内容]
+
+如果没有匹配的方法论，请输出：没有历史方法论可参考
+除以上要求外，不要输出任何内容
+""")
+            
+            # 如果内容不大或上传失败，直接使用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_ai_assistant-0.1.158 → jarvis_ai_assistant-0.1.160}/src/jarvis/jarvis_utils/utils.py

@@ -3,7 +3,7 @@ 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.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
@@ -130,3 +130,6 @@ def is_long_context(files: List[str]) -> bool:
     return total_tokens > threshold
 
 
+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.158 → jarvis_ai_assistant-0.1.160/src/jarvis_ai_assistant.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.1.158
+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