1、人脸模块:新增小视科技(MiniVision)活体检测模型

2、人脸模块:新增阿里通义工作室活体检测模型
3、人脸模块:新增2个表情识别模型
4、人脸模块:新增InsightFace、ElasticFace人脸识别模型
5、人脸模块:新增Seetaface6质量评估模型
6、目标检测模块:开放更多自定义模型参数
7、人脸模块:支持base64图片
8、实现接口 AutoCloseable,支持资源的自动释放
9、OCR模块:解决加方向矫正后无法连续识别bug
10、人脸模块:解决人脸更新后缓存问题
11、优化部分功能
This commit is contained in:
dengwenjie
2025-07-07 08:45:08 +08:00
parent 3e631a060b
commit 07a8a18835
168 changed files with 8562 additions and 2850 deletions

View File

@@ -0,0 +1,77 @@
package cn.smartjavaai.face.config;
import cn.smartjavaai.common.enums.DeviceEnum;
import cn.smartjavaai.face.constant.FaceDetectConstant;
import cn.smartjavaai.face.enums.FaceDetModelEnum;
import lombok.Data;
import java.util.HashMap;
import java.util.Map;
/**
* 人脸检测模型配置
* @author dwj
*/
@Data
public class FaceDetConfig {
/**
* 人脸检测模型枚举
*/
private FaceDetModelEnum modelEnum;
/**
* 置信度阈值
*/
private double confidenceThreshold = FaceDetectConstant.DEFAULT_CONFIDENCE_THRESHOLD;
/**
* 非极大抑制阈值 作用:消除重叠检测框,保留最优结果
*/
private double nmsThresh = FaceDetectConstant.NMS_THRESHOLD;
/**
* 模型路径
*/
private String modelPath;
/**
* 设备类型
*/
private DeviceEnum device;
/**
* 个性化配置(按模型类型动态解析)
*/
private Map<String, Object> customParams = new HashMap<>();
public FaceDetConfig() {
}
public FaceDetConfig(FaceDetModelEnum modelEnum) {
this.modelEnum = modelEnum;
}
public FaceDetConfig(FaceDetModelEnum modelEnum, String modelPath) {
this.modelEnum = modelEnum;
this.modelPath = modelPath;
}
public <T> T getCustomParam(String key, Class<T> clazz) {
Object value = customParams.get(key);
if (value == null) return null;
return clazz.cast(value);
}
/**
* 添加个性化配置项
*/
public void putCustomParam(String key, Object value) {
if (customParams == null) {
customParams = new HashMap<>();
}
customParams.put(key, value);
}
}

View File

@@ -0,0 +1,51 @@
package cn.smartjavaai.face.config;
import cn.smartjavaai.common.enums.DeviceEnum;
import cn.smartjavaai.face.enums.ExpressionModelEnum;
import cn.smartjavaai.face.model.facedect.FaceDetModel;
import cn.smartjavaai.face.model.facerec.FaceRecModel;
import lombok.Data;
import java.util.HashMap;
import java.util.Map;
/**
* @author dwj
* @date 2025/7/1
*/
@Data
public class FaceExpressionConfig {
/**
* 模型枚举
*/
private ExpressionModelEnum modelEnum = ExpressionModelEnum.DensNet121;
/**
* 模型路径
*/
private String modelPath;
/**
* 设备类型
*/
private DeviceEnum device;
/**
* 人脸检测模型
*/
private FaceDetModel detectModel;
/**
* 是否对齐人脸
*/
private boolean align = true;
/**
* 是否裁剪人脸
*/
private boolean cropFace = true;
}

View File

@@ -1,39 +0,0 @@
package cn.smartjavaai.face.config;
import cn.smartjavaai.face.model.facerec.FaceModel;
import lombok.Data;
/**
* 人脸特征提取配置
* @author dwj
* @date 2025/4/24
*/
@Data
public class FaceExtractConfig {
/**
* 是否裁剪人脸
*/
private boolean cropFace = true;
/**
* 是否对齐人脸
*/
private boolean align = false;
/**
* 人脸检测模型
*/
private FaceModel detectModel;
public FaceExtractConfig() {
}
public FaceExtractConfig(boolean cropFace, boolean align, FaceModel detectModel) {
this.cropFace = cropFace;
this.align = align;
this.detectModel = detectModel;
}
}

View File

@@ -2,22 +2,26 @@ package cn.smartjavaai.face.config;
import cn.smartjavaai.common.enums.DeviceEnum;
import cn.smartjavaai.face.constant.FaceDetectConstant;
import cn.smartjavaai.face.enums.FaceModelEnum;
import cn.smartjavaai.face.enums.VectorDBType;
import cn.smartjavaai.face.enums.FaceRecModelEnum;
import cn.smartjavaai.face.model.facedect.FaceDetModel;
import cn.smartjavaai.face.model.facerec.FaceRecModel;
import cn.smartjavaai.face.vector.config.VectorDBConfig;
import lombok.Data;
import java.util.HashMap;
import java.util.Map;
/**
* 人脸检测识别模型配置
* @author dwj
*/
@Data
public class FaceModelConfig {
public class FaceRecConfig {
/**
* 人脸模型枚举
*/
private FaceModelEnum modelEnum;
private FaceRecModelEnum modelEnum;
/**
* 置信度阈值
@@ -49,16 +53,6 @@ public class FaceModelConfig {
*/
private DeviceEnum device;
/**
* gpu设备ID 当device为GPU时生效
*/
private int gpuId = 0;
/**
* 人脸特征提取配置
*/
private FaceExtractConfig extractConfig;
/**
* 向量数据库配置
@@ -70,15 +64,52 @@ public class FaceModelConfig {
*/
private boolean isAutoLoadFace = true;
public FaceModelConfig() {
/**
* 是否裁剪人脸
*/
private boolean cropFace = true;
/**
* 是否对齐人脸
*/
private boolean align = false;
/**
* 人脸检测模型
*/
private FaceDetModel detectModel;
/**
* 个性化配置按模型类型动态解析
*/
private Map<String, Object> customParams = new HashMap<>();
public FaceRecConfig() {
}
public FaceModelConfig(FaceModelEnum modelEnum) {
public FaceRecConfig(FaceRecModelEnum modelEnum) {
this.modelEnum = modelEnum;
}
public FaceModelConfig(FaceModelEnum modelEnum, String modelPath) {
public FaceRecConfig(FaceRecModelEnum modelEnum, String modelPath) {
this.modelEnum = modelEnum;
this.modelPath = modelPath;
}
public <T> T getCustomParam(String key, Class<T> clazz) {
Object value = customParams.get(key);
if (value == null) return null;
return clazz.cast(value);
}
/**
* 添加个性化配置项
*/
public void putCustomParam(String key, Object value) {
if (customParams == null) {
customParams = new HashMap<>();
}
customParams.put(key, value);
}
}

View File

@@ -1,12 +1,15 @@
package cn.smartjavaai.face.config;
import cn.smartjavaai.common.enums.DeviceEnum;
import cn.smartjavaai.face.constant.FaceDetectConstant;
import cn.smartjavaai.face.constant.LivenessConstant;
import cn.smartjavaai.face.enums.FaceModelEnum;
import cn.smartjavaai.face.enums.LivenessModelEnum;
import cn.smartjavaai.face.model.facedect.FaceDetModel;
import cn.smartjavaai.face.model.facerec.FaceRecModel;
import lombok.Data;
import java.util.HashMap;
import java.util.Map;
/**
* 活体检测模型配置
* @author dwj
@@ -30,25 +33,26 @@ public class LivenessConfig {
private DeviceEnum device;
/**
* gpu设备ID 当device为GPU时生效
* 人脸检测模型
*/
private int gpuId = 0;
private FaceDetModel detectModel;
/**
* 人脸清晰度阈值
* 个性化配置(按模型类型动态解析)
*/
private float faceClarityThreshold = LivenessConstant.DEFAULT_FACE_CLARITY_THRESHOLD;
private Map<String, Object> customParams = new HashMap<>();
/**
* 活体阈值
*/
private float realityThreshold = LivenessConstant.DEFAULT_REALITY_THRESHOLD;
/**
* 视频检测帧数
*/
private int frameCount = LivenessConstant.DEFAULT_FRAME_COUNT;
/**
* 真人阈值
*/
private Float realityThreshold;
public LivenessConfig() {
}
@@ -64,4 +68,21 @@ public class LivenessConfig {
public LivenessConfig(String modelPath) {
this.modelPath = modelPath;
}
// 可选封装方法,便于类型转换和调用
public <T> T getCustomParam(String key, Class<T> clazz) {
Object value = customParams.get(key);
if (value == null) return null;
return clazz.cast(value);
}
/**
* 添加个性化配置项
*/
public void putCustomParam(String key, Object value) {
if (customParams == null) {
customParams = new HashMap<>();
}
customParams.put(key, value);
}
}

View File

@@ -0,0 +1,52 @@
package cn.smartjavaai.face.config;
import cn.smartjavaai.common.enums.DeviceEnum;
import cn.smartjavaai.face.constant.LivenessConstant;
import cn.smartjavaai.face.enums.LivenessModelEnum;
import cn.smartjavaai.face.enums.QualityModelEnum;
import lombok.Data;
/**
* 质量评估配置
* @author dwj
*/
@Data
public class QualityConfig {
/**
* 活体检测模型枚举
*/
private QualityModelEnum modelEnum = QualityModelEnum.SEETA_FACE6_MODEL;
/**
* 模型路径
*/
private String modelPath;
/**
* 设备类型
*/
private DeviceEnum device;
/**
* gpu设备ID 当device为GPU时生效
*/
private int gpuId = 0;
public QualityConfig() {
}
public QualityConfig(QualityModelEnum modelEnum) {
this.modelEnum = modelEnum;
}
public QualityConfig(QualityModelEnum modelEnum, String modelPath) {
this.modelEnum = modelEnum;
this.modelPath = modelPath;
}
public QualityConfig(String modelPath) {
this.modelPath = modelPath;
}
}