jarvis-ai-assistant 0.1.213__tar.gz → 0.1.214__tar.gz

{jarvis_ai_assistant-0.1.213/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.214}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.1.213
+Version: 0.1.214
 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.1.213 → jarvis_ai_assistant-0.1.214}/pyproject.toml

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

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages  # type: ignore
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.213",
+    version="0.1.214",
     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.213 → jarvis_ai_assistant-0.1.214}/src/jarvis/__init__.py

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

{jarvis_ai_assistant-0.1.213 → jarvis_ai_assistant-0.1.214}/src/jarvis/jarvis_agent/__init__.py

@@ -119,13 +119,17 @@ origin_agent_system_prompt = f"""
 
 
 class OutputHandlerProtocol(Protocol):
-    def name(self) -> str: ...
+    def name(self) -> str:
+        ...
 
-    def can_handle(self, response: str) -> bool: ...
+    def can_handle(self, response: str) -> bool:
+        ...
 
-    def prompt(self) -> str: ...
+    def prompt(self) -> str:
+        ...
 
-    def handle(self, response: str, agent: Any) -> Tuple[bool, Any]: ...
+    def handle(self, response: str, agent: Any) -> Tuple[bool, Any]:
+        ...
 
 
 class Agent:
@@ -191,9 +195,7 @@ class Agent:
             if isinstance(platform, str):
                 self.model = PlatformRegistry().create_platform(platform)
                 if self.model is None:
-                    PrettyOutput.print(
-                        f"平台 {platform} 不存在，将使用普通模型", OutputType.WARNING
-                    )
+                    PrettyOutput.print(f"平台 {platform} 不存在，将使用普通模型", OutputType.WARNING)
                     self.model = PlatformRegistry().get_normal_platform()
             else:
                 self.model = platform
@@ -356,6 +358,33 @@ class Agent:
         """
         self.after_tool_call_cb = cb
 
+    def save_session(self) -> bool:
+        """保存当前会话状态到文件"""
+        if not self.model:
+            PrettyOutput.print("没有可用的模型实例来保存会话。", OutputType.ERROR)
+            return False
+        session_dir = os.path.join(os.getcwd(), ".jarvis")
+        os.makedirs(session_dir, exist_ok=True)
+        session_file = os.path.join(session_dir, "saved_session.json")
+        return self.model.save(session_file)
+
+    def restore_session(self) -> bool:
+        """从文件恢复会话状态"""
+        if not self.model:
+            return False  # No model, cannot restore
+        session_file = os.path.join(os.getcwd(), ".jarvis", "saved_session.json")
+        if not os.path.exists(session_file):
+            return False
+
+        if self.model.restore(session_file):
+            try:
+                os.remove(session_file)
+                PrettyOutput.print("会话已恢复，并已删除会话文件。", OutputType.SUCCESS)
+            except OSError as e:
+                PrettyOutput.print(f"删除会话文件失败: {e}", OutputType.ERROR)
+            return True
+        return False
+
     def get_tool_registry(self) -> Optional[Any]:
         """获取工具注册表实例"""
         from jarvis.jarvis_tools.registry import ToolRegistry
@@ -781,18 +810,14 @@ arguments:
 
                     if get_interrupt():
                         set_interrupt(False)
-                        user_input = self.multiline_inputer(
-                            f"模型交互期间被中断，请输入用户干预信息："
-                        )
+                        user_input = self.multiline_inputer(f"模型交互期间被中断，请输入用户干预信息：")
                         if user_input:
                             # 如果有工具调用且用户确认继续，则将干预信息和工具执行结果拼接为prompt
                             if any(
                                 handler.can_handle(current_response)
                                 for handler in self.output_handler
                             ):
-                                if user_confirm(
-                                    "检测到有工具调用，是否继续处理工具调用？", True
-                                ):
+                                if user_confirm("检测到有工具调用，是否继续处理工具调用？", True):
                                     self.prompt = f"{user_input}\n\n{current_response}"
                                     continue
                             self.prompt += f"{user_input}"
@@ -838,9 +863,7 @@ arguments:
             if self.use_methodology:
                 if not upload_methodology(self.model, other_files=self.files):
                     if self.files:
-                        PrettyOutput.print(
-                            "文件上传失败，将忽略文件列表", OutputType.WARNING
-                        )
+                        PrettyOutput.print("文件上传失败，将忽略文件列表", OutputType.WARNING)
                         # 上传失败则回退到本地加载
                     msg = self.prompt
                     for handler in self.input_handler:
@@ -848,14 +871,14 @@ arguments:
                     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上传的文件包含历史对话信息和方法论文件，可以从中获取一些经验信息。"
