jarvis-ai-assistant 0.1.192__py3-none-any.whl → 0.1.194__py3-none-any.whl

jarvis/__init__.py

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

jarvis/jarvis_agent/__init__.py

@@ -12,18 +12,26 @@ from yaspin import yaspin  # type: ignore
 # jarvis_platform 相关
 from jarvis.jarvis_platform.base import BasePlatform
 from jarvis.jarvis_platform.registry import PlatformRegistry
+
 # 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.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.globals import (delete_agent, get_interrupt, make_agent_name,
-                                         set_agent, set_interrupt)
+from jarvis.jarvis_utils.globals import (
+    delete_agent,
+    get_interrupt,
+    make_agent_name,
+    set_agent,
+    set_interrupt,
+)
 from jarvis.jarvis_utils.input import get_multiline_input
-from jarvis.jarvis_utils.methodology import (load_methodology,
-                                             upload_methodology)
+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
@@ -112,28 +120,16 @@ origin_agent_system_prompt = f"""
 
 
 class OutputHandlerProtocol(Protocol):
-    def name(self) -> str:
-        ...
+    def name(self) -> str: ...
 
-    def can_handle(self, response: str) -> bool:
-        ...
+    def can_handle(self, response: str) -> bool: ...
 
-    def prompt(self) -> str:
-        ...
+    def prompt(self) -> str: ...
 
-    def handle(self, response: str, agent: Any) -> Tuple[bool, Any]:
-        ...
+    def handle(self, response: str, agent: Any) -> Tuple[bool, Any]: ...
 
 
 class Agent:
-    def set_summary_prompt(self, summary_prompt: str):
-        """设置任务完成时的总结提示模板。
-
-        参数:
-            summary_prompt: 用于生成任务总结的提示模板
-        """
-        self.summary_prompt = summary_prompt
-
     def clear(self):
         """清除当前对话历史，保留系统消息。
 
@@ -195,7 +191,9 @@ class Agent:
             if isinstance(platform, str):
                 self.model = PlatformRegistry().create_platform(platform)
                 if self.model is None:
-                    PrettyOutput.print(f"平台 {platform} 不存在，将使用普通模型", OutputType.WARNING)
+                    PrettyOutput.print(
+                        f"平台 {platform} 不存在，将使用普通模型", OutputType.WARNING
+                    )
                     self.model = PlatformRegistry().get_normal_platform()
             else:
                 self.model = platform
@@ -395,6 +393,8 @@ class Agent:
         if self.addon_prompt:
             message += f"\n\n{self.addon_prompt}"
             self.addon_prompt = ""
+        else:
+            message += f"\n\n{self.make_default_addon_prompt(need_complete)}"
 
         # 累加对话长度
         self.conversation_length += get_context_token_count(message)
@@ -526,7 +526,9 @@ class Agent:
         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 yaspin(
+                text=f"正在执行{tool_list[0].name()}...", color="cyan"
+            ) as spinner:
                 with spinner.hidden():
                     result = tool_list[0].handle(response, self)
                 spinner.text = f"{tool_list[0].name()}执行完成"
@@ -724,6 +726,40 @@ arguments:
                 spinner.text = "分析失败"
                 spinner.fail("❌")
 
+    def make_default_addon_prompt(self, need_complete: bool) -> str:
+        """生成附加提示。
+
+        参数:
+            need_complete: 是否需要完成任务
+
+        """
+        # 结构化系统指令
+        action_handlers = ", ".join([handler.name() for handler in self.output_handler])
+
+        # 任务完成提示
+        complete_prompt = (
+            f"- 输出{ot('!!!COMPLETE!!!')}"
+            if need_complete and self.auto_complete
+            else ""
+        )
+
+        addon_prompt = f"""
+<system_prompt>
+    请判断是否已经完成任务，如果已经完成：
+    - 直接输出完成原因，不需要再有新的操作，不要输出{ot("TOOL_CALL")}标签
+    {complete_prompt}
+    如果没有完成，请进行下一步操作：
+    - 仅包含一个操作
+    - 如果信息不明确，请请求用户补充
+    - 如果执行过程中连续失败5次，请使用ask_user询问用户操作
+    - 操作列表：{action_handlers}
+</system_prompt>
+
+请继续。
+"""
+
+        return addon_prompt
+
     def run(self, user_input: str) -> Any:
         """处理用户输入并执行任务
 
@@ -747,11 +783,7 @@ arguments:
             while True:
                 if self.first:
                     # 如果有上传文件，先上传文件
-                    if (
-                        self.files
-                        and self.model
-                        and self.model.support_upload_files()
-                    ):
+                    if self.files and self.model and self.model.support_upload_files():
                         self.model.upload_files(self.files)
 
                     # 如果启用方法论且没有上传文件，上传方法论
@@ -768,11 +800,6 @@ arguments:
                     current_response = self._call_model(self.prompt, True)
                     self.prompt = ""
 
-                    need_return, self.prompt = self._call_tools(current_response)
-
-                    if need_return:
-                        return self.prompt
-                    
                     if get_interrupt():
                         set_interrupt(False)
                         user_input = self.multiline_inputer(
@@ -782,6 +809,11 @@ arguments:
                             self.prompt += f"{user_input}"
                             continue
 
+                    need_return, self.prompt = self._call_tools(current_response)
+
+                    if need_return:
+                        return self.prompt
+
                     if self.after_tool_call_cb:
                         self.after_tool_call_cb(self)
 

jarvis/jarvis_agent/builtin_input_handler.py

@@ -5,7 +5,7 @@ from typing import Any, Tuple
 from jarvis.jarvis_utils.config import get_replace_map
 
 
-def builtin_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:
+def builtin_input_handler(user_input: str, agent_: Any) -> Tuple[str, bool]:
     """
     处理内置的特殊输入标记，并追加相应的提示词
 
