Update api.py

api.py

@@ -104,6 +104,35 @@ async def execute_py_file(file_name: str,background_tasks: BackgroundTasks):
 
 
 #保证既要提交队列后返回给用户,又要先完成前面的video生成步骤再执行后面的submit函数,还有兼顾allow_submit的值
+##成功示例,可惜不能立刻返回
+# @app.get("/execute_all_task")
+# async def execute_all_task(background_tasks: BackgroundTasks, bili_meta_data,file_list: List[str] = Query(["0filterImage","1removeMask", "2magiDialogCut", "3mergeDialogToVideo"]),
+#                              mp4_out_file: str = 'mp4_out/output.mp4',
+#                            allow_submit: bool = False, cover_url: str = ''
+#                            ):
+#     #cover_url因为本地上传有协程问题,所以采用cover_url然后转换为Picture类型即可->bilibili_api.utls.picture.Picture.from_url(str)->str
+#     print("获取到的用户bili_meta_data是:", bili_meta_data)
+#     #这里需要先转换bili_meta_data从str变成dict才能继续
+#     bili_meta_data = json.loads(bili_meta_data)
+#     print("获取到的file_list是",file_list)
+#     print("获取到的allow_submit是",allow_submit)
+    
+#     background_tasks.add_task(process_tasks_and_upload, file_list, bili_meta_data, cover_url,allow_submit)
+#     return {"message": "提交成功"}
+
+# async def process_tasks_and_upload(file_list, bili_meta_data,  cover_url,allow_submit):
+    
+#     tasks = []
+#     for file_name in file_list:
+#         tasks.append(file_executer(file_name))
+
+#     if allow_submit:
+#         #因为采用cover_url上传,所以不需要读取内容然后保存本地->这样也会引起协程问题
+#         print("开始对cover_url是",cover_url,"的提交进程进行加入后台任务")
+#         tasks.append(await upload_video(bili_meta_data, cover_url))
+
+
+##尝试能立刻返回的
 @app.get("/execute_all_task")
 async def execute_all_task(background_tasks: BackgroundTasks, bili_meta_data,file_list: List[str] = Query(["0filterImage","1removeMask", "2magiDialogCut", "3mergeDialogToVideo"]),
                              mp4_out_file: str = 'mp4_out/output.mp4',
@@ -116,11 +145,10 @@ async def execute_all_task(background_tasks: BackgroundTasks, bili_meta_data,fil
     print("获取到的file_list是",file_list)
     print("获取到的allow_submit是",allow_submit)
     
-    background_tasks.add_task(process_tasks_and_upload, file_list, bili_meta_data, cover_url,allow_submit)
+    background_tasks.add_task(process_tasks_and_upload, file_list, bili_meta_data, cover_url,allow_submit,background_tasks)
     return {"message": "提交成功"}
 
-async def process_tasks_and_upload(file_list, bili_meta_data,  cover_url,allow_submit):
-    
+def process_tasks_and_upload(file_list, bili_meta_data,  cover_url,allow_submit,background_tasks):
     tasks = []
     for file_name in file_list:
         tasks.append(file_executer(file_name))
@@ -128,9 +156,8 @@ async def process_tasks_and_upload(file_list, bili_meta_data,  cover_url,allow_s
     if allow_submit:
         #因为采用cover_url上传,所以不需要读取内容然后保存本地->这样也会引起协程问题
         print("开始对cover_url是",cover_url,"的提交进程进行加入后台任务")
-        tasks.append(await upload_video(bili_meta_data, cover_url))
-
-
+        background_tasks.add_task(upload_video,bili_meta_data, cover_url)
+##尝试能立刻返回的