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

jarvis/jarvis_agent/events.py

@@ -0,0 +1,157 @@
+# -*- coding: utf-8 -*-
+"""
+事件主题与负载类型定义（jarvis_agent.events）
+
+目的：
+- 统一事件名称，避免在代码各处硬编码字符串导致的漂移
+- 提供事件负载的类型提示，便于静态检查与后续文档化
+- 本文件仅提供常量与类型定义，不改变现有行为
+"""
+from typing import Any, TypedDict, List
+
+# 事件主题常量
+BEFORE_TOOL_CALL = "before_tool_call"
+AFTER_TOOL_CALL = "after_tool_call"
+
+# 会话与任务生命周期相关
+TASK_STARTED = "task_started"
+TASK_COMPLETED = "task_completed"
+
+# 总结阶段
+BEFORE_SUMMARY = "before_summary"
+AFTER_SUMMARY = "after_summary"
+
+# 附加提示
+BEFORE_ADDON_PROMPT = "before_addon_prompt"
+AFTER_ADDON_PROMPT = "after_addon_prompt"
+
+# 历史清理
+BEFORE_HISTORY_CLEAR = "before_history_clear"
+AFTER_HISTORY_CLEAR = "after_history_clear"
+
+# 模型调用
+BEFORE_MODEL_CALL = "before_model_call"
+AFTER_MODEL_CALL = "after_model_call"
+
+# 其他
+INTERRUPT_TRIGGERED = "interrupt_triggered"
+BEFORE_TOOL_FILTER = "before_tool_filter"
+TOOL_FILTERED = "tool_filtered"
+
+
+# 事件负载类型（仅用于类型提示）
+class BeforeToolCallEvent(TypedDict, total=False):
+    agent: Any
+    current_response: str
+
+class AfterToolCallEvent(TypedDict, total=False):
+    agent: Any
+    current_response: str
+    need_return: bool
+    tool_prompt: str
+
+# 任务生命周期
+class TaskStartedEvent(TypedDict, total=False):
+    agent: Any
+    name: str
+    description: str
+    user_input: str
+
+class TaskCompletedEvent(TypedDict, total=False):
+    agent: Any
+    auto_completed: bool
+    need_summary: bool
+
+# 总结阶段
+class BeforeSummaryEvent(TypedDict, total=False):
+    agent: Any
+    prompt: str
+    auto_completed: bool
+    need_summary: bool
+
+class AfterSummaryEvent(TypedDict, total=False):
+    agent: Any
+    summary: str
+
+# 附加提示
+class BeforeAddonPromptEvent(TypedDict, total=False):
+    agent: Any
+    need_complete: bool
+    current_message: str
+    has_session_addon: bool
+
+class AfterAddonPromptEvent(TypedDict, total=False):
+    agent: Any
+    need_complete: bool
+    addon_text: str
+    final_message: str
+
+# 历史清理
+class BeforeHistoryClearEvent(TypedDict, total=False):
+    agent: Any
+
+class AfterHistoryClearEvent(TypedDict, total=False):
+    agent: Any
+
+# 模型调用
+class BeforeModelCallEvent(TypedDict, total=False):
+    agent: Any
+    message: str
+
+class AfterModelCallEvent(TypedDict, total=False):
+    agent: Any
+    message: str
+    response: str
+
+# 中断
+class InterruptTriggeredEvent(TypedDict, total=False):
+    agent: Any
+    current_response: str
+    user_input: str
+
+# 工具筛选
+class BeforeToolFilterEvent(TypedDict, total=False):
+    agent: Any
+    task: str
+    total_tools: int
+    threshold: int
+
+class ToolFilteredEvent(TypedDict, total=False):
+    agent: Any
+    task: str
+    selected_tools: List[str]
+    total_tools: int
+    threshold: int
+
+__all__ = [
+    "BEFORE_TOOL_CALL",
+    "AFTER_TOOL_CALL",
+    "TASK_STARTED",
+    "TASK_COMPLETED",
+    "BEFORE_SUMMARY",
+    "AFTER_SUMMARY",
+    "BEFORE_ADDON_PROMPT",
+    "AFTER_ADDON_PROMPT",
+    "BEFORE_HISTORY_CLEAR",
+    "AFTER_HISTORY_CLEAR",
+    "BEFORE_MODEL_CALL",
+    "AFTER_MODEL_CALL",
+    "INTERRUPT_TRIGGERED",
+    "BEFORE_TOOL_FILTER",
+    "TOOL_FILTERED",
+    "BeforeToolCallEvent",
+    "AfterToolCallEvent",
+    "TaskStartedEvent",
+    "TaskCompletedEvent",
+    "BeforeSummaryEvent",
+    "AfterSummaryEvent",
+    "BeforeAddonPromptEvent",
+    "AfterAddonPromptEvent",
+    "BeforeHistoryClearEvent",
+    "AfterHistoryClearEvent",
+    "BeforeModelCallEvent",
+    "AfterModelCallEvent",
+    "InterruptTriggeredEvent",
+    "BeforeToolFilterEvent",
+    "ToolFilteredEvent",
+]

