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 12e1b00c0..dfa2f01fe 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 @@ -130,7 +130,7 @@ public class AsyncModelServiceService { try { ModelServiceDO modelServiceDO = modelServiceMapper.selectById(updateObj.getId()); // Thread.sleep(30000); - AigcRespVO aigcRespVO = trainHttpService.modelUndeploy(new HashMap<>(), modelServiceDO.getJobId()); + AigcRespVO aigcRespVO = trainHttpService.modelUndeploy(new HashMap<>(), modelServiceDO.getBaseModelName()); if (aigcRespVO.isSuccess()){ updateObj.setStatus(0); }else { 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 ce8576939..02bab2e75 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 @@ -248,11 +248,10 @@ public class TrainHttpService { AigcRespVO aigcRespVO = JSON.parseObject(res, AigcRespVO.class); return aigcRespVO; } - public AigcRespVO modelUndeploy(Map headers, Long modelId) { + public AigcRespVO modelUndeploy(Map headers, String baseModelName) { login(headers); String modelDeploy = llmBackendProperties.getModelUndeploy(); - String url = String.format(modelDeploy,modelId); - String res = HttpUtils.post(url, headers,""); + String res = HttpUtils.post(modelDeploy + baseModelName, headers,""); log.info(" modelDeploy:{}", res); AigcRespVO aigcRespVO = JSON.parseObject(res, AigcRespVO.class); log.info(" modelDeploy:{}", aigcRespVO); diff --git a/yudao-server/src/main/resources/application-dev.yaml b/yudao-server/src/main/resources/application-dev.yaml index 4e943f3d9..ac0b2c75c 100644 --- a/yudao-server/src/main/resources/application-dev.yaml +++ b/yudao-server/src/main/resources/application-dev.yaml @@ -249,10 +249,10 @@ llm: finetuning_file_list: http://36.103.199.104:9000/api/files?purpose=fine-tune # 模型创建 model_create: http://36.103.199.104:9000/api/models - # 模型部署 + # 开始部署 model_deploy: http://36.103.199.104:5123/llm/deploy - # 取消模型 - model_undeploy: http://36.103.199.104:9000/api/models/%s/undeploy + # 取消部署 + model_undeploy: http://36.103.199.104:5123/llm/stop_task?model_name= # 微调文件上传 aigc_file_upload: http://36.103.199.104:9000/api/files # diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml index c064e2359..51c747f4c 100644 --- a/yudao-server/src/main/resources/application-local.yaml +++ b/yudao-server/src/main/resources/application-local.yaml @@ -292,10 +292,10 @@ llm: finetuning_file_list: http://36.103.199.104:9000/api/files?purpose=fine-tune # 模型部署 model_create: http://36.103.199.104:9000/api/models - # 模型部署 + # 开始部署 model_deploy: http://36.103.199.104:5123/llm/deploy - # 取消模型 - model_undeploy: http://36.103.199.104:9000/api/models/%s/undeploy + # 取消部署 + model_undeploy: http://36.103.199.104:5123/llm/stop_task?model_name= #### 大模型对话 # 模型列表 GET base_model_list: http://36.103.199.104:9997/model/v1/models diff --git a/yudao-server/src/main/resources/application-prod.yaml b/yudao-server/src/main/resources/application-prod.yaml index 3432bde1b..ccdfe881e 100644 --- a/yudao-server/src/main/resources/application-prod.yaml +++ b/yudao-server/src/main/resources/application-prod.yaml @@ -292,10 +292,10 @@ llm: finetuning_file_list: http://36.133.1.230:8080/api/files?purpose=fine-tune # 模型部署 model_create: http://36.133.1.230:8080/api/models - # 模型部署 + # 开始部署 model_deploy: http://36.103.199.104:5123/llm/deploy - # 取消模型 - model_undeploy: http://36.133.1.230:8080/api/models/%s/undeploy + # 取消部署 + model_undeploy: http://36.103.199.104:5123/llm/stop_task?model_name= #### 大模型对话 # 模型列表 GET base_model_list: http://36.103.199.104:9997/model/v1/models