diff --git a/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceSendDto.java b/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceSendDto.java index e4783f00..143dd054 100644 --- a/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceSendDto.java +++ b/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceSendDto.java @@ -14,6 +14,9 @@ import lombok.ToString; @ToString public class InferenceSendDto { + private static final String DEV_PATH_PREFIX = "kamco-nfs"; + private static final String PROD_PATH_PREFIX = "data"; + private pred_requests_areas pred_requests_areas; private String model_version; private String cd_model_path; @@ -23,12 +26,17 @@ public class InferenceSendDto { private String cd_model_type; private Double priority; - public String getCd_model_path() { - return cd_model_path==null?null:cd_model_path.replace("kamcd-nfs", "data"); - } - - public String getCls_model_path() { - return cls_model_path==null?null:cls_model_path.replace("kamcd-nfs", "data"); + // 프로덕션은 경로가 바뀜 + public void changeValForProd() { + if (pred_requests_areas != null) { + pred_requests_areas.changeValForProd(); + } + if (this.cd_model_path != null) { + this.cd_model_path = this.cd_model_path.replace(DEV_PATH_PREFIX, PROD_PATH_PREFIX); + } + if (this.cls_model_path != null) { + this.cls_model_path = this.cls_model_path.replace(DEV_PATH_PREFIX, PROD_PATH_PREFIX); + } } @Getter @@ -43,13 +51,18 @@ public class InferenceSendDto { private String input1_scene_path; private String input2_scene_path; - public String getInput1_scene_path() { - - return input1_scene_path==null?null:input1_scene_path.replace("kamcd-nfs", "data"); - } - - public String getInput2_scene_path() { - return input2_scene_path==null?null:input2_scene_path.replace("kamcd-nfs", "data"); + public void changeValForProd() { + // ai팀에서 kamco-nfs를 data로 세팅했음 + if (this.input1_scene_path != null) { + this.input1_scene_path = + this.input1_scene_path.replace( + InferenceSendDto.DEV_PATH_PREFIX, InferenceSendDto.PROD_PATH_PREFIX); + } + if (this.input2_scene_path != null) { + this.input2_scene_path = + this.input2_scene_path.replace( + InferenceSendDto.DEV_PATH_PREFIX, InferenceSendDto.PROD_PATH_PREFIX); + } } } } diff --git a/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java b/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java index 412e2133..e7f12c8f 100644 --- a/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java +++ b/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java @@ -551,6 +551,14 @@ public class InferenceResultService { sendDto.setCls_model_version(modelInfo.getModelVer()); sendDto.setCd_model_type(modelType); sendDto.setPriority(5d); + + //운영환경일때 경로수정 dean 260226 + if (profile != null && profile.equals("prod")) { + log.info("profile = {} change inforence req", profile); + sendDto.changeValForProd(); + } + + log.info("[Inference Send]SendDto={}", sendDto); return sendDto; } diff --git a/src/main/java/com/kamco/cd/kamcoback/scheduler/service/MapSheetInferenceJobService.java b/src/main/java/com/kamco/cd/kamcoback/scheduler/service/MapSheetInferenceJobService.java index 3410ddfb..2bc3186f 100644 --- a/src/main/java/com/kamco/cd/kamcoback/scheduler/service/MapSheetInferenceJobService.java +++ b/src/main/java/com/kamco/cd/kamcoback/scheduler/service/MapSheetInferenceJobService.java @@ -355,8 +355,12 @@ public class MapSheetInferenceJobService { m.setCls_model_version(progressDto.getClsModelVersion()); m.setCd_model_type(type); m.setPriority(5d); - - // log.info("InferenceSendDto={}", m); + //운영환경일때 경로수정 dean 260226 + if (profile != null && profile.equals("prod")) { + log.info("profile = {} [M]change inforence req", profile); + m.changeValForProd(); + } + log.info("[Inference]SendDto={}", m); // 추론 실행 api 호출 Long batchId = ensureAccepted(m);