Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: enforce that the first message (excluding system messages) is a … #6311

Merged
merged 2 commits into from
Feb 28, 2025
Merged

fix: enforce that the first message (excluding system messages) is a … #6311

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f0182b
fix: enforce that the first message (excluding system messages) is a …
Kadxy Feb 28, 2025
2d4180f
fix: update request payload to use filtered messages in Deepseek API
Kadxy Feb 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 20 additions & 1 deletion app/client/platforms/deepseek.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,25 @@ export class DeepSeekApi implements LLMApi {
}
}

// 检测并修复消息顺序，确保除system外的第一个消息是user
const filteredMessages: ChatOptions["messages"] = [];
let hasFoundFirstUser = false;

for (const msg of messages) {
if (msg.role === "system") {
// Keep all system messages
filteredMessages.push(msg);
} else if (msg.role === "user") {
// User message directly added
filteredMessages.push(msg);
hasFoundFirstUser = true;
} else if (hasFoundFirstUser) {
// After finding the first user message, all subsequent non-system messages are retained.
filteredMessages.push(msg);
}
// If hasFoundFirstUser is false and it is not a system message, it will be skipped.
}

const modelConfig = {
...useAppConfig.getState().modelConfig,
...useChatStore.getState().currentSession().mask.modelConfig,
Expand All @@ -85,7 +104,7 @@ export class DeepSeekApi implements LLMApi {
};

const requestPayload: RequestPayload = {
messages,
messages: filteredMessages,
stream: options.config.stream,
model: modelConfig.model,
temperature: modelConfig.temperature,
Expand Down
Loading