From 602494b650a59b73b4548b9282375c99b471e11b Mon Sep 17 00:00:00 2001 From: sigoden Date: Mon, 29 Apr 2024 11:57:02 +0800 Subject: refactor: merge config models, update client models (#460) --- src/client/common.rs | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'src/client/common.rs') diff --git a/src/client/common.rs b/src/client/common.rs index 842741c..aa243a7 100644 --- a/src/client/common.rs +++ b/src/client/common.rs @@ -89,19 +89,15 @@ macro_rules! register_client { pub fn list_models(local_config: &$config) -> Vec { let client_name = Self::name(local_config); - if local_config.models.is_empty() { - for model in $crate::client::CLIENT_MODELS.iter() { - match model { - $crate::client::ClientModel::$config { models } => { - return Model::from_config(client_name, models); - } - _ => {} + for model in $crate::client::CLIENT_MODELS.iter() { + match model { + $crate::client::ClientModel::$config { models } => { + return Model::from_config(client_name, &local_config.models, models); } + _ => {} } - vec![] - } else { - Model::from_config(client_name, &local_config.models) } + vec![] } pub fn name(config: &$config) -> &str { -- cgit v1.2.3