diff --git a/.sqlx/query-1e85e546684feffc151a26b0495b9ab8aa4ee5f1627464a9872e9c357ba1dc7a.json b/.sqlx/query-06734395f0a844e59d26c7d1cbc3e4b9a27f44c4bdacb8548d06a9e1dfb3db03.json similarity index 75% rename from .sqlx/query-1e85e546684feffc151a26b0495b9ab8aa4ee5f1627464a9872e9c357ba1dc7a.json rename to .sqlx/query-06734395f0a844e59d26c7d1cbc3e4b9a27f44c4bdacb8548d06a9e1dfb3db03.json index d22bde5dda..b9c9d34d77 100644 --- a/.sqlx/query-1e85e546684feffc151a26b0495b9ab8aa4ee5f1627464a9872e9c357ba1dc7a.json +++ b/.sqlx/query-06734395f0a844e59d26c7d1cbc3e4b9a27f44c4bdacb8548d06a9e1dfb3db03.json @@ -1,12 +1,12 @@ { "db_name": "MySQL", - "query": "\nINSERT INTO voice_conversion_models\nSET\n token = ?,\n model_type = ?,\n title = ?,\n description_markdown = '',\n description_rendered_html = '',\n creator_user_token = ?,\n ip_address_creation = ?,\n ip_address_last_update = ?,\n original_download_url = ?,\n has_index_file = ?,\n private_bucket_hash = ?,\n private_bucket_object_name = ?,\n file_size_bytes = ?\n ", + "query": "\nINSERT INTO voice_conversion_models\nSET\n token = ?,\n model_type = ?,\n title = ?,\n description_markdown = '',\n description_rendered_html = '',\n creator_user_token = ?,\n ip_address_creation = ?,\n ip_address_last_update = ?,\n original_download_url = ?,\n has_index_file = ?,\n private_bucket_hash = ?,\n private_bucket_object_name = ?,\n file_size_bytes = ?,\n maybe_migration_new_model_weights_token = ?\n ", "describe": { "columns": [], "parameters": { - "Right": 11 + "Right": 12 }, "nullable": [] }, - "hash": "1e85e546684feffc151a26b0495b9ab8aa4ee5f1627464a9872e9c357ba1dc7a" + "hash": "06734395f0a844e59d26c7d1cbc3e4b9a27f44c4bdacb8548d06a9e1dfb3db03" } diff --git a/.sqlx/query-0d4c43d9055cea3ce35c71ab8ef27058075414496dc5858d57a9f06d7c076bab.json b/.sqlx/query-0d4c43d9055cea3ce35c71ab8ef27058075414496dc5858d57a9f06d7c076bab.json new file mode 100644 index 0000000000..e6e8bbeced --- /dev/null +++ b/.sqlx/query-0d4c43d9055cea3ce35c71ab8ef27058075414496dc5858d57a9f06d7c076bab.json @@ -0,0 +1,135 @@ +{ + "db_name": "MySQL", + "query": "\nSELECT\n w.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n w.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`,\n\n w.title,\n vc.has_index_file,\n\n w.private_bucket_hash,\n w.maybe_private_bucket_prefix,\n w.maybe_private_bucket_extension,\n\n w.created_at,\n w.updated_at,\n w.user_deleted_at,\n w.mod_deleted_at\n\nFROM model_weights as w\nJOIN model_weights_extension_voice_conversion_details as vc\nON vc.model_weights_token = w.token\n\nWHERE w.token = ?\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "token: tokens::tokens::model_weights::ModelWeightToken", + "type_info": { + "type": "VarString", + "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE", + "char_set": 224, + "max_size": 128 + } + }, + { + "ordinal": 1, + "name": "weights_type: enums::by_table::model_weights::weights_types::WeightsType", + "type_info": { + "type": "VarString", + "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", + "char_set": 224, + "max_size": 128 + } + }, + { + "ordinal": 2, + "name": "title", + "type_info": { + "type": "VarString", + "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE", + "char_set": 224, + "max_size": 1020 + } + }, + { + "ordinal": 3, + "name": "has_index_file", + "type_info": { + "type": "Tiny", + "flags": "NOT_NULL", + "char_set": 63, + "max_size": 1 + } + }, + { + "ordinal": 4, + "name": "private_bucket_hash", + "type_info": { + "type": "VarString", + "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE", + "char_set": 224, + "max_size": 128 + } + }, + { + "ordinal": 5, + "name": "maybe_private_bucket_prefix", + "type_info": { + "type": "VarString", + "flags": "BINARY", + "char_set": 224, + "max_size": 64 + } + }, + { + "ordinal": 6, + "name": "maybe_private_bucket_extension", + "type_info": { + "type": "VarString", + "flags": "BINARY", + "char_set": 224, + "max_size": 64 + } + }, + { + "ordinal": 7, + "name": "created_at", + "type_info": { + "type": "Timestamp", + "flags": "NOT_NULL | BINARY | TIMESTAMP", + "char_set": 63, + "max_size": 19 + } + }, + { + "ordinal": 8, + "name": "updated_at", + "type_info": { + "type": "Timestamp", + "flags": "NOT_NULL | BINARY | TIMESTAMP | ON_UPDATE_NOW", + "char_set": 63, + "max_size": 19 + } + }, + { + "ordinal": 9, + "name": "user_deleted_at", + "type_info": { + "type": "Timestamp", + "flags": "BINARY", + "char_set": 63, + "max_size": 19 + } + }, + { + "ordinal": 10, + "name": "mod_deleted_at", + "type_info": { + "type": "Timestamp", + "flags": "BINARY", + "char_set": 63, + "max_size": 19 + } + } + ], + "parameters": { + "Right": 1 + }, + "nullable": [ + false, + false, + false, + false, + false, + true, + true, + false, + false, + true, + true + ] + }, + "hash": "0d4c43d9055cea3ce35c71ab8ef27058075414496dc5858d57a9f06d7c076bab" +} diff --git a/.sqlx/query-2a8ac5f5cf9d955f154ef9369eff4aff39656262147e97f3e8d8eb59497fcbd5.json b/.sqlx/query-2a8ac5f5cf9d955f154ef9369eff4aff39656262147e97f3e8d8eb59497fcbd5.json new file mode 100644 index 0000000000..0f64b66b1e --- /dev/null +++ b/.sqlx/query-2a8ac5f5cf9d955f154ef9369eff4aff39656262147e97f3e8d8eb59497fcbd5.json @@ -0,0 +1,12 @@ +{ + "db_name": "MySQL", + "query": "\nINSERT INTO model_weights\nSET\n token = ?,\n weights_type = ?,\n weights_category = ?,\n title = ?,\n\n maybe_thumbnail_token = NULL,\n maybe_avatar_media_file_token = NULL,\n maybe_cover_media_file_token = NULL,\n description_markdown = NULL,\n description_rendered_html = NULL,\n\n maybe_last_update_user_token = NULL,\n original_download_url = ?,\n original_filename = ?,\n file_size_bytes = ?,\n file_checksum_sha2 = \"TODO\",\n\n creator_user_token = ?,\n creator_ip_address = ?,\n creator_set_visibility = ?,\n\n private_bucket_hash = ?,\n maybe_private_bucket_prefix = ?,\n maybe_private_bucket_extension = ?,\n\n cached_user_ratings_total_count = 0,\n cached_user_ratings_positive_count = 0,\n cached_user_ratings_negative_count = 0,\n maybe_cached_user_ratings_ratio = 0.0,\n cached_user_ratings_last_updated_at = NOW(),\n\n maybe_migration_old_model_token = ?\n ", + "describe": { + "columns": [], + "parameters": { + "Right": 14 + }, + "nullable": [] + }, + "hash": "2a8ac5f5cf9d955f154ef9369eff4aff39656262147e97f3e8d8eb59497fcbd5" +} diff --git a/.sqlx/query-34aaedaebab0ea772714f31f42563b7e6b243c34a784e3f66f06aa102af3f1f9.json b/.sqlx/query-34aaedaebab0ea772714f31f42563b7e6b243c34a784e3f66f06aa102af3f1f9.json new file mode 100644 index 0000000000..1b2f1ab2cd --- /dev/null +++ b/.sqlx/query-34aaedaebab0ea772714f31f42563b7e6b243c34a784e3f66f06aa102af3f1f9.json @@ -0,0 +1,12 @@ +{ + "db_name": "MySQL", + "query": "\nINSERT INTO model_weights_extension_voice_conversion_details\nSET\n model_weights_token = ?,\n has_index_file = ?\n ", + "describe": { + "columns": [], + "parameters": { + "Right": 2 + }, + "nullable": [] + }, + "hash": "34aaedaebab0ea772714f31f42563b7e6b243c34a784e3f66f06aa102af3f1f9" +} diff --git a/.sqlx/query-3d586592422727dcc928574966bdf5081ac69fdbb856fffcbd68187fd99c4642.json b/.sqlx/query-3d586592422727dcc928574966bdf5081ac69fdbb856fffcbd68187fd99c4642.json index d26bd32bec..98ea6ac401 100644 --- a/.sqlx/query-3d586592422727dcc928574966bdf5081ac69fdbb856fffcbd68187fd99c4642.json +++ b/.sqlx/query-3d586592422727dcc928574966bdf5081ac69fdbb856fffcbd68187fd99c4642.json @@ -28,7 +28,7 @@ "name": "weights_type: enums::by_table::model_weights::weights_types::WeightsType", "type_info": { "type": "VarString", - "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE", + "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", "char_set": 224, "max_size": 128 } @@ -38,7 +38,7 @@ "name": "weights_category: enums::by_table::model_weights::weights_category::WeightsCategory", "type_info": { "type": "VarString", - "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE", + "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", "char_set": 224, "max_size": 128 } @@ -128,7 +128,7 @@ "name": "creator_set_visibility: enums::common::visibility::Visibility", "type_info": { "type": "String", - "flags": "NOT_NULL | BINARY | ENUM", + "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM", "char_set": 224, "max_size": 28 } diff --git a/.sqlx/query-57a63d507ccd60824e0cf346a6aa3d69b1e34361294f7e90733a497cb8643908.json b/.sqlx/query-57a63d507ccd60824e0cf346a6aa3d69b1e34361294f7e90733a497cb8643908.json new file mode 100644 index 0000000000..7ae98fcf69 --- /dev/null +++ b/.sqlx/query-57a63d507ccd60824e0cf346a6aa3d69b1e34361294f7e90733a497cb8643908.json @@ -0,0 +1,146 @@ +{ + "db_name": "MySQL", + "query": "\nSELECT\n w.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n w.weights_type as `weight_type: enums::by_table::model_weights::weights_types::WeightsType`,\n w.creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n users.username as creator_username,\n users.display_name as creator_display_name,\n users.email_gravatar_hash as creator_gravatar_hash,\n w.title,\n w_extension.ietf_language_tag,\n w_extension.ietf_primary_language_subtag,\n w.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n w.created_at,\n w.updated_at\nFROM model_weights as w\nLEFT OUTER JOIN model_weights_extension_voice_conversion_details as w_extension\n ON w_extension.model_weights_token = w.token\nJOIN users\n ON users.token = w.creator_user_token\nWHERE\n w.weights_type IN (\"rvc_v2\", \"so_vits_svc\")\n AND w.user_deleted_at IS NULL\n AND w.mod_deleted_at IS NULL\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "token: tokens::tokens::model_weights::ModelWeightToken", + "type_info": { + "type": "VarString", + "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE", + "char_set": 224, + "max_size": 128 + } + }, + { + "ordinal": 1, + "name": "weight_type: enums::by_table::model_weights::weights_types::WeightsType", + "type_info": { + "type": "VarString", + "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", + "char_set": 224, + "max_size": 128 + } + }, + { + "ordinal": 2, + "name": "creator_user_token: tokens::tokens::users::UserToken", + "type_info": { + "type": "VarString", + "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", + "char_set": 224, + "max_size": 128 + } + }, + { + "ordinal": 3, + "name": "creator_username", + "type_info": { + "type": "VarString", + "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE", + "char_set": 224, + "max_size": 80 + } + }, + { + "ordinal": 4, + "name": "creator_display_name", + "type_info": { + "type": "VarString", + "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE", + "char_set": 224, + "max_size": 80 + } + }, + { + "ordinal": 5, + "name": "creator_gravatar_hash", + "type_info": { + "type": "String", + "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE", + "char_set": 224, + "max_size": 128 + } + }, + { + "ordinal": 6, + "name": "title", + "type_info": { + "type": "VarString", + "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE", + "char_set": 224, + "max_size": 1020 + } + }, + { + "ordinal": 7, + "name": "ietf_language_tag", + "type_info": { + "type": "VarString", + "flags": "BINARY", + "char_set": 224, + "max_size": 256 + } + }, + { + "ordinal": 8, + "name": "ietf_primary_language_subtag", + "type_info": { + "type": "VarString", + "flags": "BINARY", + "char_set": 224, + "max_size": 48 + } + }, + { + "ordinal": 9, + "name": "creator_set_visibility: enums::common::visibility::Visibility", + "type_info": { + "type": "String", + "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM", + "char_set": 224, + "max_size": 28 + } + }, + { + "ordinal": 10, + "name": "created_at", + "type_info": { + "type": "Timestamp", + "flags": "NOT_NULL | BINARY | TIMESTAMP", + "char_set": 63, + "max_size": 19 + } + }, + { + "ordinal": 11, + "name": "updated_at", + "type_info": { + "type": "Timestamp", + "flags": "NOT_NULL | BINARY | TIMESTAMP | ON_UPDATE_NOW", + "char_set": 63, + "max_size": 19 + } + } + ], + "parameters": { + "Right": 0 + }, + "nullable": [ + false, + false, + false, + false, + false, + false, + false, + true, + true, + false, + false, + false + ] + }, + "hash": "57a63d507ccd60824e0cf346a6aa3d69b1e34361294f7e90733a497cb8643908" +} diff --git a/.sqlx/query-6a94791c8a8f66ee54bb367a4e8c71106bbcbbb205f54c14e3657279e83dabb6.json b/.sqlx/query-6a94791c8a8f66ee54bb367a4e8c71106bbcbbb205f54c14e3657279e83dabb6.json index 1fe281c3fb..a7108cdb5d 100644 --- a/.sqlx/query-6a94791c8a8f66ee54bb367a4e8c71106bbcbbb205f54c14e3657279e83dabb6.json +++ b/.sqlx/query-6a94791c8a8f66ee54bb367a4e8c71106bbcbbb205f54c14e3657279e83dabb6.json @@ -28,7 +28,7 @@ "name": "weights_type: enums::by_table::model_weights::weights_types::WeightsType", "type_info": { "type": "VarString", - "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE", + "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", "char_set": 224, "max_size": 128 } @@ -38,7 +38,7 @@ "name": "weights_category: enums::by_table::model_weights::weights_category::WeightsCategory", "type_info": { "type": "VarString", - "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE", + "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", "char_set": 224, "max_size": 128 } @@ -78,7 +78,7 @@ "name": "creator_user_token: tokens::tokens::users::UserToken", "type_info": { "type": "VarString", - "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE", + "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", "char_set": 224, "max_size": 128 } @@ -98,7 +98,7 @@ "name": "creator_set_visibility: enums::common::visibility::Visibility", "type_info": { "type": "String", - "flags": "NOT_NULL | BINARY | ENUM", + "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM", "char_set": 224, "max_size": 28 } diff --git a/.sqlx/query-98d53b1732bf0b0642ac6ebae3a3a2c40f21ec732693b92ad4bda69ae2b8d5bb.json b/.sqlx/query-98d53b1732bf0b0642ac6ebae3a3a2c40f21ec732693b92ad4bda69ae2b8d5bb.json new file mode 100644 index 0000000000..e9fa1c552e --- /dev/null +++ b/.sqlx/query-98d53b1732bf0b0642ac6ebae3a3a2c40f21ec732693b92ad4bda69ae2b8d5bb.json @@ -0,0 +1,36 @@ +{ + "db_name": "MySQL", + "query": "\nSELECT\n w.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n w.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`\nFROM model_weights as w\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "token: tokens::tokens::model_weights::ModelWeightToken", + "type_info": { + "type": "VarString", + "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE", + "char_set": 224, + "max_size": 128 + } + }, + { + "ordinal": 1, + "name": "weights_type: enums::by_table::model_weights::weights_types::WeightsType", + "type_info": { + "type": "VarString", + "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", + "char_set": 224, + "max_size": 128 + } + } + ], + "parameters": { + "Right": 0 + }, + "nullable": [ + false, + false + ] + }, + "hash": "98d53b1732bf0b0642ac6ebae3a3a2c40f21ec732693b92ad4bda69ae2b8d5bb" +} diff --git a/.sqlx/query-a6ed8524fb5339fed17bec6611f8f56b6bdee35bac63c9eacbe21eb032a6a831.json b/.sqlx/query-a6ed8524fb5339fed17bec6611f8f56b6bdee35bac63c9eacbe21eb032a6a831.json index bf4a5d12ac..caa0eecbac 100644 --- a/.sqlx/query-a6ed8524fb5339fed17bec6611f8f56b6bdee35bac63c9eacbe21eb032a6a831.json +++ b/.sqlx/query-a6ed8524fb5339fed17bec6611f8f56b6bdee35bac63c9eacbe21eb032a6a831.json @@ -28,7 +28,7 @@ "name": "weights_type: enums::by_table::model_weights::weights_types::WeightsType", "type_info": { "type": "VarString", - "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE", + "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", "char_set": 224, "max_size": 128 } @@ -38,7 +38,7 @@ "name": "weights_category: enums::by_table::model_weights::weights_category::WeightsCategory", "type_info": { "type": "VarString", - "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE", + "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", "char_set": 224, "max_size": 128 } @@ -128,7 +128,7 @@ "name": "creator_set_visibility: enums::common::visibility::Visibility", "type_info": { "type": "String", - "flags": "NOT_NULL | BINARY | ENUM", + "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM", "char_set": 224, "max_size": 28 } diff --git a/.sqlx/query-d1da969247415305e6bff625150b4d2a8b3801fd27999be19cb47f5f86ea279c.json b/.sqlx/query-d1da969247415305e6bff625150b4d2a8b3801fd27999be19cb47f5f86ea279c.json new file mode 100644 index 0000000000..265506cd34 --- /dev/null +++ b/.sqlx/query-d1da969247415305e6bff625150b4d2a8b3801fd27999be19cb47f5f86ea279c.json @@ -0,0 +1,344 @@ +{ + "db_name": "MySQL", + "query": "\nSELECT\n id,\n token as `token: tokens::tokens::voice_conversion_models::VoiceConversionModelToken`,\n\n model_type as `model_type: enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType`,\n maybe_vocoder_token as `maybe_vocoder_token: tokens::tokens::vocoder_models::VocoderModelToken`,\n\n title,\n description_markdown,\n description_rendered_html,\n\n ietf_language_tag,\n ietf_primary_language_subtag,\n\n has_index_file,\n\n is_front_page_featured,\n\n original_download_url,\n original_filename,\n file_size_bytes,\n\n creator_user_token as `creator_user_token: tokens::tokens::users::UserToken`,\n\n ip_address_creation,\n ip_address_last_update,\n\n maybe_last_update_user_token as `maybe_last_update_user_token: tokens::tokens::users::UserToken`,\n\n creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n\n private_bucket_hash,\n private_bucket_object_name,\n\n is_public_listing_approved,\n is_locked_from_user_modification,\n maybe_mod_comments,\n\n maybe_migration_new_model_weights_token as `maybe_migration_new_model_weights_token: tokens::tokens::model_weights::ModelWeightToken`,\n\n version,\n\n created_at,\n updated_at,\n\n user_deleted_at,\n mod_deleted_at\n\nFROM voice_conversion_models\nWHERE\n id > ?\nORDER BY id ASC\nLIMIT ?\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "id", + "type_info": { + "type": "LongLong", + "flags": "NOT_NULL | PRIMARY_KEY | AUTO_INCREMENT", + "char_set": 63, + "max_size": 20 + } + }, + { + "ordinal": 1, + "name": "token: tokens::tokens::voice_conversion_models::VoiceConversionModelToken", + "type_info": { + "type": "VarString", + "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE", + "char_set": 224, + "max_size": 128 + } + }, + { + "ordinal": 2, + "name": "model_type: enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType", + "type_info": { + "type": "VarString", + "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", + "char_set": 224, + "max_size": 128 + } + }, + { + "ordinal": 3, + "name": "maybe_vocoder_token: tokens::tokens::vocoder_models::VocoderModelToken", + "type_info": { + "type": "VarString", + "flags": "MULTIPLE_KEY | BINARY", + "char_set": 224, + "max_size": 128 + } + }, + { + "ordinal": 4, + "name": "title", + "type_info": { + "type": "VarString", + "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE", + "char_set": 224, + "max_size": 1020 + } + }, + { + "ordinal": 5, + "name": "description_markdown", + "type_info": { + "type": "Blob", + "flags": "NOT_NULL | BLOB | BINARY | NO_DEFAULT_VALUE", + "char_set": 224, + "max_size": 262140 + } + }, + { + "ordinal": 6, + "name": "description_rendered_html", + "type_info": { + "type": "Blob", + "flags": "NOT_NULL | BLOB | BINARY | NO_DEFAULT_VALUE", + "char_set": 224, + "max_size": 262140 + } + }, + { + "ordinal": 7, + "name": "ietf_language_tag", + "type_info": { + "type": "VarString", + "flags": "NOT_NULL | BINARY", + "char_set": 224, + "max_size": 256 + } + }, + { + "ordinal": 8, + "name": "ietf_primary_language_subtag", + "type_info": { + "type": "VarString", + "flags": "NOT_NULL | BINARY", + "char_set": 224, + "max_size": 48 + } + }, + { + "ordinal": 9, + "name": "has_index_file", + "type_info": { + "type": "Tiny", + "flags": "NOT_NULL", + "char_set": 63, + "max_size": 1 + } + }, + { + "ordinal": 10, + "name": "is_front_page_featured", + "type_info": { + "type": "Tiny", + "flags": "NOT_NULL", + "char_set": 63, + "max_size": 1 + } + }, + { + "ordinal": 11, + "name": "original_download_url", + "type_info": { + "type": "VarString", + "flags": "BINARY", + "char_set": 224, + "max_size": 2048 + } + }, + { + "ordinal": 12, + "name": "original_filename", + "type_info": { + "type": "VarString", + "flags": "BINARY", + "char_set": 224, + "max_size": 1020 + } + }, + { + "ordinal": 13, + "name": "file_size_bytes", + "type_info": { + "type": "Long", + "flags": "NOT_NULL", + "char_set": 63, + "max_size": 10 + } + }, + { + "ordinal": 14, + "name": "creator_user_token: tokens::tokens::users::UserToken", + "type_info": { + "type": "VarString", + "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", + "char_set": 224, + "max_size": 128 + } + }, + { + "ordinal": 15, + "name": "ip_address_creation", + "type_info": { + "type": "VarString", + "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE", + "char_set": 224, + "max_size": 160 + } + }, + { + "ordinal": 16, + "name": "ip_address_last_update", + "type_info": { + "type": "VarString", + "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE", + "char_set": 224, + "max_size": 160 + } + }, + { + "ordinal": 17, + "name": "maybe_last_update_user_token: tokens::tokens::users::UserToken", + "type_info": { + "type": "VarString", + "flags": "BINARY", + "char_set": 224, + "max_size": 128 + } + }, + { + "ordinal": 18, + "name": "creator_set_visibility: enums::common::visibility::Visibility", + "type_info": { + "type": "String", + "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM", + "char_set": 224, + "max_size": 28 + } + }, + { + "ordinal": 19, + "name": "private_bucket_hash", + "type_info": { + "type": "String", + "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", + "char_set": 224, + "max_size": 256 + } + }, + { + "ordinal": 20, + "name": "private_bucket_object_name", + "type_info": { + "type": "VarString", + "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE", + "char_set": 224, + "max_size": 1020 + } + }, + { + "ordinal": 21, + "name": "is_public_listing_approved", + "type_info": { + "type": "Tiny", + "flags": "MULTIPLE_KEY", + "char_set": 63, + "max_size": 1 + } + }, + { + "ordinal": 22, + "name": "is_locked_from_user_modification", + "type_info": { + "type": "Tiny", + "flags": "NOT_NULL | MULTIPLE_KEY", + "char_set": 63, + "max_size": 1 + } + }, + { + "ordinal": 23, + "name": "maybe_mod_comments", + "type_info": { + "type": "VarString", + "flags": "BINARY", + "char_set": 224, + "max_size": 1020 + } + }, + { + "ordinal": 24, + "name": "maybe_migration_new_model_weights_token: tokens::tokens::model_weights::ModelWeightToken", + "type_info": { + "type": "VarString", + "flags": "UNIQUE_KEY | BINARY", + "char_set": 224, + "max_size": 128 + } + }, + { + "ordinal": 25, + "name": "version", + "type_info": { + "type": "Long", + "flags": "NOT_NULL", + "char_set": 63, + "max_size": 11 + } + }, + { + "ordinal": 26, + "name": "created_at", + "type_info": { + "type": "Timestamp", + "flags": "NOT_NULL | BINARY | TIMESTAMP", + "char_set": 63, + "max_size": 19 + } + }, + { + "ordinal": 27, + "name": "updated_at", + "type_info": { + "type": "Timestamp", + "flags": "NOT_NULL | BINARY | TIMESTAMP | ON_UPDATE_NOW", + "char_set": 63, + "max_size": 19 + } + }, + { + "ordinal": 28, + "name": "user_deleted_at", + "type_info": { + "type": "Timestamp", + "flags": "BINARY", + "char_set": 63, + "max_size": 19 + } + }, + { + "ordinal": 29, + "name": "mod_deleted_at", + "type_info": { + "type": "Timestamp", + "flags": "BINARY", + "char_set": 63, + "max_size": 19 + } + } + ], + "parameters": { + "Right": 2 + }, + "nullable": [ + false, + false, + false, + true, + false, + false, + false, + false, + false, + false, + false, + true, + true, + false, + false, + false, + false, + true, + false, + false, + false, + true, + false, + true, + true, + false, + false, + false, + true, + true + ] + }, + "hash": "d1da969247415305e6bff625150b4d2a8b3801fd27999be19cb47f5f86ea279c" +} diff --git a/.sqlx/query-f0b5767d52c389660d1859e628c746f6f33a9e1c25f21f66aeeb0784df768c8e.json b/.sqlx/query-f0b5767d52c389660d1859e628c746f6f33a9e1c25f21f66aeeb0784df768c8e.json index 7ffe2dd1d5..440dfad3e0 100644 --- a/.sqlx/query-f0b5767d52c389660d1859e628c746f6f33a9e1c25f21f66aeeb0784df768c8e.json +++ b/.sqlx/query-f0b5767d52c389660d1859e628c746f6f33a9e1c25f21f66aeeb0784df768c8e.json @@ -28,7 +28,7 @@ "name": "weights_type: enums::by_table::model_weights::weights_types::WeightsType", "type_info": { "type": "VarString", - "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE", + "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", "char_set": 224, "max_size": 128 } @@ -38,7 +38,7 @@ "name": "weights_category: enums::by_table::model_weights::weights_category::WeightsCategory", "type_info": { "type": "VarString", - "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE", + "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", "char_set": 224, "max_size": 128 } @@ -78,7 +78,7 @@ "name": "creator_user_token: tokens::tokens::users::UserToken", "type_info": { "type": "VarString", - "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE", + "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", "char_set": 224, "max_size": 128 } @@ -98,7 +98,7 @@ "name": "creator_set_visibility: enums::common::visibility::Visibility", "type_info": { "type": "String", - "flags": "NOT_NULL | BINARY | ENUM", + "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM", "char_set": 224, "max_size": 28 } diff --git a/.sqlx/query-f80fb6c91b897bc4a5c24cfd1e16c5975f9438c88421f19a1788531f335e75c2.json b/.sqlx/query-f80fb6c91b897bc4a5c24cfd1e16c5975f9438c88421f19a1788531f335e75c2.json new file mode 100644 index 0000000000..70e69f269b --- /dev/null +++ b/.sqlx/query-f80fb6c91b897bc4a5c24cfd1e16c5975f9438c88421f19a1788531f335e75c2.json @@ -0,0 +1,36 @@ +{ + "db_name": "MySQL", + "query": "\nSELECT\n m.token as `token: tokens::tokens::model_weights::ModelWeightToken`,\n m.weights_type as `weights_type: enums::by_table::model_weights::weights_types::WeightsType`\nFROM model_weights as m\nWHERE m.token = ?\n ", + "describe": { + "columns": [ + { + "ordinal": 0, + "name": "token: tokens::tokens::model_weights::ModelWeightToken", + "type_info": { + "type": "VarString", + "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE", + "char_set": 224, + "max_size": 128 + } + }, + { + "ordinal": 1, + "name": "weights_type: enums::by_table::model_weights::weights_types::WeightsType", + "type_info": { + "type": "VarString", + "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE", + "char_set": 224, + "max_size": 128 + } + } + ], + "parameters": { + "Right": 1 + }, + "nullable": [ + false, + false + ] + }, + "hash": "f80fb6c91b897bc4a5c24cfd1e16c5975f9438c88421f19a1788531f335e75c2" +} diff --git a/.sqlx/query-fbcaa705fac9d2262a8b3ac337e30d899c8704a55999866d4cd2bce561a40065.json b/.sqlx/query-fbcaa705fac9d2262a8b3ac337e30d899c8704a55999866d4cd2bce561a40065.json new file mode 100644 index 0000000000..76ac258cc9 --- /dev/null +++ b/.sqlx/query-fbcaa705fac9d2262a8b3ac337e30d899c8704a55999866d4cd2bce561a40065.json @@ -0,0 +1,12 @@ +{ + "db_name": "MySQL", + "query": "\nINSERT INTO model_weights\nSET\n token = ?,\n weights_type = ?,\n weights_category = ?,\n title = ?,\n maybe_thumbnail_token = NULL,\n maybe_avatar_media_file_token = NULL,\n maybe_cover_media_file_token = NULL,\n description_markdown = ?,\n description_rendered_html = ?,\n creator_user_token = ?,\n creator_ip_address = ?,\n\n creator_set_visibility = ?,\n maybe_last_update_user_token = NULL,\n original_download_url = ?,\n original_filename = ?,\n file_size_bytes = ?,\n file_checksum_sha2 = \"TODO\",\n\n private_bucket_hash = \"TODO\",\n maybe_private_bucket_prefix = \"TODO\",\n maybe_private_bucket_extension = \"TODO\",\n cached_user_ratings_total_count = 0,\n cached_user_ratings_positive_count = 0,\n cached_user_ratings_negative_count = 0,\n maybe_cached_user_ratings_ratio = 0.0,\n cached_user_ratings_last_updated_at = NOW(),\n\n maybe_migration_old_model_token = ?,\n version = ?,\n created_at = ?,\n updated_at = ?,\n user_deleted_at = ?,\n mod_deleted_at = ?\n\nON DUPLICATE KEY UPDATE\n weights_type = ?,\n weights_category = ?,\n title = ?,\n maybe_thumbnail_token = NULL,\n maybe_avatar_media_file_token = NULL,\n maybe_cover_media_file_token = NULL,\n description_markdown = ?,\n description_rendered_html = ?,\n creator_user_token = ?,\n creator_ip_address = ?,\n creator_set_visibility = ?,\n maybe_last_update_user_token = NULL,\n original_download_url = ?,\n original_filename = ?,\n file_size_bytes = ?,\n file_checksum_sha2 = \"TODO\",\n private_bucket_hash = \"TODO\",\n maybe_private_bucket_prefix = \"TODO\",\n maybe_private_bucket_extension = \"TODO\",\n cached_user_ratings_total_count = 0,\n cached_user_ratings_positive_count = 0,\n cached_user_ratings_negative_count = 0,\n maybe_cached_user_ratings_ratio = 0.0,\n cached_user_ratings_last_updated_at = NOW(),\n maybe_migration_old_model_token = ?,\n version = ?,\n created_at = ?,\n updated_at = ?,\n user_deleted_at = ?,\n mod_deleted_at = ?\n ", + "describe": { + "columns": [], + "parameters": { + "Right": 35 + }, + "nullable": [] + }, + "hash": "fbcaa705fac9d2262a8b3ac337e30d899c8704a55999866d4cd2bce561a40065" +} diff --git a/crates/service/job/inference_job/src/job/job_types/videofilter/rerender_a_video/download_model_file.rs b/crates/service/job/inference_job/src/job/job_types/videofilter/rerender_a_video/download_model_file.rs index ee848d3361..295d9a1ad0 100644 --- a/crates/service/job/inference_job/src/job/job_types/videofilter/rerender_a_video/download_model_file.rs +++ b/crates/service/job/inference_job/src/job/job_types/videofilter/rerender_a_video/download_model_file.rs @@ -36,7 +36,9 @@ pub async fn download_model_file( model_record.maybe_private_bucket_prefix.as_deref(), model_record.maybe_private_bucket_extension.as_deref(), ); - model_filename = model_record.private_bucket_hash.clone() + ".".to_owned() + model_record.maybe_private_bucket_extension.as_deref().unwrap_or("bin"); + let base_name = &model_record.private_bucket_hash; + let extension = model_record.maybe_private_bucket_extension.as_deref().unwrap_or("bin"); + model_filename = format!("{base_name}.{extension}"); bucket_object_path = model_bucket_path.to_full_object_pathbuf(); } None => {