From 8fa722011c9b9e82fe9f3aeb11ef6a818532a312 Mon Sep 17 00:00:00 2001 From: teddy Date: Thu, 12 Feb 2026 15:51:54 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EB=AA=A8=EB=8D=B8=EB=93=B1=EB=A1=9D=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../training/model/service/ModelTrainMngService.java | 2 -- .../cd/training/model/service/TmpDatasetService.java | 12 ++++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/kamco/cd/training/model/service/ModelTrainMngService.java b/src/main/java/com/kamco/cd/training/model/service/ModelTrainMngService.java index 3a82566..e7a6dc1 100644 --- a/src/main/java/com/kamco/cd/training/model/service/ModelTrainMngService.java +++ b/src/main/java/com/kamco/cd/training/model/service/ModelTrainMngService.java @@ -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.postgres.core.HyperParamCoreService; import com.kamco.cd.training.postgres.core.ModelTrainMngCoreService; -import com.kamco.cd.training.train.service.TrainJobService; import java.io.IOException; import java.nio.file.Path; import java.util.List; @@ -30,7 +29,6 @@ import org.springframework.transaction.annotation.Transactional; @Slf4j public class ModelTrainMngService { - private final TrainJobService trainJobService; private final ModelTrainMngCoreService modelTrainMngCoreService; private final HyperParamCoreService hyperParamCoreService; private final TmpDatasetService tmpDatasetService; diff --git a/src/main/java/com/kamco/cd/training/model/service/TmpDatasetService.java b/src/main/java/com/kamco/cd/training/model/service/TmpDatasetService.java index c58f135..e707f69 100644 --- a/src/main/java/com/kamco/cd/training/model/service/TmpDatasetService.java +++ b/src/main/java/com/kamco/cd/training/model/service/TmpDatasetService.java @@ -14,14 +14,14 @@ import org.springframework.transaction.annotation.Transactional; @RequiredArgsConstructor public class TmpDatasetService { - @Value("${train.requestDir}") + @Value("${train.docker.requestDir}") private String requestDir; - // 환경에 맞게 yml로 빼는 걸 추천 - private final Path BASE = Paths.get(requestDir); - @Transactional(readOnly = true) - public Path buildTmpDatasetSymlink(String uid, List uids) throws IOException { + public Path buildTmpDatasetSymlink(String uid, List datasetUids) throws IOException { + + // 환경에 맞게 yml로 빼는 걸 추천 + Path BASE = Paths.get(requestDir); Path tmp = BASE.resolve("tmp").resolve(uid); // mkdir -p "$TMP"/train/{input1,input2,label} ... @@ -31,7 +31,7 @@ public class TmpDatasetService { } } - for (String id : uids) { + for (String id : datasetUids) { Path srcRoot = BASE.resolve(id); for (String type : List.of("train", "val")) { From ae055dca1ee231724cf4c8b66ad2a25b819e5277 Mon Sep 17 00:00:00 2001 From: teddy Date: Thu, 12 Feb 2026 16:01:14 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EB=AA=A8=EB=8D=B8=EB=93=B1=EB=A1=9D=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../postgres/repository/model/ModelMngRepositoryImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/kamco/cd/training/postgres/repository/model/ModelMngRepositoryImpl.java b/src/main/java/com/kamco/cd/training/postgres/repository/model/ModelMngRepositoryImpl.java index 3ebbafc..642b6cc 100644 --- a/src/main/java/com/kamco/cd/training/postgres/repository/model/ModelMngRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/training/postgres/repository/model/ModelMngRepositoryImpl.java @@ -45,6 +45,8 @@ public class ModelMngRepositoryImpl implements ModelMngRepositoryCustom { builder.and(modelMasterEntity.modelNo.eq(req.getModelNo())); } + builder.and(modelMasterEntity.delYn.isFalse()); + List content = queryFactory .selectFrom(modelMasterEntity) From 4a0a4e35ed1c2c2537077c014dfcd9a75c73e3c5 Mon Sep 17 00:00:00 2001 From: teddy Date: Thu, 12 Feb 2026 16:12:58 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=ED=95=99=EC=8A=B5=20=EC=8B=A4=ED=96=89=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kamco/cd/training/train/dto/TrainRunRequest.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/java/com/kamco/cd/training/train/dto/TrainRunRequest.java b/src/main/java/com/kamco/cd/training/train/dto/TrainRunRequest.java index e294ce7..5761131 100644 --- a/src/main/java/com/kamco/cd/training/train/dto/TrainRunRequest.java +++ b/src/main/java/com/kamco/cd/training/train/dto/TrainRunRequest.java @@ -15,7 +15,7 @@ public class TrainRunRequest { // ======================== // 기본 // ======================== - private UUID datasetFolder; + private String datasetFolder; private UUID outputFolder; private String inputSize; private String cropSize; @@ -84,10 +84,6 @@ public class TrainRunRequest { private UUID uuid; - public String getDatasetFolder() { - return String.valueOf(this.datasetFolder); - } - public String getOutputFolder() { return String.valueOf(this.outputFolder); }