diff --git a/crates/_types/enums/src/by_table/generic_inference_jobs/inference_model_type.rs b/crates/_types/enums/src/by_table/generic_inference_jobs/inference_model_type.rs index 9ffca06250..6f12283a44 100644 --- a/crates/_types/enums/src/by_table/generic_inference_jobs/inference_model_type.rs +++ b/crates/_types/enums/src/by_table/generic_inference_jobs/inference_model_type.rs @@ -17,6 +17,10 @@ use strum::EnumIter; #[cfg_attr(test, derive(EnumIter, EnumCount))] #[derive(Clone, Copy, Eq, PartialEq, Hash, Ord, PartialOrd, Deserialize, Serialize)] pub enum InferenceModelType { + // TODO(bt,2024-07-15): This is too generic. We probably need "StorytellerStudio", "LivePortrait", etc. + #[serde(rename = "comfy_ui")] + ComfyUi, + #[serde(rename = "rvc_v2")] RvcV2, // NB: sad_talker does use user-supplied models, so there is no "model token" @@ -37,8 +41,6 @@ pub enum InferenceModelType { StableDiffusion, #[serde(rename = "mocap_net")] MocapNet, - #[serde(rename = "comfy_ui")] - ComfyUi, #[serde(rename = "styletts2")] StyleTTS2, /// A job that turns "FBX" game engine files into "GLTF" files (Bevy-compatible). diff --git a/crates/_types/enums/src/by_table/model_weights/weights_types.rs b/crates/_types/enums/src/by_table/model_weights/weights_types.rs index 7765189135..80d47ad0aa 100644 --- a/crates/_types/enums/src/by_table/model_weights/weights_types.rs +++ b/crates/_types/enums/src/by_table/model_weights/weights_types.rs @@ -27,6 +27,8 @@ pub enum WeightsType { VallE, #[serde(rename = "comfy_ui")] ComfyUi, + + /// NB: IN production these are filtered to `PublicWeightsType::Tacotron25`. #[serde(rename = "gpt_so_vits")] GptSoVits, } diff --git a/crates/_types/enums_public/src/by_table/model_weights/public_weights_types.rs b/crates/_types/enums_public/src/by_table/model_weights/public_weights_types.rs index 50353e467a..5277a7bbc5 100644 --- a/crates/_types/enums_public/src/by_table/model_weights/public_weights_types.rs +++ b/crates/_types/enums_public/src/by_table/model_weights/public_weights_types.rs @@ -6,12 +6,15 @@ use utoipa::ToSchema; use enums::by_table::model_weights::weights_types::WeightsType; +/// Report certain models publicly as different from what we actually use. +/// This is so we have an edge against the competition that might try to run +/// the same models. This won't always make sense, but in some cases it will. #[cfg_attr(test, derive(EnumIter, EnumCount))] #[derive(Clone, Copy, Eq, PartialEq, Hash, Ord, PartialOrd, Deserialize, Serialize, ToSchema, Debug)] pub enum PublicWeightsType { // Renamed enum variants - /// Instead of "gpt_so_vits", we report this as "tacotron2.5" + /// Instead of `WeightsType::GptSoVits` ("gpt_so_vits") #[serde(rename = "tacotron2.5")] Tacotron2_5,