From d31908d6c7b0fbd80fb059537eb519a8aaadaafc Mon Sep 17 00:00:00 2001 From: ire <931903008@qq.com> Date: Sat, 11 Jan 2025 10:55:37 +0800 Subject: [PATCH] bug --- .../modelservice/ModelServiceController.java | 7 +++++++ .../modelservice/ModelServiceDO.java | 2 ++ .../backend/config/LLMBackendProperties.java | 8 ++++++-- .../async/AsyncModelServiceService.java | 1 + .../module/llm/service/http/ModelService.java | 14 +++++++++++++ .../llm/service/http/TrainHttpService.java | 3 --- .../modelservice/ModelServiceService.java | 2 ++ .../modelservice/ModelServiceServiceImpl.java | 20 ++++++++++++++++++- .../src/main/resources/application-dev.yaml | 7 ++++++- .../src/main/resources/application-local.yaml | 5 +++++ 10 files changed, 62 insertions(+), 7 deletions(-) diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelservice/ModelServiceController.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelservice/ModelServiceController.java index 76de50ab8..9bb28940b 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelservice/ModelServiceController.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/controller/admin/modelservice/ModelServiceController.java @@ -143,4 +143,11 @@ public class ModelServiceController { return success(chat); } + @GetMapping("/download") + @Operation(summary = "下载模型") + @ApiAccessLog(operateType = EXPORT) + public List download(@RequestParam("id") Long id){ + return modelServiceService.getDownLoadList(id); + } + } diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/dataobject/modelservice/ModelServiceDO.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/dataobject/modelservice/ModelServiceDO.java index 964c75a59..dc93a4c13 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/dataobject/modelservice/ModelServiceDO.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/dataobject/modelservice/ModelServiceDO.java @@ -62,6 +62,8 @@ public class ModelServiceDO extends BaseDO { */ private Long jobId; + private String baseModelName; + private String apiKey; private String apiUrl; diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/framework/backend/config/LLMBackendProperties.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/framework/backend/config/LLMBackendProperties.java index 6d0ed53a3..f8369ed8f 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/framework/backend/config/LLMBackendProperties.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/framework/backend/config/LLMBackendProperties.java @@ -77,13 +77,17 @@ public class LLMBackendProperties { private String applicationApi; + private String modelServiceApi; + private String modelCreate; private String modelDeploy; private String modelUndeploy; - - private String modelServiceApi; private String tableDataQuery; + + private String modelFileList; + + private String modelFileDownload; } diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/async/AsyncModelServiceService.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/async/AsyncModelServiceService.java index c7b3b18ec..7e9651098 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/async/AsyncModelServiceService.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/async/AsyncModelServiceService.java @@ -69,6 +69,7 @@ public class AsyncModelServiceService { AigcModelCreateRespVO aigcModelCreateRespVO = trainHttpService.modelCreate(new HashMap<>(), aIgcModelDeploySaveReq); log.info("model create info {}",aigcModelCreateRespVO); updateObj.setJobId(aigcModelCreateRespVO.getId()); + updateObj.setBaseModelName(aigcModelCreateRespVO.getBaseModelName()); modelServiceMapper.updateById(updateObj); diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/http/ModelService.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/http/ModelService.java index aaa3233cf..1ce21f2ab 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/http/ModelService.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/http/ModelService.java @@ -5,11 +5,14 @@ import cn.iocoder.yudao.framework.common.util.object.BeanUtils; import cn.iocoder.yudao.module.llm.framework.backend.config.LLMBackendProperties; import cn.iocoder.yudao.module.llm.service.http.vo.*; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; +import java.util.Map; @Slf4j @Service @@ -73,4 +76,15 @@ public class ModelService { return null; } } + + /** + * 获取模型下载列表 + */ + public List getFileList(String fileName){ + String url = llmBackendProperties.getModelFileList() + fileName; + String res = HttpUtils.get(url, null); + log.info(" getFileList:{}", res); + return JSONArray.parseArray(res, String.class); + } + } diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/http/TrainHttpService.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/http/TrainHttpService.java index 806b04056..6d81626ac 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/http/TrainHttpService.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/http/TrainHttpService.java @@ -7,13 +7,10 @@ import cn.iocoder.yudao.module.llm.framework.backend.config.LLMBackendProperties import cn.iocoder.yudao.module.llm.service.http.vo.*; import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; -import org.hibernate.validator.constraints.NotBlank; -import org.hibernate.validator.constraints.NotEmpty; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.HashMap; -import java.util.List; import java.util.Map; /** diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelservice/ModelServiceService.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelservice/ModelServiceService.java index bd385de6d..bad12dac4 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelservice/ModelServiceService.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelservice/ModelServiceService.java @@ -66,4 +66,6 @@ public interface ModelServiceService { PageResult getModelServicePage1(ModelServicePageReqVO pageReqVO); ModelServiceDO getByApiKey(String apiKey); + + List getDownLoadList(Long id); } diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelservice/ModelServiceServiceImpl.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelservice/ModelServiceServiceImpl.java index d3ce76402..ebbd234a0 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelservice/ModelServiceServiceImpl.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/modelservice/ModelServiceServiceImpl.java @@ -12,11 +12,13 @@ import cn.iocoder.yudao.module.llm.dal.mysql.finetuningtask.FineTuningTaskMapper import cn.iocoder.yudao.module.llm.dal.mysql.modelservice.ModelServiceMapper; import cn.iocoder.yudao.module.llm.framework.backend.config.LLMBackendProperties; import cn.iocoder.yudao.module.llm.service.async.AsyncModelServiceService; +import cn.iocoder.yudao.module.llm.service.http.ModelService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Random; @@ -47,6 +49,9 @@ public class ModelServiceServiceImpl implements ModelServiceService { @Resource private LLMBackendProperties llmBackendProperties; + @Resource + private ModelService modelService; + @Override public Long createModelService(ModelServiceSaveReqVO createReqVO) { @@ -57,7 +62,7 @@ public class ModelServiceServiceImpl implements ModelServiceService { // 插入 String apikey = getApikey(); modelService.setApiKey(apikey); - String replace = llmBackendProperties.getApplicationApi().replace("apiKey", apikey); + String replace = llmBackendProperties.getModelServiceApi().replace("apiKey", apikey); modelService.setApiUrl(replace); modelServiceMapper.insert(modelService); @@ -184,4 +189,17 @@ public class ModelServiceServiceImpl implements ModelServiceService { return modelServiceMapper.selectOne(queryWrapper); } + @Override + public List getDownLoadList(Long id) { + ModelServiceDO modelServiceDO = modelServiceMapper.selectById(id); + String baseModelName = modelServiceDO.getBaseModelName(); + List fileList = modelService.getFileList(baseModelName); + String modelFileDownload = llmBackendProperties.getModelFileDownload(); + List res = new ArrayList<>(); + for (String fileName : fileList) { + res.add(modelFileDownload + baseModelName + "/" + fileName); + } + return res; + } + } diff --git a/yudao-server/src/main/resources/application-dev.yaml b/yudao-server/src/main/resources/application-dev.yaml index 17f426075..964f8b0d5 100644 --- a/yudao-server/src/main/resources/application-dev.yaml +++ b/yudao-server/src/main/resources/application-dev.yaml @@ -262,7 +262,12 @@ llm: application_api: http://localhost:48100/admin-app/llm/application/api/apiKey/chat - model_service_api : http://localhost:48100/admin-app/llm/model-service/api/apiKey/chat + model_service_api: http://localhost:48100/admin-app/llm/model-service/api/apiKey/chat + + model_file_list: http://36.133.1.230:5123/models/?path= + + model_file_download: http://36.133.1.230:5123/models/download/?file_path= + --- #################### iot相关配置 TODO 芋艿：再瞅瞅 #################### iot: diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml index 41ff5a1d3..1c2d5353e 100644 --- a/yudao-server/src/main/resources/application-local.yaml +++ b/yudao-server/src/main/resources/application-local.yaml @@ -301,10 +301,15 @@ llm: model_completions: http://api.xhllm.xinnuojinzhi.com/model/v1/chat/completions # aigc表数据查询接口 table_data_query: http://36.133.1.230:5123/table/%s + application_api: http://localhost:48080/admin-app/llm/application/api/apiKey/chat model_service_api : http://localhost:48080/admin-app/llm/model-service/api/apiKey/chat + model_file_list: http://36.133.1.230:5123/models/?path= + + model_file_download: http://36.133.1.230:5123/models/download/?file_path= + --- #################### iot相关配置 TODO 芋艿：再瞅瞅 #################### iot: emq: