Merge branch 'feat/infer_dev_260107' of https://10.100.0.10:3210/dabeeo/kamco-dabeeo-backoffice into feat/infer_dev_260107

src/main/java/com/kamco/cd/kamcoback/model/dto/ModelMngDto.java

@@ -228,6 +228,8 @@ public class ModelMngDto {
     private String clsModelFileName;
     private int chunkIndex;
     private int chunkTotalIndex;
+    @JsonIgnore private String jsonPath;
+    @JsonIgnore private String jsonFileName;
 
     public double getUploadRate() {
       if (chunkIndex < 0 || chunkTotalIndex < 0) {

src/main/java/com/kamco/cd/kamcoback/model/service/ModelMngService.java

@@ -95,18 +95,21 @@ public class ModelMngService {
           || modelUploadResDto.getCdModelConfigFileName() == null
           || modelUploadResDto.getCdModelConfigFileName().isEmpty()
           || modelUploadResDto.getClsModelFileName() == null
-          || modelUploadResDto.getClsModelFileName().isEmpty()) {
+          || modelUploadResDto.getClsModelFileName().isEmpty()
+          || modelUploadResDto.getJsonFileName() == null
+          || modelUploadResDto.getJsonFileName().isEmpty()) {
 
         log.warn(
-            "model file missing: uuid={}, path={}, cdModel={}, cdConfig={}, clsModel={}",
+            "model file missing: uuid={}, path={}, cdModel={}, cdConfig={}, clsModel={}, jsonFileName={}",
             uuid,
             addReq.getFilePath(),
             modelUploadResDto.getCdModelFileName(),
             modelUploadResDto.getCdModelConfigFileName(),
-            modelUploadResDto.getClsModelFileName());
+            modelUploadResDto.getClsModelFileName(),
+            modelUploadResDto.getJsonFileName());
 
         return new ApiResponseDto.ResponseObj(
-            ApiResponseCode.NOT_FOUND, "pth,pt,py파일이 모두 존재하지 않습니다");
+            ApiResponseCode.NOT_FOUND, "pth,pt,py,json파일이 모두 존재하지 않습니다");
       }
 
       addReq.setCdModelPath(modelUploadResDto.getCdModelPath());
@@ -142,7 +145,7 @@ public class ModelMngService {
     modelMetricAddReq.setIou(0);
 
     ObjectMapper mapper = new ObjectMapper();
-    String filePath = modelUploadResDto.getClsModelPath() + modelUploadResDto.getClsModelFileName();
+    String filePath = modelUploadResDto.getJsonPath() + modelUploadResDto.getJsonFileName();
     String dataJson = null;
     try {
       dataJson = Files.readString(Path.of(filePath));
@@ -231,7 +234,8 @@ public class ModelMngService {
     int endPos = 20;
 
     List<Basic> files =
-        FIleChecker.getFilesFromAllDepth(dirPath, "*", "pth,py,pt", 10, "name", startPos, endPos);
+        FIleChecker.getFilesFromAllDepth(
+            dirPath, "*", "pth,py,pt,json", 10, "name", startPos, endPos);
 
     for (Basic dto : files) {
       // 예: 파일명 출력 및 추가 작업
@@ -246,6 +250,9 @@ public class ModelMngService {
       } else if (dto.getExtension().equals("pt")) {
         modelUploadResDto.setClsModelPath(foldNm);
         modelUploadResDto.setClsModelFileName(dto.getFileNm());
+      } else if (dto.getExtension().equals("json")) {
+        modelUploadResDto.setJsonPath(foldNm);
+        modelUploadResDto.setJsonFileName(dto.getFileNm());
       }
     }