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):
@@ -102,17 +102,18 @@ 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, file_list: list = ["1removeMask", "2magiDialogCut", "3mergeDialogToVideo"],
+# 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)
+#     print("获取到file_list是：", file_list)
 #     tasks = []
 #     for file_name in file_list:
 #         tasks.append(file_executer(file_name))
 
-#     await asyncio.gather(*tasks)#使用asyncio.gather(*tasks)来等待所有file_executer任务完成后再执行upload_video任务。
+#     await asyncio.gather(*tasks)
 
 #     if allow_submit:
 #         cover_img = cover_image.file.read()
@@ -124,6 +125,35 @@ async def execute_py_file(file_name: str,background_tasks: BackgroundTasks):
 
 #     return {"message": "Tasks added to the queue"}
 
+
+
+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',
@@ -132,7 +162,7 @@ async def execute_all_task(background_tasks: BackgroundTasks, file_list: List[st
     print("获取到file_list是：", file_list)
     tasks = []
     for file_name in file_list:
-        tasks.append(file_executer(file_name))
+        tasks.append(await file_executer(file_name))
 
     await asyncio.gather(*tasks)
 
@@ -152,7 +182,6 @@ async def execute_all_task(background_tasks: BackgroundTasks, file_list: List[st
 
 
 
-
 ##########异步样例
 def someTask():
     time.sleep(20)