Skip to content

πŸ“„ Awesome OCR multiple programing languages toolkits based on ONNX Runtime, OpenVINO, MNN, PaddlePaddle, TensorRT and PyTorch.

chore: update files

SWHL838ae0a322ca
diff --git a/python/rapidocr/inference_engine/onnxruntime.py b/python/rapidocr/inference_engine/onnxruntime.py
index 0b8a8f6..d979133 100644
--- a/python/rapidocr/inference_engine/onnxruntime.py
+++ b/python/rapidocr/inference_engine/onnxruntime.py
@@ -17,7 +17,7 @@ from onnxruntime import (
get_device,
)
-from ..utils.logger import get_logger
+from ..utils.logger import Logger
from .base import InferSession
@@ -29,7 +29,7 @@ class EP(Enum):
class OrtInferSession(InferSession):
def __init__(self, config: Dict[str, Any]):
- self.logger = get_logger("OrtInferSession")
+ self.logger = Logger(logger_name=__name__).get_log()
model_path = config.get("model_path", None)
if not self._verify_model(model_path):
diff --git a/python/rapidocr/inference_engine/paddlepaddle.py b/python/rapidocr/inference_engine/paddlepaddle.py
index 9c803d7..302f2f3 100644
--- a/python/rapidocr/inference_engine/paddlepaddle.py
+++ b/python/rapidocr/inference_engine/paddlepaddle.py
@@ -10,12 +10,12 @@ import numpy as np
import paddle
from paddle import inference
-from ..utils.logger import get_logger
+from ..utils.logger import Logger
class PaddleInferSession:
def __init__(self, config, mode: Optional[str] = None) -> None:
- self.logger = get_logger("PaddleInferSession")
+ self.logger = Logger(logger_name=__name__).get_log()
self.mode = mode
model_dir = Path(config.model_path)
diff --git a/python/rapidocr/inference_engine/torch.py b/python/rapidocr/inference_engine/torch.py
index e0c2f45..500de16 100644
--- a/python/rapidocr/inference_engine/torch.py
+++ b/python/rapidocr/inference_engine/torch.py
@@ -20,12 +20,12 @@ def read_yaml(yaml_path: Union[str, Path]) -> Dict[str, Dict]:
from rapidocr_torch.modeling.architectures.base_model import BaseModel
-from ..utils.logger import get_logger
+from ..utils.logger import Logger
class TorchInferSession:
def __init__(self, config, mode: Optional[str] = None) -> None:
- self.logger = get_logger("TorchInferSession")
+ self.logger = Logger(logger_name=__name__).get_log()
all_arch_config = read_yaml(DEFAULT_CFG_PATH)
diff --git a/python/rapidocr/main.py b/python/rapidocr/main.py
index d58e2b9..06bd012 100644
--- a/python/rapidocr/main.py
+++ b/python/rapidocr/main.py
@@ -15,10 +15,10 @@ from .ch_ppocr_rec import TextRecInput, TextRecognizer, TextRecOutput
from .inference_engine import get_engine_name
from .utils import (
LoadImage,
+ Logger,
RapidOCROutput,
VisRes,
add_round_letterbox,
- get_logger,
increase_min_side,
init_args,
parse_lang,
@@ -28,7 +28,6 @@ from .utils.parse_parameters import ParseParams
root_dir = Path(__file__).resolve().parent
DEFAULT_CFG_PATH = root_dir / "config.yaml"
-logger = get_logger("RapidOCR")
class RapidOCR:
@@ -319,6 +318,8 @@ class RapidOCR:
def main():
+ logger = Logger(logger_name=__name__).get_log()
+
args = init_args()
ocr_engine = RapidOCR(**vars(args))
diff --git a/python/rapidocr/utils/__init__.py b/python/rapidocr/utils/__init__.py
index fd66bf8..20fe1ed 100644
--- a/python/rapidocr/utils/__init__.py
+++ b/python/rapidocr/utils/__init__.py
@@ -2,7 +2,7 @@
# @Author: SWHL
# @Contact: [email protected]
from .load_image import LoadImage, LoadImageError
-from .logger import get_logger
+from .logger import Logger
from .parse_parameters import ParseParams, init_args, parse_lang
from .process_img import add_round_letterbox, increase_min_side, reduce_max_side
from .typings import RapidOCROutput
diff --git a/python/rapidocr/utils/logger.py b/python/rapidocr/utils/logger.py
index 66522c4..408685c 100644
--- a/python/rapidocr/utils/logger.py
+++ b/python/rapidocr/utils/logger.py
@@ -2,20 +2,24 @@
# @Author: SWHL
# @Contact: [email protected]
import logging
-from functools import lru_cache
-@lru_cache(maxsize=32)
-def get_logger(name: str) -> logging.Logger:
- logger = logging.getLogger(name)
- logger.setLevel(logging.DEBUG)
+class Logger:
+ def __init__(self, log_level=logging.DEBUG, logger_name=None):
+ self.logger = logging.getLogger(logger_name)
+ self.logger.setLevel(log_level)
- fmt = "%(asctime)s - %(name)s - %(levelname)s: %(message)s"
- format_str = logging.Formatter(fmt)
+ fmt = "[%(levelname)s] %(asctime)s %(filename)s:%(lineno)d: %(message)s"
+ formatter = logging.Formatter(fmt)
- sh = logging.StreamHandler()
- sh.setLevel(logging.DEBUG)
+ self.logger.handlers.clear()
- logger.addHandler(sh)
- sh.setFormatter(format_str)
- return logger
+ if not self.logger.handlers:
+ ch = logging.StreamHandler()
+ ch.setLevel(log_level)
+
+ ch.setFormatter(formatter)
+ self.logger.addHandler(ch)
+
+ def get_log(self):
+ return self.logger