This commit is contained in:
ire 2025-01-25 11:51:46 +08:00
parent 3866266b93
commit 5b3035e2d3
2 changed files with 17 additions and 13 deletions

View File

@ -102,8 +102,22 @@ public class AsyncModelAccessManualService {
message.setRole("user");
messages.add(message);
String modelName = "";
if(modelAssessTaskAuto.getModelType() == 0){
ModelServiceDO modelServiceDO = modelServiceMapper.selectById(modelAssessTaskAuto.getModelService());
if (modelServiceDO != null){
modelName = modelServiceDO.getServiceName();
}
}else{
BaseModelDO baseModelDO = baseModelMapper.selectById(modelAssessTaskAuto.getModelService());
if (baseModelDO != null){
modelName = baseModelDO.getModelName();
}
}
ModelCompletionsReqVO modelCompletionsReqVO = new ModelCompletionsReqVO();
modelCompletionsReqVO.setMessages(messages);
modelCompletionsReqVO.setModel(modelName);
ModelCompletionsRespVO modelCompletionsRespVO = modelService.modelCompletions(modelCompletionsReqVO);
String prompt = modelCompletionsRespVO.getAnswer();
String res = trainHttpService.autoEvaluation(prompt, datasetPrompt);
@ -114,18 +128,7 @@ public class AsyncModelAccessManualService {
infoDO.setQuestion(question);
infoDO.setTaskId(modelAssessTaskAuto.getId());
if(modelAssessTaskAuto.getModelType() == 0){
ModelServiceDO modelServiceDO = modelServiceMapper.selectById(modelAssessTaskAuto.getModelService());
if (modelServiceDO != null){
infoDO.setModelName(modelServiceDO.getServiceName());
}
}else{
BaseModelDO baseModelDO = baseModelMapper.selectById(modelAssessTaskAuto.getModelService());
if (baseModelDO != null){
infoDO.setModelName(baseModelDO.getModelName());
}
}
infoDO.setModelName(modelName);
String[] split = res.split("\n");
List<String> list = new ArrayList<>(Arrays.asList(split));
@ -182,6 +185,7 @@ public class AsyncModelAccessManualService {
modelAssessTaskAuto.setStatus(4);
modelAssessTaskAutoMapper.updateById(modelAssessTaskAuto);
}catch (Exception e){
log.error("autoTask error : {}",e.getMessage());
modelAssessTaskAuto.setStatus(5);
modelAssessTaskAutoMapper.updateById(modelAssessTaskAuto);
}

View File

@ -25,7 +25,7 @@ import java.util.Map;
@Service
public class ModelService {
public final static String DEFAULT_MODEL_ID = "qwen2.5-instruct";
public final static String DEFAULT_MODEL_ID = "Qwen2.5-0.5B-Instruct";
public final static String PRIVATE_MODEL_ID = "llama3.1";
@Resource