rip out fastembed due to build errors

This commit is contained in:
dal 2025-06-03 18:01:53 -06:00
parent 5e7c8fc6b1
commit 993929720e
No known key found for this signature in database
GPG Key ID: 16F4B0E1E9F61122
5 changed files with 5 additions and 61 deletions

View File

@ -110,7 +110,6 @@ diesel_migrations = "2.0.0"
html-escape = "0.2.13" html-escape = "0.2.13"
tokio-cron-scheduler = "0.13.0" tokio-cron-scheduler = "0.13.0"
tokio-retry = "0.3.0" tokio-retry = "0.3.0"
fastembed = "4.9.0"
[profile.release] [profile.release]
debug = false debug = false

View File

@ -8,7 +8,6 @@ reqwest = { workspace = true }
serde = { workspace = true } serde = { workspace = true }
serde_json = { workspace = true } serde_json = { workspace = true }
dotenv = { workspace = true } dotenv = { workspace = true }
fastembed = "4.8.0"
[dev-dependencies] [dev-dependencies]
dotenv = { workspace = true } dotenv = { workspace = true }

View File

@ -9,24 +9,15 @@ pub struct Reranker {
base_url: String, base_url: String,
model: String, model: String,
client: Client, client: Client,
environment: String,
} }
impl Reranker { impl Reranker {
pub fn new() -> Result<Self, Box<dyn Error>> { pub fn new() -> Result<Self, Box<dyn Error>> {
dotenv().ok(); dotenv().ok();
let environment = env::var("ENVIRONMENT").unwrap_or_else(|_| "production".to_string());
// If local environment, we don't need these values let api_key = env::var("RERANK_API_KEY")?;
let (api_key, model, base_url) = if environment == "local" { let model = env::var("RERANK_MODEL")?;
(String::new(), String::new(), String::new()) let base_url = env::var("RERANK_BASE_URL")?;
} else {
(
env::var("RERANK_API_KEY")?,
env::var("RERANK_MODEL")?,
env::var("RERANK_BASE_URL")?,
)
};
let client = Client::new(); let client = Client::new();
Ok(Self { Ok(Self {
@ -34,7 +25,6 @@ impl Reranker {
base_url, base_url,
model, model,
client, client,
environment,
}) })
} }
@ -44,18 +34,13 @@ impl Reranker {
documents: &[&str], documents: &[&str],
top_n: usize, top_n: usize,
) -> Result<Vec<RerankResult>, Box<dyn Error>> { ) -> Result<Vec<RerankResult>, Box<dyn Error>> {
// Use local fastembed reranking if ENVIRONMENT is set to local
if self.environment == "local" {
return self.local_rerank(query, documents, top_n).await;
}
// Otherwise use the remote API
let request_body = RerankRequest { let request_body = RerankRequest {
query: query.to_string(), query: query.to_string(),
documents: documents.iter().map(|s| s.to_string()).collect(), documents: documents.iter().map(|s| s.to_string()).collect(),
top_n, top_n,
model: self.model.clone(), model: self.model.clone(),
}; };
let response = self let response = self
.client .client
.post(&self.base_url) .post(&self.base_url)
@ -63,40 +48,10 @@ impl Reranker {
.json(&request_body) .json(&request_body)
.send() .send()
.await?; .await?;
let response_body: RerankResponse = response.json().await?; let response_body: RerankResponse = response.json().await?;
Ok(response_body.results) Ok(response_body.results)
} }
async fn local_rerank(
&self,
query: &str,
documents: &[&str],
top_n: usize,
) -> Result<Vec<RerankResult>, Box<dyn Error>> {
use fastembed::{TextRerank, RerankInitOptions, RerankerModel};
// Initialize the reranker model
let model = TextRerank::try_new(
RerankInitOptions::new(RerankerModel::JINARerankerV1TurboEn).with_show_download_progress(true),
)?;
// Limit top_n to the number of documents
let actual_top_n = std::cmp::min(top_n, documents.len());
// Perform reranking
let fastembed_results = model.rerank(query, documents.to_vec(),false, Some(actual_top_n))?;
// Convert fastembed results to our RerankResult format
let results = fastembed_results
.iter()
.map(|result| RerankResult {
index: result.index,
relevance_score: result.score,
})
.collect();
Ok(results)
}
} }
#[derive(Serialize)] #[derive(Serialize)]

View File

@ -39,7 +39,6 @@ tower-http = { workspace = true }
tracing = { workspace = true } tracing = { workspace = true }
tracing-subscriber = { workspace = true } tracing-subscriber = { workspace = true }
uuid = { workspace = true } uuid = { workspace = true }
fastembed = { workspace = true }
# Local dependencies # Local dependencies
handlers = { path = "../libs/handlers" } handlers = { path = "../libs/handlers" }

View File

@ -22,7 +22,6 @@ use tower::ServiceBuilder;
use tower_http::{compression::CompressionLayer, trace::TraceLayer}; use tower_http::{compression::CompressionLayer, trace::TraceLayer};
use tracing::{error, info, warn}; use tracing::{error, info, warn};
use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt, EnvFilter}; use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt, EnvFilter};
use fastembed::{InitOptions, RerankInitOptions, RerankerModel, TextRerank};
pub const MIGRATIONS: EmbeddedMigrations = embed_migrations!(); pub const MIGRATIONS: EmbeddedMigrations = embed_migrations!();
@ -34,13 +33,6 @@ async fn main() -> Result<(), anyhow::Error> {
let environment = env::var("ENVIRONMENT").unwrap_or_else(|_| "development".to_string()); let environment = env::var("ENVIRONMENT").unwrap_or_else(|_| "development".to_string());
let is_development = environment == "development"; let is_development = environment == "development";
if environment == "local" {
let options =
RerankInitOptions::new(RerankerModel::JINARerankerV1TurboEn).with_show_download_progress(true);
let model = TextRerank::try_new(options)?;
println!("Model loaded and ready!");
}
ring::default_provider() ring::default_provider()
.install_default() .install_default()
.expect("Failed to install default crypto provider"); .expect("Failed to install default crypto provider");