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

jarvis/jarvis_platform/kimi.py

@@ -45,7 +45,6 @@ class KimiModel(BasePlatform):
             PrettyOutput.print("KIMI_API_KEY 未设置", OutputType.WARNING)
         self.auth_header = f"Bearer {self.api_key}"
         self.chat_id = ""
-        self.uploaded_files = []  # 存储已上传文件的信息
         self.first_chat = True  # 添加标记，用于判断是否是第一次对话
         self.system_message = ""
 
@@ -77,138 +76,6 @@ class KimiModel(BasePlatform):
             PrettyOutput.print(f"错误：创建会话失败：{e}", OutputType.ERROR)
             return False
 
-    def _get_presigned_url(self, filename: str, action: str) -> Dict:
-        """Get presigned upload URL"""
-        url = "https://kimi.moonshot.cn/api/pre-sign-url"
-        
-        
-        
-        payload = json.dumps({
-            "action": action,
-            "name": os.path.basename(filename)
-        }, ensure_ascii=False)
-        
-        headers = {
-            'Authorization': self.auth_header,
-            'Content-Type': 'application/json'
-        }
-        
-        response = while_success(lambda: requests.post(url, headers=headers, data=payload), sleep_time=5)
-        return response.json()
-
-    def _upload_file(self, file_path: str, presigned_url: str) -> bool:
-        """Upload file to presigned URL"""
-        try:
-            with open(file_path, 'rb') as f:
-                content = f.read()
-                response = while_success(lambda: requests.put(presigned_url, data=content), sleep_time=5)
-                return response.status_code == 200
-        except Exception as e:
-            PrettyOutput.print(f"错误：上传文件失败：{e}", OutputType.ERROR)
-            return False
-
-    def _get_file_info(self, file_data: Dict, name: str, file_type: str) -> Dict:
-        """Get file information"""
-        url = "https://kimi.moonshot.cn/api/file"
-        payload = json.dumps({
-            "type": file_type,
-            "name": name,
-            "object_name": file_data["object_name"],
-            "chat_id": self.chat_id,
-            "file_id": file_data.get("file_id", "")
-        }, ensure_ascii=False)
-        
-        headers = {
-            'Authorization': self.auth_header,
-            'Content-Type': 'application/json'
-        }
-        
-        response = while_success(lambda: requests.post(url, headers=headers, data=payload), sleep_time=5)
-        return response.json()
-
-    def _wait_for_parse(self, file_id: str) -> bool:
-        """Wait for file parsing to complete"""
-        url = "https://kimi.moonshot.cn/api/file/parse_process"
-        headers = {
-            'Authorization': self.auth_header,
-            'Content-Type': 'application/json'
-        }
-        
-        max_retries = 30
-        retry_count = 0
-        
-        while retry_count < max_retries:
-            payload = json.dumps({"ids": [file_id]}, ensure_ascii=False)
-            response = while_success(lambda: requests.post(url, headers=headers, data=payload, stream=True), sleep_time=5)
-            
-            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:])
-                    if data.get("event") == "resp":
-                        status = data.get("file_info", {}).get("status")
-                        if status == "parsed":
-                            return True
-                        elif status == "failed":
-                            return False
-                except json.JSONDecodeError:
-                    continue
-            
-            retry_count += 1
-            time.sleep(1)
-        
-        return False
-    def upload_files(self, file_list: List[str]) -> List[Dict]:
-        """Upload file list and return file information"""
-        if not file_list:
-            return []
-
-        
-        if not self.chat_id:
-            if not self._create_chat():
-                raise Exception("Failed to create chat session")
-
-        uploaded_files = []
-        for index, file_path in enumerate(file_list, 1):
-            try:
-                PrettyOutput.print(f"处理文件 [{index}/{len(file_list)}]: {file_path}", OutputType.PROGRESS)
-
-                mime_type, _ = mimetypes.guess_type(file_path)
-                action = "image" if mime_type and mime_type.startswith('image/') else "file"
-                
-                # 获取预签名URL
-                presigned_data = self._get_presigned_url(file_path, action)
-                
-                # 上传文件
-                if self._upload_file(file_path, presigned_data["url"]):
-                    # 获取文件信息
-                    file_info = self._get_file_info(presigned_data, os.path.basename(file_path), action)
-                    file_info = self._get_file_info(presigned_data, os.path.basename(file_path), action)
-                    # 等待文件解析
-
-                    # 只有文件需要解析
-                    if action == "file":
-                        if self._wait_for_parse(file_info["id"]):
-                            uploaded_files.append(file_info)
-                        else:
-                            PrettyOutput.print(f"✗ 文件解析失败: {file_path}", OutputType.WARNING)
-                    else:
-                        uploaded_files.append(file_info)
-                else:
-                    PrettyOutput.print(f"错误：文件上传失败: {file_path}", OutputType.WARNING)
-                    
-            except Exception as e:
-                PrettyOutput.print(f"✗ 处理文件出错 {file_path}: {str(e)}", OutputType.ERROR)
-                continue
-        
-        self.uploaded_files = uploaded_files
-        return uploaded_files
 
     def chat(self, message: str) -> str:
         """Send message and get response"""
