jarvis-ai-assistant 0.7.8__py3-none-any.whl → 1.0.2__py3-none-any.whl

jarvis/jarvis_platform/tongyi.py

@@ -3,11 +3,19 @@ import json
 import os
 import time
 import uuid
-from typing import Any, Dict, Generator, List, Tuple
+from typing import Any
+from typing import Dict
+from typing import Generator
+from typing import List
+from typing import Optional
+from typing import Tuple
+from typing import cast
 
 from jarvis.jarvis_platform.base import BasePlatform
 from jarvis.jarvis_utils import http
-from jarvis.jarvis_utils.tag import ot, ct
+from jarvis.jarvis_utils.output import PrettyOutput
+from jarvis.jarvis_utils.tag import ct
+from jarvis.jarvis_utils.tag import ot
 from jarvis.jarvis_utils.utils import while_success
 
 
@@ -17,15 +25,25 @@ class TongyiPlatform(BasePlatform):
     # Supported image formats
     IMAGE_EXTENSIONS = {".jpg", ".jpeg", ".png", ".gif", ".webp", ".bmp", ".tiff"}
 
-    def __init__(self):
-        """Initialize Tongyi platform"""
+    def __init__(self, llm_config: Optional[Dict[str, Any]] = None):
+        """
+        Initialize Tongyi platform
+
+        参数:
+            llm_config: LLM配置字典，包含 tongyi_cookies 等
+        """
         super().__init__()
         self.session_id = ""
-        self.cookies = os.getenv("TONGYI_COOKIES", "")
+        llm_config = llm_config or {}
+
+        # 从 llm_config 获取配置，如果没有则从环境变量获取（向后兼容）
+        self.cookies = llm_config.get("tongyi_cookies") or os.getenv(
+            "TONGYI_COOKIES", ""
+        )
         self.request_id = ""
         self.msg_id = ""
         self.model_name = ""
-        self.uploaded_file_info = []
+        self.uploaded_file_info: List[Dict[str, Any]] = []
         self.system_message = ""  # System message for initialization
         self.first_chat = True  # Flag for first chat
 
@@ -245,7 +263,8 @@ class TongyiPlatform(BasePlatform):
 
         try:
             response = while_success(
-                lambda: http.post(url, headers=headers, json=payload)            )
+                lambda: http.post(url, headers=headers, json=payload)
+            )
             if response.status_code != 200:
                 raise Exception(f"HTTP {response.status_code}: {response.text}")
 
@@ -253,7 +272,7 @@ class TongyiPlatform(BasePlatform):
             if not result.get("success"):
                 raise Exception(f"Failed to get upload token: {result.get('errorMsg')}")
 
-            return result.get("data", {})
+            return cast(Dict[str, Any], result.get("data", {}))
 
         except Exception as e:
             raise Exception(f"Failed to get upload token: {str(e)}")
@@ -279,8 +298,8 @@ class TongyiPlatform(BasePlatform):
                     if not os.path.exists(file_path):
                         # 先输出已收集的日志与错误后返回
                         log_lines.append(f"文件不存在: {file_path}")
-                        joined_logs = '\n'.join(log_lines)
-                        print(f"❌ {joined_logs}")
+                        joined_logs = "\n".join(log_lines)
+                        PrettyOutput.auto_print(f"❌ {joined_logs}")
                         return False
 
                     # Get file name and content type
@@ -309,9 +328,11 @@ class TongyiPlatform(BasePlatform):
                     )
 
                     if response.status_code != 200:
-                        log_lines.append(f"上传失败 {file_name}: HTTP {response.status_code}")
-                        joined_logs = '\n'.join(log_lines)
-                        print(f"❌ {joined_logs}")
+                        log_lines.append(
+                            f"上传失败 {file_name}: HTTP {response.status_code}"
+                        )
+                        joined_logs = "\n".join(log_lines)
+                        PrettyOutput.auto_print(f"❌ {joined_logs}")
                         return False
 
                     # Determine file type based on extension
@@ -343,16 +364,18 @@ class TongyiPlatform(BasePlatform):
 
                     response = http.post(url, headers=headers, json=payload)
                     if response.status_code != 200:
-                        log_lines.append(f"获取下载链接失败: HTTP {response.status_code}")
-                        joined_logs = '\n'.join(log_lines)
-                        print(f"❌ {joined_logs}")
+                        log_lines.append(
+                            f"获取下载链接失败: HTTP {response.status_code}"
+                        )
+                        joined_logs = "\n".join(log_lines)
+                        PrettyOutput.auto_print(f"❌ {joined_logs}")
                         return False
 
                     result = response.json()
                     if not result.get("success"):
                         log_lines.append(f"获取下载链接失败: {result.get('errorMsg')}")
