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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.1.214
+Version: 0.1.217
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -563,6 +563,7 @@ OPENAI_API_BASE: https://api.openai.com/v1
 | `'FindRelatedFiles'` | 查找与功能相关的文件 |
 | `'Fix'` | 修复问题 |
 | `'Check'` | 执行静态代码检查，包括错误和风格问题 |
+| `'SaveSession'` | 保存当前会话并退出 |
 
 ### 3. 自定义替换配置
 在`~/.jarvis/config.yaml`中添加：

{jarvis_ai_assistant-0.1.214 → jarvis_ai_assistant-0.1.217}/README.md

@@ -493,6 +493,7 @@ OPENAI_API_BASE: https://api.openai.com/v1
 | `'FindRelatedFiles'` | 查找与功能相关的文件 |
 | `'Fix'` | 修复问题 |
 | `'Check'` | 执行静态代码检查，包括错误和风格问题 |
+| `'SaveSession'` | 保存当前会话并退出 |
 
 ### 3. 自定义替换配置
 在`~/.jarvis/config.yaml`中添加：

{jarvis_ai_assistant-0.1.214 → jarvis_ai_assistant-0.1.217}/pyproject.toml

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

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

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

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

@@ -119,17 +119,13 @@ 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:
@@ -195,7 +191,9 @@ 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
@@ -365,14 +363,24 @@ class Agent:
             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")
+        platform_name = self.model.platform_name()
+        model_name = self.model.name().replace("/", "_").replace("\\", "_")
+        session_file = os.path.join(
+            session_dir, f"saved_session_{self.name}_{platform_name}_{model_name}.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")
+        platform_name = self.model.platform_name()
+        model_name = self.model.name().replace("/", "_").replace("\\", "_")
+        session_file = os.path.join(
+            os.getcwd(),
+            ".jarvis",
+            f"saved_session_{self.name}_{platform_name}_{model_name}.json",
+        )
         if not os.path.exists(session_file):
             return False
 
@@ -810,14 +818,18 @@ 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}"
@@ -863,7 +875,9 @@ 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:
@@ -871,14 +885,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.214 → jarvis_ai_assistant-0.1.217}/src/jarvis/jarvis_agent/jarvis.py

@@ -112,9 +112,18 @@ def main() -> None:
     parser.add_argument("-p", "--platform", type=str, help="Platform to use")
     parser.add_argument("-m", "--model", type=str, help="Model to use")
     parser.add_argument(
-        "-t", "--task", type=str, help="Directly input task content from command line"
+        "-t",
+        "--task",
+        type=str,
+        help="Directly input task content from command line",
     )
     parser.add_argument("-f", "--config", type=str, help="Path to custom config file")
+    parser.add_argument(
+        "--restore-session",
+        action="store_true",
+        help="Restore session from .jarvis/saved_session.json",
+        default=False,
+    )
     args = parser.parse_args()
     init_env(
         "欢迎使用 Jarvis AI 助手，您的智能助理已准备就绪！", config_file=args.config
@@ -130,6 +139,13 @@ def main() -> None:
             need_summary=False,
         )
 
+        # 尝试恢复会话
+        if args.restore_session:
+            if agent.restore_session():
+                PrettyOutput.print("会话已成功恢复。", OutputType.SUCCESS)
+            else:
+                PrettyOutput.print("无法恢复会话。", OutputType.WARNING)
+
         # 优先处理命令行直接传入的任务
         if args.task:
             agent.run(args.task)

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

@@ -419,6 +419,9 @@ def main() -> None:
     parser.add_argument(
         "-r", "--requirement", type=str, help="Requirement to process", default=None
     )
+    parser.add_argument(
+        "--restore-session", action="store_true", help="Restore session from .jarvis/saved_session.json", default=False
+    )
     args = parser.parse_args()
 
     curr_dir = os.getcwd()
@@ -429,10 +432,15 @@ def main() -> None:
         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.restore_session:
