diff --git a/docker-compose.yml b/docker-compose.yml index 2226f63..093906e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ x-env: &template - image: fcb_photo_review:1.14.17 + image: fcb_photo_review:1.15.0 restart: always x-review: diff --git a/photo_review/auto_photo_review.py b/photo_review/auto_photo_review.py index ed27e20..d7507e5 100644 --- a/photo_review/auto_photo_review.py +++ b/photo_review/auto_photo_review.py @@ -258,6 +258,18 @@ def information_extraction(ie, phrecs, identity): session = MysqlSession() session.add_all(zx_ie_results) session.commit() + + # 添加清晰度测试 + if not better_image: + # 替换后图片默认清晰 + clarity_result = image_util.parse_clarity(image) + unsharp_flag = 0 if (clarity_result[0] == 0 and clarity_result[1] >= 0.8) else 1 + update_clarity = (update(ZxPhrec).where(ZxPhrec.pk_phrec == phrec.pk_phrec).values( + cfjaddress2=json.dumps(clarity_result), + unsharp_flag=unsharp_flag, + )) + session.execute(update_clarity) + session.commit() session.close() result['ocr_text'] = ocr_text diff --git a/util/image_util.py b/util/image_util.py index b5d98e4..31a29da 100644 --- a/util/image_util.py +++ b/util/image_util.py @@ -260,7 +260,7 @@ def parse_clarity(image): :return: 判断结果及置信度 """ clarity_result = [1, 0] - model = PaddleClas(inference_model_dir=r"model/clas/clarity_assessment", use_gpu=False) + model = PaddleClas(inference_model_dir=r"model/clas/clarity_assessment", use_gpu=True) clas_result = model.predict(input_data=image) try: clas_result = next(clas_result)[0]