jarvis-ai-assistant 0.1.212__py3-none-any.whl → 0.1.214__py3-none-any.whl

jarvis/jarvis_platform/oyi.py

@@ -2,10 +2,12 @@ import mimetypes
 import os
 from typing import Dict, Generator, List, Tuple
 from jarvis.jarvis_platform.base import BasePlatform
-import requests
 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"""
@@ -16,7 +18,7 @@ class OyiModel(BasePlatform):
     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()]
+        return [(name, info["desc"]) for name, info in self.models.items()]
 
     def __init__(self):
         """Initialize model"""
@@ -33,23 +35,23 @@ class OyiModel(BasePlatform):
 
         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)
-
+            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'
+                "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 = {
@@ -58,35 +60,34 @@ class OyiModel(BasePlatform):
                 "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": []
-                })
+                "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 = requests.post(
-                f"{self.BASE_URL}/chatapi/chat/save",
-                headers=headers,
-                json=payload
+            response = while_success(
+                lambda: http.post(
+                    f"{self.BASE_URL}/chatapi/chat/save", headers=headers, json=payload
+                ),
+                sleep_time=5,
             )
 
-            if response.status_code == 200:
-                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
+            data = response.json()
+            if data["code"] == 200 and data["type"] == "success":
+                self.conversation = data
+                return True
             else:
-                PrettyOutput.print(f"创建会话失败: {response.status_code}", OutputType.WARNING)
+                PrettyOutput.print(f"创建会话失败: {data['message']}", OutputType.WARNING)
                 return False
 
         except Exception as e:
@@ -114,19 +115,21 @@ class OyiModel(BasePlatform):
 
             # 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/'
+                "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,
+                "topicId": (
+                    self.conversation["result"]["id"] if self.conversation else None
+                ),
                 "messages": self.messages,
                 "content": message,
-                "contentFiles": []
+                "contentFiles": [],
             }
 
             # 如果有上传的文件，添加到请求中
@@ -138,52 +141,47 @@ class OyiModel(BasePlatform):
             self.messages.append({"role": "user", "content": message})
 
             # 发送消息
-            response = requests.post(
-                f"{self.BASE_URL}/chatapi/chat/message",
-                headers=headers,
-                json=payload
+            response = while_success(
+                lambda: http.post(
+                    f"{self.BASE_URL}/chatapi/chat/message",
+                    headers=headers,
+                    json=payload,
+                ),
+                sleep_time=5,
             )
 
-            if response.status_code != 200:
-                error_msg = f"聊天请求失败: {response.status_code}"
-                PrettyOutput.print(error_msg, OutputType.WARNING)
-                raise Exception(error_msg)
-
             data = response.json()
-            if data['code'] != 200 or data['type'] != 'success':
+            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]
+            message_id = data["result"][-1]
 
             # 获取响应内容
-            response = requests.post(
-                f"{self.BASE_URL}/chatapi/chat/message/{message_id}",
-                headers=headers,
-                stream=True
+            response = while_success(
+                lambda: http.stream_post(
+                    f"{self.BASE_URL}/chatapi/chat/message/{message_id}",
+                    headers=headers,
+                ),
+                sleep_time=5,
             )
 
-            if response.status_code == 200:
-                full_response = ""
-                bin = b""
-                for chunk in response.iter_content(decode_unicode=True):
-                    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
-            else:
-                error_msg = f"获取响应失败: {response.status_code}"
-                PrettyOutput.print(error_msg, OutputType.WARNING)
-                raise Exception(error_msg)
+            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
@@ -192,7 +190,6 @@ class OyiModel(BasePlatform):
         """Return model name"""
         return self.model_name
 
-
     def delete_chat(self) -> bool:
         """Delete current chat session"""
         try:
@@ -200,41 +197,84 @@ class OyiModel(BasePlatform):
                 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/'
+                "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 = requests.post(
-                f"{self.BASE_URL}/chatapi/chat/{self.conversation['result']['id']}",
-                headers=headers,
-                json={}
+            response = while_success(
+                lambda: http.post(
+                    f"{self.BASE_URL}/chatapi/chat/{self.conversation['result']['id']}",  # type: ignore
+                    headers=headers,
+                    json={},
+                ),
+                sleep_time=5,
             )
 
-            if response.status_code == 200:
-                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
+            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"删除会话请求失败: {response.status_code}"
+                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 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,
+            "messages": self.messages,
+            "model_name": self.model_name,
+            "system_prompt": self.system_prompt,
+            "first_chat": self.first_chat,
+        }
+
+        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.get("conversation")
+            self.messages = state.get("messages", [])
+            self.model_name = state.get("model_name", "deepseek-chat")
+            self.system_prompt = state.get("system_prompt", "")
+            self.first_chat = state.get("first_chat", 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 get_available_models(self) -> List[str]:
         """Get available model list
 
