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

jarvis/jarvis_platform/tongyi.py

@@ -7,7 +7,6 @@ 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
 
@@ -161,7 +160,6 @@ class TongyiPlatform(BasePlatform):
             # 使用新的stream_post接口发送消息请求，获取流式响应
             response_stream = while_success(
                 lambda: http.stream_post(url, headers=headers, json=payload),
-                sleep_time=5,
             )
 
             msg_id = ""
@@ -224,7 +222,7 @@ class TongyiPlatform(BasePlatform):
                                             yield tmp_content[len(text_content) :]
                                             text_content = tmp_content
 
-                    except json.JSONDecodeError:
+                    except Exception:
                         continue
 
             self.msg_id = msg_id
@@ -247,8 +245,7 @@ class TongyiPlatform(BasePlatform):
 
         try:
             response = while_success(
-                lambda: http.post(url, headers=headers, json=payload), sleep_time=5
-            )
+                lambda: http.post(url, headers=headers, json=payload)            )
             if response.status_code != 200:
                 raise Exception(f"HTTP {response.status_code}: {response.text}")
 
@@ -282,7 +279,8 @@ class TongyiPlatform(BasePlatform):
                     if not os.path.exists(file_path):
                         # 先输出已收集的日志与错误后返回
                         log_lines.append(f"文件不存在: {file_path}")
-                        PrettyOutput.print("\n".join(log_lines), OutputType.ERROR)
+                        joined_logs = '\n'.join(log_lines)
+                        print(f"❌ {joined_logs}")
                         return False
 
                     # Get file name and content type
@@ -312,7 +310,8 @@ class TongyiPlatform(BasePlatform):
 
                     if response.status_code != 200:
                         log_lines.append(f"上传失败 {file_name}: HTTP {response.status_code}")
-                        PrettyOutput.print("\n".join(log_lines), OutputType.ERROR)
+                        joined_logs = '\n'.join(log_lines)
+                        print(f"❌ {joined_logs}")
                         return False
 
                     # Determine file type based on extension
@@ -345,13 +344,15 @@ class TongyiPlatform(BasePlatform):
                     response = http.post(url, headers=headers, json=payload)
                     if response.status_code != 200:
                         log_lines.append(f"获取下载链接失败: HTTP {response.status_code}")
-                        PrettyOutput.print("\n".join(log_lines), OutputType.ERROR)
+                        joined_logs = '\n'.join(log_lines)
+                        print(f"❌ {joined_logs}")
                         return False
 
                     result = response.json()
                     if not result.get("success"):
                         log_lines.append(f"获取下载链接失败: {result.get('errorMsg')}")
-                        PrettyOutput.print("\n".join(log_lines), OutputType.ERROR)
+                        joined_logs = '\n'.join(log_lines)
+                        print(f"❌ {joined_logs}")
                         return False
 
                     # Add files to chat
@@ -391,17 +392,19 @@ class TongyiPlatform(BasePlatform):
                         file_info.update(add_result.get("data", {}))
 
                     log_lines.append(f"文件 {file_name} 上传成功")
-                    PrettyOutput.print("\n".join(log_lines), OutputType.INFO)
+                    joined_logs = '\n'.join(log_lines)
+                    print(f"ℹ️ {joined_logs}")
                     time.sleep(1)  # 短暂暂停以便用户看到成功状态
 
                 except Exception as e:
                     log_lines.append(f"上传文件 {file_name} 时出错: {str(e)}")
-                    PrettyOutput.print("\n".join(log_lines), OutputType.ERROR)
+                    joined_logs = '\n'.join(log_lines)
+                    print(f"❌ {joined_logs}")
                     return False
             return True
 
         except Exception as e:
-            PrettyOutput.print(f"Error uploading files: {str(e)}", OutputType.ERROR)
+            print(f"❌ Error uploading files: {str(e)}")
             return False
 
     def _get_content_type(self, file_path: str) -> str:
