singlexyz/ChatGPT-Next-Web
1
0
Fork 0
forked from XiaoMo/ChatGPT-Next-Web
Code Pull Requests Activity

Merge pull request #2112 from songxiaocheng/PR/history-message-count

Browse Source 
fix: #2111 make "Attached Messages Count" working
This commit is contained in:
Yifei Zhang 2023-06-24 14:34:48 +08:00 committed by GitHub
commit 35ba898c97
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/store/chat.ts
View File

@ -405,10 +405,9 @@ export const useChatStore = create<ChatStore>()(
// 2. pre-defined in-context prompts // 2. pre-defined in-context prompts
// 3. short term memory: latest n messages // 3. short term memory: latest n messages
// 4. newest input message // 4. newest input message
const memoryStartIndex = Math.min( const memoryStartIndex = shouldSendLongTermMemory
longTermMemoryStartIndex, ? Math.min(longTermMemoryStartIndex, shortTermMemoryStartIndex)
shortTermMemoryStartIndex, : shortTermMemoryStartIndex;
);
// and if user has cleared history messages, we should exclude the memory too. // and if user has cleared history messages, we should exclude the memory too.
const contextStartIndex = Math.max(clearContextIndex, memoryStartIndex); const contextStartIndex = Math.max(clearContextIndex, memoryStartIndex);
const maxTokenThreshold = modelConfig.max_tokens; const maxTokenThreshold = modelConfig.max_tokens;