From b5b67db5da95253c7e52e848bc637388c204ad9b Mon Sep 17 00:00:00 2001 From: sunxiqing <2240398334@qq.com> Date: Sat, 15 Mar 2025 13:02:58 +0800 Subject: [PATCH] =?UTF-8?q?refactor(llm):=20=E4=BC=98=E5=8C=96=E6=A8=A1?= =?UTF-8?q?=E5=9E=8B=E6=9C=8D=E5=8A=A1=E7=8A=B6=E6=80=81=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 BaseModelTaskService 中添加 number 字段并更新相关逻辑 - 在 ModelServiceDO 中添加 number 字段,用于表示模型数量 - 在 ModelServiceServiceImpl 中设置模型数量为 1 - 优化模型服务状态更新逻辑,根据数量字段决定是否更新状态 --- .../llm/dal/dataobject/modelservice/ModelServiceDO.java | 4 ++++ .../llm/service/basemodel/BaseModelTaskService.java | 8 ++++++-- .../llm/service/modelservice/ModelServiceServiceImpl.java | 2 ++ 3 files changed, 12 insertions(+), 2 deletions(-) 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 7d06f6d3a..c9ca8706d 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 @@ -46,6 +46,10 @@ public class ModelServiceDO extends BaseDO { *
*/ private Long gpuType; + /** + * 数量 + */ + private Integer number; /** * GPU数量 */ diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/basemodel/BaseModelTaskService.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/basemodel/BaseModelTaskService.java index 5b65342bb..a7ccf3f71 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/basemodel/BaseModelTaskService.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/basemodel/BaseModelTaskService.java @@ -311,7 +311,7 @@ public class BaseModelTaskService { String string1 = pedestalModelVo.getHost() + "/v1/chat/completions"; localModel.setStatus(2); localModel.setModelUrl(string1); -// localModel.setApiUrl(string1); + localModel.setNumber(2); localModel.setJobId((long) pedestalModelVo.getId()); modelServiceMapper.updateById(localModel); BaseModelDO baseModelDO = baseModelMapper.selectById(localModel.getFineTuningTask()); @@ -345,7 +345,11 @@ public class BaseModelTaskService { if (localModels != null && localModels.size() > 0) { ModelServiceDO localModel = localModels.get(0); // 如果状态不是 "running",更新本地状态 - localModel.setStatus(3); + if (localModel.getNumber()!=1) { + localModel.setStatus(3); + }else { + localModel.setNumber(2); + } modelServiceMapper.updateById(localModel); } } 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 c7779ef9c..b1b21a64a 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 @@ -121,6 +121,7 @@ public class ModelServiceServiceImpl implements ModelServiceService { modelService.setApiUrl(replace); modelService.setStatus(1); + modelService.setNumber(1); BaseModelDO byAigcId = baseModelService.getById(modelService.getFineTuningTask()); if (byAigcId != null){ modelService.setBaseModelName(byAigcId.getModelName()); @@ -461,6 +462,7 @@ public class ModelServiceServiceImpl implements ModelServiceService { String resStr = HttpUtils.post(llmBackendProperties.getDeployModel(), null,JSON.toJSONString(map)); ModelServiceDO updateObj = BeanUtils.toBean(updateReqVO, ModelServiceDO.class); updateObj.setStatus(1); + updateObj.setNumber(1); modelServiceMapper.updateById(updateObj); }catch (Exception e){ log.error("启动基础模型状态时发生异常: {}", e.getMessage(), e);