server/artcraft
1
0
Fork 0
mirror of https://github.com/storytold/artcraft.git synced 2026-10-20 17:02:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix inference job status links

Browse Source
This commit is contained in:
Brandon Thomas
2023-10-20 05:37:51 -04:00
parent 471dcff697
commit 3239e318b1
2 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/lib/mysql_queries/src/queries/generic_inference/web/get_inference_job_status.rs
+15 -1
View File
@@ -10,6 +10,7 @@ use tokens::tokens::generic_inference_jobs::InferenceJobToken;
use crate::helpers::boolean_converters::i8_to_bool;
#[derive(Debug)]
pub struct GenericInferenceJobStatus {
pub job_token: InferenceJobToken,
@@ -34,6 +35,7 @@ pub struct GenericInferenceJobStatus {
/// Details about the user's original inference request
/// (We may want to present it in the "pending" UI.)
#[derive(Debug)]
pub struct RequestDetails {
pub inference_category: InferenceCategory,
pub maybe_model_type: Option<String>, // TODO: Strongly type
@@ -45,6 +47,7 @@ pub struct RequestDetails {
}
/// Details about the generated result
#[derive(Debug)]
pub struct ResultDetails {
pub entity_type: String,
pub entity_token: String,
@@ -94,6 +97,7 @@ SELECT
tts_results.public_bucket_wav_audio_path as maybe_tts_public_bucket_path,
voice_conversion_results.public_bucket_hash as maybe_voice_conversion_public_bucket_hash,
media_files.public_bucket_directory_hash as maybe_media_file_public_bucket_directory_hash,
media_files.maybe_public_bucket_prefix as maybe_media_file_public_bucket_prefix,
media_files.maybe_public_bucket_extension as maybe_media_file_public_bucket_extension,
@@ -144,12 +148,22 @@ WHERE jobs.token = ?
// NB: A bit of a hack. We store TTS results with a full path.
// Going forward, all other record types will store a hash.
let (bucket_path_is_hash, maybe_public_bucket_hash) = match record.inference_category {
let (mut bucket_path_is_hash, mut maybe_public_bucket_hash) = match record.inference_category {
InferenceCategory::LipsyncAnimation => (true, record.maybe_media_file_public_bucket_directory_hash.as_deref()),
InferenceCategory::TextToSpeech => (false, record.maybe_tts_public_bucket_path.as_deref()),
InferenceCategory::VoiceConversion => (true, record.maybe_voice_conversion_public_bucket_hash.as_deref()),
};
// NB: We've moved voice conversion out of their own table and into media_files
// This check should allow for graceful migration to the new end-state.
match record.maybe_result_entity_type.as_deref() {
Some("media_file") => {
bucket_path_is_hash = true;
maybe_public_bucket_hash = record.maybe_media_file_public_bucket_directory_hash.as_deref();
}
_ => {}
}
let maybe_result_details = record
.maybe_result_entity_type
.as_deref()
crates/service/web/storyteller_web/src/http_server/endpoints/inference_job/get_inference_job_status.rs
+17 -3
View File
@@ -233,9 +233,23 @@ pub async fn get_inference_job_status_handler(
result_details.public_bucket_location_or_hash
}
InferenceCategory::VoiceConversion => {
VoiceConversionResultOriginalFilePath::from_object_hash(&result_details.public_bucket_location_or_hash)
.get_full_object_path_str()
.to_string()
match result_details.entity_type.as_str() {
"media_file" => {
// NB: We're migrating voice conversion to media_files.
MediaFileBucketPath::from_object_hash(
&result_details.public_bucket_location_or_hash,
result_details.maybe_media_file_public_bucket_prefix.as_deref(),
result_details.maybe_media_file_public_bucket_extension.as_deref())
.get_full_object_path_str()
.to_string()
}
_ => {
// NB: This is the old voice conversion result pathing.
VoiceConversionResultOriginalFilePath::from_object_hash(&result_details.public_bucket_location_or_hash)
.get_full_object_path_str()
.to_string()
}
}
}
};