From b17719457bb098b6572671dcb5cc60a0241c4b8f Mon Sep 17 00:00:00 2001 From: sigoden Date: Wed, 5 Jun 2024 06:06:11 +0000 Subject: [PATCH] chore: format --- src/client/azure_openai.rs | 2 +- src/client/bedrock.rs | 2 +- src/client/cohere.rs | 7 +++---- src/client/ernie.rs | 2 +- src/client/ollama.rs | 7 +++---- src/client/openai.rs | 8 +++----- src/client/openai_compatible.rs | 2 +- src/client/qianwen.rs | 16 ++++++++++------ src/client/replicate.rs | 2 +- src/client/vertexai.rs | 16 ++++++++++++---- src/client/vertexai_claude.rs | 2 +- 11 files changed, 37 insertions(+), 29 deletions(-) diff --git a/src/client/azure_openai.rs b/src/client/azure_openai.rs index 19d234a..058a53e 100644 --- a/src/client/azure_openai.rs +++ b/src/client/azure_openai.rs @@ -1,5 +1,5 @@ -use super::*; use super::openai::*; +use super::*; use anyhow::Result; use reqwest::{Client as ReqwestClient, RequestBuilder}; diff --git a/src/client/bedrock.rs b/src/client/bedrock.rs index 981d1cb..5d59ffe 100644 --- a/src/client/bedrock.rs +++ b/src/client/bedrock.rs @@ -1,6 +1,6 @@ -use super::*; use super::claude::*; use super::prompt_format::*; +use super::*; use crate::utils::{base64_decode, encode_uri, hex_encode, hmac_sha256, sha256}; diff --git a/src/client/cohere.rs b/src/client/cohere.rs index 69c343b..9954a61 100644 --- a/src/client/cohere.rs +++ b/src/client/cohere.rs @@ -129,16 +129,15 @@ async fn chat_completions_streaming( Ok(()) } -async fn embeddings( - builder: RequestBuilder, -) -> Result { +async fn embeddings(builder: RequestBuilder) -> Result { let res = builder.send().await?; let status = res.status(); let data: Value = res.json().await?; if !status.is_success() { catch_error(&data, status.as_u16())?; } - let res_body: EmbeddingsResBody = serde_json::from_value(data).context("Invalid request data")?; + let res_body: EmbeddingsResBody = + serde_json::from_value(data).context("Invalid request data")?; Ok(res_body.embeddings) } diff --git a/src/client/ernie.rs b/src/client/ernie.rs index 77f4741..33ce852 100644 --- a/src/client/ernie.rs +++ b/src/client/ernie.rs @@ -1,5 +1,5 @@ -use super::*; use super::access_token::*; +use super::*; use anyhow::{anyhow, Context, Result}; use async_trait::async_trait; diff --git a/src/client/ollama.rs b/src/client/ollama.rs index f9bf8d5..9bc8978 100644 --- a/src/client/ollama.rs +++ b/src/client/ollama.rs @@ -133,16 +133,15 @@ async fn chat_completions_streaming( Ok(()) } -async fn embeddings( - builder: RequestBuilder, -) -> Result { +async fn embeddings(builder: RequestBuilder) -> Result { let res = builder.send().await?; let status = res.status(); let data = res.json().await?; if !status.is_success() { catch_error(&data, status.as_u16())?; } - let res_body: EmbeddingsResBody = serde_json::from_value(data).context("Invalid request data")?; + let res_body: EmbeddingsResBody = + serde_json::from_value(data).context("Invalid request data")?; let output = vec![res_body.embedding]; Ok(output) } diff --git a/src/client/openai.rs b/src/client/openai.rs index 0da8166..926ec67 100644 --- a/src/client/openai.rs +++ b/src/client/openai.rs @@ -140,16 +140,15 @@ pub async fn openai_chat_completions_streaming( sse_stream(builder, handle).await } -pub async fn openai_embeddings( - builder: RequestBuilder, -) -> Result { +pub async fn openai_embeddings(builder: RequestBuilder) -> Result { let res = builder.send().await?; let status = res.status(); let data: Value = res.json().await?; if !status.is_success() { catch_error(&data, status.as_u16())?; } - let res_body: EmbeddingsResBody = serde_json::from_value(data).context("Invalid request data")?; + let res_body: EmbeddingsResBody = + serde_json::from_value(data).context("Invalid request data")?; let output = res_body.data.into_iter().map(|v| v.embedding).collect(); Ok(output) } @@ -240,7 +239,6 @@ pub fn openai_build_chat_completions_body(data: ChatCompletionsData, model: &Mod body } - pub fn openai_build_embeddings_body(data: EmbeddingsData, model: &Model) -> Value { json!({ "input": data.texts, diff --git a/src/client/openai_compatible.rs b/src/client/openai_compatible.rs index af7cd0e..f5f446a 100644 --- a/src/client/openai_compatible.rs +++ b/src/client/openai_compatible.rs @@ -1,5 +1,5 @@ -use super::*; use super::openai::*; +use super::*; use anyhow::Result; use reqwest::{Client as ReqwestClient, RequestBuilder}; diff --git a/src/client/qianwen.rs b/src/client/qianwen.rs index c34e409..908cd1e 100644 --- a/src/client/qianwen.rs +++ b/src/client/qianwen.rs @@ -18,7 +18,7 @@ const CHAT_COMPLETIONS_API_URL: &str = const CHAT_COMPLETIONS_API_URL_VL: &str = "https://dashscope.aliyuncs.com/api/v1/services/aigc/multimodal-generation/generation"; -const EMBEDDINGS_API_URL: &str = +const EMBEDDINGS_API_URL: &str = "https://dashscope.aliyuncs.com/api/v1/services/embeddings/text-embedding/text-embedding"; #[derive(Debug, Clone, Deserialize, Default)] @@ -249,13 +249,17 @@ fn build_chat_completions_body(data: ChatCompletionsData, model: &Model) -> Resu Ok((body, has_upload)) } -async fn embeddings( - builder: RequestBuilder, -) -> Result { +async fn embeddings(builder: RequestBuilder) -> Result { let data: Value = builder.send().await?.json().await?; maybe_catch_error(&data)?; - let res_body: EmbeddingsResBody = serde_json::from_value(data).context("Invalid request data")?; - let output = res_body.output.embeddings.into_iter().map(|v| v.embedding).collect(); + let res_body: EmbeddingsResBody = + serde_json::from_value(data).context("Invalid request data")?; + let output = res_body + .output + .embeddings + .into_iter() + .map(|v| v.embedding) + .collect(); Ok(output) } diff --git a/src/client/replicate.rs b/src/client/replicate.rs index e96ed64..fd78ace 100644 --- a/src/client/replicate.rs +++ b/src/client/replicate.rs @@ -1,5 +1,5 @@ -use super::*; use super::prompt_format::*; +use super::*; use anyhow::{anyhow, Result}; use async_trait::async_trait; diff --git a/src/client/vertexai.rs b/src/client/vertexai.rs index a9f84f8..dc75c9f 100644 --- a/src/client/vertexai.rs +++ b/src/client/vertexai.rs @@ -1,5 +1,5 @@ -use super::*; use super::access_token::*; +use super::*; use anyhow::{anyhow, bail, Context, Result}; use async_trait::async_trait; @@ -73,7 +73,11 @@ impl VertexAIClient { true => "RETRIEVAL_DOCUMENT", false => "QUESTION_ANSWERING", }; - let instances: Vec<_> = data.texts.into_iter().map(|v| json!({"task_type": task_type, "content": v})).collect(); + let instances: Vec<_> = data + .texts + .into_iter() + .map(|v| json!({"task_type": task_type, "content": v})) + .collect(); let body = json!({ "instances": instances, }); @@ -182,7 +186,11 @@ async fn embeddings(builder: RequestBuilder) -> Result { } let res_body: EmbeddingsResBody = serde_json::from_value(data).context("Invalid request data")?; - let output = res_body.predictions.into_iter().map(|v| v.embeddings.values).collect(); + let output = res_body + .predictions + .into_iter() + .map(|v| v.embeddings.values) + .collect(); Ok(output) } @@ -198,7 +206,7 @@ struct EmbeddingsResBodyPrediction { #[derive(Deserialize)] struct EmbeddingsResBodyPredictionEmbeddings { - values: Vec + values: Vec, } fn gemini_extract_chat_completions_text(data: &Value) -> Result { diff --git a/src/client/vertexai_claude.rs b/src/client/vertexai_claude.rs index 3993078..946fb6f 100644 --- a/src/client/vertexai_claude.rs +++ b/src/client/vertexai_claude.rs @@ -1,7 +1,7 @@ -use super::*; use super::access_token::*; use super::claude::*; use super::vertexai::*; +use super::*; use anyhow::Result; use async_trait::async_trait;