+            if agent.agent.restore_session():
+                PrettyOutput.print(
+                    "已从 .jarvis/saved_session.json 恢复会话。", OutputType.SUCCESS
+                )
+            else:
+                PrettyOutput.print(
+                    "无法从 .jarvis/saved_session.json 恢复会话。", OutputType.WARNING
+                )
 
         if args.requirement:
             agent.run(args.requirement)

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

@@ -12,7 +12,6 @@ from jarvis.jarvis_utils.utils import while_success
 class AI8Model(BasePlatform):
     """AI8 model implementation"""
 
-    platform_name = "ai8"
     BASE_URL = "https://ai8.rcouyi.com"
 
     def get_model_list(self) -> List[Tuple[str, str]]:
@@ -167,6 +166,11 @@ class AI8Model(BasePlatform):
         """Return model name"""
         return self.model_name
 
+    @classmethod
+    def platform_name(cls) -> str:
+        """Return platform name"""
+        return "ai8"
+
     def delete_chat(self) -> bool:
         """Delete current chat session"""
         try:
@@ -235,7 +239,9 @@ class AI8Model(BasePlatform):
             PrettyOutput.print(f"会话文件未找到: {file_path}", OutputType.ERROR)
             return False
         except KeyError as e:
-            PrettyOutput.print(f"恢复失败: 会话文件格式不正确，缺少键 {e}", OutputType.ERROR)
+            PrettyOutput.print(
+                f"恢复失败: 会话文件格式不正确，缺少键 {e}", OutputType.ERROR
+            )
             return False
         except Exception as e:
             PrettyOutput.print(f"恢复会话失败: {str(e)}", OutputType.ERROR)

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

@@ -95,10 +95,14 @@ 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:
@@ -176,6 +180,12 @@ class BasePlatform(ABC):
         """Model name"""
         raise NotImplementedError("name is not implemented")
 
+    @classmethod
+    @abstractmethod
+    def platform_name(cls) -> str:
+        """Platform name"""
+        raise NotImplementedError("platform_name is not implemented")
+
     @abstractmethod
     def delete_chat(self) -> bool:
         """Delete chat"""

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

@@ -17,8 +17,6 @@ from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 class HumanPlatform(BasePlatform):
     """人类交互平台实现，模拟大模型但实际上与人交互"""
 
-    platform_name = "human"
-
     def get_model_list(self) -> List[Tuple[str, str]]:
         """获取支持的模型列表"""
         return [("human", "Human Interaction")]
@@ -126,6 +124,11 @@ class HumanPlatform(BasePlatform):
         """平台名称"""
         return self.model_name
 
+    @classmethod
+    def platform_name(cls) -> str:
+        """平台名称"""
+        return "human"
+
     def support_web(self) -> bool:
         """是否支持网页浏览功能"""
         return False

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

@@ -21,8 +21,6 @@ class KimiModel(BasePlatform):
     - 消息收发
     """
 
-    platform_name = "kimi"
-
     def get_model_list(self) -> List[Tuple[str, str]]:
         """Get model list"""
         return [
@@ -70,7 +68,9 @@ 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
@@ -415,6 +415,11 @@ class KimiModel(BasePlatform):
         """Model name"""
         return self.model_name
 
+    @classmethod
+    def platform_name(cls) -> str:
+        """Platform name"""
+        return "kimi"
+
     def support_web(self) -> bool:
         """Kimi平台支持web功能"""
         return True

{jarvis_ai_assistant-0.1.214 → jarvis_ai_assistant-0.1.217}/src/jarvis/jarvis_platform/openai.py

@@ -10,7 +10,6 @@ from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 
 class OpenAIModel(BasePlatform):
-    platform_name = "openai"
 
     def __init__(self):
         """
