jarvis-ai-assistant 0.1.222__py3-none-any.whl → 0.7.0__py3-none-any.whl

jarvis/jarvis_agent/agent_manager.py

@@ -0,0 +1,97 @@
+# -*- coding: utf-8 -*-
+"""Agent管理器模块，负责Agent的初始化和任务执行"""
+from typing import Optional, Callable
+
+import typer
+
+from jarvis.jarvis_agent import (
+    Agent,
+    OutputType,
+    PrettyOutput,
+    get_multiline_input,
+    origin_agent_system_prompt,
+)
+from jarvis.jarvis_agent.task_manager import TaskManager
+from jarvis.jarvis_utils.config import is_non_interactive, is_skip_predefined_tasks
+
+
+class AgentManager:
+    """Agent管理器，负责Agent的生命周期管理"""
+
+    def __init__(
+        self,
+        model_group: Optional[str] = None,
+        tool_group: Optional[str] = None,
+        restore_session: bool = False,
+        use_methodology: Optional[bool] = None,
+        use_analysis: Optional[bool] = None,
+        multiline_inputer: Optional[Callable[[str], str]] = None,
+        confirm_callback: Optional[Callable[[str, bool], bool]] = None,
+        non_interactive: Optional[bool] = None,
+        plan: Optional[bool] = None,
+    ):
+        self.model_group = model_group
+        self.tool_group = tool_group
+        self.restore_session = restore_session
+        self.use_methodology = use_methodology
+        self.use_analysis = use_analysis
+        self.agent: Optional[Agent] = None
+        # 可选：注入输入与确认回调，用于Web模式等前端替代交互
+        self.multiline_inputer = multiline_inputer
+        self.confirm_callback = confirm_callback
+        self.non_interactive = non_interactive
+        self.plan = plan
+
+    def initialize(self) -> Agent:
+        """初始化Agent"""
+        # 如果提供了 tool_group 参数，设置到配置中
+        if self.tool_group:
+            from jarvis.jarvis_utils.config import set_config
+
+            set_config("JARVIS_TOOL_GROUP", self.tool_group)
+
+        self.agent = Agent(
+            system_prompt=origin_agent_system_prompt,
+            model_group=self.model_group,
+            need_summary=False,
+            use_methodology=self.use_methodology,
+            use_analysis=self.use_analysis,
+            multiline_inputer=self.multiline_inputer,
+            confirm_callback=self.confirm_callback,
+            non_interactive=self.non_interactive,
+            plan=self.plan,
+        )
+
+        # 尝试恢复会话
+        if self.restore_session:
+            if self.agent.restore_session():
+                PrettyOutput.print("会话已成功恢复。", OutputType.SUCCESS)
+            else:
+                PrettyOutput.print("无法恢复会话。", OutputType.WARNING)
+
+        return self.agent
+
+    def run_task(self, task_content: Optional[str] = None) -> None:
+        """运行任务"""
+        if not self.agent:
+            raise RuntimeError("Agent not initialized")
+
+        # 优先处理命令行直接传入的任务
+        if task_content:
+            self.agent.run(task_content)
+            raise typer.Exit(code=0)
+
+        # 处理预定义任务（非交互模式下跳过；支持配置跳过加载）
+        if not is_non_interactive() and not is_skip_predefined_tasks() and self.agent.first:
+            task_manager = TaskManager()
+            tasks = task_manager.load_tasks()
+            if tasks and (selected_task := task_manager.select_task(tasks)):
+                PrettyOutput.print(f"开始执行任务: \n{selected_task}", OutputType.INFO)
+                self.agent.run(selected_task)
+                raise typer.Exit(code=0)
+
+        # 获取用户输入
+        user_input = get_multiline_input("请输入你的任务（输入空行退出）:")
+        if user_input:
+            self.agent.run(user_input)
+        raise typer.Exit(code=0)

jarvis/jarvis_agent/builtin_input_handler.py

@@ -32,19 +32,21 @@ def builtin_input_handler(user_input: str, agent_: Any) -> Tuple[str, bool]:
     for tag in special_tags:
         # 优先处理特殊标记
         if tag == "Summary":
-            agent._summarize_and_clear_history()
-            return "", True
+            summary = agent._summarize_and_clear_history()
+            memory_tags_prompt = agent.memory_manager.prepare_memory_tags_prompt()
+            prompt = ""
+            if summary:
+                # 将摘要和记忆标签设置为新会话的初始提示
+                prompt = summary + "\n" + memory_tags_prompt
+            else:
+                # 即使没有摘要，也确保设置记忆标签作为新会话的初始提示
+                prompt = memory_tags_prompt
+            return prompt, True
         elif tag == "Clear":
-            agent.clear()
+            agent.clear_history()
             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())
+            agent.set_addon_prompt(agent.get_tool_usage_prompt())
             return "", False
         elif tag == "ReloadConfig":
             from jarvis.jarvis_utils.utils import load_config

jarvis/jarvis_agent/config_editor.py

@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+"""配置编辑器模块，负责配置文件的编辑功能"""
+import os
+import platform
+import shutil
+import subprocess
+from pathlib import Path
+from typing import Optional
+
+import typer
+
+from jarvis.jarvis_agent import OutputType, PrettyOutput
+
+
+class ConfigEditor:
+    """配置文件编辑器"""
+
+    @staticmethod
+    def get_default_editor() -> Optional[str]:
+        """根据操作系统获取默认编辑器"""
+        if platform.system() == "Windows":
+            # 优先级：终端工具 -> 代码编辑器 -> 通用文本编辑器
+            editors = ["nvim", "vim", "nano", "code", "notepad++", "notepad"]
+        else:
+            # 优先级：终端工具 -> 代码编辑器 -> 通用文本编辑器
+            editors = ["nvim", "vim", "vi", "nano", "emacs", "code", "gedit", "kate"]
+
+        return next((e for e in editors if shutil.which(e)), None)
+
+    @staticmethod
+    def edit_config(config_file: Optional[str] = None) -> None:
+        """编辑配置文件"""
+        config_file_path = (
+            Path(config_file)
+            if config_file
+            else Path(os.path.expanduser("~/.jarvis/config.yaml"))
+        )
+
+        editor = ConfigEditor.get_default_editor()
+
+        if editor:
+            try:
+                subprocess.run(
+                    [editor, str(config_file_path)],
+                    check=True,
+                    shell=(platform.system() == "Windows"),
+                )
+                raise typer.Exit(code=0)
+            except (subprocess.CalledProcessError, FileNotFoundError) as e:
+                PrettyOutput.print(f"Failed to open editor: {e}", OutputType.ERROR)
+                raise typer.Exit(code=1)
+        else:
+            PrettyOutput.print(
+                "No suitable editor found. Please install one of: vim, nano, emacs, code",
+                OutputType.ERROR,
+            )
+            raise typer.Exit(code=1)