seed-vc: public model type enum extension

This commit is contained in:
Kasisnu committed 2024-10-23 17:48:25 +05:30
1 parent e8644d3b82
commit cd11d0aa4e
3 files changed
+16 -2

No files matched your search

@@ -42,6 +42,9 @@ pub enum MediaFileOriginModelType {
#[serde(rename = "mocap_net")]
MocapNet,
#[serde(rename = "seed_vc")]
SeedVc,
#[serde(rename = "styletts2")]
StyleTTS2,
@@ -84,6 +87,7 @@ impl MediaFileOriginModelType {
Self::LivePortrait => "live_portrait",
Self::RvcV2 => "rvc_v2",
Self::SadTalker => "sad_talker",
Self::SeedVc => "seed_vc",
Self::SoVitsSvc => "so_vits_svc",
Self::Tacotron2 => "tacotron2",
Self::MocapNet => "mocap_net",
@@ -105,6 +109,7 @@ impl MediaFileOriginModelType {
"live_portrait" => Ok(Self::LivePortrait),
"rvc_v2" => Ok(Self::RvcV2),
"sad_talker" => Ok(Self::SadTalker),
"seed_vc" => Ok(Self::SeedVc),
"so_vits_svc" => Ok(Self::SoVitsSvc),
"tacotron2" => Ok(Self::Tacotron2),
"mocap_net" => Ok(Self::MocapNet),
@@ -129,6 +134,7 @@ impl MediaFileOriginModelType {
Self::LivePortrait,
Self::RvcV2,
Self::SadTalker,
Self::SeedVc,
Self::SoVitsSvc,
Self::Tacotron2,
Self::MocapNet,
@@ -165,6 +171,7 @@ mod tests {
assert_eq!(MediaFileOriginModelType::LivePortrait.to_str(), "live_portrait");
assert_eq!(MediaFileOriginModelType::RvcV2.to_str(), "rvc_v2");
assert_eq!(MediaFileOriginModelType::SadTalker.to_str(), "sad_talker");
assert_eq!(MediaFileOriginModelType::SeedVc.to_str(), "seed_vc");
assert_eq!(MediaFileOriginModelType::SoVitsSvc.to_str(), "so_vits_svc");
assert_eq!(MediaFileOriginModelType::Tacotron2.to_str(), "tacotron2");
assert_eq!(MediaFileOriginModelType::MocapNet.to_str(), "mocap_net");
@@ -185,6 +192,7 @@ mod tests {
assert_eq!(MediaFileOriginModelType::from_str("live_portrait").unwrap(), MediaFileOriginModelType::LivePortrait);
assert_eq!(MediaFileOriginModelType::from_str("rvc_v2").unwrap(), MediaFileOriginModelType::RvcV2);
assert_eq!(MediaFileOriginModelType::from_str("sad_talker").unwrap(), MediaFileOriginModelType::SadTalker);
assert_eq!(MediaFileOriginModelType::from_str("seed_vc").unwrap(), MediaFileOriginModelType::SeedVc);
assert_eq!(MediaFileOriginModelType::from_str("so_vits_svc").unwrap(), MediaFileOriginModelType::SoVitsSvc);
assert_eq!(MediaFileOriginModelType::from_str("tacotron2").unwrap(), MediaFileOriginModelType::Tacotron2);
assert_eq!(MediaFileOriginModelType::from_str("mocap_net").unwrap(), MediaFileOriginModelType::MocapNet);
@@ -208,6 +216,7 @@ mod tests {
assert_eq!(variants.pop_first(), Some(MediaFileOriginModelType::LivePortrait));
assert_eq!(variants.pop_first(), Some(MediaFileOriginModelType::RvcV2));
assert_eq!(variants.pop_first(), Some(MediaFileOriginModelType::SadTalker));
assert_eq!(variants.pop_first(), Some(MediaFileOriginModelType::SeedVc));
assert_eq!(variants.pop_first(), Some(MediaFileOriginModelType::SoVitsSvc));
assert_eq!(variants.pop_first(), Some(MediaFileOriginModelType::Tacotron2));
assert_eq!(variants.pop_first(), Some(MediaFileOriginModelType::MocapNet));
@@ -58,6 +58,9 @@ pub enum PublicMediaFileModelType {
#[serde(rename = "f5_tts")]
F5TTS,
#[serde(rename = "seed_vc")]
SeedVc,
#[serde(rename = "studio")]
StorytellerStudio,
@@ -89,6 +92,7 @@ impl PublicMediaFileModelType {
// Conserved variants
MediaFileOriginModelType::RvcV2 => Self::RvcV2,
MediaFileOriginModelType::SoVitsSvc => Self::SoVitsSvc,
MediaFileOriginModelType::SeedVc => Self::SeedVc,
MediaFileOriginModelType::Tacotron2 => Self::Tacotron2,
MediaFileOriginModelType::MocapNet => Self::MocapNet,
MediaFileOriginModelType::StableDiffusion15 => Self::StableDiffusion15,
@@ -112,6 +116,7 @@ impl PublicMediaFileModelType {
// Conserved variants
Self::RvcV2 => MediaFileOriginModelType::RvcV2,
Self::SoVitsSvc => MediaFileOriginModelType::SoVitsSvc,
Self::SeedVc => MediaFileOriginModelType::SeedVc,
Self::Tacotron2 => MediaFileOriginModelType::Tacotron2,
Self::MocapNet => MediaFileOriginModelType::MocapNet,
Self::StableDiffusion15 => MediaFileOriginModelType::StableDiffusion15,
@@ -40,7 +40,7 @@ pub async fn insert_media_file_from_seed_vc(
{
let result_token = MediaFileToken::generate();
let origin_model_type = MediaFileOriginModelType::F5TTS;
let origin_model_type = MediaFileOriginModelType::SeedVc;
let mut maybe_creator_file_synthetic_id : Option<u64> = None;
let mut maybe_creator_category_synthetic_id : Option<u64> = None;
@@ -58,7 +58,7 @@ pub async fn insert_media_file_from_seed_vc(
let next_voice_conversion_id = transactional_increment_generic_synthetic_id(
&user_token,
IdCategory::TtsResult,
IdCategory::VoiceConversionResult,
&mut transaction
).await?;