jarvis-ai-assistant 0.1.134__py3-none-any.whl → 0.1.138__py3-none-any.whl

jarvis/jarvis_platform/openai.py

@@ -17,12 +17,12 @@ class OpenAIModel(BasePlatform):
         if not self.api_key:
             message = (
                 "需要设置以下环境变量才能使用 OpenAI 模型:\n"
-                "  • OPENAI_API_KEY: API 密钥\n" 
+                "  • OPENAI_API_KEY: API 密钥\n"
                 "  • OPENAI_API_BASE: (可选) API 基础地址, 默认使用 https://api.openai.com/v1\n"
                 "您可以通过以下方式设置它们:\n"
                 "1. 创建或编辑 ~/.jarvis/env 文件:\n"
                 "   OPENAI_API_KEY=your_api_key\n"
-                "   OPENAI_API_BASE=your_api_base\n" 
+                "   OPENAI_API_BASE=your_api_base\n"
                 "   OPENAI_MODEL_NAME=your_model_name\n"
                 "2. 直接设置环境变量:\n"
                 "   export OPENAI_API_KEY=your_api_key\n"
@@ -31,11 +31,11 @@ class OpenAIModel(BasePlatform):
             )
             PrettyOutput.print(message, OutputType.INFO)
             PrettyOutput.print("OPENAI_API_KEY 未设置", OutputType.WARNING)
-            
+
         self.base_url = os.getenv("OPENAI_API_BASE", "https://api.openai.com/v1")
         self.model_name =  os.getenv("JARVIS_MODEL") or "gpt-4o"
 
-            
+
         self.client = OpenAI(
             api_key=self.api_key,
             base_url=self.base_url
@@ -68,33 +68,33 @@ class OpenAIModel(BasePlatform):
     def chat(self, message: str) -> str:
         """Execute conversation"""
         try:
-            
+
             # Add user message to history
             self.messages.append({"role": "user", "content": message})
-            
+
             response = self.client.chat.completions.create(
                 model=self.model_name,  # Use the configured model name
                 messages=self.messages, # type: ignore
                 stream=True
             ) # type: ignore
-            
+
             full_response = ""
-            
+
             for chunk in response:
                 if chunk.choices and chunk.choices[0].delta.content:
                     text = chunk.choices[0].delta.content
                     if not self.suppress_output:
                         PrettyOutput.print_stream(text)
                     full_response += text
-                    
+
             if not self.suppress_output:
                 PrettyOutput.print_stream_end()
-            
+
             # Add assistant reply to history
             self.messages.append({"role": "assistant", "content": full_response})
-            
+
             return full_response
-            
+
         except Exception as e:
             PrettyOutput.print(f"对话失败：{str(e)}", OutputType.ERROR)
             raise Exception(f"Chat failed: {str(e)}")
@@ -103,15 +103,11 @@ class OpenAIModel(BasePlatform):
         """Return model name"""
         return self.model_name
 
-    def reset(self):
-        """Reset model state"""
-        # Clear conversation history, only keep system message
+
+    def delete_chat(self)->bool:
+        """Delete conversation"""
         if self.system_message:
             self.messages = [{"role": "system", "content": self.system_message}]
         else:
             self.messages = []
-
-    def delete_chat(self)->bool:
-        """Delete conversation"""
-        self.reset()
         return True

jarvis/jarvis_platform/oyi.py

@@ -9,7 +9,7 @@ from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 class OyiModel(BasePlatform):
     """Oyi model implementation"""
-    
+
     platform_name = "oyi"
     BASE_URL = "https://api-10086.rcouyi.com"
 
@@ -17,31 +17,31 @@ class OyiModel(BasePlatform):
         """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.models = {}
         self.messages = []
         self.system_message = ""
         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:
@@ -51,7 +51,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,
@@ -70,13 +70,13 @@ 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':
@@ -88,21 +88,21 @@ class OyiModel(BasePlatform):
             else:
                 PrettyOutput.print(f"创建会话失败: {response.status_code}", OutputType.WARNING)
                 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
         """
@@ -111,7 +111,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}',
@@ -121,14 +121,14 @@ class OyiModel(BasePlatform):
                 '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_message + "\n" + message
@@ -136,34 +136,34 @@ 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.WARNING)
                 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.WARNING)
                 raise Exception(error_msg)
-            
+
             message_id = data['result'][-1]
-            
+
             # 获取响应内容
             response = requests.post(
                 f"{self.BASE_URL}/chatapi/chat/message/{message_id}",
                 headers=headers,
                 stream=True
             )
-            
+
             if response.status_code == 200:
                 full_response = ""
                 bin = b""
@@ -180,7 +180,7 @@ class OyiModel(BasePlatform):
                         bin = b""
 
                 PrettyOutput.print_stream_end()
-                
+
                 self.messages.append({"role": "assistant", "content": full_response})
                 return full_response
             else:
@@ -190,23 +190,18 @@ class OyiModel(BasePlatform):
         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.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',
@@ -215,17 +210,19 @@ 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']}",
                 headers=headers,
                 json={}
             )
-            
+
             if response.status_code == 200:
                 data = response.json()
                 if data['code'] == 200 and data['type'] == 'success':