+                        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
-                    )
+                    PrettyOutput.print("文件上传失败，将忽略文件列表", OutputType.WARNING)
                 else:
                     self.prompt = f"{self.prompt}\n\n上传的文件包含历史对话信息，可以从中获取一些经验信息。"
         else:

{jarvis_ai_assistant-0.1.213 → jarvis_ai_assistant-0.1.214}/src/jarvis/jarvis_agent/builtin_input_handler.py

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 import re
+import sys
 from typing import Any, Tuple
 
 from jarvis.jarvis_utils.config import get_replace_map
@@ -29,7 +30,6 @@ def builtin_input_handler(user_input: str, agent_: Any) -> Tuple[str, bool]:
     replace_map = get_replace_map()
     # 处理每个标记
     for tag in special_tags:
-
         # 优先处理特殊标记
         if tag == "Summary":
             agent._summarize_and_clear_history()
@@ -51,6 +51,17 @@ def builtin_input_handler(user_input: str, agent_: Any) -> Tuple[str, bool]:
 
             load_config()
             return "", True
+        elif tag == "SaveSession":
+            if agent.save_session():
+                from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+
+                PrettyOutput.print("会话已成功保存。正在退出...", OutputType.SUCCESS)
+                sys.exit(0)
+            else:
+                from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+
+                PrettyOutput.print("保存会话失败。", OutputType.ERROR)
+            return "", True
 
         processed_tag = set()
         add_on_prompt = ""

{jarvis_ai_assistant-0.1.213 → jarvis_ai_assistant-0.1.214}/src/jarvis/jarvis_agent/edit_file_handler.py

@@ -206,48 +206,60 @@ class EditFileHandler(OutputHandler):
                 exact_search = search_text
 
                 if exact_search in modified_content:
-                    if modified_content.count(exact_search) > 1:
-                        PrettyOutput.print(
-                            f"搜索文本在文件中存在多处匹配：\n{exact_search}",
-                            output_type=OutputType.WARNING,
-                        )
-                        return False, f"搜索文本在文件中存在多处匹配：\n{exact_search}"
-
                     # 直接执行替换（保留所有原始格式）
                     modified_content = modified_content.replace(
                         exact_search, replace_text
                     )
                     print(f"✅ 补丁 #{patch_count} 应用成功")
                 else:
-                    # 尝试增加缩进重试
                     found = False
-                    for space_count in range(1, 17):
-                        indented_search = "\n".join(
-                            " " * space_count + line if line.strip() else line
-                            for line in search_text.split("\n")
-                        )
-                        indented_replace = "\n".join(
-                            " " * space_count + line if line.strip() else line
-                            for line in replace_text.split("\n")
-                        )
-                        if indented_search in modified_content:
-                            if modified_content.count(indented_search) > 1:
-                                PrettyOutput.print(
-                                    f"搜索文本在文件中存在多处匹配：\n{indented_search}",
-                                    output_type=OutputType.WARNING,
-                                )
-                                return (
-                                    False,
-                                    f"搜索文本在文件中存在多处匹配：\n{indented_search}",
-                                )
+                    # 如果匹配不到，并且search与replace块的首尾都是换行，尝试去掉第一个和最后一个换行
+                    if (
+                        search_text.startswith("\n")
+                        and search_text.endswith("\n")
+                        and replace_text.startswith("\n")
+                        and replace_text.endswith("\n")
+                    ):
+                        stripped_search = search_text[1:-1]
+                        stripped_replace = replace_text[1:-1]
+                        if stripped_search in modified_content:
                             modified_content = modified_content.replace(
-                                indented_search, indented_replace
-                            )
-                            print(
-                                f"✅ 补丁 #{patch_count} 应用成功 (自动增加 {space_count} 个空格缩进)"
+                                stripped_search, stripped_replace
                             )
+                            print(f"✅ 补丁 #{patch_count} 应用成功 (自动去除首尾换行)")
                             found = True
