[KC-108] ai api batch 작업중
This commit is contained in:
@@ -29,8 +29,10 @@ public class InferenceDetailDto {
|
|||||||
private String dataName;
|
private String dataName;
|
||||||
private Long mapSheepNum;
|
private Long mapSheepNum;
|
||||||
private Long detectingCnt;
|
private Long detectingCnt;
|
||||||
@JsonFormatDttm private ZonedDateTime analStrtDttm;
|
@JsonFormatDttm
|
||||||
@JsonFormatDttm private ZonedDateTime analEndDttm;
|
private ZonedDateTime analStrtDttm;
|
||||||
|
@JsonFormatDttm
|
||||||
|
private ZonedDateTime analEndDttm;
|
||||||
private Long analSec;
|
private Long analSec;
|
||||||
private String analState;
|
private String analState;
|
||||||
|
|
||||||
@@ -61,8 +63,10 @@ public class InferenceDetailDto {
|
|||||||
private Long id;
|
private Long id;
|
||||||
private String analTitle;
|
private String analTitle;
|
||||||
private Long detectingCnt;
|
private Long detectingCnt;
|
||||||
@JsonFormatDttm private ZonedDateTime analStrtDttm;
|
@JsonFormatDttm
|
||||||
@JsonFormatDttm private ZonedDateTime analEndDttm;
|
private ZonedDateTime analStrtDttm;
|
||||||
|
@JsonFormatDttm
|
||||||
|
private ZonedDateTime analEndDttm;
|
||||||
private Long analSec;
|
private Long analSec;
|
||||||
private Long analPredSec;
|
private Long analPredSec;
|
||||||
private String analState;
|
private String analState;
|
||||||
@@ -102,8 +106,10 @@ public class InferenceDetailDto {
|
|||||||
private String modelInfo;
|
private String modelInfo;
|
||||||
private Integer targetYyyy;
|
private Integer targetYyyy;
|
||||||
private Integer compareYyyy;
|
private Integer compareYyyy;
|
||||||
@JsonFormatDttm private ZonedDateTime analStrtDttm;
|
@JsonFormatDttm
|
||||||
@JsonFormatDttm private ZonedDateTime analEndDttm;
|
private ZonedDateTime analStrtDttm;
|
||||||
|
@JsonFormatDttm
|
||||||
|
private ZonedDateTime analEndDttm;
|
||||||
private Long analSec;
|
private Long analSec;
|
||||||
private Long analPredSec;
|
private Long analPredSec;
|
||||||
private String resultUrl;
|
private String resultUrl;
|
||||||
@@ -183,7 +189,8 @@ public class InferenceDetailDto {
|
|||||||
private Clazzes target;
|
private Clazzes target;
|
||||||
private MapSheet mapSheet;
|
private MapSheet mapSheet;
|
||||||
private Coordinate center;
|
private Coordinate center;
|
||||||
@JsonFormatDttm private ZonedDateTime updatedDttm;
|
@JsonFormatDttm
|
||||||
|
private ZonedDateTime updatedDttm;
|
||||||
|
|
||||||
public DetailListEntity(
|
public DetailListEntity(
|
||||||
UUID uuid,
|
UUID uuid,
|
||||||
@@ -233,7 +240,8 @@ public class InferenceDetailDto {
|
|||||||
|
|
||||||
private String code;
|
private String code;
|
||||||
private String name;
|
private String name;
|
||||||
@JsonIgnore private Double score;
|
@JsonIgnore
|
||||||
|
private Double score;
|
||||||
|
|
||||||
public Clazz(String code, Double score) {
|
public Clazz(String code, Double score) {
|
||||||
this.code = code;
|
this.code = code;
|
||||||
@@ -300,8 +308,10 @@ public class InferenceDetailDto {
|
|||||||
String classAfterName;
|
String classAfterName;
|
||||||
Double classAfterProb;
|
Double classAfterProb;
|
||||||
Long mapSheetNum;
|
Long mapSheetNum;
|
||||||
@JsonIgnore String gemoStr;
|
@JsonIgnore
|
||||||
@JsonIgnore String geomCenterStr;
|
String gemoStr;
|
||||||
|
@JsonIgnore
|
||||||
|
String geomCenterStr;
|
||||||
JsonNode gemo;
|
JsonNode gemo;
|
||||||
JsonNode geomCenter;
|
JsonNode geomCenter;
|
||||||
|
|
||||||
@@ -399,10 +409,14 @@ public class InferenceDetailDto {
|
|||||||
public static class InferenceBatchSheet {
|
public static class InferenceBatchSheet {
|
||||||
|
|
||||||
private Long id;
|
private Long id;
|
||||||
|
private UUID uuid;
|
||||||
private Long m1BatchId;
|
private Long m1BatchId;
|
||||||
private Long m2BatchId;
|
private Long m2BatchId;
|
||||||
private Long m3BatchId;
|
private Long m3BatchId;
|
||||||
private String status;
|
private String status;
|
||||||
private String runningModelType;
|
private String runningModelType;
|
||||||
|
private UUID m1ModelUuid;
|
||||||
|
private UUID m2ModelUuid;
|
||||||
|
private UUID m3ModelUuid;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,36 +11,36 @@ import lombok.Setter;
|
|||||||
public class InferenceProgressDto {
|
public class InferenceProgressDto {
|
||||||
|
|
||||||
private InferenceProgressDto.pred_requests_areas pred_requests_areas;
|
private InferenceProgressDto.pred_requests_areas pred_requests_areas;
|
||||||
private String model1_version;
|
private String modelVersion;
|
||||||
private String model2_version;
|
private String cdModelPath;
|
||||||
private String model3_version;
|
private String cdModelFileName;
|
||||||
private String cd_model_path;
|
private String cdModelConfigPath;
|
||||||
private String cd_model_config;
|
private String cdModelConfigFileName;
|
||||||
private String cls_model_path;
|
private String cdModelClsPath;
|
||||||
private String cls_model_version;
|
private String cdModelClsFileName;
|
||||||
private String cd_model_type;
|
private String clsModelVersion;
|
||||||
private Integer priority;
|
private Integer priority;
|
||||||
|
|
||||||
public InferenceProgressDto(
|
public InferenceProgressDto(
|
||||||
InferenceProgressDto.pred_requests_areas pred_requests_areas,
|
InferenceProgressDto.pred_requests_areas pred_requests_areas,
|
||||||
String model1_version,
|
String modelVersion,
|
||||||
String model2_version,
|
String cdModelPath,
|
||||||
String model3_version,
|
String cdModelFileName,
|
||||||
String cd_model_path,
|
String cdModelConfigPath,
|
||||||
String cd_model_config,
|
String cdModelConfigFileName,
|
||||||
String cls_model_path,
|
String cdModelClsPath,
|
||||||
String cls_model_version,
|
String cdModelClsFileName,
|
||||||
String cd_model_type,
|
String clsModelVersion,
|
||||||
Integer priority) {
|
Integer priority) {
|
||||||
this.pred_requests_areas = pred_requests_areas;
|
this.pred_requests_areas = pred_requests_areas;
|
||||||
this.model1_version = model1_version;
|
this.modelVersion = modelVersion;
|
||||||
this.model2_version = model2_version;
|
this.cdModelPath = cdModelPath;
|
||||||
this.model3_version = model3_version;
|
this.cdModelFileName = cdModelFileName;
|
||||||
this.cd_model_path = cd_model_path;
|
this.cdModelConfigPath = cdModelConfigPath;
|
||||||
this.cd_model_config = cd_model_config;
|
this.cdModelConfigFileName = cdModelConfigFileName;
|
||||||
this.cls_model_path = cls_model_path;
|
this.cdModelClsPath = cdModelClsPath;
|
||||||
this.cls_model_version = cls_model_version;
|
this.cdModelClsFileName = cdModelClsFileName;
|
||||||
this.cd_model_type = cd_model_type;
|
this.clsModelVersion = clsModelVersion;
|
||||||
this.priority = priority;
|
this.priority = priority;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -22,7 +22,9 @@ import org.springframework.data.domain.Pageable;
|
|||||||
|
|
||||||
public class InferenceResultDto {
|
public class InferenceResultDto {
|
||||||
|
|
||||||
/** 목록조회 dto */
|
/**
|
||||||
|
* 목록조회 dto
|
||||||
|
*/
|
||||||
@Getter
|
@Getter
|
||||||
@Setter
|
@Setter
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
@@ -34,11 +36,15 @@ public class InferenceResultDto {
|
|||||||
private String status;
|
private String status;
|
||||||
private String mapSheetCnt;
|
private String mapSheetCnt;
|
||||||
private Long detectingCnt;
|
private Long detectingCnt;
|
||||||
@JsonFormatDttm private ZonedDateTime startTime;
|
@JsonFormatDttm
|
||||||
@JsonFormatDttm private ZonedDateTime endTime;
|
private ZonedDateTime startTime;
|
||||||
@JsonFormatDttm private ZonedDateTime elapsedTime;
|
@JsonFormatDttm
|
||||||
|
private ZonedDateTime endTime;
|
||||||
|
@JsonFormatDttm
|
||||||
|
private ZonedDateTime elapsedTime;
|
||||||
private Boolean applyYn;
|
private Boolean applyYn;
|
||||||
@JsonFormatDttm private ZonedDateTime applyDttm;
|
@JsonFormatDttm
|
||||||
|
private ZonedDateTime applyDttm;
|
||||||
|
|
||||||
@JsonProperty("statusName")
|
@JsonProperty("statusName")
|
||||||
public String statusName() {
|
public String statusName() {
|
||||||
@@ -46,7 +52,9 @@ public class InferenceResultDto {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 목록조회 검색 조건 dto */
|
/**
|
||||||
|
* 목록조회 검색 조건 dto
|
||||||
|
*/
|
||||||
@Getter
|
@Getter
|
||||||
@Setter
|
@Setter
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
@@ -68,7 +76,9 @@ public class InferenceResultDto {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 탐지 데이터 옵션 dto */
|
/**
|
||||||
|
* 탐지 데이터 옵션 dto
|
||||||
|
*/
|
||||||
@Getter
|
@Getter
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
public enum MapSheetScope implements EnumType {
|
public enum MapSheetScope implements EnumType {
|
||||||
@@ -89,7 +99,9 @@ public class InferenceResultDto {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 분석대상 도엽 enum */
|
/**
|
||||||
|
* 분석대상 도엽 enum
|
||||||
|
*/
|
||||||
@Getter
|
@Getter
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
public enum DetectOption implements EnumType {
|
public enum DetectOption implements EnumType {
|
||||||
@@ -137,7 +149,9 @@ public class InferenceResultDto {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** 변화탐지 실행 정보 저장 요청 정보 */
|
/**
|
||||||
|
* 변화탐지 실행 정보 저장 요청 정보
|
||||||
|
*/
|
||||||
@Getter
|
@Getter
|
||||||
@Setter
|
@Setter
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
@@ -200,13 +214,16 @@ public class InferenceResultDto {
|
|||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
public static class InferenceStatusDetailDto {
|
public static class InferenceStatusDetailDto {
|
||||||
|
|
||||||
private String title;
|
private String title;
|
||||||
private Integer compareYyyy;
|
private Integer compareYyyy;
|
||||||
private Integer targetYyyy;
|
private Integer targetYyyy;
|
||||||
private String detectOption;
|
private String detectOption;
|
||||||
private String mapSheetScope;
|
private String mapSheetScope;
|
||||||
@JsonFormatDttm private ZonedDateTime inferStartDttm;
|
@JsonFormatDttm
|
||||||
@JsonFormatDttm private ZonedDateTime inferEndDttm;
|
private ZonedDateTime inferStartDttm;
|
||||||
|
@JsonFormatDttm
|
||||||
|
private ZonedDateTime inferEndDttm;
|
||||||
private Long detectingCnt;
|
private Long detectingCnt;
|
||||||
|
|
||||||
private String model1Ver;
|
private String model1Ver;
|
||||||
@@ -248,12 +265,16 @@ public class InferenceResultDto {
|
|||||||
private String model4VerStatusName = "진행중";
|
private String model4VerStatusName = "진행중";
|
||||||
|
|
||||||
public String getDetectOptionName() {
|
public String getDetectOptionName() {
|
||||||
if (this.detectOption.equals("EXCL")) return "추론제외";
|
if (this.detectOption.equals("EXCL")) {
|
||||||
|
return "추론제외";
|
||||||
|
}
|
||||||
return "이전 년도 도엽 사용";
|
return "이전 년도 도엽 사용";
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getMapSheetScopeName() {
|
public String getMapSheetScopeName() {
|
||||||
if (this.detectOption.equals("ALL")) return "전체";
|
if (this.detectOption.equals("ALL")) {
|
||||||
|
return "전체";
|
||||||
|
}
|
||||||
return "부분";
|
return "부분";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -265,9 +286,12 @@ public class InferenceResultDto {
|
|||||||
public static class InferenceServerStatusDto {
|
public static class InferenceServerStatusDto {
|
||||||
|
|
||||||
private String serverName;
|
private String serverName;
|
||||||
@JsonIgnore private float cpu_user;
|
@JsonIgnore
|
||||||
@JsonIgnore private float cpu_system;
|
private float cpu_user;
|
||||||
@JsonIgnore private float memused;
|
@JsonIgnore
|
||||||
|
private float cpu_system;
|
||||||
|
@JsonIgnore
|
||||||
|
private float memused;
|
||||||
private Long kbmemused;
|
private Long kbmemused;
|
||||||
private float gpuUtil;
|
private float gpuUtil;
|
||||||
|
|
||||||
@@ -372,7 +396,13 @@ public class InferenceResultDto {
|
|||||||
private String status;
|
private String status;
|
||||||
private String type;
|
private String type;
|
||||||
private ZonedDateTime inferStartDttm;
|
private ZonedDateTime inferStartDttm;
|
||||||
|
private ZonedDateTime inferEndDttm;
|
||||||
|
private Long detectEndCnt;
|
||||||
private String modelComparePath;
|
private String modelComparePath;
|
||||||
private String modelTargetPath;
|
private String modelTargetPath;
|
||||||
|
private String modelModelPath;
|
||||||
|
private ZonedDateTime modelStartDttm;
|
||||||
|
private ZonedDateTime modelEndDttm;
|
||||||
|
private Long updateUid;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -212,6 +212,7 @@ public class InferenceResultService {
|
|||||||
saveInferenceAiDto.setInferStartDttm(ZonedDateTime.now());
|
saveInferenceAiDto.setInferStartDttm(ZonedDateTime.now());
|
||||||
saveInferenceAiDto.setModelComparePath(modelComparePath);
|
saveInferenceAiDto.setModelComparePath(modelComparePath);
|
||||||
saveInferenceAiDto.setModelTargetPath(modelTargetPath);
|
saveInferenceAiDto.setModelTargetPath(modelTargetPath);
|
||||||
|
saveInferenceAiDto.setModelStartDttm(ZonedDateTime.now());
|
||||||
inferenceResultCoreService.update(saveInferenceAiDto);
|
inferenceResultCoreService.update(saveInferenceAiDto);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -253,7 +254,8 @@ public class InferenceResultService {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
List<Map<String, Object>> list =
|
List<Map<String, Object>> list =
|
||||||
om.readValue(body, new TypeReference<List<Map<String, Object>>>() {});
|
om.readValue(body, new TypeReference<List<Map<String, Object>>>() {
|
||||||
|
});
|
||||||
|
|
||||||
Integer batchIdInt = (Integer) list.get(0).get("batch_id");
|
Integer batchIdInt = (Integer) list.get(0).get("batch_id");
|
||||||
batchId = batchIdInt.longValue();
|
batchId = batchIdInt.longValue();
|
||||||
@@ -412,8 +414,11 @@ public class InferenceResultService {
|
|||||||
|
|
||||||
String serverNames = "";
|
String serverNames = "";
|
||||||
for (InferenceServerStatusDto server : servers) {
|
for (InferenceServerStatusDto server : servers) {
|
||||||
if (serverNames.equals("")) serverNames = server.getServerName();
|
if (serverNames.equals("")) {
|
||||||
else serverNames = serverNames + "," + server.getServerName();
|
serverNames = server.getServerName();
|
||||||
|
} else {
|
||||||
|
serverNames = serverNames + "," + server.getServerName();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
InferenceStatusDetailDto dto = inferenceResultCoreService.getInferenceStatus(uuid);
|
InferenceStatusDetailDto dto = inferenceResultCoreService.getInferenceStatus(uuid);
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto;
|
|||||||
import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto.Dashboard;
|
import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto.Dashboard;
|
||||||
import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto.InferenceBatchSheet;
|
import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto.InferenceBatchSheet;
|
||||||
import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto.MapSheet;
|
import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto.MapSheet;
|
||||||
|
import com.kamco.cd.kamcoback.inference.dto.InferenceProgressDto;
|
||||||
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto;
|
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto;
|
||||||
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.InferenceServerStatusDto;
|
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.InferenceServerStatusDto;
|
||||||
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.InferenceStatusDetailDto;
|
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.InferenceStatusDetailDto;
|
||||||
@@ -24,6 +25,7 @@ import com.kamco.cd.kamcoback.postgres.repository.scene.MapInkx5kRepository;
|
|||||||
import jakarta.persistence.EntityManager;
|
import jakarta.persistence.EntityManager;
|
||||||
import jakarta.persistence.EntityNotFoundException;
|
import jakarta.persistence.EntityNotFoundException;
|
||||||
import jakarta.validation.constraints.NotNull;
|
import jakarta.validation.constraints.NotNull;
|
||||||
|
import java.time.ZonedDateTime;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
@@ -229,16 +231,46 @@ public class InferenceResultCoreService {
|
|||||||
|
|
||||||
if (request.getType().equals("M1")) {
|
if (request.getType().equals("M1")) {
|
||||||
entity.setM1ModelBatchId(request.getBatchId());
|
entity.setM1ModelBatchId(request.getBatchId());
|
||||||
|
|
||||||
|
if (request.getModelStartDttm() != null) {
|
||||||
|
entity.setM1ModelStartDttm(request.getModelStartDttm());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (request.getModelEndDttm() != null) {
|
||||||
|
entity.setM1ModelEndDttm(request.getModelEndDttm());
|
||||||
|
}
|
||||||
|
|
||||||
} else if (request.getType().equals("M2")) {
|
} else if (request.getType().equals("M2")) {
|
||||||
entity.setM2ModelBatchId(request.getBatchId());
|
entity.setM2ModelBatchId(request.getBatchId());
|
||||||
|
|
||||||
|
if (request.getModelStartDttm() != null) {
|
||||||
|
entity.setM2ModelStartDttm(request.getModelStartDttm());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (request.getModelEndDttm() != null) {
|
||||||
|
entity.setM2ModelEndDttm(request.getModelEndDttm());
|
||||||
|
}
|
||||||
|
|
||||||
} else if (request.getType().equals("M3")) {
|
} else if (request.getType().equals("M3")) {
|
||||||
entity.setM3ModelBatchId(request.getBatchId());
|
entity.setM3ModelBatchId(request.getBatchId());
|
||||||
|
|
||||||
|
if (request.getModelStartDttm() != null) {
|
||||||
|
entity.setM3ModelStartDttm(request.getModelStartDttm());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (request.getModelEndDttm() != null) {
|
||||||
|
entity.setM3ModelEndDttm(request.getModelEndDttm());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (request.getInferStartDttm() != null) {
|
if (request.getInferStartDttm() != null) {
|
||||||
entity.setInferStartDttm(request.getInferStartDttm());
|
entity.setInferStartDttm(request.getInferStartDttm());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (request.getInferEndDttm() != null) {
|
||||||
|
entity.setInferEndDttm(request.getInferEndDttm());
|
||||||
|
}
|
||||||
|
|
||||||
if (request.getModelComparePath() != null) {
|
if (request.getModelComparePath() != null) {
|
||||||
entity.setModelComparePath(request.getModelComparePath());
|
entity.setModelComparePath(request.getModelComparePath());
|
||||||
}
|
}
|
||||||
@@ -247,10 +279,26 @@ public class InferenceResultCoreService {
|
|||||||
entity.setModelTargetPath(request.getModelTargetPath());
|
entity.setModelTargetPath(request.getModelTargetPath());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (request.getDetectEndCnt() != null) {
|
||||||
|
entity.setDetectEndCnt(request.getDetectEndCnt());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (request.getType() != null) {
|
||||||
entity.setRunningModelType(request.getType());
|
entity.setRunningModelType(request.getType());
|
||||||
|
}
|
||||||
|
|
||||||
|
if (request.getStatus() != null) {
|
||||||
entity.setStatus(request.getStatus());
|
entity.setStatus(request.getStatus());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (request.getUpdateUid() != null) {
|
||||||
|
entity.setUpdatedUid(request.getUpdateUid());
|
||||||
|
}
|
||||||
|
|
||||||
|
entity.setUpdatedDttm(ZonedDateTime.now());
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
public List<InferenceServerStatusDto> getInferenceServerStatusList() {
|
public List<InferenceServerStatusDto> getInferenceServerStatusList() {
|
||||||
return mapSheetLearnRepository.getInferenceServerStatusList();
|
return mapSheetLearnRepository.getInferenceServerStatusList();
|
||||||
}
|
}
|
||||||
@@ -263,17 +311,20 @@ public class InferenceResultCoreService {
|
|||||||
|
|
||||||
InferenceBatchSheet inferenceBatchSheet = new InferenceBatchSheet();
|
InferenceBatchSheet inferenceBatchSheet = new InferenceBatchSheet();
|
||||||
inferenceBatchSheet.setId(entity.getId());
|
inferenceBatchSheet.setId(entity.getId());
|
||||||
|
inferenceBatchSheet.setUuid(entity.getUuid());
|
||||||
inferenceBatchSheet.setM1BatchId(entity.getM1ModelBatchId());
|
inferenceBatchSheet.setM1BatchId(entity.getM1ModelBatchId());
|
||||||
inferenceBatchSheet.setM2BatchId(entity.getM2ModelBatchId());
|
inferenceBatchSheet.setM2BatchId(entity.getM2ModelBatchId());
|
||||||
inferenceBatchSheet.setM3BatchId(entity.getM3ModelBatchId());
|
inferenceBatchSheet.setM3BatchId(entity.getM3ModelBatchId());
|
||||||
inferenceBatchSheet.setStatus(entity.getStatus());
|
inferenceBatchSheet.setStatus(entity.getStatus());
|
||||||
inferenceBatchSheet.setRunningModelType(entity.getRunningModelType());
|
inferenceBatchSheet.setRunningModelType(entity.getRunningModelType());
|
||||||
|
inferenceBatchSheet.setM1ModelUuid(entity.getM1ModelUuid());
|
||||||
|
inferenceBatchSheet.setM2ModelUuid(entity.getM2ModelUuid());
|
||||||
|
inferenceBatchSheet.setM3ModelUuid(entity.getM3ModelUuid());
|
||||||
return inferenceBatchSheet;
|
return inferenceBatchSheet;
|
||||||
}
|
}
|
||||||
|
|
||||||
public SaveInferenceAiDto getInferenceAiResultById(Long id) {
|
public InferenceProgressDto getInferenceAiResultById(Long id, String type, UUID modelUuid) {
|
||||||
|
return mapSheetLearnRepository.getInferenceAiResultById(id, modelUuid);
|
||||||
return null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public InferenceStatusDetailDto getInferenceStatus(UUID uuid) {
|
public InferenceStatusDetailDto getInferenceStatus(UUID uuid) {
|
||||||
|
|||||||
@@ -124,6 +124,19 @@ public class MapSheetLearnEntity {
|
|||||||
@Column(name = "model_target_path")
|
@Column(name = "model_target_path")
|
||||||
private String modelTargetPath;
|
private String modelTargetPath;
|
||||||
|
|
||||||
|
@Column(name = "m1_model_start_dttm")
|
||||||
|
private ZonedDateTime m1ModelStartDttm;
|
||||||
|
@Column(name = "m2_model_start_dttm")
|
||||||
|
private ZonedDateTime m2ModelStartDttm;
|
||||||
|
@Column(name = "m3_model_start_dttm")
|
||||||
|
private ZonedDateTime m3ModelStartDttm;
|
||||||
|
@Column(name = "m1_model_end_dttm")
|
||||||
|
private ZonedDateTime m1ModelEndDttm;
|
||||||
|
@Column(name = "m2_model_end_dttm")
|
||||||
|
private ZonedDateTime m2ModelEndDttm;
|
||||||
|
@Column(name = "m3_model_end_dttm")
|
||||||
|
private ZonedDateTime m3ModelEndDttm;
|
||||||
|
|
||||||
public InferenceResultDto.ResultList toDto() {
|
public InferenceResultDto.ResultList toDto() {
|
||||||
return new InferenceResultDto.ResultList(
|
return new InferenceResultDto.ResultList(
|
||||||
this.uuid,
|
this.uuid,
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ public interface MapSheetLearnRepositoryCustom {
|
|||||||
|
|
||||||
Optional<MapSheetLearnEntity> getInferenceResultByStatus(String status);
|
Optional<MapSheetLearnEntity> getInferenceResultByStatus(String status);
|
||||||
|
|
||||||
Optional<InferenceProgressDto> getInferenceAiResultById(Long id);
|
InferenceProgressDto getInferenceAiResultById(Long id, UUID modelUuid);
|
||||||
|
|
||||||
public InferenceStatusDetailDto getInferenceStatus(UUID uuid);
|
public InferenceStatusDetailDto getInferenceStatus(UUID uuid);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -188,32 +188,35 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Optional<InferenceProgressDto> getInferenceAiResultById(Long id) {
|
public InferenceProgressDto getInferenceAiResultById(Long id, UUID modelUuid) {
|
||||||
// InferenceProgressDto dto =
|
|
||||||
// queryFactory
|
QModelMngEntity model = new QModelMngEntity("model");
|
||||||
// .select(
|
|
||||||
// Projections.constructor(
|
InferenceProgressDto dto =
|
||||||
// InferenceProgressDto.class,
|
queryFactory
|
||||||
// Projections.constructor(
|
.select(
|
||||||
// InferenceProgressDto.pred_requests_areas.class,
|
Projections.constructor(
|
||||||
// mapSheetLearnEntity.compareYyyy,
|
InferenceProgressDto.class,
|
||||||
// mapSheetLearnEntity.targetYyyy,
|
Projections.constructor(
|
||||||
// mapSheetLearnEntity.modelComparePath,
|
InferenceProgressDto.pred_requests_areas.class,
|
||||||
// mapSheetLearnEntity.modelTargetPath
|
mapSheetLearnEntity.compareYyyy,
|
||||||
// ),
|
mapSheetLearnEntity.targetYyyy,
|
||||||
// modelMngEntity.uuid.eq(mapSheetLearnEntity.m1ModelUuid).as("m1ModelUuid"),
|
mapSheetLearnEntity.modelComparePath,
|
||||||
// modelMngEntity.uuid.eq(mapSheetLearnEntity.m2ModelUuid).as("m2ModelUuid"),
|
mapSheetLearnEntity.modelTargetPath),
|
||||||
// mapSheetLearnEntity.cdModelPath,
|
model.modelVer.as("modelVer"),
|
||||||
// mapSheetLearnEntity.cdModelConfig,
|
model.cdModelPath.as("cdModelPath"),
|
||||||
// mapSheetLearnEntity.clsModelPath,
|
model.cdModelFileName.as("cdModelFileName"),
|
||||||
// mapSheetLearnEntity.clsModelVersion,
|
model.cdModelConfigPath.as("cdModelConfigPath"),
|
||||||
// mapSheetLearnEntity.cdModelType,
|
model.cdModelConfigFileName.as("cdModelConfigFileName"),
|
||||||
// mapSheetLearnEntity.priority
|
model.clsModelPath,
|
||||||
// )
|
model.clsModelFileName,
|
||||||
// )
|
model.clsModelVersion
|
||||||
// .from(mapSheetLearnEntity)
|
))
|
||||||
// .where(mapSheetLearnEntity.id.eq(id))
|
.from(mapSheetLearnEntity)
|
||||||
// .fetchOne();
|
.join(model)
|
||||||
return Optional.empty();
|
.on(model.uuid.eq(modelUuid))
|
||||||
|
.where(mapSheetLearnEntity.id.eq(id))
|
||||||
|
.fetchOne();
|
||||||
|
return dto;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,19 +1,30 @@
|
|||||||
package com.kamco.cd.kamcoback.scheduler.service;
|
package com.kamco.cd.kamcoback.scheduler.service;
|
||||||
|
|
||||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||||
|
import com.fasterxml.jackson.core.type.TypeReference;
|
||||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
|
import com.kamco.cd.kamcoback.common.exception.CustomApiException;
|
||||||
import com.kamco.cd.kamcoback.config.resttemplate.ExternalHttpClient;
|
import com.kamco.cd.kamcoback.config.resttemplate.ExternalHttpClient;
|
||||||
import com.kamco.cd.kamcoback.config.resttemplate.ExternalHttpClient.ExternalCallResult;
|
import com.kamco.cd.kamcoback.config.resttemplate.ExternalHttpClient.ExternalCallResult;
|
||||||
import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto.InferenceBatchSheet;
|
import com.kamco.cd.kamcoback.inference.dto.InferenceDetailDto.InferenceBatchSheet;
|
||||||
|
import com.kamco.cd.kamcoback.inference.dto.InferenceProgressDto;
|
||||||
|
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.SaveInferenceAiDto;
|
||||||
import com.kamco.cd.kamcoback.inference.dto.InferenceResultDto.Status;
|
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.postgres.core.InferenceResultCoreService;
|
import com.kamco.cd.kamcoback.postgres.core.InferenceResultCoreService;
|
||||||
import com.kamco.cd.kamcoback.scheduler.dto.JobStatusDto;
|
import com.kamco.cd.kamcoback.scheduler.dto.JobStatusDto;
|
||||||
|
import jakarta.transaction.Transactional;
|
||||||
|
import java.time.ZonedDateTime;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.UUID;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.log4j.Log4j2;
|
import lombok.extern.log4j.Log4j2;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.http.HttpHeaders;
|
import org.springframework.http.HttpHeaders;
|
||||||
import org.springframework.http.HttpMethod;
|
import org.springframework.http.HttpMethod;
|
||||||
|
import org.springframework.http.HttpStatus;
|
||||||
import org.springframework.http.MediaType;
|
import org.springframework.http.MediaType;
|
||||||
import org.springframework.scheduling.annotation.Scheduled;
|
import org.springframework.scheduling.annotation.Scheduled;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
@@ -31,7 +42,14 @@ public class MapSheetInferenceJobService {
|
|||||||
@Value("${inference.batch-url}")
|
@Value("${inference.batch-url}")
|
||||||
private String batchUrl;
|
private String batchUrl;
|
||||||
|
|
||||||
|
@Value("${spring.profiles.active}")
|
||||||
|
private String profile;
|
||||||
|
|
||||||
|
@Value("${inference.url}")
|
||||||
|
private String inferenceUrl;
|
||||||
|
|
||||||
@Scheduled(fixedDelay = 60_000)
|
@Scheduled(fixedDelay = 60_000)
|
||||||
|
@Transactional
|
||||||
public void runBatch() {
|
public void runBatch() {
|
||||||
log.info("1분 배치 시작");
|
log.info("1분 배치 시작");
|
||||||
|
|
||||||
@@ -80,19 +98,34 @@ public class MapSheetInferenceJobService {
|
|||||||
String type = batchSheet.getRunningModelType();
|
String type = batchSheet.getRunningModelType();
|
||||||
|
|
||||||
if (type.equals("M1")) {
|
if (type.equals("M1")) {
|
||||||
|
// M1 완료되었으면 M2 실행
|
||||||
|
this.startInference(batchSheet.getId(), batchSheet.getUuid(), "M2", batchSheet.getM2ModelUuid());
|
||||||
|
// 종료시간
|
||||||
|
this.updateProcessingEndTimeByModel(batchSheet.getUuid(), ZonedDateTime.now(), "M1");
|
||||||
} else if (type.equals("M2")) {
|
} else if (type.equals("M2")) {
|
||||||
|
// M1 완료되었으면 M3 실행
|
||||||
|
this.startInference(batchSheet.getId(), batchSheet.getUuid(), "M3", batchSheet.getM3ModelUuid());
|
||||||
|
// 종료시간
|
||||||
|
this.updateProcessingEndTimeByModel(batchSheet.getUuid(), ZonedDateTime.now(), "M2");
|
||||||
} else if (type.equals("M3")) {
|
} else if (type.equals("M3")) {
|
||||||
|
// 완료
|
||||||
|
SaveInferenceAiDto saveInferenceAiDto = new SaveInferenceAiDto();
|
||||||
|
saveInferenceAiDto.setUuid(batchSheet.getUuid());
|
||||||
|
saveInferenceAiDto.setStatus(Status.END.getId());
|
||||||
|
saveInferenceAiDto.setInferEndDttm(ZonedDateTime.now());
|
||||||
|
inferenceResultCoreService.update(saveInferenceAiDto);
|
||||||
|
// 종료시간
|
||||||
|
this.updateProcessingEndTimeByModel(batchSheet.getUuid(), ZonedDateTime.now(), "M3");
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
SaveInferenceAiDto saveInferenceAiDto = new SaveInferenceAiDto();
|
||||||
|
saveInferenceAiDto.setUuid(batchSheet.getUuid());
|
||||||
|
saveInferenceAiDto.setStatus(Status.IN_PROGRESS.getId());
|
||||||
|
saveInferenceAiDto.setDetectEndCnt(dto.getCompletedJobs().longValue());
|
||||||
|
inferenceResultCoreService.update(saveInferenceAiDto);
|
||||||
}
|
}
|
||||||
|
|
||||||
System.out.println(dto);
|
} catch (JsonProcessingException e) {
|
||||||
|
|
||||||
Thread.sleep(3000); // 예시: 처리 시간 3초
|
|
||||||
|
|
||||||
} catch (InterruptedException | JsonProcessingException e) {
|
|
||||||
Thread.currentThread().interrupt();
|
Thread.currentThread().interrupt();
|
||||||
log.error("배치 중 인터럽트 발생", e);
|
log.error("배치 중 인터럽트 발생", e);
|
||||||
}
|
}
|
||||||
@@ -100,44 +133,92 @@ public class MapSheetInferenceJobService {
|
|||||||
log.info("1분 배치 종료");
|
log.info("1분 배치 종료");
|
||||||
}
|
}
|
||||||
|
|
||||||
private void startInference(Long id, String type) {
|
private void startInference(Long id, UUID uuid, String type, UUID modelUuid) {
|
||||||
// InferenceResultDto.SaveInferenceAiDto req
|
|
||||||
// inferenceResultCoreService.getInferenceResultByU
|
InferenceProgressDto progressDto = inferenceResultCoreService.getInferenceAiResultById(id, type, modelUuid);
|
||||||
//
|
|
||||||
// List<MapSheetNumDto> mapSheetNum = req.getMapSheetNum();
|
pred_requests_areas predRequestsAreas = new pred_requests_areas();
|
||||||
// List<String> mapSheetNumList = new ArrayList<>();
|
predRequestsAreas.setInput1_year(progressDto.getPred_requests_areas().getInput1_year());
|
||||||
//
|
predRequestsAreas.setInput2_year(progressDto.getPred_requests_areas().getInput2_year());
|
||||||
// for (MapSheetNumDto mapSheetDto : mapSheetNum) {
|
predRequestsAreas.setInput1_scene_path(progressDto.getPred_requests_areas().getInput1_scene_path());
|
||||||
// mapSheetNumList.add(mapSheetDto.getMapSheetNum());
|
predRequestsAreas.setInput2_scene_path(progressDto.getPred_requests_areas().getInput2_scene_path());
|
||||||
// }
|
|
||||||
//
|
InferenceSendDto m = new InferenceSendDto();
|
||||||
// String modelComparePath =
|
m.setModel_version(progressDto.getModelVersion());
|
||||||
// this.getSceneInference(String.valueOf(req.getCompareYyyy()), mapSheetNumList);
|
m.setCd_model_path(progressDto.getCdModelPath() + "/" + progressDto.getCdModelFileName());
|
||||||
// String modelTargetPath =
|
m.setCd_model_config(progressDto.getCdModelConfigPath() + "/" + progressDto.getCdModelConfigFileName());
|
||||||
// this.getSceneInference(String.valueOf(req.getTargetYyyy()), mapSheetNumList);
|
m.setCls_model_path(progressDto.getCdModelClsPath() + "/" + progressDto.getCdModelClsFileName());
|
||||||
//
|
m.setCls_model_version(progressDto.getClsModelVersion());
|
||||||
// pred_requests_areas predRequestsAreas = new pred_requests_areas();
|
m.setCd_model_type(type);
|
||||||
// predRequestsAreas.setInput1_year(req.getCompareYyyy());
|
m.setPriority(progressDto.getPriority());
|
||||||
// predRequestsAreas.setInput2_year(req.getTargetYyyy());
|
|
||||||
// predRequestsAreas.setInput1_scene_path(modelComparePath);
|
// 추론 다음모델 실행
|
||||||
// predRequestsAreas.setInput2_scene_path(modelTargetPath);
|
Long batchId = this.ensureAccepted(m);
|
||||||
//
|
|
||||||
// InferenceSendDto m1 = this.getModelInfo(req.getModel1Uuid());
|
SaveInferenceAiDto saveInferenceAiDto = new SaveInferenceAiDto();
|
||||||
// InferenceSendDto m2 = this.getModelInfo(req.getModel2Uuid());
|
saveInferenceAiDto.setUuid(uuid);
|
||||||
// InferenceSendDto m3 = this.getModelInfo(req.getModel3Uuid());
|
saveInferenceAiDto.setBatchId(batchId);
|
||||||
//
|
saveInferenceAiDto.setStatus(Status.IN_PROGRESS.getId());
|
||||||
// m1.setPred_requests_areas(predRequestsAreas);
|
saveInferenceAiDto.setType(type);
|
||||||
// m2.setPred_requests_areas(predRequestsAreas);
|
saveInferenceAiDto.setModelStartDttm(ZonedDateTime.now());
|
||||||
// m3.setPred_requests_areas(predRequestsAreas);
|
inferenceResultCoreService.update(saveInferenceAiDto);
|
||||||
//
|
}
|
||||||
// Long batchId = this.ensureAccepted(m1);
|
|
||||||
//
|
private Long ensureAccepted(InferenceSendDto dto) {
|
||||||
// SaveInferenceAiDto saveInferenceAiDto = new SaveInferenceAiDto();
|
log.info("dto null? {}", dto == null);
|
||||||
// saveInferenceAiDto.setUuid(uuid);
|
ObjectMapper om = new ObjectMapper();
|
||||||
// saveInferenceAiDto.setBatchId(batchId);
|
try {
|
||||||
// saveInferenceAiDto.setStatus(Status.IN_PROGRESS.getId());
|
log.info("dto json={}", om.writeValueAsString(dto));
|
||||||
// saveInferenceAiDto.setType("M1");
|
} catch (Exception e) {
|
||||||
// saveInferenceAiDto.setInferStartDttm(ZonedDateTime.now());
|
log.error(e.getMessage());
|
||||||
// inferenceResultCoreService.update(saveInferenceAiDto);
|
}
|
||||||
|
|
||||||
|
HttpHeaders headers = new HttpHeaders();
|
||||||
|
headers.setContentType(MediaType.APPLICATION_JSON);
|
||||||
|
headers.setAccept(List.of(MediaType.APPLICATION_JSON));
|
||||||
|
|
||||||
|
// TODO 추후 삭제
|
||||||
|
if ("local".equals(profile)) {
|
||||||
|
dto.getPred_requests_areas().setInput1_scene_path("/kamco-nfs/requests/2023_local.geojson");
|
||||||
|
dto.getPred_requests_areas().setInput2_scene_path("/kamco-nfs/requests/2024_local.geojson");
|
||||||
|
}
|
||||||
|
|
||||||
|
ExternalCallResult<String> result =
|
||||||
|
externalHttpClient.call(inferenceUrl, HttpMethod.POST, dto, headers, String.class);
|
||||||
|
|
||||||
|
int status = result.statusCode();
|
||||||
|
String body = result.body();
|
||||||
|
|
||||||
|
if (status < 200 || status >= 300) {
|
||||||
|
throw new CustomApiException("BAD_GATEWAY", HttpStatus.BAD_GATEWAY);
|
||||||
|
}
|
||||||
|
|
||||||
|
Long batchId = 0L;
|
||||||
|
|
||||||
|
try {
|
||||||
|
List<Map<String, Object>> list =
|
||||||
|
om.readValue(body, new TypeReference<List<Map<String, Object>>>() {
|
||||||
|
});
|
||||||
|
|
||||||
|
Integer batchIdInt = (Integer) list.get(0).get("batch_id");
|
||||||
|
batchId = batchIdInt.longValue();
|
||||||
|
if (list.isEmpty()) {
|
||||||
|
throw new IllegalStateException("Inference response is empty");
|
||||||
|
}
|
||||||
|
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error(e.getMessage());
|
||||||
|
}
|
||||||
|
|
||||||
|
return batchId;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void updateProcessingEndTimeByModel(UUID uuid, ZonedDateTime dateTime, String type) {
|
||||||
|
SaveInferenceAiDto saveInferenceAiDto = new SaveInferenceAiDto();
|
||||||
|
saveInferenceAiDto.setUuid(uuid);
|
||||||
|
saveInferenceAiDto.setUpdateUid(0L);
|
||||||
|
saveInferenceAiDto.setModelEndDttm(dateTime);
|
||||||
|
saveInferenceAiDto.setType(type);
|
||||||
|
inferenceResultCoreService.update(saveInferenceAiDto);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user