Browse Source

优化终止实验bug,流水线转换bug

dev-complex-computation
chenzhihang 1 year ago
parent
commit
ff1d671e54
2 changed files with 10 additions and 8 deletions
  1. +1
    -1
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java
  2. +9
    -7
      ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java

+ 1
- 1
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentInsServiceImpl.java View File

@@ -450,7 +450,7 @@ public class ExperimentInsServiceImpl implements ExperimentInsService {
HashMap queryMap = new HashMap<String, Integer>(); HashMap queryMap = new HashMap<String, Integer>();
queryMap.put("ins_id", experimentIns.getId()); queryMap.put("ins_id", experimentIns.getId());
DatasetTempStorage datasetTempStorage = datasetTempStorageDao.queryByInsId(JSON.toJSONString(queryMap)); DatasetTempStorage datasetTempStorage = datasetTempStorageDao.queryByInsId(JSON.toJSONString(queryMap));
String relativePath = datasetTempStorage.getCreateBy() + "/datasets/" + datasetTempStorage.getRepoId() + "/" + datasetTempStorage.getName() + "/" + datasetTempStorage.getVersion() + "/dataset";
String relativePath = ci4sUsername + "/datasets/" + datasetTempStorage.getRepoId() + "/" + datasetTempStorage.getName() + "/" + datasetTempStorage.getVersion() + "/dataset";
newDatasetService.deleteDatasetVersionNew(datasetTempStorage.getRepoId(), datasetTempStorage.getName(), datasetTempStorage.getCreateBy(), datasetTempStorage.getVersion(), relativePath); newDatasetService.deleteDatasetVersionNew(datasetTempStorage.getRepoId(), datasetTempStorage.getName(), datasetTempStorage.getCreateBy(), datasetTempStorage.getVersion(), relativePath);
} }
} }


+ 9
- 7
ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java View File

@@ -581,13 +581,15 @@ public class ExperimentServiceImpl implements ExperimentService {
if (trainDatasetList != null) { if (trainDatasetList != null) {
List<NewDatasetVo> trainDatasets = new ArrayList<>(); List<NewDatasetVo> trainDatasets = new ArrayList<>();
for (Map<String, Object> dataset : trainDatasetList) { for (Map<String, Object> dataset : trainDatasetList) {
NewDatasetVo newDatasetVo = new NewDatasetVo();
newDatasetVo.setId(Integer.valueOf((String) dataset.get("dataset_id")));
newDatasetVo.setName((String) dataset.get("dataset_name"));
newDatasetVo.setVersion((String) dataset.get("dataset_version"));
newDatasetVo.setIdentifier((String) dataset.get("dataset_identifier"));
newDatasetVo.setOwner((String) dataset.get("owner"));
trainDatasets.add(newDatasetVo);
if(!dataset.containsKey("dataset_ref")) {
NewDatasetVo newDatasetVo = new NewDatasetVo();
newDatasetVo.setId(Integer.valueOf((String) dataset.get("dataset_id")));
newDatasetVo.setName((String) dataset.get("dataset_name"));
newDatasetVo.setVersion((String) dataset.get("dataset_version"));
newDatasetVo.setIdentifier((String) dataset.get("dataset_identifier"));
newDatasetVo.setOwner((String) dataset.get("owner"));
trainDatasets.add(newDatasetVo);
}
} }
modelMetaVo.setTrainDatasets(trainDatasets); modelMetaVo.setTrainDatasets(trainDatasets);
} }


Loading…
Cancel
Save