jarvis-ai-assistant 0.1.178__py3-none-any.whl → 0.1.179__py3-none-any.whl

jarvis/__init__.py

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

jarvis/jarvis_agent/__init__.py

@@ -1,26 +1,33 @@
 # -*- coding: utf-8 -*-
+# 标准库导入
 import datetime
 import platform
-from typing import Any, Callable, List, Optional, Tuple, Union, Protocol
+from typing import Any, Callable, List, Optional, Protocol, Tuple, Union
 
-from yaspin import yaspin # type: ignore
+# 第三方库导入
+from yaspin import yaspin  # type: ignore
 
-from jarvis.jarvis_agent.output_handler import OutputHandler
+# 本地库导入
+# jarvis_agent 相关
+# jarvis_platform 相关
 from jarvis.jarvis_platform.base import BasePlatform
 from jarvis.jarvis_platform.registry import PlatformRegistry
-from jarvis.jarvis_utils.output import PrettyOutput, OutputType
+# jarvis_utils 相关
+from jarvis.jarvis_utils.config import (get_max_token_count,
+                                        get_max_tool_call_count,
+                                        is_auto_complete,
+                                        is_execute_tool_confirm,
+                                        is_use_analysis, is_use_methodology)
 from jarvis.jarvis_utils.embedding import get_context_token_count
-from jarvis.jarvis_utils.config import get_max_tool_call_count, is_auto_complete, is_execute_tool_confirm, is_use_methodology
-from jarvis.jarvis_utils.methodology import load_methodology, upload_methodology
-from jarvis.jarvis_utils.globals import make_agent_name, set_agent, delete_agent
+from jarvis.jarvis_utils.globals import (delete_agent, make_agent_name,
+                                         set_agent)
 from jarvis.jarvis_utils.input import get_multiline_input
-from jarvis.jarvis_utils.config import get_max_token_count
+from jarvis.jarvis_utils.methodology import (load_methodology,
+                                             upload_methodology)
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.tag import ct, ot
 from jarvis.jarvis_utils.utils import user_confirm
 
-from jarvis.jarvis_platform.registry import PlatformRegistry
-
-
 origin_agent_system_prompt = f"""
 <role>
 # 🤖 角色
@@ -105,14 +112,20 @@ origin_agent_system_prompt = f"""
 
 
 class OutputHandlerProtocol(Protocol):
-    def name(self) -> str: ...
-    def can_handle(self, response: str) -> bool: ...
-    def prompt(self) -> str: ...
-    def handle(self, response: str, agent: Any) -> Tuple[bool, Any]: ...
+    def name(self) -> str:
+        ...
 
+    def can_handle(self, response: str) -> bool:
+        ...
 
-class Agent:
+    def prompt(self) -> str:
+        ...
 
+    def handle(self, response: str, agent: Any) -> Tuple[bool, Any]:
+        ...
+
+
+class Agent:
     def set_summary_prompt(self, summary_prompt: str):
         """设置任务完成时的总结提示模板。
 
@@ -129,29 +142,31 @@ class Agent:
         2. 重置对话长度计数器
         3. 清空当前提示
         """
-        self.model.reset() # type: ignore
+        self.model.reset()  # type: ignore
         self.conversation_length = 0
         self.prompt = ""
 
     def __del__(self):
         delete_agent(self.name)
 
