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

assistant: Fix issues when configuring different providers (#15072)

Browse source 
Release Notes:

- N/A

---------

Co-authored-by: Antonio Scandurra <me@as-cii.com>
This commit is contained in:
Bennet Bo Fenner 2024-07-24 11:21:31 +02:00 • committed by GitHub
parent ba6c36f370
commit af4b9805c9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
16 changed files with 225 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -23,7 +23,7 @@ use gpui::{actions, impl_actions, AppContext, Global, SharedString, UpdateGlobal
use indexed_docs::IndexedDocsRegistry;
pub(crate) use inline_assistant::*;
use language_model::{
LanguageModelId, LanguageModelProviderName, LanguageModelRegistry, LanguageModelResponseMessage,
LanguageModelId, LanguageModelProviderId, LanguageModelRegistry, LanguageModelResponseMessage,
};
pub(crate) use model_selector::*;
use semantic_index::{CloudEmbeddingProvider, SemanticIndex};
@ -231,7 +231,7 @@ fn init_completion_provider(cx: &mut AppContext) {
fn update_active_language_model_from_settings(cx: &mut AppContext) {
let settings = AssistantSettings::get_global(cx);
let provider_name = LanguageModelProviderName::from(settings.default_model.provider.clone());
let provider_name = LanguageModelProviderId::from(settings.default_model.provider.clone());
let model_id = LanguageModelId::from(settings.default_model.model.clone());
let Some(provider) = LanguageModelRegistry::global(cx)

6
crates/assistant/src/assistant_settings.rs
View file

@ -144,8 +144,8 @@ impl AssistantSettingsContent {
fs,
cx,
move |content, _| {
if content.open_ai.is_none() {
content.open_ai =
if content.openai.is_none() {
content.openai =
Some(language_model::settings::OpenAiSettingsContent {
api_url,
low_speed_timeout_in_seconds,
@ -243,7 +243,7 @@ impl AssistantSettingsContent {
pub fn set_model(&mut self, language_model: Arc<dyn LanguageModel>) {
let model = language_model.id().0.to_string();
let provider = language_model.provider_name().0.to_string();
let provider = language_model.provider_id().0.to_string();
match self {
AssistantSettingsContent::Versioned(settings) => match settings {

2
crates/assistant/src/inline_assistant.rs
View file

@ -1438,7 +1438,7 @@ impl Render for PromptEditor {
{
let model_name = available_model.name().0.clone();
let provider =
available_model.provider_name().0.clone();
available_model.provider_id().0.clone();
move |_| {
h_flex()
.w_full()

2
crates/assistant/src/terminal_inline_assistant.rs
View file

@ -565,7 +565,7 @@ impl Render for PromptEditor {
{
let model_name = available_model.name().0.clone();
let provider =
available_model.provider_name().0.clone();
available_model.provider_id().0.clone();
move |_| {
h_flex()
.w_full()