Update api.py

api.py

@@ -101,11 +101,23 @@ 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","4biliSubmit"],
-                           bili_meta_data:dict = None,cover_path:str = 'cover/cover.jpg',mp4_out_file:str='mp4_out/output.mp4'
+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:"是否将结果允许上传"=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(img)).convert("L").convert("RGB")
+        path_to_image = os.path.join(cover_path, f"cover.jpg")
+        cover_img_data.save(path_to_image)
+        #video数据从meta用户请求获取,至于
+        background_tasks.add_task(upload_video, bili_meta_data)
+        return {"message": "提交video任务已加入队列"}
+        
     return {"message": "Tasks added to the queue"}
 
 
@@ -145,12 +157,3 @@ async def upload_video():
 
     await uploader.start()
 
-@app.post("/upload_video")
-async def run_upload_video(meta: dict = Body(...),cover_image: UploadFile = File(...), save_path: str = "/cover"):
-    cover_img = cover_image.file.read()
-    cover_img_data = Image.open(io.BytesIO(img)).convert("L").convert("RGB")
-    path_to_image = os.path.join(save_path, f"cover.jpg")
-    cover_img_data.save(path_to_image)
-    #video数据从meta用户请求获取,至于
-    await upload_video(meta)
-    return {"message": "Video upload completed"}