Merge pull request 'tmp 파일 링크 수정' (#84) from feat/training_260202 into develop
Reviewed-on: #84
This commit was merged in pull request #84.
This commit is contained in:
@@ -12,7 +12,6 @@ import com.kamco.cd.training.model.dto.ModelTrainMngDto;
|
|||||||
import com.kamco.cd.training.model.dto.ModelTrainMngDto.SearchReq;
|
import com.kamco.cd.training.model.dto.ModelTrainMngDto.SearchReq;
|
||||||
import com.kamco.cd.training.postgres.core.HyperParamCoreService;
|
import com.kamco.cd.training.postgres.core.HyperParamCoreService;
|
||||||
import com.kamco.cd.training.postgres.core.ModelTrainMngCoreService;
|
import com.kamco.cd.training.postgres.core.ModelTrainMngCoreService;
|
||||||
import java.io.IOException;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
@@ -93,22 +92,6 @@ public class ModelTrainMngService {
|
|||||||
// 모델 config 저장
|
// 모델 config 저장
|
||||||
modelTrainMngCoreService.saveModelConfig(modelId, req.getModelConfig());
|
modelTrainMngCoreService.saveModelConfig(modelId, req.getModelConfig());
|
||||||
|
|
||||||
UUID tmpUuid = UUID.randomUUID();
|
|
||||||
String raw = tmpUuid.toString().toUpperCase().replace("-", "");
|
|
||||||
|
|
||||||
List<String> uids =
|
|
||||||
modelTrainMngCoreService.findDatasetUid(req.getTrainingDataset().getDatasetList());
|
|
||||||
|
|
||||||
try {
|
|
||||||
// 데이터셋 심볼링크 생성
|
|
||||||
String tmpUid = tmpDatasetService.buildTmpDatasetSymlink(raw, uids);
|
|
||||||
ModelTrainMngDto.UpdateReq updateReq = new ModelTrainMngDto.UpdateReq();
|
|
||||||
updateReq.setRequestPath(tmpUid);
|
|
||||||
modelTrainMngCoreService.updateModelMaster(modelId, updateReq);
|
|
||||||
} catch (IOException e) {
|
|
||||||
throw new RuntimeException(e);
|
|
||||||
}
|
|
||||||
|
|
||||||
return modelUuid;
|
return modelUuid;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -111,16 +111,8 @@ public class ModelTrainMngCoreService {
|
|||||||
entity.setTrainType(addReq.getTrainType()); // 일반, 전이
|
entity.setTrainType(addReq.getTrainType()); // 일반, 전이
|
||||||
entity.setBeforeModelId(addReq.getBeforeModelId());
|
entity.setBeforeModelId(addReq.getBeforeModelId());
|
||||||
|
|
||||||
if (addReq.getIsStart()) {
|
entity.setStatusCd(TrainStatusType.READY.getId());
|
||||||
entity.setModelStep((short) 1);
|
entity.setStep1State(TrainStatusType.READY.getId());
|
||||||
entity.setStatusCd(TrainStatusType.IN_PROGRESS.getId());
|
|
||||||
entity.setStrtDttm(ZonedDateTime.now());
|
|
||||||
entity.setStep1StrtDttm(ZonedDateTime.now());
|
|
||||||
entity.setStep1State(TrainStatusType.IN_PROGRESS.getId());
|
|
||||||
} else {
|
|
||||||
entity.setStatusCd(TrainStatusType.READY.getId());
|
|
||||||
entity.setStep1State(TrainStatusType.READY.getId());
|
|
||||||
}
|
|
||||||
|
|
||||||
entity.setCreatedUid(userUtil.getId());
|
entity.setCreatedUid(userUtil.getId());
|
||||||
ModelMasterEntity resultEntity = modelMngRepository.save(entity);
|
ModelMasterEntity resultEntity = modelMngRepository.save(entity);
|
||||||
|
|||||||
@@ -40,6 +40,7 @@ public class TrainJobService {
|
|||||||
private String responseDir;
|
private String responseDir;
|
||||||
|
|
||||||
public Long getModelIdByUuid(UUID uuid) {
|
public Long getModelIdByUuid(UUID uuid) {
|
||||||
|
createTmpFile(uuid);
|
||||||
return modelTrainMngCoreService.findModelIdByUuid(uuid);
|
return modelTrainMngCoreService.findModelIdByUuid(uuid);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user