Skip to content

Commit 1e5432e

Browse files
committed
clippy
1 parent 4c022f1 commit 1e5432e

File tree

10 files changed

+26
-33
lines changed

10 files changed

+26
-33
lines changed

golem-embed/embed-cohere/src/client.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ use golem_embed::{
77
use log::trace;
88
use reqwest::{Client, Method, Response};
99
use serde::{de::DeserializeOwned, Deserialize, Serialize};
10-
use serde_json;
1110

1211
const BASE_URL: &str = "https://api.cohere.ai";
1312

golem-embed/embed-cohere/src/conversions.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,6 @@ mod tests {
266266
assert_eq!(request.output_dimension, Some(1024));
267267
}
268268

269-
270269
#[test]
271270
fn test_embedding_response_conversion() {
272271
let data = EmbeddingResponse {
@@ -395,7 +394,6 @@ mod tests {
395394
);
396395
}
397396

398-
399397
#[test]
400398
fn test_create_rerank_request() {
401399
let query = "What is AI?".to_string();

golem-embed/embed-hugging-face/src/client.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ use golem_embed::{
77
use log::trace;
88
use reqwest::{Client, Method, Response};
99
use serde::{de::DeserializeOwned, Deserialize, Serialize};
10-
use serde_json;
1110

1211
const BASE_URL: &str = "https://router.huggingface.co/hf-inference";
1312

@@ -48,7 +47,6 @@ impl EmbeddingsApi {
4847
.map_err(|err| from_reqwest_error("Request failed", err))?;
4948
parse_response::<EmbeddingResponse>(response)
5049
}
51-
5250
}
5351

5452
fn parse_response<T: DeserializeOwned + Debug>(response: Response) -> Result<T, Error> {

golem-embed/embed-hugging-face/src/conversions.rs

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
11
use golem_embed::error::unsupported;
22
use golem_embed::golem::embed::embed::{
3-
Config, ContentPart, EmbeddingResponse as GolemEmbeddingResponse, Error,
4-
RerankResponse as GolemRerankResponse,
3+
Config, ContentPart, EmbeddingResponse as GolemEmbeddingResponse, Error,
54
};
65

7-
use crate::client::{EmbeddingRequest, EmbeddingResponse, RerankRequest, RerankResponse};
6+
use crate::client::{EmbeddingRequest, EmbeddingResponse};
87

9-
pub fn create_embedding_request(inputs: Vec<ContentPart>, config: Config) -> Result<(EmbeddingRequest, String), Error> {
8+
pub fn create_embedding_request(
9+
inputs: Vec<ContentPart>,
10+
config: Config,
11+
) -> Result<(EmbeddingRequest, String), Error> {
1012
let mut input_texts = Vec::new();
1113
for content in inputs {
1214
match content {
1315
ContentPart::Text(text) => input_texts.push(text),
1416
ContentPart::Image(_) => {
15-
return Err(unsupported("Image embeddings are not supported by Hugging Face."))
17+
return Err(unsupported(
18+
"Image embeddings are not supported by Hugging Face.",
19+
))
1620
}
1721
}
1822
}
@@ -46,7 +50,7 @@ pub fn process_embedding_response(
4650

4751
Ok(GolemEmbeddingResponse {
4852
embeddings,
49-
usage: None,
53+
usage: None,
5054
model,
5155
provider_metadata_json: None,
5256
})
@@ -112,4 +116,4 @@ mod tests {
112116
let request = create_embedding_request(inputs, config);
113117
assert!(request.is_err());
114118
}
115-
}
119+
}

golem-embed/embed-hugging-face/src/lib.rs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,12 @@ mod client;
22
mod conversions;
33

44
use client::EmbeddingsApi;
5-
use conversions::{
6-
create_embedding_request, create_rerank_request, process_embedding_response,
7-
process_rerank_response,
8-
};
5+
use conversions::{create_embedding_request, process_embedding_response};
96
use golem_embed::{
107
config::with_config_key,
118
durability::{DurableEmbed, ExtendedGuest},
129
golem::embed::embed::{
13-
Config, ContentPart, EmbeddingResponse, Error, Guest, RerankResponse,
10+
Config, ContentPart, EmbeddingResponse, Error, ErrorCode, Guest, RerankResponse,
1411
},
1512
LOGGING_STATE,
1613
};
@@ -31,8 +28,6 @@ impl HuggingFaceComponent {
3128
Err(err) => Err(err),
3229
}
3330
}
34-
35-
3631
}
3732

3833
impl Guest for HuggingFaceComponent {
@@ -61,4 +56,4 @@ impl ExtendedGuest for HuggingFaceComponent {}
6156

6257
type DurableHuggingFaceComponent = DurableEmbed<HuggingFaceComponent>;
6358

64-
golem_embed::export_embed!(DurableHuggingFaceComponent with_types_in golem_embed);
59+
golem_embed::export_embed!(DurableHuggingFaceComponent with_types_in golem_embed);

golem-embed/embed-hugging-face/wit/deps/golem-embed/golem-embed.wit

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ interface embed {
124124
) -> result<rerank-response, error>;
125125
}
126126

127-
128127
world embed-library {
129-
export embed;
128+
export embed;
130129
}

golem-embed/embed-openai/src/client.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ use log::trace;
1111
use reqwest::Client;
1212
use reqwest::{Method, Response};
1313
use serde::{de::DeserializeOwned, Deserialize, Serialize};
14-
use serde_json;
1514

1615
const BASE_URL: &str = "https://api.openai.com";
1716

golem-embed/embed-voyageai/src/client.rs

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ use golem_embed::{
77
use log::trace;
88
use reqwest::{Client, Method, Response};
99
use serde::{de::DeserializeOwned, Deserialize, Serialize};
10-
use serde_json;
1110

1211
const BASE_URL: &str = "https://api.voyageai.com";
1312

@@ -25,7 +24,10 @@ impl VoyageAIApi {
2524
let client = Client::builder()
2625
.build()
2726
.expect("Failed to initialize HTTP client");
28-
Self { voyageai_api_key, client }
27+
Self {
28+
voyageai_api_key,
29+
client,
30+
}
2931
}
3032

3133
pub fn generate_embedding(
@@ -61,7 +63,7 @@ fn parse_response<T: DeserializeOwned + Debug>(response: Response) -> Result<T,
6163
let response_text = response
6264
.text()
6365
.map_err(|err| from_reqwest_error("Failed to read response body", err))?;
64-
66+
6567
if !status.is_success() {
6668
if let Ok(error_response) = serde_json::from_str::<VoyageAIError>(&response_text) {
6769
return Err(Error {
@@ -70,7 +72,7 @@ fn parse_response<T: DeserializeOwned + Debug>(response: Response) -> Result<T,
7072
provider_error_json: Some(response_text),
7173
});
7274
}
73-
75+
7476
if let Ok(detail_error) = serde_json::from_str::<serde_json::Value>(&response_text) {
7577
if let Some(detail) = detail_error.get("detail").and_then(|d| d.as_str()) {
7678
return Err(Error {
@@ -80,14 +82,14 @@ fn parse_response<T: DeserializeOwned + Debug>(response: Response) -> Result<T,
8082
});
8183
}
8284
}
83-
85+
8486
return Err(Error {
8587
code: error_code_from_status(status),
8688
message: format!("Request failed with status {}: {}", status, response_text),
8789
provider_error_json: Some(response_text),
8890
});
8991
}
90-
92+
9193
match serde_json::from_str::<T>(&response_text) {
9294
Ok(response_data) => {
9395
trace!("Response from VoyageAI API: {response_data:?}");
@@ -163,7 +165,6 @@ pub struct EmbeddingUsage {
163165
pub total_tokens: u32,
164166
}
165167

166-
167168
#[derive(Debug, Serialize, Deserialize, Clone)]
168169
pub struct RerankRequest {
169170
pub query: String,

golem-embed/embed-voyageai/src/lib.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
use golem_embed::{
22
config::with_config_key,
33
durability::{DurableEmbed, ExtendedGuest},
4-
golem::embed::embed::{Config, ContentPart, EmbeddingResponse, Error, Guest, RerankResponse}, LOGGING_STATE,
4+
golem::embed::embed::{Config, ContentPart, EmbeddingResponse, Error, Guest, RerankResponse},
5+
LOGGING_STATE,
56
};
67

78
use crate::{

golem-embed/embed-voyageai/wit/deps/golem-embed/golem-embed.wit

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ interface embed {
124124
) -> result<rerank-response, error>;
125125
}
126126

127-
128127
world embed-library {
129-
export embed;
128+
export embed;
130129
}

0 commit comments

Comments
 (0)