@@ -218,15 +85,7 @@ class KimiModel(BasePlatform):
 
         url = f"https://kimi.moonshot.cn/api/chat/{self.chat_id}/completion/stream"
         
-        # 只在第一次对话时带上文件引用
-        refs = []
-        refs_file = []
-        if self.first_chat:
-            if self.uploaded_files:
-                refs = [f["id"] for f in self.uploaded_files]
-                refs_file = self.uploaded_files
-            message = self.system_message + "\n" + message
-            self.first_chat = False
+        
         
         payload = {
             "messages": [{"role": "user", "content": message}],
@@ -235,8 +94,8 @@ class KimiModel(BasePlatform):
             "kimiplus_id": "kimi",
             "use_research": False,
             "use_math": False,
-            "refs": refs,
-            "refs_file": refs_file
+            "refs": [],
+            "refs_file": []
         }
 
         headers = {

jarvis/jarvis_platform/ollama.py

@@ -1,12 +1,12 @@
-import requests
 from typing import List, Dict, Tuple
 from jarvis.jarvis_platform.base import BasePlatform
 import os
-import json
 
-from jarvis.jarvis_utils.input import get_single_line_input
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
+
+import ollama
+
 class OllamaPlatform(BasePlatform):
     """Ollama platform implementation"""
     
@@ -20,11 +20,13 @@ class OllamaPlatform(BasePlatform):
         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:
-            response = requests.get(f"{self.api_base}/api/tags")
-            response.raise_for_status()
-            available_models = [model["name"] for model in response.json().get("models", [])]
+            available_models = self._get_available_models()
             
             if not available_models:
                 message = (
@@ -36,9 +38,9 @@ class OllamaPlatform(BasePlatform):
                 PrettyOutput.print(message, OutputType.INFO)
                 PrettyOutput.print("Ollama 没有可用的模型", OutputType.WARNING)
                 
-        except requests.exceptions.ConnectionError:
+        except Exception as e:
             message = (
-                "Ollama 服务未启动或无法连接\n"
+                f"Ollama 服务未启动或无法连接: {str(e)}\n"
                 "请确保您已:\n"
                 "1. 安装 Ollama: https://ollama.ai\n"
                 "2. 启动 Ollama 服务\n"
@@ -50,11 +52,19 @@ class OllamaPlatform(BasePlatform):
         self.messages = []
         self.system_message = ""
 
+    def _get_available_models(self) -> List[str]:
+        """Get list of available models using appropriate method"""
+        models_response = self.client.list() # type: ignore
+        return [model["model"] for model in models_response.get("models", [])]
+
     def get_model_list(self) -> List[Tuple[str, str]]:
         """Get model list"""
-        response = requests.get(f"{self.api_base}/api/tags")
-        response.raise_for_status()
-        return [(model["name"], "") for model in response.json().get("models", [])]
+        try:
+            models = self._get_available_models()
+            return [(model, "") for model in models]
+        except Exception as e:
+            PrettyOutput.print(f"获取模型列表失败: {str(e)}", OutputType.ERROR)
+            return []
 
     def set_model_name(self, model_name: str):
         """Set model name"""
@@ -69,54 +79,44 @@ class OllamaPlatform(BasePlatform):
                 messages.append({"role": "system", "content": self.system_message})
             messages.extend(self.messages)
             messages.append({"role": "user", "content": message})
-            
-            # 构建请求数据
-            data = {
-                "model": self.model_name,
-                "messages": messages,
-                "stream": True  # 启用流式输出
-            }
-            
-            # 发送请求
-            response = requests.post(
-                f"{self.api_base}/api/chat",
-                json=data,
-                stream=True
-            )
-            response.raise_for_status()
-            
-            # 处理流式响应
-            full_response = ""
-            for line in response.iter_lines():
-                if line:
-                    chunk = line.decode()
-                    try:
-                        result = json.loads(chunk)
-                        if "message" in result and "content" in result["message"]:
-                            text = result["message"]["content"]
-                            if not self.suppress_output:
-                                PrettyOutput.print_stream(text)
-                            full_response += text
-                    except json.JSONDecodeError:
-                        continue
-                        
-            if not self.suppress_output:
-                PrettyOutput.print_stream_end()
-            
-            # 更新消息历史
-            self.messages.append({"role": "user", "content": message})
-            self.messages.append({"role": "assistant", "content": full_response})
-            
-            return full_response
+
+            return self._chat_with_package(messages)
             
         except Exception as e:
             PrettyOutput.print(f"对话失败: {str(e)}", OutputType.ERROR)
             raise Exception(f"Chat failed: {str(e)}")
 
-    def upload_files(self, file_list: List[str]) -> List[Dict]:
-        """Upload files (Ollama does not support file upload)"""
-        PrettyOutput.print("Ollama 不支持文件上传", output_type=OutputType.WARNING)
-        return []
+    def _chat_with_package(self, messages: List[Dict]) -> str:
+        """Chat using the ollama package"""
+        # 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:
+            if "message" in chunk and "content" in chunk["message"]:
+                text = chunk["message"]["content"]
+                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"""
@@ -137,17 +137,3 @@ class OllamaPlatform(BasePlatform):
         """Set system message"""
         self.system_message = message
         self.reset()  # 重置会话以应用新的系统消息 
-
-
-if __name__ == "__main__":
-    try:
-        ollama = OllamaPlatform()
-        while True:
-            try:
-                message = get_single_line_input("输入问题 (Ctrl+C 退出)")
-                ollama.chat_until_success(message)
-            except KeyboardInterrupt:
-                print("再见!")
-                break
-    except Exception as e:
-        PrettyOutput.print(f"程序异常退出: {str(e)}", OutputType.ERROR)

jarvis/jarvis_platform/openai.py

@@ -7,10 +7,6 @@ from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 class OpenAIModel(BasePlatform):
     platform_name = "openai"
 
-    def upload_files(self, file_list: List[str]):
-        """Upload files"""
-        PrettyOutput.print("OpenAI does not support file upload", OutputType.WARNING)
-    
     def __init__(self):
         """
         Initialize OpenAI model

jarvis/jarvis_platform/oyi.py

@@ -25,7 +25,6 @@ class OyiModel(BasePlatform):
         self.messages = []
         self.system_message = ""
         self.conversation = None
-        self.files = []
         self.first_chat = True
         
         self.token = os.getenv("OYI_API_KEY")
@@ -132,17 +131,6 @@ class OyiModel(BasePlatform):
             
             # 如果有上传的文件，添加到请求中
             if self.first_chat:
-                if self.files:
-                    for file_data in self.files:
-                        file_info = {
-                            "contentType": 1,  # 1 表示图片
-                            "fileUrl": file_data['result']['url'],
-                            "fileId": file_data['result']['id'],
-                            "fileName": file_data['result']['fileName']
-                        }
-                        payload["contentFiles"].append(file_info)
-                    # 清空已使用的文件列表
-                    self.files = []
                 message = self.system_message + "\n" + message
                 payload["content"] = message
                 self.first_chat = False
@@ -211,7 +199,6 @@ class OyiModel(BasePlatform):
         """Reset model state"""
         self.messages = []
         self.conversation = None
-        self.files = []
         self.first_chat = True
             
     def delete_chat(self) -> bool:
@@ -252,65 +239,6 @@ class OyiModel(BasePlatform):
         except Exception as e:
             PrettyOutput.print(f"删除会话失败: {str(e)}", OutputType.ERROR)
             return False
-    
-    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
-        """
-        try:
-            # 检查当前模型是否支持文件上传
-            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)
-                return []
-            
-            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',
-                'Accept': '*/*',
-                'DNT': '1',
-                'Origin': 'https://ai.rcouyi.com',
-                'Referer': 'https://ai.rcouyi.com/'
-            }
-            
-            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.WARNING)
-                    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:
-                            self.files.append(data)
-                        else:
-                            PrettyOutput.print(f"文件上传失败: {data.get('message')}", OutputType.WARNING)
-                            return []
-                    else:
-                        PrettyOutput.print(f"文件上传失败: {response.status_code}", OutputType.WARNING)
-                        return []
-                
-            return self.files
-        except Exception as e:
-            PrettyOutput.print(f"文件上传失败: {str(e)}", OutputType.ERROR)
-            return []
 
     def get_available_models(self) -> List[str]:
         """Get available model list
@@ -371,9 +299,6 @@ class OyiModel(BasePlatform):
                 if info:
                     model_str += f" - {info}"
                     
-                # 添加文件上传支持标记
-                if model.get('uploadFile'):
-                    model_str += " [Support file upload]"
                 model['desc'] = model_str
                 models.append(model_name)
                 

jarvis/jarvis_platform/registry.py

@@ -4,7 +4,7 @@ import os
 import sys
 from typing import Dict, Type, Optional, List
 from jarvis.jarvis_platform.base import BasePlatform
-from jarvis.jarvis_utils.config import get_cheap_model_name, get_cheap_platform_name, get_codegen_model_name, get_codegen_platform_name, get_normal_model_name, get_normal_platform_name, get_thinking_model_name, get_thinking_platform_name
+from jarvis.jarvis_utils.config import get_normal_model_name, get_normal_platform_name, get_thinking_model_name, get_thinking_platform_name
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 REQUIRED_METHODS = [
@@ -21,7 +21,7 @@ REQUIRED_METHODS = [
 class PlatformRegistry:
     """Platform registry"""
 
-    global_platform_name = "kimi"
+    global_platform_name = "yuanbao"
     global_platform_registry = None
 
     @staticmethod
@@ -161,20 +161,6 @@ class PlatformRegistry:
         platform.set_model_name(model_name) # type: ignore
         return platform # type: ignore
     
-    def get_codegen_platform(self) -> BasePlatform:
-        platform_name = get_codegen_platform_name()
-        model_name = get_codegen_model_name()
-        platform = self.create_platform(platform_name)
-        platform.set_model_name(model_name) # type: ignore
-        return platform # type: ignore
-    
-    def get_cheap_platform(self) -> BasePlatform:
-        platform_name = get_cheap_platform_name()
-        model_name = get_cheap_model_name()
-        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()