jarvis-ai-assistant 0.3.12__tar.gz → 0.3.13__tar.gz

{jarvis_ai_assistant-0.3.12/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.3.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.3.12
+Version: 0.3.13
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire

{jarvis_ai_assistant-0.3.12 → jarvis_ai_assistant-0.3.13}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.3.12"
+version = "0.3.13"
 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.3.12 → jarvis_ai_assistant-0.3.13}/setup.py

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

{jarvis_ai_assistant-0.3.12 → jarvis_ai_assistant-0.3.13}/src/jarvis/__init__.py

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

{jarvis_ai_assistant-0.3.12 → jarvis_ai_assistant-0.3.13}/src/jarvis/jarvis_agent/__init__.py

@@ -180,11 +180,11 @@ origin_agent_system_prompt = f"""
 
 
 class Agent:
-    def clear(self):
+    def clear_history(self):
         """
         Clears the current conversation history by delegating to the session manager.
         """
-        self.session.clear()
+        self.session.clear_history()
 
     def __del__(self):
         # 只有在记录启动时才停止记录
@@ -284,7 +284,9 @@ class Agent:
 
         self.model = PlatformRegistry().create_platform(platform_name)
         if self.model is None:
-            PrettyOutput.print(f"平台 {platform_name} 不存在，将使用普通模型", OutputType.WARNING)
+            PrettyOutput.print(
+                f"平台 {platform_name} 不存在，将使用普通模型", OutputType.WARNING
+            )
             self.model = PlatformRegistry().get_normal_platform()
 
         if model_name:
@@ -715,12 +717,18 @@ class Agent:
                     if isinstance(interrupt_result, tuple):
                         run_input_handlers, should_continue = interrupt_result
                         if should_continue:
+                            self.run_input_handlers_next_turn = True
                             continue
                     else:
                         return interrupt_result
 
                 # 处理工具调用
-                need_return, self.session.prompt = self._call_tools(current_response)
+                need_return, prompt = self._call_tools(current_response)
+                if self.session.prompt and prompt:
+                    self.session.prompt += "\n\n" + prompt
+                else:
+                    self.session.prompt = prompt
+
                 if need_return:
                     return self.session.prompt
 
@@ -785,7 +793,9 @@ class Agent:
         返回:
             str: "continue" 或 "complete"
         """
-        user_input = self.multiline_inputer(f"{self.name}: 请输入，或输入空行来结束当前任务：")
+        user_input = self.multiline_inputer(
+            f"{self.name}: 请输入，或输入空行来结束当前任务："
+        )
 
         if user_input:
             self.session.prompt = user_input
@@ -871,9 +881,3 @@ class Agent:
             organizer.organize_memories(memory_type, min_overlap=3)
         else:
             PrettyOutput.print(f"已取消 '{scope_name}' 记忆库整理。", OutputType.INFO)
-
-    def clear_history(self):
-        """
-        Clears conversation history by delegating to the session manager.
-        """
-        self.session.clear_history()

{jarvis_ai_assistant-0.3.12 → jarvis_ai_assistant-0.3.13}/src/jarvis/jarvis_agent/builtin_input_handler.py

@@ -43,7 +43,7 @@ def builtin_input_handler(user_input: str, agent_: Any) -> Tuple[str, bool]:
                 prompt = memory_tags_prompt
             return prompt, True
         elif tag == "Clear":
-            agent.clear()
+            agent.clear_history()
             return "", True
         elif tag == "ToolUsage":
             agent.set_addon_prompt(agent.get_tool_usage_prompt())

{jarvis_ai_assistant-0.3.12 → jarvis_ai_assistant-0.3.13}/src/jarvis/jarvis_agent/session_manager.py

@@ -34,14 +34,6 @@ class SessionManager:
         """Sets the addon prompt for the next model call."""
         self.addon_prompt = addon_prompt
 
-    def clear(self):
-        """
-        Clears the current conversation history, prompt, and length counter.
-        """
-        self.model.reset()
-        self.conversation_length = 0
-        self.prompt = ""
-
     def save_session(self) -> bool:
         """Saves the current session state to a file."""
         session_dir = os.path.join(os.getcwd(), ".jarvis")

{jarvis_ai_assistant-0.3.12 → jarvis_ai_assistant-0.3.13/src/jarvis_ai_assistant.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.3.12
+Version: 0.3.13
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire