add debug info

oss_utils.py

@@ -13,9 +13,21 @@ OSS_CONFIG = {
     "bucket_name": os.getenv("OSS_BUCKET_NAME")
 }
 
+# 调试OSS配置信息
+print(f"🔍 OSS CONFIG DEBUG:")
+print(f"  - access_key_id: {'✅' if OSS_CONFIG['access_key_id'] else '❌'} ({'***' + OSS_CONFIG['access_key_id'][-4:] if OSS_CONFIG['access_key_id'] else 'None'})")
+print(f"  - access_key_secret: {'✅' if OSS_CONFIG['access_key_secret'] else '❌'} ({'***' + OSS_CONFIG['access_key_secret'][-4:] if OSS_CONFIG['access_key_secret'] else 'None'})")
+print(f"  - endpoint: {OSS_CONFIG['endpoint'] or '❌ None'}")
+print(f"  - bucket_name: {OSS_CONFIG['bucket_name'] or '❌ None'}")
+
 # 初始化OSS客户端
-auth = oss2.Auth(OSS_CONFIG["access_key_id"], OSS_CONFIG["access_key_secret"])
-bucket = oss2.Bucket(auth, OSS_CONFIG["endpoint"], OSS_CONFIG["bucket_name"])
+try:
+    auth = oss2.Auth(OSS_CONFIG["access_key_id"], OSS_CONFIG["access_key_secret"])
+    bucket = oss2.Bucket(auth, OSS_CONFIG["endpoint"], OSS_CONFIG["bucket_name"])
+    print(f"✅ OSS client initialized successfully")
+except Exception as e:
+    print(f"❌ OSS client initialization failed: {e}")
+    bucket = None
 
 # 临时文件根目录
 TMP_ROOT = os.path.join(os.path.dirname(os.path.abspath(__file__)), "tmp")
@@ -23,6 +35,10 @@ os.makedirs(TMP_ROOT, exist_ok=True)
 
 def list_oss_files(folder_path: str) -> List[str]:
     """列出OSS文件夹中的所有文件"""
+    if bucket is None:
+        print(f"❌ OSS DEBUG: Bucket not initialized, cannot list files")
+        return []
+        
     files = []
     try:
         print(f"🔍 OSS DEBUG: Listing files with prefix: '{folder_path}'")
@@ -44,6 +60,10 @@ def list_oss_files(folder_path: str) -> List[str]:
 
 def download_oss_file(oss_path: str, local_path: str):
     """从OSS下载文件到本地"""
+    if bucket is None:
+        print(f"❌ OSS DEBUG: Bucket not initialized, cannot download file")
+        raise Exception("OSS bucket not initialized")
+        
     try:
         # 确保本地目录存在
         os.makedirs(os.path.dirname(local_path), exist_ok=True)
@@ -54,6 +74,10 @@ def download_oss_file(oss_path: str, local_path: str):
 
 def oss_file_exists(oss_path: str) -> bool:
     """检查OSS文件是否存在"""
+    if bucket is None:
+        print(f"❌ OSS DEBUG: Bucket not initialized, cannot check file existence")
+        return False
+        
     try:
         return bucket.object_exists(oss_path)
     except Exception as e:

simulation.py

@@ -198,14 +198,22 @@ def create_final_video_from_oss_images(result_folder: str, task_id: str, request
     返回:
         最终视频文件路径
     """
+    # 清理result_folder路径，移除OSS前缀
+    cleaned_result_folder = result_folder.strip('/')
+    if cleaned_result_folder.startswith('oss-waic/'):
+        cleaned_result_folder = cleaned_result_folder[9:]  # 移除 'oss-waic/' 前缀
+    elif cleaned_result_folder.startswith('/oss-waic/'):
+        cleaned_result_folder = cleaned_result_folder[10:]  # 移除 '/oss-waic/' 前缀
+    
     # 获取图片文件夹路径
-    image_folder = os.path.join(result_folder, "images")
+    image_folder = os.path.join(cleaned_result_folder, "images").replace('\\', '/')
     user_dir = get_user_tmp_dir(request.session_hash)
     local_image_dir = os.path.join(user_dir, task_id, "final_images")
     os.makedirs(local_image_dir, exist_ok=True)
     
     # 添加调试信息
-    print(f"🔍 DEBUG: result_folder = {result_folder}")
+    print(f"🔍 DEBUG: original result_folder = {result_folder}")
+    print(f"🔍 DEBUG: cleaned_result_folder = {cleaned_result_folder}")
     print(f"🔍 DEBUG: task_id = {task_id}")
     print(f"🔍 DEBUG: image_folder = {image_folder}")
     print(f"🔍 DEBUG: user_dir = {user_dir}")
@@ -223,9 +231,9 @@ def create_final_video_from_oss_images(result_folder: str, task_id: str, request
         print(f"🔍 DEBUG: First 5 image files: {image_files[:5]}")
         
         if not image_files:
-            # 如果没有找到图片，尝试直接在result_folder中查找
-            print(f"🔍 DEBUG: No images in {image_folder}, trying {result_folder}")
-            oss_files_direct = list_oss_files(result_folder)
+            # 如果没有找到图片，尝试直接在cleaned_result_folder中查找
+            print(f"🔍 DEBUG: No images in {image_folder}, trying {cleaned_result_folder}")
+            oss_files_direct = list_oss_files(cleaned_result_folder)
             print(f"🔍 DEBUG: Files in result_folder: {len(oss_files_direct)}")
             print(f"🔍 DEBUG: Direct files: {oss_files_direct[:10]}")
             
@@ -233,9 +241,27 @@ def create_final_video_from_oss_images(result_folder: str, task_id: str, request
             all_image_files = [f for f in oss_files_direct if f.lower().endswith(('.png', '.jpg', '.jpeg'))]
             print(f"🔍 DEBUG: All image files in result_folder: {len(all_image_files)}")
             
+            # 尝试不同的路径组合
+            alternative_paths = [
+                f"gradio_demo/tasks/{task_id}/images",
+                f"gradio_demo/tasks/{task_id}",
+                f"tasks/{task_id}/images",
+                f"tasks/{task_id}"
+            ]
+            
+            for alt_path in alternative_paths:
+                print(f"🔍 DEBUG: Trying alternative path: {alt_path}")
+                alt_files = list_oss_files(alt_path)
+                alt_images = [f for f in alt_files if f.lower().endswith(('.png', '.jpg', '.jpeg'))]
+                print(f"🔍 DEBUG: Found {len(alt_images)} images in {alt_path}")
+                if alt_images:
+                    all_image_files = alt_images
+                    print(f"🔍 DEBUG: Using images from alternative path: {alt_path}")
+                    break
+            
             if all_image_files:
                 image_files = all_image_files
-                print(f"🔍 DEBUG: Using image files from result_folder: {len(image_files)}")
+                print(f"🔍 DEBUG: Using image files from alternative search: {len(image_files)}")
             else:
                 raise gr.Error("No images found in OSS for final video creation")