From 9022f05cc53d6da83f6e11bc6bd36dffc212ff0e Mon Sep 17 00:00:00 2001 From: teddy Date: Mon, 12 Jan 2026 20:03:04 +0900 Subject: [PATCH] =?UTF-8?q?[KC-108]=20ai=20api=20batch=20=EC=9E=91?= =?UTF-8?q?=EC=97=85=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InferenceResultApiController.java | 22 ++--- .../inference/dto/InferenceResultDto.java | 83 +++++++++---------- .../service/InferenceResultService.java | 3 +- .../core/InferenceResultCoreService.java | 11 ++- .../postgres/entity/GpuMetricEntity.java | 1 - .../postgres/entity/SystemMetricEntity.java | 1 - .../MapSheetLearnRepositoryCustom.java | 4 +- .../MapSheetLearnRepositoryImpl.java | 66 +++++++++------ .../kamcoback/scheduler/dto/JobStatusDto.java | 52 ++++++++++++ .../service/MapSheetInferenceJobService.java | 47 ++++++++++- src/main/resources/application-dev.yml | 1 + src/main/resources/application-local.yml | 1 + src/main/resources/application-prod.yml | 1 + 13 files changed, 207 insertions(+), 86 deletions(-) create mode 100644 src/main/java/com/kamco/cd/kamcoback/scheduler/dto/JobStatusDto.java diff --git a/src/main/java/com/kamco/cd/kamcoback/inference/InferenceResultApiController.java b/src/main/java/com/kamco/cd/kamcoback/inference/InferenceResultApiController.java index afedbb4b..34771618 100644 --- a/src/main/java/com/kamco/cd/kamcoback/inference/InferenceResultApiController.java +++ b/src/main/java/com/kamco/cd/kamcoback/inference/InferenceResultApiController.java @@ -221,17 +221,17 @@ public class InferenceResultApiController { @Operation(summary = "추론관리 추론진행 서버 현황", description = "추론관리 추론진행 서버 현황") @ApiResponses( - value = { - @ApiResponse( - responseCode = "200", - description = "검색 성공", - content = - @Content( - mediaType = "application/json", - schema = @Schema(implementation = Page.class))), - @ApiResponse(responseCode = "400", description = "잘못된 검색 조건", content = @Content), - @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content) - }) + value = { + @ApiResponse( + responseCode = "200", + description = "검색 성공", + content = + @Content( + mediaType = "application/json", + schema = @Schema(implementation = Page.class))), + @ApiResponse(responseCode = "400", description = "잘못된 검색 조건", content = @Content), + @ApiResponse(responseCode = "500", description = "서버 오류", content = @Content) + }) @GetMapping("/serverStatus") public ApiResponseDto> getInferenceServerStatusList() { diff --git a/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceResultDto.java b/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceResultDto.java index 3941876f..c97942d3 100644 --- a/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceResultDto.java +++ b/src/main/java/com/kamco/cd/kamcoback/inference/dto/InferenceResultDto.java @@ -129,10 +129,7 @@ public class InferenceResultDto { } public static Status fromCode(String code) { - return Arrays.stream(values()) - .filter(v -> v.name().equals(code)) - .findFirst() - .orElseThrow(() -> new IllegalArgumentException("알 수 없는 상태 코드: " + code)); + return Arrays.stream(values()).filter(v -> v.name().equals(code)).findFirst().orElse(null); } public static String getDescByCode(String code) { @@ -205,81 +202,81 @@ public class InferenceResultDto { public static class InferenceServerStatusDto { private String serverName; - @JsonIgnore - private float cpu_user; + @JsonIgnore private float cpu_user; @JsonIgnore private float cpu_system; @JsonIgnore private float memused; private Long kbmemused; private float gpuUtil; - //private String cpuStatusName; - //private String memStatusName; - //private String gpuStatusName; - //private float cpu_use_rate; - //private float gpu_use_rate; - //private float mem_use_rate; - public float getCpuUseRate() - { - return this.cpu_user+this.cpu_system; + // private String cpuStatusName; + // private String memStatusName; + // private String gpuStatusName; + // private float cpu_use_rate; + // private float gpu_use_rate; + // private float mem_use_rate; + + public float getCpuUseRate() { + return this.cpu_user + this.cpu_system; } - public String getServerStatus() - { + public String getServerStatus() { String enumId = "SAFETY"; - //if( this.cpu_user+this.cpu_system >= 80 )enumId = "CAUTION"; + // if( this.cpu_user+this.cpu_system >= 80 )enumId = "CAUTION"; return enumId; } - public String getServerStatusName() - { - //String enumId = "SAFETY"; - //if( this.cpu_user+this.cpu_system >= 80 )enumId = "CAUTION"; + public String getServerStatusName() { + // String enumId = "SAFETY"; + // if( this.cpu_user+this.cpu_system >= 80 )enumId = "CAUTION"; return ServerStatus.SAFETY.getText(); } - public String getCpuStatus() - { + public String getCpuStatus() { String enumId = "SAFETY"; - if( this.cpu_user+this.cpu_system >= 80 )enumId = "CAUTION"; + if (this.cpu_user + this.cpu_system >= 80) { + enumId = "CAUTION"; + } return enumId; } - public String getGpuStatus() - { + public String getGpuStatus() { String enumId = "SAFETY"; - if( this.gpuUtil >= 80 )enumId = "CAUTION"; + if (this.gpuUtil >= 80) { + enumId = "CAUTION"; + } return enumId; } - public String getMemStatus() - { + public String getMemStatus() { String enumId = "SAFETY"; - if( this.memused >= 80 )enumId = "CAUTION"; + if (this.memused >= 80) { + enumId = "CAUTION"; + } return enumId; } - public String getCpuStatusName() - { - if( this.cpu_user+this.cpu_system >= 80 )return ServerStatus.CAUTION.getText(); + public String getCpuStatusName() { + if (this.cpu_user + this.cpu_system >= 80) { + return ServerStatus.CAUTION.getText(); + } return ServerStatus.SAFETY.getText(); } - public String getGpuStatusName() - { - if( this.gpuUtil >= 80 )return ServerStatus.CAUTION.getText(); + public String getGpuStatusName() { + if (this.gpuUtil >= 80) { + return ServerStatus.CAUTION.getText(); + } return ServerStatus.SAFETY.getText(); } - public String getMemStatusName() - { - if( this.memused >= 80 )return ServerStatus.CAUTION.getText(); + public String getMemStatusName() { + if (this.memused >= 80) { + return ServerStatus.CAUTION.getText(); + } return ServerStatus.SAFETY.getText(); } - - } - @Getter @AllArgsConstructor public enum ServerStatus implements EnumType { 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 705936bc..e78e23a5 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 @@ -15,6 +15,7 @@ import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.InferenceServerSt import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.MapSheetNumDto; import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.MapSheetScope; import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.ResultList; +import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.Status; import com.kamco.cd.kamcoback.inference.dto.InferenceSendDto; import com.kamco.cd.kamcoback.inference.dto.InferenceSendDto.pred_requests_areas; import com.kamco.cd.kamcoback.mapsheet.dto.MapSheetMngDto.MngListCompareDto; @@ -199,7 +200,7 @@ public class InferenceResultService { m3.setPred_requests_areas(predRequestsAreas); Long batchId = this.ensureAccepted(m1); - inferenceResultCoreService.update(uuid, batchId, "IN_PROGRESS"); + inferenceResultCoreService.update(uuid, batchId, Status.IN_PROGRESS.getId()); } /** diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/core/InferenceResultCoreService.java b/src/main/java/com/kamco/cd/kamcoback/postgres/core/InferenceResultCoreService.java index 1d7710a1..34419e5f 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/core/InferenceResultCoreService.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/core/InferenceResultCoreService.java @@ -228,6 +228,15 @@ public class InferenceResultCoreService { entity.setStatus(status); } - public List getInferenceServerStatusList(){return mapSheetLearnRepository.getInferenceServerStatusList(); + public List getInferenceServerStatusList() { + return mapSheetLearnRepository.getInferenceServerStatusList(); + } + + public Long getInferenceResultByStatus(String status) { + MapSheetLearnEntity entity = + mapSheetLearnRepository + .getInferenceResultByStatus(status) + .orElseThrow(() -> new EntityNotFoundException(status)); + return entity.getBatchId(); } } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/GpuMetricEntity.java b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/GpuMetricEntity.java index 55fee73d..23f74a52 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/GpuMetricEntity.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/GpuMetricEntity.java @@ -44,5 +44,4 @@ public class GpuMetricEntity { @Column(name = "gpu_mem_total") private Float gpuMemTotal; - } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/SystemMetricEntity.java b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/SystemMetricEntity.java index eb072a3f..05e5bb02 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/entity/SystemMetricEntity.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/entity/SystemMetricEntity.java @@ -55,5 +55,4 @@ public class SystemMetricEntity { @Column(name = "memused") private Float memused; - } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryCustom.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryCustom.java index 4d896aa3..74dc4ce0 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryCustom.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryCustom.java @@ -3,9 +3,9 @@ package com.kamco.cd.kamcoback.postgres.repository.Inference; import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto; import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.InferenceServerStatusDto; import com.kamco.cd.kamcoback.postgres.entity.MapSheetLearnEntity; +import java.util.List; import java.util.Optional; import java.util.UUID; -import java.util.List; import org.springframework.data.domain.Page; public interface MapSheetLearnRepositoryCustom { @@ -15,4 +15,6 @@ public interface MapSheetLearnRepositoryCustom { Optional getInferenceResultByUuid(UUID uuid); List getInferenceServerStatusList(); + + Optional getInferenceResultByStatus(String status); } diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryImpl.java index 79c7e827..9ead997b 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryImpl.java @@ -94,35 +94,49 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto BooleanBuilder builder = new BooleanBuilder(); - List latestIds = queryFactory - .select(systemMetricEntity.id1.max()) - .from(systemMetricEntity) - .groupBy(systemMetricEntity.serverName) - .fetch(); + List latestIds = + queryFactory + .select(systemMetricEntity.id1.max()) + .from(systemMetricEntity) + .groupBy(systemMetricEntity.serverName) + .fetch(); - List latestGpuIds = queryFactory - .select(gpuMetricEntity.id1.max()) - .from(gpuMetricEntity) - .groupBy(gpuMetricEntity.serverName) - .fetch(); + List latestGpuIds = + queryFactory + .select(gpuMetricEntity.id1.max()) + .from(gpuMetricEntity) + .groupBy(gpuMetricEntity.serverName) + .fetch(); - List foundContent = queryFactory - .select(Projections.constructor( - InferenceServerStatusDto.class, - systemMetricEntity.serverName, - systemMetricEntity.cpuUser, - systemMetricEntity.cpuSystem, - systemMetricEntity.memused, - systemMetricEntity.kbmemused, - gpuMetricEntity.gpuUtil - )) - .from(systemMetricEntity) - .leftJoin(gpuMetricEntity).on(gpuMetricEntity.serverName.eq(systemMetricEntity.serverName)) - .where(systemMetricEntity.id1.in(latestIds)) // In 절 사용 - .orderBy(systemMetricEntity.serverName.asc()) - .limit(4) - .fetch(); + List foundContent = + queryFactory + .select( + Projections.constructor( + InferenceServerStatusDto.class, + systemMetricEntity.serverName, + systemMetricEntity.cpuUser, + systemMetricEntity.cpuSystem, + systemMetricEntity.memused, + systemMetricEntity.kbmemused, + gpuMetricEntity.gpuUtil)) + .from(systemMetricEntity) + .leftJoin(gpuMetricEntity) + .on(gpuMetricEntity.serverName.eq(systemMetricEntity.serverName)) + .where(systemMetricEntity.id1.in(latestIds)) // In 절 사용 + .orderBy(systemMetricEntity.serverName.asc()) + .limit(4) + .fetch(); return foundContent; } + + @Override + public Optional getInferenceResultByStatus(String status) { + return Optional.ofNullable( + queryFactory + .selectFrom(mapSheetLearnEntity) + .where(mapSheetLearnEntity.status.eq(status)) + .limit(1) + .fetchOne()); + } } diff --git a/src/main/java/com/kamco/cd/kamcoback/scheduler/dto/JobStatusDto.java b/src/main/java/com/kamco/cd/kamcoback/scheduler/dto/JobStatusDto.java new file mode 100644 index 00000000..a995357e --- /dev/null +++ b/src/main/java/com/kamco/cd/kamcoback/scheduler/dto/JobStatusDto.java @@ -0,0 +1,52 @@ +package com.kamco.cd.kamcoback.scheduler.dto; + +import com.fasterxml.jackson.annotation.JsonProperty; +import java.time.ZonedDateTime; +import java.util.List; +import lombok.Data; + +@Data +public class JobStatusDto { + + private Long id; + + @JsonProperty("created_at") + private ZonedDateTime createdAt; + + @JsonProperty("input1_year") + private Integer input1Year; + + @JsonProperty("input2_year") + private Integer input2Year; + + @JsonProperty("total_jobs") + private Integer totalJobs; + + @JsonProperty("pending_jobs") + private Integer pendingJobs; + + @JsonProperty("running_jobs") + private Integer runningJobs; + + @JsonProperty("completed_jobs") + private Integer completedJobs; + + @JsonProperty("failed_jobs") + private Integer failedJobs; + + private String status; + + private List jobs; + + @JsonProperty("completed_ids") + private List completedIds; + + @JsonProperty("processing_ids") + private List processingIds; + + @JsonProperty("queued_ids") + private List queuedIds; + + @JsonProperty("failed_ids") + private List failedIds; +} 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 174eeb80..9ef683bd 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 @@ -1,8 +1,19 @@ package com.kamco.cd.kamcoback.scheduler.service; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.kamco.cd.kamcoback.config.resttemplate.ExternalHttpClient; +import com.kamco.cd.kamcoback.config.resttemplate.ExternalHttpClient.ExternalCallResult; +import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.Status; import com.kamco.cd.kamcoback.postgres.core.InferenceResultCoreService; +import com.kamco.cd.kamcoback.scheduler.dto.JobStatusDto; +import java.util.List; import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.http.MediaType; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; @@ -12,6 +23,12 @@ import org.springframework.stereotype.Service; public class MapSheetInferenceJobService { private final InferenceResultCoreService inferenceResultCoreService; + private final ExternalHttpClient externalHttpClient; + + private final ObjectMapper objectMapper; + + @Value("${inference.batch-url}") + private String batchUrl; @Scheduled(fixedDelay = 60_000) public void runBatch() { @@ -19,8 +36,36 @@ public class MapSheetInferenceJobService { try { // TODO: 배치 로직 작성 + + Long batchId = + inferenceResultCoreService.getInferenceResultByStatus(Status.IN_PROGRESS.getId()); + + if (batchId == null) { + return; + } + + HttpHeaders headers = new HttpHeaders(); + headers.setContentType(MediaType.APPLICATION_JSON); + headers.setAccept(List.of(MediaType.APPLICATION_JSON)); + + String url = batchUrl + "/" + batchId; + + ExternalCallResult result = + externalHttpClient.call(url, HttpMethod.GET, null, headers, String.class); + + int status = result.statusCode(); + if (status < 200 || status >= 300) { + return; + } + + String json = result.body(); + JobStatusDto dto = objectMapper.readValue(json, JobStatusDto.class); + + System.out.println(dto); + Thread.sleep(3000); // 예시: 처리 시간 3초 - } catch (InterruptedException e) { + + } catch (InterruptedException | JsonProcessingException e) { Thread.currentThread().interrupt(); log.error("배치 중 인터럽트 발생", e); } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 4894e6b6..128480f3 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -97,4 +97,5 @@ file: inference: url: http://10.100.0.11:8000/jobs + batch-url: http://10.100.0.11:8000/batches geojson-dir: /kamco-nfs/requests/ diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml index c75e7709..369ed2c4 100644 --- a/src/main/resources/application-local.yml +++ b/src/main/resources/application-local.yml @@ -83,4 +83,5 @@ file: inference: url: http://10.100.0.11:8000/jobs + batch-url: http://10.100.0.11:8000/batches geojson-dir: /kamco-nfs/requests/ diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 0e5de80c..51449152 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -58,5 +58,6 @@ file: inference: url: http://10.100.0.11:8000/jobs + batch-url: http://10.100.0.11:8000/batches geojson-dir: /kamco-nfs/requests/