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

{jarvis_ai_assistant-0.1.212/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.212
+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
@@ -54,8 +54,8 @@ Requires-Dist: pillow==10.2.0
 Requires-Dist: openai==1.78.1
 Requires-Dist: tabulate==0.9.0
 Requires-Dist: pyte==0.8.2
-Requires-Dist: pyyaml>=6.0.2
 Requires-Dist: httpx>=0.28.1
+Requires-Dist: pyyaml>=5.3.1
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: black; extra == "dev"

{jarvis_ai_assistant-0.1.212 → 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.212"
+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" }]
@@ -36,8 +36,8 @@ dependencies = [
     "openai==1.78.1",
     "tabulate==0.9.0",
     "pyte==0.8.2",
-    "pyyaml>=6.0.2",
     "httpx>=0.28.1",
+    "pyyaml>=5.3.1",
 ]
 requires-python = ">=3.8"
 

{jarvis_ai_assistant-0.1.212 → 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.212",
+    version="0.1.214",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",
@@ -31,10 +31,11 @@ setup(
         "openai==1.78.1",
         "tabulate==0.9.0",
         "pyte==0.8.2",
-        "pyyaml>=6.0.2",
+        "pyyaml>=5.3.1",
         "httpx>=0.28.1",
     ],
-    extras_require={"dev": ["pytest", "black", "isort", "mypy", "build", "twine"]},
+    extras_require={"dev": ["pytest", "black",
+                            "isort", "mypy", "build", "twine"]},
     entry_points={
         "console_scripts": [
             "jarvis=jarvis.jarvis_agent.jarvis:main",

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

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

{jarvis_ai_assistant-0.1.212 → 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.212 → 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.212 → 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.212 → 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.214/src/jarvis/jarvis_platform/ai8.py

@@ -0,0 +1,309 @@
+import os
+from typing import Any, Dict, Generator, List, Tuple
+
+from jarvis.jarvis_platform.base import BasePlatform
+import json
+
+from jarvis.jarvis_utils import http
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+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]]:
+        """获取模型列表"""
+        self.get_available_models()
+        return [(name, info["desc"]) for name, info in self.models.items()]
+
+    def __init__(self):
+        """Initialize model"""
+        super().__init__()
+        self.system_prompt = ""
+        self.conversation = {}
+        self.models = {}  # 存储模型信息
+
+        self.token = os.getenv("AI8_API_KEY")
+        if not self.token:
+            PrettyOutput.print("未设置 AI8_API_KEY", OutputType.WARNING)
+
+        self.headers = {
+            "Authorization": self.token,
+            "Content-Type": "application/json",
+            "Accept": "application/json, text/plain, */*",
+            "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36",
+            "X-APP-VERSION": "2.3.0",
+            "Origin": self.BASE_URL,
+            "Referer": f"{self.BASE_URL}/chat?_userMenuKey=chat",
+            "Sec-Fetch-Site": "same-origin",
+            "Sec-Fetch-Mode": "cors",
+            "Sec-Fetch-Dest": "empty",
+        }
+
+        self.model_name = os.getenv("JARVIS_MODEL") or "deepseek-chat"
+        if self.model_name not in self.get_available_models():
+            PrettyOutput.print(
+                f"警告: 选择的模型 {self.model_name} 不在可用列表中", OutputType.WARNING
+            )
+
+    def set_model_name(self, model_name: str):
+        """Set model name"""
+
+        self.model_name = model_name
+
+    def create_conversation(self) -> bool:
+        """Create a new conversation"""
+        try:
+            # 1. 创建会话
+            response = while_success(
+                lambda: http.post(
+                    f"{self.BASE_URL}/api/chat/session", headers=self.headers, json={}
+                ),
+                sleep_time=5,
+            )
+
+            data = response.json()
+            if data["code"] != 0:
+                PrettyOutput.print(
+                    f"创建会话失败: {data.get('msg', '未知错误')}", OutputType.WARNING
+                )
+                return False
+
+            self.conversation = data["data"]
+
+            # 2. 更新会话设置
+            session_data = {
+                **self.conversation,
+                "model": self.model_name,
+                "contextCount": 65536,
+                "prompt": self.system_prompt,
+                "plugins": [],
+                "localPlugins": None,
+                "useAppId": 0,
+            }
+
+            response = while_success(
+                lambda: http.put(
+                    f"{self.BASE_URL}/api/chat/session/{self.conversation['id']}",  # type: ignore
+                    headers=self.headers,
+                    json=session_data,
+                ),
+                sleep_time=5,
+            )
+
+            data = response.json()
+            if data["code"] == 0:
+                self.conversation = data["data"]
+                return True
+            else:
+                PrettyOutput.print(
+                    f"更新会话设置失败: {data.get('msg', '未知错误')}",
+                    OutputType.WARNING,
+                )
+                return False
+
+        except Exception as e:
+            PrettyOutput.print(f"创建会话失败: {str(e)}", OutputType.ERROR)
+            return False
+
+    def set_system_prompt(self, message: str):
+        """Set system message"""
+        self.system_prompt = message
+
+    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: Dict[str, Any] = {
+                "text": message,
+                "sessionId": self.conversation["id"] if self.conversation else None,
+                "files": [],
+            }
+
+            # 使用stream_post进行流式请求
+            response_stream = while_success(
+                lambda: http.stream_post(
+                    f"{self.BASE_URL}/api/chat/completions",
+                    headers=self.headers,
+                    json=payload,
+                ),
+                sleep_time=5,
+            )
+
+            # 处理流式响应
+            for chunk in response_stream:
+                if chunk:
+                    try:
+                        line = chunk.decode("utf-8")
+                        if line.startswith("data: "):
+                            try:
+                                data = json.loads(line[6:])
+                                if data.get("type") == "string":
+                                    chunk_data = data.get("data", "")
+                                    if chunk_data:
+                                        yield chunk_data
+
+                            except json.JSONDecodeError:
+                                continue
+
+                    except UnicodeDecodeError:
+                        continue
+
+            return None
+
+        except Exception as e:
+            PrettyOutput.print(f"对话异常: {str(e)}", OutputType.ERROR)
+            raise e
+
+    def name(self) -> str:
+        """Return model name"""
+        return self.model_name
+
+    def delete_chat(self) -> bool:
+        """Delete current chat session"""
+        try:
+            if not self.conversation:
+                return True
+
+            response = while_success(
+                lambda: http.delete(
+                    f"{self.BASE_URL}/api/chat/session/{self.conversation['id']}",  # type: ignore
+                    headers=self.headers,
+                ),
+                sleep_time=5,
+            )
+
+            data = response.json()
+            if data["code"] == 0:
+                self.conversation = {}
+                return True
+            else:
+                error_msg = f"删除会话失败: {data.get('msg', '未知错误')}"
+                PrettyOutput.print(error_msg, OutputType.WARNING)
+                return False
+
+        except Exception as e:
+            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
+
+        Returns:
+            List[str]: Available model name list
+        """
+        try:
+            if self.models:
+                return list(self.models.keys())
+
+            response = while_success(
+                lambda: http.get(
+                    f"{self.BASE_URL}/api/chat/tmpl", headers=self.headers
+                ),
+                sleep_time=5,
+            )
+
+            data = response.json()
+            if data["code"] != 0:
+                PrettyOutput.print(
+                    f"获取模型列表失败: {data.get('msg', '未知错误')}",
+                    OutputType.WARNING,
+                )
+                return []
+
+            # 保存模型信息
+            self.models = {model["value"]: model for model in data["data"]["models"]}
+
+            for model in self.models.values():
+                # 添加标签
+                model_str = f"{model['label']}"
+
+                # 添加特性标记
+                features = []
+                if model["attr"].get("multimodal"):
+                    features.append("Multimodal")
+                if model["attr"].get("plugin"):
+                    features.append("Plugin support")
+                if model["attr"].get("onlyImg"):
+                    features.append("Image support")
+                if model["attr"].get("tag"):
+                    features.append(model["attr"]["tag"])
+                if model["attr"].get("integral"):
+                    features.append(model["attr"]["integral"])
+                # 添加备注
+                if model["attr"].get("note"):
+                    model_str += f" - {model['attr']['note']}"
+                if features:
+                    model_str += f" [{'|'.join(features)}]"
+
+                model["desc"] = model_str
+
+            return list(self.models.keys())
+
+        except Exception as e:
+            PrettyOutput.print(f"获取模型列表失败: {str(e)}", OutputType.ERROR)
+            return []
+
+    def support_upload_files(self) -> bool:
+        return False
+
+    def support_web(self) -> bool:
+        return False
+
+    def upload_files(self, file_list: List[str]) -> bool:
+        return False