Merge remote-tracking branch 'upstream/main'

# Conflicts:
#	app/layout.tsx
#	package.json
#	yarn.lock
This commit is contained in:
sijinhui
2024-01-02 22:46:56 +08:00
17 changed files with 113 additions and 91 deletions

View File

@@ -689,7 +689,9 @@ export const useChatStore = createPersistStore(
const contextPrompts = session.mask.context.slice();
// system prompts, to get close to OpenAI Web ChatGPT
const shouldInjectSystemPrompts = modelConfig.enableInjectSystemPrompts;
const shouldInjectSystemPrompts =
modelConfig.enableInjectSystemPrompts &&
session.mask.modelConfig.model.startsWith("gpt-");
var systemPrompts: ChatMessage[] = [];
systemPrompts = shouldInjectSystemPrompts