@@ -246,55 +286,53 @@ class OyiModel(BasePlatform):
                 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/'
+                "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 = requests.get(
-                "https://ai.rcouyi.com/config/system.json",
-                headers=headers
+            response = while_success(
+                lambda: http.get(
+                    "https://ai.rcouyi.com/config/system.json", headers=headers
+                ),
+                sleep_time=5,
             )
 
-            if response.status_code != 200:
-                PrettyOutput.print(f"获取模型列表失败: {response.status_code}", OutputType.WARNING)
-                return []
-
             data = response.json()
 
             # 保存模型信息
             self.models = {
-                model['value']: model
-                for model in data.get('model', [])
-                if model.get('enable', False)  # 只保存启用的模型
+                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']
+                model_name = model["value"]
+                model_str = model["label"]
 
                 # 添加后缀标签
-                suffix = model.get('suffix', [])
+                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_str = ", ".join(s.get("tag", "") for s in suffix)
                     # 处理旧格式的suffix (字符串列表)
                     else:
-                        suffix_str = ', '.join(str(s) for s in suffix)
+                        suffix_str = ", ".join(str(s) for s in suffix)
                     model_str += f" ({suffix_str})"
 
                 # 添加描述或提示
-                info = model.get('tooltip') or model.get('description', '')
+                info = model.get("tooltip") or model.get("description", "")
                 if info:
                     model_str += f" - {info}"
 
-                model['desc'] = model_str
+                model["desc"] = model_str
                 models.append(model_name)
 
             return sorted(models)
@@ -305,10 +343,9 @@ class OyiModel(BasePlatform):
 
     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/tongyi.py

@@ -264,7 +264,7 @@ class TongyiPlatform(BasePlatform):
         """
         url = "https://api.tongyi.com/dialog/uploadToken"
         headers = self._get_base_headers()
-        payload = {}
+        payload: Dict[str, Any] = {}
 
         try:
             response = while_success(
@@ -395,16 +395,12 @@ 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", {}))
@@ -491,6 +487,56 @@ class TongyiPlatform(BasePlatform):
             PrettyOutput.print(f"Error deleting chat: {str(e)}", OutputType.ERROR)
             return False
 
+    def save(self, file_path: str) -> bool:
+        """Save chat session to a file."""
+        if not self.session_id:
+            PrettyOutput.print("没有活动的会话可供保存", OutputType.WARNING)
+            return False
+
+        state = {
+            "session_id": self.session_id,
+            "request_id": self.request_id,
+            "msg_id": self.msg_id,
+            "model_name": self.model_name,
+            "uploaded_file_info": self.uploaded_file_info,
+            "system_message": self.system_message,
+            "first_chat": self.first_chat,
+        }
+
+        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.session_id = state.get("session_id", "")
+            self.request_id = state.get("request_id", "")
+            self.msg_id = state.get("msg_id", "")
+            self.model_name = state.get("model_name", "")
+            self.uploaded_file_info = state.get("uploaded_file_info", [])
+            self.system_message = state.get("system_message", "")
+            self.first_chat = state.get("first_chat", 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 set_system_prompt(self, message: str):
         """Set system message
 

jarvis/jarvis_platform/yuanbao.py

@@ -104,9 +104,7 @@ 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)
@@ -135,7 +133,6 @@ class YuanbaoPlatform(BasePlatform):
             file_name = os.path.basename(file_path)
             print(f"🔍 上传文件 {file_name}")
             try:
-
                 # 1. Prepare the file information
                 print(f"🔍 准备文件信息: {file_name}")
                 file_size = os.path.getsize(file_path)
@@ -572,6 +569,52 @@ class YuanbaoPlatform(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_id:
+            PrettyOutput.print("没有活动的会话可供保存", OutputType.WARNING)
+            return False
+
+        state = {
+            "conversation_id": self.conversation_id,
+            "system_message": self.system_message,
+            "first_chat": self.first_chat,
+            "model_name": self.model_name,
+            "multimedia": self.multimedia,
+        }
+
+        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.system_message = state.get("system_message", "")
+            self.first_chat = state.get("first_chat", True)
+            self.model_name = state.get("model_name", "deep_seek_v3")
+            self.multimedia = state.get("multimedia", [])
+            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