diff --git a/_sql/migrations/2024-02-29-234250_alter_media_files_add_media_subtype/down.sql b/_sql/migrations/2024-02-29-234250_alter_media_files_add_media_subtype/down.sql new file mode 100644 index 0000000000..43187f2514 --- /dev/null +++ b/_sql/migrations/2024-02-29-234250_alter_media_files_add_media_subtype/down.sql @@ -0,0 +1,5 @@ +-- noinspection SqlDialectInspectionForFile +-- noinspection SqlNoDataSourceInspectionForFile +-- noinspection SqlResolveForFile + +ALTER TABLE media_files DROP COLUMN maybe_media_subtype; diff --git a/_sql/migrations/2024-02-29-234250_alter_media_files_add_media_subtype/up.sql b/_sql/migrations/2024-02-29-234250_alter_media_files_add_media_subtype/up.sql new file mode 100644 index 0000000000..99eb343ae1 --- /dev/null +++ b/_sql/migrations/2024-02-29-234250_alter_media_files_add_media_subtype/up.sql @@ -0,0 +1,7 @@ +-- noinspection SqlDialectInspectionForFile +-- noinspection SqlNoDataSourceInspectionForFile +-- noinspection SqlResolveForFile + +ALTER TABLE media_files + ADD COLUMN maybe_media_subtype VARCHAR(32) DEFAULT NULL + AFTER media_type; diff --git a/_sql/migrations_squashed/media_files.sql b/_sql/migrations_squashed/media_files.sql index 79fa38ee21..9083e974a8 100644 --- a/_sql/migrations_squashed/media_files.sql +++ b/_sql/migrations_squashed/media_files.sql @@ -81,6 +81,12 @@ CREATE TABLE media_files ( -- * 'video' for a variety of video types. media_type VARCHAR(16) NOT NULL, + -- A media file's possible subtype. Typically used for Storyteller Studio. + -- * 'mixamo' for mixamo animations (eg. for BVH, GLB, FBX, etc. files) + -- * 'mocap_net' for mocapnet animations (eg. for BVH files) + -- * 'scene' for generic scenes (eg. for BVH, GLB, FBX, etc. files) + maybe_media_subtype VARCHAR(32) DEFAULT NULL, + -- The file's mime type. maybe_mime_type VARCHAR(32) DEFAULT NULL, diff --git a/crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/process_job.rs b/crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/process_job.rs index d5dfd9eb2a..4f231fe6e4 100644 --- a/crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/process_job.rs +++ b/crates/service/job/inference_job/src/job/job_types/workflow/comfy_ui/process_job.rs @@ -523,7 +523,8 @@ pub async fn process_job(args: ComfyProcessJobArgs<'_>) -> Result