resolve conflict
This commit is contained in:
parent
63cd8c1735
commit
f3f8411728
@ -34,8 +34,12 @@ def extract_matching_keys(data_dict, good_list):
|
|||||||
|
|
||||||
def get_technical_requirements_main(file_path,output_folder):
|
def get_technical_requirements_main(file_path,output_folder):
|
||||||
truncate_file=truncate_pdf_main(file_path,output_folder,5)[0]
|
truncate_file=truncate_pdf_main(file_path,output_folder,5)[0]
|
||||||
|
<<<<<<< Updated upstream
|
||||||
truncate_file_docx=pdf2docx(truncate_file)
|
truncate_file_docx=pdf2docx(truncate_file)
|
||||||
file_id=upload_file(truncate_file_docx)
|
file_id=upload_file(truncate_file_docx)
|
||||||
|
=======
|
||||||
|
file_id=upload_file(truncate_file)
|
||||||
|
>>>>>>> Stashed changes
|
||||||
final_res=get_technical_requirements(file_id)
|
final_res=get_technical_requirements(file_id)
|
||||||
# 安全地提取 "技术要求" 内部的字典内容
|
# 安全地提取 "技术要求" 内部的字典内容
|
||||||
if isinstance(final_res, dict) and '技术要求' in final_res and isinstance(final_res['技术要求'], dict):
|
if isinstance(final_res, dict) and '技术要求' in final_res and isinstance(final_res['技术要求'], dict):
|
||||||
@ -45,7 +49,13 @@ def get_technical_requirements_main(file_path,output_folder):
|
|||||||
else:
|
else:
|
||||||
return final_res
|
return final_res
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
|
<<<<<<< Updated upstream
|
||||||
file_path="C:\\Users\\Administrator\\Desktop\\fsdownload\\45f650ce-e519-457b-9ad6-5840e2ede539\\ztbfile.pdf"
|
file_path="C:\\Users\\Administrator\\Desktop\\fsdownload\\45f650ce-e519-457b-9ad6-5840e2ede539\\ztbfile.pdf"
|
||||||
output_folder = "C:\\Users\\Administrator\\Desktop\\fsdownload\\45f650ce-e519-457b-9ad6-5840e2ede539\\tmp"
|
output_folder = "C:\\Users\\Administrator\\Desktop\\fsdownload\\45f650ce-e519-457b-9ad6-5840e2ede539\\tmp"
|
||||||
res=get_technical_requirements_main(file_path,output_folder)
|
res=get_technical_requirements_main(file_path,output_folder)
|
||||||
print(res)
|
print(res)
|
||||||
|
=======
|
||||||
|
file_path="C:\\Users\\Administrator\\Desktop\\fsdownload\\217754b7-3efd-41b2-806b-0b5b1bc98904\\ztbfile.pdf"
|
||||||
|
output_folder = "C:\\Users\\Administrator\\Desktop\\货物标\\output1\\tmp"
|
||||||
|
# res=get_technical_requirements_main(truncate_file,output_folder)
|
||||||
|
>>>>>>> Stashed changes
|
||||||
|
Loading…
x
Reference in New Issue
Block a user