jarvis-ai-assistant 0.1.222__py3-none-any.whl → 0.7.0__py3-none-any.whl

jarvis/jarvis_platform/tongyi.py

@@ -8,6 +8,7 @@ from typing import Any, Dict, Generator, List, Tuple
 from jarvis.jarvis_platform.base import BasePlatform
 from jarvis.jarvis_utils import http
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+from jarvis.jarvis_utils.tag import ot, ct
 from jarvis.jarvis_utils.utils import while_success
 
 
@@ -81,10 +82,10 @@ class TongyiPlatform(BasePlatform):
                 "contentType": "text",
                 "role": "user",
                 "ext": {
-                    "searchType": "",
+                    "searchType": "depth" if self.web else "",
                     "pptGenerate": False,
-                    "deepThink": False,
-                    "deepResearch": False,
+                    "deepThink": self.model_name == "Thinking",
+                    "deepResearch": self.model_name == "Deep-Research",
                 },
             }
         ]
@@ -98,10 +99,10 @@ class TongyiPlatform(BasePlatform):
                     "contentType": "text",
                     "role": "system",
                     "ext": {
-                        "searchType": "",
+                        "searchType": "depth" if self.web else "",
                         "pptGenerate": False,
-                        "deepThink": False,
-                        "deepResearch": False,
+                        "deepThink": self.model_name == "Thinking",
+                        "deepResearch": self.model_name == "Deep-Research",
                     },
                 },
             )
@@ -140,13 +141,13 @@ class TongyiPlatform(BasePlatform):
             "parentMsgId": self.msg_id,
             "params": {
                 "agentId": "",
-                "searchType": "",
+                "searchType": "depth" if self.web else "",
                 "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,
+                "deepThink": self.model_name == "Thinking",
+                "deepResearch": self.model_name == "Deep-Research",
                 "fileUploadBatchId": (
                     self.uploaded_file_info[0]["batchId"]
                     if self.uploaded_file_info
@@ -168,88 +169,68 @@ class TongyiPlatform(BasePlatform):
             thinking_content = ""
             text_content = ""
             in_thinking = False
-            response_data = b""
 
             # 处理流式响应
-            for chunk in response_stream:
-                response_data += chunk
-
-                # 尝试解析SSE格式的数据
-                try:
-                    # 查找完整的数据行
-                    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:])
-                                # 记录消息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:
-                                                    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
-
-                except UnicodeDecodeError:
-                    # 如果解码失败，继续累积数据
+            for line in response_stream:
+                if not line.strip():
                     continue
 
