From 15d66a4530f2124d2956e62ba94920c021e08c00 Mon Sep 17 00:00:00 2001
From: Brandon Thomas <echelon@gmail.com>
Date: Sun, 23 Apr 2023 20:48:09 -0700
Subject: [PATCH] propagate media input token to inference result

---
 .../job/list_available_generic_inference_jobs.rs | 16 ++++++++++++++++
 .../results/insert_voice_conversion_result.rs    |  4 ++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/crates/lib/mysql_queries/src/queries/generic_inference/job/list_available_generic_inference_jobs.rs b/crates/lib/mysql_queries/src/queries/generic_inference/job/list_available_generic_inference_jobs.rs
index cf0b0e1267..84d86754a6 100644
--- a/crates/lib/mysql_queries/src/queries/generic_inference/job/list_available_generic_inference_jobs.rs
+++ b/crates/lib/mysql_queries/src/queries/generic_inference/job/list_available_generic_inference_jobs.rs
@@ -24,9 +24,13 @@ pub struct AvailableInferenceJob {
 
   // Inference class
   pub inference_category: InferenceCategory,
+
   pub maybe_model_type: Option<String>, // TODO: Strongly type.
   pub maybe_model_token: Option<String>,
 
+  pub maybe_input_source_token: Option<String>,
+  pub maybe_input_source_token_type: Option<String>,
+
   // Inference details
   pub maybe_inference_args: Option<GenericInferenceArgs>,
   pub maybe_raw_inference_text: Option<String>,
@@ -102,6 +106,8 @@ pub async fn list_available_generic_inference_jobs(
               .map_err(|e| anyhow!("error: {:?}", e))?, // TODO/FIXME: This is a gross fix.
           maybe_model_type: record.maybe_model_type,
           maybe_model_token: record.maybe_model_token,
+          maybe_input_source_token: record.maybe_input_source_token,
+          maybe_input_source_token_type: record.maybe_input_source_token_type,
           maybe_inference_args: record.maybe_inference_args
               .as_deref()
               .map(|args| GenericInferenceArgs::from_json(args))
@@ -150,6 +156,9 @@ SELECT
   maybe_model_type,
   maybe_model_token,
 
+  maybe_input_source_token,
+  maybe_input_source_token_type,
+
   maybe_inference_args,
   maybe_raw_inference_text,
 
@@ -229,6 +238,9 @@ SELECT
   maybe_model_type,
   maybe_model_token,
 
+  maybe_input_source_token,
+  maybe_input_source_token_type,
+
   maybe_inference_args,
   maybe_raw_inference_text,
 
@@ -301,9 +313,13 @@ struct AvailableInferenceJobRawInternal {
   // Inference information
   //pub inference_category: InferenceCategory,
   pub inference_category: String,
+
   pub maybe_model_type: Option<String>,
   pub maybe_model_token: Option<String>,
 
+  pub maybe_input_source_token: Option<String>,
+  pub maybe_input_source_token_type: Option<String>,
+
   pub maybe_inference_args: Option<String>,
   pub maybe_raw_inference_text: Option<String>,
 
diff --git a/crates/lib/mysql_queries/src/queries/voice_conversion/results/insert_voice_conversion_result.rs b/crates/lib/mysql_queries/src/queries/voice_conversion/results/insert_voice_conversion_result.rs
index 33f4681cbd..cf413e28fa 100644
--- a/crates/lib/mysql_queries/src/queries/voice_conversion/results/insert_voice_conversion_result.rs
+++ b/crates/lib/mysql_queries/src/queries/voice_conversion/results/insert_voice_conversion_result.rs
@@ -125,8 +125,8 @@ SET
 
       args.job.maybe_model_token,
 
-      "", // TODO
-      VoiceConversionMediaTokenType::MediaUpload.to_str(),
+      args.job.maybe_input_source_token,
+      VoiceConversionMediaTokenType::MediaUpload.to_str(), //args.job.maybe_input_source_token_type,
 
       args.job.maybe_creator_user_token,
       maybe_creator_synthetic_id,