dlxj commited on
Commit ·
1cd015d
1
Parent(s): 3dae17a
fix api
Browse files- main_v6.py +6 -3
- post.py +2 -1
main_v6.py
CHANGED
|
@@ -128,7 +128,7 @@ def base64_to_mat(base64_str):
|
|
| 128 |
return mat
|
| 129 |
|
| 130 |
|
| 131 |
-
def ppresult_tojson(img, result, reverse=
|
| 132 |
global is_debug
|
| 133 |
|
| 134 |
jn = OrderedDict()
|
|
@@ -234,7 +234,9 @@ ocr = PaddleOCR(
|
|
| 234 |
text_det_box_thresh=0.1, # 同上
|
| 235 |
text_rec_score_thresh=0.3, # 过滤低置信,古籍可放低
|
| 236 |
)
|
| 237 |
-
|
|
|
|
|
|
|
| 238 |
|
| 239 |
# 限制同时处理的请求数量为1
|
| 240 |
ocr_semaphore = threading.Semaphore(1)
|
|
@@ -259,6 +261,7 @@ def ppv6():
|
|
| 259 |
try:
|
| 260 |
|
| 261 |
base64_str = request.json['img']
|
|
|
|
| 262 |
|
| 263 |
img = base64_to_mat(base64_str)
|
| 264 |
|
|
@@ -267,7 +270,7 @@ def ppv6():
|
|
| 267 |
return_word_box=True
|
| 268 |
)
|
| 269 |
|
| 270 |
-
jn = ppresult_tojson(img.copy(), result)
|
| 271 |
|
| 272 |
return jsonify(jn)
|
| 273 |
|
|
|
|
| 128 |
return mat
|
| 129 |
|
| 130 |
|
| 131 |
+
def ppresult_tojson(img, result, reverse=False): # reverse=True 逆序结果行 古籍可能需要逆序
|
| 132 |
global is_debug
|
| 133 |
|
| 134 |
jn = OrderedDict()
|
|
|
|
| 234 |
text_det_box_thresh=0.1, # 同上
|
| 235 |
text_rec_score_thresh=0.3, # 过滤低置信,古籍可放低
|
| 236 |
)
|
| 237 |
+
"""
|
| 238 |
+
ch, chinese_cht, en, japan, af, az, bs, ca, cs, cy, da, de, es, et, eu, fi, fr, ga, gl, hr, hu, id, is, it, ku, la, lb, lt, lv, mi, ms, mt, nl, no, oc, pl, pt, qu, rm, ro, rs_latin, sk, sl, sq, sv, sw, tl, tr, uz, vi, french, german
|
| 239 |
+
"""
|
| 240 |
|
| 241 |
# 限制同时处理的请求数量为1
|
| 242 |
ocr_semaphore = threading.Semaphore(1)
|
|
|
|
| 261 |
try:
|
| 262 |
|
| 263 |
base64_str = request.json['img']
|
| 264 |
+
reverse = request.json['reverse'] or False
|
| 265 |
|
| 266 |
img = base64_to_mat(base64_str)
|
| 267 |
|
|
|
|
| 270 |
return_word_box=True
|
| 271 |
)
|
| 272 |
|
| 273 |
+
jn = ppresult_tojson(img.copy(), result, reverse)
|
| 274 |
|
| 275 |
return jsonify(jn)
|
| 276 |
|
post.py
CHANGED
|
@@ -24,7 +24,8 @@ def test_ppocr():
|
|
| 24 |
|
| 25 |
# Prepare payload
|
| 26 |
payload = {
|
| 27 |
-
"img": base64_str
|
|
|
|
| 28 |
}
|
| 29 |
headers = {
|
| 30 |
"Content-Type": "application/json"
|
|
|
|
| 24 |
|
| 25 |
# Prepare payload
|
| 26 |
payload = {
|
| 27 |
+
"img": base64_str,
|
| 28 |
+
"reverse": True # 逆序结果行 古籍可能需要逆序
|
| 29 |
}
|
| 30 |
headers = {
|
| 31 |
"Content-Type": "application/json"
|