From c59bfabc9cd3b9b39476787b70222bdda31fedf5 Mon Sep 17 00:00:00 2001 From: zy123 <646228430@qq.com> Date: Mon, 17 Feb 2025 17:12:36 +0800 Subject: [PATCH] =?UTF-8?q?2.17=20=E6=96=B0=E5=A2=9E=E5=AD=90=E8=BF=9B?= =?UTF-8?q?=E7=A8=8B=E5=A4=84=E7=90=86=E5=88=86=E6=AE=B5=E8=A7=A3=E6=9E=90?= =?UTF-8?q?=EF=BC=8C=E5=8F=AF=E4=BB=A5=E8=A7=A3=E5=86=B3=E5=86=85=E5=AD=98?= =?UTF-8?q?=E6=B3=84=E6=BC=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flask_app/routes/工程标解析main.py | 6 +++--- flask_app/routes/货物标解析main.py | 7 +++---- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/flask_app/routes/工程标解析main.py b/flask_app/routes/工程标解析main.py index 7122cd7..5174b71 100644 --- a/flask_app/routes/工程标解析main.py +++ b/flask_app/routes/工程标解析main.py @@ -3,7 +3,7 @@ import json import multiprocessing import os import time -from concurrent.futures import ThreadPoolExecutor +from concurrent.futures import ThreadPoolExecutor, ProcessPoolExecutor, as_completed from docx import Document @@ -239,7 +239,7 @@ def engineering_bid_main(output_folder, file_path, file_type, unique_id): } yield json.dumps(error_response, ensure_ascii=False) return # 停止进一步处理 - with concurrent.futures.ThreadPoolExecutor() as executor: + with ProcessPoolExecutor() as executor: # 立即启动不依赖 knowledge_name 和 index 的任务 futures = { 'base_info': executor.submit(fetch_project_basic_info,processed_data['invalid_deleted_docx'] ,processed_data['merged_baseinfo_path'],processed_data['merged_baseinfo_path_more'], @@ -256,7 +256,7 @@ def engineering_bid_main(output_folder, file_path, file_type, unique_id): } # 提前处理这些不依赖的任务，按完成顺序返回 - for future in concurrent.futures.as_completed(futures.values()): + for future in as_completed(futures.values()): key = next(k for k, v in futures.items() if v == future) try: result = future.result() diff --git a/flask_app/routes/货物标解析main.py b/flask_app/routes/货物标解析main.py index 6d0ada2..03d79f8 100644 --- a/flask_app/routes/货物标解析main.py +++ b/flask_app/routes/货物标解析main.py @@ -10,8 +10,7 @@ from flask_app.general.通用功能函数 import get_global_logger from flask_app.货物标.基础信息解析货物标版 import combine_basic_info from flask_app.general.投标人须知正文提取指定内容 import extract_from_notice from flask_app.general.截取pdf_main import truncate_pdf_multiple -from concurrent.futures import ThreadPoolExecutor -import concurrent.futures +from concurrent.futures import as_completed, ProcessPoolExecutor from flask_app.general.投标人须知正文条款提取成json文件 import convert_clause_to_json from flask_app.general.无效标和废标公共代码 import combine_find_invalid from flask_app.货物标.资格审查main import combine_qualification_review @@ -242,7 +241,7 @@ def goods_bid_main(output_folder, file_path, file_type, unique_id): } yield json.dumps(error_response, ensure_ascii=False) return # 停止进一步处理 - with concurrent.futures.ThreadPoolExecutor() as executor: + with ProcessPoolExecutor() as executor: # 立即启动不依赖 knowledge_name 和 index 的任务 futures = { 'evaluation_standards': executor.submit(fetch_evaluation_standards,processed_data['invalid_deleted_docx'], #技术评分 商务评分 @@ -266,7 +265,7 @@ def goods_bid_main(output_folder, file_path, file_type, unique_id): } # 提前处理这些不依赖的任务，按完成顺序返回 - for future in concurrent.futures.as_completed(futures.values()): #as_completed：哪个先运行结束就先返回 + for future in as_completed(futures.values()): #as_completed：哪个先运行结束就先返回 key = next(k for k, v in futures.items() if v == future) try: result = future.result()