DATA_MIDDLE_PLATFORM/Data_Middle_Platform_Server
3
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

修改思考出现问题

Browse Source
This commit is contained in:
limin 2025-02-24 17:36:23 +08:00
parent 8a9db64ab1
commit 414ab3039f
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/basemodel/BaseModelTaskService.java
View File

@ -47,9 +47,10 @@ public class BaseModelTaskService {
List<BaseModelDO> 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());

9
yudao-module-llm/yudao-module-llm-biz/src/main/java/cn/iocoder/yudao/module/llm/service/http/ModelService.java
View File

@ -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 = "(<think>.*?</think>)";
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;