+                # SSE格式的行通常以"data: "开头
+                if line.startswith("data: "):
+                    try:
+                        data = json.loads(line[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 f"{ot('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:
+                                            yield f"\r\n{ct('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
+            return
 
         except Exception as e:
             raise Exception(f"Chat failed: {str(e)}")
@@ -295,16 +276,19 @@ class TongyiPlatform(BasePlatform):
 
             for file_path in file_list:
                 file_name = os.path.basename(file_path)
-                print(f"🔍 上传文件 {file_name}")
+                log_lines: List[str] = []
+                log_lines.append(f"上传文件 {file_name}")
                 try:
                     if not os.path.exists(file_path):
-                        print(f"❌ 文件不存在: {file_path}")
+                        # 先输出已收集的日志与错误后返回
+                        log_lines.append(f"文件不存在: {file_path}")
+                        PrettyOutput.print("\n".join(log_lines), OutputType.ERROR)
                         return False
 
                     # Get file name and content type
                     content_type = self._get_content_type(file_path)
 
-                    print(f"🔍 准备上传文件: {file_name}")
+                    log_lines.append(f"准备上传文件: {file_name}")
 
                     # Prepare form data
                     form_data = {
@@ -319,7 +303,7 @@ class TongyiPlatform(BasePlatform):
                     # Prepare files
                     files = {"file": (file_name, open(file_path, "rb"), content_type)}
 
-                    print(f"📤 正在上传文件: {file_name}")
+                    log_lines.append(f"正在上传文件: {file_name}")
 
                     # Upload file
                     response = http.post(
@@ -327,7 +311,8 @@ class TongyiPlatform(BasePlatform):
                     )
 
                     if response.status_code != 200:
-                        print(f"❌ 上传失败 {file_name}: HTTP {response.status_code}")
+                        log_lines.append(f"上传失败 {file_name}: HTTP {response.status_code}")
+                        PrettyOutput.print("\n".join(log_lines), OutputType.ERROR)
                         return False
 
                     # Determine file type based on extension
@@ -342,7 +327,7 @@ class TongyiPlatform(BasePlatform):
                         }
                     )
 
-                    print(f"🔍 获取下载链接: {file_name}")
+                    log_lines.append(f"获取下载链接: {file_name}")
 
                     # Get download links for uploaded files
                     url = "https://api.tongyi.com/dialog/downloadLink/batch"
@@ -359,18 +344,20 @@ class TongyiPlatform(BasePlatform):
 
                     response = http.post(url, headers=headers, json=payload)
                     if response.status_code != 200:
-                        print(f"❌ 获取下载链接失败: HTTP {response.status_code}")
+                        log_lines.append(f"获取下载链接失败: HTTP {response.status_code}")
+                        PrettyOutput.print("\n".join(log_lines), OutputType.ERROR)
                         return False
 
                     result = response.json()
                     if not result.get("success"):
-                        print(f"❌ 获取下载链接失败: {result.get('errorMsg')}")
+                        log_lines.append(f"获取下载链接失败: {result.get('errorMsg')}")
+                        PrettyOutput.print("\n".join(log_lines), 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:
-                        print(f"🔍 添加文件到对话: {file_name}")
+                        log_lines.append(f"添加文件到对话: {file_name}")
                         add_url = "https://api.tongyi.com/assistant/api/chat/file/add"
                         add_payload = {
                             "workSource": "chat",
@@ -393,25 +380,23 @@ class TongyiPlatform(BasePlatform):
                             add_url, headers=headers, json=add_payload
                         )
                         if add_response.status_code != 200:
-                            print(
-                                f"❌ 添加文件到对话失败: HTTP {add_response.status_code}"
-                            )
+                            log_lines.append(f"添加文件到对话失败: HTTP {add_response.status_code}")
                             continue
 
                         add_result = add_response.json()
                         if not add_result.get("success"):
-                            print(
-                                f"❌ 添加文件到对话失败: {add_result.get('errorMsg')}"
-                            )
+                            log_lines.append(f"添加文件到对话失败: {add_result.get('errorMsg')}")
                             continue
 
                         file_info.update(add_result.get("data", {}))
 
-                    print(f"✅ 文件 {file_name} 上传成功")
+                    log_lines.append(f"文件 {file_name} 上传成功")
+                    PrettyOutput.print("\n".join(log_lines), OutputType.INFO)
                     time.sleep(1)  # 短暂暂停以便用户看到成功状态
 
                 except Exception as e:
-                    print(f"❌ 上传文件 {file_name} 时出错: {str(e)}")
+                    log_lines.append(f"上传文件 {file_name} 时出错: {str(e)}")
+                    PrettyOutput.print("\n".join(log_lines), OutputType.ERROR)
                     return False
             return True
 
@@ -576,3 +561,32 @@ class TongyiPlatform(BasePlatform):
             bool: True if web is supported, False otherwise
         """
         return True
+
+    @classmethod
+    def get_required_env_keys(cls) -> List[str]:
+        """
+        获取通义平台所需的环境变量键列表
+
+        返回:
+            List[str]: 环境变量键的列表
+        """
+        return ["TONGYI_COOKIES"]
+
+    @classmethod
+    def get_env_config_guide(cls) -> Dict[str, str]:
+        """
+        获取环境变量配置指导
+
+        返回:
+            Dict[str, str]: 环境变量名到配置指导的映射
+        """
+        return {
+            "TONGYI_COOKIES": (
+                "1. 登录通义千问网页版: https://tongyi.aliyun.com/\n"
+                "2. 打开浏览器开发者工具 (F12)\n"
+                '3. 切换到"网络"(Network)标签页\n'
+                "4. 刷新页面或发送一条消息\n"
+                "5. 找到 conversation 请求或任意发往 api.tongyi.com 的请求\n"
+                '6. 在"请求标头"中复制完整的 Cookie 值'
+            )
+        }

jarvis/jarvis_platform/yuanbao.py

@@ -12,6 +12,7 @@ from PIL import Image  # type: ignore
 from jarvis.jarvis_platform.base import BasePlatform
 from jarvis.jarvis_utils import http
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+from jarvis.jarvis_utils.tag import ot, ct
 from jarvis.jarvis_utils.utils import while_success
 
 
@@ -68,7 +69,6 @@ class YuanbaoPlatform(BasePlatform):
             "X-Requested-With": "XMLHttpRequest",
             "chat_version": "v1",
             "X-Instance-ID": "5",
-            "X-Requested-With": "XMLHttpRequest",
             "Accept": "application/json, text/plain, */*",
             "Content-Type": "application/json",
             "sec-ch-ua-mobile": "?0",
@@ -77,7 +77,7 @@ class YuanbaoPlatform(BasePlatform):
             "Referer": f"https://yuanbao.tencent.com/chat/{self.agent_id}",
             "X-Source": "web",
             "Accept-Encoding": "gzip, deflate, br, zstd",
-            "Accept": "*/*",
+
             "Sec-Fetch-Site": "same-origin",
             "Sec-Fetch-Mode": "cors",
             "Sec-Fetch-Dest": "empty",
@@ -133,10 +133,11 @@ class YuanbaoPlatform(BasePlatform):
 
         for file_path in file_list:
             file_name = os.path.basename(file_path)
-            print(f"🔍 上传文件 {file_name}")
+            log_lines: List[str] = []
+            log_lines.append(f"上传文件 {file_name}")
             try:
                 # 1. Prepare the file information
-                print(f"🔍 准备文件信息: {file_name}")
+                log_lines.append(f"准备文件信息: {file_name}")
                 file_size = os.path.getsize(file_path)
                 file_extension = os.path.splitext(file_path)[1].lower().lstrip(".")
 
@@ -191,21 +192,23 @@ class YuanbaoPlatform(BasePlatform):
                     file_type = "code"
 
                 # 2. Generate upload information
-                print(f"🔍 获取上传信息: {file_name}")
+                log_lines.append(f"获取上传信息: {file_name}")
                 upload_info = self._generate_upload_info(file_name)
                 if not upload_info:
-                    print(f"❌ 无法获取文件 {file_name} 的上传信息")
+                    log_lines.append(f"无法获取文件 {file_name} 的上传信息")
+                    PrettyOutput.print("\n".join(log_lines), OutputType.ERROR)
                     return False
 
                 # 3. Upload the file to COS
-                print(f"🔍 上传文件到云存储: {file_name}")
+                log_lines.append(f"上传文件到云存储: {file_name}")
                 upload_success = self._upload_file_to_cos(file_path, upload_info)
                 if not upload_success:
-                    print(f"❌ 上传文件 {file_name} 失败")
+                    log_lines.append(f"上传文件 {file_name} 失败")
+                    PrettyOutput.print("\n".join(log_lines), OutputType.ERROR)
                     return False
 
                 # 4. Create file metadata for chat
-                print(f"🔍 生成文件元数据: {file_name}")
+                log_lines.append(f"生成文件元数据: {file_name}")
                 file_metadata = {
                     "type": file_type,
                     "docType": file_extension if file_extension else file_type,
@@ -223,14 +226,16 @@ class YuanbaoPlatform(BasePlatform):
                             file_metadata["width"] = img.width
                             file_metadata["height"] = img.height
                     except Exception as e:
-                        print(f"⚠️ 无法获取图片 {file_name} 的尺寸: {str(e)}")
+                        log_lines.append(f"无法获取图片 {file_name} 的尺寸: {str(e)}")
 
                 uploaded_files.append(file_metadata)
-                print(f"✅ 文件 {file_name} 上传成功")
+                log_lines.append(f"文件 {file_name} 上传成功")
+                PrettyOutput.print("\n".join(log_lines), OutputType.INFO)
                 time.sleep(3)  # 上传成功后等待3秒
 
             except Exception as e:
-                print(f"❌ 上传文件 {file_path} 时出错: {str(e)}")
+                log_lines.append(f"上传文件 {file_path} 时出错: {str(e)}")
+                PrettyOutput.print("\n".join(log_lines), OutputType.ERROR)
                 return False
 
         self.multimedia = uploaded_files
@@ -301,7 +306,7 @@ class YuanbaoPlatform(BasePlatform):
             with open(file_path, "rb") as file:
                 file_content = file.read()
 
-            print(f"ℹ️  上传文件大小: {len(file_content)}")
+            PrettyOutput.print(f"上传文件大小: {len(file_content)}", OutputType.INFO)
 
             # Prepare headers for PUT request
             host = f"{upload_info['bucketName']}.{upload_info.get('accelerateDomain', 'cos.accelerate.myqcloud.com')}"
@@ -474,61 +479,54 @@ class YuanbaoPlatform(BasePlatform):
             )
 
             in_thinking = False
-            response_data = b""
 
             # 处理流式响应
-            for chunk in response_stream:
-                response_data += chunk
-
-                # 尝试解析SSE格式的数据
-                try:
-                    # 查找完整的数据行
-                    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_str = line[6:]  # 移除"data: "前缀
-
-                                # 检查结束标志
-                                if data_str == "[DONE]":
-                                    self.first_chat = False
-                                    return None
-
-                                data = json.loads(data_str)
-
-                                # 处理文本类型的消息
-                                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
-
-                            except json.JSONDecodeError:
-                                pass
-
-                except UnicodeDecodeError:
-                    # 如果解码失败，继续累积数据
+            for line in response_stream:
+                if not line.strip():
                     continue
 
+                # SSE格式的行通常以"data: "开头
+                if line.startswith("data: "):
+                    try:
+                        data_str = line[6:]  # 移除"data: "前缀
+
+                        # 检查结束标志
+                        if data_str == "[DONE]":
+                            self.first_chat = False
+                            return
+
+                        data = json.loads(data_str)
+
+                        # 处理文本类型的消息
+                        if data.get("type") == "text":
+                            if in_thinking:
+                                yield f"{ct('think')}\n"
+                                in_thinking = False
+                            msg = data.get("msg", "")
+                            if msg:
+                                yield msg
+
+                        # 处理思考中的消息
+                        elif data.get("type") == "think":
+                            if not in_thinking:
+                                yield f"{ot('think')}\n"
+                                in_thinking = True
+                            think_content = data.get("content", "")
+                            if think_content:
+                                yield think_content
+
+                    except json.JSONDecodeError:
+                        pass
+                else:
+                    try:
+                        data = json.loads(line)
+                        if "msg" in data:
+                            yield data["msg"]
+                    except json.JSONDecodeError:
+                        pass
+
             self.first_chat = False
-            return None
+            return
 
         except Exception as e:
             raise Exception(f"对话失败: {str(e)}")
@@ -629,3 +627,31 @@ class YuanbaoPlatform(BasePlatform):
     def support_web(self) -> bool:
         """Yuanbao平台支持web功能"""
         return True
+
+    @classmethod
+    def get_required_env_keys(cls) -> List[str]:
+        """
+        获取元宝平台所需的环境变量键列表
+
+        返回:
+            List[str]: 环境变量键的列表
+        """
+        return ["YUANBAO_COOKIES"]
+
+    @classmethod
+    def get_env_config_guide(cls) -> Dict[str, str]:
+        """
+        获取环境变量配置指导
+
+        返回:
+            Dict[str, str]: 环境变量名到配置指导的映射
+        """
+        return {
+            "YUANBAO_COOKIES": (
+                "1. 登录腾讯元宝网页版: https://yuanbao.tencent.com/\n"
+                "2. 打开浏览器开发者工具 (F12)\n"
+                '3. 切换到"网络"(Network)标签页\n'
+                "4. 刷新页面，找到任意一个发往 yuanbao.tencent.com 的请求\n"
+                '5. 在"请求标头"中复制完整的 Cookie 值'
+            )
+        }