diff --git a/crates/schema/database/mysql_queries/src/queries/characters/batch_lookup_characters_by_token_for_prompting.rs b/crates/schema/database/mysql_queries/src/queries/characters/batch_lookup_characters_by_token_for_prompting.rs index 4895ab5cc8..5b71adf337 100644 --- a/crates/schema/database/mysql_queries/src/queries/characters/batch_lookup_characters_by_token_for_prompting.rs +++ b/crates/schema/database/mysql_queries/src/queries/characters/batch_lookup_characters_by_token_for_prompting.rs @@ -1,4 +1,3 @@ -use errors::AnyhowResult; use sqlx::pool::PoolConnection; use sqlx::{FromRow, MySql, QueryBuilder}; @@ -20,7 +19,7 @@ pub struct CharacterPromptData { pub async fn batch_lookup_characters_by_token_for_prompting( tokens: &[CharacterToken], connection: &mut PoolConnection, -) -> AnyhowResult> { +) -> Result, sqlx::Error> { if tokens.is_empty() { return Ok(Vec::new()); } diff --git a/crates/schema/database/mysql_queries/src/queries/characters/create_pending_character.rs b/crates/schema/database/mysql_queries/src/queries/characters/create_pending_character.rs index 27afd60895..02b8caf70c 100644 --- a/crates/schema/database/mysql_queries/src/queries/characters/create_pending_character.rs +++ b/crates/schema/database/mysql_queries/src/queries/characters/create_pending_character.rs @@ -1,4 +1,3 @@ -use anyhow::anyhow; use log::info; use sqlx::{Executor, MySql}; use std::marker::PhantomData; @@ -50,7 +49,7 @@ pub struct CreatePendingCharacterArgs<'e, 'c, E> /// once the async creation job completes. pub async fn create_pending_character<'e, 'c: 'e, E>( args: CreatePendingCharacterArgs<'e, 'c, E>, -) -> anyhow::Result +) -> Result where E: 'e + Executor<'c, Database = MySql> { let token = CharacterToken::generate(); @@ -87,8 +86,7 @@ SET ); let result = query.execute(args.mysql_executor) - .await - .map_err(|err| anyhow!("Error inserting character: {:?}", err))?; + .await?; info!("Created pending character {} (record ID {})", token, result.last_insert_id()); diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/characters/create_character_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/characters/create_character_handler.rs index 0a2b69047d..fa8fd2d40e 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/characters/create_character_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/characters/create_character_handler.rs @@ -174,11 +174,7 @@ pub async fn create_character_handler( mysql_executor: &mut *transaction, phantom: PhantomData, }) - .await - .map_err(|err| { - error!("Error inserting character record: {:?}", err); - AdvancedCommonWebError::from_anyhow_error(err) - })?; + .await?; info!("Created pending character: {}", character_token); @@ -198,7 +194,7 @@ pub async fn create_character_handler( .await .map_err(|err| { error!("Error inserting inference job: {:?}", err); - AdvancedCommonWebError::from_anyhow_error(err.into()) + AdvancedCommonWebError::from_error(err) })?; info!("Created inference job: {}", apriori_job_token); diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/seedance_2p0_multi_function_video_gen_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/seedance_2p0_multi_function_video_gen_handler.rs index d6b75fc89b..f0c0a816a8 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/seedance_2p0_multi_function_video_gen_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/multi_function/seedance_2p0_multi_function_video_gen_handler.rs @@ -616,11 +616,7 @@ async fn resolve_kinovi_character_ids( }; let characters = batch_lookup_characters_by_token_for_prompting(tokens, connection) - .await - .map_err(|err| { - error!("Error looking up characters: {:?}", err); - AdvancedCommonWebError::from_anyhow_error(err) - })?; + .await?; if characters.len() != tokens.len() { warn!(