jarvis-ai-assistant 0.1.187__py3-none-any.whl → 0.1.189__py3-none-any.whl

jarvis/__init__.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.187"
+__version__ = "0.1.189"

jarvis/jarvis_agent/__init__.py

@@ -4,8 +4,6 @@ import datetime
 import platform
 from typing import Any, Callable, Dict, List, Optional, Protocol, Tuple, Union
 
-from jarvis.jarvis_platform.base import BasePlatform
-
 # 第三方库导入
 from yaspin import yaspin  # type: ignore
 
@@ -224,7 +222,11 @@ class Agent:
 
         # 如果有上传文件，自动禁用方法论
         self.use_methodology = (
-            False if files else (use_methodology if use_methodology is not None else is_use_methodology())
+            False
+            if files
+            else (
+                use_methodology if use_methodology is not None else is_use_methodology()
+            )
         )
         self.use_analysis = (
             use_analysis if use_analysis is not None else is_use_analysis()
@@ -440,24 +442,15 @@ class Agent:
         self.conversation_length += get_context_token_count(response)
         return response
 
-    def _summarize_and_clear_history(self) -> str:
-        """总结当前对话并清理历史记录
-
-        该方法将:
-        1. 生成关键信息摘要
-        2. 清除对话历史
-        3. 保留系统消息
-        4. 添加摘要作为新上下文
-        5. 重置对话长度计数器
+    def generate_summary(self) -> str:
+        """生成对话历史摘要
 
         返回:
             str: 包含对话摘要的字符串
 
         注意:
-            当上下文长度超过最大值时使用
+            仅生成摘要，不修改对话状态
         """
-        # Create a new model instance to summarize, avoid affecting the main conversation
-
         with yaspin(text="正在总结对话历史...", color="cyan") as spinner:
             summary_prompt = """
 <summary_request>
@@ -482,36 +475,48 @@ class Agent:
 </summary_request>
 """
 
-            try:
-                with spinner.hidden():
-                    summary = self.model.chat_until_success(self.prompt + "\n" + summary_prompt)  # type: ignore
+        try:
+            with spinner.hidden():
+                summary = self.model.chat_until_success(self.prompt + "\n" + summary_prompt)  # type: ignore
+            spinner.text = "总结对话历史完成"
+            spinner.ok("✅")
+            return summary
+        except Exception as e:
+            spinner.text = "总结对话历史失败"
+            spinner.fail("❌")
+            return ""
+
+    def _summarize_and_clear_history(self) -> str:
+        """总结当前对话并清理历史记录
 
-                self.model.reset()  # type: ignore
+        该方法将:
+        1. 调用_generate_summary生成摘要
+        2. 清除对话历史
+        3. 保留系统消息
+        4. 添加摘要作为新上下文
+        5. 重置对话长度计数器
 
-                # 清空当前对话历史，但保留系统消息
-                self.conversation_length = 0  # Reset conversation length
+        返回:
+            str: 包含对话摘要的字符串
 
-                # 添加总结作为新的上下文
-                spinner.text = "总结对话历史完成"
-                spinner.ok("✅")
-                return f"""<summary>
-<header>
+        注意:
+            当上下文长度超过最大值时使用
+        """
+        summary = self.generate_summary()
+        self.clear_history()  # type: ignore
+
+        if not summary:
+            return ""
+
+        return f"""
 以下是之前对话的关键信息总结：
-</header>
 
 <content>
 {summary}
 </content>
 
-<instructions>
 请基于以上信息继续完成任务。请注意，这是之前对话的摘要，上下文长度已超过限制而被重置。请直接继续任务，无需重复已完成的步骤。如有需要，可以询问用户以获取更多信息。
-</instructions>
-</summary>
 """
-            except Exception as e:
-                spinner.text = "总结对话历史失败"
-                spinner.fail("❌")
-                return ""
 
     def _call_tools(self, response: str) -> Tuple[bool, Any]:
         """调用工具执行响应
@@ -770,32 +775,31 @@ arguments:
             3. 包含错误处理和恢复逻辑
             4. 自动加载相关方法论(如果是首次运行)
         """
+
+        self.prompt = f"{user_input}"
         try:
             set_agent(self.name, self)
 
-            for handler in self.input_handler:
-                user_input, _ = handler(user_input, self)
-
-            self.prompt = f"{user_input}"
-
-            if self.first:
-                # 如果有上传文件，先上传文件
-                if self.files and isinstance(self.model, BasePlatform) and hasattr(self.model, "upload_files"):
-                    self.model.upload_files(self.files)
-                    self.prompt = f"{user_input}"
-                
-                # 如果启用方法论且没有上传文件，上传方法论
-                elif self.use_methodology:
-                    platform = self.model if hasattr(self.model, "upload_files") else None
-                    if platform and upload_methodology(platform):
-                        self.prompt = f"{user_input}"
-                    else:
-                        # 上传失败则回退到本地加载
-                        self.prompt = f"{user_input}\n\n以下是历史类似问题的执行经验，可参考：\n{load_methodology(user_input, self.get_tool_registry())}"
-
-                self.first = False
-
             while True:
+                if self.first:
+                    # 如果有上传文件，先上传文件
+                    if (
+                        self.files
+                        and self.model
+                        and self.model.support_upload_files()
+                    ):
+                        self.model.upload_files(self.files)
+
+                    # 如果启用方法论且没有上传文件，上传方法论
+                    elif self.use_methodology:
+                        if not self.model or not upload_methodology(self.model):
+                            # 上传失败则回退到本地加载
+                            msg = self.prompt
+                            for handler in self.input_handler:
+                                msg, _ = handler(msg, self)
+                            self.prompt = f"{self.prompt}\n\n以下是历史类似问题的执行经验，可参考：\n{load_methodology(msg, self.get_tool_registry())}"
+
+                    self.first = False
                 try:
                     current_response = self._call_model(self.prompt, True)
                     self.prompt = ""
@@ -836,7 +840,7 @@ arguments:
             PrettyOutput.print(f"任务失败: {str(e)}", OutputType.ERROR)
             return f"Task failed: {str(e)}"
 
-    def _clear_history(self):
+    def clear_history(self):
         """清空对话历史但保留系统提示
 
         该方法将：

jarvis/jarvis_agent/file_input_handler.py

@@ -13,69 +13,69 @@ from jarvis.jarvis_utils.utils import is_context_overflow
 
 
 def file_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:
-    """Process user input containing file references and read file contents.
+    """处理包含文件引用的用户输入并读取文件内容。
     
-    Args:
-        user_input: Input string that may contain file references in format:
-            - 'file_path' (whole file)
-            - 'file_path:start_line,end_line' (line range)
-            - 'file_path:start_line:end_line' (alternative range format)
-        agent: Agent object for further processing (currently unused)
+    参数:
+        user_input: 可能包含文件引用的输入字符串，格式为:
+            - 'file_path' (整个文件)
+            - 'file_path:start_line,end_line' (行范围)
+            - 'file_path:start_line:end_line' (替代范围格式)
+        agent: 用于进一步处理的Agent对象(当前未使用)
         
-    Returns:
+    返回:
         Tuple[str, bool]: 
-            - Processed prompt string with file contents prepended
-            - Boolean indicating if context overflow occurred
+            - 处理后的提示字符串，前面附加文件内容
+            - 布尔值，指示是否发生上下文溢出
     """
     prompt = user_input
     files = []
 
-    file_refs = re.findall(r"'([^']+)'", user_input)
+    file_refs = re.findall(r"'([^'\n]+)'", user_input)
     for ref in file_refs:
-        # Handle file:start,end or file:start:end format
+        # 处理 file:start,end 或 file:start:end 格式
         if ':' in ref:
             file_path, line_range = ref.split(':', 1)
-            # Initialize with default values
+            # 使用默认值初始化
             start_line = 1  # 1-based
             end_line = -1
 
-            # Process line range if specified
+            # 如果指定了行范围则进行处理
             if ',' in line_range or ':' in line_range:
                 try:
                     raw_start, raw_end = map(int, re.split(r'[,:]', line_range))
 
-                    # Handle special values and Python-style negative indices
+                    # 处理特殊值和Python风格的负索引
                     try:
                         with open(file_path, 'r', encoding='utf-8', errors="ignore") as f:
                             total_lines = len(f.readlines())
                     except FileNotFoundError:
                         PrettyOutput.print(f"文件不存在: {file_path}", OutputType.WARNING)
                         continue
-                    # Process start line (0 means whole file, negative means from end)
+                    # 处理起始行(0表示整个文件，负数表示从末尾开始)
                     if raw_start == 0:  # 0表示整个文件
                         start_line = 1
                         end_line = total_lines
                     else:
                         start_line = raw_start if raw_start > 0 else total_lines + raw_start + 1
 
-                    # Process end line
+                    # 处理结束行
                     if raw_end == 0:  # 0表示整个文件（如果start也是0）
                         end_line = total_lines
                     else:
                         end_line = raw_end if raw_end > 0 else total_lines + raw_end + 1
 
-                    # Auto-correct ranges
+                    # 自动校正范围
                     start_line = max(1, min(start_line, total_lines))
                     end_line = max(start_line, min(end_line, total_lines))
 
-                    # Final validation
+                    # 最终验证
                     if start_line < 1 or end_line > total_lines or start_line > end_line:
                         raise ValueError
 
                 except:
                     continue
 
-            # Add file if it exists
+            # 如果文件存在则添加
             if os.path.isfile(file_path):
                 files.append({
                     "path": file_path,
@@ -83,7 +83,7 @@ def file_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:
                     "end_line": end_line
                 })
         else:
-            # Handle simple file path
+            # 处理简单文件路径
             if os.path.isfile(ref):
                 files.append({
                     "path": ref,
@@ -91,7 +91,7 @@ def file_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:
                     "end_line": -1
                 })
 
-    # Read and process files if any were found
+    # 如果找到文件则读取并处理
     if files:
         with yaspin(text="正在读取文件...", color="cyan") as spinner:
             old_prompt = prompt

jarvis/jarvis_agent/main.py

@@ -59,16 +59,15 @@ def main():
             agent.run(args.task)
             return 0
 
-        # Enter interactive mode if no initial task
-        while True:
-            try:
-                user_input = get_multiline_input("请输入你的任务（输入空行退出）:")
-                if not user_input:
-                    break
-                agent.set_addon_prompt("如果有必要，请先指定出行动计划，然后根据计划一步步执行，如果任务过于复杂，可以拆分子Agent进行执行，拆的子Agent需要掌握所有必要的任务信息，否则无法执行")
-                agent.run(user_input)
-            except Exception as e:
-                PrettyOutput.print(f"错误: {str(e)}", OutputType.ERROR)
+
+        try:
+            user_input = get_multiline_input("请输入你的任务（输入空行退出）:")
+            if not user_input:
+                return 0
+            agent.set_addon_prompt("如果有必要，请先指定出行动计划，然后根据计划一步步执行，如果任务过于复杂，可以拆分子Agent进行执行，拆的子Agent需要掌握所有必要的任务信息，否则无法执行")
+            agent.run(user_input)
+        except Exception as e:
+            PrettyOutput.print(f"错误: {str(e)}", OutputType.ERROR)
 
     except Exception as e:
         PrettyOutput.print(f"初始化错误: {str(e)}", OutputType.ERROR)

jarvis/jarvis_code_analysis/code_review.py

@@ -588,25 +588,33 @@ class CodeReviewTool:
                     temp_file.flush()
                 
                 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
-                    if is_large_content and agent.model and hasattr(agent.model, 'upload_files'):
+                    if is_large_content:
+                        if not agent.model or not agent.model.support_upload_files():
+                            return {
+                                "success": False,
+                                "stdout": "",
+                                "stderr": "代码差异太大，无法处理"
+                            }
+                        
                         with yaspin(text="正在上传代码差异文件...", color="cyan") as spinner:
                             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"上传代码差异文件失败，将使用分块处理", OutputType.WARNING)
