jarvis-ai-assistant 0.1.212__tar.gz → 0.1.213__tar.gz

{jarvis_ai_assistant-0.1.212/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.213}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.1.212
+Version: 0.1.213
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -54,8 +54,8 @@ Requires-Dist: pillow==10.2.0
 Requires-Dist: openai==1.78.1
 Requires-Dist: tabulate==0.9.0
 Requires-Dist: pyte==0.8.2
-Requires-Dist: pyyaml>=6.0.2
 Requires-Dist: httpx>=0.28.1
+Requires-Dist: pyyaml>=5.3.1
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: black; extra == "dev"

{jarvis_ai_assistant-0.1.212 → jarvis_ai_assistant-0.1.213}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.212"
+version = "0.1.213"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "skyfire", email = "skyfireitdiy@hotmail.com" }]
@@ -36,8 +36,8 @@ dependencies = [
     "openai==1.78.1",
     "tabulate==0.9.0",
     "pyte==0.8.2",
-    "pyyaml>=6.0.2",
     "httpx>=0.28.1",
+    "pyyaml>=5.3.1",
 ]
 requires-python = ">=3.8"
 

{jarvis_ai_assistant-0.1.212 → jarvis_ai_assistant-0.1.213}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages  # type: ignore
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.212",
+    version="0.1.213",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",
@@ -31,10 +31,11 @@ setup(
         "openai==1.78.1",
         "tabulate==0.9.0",
         "pyte==0.8.2",
-        "pyyaml>=6.0.2",
+        "pyyaml>=5.3.1",
         "httpx>=0.28.1",
     ],
