Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

agent: Fix system instructions typo (#28949)

Browse source 
See #28793, the name of the field is actually `systemInstruction` not
`systemInstructions`.

Release Notes:

- Fixed an issue where Gemini requests would fail
This commit is contained in:
Bennet Bo Fenner 2025-04-17 10:51:05 +02:00 • committed by GitHub
parent 5ebb18c47e
commit ae47829fa8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/google_ai/src/google_ai.rs
View file

@ -125,7 +125,7 @@ pub struct GenerateContentRequest {
#[serde(default, skip_serializing_if = "String::is_empty")] #[serde(default, skip_serializing_if = "String::is_empty")]
pub model: String, pub model: String,
pub contents: Vec<Content>, pub contents: Vec<Content>,
pub system_instructions: Option<SystemInstructions>, pub system_instruction: Option<SystemInstruction>,
pub generation_config: Option<GenerationConfig>, pub generation_config: Option<GenerationConfig>,
pub safety_settings: Option<Vec<SafetySetting>>, pub safety_settings: Option<Vec<SafetySetting>>,
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
@ -162,7 +162,7 @@ pub struct Content {
#[derive(Debug, Serialize, Deserialize)] #[derive(Debug, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct SystemInstructions { pub struct SystemInstruction {
pub parts: Vec<Part>, pub parts: Vec<Part>,
} }

6
crates/language_models/src/provider/google.rs
View file

@ -4,7 +4,7 @@ use credentials_provider::CredentialsProvider;
use editor::{Editor, EditorElement, EditorStyle}; use editor::{Editor, EditorElement, EditorStyle};
use futures::{FutureExt, Stream, StreamExt, future::BoxFuture}; use futures::{FutureExt, Stream, StreamExt, future::BoxFuture};
use google_ai::{ use google_ai::{
FunctionDeclaration, GenerateContentResponse, Part, SystemInstructions, UsageMetadata, FunctionDeclaration, GenerateContentResponse, Part, SystemInstruction, UsageMetadata,
}; };
use gpui::{ use gpui::{
AnyView, App, AsyncApp, Context, Entity, FontStyle, Subscription, Task, TextStyle, WhiteSpace, AnyView, App, AsyncApp, Context, Entity, FontStyle, Subscription, Task, TextStyle, WhiteSpace,
@ -405,7 +405,7 @@ pub fn into_google(
.map_or(false, |msg| matches!(msg.role, Role::System)) .map_or(false, |msg| matches!(msg.role, Role::System))
{ {
let message = request.messages.remove(0); let message = request.messages.remove(0);
Some(SystemInstructions { Some(SystemInstruction {
parts: map_content(message.content), parts: map_content(message.content),
}) })
} else { } else {
@ -414,7 +414,7 @@ pub fn into_google(
google_ai::GenerateContentRequest { google_ai::GenerateContentRequest {
model, model,
system_instructions, system_instruction: system_instructions,
contents: request contents: request
.messages .messages
.into_iter() .into_iter()