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

assistant: Fix issue when using inline assistant with Gemini models (#29407)

Browse source 
Closes #29020

Release Notes:

- assistant: Fix issue when using inline assistant with Gemini models
This commit is contained in:
Bennet Bo Fenner 2025-04-25 14:24:21 +02:00 • committed by GitHub
parent c39adc5242
commit 93862838bd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/assistant_context_editor/src/context.rs
View file

@ -2611,7 +2611,9 @@ impl AssistantContext {
.map(MessageContent::Text), .map(MessageContent::Text),
); );
completion_request.messages.push(request_message); if !request_message.contents_empty() {
completion_request.messages.push(request_message);
}
} }
if let RequestType::SuggestEdits = request_type { if let RequestType::SuggestEdits = request_type {

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

@ -442,13 +442,20 @@ pub fn into_google(
contents: request contents: request
.messages .messages
.into_iter() .into_iter()
.map(|message| google_ai::Content { .filter_map(|message| {
parts: map_content(message.content), let parts = map_content(message.content);
role: match message.role { if parts.is_empty() {
Role::User => google_ai::Role::User, None
Role::Assistant => google_ai::Role::Model, } else {
Role::System => google_ai::Role::User, // Google AI doesn't have a system role Some(google_ai::Content {
}, parts,
role: match message.role {
Role::User => google_ai::Role::User,
Role::Assistant => google_ai::Role::Model,
Role::System => google_ai::Role::User, // Google AI doesn't have a system role
},
})
}
}) })
.collect(), .collect(),
generation_config: Some(google_ai::GenerationConfig { generation_config: Some(google_ai::GenerationConfig {