【人脸识别】 新增多种人脸识别模型

【底层优化】 支持自由选择 OpenCV 或 BufferedImage 作为图像引擎

【通用图像】 全部模型启用 Image 输入，支持各类图片格式与 Image 的互转

【模型管理】 优化模型生命周期，关闭后可重新创建

【人脸识别】 支持在人脸查询结果中绘制姓名标注

【人脸检测】 新增人脸裁剪功能

【修复】 修复若干已知问题，提升系统稳定性

vision/src/main/java/cn/smartjavaai/instanceseg/model/CommonInstanceSegModel.java

@@ -8,10 +8,12 @@ import ai.djl.modality.cv.output.DetectedObjects;
 import ai.djl.repository.zoo.Criteria;
 import ai.djl.repository.zoo.ModelNotFoundException;
 import ai.djl.repository.zoo.ZooModel;
+import cn.smartjavaai.action.model.ActionRecModelFactory;
 import cn.smartjavaai.common.cv.SmartImageFactory;
 import cn.smartjavaai.common.entity.DetectionResponse;
 import cn.smartjavaai.common.entity.R;
 import cn.smartjavaai.common.pool.PredictorFactory;
+import cn.smartjavaai.common.utils.ImageUtils;
 import cn.smartjavaai.instanceseg.config.InstanceSegModelConfig;
 import cn.smartjavaai.instanceseg.criteria.InstanceSegCriteriaFactory;
 import cn.smartjavaai.instanceseg.exception.InstanceSegException;
@@ -124,8 +126,9 @@ public class CommonInstanceSegModel implements InstanceSegModel {
 
     @Override
     public R<DetectionResponse> detectAndDraw(String imagePath, String outputPath) {
+        Image img = null;
         try {
-            Image img = SmartImageFactory.getInstance().fromFile(Paths.get(imagePath));
+            img = SmartImageFactory.getInstance().fromFile(Paths.get(imagePath));
             DetectedObjects detectedObjects = detectCore(img);
             if(Objects.isNull(detectedObjects) || detectedObjects.getNumberOfObjects() == 0){
                 return R.fail(R.Status.NO_OBJECT_DETECTED);
@@ -136,11 +139,16 @@ public class CommonInstanceSegModel implements InstanceSegModel {
             return R.ok(detectionResponse);
         } catch (IOException e) {
             throw new InstanceSegException(e);
+        } finally {
+            ImageUtils.releaseOpenCVMat(img);
         }
     }
 
     @Override
     public void close() throws Exception {
+        if (fromFactory) {
+            InstanceSegModelFactory.removeFromCache(config.getModelEnum());
+        }
         try {
             if (predictorPool != null) {
                 predictorPool.close();
@@ -156,4 +164,14 @@ public class CommonInstanceSegModel implements InstanceSegModel {
             log.warn("关闭 model 失败", e);
         }
     }
+
+    private boolean fromFactory = false;
+
+    @Override
+    public void setFromFactory(boolean fromFactory) {
+        this.fromFactory = fromFactory;
+    }
+    public boolean isFromFactory() {
+        return fromFactory;
+    }
 }

vision/src/main/java/cn/smartjavaai/instanceseg/model/InstanceSegModel.java

@@ -43,5 +43,8 @@ public interface InstanceSegModel extends AutoCloseable{
         throw new UnsupportedOperationException("默认不支持该功能");
     }
 
+    default void setFromFactory(boolean fromFactory){
+        throw new UnsupportedOperationException("默认不支持该功能");
+    }
 
 }

vision/src/main/java/cn/smartjavaai/instanceseg/model/InstanceSegModelFactory.java

@@ -75,6 +75,7 @@ public class InstanceSegModelFactory {
             throw new DetectionException(e);
         }
         model.loadModel(config);
+        model.setFromFactory(true);
         return model;
     }
 
@@ -97,6 +98,19 @@ public class InstanceSegModelFactory {
         modelMap.remove(modelEnum);
     }
 
+    /**
+     * 关闭所有已加载的模型
+     */
+    public void closeAll() {
+        modelMap.values().forEach(model -> {
+            try {
+                model.close();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        });
+        modelMap.clear();
+    }
 
     // 初始化默认算法
     static {