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

jarvis/jarvis_platform/kimi.py

@@ -15,7 +15,7 @@ class KimiModel(BasePlatform):
     def get_model_list(self) -> List[Tuple[str, str]]:
         """Get model list"""
         return [("kimi", "Based on the web Kimi, free interface")]
-    
+
     def __init__(self):
         """
         Initialize Kimi model
@@ -28,7 +28,7 @@ class KimiModel(BasePlatform):
                 "需要设置 KIMI_API_KEY 才能使用 Jarvis。请按照以下步骤操作：\n"
                 "1. 获取 Kimi API Key:\n"
                 "   • 访问 Kimi AI 平台: https://kimi.moonshot.cn\n"
-                "   • 登录您的账户\n" 
+                "   • 登录您的账户\n"
                 "   • 打开浏览器开发者工具 (F12 或右键 -> 检查)\n"
                 "   • 切换到网络标签\n"
                 "   • 发送任意消息\n"
@@ -84,9 +84,9 @@ class KimiModel(BasePlatform):
                 raise Exception("Failed to create chat session")
 
         url = f"https://kimi.moonshot.cn/api/chat/{self.chat_id}/completion/stream"
-        
-        
-        
+
+
+
         payload = {
             "messages": [{"role": "user", "content": message}],
             "use_search": True,
@@ -106,23 +106,23 @@ class KimiModel(BasePlatform):
         try:
             response = while_success(lambda: requests.post(url, headers=headers, json=payload, stream=True), sleep_time=5)
             full_response = ""
-            
+
             # 收集搜索和引用结果
             search_results = []
             ref_sources = []
-            
+
             for line in response.iter_lines():
                 if not line:
                     continue
-                    
+
                 line = line.decode('utf-8')
                 if not line.startswith("data: "):
                     continue
-                    
+
                 try:
                     data = json.loads(line[6:])
                     event = data.get("event")
-                    
+
                     if event == "cmpl":
                         # 处理补全文本
                         text = data.get("text", "")
@@ -130,7 +130,7 @@ class KimiModel(BasePlatform):
                             if not self.suppress_output:
                                 PrettyOutput.print_stream(text)
                             full_response += text
-                            
+
                     elif event == "search_plus":
                         # 收集搜索结果
                         msg = data.get("msg", {})
@@ -143,7 +143,7 @@ class KimiModel(BasePlatform):
                                 "type": msg.get("type", ""),
                                 "url": msg.get("url", "")
                             })
-                                
+
                     elif event == "ref_docs":
                         # 收集引用来源
                         ref_cards = data.get("ref_cards", [])
@@ -159,13 +159,13 @@ class KimiModel(BasePlatform):
                                 "rag_segments": card.get("rag_segments", []),
                                 "origin": card.get("origin", {})
                             })
-                                    
+
                 except json.JSONDecodeError:
                     continue
-                    
+
             if not self.suppress_output:
                 PrettyOutput.print_stream_end()
-            
+
 
             # 显示搜索结果摘要
             if search_results and not self.suppress_output:
@@ -180,7 +180,7 @@ class KimiModel(BasePlatform):
                     output.append(f"  链接: {result['url']}")
                     output.append("")
                 PrettyOutput.print("\n".join(output), OutputType.PROGRESS)
-                        
+
             # 显示引用来源
             if ref_sources and not self.suppress_output:
                 output = ["引用来源:"]
@@ -189,7 +189,7 @@ class KimiModel(BasePlatform):
                     output.append(f"  链接: {source['url']}")
                     if source['abstract']:
                         output.append(f"  摘要: {source['abstract']}")
-                    
+
                     # 显示相关段落
                     if source['rag_segments']:
                         output.append("  相关段落:")
@@ -197,18 +197,18 @@ class KimiModel(BasePlatform):
                             text = segment.get('text', '').replace('\n', ' ').strip()
                             if text:
                                 output.append(f"    - {text}")
-                    
+
                     # 显示原文引用
                     origin = source['origin']
                     if origin:
                         text = origin.get('text', '')
                         if text:
                             output.append(f"  原文: {text}")
-                    
+
                     output.append("")
 
                 PrettyOutput.print("\n".join(output), OutputType.PROGRESS)
-            
+
             return full_response
 
         except Exception as e:
@@ -218,17 +218,19 @@ class KimiModel(BasePlatform):
         """Delete current session"""
         if not self.chat_id:
             return True  # 如果没有会话ID，视为删除成功
-            
+
         url = f"https://kimi.moonshot.cn/api/chat/{self.chat_id}"
         headers = {
             'Authorization': self.auth_header,
             'Content-Type': 'application/json'
         }
-        
+
         try:
             response = while_success(lambda: requests.delete(url, headers=headers), sleep_time=5)
             if response.status_code == 200:
-                self.reset()
+                self.chat_id = ""
+                self.uploaded_files = []
+                self.first_chat = True  # 重置first_chat标记
                 return True
             else:
                 PrettyOutput.print(f"删除会话失败: HTTP {response.status_code}", OutputType.WARNING)
@@ -237,11 +239,6 @@ class KimiModel(BasePlatform):
             PrettyOutput.print(f"删除会话时发生错误: {str(e)}", OutputType.ERROR)
             return False
 
-    def reset(self):
-        """Reset chat"""
-        self.chat_id = ""
-        self.uploaded_files = []
-        self.first_chat = True  # 重置first_chat标记
 
     def name(self) -> str:
         """Model name"""

jarvis/jarvis_platform/ollama.py

@@ -9,25 +9,25 @@ import ollama
 
 class OllamaPlatform(BasePlatform):
     """Ollama platform implementation"""
-    
+
     platform_name = "ollama"
-    
+
     def __init__(self):
         """Initialize model"""
         super().__init__()
-        
+
         # Check environment variables and provide help information
         self.api_base = os.getenv("OLLAMA_API_BASE", "http://localhost:11434")
         self.model_name = os.getenv("JARVIS_MODEL") or "deepseek-r1:1.5b"
-        
+
         # Setup client based on availability
         self.client = None
         self.client = ollama.Client(host=self.api_base)
-        
+
         # Check if Ollama service is available
         try:
             available_models = self._get_available_models()
-            
+
             if not available_models:
                 message = (
                     "需要先下载 Ollama 模型才能使用:\n"
@@ -37,7 +37,7 @@ class OllamaPlatform(BasePlatform):
                 )
                 PrettyOutput.print(message, OutputType.INFO)
                 PrettyOutput.print("Ollama 没有可用的模型", OutputType.WARNING)
-                
+
         except Exception as e:
             message = (
                 f"Ollama 服务未启动或无法连接: {str(e)}\n"
@@ -47,8 +47,8 @@ class OllamaPlatform(BasePlatform):
                 "3. 正确配置服务地址 (默认: http://localhost:11434)"
             )
             PrettyOutput.print(message, OutputType.WARNING)
-            
-            
+
+
         self.messages = []
         self.system_message = ""
 
@@ -81,7 +81,7 @@ class OllamaPlatform(BasePlatform):
             messages.append({"role": "user", "content": message})
 
             return self._chat_with_package(messages)
-            
+
         except Exception as e:
             PrettyOutput.print(f"对话失败: {str(e)}", OutputType.ERROR)
             raise Exception(f"Chat failed: {str(e)}")
@@ -91,14 +91,14 @@ class OllamaPlatform(BasePlatform):
         # The client should not be None here due to the check in the chat method
         if not self.client:
             raise ValueError("Ollama client is not initialized")
-            
+
         # Use ollama-python's streaming API
         stream = self.client.chat(
             model=self.model_name,
             messages=messages,
             stream=True
         )
-        
+
         # Process the streaming response
         full_response = ""
         for chunk in stream:
@@ -107,33 +107,31 @@ class OllamaPlatform(BasePlatform):
                 if not self.suppress_output:
                     PrettyOutput.print_stream(text)
                 full_response += text
-                    
+
         if not self.suppress_output:
             PrettyOutput.print_stream_end()
-        
+
         # Update message history
         self.messages.append({"role": "user", "content": messages[-1]["content"]})
         self.messages.append({"role": "assistant", "content": full_response})
-        
+
         return full_response
 
-        
-    def reset(self):
-        """Reset model state"""
-        self.messages = []
-        if self.system_message:
-            self.messages.append({"role": "system", "content": self.system_message})
-            
+
     def name(self) -> str:
         """Return model name"""
         return self.model_name
-            
+
     def delete_chat(self) -> bool:
         """Delete current chat session"""
-        self.reset()
+        self.messages = []
+        if self.system_message:
+            self.messages.append({"role": "system", "content": self.system_message})
         return True
-        
+
     def set_system_message(self, message: str):
         """Set system message"""
         self.system_message = message
-        self.reset()  # 重置会话以应用新的系统消息 
+        self.messages = []
+        if self.system_message:
+            self.messages.append({"role": "system", "content": self.system_message})

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 []