From 740ca2413a1992d151c0a9ea62c12e69321c0973 Mon Sep 17 00:00:00 2001 From: sigoden Date: Fri, 26 Apr 2024 07:43:35 +0800 Subject: refactor: simplify impl client trait (#445) --- src/client/vertexai.rs | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'src/client/vertexai.rs') diff --git a/src/client/vertexai.rs b/src/client/vertexai.rs index 0c0608e..566067f 100644 --- a/src/client/vertexai.rs +++ b/src/client/vertexai.rs @@ -26,28 +26,6 @@ pub struct VertexAIConfig { pub extra: Option, } -#[async_trait] -impl Client for VertexAIClient { - client_common_fns!(); - - async fn send_message_inner(&self, client: &ReqwestClient, data: SendData) -> Result { - self.prepare_access_token().await?; - let builder = self.request_builder(client, data)?; - gemini_send_message(builder).await - } - - async fn send_message_streaming_inner( - &self, - client: &ReqwestClient, - handler: &mut ReplyHandler, - data: SendData, - ) -> Result<()> { - self.prepare_access_token().await?; - let builder = self.request_builder(client, data)?; - gemini_send_message_streaming(builder, handler).await - } -} - impl VertexAIClient { list_models_fn!( VertexAIConfig, @@ -100,6 +78,28 @@ impl VertexAIClient { } } +#[async_trait] +impl Client for VertexAIClient { + client_common_fns!(); + + async fn send_message_inner(&self, client: &ReqwestClient, data: SendData) -> Result { + self.prepare_access_token().await?; + let builder = self.request_builder(client, data)?; + gemini_send_message(builder).await + } + + async fn send_message_streaming_inner( + &self, + client: &ReqwestClient, + handler: &mut ReplyHandler, + data: SendData, + ) -> Result<()> { + self.prepare_access_token().await?; + let builder = self.request_builder(client, data)?; + gemini_send_message_streaming(builder, handler).await + } +} + pub async fn gemini_send_message(builder: RequestBuilder) -> Result { let res = builder.send().await?; let status = res.status(); -- cgit v1.2.3