From 3261418ab5e8614aa74d1c3a79a0e9d722f0cfba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A5=BF=E5=A4=A7=E9=94=90?= <1070211640@qq.com> Date: Fri, 21 Jun 2024 17:01:28 +0800 Subject: [PATCH 1/7] =?UTF-8?q?feat:jupyter=E8=BF=94=E5=9B=9E=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/platform/service/impl/JupyterServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/JupyterServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/JupyterServiceImpl.java index 46071e7e..bdbad6fe 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/JupyterServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/JupyterServiceImpl.java @@ -111,7 +111,6 @@ public class JupyterServiceImpl implements JupyterService { this.devEnvironmentService.update(devEnvironment); return url ; - } @Override @@ -132,7 +131,7 @@ public class JupyterServiceImpl implements JupyterService { String deleteResult = k8sClientUtil.deletePod(podName, namespace); - devEnvironment.setStatus("Terminating"); + devEnvironment.setStatus("Terminated"); this.devEnvironmentService.update(devEnvironment); return deleteResult + "，编辑器已停止"; } From 01e1f7e951d4afa9531a4c99da1aea9a01602d2c Mon Sep 17 00:00:00 2001 From: fanshuai <1141904845@qq.com> Date: Mon, 24 Jun 2024 19:24:55 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8C=87=E6=A0=87?= =?UTF-8?q?=E5=AF=B9=E6=AF=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-modules/management-platform/pom.xml | 11 ++ .../controller/aim/AimController.java | 36 +++--- .../ruoyi/platform/service/AimService.java | 11 +- .../platform/service/impl/AimServiceImpl.java | 116 +++++++++++++++++- .../service/impl/ExperimentServiceImpl.java | 9 +- .../platform/utils/AIM64EncoderUtil.java | 76 ++++++++++++ .../com/ruoyi/platform/utils/HttpUtils.java | 35 ++++++ .../com/ruoyi/platform/utils/JsonUtils.java | 25 ++++ .../ruoyi/platform/vo/InsMetricInfoVo.java | 32 +++++ 9 files changed, 330 insertions(+), 21 deletions(-) create mode 100644 ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/AIM64EncoderUtil.java create mode 100644 ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/InsMetricInfoVo.java diff --git a/ruoyi-modules/management-platform/pom.xml b/ruoyi-modules/management-platform/pom.xml index 4cb1ae7d..37234ad0 100644 --- a/ruoyi-modules/management-platform/pom.xml +++ b/ruoyi-modules/management-platform/pom.xml @@ -205,6 +205,17 @@ org.springframework.boot spring-boot-starter-websocket + + org.json + json + 20210307 + + + org.apache.dubbo + dubbo + 3.0.8 + compile + diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/aim/AimController.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/aim/AimController.java index f1750133..f6b0b863 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/aim/AimController.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/controller/aim/AimController.java @@ -4,16 +4,16 @@ import com.ruoyi.common.core.web.controller.BaseController; import com.ruoyi.common.core.web.domain.GenericsAjaxResult; import com.ruoyi.platform.service.AimService; import com.ruoyi.platform.vo.FrameLogPathVo; +import com.ruoyi.platform.vo.InsMetricInfoVo; import com.ruoyi.platform.vo.PodStatusVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.v3.oas.annotations.responses.ApiResponse; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.List; + @RestController @RequestMapping("aim") @Api("Aim管理") @@ -22,17 +22,25 @@ public class AimController extends BaseController { @Resource private AimService aimService; - /** - * 启动tensorBoard接口 - * - * @param frameLogPathVo 存储路径 - * @return url - */ - @PostMapping("/run") - @ApiOperation("启动aim`") + + @GetMapping("/getExpTrainInfos/{experiment_id}") + @ApiOperation("获取当前实验的模型训练指标信息") @ApiResponse - public GenericsAjaxResult runAim(@RequestBody FrameLogPathVo frameLogPathVo) throws Exception { - return genericsSuccess(aimService.runAim(frameLogPathVo)); + public GenericsAjaxResult> getExpTrainInfos(@PathVariable("experiment_id") Integer experimentId) throws Exception { + return genericsSuccess(aimService.getExpTrainInfos(experimentId)); } + @GetMapping("/getExpEvaluateInfos/{experiment_id}") + @ApiOperation("获取当前实验的模型推理指标信息") + @ApiResponse + public GenericsAjaxResult> getExpEvaluateInfos(@PathVariable("experiment_id") Integer experimentId) throws Exception { + return genericsSuccess(aimService.getExpEvaluateInfos(experimentId)); + } + + @PostMapping("/getExpMetrics") + @ApiOperation("获取当前实验的指标对比地址") + @ApiResponse + public GenericsAjaxResult getExpMetrics(@RequestBody List runIds) throws Exception { + return genericsSuccess(aimService.getExpMetrics(runIds)); + } } \ No newline at end of file diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/AimService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/AimService.java index 60f74b90..c83a42af 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/AimService.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/AimService.java @@ -1,7 +1,14 @@ package com.ruoyi.platform.service; -import com.ruoyi.platform.vo.FrameLogPathVo; +import com.ruoyi.platform.vo.InsMetricInfoVo; + +import java.util.List; public interface AimService { - String runAim(FrameLogPathVo frameLogPathVo); + + List getExpTrainInfos(Integer experimentId) throws Exception; + + List getExpEvaluateInfos(Integer experimentId) throws Exception; + + String getExpMetrics(List runIds) throws Exception; } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AimServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AimServiceImpl.java index f66dc178..c26e101e 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AimServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AimServiceImpl.java @@ -1,13 +1,123 @@ package com.ruoyi.platform.service.impl; +import com.alibaba.druid.util.StringUtils; +import com.ruoyi.platform.domain.ExperimentIns; import com.ruoyi.platform.service.AimService; -import com.ruoyi.platform.vo.FrameLogPathVo; +import com.ruoyi.platform.service.ExperimentInsService; +import com.ruoyi.platform.service.ExperimentService; +import com.ruoyi.platform.utils.AIM64EncoderUtil; +import com.ruoyi.platform.utils.HttpUtils; +import com.ruoyi.platform.utils.JacksonUtil; +import com.ruoyi.platform.utils.JsonUtils; +import com.ruoyi.platform.vo.InsMetricInfoVo; +import org.apache.dubbo.container.Main; +import org.json.JSONObject; +import org.json.JSONTokener; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.net.URLEncoder; +import java.util.*; +import java.util.stream.Collectors; + @Service public class AimServiceImpl implements AimService { + @Resource + private ExperimentInsService experimentInsService; + + @Override + public List getExpTrainInfos(Integer experimentId) throws Exception { + String experimentName = "experiment-train-0"+experimentId; + return getAimRunInfos("",experimentId); + } + @Override - public String runAim(FrameLogPathVo frameLogPathVo) { - return null; + public List getExpEvaluateInfos(Integer experimentId) throws Exception { + String experimentName = "experiment-evaluate-0"+experimentId; + return getAimRunInfos("",experimentId); + } + + @Override + public String getExpMetrics(List runIds) throws Exception { + String decode = AIM64EncoderUtil.decode(runIds); + return "http://172.20.32.21:7123/api/runs/search/run?query="+decode; + } + + private List getAimRunInfos(String experimentName,Integer experimentId) throws Exception { + String encodedUrlString = URLEncoder.encode("run.experiment==\"experiment-0000\"", "UTF-8"); + String url = "http://172.20.32.181:30123/api/runs/search/run?query="+encodedUrlString; + String s = HttpUtils.sendGetRequest(url); + System.out.println(s); + List> response = JacksonUtil.parseJSONStr2MapList(s); + // TODO: parse aim response to InsMetricInfoVo list + if (response == null || response.size() == 0){ + return new ArrayList<>(); + } + //查询实例数据 + List byExperimentId = experimentInsService.getByExperimentId(experimentId); + +// if (byExperimentId == null || byExperimentId.size() == 0){ +// return new ArrayList<>(); +// } + List aimRunInfoList = new ArrayList<>(); + for (Map run : response) { + InsMetricInfoVo aimRunInfo = new InsMetricInfoVo(); + String runHash = (String) run.get("run_hash"); + aimRunInfo.setRunId(runHash); + + Map params= (Map) run.get("params"); + Map paramMap = JsonUtils.flattenJson("", params); + aimRunInfo.setParams(paramMap); + + Map tracesMap= (Map) run.get("params"); + List> metricList = (List>) tracesMap.get("metric"); + //过滤name为__system__开头的对象 + aimRunInfo.setMetrics(new HashMap<>()); + if (metricList != null && metricList.size() > 0){ + List> metricRelList = metricList.stream() + .filter(map -> !StringUtils.equals("__system__", (String) map.get("name"))) + .collect(Collectors.toList()); + if (metricRelList!= null && metricRelList.size() > 0){ + Map relMetricMap = new HashMap<>(); + for (Map metricMap : metricRelList) { + relMetricMap.put((String)metricMap.get("name"), metricMap.get("last_value")); + } + aimRunInfo.setMetrics(relMetricMap); + } + } + + + + //找到ins + + for (ExperimentIns ins : byExperimentId) { + String metricRecord = ins.getMetricRecord(); + if (metricRecord.contains(runHash)){ + aimRunInfo.setExperimentInsId(ins.getId()); + aimRunInfo.setStatus(ins.getStatus()); + aimRunInfo.setStartTime(ins.getStartTime()); + } + } + aimRunInfoList.add(aimRunInfo); + } + //判断哪个最长 + + Optional maxMetricsVo = aimRunInfoList.stream() + .max((vo1, vo2) -> Integer.compare(vo1.getMetrics().size(), vo2.getMetrics().size())); + + // 如果找到了，设置 metricsFlag 为 true + if (maxMetricsVo.isPresent()) { + maxMetricsVo.get().setMetricsFlag(true); + } + Optional maxParamsVo = aimRunInfoList.stream() + .max((vo1, vo2) -> Integer.compare(vo1.getParams().size(), vo2.getParams().size())); + + // 如果找到了，设置 metricsFlag 为 true + if (maxParamsVo.isPresent()) { + maxParamsVo.get().setMetricsFlag(true); + } + + return aimRunInfoList; } + } 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 893d23e7..d1ae81c4 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 @@ -254,9 +254,13 @@ public class ExperimentServiceImpl implements ExperimentService { //获取训练参数 Map metricRecord = (Map) runResMap.get("metric_record"); + Map metadata = (Map) data.get("metadata"); // 插入记录到实验实例表 ExperimentIns experimentIns = new ExperimentIns(); + if (metricRecord != null){ + experimentIns.setMetricRecord(JacksonUtil.toJSONString(metricRecord)); + } experimentIns.setExperimentId(experiment.getId()); experimentIns.setArgoInsNs((String) metadata.get("namespace")); experimentIns.setArgoInsName((String) metadata.get("name")); @@ -275,8 +279,9 @@ public class ExperimentServiceImpl implements ExperimentService { Map converMap2 = JsonUtils.jsonToMap(JacksonUtil.replaceInAarry(convertRes, params)); Map dependendcy = (Map)converMap2.get("model_dependency"); Map trainInfo = (Map)converMap2.get("component_info"); - insertModelDependency(dependendcy,trainInfo,insert.getId(),experiment.getName()); - + if (dependendcy != null && trainInfo != null){ + insertModelDependency(dependendcy,trainInfo,insert.getId(),experiment.getName()); + } }catch (Exception e){ throw new RuntimeException(e); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/AIM64EncoderUtil.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/AIM64EncoderUtil.java new file mode 100644 index 00000000..0cffc705 --- /dev/null +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/AIM64EncoderUtil.java @@ -0,0 +1,76 @@ +package com.ruoyi.platform.utils; + +import com.alibaba.fastjson.JSON; + +import java.util.Base64; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class AIM64EncoderUtil { + + private static final String AIM64_ENCODING_PREFIX = "O-"; + + private static final Map BS64_REPLACE_CHARACTERS_ENCODING = new HashMap<>(); + static { + BS64_REPLACE_CHARACTERS_ENCODING.put("=", ""); + BS64_REPLACE_CHARACTERS_ENCODING.put("+", "-"); + BS64_REPLACE_CHARACTERS_ENCODING.put("/", "_"); + } + + public static String aim64encode(Map value) { + String jsonEncoded = JSON.toJSONString(value); + String base64Encoded = Base64.getEncoder().encodeToString(jsonEncoded.getBytes()); + String aim64Encoded = base64Encoded; + for (Map.Entry entry : BS64_REPLACE_CHARACTERS_ENCODING.entrySet()) { + aim64Encoded = aim64Encoded.replace(entry.getKey(), entry.getValue()); + } + return AIM64_ENCODING_PREFIX + aim64Encoded; + } + + public static String encode(Map value, boolean oneWayHashing) { + if (oneWayHashing) { + return md5(JSON.toJSONString(value)); + } + return aim64encode(value); + } + + private static String md5(String input) { + try { + java.security.MessageDigest md = java.security.MessageDigest.getInstance("MD5"); + byte[] array = md.digest(input.getBytes()); + StringBuilder sb = new StringBuilder(); + for (byte b : array) { + sb.append(Integer.toHexString((b & 0xFF) | 0x100).substring(1, 3)); + } + return sb.toString(); + } catch (java.security.NoSuchAlgorithmException e) { + e.printStackTrace(); + } + return null; + } + + public static String decode(List runIds) { + // 确保 runIds 列表的大小为 3 + if (runIds == null || runIds.size() == 0) { + throw new IllegalArgumentException("runIds 不能为空"); + } + // 构建查询字符串 + StringBuilder queryBuilder = new StringBuilder("run.hash in ["); + for (int i = 0; i < runIds.size(); i++) { + if (i > 0) { + queryBuilder.append(","); + } + queryBuilder.append("\"").append(runIds.get(i)).append("\""); + } + queryBuilder.append("]"); + String query = queryBuilder.toString(); + Map map = new HashMap<>(); + map.put("query", query); + map.put("advancedMode", true); + map.put("advancedQuery", query); + + String searchQuery = encode(map, false); + return searchQuery; + } +} diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/HttpUtils.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/HttpUtils.java index b382eda9..910d9981 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/HttpUtils.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/HttpUtils.java @@ -25,6 +25,7 @@ import java.security.cert.X509Certificate; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.zip.GZIPInputStream; /** * HTTP请求工具类 @@ -447,4 +448,38 @@ public class HttpUtils { return true; } } + + public static String sendGetRequestgzip(String url) throws Exception { + String resultStr = null; + HttpGet httpGet = new HttpGet(url); + httpGet.setHeader("Content-Type", "application/json"); + httpGet.setHeader("Accept-Encoding", "gzip, deflate"); + try { + HttpResponse response = httpClient.execute(httpGet); + int responseCode = response.getStatusLine().getStatusCode(); + if (responseCode != 200) { + throw new IOException("HTTP request failed with response code: " + responseCode); + } + + // 获取响应内容 + InputStream responseStream = response.getEntity().getContent(); + // 检查响应是否被压缩 + if ("gzip".equalsIgnoreCase(response.getEntity().getContentEncoding().getValue())) { + responseStream = new GZIPInputStream(responseStream); + } + + // 读取解压缩后的内容 + byte[] buffer = new byte[1024]; + int len; + StringBuilder decompressedString = new StringBuilder(); + while ((len = responseStream.read(buffer)) > 0) { + decompressedString.append(new String(buffer, 0, len)); + } + + resultStr = decompressedString.toString(); + } catch (IOException e) { + e.printStackTrace(); + } + return resultStr; + } } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/JsonUtils.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/JsonUtils.java index e1b41780..186173eb 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/JsonUtils.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/utils/JsonUtils.java @@ -1,8 +1,11 @@ package com.ruoyi.platform.utils; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; +import org.json.JSONObject; import java.io.IOException; +import java.util.HashMap; +import java.util.Iterator; import java.util.Map; public class JsonUtils { @@ -28,4 +31,26 @@ public class JsonUtils { public static T jsonToObject(String json, Class clazz) throws IOException { return objectMapper.readValue(json, clazz); } + + + + // 将JSON字符串转换为扁平化的Map + public static Map flattenJson(String prefix, Map map) { + Map flatMap = new HashMap<>(); + Iterator> entries = map.entrySet().iterator(); + + while (entries.hasNext()) { + Map.Entry entry = entries.next(); + String key = entry.getKey(); + Object value = entry.getValue(); + + if (value instanceof Map) { + flatMap.putAll(flattenJson(prefix + key + ".", (Map) value)); + } else { + flatMap.put(prefix + key, value); + } + } + + return flatMap; + } } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/InsMetricInfoVo.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/InsMetricInfoVo.java new file mode 100644 index 00000000..cd3943ed --- /dev/null +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/InsMetricInfoVo.java @@ -0,0 +1,32 @@ +package com.ruoyi.platform.vo; + +import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.annotation.JsonNaming; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; +import java.util.Map; + +@JsonNaming(PropertyNamingStrategy.SnakeCaseStrategy.class) +@Data +public class InsMetricInfoVo implements Serializable { + @ApiModelProperty(value = "开始时间") + private Date startTime; + @ApiModelProperty(value = "实例运行状态") + private String status; + @ApiModelProperty(value = "使用数据集") + private List> dataset; + @ApiModelProperty(value = "实例ID") + private Integer experimentInsId; + @ApiModelProperty(value = "训练指标") + private Map metrics; + @ApiModelProperty(value = "训练参数") + private Map params; + @ApiModelProperty(value = "训练记录ID") + private String runId; + private Boolean metricsFlag = false; + private Boolean paramsFlag = false; +} From 3a886a64c445a4d039c73c796c8bd1a03f5c5cdd Mon Sep 17 00:00:00 2001 From: cp3hnu Date: Tue, 25 Jun 2024 10:21:18 +0800 Subject: [PATCH 3/7] =?UTF-8?q?chore:=20=E4=BC=98=E5=8C=96enum?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- react-ui/src/enums/index.ts | 21 ++++++++++++++++ .../components/ResourceIntro/index.tsx | 7 +++--- .../src/pages/Experiment/Comparison/index.tsx | 4 +-- .../Experiment/components/LogGroup/index.tsx | 2 +- .../Experiment/components/LogList/index.tsx | 2 +- .../components/TensorBoardStatus/index.tsx | 25 +++++++++---------- react-ui/src/pages/Experiment/index.jsx | 15 +++++------ react-ui/src/pages/Experiment/status.ts | 16 +++--------- .../src/pages/ModelDeployment/Info/index.tsx | 6 ++--- react-ui/src/pages/ModelDeployment/types.ts | 6 ++--- react-ui/src/types.ts | 2 +- 11 files changed, 59 insertions(+), 47 deletions(-) diff --git a/react-ui/src/enums/index.ts b/react-ui/src/enums/index.ts index b31aee3a..df329d87 100644 --- a/react-ui/src/enums/index.ts +++ b/react-ui/src/enums/index.ts @@ -4,6 +4,27 @@ export enum CommonTabKeys { Public = 'Public', // 公开 } +// 实验状态 +export enum ExperimentStatus { + Running = 'Running', // 运行中 + Succeeded = 'Succeeded', // 成功 + Pending = 'Pending', // 启动中 + Failed = 'Failed', // 失败 + Error = 'Error', // 错误 + Terminated = 'Terminated', // 终止 + Skipped = 'Skipped', // 跳过 + Omitted = 'Omitted', // 忽略 +} + +// TensorBoard 状态 +export enum TensorBoardStatus { + Unknown = 'Unknown', // 未知 + Pending = 'Pending', // 启动中 + Running = 'Running', // 运行中 + Terminated = 'Terminated', // 未启动或者已终止 + Failed = 'Failed', // 失败 +} + // 镜像版本状态 export enum MirrorVersionStatus { Available = 'available', // 可用 diff --git a/react-ui/src/pages/Dataset/components/ResourceIntro/index.tsx b/react-ui/src/pages/Dataset/components/ResourceIntro/index.tsx index e8bed08c..27908de7 100644 --- a/react-ui/src/pages/Dataset/components/ResourceIntro/index.tsx +++ b/react-ui/src/pages/Dataset/components/ResourceIntro/index.tsx @@ -8,10 +8,11 @@ import { ResourceData, ResourceType, resourceConfig } from '../../config'; import ResourceVersion from '../ResourceVersion'; import styles from './index.less'; +// 这里值小写是因为值会写在 url 中 export enum ResourceInfoTabKeys { - Introduction = 'introduction', - Version = 'version', - Evolution = 'evolution', + Introduction = 'introduction', // 简介 + Version = 'version', // 版本 + Evolution = 'evolution', // 演化 } type ResourceIntroProps = { diff --git a/react-ui/src/pages/Experiment/Comparison/index.tsx b/react-ui/src/pages/Experiment/Comparison/index.tsx index c53a0a94..c0421ac4 100644 --- a/react-ui/src/pages/Experiment/Comparison/index.tsx +++ b/react-ui/src/pages/Experiment/Comparison/index.tsx @@ -9,8 +9,8 @@ import { useEffect, useState } from 'react'; import styles from './index.less'; export enum ComparisonType { - Train = 'train', // 训练 - Evaluate = 'evaluate', // 评估 + Train = 'Train', // 训练 + Evaluate = 'Evaluate', // 评估 } function ExperimentComparison() { diff --git a/react-ui/src/pages/Experiment/components/LogGroup/index.tsx b/react-ui/src/pages/Experiment/components/LogGroup/index.tsx index a3da3044..5c25b860 100644 --- a/react-ui/src/pages/Experiment/components/LogGroup/index.tsx +++ b/react-ui/src/pages/Experiment/components/LogGroup/index.tsx @@ -4,8 +4,8 @@ * @Description: 日志组件 */ +import { ExperimentStatus } from '@/enums'; import { useStateRef } from '@/hooks'; -import { ExperimentStatus } from '@/pages/Experiment/status'; import { ExperimentLog } from '@/pages/Experiment/training/props'; import { getExperimentPodsLog } from '@/services/experiment/index.js'; import { DoubleRightOutlined, DownOutlined, UpOutlined } from '@ant-design/icons'; diff --git a/react-ui/src/pages/Experiment/components/LogList/index.tsx b/react-ui/src/pages/Experiment/components/LogList/index.tsx index 8a2ade14..d95224f1 100644 --- a/react-ui/src/pages/Experiment/components/LogList/index.tsx +++ b/react-ui/src/pages/Experiment/components/LogList/index.tsx @@ -1,4 +1,4 @@ -import { ExperimentStatus } from '@/pages/Experiment/status'; +import { ExperimentStatus } from '@/enums'; import { ExperimentLog } from '@/pages/Experiment/training/props'; import LogGroup from '../LogGroup'; import styles from './index.less'; diff --git a/react-ui/src/pages/Experiment/components/TensorBoardStatus/index.tsx b/react-ui/src/pages/Experiment/components/TensorBoardStatus/index.tsx index d8dad901..8a6f5b7c 100644 --- a/react-ui/src/pages/Experiment/components/TensorBoardStatus/index.tsx +++ b/react-ui/src/pages/Experiment/components/TensorBoardStatus/index.tsx @@ -5,16 +5,15 @@ import classNames from 'classnames'; import styles from './index.less'; // import stopImg from '@/assets/img/tensor-board-stop.png'; import terminatedImg from '@/assets/img/tensor-board-terminated.png'; +import { TensorBoardStatus } from '@/enums'; -export enum TensorBoardStatusEnum { - Unknown = 'Unknown', // 未知 - Pending = 'Pending', // 启动中 - Running = 'Running', // 运行中 - Terminated = 'Terminated', // 未启动或者已终止 - Failed = 'Failed', // 失败 -} +type TensorBoardStatusInfo = { + label: string; + icon: string; + classname: string; +}; -const statusConfig = { +const statusConfig: Record = { Unknown: { label: '未知', icon: terminatedImg, @@ -43,12 +42,12 @@ const statusConfig = { }; type TensorBoardStatusProps = { - status: TensorBoardStatusEnum; + status: TensorBoardStatus; onClick: () => void; }; -function TensorBoardStatus({ - status = TensorBoardStatusEnum.Unknown, +function TensorBoardStatusCell({ + status = TensorBoardStatus.Unknown, onClick, }: TensorBoardStatusProps) { return ( @@ -64,7 +63,7 @@ function TensorBoardStatus({ {statusConfig[status].icon ? ( <>
|
- {status === TensorBoardStatusEnum.Pending ? ( + {status === TensorBoardStatus.Pending ? ( ) : ( { if ( - experimentIn.tensorBoardStatus === TensorBoardStatusEnum.Terminated || - experimentIn.tensorBoardStatus === TensorBoardStatusEnum.Failed + experimentIn.tensorBoardStatus === TensorBoardStatus.Terminated || + experimentIn.tensorBoardStatus === TensorBoardStatus.Failed ) { await runTensorBoard(experimentIn); } else if ( - experimentIn.tensorBoardStatus === TensorBoardStatusEnum.Running && + experimentIn.tensorBoardStatus === TensorBoardStatus.Running && experimentIn.tensorboardUrl ) { window.open(experimentIn.tensorboardUrl, '_blank'); @@ -457,12 +458,12 @@ function Experiment() {
{item.nodes_result?.tensorboard_log ? ( - handleTensorboard(item)} - > + > ) : ( - '-' + '--' )}
diff --git a/react-ui/src/pages/Experiment/status.ts b/react-ui/src/pages/Experiment/status.ts index b9c45af6..02b68f53 100644 --- a/react-ui/src/pages/Experiment/status.ts +++ b/react-ui/src/pages/Experiment/status.ts @@ -1,23 +1,13 @@ +import { ExperimentStatus } from '@/enums'; import themes from '@/styles/theme.less'; -export interface StatusInfo { +export interface ExperimentStatusInfo { label: string; color: string; icon: string; } -export enum ExperimentStatus { - Running = 'Running', - Succeeded = 'Succeeded', - Pending = 'Pending', - Failed = 'Failed', - Error = 'Error', - Terminated = 'Terminated', - Skipped = 'Skipped', - Omitted = 'Omitted', -} - -export const experimentStatusInfo: Record = { +export const experimentStatusInfo: Record = { Running: { label: '运行中', color: themes.primaryColor, diff --git a/react-ui/src/pages/ModelDeployment/Info/index.tsx b/react-ui/src/pages/ModelDeployment/Info/index.tsx index a548e93a..4f73f46f 100644 --- a/react-ui/src/pages/ModelDeployment/Info/index.tsx +++ b/react-ui/src/pages/ModelDeployment/Info/index.tsx @@ -17,9 +17,9 @@ import { ModelDeploymentData } from '../types'; import styles from './index.less'; export enum ModelDeploymentTabKey { - Predict = 'Predict', - Guide = 'Guide', - Log = 'Log', + Predict = 'Predict', // 预测 + Guide = 'Guide', // 调用指南 + Log = 'Log', // 服务日志 } function ModelDeploymentInfo() { diff --git a/react-ui/src/pages/ModelDeployment/types.ts b/react-ui/src/pages/ModelDeployment/types.ts index c8dfe808..4bdf28c8 100644 --- a/react-ui/src/pages/ModelDeployment/types.ts +++ b/react-ui/src/pages/ModelDeployment/types.ts @@ -26,7 +26,7 @@ export type ModelDeploymentData = { // 操作类型 export enum ModelDeploymentOperationType { - Create = 'Create', - Update = 'Update', - Restart = 'Restart', + Create = 'Create', // 创建 + Update = 'Update', // 更新 + Restart = 'Restart', // 重启 } diff --git a/react-ui/src/types.ts b/react-ui/src/types.ts index 57dc3856..aa9b0e5e 100644 --- a/react-ui/src/types.ts +++ b/react-ui/src/types.ts @@ -4,7 +4,7 @@ * @Description: 定义全局类型，比如无关联的页面都需要要的类型 */ -import { ExperimentStatus } from '@/pages/Experiment/status'; +import { ExperimentStatus } from '@/enums'; // 流水线全局参数 export type PipelineGlobalParam = { From 0e6c7ce5e86bcc1ea4a090287efe9b511af982a3 Mon Sep 17 00:00:00 2001 From: fanshuai <1141904845@qq.com> Date: Wed, 26 Jun 2024 09:14:41 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8C=87=E6=A0=87?= =?UTF-8?q?=E5=AF=B9=E6=AF=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/mapper/ModelDependencyDao.java | 4 + .../ExperimentInstanceStatusTask.java | 70 +++++----- .../service/ModelDependencyService.java | 4 + .../platform/service/impl/AimServiceImpl.java | 132 ++++++++++++------ .../impl/ModelDependencyServiceImpl.java | 15 +- .../ruoyi/platform/vo/InsMetricInfoVo.java | 6 +- .../ModelDependencyDaoMapper.xml | 16 +++ 7 files changed, 162 insertions(+), 85 deletions(-) diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ModelDependencyDao.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ModelDependencyDao.java index 3a999886..ba1bc40b 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ModelDependencyDao.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/mapper/ModelDependencyDao.java @@ -84,5 +84,9 @@ public interface ModelDependencyDao { List queryByModelDependency(@Param("modelDependency") ModelDependency modelDependency); List queryChildrenByVersionId(@Param("model_id")String modelId, @Param("version")String version); + + List queryByIns(@Param("expInsId")Integer expInsId); + + ModelDependency queryByInsAndTrainTaskId(@Param("expInsId")Integer expInsId,@Param("taskId") String taskId); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/ExperimentInstanceStatusTask.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/ExperimentInstanceStatusTask.java index 4680285e..131dca48 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/ExperimentInstanceStatusTask.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/scheduling/ExperimentInstanceStatusTask.java @@ -7,20 +7,15 @@ import com.ruoyi.platform.mapper.ExperimentDao; import com.ruoyi.platform.mapper.ExperimentInsDao; import com.ruoyi.platform.mapper.ModelDependencyDao; import com.ruoyi.platform.service.ExperimentInsService; -import com.ruoyi.platform.service.ModelDependencyService; import com.ruoyi.platform.utils.JacksonUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Page; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; @Component() public class ExperimentInstanceStatusTask { @@ -34,7 +29,7 @@ public class ExperimentInstanceStatusTask { private ModelDependencyDao modelDependencyDao; private List experimentIds = new ArrayList<>(); - @Scheduled(cron = "0/14 * * * * ?") // 每30S执行一次 + @Scheduled(cron = "0/30 * * * * ?") // 每30S执行一次 public void executeExperimentInsStatus() throws IOException { // 首先查到所有非终止态的实验实例 List experimentInsList = experimentInsService.queryByExperimentIsNotTerminated(); @@ -46,95 +41,94 @@ public class ExperimentInstanceStatusTask { String oldStatus = experimentIns.getStatus(); try { experimentIns = experimentInsService.queryStatusFromArgo(experimentIns); - }catch (Exception e){ + } catch (Exception e) { experimentIns.setStatus("Failed"); } -// if (!StringUtils.equals(oldStatus,experimentIns.getStatus())){ - experimentIns.setUpdateTime(new Date()); - // 线程安全的添加操作 - synchronized (experimentIds) { - experimentIds.add(experimentIns.getExperimentId()); - } - updateList.add(experimentIns); - -// } -// experimentInsDao.update(experimentIns); + experimentIns.setUpdateTime(new Date()); + // 线程安全的添加操作 + synchronized (experimentIds) { + experimentIds.add(experimentIns.getExperimentId()); + } + updateList.add(experimentIns); } - } - if (updateList.size() > 0){ + if (updateList.size() > 0) { experimentInsDao.insertOrUpdateBatch(updateList); //遍历模型关系表，找到 List modelDependencyList = new ArrayList(); - for (ExperimentIns experimentIns : updateList){ + for (ExperimentIns experimentIns : updateList) { ModelDependency modelDependencyquery = new ModelDependency(); modelDependencyquery.setExpInsId(experimentIns.getId()); modelDependencyquery.setState(2); List modelDependencyListquery = modelDependencyDao.queryByModelDependency(modelDependencyquery); - if (modelDependencyListquery==null||modelDependencyListquery.size()==0){ + if (modelDependencyListquery == null || modelDependencyListquery.size() == 0) { continue; } ModelDependency modelDependency = modelDependencyListquery.get(0); //查看状态， - if (StringUtils.equals("Failed",experimentIns.getStatus())){ + if (StringUtils.equals("Failed", experimentIns.getStatus())) { //取出节点状态 String trainTask = modelDependency.getTrainTask(); Map trainMap = JacksonUtil.parseJSONStr2Map(trainTask); String task_id = (String) trainMap.get("task_id"); - if (StringUtils.isEmpty(task_id)){ + if (StringUtils.isEmpty(task_id)) { continue; } String nodesStatus = experimentIns.getNodesStatus(); Map nodeMaps = JacksonUtil.parseJSONStr2Map(nodesStatus); Map nodeMap = JacksonUtil.parseJSONStr2Map(JacksonUtil.toJSONString(nodeMaps.get(task_id))); - if (nodeMap==null){ + if (nodeMap == null) { continue; } - if (!StringUtils.equals("Succeeded",(String)nodeMap.get("phase"))){ + if (!StringUtils.equals("Succeeded", (String) nodeMap.get("phase"))) { modelDependency.setState(0); modelDependencyList.add(modelDependency); } } } - if (modelDependencyList.size()>0) { + if (modelDependencyList.size() > 0) { modelDependencyDao.insertOrUpdateBatch(modelDependencyList); } } - } - @Scheduled(cron = "0/17 * * * * ?") // / 每30S执行一次 + + @Scheduled(cron = "0/30 * * * * ?") // / 每30S执行一次 public void executeExperimentStatus() throws IOException { - if (experimentIds.size()==0){ + if (experimentIds.size() == 0) { return; } // 存储需要更新的实验对象列表 List updateExperiments = new ArrayList<>(); - for (Integer experimentId : experimentIds){ + for (Integer experimentId : experimentIds) { // 获取当前实验的所有实例列表 List insList = experimentInsService.getByExperimentId(experimentId); List statusList = new ArrayList(); // 更新实验状态列表 - for (int i=0;i iterator = experimentIds.iterator(); + while (iterator.hasNext()) { + Integer experimentId = iterator.next(); + for (Experiment experiment : updateExperiments) { + if (experiment.getId().equals(experimentId)) { + iterator.remove(); + } } } } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ModelDependencyService.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ModelDependencyService.java index 5c8b9d1d..049d87d1 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ModelDependencyService.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/ModelDependencyService.java @@ -62,4 +62,8 @@ public interface ModelDependencyService { List queryByModelDependency(ModelDependency modelDependency) throws IOException; ModelDependcyTreeVo getModelDependencyTree(ModelDependency modelDependency) throws Exception; + + List queryByIns(Integer expInsId); + + ModelDependency queryByInsAndTrainTaskId(Integer expInsId, String taskId); } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AimServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AimServiceImpl.java index c26e101e..6ec8f43c 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AimServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/AimServiceImpl.java @@ -1,18 +1,17 @@ package com.ruoyi.platform.service.impl; -import com.alibaba.druid.util.StringUtils; import com.ruoyi.platform.domain.ExperimentIns; +import com.ruoyi.platform.domain.ModelDependency; import com.ruoyi.platform.service.AimService; import com.ruoyi.platform.service.ExperimentInsService; -import com.ruoyi.platform.service.ExperimentService; +import com.ruoyi.platform.service.ModelDependencyService; import com.ruoyi.platform.utils.AIM64EncoderUtil; import com.ruoyi.platform.utils.HttpUtils; import com.ruoyi.platform.utils.JacksonUtil; import com.ruoyi.platform.utils.JsonUtils; import com.ruoyi.platform.vo.InsMetricInfoVo; -import org.apache.dubbo.container.Main; -import org.json.JSONObject; -import org.json.JSONTokener; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -24,58 +23,66 @@ import java.util.stream.Collectors; public class AimServiceImpl implements AimService { @Resource private ExperimentInsService experimentInsService; + @Resource + private ModelDependencyService modelDependencyService; + + @Value("${aim.url}") + private String aimUrl; + @Value("${aim.proxyUrl}") + private String aimProxyUrl; @Override public List getExpTrainInfos(Integer experimentId) throws Exception { - String experimentName = "experiment-train-0"+experimentId; - return getAimRunInfos("",experimentId); + return getAimRunInfos(true,experimentId); } @Override public List getExpEvaluateInfos(Integer experimentId) throws Exception { - String experimentName = "experiment-evaluate-0"+experimentId; - return getAimRunInfos("",experimentId); + return getAimRunInfos(false,experimentId); } @Override public String getExpMetrics(List runIds) throws Exception { String decode = AIM64EncoderUtil.decode(runIds); - return "http://172.20.32.21:7123/api/runs/search/run?query="+decode; + return aimUrl+"/api/runs/search/run?query="+decode; } - private List getAimRunInfos(String experimentName,Integer experimentId) throws Exception { - String encodedUrlString = URLEncoder.encode("run.experiment==\"experiment-0000\"", "UTF-8"); - String url = "http://172.20.32.181:30123/api/runs/search/run?query="+encodedUrlString; + private List getAimRunInfos(boolean isTrain,Integer experimentId) throws Exception { + String experimentName = "experiment-"+experimentId+"-train"; + if (!isTrain){ + experimentName = "experiment-"+experimentId+"-evaluate"; + } + String encodedUrlString = URLEncoder.encode("run.experiment==\""+experimentName+"\"", "UTF-8"); + String url = aimProxyUrl+"/api/runs/search/run?query="+encodedUrlString; String s = HttpUtils.sendGetRequest(url); - System.out.println(s); List> response = JacksonUtil.parseJSONStr2MapList(s); - // TODO: parse aim response to InsMetricInfoVo list if (response == null || response.size() == 0){ return new ArrayList<>(); } //查询实例数据 List byExperimentId = experimentInsService.getByExperimentId(experimentId); -// if (byExperimentId == null || byExperimentId.size() == 0){ -// return new ArrayList<>(); -// } + if (byExperimentId == null || byExperimentId.size() == 0){ + return new ArrayList<>(); + } List aimRunInfoList = new ArrayList<>(); for (Map run : response) { InsMetricInfoVo aimRunInfo = new InsMetricInfoVo(); String runHash = (String) run.get("run_hash"); + aimRunInfo.setRunId(runHash); Map params= (Map) run.get("params"); Map paramMap = JsonUtils.flattenJson("", params); aimRunInfo.setParams(paramMap); - - Map tracesMap= (Map) run.get("params"); + String aimrunId = (String) paramMap.get("id"); + Map tracesMap= (Map) run.get("traces"); List> metricList = (List>) tracesMap.get("metric"); //过滤name为__system__开头的对象 aimRunInfo.setMetrics(new HashMap<>()); if (metricList != null && metricList.size() > 0){ List> metricRelList = metricList.stream() - .filter(map -> !StringUtils.equals("__system__", (String) map.get("name"))) + .filter(map -> !StringUtils.startsWith((String) map.get("name"),"__system__" )) .collect(Collectors.toList()); if (metricRelList!= null && metricRelList.size() > 0){ Map relMetricMap = new HashMap<>(); @@ -85,39 +92,84 @@ public class AimServiceImpl implements AimService { aimRunInfo.setMetrics(relMetricMap); } } - - - //找到ins - for (ExperimentIns ins : byExperimentId) { - String metricRecord = ins.getMetricRecord(); - if (metricRecord.contains(runHash)){ + String metricRecordString = ins.getMetricRecord(); + if (StringUtils.isEmpty(metricRecordString)){ + continue; + } + if (metricRecordString.contains(aimrunId)){ aimRunInfo.setExperimentInsId(ins.getId()); aimRunInfo.setStatus(ins.getStatus()); - aimRunInfo.setStartTime(ins.getStartTime()); + aimRunInfo.setStartTime(ins.getCreateTime()); + Map metricRecordMap = JacksonUtil.parseJSONStr2Map(metricRecordString); + + //metricRecord 格式为{"train":[{"task_id":"model-train-35303690","run_id":"5560d78f54314672b60304c8d6ba03b8","experiment_name":"experiment-30-train"}],"evaluate":[{"task_id":"model-train-35303690","run_id":"5560d78f54314672b60304c8d6ba03b8","experiment_name":"experiment-30-train"}]} + //遍历metricRecord，找到当前task_id对应的ModelDependency + + if (isTrain){ + List> trainList = (List>) metricRecordMap.get("train"); + List trainDateSet = getTrainDateSet(trainList, ins.getId(), isTrain); + aimRunInfo.setDataset(trainDateSet); + }else { + List> trainList = (List>) metricRecordMap.get("evaluate"); + List trainDateSet = getTrainDateSet(trainList, ins.getId(), isTrain); + aimRunInfo.setDataset(trainDateSet); + } + } } aimRunInfoList.add(aimRunInfo); } //判断哪个最长 - Optional maxMetricsVo = aimRunInfoList.stream() - .max((vo1, vo2) -> Integer.compare(vo1.getMetrics().size(), vo2.getMetrics().size())); + // 获取所有 metrics 的 key 的并集 + Set metricsKeys = (Set) aimRunInfoList.stream() + .map(InsMetricInfoVo::getMetrics) + .flatMap(metrics -> metrics.keySet().stream()) + .collect(Collectors.toSet()); + // 将并集赋值给每个 InsMetricInfoVo 的 metricsNames 属性 + aimRunInfoList.forEach(vo -> vo.setMetricsNames(new ArrayList<>(metricsKeys))); + + // 获取所有 params 的 key 的并集 + Set paramKeys = (Set) aimRunInfoList.stream() + .map(InsMetricInfoVo::getParams) + .flatMap(params -> params.keySet().stream()) + .collect(Collectors.toSet()); + // 将并集赋值给每个 InsMetricInfoVo 的 paramsNames 属性 + aimRunInfoList.forEach(vo -> vo.setParamsNames(new ArrayList<>(paramKeys))); + + return aimRunInfoList; + } - // 如果找到了，设置 metricsFlag 为 true - if (maxMetricsVo.isPresent()) { - maxMetricsVo.get().setMetricsFlag(true); - } - Optional maxParamsVo = aimRunInfoList.stream() - .max((vo1, vo2) -> Integer.compare(vo1.getParams().size(), vo2.getParams().size())); - // 如果找到了，设置 metricsFlag 为 true - if (maxParamsVo.isPresent()) { - maxParamsVo.get().setMetricsFlag(true); + private List getTrainDateSet(List> trainList,Integer expInsId,boolean isTrain){ + if (trainList == null || trainList.size() == 0){ + return new ArrayList<>(); } + List datasetList = new ArrayList<>(); + for (Map trainMap : trainList) { + String task_id = (String) trainMap.get("task_id"); + //modelDependency取到数据集文件 + ModelDependency modelDependency = modelDependencyService.queryByInsAndTrainTaskId(expInsId, task_id); + //把数据集文件组装成String后放进List + String datasetString = ""; + if (isTrain){ + datasetString = modelDependency.getTrainDataset(); + }else { + datasetString = modelDependency.getTestDataset(); + } + List> datasetListMap = JacksonUtil.parseJSONStr2MapList(datasetString); - return aimRunInfoList; + if (datasetListMap != null && datasetListMap.size() > 0){ + for (Map datasetMap : datasetListMap) { + //[{"dataset_id":20,"dataset_version":"v0.1.0","dataset_name":"手写体识别模型依赖测试训练数据集"}] + String datasetName = (String) datasetMap.get("dataset_name")+":"+(String) datasetMap.get("dataset_version"); + datasetList.add(datasetName); + } + } + } + return datasetList; } } diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelDependencyServiceImpl.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelDependencyServiceImpl.java index f3c48ebb..572a66a5 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelDependencyServiceImpl.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/service/impl/ModelDependencyServiceImpl.java @@ -17,10 +17,7 @@ import org.springframework.data.domain.PageRequest; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; /** @@ -97,6 +94,16 @@ public class ModelDependencyServiceImpl implements ModelDependencyService { return modelDependcyTreeVo; } + @Override + public List queryByIns(Integer expInsId) { + return modelDependencyDao.queryByIns(expInsId); + } + + @Override + public ModelDependency queryByInsAndTrainTaskId(Integer expInsId, String taskId) { + return modelDependencyDao.queryByInsAndTrainTaskId(expInsId,taskId); + } + /** * 递归父模型 * @param modelDependcyTreeVo diff --git a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/InsMetricInfoVo.java b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/InsMetricInfoVo.java index cd3943ed..6fe8caa4 100644 --- a/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/InsMetricInfoVo.java +++ b/ruoyi-modules/management-platform/src/main/java/com/ruoyi/platform/vo/InsMetricInfoVo.java @@ -18,7 +18,7 @@ public class InsMetricInfoVo implements Serializable { @ApiModelProperty(value = "实例运行状态") private String status; @ApiModelProperty(value = "使用数据集") - private List> dataset; + private List dataset; @ApiModelProperty(value = "实例ID") private Integer experimentInsId; @ApiModelProperty(value = "训练指标") @@ -27,6 +27,6 @@ public class InsMetricInfoVo implements Serializable { private Map params; @ApiModelProperty(value = "训练记录ID") private String runId; - private Boolean metricsFlag = false; - private Boolean paramsFlag = false; + private List metricsNames; + private List paramsNames; } diff --git a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelDependencyDaoMapper.xml b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelDependencyDaoMapper.xml index 2cd5dd7a..ea592ee2 100644 --- a/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelDependencyDaoMapper.xml +++ b/ruoyi-modules/management-platform/src/main/resources/mapper/managementPlatform/ModelDependencyDaoMapper.xml @@ -22,6 +22,22 @@ + +