cleanup imports

This commit is contained in:
Brandon Thomas committed 2024-05-16 07:04:48 -07:00
1 parent 421c8e3e05
commit 97a3310b59
73 files changed
+198 -178

No files matched your search

@@ -1,4 +1,5 @@
use std::collections::BTreeSet;
use serde::Deserialize;
use serde::Serialize;
#[cfg(test)]
@@ -61,13 +62,13 @@ impl StatsEntityType {
#[cfg(test)]
mod tests {
use crate::by_table::entity_stats::stats_entity_type::StatsEntityType;
use crate::test_helpers::assert_serialization;
use crate::by_table::entity_stats::stats_entity_type::StatsEntityType;
use crate::test_helpers::assert_serialization;
mod explicit_checks {
use super::*;
mod explicit_checks {
use super::*;
#[test]
#[test]
fn test_serialization() {
assert_serialization(StatsEntityType::Comment, "comment");
assert_serialization(StatsEntityType::MediaFile, "media_file");
@@ -101,9 +102,9 @@ mod tests {
}
mod mechanical_checks {
use super::*;
use super::*;
#[test]
#[test]
fn variant_length() {
use strum::IntoEnumIterator;
assert_eq!(StatsEntityType::all_variants().len(), StatsEntityType::iter().len());
@@ -1,4 +1,5 @@
use std::collections::BTreeSet;
use serde::Deserialize;
use serde::Serialize;
#[cfg(test)]
@@ -61,13 +62,13 @@ impl FeaturedItemEntityType {
#[cfg(test)]
mod tests {
use crate::by_table::featured_items::featured_item_entity_type::FeaturedItemEntityType;
use crate::test_helpers::assert_serialization;
use crate::by_table::featured_items::featured_item_entity_type::FeaturedItemEntityType;
use crate::test_helpers::assert_serialization;
mod serde {
use super::*;
mod serde {
use super::*;
#[test]
#[test]
fn test_serialization() {
assert_serialization(FeaturedItemEntityType::MediaFile, "media_file");
assert_serialization(FeaturedItemEntityType::ModelWeight, "model_weight");
@@ -76,9 +77,9 @@ mod tests {
}
mod impl_methods {
use super::*;
use super::*;
#[test]
#[test]
fn test_to_str() {
assert_eq!(FeaturedItemEntityType::MediaFile.to_str(), "media_file");
assert_eq!(FeaturedItemEntityType::ModelWeight.to_str(), "model_weight");
@@ -95,9 +96,9 @@ mod tests {
}
mod mechanical_checks {
use super::*;
use super::*;
#[test]
#[test]
fn variant_length() {
use strum::IntoEnumIterator;
assert_eq!(FeaturedItemEntityType::all_variants().len(), FeaturedItemEntityType::iter().len());
@@ -132,7 +132,7 @@ mod tests {
mod explicit_checks {
use super::*;
#[test]
#[test]
fn test_serialization() {
assert_serialization(IdCategory::MediaFile, "media_file");
assert_serialization(IdCategory::LipsyncAnimationResult, "lipsync_animation");
@@ -113,7 +113,7 @@ mod tests {
mod explicit_checks {
use super::*;
#[test]
#[test]
fn test_serialization() {
assert_serialization(MediaFileOriginModelType::SadTalker, "sad_talker");
}
@@ -59,9 +59,9 @@ impl_mysql_from_row!(WeightsCategory);
#[cfg(test)]
mod tests {
use super::*;
use super::*;
#[test]
#[test]
fn test_to_str() {
assert_eq!(WeightsCategory::ImageGeneration.to_str(), "image_generation");
assert_eq!(WeightsCategory::TextToSpeech.to_str(), "text_to_speech");
@@ -4,6 +4,7 @@ use std::collections::BTreeSet;
use strum::EnumCount;
#[cfg(test)]
use strum::EnumIter;
// TODO we will need to scan the checkpoints for malicious code. We can't just trust the file extension.
#[cfg_attr(test, derive(EnumIter, EnumCount))]
#[derive(Clone, Copy, Eq, PartialEq, Hash, Ord, PartialOrd, Deserialize, Serialize)]
@@ -43,9 +44,9 @@ impl_mysql_enum_coders!(WeightsFileType);
#[cfg(test)]
mod tests {
use super::*;
use super::*;
#[test]
#[test]
fn test_to_str() {
assert_eq!(WeightsFileType::Checkpoint.to_str(), "checkpoint");
assert_eq!(WeightsFileType::SafeTensors.to_str(), "safetensors");
@@ -81,9 +81,9 @@ impl_mysql_from_row!(WeightsType);
#[cfg(test)]
mod tests {
use super::*;
use super::*;
#[test]
#[test]
fn test_to_str() {
assert_eq!(WeightsType::HifiganTacotron2.to_str(), "hifigan_tt2");
assert_eq!(WeightsType::RvcV2.to_str(), "rvc_v2");
@@ -86,13 +86,13 @@ impl UserBookmarkEntityType {
#[cfg(test)]
mod tests {
use crate::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType;
use crate::test_helpers::assert_serialization;
use crate::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType;
use crate::test_helpers::assert_serialization;
mod serde {
use super::*;
mod serde {
use super::*;
#[test]
#[test]
fn test_serialization() {
assert_serialization(UserBookmarkEntityType::User, "user");
assert_serialization(UserBookmarkEntityType::TtsModel, "tts_model");
@@ -107,9 +107,9 @@ mod tests {
}
mod impl_methods {
use super::*;
use super::*;
#[test]
#[test]
fn test_to_str() {
assert_eq!(UserBookmarkEntityType::User.to_str(), "user");
assert_eq!(UserBookmarkEntityType::TtsModel.to_str(), "tts_model");
@@ -63,8 +63,8 @@ impl UserFeatureFlag {
#[cfg(test)]
mod tests {
use crate::test_helpers::assert_serialization;
use crate::by_table::users::user_feature_flag::UserFeatureFlag;
use crate::test_helpers::assert_serialization;
mod explicit_checks {
use super::*;
@@ -48,8 +48,8 @@ impl ZsVoiceModelCategory {
#[cfg(test)]
mod tests {
use crate::test_helpers::assert_serialization;
use crate::by_table::zs_voices::model_category::ZsVoiceModelCategory;
use crate::test_helpers::assert_serialization;
mod serde {
use super::*;
@@ -53,8 +53,8 @@ impl ZsVoiceModelType {
#[cfg(test)]
mod tests {
use crate::test_helpers::assert_serialization;
use crate::by_table::zs_voices::model_type::ZsVoiceModelType;
use crate::test_helpers::assert_serialization;
mod serde {
use super::*;
@@ -1,10 +1,10 @@
use std::collections::BTreeSet;
use utoipa::ToSchema;
#[cfg(test)]
use strum::EnumCount;
#[cfg(test)]
use strum::EnumIter;
use utoipa::ToSchema;
/// This is used in newer jobs (that add additional enum states)
///
+12 -13
View File
@@ -2,9 +2,8 @@
use strum::EnumCount;
#[cfg(test)]
use strum::EnumIter;
use utoipa::ToSchema;
#[cfg_attr(test, derive(EnumIter, EnumCount))]
#[derive(Clone, Copy, Eq, PartialEq, Deserialize, Serialize, sqlx::Type,ToSchema)]
#[serde(rename_all = "snake_case")]
@@ -51,10 +50,10 @@ impl ViewAs {
#[cfg(test)]
mod tests {
use crate::common::view_as::ViewAs;
use crate::test_helpers::assert_serialization;
use crate::common::view_as::ViewAs;
use crate::test_helpers::assert_serialization;
#[test]
#[test]
fn test_default() {
assert_eq!(ViewAs::default(), ViewAs::AnotherUser);
@@ -83,9 +82,9 @@ mod tests {
}
mod traits {
use crate::common::view_as::ViewAs;
use crate::common::view_as::ViewAs;
#[test]
#[test]
fn display() {
let view_as = ViewAs::Moderator;
assert_eq!(format!("{}", view_as), "moderator".to_string());
@@ -105,11 +104,11 @@ mod tests {
}
mod serde_serialization {
use crate::common::view_as::ViewAs;
use crate::common::view_as::ViewAs;
use super::CompositeType;
use super::CompositeType;
#[test]
#[test]
fn serialize() {
let expected = "\"author\"".to_string(); // NB: Quoted
@@ -128,11 +127,11 @@ mod tests {
}
mod serde_deserialization {
use crate::common::view_as::ViewAs;
use crate::common::view_as::ViewAs;
use super::CompositeType;
use super::CompositeType;
#[test]
#[test]
fn deserialize() {
let payload = "\"another_user\""; // NB: Quoted
let value: ViewAs = serde_json::from_str(payload).unwrap();
+1 -1
View File
@@ -2,7 +2,6 @@
use strum::EnumCount;
#[cfg(test)]
use strum::EnumIter;
/// Visibility
///
/// Used in various database tables (as enums! careful!) and the HTTP API to convey
@@ -17,6 +16,7 @@ use strum::EnumIter;
/// *DO NOT CHANGE VALUES WITHOUT A MIGRATION STRATEGY!*
use utoipa::ToSchema;
#[cfg_attr(test, derive(EnumIter, EnumCount))]
#[derive(Clone, Copy, Eq, PartialEq, Deserialize, Serialize, sqlx::Type,ToSchema)]
#[serde(rename_all = "lowercase")]
@@ -2,9 +2,9 @@ use std::fmt::Debug;
use serde::Deserialize;
use serde::Serialize;
use utoipa::ToSchema;
use crate::prefixes::TokenPrefix;
use utoipa::ToSchema;
/// The primary key for "generic" inference jobs.
#[derive(Clone, PartialEq, Eq, sqlx::Type, Debug, Serialize, Deserialize, Default, ToSchema)]
@@ -2,10 +2,10 @@ use std::fmt::Debug;
use serde::Deserialize;
use serde::Serialize;
use utoipa::ToSchema;
use crate::prefixes::TokenPrefix;
use utoipa::ToSchema;
/// The primary key for the "model_weights" table.
#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, sqlx::Type, Debug, Serialize, Deserialize,ToSchema)]
#[sqlx(transparent)]
@@ -3,8 +3,8 @@ use std::fmt::Debug;
use serde::Deserialize;
use serde::Serialize;
use utoipa::ToSchema;
use crate::prefixes::TokenPrefix;
use crate::prefixes::TokenPrefix;
/// The primary key for Audit Logs.
#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, sqlx::Type, Debug, Serialize, Deserialize, ToSchema)]
+2 -1
View File
@@ -2,9 +2,10 @@ use std::fmt::Debug;
use serde::Deserialize;
use serde::Serialize;
use utoipa::ToSchema;
use crate::prefixes::TokenPrefix;
use utoipa::ToSchema;
/// The primary key for users.
#[derive(Clone, PartialEq, Eq, sqlx::Type, Debug, Serialize, Deserialize, Default,ToSchema)]
#[sqlx(transparent)]
@@ -1,19 +1,19 @@
use log::info;
use sqlx::{MySql, Pool};
use cloud_storage::remote_file_manager::media_descriptor::MediaVideoMp4Descriptor;
use cloud_storage::remote_file_manager::remote_cloud_file_manager::RemoteCloudFileClient;
use enums::by_table::media_files::media_file_type::MediaFileType;
use enums::common::visibility::Visibility;
use mysql_queries::queries::media_files::create::insert_media_file_from_cli_tool::{insert_media_file_from_cli_tool, InsertArgs};
use errors::{anyhow, AnyhowResult};
use mysql_queries::queries::media_files::create::insert_media_file_from_cli_tool::{insert_media_file_from_cli_tool, InsertArgs};
use mysql_queries::queries::users::user::get_user_token_by_username::get_user_token_by_username;
use storyteller_root::get_seed_tool_data_root;
use tokens::tokens::media_files::MediaFileToken;
use tokens::tokens::users::UserToken;
use crate::seeding::users::HANASHI_USERNAME;
pub async fn seed_test_videos(mysql_pool: &Pool<MySql>, user_token: UserToken) -> AnyhowResult<()> {
let model_weight_token1 = MediaFileToken::generate_for_testing_and_dev_seeding_never_use_in_production_seriously();
let seed_tool_data_root = get_seed_tool_data_root();
@@ -8,8 +8,8 @@ use cloud_storage::remote_file_manager::remote_cloud_bucket_details::RemoteCloud
use cloud_storage::remote_file_manager::remote_cloud_file_manager::RemoteCloudFileClient;
use cloud_storage::remote_file_manager::weights_descriptor::{WeightsLoRADescriptor, WeightsSD15Descriptor, WeightsWorkflowDescriptor};
use enums::by_table::model_weights::{
weights_category::WeightsCategory,
weights_types::WeightsType,
weights_category::WeightsCategory,
weights_types::WeightsType,
};
use enums::common::visibility::Visibility;
use errors::{anyhow, AnyhowResult};
@@ -7,8 +7,8 @@ use sqlx::{MySql, Pool};
use buckets::public::weight_files::bucket_file_path::WeightFileBucketPath;
use enums::{
by_table::model_weights::{weights_category::WeightsCategory, weights_types::WeightsType},
common::visibility::Visibility,
by_table::model_weights::{weights_category::WeightsCategory, weights_types::WeightsType},
common::visibility::Visibility,
};
use errors::{anyhow, AnyhowResult};
use filesys::file_read_bytes::file_read_bytes;
@@ -17,8 +17,8 @@ use filesys::path_to_string::path_to_string;
use hashing::sha256::sha256_hash_file::sha256_hash_file;
use mimetypes::mimetype_for_bytes::get_mimetype_for_bytes;
use mysql_queries::queries::model_weights::create::create_weight::{
create_weight,
CreateModelWeightsArgs,
create_weight,
CreateModelWeightsArgs,
};
use storyteller_root::get_seed_tool_data_root;
use tokens::tokens::model_weights::ModelWeightToken;
+1 -1
View File
@@ -1,7 +1,7 @@
use easyenv::init_all_with_default_logging;
use log::info;
use container_common::anyhow_result::AnyhowResult;
use easyenv::init_all_with_default_logging;
fn main() -> AnyhowResult<()> {
init_all_with_default_logging(None);
@@ -1,9 +1,10 @@
use std::thread;
use std::time::Duration;
use log::info;
use sqlx::{MySql, Pool};
use enums::common::view_as::ViewAs;
use enums::common::view_as::ViewAs;
use errors::{anyhow, AnyhowResult};
use mysql_queries::queries::media_files::delete_media_file::delete_media_file_as_mod;
use mysql_queries::queries::media_files::list::list_media_files_for_user::{list_media_files_for_user, ListMediaFileForUserArgs};
@@ -1,5 +1,6 @@
use std::thread;
use std::time::Duration;
use itertools::Itertools;
use log::info;
use sqlx::{FromRow, MySql, MySqlPool, Pool, QueryBuilder, Row};
@@ -1,4 +1,5 @@
use sqlx::{MySql, Pool};
use cloud_storage::bucket_client::BucketClient;
pub struct Deps {
@@ -1,4 +1,5 @@
use std::net::Ipv4Addr;
use actix_cors::Cors;
use log::warn;
use url::{Host, Url};
@@ -1,4 +1,5 @@
use actix_cors::Cors;
use crate::util::netlify_branch_domain_matches::netlify_branch_domain_matches;
pub fn add_gotta_go_fast_test_branches(cors: Cors, _is_production: bool) -> Cors {
@@ -1,6 +1,7 @@
use std::error::Error;
use std::path::Path;
use std::time::Duration;
use errors::AnyhowResult;
use anyhow::anyhow;
use anyhow::bail;
use log::info;
@@ -10,8 +11,9 @@ use s3::creds::Credentials;
use s3::region::Region;
use tokio::fs::File;
use tokio::io::AsyncReadExt;
use std::error::Error;
use errors::AnyhowResult;
#[derive(Clone)]
pub struct BucketClient {
bucket: Bucket,
@@ -1,7 +1,7 @@
use async_trait::async_trait;
use log::info;
use tokio::time::Duration;
use async_trait::async_trait;
use errors::AnyhowResult;
use crate::bucket_client::BucketClient;
@@ -1,7 +1,8 @@
use std::path::PathBuf;
use crockford::crockford_entropy_lower;
use buckets::util::hashed_directory_path_long_string;
use crockford::crockford_entropy_lower;
use crate::remote_file_manager::file_descriptor::FileDescriptor;
use crate::remote_file_manager::remote_cloud_bucket_details::RemoteCloudBucketDetails;
@@ -1,5 +1,6 @@
use crate::remote_file_manager::media_descriptor;
use crate::remote_file_manager::weights_descriptor::{self};
use super::file_descriptor::FileDescriptor;
#[derive(Debug, Clone)]
@@ -1,6 +1,6 @@
use anyhow::anyhow;
use buckets::public::media_files::bucket_file_path::MediaFileBucketPath;
use buckets::public::media_files::bucket_file_path::MediaFileBucketPath;
use errors::AnyhowResult;
use filesys::file_read_bytes::file_read_bytes;
use filesys::file_size::file_size;
@@ -112,15 +112,15 @@ impl RemoteCloudFileClient {
#[cfg(test)]
mod tests {
use async_trait::async_trait;
use env_logger;
use async_trait::async_trait;
use env_logger;
use errors::AnyhowResult;
use errors::AnyhowResult;
use crate::remote_file_manager::bucket_orchestration::BucketOrchestrationCore;
use crate::remote_file_manager::weights_descriptor::WeightsLoRADescriptor;
use crate::remote_file_manager::bucket_orchestration::BucketOrchestrationCore;
use crate::remote_file_manager::weights_descriptor::WeightsLoRADescriptor;
struct BucketOrchestrationMock {}
struct BucketOrchestrationMock {}
#[async_trait]
impl BucketOrchestrationCore for BucketOrchestrationMock {
-1
View File
@@ -1,6 +1,5 @@
use std::env;
/// Name of the environment variable Rust's env logger uses
pub const ENV_RUST_LOG : &str = "RUST_LOG";
+3 -3
View File
@@ -5,9 +5,9 @@
/// Public re-exports
pub mod letter_exports {
pub use lettre::Message;
pub use lettre::message::header::ContentType;
pub use lettre::message::Mailbox;
pub use lettre::Message;
pub use lettre::message::header::ContentType;
pub use lettre::message::Mailbox;
}
pub mod smtp_email_sender;
+3 -2
View File
@@ -20,8 +20,9 @@
#![allow(dead_code)]
#![allow(non_snake_case)]
// Re-export image to everyone importing this library
pub use image;
pub mod resize_image_file_preserving_aspect;
pub mod resize_preserving_aspect;
// Re-export image to everyone importing this library
pub use image;
@@ -2,8 +2,8 @@ use chrono::{DateTime, Utc};
use serde_derive::{Deserialize, Serialize};
use sqlx::MySql;
use sqlx::pool::PoolConnection;
use enums::by_table::tts_models::tts_model_type::TtsModelType;
use enums::by_table::tts_models::tts_model_type::TtsModelType;
use enums::common::visibility::Visibility;
use errors::AnyhowResult;
use mysql_queries::column_types::vocoder_type::VocoderType;
@@ -1,9 +1,9 @@
use chrono::{DateTime, Utc};
use sqlx::MySql;
use sqlx::pool::PoolConnection;
use enums::by_table::model_weights::weights_types::WeightsType;
use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType;
use enums::common::visibility::Visibility;
use errors::AnyhowResult;
use mysql_queries::queries::model_weights::list::list_model_weights_for_voice_conversion::{list_model_weights_for_voice_conversion, ModelWeightForVoiceConversion};
@@ -1,8 +1,9 @@
use std::collections::HashMap;
use tokens::tokens::media_files::MediaFileToken;
use tokens::tokens::model_weights::ModelWeightToken;
use enums::common::visibility::Visibility;
use enums::no_table::style_transfer::style_transfer_name::StyleTransferName;
use tokens::tokens::media_files::MediaFileToken;
use tokens::tokens::model_weights::ModelWeightToken;
#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
#[serde(untagged)]
@@ -1,6 +1,7 @@
//! Audit logs are for entities that can be *edited* where we might lose the IP / edit history.
use std::marker::PhantomData;
use anyhow::anyhow;
use sqlx::{Executor, MySql};
@@ -1,6 +1,5 @@
//! Audit logs are for entities that can be *edited* where we might lose the IP / edit history.
use std::marker::PhantomData;
use anyhow::anyhow;
use sqlx::{Executor, MySql, Transaction};
@@ -1,12 +1,10 @@
use anyhow::anyhow;
use chrono::{DateTime, Utc};
use sqlx::{Executor, MySql};
use enums::by_table::beta_keys::beta_key_product::BetaKeyProduct;
use enums::by_table::comments::comment_entity_type::CommentEntityType;
use enums::by_table::beta_keys::beta_key_product::BetaKeyProduct;
use errors::AnyhowResult;
use tokens::tokens::beta_keys::BetaKeyToken;
use tokens::tokens::comments::CommentToken;
use tokens::tokens::users::UserToken;
pub struct BetaKey {
@@ -2,8 +2,8 @@ use enums::by_table::comments::comment_entity_type::CommentEntityType;
use tokens::tokens::media_files::MediaFileToken;
use tokens::tokens::model_weights::ModelWeightToken;
use tokens::tokens::tts_models::TtsModelToken;
use tokens::tokens::w2l_templates::W2lTemplateToken;
use tokens::tokens::users::UserToken;
use tokens::tokens::w2l_templates::W2lTemplateToken;
pub enum CommentEntityToken {
User(UserToken),
@@ -1,5 +1,4 @@
use anyhow::anyhow;
use chrono::{DateTime, Utc};
use log::warn;
use sqlx::{MySql, MySqlPool};
@@ -345,6 +344,7 @@ struct RawGenericInferenceJobStatus {
#[cfg(test)]
mod tests {
use enums::by_table::generic_inference_jobs::inference_category::InferenceCategory;
use crate::queries::generic_inference::web::get_inference_job_status::{raw_record_to_public_result, RawGenericInferenceJobStatus};
#[test]
@@ -8,7 +8,6 @@ use enums::by_table::media_files::media_file_class::MediaFileClass;
use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory;
use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory;
use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory;
use enums::by_table::media_files::media_file_subtype::MediaFileSubtype;
use enums::by_table::media_files::media_file_type::MediaFileType;
use enums::common::visibility::Visibility;
use errors::AnyhowResult;
@@ -13,7 +13,8 @@ use tokens::tokens::users::UserToken;
use crate::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob;
use crate::queries::generic_synthetic_ids::transactional_increment_generic_synthetic_id::transactional_increment_generic_synthetic_id;
// thought about this it seems like this can be a bit more geneneric instead of having this we can ...
// thought about this it seems like this can be a bit more geneneric instead of having this we can ...
pub struct InsertArgs<'a> {
pub pool: &'a MySqlPool,
pub job: &'a AvailableInferenceJob,
@@ -7,8 +7,8 @@ use anyhow::anyhow;
use chrono::{DateTime, Utc};
use sqlx::{FromRow, MySql, MySqlPool, QueryBuilder, Row};
use sqlx::mysql::MySqlRow;
use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType;
use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType;
use enums::by_table::media_files::media_file_class::MediaFileClass;
use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory;
use enums::by_table::media_files::media_file_subtype::MediaFileSubtype;
@@ -1,10 +1,10 @@
use chrono::{DateTime, Utc};
use sqlx::{Acquire, FromRow, MySql, MySqlConnection, MySqlPool, QueryBuilder, Row};
use sqlx::mysql::MySqlRow;
use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType;
use enums::by_table::media_files::media_file_class::MediaFileClass;
use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory;
use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory;
use enums::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType;
use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory;
@@ -22,8 +22,8 @@ use tokens::tokens::media_files::MediaFileToken;
use tokens::tokens::model_weights::ModelWeightToken;
use tokens::tokens::prompts::PromptToken;
use tokens::tokens::users::UserToken;
use crate::helpers::boolean_converters::i64_to_bool;
use crate::helpers::boolean_converters::i64_to_bool;
use crate::payloads::prompt_args::prompt_inner_payload::PromptInnerPayload;
#[derive(Serialize, Debug)]
@@ -1,9 +1,10 @@
use std::collections::HashSet;
use chrono::{DateTime, Utc};
use sqlx::{FromRow, MySql, MySqlPool, QueryBuilder, Row};
use sqlx::mysql::MySqlRow;
use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType;
use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType;
use enums::by_table::media_files::media_file_class::MediaFileClass;
use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory;
use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory;
@@ -16,6 +17,7 @@ use enums::traits::mysql_from_row::MySqlFromRow;
use errors::AnyhowResult;
use tokens::tokens::media_files::MediaFileToken;
use tokens::tokens::users::UserToken;
use crate::payloads::prompt_args::prompt_inner_payload::PromptInnerPayload;
pub struct FeaturedMediaFileListPage {
@@ -1,9 +1,10 @@
use std::collections::HashSet;
use chrono::{DateTime, Utc};
use sqlx::{FromRow, MySql, MySqlPool, QueryBuilder, Row};
use sqlx::mysql::MySqlRow;
use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType;
use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType;
use enums::by_table::media_files::media_file_class::MediaFileClass;
use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory;
use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory;
@@ -16,6 +17,7 @@ use enums::traits::mysql_from_row::MySqlFromRow;
use errors::AnyhowResult;
use tokens::tokens::media_files::MediaFileToken;
use tokens::tokens::users::UserToken;
use crate::payloads::prompt_args::prompt_inner_payload::PromptInnerPayload;
pub struct MediaFileListPage {
@@ -1,10 +1,10 @@
use chrono::{DateTime, Utc};
use sqlx::{FromRow, MySql, MySqlPool, QueryBuilder, Row};
use sqlx::mysql::MySqlRow;
use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType;
use enums::by_table::media_files::media_file_class::MediaFileClass;
use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory;
use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory;
use enums::by_table::media_files::media_file_origin_model_type::MediaFileOriginModelType;
use enums::by_table::media_files::media_file_origin_product_category::MediaFileOriginProductCategory;
@@ -15,6 +15,7 @@ use enums::traits::mysql_from_row::MySqlFromRow;
use errors::AnyhowResult;
use tokens::tokens::batch_generations::BatchGenerationToken;
use tokens::tokens::media_files::MediaFileToken;
use crate::payloads::prompt_args::prompt_inner_payload::PromptInnerPayload;
pub struct MediaFileListPage {
@@ -3,8 +3,8 @@ use std::collections::HashSet;
use chrono::{DateTime, Utc};
use sqlx::{FromRow, MySql, MySqlPool, QueryBuilder, Row};
use sqlx::mysql::MySqlRow;
use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType;
use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType;
use enums::by_table::media_files::media_file_class::MediaFileClass;
use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory;
use enums::by_table::media_files::media_file_origin_category::MediaFileOriginCategory;
@@ -1,12 +1,13 @@
use container_common::anyhow_result::AnyhowResult;
use sqlx::MySqlPool;
use enums::by_table::model_weights::{
weights_types::WeightsType,
weights_category::WeightsCategory,
};
use log::warn;
use sqlx::MySqlPool;
use container_common::anyhow_result::AnyhowResult;
use enums::by_table::model_weights::{
weights_category::WeightsCategory,
weights_types::WeightsType,
};
use enums::common::visibility::Visibility;
use tokens::tokens::{ users::UserToken, model_weights::ModelWeightToken };
use tokens::tokens::{model_weights::ModelWeightToken, users::UserToken};
use tokens::tokens::media_files::MediaFileToken;
pub struct CreateModelWeightsArgs<'a> {
@@ -1,9 +1,8 @@
use sqlx::MySqlPool;
use errors::AnyhowResult;
use tokens::tokens::model_weights::ModelWeightToken;
pub async fn delete_weights_as_user(
weight_token: &ModelWeightToken,
mysql_pool: &MySqlPool
@@ -88,15 +88,14 @@ SET
#[cfg(test)]
mod tests {
// Template
use sqlx::mysql::MySqlPoolOptions;
use tokio;
// Template
use sqlx::mysql::MySqlPoolOptions;
use tokio;
use config::shared_constants::DEFAULT_MYSQL_CONNECTION_STRING;
use errors::AnyhowResult;
use config::shared_constants::DEFAULT_MYSQL_CONNECTION_STRING;
use errors::AnyhowResult;
#[ignore]
#[ignore]
#[tokio::test]
async fn test_update_weights() -> AnyhowResult<()> {
let db_connection_string = DEFAULT_MYSQL_CONNECTION_STRING;
@@ -9,6 +9,7 @@ use enums::by_table::model_weights::weights_category::WeightsCategory;
use enums::by_table::model_weights::weights_types::WeightsType;
use enums::common::visibility::Visibility;
use tokens::tokens::{model_weights::ModelWeightToken, users::UserToken};
use crate::column_types::vocoder_type::VocoderType;
#[derive(Serialize, Deserialize, Clone)]
@@ -7,8 +7,8 @@ use sqlx::MySqlPool;
use config::shared_constants::DEFAULT_MYSQL_QUERY_RESULT_PAGE_SIZE;
use enums::by_table::model_weights::{
weights_category::WeightsCategory,
weights_types::WeightsType,
weights_category::WeightsCategory,
weights_types::WeightsType,
};
use enums::common::visibility::Visibility;
use errors::AnyhowResult;
@@ -463,14 +463,14 @@ struct RawWeightJoinUser {
#[cfg(test)]
mod tests {
use enums::by_table::model_weights::{
weights_category::WeightsCategory,
weights_types::WeightsType,
};
use enums::by_table::model_weights::{
weights_category::WeightsCategory,
weights_types::WeightsType,
};
use crate::queries::model_weights::list::list_weights_query_builder::ListWeightsQueryBuilder;
use crate::queries::model_weights::list::list_weights_query_builder::ListWeightsQueryBuilder;
#[test]
#[test]
fn predicates_without_scoping() {
let query_builder = ListWeightsQueryBuilder::new();
@@ -1,38 +1,38 @@
#[ignore]
#[cfg(test)]
mod tests {
use anyhow::Ok;
use rand::Rng;
use serial_test::serial;
use sqlx::mysql::MySqlPoolOptions;
use sqlx::MySqlPool;
use tokio;
use anyhow::Ok;
use rand::Rng;
use serial_test::serial;
use sqlx::mysql::MySqlPoolOptions;
use sqlx::MySqlPool;
use tokio;
use config::shared_constants::DEFAULT_MYSQL_CONNECTION_STRING;
use container_common::anyhow_result::AnyhowResult;
// common tests
use enums::by_table::model_weights::{
weights_category::WeightsCategory,
weights_types::WeightsType,
};
use enums::common::view_as::ViewAs;
use enums::common::visibility::Visibility;
use tokens::tokens::{model_weights::ModelWeightToken, users::UserToken};
use config::shared_constants::DEFAULT_MYSQL_CONNECTION_STRING;
use container_common::anyhow_result::AnyhowResult;
// common tests
use enums::by_table::model_weights::{
weights_category::WeightsCategory,
weights_types::WeightsType,
};
use enums::common::view_as::ViewAs;
use enums::common::visibility::Visibility;
use tokens::tokens::{model_weights::ModelWeightToken, users::UserToken};
use crate::queries::model_weights::create::create_weight::create_weight;
use crate::queries::model_weights::create::create_weight::CreateModelWeightsArgs;
use crate::queries::model_weights::delete_weights::{
delete_weights_as_mod,
delete_weights_as_user,
undelete_weights_as_mod,
undelete_weights_as_user,
};
use crate::queries::model_weights::get::get_weight::get_weight_by_token;
use crate::queries::model_weights::list::list_weights_by_user::{list_weights_by_creator_username, ListWeightsForUserArgs};
use crate::queries::model_weights::list::list_weights_query_builder::ListWeightsQueryBuilder;
use crate::queries::users::user::get_user_token_by_username::get_user_token_by_username;
use crate::queries::model_weights::create::create_weight::create_weight;
use crate::queries::model_weights::create::create_weight::CreateModelWeightsArgs;
use crate::queries::model_weights::delete_weights::{
delete_weights_as_mod,
delete_weights_as_user,
undelete_weights_as_mod,
undelete_weights_as_user,
};
use crate::queries::model_weights::get::get_weight::get_weight_by_token;
use crate::queries::model_weights::list::list_weights_by_user::{list_weights_by_creator_username, ListWeightsForUserArgs};
use crate::queries::model_weights::list::list_weights_query_builder::ListWeightsQueryBuilder;
use crate::queries::users::user::get_user_token_by_username::get_user_token_by_username;
async fn setup() -> sqlx::Pool<sqlx::MySql> {
async fn setup() -> sqlx::Pool<sqlx::MySql> {
println!("Dropping database model_weights");
let db_connection_string = DEFAULT_MYSQL_CONNECTION_STRING;
@@ -1,10 +1,11 @@
use anyhow::anyhow;
use sqlx::MySqlPool;
use composite_identifiers::by_table::audit_logs::audit_log_entity::AuditLogEntity;
use enums::by_table::audit_logs::audit_log_entity_action::AuditLogEntityAction;
use errors::AnyhowResult;
use tokens::tokens::users::UserToken;
use crate::queries::audit_logs::insert_audit_log::{insert_audit_log, InsertAuditLogArgs};
pub struct SetUserFeatureFlagArgs<'a> {
@@ -1,11 +1,11 @@
use anyhow::anyhow;
use sqlx::{MySql, MySqlPool, Transaction};
use sqlx::{MySql, Transaction};
use composite_identifiers::by_table::audit_logs::audit_log_entity::AuditLogEntity;
use enums::by_table::audit_logs::audit_log_entity_action::AuditLogEntityAction;
use errors::AnyhowResult;
use tokens::tokens::users::UserToken;
use crate::queries::audit_logs::insert_audit_log::{insert_audit_log, InsertAuditLogArgs};
use crate::queries::audit_logs::insert_audit_log_transactional::{insert_audit_log_transactional, InsertAuditLogTransactionalArgs};
pub struct SetUserFeatureFlagTransactionalArgs<'a, 'b> {
@@ -1,4 +1,5 @@
use std::collections::HashSet;
use anyhow::anyhow;
use log::error;
use sqlx::{MySql, QueryBuilder};
@@ -1,6 +1,6 @@
use anyhow::anyhow;
use log::warn;
use sqlx::{MySql};
use sqlx::MySql;
use sqlx::pool::PoolConnection;
use errors::AnyhowResult;
@@ -10,9 +10,9 @@ use sqlx::MySqlPool;
use enums::common::visibility::Visibility;
use errors::AnyhowResult;
use tokens::tokens::voice_conversion_results::VoiceConversionResultToken;
use tokens::tokens::users::UserToken;
use tokens::tokens::voice_conversion_models::VoiceConversionModelToken;
use tokens::tokens::voice_conversion_results::VoiceConversionResultToken;
use crate::helpers::boolean_converters::{i8_to_bool, nullable_i8_to_bool};
@@ -10,8 +10,8 @@ use sqlx::MySqlPool;
use enums::common::visibility::Visibility;
use errors::AnyhowResult;
use tokens::tokens::voice_conversion_results::VoiceConversionResultToken;
use tokens::tokens::users::UserToken;
use tokens::tokens::voice_conversion_results::VoiceConversionResultToken;
use crate::helpers::boolean_converters::nullable_i8_to_bool;
@@ -1,11 +1,12 @@
use anyhow::anyhow;
use sqlx::MySqlPool;
use enums::common::visibility::Visibility;
use enums::by_table::generic_synthetic_ids::id_category::IdCategory;
use enums::by_table::generic_synthetic_ids::id_category::IdCategory;
use enums::common::visibility::Visibility;
use errors::AnyhowResult;
use tokens::tokens::zs_voice_datasets::ZsVoiceDatasetToken;
use tokens::tokens::users::UserToken;
use tokens::tokens::zs_voice_datasets::ZsVoiceDatasetToken;
use crate::queries::generic_synthetic_ids::transactional_increment_generic_synthetic_id::transactional_increment_generic_synthetic_id;
pub struct CreateDatasetArgs<'a> {
@@ -8,7 +8,6 @@ use enums::common::visibility::Visibility;
use errors::AnyhowResult;
use tokens::tokens::zs_voice_datasets::ZsVoiceDatasetToken;
pub struct ZsDataset {
pub token: ZsVoiceDatasetToken,
pub title: String,
@@ -1,11 +1,12 @@
use anyhow::anyhow;
use sqlx::MySqlPool;
use enums::common::visibility::Visibility;
use enums::by_table::generic_synthetic_ids::id_category::IdCategory;
use enums::by_table::generic_synthetic_ids::id_category::IdCategory;
use enums::common::visibility::Visibility;
use errors::AnyhowResult;
use tokens::tokens::zs_voice_datasets::ZsVoiceDatasetToken;
use tokens::tokens::users::UserToken;
use tokens::tokens::zs_voice_datasets::ZsVoiceDatasetToken;
use crate::queries::generic_synthetic_ids::transactional_increment_generic_synthetic_id::transactional_increment_generic_synthetic_id;
pub struct UpdateDatasetArgs<'a> {
@@ -11,7 +11,6 @@ use errors::AnyhowResult;
use tokens::tokens::users::UserToken;
use tokens::tokens::zs_voices::ZsVoiceToken;
#[derive(Serialize)]
pub struct ZsVoiceListPage {
pub voices: Vec<ZsVoice>,
@@ -302,9 +301,9 @@ struct RawInternalVoiceRecordForList {
#[cfg(test)]
mod tests {
use crate::queries::voice_designer::voices::list_voices_query_builder::ListVoicesQueryBuilder;
use crate::queries::voice_designer::voices::list_voices_query_builder::ListVoicesQueryBuilder;
#[test]
#[test]
fn predicates_without_scoping() {
let query_builder = ListVoicesQueryBuilder::new();
@@ -1,5 +1,5 @@
use speculoos::asserting;
use prompt_engineering::classify_prompt::classify_prompt;
#[test]
+4 -3
View File
@@ -29,12 +29,13 @@
#![allow(dead_code)]
#![allow(non_snake_case)]
mod paths;
mod substituted_path;
pub use paths::seed_tool_data_root::get_seed_tool_data_root;
pub use paths::storyteller_frontend_root::get_storyteller_frontend_root;
pub use paths::storyteller_ml_root::get_storyteller_ml_root;
pub use paths::storyteller_root::get_storyteller_root;
pub use paths::storyteller_rust_root::get_storyteller_rust_root;
pub use substituted_path::get_substituted_path;
mod paths;
mod substituted_path;
@@ -32,8 +32,8 @@ mod tests {
use serial_test::serial;
use crate::paths::storyteller_root::TEST_HOME;
use crate::paths::seed_tool_data_root::{get_seed_tool_data_root, TEST_SEED_TOOL_DATA_ROOT};
use crate::paths::storyteller_root::TEST_HOME;
#[test]
#[serial]
@@ -32,8 +32,8 @@ mod tests {
use serial_test::serial;
use crate::paths::storyteller_root::TEST_HOME;
use crate::paths::storyteller_frontend_root::{get_storyteller_frontend_root, TEST_STORYTELLER_FRONTEND_ROOT};
use crate::paths::storyteller_root::TEST_HOME;
#[test]
#[serial]
+1
View File
@@ -1,4 +1,5 @@
use std::path::{Path, PathBuf};
use errors::{anyhow, AnyhowResult};
/// Refer to test files using the path from repo root and return a canonical path.