gitadmin
/
tuoheng_alg_fangke_discard_20240715
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 2 Wiki Activity
Browse Source

Merge branch 'release' of gitadmin/tuoheng_alg_fangke into master

tags/V1.4.0
chenyukun 1 year ago
parent
5ebbada153 89656f35d1
commit
dc97985a05
6 changed files with 61 additions and 32 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +16
    -2
      .idea/deployment.xml
  2. +15
    -0
      .idea/git_toolbox_prj.xml
  3. +18
    -18
      .idea/workspace.xml
  4. +2
    -4
      service/Dispatcher.py
  5. +3
    -3
      test/baidusdk/baidusdk.py
  6. +7
    -5
      util/ModelUtils.py

+ 16
- 2
.idea/deployment.xml View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="PublishConfigData" autoUpload="Always" remoteFilesAllowedToDisappearOnAutoupload="false">
<component name="PublishConfigData" autoUpload="Always" serverName="thsw2@192.168.10.66:22" remoteFilesAllowedToDisappearOnAutoupload="false">
<serverData>
<paths name="10.11">
<serverdata>
@@ -56,7 +56,7 @@
<paths name="thsw2@192.168.10.66:22">
<serverdata>
<mappings>
<mapping local="$PROJECT_DIR$" web="/" />
<mapping deploy="/home/thsw2/tuo_heng/prod/fk" local="$PROJECT_DIR$" web="/" />
</mappings>
</serverdata>
</paths>
@@ -67,6 +67,20 @@
</mappings>
</serverdata>
</paths>
<paths name="thsw@192.168.10.11:22">
<serverdata>
<mappings>
<mapping local="$PROJECT_DIR$" web="/" />
</mappings>
</serverdata>
</paths>
<paths name="thsw@212.129.223.66:6000">
<serverdata>
<mappings>
<mapping local="$PROJECT_DIR$" web="/" />
</mappings>
</serverdata>
</paths>
</serverData>
<option name="myAutoUpload" value="ALWAYS" />
</component>

+ 15
- 0
.idea/git_toolbox_prj.xml View File

@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="GitToolBoxProjectSettings">
<option name="commitMessageIssueKeyValidationOverride">
<BoolValueOverride>
<option name="enabled" value="true" />
</BoolValueOverride>
</option>
<option name="commitMessageValidationEnabledOverride">
<BoolValueOverride>
<option name="enabled" value="true" />
</BoolValueOverride>
</option>
</component>
</project>

+ 18
- 18
.idea/workspace.xml View File

