starred/minne
1
0
Fork 0
mirror of https://github.com/perstarkse/minne.git synced 2026-04-25 10:18:38 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

chore: corrected error type and clippy satisfaction

Browse Source
This commit is contained in:
Per Stark
2025-05-05 09:27:26 +02:00
parent c2fbdecce0
commit 6ad625befc
3 changed files with 7 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/error.rs
View File

@@ -31,8 +31,10 @@ pub enum AppError {
Reqwest(#[from] reqwest::Error), Reqwest(#[from] reqwest::Error),
#[error("Tiktoken error: {0}")] #[error("Tiktoken error: {0}")]
Tiktoken(#[from] anyhow::Error), Tiktoken(#[from] anyhow::Error),
#[error("Ingress Processing error: {0}")] #[error("Ingestion Processing error: {0}")]
Processing(String), Processing(String),
#[error("DOM smoothie error: {0}")] #[error("DOM smoothie error: {0}")]
DomSmoothie(#[from] dom_smoothie::ReadabilityError), DomSmoothie(#[from] dom_smoothie::ReadabilityError),
#[error("Internal service error: {0}")]
InternalError(String),
} }

54
common/src/storage/db.rs
View File

@@ -1,4 +1,4 @@
use super::types::{analytics::Analytics, system_settings::SystemSettings, StoredObject}; use super::types::StoredObject;
use crate::error::AppError; use crate::error::AppError;
use axum_session::{SessionConfig, SessionError, SessionStore}; use axum_session::{SessionConfig, SessionError, SessionStore};
use axum_session_surreal::SessionSurrealPool; use axum_session_surreal::SessionSurrealPool;
@@ -65,72 +65,24 @@ impl SurrealDbClient {
/// the database and selecting the appropriate namespace and database, but before /// the database and selecting the appropriate namespace and database, but before
/// the application starts performing operations that rely on the schema. /// the application starts performing operations that rely on the schema.
pub async fn apply_migrations(&self) -> Result<(), AppError> { pub async fn apply_migrations(&self) -> Result<(), AppError> {
// Instantiate the runner, load embedded files, and run 'up'
MigrationRunner::new(&self.client) MigrationRunner::new(&self.client)
.load_files(&MIGRATIONS_DIR) .load_files(&MIGRATIONS_DIR)
.up() .up()
.await .await
.map_err(|e| AppError::Processing(e.to_string()))?; .map_err(|e| AppError::InternalError(e.to_string()))?;
Ok(()) Ok(())
} }
// pub async fn ensure_initialized(&self) -> Result<(), AppError> { /// Operation to rebuild indexes
// Self::build_indexes(self).await?;
// Self::setup_auth(self).await?;
// Analytics::ensure_initialized(self).await?;
// SystemSettings::ensure_initialized(self).await?;
// Ok(())
// }
// pub async fn setup_auth(&self) -> Result<(), Error> {
// self.client.query(
// "DEFINE TABLE user SCHEMALESS;
// DEFINE INDEX unique_name ON TABLE user FIELDS email UNIQUE;
// DEFINE ACCESS account ON DATABASE TYPE RECORD
// SIGNUP ( CREATE user SET email = $email, password = crypto::argon2::generate($password), anonymous = false, user_id = $user_id)
// SIGNIN ( SELECT * FROM user WHERE email = $email AND crypto::argon2::compare(password, $password) );",
// )
// .await?;
// Ok(())
// }
// pub async fn build_indexes(&self) -> Result<(), Error> {
// self.client.query("DEFINE INDEX idx_embedding_chunks ON text_chunk FIELDS embedding HNSW DIMENSION 1536").await?;
// self.client.query("DEFINE INDEX idx_embedding_entities ON knowledge_entity FIELDS embedding HNSW DIMENSION 1536").await?;
// self.client
// .query("DEFINE INDEX idx_job_status ON job FIELDS status")
// .await?;
// self.client
// .query("DEFINE INDEX idx_job_user ON job FIELDS user_id")
// .await?;
// self.client
// .query("DEFINE INDEX idx_job_created ON job FIELDS created_at")
// .await?;
// Ok(())
// }
pub async fn rebuild_indexes(&self) -> Result<(), Error> { pub async fn rebuild_indexes(&self) -> Result<(), Error> {
self.client self.client
.query("REBUILD INDEX IF EXISTS idx_embedding_chunks ON text_chunk") .query("REBUILD INDEX IF EXISTS idx_embedding_chunks ON text_chunk")
.await?;
self.client
.query("REBUILD INDEX IF EXISTS idx_embeddings_entities ON knowledge_entity") .query("REBUILD INDEX IF EXISTS idx_embeddings_entities ON knowledge_entity")
.await?; .await?;
Ok(()) Ok(())
} }
pub async fn drop_table<T>(&self) -> Result<Vec<T>, Error>
where
T: StoredObject + Send + Sync + 'static,
{
self.client.delete(T::table_name()).await
}
/// Operation to store a object in SurrealDB, requires the struct to implement StoredObject /// Operation to store a object in SurrealDB, requires the struct to implement StoredObject
/// ///
/// # Arguments /// # Arguments

2
composite-retrieval/src/graph.rs
View File

@@ -292,7 +292,7 @@ mod tests {
.await .await
.expect("Failed to store related entity 2") .expect("Failed to store related entity 2")
.unwrap(); .unwrap();
let unrelated_entity = db let _unrelated_entity = db
.store_item(unrelated_entity.clone()) .store_item(unrelated_entity.clone())
.await .await
.expect("Failed to store unrelated entity") .expect("Failed to store unrelated entity")