From da3c541b681b140feb52b4297167ca233535fa90 Mon Sep 17 00:00:00 2001 From: sigoden Date: Wed, 1 Nov 2023 15:01:50 +0800 Subject: refactor: add/use openai_compatible_client macro --- src/client/azure_openai.rs | 29 +++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-) (limited to 'src/client/azure_openai.rs') diff --git a/src/client/azure_openai.rs b/src/client/azure_openai.rs index cabcebd..d0fa31f 100644 --- a/src/client/azure_openai.rs +++ b/src/client/azure_openai.rs @@ -1,8 +1,5 @@ -use super::openai::{openai_build_body, openai_send_message, openai_send_message_streaming}; -use super::{AzureOpenAIClient, Client, ExtraConfig, ModelInfo, PromptKind, PromptType, SendData}; - -use crate::config::SharedConfig; -use crate::repl::ReplyStreamHandler; +use super::openai::openai_build_body; +use super::{AzureOpenAIClient, ExtraConfig, ModelInfo, PromptKind, PromptType, SendData}; use anyhow::{anyhow, Result}; use async_trait::async_trait; @@ -26,27 +23,7 @@ pub struct AzureOpenAIModel { max_tokens: Option, } -#[async_trait] -impl Client for AzureOpenAIClient { - fn config(&self) -> (&SharedConfig, &Option) { - (&self.global_config, &self.config.extra) - } - - async fn send_message_inner(&self, client: &ReqwestClient, data: SendData) -> Result { - let builder = self.request_builder(client, data)?; - openai_send_message(builder).await - } - - async fn send_message_streaming_inner( - &self, - client: &ReqwestClient, - handler: &mut ReplyStreamHandler, - data: SendData, - ) -> Result<()> { - let builder = self.request_builder(client, data)?; - openai_send_message_streaming(builder, handler).await - } -} +openai_compatible_client!(AzureOpenAIClient); impl AzureOpenAIClient { config_get_fn!(api_base, get_api_base); -- cgit v1.2.3