jarvis/jarvis_agent/file_context_handler.py

@@ -0,0 +1,79 @@
+# -*- coding: utf-8 -*-
+import re
+import os
+from typing import Any, Tuple
+
+from jarvis.jarvis_tools.read_code import ReadCodeTool
+
+
+def is_text_file(filepath: str) -> bool:
+    """
+    Check if a file is a text file.
+    """
+    try:
+        with open(filepath, "r", encoding="utf-8") as f:
+            f.read(1024)  # Try to read a small chunk
+        return True
+    except (UnicodeDecodeError, IOError):
+        return False
+
+
+def count_lines(filepath: str) -> int:
+    """
+    Count the number of lines in a file.
+    """
+    try:
+        with open(filepath, "r", encoding="utf-8", errors="ignore") as f:
+            return sum(1 for _ in f)
+    except IOError:
+        return 0
+
+
+def file_context_handler(user_input: str, agent_: Any) -> Tuple[str, bool]:
+    """
+    Extracts file paths from the input, reads their content if they are valid text files
+    and appends the content to the input.
+
+    Args:
+        user_input: The user's input string.
+        agent_: The agent instance.
+
+    Returns:
+        A tuple containing the modified user input and a boolean indicating if
+        further processing should be skipped.
+    """
+    # Regex to find paths in single quotes
+    raw_paths = re.findall(r"'([^']+)'", user_input)
+    # Convert to absolute paths and de-duplicate by absolute path while preserving order
+    abs_to_raws: dict[str, list[str]] = {}
+    file_paths = []
+    for _raw in raw_paths:
+        abs_path = os.path.abspath(_raw)
+        if abs_path not in abs_to_raws:
+            abs_to_raws[abs_path] = []
+            file_paths.append(abs_path)
+        abs_to_raws[abs_path].append(_raw)
+
+    if not file_paths:
+        return user_input, False
+
+    added_context = ""
+    read_code_tool = ReadCodeTool()
+
+    for abs_path in file_paths:
+        if os.path.isfile(abs_path) and is_text_file(abs_path):
+            line_count = count_lines(abs_path)
+            if line_count > 0:
+                # Use ReadCodeTool to get formatted content
+                result = read_code_tool._handle_single_file(abs_path)
+                if result["success"]:
+                    # Remove all original path tokens that map to this absolute path to avoid redundancy
+                    for _raw in abs_to_raws.get(abs_path, []):
+                        user_input = user_input.replace(f"'{_raw}'", "")
+                    # Append the full, formatted output from the tool, which includes headers and line numbers
+                    added_context += "\n" + result["stdout"]
+
+    if added_context:
+        user_input = user_input.strip() + added_context
+
+    return user_input, False

jarvis/jarvis_agent/file_methodology_manager.py

@@ -0,0 +1,117 @@
+# -*- coding: utf-8 -*-
+"""
+文件和方法论管理器模块
+负责处理文件上传和方法论加载功能
+"""
+import os
+import tempfile
+
+from jarvis.jarvis_utils.methodology import load_methodology, upload_methodology
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+from jarvis.jarvis_agent.utils import join_prompts
+
+
+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:
+            # 上传成功
+
+            if self.agent.files:
+                self.agent.session.prompt = join_prompts([
+                    self.agent.session.prompt,
+                    "上传的文件包含历史对话信息和方法论文件，可以从中获取一些经验信息。"
+                ])
+            else:
+                self.agent.session.prompt = join_prompts([
+                    self.agent.session.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 = join_prompts([
+                self.agent.session.prompt,
+                "上传的文件包含历史对话信息，可以从中获取一些经验信息。"
+            ])
+
+    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
+
+        MemoryManager(self.agent)
+        methodology = load_methodology(
+            msg,
+            self.agent.get_tool_registry(),
+            platform_name=self.agent.model.platform_name(),
+            model_name=self.agent.model.name(),
+        )
+        self.agent.session.prompt = join_prompts([
+            self.agent.session.prompt,
+            f"以下是历史类似问题的执行经验，可参考：\n{methodology}"
+        ])
+
+    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)