修改
This commit is contained in:
parent
7d1fd72db1
commit
8b4a56488f
@ -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";
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user