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

jarvis/jarvis_platform/ai8.py

@@ -1,268 +0,0 @@
-import os
-from typing import Dict, List, Tuple
-from jarvis.jarvis_platform.base import BasePlatform
-import requests
-import json
-import base64
-
-from jarvis.jarvis_utils.output import OutputType, PrettyOutput
-
-class AI8Model(BasePlatform):
-    """AI8 model implementation"""
-
-    platform_name = "ai8"
-    BASE_URL = "https://ai8.rcouyi.com"
-
-    def get_model_list(self) -> List[Tuple[str, str]]:
-        """获取模型列表"""
-        self.get_available_models()
-        return [(name,info['desc']) for name,info in self.models.items()]
-
-    def __init__(self):
-        """Initialize model"""
-        super().__init__()
-        self.system_message = ""
-        self.conversation = {}
-        self.models = {}  # 存储模型信息
-
-        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:
-
-
-            # 1. 创建会话
-            response = requests.post(
-                f"{self.BASE_URL}/api/chat/session",
-                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,
-                "model": self.model_name,
-                "contextCount": 65536,
-                "prompt": self.system_message,
-                "plugins": [],
-                "localPlugins": None,
-                "useAppId": 0
-            }
-
-            response = requests.put(
-                f"{self.BASE_URL}/api/chat/session/{self.conversation['id']}",
-                headers=self.headers,
-                json=session_data
-            )
-
-            if response.status_code == 200:
-                data = response.json()
-                if data['code'] == 0:
-                    self.conversation = data['data']
-                    return True
-                else:
-                    PrettyOutput.print(f"更新会话设置失败: {data.get('msg', '未知错误')}", OutputType.WARNING)
-                    return False
-            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")
-
-
-
-            payload = {
-                "text": message,
-                "sessionId": self.conversation['id'] if self.conversation else None,
-                "files": []
-            }
-
-
-            response = requests.post(
-                f"{self.BASE_URL}/api/chat/completions",
-                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():
-                if line:
-                    line = line.decode('utf-8')
-                    if line.startswith('data: '):
-                        try:
-                            data = json.loads(line[6:])
-                            if data.get('type') == 'string':
-                                chunk = data.get('data', '')
-                                if chunk:
-                                    full_response += chunk
-                                    if not self.suppress_output:
-                                        PrettyOutput.print_stream(chunk)
-
-                        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 delete_chat(self) -> bool:
-        """Delete current chat session"""
-        try:
-            if not self.conversation:
-                return True
-
-
-            response = requests.delete(
-                f"{self.BASE_URL}/api/chat/session/{self.conversation['id']}",
-                headers=self.headers
-            )
-
-            if response.status_code == 200:
-                data = response.json()
-                if data['code'] == 0:
-                    self.conversation = None
-                    return True
-                else:
-                    error_msg = f"删除会话失败: {data.get('msg', '未知错误')}"
-                    PrettyOutput.print(error_msg, OutputType.WARNING)
-                    return False
-            else:
-                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())
-
-            response = requests.get(
-                f"{self.BASE_URL}/api/chat/tmpl",
-                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
-                for model in data['data']['models']
-            }
-
-            for model in self.models.values():
-                # 添加标签
-                model_str = f"{model['label']}"
-
-                # 添加特性标记
-                features = []
-                if model['attr'].get('multimodal'):
-                    features.append("Multimodal")
-                if model['attr'].get('plugin'):
-                    features.append("Plugin support")
-                if model['attr'].get('onlyImg'):
-                    features.append("Image support")
-                if model['attr'].get('tag'):
-                    features.append(model['attr']['tag'])
-                if model['attr'].get('integral'):
-                    features.append(model['attr']['integral'])
-                # 添加备注
-                if model['attr'].get('note'):
-                    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/ollama.py

@@ -1,137 +0,0 @@
-from typing import List, Dict, Tuple
-from jarvis.jarvis_platform.base import BasePlatform
-import os
-
-from jarvis.jarvis_utils.output import OutputType, PrettyOutput
-
-
-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"
-                    "1. 安装 Ollama: https://ollama.ai\n"
-                    "2. 下载模型:\n"
-                    f"   ollama pull {self.model_name}"
-                )
-                PrettyOutput.print(message, OutputType.INFO)
-                PrettyOutput.print("Ollama 没有可用的模型", OutputType.WARNING)
-
-        except Exception as e:
-            message = (
-                f"Ollama 服务未启动或无法连接: {str(e)}\n"
-                "请确保您已:\n"
-                "1. 安装 Ollama: https://ollama.ai\n"
-                "2. 启动 Ollama 服务\n"
-                "3. 正确配置服务地址 (默认: http://localhost:11434)"
-            )
-            PrettyOutput.print(message, OutputType.WARNING)
-
-
-        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"""
-        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"""
-        self.model_name = model_name
-
-    def chat(self, message: str) -> str:
-        """Execute conversation"""
-        try:
-            # Build message list
-            messages = []
-            if self.system_message:
-                messages.append({"role": "system", "content": self.system_message})
-            messages.extend(self.messages)
-            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)}")
-
-    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 name(self) -> str:
-        """Return model name"""
-        return self.model_name
-
-    def delete_chat(self) -> bool:
-        """Delete current chat session"""
-        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.messages = []
-        if self.system_message:
-            self.messages.append({"role": "system", "content": self.system_message})