Update api.py

api.py

@@ -66,30 +66,30 @@ async def delete_files(directory: str):
 
 
 ########异步处理py文件执行接口
-# def file_executer(file_name:str)->"执行返回":
-#     try:
-#         print("开始执行py任务",file_name)
-#         # result = subprocess.check_output(["python", f"{file_name}.py"], stderr=subprocess.STDOUT).decode("utf-8")#执行完成后显示运行py的print
-#         ##########test 边执行py边显示print+++++++++++++++++++++++++++++++++++++
-#         # 开始执行Python 脚本
-#         output = []
-#         process = subprocess.Popen(["python", f"{file_name}.py"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-#         # 逐行读取脚本的输出并显示
-#         for line in iter(process.stdout.readline, b''):
-#             line_text = line.decode('utf-8').strip()
-#             print(line_text)
-#             output.append(line_text)
-#         process.wait()
-#         result = '\n'.join(output)
-#         ##########test 边执行py边显示print+++++++++++++++++++++++++++++++++++++
+def file_executer(file_name:str)->"执行返回":
+    try:
+        print("开始执行py任务",file_name)
+        # result = subprocess.check_output(["python", f"{file_name}.py"], stderr=subprocess.STDOUT).decode("utf-8")#执行完成后显示运行py的print
+        ##########test 边执行py边显示print+++++++++++++++++++++++++++++++++++++
+        # 开始执行Python 脚本
+        output = []
+        process = subprocess.Popen(["python", f"{file_name}.py"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+        # 逐行读取脚本的输出并显示
+        for line in iter(process.stdout.readline, b''):
+            line_text = line.decode('utf-8').strip()
+            print(line_text)
+            output.append(line_text)
+        process.wait()
+        result = '\n'.join(output)
+        ##########test 边执行py边显示print+++++++++++++++++++++++++++++++++++++
         
-#         print("执行完成py任务:",file_name,"结果如下")
-#         print(result)
-#         return PlainTextResponse(result)
-#     except subprocess.CalledProcessError as e:
-#         print("执行py任务失败",file_name,"原因如下")
-#         print(f"Error executing {file_name}.py: {e}")
-#         return PlainTextResponse(f"Error executing {file_name}.py: {e}")
+        print("执行完成py任务:",file_name,"结果如下")
+        print(result)
+        return PlainTextResponse(result)
+    except subprocess.CalledProcessError as e:
+        print("执行py任务失败",file_name,"原因如下")
+        print(f"Error executing {file_name}.py: {e}")
+        return PlainTextResponse(f"Error executing {file_name}.py: {e}")
     
 @app.get("/execute_py_file/{file_name}")
 async def execute_py_file(file_name: str,background_tasks: BackgroundTasks):
@@ -113,7 +113,7 @@ async def execute_py_file(file_name: str,background_tasks: BackgroundTasks):
 #     for file_name in file_list:
 #         tasks.append(file_executer(file_name))
 
-#     await asyncio.gather(*tasks)
+#     # await asyncio.gather(*tasks) #尝试不用这个能否运行,老是这里报错
 
 #     if allow_submit:
 #         cover_img = cover_image.file.read()
@@ -127,54 +127,28 @@ async def execute_py_file(file_name: str,background_tasks: BackgroundTasks):
 
 
 
-async def file_executer(file_name: str) -> "执行返回":
-    try:
-        print("开始执行py任务", file_name)
-        
-        output = []
-        process = await asyncio.create_subprocess_exec("python", f"{file_name}.py", stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.STDOUT)
-        
-        while True:
-            line = await process.stdout.readline()
-            if not line:
-                break
-            line_text = line.decode('utf-8').strip()
-            print(line_text)
-            output.append(line_text)
-        
-        await process.wait()
-        result = '\n'.join(output)
-        
-        print("执行完成py任务:", file_name, "结果如下")
-        print(result)
-        
-        return PlainTextResponse(result)
-    except subprocess.CalledProcessError as e:
-        print("执行py任务失败", file_name, "原因如下")
-        print(f"Error executing {file_name}.py: {e}")
-        return PlainTextResponse(f"Error executing {file_name}.py: {e}")
-
 @app.get("/execute_all_task")
 async def execute_all_task(background_tasks: BackgroundTasks, file_list: List[str] = Query(["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'
                            ):
-    print("获取到file_list是：", file_list)
+    
+    background_tasks.add_task(process_tasks_and_upload, file_list, bili_meta_data, cover_image, cover_path,background_tasks)
+    return {"message": "提交成功"}
+
+def process_tasks_and_upload(file_list, bili_meta_data, cover_image, cover_path,background_tasks):
     tasks = []
     for file_name in file_list:
-        tasks.append(await file_executer(file_name))
+        tasks.append(file_executer(file_name))
+
+    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, "cover.jpg")
+    cover_img_data.save(cover_path_to_image)
+    background_tasks.add_task(upload_video, bili_meta_data, cover_path_to_image)
 
-    await asyncio.gather(*tasks)
 
-    if allow_submit:
-        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)
-        background_tasks.add_task(upload_video, bili_meta_data, cover_path_to_image)
-        return {"message": "提交video任务已加入队列"}
 
-    return {"message": "Tasks added to the queue"}