浏览代码

io --> rw

kernel.h@qq.com 1 年之前
父节点
当前提交
ef03c906a1

+ 3 - 3
magic_pdf/cli/magicpdf.py

@@ -33,8 +33,8 @@ from magic_pdf.libs.path_utils import (
     remove_non_official_s3_args,
 )
 from magic_pdf.libs.config_reader import get_local_dir
-from magic_pdf.io.S3ReaderWriter import S3ReaderWriter, MODE_BIN, MODE_TXT
-from magic_pdf.io.DiskReaderWriter import DiskReaderWriter
+from magic_pdf.rw.S3ReaderWriter import S3ReaderWriter, MODE_BIN, MODE_TXT
+from magic_pdf.rw.DiskReaderWriter import DiskReaderWriter
 from magic_pdf.libs.json_compressor import JsonCompressor
 
 
@@ -119,7 +119,7 @@ def json_command(json, method):
 
     _do_parse(
         pdf_data,
-        jso,
+        jso['doc_layout_result'],
         method,
         local_image_rw,
         local_md_rw,

+ 1 - 1
magic_pdf/libs/pdf_image_tools.py

@@ -1,6 +1,6 @@
 from loguru import logger
 
-from magic_pdf.io.AbsReaderWriter import AbsReaderWriter
+from magic_pdf.rw.AbsReaderWriter import AbsReaderWriter
 from magic_pdf.libs.commons import fitz
 from magic_pdf.libs.commons import join_path
 from magic_pdf.libs.hash_utils import compute_sha256

+ 2 - 2
magic_pdf/para/para_split.py

@@ -341,8 +341,8 @@ def __connect_list_inter_layout(layout_paras, new_layout_bbox, layout_list_info,
     """
     if len(layout_paras)==0 or len(layout_list_info)==0: # 0的时候最后的return 会出错
         return layout_paras, [False, False]
-    if page_num==343:
-        pass
+    # if page_num==343:
+    #     pass
         
     for i in range(1, len(layout_paras)):
         pre_layout_list_info = layout_list_info[i-1]

+ 2 - 2
magic_pdf/pipe/UNIPipe.py

@@ -6,8 +6,8 @@ from magic_pdf.dict2md.mkcontent import mk_universal_format, mk_mm_markdown
 from magic_pdf.dict2md.ocr_mkcontent import make_standard_format_with_para, ocr_mk_mm_markdown_with_para
 from magic_pdf.filter.pdf_classify_by_type import classify
 from magic_pdf.filter.pdf_meta_scan import pdf_meta_scan
-from magic_pdf.io.AbsReaderWriter import AbsReaderWriter
-from magic_pdf.io.DiskReaderWriter import DiskReaderWriter
+from magic_pdf.rw.AbsReaderWriter import AbsReaderWriter
+from magic_pdf.rw.DiskReaderWriter import DiskReaderWriter
 from magic_pdf.libs.commons import join_path
 from magic_pdf.libs.detect_language_from_model import get_language_from_model
 from magic_pdf.libs.drop_reason import DropReason

+ 0 - 0
magic_pdf/io/AbsReaderWriter.py → magic_pdf/rw/AbsReaderWriter.py


+ 1 - 1
magic_pdf/io/DiskReaderWriter.py → magic_pdf/rw/DiskReaderWriter.py

@@ -1,5 +1,5 @@
 import os
-from magic_pdf.io.AbsReaderWriter import AbsReaderWriter
+from magic_pdf.rw.AbsReaderWriter import AbsReaderWriter
 from loguru import logger
 
 

+ 1 - 1
magic_pdf/io/S3ReaderWriter.py → magic_pdf/rw/S3ReaderWriter.py

@@ -1,4 +1,4 @@
-from magic_pdf.io.AbsReaderWriter import AbsReaderWriter
+from magic_pdf.rw.AbsReaderWriter import AbsReaderWriter
 from magic_pdf.libs.commons import parse_aws_param, parse_bucket_key
 import boto3
 from loguru import logger

+ 0 - 0
magic_pdf/io/__init__.py → magic_pdf/rw/__init__.py


+ 1 - 1
magic_pdf/user_api.py

@@ -14,7 +14,7 @@
 """
 from loguru import logger
 
-from magic_pdf.io import AbsReaderWriter
+from magic_pdf.rw import AbsReaderWriter
 from magic_pdf.pdf_parse_by_ocr import parse_pdf_by_ocr
 from magic_pdf.pdf_parse_by_txt import parse_pdf_by_txt