@@ -5,17 +5,10 @@
</component>
<component name="ChangeListManager">
<list default="true" id="4f7dccd9-8f92-4a6e-90cc-33890d102263" name="Changes" comment="Changes">
<change afterPath="$PROJECT_DIR$/test/baidusdk/aaliyunsdk.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/deployment.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/deployment.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/shelf/_2022_11_2_13_46___Changes_1.xml" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/shelf/在进行签出之前于_2022_11_2_13_46_取消提交了变更_[Changes]1/shelved.patch" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/enums/ExceptionEnum.py" beforeDir="false" afterPath="$PROJECT_DIR$/enums/ExceptionEnum.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/service/Dispatcher.py" beforeDir="false" afterPath="$PROJECT_DIR$/service/Dispatcher.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/test/baidusdk/baidusdk.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/baidusdk/baidusdk.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/util/ModelUtils.py" beforeDir="false" afterPath="$PROJECT_DIR$/util/ModelUtils.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/util/OcrBaiduSdk.py" beforeDir="false" afterPath="$PROJECT_DIR$/util/OcrBaiduSdk.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/util/TimeUtils.py" beforeDir="false" afterPath="$PROJECT_DIR$/util/TimeUtils.py" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -72,7 +65,7 @@
</favorite-branches>
<option name="RECENT_BRANCH_BY_REPOSITORY">
<map>
<entry key="$PROJECT_DIR$" value="develop" />
<entry key="$PROJECT_DIR$" value="master" />
</map>
</option>
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -86,6 +79,7 @@
</file-type-list>
</component>
<component name="GitToolBoxStore">
<option name="projectConfigVersion" value="5" />
<option name="recentBranches">
<RecentBranches>
<option name="branchesForRepo">
@@ -95,11 +89,7 @@
<list>
<RecentBranch>
<option name="branchName" value="develop" />
<option name="lastUsedInstant" value="1667368008" />
</RecentBranch>
<RecentBranch>
<option name="branchName" value="release" />
<option name="lastUsedInstant" value="1664245931" />
<option name="lastUsedInstant" value="1668478704" />
</RecentBranch>
<RecentBranch>
<option name="branchName" value="master" />
@@ -220,13 +210,13 @@
<envs>
<env name="PYTHONUNBUFFERED" value="1" />
</envs>
<option name="SDK_HOME" value="sftp://thsw2@192.168.10.66:22/home/thsw2/anaconda3/envs/chenyukun/bin/python3.8" />
<option name="WORKING_DIRECTORY" value="/home/DATA/chenyukun/fk" />
<option name="SDK_HOME" value="sftp://dell@192.168.10.12:22/home/dell/anaconda3/envs/prod/bin/python3.8" />
<option name="WORKING_DIRECTORY" value="/home/chenyukun/fk" />
<option name="IS_MODULE_SDK" value="false" />
<option name="ADD_CONTENT_ROOTS" value="true" />
<option name="ADD_SOURCE_ROOTS" value="true" />
<EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
<option name="SCRIPT_NAME" value="/home/DATA/chenyukun/fk/test/baidusdk/baidusdk.py" />
<option name="SCRIPT_NAME" value="/home/chenyukun/fk/test/baidusdk/baidusdk.py" />
<option name="PARAMETERS" value="" />
<option name="SHOW_COMMAND_LINE" value="false" />
<option name="EMULATE_TERMINAL" value="false" />
@@ -369,7 +359,13 @@
<workItem from="1667524924941" duration="63471000" />
<workItem from="1667887464732" duration="17098000" />
<workItem from="1667985411968" duration="3557000" />
<workItem from="1668068825370" duration="5338000" />
<workItem from="1668068825370" duration="5480000" />
<workItem from="1668146121972" duration="2387000" />
<workItem from="1668423781277" duration="652000" />
<workItem from="1668478677307" duration="214000" />
<workItem from="1668495580103" duration="4299000" />
<workItem from="1668557058851" duration="7348000" />
<workItem from="1668729963723" duration="1367000" />
</task>
<servers />
</component>
@@ -388,6 +384,10 @@
</option>
<option name="oldMeFiltersMigrated" value="true" />
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="Changes" />
<option name="LAST_COMMIT_MESSAGE" value="Changes" />
</component>
<component name="XSLT-Support.FileAssociations.UIState">
<expand />
<select />
@@ -417,7 +417,7 @@
<SUITE FILE_PATH="coverage/tuoheng_fk$image.coverage" NAME="image 覆盖结果" MODIFIED="1667547816366" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test/协程" />
<SUITE FILE_PATH="coverage/tuoheng_alg$TimeUtils.coverage" NAME="TimeUtils Coverage Results" MODIFIED="1661222768678" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/util" />
<SUITE FILE_PATH="coverage/tuoheng_fk_python$aaliyunsdk.coverage" NAME="ailiyunsdk2 覆盖结果" MODIFIED="1667959131471" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="/home/chenyukun/fk/test/baidusdk" />
<SUITE FILE_PATH="coverage/tuoheng_fk_python$baidusdk.coverage" NAME="baidusdk 覆盖结果" MODIFIED="1668074335386" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="/home/DATA/chenyukun/fk" />
<SUITE FILE_PATH="coverage/tuoheng_fk_python$baidusdk.coverage" NAME="baidusdk 覆盖结果" MODIFIED="1668732696180" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="/home/chenyukun/fk" />
<SUITE FILE_PATH="coverage/tuoheng_fk$Dispatcher.coverage" NAME="Dispatcher 覆盖结果" MODIFIED="1667810228478" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/service" />
<SUITE FILE_PATH="coverage/tuoheng_alg$3.coverage" NAME="视频添加文字水印3 Coverage Results" MODIFIED="1661906152928" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="true" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/test" />
</component>

+ 2
- 4
service/Dispatcher.py View File