@@ -132,6 +131,16 @@ class OpenAIModel(BasePlatform):
         """
         return self.model_name
 
+    @classmethod
+    def platform_name(cls) -> str:
+        """
+        获取当前平台的名称
+
+        返回:
+            str: 当前平台的名称
+        """
+        return "openai"
+
     def delete_chat(self) -> bool:
         """
         删除当前对话历史

{jarvis_ai_assistant-0.1.214 → jarvis_ai_assistant-0.1.217}/src/jarvis/jarvis_platform/oyi.py

@@ -12,7 +12,6 @@ from jarvis.jarvis_utils.utils import while_success
 class OyiModel(BasePlatform):
     """Oyi model implementation"""
 
-    platform_name = "oyi"
     BASE_URL = "https://api-10086.rcouyi.com"
 
     def get_model_list(self) -> List[Tuple[str, str]]:
@@ -87,7 +86,9 @@ class OyiModel(BasePlatform):
                 self.conversation = data
                 return True
             else:
-                PrettyOutput.print(f"创建会话失败: {data['message']}", OutputType.WARNING)
+                PrettyOutput.print(
+                    f"创建会话失败: {data['message']}", OutputType.WARNING
+                )
                 return False
 
         except Exception as e:
@@ -190,6 +191,11 @@ class OyiModel(BasePlatform):
         """Return model name"""
         return self.model_name
 
+    @classmethod
+    def platform_name(cls) -> str:
+        """Return platform name"""
+        return "oyi"
+
     def delete_chat(self) -> bool:
         """Delete current chat session"""
         try:

{jarvis_ai_assistant-0.1.214 → jarvis_ai_assistant-0.1.217}/src/jarvis/jarvis_platform/registry.py

@@ -6,10 +6,13 @@ import sys
 from typing import Dict, List, Optional, Type
 
 from jarvis.jarvis_platform.base import BasePlatform
-from jarvis.jarvis_utils.config import (get_data_dir, get_normal_model_name,
-                                        get_normal_platform_name,
-                                        get_thinking_model_name,
-                                        get_thinking_platform_name)
+from jarvis.jarvis_utils.config import (
+    get_data_dir,
+    get_normal_model_name,
+    get_normal_platform_name,
+    get_thinking_model_name,
+    get_thinking_platform_name,
+)
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 REQUIRED_METHODS = [
@@ -94,7 +97,7 @@ class PlatformRegistry:
         Returns:
             Dict[str, Type[BasePlatform]]: Platform name to platform class mapping
         """
-        platforms = {}
+        platforms: Dict[str, Type[BasePlatform]] = {}
 
         # 确保目录存在
         if not os.path.exists(directory):
@@ -130,12 +133,19 @@ class PlatformRegistry:
                             inspect.isclass(obj)
                             and issubclass(obj, BasePlatform)
                             and obj != BasePlatform
-                            and hasattr(obj, "platform_name")
                         ):
                             # 检查平台实现
                             if not PlatformRegistry.check_platform_implementation(obj):
                                 continue
-                            platforms[obj.platform_name] = obj  # type: ignore
+                            try:
+                                # 调用类方法 platform_name
+                                platform_name = obj.platform_name()
+                                platforms[platform_name] = obj
+                            except Exception as e:
+                                PrettyOutput.print(
+                                    f"实例化或注册平台失败 {obj.__name__}: {str(e)}",
+                                    OutputType.ERROR,
+                                )
                             break
                 except Exception as e:
                     PrettyOutput.print(

{jarvis_ai_assistant-0.1.214 → jarvis_ai_assistant-0.1.217}/src/jarvis/jarvis_platform/tongyi.py

@@ -17,8 +17,6 @@ class TongyiPlatform(BasePlatform):
     # Supported image formats
     IMAGE_EXTENSIONS = {".jpg", ".jpeg", ".png", ".gif", ".webp", ".bmp", ".tiff"}
 
-    platform_name = "tongyi"
-
     def __init__(self):
         """Initialize Tongyi platform"""
         super().__init__()
@@ -395,12 +393,16 @@ class TongyiPlatform(BasePlatform):
                             add_url, headers=headers, json=add_payload
                         )
                         if add_response.status_code != 200:
-                            print(f"❌ 添加文件到对话失败: HTTP {add_response.status_code}")
+                            print(
+                                f"❌ 添加文件到对话失败: HTTP {add_response.status_code}"
+                            )
                             continue
 
                         add_result = add_response.json()
                         if not add_result.get("success"):
-                            print(f"❌ 添加文件到对话失败: {add_result.get('errorMsg')}")
+                            print(
+                                f"❌ 添加文件到对话失败: {add_result.get('errorMsg')}"
+                            )
                             continue
 
                         file_info.update(add_result.get("data", {}))
@@ -455,6 +457,15 @@ class TongyiPlatform(BasePlatform):
         """
         return self.model_name
 
+    @classmethod
+    def platform_name(cls) -> str:
+        """Get platform name
+
+        Returns:
+            str: Platform name
+        """
+        return "tongyi"
+
     def delete_chat(self) -> bool:
         """Delete chat history
 

{jarvis_ai_assistant-0.1.214 → jarvis_ai_assistant-0.1.217}/src/jarvis/jarvis_platform/yuanbao.py

@@ -18,8 +18,6 @@ from jarvis.jarvis_utils.utils import while_success
 class YuanbaoPlatform(BasePlatform):
     """Hunyuan模型实现"""
 
-    platform_name = "yuanbao"
-
     def get_model_list(self) -> List[Tuple[str, str]]:
         """获取支持的模型列表"""
         return [
@@ -104,7 +102,9 @@ class YuanbaoPlatform(BasePlatform):
                 self.conversation_id = response_json["id"]
                 return True
             else:
-                PrettyOutput.print(f"错误：创建会话失败，响应: {response_json}", OutputType.ERROR)
+                PrettyOutput.print(
+                    f"错误：创建会话失败，响应: {response_json}", OutputType.ERROR
+                )
                 return False
         except Exception as e:
             PrettyOutput.print(f"错误：创建会话失败：{e}", OutputType.ERROR)
@@ -619,6 +619,11 @@ class YuanbaoPlatform(BasePlatform):
         """模型名称"""
         return self.model_name
 
+    @classmethod
+    def platform_name(cls) -> str:
+        """平台名称"""
+        return "yuanbao"
+
     def support_web(self) -> bool:
         """Yuanbao平台支持web功能"""
         return True

{jarvis_ai_assistant-0.1.214 → jarvis_ai_assistant-0.1.217}/src/jarvis/jarvis_utils/input.py

@@ -223,10 +223,11 @@ def get_multiline_input(tip: str) -> str:
         if last_msg:
             try:
                 # 使用xsel将内容复制到剪贴板
-                process = subprocess.Popen(["xsel", "-b", "-i"], stdin=subprocess.PIPE)
-                process.communicate(input=last_msg.encode("utf-8"))
+                subprocess.run(
+                    ["xsel", "-b", "-i"], input=last_msg.encode("utf-8"), check=True
+                )
                 PrettyOutput.print("已将最后一条消息复制到剪贴板", OutputType.INFO)
-            except Exception as e:
+            except subprocess.CalledProcessError as e:
                 PrettyOutput.print(f"复制到剪贴板失败: {e}", OutputType.ERROR)
         else:
             PrettyOutput.print("没有可复制的消息", OutputType.INFO)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.1.214
+Version: 0.1.217
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -563,6 +563,7 @@ OPENAI_API_BASE: https://api.openai.com/v1
 | `'FindRelatedFiles'` | 查找与功能相关的文件 |
 | `'Fix'` | 修复问题 |
 | `'Check'` | 执行静态代码检查，包括错误和风格问题 |
+| `'SaveSession'` | 保存当前会话并退出 |
 
 ### 3. 自定义替换配置
 在`~/.jarvis/config.yaml`中添加：