jarvis-ai-assistant 0.1.195__tar.gz → 0.1.197__tar.gz

{jarvis_ai_assistant-0.1.195/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.197}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.1.195
+Version: 0.1.197
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -538,6 +538,7 @@ OPENAI_API_BASE: https://api.openai.com/v1
 | `JARVIS_PRINT_PROMPT` | false | 是否打印提示 |
 | `JARVIS_USE_METHODOLOGY` | true | 是否启用方法论功能 |
 | `JARVIS_USE_ANALYSIS` | true | 是否启用任务分析功能 |
+| `JARVIS_USE_HISTORY_COUNT` | 0 | 使用N次历史记录作为上下文记忆 |
 | `JARVIS_DATA_PATH` | ~/.jarvis | Jarvis数据存储目录路径 |
 
 ## 🛠️ 工具说明 <a id="tools"></a>

{jarvis_ai_assistant-0.1.195 → jarvis_ai_assistant-0.1.197}/README.md

@@ -468,6 +468,7 @@ OPENAI_API_BASE: https://api.openai.com/v1
 | `JARVIS_PRINT_PROMPT` | false | 是否打印提示 |
 | `JARVIS_USE_METHODOLOGY` | true | 是否启用方法论功能 |
 | `JARVIS_USE_ANALYSIS` | true | 是否启用任务分析功能 |
+| `JARVIS_USE_HISTORY_COUNT` | 0 | 使用N次历史记录作为上下文记忆 |
 | `JARVIS_DATA_PATH` | ~/.jarvis | Jarvis数据存储目录路径 |
 
 ## 🛠️ 工具说明 <a id="tools"></a>

{jarvis_ai_assistant-0.1.195 → jarvis_ai_assistant-0.1.197}/pyproject.toml

@@ -8,7 +8,7 @@ default = true
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.195"
+version = "0.1.197"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "skyfire", email = "skyfireitdiy@hotmail.com" }]

{jarvis_ai_assistant-0.1.195 → jarvis_ai_assistant-0.1.197}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.195",
+    version="0.1.197",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",

{jarvis_ai_assistant-0.1.195 → jarvis_ai_assistant-0.1.197}/src/jarvis/__init__.py

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

{jarvis_ai_assistant-0.1.195 → jarvis_ai_assistant-0.1.197}/src/jarvis/jarvis_agent/__init__.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 # 标准库导入
 import datetime
+import os
 from pathlib import Path
 import platform
 from typing import Any, Callable, Dict, List, Optional, Protocol, Tuple, Union
@@ -18,7 +19,7 @@ from jarvis.jarvis_utils.config import (get_data_dir, get_max_token_count,
                                         get_max_tool_call_count,
                                         is_auto_complete,
                                         is_execute_tool_confirm,
-                                        is_use_analysis, is_use_methodology)
+                                        is_use_analysis, get_history_count, 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,
@@ -159,6 +160,7 @@ class Agent:
         use_methodology: Optional[bool] = None,
         use_analysis: Optional[bool] = None,
         files: List[str] = [],
+        history_count: Optional[int] = None,
     ):
         self.files = files
         """初始化Jarvis Agent实例
@@ -238,7 +240,11 @@ class Agent:
         self.after_tool_call_cb: Optional[Callable[[Agent], None]] = None
 
         self.history = JarvisHistory()
-        self.history.start_record(str(Path(get_data_dir())/"history"))
+        self.history_dir = str(Path(get_data_dir())/"history")
+        self.history.start_record(self.history_dir)
+
+        self.history_count = history_count if history_count is not None else get_history_count()
+
 
         self.execute_tool_confirm = (
             execute_tool_confirm
@@ -467,13 +473,25 @@ class Agent:
         注意:
             当上下文长度超过最大值时使用
         """
-        summary = self.generate_summary()
-        self.clear_history()  # type: ignore
+        need_summary = True
+        tmp_file_name = ""
+        try:
+            if self.model and self.model.support_upload_files():
+                need_summary = False
+            if need_summary:
+                summary = self.generate_summary()
+            else:
+                import tempfile
+                tmp_file = tempfile.NamedTemporaryFile(delete=False)
+                tmp_file_name = tmp_file.name
+                self.history.save_history(tmp_file_name)
+            self.clear_history()  # type: ignore
 
