From 9c6c9f10a27d0993636b453f39d8934c95c5c2b2 Mon Sep 17 00:00:00 2001 From: sigoden Date: Tue, 23 Apr 2024 18:14:47 +0800 Subject: feat: builtin models can be overwrited by models config (#429) --- src/client/qianwen.rs | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) (limited to 'src/client/qianwen.rs') diff --git a/src/client/qianwen.rs b/src/client/qianwen.rs index 6225b96..a3ee988 100644 --- a/src/client/qianwen.rs +++ b/src/client/qianwen.rs @@ -1,5 +1,6 @@ use super::{ - message::*, Client, ExtraConfig, Model, PromptType, QianwenClient, ReplyHandler, SendData, + message::*, Client, ExtraConfig, Model, ModelConfig, PromptType, QianwenClient, ReplyHandler, + SendData, }; use crate::utils::{sha256sum, PromptKind}; @@ -38,6 +39,8 @@ const MODELS: [(&str, usize, &str); 6] = [ pub struct QianwenConfig { pub name: Option, pub api_key: Option, + #[serde(default)] + pub models: Vec, pub extra: Option, } @@ -70,23 +73,12 @@ impl Client for QianwenClient { } impl QianwenClient { + list_models_fn!(QianwenConfig, &MODELS); config_get_fn!(api_key, get_api_key); pub const PROMPTS: [PromptType<'static>; 1] = [("api_key", "API Key:", true, PromptKind::String)]; - pub fn list_models(local_config: &QianwenConfig) -> Vec { - let client_name = Self::name(local_config); - MODELS - .into_iter() - .map(|(name, max_input_tokens, capabilities)| { - Model::new(client_name, name) - .set_capabilities(capabilities.into()) - .set_max_input_tokens(Some(max_input_tokens)) - }) - .collect() - } - fn request_builder(&self, client: &ReqwestClient, data: SendData) -> Result { let api_key = self.get_api_key()?; -- cgit v1.2.3