@@ -466,13 +469,9 @@ class TongyiPlatform(BasePlatform):
 
         try:
             response = while_success(
-                lambda: http.post(url, headers=headers, json=payload), sleep_time=5
-            )
+                lambda: http.post(url, headers=headers, json=payload)            )
             if response.status_code != 200:
-                PrettyOutput.print(
-                    f"Failed to delete chat: HTTP {response.status_code}",
-                    OutputType.ERROR,
-                )
+                print(f"❌ Failed to delete chat: HTTP {response.status_code}")
                 return False
             self.request_id = ""
             self.session_id = ""
@@ -480,13 +479,13 @@ class TongyiPlatform(BasePlatform):
             self.first_chat = True  # Reset first_chat flag
             return True
         except Exception as e:
-            PrettyOutput.print(f"Error deleting chat: {str(e)}", OutputType.ERROR)
+            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:
-            PrettyOutput.print("没有活动的会话可供保存", OutputType.WARNING)
+            print("⚠️ 没有活动的会话可供保存")
             return False
 
         state = {
@@ -503,10 +502,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
-            PrettyOutput.print(f"会话已成功保存到 {file_path}", OutputType.SUCCESS)
+            print(f"✅ 会话已成功保存到 {file_path}")
             return True
         except Exception as e:
-            PrettyOutput.print(f"保存会话失败: {str(e)}", OutputType.ERROR)
+            print(f"❌ 保存会话失败: {str(e)}")
             return False
 
     def restore(self, file_path: str) -> bool:
@@ -524,13 +523,13 @@ class TongyiPlatform(BasePlatform):
             self.first_chat = state.get("first_chat", True)
             self._saved = True
 
-            PrettyOutput.print(f"从 {file_path} 成功恢复会话", OutputType.SUCCESS)
+            print(f"✅ 从 {file_path} 成功恢复会话")
             return True
         except FileNotFoundError:
-            PrettyOutput.print(f"会话文件未找到: {file_path}", OutputType.ERROR)
+            print(f"❌ 会话文件未找到: {file_path}")
             return False
         except Exception as e:
-            PrettyOutput.print(f"恢复会话失败: {str(e)}", OutputType.ERROR)
+            print(f"❌ 恢复会话失败: {str(e)}")
             return False
 
     def set_system_prompt(self, message: str):

jarvis/jarvis_platform/yuanbao.py

@@ -11,7 +11,6 @@ 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
 
@@ -59,7 +58,7 @@ class YuanbaoPlatform(BasePlatform):
         if model_name in model_mapping:
             self.model_name = model_name
         else:
-            PrettyOutput.print(f"错误：不支持的模型: {model_name}", OutputType.ERROR)
+            print(f"❌ 错误：不支持的模型: {model_name}")
 
     def _get_base_headers(self):
         """获取API请求的基础头部信息"""
@@ -96,7 +95,6 @@ class YuanbaoPlatform(BasePlatform):
         try:
             response = while_success(
                 lambda: http.post(url, headers=headers, data=payload),
-                sleep_time=5,
             )
             response_json = response.json()
 
@@ -104,12 +102,10 @@ class YuanbaoPlatform(BasePlatform):
                 self.conversation_id = response_json["id"]
                 return True
             else:
-                PrettyOutput.print(
-                    f"错误：创建会话失败，响应: {response_json}", OutputType.ERROR
-                )
+                print(f"❌ 错误：创建会话失败，响应: {response_json}")
                 return False
         except Exception as e:
-            PrettyOutput.print(f"错误：创建会话失败：{e}", OutputType.ERROR)
+            print(f"❌ 错误：创建会话失败：{e}")
             return False
 
     def support_upload_files(self) -> bool:
@@ -126,7 +122,7 @@ class YuanbaoPlatform(BasePlatform):
             用于聊天消息的文件元数据字典列表
         """
         if not self.cookies:
-            PrettyOutput.print("未设置YUANBAO_COOKIES，无法上传文件", OutputType.ERROR)
+            print("❌ 未设置YUANBAO_COOKIES，无法上传文件")
             return False
 
         uploaded_files = []
@@ -196,7 +192,8 @@ class YuanbaoPlatform(BasePlatform):
                 upload_info = self._generate_upload_info(file_name)
                 if not upload_info:
                     log_lines.append(f"无法获取文件 {file_name} 的上传信息")
-                    PrettyOutput.print("\n".join(log_lines), OutputType.ERROR)
+                    joined_logs = '\n'.join(log_lines)
+                    print(f"❌ {joined_logs}")
                     return False
 
                 # 3. Upload the file to COS
@@ -204,7 +201,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} 失败")
-                    PrettyOutput.print("\n".join(log_lines), OutputType.ERROR)
+                    joined_logs = '\n'.join(log_lines)
+                    print(f"❌ {joined_logs}")
                     return False
 
                 # 4. Create file metadata for chat
@@ -230,12 +228,14 @@ class YuanbaoPlatform(BasePlatform):
 
                 uploaded_files.append(file_metadata)
                 log_lines.append(f"文件 {file_name} 上传成功")
-                PrettyOutput.print("\n".join(log_lines), OutputType.INFO)
+                joined_logs = '\n'.join(log_lines)
+                print(f"ℹ️ {joined_logs}")
                 time.sleep(3)  # 上传成功后等待3秒
 
             except Exception as e:
                 log_lines.append(f"上传文件 {file_path} 时出错: {str(e)}")
-                PrettyOutput.print("\n".join(log_lines), OutputType.ERROR)
+                joined_logs = '\n'.join(log_lines)
+                print(f"❌ {joined_logs}")
                 return False
 
         self.multimedia = uploaded_files
@@ -259,23 +259,19 @@ class YuanbaoPlatform(BasePlatform):
         try:
             response = while_success(
                 lambda: http.post(url, headers=headers, json=payload),
-                sleep_time=5,
             )
 
             if response.status_code != 200:
-                PrettyOutput.print(
-                    f"获取上传信息失败，状态码: {response.status_code}",
-                    OutputType.ERROR,
-                )
+                print(f"❌ 获取上传信息失败，状态码: {response.status_code}")
                 if hasattr(response, "text"):
-                    PrettyOutput.print(f"响应: {response.text}", OutputType.ERROR)
+                    print(f"❌ 响应: {response.text}")
                 return {}
 
             upload_info = response.json()
             return upload_info
 
         except Exception as e:
-            PrettyOutput.print(f"获取上传信息时出错: {str(e)}", OutputType.ERROR)
+            print(f"❌ 获取上传信息时出错: {str(e)}")
             return {}
 
     def _upload_file_to_cos(self, file_path: str, upload_info: Dict) -> bool:
@@ -306,7 +302,7 @@ class YuanbaoPlatform(BasePlatform):
             with open(file_path, "rb") as file:
                 file_content = file.read()
 
-            PrettyOutput.print(f"上传文件大小: {len(file_content)}", OutputType.INFO)
+            print(f"ℹ️ 上传文件大小: {len(file_content)}")
 
             # Prepare headers for PUT request
             host = f"{upload_info['bucketName']}.{upload_info.get('accelerateDomain', 'cos.accelerate.myqcloud.com')}"
@@ -338,18 +334,15 @@ class YuanbaoPlatform(BasePlatform):
             response = http.put(url, headers=headers, data=file_content)
 
             if response.status_code not in [200, 204]:
-                PrettyOutput.print(
-                    f"文件上传到COS失败，状态码: {response.status_code}",
-                    OutputType.ERROR,
-                )
+                print(f"❌ 文件上传到COS失败，状态码: {response.status_code}")
                 if hasattr(response, "text"):
-                    PrettyOutput.print(f"响应: {response.text}", OutputType.ERROR)
+                    print(f"❌ 响应: {response.text}")
                 return False
 
             return True
 
         except Exception as e:
-            PrettyOutput.print(f"上传文件到COS时出错: {str(e)}", OutputType.ERROR)
+            print(f"❌ 上传文件到COS时出错: {str(e)}")
             return False
 
     def _generate_cos_signature(
@@ -411,7 +404,7 @@ class YuanbaoPlatform(BasePlatform):
             return signature
 
         except Exception as e:
-            PrettyOutput.print(f"生成签名时出错: {str(e)}", OutputType.ERROR)
+            print(f"❌ 生成签名时出错: {str(e)}")
             raise e
 
     def chat(self, message: str) -> Generator[str, None, None]:
@@ -475,7 +468,6 @@ class YuanbaoPlatform(BasePlatform):
             # 使用新的stream_post接口发送消息请求，获取流式响应
             response_stream = while_success(
                 lambda: http.stream_post(url, headers=headers, json=payload),
-                sleep_time=5,
             )
 
             in_thinking = False
@@ -515,14 +507,14 @@ class YuanbaoPlatform(BasePlatform):
                             if think_content:
                                 yield think_content
 
-                    except json.JSONDecodeError:
+                    except Exception:
                         pass
                 else:
                     try:
                         data = json.loads(line)
                         if "msg" in data:
                             yield data["msg"]
-                    except json.JSONDecodeError:
+                    except Exception:
                         pass
 
             self.first_chat = False
@@ -551,7 +543,6 @@ class YuanbaoPlatform(BasePlatform):
         try:
             response = while_success(
                 lambda: http.post(url, headers=headers, json=payload),
-                sleep_time=5,
             )
 
             if response.status_code == 200:
@@ -559,20 +550,18 @@ class YuanbaoPlatform(BasePlatform):
                 self.first_chat = True
                 return True
             else:
-                PrettyOutput.print(
-                    f"删除会话失败: HTTP {response.status_code}", OutputType.WARNING
-                )
+                print(f"⚠️ 删除会话失败: HTTP {response.status_code}")
                 if hasattr(response, "text"):
-                    PrettyOutput.print(f"响应: {response.text}", OutputType.WARNING)
+                    print(f"⚠️ 响应: {response.text}")
                 return False
         except Exception as e:
-            PrettyOutput.print(f"删除会话时发生错误: {str(e)}", OutputType.ERROR)
+            print(f"❌ 删除会话时发生错误: {str(e)}")
             return False
 
     def save(self, file_path: str) -> bool:
         """Save chat session to a file."""
         if not self.conversation_id:
-            PrettyOutput.print("没有活动的会话可供保存", OutputType.WARNING)
+            print("⚠️ 没有活动的会话可供保存")
             return False
 
         state = {
@@ -587,10 +576,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
-            PrettyOutput.print(f"会话已成功保存到 {file_path}", OutputType.SUCCESS)
+            print(f"✅ 会话已成功保存到 {file_path}")
             return True
         except Exception as e:
-            PrettyOutput.print(f"保存会话失败: {str(e)}", OutputType.ERROR)
+            print(f"❌ 保存会话失败: {str(e)}")
             return False
 
     def restore(self, file_path: str) -> bool:
@@ -606,13 +595,13 @@ class YuanbaoPlatform(BasePlatform):
             self.multimedia = state.get("multimedia", [])
             self._saved = True
 
-            PrettyOutput.print(f"从 {file_path} 成功恢复会话", OutputType.SUCCESS)
+            print(f"✅ 从 {file_path} 成功恢复会话")
             return True
         except FileNotFoundError:
-            PrettyOutput.print(f"会话文件未找到: {file_path}", OutputType.ERROR)
+            print(f"❌ 会话文件未找到: {file_path}")
             return False
         except Exception as e:
-            PrettyOutput.print(f"恢复会话失败: {str(e)}", OutputType.ERROR)
+            print(f"❌ 恢复会话失败: {str(e)}")
             return False
 
     def name(self) -> str: