From f2378e172548f3357fca6e561803bfe3a013bcb3 Mon Sep 17 00:00:00 2001 From: sigoden Date: Fri, 21 Jun 2024 21:26:18 +0800 Subject: refactor: rename model.mode to model.type (#625) --- src/client/common.rs | 6 +++--- src/client/model.rs | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/client') diff --git a/src/client/common.rs b/src/client/common.rs index 6c86acd..de2fa50 100644 --- a/src/client/common.rs +++ b/src/client/common.rs @@ -145,15 +145,15 @@ macro_rules! register_client { } pub fn list_chat_models(config: &$crate::config::Config) -> Vec<&'static $crate::client::Model> { - list_models(config).into_iter().filter(|v| v.mode() == "chat").collect() + list_models(config).into_iter().filter(|v| v.model_type() == "chat").collect() } pub fn list_embedding_models(config: &$crate::config::Config) -> Vec<&'static $crate::client::Model> { - list_models(config).into_iter().filter(|v| v.mode() == "embedding").collect() + list_models(config).into_iter().filter(|v| v.model_type() == "embedding").collect() } pub fn list_rerank_models(config: &$crate::config::Config) -> Vec<&'static $crate::client::Model> { - list_models(config).into_iter().filter(|v| v.mode() == "rerank").collect() + list_models(config).into_iter().filter(|v| v.model_type() == "rerank").collect() } }; } diff --git a/src/client/model.rs b/src/client/model.rs index 06f5577..0584f82 100644 --- a/src/client/model.rs +++ b/src/client/model.rs @@ -111,8 +111,8 @@ impl Model { &self.data.name } - pub fn mode(&self) -> &str { - &self.data.mode + pub fn model_type(&self) -> &str { + &self.data.model_type } pub fn data(&self) -> &ModelData { @@ -245,8 +245,8 @@ impl Model { #[derive(Debug, Clone, Default, Serialize, Deserialize)] pub struct ModelData { pub name: String, - #[serde(default = "default_model_mode")] - pub mode: String, + #[serde(default = "default_model_type", rename = "type")] + pub model_type: String, pub max_input_tokens: Option, pub input_price: Option, pub output_price: Option, @@ -280,6 +280,6 @@ pub struct BuiltinModels { pub models: Vec, } -fn default_model_mode() -> String { +fn default_model_type() -> String { "chat".into() } -- cgit v1.2.3