DATA_MIDDLE_PLATFORM/Data_Middle_Platform_Server
3
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/basemodel/BaseModelTaskService.java
This commit is contained in:
sunxiqing 2025-03-14 18:47:59 +08:00
commit 1d1f959f26
1 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/basemodel/BaseModelTaskService.java
View File

@ -111,33 +111,33 @@ public class BaseModelTaskService {
String status = latestRecord.getStatus();
log.info("最新模型部署记录状态: {}", status);
// // 如果模型状态为 "stop"，则重新部署
// if ("stop".equals(status)) {
// log.info("模型状态为 'stop'，正在重新部署模型...");
//
// // 构建模型部署请求
// AigcModelDeploySaveReq aigcModelDeploySaveReq = new AigcModelDeploySaveReq(
// baseModelDO.getAigcModelName(), "gpu");
// log.info("模型部署请求参数: {}", JSON.toJSONString(aigcModelDeploySaveReq));
//
// // 发起模型部署请求
// ModelDeployRespVO modelDeployRespVO = trainHttpService.modelDeploy(
// new HashMap<>(), serverName.getHost(), aigcModelDeploySaveReq);
// log.info("模型部署请求完成。响应内容: {}", JSON.toJSONString(modelDeployRespVO));
//
// // 更新基础模型信息
// if (!"error".equals(modelDeployRespVO.getMessage())) {
// log.info("模型部署成功。正在更新基础模型信息...");
// BaseModelSaveReqVO baseModelSaveReqVO = new BaseModelSaveReqVO();
// baseModelSaveReqVO.setId(baseModelDO.getId());
// baseModelSaveReqVO.setModelId(modelDeployRespVO.getId());
// baseModelSaveReqVO.setChatUrl(modelDeployRespVO.getPort() + DEFAULT_MODEL_URL_SUFFIX);
// baseModelService.updateBaseModel(baseModelSaveReqVO);
// log.info("基础模型信息更新完成。模型ID: {}", baseModelDO.getId());
// } else {
// log.error("模型部署失败。模型ID: {}", baseModelDO.getId());
// }
// }
// // 如果模型状态为 "stop"，则重新部署
// if ("stop".equals(status)) {
// log.info("模型状态为 'stop'，正在重新部署模型...");
//
// // 构建模型部署请求
// AigcModelDeploySaveReq aigcModelDeploySaveReq = new AigcModelDeploySaveReq(
// baseModelDO.getAigcModelName(), "gpu");
// log.info("模型部署请求参数: {}", JSON.toJSONString(aigcModelDeploySaveReq));
//
// // 发起模型部署请求
// ModelDeployRespVO modelDeployRespVO = trainHttpService.modelDeploy(
// new HashMap<>(), serverName.getHost(), aigcModelDeploySaveReq);
// log.info("模型部署请求完成。响应内容: {}", JSON.toJSONString(modelDeployRespVO));
//
// // 更新基础模型信息
// if (!"error".equals(modelDeployRespVO.getMessage())) {
// log.info("模型部署成功。正在更新基础模型信息...");
// BaseModelSaveReqVO baseModelSaveReqVO = new BaseModelSaveReqVO();
// baseModelSaveReqVO.setId(baseModelDO.getId());
// baseModelSaveReqVO.setModelId(modelDeployRespVO.getId());
// baseModelSaveReqVO.setChatUrl(modelDeployRespVO.getPort() + DEFAULT_MODEL_URL_SUFFIX);
// baseModelService.updateBaseModel(baseModelSaveReqVO);
// log.info("基础模型信息更新完成。模型ID: {}", baseModelDO.getId());
// } else {
// log.error("模型部署失败。模型ID: {}", baseModelDO.getId());
// }
// }
} else {
log.warn("未找到模型部署记录。模型ID: {}", modelId);
}
@ -316,17 +316,17 @@ public class BaseModelTaskService {
log.info("模型 {} 状态为 running，无需更新", pedestalModelVo.getDeploymentName());
}
}
// else {
// //新增基座模型
// if ("running".equals(pedestalModelVo.getStatus())){
// BaseModelSaveReqVO baseModelSaveReqVO = new BaseModelSaveReqVO();
// baseModelSaveReqVO.setModelName(pedestalModelVo.getDeploymentName());
// baseModelSaveReqVO.setIsActive(1);
// baseModelSaveReqVO.setAigcModelName(pedestalModelVo.getDeploymentName());
// baseModelSaveReqVO.setChatUrl(pedestalModelVo.getHost() + "/v1/chat/completions");
// baseModelService.createBaseModel(baseModelSaveReqVO);
// }
// }
// else {
// //新增基座模型
// if ("running".equals(pedestalModelVo.getStatus())){
// BaseModelSaveReqVO baseModelSaveReqVO = new BaseModelSaveReqVO();
// baseModelSaveReqVO.setModelName(pedestalModelVo.getDeploymentName());
// baseModelSaveReqVO.setIsActive(1);
// baseModelSaveReqVO.setAigcModelName(pedestalModelVo.getDeploymentName());
// baseModelSaveReqVO.setChatUrl(pedestalModelVo.getHost() + "/v1/chat/completions");
// baseModelService.createBaseModel(baseModelSaveReqVO);
// }
// }
} else {
List<PedestalModelVO> collect1 = modelListRes.stream()
.filter(pedestalModelVO -> pedestalModelVO.getDeploymentName().equals(name)