@@ -16,6 +16,9 @@ def builtin_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:
     返回：
         Tuple[str, bool]: 处理后的输入和是否需要进一步处理
     """
+    from jarvis.jarvis_agent import Agent
+
+    agent: Agent = agent_
     # 查找特殊标记
     special_tags = re.findall(r"'<([^>]+)>'", user_input)
 
@@ -34,18 +37,37 @@ def builtin_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:
         elif tag == "Clear":
             agent.clear()
             return "", True
-        
+        elif tag == "ToolUsage":
+            from jarvis.jarvis_tools.registry import ToolRegistry
+
+            tool_registry_ = agent.get_tool_registry()
+            tool_registry: ToolRegistry = (
+                tool_registry_ if tool_registry_ else ToolRegistry()
+            )
+            agent.set_addon_prompt(tool_registry.prompt())
+        elif tag == "ReloadConfig":
+            from jarvis.jarvis_utils.utils import load_config
+
+            load_config()
+            return "", True
+
         processed_tag = set()
         add_on_prompt = ""
 
         # 处理普通替换标记
         if tag in replace_map:
             processed_tag.add(tag)
-            if "append" in replace_map[tag] and replace_map[tag]["append"] and tag not in processed_tag:
+            if (
+                "append" in replace_map[tag]
+                and replace_map[tag]["append"]
+                and tag not in processed_tag
+            ):
                 user_input = user_input.replace(f"'<{tag}>'", "")
                 add_on_prompt += replace_map[tag]["template"] + "\n"
             else:
-                user_input = user_input.replace(f"'<{tag}>'", replace_map[tag]["template"])
+                user_input = user_input.replace(
+                    f"'<{tag}>'", replace_map[tag]["template"]
+                )
 
         agent.set_addon_prompt(add_on_prompt)
 

jarvis/jarvis_agent/jarvis.py

@@ -8,9 +8,14 @@ import yaml
 from prompt_toolkit import prompt
 from yaspin import yaspin
 
-from jarvis.jarvis_agent import (Agent, OutputType, PrettyOutput,
-                                 get_multiline_input,
-                                 origin_agent_system_prompt, user_confirm)
+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
@@ -29,7 +34,9 @@ def _load_tasks() -> Dict[str, str]:
         spinner_text = f"从{pre_command_path}加载预定义任务..."
         with yaspin(text=spinner_text, color="cyan") as spinner:
             try:
-                with open(pre_command_path, "r", encoding="utf-8", errors="ignore") as f:
+                with open(
+                    pre_command_path, "r", encoding="utf-8", errors="ignore"
+                ) as f:
                     user_tasks = yaml.safe_load(f)
                 if isinstance(user_tasks, dict):
                     for name, desc in user_tasks.items():
@@ -48,7 +55,9 @@ def _load_tasks() -> Dict[str, str]:
         spinner_text = f"从{abs_path}加载预定义任务..."
         with yaspin(text=spinner_text, color="cyan") as spinner:
             try:
-                with open(pre_command_path, "r", encoding="utf-8", errors="ignore") as f:
+                with open(
+                    pre_command_path, "r", encoding="utf-8", errors="ignore"
+                ) as f:
                     local_tasks = yaml.safe_load(f)
                 if isinstance(local_tasks, dict):
                     for name, desc in local_tasks.items():
@@ -62,11 +71,12 @@ def _load_tasks() -> Dict[str, str]:
 
     return tasks
 
+
 def _select_task(tasks: Dict[str, str]) -> str:
     """Let user select a task from the list or skip. Returns task description if selected."""
     if not tasks:
         return ""
-    
+
     task_names = list(tasks.keys())
     task_list = ["可用任务:"]
     for i, name in enumerate(task_names, 1):
@@ -74,7 +84,6 @@ def _select_task(tasks: Dict[str, str]) -> str:
     task_list.append("[0] 跳过预定义任务")
     PrettyOutput.print("\n".join(task_list), OutputType.INFO)
 
-
     while True:
         try:
             choice_str = prompt("\n请选择一个任务编号（0 跳过预定义任务）：").strip()
@@ -88,13 +97,19 @@ def _select_task(tasks: Dict[str, str]) -> str:
                 selected_task = tasks[task_names[choice - 1]]
                 PrettyOutput.print(f"将要执行任务:\n {selected_task}", OutputType.INFO)
                 # 询问是否需要补充信息
-                need_additional = user_confirm("需要为此任务添加补充信息吗？", default=False)
+                need_additional = user_confirm(
+                    "需要为此任务添加补充信息吗？", default=False
+                )
                 if need_additional:
                     additional_input = get_multiline_input("请输入补充信息：")
                     if additional_input:
-                        selected_task = f"{selected_task}\n\n补充信息:\n{additional_input}"
+                        selected_task = (
+                            f"{selected_task}\n\n补充信息:\n{additional_input}"
+                        )
                 return selected_task
-            PrettyOutput.print("无效的选择。请选择列表中的一个号码。", OutputType.WARNING)
+            PrettyOutput.print(
+                "无效的选择。请选择列表中的一个号码。", OutputType.WARNING
+            )
 
         except (KeyboardInterrupt, EOFError):
             return ""
@@ -104,26 +119,26 @@ def _select_task(tasks: Dict[str, str]) -> str:
 
 def main() -> None:
 
-    
-    parser = argparse.ArgumentParser(description='Jarvis AI assistant')
-    parser.add_argument('-p', '--platform', type=str, help='Platform to use')
-    parser.add_argument('-m', '--model', type=str, help='Model to use')
-    parser.add_argument('-t', '--task', type=str, help='Directly input task content from command line')
-    parser.add_argument('-f', '--config', type=str, help='Path to custom config file')
+    parser = argparse.ArgumentParser(description="Jarvis AI assistant")
+    parser.add_argument("-p", "--platform", type=str, help="Platform to use")
+    parser.add_argument("-m", "--model", type=str, help="Model to use")
+    parser.add_argument(
+        "-t", "--task", type=str, help="Directly input task content from command line"
+    )
+    parser.add_argument("-f", "--config", type=str, help="Path to custom config file")
     args = parser.parse_args()
-    init_env("欢迎使用 Jarvis AI 助手，您的智能助理已准备就绪！", config_file=args.config)
+    init_env(
+        "欢迎使用 Jarvis AI 助手，您的智能助理已准备就绪！", config_file=args.config
+    )
 
     try:
         agent = Agent(
             system_prompt=origin_agent_system_prompt,
             platform=args.platform,
             model_name=args.model,
-            input_handler=[
-                shell_input_handler, 
-                builtin_input_handler
-            ],
+            input_handler=[shell_input_handler, builtin_input_handler],
             output_handler=[ToolRegistry()],
-            need_summary=False
+            need_summary=False,
         )
 
         # 优先处理命令行直接传入的任务
@@ -146,5 +161,6 @@ def main() -> None:
         PrettyOutput.print(f"初始化错误: {str(err)}", OutputType.ERROR)
         sys.exit(1)
 
+
 if __name__ == "__main__":
     main()

jarvis/jarvis_agent/main.py

@@ -20,10 +20,12 @@ def load_config(config_path: str) -> dict:
         dict: 配置字典
     """
     if not os.path.exists(config_path):
-        PrettyOutput.print(f"配置文件 {config_path} 不存在，使用默认配置", OutputType.WARNING)
+        PrettyOutput.print(
+            f"配置文件 {config_path} 不存在，使用默认配置", OutputType.WARNING
+        )
         return {}
 
-    with open(config_path, 'r', encoding='utf-8', errors="ignore") as f:
+    with open(config_path, "r", encoding="utf-8", errors="ignore") as f:
         try:
             config = yaml.safe_load(f)
             return config if config else {}
@@ -31,20 +33,24 @@ def load_config(config_path: str) -> dict:
             PrettyOutput.print(f"配置文件解析失败: {str(e)}", OutputType.ERROR)
             return {}
 
+
 def main():
     """Main entry point for Jarvis agent"""
     # Set up argument parser
-    parser = argparse.ArgumentParser(description='Jarvis AI assistant')
-    parser.add_argument('-f', '--config', type=str, required=False,
-                        help='Path to agent config file')
-    parser.add_argument('-c', '--agent_definition', type=str,
-                        help='Path to agent definition file')
-    parser.add_argument('-t', '--task', type=str,
-                        help='Initial task to execute')
+    parser = argparse.ArgumentParser(description="Jarvis AI assistant")
+    parser.add_argument(
+        "-f", "--config", type=str, required=False, help="Path to agent config file"
+    )
+    parser.add_argument(
+        "-c", "--agent_definition", type=str, help="Path to agent definition file"
+    )
+    parser.add_argument("-t", "--task", type=str, help="Initial task to execute")
     args = parser.parse_args()
 
     # Initialize environment
