jarvis-ai-assistant 0.1.212__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.212"
+__version__ = "0.1.213"

jarvis/jarvis_platform/ai8.py

@@ -1,11 +1,12 @@
 import os
-from typing import Dict, Generator, List, Tuple
+from typing import Generator, List, Tuple
 from jarvis.jarvis_platform.base import BasePlatform
-import requests
 import json
-import base64
 
+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"""
@@ -16,7 +17,7 @@ class AI8Model(BasePlatform):
     def get_model_list(self) -> List[Tuple[str, str]]:
         """获取模型列表"""
         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"""
@@ -30,24 +31,23 @@ class AI8Model(BasePlatform):
             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',
+            "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)
-
-
-
+            PrettyOutput.print(
+                f"警告: 选择的模型 {self.model_name} 不在可用列表中", OutputType.WARNING
+            )
 
     def set_model_name(self, model_name: str):
         """Set model name"""
@@ -58,24 +58,22 @@ class AI8Model(BasePlatform):
         """Create a new conversation"""
         try:
 
-
             # 1. 创建会话
-            response = requests.post(
-                f"{self.BASE_URL}/api/chat/session",
-                headers=self.headers,
-                json={}
+            response = while_success(
+                lambda: http.post(
+                    f"{self.BASE_URL}/api/chat/session", headers=self.headers, json={}
+                ),
+                sleep_time=5,
             )
 
-            if response.status_code != 200:
-                PrettyOutput.print(f"创建会话失败: {response.status_code}", OutputType.WARNING)
-                return False
-
             data = response.json()
-            if data['code'] != 0:
-                PrettyOutput.print(f"创建会话失败: {data.get('msg', '未知错误')}", OutputType.WARNING)
+            if data["code"] != 0:
+                PrettyOutput.print(
+                    f"创建会话失败: {data.get('msg', '未知错误')}", OutputType.WARNING
+                )
                 return False
 
-            self.conversation = data['data']
+            self.conversation = data["data"]
 
             # 2. 更新会话设置
             session_data = {
@@ -85,25 +83,27 @@ class AI8Model(BasePlatform):
                 "prompt": self.system_prompt,
                 "plugins": [],
                 "localPlugins": None,
-                "useAppId": 0
+                "useAppId": 0,
             }
 
-            response = requests.put(
-                f"{self.BASE_URL}/api/chat/session/{self.conversation['id']}",
-                headers=self.headers,
-                json=session_data
+            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,
             )
 
-            if response.status_code == 200:
-                data = response.json()
-                if data['code'] == 0:
-                    self.conversation = data['data']
-                    return True
-                else:
-                    PrettyOutput.print(f"更新会话设置失败: {data.get('msg', '未知错误')}", OutputType.WARNING)
-                    return False
+            data = response.json()
+            if data["code"] == 0:
+                self.conversation = data["data"]
+                return True
             else:
-                PrettyOutput.print(f"更新会话设置失败: {response.status_code}", OutputType.WARNING)
+                PrettyOutput.print(
+                    f"更新会话设置失败: {data.get('msg', '未知错误')}",
+                    OutputType.WARNING,
+                )
                 return False
 
         except Exception as e:
@@ -123,41 +123,40 @@ class AI8Model(BasePlatform):
                 if not self.create_conversation():
                     raise Exception("Failed to create conversation")
 
-
-
             payload = {
                 "text": message,
-                "sessionId": self.conversation['id'] if self.conversation else None,
-                "files": []
+                "sessionId": self.conversation["id"] if self.conversation else None,
+                "files": [],
             }
 
-
-            response = requests.post(
-                f"{self.BASE_URL}/api/chat/completions",
-                headers=self.headers,
-                json=payload,
-                stream=True
+            # 使用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,
             )
 
-            if response.status_code != 200:
-                error_msg = f"Failed to chat: {response.status_code} {response.text}"
-                PrettyOutput.print(error_msg, OutputType.WARNING)
-                raise Exception(error_msg)
-
             # 处理流式响应
-            for line in response.iter_lines():
-                if line:
-                    line = line.decode('utf-8')
-                    if line.startswith('data: '):
-                        try:
-                            data = json.loads(line[6:])
-                            if data.get('type') == 'string':
-                                chunk = data.get('data', '')
-                                if chunk:
-                                    yield chunk
-
-                        except json.JSONDecodeError:
-                            continue
+            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
 
@@ -169,30 +168,26 @@ class AI8Model(BasePlatform):
         """Return model name"""
         return self.model_name
 
-
     def delete_chat(self) -> bool:
         """Delete current chat session"""
         try:
             if not self.conversation:
                 return True
 
-
-            response = requests.delete(
-                f"{self.BASE_URL}/api/chat/session/{self.conversation['id']}",
-                headers=self.headers
+            response = while_success(
+                lambda: http.delete(
+                    f"{self.BASE_URL}/api/chat/session/{self.conversation['id']}",  # type: ignore
+                    headers=self.headers,
+                ),
+                sleep_time=5,
             )
 
-            if response.status_code == 200:
-                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
+            data = response.json()
+            if data["code"] == 0:
+                self.conversation = None
+                return True
             else:
-                error_msg = f"删除会话请求失败: {response.status_code}"
+                error_msg = f"删除会话失败: {data.get('msg', '未知错误')}"
                 PrettyOutput.print(error_msg, OutputType.WARNING)
                 return False
 
@@ -210,25 +205,23 @@ class AI8Model(BasePlatform):
             if self.models:
                 return list(self.models.keys())
 
-            response = requests.get(
-                f"{self.BASE_URL}/api/chat/tmpl",
-                headers=self.headers
+            response = while_success(
+                lambda: http.get(
+                    f"{self.BASE_URL}/api/chat/tmpl", headers=self.headers
+                ),
+                sleep_time=5,
             )
 
-            if response.status_code != 200:
-                PrettyOutput.print(f"获取模型列表失败: {response.status_code}", OutputType.WARNING)
-                return []
-
             data = response.json()
-            if data['code'] != 0:
-                PrettyOutput.print(f"获取模型列表失败: {data.get('msg', '未知错误')}", OutputType.WARNING)
+            if data["code"] != 0:
+                PrettyOutput.print(
+                    f"获取模型列表失败: {data.get('msg', '未知错误')}",
+                    OutputType.WARNING,
+                )
                 return []
 
             # 保存模型信息
-            self.models = {
-                model['value']: model
-                for model in data['data']['models']
-            }
+            self.models = {model["value"]: model for model in data["data"]["models"]}
 
             for model in self.models.values():
                 # 添加标签
@@ -236,23 +229,23 @@ class AI8Model(BasePlatform):
 
                 # 添加特性标记
                 features = []
-                if model['attr'].get('multimodal'):
+                if model["attr"].get("multimodal"):
                     features.append("Multimodal")
-                if model['attr'].get('plugin'):
+                if model["attr"].get("plugin"):
                     features.append("Plugin support")
-                if model['attr'].get('onlyImg'):
+                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("tag"):
+                    features.append(model["attr"]["tag"])
+                if model["attr"].get("integral"):
+                    features.append(model["attr"]["integral"])
                 # 添加备注
-                if model['attr'].get('note'):
+                if model["attr"].get("note"):
                     model_str += f" - {model['attr']['note']}"
                 if features:
                     model_str += f" [{'|'.join(features)}]"
 
-                model['desc'] = model_str
+                model["desc"] = model_str
 
             return list(self.models.keys())
 
@@ -262,9 +255,9 @@ class AI8Model(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/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,36 @@ 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 +117,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 +143,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 +192,6 @@ class OyiModel(BasePlatform):
         """Return model name"""
         return self.model_name
 
-
     def delete_chat(self) -> bool:
         """Delete current chat session"""
         try:
@@ -200,37 +199,34 @@ 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
@@ -246,55 +242,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 +299,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_utils/input.py

@@ -38,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",
@@ -190,7 +190,7 @@ def get_multiline_input(tip: str) -> str:
     """
     # 显示输入说明
     PrettyOutput.section(
-        "用户输入 - 使用 @ 触发文件补全，Tab 选择补全项，Ctrl+J 提交，Ctrl+L 复制最后一条消息，按 Ctrl+C 取消输入",
+        "用户输入 - 使用 @ 触发文件补全，Tab 选择补全项，Ctrl+J 提交，Ctrl+O 复制最后一条消息，按 Ctrl+C 取消输入",
         OutputType.USER,
     )
     print(f"{Fore.GREEN}{tip}{ColoramaStyle.RESET_ALL}")
@@ -212,9 +212,9 @@ def get_multiline_input(tip: str) -> str:
         """处理Ctrl+J以提交输入。"""
         event.current_buffer.validate_and_handle()
 
-    @bindings.add("c-l")
+    @bindings.add("c-o")
     def _(event):
-        """处理Ctrl+L以复制最后一条消息到剪贴板。"""
+        """处理Ctrl+O以复制最后一条消息到剪贴板。"""
         from jarvis.jarvis_utils.globals import get_last_message
         import subprocess
 
@@ -246,7 +246,7 @@ def get_multiline_input(tip: str) -> str:
         # 获取数据目录路径
         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.212.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.212
+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.212.dist-info → jarvis_ai_assistant-0.1.213.dist-info}/RECORD

@@ -1,4 +1,4 @@
-jarvis/__init__.py,sha256=kz-6zpmo_NPSLXBTjHQyhEg8Z5G5ayw0RFZS5KubWws,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,12 +45,12 @@ 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/ai8.py,sha256=3LA4vSsaP-p9zXmj7o0jzL1WI8UMv4-P0YNz9s9r-6U,9115
+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=w0-OJ6xkOGPApcc2Jvc30BMjabwrnzcndmsJJsWOWJg,13419
 jarvis/jarvis_platform/openai.py,sha256=uEjBikfFj7kp5wondLvOx4WdkmTX0aqF6kixxAufcHg,4806
-jarvis/jarvis_platform/oyi.py,sha256=6SBAO-lhk6yoZvrglGF8rHIDA7SbcvjRy8sYYJ7ou0w,11241
+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
@@ -83,14 +83,14 @@ jarvis/jarvis_utils/file_processors.py,sha256=XiM248SHS7lLgQDCbORVFWqinbVDUawYxW
 jarvis/jarvis_utils/git_utils.py,sha256=7AZblSD4b76vXxaDFkmZOy5rNkwvkwQQxGUy3NAusDQ,21641
 jarvis/jarvis_utils/globals.py,sha256=WzZh_acNfHJj1LDulhyLQ7cojksBy0gdrITe0vH1XA0,3901
 jarvis/jarvis_utils/http.py,sha256=Uqt1kcz0HWnAfXHHi1fNGwLb2lcVUqpbrG2Uk_-kcIU,4882
-jarvis/jarvis_utils/input.py,sha256=Vd6Ksh9PYM8X0OvK2x22UoG0y3ejlssk-JIAv5X_kRM,8877
+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.212.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.212.dist-info/METADATA,sha256=ZlgX9X1Zd8T5cKIXuhfydCw9qszuXa_TUR6HnyJkAVc,19564
-jarvis_ai_assistant-0.1.212.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jarvis_ai_assistant-0.1.212.dist-info/entry_points.txt,sha256=SF46ViTZcQVZEfbqzJDKKVc9TrN1x-P1mQ6wup7u2HY,875
-jarvis_ai_assistant-0.1.212.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.212.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,,