-    extras_require={"dev": ["pytest", "black", "isort", "mypy", "build", "twine"]},
+    extras_require={"dev": ["pytest", "black",
+                            "isort", "mypy", "build", "twine"]},
     entry_points={
         "console_scripts": [
             "jarvis=jarvis.jarvis_agent.jarvis:main",

{jarvis_ai_assistant-0.1.212 → jarvis_ai_assistant-0.1.213}/src/jarvis/__init__.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.212"
+__version__ = "0.1.213"

jarvis_ai_assistant-0.1.213/src/jarvis/jarvis_platform/ai8.py

@@ -0,0 +1,263 @@
+import os
+from typing import Generator, List, Tuple
+from jarvis.jarvis_platform.base import BasePlatform
+import json
+
+from jarvis.jarvis_utils import http
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+from jarvis.jarvis_utils.utils import while_success
+
+
+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_prompt = ""
+        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 = while_success(
+                lambda: http.post(
+                    f"{self.BASE_URL}/api/chat/session", headers=self.headers, json={}
+                ),
+                sleep_time=5,
+            )
+
+            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_prompt,
+                "plugins": [],
+                "localPlugins": None,
+                "useAppId": 0,
+            }
+
+            response = while_success(
+                lambda: http.put(
+                    f"{self.BASE_URL}/api/chat/session/{self.conversation['id']}",  # type: ignore
+                    headers=self.headers,
+                    json=session_data,
+                ),
+                sleep_time=5,
+            )
+
+            data = response.json()
+            if data["code"] == 0:
+                self.conversation = data["data"]
+                return True
+            else:
+                PrettyOutput.print(
+                    f"更新会话设置失败: {data.get('msg', '未知错误')}",
+                    OutputType.WARNING,
+                )
+                return False
+
+        except Exception as e:
+            PrettyOutput.print(f"创建会话失败: {str(e)}", OutputType.ERROR)
+            return False
+
+    def set_system_prompt(self, message: str):
+        """Set system message"""
+        self.system_prompt = message
+
+    def chat(self, message: str) -> Generator[str, None, None]:
+        """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": [],
+            }
+
+            # 使用stream_post进行流式请求
+            response_stream = while_success(
+                lambda: http.stream_post(
+                    f"{self.BASE_URL}/api/chat/completions",
+                    headers=self.headers,
+                    json=payload,
+                ),
+                sleep_time=5,
+            )
+
+            # 处理流式响应
+            for chunk in response_stream:
+                if chunk:
+                    try:
+                        line = chunk.decode("utf-8")
+                        if line.startswith("data: "):
+                            try:
+                                data = json.loads(line[6:])
+                                if data.get("type") == "string":
+                                    chunk_data = data.get("data", "")
+                                    if chunk_data:
+                                        yield chunk_data
+
+                            except json.JSONDecodeError:
+                                continue
+
+                    except UnicodeDecodeError:
+                        continue
+
+            return None
+
+        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 = while_success(
+                lambda: http.delete(
+                    f"{self.BASE_URL}/api/chat/session/{self.conversation['id']}",  # type: ignore
+                    headers=self.headers,
+                ),
+                sleep_time=5,
+            )
+
+            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
+
+        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 = while_success(
+                lambda: http.get(
+                    f"{self.BASE_URL}/api/chat/tmpl", headers=self.headers
+                ),
+                sleep_time=5,
+            )
+
+            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 []
+
+    def support_upload_files(self) -> bool:
+        return False
+
+    def support_web(self) -> bool:
+        return False
+
+    def upload_files(self, file_list: List[str]) -> bool:
+        return False

jarvis_ai_assistant-0.1.213/src/jarvis/jarvis_platform/oyi.py

@@ -0,0 +1,307 @@
+import mimetypes
+import os
+from typing import Dict, Generator, List, Tuple
+from jarvis.jarvis_platform.base import BasePlatform
+import json
+
+from jarvis.jarvis_utils import http
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+from jarvis.jarvis_utils.utils import while_success
+
+
+class OyiModel(BasePlatform):
+    """Oyi model implementation"""
+
+    platform_name = "oyi"
+    BASE_URL = "https://api-10086.rcouyi.com"
+
+    def get_model_list(self) -> List[Tuple[str, str]]:
+        """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.messages = []
+        self.system_prompt = ""
+        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:
+            headers = {
+                "Authorization": f"Bearer {self.token}",
+                "Content-Type": "application/json",
+                "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,
+                "title": "New conversation",
+                "isLock": False,
+                "systemMessage": "",
+                "params": json.dumps(
+                    {
+                        "model": self.model_name,
+                        "is_webSearch": True,
+                        "message": [],
+                        "systemMessage": None,
+                        "requestMsgCount": 65536,
+                        "temperature": 0.8,
+                        "speechVoice": "Alloy",
+                        "max_tokens": 8192,
+                        "chatPluginIds": [],
+                    }
+                ),
+            }
+
+            response = while_success(
+                lambda: http.post(
+                    f"{self.BASE_URL}/chatapi/chat/save", headers=headers, json=payload
+                ),
+                sleep_time=5,
+            )
+
+            data = response.json()
+            if data["code"] == 200 and data["type"] == "success":
+                self.conversation = data
+                return True
+            else:
+                PrettyOutput.print(
+                    f"创建会话失败: {data['message']}", OutputType.WARNING
+                )
+                return False
+
+        except Exception as e:
+            PrettyOutput.print(f"创建会话失败: {str(e)}", OutputType.ERROR)
+            return False
+
+    def set_system_prompt(self, message: str):
+        """Set system message"""
+        self.system_prompt = message
+
+    def chat(self, message: str) -> Generator[str, None, None]:
+        """Execute chat with the model
+
+        Args:
+            message: User input message
+
+        Returns:
+            str: Model response
+        """
+        try:
+            # 确保有会话ID
+            if not self.conversation:
+                if not self.create_conversation():
+                    raise Exception("Failed to create conversation")
+
+            # 1. 发送消息
+            headers = {
+                "Authorization": f"Bearer {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",
+                "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_prompt + "\n" + message
+                payload["content"] = message
+                self.first_chat = False
+
+            self.messages.append({"role": "user", "content": message})
+
+            # 发送消息
+            response = while_success(
+                lambda: http.post(
+                    f"{self.BASE_URL}/chatapi/chat/message",
+                    headers=headers,
+                    json=payload,
+                ),
+                sleep_time=5,
+            )
+
+            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 = while_success(
+                lambda: http.stream_post(
+                    f"{self.BASE_URL}/chatapi/chat/message/{message_id}",
+                    headers=headers,
+                ),
+                sleep_time=5,
+            )
+
+            full_response = ""
+            bin = b""
+            for chunk in response:
+                if chunk:
+                    bin += chunk
+                    try:
+                        text = bin.decode("utf-8")
+                    except UnicodeDecodeError:
+                        continue
+                    full_response += text
+                    bin = b""
+                    yield text
+
+            self.messages.append({"role": "assistant", "content": full_response})
+            return None
+        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
+
+            headers = {
+                "Authorization": f"Bearer {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",
+                "Origin": "https://ai.rcouyi.com",
+                "Referer": "https://ai.rcouyi.com/",
+            }
+
+            response = while_success(
+                lambda: http.post(
+                    f"{self.BASE_URL}/chatapi/chat/{self.conversation['result']['id']}",  # type: ignore
+                    headers=headers,
+                    json={},
+                ),
+                sleep_time=5,
+            )
+
+            data = response.json()
+            if data["code"] == 200 and data["type"] == "success":
+                self.messages = []
+                self.conversation = None
+                self.first_chat = True
+                return True
+            else:
+                error_msg = f"删除会话失败: {data.get('message', '未知错误')}"
+                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",
+                "Origin": "https://ai.rcouyi.com",
+                "Referer": "https://ai.rcouyi.com/",
+            }
+
+            response = while_success(
+                lambda: http.get(
+                    "https://ai.rcouyi.com/config/system.json", headers=headers
+                ),
+                sleep_time=5,
+            )
+
+            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:
+                    # 处理新格式的suffix (字典列表)
+                    if suffix and isinstance(suffix[0], dict):
+                        suffix_str = ", ".join(s.get("tag", "") for s in suffix)
+                    # 处理旧格式的suffix (字符串列表)
+                    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 []
+
+    def support_upload_files(self) -> bool:
+        return False
+
+    def support_web(self) -> bool:
+        return False
+
+    def upload_files(self, file_list: List[str]) -> bool:
+        return False

{jarvis_ai_assistant-0.1.212 → jarvis_ai_assistant-0.1.213}/src/jarvis/jarvis_utils/input.py

@@ -38,7 +38,7 @@ def get_single_line_input(tip: str) -> str:
     返回：
         str: 用户的输入
     """
-    session = PromptSession(history=None)
+    session: PromptSession = PromptSession(history=None)
     style = PromptStyle.from_dict(
         {
             "prompt": "ansicyan",
@@ -190,7 +190,7 @@ def get_multiline_input(tip: str) -> str:
     """
     # 显示输入说明
     PrettyOutput.section(
-        "用户输入 - 使用 @ 触发文件补全，Tab 选择补全项，Ctrl+J 提交，Ctrl+L 复制最后一条消息，按 Ctrl+C 取消输入",
+        "用户输入 - 使用 @ 触发文件补全，Tab 选择补全项，Ctrl+J 提交，Ctrl+O 复制最后一条消息，按 Ctrl+C 取消输入",
         OutputType.USER,
     )
     print(f"{Fore.GREEN}{tip}{ColoramaStyle.RESET_ALL}")
@@ -212,9 +212,9 @@ def get_multiline_input(tip: str) -> str:
         """处理Ctrl+J以提交输入。"""
         event.current_buffer.validate_and_handle()
 
-    @bindings.add("c-l")
+    @bindings.add("c-o")
     def _(event):
-        """处理Ctrl+L以复制最后一条消息到剪贴板。"""
+        """处理Ctrl+O以复制最后一条消息到剪贴板。"""
         from jarvis.jarvis_utils.globals import get_last_message
         import subprocess
 
@@ -246,7 +246,7 @@ def get_multiline_input(tip: str) -> str:
         # 获取数据目录路径
         history_dir = get_data_dir()
         # 初始化带历史记录的会话
-        session = PromptSession(
+        session: PromptSession = PromptSession(
             history=FileHistory(os.path.join(history_dir, "multiline_input_history")),
             completer=FileCompleter(),
             key_bindings=bindings,