This repository was archived by the owner on May 11, 2024. It is now read-only.

Commit 9196cd8

committed

fix: 修复在无聊天记录时候出现的NPE

1 parent b0c38d9 commit 9196cd8Copy full SHA for 9196cd8

File tree

-1

lines changed

-1

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package com.gzhu.funai.service.impl;`
`2`	`2`
	`3`	`+import cn.hutool.core.collection.CollUtil;`
`3`	`4`	`import com.github.benmanes.caffeine.cache.Caffeine;`
`4`	`5`	`import com.github.benmanes.caffeine.cache.LoadingCache;`
`5`	`6`	`import com.google.common.collect.ImmutableList;`
`@@ -337,6 +338,10 @@ private String getStandaloneQuestion(String message, Deque<SessionChatRecordEnti`
`337`	`338`	`return null;`
`338`	`339`	`}`
`339`	`340`
	`341`	`+ if(CollUtil.isEmpty(windowRecords)){`
	`342`	`+ return String.format(qaPromptTemplate, "", message);`
	`343`	`+ }`
	`344`	`+`
`340`	`345`	`// 获取[会话窗口]的token总数`
`341`	`346`	`int windowRecordsTokens = windowRecordTokensCache.getOrDefault(sessionId, 0);`
`342`	`347`
`@@ -396,7 +401,7 @@ private String getContext(String collectionName, String message, String apiKey,`
`396`	`401`	`// 添加历史记录在最终问答`
`397`	`402`	`int historyWindowRecordsTokens = 0;`
`398`	`403`	`StringBuilder chatHistory = new StringBuilder();`
`399`		`- if(windowRecords != null){`
	`404`	`+ if(!CollUtil.isEmpty(windowRecords)){`
`400`	`405`
`401`	`406`	`// 最后一个问题不要,因为最后一个问题是刚问的`
`402`	`407`	`windowRecords.pollLast();`

Comments

(0)