From 8b4a56488f62b98e6853c38a263d8e0a7459a37c Mon Sep 17 00:00:00 2001 From: limin Date: Thu, 20 Feb 2025 14:52:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/async/AsyncModelAccessManualService.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/async/AsyncModelAccessManualService.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/async/AsyncModelAccessManualService.java index 79002f98e..08130d78b 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/async/AsyncModelAccessManualService.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/async/AsyncModelAccessManualService.java @@ -17,6 +17,7 @@ import cn.iocoder.yudao.module.llm.dal.dataobject.modelassesstaskmanualbackup.Ma import cn.iocoder.yudao.module.llm.dal.dataobject.modelassesstaskmanualbackup.ModelAssessTaskDimensionBackupDO; import cn.iocoder.yudao.module.llm.dal.dataobject.modelassesstaskmanualbackup.ModelAssessTaskManualBackupDO; import cn.iocoder.yudao.module.llm.dal.dataobject.modelservice.ModelServiceDO; +import cn.iocoder.yudao.module.llm.dal.dataobject.servername.ServerNameDO; import cn.iocoder.yudao.module.llm.dal.mysql.basemodel.BaseModelMapper; import cn.iocoder.yudao.module.llm.dal.mysql.dataset.DatasetMapper; import cn.iocoder.yudao.module.llm.dal.mysql.modelassesstaskauto.ModelAssessTaskAutoMapper; @@ -27,6 +28,7 @@ import cn.iocoder.yudao.module.llm.dal.mysql.modelassesstaskmanual.ModelAssessTa import cn.iocoder.yudao.module.llm.dal.mysql.modelassesstaskmanualbackup.ManualModelAnswerBackupMapper; import cn.iocoder.yudao.module.llm.dal.mysql.modelassesstaskmanualbackup.ModelAssessTaskDimensionBackupMapper; import cn.iocoder.yudao.module.llm.dal.mysql.modelservice.ModelServiceMapper; +import cn.iocoder.yudao.module.llm.dal.mysql.servername.ServerNameMapper; import cn.iocoder.yudao.module.llm.service.conversation.ConversationService; import cn.iocoder.yudao.module.llm.service.dataset.DatasetQuestionService; import cn.iocoder.yudao.module.llm.service.http.ModelService; @@ -74,6 +76,8 @@ public class AsyncModelAccessManualService { private BaseModelMapper baseModelMapper; @Resource private ModelAssessTaskAutoInfoMapper modelAssessTaskAutoInfoMapper; + @Resource + private ServerNameMapper serverNameMapper; @Async @@ -104,16 +108,22 @@ public class AsyncModelAccessManualService { String modelName = ""; String modelUrl = ""; + String modelHost = ""; if(modelAssessTaskAuto.getModelType() == 0){ ModelServiceDO modelServiceDO = modelServiceMapper.selectById(modelAssessTaskAuto.getModelService()); if (modelServiceDO != null){ modelName = modelServiceDO.getBaseModelName(); modelUrl = modelServiceDO.getModelUrl(); + ServerNameDO serverNameDO = serverNameMapper.selectById(modelServiceDO.getGpuType()); + modelHost = serverNameDO.getHost(); } }else{ BaseModelDO baseModelDO = baseModelMapper.selectById(modelAssessTaskAuto.getModelService()); if (baseModelDO != null){ modelName = baseModelDO.getAigcModelName(); + modelUrl = baseModelDO.getChatUrl(); + ServerNameDO serverNameDO = serverNameMapper.selectById(baseModelDO.getGpuId()); + modelHost = serverNameDO.getHost(); } } @@ -126,7 +136,7 @@ public class AsyncModelAccessManualService { String res = ""; if(prompt != null && !prompt.equals("")){ try{ - res = trainHttpService.autoEvaluation(modelUrl,prompt, datasetPrompt); + res = trainHttpService.autoEvaluation(modelHost,prompt, datasetPrompt); }catch (Exception ex){ res = "bad"; }