-                    else:
-                        upload_success = False
+                                return {
+                                    "success": False,
+                                    "stdout": "",
+                                    "stderr": "上传代码差异文件失败"
+                                }
+                        
                     
                     # Prepare the prompt based on upload status
-                    if upload_success:
+                    if is_large_content:
                         # When file is uploaded, reference it in the prompt
                         complete_prompt = user_prompt + f"""
 
@@ -619,13 +627,6 @@ class CodeReviewTool:
                         # Run the agent with the prompt
                         result = agent.run(complete_prompt)
                     else:
-                        if is_large_content:
-                            return {
-                                "success": False,
-                                "stdout": "",
-                                "stderr": "错误：上传代码差异文件失败"
-                            }
-                        # 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:

jarvis/jarvis_data/config_schema.json

@@ -179,7 +179,7 @@
     "JARVIS_MAX_BIG_CONTENT_SIZE": {
       "type": "number",
       "description": "最大大内容尺寸",
-      "default": 1024000
+      "default": 160000
     },
     "JARVIS_PRETTY_OUTPUT": {
       "type": "boolean",

jarvis/jarvis_dev/main.py

@@ -1160,42 +1160,42 @@ def create_dev_team() -> MultiAgent:
             description="Project Manager - Coordinates team and manages project delivery",
             system_prompt=PM_PROMPT_WITH_TOOLS,
             output_handler=[PM_output_handler],
-            platform=PlatformRegistry().get_thinking_platform(),
+            platform=PlatformRegistry().get_normal_platform(),
         ),
         dict(
             name="BA",
             description="Business Analyst - Analyzes and documents requirements",
             system_prompt=BA_PROMPT_WITH_TOOLS,
             output_handler=[BA_output_handler],
-            platform=PlatformRegistry().get_thinking_platform(),
+            platform=PlatformRegistry().get_normal_platform(),
         ),
         dict(
             name="SA",
             description="Solution Architect - Designs technical solutions",
             system_prompt=SA_PROMPT_WITH_TOOLS,
             output_handler=[SA_output_handler],
-            platform=PlatformRegistry().get_thinking_platform(),
+            platform=PlatformRegistry().get_normal_platform(),
         ),
         dict(
             name="TL",
             description="Technical Lead - Leads development team and ensures technical quality",
             system_prompt=TL_PROMPT_WITH_TOOLS,
             output_handler=[TL_output_handler],
-            platform=PlatformRegistry().get_thinking_platform(),
+            platform=PlatformRegistry().get_normal_platform(),
         ),
         dict(
             name="DEV",
             description="Developer - Implements features and writes code",
             system_prompt=DEV_PROMPT_WITH_TOOLS,
             output_handler=[DEV_output_handler],
-            platform=PlatformRegistry().get_thinking_platform(),
+            platform=PlatformRegistry().get_normal_platform(),
         ),
         dict(
             name="QA",
             description="Quality Assurance - Ensures product quality through testing",
             system_prompt=QA_PROMPT_WITH_TOOLS,
             output_handler=[QA_output_handler],
-            platform=PlatformRegistry().get_thinking_platform(),
+            platform=PlatformRegistry().get_normal_platform(),
         )
     ]
 

jarvis/jarvis_git_details/main.py

@@ -207,7 +207,7 @@ class GitCommitAnalyzer:
 [检查代码是否符合行业最佳实践和项目规范]
 {ct("REPORT")}""",
             output_handler=[tool_registry],
-            platform=PlatformRegistry().get_thinking_platform(),
+            platform=PlatformRegistry().get_normal_platform(),
             auto_complete=True
         )