From b34e40e25f0b10fccc9de64b9f06b9290be88b22 Mon Sep 17 00:00:00 2001 From: sigoden Date: Fri, 3 Nov 2023 09:56:15 +0800 Subject: refactor: rename azure-openai to azure (#204) --- src/client/azure.rs | 73 ++++++++++++++++++++++++++++++++++++++++ src/client/azure_openai.rs | 84 ---------------------------------------------- src/client/mod.rs | 8 +---- 3 files changed, 74 insertions(+), 91 deletions(-) create mode 100644 src/client/azure.rs delete mode 100644 src/client/azure_openai.rs (limited to 'src/client') diff --git a/src/client/azure.rs b/src/client/azure.rs new file mode 100644 index 0000000..bae7851 --- /dev/null +++ b/src/client/azure.rs @@ -0,0 +1,73 @@ +use super::openai::{openai_build_body, OPENAI_TOKENS_COUNT_FACTORS}; +use super::{AzureClient, ExtraConfig, PromptType, SendData, Model}; + +use crate::utils::PromptKind; + +use anyhow::Result; +use async_trait::async_trait; +use reqwest::{Client as ReqwestClient, RequestBuilder}; +use serde::Deserialize; + +#[derive(Debug, Clone, Deserialize)] +pub struct AzureConfig { + pub name: Option, + pub api_base: Option, + pub api_key: Option, + pub models: Vec, + pub extra: Option, +} + +#[derive(Debug, Clone, Deserialize)] +pub struct AzureModel { + name: String, + max_tokens: Option, +} + +openai_compatible_client!(AzureClient); + +impl AzureClient { + config_get_fn!(api_base, get_api_base); + config_get_fn!(api_key, get_api_key); + + pub const PROMPTS: [PromptType<'static>; 4] = [ + ("api_base", "API Base:", true, PromptKind::String), + ("api_key", "API Key:", true, PromptKind::String), + ("models[].name", "Model Name:", true, PromptKind::String), + ( + "models[].max_tokens", + "Max Tokens:", + true, + PromptKind::Integer, + ), + ]; + + pub fn list_models(local_config: &AzureConfig, client_index: usize) -> Vec { + let client_name = Self::name(local_config); + + local_config + .models + .iter() + .map(|v| { + Model::new(client_index, client_name, &v.name) + .set_max_tokens(v.max_tokens) + .set_tokens_count_factors(OPENAI_TOKENS_COUNT_FACTORS) + }) + .collect() + } + + fn request_builder(&self, client: &ReqwestClient, data: SendData) -> Result { + let api_base = self.get_api_base()?; + let api_key = self.get_api_key()?; + + let body = openai_build_body(data, self.model.llm_name.clone()); + + let url = format!( + "{}/openai/deployments/{}/chat/completions?api-version=2023-05-15", + &api_base, self.model.llm_name + ); + + let builder = client.post(url).header("api-key", api_key).json(&body); + + Ok(builder) + } +} diff --git a/src/client/azure_openai.rs b/src/client/azure_openai.rs deleted file mode 100644 index d1dc43b..0000000 --- a/src/client/azure_openai.rs +++ /dev/null @@ -1,84 +0,0 @@ -use super::openai::{openai_build_body, OPENAI_TOKENS_COUNT_FACTORS}; -use super::{AzureOpenAIClient, ExtraConfig, PromptType, SendData, Model}; - -use crate::utils::PromptKind; - -use anyhow::{anyhow, Result}; -use async_trait::async_trait; -use reqwest::{Client as ReqwestClient, RequestBuilder}; -use serde::Deserialize; - -use std::env; - -#[derive(Debug, Clone, Deserialize)] -pub struct AzureOpenAIConfig { - pub name: Option, - pub api_base: Option, - pub api_key: Option, - pub models: Vec, - pub extra: Option, -} - -#[derive(Debug, Clone, Deserialize)] -pub struct AzureOpenAIModel { - name: String, - max_tokens: Option, -} - -openai_compatible_client!(AzureOpenAIClient); - -impl AzureOpenAIClient { - config_get_fn!(api_base, get_api_base); - - pub const PROMPTS: [PromptType<'static>; 4] = [ - ("api_base", "API Base:", true, PromptKind::String), - ("api_key", "API Key:", true, PromptKind::String), - ("models[].name", "Model Name:", true, PromptKind::String), - ( - "models[].max_tokens", - "Max Tokens:", - true, - PromptKind::Integer, - ), - ]; - - pub fn list_models(local_config: &AzureOpenAIConfig, client_index: usize) -> Vec { - let client_name = Self::name(local_config); - - local_config - .models - .iter() - .map(|v| { - Model::new(client_index, client_name, &v.name) - .set_max_tokens(v.max_tokens) - .set_tokens_count_factors(OPENAI_TOKENS_COUNT_FACTORS) - }) - .collect() - } - - fn request_builder(&self, client: &ReqwestClient, data: SendData) -> Result { - let api_key = self.config.api_key.clone(); - let api_key = api_key - .or_else(|| { - let env_prefix = match &self.config.name { - None => "AZURE".into(), - Some(v) => v.to_uppercase(), - }; - env::var(format!("{env_prefix}_OPENAI_KEY")).ok() - }) - .ok_or_else(|| anyhow!("Miss api_key"))?; - - let api_base = self.get_api_base()?; - - let body = openai_build_body(data, self.model.llm_name.clone()); - - let url = format!( - "{}/openai/deployments/{}/chat/completions?api-version=2023-05-15", - &api_base, self.model.llm_name - ); - - let builder = client.post(url).header("api-key", api_key).json(&body); - - Ok(builder) - } -} diff --git a/src/client/mod.rs b/src/client/mod.rs index 7ac9aa0..55f0ed0 100644 --- a/src/client/mod.rs +++ b/src/client/mod.rs @@ -10,11 +10,5 @@ pub use model::*; register_client!( (openai, "openai", OpenAI, OpenAIConfig, OpenAIClient), (localai, "localai", LocalAI, LocalAIConfig, LocalAIClient), - ( - azure_openai, - "azure-openai", - AzureOpenAI, - AzureOpenAIConfig, - AzureOpenAIClient - ), + (azure, "azure", Azure, AzureConfig, AzureClient), ); -- cgit v1.2.3