From 4093ea38339cb1e5085077d57fbca0c532fac4ea Mon Sep 17 00:00:00 2001 From: chenzhihang <709011834@qq.com> Date: Sat, 19 Oct 2024 15:09:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E9=AA=8C=E5=AF=B9=E6=AF=94=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/aim/AimController.java | 12 ++++++---- .../ruoyi/platform/service/AimService.java | 4 ++-- .../platform/service/impl/AimServiceImpl.java | 23 +++++++++++++------ 3 files changed, 26 insertions(+), 13 deletions(-) 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 c61fb789..c13763e2 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 @@ -24,15 +24,19 @@ public class AimController extends BaseController { @GetMapping("/getExpTrainInfos/{experiment_id}") @ApiOperation("获取当前实验的模型训练指标信息") @ApiResponse - public GenericsAjaxResult> getExpTrainInfos(@PathVariable("experiment_id") Integer experimentId) throws Exception { - return genericsSuccess(aimService.getExpTrainInfos(experimentId)); + public GenericsAjaxResult> getExpTrainInfos(@RequestParam(value = "offset") String offset, + @RequestParam(value = "limit") int limit, + @PathVariable("experiment_id") Integer experimentId) throws Exception { + return genericsSuccess(aimService.getExpTrainInfos(experimentId, offset, limit)); } @GetMapping("/getExpEvaluateInfos/{experiment_id}") @ApiOperation("获取当前实验的模型推理指标信息") @ApiResponse - public GenericsAjaxResult> getExpEvaluateInfos(@PathVariable("experiment_id") Integer experimentId) throws Exception { - return genericsSuccess(aimService.getExpEvaluateInfos(experimentId)); + public GenericsAjaxResult> getExpEvaluateInfos(@RequestParam(value = "offset") String offset, + @RequestParam(value = "limit") int limit, + @PathVariable("experiment_id") Integer experimentId) throws Exception { + return genericsSuccess(aimService.getExpEvaluateInfos(experimentId, offset, limit)); } @PostMapping("/getExpMetrics") 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 9a867ff8..3e2ccb77 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 @@ -8,11 +8,11 @@ import java.util.Map; public interface AimService { - List getExpTrainInfos(Integer experimentId) throws Exception; + List getExpTrainInfos(Integer experimentId, String offset, int limit) throws Exception; List getExpTrainInfos1(boolean isTrain, Integer experimentId, String runId) throws Exception; - List getExpEvaluateInfos(Integer experimentId) throws Exception; + List getExpEvaluateInfos(Integer experimentId, String offset, int limit) 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 fe364123..1002e6b3 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 @@ -4,7 +4,10 @@ import com.alibaba.fastjson2.JSON; import com.ruoyi.platform.domain.ExperimentIns; import com.ruoyi.platform.service.AimService; import com.ruoyi.platform.service.ExperimentInsService; -import com.ruoyi.platform.utils.*; +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.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; @@ -27,13 +30,13 @@ public class AimServiceImpl implements AimService { private String aimProxyUrl; @Override - public List getExpTrainInfos(Integer experimentId) throws Exception { - return getAimRunInfos(true, experimentId); + public List getExpTrainInfos(Integer experimentId, String offset, int limit) throws Exception { + return getAimRunInfos(true, experimentId, offset, limit); } @Override - public List getExpEvaluateInfos(Integer experimentId) throws Exception { - return getAimRunInfos(false, experimentId); + public List getExpEvaluateInfos(Integer experimentId, String offset, int limit) throws Exception { + return getAimRunInfos(false, experimentId, offset, limit); } @Override @@ -42,12 +45,18 @@ public class AimServiceImpl implements AimService { return aimUrl + "/metrics?select=" + decode; } - private List getAimRunInfos(boolean isTrain, Integer experimentId) throws Exception { + private List getAimRunInfos(boolean isTrain, Integer experimentId, String offset, int limit) throws Exception { String experimentName = "experiment-" + experimentId + "-train"; if (!isTrain) { experimentName = "experiment-" + experimentId + "-evaluate"; } - String encodedUrlString = URLEncoder.encode("run.experiment==\"" + experimentName + "\"", "UTF-8"); + + StringBuffer query = new StringBuffer("run.experiment==\"" + experimentName + "\"" + "&limit=" + limit); + if (StringUtils.isNotEmpty(offset)) { + query.append("&offset=").append(offset); + } + + String encodedUrlString = URLEncoder.encode(String.valueOf(query), "UTF-8"); String url = aimProxyUrl + "/api/runs/search/run?query=" + encodedUrlString; String s = HttpUtils.sendGet(url, null); List> response = JacksonUtil.parseJSONStr2MapList(s);