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

{jarvis_ai_assistant-0.3.11/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.11
+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.11 → 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.11"
+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.11 → 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.11",
+    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.11 → jarvis_ai_assistant-0.3.13}/src/jarvis/__init__.py

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

{jarvis_ai_assistant-0.3.11 → 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):
         # 只有在记录启动时才停止记录
@@ -444,9 +444,10 @@ class Agent:
             4. 会检查并处理上下文长度限制
         """
         # 处理输入
-        message = self._process_input(message, run_input_handlers)
-        if run_input_handlers and self._should_return_early(message):
-            return message
+        if run_input_handlers:
+            message = self._process_input(message)
+            if not message:
+                return ""
 
         # 添加附加提示
         message = self._add_addon_prompt(message, need_complete)
@@ -459,21 +460,16 @@ class Agent:
 
         return response
 
-    def _process_input(self, message: str, run_input_handlers: bool) -> str:
+    def _process_input(self, message: str) -> str:
         """处理输入消息"""
-        if run_input_handlers:
-            for handler in self.input_handler:
-                message, need_return = handler(message, self)
-                if need_return:
-                    self._last_handler_returned = True
-                    return message
+        for handler in self.input_handler:
+            message, need_return = handler(message, self)
+            if need_return:
+                self._last_handler_returned = True
+                return message
         self._last_handler_returned = False
         return message
 
-    def _should_return_early(self, message: str) -> bool:
-        """检查是否需要提前返回"""
-        return hasattr(self, "_last_handler_returned") and self._last_handler_returned
-
     def _add_addon_prompt(self, message: str, need_complete: bool) -> str:
         """添加附加提示到消息"""
         if self.session.addon_prompt:
@@ -561,12 +557,19 @@ class Agent:
     def _handle_history_with_summary(self) -> str:
         """使用摘要方式处理历史"""
         summary = self.generate_summary()
-        self.clear_history()
 
-        if not summary:
-            return ""
+        # 先获取格式化的摘要消息
+        formatted_summary = ""
+        if summary:
+            formatted_summary = self._format_summary_message(summary)
+
+        # 清理历史（但不清理prompt，因为prompt会在builtin_input_handler中设置）
+        if self.model:
+            self.model.reset()
+        # 重置会话
+        self.session.clear_history()
 
-        return self._format_summary_message(summary)
+        return formatted_summary
 
     def _handle_history_with_file_upload(self) -> str:
         """使用文件上传方式处理历史"""
@@ -704,6 +707,7 @@ class Agent:
                 current_response = self._call_model(
                     self.session.prompt, True, run_input_handlers
                 )
+
                 self.session.prompt = ""
                 run_input_handlers = False
 
@@ -713,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
 
@@ -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.11 → jarvis_ai_assistant-0.3.13}/src/jarvis/jarvis_agent/builtin_input_handler.py

@@ -32,10 +32,18 @@ def builtin_input_handler(user_input: str, agent_: Any) -> Tuple[str, bool]:
     for tag in special_tags:
         # 优先处理特殊标记
         if tag == "Summary":
-            agent._summarize_and_clear_history()
-            return "", True
+            summary = agent._summarize_and_clear_history()
+            memory_tags_prompt = agent.memory_manager.prepare_memory_tags_prompt()
+            prompt = ""
+            if summary:
+                # 将摘要和记忆标签设置为新会话的初始提示
+                prompt = summary + "\n" + memory_tags_prompt
+            else:
+                # 即使没有摘要，也确保设置记忆标签作为新会话的初始提示
+                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.11 → jarvis_ai_assistant-0.3.13}/src/jarvis/jarvis_agent/file_methodology_manager.py

@@ -48,13 +48,10 @@ class FileMethodologyManager:
             # 上传成功
             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}"
+                self.agent.session.prompt = f"{self.agent.session.prompt}\n\n上传的文件包含历史对话信息和方法论文件，可以从中获取一些经验信息。"
             else:
-                self.agent.session.prompt = f"{self.agent.session.prompt}\n\n上传的文件包含历史对话信息，可以从中获取一些经验信息。{memory_tags_prompt}"
+                self.agent.session.prompt = f"{self.agent.session.prompt}\n\n上传的文件包含历史对话信息，可以从中获取一些经验信息。"
 
     def _handle_files_upload(self):
         """处理普通文件上传"""
@@ -79,14 +76,13 @@ class FileMethodologyManager:
         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(),
             platform_name=self.agent.model.platform_name(),
             model_name=self.agent.model.name(),
         )
-        self.agent.session.prompt = f"{self.agent.session.prompt}\n\n以下是历史类似问题的执行经验，可参考：\n{methodology}{memory_tags_prompt}"
+        self.agent.session.prompt = f"{self.agent.session.prompt}\n\n以下是历史类似问题的执行经验，可参考：\n{methodology}"
 
     def handle_history_with_file_upload(self) -> str:
         """使用文件上传方式处理历史"""

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

@@ -19,21 +19,18 @@ def run_cli(
     ctx: typer.Context,
     llm_type: str = typer.Option(
         "normal",
-        "-t", "--llm-type",
+        "-t",
+        "--llm-type",
         help="使用的LLM类型，可选值：'normal'（普通）或 'thinking'（思考模式）",
     ),
-    task: Optional[str] = typer.Option(
-        None, "-T", "--task", help="从命令行直接输入任务内容"
-    ),
+    task: Optional[str] = typer.Option(None, "-T", "--task", help="从命令行直接输入任务内容"),
     model_group: Optional[str] = typer.Option(
         None, "-g", "--llm-group", help="使用的模型组，覆盖配置文件中的设置"
     ),
     tool_group: Optional[str] = typer.Option(
         None, "-G", "--tool-group", help="使用的工具组，覆盖配置文件中的设置"
     ),
-    config_file: Optional[str] = typer.Option(
-        None, "-f", "--config", help="自定义配置文件路径"
-    ),
+    config_file: Optional[str] = typer.Option(None, "-f", "--config", help="自定义配置文件路径"),
     restore_session: bool = typer.Option(
         False,
         "--restore-session",
@@ -43,9 +40,7 @@ def run_cli(
     share_methodology: bool = typer.Option(
         False, "--share-methodology", help="分享本地方法论到中心方法论仓库"
     ),
-    share_tool: bool = typer.Option(
-        False, "--share-tool", help="分享本地工具到中心工具仓库"
-    ),
+    share_tool: bool = typer.Option(False, "--share-tool", help="分享本地工具到中心工具仓库"),
 ) -> None:
     """Jarvis AI assistant command-line interface."""
     if ctx.invoked_subcommand is not None:
@@ -59,21 +54,19 @@ def run_cli(
     # 处理方法论分享
     if share_methodology:
         init_env("", config_file=config_file)  # 初始化配置但不显示欢迎信息
-        manager = MethodologyShareManager()
-        manager.run()
+        methodology_manager = MethodologyShareManager()
+        methodology_manager.run()
         return
 
     # 处理工具分享
     if share_tool:
         init_env("", config_file=config_file)  # 初始化配置但不显示欢迎信息
-        manager = ToolShareManager()
-        manager.run()
+        tool_manager = ToolShareManager()
+        tool_manager.run()
         return
 
     # 初始化环境
-    init_env(
-        "欢迎使用 Jarvis AI 助手，您的智能助理已准备就绪！", config_file=config_file
-    )
+    init_env("欢迎使用 Jarvis AI 助手，您的智能助理已准备就绪！", config_file=config_file)
 
     # 运行主流程
     try:

{jarvis_ai_assistant-0.3.11 → 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.11 → jarvis_ai_assistant-0.3.13}/src/jarvis/jarvis_agent/share_manager.py

@@ -2,7 +2,7 @@
 """分享管理模块，负责工具和方法论的分享功能"""
 import os
 import subprocess
-from typing import List, Dict, Any
+from typing import List, Dict, Any, Set
 from abc import ABC, abstractmethod
 
 from prompt_toolkit import prompt
@@ -16,7 +16,7 @@ def parse_selection(selection_str: str, max_value: int) -> List[int]:
 
     例如: "1,2,3,4-9,20" -> [1, 2, 3, 4, 5, 6, 7, 8, 9, 20]
     """
-    selected: set[int] = set()
+    selected: Set[int] = set()
     parts = selection_str.split(",")
 
     for part in parts:
@@ -73,13 +73,15 @@ class ShareManager(ABC):
                     if "__pycache__" not in content:
                         f.write("\n__pycache__/\n")
                         modified = True
-            
+
             if modified:
-                subprocess.run(["git", "add", ".gitignore"], cwd=self.repo_path, check=True)
                 subprocess.run(
-                    ["git", "commit", "-m", "chore: add __pycache__ to .gitignore"], 
-                    cwd=self.repo_path, 
-                    check=True
+                    ["git", "add", ".gitignore"], cwd=self.repo_path, check=True
+                )
+                subprocess.run(
+                    ["git", "commit", "-m", "chore: add __pycache__ to .gitignore"],
+                    cwd=self.repo_path,
+                    check=True,
                 )
                 subprocess.run(["git", "push"], cwd=self.repo_path, check=True)
         else:
@@ -163,9 +165,7 @@ class ShareManager(ABC):
     def select_resources(self, resources: List[Dict[str, Any]]) -> List[Dict[str, Any]]:
         """让用户选择要分享的资源"""
         # 显示可选的资源
-        resource_list = [
-            f"\n可分享的{self.get_resource_type()}（已排除中心仓库中已有的）："
-        ]
+        resource_list = [f"\n可分享的{self.get_resource_type()}（已排除中心仓库中已有的）："]
         for i, resource in enumerate(resources, 1):
             resource_list.append(f"[{i}] {self.format_resource_display(resource)}")
 

{jarvis_ai_assistant-0.3.11 → 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.11
+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