starred/minne
1
0
Fork 0
mirror of https://github.com/perstarkse/minne.git synced 2026-03-31 14:43:20 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

refactored queue into Job

Browse Source
This commit is contained in:
Per Stark
2025-03-05 16:14:18 +01:00
parent cada21dbf6
commit 7d79f468aa
29 changed files with 401 additions and 490 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
crates/html-router/src/html_state.rs
View File

@@ -1,6 +1,5 @@
use axum_session::SessionStore;
use axum_session_surreal::SessionSurrealPool;
use common::ingress::jobqueue::JobQueue;
use common::storage::db::SurrealDbClient;
use common::utils::config::AppConfig;
use common::utils::mailer::Mailer;
@@ -12,11 +11,10 @@ use surrealdb::engine::any::Any;
#[derive(Clone)]
pub struct HtmlState {
pub surreal_db_client: Arc<SurrealDbClient>,
pub db: Arc<SurrealDbClient>,
pub openai_client: Arc<async_openai::Client<async_openai::config::OpenAIConfig>>,
pub templates: Arc<AutoReloader>,
pub mailer: Arc<Mailer>,
pub job_queue: Arc<JobQueue>,
pub session_store: Arc<SessionStore<SessionSurrealPool<Any>>>,
}
@@ -51,7 +49,7 @@ impl HtmlState {
let session_store = Arc::new(surreal_db_client.create_session_store().await?);
let app_state = HtmlState {
surreal_db_client: surreal_db_client.clone(),
db: surreal_db_client.clone(),
templates: Arc::new(reloader),
openai_client: openai_client.clone(),
mailer: Arc::new(Mailer::new(
@@ -59,7 +57,6 @@ impl HtmlState {
&config.smtp_relayer,
&config.smtp_password,
)?),
job_queue: Arc::new(JobQueue::new(surreal_db_client)),
session_store,
};

2
crates/html-router/src/lib.rs
View File

@@ -102,7 +102,7 @@ where
.layer(from_fn_with_state(app_state.clone(), analytics_middleware))
.layer(
AuthSessionLayer::<User, String, SessionSurrealPool<Any>, Surreal<Any>>::new(Some(
app_state.surreal_db_client.client.clone(),
app_state.db.client.clone(),
))
.with_config(AuthConfig::<String>::default()),
)

4
crates/html-router/src/middleware_analytics.rs
View File

@@ -22,11 +22,11 @@ pub async fn analytics_middleware(
// Only count if it's a main page request (not assets or other resources)
if !path.starts_with("/assets") && !path.starts_with("/_next") && !path.contains('.') {
if !session.get::<bool>("counted_visitor").unwrap_or(false) {
let _ = Analytics::increment_visitors(&state.surreal_db_client).await;
let _ = Analytics::increment_visitors(&state.db).await;
session.set("counted_visitor", true);
}
let _ = Analytics::increment_page_loads(&state.surreal_db_client).await;
let _ = Analytics::increment_page_loads(&state.db).await;
}
next.run(request).await

10
crates/html-router/src/routes/account.rs
View File

@@ -12,7 +12,7 @@ use surrealdb::{engine::any::Any, Surreal};
use common::{
error::{AppError, HtmlError},
storage::{db::delete_item, types::user::User},
storage::types::user::User,
};
use crate::{html_state::HtmlState, page_data};
@@ -56,7 +56,7 @@ pub async fn set_api_key(
};
// Generate and set the API key
let api_key = User::set_api_key(&user.id, &state.surreal_db_client)
let api_key = User::set_api_key(&user.id, &state.db)
.await
.map_err(|e| HtmlError::new(e, state.templates.clone()))?;
@@ -92,7 +92,9 @@ pub async fn delete_account(
None => return Ok(Redirect::to("/").into_response()),
};
delete_item::<User>(&state.surreal_db_client, &user.id)
state
.db
.delete_item::<User>(&user.id)
.await
.map_err(|e| HtmlError::new(AppError::from(e), state.templates.clone()))?;
@@ -118,7 +120,7 @@ pub async fn update_timezone(
None => return Ok(Redirect::to("/").into_response()),
};
User::update_timezone(&user.id, &form.timezone, &state.surreal_db_client)
User::update_timezone(&user.id, &form.timezone, &state.db)
.await
.map_err(|e| HtmlError::new(e, state.templates.clone()))?;

10
crates/html-router/src/routes/admin_panel.rs
View File

@@ -33,15 +33,15 @@ pub async fn show_admin_panel(
_ => return Ok(Redirect::to("/").into_response()),
};
let settings = SystemSettings::get_current(&state.surreal_db_client)
let settings = SystemSettings::get_current(&state.db)
.await
.map_err(|e| HtmlError::new(e, state.templates.clone()))?;
let analytics = Analytics::get_current(&state.surreal_db_client)
let analytics = Analytics::get_current(&state.db)
.await
.map_err(|e| HtmlError::new(e, state.templates.clone()))?;
let users_count = Analytics::get_users_amount(&state.surreal_db_client)
let users_count = Analytics::get_users_amount(&state.db)
.await
.map_err(|e| HtmlError::new(e, state.templates.clone()))?;
@@ -92,7 +92,7 @@ pub async fn toggle_registration_status(
_ => return Ok(Redirect::to("/").into_response()),
};
let current_settings = SystemSettings::get_current(&state.surreal_db_client)
let current_settings = SystemSettings::get_current(&state.db)
.await
.map_err(|e| HtmlError::new(e, state.templates.clone()))?;
@@ -101,7 +101,7 @@ pub async fn toggle_registration_status(
..current_settings.clone()
};
SystemSettings::update(&state.surreal_db_client, new_settings.clone())
SystemSettings::update(&state.db, new_settings.clone())
.await
.map_err(|e| HtmlError::new(e, state.templates.clone()))?;

27
crates/html-router/src/routes/chat/message_response_stream.rs
View File

@@ -29,7 +29,7 @@ use common::{
},
},
storage::{
db::{get_item, store_item, SurrealDbClient},
db::SurrealDbClient,
types::{
message::{Message, MessageRole},
user::User,
@@ -64,7 +64,7 @@ async fn get_message_and_user(
};
// Retrieve message
let message = match get_item::<Message>(db, message_id).await {
let message = match db.get_item::<Message>(message_id).await {
Ok(Some(message)) => message,
Ok(None) => {
return Err(Sse::new(create_error_stream(
@@ -93,20 +93,15 @@ pub async fn get_response_stream(
Query(params): Query<QueryParams>,
) -> Sse<Pin<Box<dyn Stream<Item = Result<Event, axum::Error>> + Send>>> {
// 1. Authentication and initial data validation
let (user_message, user) = match get_message_and_user(
&state.surreal_db_client,
auth.current_user,
&params.message_id,
)
.await
{
Ok((user_message, user)) => (user_message, user),
Err(error_stream) => return error_stream,
};
let (user_message, user) =
match get_message_and_user(&state.db, auth.current_user, &params.message_id).await {
Ok((user_message, user)) => (user_message, user),
Err(error_stream) => return error_stream,
};
// 2. Retrieve knowledge entities
let entities = match combined_knowledge_entity_retrieval(
&state.surreal_db_client,
&state.db,
&state.openai_client,
&user_message.content,
&user.id,
@@ -143,7 +138,7 @@ pub async fn get_response_stream(
let (tx_final, mut rx_final) = channel::<Message>(1);
// 6. Set up the collection task for DB storage
let db_client = state.surreal_db_client.clone();
let db_client = state.db.clone();
tokio::spawn(async move {
drop(tx); // Close sender when no longer needed
@@ -170,7 +165,7 @@ pub async fn get_response_stream(
let _ = tx_final.send(ai_message.clone()).await;
match store_item(&db_client, ai_message).await {
match db_client.store_item(ai_message).await {
Ok(_) => info!("Successfully stored AI message with references"),
Err(e) => error!("Failed to store AI message: {:?}", e),
}
@@ -185,7 +180,7 @@ pub async fn get_response_stream(
None,
);
let _ = store_item(&db_client, ai_message).await;
let _ = db_client.store_item(ai_message).await;
}
});

51
crates/html-router/src/routes/chat/mod.rs
View File

@@ -14,19 +14,15 @@ use tracing::info;
use common::{
error::{AppError, HtmlError},
storage::{
db::{get_item, store_item},
types::{
conversation::Conversation,
message::{Message, MessageRole},
user::User,
},
storage::types::{
conversation::Conversation,
message::{Message, MessageRole},
user::User,
},
};
use crate::{html_state::HtmlState, page_data, routes::render_template};
// Update your ChatStartParams struct to properly deserialize the references
#[derive(Debug, Deserialize)]
pub struct ChatStartParams {
user_query: String,
@@ -80,9 +76,9 @@ pub async fn show_initialized_chat(
);
let (conversation_result, ai_message_result, user_message_result) = futures::join!(
store_item(&state.surreal_db_client, conversation.clone()),
store_item(&state.surreal_db_client, ai_message.clone()),
store_item(&state.surreal_db_client, user_message.clone())
state.db.store_item(conversation.clone()),
state.db.store_item(ai_message.clone()),
state.db.store_item(user_message.clone())
);
// Check each result individually
@@ -90,7 +86,7 @@ pub async fn show_initialized_chat(
user_message_result.map_err(|e| HtmlError::new(AppError::from(e), state.templates.clone()))?;
ai_message_result.map_err(|e| HtmlError::new(AppError::from(e), state.templates.clone()))?;
let conversation_archive = User::get_user_conversations(&user.id, &state.surreal_db_client)
let conversation_archive = User::get_user_conversations(&user.id, &state.db)
.await
.map_err(|e| HtmlError::new(e, state.templates.clone()))?;
@@ -126,7 +122,7 @@ pub async fn show_chat_base(
None => return Ok(Redirect::to("/").into_response()),
};
let conversation_archive = User::get_user_conversations(&user.id, &state.surreal_db_client)
let conversation_archive = User::get_user_conversations(&user.id, &state.db)
.await
.map_err(|e| HtmlError::new(e, state.templates.clone()))?;
@@ -161,17 +157,14 @@ pub async fn show_existing_chat(
None => return Ok(Redirect::to("/").into_response()),
};
let conversation_archive = User::get_user_conversations(&user.id, &state.surreal_db_client)
let conversation_archive = User::get_user_conversations(&user.id, &state.db)
.await
.map_err(|e| HtmlError::new(e, state.templates.clone()))?;
let (conversation, messages) = Conversation::get_complete_conversation(
conversation_id.as_str(),
&user.id,
&state.surreal_db_client,
)
.await
.map_err(|e| HtmlError::new(e, state.templates.clone()))?;
let (conversation, messages) =
Conversation::get_complete_conversation(conversation_id.as_str(), &user.id, &state.db)
.await
.map_err(|e| HtmlError::new(e, state.templates.clone()))?;
let output = render_template(
ChatData::template_name(),
@@ -198,7 +191,9 @@ pub async fn new_user_message(
None => return Ok(Redirect::to("/").into_response()),
};
let conversation: Conversation = get_item(&state.surreal_db_client, &conversation_id)
let conversation: Conversation = state
.db
.get_item(&conversation_id)
.await
.map_err(|e| HtmlError::new(AppError::from(e), state.templates.clone()))?
.ok_or_else(|| {
@@ -217,7 +212,9 @@ pub async fn new_user_message(
let user_message = Message::new(conversation_id, MessageRole::User, form.content, None);
store_item(&state.surreal_db_client, user_message.clone())
state
.db
.store_item(user_message.clone())
.await
.map_err(|e| HtmlError::new(AppError::from(e), state.templates.clone()))?;
@@ -258,10 +255,14 @@ pub async fn new_chat_user_message(
None,
);
store_item(&state.surreal_db_client, conversation.clone())
state
.db
.store_item(conversation.clone())
.await
.map_err(|e| HtmlError::new(AppError::from(e), state.templates.clone()))?;
store_item(&state.surreal_db_client, user_message.clone())
state
.db
.store_item(user_message.clone())
.await
.map_err(|e| HtmlError::new(AppError::from(e), state.templates.clone()))?;

9
crates/html-router/src/routes/chat/references.rs
View File

@@ -10,10 +10,7 @@ use tracing::info;
use common::{
error::{AppError, HtmlError},
storage::{
db::get_item,
types::{knowledge_entity::KnowledgeEntity, user::User},
},
storage::types::{knowledge_entity::KnowledgeEntity, user::User},
};
use crate::{html_state::HtmlState, routes::render_template};
@@ -30,7 +27,9 @@ pub async fn show_reference_tooltip(
None => return Ok(Redirect::to("/").into_response()),
};
let entity: KnowledgeEntity = get_item(&state.surreal_db_client, &reference_id)
let entity: KnowledgeEntity = state
.db
.get_item(&reference_id)
.await
.map_err(|e| HtmlError::new(AppError::from(e), state.templates.clone()))?
.ok_or_else(|| {

10
crates/html-router/src/routes/content/mod.rs
View File

@@ -30,7 +30,7 @@ pub async fn show_content_page(
None => return Ok(Redirect::to("/signin").into_response()),
};
let text_contents = User::get_text_contents(&user.id, &state.surreal_db_client)
let text_contents = User::get_text_contents(&user.id, &state.db)
.await
.map_err(|e| HtmlError::new(e, state.templates.clone()))?;
@@ -63,7 +63,7 @@ pub async fn show_text_content_edit_form(
None => return Ok(Redirect::to("/signin").into_response()),
};
let text_content = User::get_and_validate_text_content(&id, &user.id, &state.surreal_db_client)
let text_content = User::get_and_validate_text_content(&id, &user.id, &state.db)
.await
.map_err(|e| HtmlError::new(e, state.templates.clone()))?;
@@ -87,11 +87,13 @@ pub async fn patch_text_content(
None => return Ok(Redirect::to("/signin").into_response()),
};
let text_content = User::get_and_validate_text_content(&id, &user.id, &state.surreal_db_client)
let text_content = User::get_and_validate_text_content(&id, &user.id, &state.db)
.await
.map_err(|e| HtmlError::new(e, state.templates.clone()))?;
let text_contents = User::get_text_contents(&user.id, &state.surreal_db_client)
// ADD FUNCTION TO PATCH CONTENT
let text_contents = User::get_text_contents(&user.id, &state.db)
.await
.map_err(|e| HtmlError::new(e, state.templates.clone()))?;

50
crates/html-router/src/routes/index.rs
View File

@@ -11,13 +11,10 @@ use tracing::info;
use common::{
error::{AppError, HtmlError},
storage::{
db::{delete_item, get_item},
types::{
file_info::FileInfo, job::Job, knowledge_entity::KnowledgeEntity,
knowledge_relationship::KnowledgeRelationship, text_chunk::TextChunk,
text_content::TextContent, user::User,
},
storage::types::{
file_info::FileInfo, job::Job, knowledge_entity::KnowledgeEntity,
knowledge_relationship::KnowledgeRelationship, text_chunk::TextChunk,
text_content::TextContent, user::User,
},
};
@@ -42,9 +39,7 @@ pub async fn index_handler(
let gdpr_accepted = auth.current_user.is_some() | session.get("gdpr_accepted").unwrap_or(false);
let active_jobs = match auth.current_user.is_some() {
true => state
.job_queue
.get_unfinished_user_jobs(&auth.current_user.clone().unwrap().id)
true => User::get_unfinished_jobs(&auth.current_user.clone().unwrap().id, &state.db)
.await
.map_err(|e| HtmlError::new(e, state.templates.clone()))?,
false => vec![],
@@ -53,7 +48,7 @@ pub async fn index_handler(
let latest_text_contents = match auth.current_user.clone().is_some() {
true => User::get_latest_text_contents(
auth.current_user.clone().unwrap().id.as_str(),
&state.surreal_db_client,
&state.db,
)
.await
.map_err(|e| HtmlError::new(e, state.templates.clone()))?,
@@ -63,7 +58,7 @@ pub async fn index_handler(
// let latest_knowledge_entities = match auth.current_user.is_some() {
// true => User::get_latest_knowledge_entities(
// auth.current_user.clone().unwrap().id.as_str(),
// &state.surreal_db_client,
// &state.db,
// )
// .await
// .map_err(|e| HtmlError::new(e, state.templates.clone()))?,
@@ -107,18 +102,15 @@ pub async fn delete_text_content(
let deletion_tasks = join!(
async {
if let Some(file_info) = text_content.file_info {
FileInfo::delete_by_id(&file_info.id, &state.surreal_db_client).await
FileInfo::delete_by_id(&file_info.id, &state.db).await
} else {
Ok(())
}
},
delete_item::<TextContent>(&state.surreal_db_client, &text_content.id),
TextChunk::delete_by_source_id(&text_content.id, &state.surreal_db_client),
KnowledgeEntity::delete_by_source_id(&text_content.id, &state.surreal_db_client),
KnowledgeRelationship::delete_relationships_by_source_id(
&text_content.id,
&state.surreal_db_client
)
state.db.delete_item::<TextContent>(&text_content.id),
TextChunk::delete_by_source_id(&text_content.id, &state.db),
KnowledgeEntity::delete_by_source_id(&text_content.id, &state.db),
KnowledgeRelationship::delete_relationships_by_source_id(&text_content.id, &state.db)
);
// Handle potential errors from concurrent operations
@@ -133,7 +125,7 @@ pub async fn delete_text_content(
}
// Render updated content
let latest_text_contents = User::get_latest_text_contents(&user.id, &state.surreal_db_client)
let latest_text_contents = User::get_latest_text_contents(&user.id, &state.db)
.await
.map_err(|e| HtmlError::new(e, state.templates.clone()))?;
@@ -156,7 +148,9 @@ async fn get_and_validate_text_content(
id: &str,
user: &User,
) -> Result<TextContent, HtmlError> {
let text_content = get_item::<TextContent>(&state.surreal_db_client, id)
let text_content = state
.db
.get_item::<TextContent>(id)
.await
.map_err(|e| HtmlError::new(AppError::from(e), state.templates.clone()))?
.ok_or_else(|| {
@@ -192,15 +186,11 @@ pub async fn delete_job(
None => return Ok(Redirect::to("/signin").into_response()),
};
state
.job_queue
.delete_job(&id, &user.id)
User::validate_and_delete_job(&id, &user.id, &state.db)
.await
.map_err(|e| HtmlError::new(e, state.templates.clone()))?;
let active_jobs = state
.job_queue
.get_unfinished_user_jobs(&user.id)
let active_jobs = User::get_unfinished_jobs(&user.id, &state.db)
.await
.map_err(|e| HtmlError::new(e, state.templates.clone()))?;
@@ -226,9 +216,7 @@ pub async fn show_active_jobs(
None => return Ok(Redirect::to("/signin").into_response()),
};
let active_jobs = state
.job_queue
.get_unfinished_user_jobs(&user.id)
let active_jobs = User::get_unfinished_jobs(&user.id, &state.db)
.await
.map_err(|e| HtmlError::new(e, state.templates.clone()))?;

12
crates/html-router/src/routes/ingress_form.rs
View File

@@ -13,7 +13,7 @@ use tracing::info;
use common::{
error::{AppError, HtmlError, IntoHtmlError},
ingress::ingress_input::{create_ingress_objects, IngressInput},
storage::types::{file_info::FileInfo, user::User},
storage::types::{file_info::FileInfo, job::Job, user::User},
};
use crate::{
@@ -37,7 +37,7 @@ pub async fn show_ingress_form(
return Ok(Redirect::to("/").into_response());
}
let user_categories = User::get_user_categories(&auth.id, &state.surreal_db_client)
let user_categories = User::get_user_categories(&auth.id, &state.db)
.await
.map_err(|e| HtmlError::new(e, state.templates.clone()))?;
@@ -107,7 +107,7 @@ pub async fn process_ingress_form(
info!("{:?}", input);
let file_infos = try_join_all(input.files.into_iter().map(|file| {
FileInfo::new(file, &state.surreal_db_client, &user.id)
FileInfo::new(file, &state.db, &user.id)
.map_err(|e| HtmlError::new(AppError::from(e), state.templates.clone()))
}))
.await?;
@@ -125,7 +125,7 @@ pub async fn process_ingress_form(
let futures: Vec<_> = ingress_objects
.into_iter()
.map(|object| state.job_queue.enqueue(object.clone(), user.id.clone()))
.map(|object| Job::create_and_add_to_db(object.clone(), user.id.clone(), &state.db))
.collect();
try_join_all(futures)
@@ -134,9 +134,7 @@ pub async fn process_ingress_form(
.map_err(|e| HtmlError::new(e, state.templates.clone()))?;
// Update the active jobs page with the newly created job
let active_jobs = state
.job_queue
.get_unfinished_user_jobs(&user.id)
let active_jobs = User::get_unfinished_jobs(&user.id, &state.db)
.await
.map_err(|e| HtmlError::new(e, state.templates.clone()))?;

43
crates/html-router/src/routes/knowledge/mod.rs
View File

@@ -15,13 +15,10 @@ use tracing::info;
use common::{
error::{AppError, HtmlError},
storage::{
db::delete_item,
types::{
knowledge_entity::{KnowledgeEntity, KnowledgeEntityType},
knowledge_relationship::KnowledgeRelationship,
user::User,
},
storage::types::{
knowledge_entity::{KnowledgeEntity, KnowledgeEntityType},
knowledge_relationship::KnowledgeRelationship,
user::User,
},
};
@@ -44,13 +41,13 @@ pub async fn show_knowledge_page(
None => return Ok(Redirect::to("/signin").into_response()),
};
let entities = User::get_knowledge_entities(&user.id, &state.surreal_db_client)
let entities = User::get_knowledge_entities(&user.id, &state.db)
.await
.map_err(|e| HtmlError::new(e, state.templates.clone()))?;
info!("Got entities ok");
let relationships = User::get_knowledge_relationships(&user.id, &state.surreal_db_client)
let relationships = User::get_knowledge_relationships(&user.id, &state.db)
.await
.map_err(|e| HtmlError::new(e, state.templates.clone()))?;
@@ -169,7 +166,7 @@ pub async fn show_edit_knowledge_entity_form(
.collect();
// Get the entity and validate ownership
let entity = User::get_and_validate_knowledge_entity(&id, &user.id, &state.surreal_db_client)
let entity = User::get_and_validate_knowledge_entity(&id, &user.id, &state.db)
.await
.map_err(|e| HtmlError::new(e, state.templates.clone()))?;
@@ -212,7 +209,7 @@ pub async fn patch_knowledge_entity(
};
// Get the existing entity and validate that the user is allowed
User::get_and_validate_knowledge_entity(&form.id, &user.id, &state.surreal_db_client)
User::get_and_validate_knowledge_entity(&form.id, &user.id, &state.db)
.await
.map_err(|e| HtmlError::new(e, state.templates.clone()))?;
@@ -224,14 +221,14 @@ pub async fn patch_knowledge_entity(
&form.name,
&form.description,
&entity_type,
&state.surreal_db_client,
&state.db,
&state.openai_client,
)
.await
.map_err(|e| HtmlError::new(AppError::from(e), state.templates.clone()))?;
// Get updated list of entities
let entities = User::get_knowledge_entities(&user.id, &state.surreal_db_client)
let entities = User::get_knowledge_entities(&user.id, &state.db)
.await
.map_err(|e| HtmlError::new(e, state.templates.clone()))?;
@@ -257,17 +254,19 @@ pub async fn delete_knowledge_entity(
};
// Get the existing entity and validate that the user is allowed
User::get_and_validate_knowledge_entity(&id, &user.id, &state.surreal_db_client)
User::get_and_validate_knowledge_entity(&id, &user.id, &state.db)
.await
.map_err(|e| HtmlError::new(e, state.templates.clone()))?;
// Delete the entity
delete_item::<KnowledgeEntity>(&state.surreal_db_client, &id)
state
.db
.delete_item::<KnowledgeEntity>(&id)
.await
.map_err(|e| HtmlError::new(AppError::from(e), state.templates.clone()))?;
// Get updated list of entities
let entities = User::get_knowledge_entities(&user.id, &state.surreal_db_client)
let entities = User::get_knowledge_entities(&user.id, &state.db)
.await
.map_err(|e| HtmlError::new(e, state.templates.clone()))?;
@@ -300,15 +299,15 @@ pub async fn delete_knowledge_relationship(
// GOTTA ADD AUTH VALIDATION
KnowledgeRelationship::delete_relationship_by_id(&id, &state.surreal_db_client)
KnowledgeRelationship::delete_relationship_by_id(&id, &state.db)
.await
.map_err(|e| HtmlError::new(e, state.templates.clone()))?;
let entities = User::get_knowledge_entities(&user.id, &state.surreal_db_client)
let entities = User::get_knowledge_entities(&user.id, &state.db)
.await
.map_err(|e| HtmlError::new(e, state.templates.clone()))?;
let relationships = User::get_knowledge_relationships(&user.id, &state.surreal_db_client)
let relationships = User::get_knowledge_relationships(&user.id, &state.db)
.await
.map_err(|e| HtmlError::new(e, state.templates.clone()))?;
@@ -353,15 +352,15 @@ pub async fn save_knowledge_relationship(
);
relationship
.store_relationship(&state.surreal_db_client)
.store_relationship(&state.db)
.await
.map_err(|e| HtmlError::new(e, state.templates.clone()))?;
let entities = User::get_knowledge_entities(&user.id, &state.surreal_db_client)
let entities = User::get_knowledge_entities(&user.id, &state.db)
.await
.map_err(|e| HtmlError::new(e, state.templates.clone()))?;
let relationships = User::get_knowledge_relationships(&user.id, &state.surreal_db_client)
let relationships = User::get_knowledge_relationships(&user.id, &state.db)
.await
.map_err(|e| HtmlError::new(e, state.templates.clone()))?;

2
crates/html-router/src/routes/signin.rs
View File

@@ -54,7 +54,7 @@ pub async fn authenticate_user(
auth: AuthSession<User, String, SessionSurrealPool<Any>, Surreal<Any>>,
Form(form): Form<SignupParams>,
) -> Result<impl IntoResponse, HtmlError> {
let user = match User::authenticate(form.email, form.password, &state.surreal_db_client).await {
let user = match User::authenticate(form.email, form.password, &state.db).await {
Ok(user) => user,
Err(_) => {
return Ok(Html("<p>Incorrect email or password </p>").into_response());

9
crates/html-router/src/routes/signup.rs
View File

@@ -44,14 +44,7 @@ pub async fn process_signup_and_show_verification(
auth: AuthSession<User, String, SessionSurrealPool<Any>, Surreal<Any>>,
Form(form): Form<SignupParams>,
) -> Result<impl IntoResponse, HtmlError> {
let user = match User::create_new(
form.email,
form.password,
&state.surreal_db_client,
form.timezone,
)
.await
{
let user = match User::create_new(form.email, form.password, &state.db, form.timezone).await {
Ok(user) => user,
Err(e) => {
tracing::error!("{:?}", e);