diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/basemodel/BaseModelTaskService.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/basemodel/BaseModelTaskService.java index 996efd04b..5dbec90fd 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/basemodel/BaseModelTaskService.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/basemodel/BaseModelTaskService.java @@ -47,9 +47,10 @@ public class BaseModelTaskService { List baseModelList = baseModelService.getBaseModelList(); for (BaseModelDO baseModelDO : baseModelList) { Long modelId = baseModelDO.getModelId(); - + Long gpuId = baseModelDO.getGpuId(); + ServerNameDO serverNameDO1 = serverNameMapper.selectById(gpuId); String query = "?filter={\"id\":" + modelId + "}"; - String res = trainHttpService.modelTableQuery(new HashMap<>(), "","model_deploy", query); + String res = trainHttpService.modelTableQuery(new HashMap<>(), serverNameDO1.getHost(),"model_deploy", query); ObjectMapper mapper = new ObjectMapper(); mapper.registerModule(new JavaTimeModule()); diff --git a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/http/ModelService.java b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/http/ModelService.java index 83c4ff7c8..ae31c45a9 100644 --- a/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/http/ModelService.java +++ b/yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/http/ModelService.java @@ -18,6 +18,8 @@ import java.io.BufferedReader; import java.io.InputStream; import java.io.InputStreamReader; import java.util.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; @Slf4j @Service @@ -83,11 +85,16 @@ public class ModelService { try { ChatCompletion chatCompletion = JSON.parseObject(result, ChatCompletion.class); if (StringUtils.isBlank(chatCompletion.getDetail())) { + String respContent = chatCompletion.getChoices().get(0).getMessage().getContent(); + String patternString = "(.*?)"; + Pattern pattern = Pattern.compile(patternString, Pattern.DOTALL); + Matcher matcher = pattern.matcher(respContent); + String answerContent = matcher.replaceAll(""); // 没有detail,就是没有错误 ModelCompletionsRespVO respVO = new ModelCompletionsRespVO(); respVO.setSystem("助手"); respVO.setQuestion(req.getMessages().get(req.getMessages().size() - 1).getContent()); - respVO.setAnswer(chatCompletion.getChoices().get(0).getMessage().getContent()); + respVO.setAnswer(answerContent); return respVO; } return null;