diff --git a/flask_app/routes/upload.py b/flask_app/routes/upload.py index 7f155bd..0a0124c 100644 --- a/flask_app/routes/upload.py +++ b/flask_app/routes/upload.py @@ -1,6 +1,7 @@ # flask_app/routes/upload.py import multiprocessing from flask import Blueprint, request, jsonify,g +import urllib.parse import json import os import time @@ -58,7 +59,7 @@ def zbparse(): #大解析 logger.info("Received JSON data: " + str(received_data)) file_url = g.file_url zb_type = g.zb_type - file_name = os.path.basename(file_url.split('?')[0]) + file_name = urllib.parse.unquote(os.path.basename(file_url.split('?')[0])) logger.info(f"Starting parsing file: {file_name}") try: logger.info("starting parsing url:" + file_url) @@ -93,7 +94,7 @@ def process_and_stream(file_url, zb_type): filename = "ztbfile" downloaded_filename = os.path.join(output_folder, filename) start_time = time.time() - file_name = os.path.basename(file_url.split('?')[0]) + file_name = urllib.parse.unquote(os.path.basename(file_url.split('?')[0])) try: downloaded_filepath, file_type = download_file(file_url, downloaded_filename, True) if not downloaded_filepath or file_type == 4: @@ -138,6 +139,8 @@ def process_and_stream(file_url, zb_type): status='error', data='' ) + logger.info("========== if 'error' in parsed_data ==========") + logger.info(error_response) yield sse_format(error_response) return # 终止进一步处理 @@ -155,6 +158,8 @@ def process_and_stream(file_url, zb_type): status='success', data=data ) + logger.info("========== 返回给后端->前端展示 ==========") + logger.info(response) yield sse_format(response) #返回给后端->前端展示 base_end_time = time.time() @@ -173,11 +178,23 @@ def process_and_stream(file_url, zb_type): proof_materials, logger) #生成规范的响应 # 使用通用响应函数 + logger.info("========== 使用通用响应函数->tech_deviation_response ==========") + logger.info(tech_deviation_response) yield sse_format(tech_deviation_response) + logger.info("========== 使用通用响应函数->tech_deviation_star_response ==========") + logger.info(tech_deviation_star_response) yield sse_format(tech_deviation_star_response) + logger.info("========== 使用通用响应函数->zigefuhe_deviation_response ==========") + logger.info(zigefuhe_deviation_response) yield sse_format(zigefuhe_deviation_response) + logger.info("========== 使用通用响应函数->shangwu_deviation_response ==========") + logger.info(shangwu_deviation_response) yield sse_format(shangwu_deviation_response) + logger.info("========== 使用通用响应函数->shangwu_star_deviation_response ==========") + logger.info(shangwu_star_deviation_response) yield sse_format(shangwu_star_deviation_response) + logger.info("========== 使用通用响应函数->proof_materials_response ==========") + logger.info(proof_materials_response) yield sse_format(proof_materials_response) try: @@ -201,6 +218,8 @@ def process_and_stream(file_url, zb_type): status='success', data=json.dumps(extracted_info, ensure_ascii=False) ) + logger.info("========== extracted_info_response ==========") + logger.info(extracted_info_response) yield sse_format(extracted_info_response) complete_response = create_response( @@ -208,6 +227,8 @@ def process_and_stream(file_url, zb_type): status='success', data=json.dumps(final_result, ensure_ascii=False) ) + logger.info("========== complete_response ==========") + logger.info(complete_response) yield sse_format(complete_response) final_response = create_response( #目前后端的逻辑是读取到'data'中有个'END',就终止连接 @@ -215,6 +236,8 @@ def process_and_stream(file_url, zb_type): status='success', data='END' ) + logger.info("========== final_response ==========") + logger.info(final_response) yield sse_format(final_response) except Exception as e: @@ -225,6 +248,8 @@ def process_and_stream(file_url, zb_type): status='error', data='' ) + logger.info("========== error_response ==========") + logger.info(error_response) yield sse_format(error_response) finally: