From ee52e777d679553fd1e042f1a2571f6028788f2a Mon Sep 17 00:00:00 2001 From: Liuyang <2746366019@qq.com> Date: Wed, 26 Feb 2025 11:25:26 +0800 Subject: [PATCH] =?UTF-8?q?refactor(module-llm):=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=8D=B8=E8=BD=BD=E5=92=8C=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E9=80=BB=E8=BE=91-=20=E5=9C=A8=20ModelServiceServiceImpl=20?= =?UTF-8?q?=E4=B8=AD=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=EF=BC=8C=E8=AF=A6=E7=BB=86=E8=AE=B0=E5=BD=95=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E5=8D=B8=E8=BD=BD=E5=92=8C=E5=88=A0=E9=99=A4=E8=BF=87=E7=A8=8B?= =?UTF-8?q?=20-=20=E4=BC=98=E5=8C=96=20TrainHttpService=20=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=20modelUndeploy=20=E6=96=B9=E6=B3=95=EF=BC=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BC=82=E5=B8=B8=E5=A4=84=E7=90=86=E5=B9=B6?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../llm/service/http/TrainHttpService.java | 33 +++++++++++++++---- .../modelservice/ModelServiceServiceImpl.java | 12 +++++-- 2 files changed, 36 insertions(+), 9 deletions(-) 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 214b41260..62ac2ca72 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 @@ -247,13 +247,32 @@ public class TrainHttpService { } public AigcModelDeployVO modelUndeploy (Map headers, String url, Long deployId) { - // login(headers); - String modelDeploy = llmBackendProperties.getModelUndeploy(); - String res = HttpUtils.post(url + modelDeploy + deployId, headers, ""); - log.info(" modelDeploy:{}", res); - AigcModelDeployVO modelDeployRespVO = JSON.parseObject(res, AigcModelDeployVO.class); - log.info(" modelDeploy:{}", modelDeployRespVO); - return modelDeployRespVO; + try { + log.info("开始卸载模型部署，部署ID: {}", deployId); + + // 构建请求 URL + String modelDeploy = llmBackendProperties.getModelUndeploy(); + String requestUrl = url + modelDeploy + deployId; + log.debug("构建请求 URL: {}", requestUrl); + + // 发起 HTTP POST 请求 + log.debug("正在发起 HTTP POST 请求..."); + String res = HttpUtils.post(requestUrl, headers, ""); + log.info("HTTP 请求完成。响应内容: {}", res); + + // 解析响应内容 + log.debug("正在解析响应内容..."); + AigcModelDeployVO modelDeployRespVO = JSON.parseObject(res, AigcModelDeployVO.class); + log.info("响应解析完成。模型卸载结果: {}", JSON.toJSONString(modelDeployRespVO)); + + // 返回结果 + return modelDeployRespVO; + + } catch (Exception e) { + log.error("卸载模型部署时发生异常。部署ID: {}", deployId, e); + throw new RuntimeException("模型卸载失败", e); + } + } /** 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 752b0747c..2bab4ae3e 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 @@ -147,14 +147,22 @@ public class ModelServiceServiceImpl implements ModelServiceService { public void deleteModelService (Long id) { // 校验存在 validateModelServiceExists(id); + // 校验使用 validateModelUse(id); ModelServiceDO modelServiceDO = modelServiceMapper.selectById(id); ServerNameDO serverNameDO = serverNameService.getServerName(modelServiceDO.getGpuType()); - trainHttpService.modelUndeploy(new HashMap<>(), serverNameDO.getHost(),modelServiceDO.getJobId()); - // 删除 + + // 发起模型卸载请求 + log.info("正在发起模型卸载请求，服务ID: {}", id); + trainHttpService.modelUndeploy(new HashMap<>(), serverNameDO.getHost(), modelServiceDO.getJobId()); + log.info("模型卸载请求完成，服务ID: {}", id); + + // 删除模型服务 + log.debug("正在删除模型服务，服务ID: {}", id); modelServiceMapper.deleteById(id); + log.info("模型服务删除成功，服务ID: {}", id); } /**