jarvis-ai-assistant 0.2.7__py3-none-any.whl → 0.3.0__py3-none-any.whl

jarvis/jarvis_agent/agent_manager.py

@@ -0,0 +1,85 @@
+# -*- coding: utf-8 -*-
+"""Agent管理器模块，负责Agent的初始化和任务执行"""
+from typing import Optional
+
+import typer
+
+from jarvis.jarvis_agent import (
+    Agent,
+    OutputType,
+    PrettyOutput,
+    get_multiline_input,
+    origin_agent_system_prompt,
+)
+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_agent.task_manager import TaskManager
+from jarvis.jarvis_tools.registry import ToolRegistry
+
+
+class AgentManager:
+    """Agent管理器，负责Agent的生命周期管理"""
+
+    def __init__(
+        self,
+        llm_type: str,
+        model_group: Optional[str] = None,
+        tool_group: Optional[str] = None,
+        restore_session: bool = False,
+    ):
+        self.llm_type = llm_type
+        self.model_group = model_group
+        self.tool_group = tool_group
+        self.restore_session = restore_session
+        self.agent: Optional[Agent] = None
+
+    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,
+            llm_type=self.llm_type,
+            model_group=self.model_group,
+            input_handler=[shell_input_handler, builtin_input_handler],
+            output_handler=[ToolRegistry()],  # type: ignore
+            need_summary=False,
+        )
+
+        # 尝试恢复会话
+        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 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/config_editor.py

@@ -0,0 +1,53 @@
+# -*- 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)
+                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(
+                f"No suitable editor found. Please install one of: vim, nano, emacs, code",
+                OutputType.ERROR,
+            )
+            raise typer.Exit(code=1)

jarvis/jarvis_agent/file_methodology_manager.py

@@ -0,0 +1,105 @@
+# -*- coding: utf-8 -*-
+"""
+文件和方法论管理器模块
+负责处理文件上传和方法论加载功能
+"""
+import os
+import tempfile
+from typing import List, Optional
+
+from jarvis.jarvis_utils.methodology import load_methodology, upload_methodology
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+
+
+class FileMethodologyManager:
+    """文件和方法论管理器，负责处理文件上传和方法论相关功能"""
+
+    def __init__(self, agent):
+        """
+        初始化文件和方法论管理器
+
+        参数:
+            agent: Agent实例
+        """
+        self.agent = agent
+
+    def handle_files_and_methodology(self):
+        """处理文件上传和方法论加载"""
+        if self.agent.model and self.agent.model.support_upload_files():
+            self._handle_file_upload_mode()
+        else:
+            self._handle_local_mode()
+
+    def _handle_file_upload_mode(self):
+        """处理支持文件上传的模式"""
+        if self.agent.use_methodology:
+            self._handle_methodology_upload()
+        elif self.agent.files:
+            self._handle_files_upload()
+
+    def _handle_methodology_upload(self):
+        """处理方法论上传"""
+        if not upload_methodology(self.agent.model, other_files=self.agent.files):  # type: ignore
+            if self.agent.files:
+                PrettyOutput.print("文件上传失败，将忽略文件列表", OutputType.WARNING)
+            # 上传失败则回退到本地加载
+            self._load_local_methodology()
+        else:
+            # 上传成功
+            from jarvis.jarvis_agent.memory_manager import MemoryManager
+
+            memory_manager = MemoryManager(self.agent)
+            memory_tags_prompt = memory_manager.prepare_memory_tags_prompt()
+
+            if self.agent.files:
+                self.agent.session.prompt = f"{self.agent.session.prompt}\n\n上传的文件包含历史对话信息和方法论文件，可以从中获取一些经验信息。{memory_tags_prompt}"
+            else:
+                self.agent.session.prompt = f"{self.agent.session.prompt}\n\n上传的文件包含历史对话信息，可以从中获取一些经验信息。{memory_tags_prompt}"
+
+    def _handle_files_upload(self):
+        """处理普通文件上传"""
+        if not self.agent.model.upload_files(self.agent.files):  # type: ignore
+            PrettyOutput.print("文件上传失败，将忽略文件列表", OutputType.WARNING)
+        else:
+            self.agent.session.prompt = f"{self.agent.session.prompt}\n\n上传的文件包含历史对话信息，可以从中获取一些经验信息。"
+
+    def _handle_local_mode(self):
+        """处理本地模式（不支持文件上传）"""
+        if self.agent.files:
+            PrettyOutput.print("不支持上传文件，将忽略文件列表", OutputType.WARNING)
+        if self.agent.use_methodology:
+            self._load_local_methodology()
+
+    def _load_local_methodology(self):
+        """加载本地方法论"""
+        msg = self.agent.session.prompt
+        for handler in self.agent.input_handler:
+            msg, _ = handler(msg, self.agent)
+
+        from jarvis.jarvis_agent.memory_manager import MemoryManager
+
+        memory_manager = MemoryManager(self.agent)
+        memory_tags_prompt = memory_manager.prepare_memory_tags_prompt()
+        methodology = load_methodology(msg, self.agent.get_tool_registry())
+        self.agent.session.prompt = f"{self.agent.session.prompt}\n\n以下是历史类似问题的执行经验，可参考：\n{methodology}{memory_tags_prompt}"
+
+    def handle_history_with_file_upload(self) -> str:
+        """使用文件上传方式处理历史"""
+        tmp_file_name = ""
+        try:
+            tmp_file = tempfile.NamedTemporaryFile(
+                delete=False, mode="w", encoding="utf-8"
+            )
+            tmp_file_name = tmp_file.name
+            tmp_file.write(self.agent.session.prompt)
+            tmp_file.close()
+
+            self.agent.clear_history()
+
+            if self.agent.model and self.agent.model.upload_files([tmp_file_name]):
+                return "上传的文件是历史对话信息，请基于历史对话信息继续完成任务。"
+            else:
+                return ""
+        finally:
+            if tmp_file_name and os.path.exists(tmp_file_name):
+                os.remove(tmp_file_name)