jarvis-ai-assistant 0.1.182__py3-none-any.whl → 0.1.183__py3-none-any.whl

jarvis/__init__.py

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

jarvis/jarvis_platform/kimi.py

@@ -315,7 +315,7 @@ class KimiModel(BasePlatform):
 
     def name(self) -> str:
         """Model name"""
-        return "kimi"
+        return self.model_name
 
     def support_web(self) -> bool:
         """Kimi平台支持web功能"""

jarvis/jarvis_platform/registry.py

@@ -19,7 +19,6 @@ REQUIRED_METHODS = [
     ('set_system_message', ['message']),
     ('set_model_name', ['model_name']),
     ('get_model_list', []),
-    ('set_suppress_output', ['suppress']),
     ('upload_files', ['file_list']),
 ]
 

jarvis/jarvis_platform/tongyi.py

@@ -0,0 +1,428 @@
+# -*- coding: utf-8 -*-
+import json
+import os
+from typing import Any, Dict, Generator, List, Tuple
+import uuid
+
+import requests
+
+from jarvis.jarvis_platform.base import BasePlatform
+from jarvis.jarvis_utils.output import PrettyOutput, OutputType
+from jarvis.jarvis_utils.utils import while_success
+
+
+class TongyiPlatform(BasePlatform):
+    """Tongyi platform implementation"""
+
+    platform_name = "tongyi"
+
+    def __init__(self):
+        """Initialize Tongyi platform"""
+        super().__init__()
+        self.session_id = ""
+        self.cookies = os.getenv("TONGYI_COOKIES", "")
+        self.request_id = ""
+        self.msg_id = ""
+        self.model_name = ""
+        self.uploaded_file_info = []
+
+
+    def _get_base_headers(self):
+        return {
+            "Host": "api.tongyi.com",
+            "Connection": "keep-alive",
+            "X-Platform": "pc_tongyi",
+            "sec-ch-ua-platform": "Windows",
+            "sec-ch-ua": '"Chromium";v="136", "Microsoft Edge";v="136", "Not.A/Brand";v="99"',
+            "sec-ch-ua-mobile": "?0",
+            "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/136.0.0.0 Safari/537.36 Edg/136.0.0.0",
+            "accept": "application/json, text/plain, */*",
+            "DNT": "1",
+            "Content-Type": "application/json",
+            "Origin": "https://www.tongyi.com",
+            "Sec-Fetch-Site": "same-site",
+            "Sec-Fetch-Mode": "cors",
+            "Sec-Fetch-Dest": "empty",
+            "Referer": "https://www.tongyi.com/qianwen",
+            "Accept-Encoding": "gzip, deflate, br, zstd",
+            "Accept-Language": "zh-CN,zh;q=0.9,en;q=0.8,en-GB;q=0.7,en-US;q=0.6",
+            "Cookie": self.cookies
+        }
+
+    def set_model_name(self, model_name: str):
+        """Set model name
+        
+        Args:
+            model_name: Model name to use
+        """
+        self.model_name = model_name
+
+    def _generate_request_id(self):
+        self.request_id = str(uuid.uuid4()).replace("-", "")
+
+    def chat(self, message: str) -> Generator[str, None, None]:
+        if not self.request_id:
+            self._generate_request_id()
+        url = "https://api.tongyi.com/dialog/conversation"
+        headers = self._get_base_headers()
+
+        headers["accept"] = "text/event-stream"
+        
+        # Prepare contents array with message
+        contents = [{
+            "content": message,
+            "contentType": "text",
+            "role": "user",
+            "ext": {
+                "searchType": "",
+                "pptGenerate": False,
+                "deepThink": False,
+                "deepResearch": False
+            }
+        }]
+
+        # Add uploaded files to contents if available and clear after use
+        if self.uploaded_file_info:
+            for file_info in self.uploaded_file_info:
+                contents.append({
+                    "role": "user",
+                    "contentType": "file",
+                    "content": file_info["url"],
+                    "ext": {
+                        "fileSize": file_info.get("fileSize", 0),
+                        "batchId": file_info.get("batchId", ""),
+                        "docId": file_info.get("docId", "")
+                    }
+                })
+            # Clear uploaded file info after using it
+            self.uploaded_file_info = []
+
+        payload = {
+            "model": "",
+            "action": "next",
+            "mode": "chat",
+            "userAction": "new_top",
+            "requestId": self.request_id,
+            "sessionId": self.session_id,
+            "sessionType": "text_chat",
+            "parentMsgId": self.msg_id,
+            "params": {
+                "agentId": "",
+                "searchType": "",
+                "pptGenerate": False,
+                "bizScene": "code_chat" if self.model_name == "Code-Chat" else "",
+                "bizSceneInfo": {},
+                "specifiedModel": "",
+                "deepThink": True if self.model_name == "Thinking" else False,
+                "deepResearch": False,
+                "fileUploadBatchId": self.uploaded_file_info[0]["batchId"] if self.uploaded_file_info else ""
+            },
+            "contents": contents
+        }
+
+        try:
+            response = while_success(lambda: requests.post(url, headers=headers, json=payload, stream=True), sleep_time=5)
+            if response.status_code != 200:
+                raise Exception(f"HTTP {response.status_code}: {response.text}")
+            msg_id = ""
+            session_id = ""
+            thinking_content = ""
+            text_content = ""
+            in_thinking = False
+            for line in response.iter_lines():
+                if not line:
+                    continue
+                line_str = line.decode('utf-8')
+                if not line_str.startswith("data: "):
+                    continue
+
+                try:
+                    data = json.loads(line_str[6:])
+                    # 记录消息ID和会话ID
+                    if "msgId" in data:
+                        msg_id = data["msgId"]
+                    if "sessionId" in data:
+                        session_id = data["sessionId"]
+                    
+                    if "contents" in data and len(data["contents"]) > 0:
+                        for content in data["contents"]:
+                            if content.get("contentType") == "think":
+                                if not in_thinking:
+                                    yield "<think>\n\n"
+                                    in_thinking = True
+                                if content.get("incremental"):
+                                    tmp_content = json.loads(content.get("content"))["content"]
+                                    thinking_content += tmp_content
+                                    yield tmp_content
+                                else:
+                                    tmp_content = json.loads(content.get("content"))["content"]
+                                    if len(thinking_content) < len(tmp_content):
+                                        yield tmp_content[len(thinking_content):]
+                                        thinking_content = tmp_content
+                                    else:
+                                        # thinking_content = "aaa</thi"
+                                        # tmp_content = "aaa"
+                                        # 应该yield nk>
+                                        # print("\n")
+                                        # print(len(thinking_content))
+                                        # print(len(tmp_content))
+                                        # print("--------------------------------")
+                                        # print(thinking_content)
+                                        # print("--------------------------------")
+                                        # print(tmp_content)
+                                        # print("--------------------------------")
+                                        yield "\r\n</think>\n"[len(thinking_content)-len(tmp_content):]
+                                        thinking_content = tmp_content
+                                    in_thinking = False
+                            elif content.get("contentType") == "text":
+                                if in_thinking:
+                                    continue
+                                if content.get("incremental"):
+                                    tmp_content = content.get("content")
+                                    text_content += tmp_content
+                                    yield tmp_content
+                                else:
+                                    tmp_content = content.get("content")
+                                    if len(text_content) < len(tmp_content):
+                                        yield tmp_content[len(text_content):]
+                                        text_content = tmp_content
+
+
+                except json.JSONDecodeError:
+                    continue
+
+            self.msg_id = msg_id
+            self.session_id = session_id
+
+            return None
+
+        except Exception as e:
+            raise Exception(f"Chat failed: {str(e)}")
+            
+    def _get_upload_token(self) -> Dict[str, Any]:
+        """Get upload token from Tongyi API
+        
+        Returns:
+            Dict[str, Any]: Upload token information including accessId, bucketName, etc.
+        """
+        url = "https://api.tongyi.com/dialog/uploadToken"
+        headers = self._get_base_headers()
+        payload = {}
+
+        try:
+            response = while_success(lambda: requests.post(url, headers=headers, json=payload), sleep_time=5)
+            if response.status_code != 200:
+                raise Exception(f"HTTP {response.status_code}: {response.text}")
+                
+            result = response.json()
+            if not result.get("success"):
+                raise Exception(f"Failed to get upload token: {result.get('errorMsg')}")
+                
+            return result.get("data", {})
+            
+        except Exception as e:
+            raise Exception(f"Failed to get upload token: {str(e)}")
+            
+
+    def upload_files(self, file_list: List[str]) -> bool:
+        """Upload files to Tongyi platform and get download links
+        
+        Args:
+            file_list: List of file paths to upload
+            
+        Returns:
+            List[Dict[str, str]]: List of dictionaries containing file info and download URLs
+        """
+        try:
+            upload_token = self._get_upload_token()
+            uploaded_files = []
+            
+            for file_path in file_list:
+                if not os.path.exists(file_path):
+                    PrettyOutput.print(f"File not found: {file_path}", OutputType.ERROR)
+                    return False
+                    
+                # Get file name and content type
+                file_name = os.path.basename(file_path)
+                content_type = self._get_content_type(file_path)
+                
+                # Prepare form data
+                form_data = {
+                    'OSSAccessKeyId': upload_token['accessId'],
+                    'policy': upload_token['policy'],
+                    'signature': upload_token['signature'],
+                    'key': f"{upload_token['dir']}{file_name}",
+                    'dir': upload_token['dir'],
+                    'success_action_status': '200'
+                }
+                
+                # Prepare files
+                files = {
+                    'file': (file_name, open(file_path, 'rb'), content_type)
+                }
+                
+                # Upload file
+                response = requests.post(
+                    upload_token['host'],
+                    data=form_data,
+                    files=files
+                )
+                
+                if response.status_code != 200:
+                    PrettyOutput.print(f"Failed to upload {file_name}: HTTP {response.status_code}", OutputType.ERROR)
+                    return False
+                    
+                uploaded_files.append({
+                    'fileKey': file_name,
+                    'fileType': 'file',
+                    'dir': upload_token['dir']
+                })
+            
+            # Get download links for uploaded files
+            url = "https://api.tongyi.com/dialog/downloadLink/batch"
+            headers = self._get_base_headers()
+            payload = {
+                "fileKeys": [f['fileKey'] for f in uploaded_files],
+                "fileType": "file",
+                "dir": upload_token['dir']
+            }
+            
+            response = requests.post(url, headers=headers, json=payload)
+            if response.status_code != 200:
+                PrettyOutput.print(f"Failed to get download links: HTTP {response.status_code}", OutputType.ERROR)
+                return False
+                
+            result = response.json()
+            if not result.get("success"):
+                PrettyOutput.print(f"Failed to get download links: {result.get('errorMsg')}", OutputType.ERROR)
+                return False
+                
+            # Add files to chat
+            self.uploaded_file_info = result.get("data", {}).get("results", [])
+            for file_info in self.uploaded_file_info:
+                add_url = "https://api.tongyi.com/assistant/api/chat/file/add"
+                add_payload = {
+                    "workSource": "chat",
+                    "terminal": "web",
+                    "workCode": "0",
+                    "channel": "home",
+                    "workType": "file",
+                    "module": "uploadhistory",
+                    "workName": file_info["fileKey"],
+                    "workId": file_info["docId"],
+                    "workResourcePath": file_info["url"],
+                    "sessionId": "",
+                    "batchId": str(uuid.uuid4()).replace('-', '')[:32],  # Generate random batchId
+                    "fileSize": os.path.getsize(file_path)
+                }
+                
+                add_response = requests.post(add_url, headers=headers, json=add_payload)
+                if add_response.status_code != 200:
+                    PrettyOutput.print(f"Failed to add file to chat: HTTP {add_response.status_code}", OutputType.ERROR)
+                    continue
+                    
+                add_result = add_response.json()
+                if not add_result.get("success"):
+                    PrettyOutput.print(f"Failed to add file to chat: {add_result.get('errorMsg')}", OutputType.ERROR)
+                    continue
+                    
+                file_info.update(add_result.get("data", {}))
+                
+            return True
+            
+        except Exception as e:
+            PrettyOutput.print(f"Error uploading files: {str(e)}", OutputType.ERROR)
+            return False
+            
+    def _get_content_type(self, file_path: str) -> str:
+        """Get content type for file
+        
+        Args:
+            file_path: Path to file
+            
+        Returns:
+            str: Content type
+        """
+        ext = os.path.splitext(file_path)[1].lower()
+        content_types = {
+            '.txt': 'text/plain',
+            '.md': 'text/markdown',
+            '.doc': 'application/msword',
+            '.docx': 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+            '.xls': 'application/vnd.ms-excel',
+            '.xlsx': 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+            '.pdf': 'application/pdf',
+            '.png': 'image/png',
+            '.jpg': 'image/jpeg',
+            '.jpeg': 'image/jpeg',
+            '.gif': 'image/gif',
+            '.mp4': 'video/mp4',
+            '.mp3': 'audio/mpeg',
+            '.wav': 'audio/wav'
+        }
+        return content_types.get(ext, 'application/octet-stream')
+
+    def name(self) -> str:
+        """Get platform name
+        
+        Returns:
+            str: Platform name
+        """
+        return self.model_name
+
+    def delete_chat(self) -> bool:
+        """Delete chat history
+        
+        Returns:
+            bool: True if deletion successful, False otherwise
+        """
+        if not self.session_id:
+            return True
+
+        url = "https://api.tongyi.com/dialog/session/delete"
+        headers = self._get_base_headers()
+        payload = {
+            "sessionId": self.session_id
+        }
+
+        try:
+            response = while_success(lambda: requests.post(url, headers=headers, json=payload), sleep_time=5)
+            if response.status_code != 200:
+                PrettyOutput.print(f"Failed to delete chat: HTTP {response.status_code}", OutputType.ERROR)
+                return False
+            self.request_id = ""
+            self.session_id = ""
+            self.msg_id = ""
+            return True
+        except Exception as e:
+            PrettyOutput.print(f"Error deleting chat: {str(e)}", OutputType.ERROR)
+            return False
+
+    def set_system_message(self, message: str):
+        """Set system message
+        
+        Args:
+            message: System message to set
+        """
+        self.system_message = message
+
+    def get_model_list(self) -> List[Tuple[str, str]]:
+        """Get available model list
+        
+        Returns:
+            List[Tuple[str, str]]: List of (model_id, model_name) tuples
+        """
+        return [
+            ("Normal", "Normal"),
+            ("Thinking", "Thinking"),
+            ("Deep-Research", "Deep-Research"),
+            ("Code-Chat", "Code-Chat"),
+        ]
+
+    def support_web(self) -> bool:
+        """Check if platform supports web functionality
+        
+        Returns:
+            bool: True if web is supported, False otherwise
+        """
+        return True

jarvis/jarvis_platform/yuanbao.py

@@ -430,6 +430,8 @@ class YuanbaoPlatform(BasePlatform):
                 if hasattr(response, 'text'):
                     error_msg += f", 响应: {response.text}"
                 raise Exception(error_msg)
+            
+            in_thinking = False
 
             # 处理SSE流响应
             for line in response.iter_lines():
@@ -446,12 +448,18 @@ class YuanbaoPlatform(BasePlatform):
 
                         # 处理文本类型的消息
                         if data.get("type") == "text":
+                            if in_thinking:
+                                yield "</think>\n"
+                                in_thinking = False
                             msg = data.get("msg", "")
                             if msg:
                                 yield msg
 
                         # 处理思考中的消息
                         elif data.get("type") == "think":
+                            if not in_thinking:
+                                yield "<think>\n"
+                                in_thinking = True
                             think_content = data.get("content", "")
                             if think_content:
                                 yield think_content

{jarvis_ai_assistant-0.1.182.dist-info → jarvis_ai_assistant-0.1.183.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.1.182
+Version: 0.1.183
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -153,6 +153,35 @@ Kimi API Key获取方式：
 删除Bearer前缀，剩下的内容就是Kimi API Key。
 
 
+#### 通义千问
+```yaml
+JARVIS_PLATFORM: tongyi
+JARVIS_MODEL: Normal  # 可选模型：Normal, Thinking, Deep-Research, Code-Chat
+JARVIS_THINKING_PLATFORM: tongyi
+JARVIS_THINKING_MODEL: Thinking
+
+ENV:
+  TONGYI_COOKIES: <通义千问cookies>
+```
+
+通义千问cookies获取方式：
+
+![通义千问cookies获取方式](docs/images/tongyi.png)
+
+1. 登录[通义千问](https://www.tongyi.com/qianwen)
+2. 打开浏览器开发者工具（F12）
+3. 在Network标签页中找到任意请求
+4. 在请求头中找到Cookie字段，复制其值
+
+配置说明：
+1. `TONGYI_COOKIES`: 必填，用于身份验证
+2. 支持的模型：
+   - `Normal`: 标准对话模型
+   - `Thinking`: 深度思考模型
+   - `Deep-Research`: 深度研究模型
+   - `Code-Chat`: 代码对话模型
+
+
 #### OpenAI
 ```yaml
 JARVIS_PLATFORM: openai

{jarvis_ai_assistant-0.1.182.dist-info → jarvis_ai_assistant-0.1.183.dist-info}/RECORD

@@ -1,4 +1,4 @@
-jarvis/__init__.py,sha256=0L3xbrhIunJRm7imt5CFTJQk-Ck5Or4XgYyygPYg_Dg,74
+jarvis/__init__.py,sha256=KysQNyO0AUjUMLzRISa3Wf1q9ffBDepVKiOh2ztirYg,74
 jarvis/jarvis_agent/__init__.py,sha256=AxT_2n-IQkbtoQlAS3SJ0tsvcUenWD7_Xrc-RZZCWiA,30352
 jarvis/jarvis_agent/builtin_input_handler.py,sha256=f4DaEHPakXcAbgykFP-tiOQP6fh_yGFlZx_h91_j2tQ,1529
 jarvis/jarvis_agent/file_input_handler.py,sha256=LDNXoTtyjhyBmfzDnAdbWZ2BWdu4q-r6thSKRK8Iwjk,4187
@@ -49,10 +49,11 @@ jarvis/jarvis_multi_agent/main.py,sha256=KeGv8sdpSgTjW6VE4-tQ8BWDC_a0aE_4R3OqzPB
 jarvis/jarvis_platform/__init__.py,sha256=0YnsUoM4JkIBOtImFdjfuDbrqQZT3dEaAwSJ62DrpCc,104
 jarvis/jarvis_platform/base.py,sha256=HbE7BVh8F5F38rr9K9281h6Q11XyWgDGzyPXe-e_Th0,7086
 jarvis/jarvis_platform/human.py,sha256=xwaTZ1zdrAYZZFXxkbHvUdECwCGsic0kgAFUncUr45g,2567
-jarvis/jarvis_platform/kimi.py,sha256=k0dYwuRf-snmJF206D7inahUcZUZG0VqOmhphj09NzQ,11969
+jarvis/jarvis_platform/kimi.py,sha256=b3EpnmHseZwrfCc8sMmvwLJ6Jg2FWf8ATItSDz5G3eQ,11978
 jarvis/jarvis_platform/openai.py,sha256=VyX3bR1rGxrJdWOtUBf8PgSL9n06KaNbOewL1urzOnk,4741
-jarvis/jarvis_platform/registry.py,sha256=CxAELjDrc-KKPPKdP71E_qaFisfQztvwc_tdf3WpOt8,7863
-jarvis/jarvis_platform/yuanbao.py,sha256=vKb6oy5cTMQCwqcqpaVur7BFtQwX1Cv-mYnswP-L4mA,20291
+jarvis/jarvis_platform/registry.py,sha256=3djxE8AB4gwrdAOvRSL0612Rt_CcsaZhzZ0_oXHu6xk,7820
+jarvis/jarvis_platform/tongyi.py,sha256=m44aZHZ1oCbYdlSMuG3qYPFZbHW4e3VlaFZ2i3H7xrE,16927
+jarvis/jarvis_platform/yuanbao.py,sha256=FDi-D9Jnw_MiwI0skPNMYz874o6GhWhdNRdZg-ECoUA,20632
 jarvis/jarvis_platform_manager/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_platform_manager/main.py,sha256=OXWj18SqiV0Gl75YT6D9wspCCB4Nes04EY-ShI9kbpU,25677
 jarvis/jarvis_smart_shell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -90,9 +91,9 @@ jarvis/jarvis_utils/methodology.py,sha256=A8pE8ZqNHvGKaDO4TFtg7Oz-hAXPBcQfhmSPWM
 jarvis/jarvis_utils/output.py,sha256=QboL42GtG_dnvd1O64sl8o72mEBhXNRADPXQMXgDE7Q,9661
 jarvis/jarvis_utils/tag.py,sha256=YJHmuedLb7_AiqvKQetHr4R1FxyzIh7HN0RRkWMmYbU,429
 jarvis/jarvis_utils/utils.py,sha256=atSK-2cUr7_tOIFsQzJnuQxebi7aFN4jtmaoXEaV4jM,10692
-jarvis_ai_assistant-0.1.182.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.182.dist-info/METADATA,sha256=Op8V2ma_T4C2rrhuEXgSn0qN7lZEfeiozSES036fdak,15059
-jarvis_ai_assistant-0.1.182.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
-jarvis_ai_assistant-0.1.182.dist-info/entry_points.txt,sha256=Gy3DOP1PYLMK0GCj4rrP_9lkOyBQ39EK_lKGUSwn41E,869
-jarvis_ai_assistant-0.1.182.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.182.dist-info/RECORD,,
+jarvis_ai_assistant-0.1.183.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.183.dist-info/METADATA,sha256=RRkBRiDEeBnEfQQFAufn9jE2RV7BA90P5o5G_PnJUp0,15836
+jarvis_ai_assistant-0.1.183.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+jarvis_ai_assistant-0.1.183.dist-info/entry_points.txt,sha256=Gy3DOP1PYLMK0GCj4rrP_9lkOyBQ39EK_lKGUSwn41E,869
+jarvis_ai_assistant-0.1.183.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.183.dist-info/RECORD,,