From b95ef734eff795b9caa60e379e850d7c93181a60 Mon Sep 17 00:00:00 2001 From: wess09 Date: Tue, 12 May 2026 21:55:27 +0800 Subject: [PATCH] fix --- module/daemon/ocr_benchmark.py | 12 ++++++++++-- module/ocr/al_ocr.py | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/module/daemon/ocr_benchmark.py b/module/daemon/ocr_benchmark.py index e8517fcf7..034b75116 100644 --- a/module/daemon/ocr_benchmark.py +++ b/module/daemon/ocr_benchmark.py @@ -7,19 +7,27 @@ import cv2 from rich.table import Table from rich.text import Text -from module.daemon.daemon_base import DaemonBase +from module.config.config import AzurLaneConfig from module.exception import RequestHumanTakeover from module.logger import logger from module.ocr.al_ocr import AlOcr -class OcrBenchmark(DaemonBase): +class OcrBenchmark: # Each entry: (model_name, dataset_prefix, subfolder_name) BENCHMARKS = [ ('en', 'sets_num', 'sets_num'), ('cn', 'sets_zhcn', 'sets_zhcn'), ] + def __init__(self, config, device=None, task=None): + if isinstance(config, AzurLaneConfig): + self.config = config + if task is not None: + self.config.init_task(task) + else: + self.config = AzurLaneConfig(config, task=task) + def _find_archive(self, prefix): for ext in ['.zip', '.tar', '.tar.xz', '.tar.gz']: path = f'module/daemon/{prefix}{ext}' diff --git a/module/ocr/al_ocr.py b/module/ocr/al_ocr.py index 5ec825e54..68b9935be 100644 --- a/module/ocr/al_ocr.py +++ b/module/ocr/al_ocr.py @@ -111,7 +111,7 @@ class RecOnlyOCR(RapidOCR): self.use_rec = cfg.Global.use_rec cfg.Rec.engine_cfg = cfg.EngineConfig[cfg.Rec.engine_type.value] cfg.Rec.font_path = cfg.Global.font_path - cfg.Rec.model_root_dir = cfg.Global.model_root_dir + cfg.Rec.model_root_dir = cfg.Global.get("model_root_dir", os.getcwd()) self.text_rec = TextRecognizer(cfg.Rec) self.load_img = LoadImage()