-
-    def __init__(self,
-                 system_prompt: str,
-                 name: str = "Jarvis",
-                 description: str = "",
-                 platform: Union[Optional[BasePlatform], Optional[str]] = None,
-                 model_name: Optional[str] = None,
-                 summary_prompt: Optional[str] = None,
-                 auto_complete: Optional[bool] = None,
-                 output_handler: List[OutputHandlerProtocol] = [],
-                 use_tools: List[str] = [],
-                 input_handler: Optional[List[Callable[[str, Any], Tuple[str, bool]]]] = None,
-                 execute_tool_confirm: Optional[bool] = None,
-                 need_summary: bool = True,
-                 multiline_inputer: Optional[Callable[[str], str]] = None,
-                 use_methodology: Optional[bool] = None):
+    def __init__(
+        self,
+        system_prompt: str,
+        name: str = "Jarvis",
+        description: str = "",
+        platform: Union[Optional[BasePlatform], Optional[str]] = None,
+        model_name: Optional[str] = None,
+        summary_prompt: Optional[str] = None,
+        auto_complete: Optional[bool] = None,
+        output_handler: List[OutputHandlerProtocol] = [],
+        use_tools: List[str] = [],
+        input_handler: Optional[List[Callable[[str, Any], Tuple[str, bool]]]] = None,
+        execute_tool_confirm: Optional[bool] = None,
+        need_summary: bool = True,
+        multiline_inputer: Optional[Callable[[str], str]] = None,
+        use_methodology: Optional[bool] = None,
+        use_analysis: Optional[bool] = None,
+    ):
         """初始化Jarvis Agent实例
 
         参数:
@@ -169,6 +184,7 @@ class Agent:
             need_summary: 是否需要生成总结
             multiline_inputer: 多行输入处理器
             use_methodology: 是否使用方法论
+            use_analysis: 是否使用任务分析
         """
         self.name = make_agent_name(name)
         self.description = description
@@ -182,7 +198,9 @@ class Agent:
             else:
                 self.model = platform
         else:
-            self.model = PlatformRegistry.get_global_platform_registry().get_normal_platform()
+            self.model = (
+                PlatformRegistry.get_global_platform_registry().get_normal_platform()
+            )
 
         if model_name is not None:
             self.model.set_model_name(model_name)
@@ -190,13 +208,20 @@ class Agent:
         self.model.set_suppress_output(False)
 
         from jarvis.jarvis_tools.registry import ToolRegistry
+
         self.output_handler = output_handler if output_handler else [ToolRegistry()]
         self.set_use_tools(use_tools)
 
-        self.multiline_inputer = multiline_inputer if multiline_inputer else get_multiline_input
-
-        self.use_methodology = use_methodology if use_methodology is not None else is_use_methodology()
+        self.multiline_inputer = (
+            multiline_inputer if multiline_inputer else get_multiline_input
+        )
 
+        self.use_methodology = (
+            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()
+        )
         self.prompt = ""
         self.conversation_length = 0  # Use length counter instead
         self.system_prompt = system_prompt
@@ -209,10 +234,16 @@ class Agent:
         self.max_tool_call_count = get_max_tool_call_count()
         self.after_tool_call_cb: Optional[Callable[[Agent], None]] = None
 
+        self.execute_tool_confirm = (
+            execute_tool_confirm
+            if execute_tool_confirm is not None
+            else is_execute_tool_confirm()
+        )
 
-        self.execute_tool_confirm = execute_tool_confirm if execute_tool_confirm is not None else is_execute_tool_confirm()
-
-        self.summary_prompt = summary_prompt if summary_prompt else f"""<report>
+        self.summary_prompt = (
+            summary_prompt
+            if summary_prompt
+            else f"""<report>
 请生成任务执行的简明总结报告，包括：
 
 <content>
@@ -228,9 +259,12 @@ class Agent:
 </format>
 </report>
 """
+        )
 
-        self.max_token_count =  get_max_token_count()
-        self.auto_complete = auto_complete if auto_complete is not None else is_auto_complete()
+        self.max_token_count = get_max_token_count()
+        self.auto_complete = (
+            auto_complete if auto_complete is not None else is_auto_complete()
+        )
         welcome_message = f"{name} 初始化完成 - 使用 {self.model.name()} 模型"
 
         PrettyOutput.print(welcome_message, OutputType.SYSTEM)
@@ -243,7 +277,9 @@ class Agent:
 
         # 添加工具列表概览
         action_prompt += "\n<overview>\n## Action List\n"
-        action_prompt += ", ".join([handler.name() for handler in self.output_handler])
+        action_prompt += (
+            "[" + ", ".join([handler.name() for handler in self.output_handler]) + "]"
+        )
         action_prompt += "\n</overview>"
 
         # 添加每个工具的详细说明
@@ -253,8 +289,10 @@ class Agent:
             # 获取工具的提示词并确保格式正确
             handler_prompt = handler.prompt().strip()
             # 调整缩进以保持层级结构
-            handler_prompt = "\n".join("   " + line if line.strip() else line
-                                      for line in handler_prompt.split("\n"))
+            handler_prompt = "\n".join(
+                "   " + line if line.strip() else line
+                for line in handler_prompt.split("\n")
+            )
             action_prompt += handler_prompt + "\n</tool>\n"
 
         # 添加工具使用总结
@@ -272,23 +310,25 @@ class Agent:
 </actions>
 """
 
