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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.1.211
+Version: 0.1.212
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.211"
+version = "0.1.212"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "skyfire", email = "skyfireitdiy@hotmail.com" }]

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

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages  # type: ignore
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.211",
+    version="0.1.212",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",

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

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

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

@@ -0,0 +1,270 @@
+import os
+from typing import Dict, Generator, 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_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 = 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_prompt,
+                "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_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": []
+            }
+
+
+            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)
+
+            # 处理流式响应
+            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:
+                                    yield chunk
+
+                        except json.JSONDecodeError:
+                            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 = 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 []
+
+    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.211 → jarvis_ai_assistant-0.1.212}/src/jarvis/jarvis_platform/base.py

@@ -166,6 +166,9 @@ class BasePlatform(ABC):
             result: str = while_true(
                 lambda: while_success(lambda: self._chat(message), 5), 5
             )
+            from jarvis.jarvis_utils.globals import set_last_message
+
+            set_last_message(result)
             return result
         finally:
             set_in_chat(False)

{jarvis_ai_assistant-0.1.211 → jarvis_ai_assistant-0.1.212}/src/jarvis/jarvis_platform/kimi.py

@@ -151,34 +151,43 @@ class KimiModel(BasePlatform):
         retry_count = 0
 
         while retry_count < max_retries:
-            payload = json.dumps({"ids": [file_id]}, ensure_ascii=False)
-            response = while_success(
-                lambda: http.post(url, headers=headers, data=payload, stream=True),
+            payload = {"ids": [file_id]}
+            response_stream = while_success(
+                lambda: http.stream_post(url, headers=headers, json=payload),
                 sleep_time=5,
             )
 
-            for line in response.iter_lines():
-                if not line:
-                    continue
-
-                # httpx 返回字符串，requests 返回字节，需要兼容处理
-                if isinstance(line, bytes):
-                    line = line.decode("utf-8")
-                else:
-                    line = str(line)
-
-                if not line.startswith("data: "):
-                    continue
+            response_data = b""
+            
+            # 处理流式响应
+            for chunk in response_stream:
+                response_data += chunk
 
+                # 尝试解析SSE格式的数据
                 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:
+                    # 查找完整的数据行
+                    lines = response_data.decode("utf-8").split("\n")
+                    response_data = b""  # 重置缓冲区
+
+                    for line in lines:
+                        if not line.strip():
+                            continue
+
+                        # SSE格式的行通常以"data: "开头
+                        if line.startswith("data: "):
+                            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
+
+                except UnicodeDecodeError:
+                    # 如果解码失败，继续累积数据
                     continue
 
             retry_count += 1
@@ -284,34 +293,44 @@ class KimiModel(BasePlatform):
         }
 
         try:
-            response = while_success(
-                lambda: http.post(url, headers=headers, json=payload, stream=True),
+            # 使用新的stream_post接口发送消息请求，获取流式响应
+            response_stream = while_success(
+                lambda: http.stream_post(url, headers=headers, json=payload),
                 sleep_time=5,
             )
-            # 如果禁止输出，则静默处理
-            for line in response.iter_lines():
-                if not line:
-                    continue
-
-                # httpx 返回字符串，requests 返回字节，需要兼容处理
-                if isinstance(line, bytes):
-                    line = line.decode("utf-8")
-                else:
-                    line = str(line)
-
-                if not line.startswith("data: "):
-                    continue
-
+            
+            response_data = b""
+            
+            # 处理流式响应
+            for chunk in response_stream:
+                response_data += chunk
+
+                # 尝试解析SSE格式的数据
                 try:
-                    data = json.loads(line[6:])
-                    event = data.get("event")
-
-                    if event == "cmpl":
-                        # 处理补全文本
-                        text = data.get("text", "")
-                        if text:
-                            yield text
-                except json.JSONDecodeError:
+                    # 查找完整的数据行
+                    lines = response_data.decode("utf-8").split("\n")
+                    response_data = b""  # 重置缓冲区
+
+                    for line in lines:
+                        if not line.strip():
+                            continue
+
+                        # SSE格式的行通常以"data: "开头
+                        if line.startswith("data: "):
+                            try:
+                                data = json.loads(line[6:])
+                                event = data.get("event")
+
+                                if event == "cmpl":
+                                    # 处理补全文本
+                                    text = data.get("text", "")
+                                    if text:
+                                        yield text
+                            except json.JSONDecodeError:
+                                continue
+
+                except UnicodeDecodeError:
+                    # 如果解码失败，继续累积数据
                     continue
 
             return None