-                            break
+
+                    if not found:
+                        # 尝试增加缩进重试
+                        current_search = search_text
+                        current_replace = replace_text
+                        if (
+                            current_search.startswith("\n")
+                            and current_search.endswith("\n")
+                            and current_replace.startswith("\n")
+                            and current_replace.endswith("\n")
+                        ):
+                            current_search = current_search[1:-1]
+                            current_replace = current_replace[1:-1]
+
+                        for space_count in range(1, 17):
+                            indented_search = "\n".join(
+                                " " * space_count + line if line.strip() else line
+                                for line in current_search.split("\n")
+                            )
+                            indented_replace = "\n".join(
+                                " " * space_count + line if line.strip() else line
+                                for line in current_replace.split("\n")
+                            )
+                            if indented_search in modified_content:
+                                modified_content = modified_content.replace(
+                                    indented_search, indented_replace
+                                )
+                                print(
+                                    f"✅ 补丁 #{patch_count} 应用成功 (自动增加 {space_count} 个空格缩进)"
+                                )
+                                found = True
+                                break
 
                     if not found:
                         PrettyOutput.print(

{jarvis_ai_assistant-0.1.213 → jarvis_ai_assistant-0.1.214}/src/jarvis/jarvis_code_agent/code_agent.py

@@ -131,7 +131,7 @@ class CodeAgent:
             input_handler=[shell_input_handler, builtin_input_handler],
             need_summary=need_summary,
             use_methodology=False,  # 禁用方法论
-            use_analysis=False      # 禁用分析
+            use_analysis=False,  # 禁用分析
         )
 
         self.agent.set_after_tool_call_cb(self.after_tool_call_cb)
@@ -359,9 +359,7 @@ class CodeAgent:
 
                 # 添加提交信息到final_ret
                 if commits:
-                    final_ret += (
-                        f"\n\n代码已修改完成\n补丁内容:\n```diff\n{diff}\n```\n"
-                    )
+                    final_ret += f"\n\n代码已修改完成\n补丁内容:\n```diff\n{diff}\n```\n"
                     # 修改后的提示逻辑
                     lint_tools_info = "\n".join(
                         f"   - {file}: 使用 {'、'.join(get_lint_tools(file))}"
@@ -380,6 +378,7 @@ class CodeAgent:
 {file_list}
 {tool_info}
 如果本次修改引入了警告和错误，请根据警告和错误信息修复代码
+注意：如果要进行静态检查，需要在所有的修改都完成之后进行集中检查
                     """
                         agent.set_addon_prompt(addon_prompt)
                 else:
@@ -428,6 +427,13 @@ def main() -> None:
 
     try:
         agent = CodeAgent(platform=args.platform, model=args.model, need_summary=False)
+
+        # 尝试恢复会话
+        if agent.agent.restore_session():
+            PrettyOutput.print(
+                "已从 .jarvis/saved_session.json 恢复会话。", OutputType.SUCCESS
+            )
+
         if args.requirement:
             agent.run(args.requirement)
         else:

{jarvis_ai_assistant-0.1.213 → jarvis_ai_assistant-0.1.214}/src/jarvis/jarvis_platform/ai8.py

@@ -1,5 +1,6 @@
 import os
-from typing import Generator, List, Tuple
+from typing import Any, Dict, Generator, List, Tuple
+
 from jarvis.jarvis_platform.base import BasePlatform
 import json
 
@@ -57,7 +58,6 @@ class AI8Model(BasePlatform):
     def create_conversation(self) -> bool:
         """Create a new conversation"""
         try:
-
             # 1. 创建会话
             response = while_success(
                 lambda: http.post(
@@ -117,13 +117,12 @@ class AI8Model(BasePlatform):
     def chat(self, message: str) -> Generator[str, None, None]:
         """Execute conversation"""
         try:
-
             # 确保有会话ID
             if not self.conversation:
                 if not self.create_conversation():
                     raise Exception("Failed to create conversation")
 
-            payload = {
+            payload: Dict[str, Any] = {
                 "text": message,
                 "sessionId": self.conversation["id"] if self.conversation else None,
                 "files": [],
@@ -184,7 +183,7 @@ class AI8Model(BasePlatform):
 
             data = response.json()
             if data["code"] == 0:
-                self.conversation = None
+                self.conversation = {}
                 return True
             else:
                 error_msg = f"删除会话失败: {data.get('msg', '未知错误')}"
@@ -195,6 +194,53 @@ class AI8Model(BasePlatform):
             PrettyOutput.print(f"删除会话失败: {str(e)}", OutputType.ERROR)
             return False
 
+    def save(self, file_path: str) -> bool:
+        """Save chat session to a file."""
+        if not self.conversation:
+            PrettyOutput.print("没有活动的会话可供保存", OutputType.WARNING)
+            return False
+
+        state = {
+            "conversation": self.conversation,
+            "model_name": self.model_name,
+            "system_prompt": self.system_prompt,
+        }
+
+        try:
+            with open(file_path, "w", encoding="utf-8") as f:
+                json.dump(state, f, ensure_ascii=False, indent=4)
+            self._saved = True
+            PrettyOutput.print(f"会话已成功保存到 {file_path}", OutputType.SUCCESS)
+            return True
+        except Exception as e:
+            PrettyOutput.print(f"保存会话失败: {str(e)}", OutputType.ERROR)
+            return False
+
+    def restore(self, file_path: str) -> bool:
+        """Restore chat session from a file."""
+        try:
+            with open(file_path, "r", encoding="utf-8") as f:
+                state = json.load(f)
+
+            self.conversation = state["conversation"]
+            self.model_name = state["model_name"]
+            self.system_prompt = state.get("system_prompt", "")
+
+            # A restored session should not be deleted on exit, as it's persistent.
+            self._saved = True
+
+            PrettyOutput.print(f"从 {file_path} 成功恢复会话", OutputType.SUCCESS)
+            return True
+        except FileNotFoundError:
+            PrettyOutput.print(f"会话文件未找到: {file_path}", OutputType.ERROR)
+            return False
+        except KeyError as e:
+            PrettyOutput.print(f"恢复失败: 会话文件格式不正确，缺少键 {e}", OutputType.ERROR)
+            return False
+        except Exception as e:
+            PrettyOutput.print(f"恢复会话失败: {str(e)}", OutputType.ERROR)
+            return False
+
     def get_available_models(self) -> List[str]:
         """Get available model list
 

{jarvis_ai_assistant-0.1.213 → jarvis_ai_assistant-0.1.214}/src/jarvis/jarvis_platform/base.py

@@ -27,10 +27,12 @@ class BasePlatform(ABC):
         """Initialize model"""
         self.suppress_output = True  # 添加输出控制标志
         self.web = False  # 添加web属性，默认false
+        self._saved = False
 
     def __del__(self):
         """Destroy model"""
-        self.delete_chat()
+        if not self._saved:
+            self.delete_chat()
 
     @abstractmethod
     def set_model_name(self, model_name: str):
@@ -93,14 +95,10 @@ class BasePlatform(ABC):
                 ):
                     response += trunk
 
