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 66ad0065a..fbba40111 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 @@ -84,9 +84,14 @@ public class AsyncModelServiceService { AigcModelDeploySaveReq aigcModelDeploySaveReq = new AigcModelDeploySaveReq(modelServiceDO.getBaseModelName(), "gpu"); ModelDeployRespVO modelDeployRespVO = trainHttpService.modelDeploy(new HashMap<>(), aigcModelDeploySaveReq); - updateObj.setStatus(1); - updateObj.setJobId(modelDeployRespVO.getId()); - updateObj.setModelUrl(modelDeployRespVO.getPort()+DEFAULT_MODEL_URL_SUFFIX); + if (modelDeployRespVO.getMessage().equals("error")){ + updateObj.setStatus(3); + }else { + updateObj.setStatus(1); + updateObj.setJobId(modelDeployRespVO.getId()); + updateObj.setModelUrl(modelDeployRespVO.getPort()+DEFAULT_MODEL_URL_SUFFIX); + } + modelServiceMapper.updateById(updateObj); }catch(Exception e){ // updateObj.setStatus(3); 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 0744f3966..3ebbac412 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 @@ -60,11 +60,13 @@ public class BaseModelTaskService { AigcModelDeploySaveReq aigcModelDeploySaveReq = new AigcModelDeploySaveReq(baseModelDO.getAigcModelName(), "gpu"); ModelDeployRespVO modelDeployRespVO = trainHttpService.modelDeploy(new HashMap<>(), aigcModelDeploySaveReq); - BaseModelSaveReqVO baseModelSaveReqVO = new BaseModelSaveReqVO(); - baseModelSaveReqVO.setId(baseModelDO.getId()); - baseModelSaveReqVO.setModelId(modelDeployRespVO.getId()); - baseModelSaveReqVO.setChatUrl(modelDeployRespVO.getPort() + DEFAULT_MODEL_URL_SUFFIX); - baseModelService.updateBaseModel(new BaseModelSaveReqVO()); + if (!modelDeployRespVO.getMessage().equals("error")) { + BaseModelSaveReqVO baseModelSaveReqVO = new BaseModelSaveReqVO(); + baseModelSaveReqVO.setId(baseModelDO.getId()); + baseModelSaveReqVO.setModelId(modelDeployRespVO.getId()); + baseModelSaveReqVO.setChatUrl(modelDeployRespVO.getPort() + DEFAULT_MODEL_URL_SUFFIX); + baseModelService.updateBaseModel(new BaseModelSaveReqVO()); + } } } } 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 670324a24..70557eeb8 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 @@ -244,7 +244,15 @@ public class TrainHttpService { log.info(" modelDeploy request:{}", JSON.toJSONString(req)); String res = HttpUtils.post(modelDeploy, headers, JSON.toJSONString(req)); log.info(" modelDeploy:{}", res); - ModelDeployRespVO modelDeployRespVO = JSON.parseObject(res.getBytes(), ModelDeployRespVO.class); + JSONObject parseObject = JSON.parseObject(res); + ModelDeployRespVO modelDeployRespVO=new ModelDeployRespVO(); + + if(parseObject.getString("res").contains("error")){ + modelDeployRespVO.setMessage("error"); + return modelDeployRespVO; + } + modelDeployRespVO = JSON.parseObject(res.getBytes(), ModelDeployRespVO.class); + return modelDeployRespVO; } public AigcModelDeployVO modelUndeploy(Map headers, Long deployId) {