jarvis-ai-assistant 0.1.196__py3-none-any.whl → 0.1.198__py3-none-any.whl

jarvis/__init__.py

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

jarvis/jarvis_agent/__init__.py

@@ -473,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>
@@ -487,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]:
         """调用工具执行响应
@@ -848,7 +868,7 @@ arguments:
             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.history.export_history_to_markdown(self.history_dir, history_md, max_files=self.history_count)
             self.files.append(history_md)
 
                         # 如果有上传文件，先上传文件
@@ -862,9 +882,16 @@ arguments:
                     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())}"
+                else:
+                    if self.files:
+                        self.prompt = f"{self.prompt}\n\n上传的文件包含历史对话信息和方法论文件，可以从中获取一些经验信息。"
+                    else:
+                        self.prompt = f"{self.prompt}\n\n上传的文件包含历史对话信息，可以从中获取一些经验信息。"
             elif self.files:
                 if not self.model.upload_files(self.files):
                     PrettyOutput.print("文件上传失败，将忽略文件列表", OutputType.WARNING)
+                else:
+                    self.prompt = f"{self.prompt}\n\n上传的文件包含历史对话信息，可以从中获取一些经验信息。"
         else:
             if self.files:
                 PrettyOutput.print("不支持上传文件，将忽略文件列表", OutputType.WARNING)

jarvis/jarvis_utils/jarvis_history.py

@@ -23,23 +23,25 @@ class JarvisHistory:
             raise RuntimeError("Recording not started. Call start_record first.")
         self.records.append({"role": role, "message": msg})
 
-    def stop_record(self) -> None:
+    def save_history(self, filename: str) -> 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)
+        os.makedirs(os.path.dirname(filename), exist_ok=True)
 
-        with open(self.current_file, "w") as f:
+        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 = []
 

{jarvis_ai_assistant-0.1.196.dist-info → jarvis_ai_assistant-0.1.198.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.1.196
+Version: 0.1.198
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -538,7 +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` | false | 是否启用历史记录功能 |
+| `JARVIS_USE_HISTORY_COUNT` | 0 | 使用N次历史记录作为上下文记忆 |
 | `JARVIS_DATA_PATH` | ~/.jarvis | Jarvis数据存储目录路径 |
 
 ## 🛠️ 工具说明 <a id="tools"></a>

{jarvis_ai_assistant-0.1.196.dist-info → jarvis_ai_assistant-0.1.198.dist-info}/RECORD

@@ -1,5 +1,5 @@
-jarvis/__init__.py,sha256=kYWJwIMa2ypcsRdrrfHUmeaXSvmV7v53HTQlUE3nCcs,75
-jarvis/jarvis_agent/__init__.py,sha256=l826UsXr8_hVj9RSaOnJtkDgnINWnOzLltRTBcMO0l8,32501
+jarvis/__init__.py,sha256=Ir1_uW7TcquoBOm25uhvdYhSDr2TWwS0R_QGOUXidP0,75
+jarvis/jarvis_agent/__init__.py,sha256=3CfmmDU9ccEtJmRAtY86cdBm6NUYWatAsbgQFjs0t6M,33880
 jarvis/jarvis_agent/builtin_input_handler.py,sha256=4CCEtVLRBIpkhDUKd54VcX1JFCIWCvDqDh4B1H-eSn0,2187
 jarvis/jarvis_agent/jarvis.py,sha256=GH2zi8eXNpW8twiY3LKDEZgGmFC5geB0jlkwFrm7hOQ,6279
 jarvis/jarvis_agent/main.py,sha256=c6bQe-8LXvW2-NBn9Rn_yPYdrwnkJ8KQaSFY2cPvkxw,2775
@@ -85,14 +85,14 @@ jarvis/jarvis_utils/file_processors.py,sha256=XiM248SHS7lLgQDCbORVFWqinbVDUawYxW
 jarvis/jarvis_utils/git_utils.py,sha256=F1558EbJ3dRl12DMwmT24XjkC8XqddBjhpWxLgyI0aI,15688
 jarvis/jarvis_utils/globals.py,sha256=9NTMfCVd0jvtloOv14-KE6clhcVStFmyN9jWxLmQ5so,3369
 jarvis/jarvis_utils/input.py,sha256=WOs9hYSiZE3ao5K-UJmC7KyZByYnC1opHGJTUZm7DVo,7884
-jarvis/jarvis_utils/jarvis_history.py,sha256=TCfxJvEP321iY5CFpEOxo6sVKNw5tWEQFaWf9cV4Als,3597
+jarvis/jarvis_utils/jarvis_history.py,sha256=Td6cmze9Oc5-Ewz0l9RKYeSg_-fbEu9ZhyEueHEMcLY,3664
 jarvis/jarvis_utils/methodology.py,sha256=MhPrMxMqElyAn54BDfpQdUqrRr7IbSlrLvAI39LCgTM,8487
 jarvis/jarvis_utils/output.py,sha256=PRCgudPOB8gMEP3u-g0FGD2c6tBgJhLXUMqNPglfjV8,10813
 jarvis/jarvis_utils/tag.py,sha256=f211opbbbTcSyzCDwuIK_oCnKhXPNK-RknYyGzY1yD0,431
 jarvis/jarvis_utils/utils.py,sha256=55kIbFXPFEd6770mdy2fZDh96XH0rIFJw2w3rYhE2Cc,11895
-jarvis_ai_assistant-0.1.196.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.196.dist-info/METADATA,sha256=xGxSUcjUBvI2jzh5z_dv6hoOKgjouRgtaNpCQijpA5s,20200
-jarvis_ai_assistant-0.1.196.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jarvis_ai_assistant-0.1.196.dist-info/entry_points.txt,sha256=Gy3DOP1PYLMK0GCj4rrP_9lkOyBQ39EK_lKGUSwn41E,869
-jarvis_ai_assistant-0.1.196.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.196.dist-info/RECORD,,
+jarvis_ai_assistant-0.1.198.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.198.dist-info/METADATA,sha256=DuyATtZZbn9V7qS0YtIBAfsp1a9bBfkL9Agp21YUeWk,20215
+jarvis_ai_assistant-0.1.198.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jarvis_ai_assistant-0.1.198.dist-info/entry_points.txt,sha256=Gy3DOP1PYLMK0GCj4rrP_9lkOyBQ39EK_lKGUSwn41E,869
+jarvis_ai_assistant-0.1.198.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.198.dist-info/RECORD,,