get rid of optional

.sqlx/query-094eb099cde85835db0662c2700c6b82644b51bf9b3609391ed4d2945fe5e98f.json

@@ -0,0 +1,69 @@
+{
+  "db_name": "MySQL",
+  "query": "\nSELECT\n    pci.media_token as `media_token: tokens::tokens::media_files::MediaFileToken`,\n    pci.context_semantic_type as `context_semantic_type: enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType`,\n\n    m.public_bucket_directory_hash,\n    m.maybe_public_bucket_prefix,\n    m.maybe_public_bucket_extension\n\nFROM prompt_context_items pci\nJOIN media_files m\nON\n    pci.media_token = m.token\nWHERE\n    pci.prompt_token = ?\nORDER BY pci.id ASC\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "media_token: tokens::tokens::media_files::MediaFileToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "context_semantic_type: enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 2,
+        "name": "public_bucket_directory_hash",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 3,
+        "name": "maybe_public_bucket_prefix",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 4,
+        "name": "maybe_public_bucket_extension",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 64
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      true,
+      true
+    ]
+  },
+  "hash": "094eb099cde85835db0662c2700c6b82644b51bf9b3609391ed4d2945fe5e98f"
+}

.sqlx/query-b46b0d022790f4e10f6e47126df0fdc55172bf8cda77d4e0b2afac9e6ebd1630.json

