Commit 099a81f3 authored by alex yao's avatar alex yao

fix:NPE

parent 446d8046
......@@ -193,7 +193,7 @@ public class AgentApplicationInfoServiceImpl implements AgentApplicationInfoServ
systemMessage.setRole(LLMRoleEnum.SYSTEM.getRole());
Message message = new Message();
message.setContent("{" + input + "}");
message.setContent("[" + input + "]");
message.setRole(LLMRoleEnum.USER.getRole());
List<Message> messages = new ArrayList<Message>() {{
add(systemMessage);
......
package cn.com.poc.thirdparty.resource.demand.ai.aggregate.impl;
import cn.com.poc.common.utils.JsonUtils;
import cn.com.poc.thirdparty.resource.demand.ai.aggregate.AIDialogueService;
import cn.com.poc.thirdparty.resource.demand.ai.entity.function.FunctionCallResponse;
import cn.com.poc.thirdparty.resource.demand.ai.entity.function.FunctionCallResult;
import cn.com.poc.thirdparty.resource.demand.ai.entity.largemodel.LargeModelDemandResponse;
import cn.com.poc.thirdparty.resource.demand.ai.entity.largemodel.LargeModelDemandResult;
import cn.com.poc.thirdparty.resource.demand.ai.entity.largemodel.LargeModelResponse;
import cn.com.poc.thirdparty.resource.demand.member.service.DemandAuthService;
import cn.com.poc.thirdparty.resource.demand.dgTools.DgtoolsAbstractHttpClient;
import cn.com.poc.thirdparty.resource.demand.ai.route.DgtoolsApiRoute;
import cn.com.poc.thirdparty.resource.demand.dgTools.DgtoolsAbstractHttpClient;
import cn.com.poc.thirdparty.resource.demand.member.service.DemandAuthService;
import cn.com.yict.framemax.core.exception.BusinessException;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.Header;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.RequestBuilder;
......@@ -92,7 +95,20 @@ public class AIDialogueServiceImpl implements AIDialogueService {
.build()
);
InputStream inputStream = httpResponse.getEntity().getContent();
Header contentType = httpResponse.getFirstHeader("Content-type");
BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8));
if ("application/json".equals(contentType.getValue()) || "text/plain;charset=UTF-8".equals(contentType.getValue()) || "application/json; charset=utf-8".equals(contentType.getValue())) {
String res;
StringBuilder stringBuilder = new StringBuilder();
while ((res = bufferedReader.readLine()) != null) {
if (StringUtils.isBlank(res)) {
continue;
}
stringBuilder.append(res);
}
LargeModelDemandResult result = JsonUtils.deSerialize(stringBuilder.toString(), LargeModelDemandResult.class);
throw new BusinessException(result.getMessage());
}
return bufferedReader;
}
......@@ -103,7 +119,7 @@ public class AIDialogueServiceImpl implements AIDialogueService {
add(DgtoolsApiRoute.AI_HEADER);
add(new BasicHeader(DgtoolsApiRoute.HEADER_X_PLATFORM_AUTHORIZATION, demandAuthService.getToken()));
}};
return dgToolsAbstractHttpClient.doRequest(url, request, headers);
return dgToolsAbstractHttpClient.doRequest(url, request, headers);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment