diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/finetuningtask/FineTuningTaskServiceImpl.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/finetuningtask/FineTuningTaskServiceImpl.java index 1f2b7be21..550d09a1d 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/finetuningtask/FineTuningTaskServiceImpl.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/finetuningtask/FineTuningTaskServiceImpl.java @@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.llm.service.finetuningtask; import cn.iocoder.yudao.framework.common.exception.ErrorCode; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.module.llm.controller.admin.basemodel.BaseModelController; import cn.iocoder.yudao.module.llm.controller.admin.finetuningtask.vo.FineTuningTaskPageReqVO; import cn.iocoder.yudao.module.llm.controller.admin.finetuningtask.vo.FineTuningTaskRespVO; import cn.iocoder.yudao.module.llm.controller.admin.finetuningtask.vo.FineTuningTaskSaveReqVO; @@ -26,6 +27,7 @@ import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -67,6 +69,10 @@ public class FineTuningTaskServiceImpl implements FineTuningTaskService { @Resource private ModelServiceService modelServiceService; + @Resource + @Lazy + private BaseModelController baseModelController; + @Override public Long createFineTuningTask (FineTuningTaskSaveReqVO createReqVO) { @@ -115,6 +121,11 @@ public class FineTuningTaskServiceImpl implements FineTuningTaskService { // validateFineTuningTaskUse(id); FineTuningTaskDO fineTuningTaskDO = fineTuningTaskMapper.selectById(id); // 删除 + LambdaQueryWrapper eq = new LambdaQueryWrapper().eq(BaseModelDO::getModelName, fineTuningTaskDO.getJobModelName()); + List baseModelDOS = baseModelMapper.selectList(eq); + if (baseModelDOS != null && baseModelDOS.size() > 0) { + baseModelController.deleteTheModel(baseModelDOS.get(0).getId()); + } LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); wrapper.eq(FineTuningTaskDO::getId, id) .set(FineTuningTaskDO::getDeleted, true); 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 72e551291..742b2150e 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 @@ -94,10 +94,6 @@ public class ModelServiceServiceImpl implements ModelServiceService { @Resource @Lazy private BaseModelService baseModelService; - @Resource - private BaseModelController baseModelController; - @Resource - private BaseModelMapper baseModelMapper; @Override @@ -186,12 +182,6 @@ public class ModelServiceServiceImpl implements ModelServiceService { ModelServiceDO modelServiceDO = modelServiceMapper.selectById(id); ServerNameDO serverNameDO = serverNameService.getServerName(modelServiceDO.getGpuType()); - LambdaQueryWrapper wrapper = new LambdaQueryWrapper().eq(BaseModelDO::getModelName, modelServiceDO.getBaseModelName()); - List baseModelDOS = baseModelMapper.selectList(wrapper); - if (baseModelDOS != null && baseModelDOS.size() > 0) { - baseModelController.deleteTheModel(baseModelDOS.get(0).getId()); - } - // 发起模型卸载请求 log.info("正在发起模型卸载请求,服务ID: {}", id); trainHttpService.modelUndeploy(new HashMap<>(), serverNameDO.getHost(), modelServiceDO.getJobId());