-                print(
-                    f"📤 提交第{submit_count}部分完成，当前进度：{length}/{len(message)}"
-                )
+                print(f"📤 提交第{submit_count}部分完成，当前进度：{length}/{len(message)}")
             print("✅ 提交完成")
             response += "\n" + while_true(
-                lambda: while_success(
-                    lambda: self._chat("内容已经全部提供完毕，请根据内容继续"), 5
-                ),
+                lambda: while_success(lambda: self._chat("内容已经全部提供完毕，请根据内容继续"), 5),
                 5,
             )
         else:
@@ -183,6 +181,34 @@ class BasePlatform(ABC):
         """Delete chat"""
         raise NotImplementedError("delete_chat is not implemented")
 
+    @abstractmethod
+    def save(self, file_path: str) -> bool:
+        """Save chat session to a file.
+
+        Note:
+            Implementations of this method should set `self._saved = True` upon successful saving
+            to prevent the session from being deleted on object destruction.
+
+        Args:
+            file_path: The path to save the session file.
+
+        Returns:
+            True if saving is successful, False otherwise.
+        """
+        raise NotImplementedError("save is not implemented")
+
+    @abstractmethod
+    def restore(self, file_path: str) -> bool:
+        """Restore chat session from a file.
+
+        Args:
+            file_path: The path to restore the session file from.
+
+        Returns:
+            True if restoring is successful, False otherwise.
+        """
+        raise NotImplementedError("restore is not implemented")
+
     @abstractmethod
     def set_system_prompt(self, message: str):
         """Set system message"""

{jarvis_ai_assistant-0.1.213 → jarvis_ai_assistant-0.1.214}/src/jarvis/jarvis_platform/human.py

@@ -4,6 +4,7 @@
 
 # 提供与真实人类交互的模拟接口
 
+import json
 import random
 import string
 from typing import Generator, List, Tuple
@@ -59,8 +60,9 @@ class HumanPlatform(BasePlatform):
 
         # 将prompt复制到剪贴板
         import subprocess
+
         try:
-            subprocess.run(['xsel', '-ib'], input=prompt.encode('utf-8'), check=True)
+            subprocess.run(["xsel", "-ib"], input=prompt.encode("utf-8"), check=True)
             PrettyOutput.print("提示已复制到剪贴板", OutputType.INFO)
         except subprocess.CalledProcessError as e:
             PrettyOutput.print(f"无法复制到剪贴板: {e}", OutputType.WARNING)
@@ -80,6 +82,46 @@ class HumanPlatform(BasePlatform):
         self.first_message = True
         return True
 