@@ -160,8 +160,7 @@ def ai_segmentation_recognition(param):
'hsRecognition': hsRecognition,
'hs_score': hs_score}
else:
raise ServiceException(ExceptionType.AI_RECOGNITION_FAILED.value[0],
ExceptionType.AI_RECOGNITION_FAILED.value[1])
return ''
except ServiceException as s:
logger.exception("AI划图，百度云识别失败:{}, msgId: {}", s.msg, param[5])
return None
@@ -208,7 +207,6 @@ class DispatcherService():
for m in v:
message = m.value
try:
gpu_ids = self.checkGPU(message.get("msgId"))
customerKafkaConsumer.commit_offset(m)
logger.info("当前拉取到的消息, topic:{}, offset:{}, partition: {}, body: {}, msgId:{}",
m.topic, m.offset, m.partition, message, message.get("msgId"))
@@ -262,7 +260,7 @@ class DispatcherService():
GPUtil.showUtilization()
gpu_ids = GPUtils.get_gpu_ids(self.content)
if gpu_ids is None or len(gpu_ids) == 0:
logger.warning("暂无可用GPU资源，5秒后重试, 可用gpu数: {}, msgId: {}", len(gpu_ids), msgId)
logger.warning("暂无可用GPU资源，5秒后重试, 可用gpu数: {}, msgId: {}", gpu_ids, msgId)
time.sleep(5)
continue
else:

+ 3
- 3
test/baidusdk/baidusdk.py View File

@@ -8,7 +8,7 @@ client = AipOcr(str(28173504), 'kqrFE7VuygIaFer7z6cRxzoi',
'yp7xBokyl4TItyGhay7skAN1cMwfvEXf')
# client = AipOcr(str(28324292), 'l58x9bqCsPOpyexGqrM86jhy',
# '1qECRaULUZBfOPejVIWUGLahUHGMQoni')
im0 = cv2.imread('/home/thsw2/tuo_heng/prod/healthCode/imgs/pff9504t6fd_1667544805350.jfif')
im0 = cv2.imread('/home/chenyukun/healthCode/imgs/jkm/il4g3jm4y27_1668730977634.jfif_phoneNumberImage.jpg')

or_result, or_image = cv2.imencode(".jpg", im0)
# with open("/home/chenyukun/fk/fk_application.yml", 'r', encoding='utf-8') as f:
@@ -21,8 +21,8 @@ or_result, or_image = cv2.imencode(".jpg", im0)

def aa(a):
# res_image = orc.universal_text_recognition(im0,'aaaaaaaa')
res_image = client.licensePlate(or_image.tobytes())
# res_image = client.basicGeneral(or_image.tobytes())
# res_image = client.licensePlate(or_image.tobytes())
res_image = client.basicGeneral(or_image.tobytes())
# res_image = orc.license_plate_recognition(im0,'aa')
print(res_image)
# print(res_image1)

+ 7
- 5
util/ModelUtils.py View File

@@ -1,22 +1,23 @@
# -*- coding: utf-8 -*-
import os
import sys

import torch
from loguru import logger

sys.path.extend(['..', '../healthCode'])
from utilsK.general import pre_process, post_process, get_return_data


class Model():
def __init__(self):
self.par = {'code': {'weights': '../healthCode/weights/health_yolov5s_v2.jit', 'img_type': 'code', 'nc': 9},
'plate': {'weights': '../healthCode/weights/plate_yolov5s.jit', 'img_type': 'plate', 'nc': 1},
self.par = {'code': {'weights': '../healthCode/weights/health_yolov5s_v3.jit', 'img_type': 'code', 'nc': 10},
'plate': {'weights': '../healthCode/weights/plate_yolov5s_v3.jit', 'img_type': 'plate', 'nc': 1},
'conf_thres': 0.4,
'iou_thres': 0.45,
'device': 'cuda:0',
'plate_dilate': (0.5, 0.3)
}

###加载模型
self.device = torch.device(self.par['device'])
self.model = torch.jit.load(self.par['code']['weights'])
@@ -32,13 +33,14 @@ class FKModel(Model):
def process(self, im0, device, img_type):
try:
# 预处理
img, padInfos = pre_process(im0, device)
img, padInfos = pre_process(im0, self.device)
# 模型推理 code, plate
if img_type == 'code':
pred = self.model(img)
if img_type == 'plate':
pred = self.model_plate(img)
boxes = post_process(pred, padInfos, device, conf_thres=self.par['conf_thres'], iou_thres=self.par['iou_thres'],
boxes = post_process(pred, padInfos, self.device, conf_thres=self.par['conf_thres'],
iou_thres=self.par['iou_thres'],
nc=self.par[img_type]['nc']) # 后处理
dataBack = get_return_data(im0, boxes, modelType=img_type, plate_dilate=self.par['plate_dilate'])
return dataBack

Write Preview
Loading…
Cancel
Save