-                        joined_logs = '\n'.join(log_lines)
-                        print(f"❌ {joined_logs}")
+                        joined_logs = "\n".join(log_lines)
+                        PrettyOutput.auto_print(f"❌ {joined_logs}")
                         return False
 
                     # Add files to chat
@@ -381,30 +404,34 @@ class TongyiPlatform(BasePlatform):
                             add_url, headers=headers, json=add_payload
                         )
                         if add_response.status_code != 200:
-                            log_lines.append(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"):
-                            log_lines.append(f"添加文件到对话失败: {add_result.get('errorMsg')}")
+                            log_lines.append(
+                                f"添加文件到对话失败: {add_result.get('errorMsg')}"
+                            )
                             continue
 
                         file_info.update(add_result.get("data", {}))
 
                     log_lines.append(f"文件 {file_name} 上传成功")
-                    joined_logs = '\n'.join(log_lines)
-                    print(f"ℹ️ {joined_logs}")
+                    joined_logs = "\n".join(log_lines)
+                    PrettyOutput.auto_print(f"ℹ️ {joined_logs}")
                     time.sleep(1)  # 短暂暂停以便用户看到成功状态
 
                 except Exception as e:
                     log_lines.append(f"上传文件 {file_name} 时出错: {str(e)}")
-                    joined_logs = '\n'.join(log_lines)
-                    print(f"❌ {joined_logs}")
+                    joined_logs = "\n".join(log_lines)
+                    PrettyOutput.auto_print(f"❌ {joined_logs}")
                     return False
             return True
 
         except Exception as e:
-            print(f"❌ Error uploading files: {str(e)}")
+            PrettyOutput.auto_print(f"❌ Error uploading files: {str(e)}")
             return False
 
     def _get_content_type(self, file_path: str) -> str:
@@ -469,9 +496,12 @@ class TongyiPlatform(BasePlatform):
 
         try:
             response = while_success(
-                lambda: http.post(url, headers=headers, json=payload)            )
+                lambda: http.post(url, headers=headers, json=payload)
+            )
             if response.status_code != 200:
-                print(f"❌ Failed to delete chat: HTTP {response.status_code}")
+                PrettyOutput.auto_print(
+                    f"❌ Failed to delete chat: HTTP {response.status_code}"
+                )
                 return False
             self.request_id = ""
             self.session_id = ""
@@ -479,13 +509,13 @@ class TongyiPlatform(BasePlatform):
             self.first_chat = True  # Reset first_chat flag
             return True
         except Exception as e:
-            print(f"❌ Error deleting chat: {str(e)}")
+            PrettyOutput.auto_print(f"❌ Error deleting chat: {str(e)}")
             return False
 
     def save(self, file_path: str) -> bool:
         """Save chat session to a file."""
         if not self.session_id:
