From 923cd11b7054aa23c2ad4793b5024d4dcb905e2d Mon Sep 17 00:00:00 2001 From: chenzhihang <709011834@qq.com> Date: Tue, 24 Sep 2024 16:50:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E9=AA=8C=E6=A8=A1=E5=9E=8B=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=85=83=E6=95=B0=E6=8D=AE=E8=AE=B0=E5=BD=95=E6=8C=87?= =?UTF-8?q?=E6=A0=87=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dependencydomain/TrainTaskDepency.java | 2 + .../service/impl/ExperimentServiceImpl.java | 77 ++++++++++--------- 2 files changed, 42 insertions(+), 37 deletions(-) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/dependencydomain/TrainTaskDepency.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/dependencydomain/TrainTaskDepency.java index 803ccdbe..534f5fd4 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/dependencydomain/TrainTaskDepency.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/domain/dependencydomain/TrainTaskDepency.java @@ -16,4 +16,6 @@ public class TrainTaskDepency implements Serializable { private Long workflowId; private Integer experimentId; + + private String taskId; } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java index eca66050..6f0947eb 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ExperimentServiceImpl.java @@ -491,6 +491,8 @@ public class ExperimentServiceImpl implements ExperimentService { } private void insertModelDependencyNew(Map dependendcy, Map trainInfo, Map output, String metricRecord, Integer experimentInsId, Long workflowId, Integer experimentId, String experimentName, String globalParam) { + LoginUser loginUser = SecurityUtils.getLoginUser(); + String gitLinkUsername = loginUser.getSysUser().getGitLinkUsername(); Iterator> dependendcyIterator = dependendcy.entrySet().iterator(); Map modelTrain = (Map) trainInfo.get("model_train"); Map modelEvaluate = (Map) trainInfo.get("model_evaluate"); @@ -499,16 +501,16 @@ public class ExperimentServiceImpl implements ExperimentService { while (dependendcyIterator.hasNext()) { ModelsVo modelMetaVo = new ModelsVo(); - ModelDependency1 modelDependency = new ModelDependency1(); Map.Entry entry = dependendcyIterator.next(); Map modelDel = (Map) entry.getValue(); Map source = (Map) modelDel.get("source"); List> test = (List>) modelDel.get("test"); List> target = (List>) modelDel.get("target"); - String sourceTaskId = (String) source.get("task_id"); + String sourceTaskId = (String) source.get("task_id"); Map modelTrainMap = (Map) modelTrain.get(sourceTaskId); + //处理project数据 Map projectMap = (Map) modelTrainMap.get("project"); ProjectDepency projectDepency = new ProjectDepency(); @@ -517,6 +519,7 @@ public class ExperimentServiceImpl implements ExperimentService { projectDepency.setUrl(projectUrl); projectDepency.setName(projectUrl.substring(projectUrl.lastIndexOf('/') + 1, projectUrl.length() - 4)); modelMetaVo.setProjectDepency(projectDepency); + //处理镜像 Map imagesMap = (Map) modelTrainMap.get("image"); modelMetaVo.setImage(imagesMap.get("name")); @@ -536,23 +539,6 @@ public class ExperimentServiceImpl implements ExperimentService { HashMap metricMap = JSON.parseObject(metricRecord, HashMap.class); modelMetaVo.setMetrics(metricMap); - //处理source数据 - List> modelsList = (List>) modelTrainMap.get("models"); - if (modelsList != null) { - Map parentModelMap = modelsList.get(0); - String id = (String) parentModelMap.get("model_id"); - String identifier = (String) parentModelMap.get("model_identifier"); - String version = (String) parentModelMap.get("model_version"); - - HashMap map = new HashMap<>(); - map.put("repoId", id); - map.put("identifier", identifier); - map.put("version", version); - String parentModel = JSON.toJSONString(map); - modelMetaVo.setParentModel(parentModel); - modelDependency.setParentModel(parentModel); - } - //训练数据集 List> trainDatasetList = (List>) modelTrainMap.get("datasets"); if (trainDatasetList != null) { @@ -574,8 +560,32 @@ public class ExperimentServiceImpl implements ExperimentService { trainTask.setInsId(experimentInsId); trainTask.setName(experimentName); trainTask.setExperimentId(experimentId); + trainTask.setTaskId(sourceTaskId); modelMetaVo.setTrainTask(trainTask); + //处理source数据 + List> modelsList = (List>) modelTrainMap.get("models"); + if (modelsList != null) { + Map parentModelMap = modelsList.get(0); + String id = (String) parentModelMap.get("model_id"); + String identifier = (String) parentModelMap.get("model_identifier"); + String version = (String) parentModelMap.get("model_version"); + + HashMap map = new HashMap<>(); + map.put("repoId", id); + map.put("identifier", identifier); + map.put("version", version); + String parentModel = JSON.toJSONString(map); + modelMetaVo.setParentModel(parentModel); + + ModelDependency1 modelDependency = new ModelDependency1(); + modelDependency.setOwner(gitLinkUsername); + modelDependency.setState(Constant.State_building); + modelDependency.setParentModel(parentModel); + modelDependency.setMeta(JSON.toJSONString(modelMetaVo)); + modelDependency1Dao.insert(modelDependency); + } + //处理test数据 if (test != null) { for (Map testMap : test) { @@ -597,8 +607,6 @@ public class ExperimentServiceImpl implements ExperimentService { } //处理target数据 - LoginUser loginUser = SecurityUtils.getLoginUser(); - String gitLinkUsername = loginUser.getSysUser().getGitLinkUsername(); modelMetaVo.setOwner(gitLinkUsername); if (target != null) { for (int i = 0; i < target.size(); i++) { @@ -616,11 +624,6 @@ public class ExperimentServiceImpl implements ExperimentService { modelMetaVo.setVersion((String) targetModel.get("model_version")); modelMetaVo.setOwner(gitLinkUsername); - modelDependency.setRepoId(Integer.valueOf((String) targetModel.get("model_id"))); - modelDependency.setIdentifier((String) targetModel.get("model_identifier")); - modelDependency.setVersion((String) targetModel.get("model_version")); - modelDependency.setModelName((String) targetModel.get("model_name")); - List versionVos = new ArrayList<>(); for (Map outputFile : outputList) { String path = (String) outputFile.get("path"); @@ -635,19 +638,19 @@ public class ExperimentServiceImpl implements ExperimentService { } } modelMetaVo.setModelVersionVos(versionVos); + + ModelDependency1 modelDependency = new ModelDependency1(); + modelDependency.setOwner(gitLinkUsername); + modelDependency.setState(Constant.State_building); + modelDependency.setRepoId(Integer.valueOf((String) targetModel.get("model_id"))); + modelDependency.setIdentifier((String) targetModel.get("model_identifier")); + modelDependency.setVersion((String) targetModel.get("model_version")); + modelDependency.setModelName((String) targetModel.get("model_name")); + String meta = JSON.toJSONString(modelMetaVo); + modelDependency.setMeta(meta); + modelDependency1Dao.insert(modelDependency); } - String meta = JSON.toJSONString(modelMetaVo); - modelDependency.setMeta(meta); - modelDependency.setOwner(gitLinkUsername); - modelDependency.setState(Constant.State_building); - modelDependency1Dao.insert(modelDependency); } - } else { - String meta = JSON.toJSONString(modelMetaVo); - modelDependency.setMeta(meta); - modelDependency.setOwner(gitLinkUsername); - modelDependency.setState(Constant.State_building); - modelDependency1Dao.insert(modelDependency); } } }