Commit 0de07fa5 authored by yangyw's avatar yangyw

Merge branch 'refs/heads/feature/20241217_收尾' into sandbox

parents 812e460c 9082f9ec
...@@ -593,6 +593,7 @@ public class AppChatCompletionService { ...@@ -593,6 +593,7 @@ public class AppChatCompletionService {
final Boolean[] replyFlag = {false}; final Boolean[] replyFlag = {false};
String finalSessionId = sessionId; String finalSessionId = sessionId;
List<String> references = Lists.newArrayList(); List<String> references = Lists.newArrayList();
final Boolean[] referenceFlag = {false};
return webClient.post().uri(dsApiBase).accept(MediaType.TEXT_EVENT_STREAM).bodyValue(reqBody.toJSONString()).exchangeToFlux(r -> r.bodyToFlux(String.class)) return webClient.post().uri(dsApiBase).accept(MediaType.TEXT_EVENT_STREAM).bodyValue(reqBody.toJSONString()).exchangeToFlux(r -> r.bodyToFlux(String.class))
.mapNotNull(v -> { .mapNotNull(v -> {
log.info("ds:{}", v); log.info("ds:{}", v);
...@@ -628,7 +629,8 @@ public class AppChatCompletionService { ...@@ -628,7 +629,8 @@ public class AppChatCompletionService {
if (StrUtil.isBlank(recordId[0]) && StrUtil.isNotBlank(payload.getString("record_id"))) { if (StrUtil.isBlank(recordId[0]) && StrUtil.isNotBlank(payload.getString("record_id"))) {
recordId[0] = payload.getString("record_id"); recordId[0] = payload.getString("record_id");
} }
if (CollUtil.isEmpty(references) && payload.containsKey("knowledge")) { if (referenceFlag[0] == false && CollUtil.isEmpty(references) && payload.containsKey("knowledge")) {
referenceFlag[0] = true;
JSONArray knowledge = payload.getJSONArray("knowledge"); JSONArray knowledge = payload.getJSONArray("knowledge");
if (ObjectUtil.isNotNull(knowledge) && knowledge.size() > 0) { if (ObjectUtil.isNotNull(knowledge) && knowledge.size() > 0) {
for (Object kb : knowledge) { for (Object kb : knowledge) {
...@@ -641,6 +643,7 @@ public class AppChatCompletionService { ...@@ -641,6 +643,7 @@ public class AppChatCompletionService {
if (CollUtil.isNotEmpty(references)) { if (CollUtil.isNotEmpty(references)) {
try { try {
List<String> docs = tencentCloudFacade.getKbSegment(references); List<String> docs = tencentCloudFacade.getKbSegment(references);
log.info("get kb docs:{}", docs.size());
result.setReferences(docs); result.setReferences(docs);
} catch (TencentCloudSDKException e) { } catch (TencentCloudSDKException e) {
log.error("getKbSegment error,{}", e.getMessage()); log.error("getKbSegment error,{}", e.getMessage());
......
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