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

jarvis/jarvis_platform/ai8.py

@@ -9,7 +9,7 @@ from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 class AI8Model(BasePlatform):
     """AI8 model implementation"""
-    
+
     platform_name = "ai8"
     BASE_URL = "https://ai8.rcouyi.com"
 
@@ -17,7 +17,7 @@ class AI8Model(BasePlatform):
         """获取模型列表"""
         self.get_available_models()
         return [(name,info['desc']) for name,info in self.models.items()]
-    
+
     def __init__(self):
         """Initialize model"""
         super().__init__()
@@ -28,48 +28,55 @@ class AI8Model(BasePlatform):
         self.token = os.getenv("AI8_API_KEY")
         if not self.token:
             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',
+        }
+
         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)
-        
+
+
+
 
     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': 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.2.2',
-                'Origin': self.BASE_URL,
-                'Referer': f'{self.BASE_URL}/chat?_userMenuKey=chat'
-            }
-            
+
+
             # 1. 创建会话
             response = requests.post(
                 f"{self.BASE_URL}/api/chat/session",
-                headers=headers
+                headers=self.headers,
+                json={}
             )
-            
+
             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)
                 return False
-            
+
             self.conversation = data['data']
-            
+
             # 2. 更新会话设置
             session_data = {
                 **self.conversation,
@@ -80,13 +87,13 @@ class AI8Model(BasePlatform):
                 "localPlugins": None,
                 "useAppId": 0
             }
-            
+
             response = requests.put(
                 f"{self.BASE_URL}/api/chat/session/{self.conversation['id']}",
-                headers=headers,
+                headers=self.headers,
                 json=session_data
             )
-            
+
             if response.status_code == 200:
                 data = response.json()
                 if data['code'] == 0:
@@ -98,53 +105,45 @@ class AI8Model(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 conversation"""
         try:
-            
+
             # 确保有会话ID
             if not self.conversation:
                 if not self.create_conversation():
                     raise Exception("Failed to create conversation")
-                
-            headers = {
-                'Authorization': self.token,
-                'Content-Type': 'application/json',
-                'Accept': 'text/event-stream',
-                '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.2.2',
-                'Origin': self.BASE_URL,
-                'Referer': f'{self.BASE_URL}/chat?_userMenuKey=chat'
-            }
-            
+
+
+
             payload = {
                 "text": message,
                 "sessionId": self.conversation['id'] if self.conversation else None,
                 "files": []
             }
-            
-            
+
+
             response = requests.post(
                 f"{self.BASE_URL}/api/chat/completions",
-                headers=headers,
+                headers=self.headers,
                 json=payload,
                 stream=True
             )
-            
+
             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)
-            
+
             # 处理流式响应
             full_response = ""
             for line in response.iter_lines():
@@ -162,49 +161,37 @@ class AI8Model(BasePlatform):
 
                         except json.JSONDecodeError:
                             continue
-            
+
             if not self.suppress_output:
                 PrettyOutput.print_stream_end()
 
             return full_response
-            
+
         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.conversation = None
-            
+
+
     def delete_chat(self) -> bool:
         """Delete current chat session"""
         try:
             if not self.conversation:
                 return True
-            
-            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.2.2',
-                'Origin': self.BASE_URL,
-                'Referer': f'{self.BASE_URL}/chat?_userMenuKey=chat'
-            }
-            
+
+
             response = requests.delete(
                 f"{self.BASE_URL}/api/chat/session/{self.conversation['id']}",
-                headers=headers
+                headers=self.headers
             )
-            
+
             if response.status_code == 200:
                 data = response.json()
                 if data['code'] == 0:
-                    self.reset()
+                    self.conversation = None
                     return True
                 else:
                     error_msg = f"删除会话失败: {data.get('msg', '未知错误')}"
@@ -214,54 +201,45 @@ class AI8Model(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, */*',
-                '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.2.2',
-                'Origin': self.BASE_URL,
-                'Referer': f'{self.BASE_URL}/chat?_userMenuKey=chat'
-            }
-            
+
             response = requests.get(
                 f"{self.BASE_URL}/api/chat/tmpl",
-                headers=headers
+                headers=self.headers
             )
-            
+
             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)
                 return []
-            
+
             # 保存模型信息
             self.models = {
-                model['value']: model 
+                model['value']: model
                 for model in data['data']['models']
             }
 
             for model in self.models.values():
                 # 添加标签
                 model_str = f"{model['label']}"
-                
+
                 # 添加特性标记
                 features = []
                 if model['attr'].get('multimodal'):
@@ -279,12 +257,12 @@ class AI8Model(BasePlatform):
                     model_str += f" - {model['attr']['note']}"
                 if features:
                     model_str += f" [{'|'.join(features)}]"
-                    
+
                 model['desc'] = model_str
-            
+
             return list(self.models.keys())
-            
+
         except Exception as e:
             PrettyOutput.print(f"获取模型列表失败: {str(e)}", OutputType.ERROR)
             return []
-        
+

jarvis/jarvis_platform/base.py

@@ -1,13 +1,14 @@
 from abc import ABC, abstractmethod
 import re
 from typing import Dict, List, Tuple
+from jarvis.jarvis_utils.globals import clear_read_file_record
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import ct, ot, get_context_token_count, while_success, while_true
 
 
 class BasePlatform(ABC):
     """Base class for large language models"""
-    
+
     def __init__(self):
         """Initialize model"""
         self.suppress_output = True  # 添加输出控制标志
@@ -20,7 +21,12 @@ class BasePlatform(ABC):
     def set_model_name(self, model_name: str):
         """Set model name"""
         raise NotImplementedError("set_model_name is not implemented")
-        
+
+    def reset(self):
+        """Reset model"""
+        clear_read_file_record()
+        self.delete_chat()
+
     @abstractmethod
     def chat(self, message: str) -> str:
         """Execute conversation"""
@@ -31,11 +37,11 @@ class BasePlatform(ABC):
             import time
             start_time = time.time()
             response = self.chat(message)
-            
+
             end_time = time.time()
             duration = end_time - start_time
             char_count = len(response)
-            
+
             # Calculate token count and tokens per second
             try:
                 token_count = get_context_token_count(response)
@@ -55,29 +61,24 @@ class BasePlatform(ABC):
             # Keep original think tag handling
             response = re.sub(ot("think")+r'.*?'+ct("think"), '', response, flags=re.DOTALL)
             return response
-                
+
         return while_true(lambda: while_success(lambda: _chat(), 5), 5)
 
-    @abstractmethod
-    def reset(self):
-        """Reset model"""
-        raise NotImplementedError("reset is not implemented")
-        
     @abstractmethod
     def name(self) -> str:
         """Model name"""
         raise NotImplementedError("name is not implemented")
-    
+
     @abstractmethod
     def delete_chat(self)->bool:
         """Delete chat"""
         raise NotImplementedError("delete_chat is not implemented")
-    
+
     @abstractmethod
     def set_system_message(self, message: str):
         """Set system message"""
         raise NotImplementedError("set_system_message is not implemented")
-    
+
     @abstractmethod
     def get_model_list(self) -> List[Tuple[str, str]]:
         """Get model list"""

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})