From 8ac0a0031167f2ab6dc4e9a11208d54878a4dad9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dean=5B=EB=B0=B1=EB=B3=91=EB=82=A8=5D?= Date: Thu, 26 Feb 2026 08:33:53 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EC=9A=B4=EC=98=81=ED=99=98=EA=B2=BD?= =?UTF-8?q?=EC=9D=BC=EB=95=8C=20ai=ED=8C=80=EA=B2=BD=EB=A1=9C=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inference/dto/InferenceSendDto.java | 39 ++++++++++++------- .../service/InferenceResultService.java | 8 ++++ .../service/MapSheetInferenceJobService.java | 8 +++- 3 files changed, 40 insertions(+), 15 deletions(-) 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); From 7c200b057a4f2cfd5cf1ffd9902ef70cf6661aec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dean=5B=EB=B0=B1=EB=B3=91=EB=82=A8=5D?= Date: Thu, 26 Feb 2026 08:36:53 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EC=9A=B4=EC=98=81=ED=99=98=EA=B2=BD?= =?UTF-8?q?=EC=9D=BC=EB=95=8C=20ai=ED=8C=80=EA=B2=BD=EB=A1=9C=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cd/kamcoback/inference/service/InferenceResultService.java | 2 +- .../scheduler/service/MapSheetInferenceJobService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 e7f12c8f..1b705325 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 @@ -552,7 +552,7 @@ public class InferenceResultService { sendDto.setCd_model_type(modelType); sendDto.setPriority(5d); - //운영환경일때 경로수정 dean 260226 + // 운영환경일때 경로수정 dean 260226 if (profile != null && profile.equals("prod")) { log.info("profile = {} change inforence req", profile); sendDto.changeValForProd(); 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 2bc3186f..ad0ed616 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,7 +355,7 @@ public class MapSheetInferenceJobService { m.setCls_model_version(progressDto.getClsModelVersion()); m.setCd_model_type(type); m.setPriority(5d); - //운영환경일때 경로수정 dean 260226 + // 운영환경일때 경로수정 dean 260226 if (profile != null && profile.equals("prod")) { log.info("profile = {} [M]change inforence req", profile); m.changeValForProd(); From 4a120ae5fd93c4887f12d1c7ee031901aff54d01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dean=5B=EB=B0=B1=EB=B3=91=EB=82=A8=5D?= Date: Thu, 26 Feb 2026 09:23:00 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EC=9A=B4=EC=98=81=ED=99=98=EA=B2=BD?= =?UTF-8?q?=EC=9D=BC=EB=95=8C=20ai=ED=8C=80=EA=B2=BD=EB=A1=9C=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inference/service/InferenceRunService.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceRunService.java b/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceRunService.java index 6515bd56..9f24ffff 100644 --- a/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceRunService.java +++ b/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceRunService.java @@ -37,6 +37,9 @@ public class InferenceRunService { private final ModelMngCoreService modelMngCoreService; private final ObjectMapper objectMapper; + @Value("${spring.profiles.active}") + private String profile; + @Value("${inference.url}") private String inferenceUrl; @@ -214,7 +217,13 @@ public class InferenceRunService { sendDto.setCls_model_path(cdClsModelPath); sendDto.setCls_model_version(modelInfo.getModelVer()); sendDto.setCd_model_type(modelType); - sendDto.setPriority(modelInfo.getPriority()); + sendDto.setPriority(5.0); + // 운영환경일때 경로수정 dean 260226 + if (profile != null && profile.equals("prod")) { + log.info("profile = {} change inforence req", profile); + sendDto.changeValForProd(); + } + return sendDto; } }