π Awesome OCR multiple programing languages toolkits based on ONNX Runtime, OpenVINO, MNN, PaddlePaddle, TensorRT and PyTorch.
chore: update files
SWHLb008fbaa48d6
diff --git a/python/demo.py b/python/demo.pyindex 446756d..e115f06 100644--- a/python/demo.py+++ b/python/demo.py@@ -5,6 +5,9 @@ import cv2from rapidocr import RapidOCR, VisRes+# from rapidocr_onnxruntime import RapidOCR, VisRes++# from rapidocr_paddle import RapidOCR, VisRes# from rapidocr_openvino import RapidOCR, VisResdiff --git a/python/rapidocr/cal_rec_boxes/main.py b/python/rapidocr/cal_rec_boxes/main.pyindex 8d6b9e3..6d86bd9 100644--- a/python/rapidocr/cal_rec_boxes/main.py+++ b/python/rapidocr/cal_rec_boxes/main.py@@ -28,7 +28,7 @@ class CalRecBoxes:for idx, (img, box) in enumerate(zip(imgs, dt_boxes)):direction = self.get_box_direction(box)- rec_txt, rec_conf = rec_res.line_results[idx]+ rec_txt = rec_res.line_txts[idx]rec_word_info = rec_res.word_results[idx]h, w = img.shape[:2]diff --git a/python/rapidocr/ch_ppocr_cls/__init__.py b/python/rapidocr/ch_ppocr_cls/__init__.pyindex 7fc854c..7110450 100644--- a/python/rapidocr/ch_ppocr_cls/__init__.py+++ b/python/rapidocr/ch_ppocr_cls/__init__.py@@ -1,4 +1,5 @@# -*- encoding: utf-8 -*-# @Author: SWHL# @Contact: [email protected]-from .text_cls import TextClassifier+from .main import TextClassifier+from .utils import TextClsOutputdiff --git a/python/rapidocr/ch_ppocr_cls/text_cls.py b/python/rapidocr/ch_ppocr_cls/main.pysimilarity index 90%rename from python/rapidocr/ch_ppocr_cls/text_cls.pyrename to python/rapidocr/ch_ppocr_cls/main.pyindex 183f6ed..e848be2 100644--- a/python/rapidocr/ch_ppocr_cls/text_cls.py+++ b/python/rapidocr/ch_ppocr_cls/main.py@@ -15,13 +15,14 @@ import argparseimport copyimport mathimport time-from typing import Any, Dict, List, Tuple, Union+from typing import Any, Dict, List, Unionimport cv2import numpy as np+from rapidocr.utils import OrtInferSession, read_yaml-from .utils import ClsPostProcess+from .utils import ClsPostProcess, TextClsOutputclass TextClassifier:@@ -33,9 +34,7 @@ class TextClassifier:self.infer = OrtInferSession(config)- def __call__(- self, img_list: Union[np.ndarray, List[np.ndarray]]- ) -> Tuple[List[np.ndarray], List[List[Union[str, float]]], float]:+ def __call__(self, img_list: Union[np.ndarray, List[np.ndarray]]) -> TextClsOutput:if isinstance(img_list, np.ndarray):img_list = [img_list]@@ -48,7 +47,7 @@ class TextClassifier:indices = np.argsort(np.array(width_list))img_num = len(img_list)- cls_res = [["", 0.0]] * img_num+ cls_res = [("", 0.0)] * img_numbatch_num = self.cls_batch_numelapse = 0for beg_img_no in range(0, img_num, batch_num):@@ -67,12 +66,12 @@ class TextClassifier:elapse += time.time() - starttimefor rno, (label, score) in enumerate(cls_result):- cls_res[indices[beg_img_no + rno]] = [label, score]+ cls_res[indices[beg_img_no + rno]] = (label, score)if "180" in label and score > self.cls_thresh:img_list[indices[beg_img_no + rno]] = cv2.rotate(img_list[indices[beg_img_no + rno]], 1)- return img_list, cls_res, elapse+ return TextClsOutput(img_list=img_list, cls_res=cls_res, elapse=elapse)def resize_norm_img(self, img: np.ndarray) -> np.ndarray:img_c, img_h, img_w = self.cls_image_shapediff --git a/python/rapidocr/ch_ppocr_cls/utils.py b/python/rapidocr/ch_ppocr_cls/utils.pyindex 6549fcb..c4e96b2 100644--- a/python/rapidocr/ch_ppocr_cls/utils.py+++ b/python/rapidocr/ch_ppocr_cls/utils.py@@ -11,11 +11,19 @@# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.# See the License for the specific language governing permissions and# limitations under the License.-from typing import List, Tuple+from dataclasses import dataclass+from typing import List, Optional, Tupleimport numpy as np+@dataclass+class TextClsOutput:+ img_list: Optional[List[np.ndarray]] = None+ cls_res: Optional[List[Tuple[str, float]]] = None+ elapse: Optional[float] = None++class ClsPostProcess:def __init__(self, label_list: List[str]):self.label_list = label_listdiff --git a/python/rapidocr/ch_ppocr_rec/__init__.py b/python/rapidocr/ch_ppocr_rec/__init__.pyindex 1faca81..867d812 100644--- a/python/rapidocr/ch_ppocr_rec/__init__.py+++ b/python/rapidocr/ch_ppocr_rec/__init__.py@@ -2,4 +2,4 @@# @Author: SWHL# @Contact: [email protected]from .main import TextRecognizer-from .utils import TextRecArguments, TextRecOutput+from .utils import TextRecInput, TextRecOutputdiff --git a/python/rapidocr/ch_ppocr_rec/main.py b/python/rapidocr/ch_ppocr_rec/main.pyindex 5926bc5..a67955c 100644--- a/python/rapidocr/ch_ppocr_rec/main.py+++ b/python/rapidocr/ch_ppocr_rec/main.py@@ -20,7 +20,7 @@ import numpy as npfrom rapidocr.utils import OrtInferSession-from .utils import CTCLabelDecode, TextRecArguments, TextRecOutput+from .utils import CTCLabelDecode, TextRecInput, TextRecOutputclass TextRecognizer:@@ -39,7 +39,7 @@ class TextRecognizer:self.rec_batch_num = config["rec_batch_num"]self.rec_image_shape = config["rec_img_shape"]- def __call__(self, args: TextRecArguments) -> TextRecOutput:+ def __call__(self, args: TextRecInput) -> TextRecOutput:img_list = [args.img] if isinstance(args.img, np.ndarray) else args.imgreturn_word_box = args.return_word_box@@ -90,7 +90,8 @@ class TextRecognizer:elapse += time.perf_counter() - start_timeall_line_results, all_word_results = list(zip(*rec_res))- return TextRecOutput(all_line_results, all_word_results, elapse)+ line_txts, line_scores = list(zip(*all_line_results))+ return TextRecOutput(line_txts, line_scores, all_word_results, elapse)def resize_norm_img(self, img: np.ndarray, max_wh_ratio: float) -> np.ndarray:img_channel, img_height, img_width = self.rec_image_shapediff --git a/python/rapidocr/ch_ppocr_rec/utils.py b/python/rapidocr/ch_ppocr_rec/utils.pyindex 6130f59..4070593 100644--- a/python/rapidocr/ch_ppocr_rec/utils.py+++ b/python/rapidocr/ch_ppocr_rec/utils.py@@ -22,14 +22,15 @@ class TextRecConfig:@dataclass-class TextRecArguments:+class TextRecInput:img: Union[np.ndarray, List[np.ndarray], None] = Nonereturn_word_box: bool = False@dataclassclass TextRecOutput:- line_results: Tuple[Tuple[str, float]] = (("", 1.0),)+ line_txts: Optional[Tuple[str]] = None+ line_scores: Tuple[float] = (1.0,)word_results: Tuple[Tuple[str, float, Optional[List[List[int]]]]] = (("", 1.0, None),)diff --git a/python/rapidocr/main.py b/python/rapidocr/main.pyindex efe9c74..6d6f30d 100644--- a/python/rapidocr/main.py+++ b/python/rapidocr/main.py@@ -9,9 +9,9 @@ import cv2import numpy as npfrom .cal_rec_boxes import CalRecBoxes-from .ch_ppocr_cls import TextClassifier-from .ch_ppocr_det import TextDetector-from .ch_ppocr_rec import TextRecArguments, TextRecognizer, TextRecOutput+from .ch_ppocr_cls import TextClassifier, TextClsOutput+from .ch_ppocr_det import TextDetector, TextDetOutput+from .ch_ppocr_rec import TextRecInput, TextRecognizer, TextRecOutputfrom .utils import (LoadImage,RapidOCROutput,@@ -71,7 +71,7 @@ class RapidOCR:use_cls: Optional[bool] = None,use_rec: Optional[bool] = None,**kwargs,- ) -> Tuple[Optional[List[List[Union[Any, str]]]], Optional[List[float]]]:+ ) -> RapidOCROutput:use_det = self.use_det if use_det is None else use_detuse_cls = self.use_cls if use_cls is None else use_clsuse_rec = self.use_rec if use_rec is None else use_rec@@ -94,8 +94,7 @@ class RapidOCR:img, ratio_h, ratio_w = self.preprocess(img)op_record["preprocess"] = {"ratio_h": ratio_h, "ratio_w": ratio_w}- dt_boxes, cls_res, rec_res = None, None, TextRecOutput()- det_elapse, cls_elapse = 0.0, 0.0+ det_res, cls_res, rec_res = TextDetOutput(), TextClsOutput(), TextRecOutput()if use_det:img, op_record = self.maybe_add_letterbox(img, op_record)@@ -103,21 +102,22 @@ class RapidOCR:if det_res.boxes is None:return RapidOCROutput()- img = self.get_crop_img_list(img, dt_boxes)+ img = self.get_crop_img_list(img, det_res)if use_cls:- img, cls_res, cls_elapse = self.text_cls(img)+ cls_res = self.text_cls(img)+ img = cls_res.img_listif use_rec:- rec_input = TextRecArguments(img=img, return_word_box=return_word_box)+ rec_input = TextRecInput(img=img, return_word_box=return_word_box)rec_res = self.text_rec(rec_input)if (return_word_box- and dt_boxes is not None+ and det_res.boxes is not Noneand all(v for v in rec_res.word_results)):- rec_res = self.cal_rec_boxes(img, dt_boxes, rec_res)+ rec_res = self.cal_rec_boxes(img, det_res.boxes, rec_res)origin_words = []for one_word in rec_res.word_results:one_word_points = one_word[2]@@ -131,10 +131,12 @@ class RapidOCR:origin_words.append((one_word[0], one_word[1], origin_words_points))rec_res.word_results = tuple(origin_words)- if dt_boxes is not None:- dt_boxes = self._get_origin_points(dt_boxes, op_record, raw_h, raw_w)+ if det_res.boxes is not None:+ det_res.boxes = self._get_origin_points(+ det_res.boxes, op_record, raw_h, raw_w+ )- ocr_res = self.get_final_res(dt_boxes, cls_res, rec_res, det_elapse, cls_elapse)+ ocr_res = self.get_final_res(det_res, cls_res, rec_res)return ocr_resdef preprocess(self, img: np.ndarray) -> Tuple[np.ndarray, float, float]:@@ -174,18 +176,8 @@ class RapidOCR:padding_h = int(abs(new_h - h) / 2)return padding_h- def auto_text_det(- self, img: np.ndarray- ) -> Tuple[Optional[List[np.ndarray]], float]:- dt_boxes, det_elapse = self.text_det(img)- if dt_boxes is None or len(dt_boxes) < 1:- return None, 0.0-- dt_boxes = self.sorted_boxes(dt_boxes)- return dt_boxes, det_elapse-def get_crop_img_list(- self, img: np.ndarray, dt_boxes: List[np.ndarray]+ self, img: np.ndarray, det_res: TextDetOutput) -> List[np.ndarray]:def get_rotate_crop_image(img: np.ndarray, points: np.ndarray) -> np.ndarray:img_crop_width = int(@@ -222,38 +214,12 @@ class RapidOCR:return dst_imgimg_crop_list = []- for box in dt_boxes:+ for box in det_res.boxes:tmp_box = copy.deepcopy(box)img_crop = get_rotate_crop_image(img, tmp_box)img_crop_list.append(img_crop)return img_crop_list- @staticmethod- def sorted_boxes(dt_boxes: np.ndarray) -> List[np.ndarray]:- """- Sort text boxes in order from top to bottom, left to right- args:- dt_boxes(array):detected text boxes with shape [4, 2]- return:- sorted boxes(array) with shape [4, 2]- """- num_boxes = dt_boxes.shape[0]- sorted_boxes = sorted(dt_boxes, key=lambda x: (x[0][1], x[0][0]))- _boxes = list(sorted_boxes)-- for i in range(num_boxes - 1):- for j in range(i, -1, -1):- if (- abs(_boxes[j + 1][0][1] - _boxes[j][0][1]) < 10- and _boxes[j + 1][0][0] < _boxes[j][0][0]- ):- tmp = _boxes[j]- _boxes[j] = _boxes[j + 1]- _boxes[j + 1] = tmp- else:- break- return _boxes-def _get_origin_points(self,dt_boxes: List[np.ndarray],@@ -284,28 +250,33 @@ class RapidOCR:return dt_boxes_arraydef get_final_res(- self,- dt_boxes: Optional[List[np.ndarray]],- cls_res: Optional[List[List[Union[str, float]]]],- rec_res: TextRecOutput,- det_elapse: float,- cls_elapse: float,- ) -> Tuple[Optional[List[List[Union[Any, str]]]], Optional[List[float]]]:- if dt_boxes is None and rec_res is None and cls_res is not None:- return cls_res, [cls_elapse]+ self, det_res: TextDetOutput, cls_res: TextClsOutput, rec_res: TextRecOutput+ ) -> Union[TextDetOutput, TextClsOutput, TextRecOutput, RapidOCROutput]:+ dt_boxes = det_res.boxes+ txt_res = rec_res.line_txts- if dt_boxes is None and rec_res is None:- return None, None+ if dt_boxes is None and txt_res is None and cls_res.cls_res is not None:+ return cls_res- if dt_boxes is None and rec_res is not None:- return [[v[0], v[1]] for v in rec_res.line_results], [rec_res.elapse]+ if dt_boxes is None and txt_res is None:+ return RapidOCROutput()- if dt_boxes is not None and rec_res is None:- return [box.tolist() for box in dt_boxes], [det_elapse]+ if dt_boxes is None and txt_res is not None:+ return rec_res- dt_boxes, rec_res = self.filter_result(dt_boxes, rec_res)- if not dt_boxes or not rec_res or len(dt_boxes) <= 0:- return None, None+ if dt_boxes is not None and rec_res is None:+ return det_res++ ocr_res = RapidOCROutput(+ boxes=det_res.boxes,+ txts=rec_res.line_txts,+ scores=rec_res.line_scores,+ word_results=rec_res.word_results,+ elapse_list=[det_res.elapse, cls_res.elapse, rec_res.elapse],+ )+ ocr_res = self.filter_by_text_score(ocr_res)+ if len(ocr_res.boxes) <= 0:+ return RapidOCROutput()ocr_res = [[box.tolist(), *res] for box, res in zip(dt_boxes, rec_res.line_results)@@ -316,23 +287,18 @@ class RapidOCR:]return ocr_res- def filter_result(- self,- dt_boxes: Optional[List[np.ndarray]],- rec_res: Optional[List[Tuple[str, float]]],- ) -> Tuple[Optional[List[np.ndarray]], TextRecOutput]:- if dt_boxes is None or rec_res is None:- return None, None-- filter_boxes, filter_rec_res = [], []- for box, rec_reuslt in zip(dt_boxes, rec_res.line_results):- text, score = rec_reuslt[0], rec_reuslt[1]+ def filter_by_text_score(self, ocr_res: RapidOCROutput) -> RapidOCROutput:+ filter_boxes, filter_txts, filter_scores = [], [], []+ for box, txt, score in zip(ocr_res.boxes, ocr_res.txts, ocr_res.scores):if float(score) >= self.text_score:filter_boxes.append(box)- filter_rec_res.append(rec_reuslt)+ filter_txts.append(txt)+ filter_scores.append(score)- rec_res.line_results = filter_rec_res- return filter_boxes, rec_res+ ocr_res.boxes = filter_boxes+ ocr_res.txts = filter_txts+ ocr_res.scores = filter_scores+ return ocr_resdef main():diff --git a/python/rapidocr/utils/typings.py b/python/rapidocr/utils/typings.pyindex b3e2907..c19363f 100644--- a/python/rapidocr/utils/typings.py+++ b/python/rapidocr/utils/typings.py@@ -1,9 +1,20 @@# -*- encoding: utf-8 -*-# @Author: SWHL# @Contact: [email protected]-from dataclasses import dataclass+from dataclasses import dataclass, field+from typing import List, Optional, Tuple@dataclassclass RapidOCROutput:- pass+ boxes: Optional[List[List[float]]] = None+ txts: Optional[List[str]] = None+ scores: Optional[List[float]] = None+ word_results: Tuple[Tuple[str, float, Optional[List[List[int]]]]] = (+ ("", 1.0, None),+ )+ elapse_list: List[float] = field(default_factory=list)+ elapse: float = field(init=False)++ def __post_init__(self):+ self.elapse = sum(self.elapse_list)