Skip to content

Do not pass systemInstructions to models that do not support it #40

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

Merged
merged 1 commit into from
May 6, 2024
Merged

Do not pass systemInstructions to models that do not support it #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions js/plugins/googleai/src/gemini.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,10 +325,12 @@ export function googleAIModel(
// message detected with role=system will be used for systemInstructions.
// Any additional system messages may be considered to be "exceptional".
let systemInstruction: GeminiMessage | undefined = undefined;
const systemMessage = messages.find((m) => m.role === 'system');
if (systemMessage) {
messages.splice(messages.indexOf(systemMessage), 1);
systemInstruction = toGeminiSystemInstruction(systemMessage);
if (SUPPORTED_V15_MODELS[name]) {
const systemMessage = messages.find((m) => m.role === 'system');
if (systemMessage) {
messages.splice(messages.indexOf(systemMessage), 1);
systemInstruction = toGeminiSystemInstruction(systemMessage);
}
}

const chatRequest = {
Expand Down
11 changes: 7 additions & 4 deletions js/plugins/vertexai/src/gemini.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,11 +433,14 @@ export function geminiModel(name: string, vertex: VertexAI): ModelAction {
// message detected with role=system will be used for systemInstructions.
// Any additional system messages may be considered to be "exceptional".
let systemInstruction: Content | undefined = undefined;
const systemMessage = messages.find((m) => m.role === 'system');
if (systemMessage) {
messages.splice(messages.indexOf(systemMessage), 1);
systemInstruction = toGeminiSystemInstruction(systemMessage);
if (SUPPORTED_V15_MODELS[name]) {
const systemMessage = messages.find((m) => m.role === 'system');
if (systemMessage) {
messages.splice(messages.indexOf(systemMessage), 1);
systemInstruction = toGeminiSystemInstruction(systemMessage);
}
}

const chatRequest: StartChatParams = {
systemInstruction,
tools: request.tools?.length
Expand Down