From acabae5624e4c9b8e2be59f39ae5d05f547c7a08 Mon Sep 17 00:00:00 2001 From: xuchao Date: Tue, 19 Mar 2024 16:13:04 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E4=B8=8E=E9=A1=B5=E9=9D=A2=E4=B9=8B=E9=97=B4=E6=AE=B5=E8=90=BD?= =?UTF-8?q?=E7=9A=84=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- magic_pdf/para/para_split.py | 73 ++++++++++++++++++++++++++++------- magic_pdf/pdf_parse_by_ocr.py | 10 +++-- 2 files changed, 66 insertions(+), 17 deletions(-) diff --git a/magic_pdf/para/para_split.py b/magic_pdf/para/para_split.py index 990e3767..f4f1bbf6 100644 --- a/magic_pdf/para/para_split.py +++ b/magic_pdf/para/para_split.py @@ -172,12 +172,11 @@ def __split_para_in_layoutbox(lines_group, layout_bboxes, lang="en", char_avg_le else: para.append(line) else: # 其他，图片、表格、行间公式，各自占一段 - if len(para)>0: + if len(para)>0: # 先把之前的段落加入到结果中 paras.append(para) para = [] - else: - paras.append([line]) - para = [] + paras.append([line]) # 再把当前行加入到结果中。当前行为行间公式、图、表等。 + para = [] # para_text = ''.join([get_span_text(span) for line in para for span in line['spans']]) # logger.info(para_text) if len(para)>0: @@ -239,6 +238,40 @@ def __connect_para_inter_layoutbox(layout_paras, new_layout_bbox, lang="en"): return connected_layout_paras +def __connect_para_inter_page(pre_page_paras, next_page_paras, pre_page_layout_bbox, next_page_layout_bbox, lang): + """ + 连接起来相邻两个页面的段落——前一个页面最后一个段落和后一个页面的第一个段落。 + 是否可以连接的条件： + 1. 前一个页面的最后一个段落最后一行沾满整个行。并且没有结尾符号。 + 2. 后一个页面的第一个段落第一行没有空白开头。 + """ + pre_last_para = pre_page_paras[-1] + next_first_para = next_page_paras[0] + pre_last_line = pre_last_para[-1] + next_first_line = next_first_para[0] + pre_last_line_text = ''.join([__get_span_text(span) for span in pre_last_line['spans']]) + pre_last_line_type = pre_last_line['spans'][-1]['type'] + next_first_line_text = ''.join([__get_span_text(span) for span in next_first_line['spans']]) + next_first_line_type = next_first_line['spans'][0]['type'] + + if pre_last_line_type not in [TEXT, INLINE_EQUATION] or next_first_line_type not in [TEXT, INLINE_EQUATION]: # TODO，真的要做好，要考虑跨table, image, 行间的情况 + # 不是文本，不连接 + return False + + pre_x2_max = __find_layout_bbox_by_line(pre_last_line['bbox'], pre_page_layout_bbox)[2] + next_x0_min = __find_layout_bbox_by_line(next_first_line['bbox'], next_page_layout_bbox)[0] + + pre_last_line_text = pre_last_line_text.strip() + next_first_line_text = next_first_line_text.strip() + if pre_last_line['bbox'][2] == pre_x2_max and pre_last_line_text[-1] not in LINE_STOP_FLAG and next_first_line['bbox'][0]==next_x0_min: # 前面一行沾满了整个行，并且没有结尾符号.下一行没有空白开头。 + """连接段落条件成立，将前一个layout的段落和后一个layout的段落连接。""" + pre_page_paras[-1].extend(next_first_para) + next_page_paras.pop(0) # 删除后一个页面的第一个段落， 因为他已经被合并到前一个页面的最后一个段落了。 + return True + else: + return False + + def __do_split(blocks, layout_bboxes, new_layout_bbox, lang="en"): """ 根据line和layout情况进行分段 @@ -254,18 +287,32 @@ def __do_split(blocks, layout_bboxes, new_layout_bbox, lang="en"): lines_group = __group_line_by_layout(blocks, layout_bboxes, lang) # block内分段 layout_paras = __split_para_in_layoutbox(lines_group, layout_bboxes, lang) # layout内分段 connected_layout_paras = __connect_para_inter_layoutbox(layout_paras, new_layout_bbox, lang) # layout间链接段落 - # TODO 不同页面连接 - - - return connected_layout_paras -def para_split(blocks, layout_bboxes, lang="en"): +def para_split(pdf_info_dict, lang="en"): """ 根据line和layout情况进行分段 """ - new_layout_bbox = __common_pre_proc(blocks, layout_bboxes) - splited_blocks = __do_split(blocks, layout_bboxes, new_layout_bbox, lang) - - return splited_blocks + new_layout_of_pages = [] # 数组的数组，每个元素是一个页面的layoutS + for _, page in pdf_info_dict.items(): + blocks = page['preproc_blocks'] + layout_bboxes = page['layout_bboxes'] + new_layout_bbox = __common_pre_proc(blocks, layout_bboxes) + new_layout_of_pages.append(new_layout_bbox) + splited_blocks = __do_split(blocks, layout_bboxes, new_layout_bbox, lang) + page['para_blocks'] = splited_blocks + + """连接页面与页面之间的可能合并的段落""" + pdf_infos = list(pdf_info_dict.values()) + for i, page in enumerate(pdf_info_dict.values()): + if i==0: + continue + pre_page_paras = pdf_infos[i-1]['para_blocks'] + next_page_paras = pdf_infos[i]['para_blocks'] + pre_page_layout_bbox = new_layout_of_pages[i-1] + next_page_layout_bbox = new_layout_of_pages[i] + + is_conn= __connect_para_inter_page(pre_page_paras, next_page_paras, pre_page_layout_bbox, next_page_layout_bbox, lang) + if is_conn: + logger.info(f"连接了第{i-1}页和第{i}页的段落") \ No newline at end of file diff --git a/magic_pdf/pdf_parse_by_ocr.py b/magic_pdf/pdf_parse_by_ocr.py index d0cc1fd0..941c0d90 100644 --- a/magic_pdf/pdf_parse_by_ocr.py +++ b/magic_pdf/pdf_parse_by_ocr.py @@ -33,13 +33,12 @@ from magic_pdf.pre_proc.ocr_span_list_modify import remove_spans_by_bboxes, remo from magic_pdf.pre_proc.remove_bbox_overlap import remove_overlap_between_bbox -def construct_page_component(blocks, para_blocks, layout_bboxes, page_id, page_w, page_h, layout_tree, +def construct_page_component(blocks, layout_bboxes, page_id, page_w, page_h, layout_tree, images, tables, interline_equations, inline_equations, dropped_text_block, dropped_image_block, dropped_table_block, dropped_equation_block, need_remove_spans_bboxes_dict): return_dict = { 'preproc_blocks': blocks, - "para_blocks": para_blocks, # 分好段落的blocks 'layout_bboxes': layout_bboxes, 'page_idx': page_id, 'page_size': [page_w, page_h], @@ -238,7 +237,7 @@ def parse_pdf_by_ocr( blocks = merge_lines_to_block(lines) # 根据block合并段落 - para_blocks = para_split(blocks, layout_bboxes) + #para_blocks = para_split(blocks, layout_bboxes) # 获取QA需要外置的list images, tables, interline_equations, inline_equations = get_qa_need_list(blocks) @@ -267,12 +266,15 @@ def parse_pdf_by_ocr( # 构造pdf_info_dict - page_info = construct_page_component(blocks, para_blocks, layout_bboxes, page_id, page_w, page_h, layout_tree, + page_info = construct_page_component(blocks, layout_bboxes, page_id, page_w, page_h, layout_tree, images, tables, interline_equations, inline_equations, dropped_text_block, dropped_image_block, dropped_table_block, dropped_equation_block, need_remove_spans_bboxes_dict) pdf_info_dict[f"page_{page_id}"] = page_info + """分段""" + para_split(pdf_info_dict) + # 在测试时,保存调试信息 if debug_mode: params_file_save_path = join_path( From d2cb75e8ace8d009b59b36632aeef028b3dc65bc Mon Sep 17 00:00:00 2001 From: xuchao Date: Tue, 19 Mar 2024 19:55:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=88=A9=E7=94=A8=E4=B8=8B=E4=B8=80?= =?UTF-8?q?=E8=A1=8C=E5=BC=80=E5=A4=B4=E5=85=B7=E6=9C=89=E7=9A=84=E7=A9=BA?= =?UTF-8?q?=E6=A0=BC=E7=89=B9=E5=BE=81=E5=88=86=E5=89=B2=E6=AE=B5=E8=90=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- magic_pdf/para/para_split.py | 42 ++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/magic_pdf/para/para_split.py b/magic_pdf/para/para_split.py index f4f1bbf6..aa04e762 100644 --- a/magic_pdf/para/para_split.py +++ b/magic_pdf/para/para_split.py @@ -142,47 +142,51 @@ def __group_line_by_layout(blocks, layout_bboxes, lang="en"): return lines_group -def __split_para_in_layoutbox(lines_group, layout_bboxes, lang="en", char_avg_len=10): +def __split_para_in_layoutbox(lines_group, new_layout_bbox, lang="en", char_avg_len=10): """ - lines_group 进行行分段——layout内部进行分段。 + lines_group 进行行分段——layout内部进行分段。lines_group内每个元素是一个Layoutbox内的所有行。 1. 先计算每个group的左右边界。 2. 然后根据行末尾特征进行分段。 末尾特征：以句号等结束符结尾。并且距离右侧边界有一定距离。 + 且下一行开头不留空白。 """ paras = [] right_tail_distance = 1.5 * char_avg_len for lines in lines_group: - if len(lines)==0: + total_lines = len(lines) + if total_lines<=1: # 0行无需处理。1行无法分段。 continue - layout_right = max([line['bbox'][2] for line in lines]) + #layout_right = max([line['bbox'][2] for line in lines]) + layout_right = __find_layout_bbox_by_line(lines[0]['bbox'], new_layout_bbox)[2] para = [] # 元素是line - for line in lines: - line_text = ''.join([__get_span_text(span) for span in line['spans']]) - #logger.info(line_text) - last_span_type = line['spans'][-1]['type'] - if last_span_type in [TEXT, INLINE_EQUATION]: - last_char = line['spans'][-1]['content'][-1] - if last_char in LINE_STOP_FLAG or line['bbox'][2] < layout_right - right_tail_distance: + + for i, line in enumerate(lines): + # 如果i有下一行，那么就要根据下一行位置综合判断是否要分段。如果i之后没有行，那么只需要判断一下行结尾特征。 + + cur_line_type = line['spans'][-1]['type'] + #cur_line_last_char = line['spans'][-1]['content'][-1] + next_line = lines[i+1] if i= layout_right - right_tail_distance and next_line and next_line['bbox'][0] == layout_right: # 现在这行到了行尾沾满，下一行存在且顶格。 + para.append(line) else: para.append(line) + paras.append(para) + para = [] else: # 其他，图片、表格、行间公式，各自占一段 if len(para)>0: # 先把之前的段落加入到结果中 paras.append(para) para = [] paras.append([line]) # 再把当前行加入到结果中。当前行为行间公式、图、表等。 para = [] - # para_text = ''.join([get_span_text(span) for line in para for span in line['spans']]) - # logger.info(para_text) if len(para)>0: paras.append(para) - # para_text = ''.join([get_span_text(span) for line in para for span in line['spans']]) - # logger.info(para_text) para = [] return paras @@ -285,7 +289,7 @@ def __do_split(blocks, layout_bboxes, new_layout_bbox, lang="en"): 4. 图、表，目前独占一行，不考虑分段。 """ lines_group = __group_line_by_layout(blocks, layout_bboxes, lang) # block内分段 - layout_paras = __split_para_in_layoutbox(lines_group, layout_bboxes, lang) # layout内分段 + layout_paras = __split_para_in_layoutbox(lines_group, new_layout_bbox, lang) # layout内分段 connected_layout_paras = __connect_para_inter_layoutbox(layout_paras, new_layout_bbox, lang) # layout间链接段落 return connected_layout_paras @@ -315,4 +319,4 @@ def para_split(pdf_info_dict, lang="en"): is_conn= __connect_para_inter_page(pre_page_paras, next_page_paras, pre_page_layout_bbox, next_page_layout_bbox, lang) if is_conn: - logger.info(f"连接了第{i-1}页和第{i}页的段落") \ No newline at end of file + logger.info(f"连接了第{i-1}页和第{i}页的段落") From 2fb4b2efeaf390795aa84104f121709cfb23be85 Mon Sep 17 00:00:00 2001 From: liusilu Date: Wed, 20 Mar 2024 11:25:15 +0800 Subject: [PATCH 3/3] add pdf tools --- tests/overall_indicator.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/tests/overall_indicator.py b/tests/overall_indicator.py index ff81591f..23701c7d 100644 --- a/tests/overall_indicator.py +++ b/tests/overall_indicator.py @@ -22,9 +22,9 @@ def indicator_cal(json_standard,json_test): '''数据集总体指标''' a=json_test[['id','mid_json']] - b=json_standard[['id','mid_json']] + b=json_standard[['id','mid_json','pass_label']] outer_merge=pd.merge(a,b,on='id',how='outer') - outer_merge.columns=['id','standard_mid_json','test_mid_json'] + outer_merge.columns=['id','standard_mid_json','test_mid_json','pass_label'] standard_exist=outer_merge.standard_mid_json.apply(lambda x: not isnull(x)) test_exist=outer_merge.test_mid_json.apply(lambda x: not isnull(x)) @@ -36,7 +36,7 @@ def indicator_cal(json_standard,json_test): inner_merge=pd.merge(a,b,on='id',how='inner') - inner_merge.columns=['id','standard_mid_json','test_mid_json'] + inner_merge.columns=['id','standard_mid_json','test_mid_json','pass_label'] json_standard = inner_merge['standard_mid_json']#check一下是否对齐 json_test = inner_merge['test_mid_json'] @@ -156,7 +156,14 @@ def indicator_cal(json_standard,json_test): """ - '''计算pdf之间的总体编辑距离和bleu''' + ''' + 计算pdf之间的总体编辑距离和bleu + 这里只计算正例的pdf + ''' + + test_para_text=np.asarray(test_para_text, dtype = object)[inner_merge['pass_label']=='yes'] + standard_para_text=np.asarray(standard_para_text, dtype = object)[inner_merge['pass_label']=='yes'] + pdf_dis=[] pdf_bleu=[] for a,b in zip(test_para_text,standard_para_text):