gen final video from fronted

app.py

@@ -4,7 +4,7 @@ import gradio as gr
 from config import SCENE_CONFIGS, MODEL_CHOICES, MODE_CHOICES
 from backend_api import submit_to_backend, get_task_status, get_task_result
 from logging_utils import log_access, log_submission, is_request_allowed
-from simulation import stream_simulation_results, convert_to_h264
+from simulation import stream_simulation_results, convert_to_h264, create_final_video_from_oss_images
 from ui_components import update_history_display, update_scene_display, update_log_display, get_scene_instruction
 from oss_utils import download_oss_file, get_user_tmp_dir, cleanup_user_tmp_dir, oss_file_exists
 import os
@@ -55,23 +55,15 @@ def run_simulation(scene, model, mode, prompt, history, request: gr.Request):
     # 获取最终任务状态
     status = get_task_status(task_id)
     if status.get("status") == "completed":
-        # 从OSS下载最终视频文件
-        oss_video_path = os.path.join(result_folder, "output.mp4")  # 或者根据实际的视频文件名调整
-        user_dir = get_user_tmp_dir(session_id)
-        local_video_path = os.path.join(user_dir, task_id, "output.mp4")
-        
         try:
-            # 尝试下载视频文件
-            if oss_file_exists(oss_video_path):
-                download_oss_file(oss_video_path, local_video_path)
-                video_path = convert_to_h264(local_video_path)
-            else:
-                # 如果OSS上没有最终视频，使用最后一个片段
-                gr.Info("Final video not found in OSS, using last segment")
-                video_path = None
+            # 从OSS上的所有图片拼接成最终视频（6帧每秒）
+            gr.Info("Creating final video from all OSS images...")
+            video_path = create_final_video_from_oss_images(result_folder, task_id, request, fps=6)
+            gr.Info(f"Final video created successfully with 6 fps!")
                 
         except Exception as e:
-            print(f"Error downloading final video: {e}")
+            print(f"Error creating final video from OSS images: {e}")
+            log_submission(scene, prompt, model, user_ip, f"Final video creation failed: {str(e)}")
             video_path = None
         new_entry = {
             "timestamp": timestamp,

simulation.py

@@ -184,3 +184,80 @@ def convert_to_h264(video_path):
         raise gr.Error(f"FFmpeg 转换失败: {e.stderr}")
     except Exception as e:
         raise gr.Error(f"转换过程中发生错误: {str(e)}")
+
+def create_final_video_from_oss_images(result_folder: str, task_id: str, request: gr.Request, fps: int = 6) -> str:
+    """
+    从OSS上的所有图片拼接成最终完整视频
+    
+    参数:
+        result_folder: OSS上的结果文件夹路径
+        task_id: 任务ID
+        request: Gradio请求对象
+        fps: 视频帧率 (6帧每秒)
+        
+    返回:
+        最终视频文件路径
+    """
+    # 获取图片文件夹路径
+    image_folder = os.path.join(result_folder, "images")
+    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)
+    
+    try:
+        # 1. 获取OSS上的所有图片文件
+        oss_files = list_oss_files(image_folder)
+        image_files = [f for f in oss_files if f.lower().endswith(('.png', '.jpg', '.jpeg'))]
+        
+        if not image_files:
+            raise gr.Error("No images found in OSS for final video creation")
+        
+        # 2. 按文件名排序确保时间顺序正确
+        image_files.sort(key=lambda x: os.path.splitext(os.path.basename(x))[0])
+        
+        # 3. 下载所有图片到本地
+        frames = []
+        width, height = 0, 0
+        
+        for oss_path in image_files:
+            try:
+                filename = os.path.basename(oss_path)
+                local_path = os.path.join(local_image_dir, filename)
+                download_oss_file(oss_path, local_path)
+                
+                # 读取图片
+                frame = cv2.imread(local_path)
+                if frame is not None:
+                    if width == 0:  # 第一次获取图像尺寸
+                        height, width = frame.shape[:2]
+                    frames.append(frame)
+                    
+            except Exception as e:
+                print(f"Error processing {oss_path}: {e}")
+                continue
+        
+        if not frames:
+            raise gr.Error("No valid images could be processed for final video")
+        
+        # 4. 创建最终视频
+        final_video_dir = os.path.join(user_dir, task_id, "final")
+        os.makedirs(final_video_dir, exist_ok=True)
+        final_video_path = os.path.join(final_video_dir, "final_video.mp4")
+        
+        # 使用OpenCV创建视频
+        fourcc = cv2.VideoWriter_fourcc(*'mp4v')
+        out = cv2.VideoWriter(final_video_path, fourcc, fps, (width, height))
+        
+        for frame in frames:
+            out.write(frame)
+        out.release()
+        
+        # 5. 转换为H.264格式
+        h264_video_path = convert_to_h264(final_video_path)
+        
+        print(f"Final video created: {h264_video_path} with {len(frames)} frames at {fps} fps")
+        return h264_video_path
+        
+    except Exception as e:
+        print(f"Error creating final video from OSS images: {e}")
+        raise gr.Error(f"Failed to create final video: {str(e)}")