Update doc_analyze_by_custom_model.py

magic_pdf/model/doc_analyze_by_custom_model.py

@@ -95,7 +95,7 @@ def custom_model_init(ocr: bool = False, show_log: bool = False):
         else:
             logger.error("Not allow model_name!")
             exit(1)
-        model_init_cost = time.time() - model_init_start
+        model_init_cost = round(time.time() - model_init_start,2)
         logger.info(f"model init cost: {model_init_cost}")
     else:
         logger.error("use_inside_model is False, not allow to use inside model")
@@ -104,11 +104,12 @@ def custom_model_init(ocr: bool = False, show_log: bool = False):
     return custom_model
 
 
-def doc_analyze(pdf_bytes: bytes, ocr: bool = False, show_log: bool = False,
+def doc_analyze(model,pdf_bytes: bytes, ocr: bool = False, show_log: bool = False,
                 start_page_id=0, end_page_id=None):
 
-    model_manager = ModelSingleton()
-    custom_model = model_manager.get_model(ocr, show_log)
+    # model_manager = ModelSingleton()
+    # custom_model = model_manager.get_model(ocr, show_log)
+    custom_model = model
 
     images = load_images_from_pdf(pdf_bytes)
 
@@ -133,7 +134,7 @@ def doc_analyze(pdf_bytes: bytes, ocr: bool = False, show_log: bool = False,
         page_info = {"page_no": index, "height": page_height, "width": page_width}
         page_dict = {"layout_dets": result, "page_info": page_info}
         model_json.append(page_dict)
-    doc_analyze_cost = time.time() - doc_analyze_start
+    doc_analyze_cost = round(time.time() - doc_analyze_start,2)
     logger.info(f"文件分析提取截图共耗时: {doc_analyze_cost}")
 #    logger.info(f'model_json:\n{model_json}')
     return model_json