-                    self.reset()
+                    self.messages = []
+                    self.conversation = None
+                    self.first_chat = True
                     return True
                 else:
                     error_msg = f"删除会话失败: {data.get('message', '未知错误')}"
@@ -235,21 +232,22 @@ class OyiModel(BasePlatform):
                 error_msg = f"删除会话请求失败: {response.status_code}"
                 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, */*',
@@ -257,32 +255,32 @@ 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.WARNING)
                 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_name = model['value']
                 model_str = model['label']
-                
+
                 # 添加后缀标签
                 suffix = model.get('suffix', [])
                 if suffix:
@@ -293,17 +291,17 @@ class OyiModel(BasePlatform):
                     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 []

jarvis/jarvis_platform/registry.py

@@ -11,7 +11,6 @@ REQUIRED_METHODS = [
     ('chat', ['message']),           # 方法名和参数列表
     ('name', []),
     ('delete_chat', []),
-    ('reset', []),
     ('set_system_message', ['message']),
     ('set_model_name', ['model_name']),
     ('get_model_list', []),
@@ -43,67 +42,67 @@ class PlatformRegistry:
     @staticmethod
     def check_platform_implementation(platform_class: Type[BasePlatform]) -> bool:
         """Check if the platform class implements all necessary methods
-        
+
         Args:
             platform_class: The platform class to check
-            
+
         Returns:
             bool: Whether all necessary methods are implemented
         """
         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}(parameter mismatch)")
-        
+
         if missing_methods:
             PrettyOutput.print(
-                f"平台 {platform_class.__name__} 缺少必要的方法: {', '.join(missing_methods)}", 
+                f"平台 {platform_class.__name__} 缺少必要的方法: {', '.join(missing_methods)}",
                 OutputType.WARNING
             )
             return False
-            
+
         return True
 
     @staticmethod
     def load_platform_from_dir(directory: str) -> Dict[str, Type[BasePlatform]]:
         """Load platforms from specified directory
-        
+
         Args:
             directory: Platform directory path
-            
+
         Returns:
             Dict[str, Type[BasePlatform]]: Platform name to platform class mapping
         """
         platforms = {}
-        
+
         # 确保目录存在
         if not os.path.exists(directory):
             PrettyOutput.print(f"平台目录不存在: {directory}", OutputType.WARNING)
             return platforms
-            
+
         # 获取目录的包名
         package_name = None
         if directory == os.path.dirname(__file__):
             package_name = "jarvis.jarvis_platform"
-            
+
         # 添加目录到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('__'):
@@ -114,12 +113,12 @@ class PlatformRegistry:
                         module = importlib.import_module(f"{package_name}.{module_name}")
                     else:
                         module = importlib.import_module(module_name)
-                    
+
                     # 遍历模块中的所有类
                     for _, obj in inspect.getmembers(module):
                         # 检查是否是BasePlatform的子类，但不是BasePlatform本身
-                        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')):
                             # 检查平台实现
@@ -129,7 +128,7 @@ class PlatformRegistry:
                             break
                 except Exception as e:
                     PrettyOutput.print(f"加载平台 {module_name} 失败: {str(e)}", OutputType.ERROR)
-        
+
         return platforms
 
 
@@ -137,9 +136,9 @@ class PlatformRegistry:
     def get_global_platform_registry():
         """Get global platform registry"""
         if PlatformRegistry.global_platform_registry is None:
-            PlatformRegistry.global_platform_registry = PlatformRegistry()  
+            PlatformRegistry.global_platform_registry = PlatformRegistry()
         return PlatformRegistry.global_platform_registry
-    
+
     def __init__(self):
         """Initialize platform registry"""
         self.platforms: Dict[str, Type[BasePlatform]] = {}
@@ -152,7 +151,7 @@ class PlatformRegistry:
         if platform_dir and os.path.exists(platform_dir):
             for platform_name, platform_class in PlatformRegistry.load_platform_from_dir(platform_dir).items():
                 self.register_platform(platform_name, platform_class)
-        
+
 
     def get_normal_platform(self) -> BasePlatform:
         platform_name = get_normal_platform_name()
@@ -160,7 +159,7 @@ class PlatformRegistry:
         platform = self.create_platform(platform_name)
         platform.set_model_name(model_name) # type: ignore
         return platform # type: ignore
-    
+
     def get_thinking_platform(self) -> BasePlatform:
         platform_name = get_thinking_platform_name()
         model_name = get_thinking_model_name()
@@ -170,26 +169,26 @@ class PlatformRegistry:
 
     def register_platform(self, name: str, platform_class: Type[BasePlatform]):
         """Register platform class
-        
+
         Args:
             name: Platform name
             model_class: Platform class
         """
         self.platforms[name] = platform_class
-            
+
     def create_platform(self, name: str) -> Optional[BasePlatform]:
         """Create platform instance
-        
+
         Args:
             name: Platform name
-            
+
         Returns:
             BasePlatform: Platform instance
         """
         if name not in self.platforms:
             PrettyOutput.print(f"未找到平台: {name}", OutputType.WARNING)
             return None
-            
+
         try:
 
             platform = self.platforms[name]()