@@ -1,6 +1,6 @@
 {
   "db_name": "MySQL",
-  "query": "\nSELECT\n    p.token as `token: tokens::tokens::prompts::PromptToken`,\n\n    p.prompt_type as `prompt_type: enums::by_table::prompts::prompt_type::PromptType`,\n\n    p.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n\n    p.maybe_positive_prompt,\n    p.maybe_negative_prompt,\n    p.maybe_other_args,\n\n    p.creator_ip_address,\n    p.created_at\n\nFROM prompts as p\nWHERE\n    p.token = ?\n        ",
+  "query": "\nSELECT\n    p.token as `token: tokens::tokens::prompts::PromptToken`,\n\n    p.prompt_type as `prompt_type: enums::by_table::prompts::prompt_type::PromptType`,\n\n    p.maybe_model_type as `maybe_model_type: enums::common::model_type::ModelType`,\n    p.maybe_generation_provider as `maybe_generation_provider: enums::common::generation_provider::GenerationProvider`,\n\n    p.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n\n    p.maybe_positive_prompt,\n    p.maybe_negative_prompt,\n    p.maybe_other_args,\n\n    p.creator_ip_address,\n    p.created_at\n\nFROM prompts as p\nWHERE\n    p.token = ?\n        ",
   "describe": {
     "columns": [
       {
@@ -25,6 +25,26 @@
       },
       {
         "ordinal": 2,
+        "name": "maybe_model_type: enums::common::model_type::ModelType",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 3,
+        "name": "maybe_generation_provider: enums::common::generation_provider::GenerationProvider",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 4,
         "name": "maybe_creator_user_token: tokens::tokens::users::UserToken",
         "type_info": {
           "type": "VarString",
@@ -34,7 +54,7 @@
         }
       },
       {
-        "ordinal": 3,
+        "ordinal": 5,
         "name": "maybe_positive_prompt",
         "type_info": {
           "type": "Blob",
@@ -44,7 +64,7 @@
         }
       },
       {
-        "ordinal": 4,
+        "ordinal": 6,
         "name": "maybe_negative_prompt",
         "type_info": {
           "type": "Blob",
@@ -54,7 +74,7 @@
         }
       },
       {
-        "ordinal": 5,
+        "ordinal": 7,
         "name": "maybe_other_args",
         "type_info": {
           "type": "Blob",
@@ -64,7 +84,7 @@
         }
       },
       {
-        "ordinal": 6,
+        "ordinal": 8,
         "name": "creator_ip_address",
         "type_info": {
           "type": "VarString",
@@ -74,7 +94,7 @@
         }
       },
       {
-        "ordinal": 7,
+        "ordinal": 9,
         "name": "created_at",
         "type_info": {
           "type": "Timestamp",
@@ -94,9 +114,11 @@
       true,
       true,
       true,
+      true,
+      true,
       false,
       false
     ]
   },
-  "hash": "61744bbf83f7cf00348bcc21e868d9c506fec46da4a33ac50d63c6d9e00c0cec"
+  "hash": "b46b0d022790f4e10f6e47126df0fdc55172bf8cda77d4e0b2afac9e6ebd1630"
 }

_sql/migrations_squashed/prompts/prompt_context_items.sql

@@ -9,9 +9,6 @@ CREATE TABLE prompt_context_items (
   -- Not used for anything except replication.
   id BIGINT(20) NOT NULL AUTO_INCREMENT,
 
-  -- The semantic type of context.
-  context_semantic_type VARCHAR(16) NOT NULL,
-
   -- Foreign key, many-to-many
   -- There is no uniqueness constraint for (prompt_token, media_token) because a user
   -- might attach many duplicate images to the same prompt.
@@ -22,6 +19,9 @@ CREATE TABLE prompt_context_items (
   -- might attach many duplicate images to the same prompt.
   media_token VARCHAR(32) NOT NULL,
 
+  -- The semantic type of context.
+  context_semantic_type VARCHAR(16) NOT NULL,
+
   -- INDICES --
   PRIMARY KEY (id),
   KEY index_prompt_token (prompt_token),

_sql/migrations_squashed/prompts/prompts.sql

@@ -30,7 +30,7 @@ CREATE TABLE prompts (
   maybe_model_type VARCHAR(32) DEFAULT NULL,
 
   -- What service provided the generation.
-  maybe_generation_provider VARCHAR(16) NOT NULL, -- TODO
+  maybe_generation_provider VARCHAR(16) NOT NULL,
 
   -- Whoever created the prompt
   maybe_creator_user_token VARCHAR(32) DEFAULT NULL,

crates/schema/database/mysql_queries/src/queries/mod.rs

@@ -21,6 +21,7 @@ pub mod media_uploads;
 pub mod model_categories;
 pub mod model_weight_usage_counts;
 pub mod model_weights;
+pub mod prompt_context_items;
 pub mod prompts;
 pub mod public_event_feed;
 pub mod stats;

crates/schema/database/mysql_queries/src/queries/prompt_context_items/insert_batch_prompt_context_items.rs

@@ -0,0 +1,58 @@
+use anyhow::anyhow;
+use log::error;
+use sqlx::{MySql, QueryBuilder, Transaction};
+
+use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType;
+use errors::AnyhowResult;
+use tokens::tokens::media_files::MediaFileToken;
+use tokens::tokens::prompts::PromptToken;
+
+pub struct PromptContextItem {
+  pub media_token: MediaFileToken,
+  pub context_semantic_type: PromptContextSemanticType,
+}
+
+pub struct InsertBatchArgs<'a, 'b> {
+  pub prompt_token: PromptToken,
+  pub items: Vec<PromptContextItem>,
+  pub transaction: &'a mut Transaction<'b, MySql>,
+}
+
+/// Insert a list of entities into a "batch" together for grouping; returns the new batch token identifier to return
+/// to the HTTP caller.
+///
+/// NB: Calling code is responsible for rolling back the transaction if this fails.
+pub async fn insert_batch_prompt_context_items<'a, 'b>(args: InsertBatchArgs<'a, 'b>) -> AnyhowResult<()> {
+
+  let mut query_builder = QueryBuilder::new(r#"
+    INSERT INTO prompt_context_items (prompt_token, media_token, context_semantic_type) VALUES
+  "#);
+
+  for (i, item) in args.items.iter().enumerate() {
+    query_builder.push("(");
+    query_builder.push_bind(&args.prompt_token);
+    query_builder.push(",");
+
+    query_builder.push_bind(item.media_token.to_string());
+    query_builder.push(",");
+
+    query_builder.push_bind(item.context_semantic_type.to_string());
+    query_builder.push(")");
+
+    if i < args.items.len() - 1 {
+      query_builder.push(",");
+    }
+  }
+
+  let query = query_builder.build();
+
+  let query_result  = query.execute(&mut **args.transaction).await;
+
+  match query_result {
+    Ok(_) => Ok(()),
+    Err(err) => {
+      error!("Error with prompt context item insert query: {:?}", &err);
+      Err(anyhow!("prompt context item insert error: {:?}", &err))
+    },
+  }
+}

crates/schema/database/mysql_queries/src/queries/prompt_context_items/list_prompt_context_items.rs

@@ -0,0 +1,75 @@
+use anyhow::anyhow;
+use chrono::{DateTime, Utc};
+use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType;
+use errors::AnyhowResult;
+use log::{info, warn};
+use sqlx::pool::PoolConnection;
+use sqlx::MySql;
+use tokens::tokens::media_files::MediaFileToken;
+use tokens::tokens::prompts::PromptToken;
+
+pub struct PromptContextItem {
+  pub media_token: MediaFileToken,
+  pub context_semantic_type: PromptContextSemanticType,
+  pub public_bucket_directory_hash: String,
+  pub maybe_public_bucket_prefix: Option<String>,
+  pub maybe_public_bucket_extension: Option<String>,
+}
+
+struct RawPromptContextItem {
+  media_token: MediaFileToken,
+  context_semantic_type: PromptContextSemanticType,
+  public_bucket_directory_hash: String,
+  maybe_public_bucket_prefix: Option<String>,
+  maybe_public_bucket_extension: Option<String>,
+}
+
+pub async fn list_prompt_context_items(
+  prompt_token: &PromptToken,
+  mysql_connection: &mut PoolConnection<MySql>,
+) -> AnyhowResult<Vec<PromptContextItem>> {
+  let result = sqlx::query_as!(
+      RawPromptContextItem,
+        r#"
+SELECT
+    pci.media_token as `media_token: tokens::tokens::media_files::MediaFileToken`,
+    pci.context_semantic_type as `context_semantic_type: enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType`,
+
+    m.public_bucket_directory_hash,
+    m.maybe_public_bucket_prefix,
+    m.maybe_public_bucket_extension
+
+FROM prompt_context_items pci
+JOIN media_files m
+ON
+    pci.media_token = m.token
+WHERE
+    pci.prompt_token = ?
+ORDER BY pci.id ASC
+        "#,
+        prompt_token.as_str()
+      )
+      .fetch_all(&mut **mysql_connection)
+      .await;
+
+  match result {
+    Ok(items) => {
+      Ok(items.into_iter().map(|item| {
+        PromptContextItem {
+          media_token: item.media_token,
+          context_semantic_type: item.context_semantic_type,
+          public_bucket_directory_hash: item.public_bucket_directory_hash,
+          maybe_public_bucket_prefix: item.maybe_public_bucket_prefix,
+          maybe_public_bucket_extension: item.maybe_public_bucket_extension,
+        }
+      }).collect::<Vec<PromptContextItem>>())
+    }
+    Err(err) => match err {
+      sqlx::Error::RowNotFound => Ok(Vec::new()),
+      _ => {
+        warn!("Error querying prompt context items: {:?}", err);
+        Err(anyhow!("error querying prompt context items"))
+      }
+    }
+  }
+}

crates/schema/database/mysql_queries/src/queries/prompt_context_items/mod.rs

@@ -0,0 +1,2 @@
+pub mod insert_batch_prompt_context_items;
+pub mod list_prompt_context_items;

crates/schema/database/mysql_queries/src/queries/prompts/get_prompt.rs

@@ -5,10 +5,12 @@
 
 use anyhow::anyhow;
 use chrono::{DateTime, Utc};
-use sqlx::MySqlPool;
-
 use enums::by_table::prompts::prompt_type::PromptType;
+use enums::common::generation_provider::GenerationProvider;
+use enums::common::model_type::ModelType;
 use errors::AnyhowResult;
+use sqlx::pool::PoolConnection;
+use sqlx::{MySql, MySqlPool};
 use tokens::tokens::prompts::PromptToken;
 use tokens::tokens::users::UserToken;
 
@@ -20,6 +22,9 @@ pub struct Prompt {
 
   pub prompt_type: PromptType,
 
+  pub maybe_model_type: Option<ModelType>,
+  pub maybe_generation_provider: Option<GenerationProvider>,
+
   pub maybe_creator_user_token: Option<UserToken>,
 
   pub maybe_positive_prompt: Option<String>,
@@ -39,6 +44,9 @@ pub struct PromptRaw {
 
   pub prompt_type: PromptType,
 
+  pub maybe_model_type: Option<ModelType>,
+  pub maybe_generation_provider: Option<GenerationProvider>,
+
   pub maybe_creator_user_token: Option<UserToken>,
 
   pub maybe_positive_prompt: Option<String>,
@@ -52,12 +60,21 @@ pub struct PromptRaw {
   pub created_at: DateTime<Utc>,
 }
 
+
 pub async fn get_prompt(
   prompt_token: &PromptToken,
   mysql_pool: &MySqlPool
 ) -> AnyhowResult<Option<Prompt>> {
+  let mut connection = mysql_pool.acquire().await?;
+  get_prompt_from_connection(prompt_token, &mut connection).await
+}
 
-  let record = select_record(prompt_token, mysql_pool).await;
+pub async fn get_prompt_from_connection(
+  prompt_token: &PromptToken,
+  mysql_connection: &mut PoolConnection<MySql>
+) -> AnyhowResult<Option<Prompt>> {
+
+  let record = select_record(prompt_token, mysql_connection).await;
 
   let record = match record {
     Ok(record) => record,
@@ -72,6 +89,8 @@ pub async fn get_prompt(
   Ok(Some(Prompt {
     token: record.token,
     prompt_type: record.prompt_type,
+    maybe_model_type: record.maybe_model_type,
+    maybe_generation_provider: record.maybe_generation_provider,
     maybe_creator_user_token: record.maybe_creator_user_token,
     maybe_positive_prompt: record.maybe_positive_prompt,
     maybe_negative_prompt: record.maybe_negative_prompt,
@@ -86,7 +105,7 @@ pub async fn get_prompt(
 
 async fn select_record(
   prompt_token: &PromptToken,
-  mysql_pool: &MySqlPool
+  mysql_connection: &mut PoolConnection<MySql>
 ) -> Result<PromptRaw, sqlx::Error> {
   sqlx::query_as!(
       PromptRaw,
@@ -96,6 +115,9 @@ SELECT
 
     p.prompt_type as `prompt_type: enums::by_table::prompts::prompt_type::PromptType`,
 
+    p.maybe_model_type as `maybe_model_type: enums::common::model_type::ModelType`,
+    p.maybe_generation_provider as `maybe_generation_provider: enums::common::generation_provider::GenerationProvider`,
+
     p.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,
 
     p.maybe_positive_prompt,
@@ -111,6 +133,6 @@ WHERE
         "#,
       prompt_token
     )
-      .fetch_one(mysql_pool)
+      .fetch_one(&mut **mysql_connection)
       .await
 }

crates/service/web/storyteller_web/src/http_server/common_responses/common_web_error.rs

@@ -2,6 +2,7 @@ use actix_http::StatusCode;
 use actix_web::{HttpResponse, HttpResponseBuilder, ResponseError};
 use std::error::Error;
 use std::fmt::{Display, Formatter};
+use log::error;
 
 #[derive(Debug)]
 pub enum CommonWebError {
@@ -73,6 +74,13 @@ impl ResponseError for CommonWebError {
   }
 }
 
+impl From<sqlx::Error> for CommonWebError {
+  fn from(value: sqlx::Error) -> Self {
+    error!("SQLx error: {:?}", value);
+    CommonWebError::ServerError
+  }
+}
+
 #[cfg(test)]
 mod tests {
   use super::*;

crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/edit/gpt_image_1_edit_image_handler.rs

@@ -25,8 +25,10 @@ use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job
 use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token;
 use mysql_queries::queries::media_files::get::batch_get_media_files_by_tokens::{batch_get_media_files_by_tokens, batch_get_media_files_by_tokens_with_connection};
 use mysql_queries::queries::prompts::insert_prompt::{insert_prompt, InsertPromptArgs};
+use mysql_queries::queries::prompt_context_items::insert_batch_prompt_context_items::{InsertBatchArgs, PromptContextItem, insert_batch_prompt_context_items};
 use sqlx::Acquire;
 use utoipa::ToSchema;
+use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType;
 
 /// Gpt Image 1 Image Editing
 #[utoipa::path(
@@ -47,11 +49,7 @@ pub async fn gpt_image_1_edit_image_handler(
 ) -> Result<Json<GptImage1EditImageResponse>, CommonWebError> {
   let mut mysql_connection = server_state.mysql_pool
       .acquire()
-      .await
-      .map_err(|err| {
-        error!("MySql pool error: {:?}", err);
-        CommonWebError::ServerError
-      })?;
+      .await?;
   
   let maybe_user_session = server_state
       .session_checker
@@ -225,6 +223,24 @@ pub async fn gpt_image_1_edit_image_handler(
       None // Don't fail the job if the prompt insertion fails.
     }
   };
+  
+  if let Some(token) = prompt_token.as_ref() {
+    let result = insert_batch_prompt_context_items(InsertBatchArgs {
+      prompt_token: token.clone(),
+      items: media_files.iter().map(|media_file| {
+        PromptContextItem {
+          media_token: media_file.token.clone(),
+          context_semantic_type: PromptContextSemanticType::Imgref,
+        }
+      }).collect(),
+      transaction: &mut transaction,
+    }).await;
+    
+    if let Err(err) = result {
+      // NB: Fail open.
+      warn!("Error inserting batch prompt context items: {:?}", err);
+    }
+  }
 
   let db_result = insert_generic_inference_job_for_fal_queue(InsertGenericInferenceForFalArgs {
     uuid_idempotency_token: &request.uuid_idempotency_token,

crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/generate_flux_1_dev_text_to_image_handler.rs

@@ -6,6 +6,9 @@ use crate::state::server_state::ServerState;
 use actix_web::web::Json;
 use actix_web::{web, HttpRequest};
 use artcraft_api_defs::generate::image::generate_flux_1_dev_text_to_image::{GenerateFlux1DevTextToImageAspectRatio, GenerateFlux1DevTextToImageNumImages, GenerateFlux1DevTextToImageRequest, GenerateFlux1DevTextToImageResponse};
+use enums::by_table::prompts::prompt_type::PromptType;
+use enums::common::generation_provider::GenerationProvider;
+use enums::common::model_type::ModelType;
 use enums::common::visibility::Visibility;
 use fal_client::requests::webhook::image::enqueue_flux_1_dev_text_to_image_webhook::enqueue_flux_1_dev_text_to_image_webhook;
 use fal_client::requests::webhook::image::enqueue_flux_1_dev_text_to_image_webhook::{Flux1DevArgs, Flux1DevAspectRatio, Flux1DevNumImages};
@@ -15,6 +18,8 @@ use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job
 use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::FalCategory;
 use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::InsertGenericInferenceForFalArgs;
 use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token;
+use mysql_queries::queries::prompts::insert_prompt::{insert_prompt, InsertPromptArgs};
+use sqlx::Acquire;
 use utoipa::ToSchema;
 
 /// Flux 1 Dev text to image
@@ -34,9 +39,13 @@ pub async fn generate_flux_1_dev_text_to_image_handler(
   request: Json<GenerateFlux1DevTextToImageRequest>,
   server_state: web::Data<Arc<ServerState>>
 ) -> Result<Json<GenerateFlux1DevTextToImageResponse>, CommonWebError> {
+  let mut mysql_connection = server_state.mysql_pool
+      .acquire()
+      .await?;
+  
   let maybe_user_session = server_state
       .session_checker
-      .maybe_get_user_session(&http_request, &server_state.mysql_pool)
+      .maybe_get_user_session_from_connection(&http_request, &mut mysql_connection)
       .await
       .map_err(|e| {
         warn!("Session checker error: {:?}", e);
@@ -61,7 +70,7 @@ pub async fn generate_flux_1_dev_text_to_image_handler(
     return Err(CommonWebError::BadInputWithSimpleMessage(reason));
   }
 
-  insert_idempotency_token(&request.uuid_idempotency_token, &server_state.mysql_pool)
+  insert_idempotency_token(&request.uuid_idempotency_token, &mut *mysql_connection)
       .await
       .map_err(|err| {
         error!("Error inserting idempotency token: {:?}", err);
@@ -115,17 +124,50 @@ pub async fn generate_flux_1_dev_text_to_image_handler(
 
   let ip_address = get_request_ip(&http_request);
 
+  let mut transaction = mysql_connection
+      .begin()
+      .await
+      .map_err(|err| {
+        error!("Error starting MySQL transaction: {:?}", err);
+        CommonWebError::ServerError
+      })?;
+
+  // NB: Don't fail the job if the query fails.
+  let prompt_result = insert_prompt(InsertPromptArgs {
+    maybe_apriori_prompt_token: None,
+    prompt_type: PromptType::ArtcraftApp,
+    maybe_creator_user_token: maybe_user_session
+        .as_ref()
+        .map(|s| &s.user_token),
+    maybe_model_type: Some(ModelType::Flux1Dev),
+    maybe_generation_provider: Some(GenerationProvider::Artcraft),
+    maybe_positive_prompt: request.prompt.as_deref(),
+    maybe_negative_prompt: None,
+    maybe_other_args: None,
+    creator_ip_address: &ip_address,
+    mysql_executor: &mut *transaction,
+    phantom: Default::default(),
+  }).await;
+
+  let prompt_token = match prompt_result {
+    Ok(token) => Some(token),
+    Err(err) => {
+      warn!("Error inserting prompt: {:?}", err);
+      None // Don't fail the job if the prompt insertion fails.
+    }
+  };
+
   let db_result = insert_generic_inference_job_for_fal_queue(InsertGenericInferenceForFalArgs {
     uuid_idempotency_token: &request.uuid_idempotency_token,
     maybe_external_third_party_id: &external_job_id,
     fal_category: FalCategory::ImageGeneration,
     maybe_inference_args: None,
-    maybe_prompt_token: None,
+    maybe_prompt_token: prompt_token.as_ref(),
     maybe_creator_user_token: maybe_user_session.as_ref().map(|s| &s.user_token),
     maybe_avt_token: maybe_avt_token.as_ref(),
     creator_ip_address: &ip_address,
     creator_set_visibility: Visibility::Public,
-    mysql_executor: &server_state.mysql_pool,
+    mysql_executor: &mut *transaction,
     phantom: Default::default(),
   }).await;
 
@@ -136,6 +178,14 @@ pub async fn generate_flux_1_dev_text_to_image_handler(
       return Err(CommonWebError::ServerError);
     }
   };
+  
+  let _r = transaction
+      .commit()
+      .await
+      .map_err(|err| {
+        error!("Error committing MySQL transaction: {:?}", err);
+        CommonWebError::ServerError
+      })?;
 
   Ok(Json(GenerateFlux1DevTextToImageResponse {
     success: true,

crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/generate_flux_1_schnell_text_to_image_handler.rs

@@ -6,6 +6,9 @@ use crate::state::server_state::ServerState;
 use actix_web::web::Json;
 use actix_web::{web, HttpRequest};
 use artcraft_api_defs::generate::image::generate_flux_1_schnell_text_to_image::{GenerateFlux1SchnellTextToImageAspectRatio, GenerateFlux1SchnellTextToImageNumImages, GenerateFlux1SchnellTextToImageRequest, GenerateFlux1SchnellTextToImageResponse};
+use enums::by_table::prompts::prompt_type::PromptType;
+use enums::common::generation_provider::GenerationProvider;
+use enums::common::model_type::ModelType;
 use enums::common::visibility::Visibility;
 use fal_client::requests::webhook::image::enqueue_flux_1_schnell_text_to_image_webhook::enqueue_flux_1_schnell_text_to_image_webhook;
 use fal_client::requests::webhook::image::enqueue_flux_1_schnell_text_to_image_webhook::{Flux1SchnellArgs, Flux1SchnellAspectRatio, Flux1SchnellNumImages};
@@ -15,6 +18,8 @@ use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job
 use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::FalCategory;
 use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::InsertGenericInferenceForFalArgs;
 use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token;
+use mysql_queries::queries::prompts::insert_prompt::{insert_prompt, InsertPromptArgs};
+use sqlx::Acquire;
 use utoipa::ToSchema;
 
 /// Flux 1 Schnell text to image
@@ -34,9 +39,13 @@ pub async fn generate_flux_1_schnell_text_to_image_handler(
   request: Json<GenerateFlux1SchnellTextToImageRequest>,
   server_state: web::Data<Arc<ServerState>>
 ) -> Result<Json<GenerateFlux1SchnellTextToImageResponse>, CommonWebError> {
+  let mut mysql_connection = server_state.mysql_pool
+      .acquire()
+      .await?;
+  
   let maybe_user_session = server_state
       .session_checker
-      .maybe_get_user_session(&http_request, &server_state.mysql_pool)
+      .maybe_get_user_session_from_connection(&http_request, &mut mysql_connection)
       .await
       .map_err(|e| {
         warn!("Session checker error: {:?}", e);
@@ -61,7 +70,7 @@ pub async fn generate_flux_1_schnell_text_to_image_handler(
     return Err(CommonWebError::BadInputWithSimpleMessage(reason));
   }
 
-  insert_idempotency_token(&request.uuid_idempotency_token, &server_state.mysql_pool)
+  insert_idempotency_token(&request.uuid_idempotency_token, &mut *mysql_connection)
       .await
       .map_err(|err| {
         error!("Error inserting idempotency token: {:?}", err);
@@ -114,18 +123,51 @@ pub async fn generate_flux_1_schnell_text_to_image_handler(
   info!("Fal request_id: {}", external_job_id);
 
   let ip_address = get_request_ip(&http_request);
+  
+  let mut transaction = mysql_connection
+      .begin()
+      .await
+      .map_err(|err| {
+        error!("Error starting MySQL transaction: {:?}", err);
+        CommonWebError::ServerError
+      })?;
+
+  // NB: Don't fail the job if the query fails.
+  let prompt_result = insert_prompt(InsertPromptArgs {
+    maybe_apriori_prompt_token: None,
+    prompt_type: PromptType::ArtcraftApp,
+    maybe_creator_user_token: maybe_user_session
+        .as_ref()
+        .map(|s| &s.user_token),
+    maybe_model_type: Some(ModelType::Flux1Schnell),
+    maybe_generation_provider: Some(GenerationProvider::Artcraft),
+    maybe_positive_prompt: request.prompt.as_deref(),
+    maybe_negative_prompt: None,
+    maybe_other_args: None,
+    creator_ip_address: &ip_address,
+    mysql_executor: &mut *transaction,
+    phantom: Default::default(),
+  }).await;
+
+  let prompt_token = match prompt_result {
+    Ok(token) => Some(token),
+    Err(err) => {
+      warn!("Error inserting prompt: {:?}", err);
+      None // Don't fail the job if the prompt insertion fails.
+    }
+  };
 
   let db_result = insert_generic_inference_job_for_fal_queue(InsertGenericInferenceForFalArgs {
     uuid_idempotency_token: &request.uuid_idempotency_token,
     maybe_external_third_party_id: &external_job_id,
     fal_category: FalCategory::ImageGeneration,
-    maybe_prompt_token: None,
+    maybe_prompt_token: prompt_token.as_ref(),
     maybe_inference_args: None,
     maybe_creator_user_token: maybe_user_session.as_ref().map(|s| &s.user_token),
     maybe_avt_token: maybe_avt_token.as_ref(),
     creator_ip_address: &ip_address,
     creator_set_visibility: Visibility::Public,
-    mysql_executor: &server_state.mysql_pool,
+    mysql_executor: &mut *transaction,
     phantom: Default::default(),
   }).await;
 
@@ -136,6 +178,14 @@ pub async fn generate_flux_1_schnell_text_to_image_handler(
       return Err(CommonWebError::ServerError);
     }
   };
+  
+  let _r = transaction
+      .commit()
+      .await
+      .map_err(|err| {
+        error!("Error committing MySQL transaction: {:?}", err);
+        CommonWebError::ServerError
+      })?;
 
   Ok(Json(GenerateFlux1SchnellTextToImageResponse {
     success: true,

crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/generate_flux_pro_11_text_to_image_handler.rs

@@ -7,6 +7,9 @@ use actix_web::web::Json;
 use actix_web::{web, HttpRequest};
 use artcraft_api_defs::generate::image::generate_flux_pro_11_text_to_image::GenerateFluxPro11TextToImageResponse;
 use artcraft_api_defs::generate::image::generate_flux_pro_11_text_to_image::{GenerateFluxPro11TextToImageAspectRatio, GenerateFluxPro11TextToImageNumImages, GenerateFluxPro11TextToImageRequest};
+use enums::by_table::prompts::prompt_type::PromptType;
+use enums::common::generation_provider::GenerationProvider;
+use enums::common::model_type::ModelType;
 use enums::common::visibility::Visibility;
 use fal_client::requests::webhook::image::enqueue_flux_pro_11_text_to_image_webhook::FluxPro11Args;
 use fal_client::requests::webhook::image::enqueue_flux_pro_11_text_to_image_webhook::{enqueue_flux_pro_11_text_to_image_webhook, FluxPro11AspectRatio, FluxPro11NumImages};
@@ -16,9 +19,10 @@ use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job
 use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::FalCategory;
 use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::InsertGenericInferenceForFalArgs;
 use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token;
+use mysql_queries::queries::prompts::insert_prompt::{insert_prompt, InsertPromptArgs};
+use sqlx::Acquire;
 use utoipa::ToSchema;
 
-
 /// Flux Pro 1.1
 #[utoipa::path(
   post,
@@ -36,9 +40,13 @@ pub async fn generate_flux_pro_11_text_to_image_handler(
   request: Json<GenerateFluxPro11TextToImageRequest>,
   server_state: web::Data<Arc<ServerState>>
 ) -> Result<Json<GenerateFluxPro11TextToImageResponse>, CommonWebError> {
+  let mut mysql_connection = server_state.mysql_pool
+      .acquire()
+      .await?;
+
   let maybe_user_session = server_state
       .session_checker
-      .maybe_get_user_session(&http_request, &server_state.mysql_pool)
+      .maybe_get_user_session_from_connection(&http_request, &mut mysql_connection)
       .await
       .map_err(|e| {
         warn!("Session checker error: {:?}", e);
@@ -63,7 +71,7 @@ pub async fn generate_flux_pro_11_text_to_image_handler(
     return Err(CommonWebError::BadInputWithSimpleMessage(reason));
   }
 
-  insert_idempotency_token(&request.uuid_idempotency_token, &server_state.mysql_pool)
+  insert_idempotency_token(&request.uuid_idempotency_token, &mut *mysql_connection)
       .await
       .map_err(|err| {
         error!("Error inserting idempotency token: {:?}", err);
@@ -116,17 +124,50 @@ pub async fn generate_flux_pro_11_text_to_image_handler(
   
   let ip_address = get_request_ip(&http_request);
 
+  let mut transaction = mysql_connection
+      .begin()
+      .await
+      .map_err(|err| {
+        error!("Error starting MySQL transaction: {:?}", err);
+        CommonWebError::ServerError
+      })?;
+
+  // NB: Don't fail the job if the query fails.
+  let prompt_result = insert_prompt(InsertPromptArgs {
+    maybe_apriori_prompt_token: None,
+    prompt_type: PromptType::ArtcraftApp,
+    maybe_creator_user_token: maybe_user_session
+        .as_ref()
+        .map(|s| &s.user_token),
+    maybe_model_type: Some(ModelType::FluxPro11),
+    maybe_generation_provider: Some(GenerationProvider::Artcraft),
+    maybe_positive_prompt: request.prompt.as_deref(),
+    maybe_negative_prompt: None,
+    maybe_other_args: None,
+    creator_ip_address: &ip_address,
+    mysql_executor: &mut *transaction,
+    phantom: Default::default(),
+  }).await;
+
+  let prompt_token = match prompt_result {
+    Ok(token) => Some(token),
+    Err(err) => {
+      warn!("Error inserting prompt: {:?}", err);
+      None // Don't fail the job if the prompt insertion fails.
+    }
+  };
+
   let db_result = insert_generic_inference_job_for_fal_queue(InsertGenericInferenceForFalArgs {
     uuid_idempotency_token: &request.uuid_idempotency_token,
     maybe_external_third_party_id: &external_job_id,
     fal_category: FalCategory::ImageGeneration,
     maybe_inference_args: None,
-    maybe_prompt_token: None,
+    maybe_prompt_token: prompt_token.as_ref(),
     maybe_creator_user_token: maybe_user_session.as_ref().map(|s| &s.user_token),
     maybe_avt_token: maybe_avt_token.as_ref(),
     creator_ip_address: &ip_address,
     creator_set_visibility: Visibility::Public,
-    mysql_executor: &server_state.mysql_pool,
+    mysql_executor: &mut *transaction,
     phantom: Default::default(),
   }).await;
 
@@ -138,6 +179,14 @@ pub async fn generate_flux_pro_11_text_to_image_handler(
     }
   };
 
+  let _r = transaction
+      .commit()
+      .await
+      .map_err(|err| {
+        error!("Error committing MySQL transaction: {:?}", err);
+        CommonWebError::ServerError
+      })?;
+
   Ok(Json(GenerateFluxPro11TextToImageResponse {
     success: true,
     inference_job_token: job_token,

crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/generate_flux_pro_11_ultra_text_to_image_handler.rs

@@ -7,6 +7,9 @@ use actix_web::web::Json;
 use actix_web::{web, HttpRequest};
 use artcraft_api_defs::generate::image::generate_flux_pro_11_ultra_text_to_image::GenerateFluxPro11UltraTextToImageResponse;
 use artcraft_api_defs::generate::image::generate_flux_pro_11_ultra_text_to_image::{GenerateFluxPro11UltraTextToImageAspectRatio, GenerateFluxPro11UltraTextToImageNumImages, GenerateFluxPro11UltraTextToImageRequest};
+use enums::by_table::prompts::prompt_type::PromptType;
+use enums::common::generation_provider::GenerationProvider;
+use enums::common::model_type::ModelType;
 use enums::common::visibility::Visibility;
 use fal_client::requests::webhook::image::enqueue_flux_pro_11_ultra_text_to_image_webhook::FluxPro11UltraArgs;
 use fal_client::requests::webhook::image::enqueue_flux_pro_11_ultra_text_to_image_webhook::{enqueue_flux_pro_11_ultra_text_to_image_webhook, FluxPro11UltraAspectRatio, FluxPro11UltraNumImages};
@@ -16,9 +19,10 @@ use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job
 use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::FalCategory;
 use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::InsertGenericInferenceForFalArgs;
 use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token;
+use mysql_queries::queries::prompts::insert_prompt::{insert_prompt, InsertPromptArgs};
+use sqlx::Acquire;
 use utoipa::ToSchema;
 
-
 /// Flux Pro 1.1 Ultra
 #[utoipa::path(
   post,
@@ -36,9 +40,13 @@ pub async fn generate_flux_pro_11_ultra_text_to_image_handler(
   request: Json<GenerateFluxPro11UltraTextToImageRequest>,
   server_state: web::Data<Arc<ServerState>>
 ) -> Result<Json<GenerateFluxPro11UltraTextToImageResponse>, CommonWebError> {
+  let mut mysql_connection = server_state.mysql_pool
+      .acquire()
+      .await?;
+
   let maybe_user_session = server_state
       .session_checker
-      .maybe_get_user_session(&http_request, &server_state.mysql_pool)
+      .maybe_get_user_session_from_connection(&http_request, &mut mysql_connection)
       .await
       .map_err(|e| {
         warn!("Session checker error: {:?}", e);
@@ -63,7 +71,7 @@ pub async fn generate_flux_pro_11_ultra_text_to_image_handler(
     return Err(CommonWebError::BadInputWithSimpleMessage(reason));
   }
 
-  insert_idempotency_token(&request.uuid_idempotency_token, &server_state.mysql_pool)
+  insert_idempotency_token(&request.uuid_idempotency_token, &mut *mysql_connection)
       .await
       .map_err(|err| {
         error!("Error inserting idempotency token: {:?}", err);
@@ -116,17 +124,50 @@ pub async fn generate_flux_pro_11_ultra_text_to_image_handler(
   
   let ip_address = get_request_ip(&http_request);
 
+  let mut transaction = mysql_connection
+      .begin()
+      .await
+      .map_err(|err| {
+        error!("Error starting MySQL transaction: {:?}", err);
+        CommonWebError::ServerError
+      })?;
+
+  // NB: Don't fail the job if the query fails.
+  let prompt_result = insert_prompt(InsertPromptArgs {
+    maybe_apriori_prompt_token: None,
+    prompt_type: PromptType::ArtcraftApp,
+    maybe_creator_user_token: maybe_user_session
+        .as_ref()
+        .map(|s| &s.user_token),
+    maybe_model_type: Some(ModelType::FluxPro11Ultra),
+    maybe_generation_provider: Some(GenerationProvider::Artcraft),
+    maybe_positive_prompt: request.prompt.as_deref(),
+    maybe_negative_prompt: None,
+    maybe_other_args: None,
+    creator_ip_address: &ip_address,
+    mysql_executor: &mut *transaction,
+    phantom: Default::default(),
+  }).await;
+
+  let prompt_token = match prompt_result {
+    Ok(token) => Some(token),
+    Err(err) => {
+      warn!("Error inserting prompt: {:?}", err);
+      None // Don't fail the job if the prompt insertion fails.
+    }
+  };
+
   let db_result = insert_generic_inference_job_for_fal_queue(InsertGenericInferenceForFalArgs {
     uuid_idempotency_token: &request.uuid_idempotency_token,
     maybe_external_third_party_id: &external_job_id,
     fal_category: FalCategory::ImageGeneration,
     maybe_inference_args: None,
-    maybe_prompt_token: None,
+    maybe_prompt_token: prompt_token.as_ref(),
     maybe_creator_user_token: maybe_user_session.as_ref().map(|s| &s.user_token),
     maybe_avt_token: maybe_avt_token.as_ref(),
     creator_ip_address: &ip_address,
     creator_set_visibility: Visibility::Public,
-    mysql_executor: &server_state.mysql_pool,
+    mysql_executor: &mut *transaction,
     phantom: Default::default(),
   }).await;
 
@@ -138,6 +179,14 @@ pub async fn generate_flux_pro_11_ultra_text_to_image_handler(
     }
   };
 
+  let _r = transaction
+      .commit()
+      .await
+      .map_err(|err| {
+        error!("Error committing MySQL transaction: {:?}", err);
+        CommonWebError::ServerError
+      })?;
+
   Ok(Json(GenerateFluxPro11UltraTextToImageResponse {
     success: true,
     inference_job_token: job_token,

crates/service/web/storyteller_web/src/http_server/endpoints/generate/image/remove_image_background_handler.rs

@@ -10,6 +10,7 @@ use actix_web::{web, HttpRequest};
 use artcraft_api_defs::generate::image::remove_image_background::RemoveImageBackgroundRequest;
 use artcraft_api_defs::generate::image::remove_image_background::RemoveImageBackgroundResponse;
 use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath;
+use enums::common::model_type::ModelType;
 use enums::common::visibility::Visibility;
 use fal_client::requests::webhook::image::remove_background_rembg_webhook::{remove_background_rembg_webhook, RemoveBackgroundRembgWebhookArgs};
 use http_server_common::request::get_request_ip::get_request_ip;
@@ -18,7 +19,9 @@ use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job
 use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::FalCategory;
 use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::InsertGenericInferenceForFalArgs;
 use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token;
-use mysql_queries::queries::media_files::get::get_media_file::get_media_file;
+use mysql_queries::queries::media_files::get::get_media_file::get_media_file_with_connection;
+use mysql_queries::queries::prompts::insert_prompt::{insert_prompt, InsertPromptArgs};
+use sqlx::Acquire;
 use utoipa::ToSchema;
 
 /// Background removal
@@ -38,9 +41,13 @@ pub async fn remove_image_background_handler(
   request: Json<RemoveImageBackgroundRequest>,
   server_state: web::Data<Arc<ServerState>>
 ) -> Result<Json<RemoveImageBackgroundResponse>, CommonWebError> {
+  let mut mysql_connection = server_state.mysql_pool
+      .acquire()
+      .await?;
+  
   let maybe_user_session = server_state
       .session_checker
-      .maybe_get_user_session(&http_request, &server_state.mysql_pool)
+      .maybe_get_user_session_from_connection(&http_request, &mut mysql_connection)
       .await
       .map_err(|e| {
         warn!("Session checker error: {:?}", e);
@@ -73,7 +80,7 @@ pub async fn remove_image_background_handler(
     return Err(CommonWebError::BadInputWithSimpleMessage(reason));
   }
 
-  insert_idempotency_token(&request.uuid_idempotency_token, &server_state.mysql_pool)
+  insert_idempotency_token(&request.uuid_idempotency_token, &mut *mysql_connection)
       .await
       .map_err(|err| {
         error!("Error inserting idempotency token: {:?}", err);
@@ -81,10 +88,10 @@ pub async fn remove_image_background_handler(
       })?;
   const IS_MOD : bool = false;
   
-  let media_file_lookup_result = get_media_file(
+  let media_file_lookup_result = get_media_file_with_connection(
     media_file_token,
     IS_MOD,
-    &server_state.mysql_pool,
+    &mut mysql_connection,
   ).await;
 
   let media_file = match media_file_lookup_result {
@@ -150,7 +157,7 @@ pub async fn remove_image_background_handler(
     maybe_avt_token: maybe_avt_token.as_ref(),
     creator_ip_address: &ip_address,
     creator_set_visibility: Visibility::Public,
-    mysql_executor: &server_state.mysql_pool,
+    mysql_executor: &mut *mysql_connection,
     phantom: Default::default(),
   }).await;
 

crates/service/web/storyteller_web/src/http_server/endpoints/generate/object/generate_hunyuan_2_0_image_to_3d_handler.rs

@@ -19,7 +19,7 @@ use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job
 use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::FalCategory;
 use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::InsertGenericInferenceForFalArgs;
 use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token;
-use mysql_queries::queries::media_files::get::get_media_file::get_media_file;
+use mysql_queries::queries::media_files::get::get_media_file::{get_media_file, get_media_file_with_connection};
 use utoipa::ToSchema;
 
 /// Hunyuan 2.0 Image to 3D
@@ -39,9 +39,13 @@ pub async fn generate_hunyuan_2_0_image_to_3d_handler(
   request: Json<GenerateHunyuan20ImageTo3dRequest>,
   server_state: web::Data<Arc<ServerState>>
 ) -> Result<Json<GenerateHunyuan20ImageTo3dResponse>, CommonWebError> {
+  let mut mysql_connection = server_state.mysql_pool
+      .acquire()
+      .await?;
+
   let maybe_user_session = server_state
       .session_checker
-      .maybe_get_user_session(&http_request, &server_state.mysql_pool)
+      .maybe_get_user_session_from_connection(&http_request, &mut mysql_connection)
       .await
       .map_err(|e| {
         warn!("Session checker error: {:?}", e);
@@ -74,7 +78,7 @@ pub async fn generate_hunyuan_2_0_image_to_3d_handler(
     return Err(CommonWebError::BadInputWithSimpleMessage(reason));
   }
 
-  insert_idempotency_token(&request.uuid_idempotency_token, &server_state.mysql_pool)
+  insert_idempotency_token(&request.uuid_idempotency_token, &mut *mysql_connection)
       .await
       .map_err(|err| {
         error!("Error inserting idempotency token: {:?}", err);
@@ -82,10 +86,10 @@ pub async fn generate_hunyuan_2_0_image_to_3d_handler(
       })?;
   const IS_MOD : bool = false;
   
-  let media_file_lookup_result = get_media_file(
+  let media_file_lookup_result = get_media_file_with_connection(
     media_file_token,
     IS_MOD,
-    &server_state.mysql_pool,
+    &mut mysql_connection,
   ).await;
 
   let media_file = match media_file_lookup_result {
@@ -151,7 +155,7 @@ pub async fn generate_hunyuan_2_0_image_to_3d_handler(
     maybe_avt_token: maybe_avt_token.as_ref(),
     creator_ip_address: &ip_address,
     creator_set_visibility: Visibility::Public,
-    mysql_executor: &server_state.mysql_pool,
+    mysql_executor: &mut *mysql_connection,
     phantom: Default::default(),
   }).await;
 

crates/service/web/storyteller_web/src/http_server/endpoints/generate/object/generate_hunyuan_2_1_image_to_3d_handler.rs

@@ -19,7 +19,7 @@ use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job
 use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::FalCategory;
 use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::InsertGenericInferenceForFalArgs;
 use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token;
-use mysql_queries::queries::media_files::get::get_media_file::get_media_file;
+use mysql_queries::queries::media_files::get::get_media_file::{get_media_file, get_media_file_with_connection};
 use utoipa::ToSchema;
 
 /// Hunyuan 2.1 Image to 3D
@@ -39,9 +39,13 @@ pub async fn generate_hunyuan_2_1_image_to_3d_handler(
   request: Json<GenerateHunyuan21ImageTo3dRequest>,
   server_state: web::Data<Arc<ServerState>>
 ) -> Result<Json<GenerateHunyuan21ImageTo3dResponse>, CommonWebError> {
+  let mut mysql_connection = server_state.mysql_pool
+      .acquire()
+      .await?;
+  
   let maybe_user_session = server_state
       .session_checker
-      .maybe_get_user_session(&http_request, &server_state.mysql_pool)
+      .maybe_get_user_session_from_connection(&http_request, &mut mysql_connection)
       .await
       .map_err(|e| {
         warn!("Session checker error: {:?}", e);
@@ -74,7 +78,7 @@ pub async fn generate_hunyuan_2_1_image_to_3d_handler(
     return Err(CommonWebError::BadInputWithSimpleMessage(reason));
   }
 
-  insert_idempotency_token(&request.uuid_idempotency_token, &server_state.mysql_pool)
+  insert_idempotency_token(&request.uuid_idempotency_token, &mut *mysql_connection)
       .await
       .map_err(|err| {
         error!("Error inserting idempotency token: {:?}", err);
@@ -82,10 +86,10 @@ pub async fn generate_hunyuan_2_1_image_to_3d_handler(
       })?;
   const IS_MOD : bool = false;
   
-  let media_file_lookup_result = get_media_file(
+  let media_file_lookup_result = get_media_file_with_connection(
     media_file_token,
     IS_MOD,
-    &server_state.mysql_pool,
+    &mut mysql_connection,
   ).await;
 
   let media_file = match media_file_lookup_result {
@@ -151,7 +155,7 @@ pub async fn generate_hunyuan_2_1_image_to_3d_handler(
     maybe_avt_token: maybe_avt_token.as_ref(),
     creator_ip_address: &ip_address,
     creator_set_visibility: Visibility::Public,
-    mysql_executor: &server_state.mysql_pool,
+    mysql_executor: &mut *mysql_connection,
     phantom: Default::default(),
   }).await;
 

crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_kling_1_6_pro_video_handler.rs

@@ -10,6 +10,9 @@ use actix_web::{web, HttpRequest};
 use artcraft_api_defs::generate::video::generate_kling_1_6_pro_image_to_video::{GenerateKling16ProAspectRatio, GenerateKling16ProImageToVideoRequest};
 use artcraft_api_defs::generate::video::generate_kling_1_6_pro_image_to_video::{GenerateKling16ProDuration, GenerateKling16ProImageToVideoResponse};
 use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath;
+use enums::by_table::prompts::prompt_type::PromptType;
+use enums::common::generation_provider::GenerationProvider;
+use enums::common::model_type::ModelType;
 use enums::common::visibility::Visibility;
 use fal_client::requests::webhook::video::enqueue_kling_16_pro_image_to_video_webhook::enqueue_kling_16_pro_image_to_video_webhook;
 use fal_client::requests::webhook::video::enqueue_kling_16_pro_image_to_video_webhook::Kling16Duration;
@@ -21,30 +24,10 @@ use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job
 use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::FalCategory;
 use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::InsertGenericInferenceForFalArgs;
 use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token;
-use mysql_queries::queries::media_files::get::get_media_file::get_media_file;
+use mysql_queries::queries::media_files::get::get_media_file::get_media_file_with_connection;
+use mysql_queries::queries::prompts::insert_prompt::{insert_prompt, InsertPromptArgs};
+use sqlx::Acquire;
 use utoipa::ToSchema;
-/*
- TODO: Either on the Tauri client or as an API, make "generic" image / video / object endpoints. 
-  Take a reference image payload: 
-  
-    ReferenceImage {
-      media_token: MediaFileToken,
-      reference_type: ReferenceType
-    } 
-    
-    enum ReferenceType {
-      PrimaryReference,
-      CharacterReference,
-      LocationReference,
-      StyleReference,
-      ...
-      GenericReference,
-    }
-    
-    // **ORDER MATTERS**
-    reference_images: Vec<ReferenceImage>,
-
-*/
 
 /// Kling 1.6 Pro Image to Video
 #[utoipa::path(
@@ -63,9 +46,13 @@ pub async fn generate_kling_1_6_pro_video_handler(
   request: Json<GenerateKling16ProImageToVideoRequest>,
   server_state: web::Data<Arc<ServerState>>
 ) -> Result<Json<GenerateKling16ProImageToVideoResponse>, CommonWebError> {
+  let mut mysql_connection = server_state.mysql_pool
+      .acquire()
+      .await?;
+
   let maybe_user_session = server_state
       .session_checker
-      .maybe_get_user_session(&http_request, &server_state.mysql_pool)
+      .maybe_get_user_session_from_connection(&http_request, &mut mysql_connection)
       .await
       .map_err(|e| {
         warn!("Session checker error: {:?}", e);
@@ -98,7 +85,7 @@ pub async fn generate_kling_1_6_pro_video_handler(
     return Err(CommonWebError::BadInputWithSimpleMessage(reason));
   }
 
-  insert_idempotency_token(&request.uuid_idempotency_token, &server_state.mysql_pool)
+  insert_idempotency_token(&request.uuid_idempotency_token, &mut *mysql_connection)
       .await
       .map_err(|err| {
         error!("Error inserting idempotency token: {:?}", err);
@@ -106,10 +93,10 @@ pub async fn generate_kling_1_6_pro_video_handler(
       })?;
   const IS_MOD : bool = false;
   
-  let media_file_lookup_result = get_media_file(
+  let media_file_lookup_result = get_media_file_with_connection(
     media_file_token,
     IS_MOD,
-    &server_state.mysql_pool,
+    &mut mysql_connection,
   ).await;
 
   let media_file = match media_file_lookup_result {
@@ -186,17 +173,50 @@ pub async fn generate_kling_1_6_pro_video_handler(
   
   let ip_address = get_request_ip(&http_request);
 
+  let mut transaction = mysql_connection
+      .begin()
+      .await
+      .map_err(|err| {
+        error!("Error starting MySQL transaction: {:?}", err);
+        CommonWebError::ServerError
+      })?;
+
+  // NB: Don't fail the job if the query fails.
+  let prompt_result = insert_prompt(InsertPromptArgs {
+    maybe_apriori_prompt_token: None,
+    prompt_type: PromptType::ArtcraftApp,
+    maybe_creator_user_token: maybe_user_session
+        .as_ref()
+        .map(|s| &s.user_token),
+    maybe_model_type: Some(ModelType::Kling16Pro),
+    maybe_generation_provider: Some(GenerationProvider::Artcraft),
+    maybe_positive_prompt: Some(prompt),
+    maybe_negative_prompt: None,
+    maybe_other_args: None,
+    creator_ip_address: &ip_address,
+    mysql_executor: &mut *transaction,
+    phantom: Default::default(),
+  }).await;
+
+  let prompt_token = match prompt_result {
+    Ok(token) => Some(token),
+    Err(err) => {
+      warn!("Error inserting prompt: {:?}", err);
+      None // Don't fail the job if the prompt insertion fails.
+    }
+  };
+
   let db_result = insert_generic_inference_job_for_fal_queue(InsertGenericInferenceForFalArgs {
     uuid_idempotency_token: &request.uuid_idempotency_token,
     maybe_external_third_party_id: &external_job_id,
     fal_category: FalCategory::VideoGeneration,
     maybe_inference_args: None,
-    maybe_prompt_token: None,
+    maybe_prompt_token: prompt_token.as_ref(),
     maybe_creator_user_token: maybe_user_session.as_ref().map(|s| &s.user_token),
     maybe_avt_token: maybe_avt_token.as_ref(),
     creator_ip_address: &ip_address,
     creator_set_visibility: Visibility::Public,
-    mysql_executor: &server_state.mysql_pool,
+    mysql_executor: &mut *transaction,
     phantom: Default::default(),
   }).await;
 
@@ -208,6 +228,14 @@ pub async fn generate_kling_1_6_pro_video_handler(
     }
   };
 
+  let _r = transaction
+      .commit()
+      .await
+      .map_err(|err| {
+        error!("Error committing MySQL transaction: {:?}", err);
+        CommonWebError::ServerError
+      })?;
+
   Ok(Json(GenerateKling16ProImageToVideoResponse {
     success: true,
     inference_job_token: job_token,

crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_kling_2_1_master_video_handler.rs

@@ -10,6 +10,9 @@ use actix_web::{web, HttpRequest};
 use artcraft_api_defs::generate::video::generate_kling_2_1_master_image_to_video::{GenerateKling21MasterAspectRatio, GenerateKling21MasterImageToVideoRequest};
 use artcraft_api_defs::generate::video::generate_kling_2_1_master_image_to_video::{GenerateKling21MasterDuration, GenerateKling21MasterImageToVideoResponse};
 use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath;
+use enums::by_table::prompts::prompt_type::PromptType;
+use enums::common::generation_provider::GenerationProvider;
+use enums::common::model_type::ModelType;
 use enums::common::visibility::Visibility;
 use fal_client::requests::webhook::video::enqueue_kling_21_master_image_to_video_webhook::enqueue_kling_21_master_image_to_video_webhook;
 use fal_client::requests::webhook::video::enqueue_kling_21_master_image_to_video_webhook::Kling21MasterArgs;
@@ -21,32 +24,11 @@ use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job
 use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::FalCategory;
 use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::InsertGenericInferenceForFalArgs;
 use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token;
-use mysql_queries::queries::media_files::get::get_media_file::get_media_file;
+use mysql_queries::queries::media_files::get::get_media_file::{get_media_file, get_media_file_with_connection};
+use mysql_queries::queries::prompts::insert_prompt::{insert_prompt, InsertPromptArgs};
+use sqlx::Acquire;
 use utoipa::ToSchema;
 
-/*
- TODO: Either on the Tauri client or as an API, make "generic" image / video / object endpoints. 
-  Take a reference image payload: 
-  
-    ReferenceImage {
-      media_token: MediaFileToken,
-      reference_type: ReferenceType
-    } 
-    
-    enum ReferenceType {
-      PrimaryReference,
-      CharacterReference,
-      LocationReference,
-      StyleReference,
-      ...
-      GenericReference,
-    }
-    
-    // **ORDER MATTERS**
-    reference_images: Vec<ReferenceImage>,
-
-*/
-
 /// Kling 2.1 Master Image to Video
 #[utoipa::path(
   post,
@@ -64,9 +46,13 @@ pub async fn generate_kling_2_1_master_video_handler(
   request: Json<GenerateKling21MasterImageToVideoRequest>,
   server_state: web::Data<Arc<ServerState>>
 ) -> Result<Json<GenerateKling21MasterImageToVideoResponse>, CommonWebError> {
+  let mut mysql_connection = server_state.mysql_pool
+      .acquire()
+      .await?;
+
   let maybe_user_session = server_state
       .session_checker
-      .maybe_get_user_session(&http_request, &server_state.mysql_pool)
+      .maybe_get_user_session_from_connection(&http_request, &mut mysql_connection)
       .await
       .map_err(|e| {
         warn!("Session checker error: {:?}", e);
@@ -99,7 +85,7 @@ pub async fn generate_kling_2_1_master_video_handler(
     return Err(CommonWebError::BadInputWithSimpleMessage(reason));
   }
 
-  insert_idempotency_token(&request.uuid_idempotency_token, &server_state.mysql_pool)
+  insert_idempotency_token(&request.uuid_idempotency_token, &mut *mysql_connection)
       .await
       .map_err(|err| {
         error!("Error inserting idempotency token: {:?}", err);
@@ -107,10 +93,10 @@ pub async fn generate_kling_2_1_master_video_handler(
       })?;
   const IS_MOD : bool = false;
   
-  let media_file_lookup_result = get_media_file(
+  let media_file_lookup_result = get_media_file_with_connection(
     media_file_token,
     IS_MOD,
-    &server_state.mysql_pool,
+    &mut mysql_connection,
   ).await;
 
   let media_file = match media_file_lookup_result {
@@ -187,17 +173,50 @@ pub async fn generate_kling_2_1_master_video_handler(
   
   let ip_address = get_request_ip(&http_request);
 
+  let mut transaction = mysql_connection
+      .begin()
+      .await
+      .map_err(|err| {
+        error!("Error starting MySQL transaction: {:?}", err);
+        CommonWebError::ServerError
+      })?;
+
+  // NB: Don't fail the job if the query fails.
+  let prompt_result = insert_prompt(InsertPromptArgs {
+    maybe_apriori_prompt_token: None,
+    prompt_type: PromptType::ArtcraftApp,
+    maybe_creator_user_token: maybe_user_session
+        .as_ref()
+        .map(|s| &s.user_token),
+    maybe_model_type: Some(ModelType::Kling21Master),
+    maybe_generation_provider: Some(GenerationProvider::Artcraft),
+    maybe_positive_prompt: Some(prompt),
+    maybe_negative_prompt: None,
+    maybe_other_args: None,
+    creator_ip_address: &ip_address,
+    mysql_executor: &mut *transaction,
+    phantom: Default::default(),
+  }).await;
+
+  let prompt_token = match prompt_result {
+    Ok(token) => Some(token),
+    Err(err) => {
+      warn!("Error inserting prompt: {:?}", err);
+      None // Don't fail the job if the prompt insertion fails.
+    }
+  };
+
   let db_result = insert_generic_inference_job_for_fal_queue(InsertGenericInferenceForFalArgs {
     uuid_idempotency_token: &request.uuid_idempotency_token,
     maybe_external_third_party_id: &external_job_id,
     fal_category: FalCategory::VideoGeneration,
     maybe_inference_args: None,
-    maybe_prompt_token: None,
+    maybe_prompt_token: prompt_token.as_ref(),
     maybe_creator_user_token: maybe_user_session.as_ref().map(|s| &s.user_token),
     maybe_avt_token: maybe_avt_token.as_ref(),
     creator_ip_address: &ip_address,
     creator_set_visibility: Visibility::Public,
-    mysql_executor: &server_state.mysql_pool,
+    mysql_executor: &mut *transaction,
     phantom: Default::default(),
   }).await;
 

crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_kling_2_1_pro_video_handler.rs

@@ -10,6 +10,9 @@ use actix_web::{web, HttpRequest};
 use artcraft_api_defs::generate::video::generate_kling_2_1_pro_image_to_video::{GenerateKling21ProAspectRatio, GenerateKling21ProImageToVideoRequest};
 use artcraft_api_defs::generate::video::generate_kling_2_1_pro_image_to_video::{GenerateKling21ProDuration, GenerateKling21ProImageToVideoResponse};
 use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath;
+use enums::by_table::prompts::prompt_type::PromptType;
+use enums::common::generation_provider::GenerationProvider;
+use enums::common::model_type::ModelType;
 use enums::common::visibility::Visibility;
 use fal_client::requests::webhook::video::enqueue_kling_21_pro_image_to_video_webhook::enqueue_kling_21_pro_image_to_video_webhook;
 use fal_client::requests::webhook::video::enqueue_kling_21_pro_image_to_video_webhook::Kling21ProArgs;
@@ -21,32 +24,11 @@ use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job
 use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::FalCategory;
 use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::InsertGenericInferenceForFalArgs;
 use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token;
-use mysql_queries::queries::media_files::get::get_media_file::get_media_file;
+use mysql_queries::queries::media_files::get::get_media_file::{get_media_file, get_media_file_with_connection};
+use mysql_queries::queries::prompts::insert_prompt::{insert_prompt, InsertPromptArgs};
+use sqlx::Acquire;
 use utoipa::ToSchema;
 
-/*
- TODO: Either on the Tauri client or as an API, make "generic" image / video / object endpoints. 
-  Take a reference image payload: 
-  
-    ReferenceImage {
-      media_token: MediaFileToken,
-      reference_type: ReferenceType
-    } 
-    
-    enum ReferenceType {
-      PrimaryReference,
-      CharacterReference,
-      LocationReference,
-      StyleReference,
-      ...
-      GenericReference,
-    }
-    
-    // **ORDER MATTERS**
-    reference_images: Vec<ReferenceImage>,
-
-*/
-
 /// Kling 2.1 Pro Image to Video
 #[utoipa::path(
   post,
@@ -64,9 +46,13 @@ pub async fn generate_kling_2_1_pro_video_handler(
   request: Json<GenerateKling21ProImageToVideoRequest>,
   server_state: web::Data<Arc<ServerState>>
 ) -> Result<Json<GenerateKling21ProImageToVideoResponse>, CommonWebError> {
+  let mut mysql_connection = server_state.mysql_pool
+      .acquire()
+      .await?;
+  
   let maybe_user_session = server_state
       .session_checker
-      .maybe_get_user_session(&http_request, &server_state.mysql_pool)
+      .maybe_get_user_session_from_connection(&http_request, &mut mysql_connection)
       .await
       .map_err(|e| {
         warn!("Session checker error: {:?}", e);
@@ -99,7 +85,7 @@ pub async fn generate_kling_2_1_pro_video_handler(
     return Err(CommonWebError::BadInputWithSimpleMessage(reason));
   }
 
-  insert_idempotency_token(&request.uuid_idempotency_token, &server_state.mysql_pool)
+  insert_idempotency_token(&request.uuid_idempotency_token, &mut *mysql_connection)
       .await
       .map_err(|err| {
         error!("Error inserting idempotency token: {:?}", err);
@@ -107,10 +93,10 @@ pub async fn generate_kling_2_1_pro_video_handler(
       })?;
   const IS_MOD : bool = false;
   
-  let media_file_lookup_result = get_media_file(
+  let media_file_lookup_result = get_media_file_with_connection(
     media_file_token,
     IS_MOD,
-    &server_state.mysql_pool,
+    &mut mysql_connection,
   ).await;
 
   let media_file = match media_file_lookup_result {
@@ -187,17 +173,50 @@ pub async fn generate_kling_2_1_pro_video_handler(
   
   let ip_address = get_request_ip(&http_request);
 
+  let mut transaction = mysql_connection
+      .begin()
+      .await
+      .map_err(|err| {
+        error!("Error starting MySQL transaction: {:?}", err);
+        CommonWebError::ServerError
+      })?;
+
+  // NB: Don't fail the job if the query fails.
+  let prompt_result = insert_prompt(InsertPromptArgs {
+    maybe_apriori_prompt_token: None,
+    prompt_type: PromptType::ArtcraftApp,
+    maybe_creator_user_token: maybe_user_session
+        .as_ref()
+        .map(|s| &s.user_token),
+    maybe_model_type: Some(ModelType::Kling21Pro),
+    maybe_generation_provider: Some(GenerationProvider::Artcraft),
+    maybe_positive_prompt: Some(prompt),
+    maybe_negative_prompt: None,
+    maybe_other_args: None,
+    creator_ip_address: &ip_address,
+    mysql_executor: &mut *transaction,
+    phantom: Default::default(),
+  }).await;
+
+  let prompt_token = match prompt_result {
+    Ok(token) => Some(token),
+    Err(err) => {
+      warn!("Error inserting prompt: {:?}", err);
+      None // Don't fail the job if the prompt insertion fails.
+    }
+  };
+
   let db_result = insert_generic_inference_job_for_fal_queue(InsertGenericInferenceForFalArgs {
     uuid_idempotency_token: &request.uuid_idempotency_token,
     maybe_external_third_party_id: &external_job_id,
     fal_category: FalCategory::VideoGeneration,
     maybe_inference_args: None,
-    maybe_prompt_token: None,
+    maybe_prompt_token: prompt_token.as_ref(),
     maybe_creator_user_token: maybe_user_session.as_ref().map(|s| &s.user_token),
     maybe_avt_token: maybe_avt_token.as_ref(),
     creator_ip_address: &ip_address,
     creator_set_visibility: Visibility::Public,
-    mysql_executor: &server_state.mysql_pool,
+    mysql_executor: &mut *transaction,
     phantom: Default::default(),
   }).await;
 
@@ -209,6 +228,14 @@ pub async fn generate_kling_2_1_pro_video_handler(
     }
   };
 
+  let _r = transaction
+      .commit()
+      .await
+      .map_err(|err| {
+        error!("Error committing MySQL transaction: {:?}", err);
+        CommonWebError::ServerError
+      })?;
+
   Ok(Json(GenerateKling21ProImageToVideoResponse {
     success: true,
     inference_job_token: job_token,

crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_seedance_1_0_lite_image_to_video_handler.rs

@@ -12,6 +12,9 @@ use artcraft_api_defs::generate::video::generate_seedance_1_0_lite_image_to_vide
 use artcraft_api_defs::generate::video::generate_seedance_1_0_lite_image_to_video::GenerateSeedance10LiteImageToVideoResponse;
 use artcraft_api_defs::generate::video::generate_seedance_1_0_lite_image_to_video::GenerateSeedance10LiteResolution;
 use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath;
+use enums::by_table::prompts::prompt_type::PromptType;
+use enums::common::generation_provider::GenerationProvider;
+use enums::common::model_type::ModelType;
 use enums::common::visibility::Visibility;
 use fal_client::requests::webhook::video::enqueue_seedance_1_lite_image_to_video_webhook::enqueue_seedance_1_lite_image_to_video_webhook;
 use fal_client::requests::webhook::video::enqueue_seedance_1_lite_image_to_video_webhook::Seedance1LiteDuration;
@@ -22,7 +25,9 @@ use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job
 use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::FalCategory;
 use mysql_queries::queries::generic_inference::fal::insert_generic_inference_job_for_fal_queue::InsertGenericInferenceForFalArgs;
 use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_idempotency_token;
-use mysql_queries::queries::media_files::get::get_media_file::get_media_file;
+use mysql_queries::queries::media_files::get::get_media_file::{get_media_file, get_media_file_with_connection};
+use mysql_queries::queries::prompts::insert_prompt::{insert_prompt, InsertPromptArgs};
+use sqlx::Acquire;
 use utoipa::ToSchema;
 
 /// Seedance 1.0 Lite Image to Video
@@ -42,9 +47,13 @@ pub async fn generate_seedance_1_0_lite_image_to_video_handler(
   request: Json<GenerateSeedance10LiteImageToVideoRequest>,
   server_state: web::Data<Arc<ServerState>>
 ) -> Result<Json<GenerateSeedance10LiteImageToVideoResponse>, CommonWebError> {
+  let mut mysql_connection = server_state.mysql_pool
+      .acquire()
+      .await?;
+
   let maybe_user_session = server_state
       .session_checker
-      .maybe_get_user_session(&http_request, &server_state.mysql_pool)
+      .maybe_get_user_session_from_connection(&http_request, &mut mysql_connection)
       .await
       .map_err(|e| {
         warn!("Session checker error: {:?}", e);
@@ -77,7 +86,7 @@ pub async fn generate_seedance_1_0_lite_image_to_video_handler(
     return Err(CommonWebError::BadInputWithSimpleMessage(reason));
   }
 
-  insert_idempotency_token(&request.uuid_idempotency_token, &server_state.mysql_pool)
+  insert_idempotency_token(&request.uuid_idempotency_token, &mut *mysql_connection)
       .await
       .map_err(|err| {
         error!("Error inserting idempotency token: {:?}", err);
@@ -85,10 +94,10 @@ pub async fn generate_seedance_1_0_lite_image_to_video_handler(
       })?;
   const IS_MOD : bool = false;
   
-  let media_file_lookup_result = get_media_file(
+  let media_file_lookup_result = get_media_file_with_connection(
     media_file_token,
     IS_MOD,
-    &server_state.mysql_pool,
+    &mut mysql_connection,
   ).await;
 
   let media_file = match media_file_lookup_result {
@@ -166,17 +175,50 @@ pub async fn generate_seedance_1_0_lite_image_to_video_handler(
   
   let ip_address = get_request_ip(&http_request);
 
+  let mut transaction = mysql_connection
+      .begin()
+      .await
+      .map_err(|err| {
+        error!("Error starting MySQL transaction: {:?}", err);
+        CommonWebError::ServerError
+      })?;
+
+  // NB: Don't fail the job if the query fails.
+  let prompt_result = insert_prompt(InsertPromptArgs {
+    maybe_apriori_prompt_token: None,
+    prompt_type: PromptType::ArtcraftApp,
+    maybe_creator_user_token: maybe_user_session
+        .as_ref()
+        .map(|s| &s.user_token),
+    maybe_model_type: Some(ModelType::Seedance10Lite),
+    maybe_generation_provider: Some(GenerationProvider::Artcraft),
+    maybe_positive_prompt: Some(prompt),
+    maybe_negative_prompt: None,
+    maybe_other_args: None,
+    creator_ip_address: &ip_address,
+    mysql_executor: &mut *transaction,
+    phantom: Default::default(),
+  }).await;
+
+  let prompt_token = match prompt_result {
+    Ok(token) => Some(token),
+    Err(err) => {
+      warn!("Error inserting prompt: {:?}", err);
+      None // Don't fail the job if the prompt insertion fails.
+    }
+  };
+
   let db_result = insert_generic_inference_job_for_fal_queue(InsertGenericInferenceForFalArgs {
     uuid_idempotency_token: &request.uuid_idempotency_token,
     maybe_external_third_party_id: &external_job_id,
     fal_category: FalCategory::VideoGeneration,
     maybe_inference_args: None,
-    maybe_prompt_token: None,
+    maybe_prompt_token: prompt_token.as_ref(),
     maybe_creator_user_token: maybe_user_session.as_ref().map(|s| &s.user_token),
     maybe_avt_token: maybe_avt_token.as_ref(),
     creator_ip_address: &ip_address,
     creator_set_visibility: Visibility::Public,
-    mysql_executor: &server_state.mysql_pool,
+    mysql_executor: &mut *transaction,
     phantom: Default::default(),
   }).await;
 
@@ -187,6 +229,14 @@ pub async fn generate_seedance_1_0_lite_image_to_video_handler(
       return Err(CommonWebError::ServerError);
     }
   };
+  
+  let _r = transaction
+      .commit()
+      .await
+      .map_err(|err| {
+        error!("Error committing MySQL transaction: {:?}", err);
+        CommonWebError::ServerError
+      })?;
 
   Ok(Json(GenerateSeedance10LiteImageToVideoResponse {
     success: true,

crates/service/web/storyteller_web/src/http_server/endpoints/generate/video/generate_veo_2_image_to_video_handler.rs

@@ -53,11 +53,7 @@ pub async fn generate_veo_2_image_to_video_handler(
 ) -> Result<Json<GenerateVeo2ImageToVideoResponse>, CommonWebError> {
   let mut mysql_connection = server_state.mysql_pool
       .acquire()
-      .await
-      .map_err(|err| {
-        error!("MySql pool error: {:?}", err);
-        CommonWebError::ServerError
-      })?;
+      .await?;
 
   let maybe_user_session = server_state
       .session_checker

crates/service/web/storyteller_web/src/http_server/endpoints/prompts/get_prompt_handler.rs

@@ -1,22 +1,28 @@
 use std::fmt;
 use std::sync::Arc;
 
+use crate::http_server::common_responses::media::media_links_builder::MediaLinksBuilder;
+use crate::http_server::endpoints::media_files::helpers::get_media_domain::get_media_domain;
+use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
+use crate::state::server_state::ServerState;
 use actix_web::error::ResponseError;
 use actix_web::http::StatusCode;
 use actix_web::web::Path;
 use actix_web::{web, HttpMessage, HttpRequest, HttpResponse};
+use artcraft_api_defs::common::responses::media_links::MediaLinks;
+use bucket_paths::legacy::typified_paths::public::media_files::bucket_file_path::MediaFileBucketPath;
 use chrono::{DateTime, Utc};
-use log::warn;
-use utoipa::ToSchema;
-
+use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType;
 use enums::by_table::prompts::prompt_type::PromptType;
+use enums::common::generation_provider::GenerationProvider;
+use enums::common::model_type::ModelType;
 use enums::no_table::style_transfer::style_transfer_name::StyleTransferName;
-use mysql_queries::queries::prompts::get_prompt::get_prompt;
+use log::{error, warn};
+use mysql_queries::queries::prompt_context_items::list_prompt_context_items::list_prompt_context_items;
+use mysql_queries::queries::prompts::get_prompt::{get_prompt, get_prompt_from_connection};
 use tokens::tokens::media_files::MediaFileToken;
 use tokens::tokens::prompts::PromptToken;
-
-use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;
-use crate::state::server_state::ServerState;
+use utoipa::ToSchema;
 
 /// For the URL PathInfo
 #[derive(Deserialize, ToSchema)]
@@ -30,6 +36,13 @@ pub struct GetPromptSuccessResponse {
   pub prompt: PromptInfo,
 }
 
+#[derive(Serialize, ToSchema)]
+pub struct ImageContextItem {
+  pub media_token: MediaFileToken,
+  pub semantic: PromptContextSemanticType,
+  pub media_links: MediaLinks,
+}
+
 #[derive(Serialize, ToSchema)]
 pub struct PromptInfo {
   pub token: PromptToken,
@@ -37,6 +50,12 @@ pub struct PromptInfo {
   /// The type of prompt.
   /// Note: Prompts may or may not be compatible across systems.
   pub prompt_type: PromptType,
+
+  /// The type of model used
+  pub maybe_model_type: Option<ModelType>,
+
+  /// The service provider used
+  pub maybe_generation_provider: Option<GenerationProvider>,
   
   /// Positive prompt (technically optional, but usually present)
   pub maybe_positive_prompt: Option<String>,
@@ -44,6 +63,9 @@ pub struct PromptInfo {
   /// Negative prompt (optional)
   pub maybe_negative_prompt: Option<String>,
 
+  /// Context images (optional)
+  pub maybe_context_images: Option<Vec<ImageContextItem>>,
+
   /// Scheduled / travel prompt (optional)
   pub maybe_travel_prompt: Option<String>,
 
@@ -165,9 +187,17 @@ pub async fn get_prompt_handler(
   path: Path<GetPromptPathInfo>,
   server_state: web::Data<Arc<ServerState>>) -> Result<HttpResponse, GetPromptError>
 {
+  let mut mysql_connection = server_state.mysql_pool
+      .acquire()
+      .await
+      .map_err(|err| {
+        error!("Error acquiring MySQL connection: {:?}", err);
+        GetPromptError::ServerError
+      })?;
+
   let maybe_user_session = server_state
       .session_checker
-      .maybe_get_user_session(&http_request, &server_state.mysql_pool)
+      .maybe_get_user_session_from_connection(&http_request, &mut mysql_connection)
       .await
       .map_err(|e| {
         warn!("Session checker error: {:?}", e);
@@ -180,9 +210,9 @@ pub async fn get_prompt_handler(
 
   let prompt_token = path.into_inner().token;
 
-  let result = get_prompt(
+  let result = get_prompt_from_connection(
     &prompt_token,
-    &server_state.mysql_pool
+    &mut mysql_connection
   ).await;
 
   let result = match result {
@@ -247,13 +277,51 @@ pub async fn get_prompt_handler(
     });
   }
 
+  let media_domain = get_media_domain(&http_request);
+
+  let items_result = list_prompt_context_items(
+    &result.token,
+    &mut mysql_connection
+  ).await;
+
+  let items = items_result.unwrap_or_else(|e| {
+    warn!("Error listing prompt context items: {:?}", e);
+    Vec::new()
+  });
+
+  let items = items.iter().map(|item| {
+    let bucket_path = MediaFileBucketPath::from_object_hash(
+      &item.public_bucket_directory_hash,
+      item.maybe_public_bucket_prefix.as_deref(),
+      item.maybe_public_bucket_extension.as_deref());
+
+    ImageContextItem {
+      media_token: item.media_token.clone(),
+      semantic: item.context_semantic_type,
+      media_links: MediaLinksBuilder::from_media_path_and_env(
+        media_domain,
+        server_state.server_environment,
+        &bucket_path,
+      ),
+    }
+  }).collect::<Vec<ImageContextItem>>();
+
+  let maybe_context_images = if items.is_empty() {
+    None
+  } else {
+    Some(items)
+  };
+
   let response = GetPromptSuccessResponse {
     success: true,
     prompt: PromptInfo {
       token: result.token,
       maybe_strength,
+      maybe_model_type: result.maybe_model_type,
+      maybe_generation_provider: result.maybe_generation_provider,
       maybe_positive_prompt: result.maybe_positive_prompt,
       maybe_negative_prompt: result.maybe_negative_prompt,
+      maybe_context_images,
       maybe_travel_prompt,
       maybe_style_name,
       maybe_inference_duration_millis,