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 { @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;