-        self.model.set_system_message(f"""
+        self.model.set_system_message(
+            f"""
 {self.system_prompt}
 
 {action_prompt}
-""")
+"""
+        )
         self.first = True
 
     def set_use_tools(self, use_tools):
         """设置要使用的工具列表"""
         from jarvis.jarvis_tools.registry import ToolRegistry
+
         for handler in self.output_handler:
             if isinstance(handler, ToolRegistry):
                 if use_tools:
                     handler.use_tools(use_tools)
                 break
 
-
     def set_addon_prompt(self, addon_prompt: str):
         """设置附加提示。
 
@@ -297,7 +337,7 @@ class Agent:
         """
         self.addon_prompt = addon_prompt
 
-    def set_after_tool_call_cb(self, cb: Callable[[Any], None]): # type: ignore
+    def set_after_tool_call_cb(self, cb: Callable[[Any], None]):  # type: ignore
         """设置工具调用后回调函数。
 
         参数:
@@ -308,6 +348,7 @@ class Agent:
     def get_tool_registry(self) -> Optional[Any]:
         """获取工具注册表实例"""
         from jarvis.jarvis_tools.registry import ToolRegistry
+
         for handler in self.output_handler:
             if isinstance(handler, ToolRegistry):
                 return handler
@@ -321,10 +362,14 @@ class Agent:
 
         """
         # 结构化系统指令
-        action_handlers = '\n'.join([f'- {handler.name()}' for handler in self.output_handler])
+        action_handlers = ", ".join([handler.name() for handler in self.output_handler])
 
         # 任务完成提示
-        complete_prompt = f"- 输出{ot('!!!COMPLETE!!!')}" if need_complete and self.auto_complete else ""
+        complete_prompt = (
+            f"- 输出{ot('!!!COMPLETE!!!')}"
+            if need_complete and self.auto_complete
+            else ""
+        )
 
         addon_prompt = f"""
 [系统提示开始]
@@ -335,8 +380,7 @@ class Agent:
     - 仅包含一个操作
     - 如果信息不明确，请请求用户补充
     - 如果执行过程中连续失败5次，请使用ask_user询问用户操作
-    - 操作列表：
-    {action_handlers}
+    - 操作列表：{action_handlers}
 [系统提示结束]
 
 请继续。
@@ -377,8 +421,7 @@ class Agent:
         if self.conversation_length > self.max_token_count:
             message = self._summarize_and_clear_history() + "\n\n" + message
             self.conversation_length += get_context_token_count(message)
-        return self.model.chat_until_success(message)   # type: ignore
-
+        return self.model.chat_until_success(message)  # type: ignore
 
     def _summarize_and_clear_history(self) -> str:
         """总结当前对话并清理历史记录
@@ -399,7 +442,6 @@ class Agent:
         # Create a new model instance to summarize, avoid affecting the main conversation
 
         with yaspin(text="正在总结对话历史...", color="cyan") as spinner:
-
             summary_prompt = """
 <summary_request>
 <objective>
@@ -425,9 +467,9 @@ class Agent:
 
             try:
                 with spinner.hidden():
-                    summary = self.model.chat_until_success(self.prompt + "\n" + summary_prompt) # type: ignore
+                    summary = self.model.chat_until_success(self.prompt + "\n" + summary_prompt)  # type: ignore
 
-                self.model.reset() # type: ignore
+                self.model.reset()  # type: ignore
 
                 # 清空当前对话历史，但保留系统消息
                 self.conversation_length = 0  # Reset conversation length
@@ -435,7 +477,7 @@ class Agent:
                 # 添加总结作为新的上下文
                 spinner.text = "总结对话历史完成"
                 spinner.ok("✅")
-                return  f"""<summary>
+                return f"""<summary>
 <header>
 以下是之前对话的关键信息总结：
 </header>
@@ -475,18 +517,29 @@ class Agent:
             if handler.can_handle(response):
                 tool_list.append(handler)
         if len(tool_list) > 1:
-            PrettyOutput.print(f"操作失败：检测到多个操作。一次只能执行一个操作。尝试执行的操作：{', '.join([handler.name() for handler in tool_list])}", OutputType.WARNING)
-            return False, f"操作失败：检测到多个操作。一次只能执行一个操作。尝试执行的操作：{', '.join([handler.name() for handler in tool_list])}"
+            PrettyOutput.print(
+                f"操作失败：检测到多个操作。一次只能执行一个操作。尝试执行的操作：{', '.join([handler.name() for handler in tool_list])}",
+                OutputType.WARNING,
+            )
+            return (
+                False,
+                f"操作失败：检测到多个操作。一次只能执行一个操作。尝试执行的操作：{', '.join([handler.name() for handler in tool_list])}",
+            )
         if len(tool_list) == 0:
             return False, ""
-        if self.max_tool_call_count > 0 and self.tool_call_count >= self.max_tool_call_count:
+        if (
+            self.max_tool_call_count > 0
+            and self.tool_call_count >= self.max_tool_call_count
+        ):
             if user_confirm(f"工具调用次数超过限制，是否继续执行？", True):
                 self.reset_tool_call_count()
             else:
                 return False, ""
         if self.execute_tool_confirm:
             self.reset_tool_call_count()
-        if not self.execute_tool_confirm or user_confirm(f"需要执行{tool_list[0].name()}确认执行？", True):
+        if not self.execute_tool_confirm or user_confirm(
+            f"需要执行{tool_list[0].name()}确认执行？", True
+        ):
             with yaspin(text=f"正在执行{tool_list[0].name()}...", color="cyan") as spinner:
                 with spinner.hidden():
                     result = tool_list[0].handle(response, self)
@@ -495,11 +548,10 @@ class Agent:
                 self.tool_call_count += 1
                 return result
         return False, ""
-    
+
     def reset_tool_call_count(self):
         self.tool_call_count = 0
 
-
     def _complete_task(self) -> str:
         """完成任务并生成总结(如果需要)
 
@@ -511,13 +563,13 @@ class Agent:
             2. 对于子Agent: 可能会生成总结(如果启用)
             3. 使用spinner显示生成状态
         """
-        if self.use_methodology:
+        if self.use_analysis:
             self._analysis_task()
         if self.need_summary:
             with yaspin(text="正在生成总结...", color="cyan") as spinner:
                 self.prompt = self.summary_prompt
                 with spinner.hidden():
-                    ret = self.model.chat_until_success(self.prompt) # type: ignore
+                    ret = self.model.chat_until_success(self.prompt)  # type: ignore
                     spinner.text = "总结生成完成"
                     spinner.ok("✅")
                     return ret
@@ -676,7 +728,7 @@ arguments:
 
                 self.prompt = analysis_prompt
                 with spinner.hidden():
-                    response = self.model.chat_until_success(self.prompt) # type: ignore
+                    response = self.model.chat_until_success(self.prompt)  # type: ignore
 
                 with spinner.hidden():
                     self._call_tools(response)
@@ -686,7 +738,6 @@ arguments:
                 spinner.text = "分析失败"
                 spinner.fail("❌")
 
-
     def run(self, user_input: str) -> Any:
         """处理用户输入并执行任务
 
@@ -708,9 +759,8 @@ arguments:
             self.prompt = f"{user_input}"
 
             if self.first and self.use_methodology:
-                
                 # 先尝试上传方法轮
-                platform = self.model if hasattr(self.model, 'upload_files') else None
+                platform = self.model if hasattr(self.model, "upload_files") else None
                 if platform and upload_methodology(platform):
                     self.prompt = f"{user_input}\n\n方法论已上传到平台，请参考平台上的方法论内容"
                 else:
@@ -719,7 +769,7 @@ arguments:
                         msg, _ = handler(msg, self)
                     # 上传失败则回退到本地加载
                     self.prompt = f"{user_input}\n\n以下是历史类似问题的执行经验，可参考：\n{load_methodology(msg, self.get_tool_registry())}"
-                
+
                 self.first = False
 
             self.conversation_length = get_context_token_count(self.prompt)
@@ -729,7 +779,9 @@ arguments:
 
                     current_response = self._call_model(self.prompt, True)
                     self.prompt = ""
-                    self.conversation_length += get_context_token_count(current_response)
+                    self.conversation_length += get_context_token_count(
+                        current_response
+                    )
 
                     need_return, self.prompt = self._call_tools(current_response)
 
@@ -744,11 +796,13 @@ arguments:
 
                     if self.auto_complete and ot("!!!COMPLETE!!!") in current_response:
                         return self._complete_task()
-                    
+
                     self.reset_tool_call_count()
 
                     # 获取用户输入
-                    user_input = self.multiline_inputer(f"{self.name}: 请输入，或输入空行来结束当前任务：")
+                    user_input = self.multiline_inputer(
+                        f"{self.name}: 请输入，或输入空行来结束当前任务："
+                    )
 
                     if user_input:
                         self.prompt = user_input
@@ -777,8 +831,5 @@ arguments:
             用于重置Agent状态而不影响系统消息
         """
         self.prompt = ""
-        self.model.reset() # type: ignore
+        self.model.reset()  # type: ignore
         self.conversation_length = 0  # 重置对话长度
-
-
-

jarvis/jarvis_agent/builtin_input_handler.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 import re
 from typing import Any, Tuple
-from jarvis.jarvis_utils.config import get_replace_map
 
+from jarvis.jarvis_utils.config import get_replace_map
 
 
 def builtin_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:

jarvis/jarvis_agent/jarvis.py

@@ -2,24 +2,20 @@
 import argparse
 import os
 import sys
+from typing import Dict
 
-from typing import Dict, List, Tuple  # 增加必要的类型导入
-
-from jarvis.jarvis_utils.config import get_data_dir
-from prompt_toolkit import prompt
 import yaml
+from prompt_toolkit import prompt
 from yaspin import yaspin
-from jarvis.jarvis_agent import (
-     PrettyOutput, OutputType,
-     get_multiline_input,
-     user_confirm,
-     Agent,
-     origin_agent_system_prompt
-)
+
+from jarvis.jarvis_agent import (Agent, OutputType, PrettyOutput,
+                                 get_multiline_input,
+                                 origin_agent_system_prompt, user_confirm)
+from jarvis.jarvis_agent.builtin_input_handler import builtin_input_handler
+from jarvis.jarvis_agent.shell_input_handler import shell_input_handler
 from jarvis.jarvis_tools.registry import ToolRegistry
+from jarvis.jarvis_utils.config import get_data_dir
 from jarvis.jarvis_utils.utils import init_env
-from jarvis.jarvis_agent.shell_input_handler import shell_input_handler
-from jarvis.jarvis_agent.builtin_input_handler import builtin_input_handler
 
 
 def _load_tasks() -> Dict[str, str]:

jarvis/jarvis_agent/main.py

@@ -1,10 +1,12 @@
 # -*- coding: utf-8 -*-
 import argparse
-import yaml
 import os
+
+import yaml
+
 from jarvis.jarvis_agent import Agent
 from jarvis.jarvis_utils.input import get_multiline_input
-from jarvis.jarvis_utils.output import PrettyOutput, OutputType
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import init_env
 
 

jarvis/jarvis_code_agent/code_agent.py

@@ -4,34 +4,33 @@
 该模块提供CodeAgent类，用于处理代码修改任务。
 """
 
+import argparse
 import os
-import sys
 import subprocess
-import argparse
-from typing import Any, Dict, Optional, List, Tuple
+import sys
+from typing import Any, Dict, List, Optional, Tuple
 
-# 忽略yaspin的类型检查
-from jarvis.jarvis_utils.config import is_confirm_before_apply_patch
 from yaspin import yaspin  # type: ignore
 
+from jarvis import __version__
 from jarvis.jarvis_agent import Agent
 from jarvis.jarvis_agent.builtin_input_handler import builtin_input_handler
 from jarvis.jarvis_agent.shell_input_handler import shell_input_handler
-from jarvis.jarvis_platform.registry import PlatformRegistry
+# 忽略yaspin的类型检查
+from jarvis.jarvis_code_agent.lint import get_lint_tools
 from jarvis.jarvis_git_utils.git_commiter import GitCommitTool
+from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_tools.registry import ToolRegistry
-from jarvis.jarvis_utils.git_utils import (
-    find_git_root,
-    get_commits_between,
-    get_diff,
-    get_latest_commit_hash,
-    handle_commit_workflow,
-    has_uncommitted_changes
-)
+from jarvis.jarvis_utils.config import is_confirm_before_apply_patch
+from jarvis.jarvis_utils.git_utils import (find_git_root, get_commits_between,
+                                           get_diff, get_diff_file_list,
+                                           get_latest_commit_hash,
+                                           handle_commit_workflow,
+                                           has_uncommitted_changes)
 from jarvis.jarvis_utils.input import get_multiline_input
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import init_env, user_confirm
-from jarvis import __version__
+
 
 class CodeAgent:
     """Jarvis系统的代码修改代理。
@@ -49,7 +48,6 @@ class CodeAgent:
             "search_web",
             "ask_user",
             "ask_codebase",
-            "lsp_get_diagnostics",
             "read_code",
             "methodology",
             "chdir",
@@ -327,7 +325,9 @@ class CodeAgent:
                 project_info.append(f"代码统计:\n{loc_stats}")
             if commits_info:
                 commits_str = "\n".join(
-                    f"提交 {i+1}: {commit['hash'][:7]} - {commit['message']} ({len(commit['files'])}个文件)"
+                    f"提交 {i+1}: {commit['hash'][:7]} - {commit['message']} ({len(commit['files'])}个文件)\n" +
+                    "\n".join(f"    - {file}" for file in commit['files'][:5]) + 
+                    ("\n    ..." if len(commit['files']) > 5 else "")
                     for i, commit in enumerate(commits_info)
                 )
                 project_info.append(f"最近提交:\n{commits_str}")
@@ -354,6 +354,8 @@ class CodeAgent:
         final_ret = ""
         diff = get_diff()
         if diff:
+            # 获取修改的文件列表
+            modified_files = get_diff_file_list()
             start_hash = get_latest_commit_hash()
             PrettyOutput.print(diff, OutputType.CODE, lang="diff")
             commited = handle_commit_workflow()
@@ -372,13 +374,22 @@ class CodeAgent:
                     final_ret += f"# 应用补丁:\n```diff\n{diff}\n```"
 
                     # 修改后的提示逻辑
+                    lint_tools_info = "\n".join(
+                        f"   - {file}: 使用 {'、'.join(get_lint_tools(file))}"
+                        for file in modified_files 
+                        if get_lint_tools(file)
+                    )
                     addon_prompt = """
-                    [系统提示开始]
-                    如果对应语言有静态检查工具，请使用静态检查工具检查修改的代码，如果本次修改引入了警告和错误，请根据警告和错误信息修复代码
-                    在引入警告和错误都被修复的前提下，如果用户的需求未完成，请继续修改代码，如果已经完成，请终止，不要实现任何超出用户需求外的内容
-                    如果有任何信息不明确，调用工具获取信息
-                    每次响应必须且只能包含一个操作
-                    [系统提示结束]
+1. 请对以下修改的文件进行静态扫描:
+""" + "\n".join(f"   - {file}" for file in modified_files) + (
+                        f"""
+2. 建议使用以下lint工具进行检查:
+{lint_tools_info}""" if lint_tools_info else ""
+                    ) + """
+3. 如果本次修改引入了警告和错误，请根据警告和错误信息修复代码
+4. 在引入的警告和错误都被修复的前提下，如果用户的需求未完成，请继续修改代码，如果已经完成，请终止，不要实现任何超出用户需求外的内容
+5. 如果有任何信息不明确，调用工具获取信息
+6. 每次响应必须且只能包含一个操作
                     """
 
                     agent.set_addon_prompt(addon_prompt)