oss support

app.py

@@ -24,7 +24,7 @@ header_html = """
     </div>
     <div style="display: flex; gap: 15px; align-items: center;">
         <a href="https://github.com/InternRobotics" target="_blank" style="text-decoration: none; transition: transform 0.2s;" onmouseover="this.style.transform='scale(1.1)'" onmouseout="this.style.transform='scale(1)'">
-            <img src="assets/github-mark.png" alt="GitHub" style="height: 30px;">
+            <img src="https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png" alt="GitHub" style="height: 30px;">
         </a>
         <a href="https://huggingface.co/InternRobotics" target="_blank" style="text-decoration: none; transition: transform 0.2s;" onmouseover="this.style.transform='scale(1.1)'" onmouseout="this.style.transform='scale(1)'">
             <img src="https://huggingface.co/front/assets/huggingface_logo-noborder.svg" alt="HuggingFace" style="height: 30px;">

app_utils.py

@@ -19,7 +19,7 @@ os.makedirs(TMP_ROOT, exist_ok=True)
 
 
 # 后端API配置（可配置化）
-BACKEND_URL = os.getenv("BACKEND_URL")
+BACKEND_URL = os.getenv("BACKEND_URL", "http://localhost:8000")
 API_ENDPOINTS = {
     "submit_task": f"{BACKEND_URL}/predict/video",
     "query_status": f"{BACKEND_URL}/predict/task",
@@ -183,6 +183,13 @@ def download_oss_file(oss_path: str, local_path: str):
     """从OSS下载文件到本地"""
     bucket.get_object_to_file(oss_path, local_path)
 
+def oss_file_exists(oss_path):
+    try:
+        # Assuming you have an OSS bucket object
+        return bucket.object_exists(oss_path)
+    except Exception as e:
+        print(f"Error checking if file exists in OSS: {str(e)}")
+        return False
 def stream_simulation_results(result_folder: str, task_id: str, request: gr.Request, fps: int = 30):
     """
     流式输出仿真结果，从OSS读取图片
@@ -190,8 +197,9 @@ def stream_simulation_results(result_folder: str, task_id: str, request: gr.Requ
     参数:
         result_folder: OSS上包含生成图片的文件夹路径
         task_id: 后端任务ID用于状态查询
-        fps: 输出视频的帧率
         request: Gradio请求对象
+        fps: 输出视频的帧率
+        
         
     生成:
         生成的视频文件路径 (分段输出)
@@ -204,12 +212,13 @@ def stream_simulation_results(result_folder: str, task_id: str, request: gr.Requ
     processed_files = set()
     width, height = 0, 0
     last_status_check = 0
-    status_check_interval = 5  # 每5秒检查一次后端状态
+    status_check_interval = 1  # 每5秒检查一次后端状态
     max_time = 240
 
     # 创建临时目录存储下载的图片
     user_dir = os.path.join(TMP_ROOT, str(request.session_hash))
-    local_image_dir = os.path.join(user_dir, "tasks", "images")
+    local_image_dir = os.path.join(user_dir, task_id, "tasks", "images")
+    
     os.makedirs(local_image_dir, exist_ok=True)
 
     while max_time > 0:
@@ -219,7 +228,7 @@ def stream_simulation_results(result_folder: str, task_id: str, request: gr.Requ
         # 定期检查后端状态
         if current_time - last_status_check > status_check_interval:
             status = get_task_status(task_id)
-            print("status: ", status)
+            print(str(request.session_hash), "status: ", status)
             if status.get("status") == "completed":
                 # 确保处理完所有已生成的图片
                 process_remaining_oss_images(image_folder, local_image_dir, processed_files, frame_buffer)
@@ -275,7 +284,7 @@ def create_video_segment(frames: List[np.ndarray], fps: int, width: int, height:
     """创建视频片段"""
     user_dir = os.path.join(TMP_ROOT, str(req.session_hash))
     os.makedirs(user_dir, exist_ok=True)
-    video_chunk_path = os.path.join(user_dir, "tasks/video_chunk")
+    video_chunk_path = os.path.join(user_dir, "video_chunk")
     os.makedirs(video_chunk_path, exist_ok=True)
     segment_name = os.path.join(video_chunk_path, f"output_{uuid.uuid4()}.mp4")
     fourcc = cv2.VideoWriter_fourcc(*'mp4v')
@@ -364,7 +373,7 @@ def get_task_status(task_id: str) -> dict:
         )
         return response.json()
     except Exception as e:
-        return {"status": "error", "message": str(e)}
+        return {"status": "error get_task_status", "message": str(e)}
 
 def terminate_task(task_id: str) -> Optional[dict]:
     """
@@ -431,6 +440,7 @@ def run_simulation(
     # 记录用户提交
     user_ip = request.client.host if request else "unknown"
     session_id = request.session_hash
+    user_dir = os.path.join(TMP_ROOT, str(request.session_hash))
 
     if not is_request_allowed(user_ip):
         log_submission(scene, prompt, model, max_step, user_ip, "IP blocked temporarily")
@@ -454,19 +464,20 @@ def run_simulation(
         status = get_task_status(task_id)
         print("first status: ", status)
         result_folder = status.get("result", "")
+        result_folder = "gradio_demo/tasks/" + task_id
     except Exception as e:
         log_submission(scene, prompt, model, max_step, user_ip, str(e))
         raise gr.Error(f"error occurred when parsing submission result from backend: {str(e)}")
 
 
-    if not os.path.exists(result_folder):
-        log_submission(scene, prompt, model, max_step, user_ip, "Result folder provided by backend doesn't exist")
-        raise gr.Error(f"Result folder provided by backend doesn't exist: <PATH>{result_folder}")
+    # if not os.path.exists(result_folder):
+    #     log_submission(scene, prompt, model, max_step, user_ip, "Result folder provided by backend doesn't exist")
+    #     raise gr.Error(f"Result folder provided by backend doesn't exist: <PATH>{result_folder}")
     
     
     # 流式输出视频片段
     try:
-        for video_path in stream_simulation_results(result_folder, task_id):
+        for video_path in stream_simulation_results(result_folder, task_id, request):
             if video_path:
                 yield video_path, history
     except Exception as e:
@@ -477,9 +488,14 @@ def run_simulation(
     status = get_task_status(task_id)
     print("status: ", status)
     if status.get("status") == "completed":
-        video_path = os.path.join(status.get("result"), "manipulation.mp4")
-        print("video_path: ", video_path)
-        video_path = convert_to_h264(video_path)
+        # time.sleep(3)
+        oss_video_path = os.path.join(result_folder, "manipulation.mp4")
+        local_video_path = os.path.join(user_dir, task_id, "tasks", "manipulation.mp4")
+        download_oss_file(oss_video_path, local_video_path)
+        print("oss_video_path: ", oss_video_path)
+        print("local_video_path: ", local_video_path)
+
+        video_path = convert_to_h264(local_video_path)
 
         # 创建新的历史记录条目
         new_entry = {