From 7fe7494e7dc8abfabea52687cd4d3b280de1e3ee Mon Sep 17 00:00:00 2001
From: ire <931903008@qq.com>
Date: Fri, 24 Jan 2025 11:24:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E8=B0=83=E4=BC=98=EF=BC=8C?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../async/AsyncModelServiceService.java        | 18 ++++++++++++++++--
 .../llm/service/http/TrainHttpService.java     |  5 ++---
 .../http/vo/AigcModelDeploySaveReq.java        |  2 ++
 .../src/main/resources/application-local.yaml  |  2 +-
 4 files changed, 21 insertions(+), 6 deletions(-)

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 537f5a7b9..12e1b00c0 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
@@ -89,15 +89,29 @@ public class AsyncModelServiceService {
              * quantization:"float16"
              * replicas:1
              */
+            /**
+             * {
+             *   "model": "string",
+             *   "inferredType": "gpu",
+             *   "cpu": 0,
+             *   "gpu": 1,
+             *   "replicas": 1,
+             *   "label": "cpu-aigc-model",
+             *   "quantization": "float16",
+             *   "maxGpuMemory": 0,
+             *   "modelWorker": ""
+             * }
+             */
             ModelServiceDO modelServiceDO = modelServiceMapper.selectById(updateObj.getId());
-            AigcModelDeploySaveReq aigcModelDeploySaveReq = new AigcModelDeploySaveReq(1,
+            AigcModelDeploySaveReq aigcModelDeploySaveReq = new AigcModelDeploySaveReq(modelServiceDO.getBaseModelName(),
+                    1,
                     updateObj.getGpuCount(),
                     "cpu",
                     "cpu-aigc-model",
                     0,
                     "",
                     "float16", 1);
-            AigcRespVO aigcRespVO = trainHttpService.modelDeploy(new HashMap<>(), aigcModelDeploySaveReq,modelServiceDO.getJobId());
+            AigcRespVO aigcRespVO = trainHttpService.modelDeploy(new HashMap<>(), aigcModelDeploySaveReq);
             if (aigcRespVO.isSuccess()){
                 updateObj.setStatus(1);
             }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 c0c90f409..ce8576939 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
@@ -240,11 +240,10 @@ public class TrainHttpService {
         return res;
     }
 
-    public AigcRespVO modelDeploy(Map<String, String> headers,AigcModelDeploySaveReq req,Long jobId){
+    public AigcRespVO modelDeploy(Map<String, String> headers,AigcModelDeploySaveReq req){
         login(headers);
         String modelDeploy = llmBackendProperties.getModelDeploy();
-        String url = String.format(modelDeploy,jobId);
-        String res = HttpUtils.post(url, headers, JSON.toJSONString(req));
+        String res = HttpUtils.post(modelDeploy, headers, JSON.toJSONString(req));
         log.info(" modelDeploy:{}", res);
         AigcRespVO aigcRespVO = JSON.parseObject(res, AigcRespVO.class);
         return aigcRespVO;
diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/http/vo/AigcModelDeploySaveReq.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/http/vo/AigcModelDeploySaveReq.java
index 7e08dae29..d0e4e1e27 100644
--- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/http/vo/AigcModelDeploySaveReq.java
+++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/http/vo/AigcModelDeploySaveReq.java
@@ -18,6 +18,8 @@ public class AigcModelDeploySaveReq {
      * quantization:"float16"
      * replicas:1
      */
+
+    private String model;
     private Integer cpu;
     private Integer gpu;
     /**
diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml
index e594b1814..015ffbba4 100644
--- a/yudao-server/src/main/resources/application-local.yaml
+++ b/yudao-server/src/main/resources/application-local.yaml
@@ -293,7 +293,7 @@ llm:
     # 模型部署
     model_create: http://36.103.199.104:9000/api/models
     # 模型部署
-    model_deploy: http://36.103.199.104:9000/api/models/%s/deploy
+    model_deploy: http://36.103.199.104:5123/llm/deploy
     # 取消模型
     model_undeploy: http://36.103.199.104:9000/api/models/%s/undeploy
     #### 大模型对话