Update api.py

api.py

@@ -13,6 +13,8 @@ import subprocess
 from fastapi import BackgroundTasks
 import time
 from bilibili_api import sync, video_uploader, Credential#bili上传部分
+import concurrent.futures #线程保证后台任务的先后
+
 
 sessdata = os.getenv('sessdata')
 bili_jct = os.getenv('bili_jct')
@@ -100,30 +102,55 @@ async def execute_py_file(file_name: str,background_tasks: BackgroundTasks):
 
 
 #收到图片后为了后台任务的顺序,单独设定一个函数依次将自定义执行顺序加入队列 ,有默认参数的写后面-并且和bili合并,不然还要等output.mp4生成后才能发起提交请求
-@app.get("/execute_all_task")
-async def execute_all_task(background_tasks: BackgroundTasks,file_list: list = ["1removeMask", "2magiDialogCut", "3mergeDialogToVideo"],
-                           bili_meta_data:dict = None,cover_image: UploadFile = File(...),mp4_out_file:str='mp4_out/output.mp4',
-                           allow_submit:bool=False,cover_path:str ='/cover'
+# @app.get("/execute_all_task")
+# async def execute_all_task(background_tasks: BackgroundTasks,file_list: list = ["1removeMask", "2magiDialogCut", "3mergeDialogToVideo"],
+#                            bili_meta_data:dict = None,cover_image: UploadFile = File(...),mp4_out_file:str='mp4_out/output.mp4',
+#                            allow_submit:bool=False,cover_path:str ='/cover'
                            
-                          ):
+#                           ):
+#     for file_name in file_list:
+#         background_tasks.add_task(file_executer, file_name)
+#     if allow_submit:
+#         #如果请求中设置允许上传output.mp4
+#         cover_img = cover_image.file.read()
+#         cover_img_data = Image.open(io.BytesIO(cover_img)).convert("L").convert("RGB")
+#         cover_path_to_image = os.path.join(cover_path, f"cover.jpg")
+#         cover_img_data.save(cover_path_to_image)
+#         #video数据从meta用户请求获取,至于
+#         background_tasks.add_task(upload_video, bili_meta_data,cover_path_to_image)
+#         return {"message": "提交video任务已加入队列"}
+        
+#     return {"message": "Tasks added to the queue"}
+
+
+#保证既要提交队列后返回给用户,又要先完成前面的video生成步骤再执行后面的submit函数,还有兼顾allow_submit的值
+@app.get("/execute_all_task")
+async def execute_all_task(background_tasks: BackgroundTasks, file_list: list = ["1removeMask", "2magiDialogCut", "3mergeDialogToVideo"],
+                           bili_meta_data: dict = None, cover_image: UploadFile = File(...), mp4_out_file: str = 'mp4_out/output.mp4',
+                           allow_submit: bool = False, cover_path: str = '/cover'
+                           ):
+    tasks = []
     for file_name in file_list:
-        background_tasks.add_task(file_executer, file_name)
+        tasks.append(file_executer(file_name))
+
+    await asyncio.gather(*tasks)#使用asyncio.gather(*tasks)来等待所有file_executer任务完成后再执行upload_video任务。
+
     if allow_submit:
-        #如果请求中设置允许上传output.mp4
         cover_img = cover_image.file.read()
         cover_img_data = Image.open(io.BytesIO(cover_img)).convert("L").convert("RGB")
         cover_path_to_image = os.path.join(cover_path, f"cover.jpg")
         cover_img_data.save(cover_path_to_image)
-        #video数据从meta用户请求获取,至于
-        background_tasks.add_task(upload_video, bili_meta_data,cover_path_to_image)
+        background_tasks.add_task(upload_video, bili_meta_data, cover_path_to_image)
         return {"message": "提交video任务已加入队列"}
-        
+
     return {"message": "Tasks added to the queue"}
 
 
 
 
 
+
+
 ##########异步样例
 def someTask():
     time.sleep(20)