From 94f6f4c38f5c3d5199372cef51b76a9f7f24b0cc Mon Sep 17 00:00:00 2001
From: ire <931903008@qq.com>
Date: Fri, 24 Jan 2025 11:00:13 +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

---
 .../yudao/module/llm/dal/dataobject/dataset/DatasetDO.java  | 3 +++
 .../yudao/module/llm/dal/mysql/dataset/DatasetMapper.java   | 3 +++
 .../yudao/module/llm/service/async/AsyncDataSetService.java | 6 ++++++
 .../llm/service/async/AsyncFineTuningTaskService.java       | 3 ++-
 .../llm/service/http/vo/AigcFineTuningCreateReqVO.java      | 1 +
 5 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/dataobject/dataset/DatasetDO.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/dataobject/dataset/DatasetDO.java
index 03c11eb43..3d8ecbb9a 100644
--- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/dataobject/dataset/DatasetDO.java
+++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/dataobject/dataset/DatasetDO.java
@@ -72,4 +72,7 @@ public class DatasetDO extends BaseDO {
      */
     private String jobId;
 
+    private String fileUrl;
+
+
 }
diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/mysql/dataset/DatasetMapper.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/mysql/dataset/DatasetMapper.java
index 54aead1ed..ee5fd3189 100644
--- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/mysql/dataset/DatasetMapper.java
+++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/dal/mysql/dataset/DatasetMapper.java
@@ -41,4 +41,7 @@ public interface DatasetMapper extends BaseMapperX<DatasetDO> {
 
     @Update("update llm_dataset set job_id = #{fileId} where id = #{id}")
     void setJobid(@Param("id") Long id,@Param("fileId") String fileId);
+
+    @Update("update llm_dataset set file_url = #{url} where id = #{id}")
+    void setUrl(@Param("id") Long id,@Param("url") String url);
 }
diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/async/AsyncDataSetService.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/async/AsyncDataSetService.java
index cf69178d9..6a224bc96 100644
--- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/async/AsyncDataSetService.java
+++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/async/AsyncDataSetService.java
@@ -59,6 +59,12 @@ public class AsyncDataSetService {
             AigcDatasetFileRespV0 aigcDatasetFileRespV0 = trainHttpService.AigcUploadFile(new HashMap<>(), inputStream, datasetDO.getDatasetName() + datasetDO.getId() + ".json");
             if (aigcDatasetFileRespV0 != null){
                 datasetMapper.setJobid(datasetDO.getId(),aigcDatasetFileRespV0.getFileId());
+
+                String s3Url = aigcDatasetFileRespV0.getS3Url();
+                int lastIndex = s3Url.lastIndexOf("/");
+                String url = s3Url.substring(lastIndex + 1);
+                datasetMapper.setUrl(datasetDO.getId(),"storage/" + url);
+
                 log.info("[JsonFileWrite][写入文件成功]");
             }
         } catch (IOException e) {
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 2c640392e..777a1fcc7 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
@@ -37,7 +37,8 @@ public class AsyncFineTuningTaskService {
             AigcFineTuningCreateReqVO req = getAigcFineTuningCreateReqVO(fineTuningTask);
             Long datasetId = fineTuningTask.getDataset();
             DatasetRespVO dataset = datasetService.getDataset(datasetId);
-            req.setFileId(dataset.getJobId());
+//            req.setFileId(dataset.getJobId());
+            req.setDataset(dataset.getDatasetFileUrl());
             req.setSuffix(String.valueOf(fineTuningTask.getId()));
             AigcFineTuningCreateRespVO resp = trainHttpService.finetuningCreate(new HashMap<>(), req);
             FineTuningTaskDO updateObj = new FineTuningTaskDO();
diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/http/vo/AigcFineTuningCreateReqVO.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/http/vo/AigcFineTuningCreateReqVO.java
index 66cb66605..358c3d384 100644
--- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/http/vo/AigcFineTuningCreateReqVO.java
+++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/http/vo/AigcFineTuningCreateReqVO.java
@@ -11,6 +11,7 @@ public class AigcFineTuningCreateReqVO {
 
         private String scenario = "general";
         private String fileId = "6237ed4d-a046-479c-80d6-8579a0283994";
+        private String dataset;
         private String baseModel;
         private int trainEpoch;
         private String suffix;