From 6f44319d332e488596347008724368a9ab6a87fc 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 10:24:29 +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 | 6 +++++ .../service/InferenceResultService.java | 8 +------ .../service/InferenceRunService.java | 6 ----- .../service/MapSheetInferenceJobService.java | 22 ++++++++++++------- 4 files changed, 21 insertions(+), 21 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 143dd054..e5ffaab9 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 @@ -5,8 +5,10 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import lombok.ToString; +import lombok.extern.slf4j.Slf4j; /** AI API 추론 실행 DTO */ +@Slf4j @Getter @Setter @NoArgsConstructor @@ -30,6 +32,7 @@ public class InferenceSendDto { public void changeValForProd() { if (pred_requests_areas != null) { pred_requests_areas.changeValForProd(); + log.info("[CHANGE]pred_requests_areas={}", pred_requests_areas); } if (this.cd_model_path != null) { this.cd_model_path = this.cd_model_path.replace(DEV_PATH_PREFIX, PROD_PATH_PREFIX); @@ -37,6 +40,9 @@ public class InferenceSendDto { if (this.cls_model_path != null) { this.cls_model_path = this.cls_model_path.replace(DEV_PATH_PREFIX, PROD_PATH_PREFIX); } + if (this.cd_model_config != null) { + this.cd_model_config = this.cd_model_config.replace(DEV_PATH_PREFIX, PROD_PATH_PREFIX); + } } @Getter 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 1b705325..75740286 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 @@ -452,6 +452,7 @@ public class InferenceResultService { log.warn("not InferenceSendDto dto"); throw new CustomApiException("BAD_REQUEST", HttpStatus.BAD_REQUEST); } + dto.changeValForProd(); // 1) 요청 로그 try { @@ -551,13 +552,6 @@ 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/inference/service/InferenceRunService.java b/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceRunService.java index 9f24ffff..6b0063aa 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 @@ -218,12 +218,6 @@ public class InferenceRunService { sendDto.setCls_model_version(modelInfo.getModelVer()); sendDto.setCd_model_type(modelType); sendDto.setPriority(5.0); - // 운영환경일때 경로수정 dean 260226 - if (profile != null && profile.equals("prod")) { - log.info("profile = {} change inforence req", profile); - sendDto.changeValForProd(); - } - 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 ad0ed616..2117860d 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 @@ -342,7 +342,7 @@ public class MapSheetInferenceJobService { predRequestsAreas.setInput2_scene_path( progressDto.getPred_requests_areas().getInput2_scene_path()); - InferenceSendDto m = new InferenceSendDto(); + InferenceSendDto m = new InferenceSendDto(); m.setPred_requests_areas(predRequestsAreas); m.setModel_version(progressDto.getModelVersion()); m.setCd_model_path( @@ -355,12 +355,7 @@ public class MapSheetInferenceJobService { m.setCls_model_version(progressDto.getClsModelVersion()); m.setCd_model_type(type); m.setPriority(5d); - // 운영환경일때 경로수정 dean 260226 - if (profile != null && profile.equals("prod")) { - log.info("profile = {} [M]change inforence req", profile); - m.changeValForProd(); - } - log.info("[Inference]SendDto={}", m); + log.info("[BEFORE INFERENCE] BEFORE SendDto={}", m); // 추론 실행 api 호출 Long batchId = ensureAccepted(m); @@ -385,9 +380,20 @@ public class MapSheetInferenceJobService { log.warn("not InferenceSendDto dto"); throw new CustomApiException("BAD_REQUEST", HttpStatus.BAD_REQUEST); } + // 운영환경일때 경로수정 dean 260226 + if (profile != null && profile.equals("prod")) { + log.info("========================================================"); + log.info("[CHANGE INFERENCE] profile = {} Inforence req", profile); + log.info("========================================================"); + log.info(""); + dto.changeValForProd(); + } // 1) 요청 로그 - log.info("Inference request dto={}", dto); + log.info("========================================================"); + log.info("========================================================"); + log.info("[SEND INFERENCE] Inference request dto={}", dto); + log.info("========================================================"); // 2) local 환경 임시 처리 if ("local".equals(profile)) { From f2307ff0f49d6fb0dc7265cda4b11aace55bfef4 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 10:29:10 +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 --- .../scheduler/service/MapSheetInferenceJobService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 2117860d..b83a9961 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 @@ -342,7 +342,7 @@ public class MapSheetInferenceJobService { predRequestsAreas.setInput2_scene_path( progressDto.getPred_requests_areas().getInput2_scene_path()); - InferenceSendDto m = new InferenceSendDto(); + InferenceSendDto m = new InferenceSendDto(); m.setPred_requests_areas(predRequestsAreas); m.setModel_version(progressDto.getModelVersion()); m.setCd_model_path( @@ -390,11 +390,11 @@ public class MapSheetInferenceJobService { } // 1) 요청 로그 - log.info("========================================================"); + log.info(""); log.info("========================================================"); log.info("[SEND INFERENCE] Inference request dto={}", dto); log.info("========================================================"); - + log.info(""); // 2) local 환경 임시 처리 if ("local".equals(profile)) { if (dto.getPred_requests_areas() == null) { From 2508f59a728208785e1dfb06ccafc4078cffcb3b 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 10:36:10 +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/InferenceResultService.java | 11 ++++++++++- .../inference/service/InferenceRunService.java | 3 ++- .../service/MapSheetInferenceJobService.java | 5 ++++- 3 files changed, 16 insertions(+), 3 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 75740286..b3355ae4 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 @@ -446,13 +446,22 @@ public class InferenceResultService { * * @param dto */ + // 같은함수가 왜 두개지 private Long ensureAccepted(InferenceSendDto dto) { if (dto == null) { log.warn("not InferenceSendDto dto"); throw new CustomApiException("BAD_REQUEST", HttpStatus.BAD_REQUEST); } - dto.changeValForProd(); + + // [중복]운영환경일때 경로수정 dean 260226 + if (profile != null && profile.equals("prod")) { + log.info("========================================================"); + log.info("[CHANGE INFERENCE] profile = {} Inforence req", profile); + log.info("========================================================"); + log.info(""); + dto.changeValForProd(); + } // 1) 요청 로그 try { 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 6b0063aa..a34fe9ef 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 @@ -43,6 +43,7 @@ public class InferenceRunService { @Value("${inference.url}") private String inferenceUrl; + // TODO 이거 쓰는건가? public void run(Integer compareYear, Integer targetYear, UUID modelUuid) { List compareList = mapSheetMngCoreService.getMapSheetMngHst(compareYear); @@ -131,7 +132,7 @@ public class InferenceRunService { // 1) 요청 로그 try { - log.debug("Inference request dto={}", objectMapper.writeValueAsString(dto)); + log.info("Inference request dto={}", objectMapper.writeValueAsString(dto)); } catch (JsonProcessingException e) { log.warn("Failed to serialize inference dto", e); } 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 b83a9961..ee1b0b7e 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 @@ -375,12 +375,13 @@ public class MapSheetInferenceJobService { * @param dto * @return */ + // 같은함수가 왜 두개지 private Long ensureAccepted(InferenceSendDto dto) { if (dto == null) { log.warn("not InferenceSendDto dto"); throw new CustomApiException("BAD_REQUEST", HttpStatus.BAD_REQUEST); } - // 운영환경일때 경로수정 dean 260226 + // [중복운영환경일때 경로수정 dean 260226 if (profile != null && profile.equals("prod")) { log.info("========================================================"); log.info("[CHANGE INFERENCE] profile = {} Inforence req", profile); @@ -409,6 +410,7 @@ public class MapSheetInferenceJobService { headers.setContentType(MediaType.APPLICATION_JSON); headers.setAccept(List.of(MediaType.APPLICATION_JSON)); + // TODO 어떤 URL로 어떤파리티러로 요청한 로딩해야지 ExternalCallResult result = externalHttpClient.call(inferenceUrl, HttpMethod.POST, dto, headers, String.class); @@ -423,6 +425,7 @@ public class MapSheetInferenceJobService { objectMapper.readValue(result.body(), new TypeReference<>() {}); if (list.isEmpty()) { + // 어떤 URL로 어떤파리티러로 요청한 정보를 봐야 재현을 할듯하지요 throw new IllegalStateException("Inference response is empty"); }