-        if not summary:
-            return ""
+            if need_summary:
+                if not summary:
+                    return ""
 
-        return f"""
+                return f"""
 以下是之前对话的关键信息总结：
 
 <content>
@@ -481,7 +499,15 @@ class Agent:
 </content>
 
 请基于以上信息继续完成任务。请注意，这是之前对话的摘要，上下文长度已超过限制而被重置。请直接继续任务，无需重复已完成的步骤。如有需要，可以询问用户以获取更多信息。
-"""
+        """
+            else:
+                if self.model and self.model.upload_files([tmp_file_name]):
+                    return "上传的文件是历史对话信息，请基于历史对话信息继续完成任务。"
+                else:
+                    return ""
+        finally:
+            if tmp_file_name:
+                os.remove(tmp_file_name)
 
     def _call_tools(self, response: str) -> Tuple[bool, Any]:
         """调用工具执行响应
@@ -782,31 +808,9 @@ arguments:
             set_agent(self.name, self)
 
             while True:
+                history_md = ""
                 if self.first:
-                    # 如果有上传文件，先上传文件
-                    if self.model and self.model.support_upload_files():
-                        if self.use_methodology:
-                            if not upload_methodology(self.model, other_files=self.files):
-                                if self.files:
-                                    PrettyOutput.print("文件上传失败，将忽略文件列表", OutputType.WARNING)
-                                # 上传失败则回退到本地加载
-                                msg = self.prompt
-                                for handler in self.input_handler:
-                                    msg, _ = handler(msg, self)
-                                self.prompt = f"{self.prompt}\n\n以下是历史类似问题的执行经验，可参考：\n{load_methodology(msg, self.get_tool_registry())}"
-                        elif self.files:
-                            if not self.model.upload_files(self.files):
-                                PrettyOutput.print("文件上传失败，将忽略文件列表", OutputType.WARNING)
-                    else:
-                        if self.files:
-                            PrettyOutput.print("不支持上传文件，将忽略文件列表", OutputType.WARNING)
-                        if self.use_methodology:
-                            msg = self.prompt
-                            for handler in self.input_handler:
-                                msg, _ = handler(msg, self)
-                            self.prompt = f"{self.prompt}\n\n以下是历史类似问题的执行经验，可参考：\n{load_methodology(msg, self.get_tool_registry())}"
-
-                    self.first = False
+                    history_md = self._first_run()
                 try:
                     current_response = self._call_model(self.prompt, True)
                     self.prompt = ""
@@ -849,6 +853,8 @@ arguments:
                         return self._complete_task()
 
                 except Exception as e:
+                    if history_md:
+                        os.remove(history_md)
                     PrettyOutput.print(f"任务失败: {str(e)}", OutputType.ERROR)
                     return f"Task failed: {str(e)}"
 
@@ -856,6 +862,41 @@ arguments:
             PrettyOutput.print(f"任务失败: {str(e)}", OutputType.ERROR)
             return f"Task failed: {str(e)}"
 
+    def _first_run(self):
+        history_md = ""
+        if self.history_count > 0 and self.model and self.model.support_upload_files():
+            import tempfile
+            timestamp = datetime.datetime.now().strftime("%Y%m%d_%H%M%S")
+            history_md = str(Path(tempfile.gettempdir())/f"{self.name}_history_{timestamp}.md")
+            self.history.export_history_to_markdown(tempfile.gettempdir(), history_md, max_files=self.history_count)
+            self.files.append(history_md)
+
+                        # 如果有上传文件，先上传文件
+        if self.model and self.model.support_upload_files():
+            if self.use_methodology:
+                if not upload_methodology(self.model, other_files=self.files):
+                    if self.files:
+                        PrettyOutput.print("文件上传失败，将忽略文件列表", OutputType.WARNING)
+                                    # 上传失败则回退到本地加载
+                    msg = self.prompt
+                    for handler in self.input_handler:
+                        msg, _ = handler(msg, self)
+                    self.prompt = f"{self.prompt}\n\n以下是历史类似问题的执行经验，可参考：\n{load_methodology(msg, self.get_tool_registry())}"
+            elif self.files:
+                if not self.model.upload_files(self.files):
+                    PrettyOutput.print("文件上传失败，将忽略文件列表", OutputType.WARNING)
+        else:
+            if self.files:
+                PrettyOutput.print("不支持上传文件，将忽略文件列表", OutputType.WARNING)
+            if self.use_methodology:
+                msg = self.prompt
+                for handler in self.input_handler:
+                    msg, _ = handler(msg, self)
+                self.prompt = f"{self.prompt}\n\n以下是历史类似问题的执行经验，可参考：\n{load_methodology(msg, self.get_tool_registry())}"
+
+        self.first = False
+        return history_md
+
     def clear_history(self):
         """清空对话历史但保留系统提示
 

{jarvis_ai_assistant-0.1.195 → jarvis_ai_assistant-0.1.197}/src/jarvis/jarvis_data/config_schema.json

@@ -201,6 +201,11 @@
       "description": "是否打印提示",
       "default": false
     },
+    "JARVIS_USE_HISTORY_COUNT": {
+      "type": "number",
+      "description": "使用的历史记录数量",
+      "default": 0
+    },
     "JARVIS_REPLACE_MAP": {
       "type": "object",
       "description": "自定义替换映射表配置",

{jarvis_ai_assistant-0.1.195 → jarvis_ai_assistant-0.1.197}/src/jarvis/jarvis_utils/config.py

@@ -265,6 +265,16 @@ def is_print_prompt() -> bool:
     return GLOBAL_CONFIG_DATA.get("JARVIS_PRINT_PROMPT", False) == True
 
 
+def get_history_count() -> int:
+    """
+    获取是否启用历史记录功能。
+
+    返回：
+        bool: 如果启用历史记录则返回True，默认为False
+    """
+    return GLOBAL_CONFIG_DATA.get("JARVIS_USE_HISTORY_COUNT", 0)
+
+
 def get_mcp_config() -> List[Dict[str, Any]]:
     """
     获取MCP配置列表。

jarvis_ai_assistant-0.1.197/src/jarvis/jarvis_utils/jarvis_history.py

@@ -0,0 +1,98 @@
+import glob
+import os
+from datetime import datetime
+from typing import Dict, List, Optional, Union
+
+import yaml
+
+
+class JarvisHistory:
+    def __init__(self):
+        self.records: List[Dict[str, str]] = []
+        self.current_file: Optional[str] = None
+
+    def start_record(self, data_dir: str) -> None:
+        """Start a new recording session with timestamped filename"""
+        timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
+        self.current_file = os.path.join(data_dir, f"history_{timestamp}.yaml")
+        self.records = []
+
+    def append_msg(self, role: str, msg: str) -> None:
+        """Append a message to current recording session"""
+        if not self.current_file:
+            raise RuntimeError("Recording not started. Call start_record first.")
+        self.records.append({"role": role, "message": msg})
+
+    def save_history(self, filename: str) -> None:
+        """Save recorded messages to YAML file"""
+
+        # Skip saving if records is empty
+        if not self.records:
+            return
+
+        # Ensure directory exists
+        os.makedirs(os.path.dirname(filename), exist_ok=True)
+
+        with open(filename, "w") as f:
+            yaml.safe_dump({"conversation": self.records}, f, allow_unicode=True)
+
+    def stop_record(self) -> None:
+        """Stop recording session and save messages"""
+        if not self.current_file:
+            raise RuntimeError("No recording session to stop.")
+
+        self.save_history(self.current_file)
+        self.current_file = None
+        self.records = []
+
+    @staticmethod
+    def export_history_to_markdown(
+        input_dir: str, output_file: str, max_files: Optional[int] = None
+    ) -> None:
+        """
+        Export all history files in the directory to a single markdown file
+
+        Args:
+            input_dir: Directory containing history YAML files
+            output_file: Path to output markdown file
+            max_files: Maximum number of history files to export (None for all)
+        """
+        # Find all history files in the directory
+        history_files = glob.glob(os.path.join(input_dir, "history_*.yaml"))
+
+        if not history_files:
+            raise FileNotFoundError(f"No history files found in {input_dir}")
+
+        # Sort files by modification time (newest first) and limit to max_files
+        history_files.sort(key=os.path.getmtime, reverse=True)
+        if max_files is not None:
+            history_files = history_files[:max_files]
+
+        # Ensure output directory exists
+        os.makedirs(os.path.dirname(output_file), exist_ok=True)
+
+        with open(output_file, "w", encoding="utf-8") as md_file:
+            md_file.write("# Jarvis Conversation History\n\n")
+
+            for history_file in sorted(history_files):
+                # Read YAML file
+                with open(history_file, "r", encoding="utf-8") as f:
+                    data = yaml.safe_load(f)
+
+                if not data or "conversation" not in data:
+                    continue
+
+                # Write file header with timestamp from filename
+                timestamp = os.path.basename(history_file)[
+                    8:-5
+                ]  # Extract timestamp from "history_YYYYMMDD_HHMMSS.yaml"
+                md_file.write(
+                    f"## Conversation at {timestamp[:4]}-{timestamp[4:6]}-{timestamp[6:8]} "
+                    f"{timestamp[9:11]}:{timestamp[11:13]}:{timestamp[13:15]}\n\n"
+                )
+
+                # Write conversation messages
+                for msg in data["conversation"]:
+                    md_file.write(f"**{msg['role']}**: {msg['message']}\n\n")
+
+                md_file.write("\n---\n\n")

{jarvis_ai_assistant-0.1.195 → jarvis_ai_assistant-0.1.197/src/jarvis_ai_assistant.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.1.195
+Version: 0.1.197
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -538,6 +538,7 @@ OPENAI_API_BASE: https://api.openai.com/v1
 | `JARVIS_PRINT_PROMPT` | false | 是否打印提示 |
 | `JARVIS_USE_METHODOLOGY` | true | 是否启用方法论功能 |
 | `JARVIS_USE_ANALYSIS` | true | 是否启用任务分析功能 |
+| `JARVIS_USE_HISTORY_COUNT` | 0 | 使用N次历史记录作为上下文记忆 |
 | `JARVIS_DATA_PATH` | ~/.jarvis | Jarvis数据存储目录路径 |
 
 ## 🛠️ 工具说明 <a id="tools"></a>

jarvis_ai_assistant-0.1.195/src/jarvis/jarvis_utils/jarvis_history.py

@@ -1,43 +0,0 @@
-import os
-from datetime import datetime
-from typing import Dict, List, Optional
-
-import yaml
-
-
-class JarvisHistory:
-    def __init__(self):
-        self.records: List[Dict[str, str]] = []
-        self.current_file: Optional[str] = None
-
-    def start_record(self, data_dir: str) -> None:
-        """Start a new recording session with timestamped filename"""
-        timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
-        self.current_file = os.path.join(data_dir, f"history_{timestamp}.yaml")
-        self.records = []
-
-    def append_msg(self, role: str, msg: str) -> None:
-        """Append a message to current recording session"""
-        if not self.current_file:
-            raise RuntimeError("Recording not started. Call start_record first.")
-        self.records.append({"role": role, "message": msg})
-
-    def stop_record(self) -> None:
-        """Save recorded messages to YAML file"""
-        if not self.current_file:
-            raise RuntimeError("No recording session to stop.")
-
-        # Skip saving if records is empty
-        if not self.records:
-            self.current_file = None
-            self.records = []
-            return
-
-        # Ensure directory exists
-        os.makedirs(os.path.dirname(self.current_file), exist_ok=True)
-
-        with open(self.current_file, "w") as f:
-            yaml.safe_dump({"conversation": self.records}, f, allow_unicode=True)
-
-        self.current_file = None
-        self.records = []