jarvis-ai-assistant 0.1.211__py3-none-any.whl → 0.1.213__py3-none-any.whl

jarvis/__init__.py

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

jarvis/jarvis_platform/ai8.py

@@ -0,0 +1,263 @@
+import os
+from typing import 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 = {
+                "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 = None
+                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 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

jarvis/jarvis_platform/base.py

@@ -166,6 +166,9 @@ class BasePlatform(ABC):
             result: str = while_true(
                 lambda: while_success(lambda: self._chat(message), 5), 5
             )
+            from jarvis.jarvis_utils.globals import set_last_message
+
+            set_last_message(result)
             return result
         finally:
             set_in_chat(False)

jarvis/jarvis_platform/kimi.py

@@ -151,34 +151,43 @@ class KimiModel(BasePlatform):
         retry_count = 0
 
         while retry_count < max_retries:
-            payload = json.dumps({"ids": [file_id]}, ensure_ascii=False)
-            response = while_success(
-                lambda: http.post(url, headers=headers, data=payload, stream=True),
+            payload = {"ids": [file_id]}
+            response_stream = while_success(
+                lambda: http.stream_post(url, headers=headers, json=payload),
                 sleep_time=5,
             )
 
-            for line in response.iter_lines():
-                if not line:
-                    continue
-
-                # httpx 返回字符串，requests 返回字节，需要兼容处理
-                if isinstance(line, bytes):
-                    line = line.decode("utf-8")
-                else:
-                    line = str(line)
-
-                if not line.startswith("data: "):
-                    continue
+            response_data = b""
+            
+            # 处理流式响应
+            for chunk in response_stream:
+                response_data += chunk
 
+                # 尝试解析SSE格式的数据
                 try:
-                    data = json.loads(line[6:])
-                    if data.get("event") == "resp":
-                        status = data.get("file_info", {}).get("status")
-                        if status == "parsed":
-                            return True
-                        elif status == "failed":
-                            return False
-                except json.JSONDecodeError:
+                    # 查找完整的数据行
+                    lines = response_data.decode("utf-8").split("\n")
+                    response_data = b""  # 重置缓冲区
+
+                    for line in lines:
+                        if not line.strip():
+                            continue
+
+                        # SSE格式的行通常以"data: "开头
+                        if line.startswith("data: "):
+                            try:
+                                data = json.loads(line[6:])
+                                if data.get("event") == "resp":
+                                    status = data.get("file_info", {}).get("status")
+                                    if status == "parsed":
+                                        return True
+                                    elif status == "failed":
+                                        return False
+                            except json.JSONDecodeError:
+                                continue
+
+                except UnicodeDecodeError:
+                    # 如果解码失败，继续累积数据
                     continue
 
             retry_count += 1
@@ -284,34 +293,44 @@ class KimiModel(BasePlatform):
         }
 
         try:
-            response = while_success(
-                lambda: http.post(url, headers=headers, json=payload, stream=True),
+            # 使用新的stream_post接口发送消息请求，获取流式响应
+            response_stream = while_success(
+                lambda: http.stream_post(url, headers=headers, json=payload),
                 sleep_time=5,
             )
-            # 如果禁止输出，则静默处理
-            for line in response.iter_lines():
-                if not line:
-                    continue
-
-                # httpx 返回字符串，requests 返回字节，需要兼容处理
-                if isinstance(line, bytes):
-                    line = line.decode("utf-8")
-                else:
-                    line = str(line)
-
-                if not line.startswith("data: "):
-                    continue
-
+            
+            response_data = b""
+            
+            # 处理流式响应
+            for chunk in response_stream:
+                response_data += chunk
+
+                # 尝试解析SSE格式的数据
                 try:
-                    data = json.loads(line[6:])
-                    event = data.get("event")
-
-                    if event == "cmpl":
-                        # 处理补全文本
-                        text = data.get("text", "")
-                        if text:
-                            yield text
-                except json.JSONDecodeError:
+                    # 查找完整的数据行
+                    lines = response_data.decode("utf-8").split("\n")
+                    response_data = b""  # 重置缓冲区
+
+                    for line in lines:
+                        if not line.strip():
+                            continue
+
+                        # SSE格式的行通常以"data: "开头
+                        if line.startswith("data: "):
+                            try:
+                                data = json.loads(line[6:])
+                                event = data.get("event")
+
+                                if event == "cmpl":
+                                    # 处理补全文本
+                                    text = data.get("text", "")
+                                    if text:
+                                        yield text
+                            except json.JSONDecodeError:
+                                continue
+
+                except UnicodeDecodeError:
+                    # 如果解码失败，继续累积数据
                     continue
 
             return None

jarvis/jarvis_platform/oyi.py

@@ -0,0 +1,307 @@
+import mimetypes
+import os
+from typing import 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 OyiModel(BasePlatform):
+    """Oyi model implementation"""
+
+    platform_name = "oyi"
+    BASE_URL = "https://api-10086.rcouyi.com"
+
+    def get_model_list(self) -> List[Tuple[str, str]]:
+        """Get model list"""
+        self.get_available_models()
+        return [(name, info["desc"]) for name, info in self.models.items()]
+
+    def __init__(self):
+        """Initialize model"""
+        super().__init__()
+        self.models = {}
+        self.messages = []
+        self.system_prompt = ""
+        self.conversation = None
+        self.first_chat = True
+
+        self.token = os.getenv("OYI_API_KEY")
+        if not self.token:
+            PrettyOutput.print("OYI_API_KEY 未设置", OutputType.WARNING)
+
+        self.model_name = os.getenv("JARVIS_MODEL") or "deepseek-chat"
+        if self.model_name not in [m.split()[0] for m 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:
+            headers = {
+                "Authorization": f"Bearer {self.token}",
+                "Content-Type": "application/json",
+                "Accept": "application/json",
+                "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",
+            }
+
+            payload = {
+                "id": 0,
+                "roleId": 0,
+                "title": "New conversation",
+                "isLock": False,
+                "systemMessage": "",
+                "params": json.dumps(
+                    {
+                        "model": self.model_name,
+                        "is_webSearch": True,
+                        "message": [],
+                        "systemMessage": None,
+                        "requestMsgCount": 65536,
+                        "temperature": 0.8,
+                        "speechVoice": "Alloy",
+                        "max_tokens": 8192,
+                        "chatPluginIds": [],
+                    }
+                ),
+            }
+
+            response = while_success(
+                lambda: http.post(
+                    f"{self.BASE_URL}/chatapi/chat/save", headers=headers, json=payload
+                ),
+                sleep_time=5,
+            )
+
+            data = response.json()
+            if data["code"] == 200 and data["type"] == "success":
+                self.conversation = data
+                return True
+            else:
+                PrettyOutput.print(
+                    f"创建会话失败: {data['message']}", 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 chat with the model
+
+        Args:
+            message: User input message
+
+        Returns:
+            str: Model response
+        """
+        try:
+            # 确保有会话ID
+            if not self.conversation:
+                if not self.create_conversation():
+                    raise Exception("Failed to create conversation")
+
+            # 1. 发送消息
+            headers = {
+                "Authorization": f"Bearer {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",
+                "Origin": "https://ai.rcouyi.com",
+                "Referer": "https://ai.rcouyi.com/",
+            }
+
+            payload = {
+                "topicId": (
+                    self.conversation["result"]["id"] if self.conversation else None
+                ),
+                "messages": self.messages,
+                "content": message,
+                "contentFiles": [],
+            }
+
+            # 如果有上传的文件，添加到请求中
+            if self.first_chat:
+                message = self.system_prompt + "\n" + message
+                payload["content"] = message
+                self.first_chat = False
+
+            self.messages.append({"role": "user", "content": message})
+
+            # 发送消息
+            response = while_success(
+                lambda: http.post(
+                    f"{self.BASE_URL}/chatapi/chat/message",
+                    headers=headers,
+                    json=payload,
+                ),
+                sleep_time=5,
+            )
+
+            data = response.json()
+            if data["code"] != 200 or data["type"] != "success":
+                error_msg = f"聊天失败: {data.get('message', '未知错误')}"
+                PrettyOutput.print(error_msg, OutputType.WARNING)
+                raise Exception(error_msg)
+
+            message_id = data["result"][-1]
+
+            # 获取响应内容
+            response = while_success(
+                lambda: http.stream_post(
+                    f"{self.BASE_URL}/chatapi/chat/message/{message_id}",
+                    headers=headers,
+                ),
+                sleep_time=5,
+            )
+
+            full_response = ""
+            bin = b""
+            for chunk in response:
+                if chunk:
+                    bin += chunk
+                    try:
+                        text = bin.decode("utf-8")
+                    except UnicodeDecodeError:
+                        continue
+                    full_response += text
+                    bin = b""
+                    yield text
+
+            self.messages.append({"role": "assistant", "content": full_response})
+            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
+
+            headers = {
+                "Authorization": f"Bearer {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",
+                "Origin": "https://ai.rcouyi.com",
+                "Referer": "https://ai.rcouyi.com/",
+            }
+
+            response = while_success(
+                lambda: http.post(
+                    f"{self.BASE_URL}/chatapi/chat/{self.conversation['result']['id']}",  # type: ignore
+                    headers=headers,
+                    json={},
+                ),
+                sleep_time=5,
+            )
+
+            data = response.json()
+            if data["code"] == 200 and data["type"] == "success":
+                self.messages = []
+                self.conversation = None
+                self.first_chat = True
+                return True
+            else:
+                error_msg = f"删除会话失败: {data.get('message', '未知错误')}"
+                PrettyOutput.print(error_msg, OutputType.WARNING)
+                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())
+
+            headers = {
+                "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",
+                "Origin": "https://ai.rcouyi.com",
+                "Referer": "https://ai.rcouyi.com/",
+            }
+
+            response = while_success(
+                lambda: http.get(
+                    "https://ai.rcouyi.com/config/system.json", headers=headers
+                ),
+                sleep_time=5,
+            )
+
+            data = response.json()
+
+            # 保存模型信息
+            self.models = {
+                model["value"]: model
+                for model in data.get("model", [])
+                if model.get("enable", False)  # 只保存启用的模型
+            }
+
+            # 格式化显示
+            models = []
+            for model in self.models.values():
+                # 基本信息
+                model_name = model["value"]
+                model_str = model["label"]
+
+                # 添加后缀标签
+                suffix = model.get("suffix", [])
+                if suffix:
+                    # 处理新格式的suffix (字典列表)
+                    if suffix and isinstance(suffix[0], dict):
+                        suffix_str = ", ".join(s.get("tag", "") for s in suffix)
+                    # 处理旧格式的suffix (字符串列表)
+                    else:
+                        suffix_str = ", ".join(str(s) for s in suffix)
+                    model_str += f" ({suffix_str})"
+
+                # 添加描述或提示
+                info = model.get("tooltip") or model.get("description", "")
+                if info:
+                    model_str += f" - {info}"
+
+                model["desc"] = model_str
+                models.append(model_name)
+
+            return sorted(models)
+
+        except Exception as e:
+            PrettyOutput.print(f"获取模型列表失败: {str(e)}", OutputType.WARNING)
+            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

jarvis/jarvis_platform_manager/main.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
-"""Jarvis Platform Manager Main Module.
+"""Jarvis平台管理器主模块。
 
-This module provides the main entry point for the Jarvis platform manager.
+该模块提供了Jarvis平台管理器的主要入口点。
 """
 import argparse
 import os
@@ -15,7 +15,7 @@ from jarvis.jarvis_platform_manager.service import start_service
 
 
 def list_platforms() -> None:
-    """List all supported platforms and models."""
+    """列出所有支持的平台和模型。"""
     registry = PlatformRegistry.get_global_platform_registry()
     platforms = registry.get_available_platforms()
 
@@ -53,7 +53,7 @@ def list_platforms() -> None:
 
 
 def chat_with_model(platform_name: str, model_name: str, system_prompt: str) -> None:
-    """Chat with specified platform and model."""
+    """与指定平台和模型进行对话。"""
     registry = PlatformRegistry.get_global_platform_registry()
     conversation_history: List[Dict[str, str]] = []  # 存储对话记录
 
@@ -190,9 +190,13 @@ def chat_with_model(platform_name: str, model_name: str, system_prompt: str) ->
                         for entry in conversation_history:
                             file_obj.write(f"{entry['role']}: {entry['content']}\n\n")
 
-                    PrettyOutput.print(f"所有对话已保存到 {file_path}", OutputType.SUCCESS)
+                    PrettyOutput.print(
+                        f"所有对话已保存到 {file_path}", OutputType.SUCCESS
+                    )
                 except Exception as exc:
-                    PrettyOutput.print(f"保存所有对话失败: {str(exc)}", OutputType.ERROR)
+                    PrettyOutput.print(
+                        f"保存所有对话失败: {str(exc)}", OutputType.ERROR
+                    )
                 continue
 
             # Check if it is a shell command
@@ -242,13 +246,13 @@ def chat_with_model(platform_name: str, model_name: str, system_prompt: str) ->
 
 
 def validate_platform_model(args: argparse.Namespace) -> bool:
-    """Validate platform and model arguments.
+    """验证平台和模型参数。
 
-    Args:
-        args: Command line arguments.
+    参数:
+        args: 命令行参数。
 
-    Returns:
-        bool: True if platform and model are valid, False otherwise.
+    返回:
+        bool: 如果平台和模型有效返回True，否则返回False。
     """
     if not args.platform or not args.model:
         PrettyOutput.print(
@@ -260,10 +264,10 @@ def validate_platform_model(args: argparse.Namespace) -> bool:
 
 
 def chat_command(args: argparse.Namespace) -> None:
-    """Process chat subcommand.
+    """处理聊天子命令。
 
-    Args:
-        args: Command line arguments.
+    参数:
+        args: 命令行参数。
     """
     if not validate_platform_model(args):
         return
@@ -271,19 +275,19 @@ def chat_command(args: argparse.Namespace) -> None:
 
 
 def info_command(args: argparse.Namespace) -> None:
-    """Process info subcommand.
+    """处理信息子命令。
 
-    Args:
-        args: Command line arguments.
+    参数:
+        args: 命令行参数。
     """
     list_platforms()
 
 
 def service_command(args: argparse.Namespace) -> None:
-    """Process service subcommand - start OpenAI-compatible API server.
+    """处理服务子命令 - 启动OpenAI兼容的API服务。
 
-    Args:
-        args: Command line arguments.
+    参数:
+        args: 命令行参数。
     """
     start_service(
         host=args.host,
@@ -357,7 +361,7 @@ def role_command(args: argparse.Namespace) -> None:
 
 
 def main() -> None:
-    """Main entry point for Jarvis platform manager."""
+    """Jarvis平台管理器的主入口点。"""
     init_env("欢迎使用 Jarvis-PlatformManager，您的平台管理助手已准备就绪！")
 
     parser = argparse.ArgumentParser(description="Jarvis AI 平台")
@@ -381,8 +385,12 @@ def main() -> None:
     service_parser.add_argument(
         "--port", type=int, default=8000, help="服务端口 (默认: 8000)"
     )
-    service_parser.add_argument("--platform", "-p", help="指定默认平台，当客户端未指定平台时使用")
-    service_parser.add_argument("--model", "-m", help="指定默认模型，当客户端未指定平台时使用")
+    service_parser.add_argument(
+        "--platform", "-p", help="指定默认平台，当客户端未指定平台时使用"
+    )
+    service_parser.add_argument(
+        "--model", "-m", help="指定默认模型，当客户端未指定平台时使用"
+    )
     service_parser.set_defaults(func=service_command)
 
     # role subcommand

jarvis/jarvis_utils/globals.py

@@ -8,6 +8,9 @@
 - 环境初始化
 """
 import os
+
+# 全局变量：保存最后一条消息
+last_message: str = ""
 from typing import Any, Set
 
 import colorama
@@ -149,3 +152,31 @@ def get_interrupt() -> int:
         int: 当前中断计数
     """
     return g_interrupt
+
+
+def set_last_message(message: str) -> None:
+    """
+    设置最后一条消息。
+
+    参数:
+        message: 要保存的消息
+    """
+    global last_message
+    last_message = message
+
+
+def get_last_message() -> str:
+    """
+    获取最后一条消息。
+
+    返回:
+        str: 最后一条消息
+    """
+    return last_message
+    """
+    获取当前中断信号状态。
+
+    返回:
+        int: 当前中断计数
+    """
+    return g_interrupt

jarvis/jarvis_utils/input.py

@@ -8,16 +8,20 @@
 - 带有模糊匹配的文件路径补全
 - 用于输入控制的自定义键绑定
 """
-from colorama import Fore # type: ignore
-from colorama import Style as ColoramaStyle # type: ignore
-from fuzzywuzzy import process # type: ignore
-from prompt_toolkit import PromptSession # type: ignore
-from prompt_toolkit.completion import (CompleteEvent, Completer, Completion, # type: ignore
-                                       PathCompleter) # type: ignore
-from prompt_toolkit.document import Document # type: ignore
-from prompt_toolkit.formatted_text import FormattedText # type: ignore
-from prompt_toolkit.key_binding import KeyBindings # type: ignore
-from prompt_toolkit.styles import Style as PromptStyle # type: ignore
+from colorama import Fore  # type: ignore
+from colorama import Style as ColoramaStyle  # type: ignore
+from fuzzywuzzy import process  # type: ignore
+from prompt_toolkit import PromptSession  # type: ignore
+from prompt_toolkit.completion import (
+    CompleteEvent,
+    Completer,
+    Completion,  # type: ignore
+    PathCompleter,
+)  # type: ignore
+from prompt_toolkit.document import Document  # type: ignore
+from prompt_toolkit.formatted_text import FormattedText  # type: ignore
+from prompt_toolkit.key_binding import KeyBindings  # type: ignore
+from prompt_toolkit.styles import Style as PromptStyle  # type: ignore
 
 from jarvis.jarvis_utils.config import get_replace_map
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
@@ -34,7 +38,7 @@ def get_single_line_input(tip: str) -> str:
     返回：
         str: 用户的输入
     """
-    session = PromptSession(history=None)
+    session: PromptSession = PromptSession(history=None)
     style = PromptStyle.from_dict(
         {
             "prompt": "ansicyan",
@@ -186,7 +190,7 @@ def get_multiline_input(tip: str) -> str:
     """
     # 显示输入说明
     PrettyOutput.section(
-        "用户输入 - 使用 @ 触发文件补全，Tab 选择补全项，Ctrl+J 提交，按 Ctrl+C 取消输入",
+        "用户输入 - 使用 @ 触发文件补全，Tab 选择补全项，Ctrl+J 提交，Ctrl+O 复制最后一条消息，按 Ctrl+C 取消输入",
         OutputType.USER,
     )
     print(f"{Fore.GREEN}{tip}{ColoramaStyle.RESET_ALL}")
@@ -208,6 +212,24 @@ def get_multiline_input(tip: str) -> str:
         """处理Ctrl+J以提交输入。"""
         event.current_buffer.validate_and_handle()
 
+    @bindings.add("c-o")
+    def _(event):
+        """处理Ctrl+O以复制最后一条消息到剪贴板。"""
+        from jarvis.jarvis_utils.globals import get_last_message
+        import subprocess
+
+        last_msg = get_last_message()
+        if last_msg:
+            try:
+                # 使用xsel将内容复制到剪贴板
+                process = subprocess.Popen(["xsel", "-b", "-i"], stdin=subprocess.PIPE)
+                process.communicate(input=last_msg.encode("utf-8"))
+                PrettyOutput.print("已将最后一条消息复制到剪贴板", OutputType.INFO)
+            except Exception as e:
+                PrettyOutput.print(f"复制到剪贴板失败: {e}", OutputType.ERROR)
+        else:
+            PrettyOutput.print("没有可复制的消息", OutputType.INFO)
+
     # 配置提示会话
     style = PromptStyle.from_dict(
         {
@@ -217,14 +239,14 @@ def get_multiline_input(tip: str) -> str:
     try:
         import os
 
-        from prompt_toolkit.history import FileHistory # type: ignore
+        from prompt_toolkit.history import FileHistory  # type: ignore
 
         from jarvis.jarvis_utils.config import get_data_dir
 
         # 获取数据目录路径
         history_dir = get_data_dir()
         # 初始化带历史记录的会话
-        session = PromptSession(
+        session: PromptSession = PromptSession(
             history=FileHistory(os.path.join(history_dir, "multiline_input_history")),
             completer=FileCompleter(),
             key_bindings=bindings,

{jarvis_ai_assistant-0.1.211.dist-info → jarvis_ai_assistant-0.1.213.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.1.211
+Version: 0.1.213
 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.211.dist-info → jarvis_ai_assistant-0.1.213.dist-info}/RECORD

@@ -1,4 +1,4 @@
-jarvis/__init__.py,sha256=cqFgIO8VkgWyzLkk14Tuu3hR1gSzDxeUVLp3NtZ1Uos,75
+jarvis/__init__.py,sha256=-plSw2QooYexMaRlKIRHSdkQww5y9LDlUdoQ1gxFf2I,75
 jarvis/jarvis_agent/__init__.py,sha256=QbI5vkourPJZ2OR63RBZAtFptTYrZz_si8bIkc9EB2o,31709
 jarvis/jarvis_agent/builtin_input_handler.py,sha256=1V7kV5Zhw2HE3Xgjs1R-43RZ2huq3Kg-32NCdNnyZmA,2216
 jarvis/jarvis_agent/edit_file_handler.py,sha256=bIciBghx5maDz09x0XNTxdNsyrBbTND95GupVdJIVVg,16762
@@ -45,15 +45,17 @@ jarvis/jarvis_methodology/main.py,sha256=-PqsWvtpUJkkhiGgV-1JegEnEZBmv8SHnNMNNm_
 jarvis/jarvis_multi_agent/__init__.py,sha256=sDd3sK88dS7_qAz2ywIAaEWdQ4iRVCiuBu2rQQmrKbU,4512
 jarvis/jarvis_multi_agent/main.py,sha256=h7VUSwoPrES0XTK8z5kt3XLX1mmcm8UEuFEHQOUWPH4,1696
 jarvis/jarvis_platform/__init__.py,sha256=WLQHSiE87PPket2M50_hHzjdMIgPIBx2VF8JfB_NNRk,105
-jarvis/jarvis_platform/base.py,sha256=xN0DGYs03eS-wSQk4JgBOzFl0kvDAmqnssUU59EOXU8,7775
+jarvis/jarvis_platform/ai8.py,sha256=UWbe6kveQvOO8wMM9mh5YWyB0zapUEeFiYVPBMnhBAE,8845
+jarvis/jarvis_platform/base.py,sha256=CBFk1Kq7qzOwafOj22bacXChWvCnap3D4IacZCWC_Ss,7882
 jarvis/jarvis_platform/human.py,sha256=_WQtC5w6QJnHh-3KuW8T49C-HucXiHsBEVw-m51ykj4,3196
-jarvis/jarvis_platform/kimi.py,sha256=W5MKkH6rxS5JeNY3VZY0EOT9ugeZJqr_eHO9wd9cEW4,12444
+jarvis/jarvis_platform/kimi.py,sha256=w0-OJ6xkOGPApcc2Jvc30BMjabwrnzcndmsJJsWOWJg,13419
 jarvis/jarvis_platform/openai.py,sha256=uEjBikfFj7kp5wondLvOx4WdkmTX0aqF6kixxAufcHg,4806
+jarvis/jarvis_platform/oyi.py,sha256=U6klSMESC69H9xTo44PXD1ZvdnMa5d7qE3jcPmPBspY,10662
 jarvis/jarvis_platform/registry.py,sha256=Sz4ADAaxuufpAQG0KSQZuL1yALzH-aF3FDapkNn5foE,8107
 jarvis/jarvis_platform/tongyi.py,sha256=juvzMjZ2mbNzSWzem8snmFuE28YVOjjE_YdHCZa9Qnw,20698
 jarvis/jarvis_platform/yuanbao.py,sha256=ZsKXWifESXGfvB9eOot1I6TnhlmgXwnaft3e2UXgSXk,21045
 jarvis/jarvis_platform_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_platform_manager/main.py,sha256=Jm1ijKGZrSYo1HrgJ1R4JQZwPwiOIfDFYSVJXKPklPU,15585
+jarvis/jarvis_platform_manager/main.py,sha256=tIb3jUuMF0ErislPjo8TkEUqL04snfEJwMPSZiOkMmY,15659
 jarvis/jarvis_platform_manager/service.py,sha256=rY1FmNl-tmbkkke_3SlH9h6ckyPIgmSwbaRorURp9Cc,14916
 jarvis/jarvis_smart_shell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_smart_shell/main.py,sha256=DbhRSP1sZfSIaTltP1YWVDSQOTYEsbiOnfO9kSYwcNs,6959
@@ -79,16 +81,16 @@ jarvis/jarvis_utils/config.py,sha256=MO2-1z_7f3KkSrv7heGK1650Zb0SjnljO2hzLE2jA5c
 jarvis/jarvis_utils/embedding.py,sha256=oEOEM2qf16DMYwPsQe6srET9BknyjOdY2ef0jsp3Or8,2714
 jarvis/jarvis_utils/file_processors.py,sha256=XiM248SHS7lLgQDCbORVFWqinbVDUawYxWDOsLXDxP8,3043
 jarvis/jarvis_utils/git_utils.py,sha256=7AZblSD4b76vXxaDFkmZOy5rNkwvkwQQxGUy3NAusDQ,21641
-jarvis/jarvis_utils/globals.py,sha256=9NTMfCVd0jvtloOv14-KE6clhcVStFmyN9jWxLmQ5so,3369
+jarvis/jarvis_utils/globals.py,sha256=WzZh_acNfHJj1LDulhyLQ7cojksBy0gdrITe0vH1XA0,3901
 jarvis/jarvis_utils/http.py,sha256=Uqt1kcz0HWnAfXHHi1fNGwLb2lcVUqpbrG2Uk_-kcIU,4882
-jarvis/jarvis_utils/input.py,sha256=ehvHkIgwqnBOHkwOeRCBFRggqOgOZuUdGQXn2ATUFwU,8049
+jarvis/jarvis_utils/input.py,sha256=D0fQ6sRHjBaMm8s1L8HccC09Qlt_JD_SB_EHPCoztyA,8907
 jarvis/jarvis_utils/methodology.py,sha256=-cvM6pwgJK7BXCYg2uVjIId_j3v5RUh2z2PBcK_2vj4,8155
 jarvis/jarvis_utils/output.py,sha256=PRCgudPOB8gMEP3u-g0FGD2c6tBgJhLXUMqNPglfjV8,10813
 jarvis/jarvis_utils/tag.py,sha256=f211opbbbTcSyzCDwuIK_oCnKhXPNK-RknYyGzY1yD0,431
 jarvis/jarvis_utils/utils.py,sha256=BoRwLcixdf7mU3Tawe95ygGhQpkMffrFYLYhPwIvw8A,14498
-jarvis_ai_assistant-0.1.211.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.211.dist-info/METADATA,sha256=DXSWr3mZ247PHP_3dZzWhbgM0QBJEo2uxK1YX6v9WoU,19564
-jarvis_ai_assistant-0.1.211.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jarvis_ai_assistant-0.1.211.dist-info/entry_points.txt,sha256=SF46ViTZcQVZEfbqzJDKKVc9TrN1x-P1mQ6wup7u2HY,875
-jarvis_ai_assistant-0.1.211.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.211.dist-info/RECORD,,
+jarvis_ai_assistant-0.1.213.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.213.dist-info/METADATA,sha256=ihUbPrOcnHuEjAtbY2-IA3Tj_ZOM3Hj_YDT5wJcsH6M,19564
+jarvis_ai_assistant-0.1.213.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jarvis_ai_assistant-0.1.213.dist-info/entry_points.txt,sha256=SF46ViTZcQVZEfbqzJDKKVc9TrN1x-P1mQ6wup7u2HY,875
+jarvis_ai_assistant-0.1.213.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.213.dist-info/RECORD,,