-            print("⚠️ 没有活动的会话可供保存")
+            PrettyOutput.auto_print("⚠️ 没有活动的会话可供保存")
             return False
 
         state = {
@@ -502,10 +532,10 @@ class TongyiPlatform(BasePlatform):
             with open(file_path, "w", encoding="utf-8") as f:
                 json.dump(state, f, ensure_ascii=False, indent=4)
             self._saved = True
-            print(f"✅ 会话已成功保存到 {file_path}")
+            PrettyOutput.auto_print(f"✅ 会话已成功保存到 {file_path}")
             return True
         except Exception as e:
-            print(f"❌ 保存会话失败: {str(e)}")
+            PrettyOutput.auto_print(f"❌ 保存会话失败: {str(e)}")
             return False
 
     def restore(self, file_path: str) -> bool:
@@ -523,13 +553,13 @@ class TongyiPlatform(BasePlatform):
             self.first_chat = state.get("first_chat", True)
             self._saved = True
 
-            print(f"✅ 从 {file_path} 成功恢复会话")
+            PrettyOutput.auto_print(f"✅ 从 {file_path} 成功恢复会话")
             return True
         except FileNotFoundError:
-            print(f"❌ 会话文件未找到: {file_path}")
+            PrettyOutput.auto_print(f"❌ 会话文件未找到: {file_path}")
             return False
         except Exception as e:
-            print(f"❌ 恢复会话失败: {str(e)}")
+            PrettyOutput.auto_print(f"❌ 恢复会话失败: {str(e)}")
             return False
 
     def set_system_prompt(self, message: str):
@@ -564,20 +594,20 @@ class TongyiPlatform(BasePlatform):
     @classmethod
     def get_required_env_keys(cls) -> List[str]:
         """
-        获取通义平台所需的环境变量键列表
+        获取通义平台所需的配置键列表（已弃用：建议使用 llm_config 配置）
 
         返回:
-            List[str]: 环境变量键的列表
+            List[str]: 配置键的列表（对应 llm_config 中的 tongyi_cookies）
         """
         return ["TONGYI_COOKIES"]
 
     @classmethod
     def get_env_config_guide(cls) -> Dict[str, str]:
         """
-        获取环境变量配置指导
+        获取配置指导（已弃用：建议使用 llm_config 配置）
 
         返回:
-            Dict[str, str]: 环境变量名到配置指导的映射
+            Dict[str, str]: 配置键名到配置指导的映射
         """
         return {
             "TONGYI_COOKIES": (

jarvis/jarvis_platform/yuanbao.py

@@ -5,13 +5,21 @@ import json
 import os
 import time
 import urllib.parse
-from typing import Dict, Generator, List, Tuple
+from typing import Any
+from typing import Dict
+from typing import Generator
+from typing import List
+from typing import Optional
+from typing import Tuple
+from typing import cast
 
-from PIL import Image  # type: ignore
+from PIL import Image
 
 from jarvis.jarvis_platform.base import BasePlatform
 from jarvis.jarvis_utils import http
-from jarvis.jarvis_utils.tag import ot, ct
+from jarvis.jarvis_utils.output import PrettyOutput
+from jarvis.jarvis_utils.tag import ct
+from jarvis.jarvis_utils.tag import ot
 from jarvis.jarvis_utils.utils import while_success
 
 
@@ -27,25 +35,30 @@ class YuanbaoPlatform(BasePlatform):
             ("hunyuan_t1", "Tencent Hunyuan-T1"),
         ]
 
-    def __init__(self):
+    def __init__(self, llm_config: Optional[Dict[str, Any]] = None):
         """
         初始化Hunyuan模型
+
+        参数:
+            llm_config: LLM配置字典，包含 yuanbao_cookies 等
         """
         super().__init__()
         self.conversation_id = ""  # 会话ID，用于标识当前对话
-        # 从环境变量中获取必要参数
-        self.cookies = os.getenv("YUANBAO_COOKIES")  # 认证cookies
+        llm_config = llm_config or {}
+
+        # 从 llm_config 获取配置，如果没有则从环境变量获取（向后兼容）
+        self.cookies = llm_config.get("yuanbao_cookies") or os.getenv("YUANBAO_COOKIES")
         self.agent_id = "naQivTmsDa"
 
         if not self.cookies:
             raise ValueError(
-                "YUANBAO_COOKIES environment variable not set. Please provide your cookies to use the Yuanbao platform."
+                "yuanbao_cookies 未设置。请在 llm_config 中配置 yuanbao_cookies 或设置 YUANBAO_COOKIES 环境变量。"
             )
 
         self.system_message = ""  # 系统消息，用于初始化对话
         self.first_chat = True  # 标识是否为第一次对话
         self.model_name = "deep_seek_v3"  # 默认模型名称，使用下划线保持一致
-        self.multimedia = []
+        self.multimedia: List[Dict[str, Any]] = []
 
     def set_system_prompt(self, message: str):
         """设置系统消息"""
@@ -58,7 +71,7 @@ class YuanbaoPlatform(BasePlatform):
         if model_name in model_mapping:
             self.model_name = model_name
         else:
-            print(f"❌ 错误：不支持的模型: {model_name}")
+            PrettyOutput.auto_print(f"❌ 错误：不支持的模型: {model_name}")
 
     def _get_base_headers(self):
         """获取API请求的基础头部信息"""
@@ -76,7 +89,6 @@ class YuanbaoPlatform(BasePlatform):
             "Referer": f"https://yuanbao.tencent.com/chat/{self.agent_id}",
             "X-Source": "web",
             "Accept-Encoding": "gzip, deflate, br, zstd",
-
             "Sec-Fetch-Site": "same-origin",
             "Sec-Fetch-Mode": "cors",
             "Sec-Fetch-Dest": "empty",
@@ -102,10 +114,10 @@ class YuanbaoPlatform(BasePlatform):
                 self.conversation_id = response_json["id"]
                 return True
             else:
-                print(f"❌ 错误：创建会话失败，响应: {response_json}")
+                PrettyOutput.auto_print(f"❌ 错误：创建会话失败，响应: {response_json}")
                 return False
         except Exception as e:
-            print(f"❌ 错误：创建会话失败：{e}")
+            PrettyOutput.auto_print(f"❌ 错误：创建会话失败：{e}")
             return False
 
     def support_upload_files(self) -> bool:
@@ -122,7 +134,7 @@ class YuanbaoPlatform(BasePlatform):
             用于聊天消息的文件元数据字典列表
         """
         if not self.cookies:
-            print("❌ 未设置YUANBAO_COOKIES，无法上传文件")
+            PrettyOutput.auto_print("❌ 未设置yuanbao_cookies，无法上传文件")
             return False
 
         uploaded_files = []
@@ -192,8 +204,8 @@ class YuanbaoPlatform(BasePlatform):
                 upload_info = self._generate_upload_info(file_name)
                 if not upload_info:
                     log_lines.append(f"无法获取文件 {file_name} 的上传信息")
-                    joined_logs = '\n'.join(log_lines)
-                    print(f"❌ {joined_logs}")
+                    joined_logs = "\n".join(log_lines)
+                    PrettyOutput.auto_print(f"❌ {joined_logs}")
                     return False
 
                 # 3. Upload the file to COS
@@ -201,8 +213,8 @@ class YuanbaoPlatform(BasePlatform):
                 upload_success = self._upload_file_to_cos(file_path, upload_info)
                 if not upload_success:
                     log_lines.append(f"上传文件 {file_name} 失败")
-                    joined_logs = '\n'.join(log_lines)
-                    print(f"❌ {joined_logs}")
+                    joined_logs = "\n".join(log_lines)
+                    PrettyOutput.auto_print(f"❌ {joined_logs}")
                     return False
 
                 # 4. Create file metadata for chat
@@ -228,14 +240,14 @@ class YuanbaoPlatform(BasePlatform):
 
                 uploaded_files.append(file_metadata)
                 log_lines.append(f"文件 {file_name} 上传成功")
-                joined_logs = '\n'.join(log_lines)
-                print(f"ℹ️ {joined_logs}")
+                joined_logs = "\n".join(log_lines)
+                PrettyOutput.auto_print(f"ℹ️ {joined_logs}")
                 time.sleep(3)  # 上传成功后等待3秒
 
             except Exception as e:
                 log_lines.append(f"上传文件 {file_path} 时出错: {str(e)}")
-                joined_logs = '\n'.join(log_lines)
-                print(f"❌ {joined_logs}")
+                joined_logs = "\n".join(log_lines)
+                PrettyOutput.auto_print(f"❌ {joined_logs}")
                 return False
 
         self.multimedia = uploaded_files
@@ -262,16 +274,18 @@ class YuanbaoPlatform(BasePlatform):
             )
 
             if response.status_code != 200:
-                print(f"❌ 获取上传信息失败，状态码: {response.status_code}")
+                PrettyOutput.auto_print(
+                    f"❌ 获取上传信息失败，状态码: {response.status_code}"
+                )
                 if hasattr(response, "text"):
-                    print(f"❌ 响应: {response.text}")
+                    PrettyOutput.auto_print(f"❌ 响应: {response.text}")
                 return {}
 
             upload_info = response.json()
-            return upload_info
+            return cast(Dict[str, Any], upload_info)
 
         except Exception as e:
-            print(f"❌ 获取上传信息时出错: {str(e)}")
+            PrettyOutput.auto_print(f"❌ 获取上传信息时出错: {str(e)}")
             return {}
 
     def _upload_file_to_cos(self, file_path: str, upload_info: Dict) -> bool:
@@ -302,7 +316,7 @@ class YuanbaoPlatform(BasePlatform):
             with open(file_path, "rb") as file:
                 file_content = file.read()
 
-            print(f"ℹ️ 上传文件大小: {len(file_content)}")
+            PrettyOutput.auto_print(f"ℹ️ 上传文件大小: {len(file_content)}")
 
             # Prepare headers for PUT request
             host = f"{upload_info['bucketName']}.{upload_info.get('accelerateDomain', 'cos.accelerate.myqcloud.com')}"
@@ -334,15 +348,17 @@ class YuanbaoPlatform(BasePlatform):
             response = http.put(url, headers=headers, data=file_content)
 
             if response.status_code not in [200, 204]:
-                print(f"❌ 文件上传到COS失败，状态码: {response.status_code}")
+                PrettyOutput.auto_print(
+                    f"❌ 文件上传到COS失败，状态码: {response.status_code}"
+                )
                 if hasattr(response, "text"):
-                    print(f"❌ 响应: {response.text}")
+                    PrettyOutput.auto_print(f"❌ 响应: {response.text}")
                 return False
 
             return True
 
         except Exception as e:
-            print(f"❌ 上传文件到COS时出错: {str(e)}")
+            PrettyOutput.auto_print(f"❌ 上传文件到COS时出错: {str(e)}")
             return False
 
     def _generate_cos_signature(
@@ -404,7 +420,7 @@ class YuanbaoPlatform(BasePlatform):
             return signature
 
         except Exception as e:
-            print(f"❌ 生成签名时出错: {str(e)}")
+            PrettyOutput.auto_print(f"❌ 生成签名时出错: {str(e)}")
             raise e
 
     def chat(self, message: str) -> Generator[str, None, None]:
@@ -550,18 +566,18 @@ class YuanbaoPlatform(BasePlatform):
                 self.first_chat = True
                 return True
             else:
-                print(f"⚠️ 删除会话失败: HTTP {response.status_code}")
+                PrettyOutput.auto_print(f"⚠️ 删除会话失败: HTTP {response.status_code}")
                 if hasattr(response, "text"):
-                    print(f"⚠️ 响应: {response.text}")
+                    PrettyOutput.auto_print(f"⚠️ 响应: {response.text}")
                 return False
         except Exception as e:
-            print(f"❌ 删除会话时发生错误: {str(e)}")
+            PrettyOutput.auto_print(f"❌ 删除会话时发生错误: {str(e)}")
             return False
 
     def save(self, file_path: str) -> bool:
         """Save chat session to a file."""
         if not self.conversation_id:
-            print("⚠️ 没有活动的会话可供保存")
+            PrettyOutput.auto_print("⚠️ 没有活动的会话可供保存")
             return False
 
         state = {
@@ -576,10 +592,10 @@ class YuanbaoPlatform(BasePlatform):
             with open(file_path, "w", encoding="utf-8") as f:
                 json.dump(state, f, ensure_ascii=False, indent=4)
             self._saved = True
-            print(f"✅ 会话已成功保存到 {file_path}")
+            PrettyOutput.auto_print(f"✅ 会话已成功保存到 {file_path}")
             return True
         except Exception as e:
-            print(f"❌ 保存会话失败: {str(e)}")
+            PrettyOutput.auto_print(f"❌ 保存会话失败: {str(e)}")
             return False
 
     def restore(self, file_path: str) -> bool:
@@ -595,13 +611,13 @@ class YuanbaoPlatform(BasePlatform):
             self.multimedia = state.get("multimedia", [])
             self._saved = True
 
-            print(f"✅ 从 {file_path} 成功恢复会话")
+            PrettyOutput.auto_print(f"✅ 从 {file_path} 成功恢复会话")
             return True
         except FileNotFoundError:
-            print(f"❌ 会话文件未找到: {file_path}")
+            PrettyOutput.auto_print(f"❌ 会话文件未找到: {file_path}")
             return False
         except Exception as e:
-            print(f"❌ 恢复会话失败: {str(e)}")
+            PrettyOutput.auto_print(f"❌ 恢复会话失败: {str(e)}")
             return False
 
     def name(self) -> str:
@@ -620,20 +636,20 @@ class YuanbaoPlatform(BasePlatform):
     @classmethod
     def get_required_env_keys(cls) -> List[str]:
         """
-        获取元宝平台所需的环境变量键列表
+        获取元宝平台所需的配置键列表（已弃用：建议使用 llm_config 配置）
 
         返回:
-            List[str]: 环境变量键的列表
+            List[str]: 配置键的列表（对应 llm_config 中的 yuanbao_cookies）
         """
         return ["YUANBAO_COOKIES"]
 
     @classmethod
     def get_env_config_guide(cls) -> Dict[str, str]:
         """
-        获取环境变量配置指导
+        获取配置指导（已弃用：建议使用 llm_config 配置）
 
         返回:
-            Dict[str, str]: 环境变量名到配置指导的映射
+            Dict[str, str]: 配置键名到配置指导的映射
         """
         return {
             "YUANBAO_COOKIES": (