From a170459a56f77dd126242ddd68d5ae13fee4736a Mon Sep 17 00:00:00 2001 From: zy123 <646228430@qq.com> Date: Mon, 23 Dec 2024 16:00:23 +0800 Subject: [PATCH] =?UTF-8?q?12.23=20=E6=97=A0=E6=95=88=E6=A0=87=E5=BA=9F?= =?UTF-8?q?=E6=A0=87=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flask_app/routes/小解析main.py | 2 +- flask_app/routes/货物标解析main.py | 2 +- .../{基础信息解析main.py => 基础信息解析货物标版.py} | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) rename flask_app/货物标/{基础信息解析main.py => 基础信息解析货物标版.py} (96%) diff --git a/flask_app/routes/小解析main.py b/flask_app/routes/小解析main.py index 18c53aa..1e5cc27 100644 --- a/flask_app/routes/小解析main.py +++ b/flask_app/routes/小解析main.py @@ -9,7 +9,7 @@ from flask_app.general.json_utils import clean_json_string from flask_app.general.多线程提问 import read_questions_from_file, multi_threading from flask_app.general.通义千问long import upload_file from flask_app.general.通用功能函数 import get_global_logger -from flask_app.货物标.基础信息解析main import aggregate_basic_info_goods +from flask_app.货物标.基础信息解析货物标版 import aggregate_basic_info_goods from flask_app.general.截取pdf_main import truncate_pdf_multiple from flask_app.货物标.截取pdf货物标版 import truncate_pdf_main_goods from flask_app.工程标.截取pdf工程标版 import truncate_pdf_main_engineering diff --git a/flask_app/routes/货物标解析main.py b/flask_app/routes/货物标解析main.py index b072e19..1470a45 100644 --- a/flask_app/routes/货物标解析main.py +++ b/flask_app/routes/货物标解析main.py @@ -8,7 +8,7 @@ from flask_app.general.format_change import docx2pdf, pdf2docx,doc2docx from flask_app.general.insert_del_pagemark import insert_mark, delete_mark from flask_app.general.json_utils import transform_json_values from flask_app.general.通用功能函数 import get_global_logger -from flask_app.货物标.基础信息解析main import combine_basic_info +from flask_app.货物标.基础信息解析货物标版 import combine_basic_info from flask_app.货物标.投标人须知正文提取指定内容货物标版 import extract_from_notice from flask_app.general.截取pdf_main import truncate_pdf_multiple from concurrent.futures import ThreadPoolExecutor diff --git a/flask_app/货物标/基础信息解析main.py b/flask_app/货物标/基础信息解析货物标版.py similarity index 96% rename from flask_app/货物标/基础信息解析main.py rename to flask_app/货物标/基础信息解析货物标版.py index da6eea5..8bc0d83 100644 --- a/flask_app/货物标/基础信息解析main.py +++ b/flask_app/货物标/基础信息解析货物标版.py @@ -134,8 +134,8 @@ def dynamic_key_handling(key_groups, detected_keys): def get_base_info(merged_baseinfo_path,clause_path): file_id = upload_file(merged_baseinfo_path) - # baseinfo_file_path='flask_app/static/提示词/基本信息货物标.txt' - baseinfo_file_path = r'D:\flask_project\flask_app\static\提示词\基本信息货物标.txt' + baseinfo_file_path='flask_app/static/提示词/基本信息货物标.txt' + # baseinfo_file_path = r'D:\flask_project\flask_app\static\提示词\基本信息货物标.txt' questions = read_questions_from_file(baseinfo_file_path) more_query = "请你根据招标文件信息，回答以下问题：是否组织踏勘现场？是否召开投标预备会（或投标答疑会）？是否退还投标文件？是否允许分包? 是否需要递交投标保证金（或磋商保证金）？是否需要提交履约保证金（或履约担保）？是否有招标代理服务费（或中标、成交服务费或采购代理服务费）？请按json格式给我提供信息，键名分别为'是否组织踏勘现场','是否召开投标预备会'（或'是否召开投标答疑会'）,'是否退还投标文件',是否允许分包','是否递交投标保证金'（或'是否递交磋商保证金'）,'是否提交履约保证金','是否有招标代理服务费',键值仅限于'是','否','未知',若存在矛盾信息，请回答'未知'。" questions.append(more_query) @@ -143,8 +143,8 @@ def get_base_info(merged_baseinfo_path,clause_path): baseinfo_list = [clean_json_string(res) for _, res in baseinfo_results] if baseinfo_results else [] chosen_numbers, merged = merge_json_to_list(baseinfo_list.pop()) baseinfo_list.append(merged) - # judge_file_path = 'flask_app/static/提示词/是否相关问题货物标.txt' - judge_file_path =r'D:\flask_project\flask_app\static\提示词\是否相关问题货物标.txt' + judge_file_path = 'flask_app/static/提示词/是否相关问题货物标.txt' + # judge_file_path =r'D:\flask_project\flask_app\static\提示词\是否相关问题货物标.txt' with concurrent.futures.ThreadPoolExecutor(max_workers=3) as executor: # 提交两个任务 future1 = executor.submit(process_judge_questions, judge_file_path, chosen_numbers, file_id,