Просмотр исходного кода

fix : custom onnx model missing.

hellofinch 1 год назад
Родитель
Сommit
3e47b8d32e
3 измененных файлов с 12 добавлено и 9 удалено
  1. 2 3
      pdf2zh/backend.py
  2. 2 0
      pdf2zh/gui.py
  3. 8 6
      pdf2zh/pdf2zh.py

+ 2 - 3
pdf2zh/backend.py

@@ -6,9 +6,7 @@ from pdf2zh import translate_stream
 import tqdm
 import json
 import io
-from pdf2zh.doclayout import OnnxModel
-
-model = OnnxModel.load_available()
+from pdf2zh.pdf2zh import model
 
 flask_app = Flask("pdf2zh")
 flask_app.config.from_mapping(
@@ -18,6 +16,7 @@ flask_app.config.from_mapping(
     )
 )
 
+
 def celery_init_app(app: Flask) -> Celery:
     class FlaskTask(Task):
         def __call__(self, *args, **kwargs):

+ 2 - 0
pdf2zh/gui.py

@@ -13,6 +13,7 @@ from gradio_pdf import PDF
 
 from pdf2zh import __version__
 from pdf2zh.high_level import translate
+from pdf2zh.pdf2zh import model
 from pdf2zh.translator import (
     AnythingLLMTranslator,
     AzureOpenAITranslator,
@@ -265,6 +266,7 @@ def translate_file(
         "cancellation_event": cancellation_event_map[session_id],
         "envs": _envs,
         "prompt": prompt,
+        "model": model,
     }
     try:
         translate(**param)

+ 8 - 6
pdf2zh/pdf2zh.py

@@ -199,6 +199,9 @@ def find_all_files_in_directory(directory_path):
     return file_paths
 
 
+model = None
+
+
 def main(args: Optional[List[str]] = None) -> int:
     logging.basicConfig()
 
@@ -206,6 +209,11 @@ def main(args: Optional[List[str]] = None) -> int:
 
     if parsed_args.debug:
         log.setLevel(logging.DEBUG)
+    global model
+    if parsed_args.onnx:
+        model = OnnxModel(parsed_args.onnx)
+    else:
+        model = OnnxModel.load_available()
 
     if parsed_args.interactive:
         from pdf2zh.gui import setup_gui
@@ -238,12 +246,6 @@ def main(args: Optional[List[str]] = None) -> int:
         except Exception:
             raise ValueError("prompt error.")
 
-    model = None
-    if parsed_args.onnx:
-        model = OnnxModel(parsed_args.onnx)
-    else:
-        model = OnnxModel.load_available()
-
     if parsed_args.dir:
         untranlate_file = find_all_files_in_directory(parsed_args.files[0])
         parsed_args.files = untranlate_file