Skip to content

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

feat(rapidocr): add font_path and lang_type parameter of cli

SWHL4c4bcab0bec3
diff --git a/python/rapidocr/main.py b/python/rapidocr/main.py
index 1b74afa..4eef34a 100644
--- a/python/rapidocr/main.py
+++ b/python/rapidocr/main.py
@@ -26,6 +26,7 @@ from .utils import (
resize_image_within_bounds,
)
from .utils.parse_parameters import ParseParams
+from .utils.typings import LangRec
root_dir = Path(__file__).resolve().parent
DEFAULT_CFG_PATH = root_dir / "config.yaml"
@@ -356,8 +357,15 @@ def parse_args(arg_list: Optional[List[str]] = None):
parser = argparse.ArgumentParser()
parser.add_argument("-img", "--img_path", type=str, default=None)
parser.add_argument("--text_score", type=float, default=0.5)
+ parser.add_argument(
+ "--lang_type",
+ type=str,
+ default="ch",
+ choices=list(v.value for v in LangRec),
+ )
parser.add_argument("-vis", "--vis_res", action="store_true", default=False)
parser.add_argument("--vis_save_dir", type=Path, default=".")
+ parser.add_argument("--font_path", type=str, default=None)
parser.add_argument(
"-word", "--return_word_box", action="store_true", default=False
)
@@ -404,7 +412,11 @@ def main(arg_list: Optional[List[str]] = None):
print(result)
if args.vis_res:
- vis = VisRes()
+ vis = VisRes(
+ text_score=args.text_score,
+ font_path=args.font_path,
+ lang_type=LangRec(args.lang_type),
+ )
cur_dir = args.vis_save_dir
if args.return_word_box:
diff --git a/python/tests/test_main.py b/python/tests/test_main.py
index 235e197..71cc06f 100644
--- a/python/tests/test_main.py
+++ b/python/tests/test_main.py
@@ -9,8 +9,7 @@ from typing import List
import cv2
import numpy as np
import pytest
-
-from rapidocr.utils.typings import OCRVersion
+from pytest import mark
root_dir = Path(__file__).resolve().parent.parent
sys.path.append(str(root_dir))
@@ -18,6 +17,7 @@ sys.path.append(str(root_dir))
from rapidocr import EngineType, LangRec, LoadImageError, ModelType, RapidOCR
from rapidocr.main import main
from rapidocr.utils.logger import Logger
+from rapidocr.utils.typings import OCRVersion
tests_dir = root_dir / "tests" / "test_files"
img_path = tests_dir / "ch_en_num.jpg"
@@ -47,7 +47,7 @@ def test_to_markdown(engine):
assert len(result_markdown.split("\n")) == 11
"engine_type",
[EngineType.ONNXRUNTIME, EngineType.PADDLE, EngineType.OPENVINO, EngineType.TORCH],
)
@@ -66,7 +66,7 @@ def test_ppocrv5_rec_mobile(engine_type):
assert result.txts[0] == "ιŸ©ε›½ε°ι¦†"
"engine_type",
[EngineType.ONNXRUNTIME, EngineType.PADDLE, EngineType.OPENVINO, EngineType.TORCH],
)
@@ -147,14 +147,14 @@ def test_server_rec():
assert result.txts[0] == "正品促销"
[email protected]("cmd,gt", [(f"--img_path {img_path}", "正品促销")])
[email protected]("cmd,gt", [(f"--img_path {img_path}", "正品促销")])
def test_cli(capsys, cmd, gt):
main(shlex.split(cmd))
output = capsys.readouterr().out.strip()
assert gt in output
[email protected]("cmd", [f"config --save_cfg_file {tests_dir}/config.yaml"])
[email protected]("cmd", [f"config --save_cfg_file {tests_dir}/config.yaml"])
def test_cli_config(capsys, cmd):
main(shlex.split(cmd))
output = capsys.readouterr().out.strip()
@@ -166,7 +166,7 @@ def test_cli_config(capsys, cmd):
cfg_yaml_path.unlink()
[email protected]("cmd", ["check"])
[email protected]("cmd", ["check"])
def test_cli_check(capsys, cmd):
main(shlex.split(cmd))
output = capsys.readouterr().out.strip()
@@ -174,7 +174,7 @@ def test_cli_check(capsys, cmd):
assert "Success! rapidocr is installed correctly!" in output
"cmd,img_name",
[
(
@@ -194,6 +194,16 @@ def test_cli_vis(cmd, img_name):
vis_path.unlink()
+def test_cli_lang_type():
+ img_path = tests_dir / "japan.jpg"
+ cmd = f"--img_path {img_path} --lang_type japan -vis --vis_save_dir {tests_dir}"
+ vis_path = tests_dir / f"{img_path.stem}_vis.png"
+
+ main(shlex.split(cmd))
+ assert vis_path.exists()
+ vis_path.unlink()
+
+
def test_korean_lang():
engine = RapidOCR(
params={"Rec.lang_type": LangRec.KOREAN, "Rec.model_type": ModelType.MOBILE}
@@ -214,7 +224,7 @@ def test_en_lang():
assert result.txts[0] == "3"
[email protected](sys.platform.startswith("darwin"), reason="does not run on macOS")
[email protected](sys.platform.startswith("darwin"), reason="does not run on macOS")
def test_engine_openvino():
engine = RapidOCR(
params={
@@ -271,7 +281,7 @@ def test_mode_one_img(engine):
assert result.txts[0] == "TEST"
"img_name,gt",
[
(
@@ -290,7 +300,7 @@ def test_transparent_img(engine, img_name: str, gt: str):
assert result.txts[0] == gt
"img_name,gt_len,gt_first_len",
[
(
@@ -410,7 +420,7 @@ def test_input_three_ndim_one_channel(engine):
assert len(result) >= 17
"img_name,words",
[
(
@@ -430,7 +440,7 @@ def test_cn_word_ocr(engine, img_name: str, words: List[str]):
assert txts == words
"img_name,words",
[("issue_170.png", "TEST"), ("return_word_debug.jpg", "3F1")],
)