-    init_env("欢迎使用 Jarvis AI 助手，您的智能助理已准备就绪！", config_file=args.config)
+    init_env(
+        "欢迎使用 Jarvis AI 助手，您的智能助理已准备就绪！", config_file=args.config
+    )
 
     # Load configuration
     config = load_config(args.agent_definition) if args.agent_definition else {}
@@ -59,12 +65,13 @@ def main():
             agent.run(args.task)
             return 0
 
-
         try:
             user_input = get_multiline_input("请输入你的任务（输入空行退出）:")
             if not user_input:
                 return 0
-            agent.set_addon_prompt("如果有必要，请先指定出行动计划，然后根据计划一步步执行，如果任务过于复杂，可以拆分子Agent进行执行，拆的子Agent需要掌握所有必要的任务信息，否则无法执行")
+            agent.set_addon_prompt(
+                "如果有必要，请先指定出行动计划，然后根据计划一步步执行，如果任务过于复杂，可以拆分子Agent进行执行，拆的子Agent需要掌握所有必要的任务信息，否则无法执行"
+            )
             agent.run(user_input)
         except Exception as e:
             PrettyOutput.print(f"错误: {str(e)}", OutputType.ERROR)
@@ -75,5 +82,6 @@ def main():
 
     return 0
 
+
 if __name__ == "__main__":
     exit(main())

jarvis/jarvis_agent/output_handler.py

@@ -7,11 +7,11 @@ class OutputHandler(ABC):
     @abstractmethod
     def handle(self, response: str, agent: Any) -> Tuple[bool, Any]:
         """处理响应数据
-        
+
         Args:
             response: 需要处理的响应字符串
             agent: 执行处理的agent实例
-        
+
         Returns:
             Tuple[bool, Any]: 返回处理结果元组，第一个元素表示是否处理成功，第二个元素为处理后的数据
         """
@@ -20,10 +20,10 @@ class OutputHandler(ABC):
     @abstractmethod
     def can_handle(self, response: str) -> bool:
         """判断是否能处理给定的响应
-        
+
         Args:
             response: 需要判断的响应字符串
-        
+
         Returns:
             bool: 返回是否能处理该响应
         """
@@ -32,7 +32,7 @@ class OutputHandler(ABC):
     @abstractmethod
     def prompt(self) -> str:
         """获取处理器的提示信息
-        
+
         Returns:
             str: 返回处理器的提示字符串
         """
@@ -41,8 +41,8 @@ class OutputHandler(ABC):
     @abstractmethod
     def name(self) -> str:
         """获取处理器的名称
-        
+
         Returns:
             str: 返回处理器的名称字符串
         """
-        pass
+        pass

jarvis/jarvis_agent/shell_input_handler.py

@@ -11,20 +11,23 @@ def shell_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:
     if len(cmdline) == 0:
         return user_input, False
     else:
-        script = '\n'.join([c[1:] for c in cmdline])
+        script = "\n".join([c[1:] for c in cmdline])
         PrettyOutput.print(script, OutputType.CODE, lang="bash")
         if user_confirm(f"是否要执行以上shell脚本？", default=True):
             from jarvis.jarvis_tools.registry import ToolRegistry
-            output = ToolRegistry().handle_tool_calls({
-                "name": "execute_script",
-                "want": "提取命令执行结果关键信息",
-                "arguments": {
-                    "interpreter": "bash",
-                    "script_content": script
-                }
-            }, agent)
+
+            output = ToolRegistry().handle_tool_calls(
+                {
+                    "name": "execute_script",
+                    "want": "提取命令执行结果关键信息",
+                    "arguments": {"interpreter": "bash", "script_content": script},
+                },
+                agent,
+            )
             if user_confirm("是否将执行结果反馈给Agent？", default=True):
-                return f"{user_input}\n\n用户执行以下脚本：\n{script}\n\n执行结果：\n{output}", False
+                return (
+                    f"{user_input}\n\n用户执行以下脚本：\n{script}\n\n执行结果：\n{output}",
+                    False,
+                )
             return "", True
         return user_input, False
-