jarvis-ai-assistant 0.1.46__py3-none-any.whl → 0.1.48__py3-none-any.whl

jarvis/models/oyi.py

@@ -6,17 +6,16 @@ from jarvis.utils import PrettyOutput, OutputType
 import requests
 import json
 
-
 class OyiModel(BasePlatform):
     """Oyi model implementation"""
-
+    
     platform_name = "oyi"
     BASE_URL = "https://api-10086.rcouyi.com"
-
+    
     def __init__(self):
         """Initialize model"""
         PrettyOutput.section("支持的模型", OutputType.SUCCESS)
-
+        
         # 获取可用模型列表
         available_models = self.get_available_models()
         if available_models:
@@ -24,32 +23,30 @@ class OyiModel(BasePlatform):
                 PrettyOutput.print(model, OutputType.INFO)
         else:
             PrettyOutput.print("获取模型列表失败", OutputType.WARNING)
-
+        
         PrettyOutput.print("使用OYI_MODEL环境变量配置模型", OutputType.SUCCESS)
-
+        
         self.messages = []
         self.system_message = ""
         self.conversation = None
-        self.upload_files = []
+        self.upload_files = []  # 重命名 files 为 upload_files
         self.first_chat = True
-
+        
         self.token = os.getenv("OYI_API_KEY")
         if not self.token:
             raise Exception("OYI_API_KEY is not set")
-
+        
         self.model_name = os.getenv("OYI_MODEL") or "deepseek-chat"
         if self.model_name not in [m.split()[0] for m in available_models]:
-            PrettyOutput.print(
-                f"警告: 当前选择的模型 {
-                    self.model_name} 不在可用列表中",
-                OutputType.WARNING)
-
+            PrettyOutput.print(f"警告: 当前选择的模型 {self.model_name} 不在可用列表中", OutputType.WARNING)
+        
         PrettyOutput.print(f"当前使用模型: {self.model_name}", OutputType.SYSTEM)
 
     def set_model_name(self, model_name: str):
         """设置模型名称"""
         self.model_name = model_name
 
+        
     def create_conversation(self) -> bool:
         """Create a new conversation"""
         try:
@@ -59,7 +56,7 @@ class OyiModel(BasePlatform):
                 '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,
@@ -78,49 +75,40 @@ class OyiModel(BasePlatform):
                     "chatPluginIds": []
                 })
             }
-
+            
             response = requests.post(
                 f"{self.BASE_URL}/chatapi/chat/save",
                 headers=headers,
                 json=payload
             )
-
+            
             if response.status_code == 200:
                 data = response.json()
                 if data['code'] == 200 and data['type'] == 'success':
                     self.conversation = data
-                    PrettyOutput.print(
-                        f"创建会话成功: {
-                            data['result']['id']}",
-                        OutputType.SUCCESS)
+                    PrettyOutput.print(f"创建会话成功: {data['result']['id']}", OutputType.SUCCESS)
                     return True
                 else:
-                    PrettyOutput.print(
-                        f"创建会话失败: {
-                            data['message']}",
-                        OutputType.ERROR)
+                    PrettyOutput.print(f"创建会话失败: {data['message']}", OutputType.ERROR)
                     return False
             else:
-                PrettyOutput.print(
-                    f"创建会话失败: {
-                        response.status_code}",
-                    OutputType.ERROR)
+                PrettyOutput.print(f"创建会话失败: {response.status_code}", OutputType.ERROR)
                 return False
-
+                
         except Exception as e:
             PrettyOutput.print(f"创建会话异常: {str(e)}", OutputType.ERROR)
             return False
-
+    
     def set_system_message(self, message: str):
         """Set system message"""
         self.system_message = message
-
+        
     def chat(self, message: str) -> str:
         """Execute chat with the model
-
+        
         Args:
             message: User input message
-
+            
         Returns:
             str: Model response
         """
@@ -129,7 +117,7 @@ class OyiModel(BasePlatform):
             if not self.conversation:
                 if not self.create_conversation():
                     raise Exception("Failed to create conversation")
-
+            
             # 1. 发送消息
             headers = {
                 'Authorization': f'Bearer {self.token}',
@@ -139,14 +127,14 @@ class OyiModel(BasePlatform):
                 'Origin': 'https://ai.rcouyi.com',
                 'Referer': 'https://ai.rcouyi.com/'
             }
-
+            
             payload = {
                 "topicId": self.conversation['result']['id'],
                 "messages": self.messages,
                 "content": message,
                 "contentFiles": []
             }
-
+            
             # 如果有上传的文件，添加到请求中
             if self.first_chat:
                 if self.upload_files:
@@ -165,64 +153,63 @@ class OyiModel(BasePlatform):
                 self.first_chat = False
 
             self.messages.append({"role": "user", "content": message})
-
+            
             # 发送消息
             response = requests.post(
                 f"{self.BASE_URL}/chatapi/chat/message",
                 headers=headers,
                 json=payload
             )
-
+            
             if response.status_code != 200:
                 error_msg = f"聊天请求失败: {response.status_code}"
                 PrettyOutput.print(error_msg, OutputType.ERROR)
                 raise Exception(error_msg)
-
+            
             data = response.json()
             if data['code'] != 200 or data['type'] != 'success':
                 error_msg = f"聊天失败: {data.get('message', '未知错误')}"
                 PrettyOutput.print(error_msg, OutputType.ERROR)
                 raise Exception(error_msg)
-
+            
             message_id = data['result'][-1]
-
+            
             # 获取响应内容
             response = requests.post(
                 f"{self.BASE_URL}/chatapi/chat/message/{message_id}",
                 headers=headers
             )
-
+            
             if response.status_code == 200:
                 PrettyOutput.print(response.text, OutputType.SYSTEM)
-                self.messages.append(
-                    {"role": "assistant", "content": response.text})
+                self.messages.append({"role": "assistant", "content": response.text})
                 return response.text
             else:
                 error_msg = f"获取响应失败: {response.status_code}"
                 PrettyOutput.print(error_msg, OutputType.ERROR)
                 raise Exception(error_msg)
-
+            
         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 reset(self):
         """Reset model state"""
         self.messages = []
         self.conversation = None
         self.upload_files = []
         self.first_chat = True
-
+            
     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',
@@ -231,15 +218,13 @@ class OyiModel(BasePlatform):
                 'Origin': 'https://ai.rcouyi.com',
                 'Referer': 'https://ai.rcouyi.com/'
             }
-
+            
             response = requests.post(
-                f"{
-                    self.BASE_URL}/chatapi/chat/{
-                    self.conversation['result']['id']}",
+                f"{self.BASE_URL}/chatapi/chat/{self.conversation['result']['id']}",
                 headers=headers,
                 json={}
             )
-
+            
             if response.status_code == 200:
                 data = response.json()
                 if data['code'] == 200 and data['type'] == 'success':
@@ -254,17 +239,17 @@ class OyiModel(BasePlatform):
                 error_msg = f"删除会话请求失败: {response.status_code}"
                 PrettyOutput.print(error_msg, OutputType.ERROR)
                 return False
-
+            
         except Exception as e:
             PrettyOutput.print(f"删除会话异常: {str(e)}", OutputType.ERROR)
             return False
-
-    def upload_file(self, file_path: str) -> Dict:
+    
+    def upload_files(self, file_list: List[str]) -> List[Dict]:
         """Upload a file to OYI API
-
+        
         Args:
             file_path: Path to the file to upload
-
+            
         Returns:
             Dict: Upload response data
         """
@@ -272,12 +257,9 @@ class OyiModel(BasePlatform):
             # 检查当前模型是否支持文件上传
             model_info = self.models.get(self.model_name)
             if not model_info or not model_info.get('uploadFile', False):
-                PrettyOutput.print(
-                    f"当前模型 {
-                        self.model_name} 不支持文件上传",
-                    OutputType.WARNING)
+                PrettyOutput.print(f"当前模型 {self.model_name} 不支持文件上传", OutputType.WARNING)
                 return None
-
+            
             headers = {
                 'Authorization': f'Bearer {self.token}',
                 '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',
@@ -286,45 +268,45 @@ class OyiModel(BasePlatform):
                 'Origin': 'https://ai.rcouyi.com',
                 'Referer': 'https://ai.rcouyi.com/'
             }
-
-            with open(file_path, 'rb') as f:
-                files = {
-                    'file': (os.path.basename(file_path), f, mimetypes.guess_type(file_path)[0])
-                }
-
-                response = requests.post(
-                    f"{self.BASE_URL}/chatapi/m_file/uploadfile",
-                    headers=headers,
-                    files=files
-                )
-
-                if response.status_code == 200:
-                    data = response.json()
-                    if data.get('code') == 200:
-                        PrettyOutput.print("文件上传成功", OutputType.SUCCESS)
-                        print(data)
-                        self.upload_files.append(data)
-                        return data
+            
+            for file_path in file_list:
+                # 检查文件类型
+                file_type = mimetypes.guess_type(file_path)[0]
+                if not file_type or not file_type.startswith(('image/', 'text/', 'application/')):
+                    PrettyOutput.print(f"文件类型不支持: {file_type}", OutputType.ERROR)
+                    continue
+                
+                with open(file_path, 'rb') as f:
+                    files = {
+                        'file': (os.path.basename(file_path), f, file_type)
+                    }
+                
+                    response = requests.post(
+                        f"{self.BASE_URL}/chatapi/m_file/uploadfile",
+                        headers=headers,
+                        files=files
+                    )
+                    
+                    if response.status_code == 200:
+                        data = response.json()
+                        if data.get('code') == 200:
+                            PrettyOutput.print("文件上传成功", OutputType.SUCCESS)
+                            self.upload_files.append(data)
+                            return data
+                        else:
+                            PrettyOutput.print(f"文件上传失败: {data.get('message')}", OutputType.ERROR)
+                            return None
                     else:
-                        PrettyOutput.print(
-                            f"文件上传失败: {
-                                data.get('message')}",
-                            OutputType.ERROR)
+                        PrettyOutput.print(f"文件上传失败: {response.status_code}", OutputType.ERROR)
                         return None
-                else:
-                    PrettyOutput.print(
-                        f"文件上传失败: {
-                            response.status_code}",
-                        OutputType.ERROR)
-                    return None
-
+                
         except Exception as e:
             PrettyOutput.print(f"文件上传异常: {str(e)}", OutputType.ERROR)
             return None
 
     def get_available_models(self) -> List[str]:
         """获取可用的模型列表
-
+        
         Returns:
             List[str]: 可用模型名称列表
         """
@@ -336,59 +318,55 @@ class OyiModel(BasePlatform):
                 'Origin': 'https://ai.rcouyi.com',
                 'Referer': 'https://ai.rcouyi.com/'
             }
-
+            
             response = requests.get(
                 "https://ai.rcouyi.com/config/system.json",
                 headers=headers
             )
-
+            
             if response.status_code != 200:
-                PrettyOutput.print(
-                    f"获取模型列表失败: {
-                        response.status_code}",
-                    OutputType.ERROR)
+                PrettyOutput.print(f"获取模型列表失败: {response.status_code}", OutputType.ERROR)
                 return []
-
+            
             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_str = f"{model['value']:<30} {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_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}"
-
+                    
                 # 添加文件上传支持标记
                 if model.get('uploadFile'):
                     model_str += " [支持文件上传]"
-
+                    
                 models.append(model_str)
-
+                
             return sorted(models)
-
+            
         except Exception as e:
             PrettyOutput.print(f"获取模型列表异常: {str(e)}", OutputType.ERROR)
             return []

jarvis/models/registry.py

@@ -14,7 +14,6 @@ REQUIRED_METHODS = [
     ('set_system_message', ['message'])
 ]
 
-
 class PlatformRegistry:
     """平台注册器"""
 
@@ -30,82 +29,76 @@ class PlatformRegistry:
                 # 创建 __init__.py 使其成为 Python 包
                 with open(os.path.join(user_platform_dir, "__init__.py"), "w") as f:
                     pass
-                PrettyOutput.print(
-                    f"已创建平台目录: {user_platform_dir}",
-                    OutputType.INFO)
+                PrettyOutput.print(f"已创建平台目录: {user_platform_dir}", OutputType.INFO)
             except Exception as e:
                 PrettyOutput.print(f"创建平台目录失败: {str(e)}", OutputType.ERROR)
                 return ""
         return user_platform_dir
 
     @staticmethod
-    def check_platform_implementation(
-            platform_class: Type[BasePlatform]) -> bool:
+    def check_platform_implementation(platform_class: Type[BasePlatform]) -> bool:
         """检查平台类是否实现了所有必要的方法
-
+        
         Args:
             platform_class: 要检查的平台类
-
+            
         Returns:
             bool: 是否实现了所有必要的方法
         """
         missing_methods = []
-
+        
         for method_name, params in REQUIRED_METHODS:
             if not hasattr(platform_class, method_name):
                 missing_methods.append(method_name)
                 continue
-
+                
             method = getattr(platform_class, method_name)
             if not callable(method):
                 missing_methods.append(method_name)
                 continue
-
+                
             # 检查方法参数
             import inspect
             sig = inspect.signature(method)
             method_params = [p for p in sig.parameters if p != 'self']
             if len(method_params) != len(params):
                 missing_methods.append(f"{method_name}(参数不匹配)")
-
+        
         if missing_methods:
             PrettyOutput.print(
-                f"平台 {
-                    platform_class.__name__} 缺少必要的方法: {
-                    ', '.join(missing_methods)}",
+                f"平台 {platform_class.__name__} 缺少必要的方法: {', '.join(missing_methods)}", 
                 OutputType.ERROR
             )
             return False
-
+            
         return True
 
     @staticmethod
-    def load_platform_from_dir(
-            directory: str) -> Dict[str, Type[BasePlatform]]:
+    def load_platform_from_dir(directory: str) -> Dict[str, Type[BasePlatform]]:
         """从指定目录加载平台
-
+        
         Args:
             directory: 平台目录路径
-
+            
         Returns:
             Dict[str, Type[BaseModel]]: 平台名称到平台类的映射
         """
         platforms = {}
-
+        
         # 确保目录存在
         if not os.path.exists(directory):
             PrettyOutput.print(f"平台目录不存在: {directory}", OutputType.ERROR)
             return platforms
-
+            
         # 获取目录的包名
         package_name = None
         if directory == os.path.dirname(__file__):
             package_name = "jarvis.models"
-
+            
         # 添加目录到Python路径
         if directory not in sys.path:
             sys.path.append(directory)
-
+        
         # 遍历目录下的所有.py文件
         for filename in os.listdir(directory):
             if filename.endswith('.py') and not filename.startswith('__'):
@@ -113,55 +106,46 @@ class PlatformRegistry:
                 try:
                     # 导入模块
                     if package_name:
-                        module = importlib.import_module(
-                            f"{package_name}.{module_name}")
+                        module = importlib.import_module(f"{package_name}.{module_name}")
                     else:
                         module = importlib.import_module(module_name)
-
+                    
                     # 遍历模块中的所有类
                     for name, obj in inspect.getmembers(module):
                         # 检查是否是BaseModel的子类，但不是BaseModel本身
-                        if (inspect.isclass(obj) and
-                            issubclass(obj, BasePlatform) and
+                        if (inspect.isclass(obj) and 
+                            issubclass(obj, BasePlatform) and 
                             obj != BasePlatform and
-                                hasattr(obj, 'platform_name')):
+                            hasattr(obj, 'platform_name')):
                             # 检查平台实现
-                            if not PlatformRegistry.check_platform_implementation(
-                                    obj):
+                            if not PlatformRegistry.check_platform_implementation(obj):
                                 continue
                             platforms[obj.platform_name] = obj
-                            PrettyOutput.print(
-                                f"从 {directory} 加载平台: {
-                                    obj.platform_name}", OutputType.INFO)
+                            PrettyOutput.print(f"从 {directory} 加载平台: {obj.platform_name}", OutputType.INFO)
                             break
                 except Exception as e:
-                    PrettyOutput.print(
-                        f"加载平台 {module_name} 失败: {
-                            str(e)}", OutputType.ERROR)
-
+                    PrettyOutput.print(f"加载平台 {module_name} 失败: {str(e)}", OutputType.ERROR)
+        
         return platforms
 
+
     @staticmethod
     def get_global_platform_registry():
         """获取全局平台注册器"""
         if PlatformRegistry.global_platform_registry is None:
             PlatformRegistry.global_platform_registry = PlatformRegistry()
-
+            
             # 从用户平台目录加载额外平台
             platform_dir = PlatformRegistry.get_platform_dir()
             if platform_dir and os.path.exists(platform_dir):
-                for platform_name, platform_class in PlatformRegistry.load_platform_from_dir(
-                        platform_dir).items():
-                    PlatformRegistry.global_platform_registry.register_platform(
-                        platform_name, platform_class)
+                for platform_name, platform_class in PlatformRegistry.load_platform_from_dir(platform_dir).items():
+                    PlatformRegistry.global_platform_registry.register_platform(platform_name, platform_class)
             platform_dir = os.path.dirname(__file__)
             if platform_dir and os.path.exists(platform_dir):
-                for platform_name, platform_class in PlatformRegistry.load_platform_from_dir(
-                        platform_dir).items():
-                    PlatformRegistry.global_platform_registry.register_platform(
-                        platform_name, platform_class)
+                for platform_name, platform_class in PlatformRegistry.load_platform_from_dir(platform_dir).items():
+                    PlatformRegistry.global_platform_registry.register_platform(platform_name, platform_class)
         return PlatformRegistry.global_platform_registry
-
+    
     def __init__(self):
         """初始化平台注册器
         """
@@ -170,37 +154,34 @@ class PlatformRegistry:
     @staticmethod
     def get_global_platform() -> BasePlatform:
         """获取全局平台实例"""
-        platform = PlatformRegistry.get_global_platform_registry(
-        ).create_platform(PlatformRegistry.global_platform_name)
+        platform = PlatformRegistry.get_global_platform_registry().create_platform(PlatformRegistry.global_platform_name)
         if not platform:
-            raise Exception(
-                f"Failed to create platform: {
-                    PlatformRegistry.global_platform_name}")
+            raise Exception(f"Failed to create platform: {PlatformRegistry.global_platform_name}")
         return platform
-
+        
     def register_platform(self, name: str, platform_class: Type[BasePlatform]):
         """注册平台类
-
+        
         Args:
             name: 平台名称
             model_class: 平台类
         """
         self.platforms[name] = platform_class
         PrettyOutput.print(f"已注册平台: {name}", OutputType.INFO)
-
+            
     def create_platform(self, name: str) -> Optional[BasePlatform]:
         """创建平台实例
-
+        
         Args:
             name: 平台名称
-
+            
         Returns:
             BaseModel: 平台实例
         """
         if name not in self.platforms:
             PrettyOutput.print(f"未找到平台: {name}", OutputType.ERROR)
             return None
-
+            
         try:
             platform = self.platforms[name]()
             PrettyOutput.print(f"已创建平台实例: {name}", OutputType.INFO)
@@ -208,11 +189,11 @@ class PlatformRegistry:
         except Exception as e:
             PrettyOutput.print(f"创建平台失败: {str(e)}", OutputType.ERROR)
             return None
-
+            
     def get_available_platforms(self) -> List[str]:
         """获取可用平台列表"""
-        return list(self.platforms.keys())
-
+        return list(self.platforms.keys()) 
+    
     def set_global_platform_name(self, platform_name: str):
         """设置全局平台"""
         PlatformRegistry.global_platform_name = platform_name