From cd33cef81088d6ef85434b6f15efee95cf214d73 Mon Sep 17 00:00:00 2001 From: limin Date: Thu, 23 Jan 2025 18:30:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A8=A1=E5=9E=8B=E5=BE=AE?= =?UTF-8?q?=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backend/config/LLMBackendProperties.java | 1 + .../llm/service/async/AsyncFineTuningTaskService.java | 1 + .../finetuningtask/FineTuningTaskServiceImpl.java | 1 + .../module/llm/service/http/TrainHttpService.java | 11 +++++++++++ yudao-server/src/main/resources/application-dev.yaml | 2 ++ .../src/main/resources/application-local.yaml | 2 ++ yudao-server/src/main/resources/application-prod.yaml | 2 ++ 7 files changed, 20 insertions(+) diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/framework/backend/config/LLMBackendProperties.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/framework/backend/config/LLMBackendProperties.java index 9c8e96007..1c15a3ef8 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/framework/backend/config/LLMBackendProperties.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/framework/backend/config/LLMBackendProperties.java @@ -74,6 +74,7 @@ public class LLMBackendProperties { private String finetuningDetail; private String finetuningFileList; + private String finetuningCancel; private String applicationApi; diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/async/AsyncFineTuningTaskService.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/async/AsyncFineTuningTaskService.java index 68076a046..b51765d79 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/async/AsyncFineTuningTaskService.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/async/AsyncFineTuningTaskService.java @@ -85,6 +85,7 @@ public class AsyncFineTuningTaskService { @Async public void stopFineTuningTask(FineTuningTaskDO fineTuningTask) { try { + trainHttpService.finetuningCancle(new HashMap<>(),fineTuningTask.getJobId()); trainHttpService.finetuningDelete(new HashMap<>(), fineTuningTask.getJobId()); }catch(Exception e){ e.printStackTrace(); 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 64a586fdb..02b26f30b 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 @@ -62,6 +62,7 @@ public class FineTuningTaskServiceImpl implements FineTuningTaskService { // 插入 validateFineTuningNameTaskExists(createReqVO); FineTuningTaskDO fineTuningTask = BeanUtils.toBean(createReqVO, FineTuningTaskDO.class); + fineTuningTask.setStatus(FinetuningTaskStatusEnum.WAITING.getStatus()); fineTuningTaskMapper.insert(fineTuningTask); //todo 调用模型服务，创建调优任务 asyncFineTuningTaskService.createTuning(fineTuningTask); 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 889b154ad..3878e5179 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 @@ -312,4 +312,15 @@ public class TrainHttpService { } + public AigcRespVO finetuningCancle(Map headers, String jobId) { + login(headers); + String finetuningCancel = llmBackendProperties.getFinetuningCancel(); + String url = String.format(finetuningCancel,jobId); + String res = HttpUtils.del(url, headers); + log.info(" finetuningDelete:{}", res); + AigcRespVO aigcRespVO = JSON.parseObject(res, AigcRespVO.class); + log.info(" finetuningDelete:{}", aigcRespVO); + return aigcRespVO; + + } } diff --git a/yudao-server/src/main/resources/application-dev.yaml b/yudao-server/src/main/resources/application-dev.yaml index 71245360f..c572b54a8 100644 --- a/yudao-server/src/main/resources/application-dev.yaml +++ b/yudao-server/src/main/resources/application-dev.yaml @@ -243,6 +243,8 @@ llm: finetuning_create: http://36.103.199.104:9000/api/finetuning # 微调任务详情 GET finetuning_detail: http://36.103.199.104:9000/api/finetuning + # 微调任务取消 + finetuning_cancel: http://36.103.199.104:9000/api/finetuning/%s/cancel # 微调文件列表 GET finetuning_file_list: http://36.103.199.104:9000/api/files?purpose=fine-tune # 模型创建 diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml index 61a2cfba3..abf8aaf6d 100644 --- a/yudao-server/src/main/resources/application-local.yaml +++ b/yudao-server/src/main/resources/application-local.yaml @@ -286,6 +286,8 @@ llm: finetuning_create: http://36.103.199.104:9000/api/finetuning # 微调任务详情 GET finetuning_detail: http://36.103.199.104:9000/api/finetuning + # 微调任务取消 + finetuning_cancel: http://36.103.199.104:9000/api/finetuning/%s/cancel # 微调文件列表 GET finetuning_file_list: http://36.103.199.104:9000/api/files?purpose=fine-tune # 模型部署 diff --git a/yudao-server/src/main/resources/application-prod.yaml b/yudao-server/src/main/resources/application-prod.yaml index 6a1e82c51..d357d5338 100644 --- a/yudao-server/src/main/resources/application-prod.yaml +++ b/yudao-server/src/main/resources/application-prod.yaml @@ -286,6 +286,8 @@ llm: finetuning_create: http://36.133.1.230:8080/api/finetuning # 微调任务详情 GET finetuning_detail: http://36.133.1.230:8080/api/finetuning + # 微调任务取消 + finetuning_cancel: http://36.103.199.104:9000/api/finetuning/%s/cancel # 微调文件列表 GET finetuning_file_list: http://36.133.1.230:8080/api/files?purpose=fine-tune # 模型部署