diff --git a/modelcenter/PP-OCRv2/APP/app.py b/modelcenter/PP-OCRv2/APP/app.py index cdcd36a37bc87812c2c8ba2b57ed2b1a92626a65..28dcc84301079b0280e9fbcd9eb9b84daf21750f 100644 --- a/modelcenter/PP-OCRv2/APP/app.py +++ b/modelcenter/PP-OCRv2/APP/app.py @@ -3,6 +3,7 @@ import base64 from io import BytesIO from PIL import Image +import paddleocr from paddleocr import PaddleOCR, draw_ocr ocr = PaddleOCR(ocr_version='PP-OCRv2', use_angle_cls=True, lang="ch") @@ -22,7 +23,8 @@ def model_inference(image): result = ocr.ocr(image, cls=True) # 显示结果 - result = result[0] + if paddleocr.__version__ >= "2.6.0.2": + result = result[0] boxes = [line[0] for line in result] txts = [line[1][0] for line in result] scores = [line[1][1] for line in result] diff --git a/modelcenter/PP-OCRv2/APP/requirements.txt b/modelcenter/PP-OCRv2/APP/requirements.txt index 9dfc4b72bf6912e3cddfb43ecb8c6a49e9699f5c..1710ebf9168cf1e683d25161fae74ab832d27af1 100644 --- a/modelcenter/PP-OCRv2/APP/requirements.txt +++ b/modelcenter/PP-OCRv2/APP/requirements.txt @@ -1,2 +1,3 @@ gradio paddlepaddle +paddleocr diff --git a/modelcenter/PP-OCRv3/APP/app.py b/modelcenter/PP-OCRv3/APP/app.py index d7e0e79142fd3e5f77fedbe922d4bf86afd1513a..04b7f8bee7e92824055453a33a62bb5bc6ff6fa4 100644 --- a/modelcenter/PP-OCRv3/APP/app.py +++ b/modelcenter/PP-OCRv3/APP/app.py @@ -3,6 +3,7 @@ import base64 from io import BytesIO from PIL import Image +import paddleocr from paddleocr import PaddleOCR, draw_ocr ocr = PaddleOCR(use_angle_cls=True, lang="ch") @@ -22,7 +23,8 @@ def model_inference(image): result = ocr.ocr(image, cls=True) # 显示结果 - result = result[0] + if paddleocr.__version__ >= "2.6.0.2": + result = result[0] boxes = [line[0] for line in result] txts = [line[1][0] for line in result] scores = [line[1][1] for line in result] diff --git a/modelcenter/PP-OCRv3/APP/requirements.txt b/modelcenter/PP-OCRv3/APP/requirements.txt index 9dfc4b72bf6912e3cddfb43ecb8c6a49e9699f5c..1710ebf9168cf1e683d25161fae74ab832d27af1 100644 --- a/modelcenter/PP-OCRv3/APP/requirements.txt +++ b/modelcenter/PP-OCRv3/APP/requirements.txt @@ -1,2 +1,3 @@ gradio paddlepaddle +paddleocr