📄 Awesome OCR multiple programing languages toolkits based on ONNX Runtime, OpenVINO, MNN, PaddlePaddle, TensorRT and PyTorch.
fix redis error
SWHLe1fa80a9266b
diff --git a/ocrweb/main.py b/ocrweb/main.pyindex ac4f246..3e698d6 100644--- a/ocrweb/main.py+++ b/ocrweb/main.py@@ -10,7 +10,6 @@ from flask import Flask, render_template, requestfrom task import detect_recognize-app = Flask(__name__)# 设置上传文件大小@@ -34,4 +33,4 @@ def ocr():if __name__ == '__main__':- app.run(host='0.0.0.0', port=9003, debug=False, processes=True)+ app.run(host='0.0.0.0', port=9005, debug=False, processes=True)diff --git a/ocrweb/main_redis.py b/ocrweb/main_redis.pyindex 466d5f3..e7d9df4 100644--- a/ocrweb/main_redis.py+++ b/ocrweb/main_redis.py@@ -15,7 +15,7 @@ from rq import Queuefrom rq.job import Job-from task import conn, detect_recognize+from task_redis import conn, detect_recognizeroot_path = Path(__file__).resolve().parentdiff --git a/ocrweb/task.py b/ocrweb/task.pyindex d34c596..80ae624 100644--- a/ocrweb/task.py+++ b/ocrweb/task.py@@ -3,22 +3,17 @@# @File: worker.py# @Time: 2021/03/07 20:29:32# @Author: Max-import jsonimport base64-import cv2+import jsonimport time++import cv2import numpy as np-import redis-from rq import Worker, Queue, Connectionfrom resources.bpocr import TextSystem, draw_text_det_res-listen = ['default']-redis_url = "redis://localhost:6379" # redis server 默认地址-conn = redis.from_url(redis_url)-# 实例化模型-det_model_path = 'resources/models/ch_ppocr_server_v2.0_det_infer.onnx'+det_model_path = 'resources/models/ch_ppocr_server_v2.0_det_train.onnx'cls_model_path = 'resources/models/ch_ppocr_mobile_v2.0_cls_infer.onnx'rec_model_path = 'resources/models/ch_ppocr_mobile_v2.0_rec_infer.onnx'@@ -63,9 +58,3 @@ def detect_recognize(image_path):return json.dumps({'image': img,'elapse': elapse,'rec_res': rec_res_data})---if __name__ == '__main__':- with Connection(conn): # 建立与redis server的连接- worker = Worker(list(map(Queue, listen))) # 建立worker监听给定的队列- worker.work()\ No newline at end of filediff --git a/ocrweb/task_redis.py b/ocrweb/task_redis.pynew file mode 100644index 0000000..d34c596--- /dev/null+++ b/ocrweb/task_redis.py@@ -0,0 +1,71 @@+# !/usr/bin/env python+# -*- encoding: utf-8 -*-+# @File: worker.py+# @Time: 2021/03/07 20:29:32+# @Author: Max+import json+import base64+import cv2+import time+import numpy as np++import redis+from rq import Worker, Queue, Connection+from resources.bpocr import TextSystem, draw_text_det_res++listen = ['default']+redis_url = "redis://localhost:6379" # redis server 默认地址+conn = redis.from_url(redis_url)++# 实例化模型+det_model_path = 'resources/models/ch_ppocr_server_v2.0_det_infer.onnx'+cls_model_path = 'resources/models/ch_ppocr_mobile_v2.0_cls_infer.onnx'+rec_model_path = 'resources/models/ch_ppocr_mobile_v2.0_rec_infer.onnx'++text_sys = TextSystem(det_model_path,+ rec_model_path,+ use_angle_cls=True,+ cls_model_path=cls_model_path)+++def detect_recognize(image_path):+ if isinstance(image_path, str):+ image = cv2.imread(image_path)+ elif isinstance(image_path, np.ndarray):+ image = image_path++ t1 = time.time()+ dt_boxes, rec_res, img = text_sys(image)+ t2 = time.time()++ if dt_boxes is None or rec_res is None:+ temp_rec_res = []+ rec_res_data = json.dumps(temp_rec_res,+ indent=2,+ ensure_ascii=False)+ elapse = 0+ image = cv2.imencode('.jpg', img)[1]+ img = str(base64.b64encode(image))[2:-1]+ else:+ temp_rec_res = []+ for i, value in enumerate(rec_res):+ temp_rec_res.append([i, value[0], value[1]])+ temp_rec_res = np.array(temp_rec_res)+ rec_res_data = json.dumps(temp_rec_res.tolist(),+ indent=2,+ ensure_ascii=False)++ det_im = draw_text_det_res(dt_boxes, img)+ image = cv2.imencode('.jpg', det_im)[1]+ img = str(base64.b64encode(image))[2:-1]++ elapse = f'{t2-t1:.3f}'+ return json.dumps({'image': img,+ 'elapse': elapse,+ 'rec_res': rec_res_data})+++if __name__ == '__main__':+ with Connection(conn): # 建立与redis server的连接+ worker = Worker(list(map(Queue, listen))) # 建立worker监听给定的队列+ worker.work()\ No newline at end of file