+    def save(self, file_path: str) -> bool:
+        """Save chat session to a file."""
+        state = {
+            "conversation_id": self.conversation_id,
+            "model_name": self.model_name,
+            "system_message": self.system_message,
+            "first_message": self.first_message,
+        }
+
+        try:
+            with open(file_path, "w", encoding="utf-8") as f:
+                json.dump(state, f, ensure_ascii=False, indent=4)
+            self._saved = True
+            PrettyOutput.print(f"会话已成功保存到 {file_path}", OutputType.SUCCESS)
+            return True
+        except Exception as e:
+            PrettyOutput.print(f"保存会话失败: {str(e)}", OutputType.ERROR)
+            return False
+
+    def restore(self, file_path: str) -> bool:
+        """Restore chat session from a file."""
+        try:
+            with open(file_path, "r", encoding="utf-8") as f:
+                state = json.load(f)
+
+            self.conversation_id = state.get("conversation_id", "")
+            self.model_name = state.get("model_name", "human")
+            self.system_message = state.get("system_message", "")
+            self.first_message = state.get("first_message", True)
+            self._saved = True
+
+            PrettyOutput.print(f"从 {file_path} 成功恢复会话", OutputType.SUCCESS)
+            return True
+        except FileNotFoundError:
+            PrettyOutput.print(f"会话文件未找到: {file_path}", OutputType.ERROR)
+            return False
+        except Exception as e:
+            PrettyOutput.print(f"恢复会话失败: {str(e)}", OutputType.ERROR)
+            return False
+
     def name(self) -> str:
         """平台名称"""
         return self.model_name

{jarvis_ai_assistant-0.1.213 → jarvis_ai_assistant-0.1.214}/src/jarvis/jarvis_platform/kimi.py

@@ -70,9 +70,7 @@ class KimiModel(BasePlatform):
                 sleep_time=5,
             )
             if response.status_code != 200:
-                PrettyOutput.print(
-                    f"错误：创建会话失败：{response.json()}", OutputType.ERROR
-                )
+                PrettyOutput.print(f"错误：创建会话失败：{response.json()}", OutputType.ERROR)
                 return False
             self.chat_id = response.json()["id"]
             return True
@@ -158,7 +156,7 @@ class KimiModel(BasePlatform):
             )
 
             response_data = b""
-            
+
             # 处理流式响应
             for chunk in response_stream:
                 response_data += chunk
@@ -298,9 +296,9 @@ class KimiModel(BasePlatform):
                 lambda: http.stream_post(url, headers=headers, json=payload),
                 sleep_time=5,
             )
-            
+
             response_data = b""
-            
+
             # 处理流式响应
             for chunk in response_stream:
                 response_data += chunk
@@ -367,6 +365,52 @@ class KimiModel(BasePlatform):
             PrettyOutput.print(f"删除会话时发生错误: {str(e)}", OutputType.ERROR)
             return False
 
+    def save(self, file_path: str) -> bool:
+        """Save chat session to a file."""
+        if not self.chat_id:
+            PrettyOutput.print("没有活动的会话可供保存", OutputType.WARNING)
+            return False
+
+        state = {
+            "chat_id": self.chat_id,
+            "model_name": self.model_name,
+            "system_message": self.system_message,
+            "first_chat": self.first_chat,
+            "uploaded_files": self.uploaded_files,
+        }
+
+        try:
+            with open(file_path, "w", encoding="utf-8") as f:
+                json.dump(state, f, ensure_ascii=False, indent=4)
+            self._saved = True
+            PrettyOutput.print(f"会话已成功保存到 {file_path}", OutputType.SUCCESS)
+            return True
+        except Exception as e:
+            PrettyOutput.print(f"保存会话失败: {str(e)}", OutputType.ERROR)
+            return False
+
+    def restore(self, file_path: str) -> bool:
+        """Restore chat session from a file."""
+        try:
+            with open(file_path, "r", encoding="utf-8") as f:
+                state = json.load(f)
+
+            self.chat_id = state.get("chat_id", "")
+            self.model_name = state.get("model_name", "kimi")
+            self.system_message = state.get("system_message", "")
+            self.first_chat = state.get("first_chat", True)
+            self.uploaded_files = state.get("uploaded_files", [])
+            self._saved = True
+
+            PrettyOutput.print(f"从 {file_path} 成功恢复会话", OutputType.SUCCESS)
+            return True
+        except FileNotFoundError:
+            PrettyOutput.print(f"会话文件未找到: {file_path}", OutputType.ERROR)
+            return False
+        except Exception as e:
+            PrettyOutput.print(f"恢复会话失败: {str(e)}", OutputType.ERROR)
+            return False
+
     def name(self) -> str:
         """Model name"""
         return self.model_name