mirror of
https://github.com/storytold/artcraft.git
synced 2026-11-17 07:04:36 +00:00
unused variables lint
This commit is contained in:
1 parent
9d94737737
commit
88610b2c58
39 files changed
+107
-123
No files matched your search
@@ -42,6 +42,7 @@ deny = [
|
||||
# Rust
|
||||
"unused_parens", # Unused parens are ugly
|
||||
"unused_imports", # These are easy to automatically cull
|
||||
"unused_variables", # Don't leave cruft
|
||||
|
||||
# Possible:
|
||||
# "clippy::ptr_arg",
|
||||
|
||||
@@ -47,11 +47,11 @@ pub async fn main() -> AnyhowResult<()> {
|
||||
maybe_bucket_clients = Some(get_bucket_clients()?);
|
||||
}
|
||||
|
||||
let mut maybe_elasticsearch = None;
|
||||
|
||||
if args.seed_elasticsearch {
|
||||
maybe_elasticsearch = Some(get_elasticsearch_client());
|
||||
}
|
||||
// let mut maybe_elasticsearch = None;
|
||||
//
|
||||
// if args.seed_elasticsearch {
|
||||
// maybe_elasticsearch = Some(get_elasticsearch_client());
|
||||
// }
|
||||
|
||||
seed_user_accounts(&pool).await?;
|
||||
seed_media_files(&pool, maybe_bucket_clients.as_ref()).await?;
|
||||
|
||||
@@ -81,7 +81,7 @@ pub async fn seed_weights_for_paging(mysql_pool: &Pool<MySql>, user_token: UserT
|
||||
*Thank you for your continued support and feedback!*
|
||||
"#;
|
||||
|
||||
let sd1_5_image_token = "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/be706282-2978-42a0-aaa2-73881aad94e9/width=1024/00049-2287632957-1girl,face,curly%20hair,red%20hair,white%20background,.jpeg";
|
||||
let _sd1_5_image_token = "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/be706282-2978-42a0-aaa2-73881aad94e9/width=1024/00049-2287632957-1girl,face,curly%20hair,red%20hair,white%20background,.jpeg";
|
||||
|
||||
// create a loop that loops from 1 to 100
|
||||
for i in 1..=100 {
|
||||
@@ -112,7 +112,7 @@ pub async fn seed_weights_for_paging(mysql_pool: &Pool<MySql>, user_token: UserT
|
||||
let mut original_filename;
|
||||
let mut original_download_url;
|
||||
|
||||
let mut private_bucket_hash:String = "".to_string();
|
||||
let mut _private_bucket_hash:String = "".to_string();
|
||||
let mut private_bucket_prefix;
|
||||
let mut private_bucket_extension;
|
||||
|
||||
@@ -220,7 +220,7 @@ pub async fn seed_weights_for_paging(mysql_pool: &Pool<MySql>, user_token: UserT
|
||||
|
||||
Have fun! 😊
|
||||
"#;
|
||||
let sdxl_image_token = "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/be706282-2978-42a0-aaa2-73881aad94e9/width=1024/00049-2287632957-1girl,face,curly%20hair,red%20hair,white%20background,.jpeg";
|
||||
let _sdxl_image_token = "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/be706282-2978-42a0-aaa2-73881aad94e9/width=1024/00049-2287632957-1girl,face,curly%20hair,red%20hair,white%20background,.jpeg";
|
||||
|
||||
model_weight_token = ModelWeightToken::generate_for_testing_and_dev_seeding_never_use_in_production_seriously();
|
||||
title = format!("SDXL_Niji_Special Edition: {}", i);
|
||||
@@ -249,7 +249,7 @@ pub async fn seed_weights_for_paging(mysql_pool: &Pool<MySql>, user_token: UserT
|
||||
- LoRA Gawr Gura
|
||||
"#;
|
||||
|
||||
let lora_image_token = "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/123645df-dee2-4239-863a-76a150b09c32/width=1024/00000-2171948503.jpeg";
|
||||
let _lora_image_token = "https://image.civitai.com/xG1nkqKTMzGDvpLrqFT7WA/123645df-dee2-4239-863a-76a150b09c32/width=1024/00000-2171948503.jpeg";
|
||||
model_weight_token = ModelWeightToken::generate_for_testing_and_dev_seeding_never_use_in_production_seriously();
|
||||
title = format!("Gawr Gura LoRA: {}", i);
|
||||
|
||||
@@ -479,7 +479,7 @@ pub async fn seed_weights_for_user_token(
|
||||
}
|
||||
|
||||
|
||||
pub async fn original_seed_weights(mysql_pool: &Pool<MySql>,user_token: UserToken) -> AnyhowResult<()> {
|
||||
pub async fn original_seed_weights(mysql_pool: &Pool<MySql>, _user_token: UserToken) -> AnyhowResult<()> {
|
||||
let model_weight_token1 = ModelWeightToken::generate_for_testing_and_dev_seeding_never_use_in_production_seriously();
|
||||
let creator_token1 = UserToken::generate_for_testing_and_dev_seeding_never_use_in_production_seriously();
|
||||
|
||||
|
||||
@@ -74,7 +74,7 @@ pub async fn seed_weights_files(
|
||||
|
||||
for (
|
||||
user_token,
|
||||
weights_file_token,
|
||||
_weights_file_token,
|
||||
weights_type,
|
||||
weights_category,
|
||||
model_name,
|
||||
@@ -168,9 +168,9 @@ struct BucketDetails {
|
||||
}
|
||||
|
||||
async fn seed_model(
|
||||
mysql_pool: &Pool<MySql>,
|
||||
model_weight_token: &ModelWeightToken,
|
||||
user_token: &UserToken,
|
||||
_mysql_pool: &Pool<MySql>,
|
||||
_model_weight_token: &ModelWeightToken,
|
||||
_user_token: &UserToken,
|
||||
weight_type: WeightsType,
|
||||
weight_file_path: &Path,
|
||||
maybe_bucket_clients: Option<&BucketClients>
|
||||
|
||||
@@ -81,7 +81,7 @@ async fn create_document_from_record(elasticsearch: &Elasticsearch, record: &Tts
|
||||
}
|
||||
|
||||
// NB: Adapted from elasticsearch crate examples source
|
||||
async fn create_tts_model_index(client: &Elasticsearch, delete: bool) -> AnyhowResult<()> {
|
||||
async fn create_tts_model_index(client: &Elasticsearch, _delete: bool) -> AnyhowResult<()> {
|
||||
|
||||
info!("Creating TTS model index...");
|
||||
|
||||
|
||||
@@ -192,7 +192,7 @@ impl BucketPathUnifier {
|
||||
pub fn w2l_inference_video_output_path(&self, w2l_inference_job_token: &str) -> PathBuf {
|
||||
// NB: We don't want colons from the token in the filename.
|
||||
if w2l_inference_job_token.contains(":") {
|
||||
if let Some((token_type, token)) = w2l_inference_job_token.split_once(":") {
|
||||
if let Some((_token_type, token)) = w2l_inference_job_token.split_once(":") {
|
||||
let video_filename = w2l_inference_job_token.replace(":", "");
|
||||
let video_filename = format!("vocodes_video_{}.mp4", video_filename);
|
||||
|
||||
|
||||
@@ -15,33 +15,33 @@ impl NoOpJobProgressReporterBuilder {
|
||||
}
|
||||
|
||||
impl JobProgressReporterBuilder for NoOpJobProgressReporterBuilder {
|
||||
fn new_generic_download(&self, job_token: &str) -> AnyhowResult<Box<dyn JobProgressReporter>> {
|
||||
fn new_generic_download(&self, _job_token: &str) -> AnyhowResult<Box<dyn JobProgressReporter>> {
|
||||
NoOpJobProgressReporterBuilder::create_instance()
|
||||
}
|
||||
|
||||
fn new_generic_inference(&self, job_token: &str) -> AnyhowResult<Box<dyn JobProgressReporter>> {
|
||||
fn new_generic_inference(&self, _job_token: &str) -> AnyhowResult<Box<dyn JobProgressReporter>> {
|
||||
NoOpJobProgressReporterBuilder::create_instance()
|
||||
}
|
||||
|
||||
fn new_tts_download(&self, tts_job_token: &str) -> AnyhowResult<Box<dyn JobProgressReporter>> {
|
||||
fn new_tts_download(&self, _tts_job_token: &str) -> AnyhowResult<Box<dyn JobProgressReporter>> {
|
||||
NoOpJobProgressReporterBuilder::create_instance()
|
||||
}
|
||||
|
||||
fn new_tts_inference(&self, tts_job_token: &str) -> AnyhowResult<Box<dyn JobProgressReporter>> {
|
||||
fn new_tts_inference(&self, _tts_job_token: &str) -> AnyhowResult<Box<dyn JobProgressReporter>> {
|
||||
NoOpJobProgressReporterBuilder::create_instance()
|
||||
}
|
||||
|
||||
fn new_w2l_download(&self, w2l_job_token: &str) -> AnyhowResult<Box<dyn JobProgressReporter>> {
|
||||
fn new_w2l_download(&self, _w2l_job_token: &str) -> AnyhowResult<Box<dyn JobProgressReporter>> {
|
||||
NoOpJobProgressReporterBuilder::create_instance()
|
||||
}
|
||||
|
||||
fn new_w2l_inference(&self, w2l_job_token: &str) -> AnyhowResult<Box<dyn JobProgressReporter>> {
|
||||
fn new_w2l_inference(&self, _w2l_job_token: &str) -> AnyhowResult<Box<dyn JobProgressReporter>> {
|
||||
NoOpJobProgressReporterBuilder::create_instance()
|
||||
}
|
||||
}
|
||||
|
||||
impl JobProgressReporter for NoOpJobProgressReporter {
|
||||
fn log_status(&mut self, logging_details: &str) -> AnyhowResult<()> {
|
||||
fn log_status(&mut self, _logging_details: &str) -> AnyhowResult<()> {
|
||||
Ok(()) // No-op
|
||||
}
|
||||
}
|
||||
@@ -468,7 +468,7 @@ SET
|
||||
// NB: MySQL Error Code 1062: Duplicate key insertion (this is harder to access)
|
||||
match err {
|
||||
Database(err) => {
|
||||
let maybe_code = err.code().map(|c| c.into_owned());
|
||||
let _maybe_code = err.code().map(|c| c.into_owned());
|
||||
/*match maybe_code.as_deref() {
|
||||
Some("23000") => {
|
||||
if err.message().contains("username") {
|
||||
|
||||
@@ -346,7 +346,7 @@ SET
|
||||
// NB: MySQL Error Code 1062: Duplicate key insertion (this is harder to access)
|
||||
match err {
|
||||
Database(err) => {
|
||||
let maybe_code = err.code().map(|c| c.into_owned());
|
||||
let _maybe_code = err.code().map(|c| c.into_owned());
|
||||
/*match maybe_code.as_deref() {
|
||||
Some("23000") => {
|
||||
if err.message().contains("username") {
|
||||
|
||||
-4
@@ -63,10 +63,6 @@ pub async fn insert_media_file_from_face_animation(
|
||||
maybe_creator_category_synthetic_id = Some(next_lipsync_id);
|
||||
}
|
||||
|
||||
let vc_model_token = args.job.maybe_model_token.as_deref();
|
||||
let creator_ip_address = args.job.creator_ip_address.as_str();
|
||||
let creator_set_visibility = args.job.creator_set_visibility.clone();
|
||||
|
||||
const ORIGIN_CATEGORY : MediaFileOriginCategory = MediaFileOriginCategory::Inference;
|
||||
const ORIGIN_PRODUCT_CATEGORY : MediaFileOriginProductCategory = MediaFileOriginProductCategory::FaceAnimator;
|
||||
const ORIGIN_MODEL_TYPE : MediaFileOriginModelType = MediaFileOriginModelType::SadTalker;
|
||||
|
||||
-3
@@ -63,9 +63,6 @@ pub async fn insert_media_file_from_rerender(
|
||||
maybe_creator_category_synthetic_id = Some(next_rerender_id);
|
||||
}
|
||||
|
||||
let creator_ip_address = args.job.creator_ip_address.as_str();
|
||||
let creator_set_visibility = args.job.creator_set_visibility.clone();
|
||||
|
||||
const ORIGIN_CATEGORY : MediaFileOriginCategory = MediaFileOriginCategory::Inference;
|
||||
const ORIGIN_PRODUCT_CATEGORY : MediaFileOriginProductCategory = MediaFileOriginProductCategory::VideoFilter;
|
||||
const ORIGIN_MODEL_TYPE : MediaFileOriginModelType = MediaFileOriginModelType::Rerender;
|
||||
|
||||
-4
@@ -67,10 +67,6 @@ pub async fn insert_media_file_from_tacotron2(
|
||||
maybe_creator_category_synthetic_id = Some(next_voice_conversion_id);
|
||||
}
|
||||
|
||||
let vc_model_token = args.job.maybe_model_token.as_deref();
|
||||
let creator_ip_address = args.job.creator_ip_address.as_str();
|
||||
let creator_set_visibility = args.job.creator_set_visibility.clone();
|
||||
|
||||
const ORIGIN_CATEGORY : MediaFileOriginCategory = MediaFileOriginCategory::Inference;
|
||||
const ORIGIN_PRODUCT_CATEGORY : MediaFileOriginProductCategory = MediaFileOriginProductCategory::TextToSpeech;
|
||||
const MEDIA_TYPE : MediaFileType = MediaFileType::Audio;
|
||||
|
||||
-4
@@ -76,10 +76,6 @@ pub async fn insert_media_file_from_voice_conversion(
|
||||
maybe_creator_category_synthetic_id = Some(next_voice_conversion_id);
|
||||
}
|
||||
|
||||
let vc_model_token = args.job.maybe_model_token.as_deref();
|
||||
let creator_ip_address = args.job.creator_ip_address.as_str();
|
||||
let creator_set_visibility = args.job.creator_set_visibility.clone();
|
||||
|
||||
const ORIGIN_CATEGORY : MediaFileOriginCategory = MediaFileOriginCategory::Inference;
|
||||
const ORIGIN_PRODUCT_CATEGORY : MediaFileOriginProductCategory = MediaFileOriginProductCategory::VoiceConversion;
|
||||
const MEDIA_TYPE : MediaFileType = MediaFileType::Audio;
|
||||
|
||||
+2
-2
@@ -14,7 +14,7 @@ pub struct UpdateArgs<'a> {
|
||||
pub async fn set_model_weight_cover_image(args: UpdateArgs<'_>) -> AnyhowResult<()>{
|
||||
let transaction = args.mysql_pool.begin().await?;
|
||||
|
||||
let query_result = sqlx::query!(
|
||||
let _query_result = sqlx::query!(
|
||||
r#"
|
||||
UPDATE model_weights
|
||||
SET
|
||||
@@ -24,7 +24,7 @@ pub async fn set_model_weight_cover_image(args: UpdateArgs<'_>) -> AnyhowResult<
|
||||
"#,
|
||||
args.maybe_cover_image_media_file_token,
|
||||
args.model_weight_token,
|
||||
).execute(args.mysql_pool).await;
|
||||
).execute(args.mysql_pool).await?;
|
||||
|
||||
transaction.commit().await?;
|
||||
|
||||
|
||||
+1
-1
@@ -164,7 +164,7 @@ pub async fn mark_tts_upload_job_failure(
|
||||
next_status = "dead";
|
||||
}
|
||||
|
||||
let query_result = sqlx::query!(
|
||||
let _query_result = sqlx::query!(
|
||||
r#"
|
||||
UPDATE tts_model_upload_jobs
|
||||
SET
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
use anyhow::anyhow;
|
||||
use chrono::{DateTime, Utc};
|
||||
use log::{info, warn};
|
||||
use sqlx::{MySql, MySqlPool};
|
||||
use sqlx::{Error, MySql, MySqlPool};
|
||||
use sqlx::pool::PoolConnection;
|
||||
|
||||
use enums::common::visibility::Visibility;
|
||||
@@ -75,13 +75,13 @@ pub async fn list_tts_models_with_connection(
|
||||
let models : Vec<InternalRawTtsModelRecordForList> = match maybe_models {
|
||||
Ok(models) => models,
|
||||
Err(err) => {
|
||||
match err {
|
||||
RowNotFound => {
|
||||
return Ok(Vec::new());
|
||||
return match err {
|
||||
Error::RowNotFound => {
|
||||
Ok(Vec::new())
|
||||
},
|
||||
_ => {
|
||||
warn!("tts model list query error: {:?}", err);
|
||||
return Err(anyhow!("tts model list query error"));
|
||||
Err(anyhow!("tts model list query error"))
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -117,7 +117,7 @@ pub async fn list_tts_models_with_connection(
|
||||
async fn list_tts_models_for_all_creators(
|
||||
mysql_connection: &mut PoolConnection<MySql>,
|
||||
allow_mod_disabled: bool
|
||||
) -> AnyhowResult<Vec<InternalRawTtsModelRecordForList>> {
|
||||
) -> Result<Vec<InternalRawTtsModelRecordForList>, Error> {
|
||||
// TODO: There has to be a better way.
|
||||
// Sqlx doesn't like anything except string literals.
|
||||
let maybe_models = if !allow_mod_disabled {
|
||||
@@ -198,7 +198,7 @@ async fn list_tts_models_creator_scoped(
|
||||
mysql_connection: &mut PoolConnection<MySql>,
|
||||
scope_creator_username: &str,
|
||||
allow_mod_disabled: bool
|
||||
) -> AnyhowResult<Vec<InternalRawTtsModelRecordForList>> {
|
||||
) -> Result<Vec<InternalRawTtsModelRecordForList>, Error> {
|
||||
// TODO: There has to be a better way.
|
||||
// Sqlx doesn't like anything except string literals.
|
||||
let maybe_models = if !allow_mod_disabled {
|
||||
|
||||
+6
-6
@@ -1,7 +1,7 @@
|
||||
use anyhow::anyhow;
|
||||
use chrono::{DateTime, Utc};
|
||||
use log::warn;
|
||||
use sqlx::{MySql, MySqlPool};
|
||||
use sqlx::{Error, MySql, MySqlPool};
|
||||
use sqlx::pool::PoolConnection;
|
||||
|
||||
use enums::by_table::tts_models::tts_model_type::TtsModelType;
|
||||
@@ -104,13 +104,13 @@ pub async fn list_whole_tts_models_using_cursor(
|
||||
let models : Vec<RawRecord> = match maybe_models {
|
||||
Ok(models) => models,
|
||||
Err(err) => {
|
||||
match err {
|
||||
RowNotFound => {
|
||||
return Ok(Vec::new());
|
||||
return match err {
|
||||
Error::RowNotFound => {
|
||||
Ok(Vec::new())
|
||||
},
|
||||
_ => {
|
||||
warn!("vc model list query error: {:?}", err);
|
||||
return Err(anyhow!("vc model list query error"));
|
||||
Err(anyhow!("vc model list query error"))
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -176,7 +176,7 @@ async fn list_whole_voice_conversion_models(
|
||||
mysql_connection: &mut PoolConnection<MySql>,
|
||||
page_size: u64,
|
||||
cursor: u64,
|
||||
) -> AnyhowResult<Vec<RawRecord>> {
|
||||
) -> Result<Vec<RawRecord>, Error> {
|
||||
Ok(sqlx::query_as!(
|
||||
RawRecord,
|
||||
r#"
|
||||
|
||||
+1
-1
@@ -241,7 +241,7 @@ LEFT OUTER JOIN users
|
||||
|
||||
let mut query = "".to_string();
|
||||
|
||||
if let Some(offset) = self.offset {
|
||||
if let Some(_offset) = self.offset {
|
||||
if !first_predicate_added {
|
||||
query.push_str(" WHERE");
|
||||
first_predicate_added = true;
|
||||
|
||||
+1
-1
@@ -72,7 +72,7 @@ pub async fn reorder_twitch_event_rules(
|
||||
.join("\n");
|
||||
|
||||
let query_inner_ip_addresses = rule_token_to_order_map.iter()
|
||||
.map(|(token, position)| {
|
||||
.map(|(token, _position)| {
|
||||
format!("when token = '{}' then '{}'", token.as_str(), ip_address_update)
|
||||
})
|
||||
.collect::<Vec<String>>()
|
||||
|
||||
+6
-6
@@ -1,7 +1,7 @@
|
||||
use anyhow::anyhow;
|
||||
use chrono::{DateTime, Utc};
|
||||
use log::warn;
|
||||
use sqlx::{MySql, MySqlPool};
|
||||
use sqlx::{Error, MySql, MySqlPool};
|
||||
use sqlx::pool::PoolConnection;
|
||||
|
||||
use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType;
|
||||
@@ -80,13 +80,13 @@ pub async fn list_whole_voice_conversion_models_using_cursor(
|
||||
let models : Vec<RawRecord> = match maybe_models {
|
||||
Ok(models) => models,
|
||||
Err(err) => {
|
||||
match err {
|
||||
RowNotFound => {
|
||||
return Ok(Vec::new());
|
||||
return match err {
|
||||
Error::RowNotFound => {
|
||||
Ok(Vec::new())
|
||||
},
|
||||
_ => {
|
||||
warn!("vc model list query error: {:?}", err);
|
||||
return Err(anyhow!("vc model list query error"));
|
||||
Err(anyhow!("vc model list query error"))
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -134,7 +134,7 @@ async fn list_whole_voice_conversion_models(
|
||||
mysql_connection: &mut PoolConnection<MySql>,
|
||||
page_size: u64,
|
||||
cursor: u64,
|
||||
) -> AnyhowResult<Vec<RawRecord>> {
|
||||
) -> Result<Vec<RawRecord>, Error> {
|
||||
Ok(sqlx::query_as!(
|
||||
RawRecord,
|
||||
r#"
|
||||
|
||||
+7
-7
@@ -1,7 +1,7 @@
|
||||
use anyhow::anyhow;
|
||||
use chrono::{DateTime, Utc};
|
||||
use log::warn;
|
||||
use sqlx::{MySql, MySqlPool};
|
||||
use sqlx::{Error, MySql, MySqlPool};
|
||||
use sqlx::pool::PoolConnection;
|
||||
|
||||
use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType;
|
||||
@@ -64,13 +64,13 @@ pub async fn list_voice_conversion_models_with_connection(
|
||||
let models : Vec<RawVoiceConversionModelRecord> = match maybe_models {
|
||||
Ok(models) => models,
|
||||
Err(err) => {
|
||||
match err {
|
||||
RowNotFound => {
|
||||
return Ok(Vec::new());
|
||||
return match err {
|
||||
Error::RowNotFound => {
|
||||
Ok(Vec::new())
|
||||
},
|
||||
_ => {
|
||||
warn!("vc model list query error: {:?}", err);
|
||||
return Err(anyhow!("vc model list query error"));
|
||||
Err(anyhow!("vc model list query error"))
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -99,7 +99,7 @@ pub async fn list_voice_conversion_models_with_connection(
|
||||
|
||||
async fn list_voice_conversion_models_for_all_creators(
|
||||
mysql_connection: &mut PoolConnection<MySql>,
|
||||
) -> AnyhowResult<Vec<RawVoiceConversionModelRecord>> {
|
||||
) -> Result<Vec<RawVoiceConversionModelRecord>, Error> {
|
||||
Ok(sqlx::query_as!(
|
||||
RawVoiceConversionModelRecord,
|
||||
r#"
|
||||
@@ -131,7 +131,7 @@ WHERE
|
||||
async fn list_voice_conversion_models_creator_scoped(
|
||||
mysql_connection: &mut PoolConnection<MySql>,
|
||||
scope_creator_username: &str,
|
||||
) -> AnyhowResult<Vec<RawVoiceConversionModelRecord>> {
|
||||
) -> Result<Vec<RawVoiceConversionModelRecord>, Error> {
|
||||
Ok(sqlx::query_as!(
|
||||
RawVoiceConversionModelRecord,
|
||||
r#"
|
||||
|
||||
+6
-6
@@ -1,7 +1,7 @@
|
||||
use anyhow::anyhow;
|
||||
use chrono::{DateTime, Utc};
|
||||
use log::{info, warn};
|
||||
use sqlx::{MySql, MySqlPool};
|
||||
use sqlx::{Error, MySql, MySqlPool};
|
||||
use sqlx::pool::PoolConnection;
|
||||
|
||||
use enums::common::visibility::Visibility;
|
||||
@@ -51,13 +51,13 @@ pub async fn list_datasets_by_username_with_connection(
|
||||
let datasets : Vec<InternalRawDatasetRecordForList> = match datasets {
|
||||
Ok(datasets) => datasets,
|
||||
Err(err) => {
|
||||
match err {
|
||||
RowNotFound => {
|
||||
return Ok(Vec::new());
|
||||
return match err {
|
||||
Error::RowNotFound => {
|
||||
Ok(Vec::new())
|
||||
},
|
||||
_ => {
|
||||
warn!("dataset list query error: {:?}", err);
|
||||
return Err(anyhow!("dataset list query error"));
|
||||
Err(anyhow!("dataset list query error"))
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -90,7 +90,7 @@ async fn list_datasets_by_creator_username(
|
||||
mysql_connection: &mut PoolConnection<MySql>,
|
||||
creator_username: &str,
|
||||
can_see_deleted: bool,
|
||||
) -> AnyhowResult<Vec<InternalRawDatasetRecordForList>> {
|
||||
) -> Result<Vec<InternalRawDatasetRecordForList>, Error> {
|
||||
// TODO: There has to be a better way.
|
||||
// Sqlx doesn't like anything except string literals.
|
||||
let maybe_datasets = if !can_see_deleted {
|
||||
|
||||
+1
-1
@@ -53,7 +53,7 @@ const ORIGIN_PRODUCT : MediaFileOriginProductCategory = MediaFileOriginProductCa
|
||||
|
||||
pub async fn insert_dataset_sample_and_media_file(args: InsertDatasetSampleAndMediaFileArgs<'_>) -> AnyhowResult<(ZsVoiceDatasetSampleToken, MediaFileToken, u64)> {
|
||||
|
||||
let maybe_creator_synthetic_id : Option<u64> = None;
|
||||
let _maybe_creator_synthetic_id : Option<u64> = None;
|
||||
|
||||
let mut transaction = args.mysql_pool.begin().await?;
|
||||
|
||||
|
||||
+6
-8
@@ -1,7 +1,7 @@
|
||||
use anyhow::anyhow;
|
||||
use chrono::{DateTime, Utc};
|
||||
use log::warn;
|
||||
use sqlx::{MySql, MySqlPool};
|
||||
use sqlx::{Error, MySql, MySqlPool};
|
||||
use sqlx::pool::PoolConnection;
|
||||
|
||||
use enums::by_table::media_files::media_file_type::MediaFileType;
|
||||
@@ -11,8 +11,6 @@ use tokens::tokens::users::UserToken;
|
||||
use tokens::tokens::zs_voice_dataset_samples::ZsVoiceDatasetSampleToken;
|
||||
use tokens::tokens::zs_voice_datasets::ZsVoiceDatasetToken;
|
||||
|
||||
|
||||
|
||||
pub struct DatasetSampleRecordForList {
|
||||
pub sample_token: ZsVoiceDatasetSampleToken,
|
||||
|
||||
@@ -62,13 +60,13 @@ pub async fn list_samples_by_dataset_token_with_connection(
|
||||
let records = match maybe_samples {
|
||||
Ok(records) => records,
|
||||
Err(err) => {
|
||||
match err {
|
||||
RowNotFound => {
|
||||
return Ok(Vec::new());
|
||||
return match err {
|
||||
Error::RowNotFound => {
|
||||
Ok(Vec::new())
|
||||
},
|
||||
_ => {
|
||||
warn!("dataset sample list query error: {:?}", err);
|
||||
return Err(anyhow!("Error fetching dataset samples by dataset token: {:?}", err));
|
||||
Err(anyhow!("Error fetching dataset samples by dataset token: {:?}", err))
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -96,7 +94,7 @@ async fn list_samples_by_dataset_token(
|
||||
mysql_connection: &mut PoolConnection<MySql>,
|
||||
dataset_token: &ZsVoiceDatasetToken,
|
||||
can_see_deleted: bool,
|
||||
) -> AnyhowResult<Vec<InternalRawDatasetSampleRecordForList>> {
|
||||
) -> Result<Vec<InternalRawDatasetSampleRecordForList>, Error> {
|
||||
let maybe_samples = if !can_see_deleted {
|
||||
sqlx::query_as!(
|
||||
InternalRawDatasetSampleRecordForList,
|
||||
|
||||
+6
-6
@@ -1,7 +1,7 @@
|
||||
use anyhow::anyhow;
|
||||
use chrono::{DateTime, Utc};
|
||||
use log::{info, warn};
|
||||
use sqlx::{MySql, MySqlPool};
|
||||
use sqlx::{Error, MySql, MySqlPool};
|
||||
use sqlx::pool::PoolConnection;
|
||||
|
||||
use enums::common::visibility::Visibility;
|
||||
@@ -50,13 +50,13 @@ pub async fn list_zs_voices_by_username_with_connection(
|
||||
let voices : Vec<InternalRawVoiceRecordForList> = match maybe_voices {
|
||||
Ok(voices) => voices,
|
||||
Err(err) => {
|
||||
match err {
|
||||
RowNotFound => {
|
||||
return Ok(Vec::new());
|
||||
return match err {
|
||||
Error::RowNotFound => {
|
||||
Ok(Vec::new())
|
||||
},
|
||||
_ => {
|
||||
warn!("voice list query error: {:?}", err);
|
||||
return Err(anyhow!("voice list query error"));
|
||||
Err(anyhow!("voice list query error"))
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -89,7 +89,7 @@ async fn list_voices_by_creator_username(
|
||||
mysql_connection: &mut PoolConnection<MySql>,
|
||||
creator_username: &str,
|
||||
can_see_deleted: bool,
|
||||
) -> AnyhowResult<Vec<InternalRawVoiceRecordForList>> {
|
||||
) -> Result<Vec<InternalRawVoiceRecordForList>, Error> {
|
||||
// TODO: There has to be a better way.
|
||||
// Sqlx doesn't like anything except string literals.
|
||||
let maybe_voices = if !can_see_deleted {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
use anyhow::anyhow;
|
||||
use chrono::{DateTime, Utc};
|
||||
use log::{info, warn};
|
||||
use sqlx::MySqlPool;
|
||||
use sqlx::{Error, MySqlPool};
|
||||
|
||||
use errors::AnyhowResult;
|
||||
|
||||
@@ -69,13 +69,13 @@ pub async fn list_w2l_templates(
|
||||
Err(err) => {
|
||||
warn!("Error: {:?}", err);
|
||||
|
||||
match err {
|
||||
RowNotFound => {
|
||||
return Ok(Vec::new());
|
||||
return match err {
|
||||
Error::RowNotFound => {
|
||||
Ok(Vec::new())
|
||||
},
|
||||
_ => {
|
||||
warn!("w2l template list query error: {:?}", err);
|
||||
return Err(anyhow!("w2l template list query error"));
|
||||
Err(anyhow!("w2l template list query error"))
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -106,7 +106,7 @@ pub async fn list_w2l_templates(
|
||||
async fn list_w2l_templates_for_all_creators(
|
||||
mysql_pool: &MySqlPool,
|
||||
require_mod_approved: bool
|
||||
) -> AnyhowResult<Vec<RawW2lTemplateRecordForList>> {
|
||||
) -> Result<Vec<RawW2lTemplateRecordForList>, Error> {
|
||||
// TODO: There has to be a better way.
|
||||
// Sqlx doesn't like anything except string literals.
|
||||
let maybe_templates = if require_mod_approved {
|
||||
@@ -177,7 +177,7 @@ async fn list_w2l_templates_creator_scoped(
|
||||
mysql_pool: &MySqlPool,
|
||||
scope_creator_username: &str,
|
||||
require_mod_approved: bool
|
||||
) -> AnyhowResult<Vec<RawW2lTemplateRecordForList>> {
|
||||
) -> Result<Vec<RawW2lTemplateRecordForList>, Error> {
|
||||
// TODO: There has to be a better way.
|
||||
// Sqlx doesn't like anything except string literals.
|
||||
let maybe_templates = if require_mod_approved {
|
||||
|
||||
@@ -60,7 +60,7 @@ pub fn parse_download_types(comma_separated_types: &str) -> AnyhowResult<BTreeSe
|
||||
|
||||
for t in scoped_types.into_iter() {
|
||||
let model_type = GenericDownloadType::from_str(&t)
|
||||
.map_err(|err| anyhow!(
|
||||
.map_err(|_err| anyhow!(
|
||||
"Invalid model type: {:?}; should include only items from: {:?}",
|
||||
t,
|
||||
GenericDownloadType::all_variants()))?;
|
||||
|
||||
+1
-1
@@ -95,7 +95,7 @@ pub async fn get_health_check_handler(
|
||||
};
|
||||
|
||||
let body = serde_json::to_string(&response)
|
||||
.map_err(|e| HealthCheckError::ServerError)?;
|
||||
.map_err(|_e| HealthCheckError::ServerError)?;
|
||||
|
||||
if is_healthy {
|
||||
Ok(HttpResponse::Ok()
|
||||
|
||||
@@ -25,7 +25,7 @@ pub fn run_http_server(args: CreateServerArgs) -> AnyhowResult<Server>
|
||||
// HTTP server args
|
||||
let bind_address = easyenv::get_env_string_or_default("HTTP_BIND_ADDRESS", DEFAULT_BIND_ADDRESS);
|
||||
let num_workers = easyenv::get_env_num("HTTP_NUM_WORKERS", DEFAULT_NUM_WORKERS)?;
|
||||
let hostname = args.container_environment.hostname.clone();
|
||||
let _hostname = args.container_environment.hostname.clone();
|
||||
|
||||
let server_state = HttpServerSharedState {
|
||||
job_stats: args.job_stats.clone(),
|
||||
|
||||
@@ -17,7 +17,7 @@ pub async fn process_single_job(
|
||||
job_dependencies: &JobDependencies,
|
||||
job: &AvailableEmailSenderJob,
|
||||
) -> Result<ProcessSingleJobSuccessCase, ProcessSingleJobError> {
|
||||
let mut force_execution = false;
|
||||
//let mut force_execution = false;
|
||||
|
||||
// Some jobs have "routing tags". These ensure that jobs only execute on certain hosts.
|
||||
// This is typically for debugging or development.
|
||||
@@ -27,7 +27,7 @@ pub async fn process_single_job(
|
||||
|
||||
if hostname.starts_with(&routing_tag) {
|
||||
info!("Job has routing tag ({}) for execution on this host ({})", routing_tag, hostname);
|
||||
force_execution = true;
|
||||
//force_execution = true;
|
||||
} else {
|
||||
info!("Job routing tag ({}) doesn't match hostname ({}); skipping...", routing_tag, hostname);
|
||||
return Ok(ProcessSingleJobSuccessCase::JobSkippedForRoutingTagMismatch);
|
||||
|
||||
@@ -70,8 +70,8 @@ async fn main() -> AnyhowResult<()> {
|
||||
info!("Hostname: {}", &container_environment.hostname);
|
||||
|
||||
// NB: These are non-standard env vars we're injecting ourselves.
|
||||
let k8s_node_name = easyenv::get_env_string_optional("K8S_NODE_NAME");
|
||||
let k8s_pod_name = easyenv::get_env_string_optional("K8S_POD_NAME");
|
||||
let _k8s_node_name = easyenv::get_env_string_optional("K8S_NODE_NAME");
|
||||
let _k8s_pod_name = easyenv::get_env_string_optional("K8S_POD_NAME");
|
||||
|
||||
let db_connection_string =
|
||||
easyenv::get_env_string_or_default(
|
||||
|
||||
@@ -95,7 +95,7 @@ pub async fn get_health_check_handler(
|
||||
};
|
||||
|
||||
let body = serde_json::to_string(&response)
|
||||
.map_err(|e| HealthCheckError::ServerError)?;
|
||||
.map_err(|_e| HealthCheckError::ServerError)?;
|
||||
|
||||
if is_healthy {
|
||||
Ok(HttpResponse::Ok()
|
||||
|
||||
@@ -25,7 +25,7 @@ pub fn run_http_server(args: CreateServerArgs) -> AnyhowResult<Server>
|
||||
// HTTP server args
|
||||
let bind_address = easyenv::get_env_string_or_default("HTTP_BIND_ADDRESS", DEFAULT_BIND_ADDRESS);
|
||||
let num_workers = easyenv::get_env_num("HTTP_NUM_WORKERS", DEFAULT_NUM_WORKERS)?;
|
||||
let hostname = args.container_environment.hostname.clone();
|
||||
let _hostname = args.container_environment.hostname.clone();
|
||||
|
||||
let server_state = HttpServerSharedState {
|
||||
job_stats: args.job_stats.clone(),
|
||||
|
||||
+1
-1
@@ -180,7 +180,7 @@ pub async fn process_job(args: SadTalkerProcessJobArgs<'_>) -> Result<JobSuccess
|
||||
|
||||
// TODO: Limit output length for non-premium (???)
|
||||
|
||||
let maybe_args = job.maybe_inference_args
|
||||
let _maybe_args = job.maybe_inference_args
|
||||
.as_ref()
|
||||
.map(|args| args.args.as_ref())
|
||||
.flatten();
|
||||
|
||||
+8
-8
@@ -113,14 +113,14 @@ pub async fn process_create_voice(
|
||||
|
||||
info!("Dataset length info: {}", dataset.len());
|
||||
|
||||
let temp_extension = String::from(".bin");
|
||||
let temp_prefix:String;
|
||||
|
||||
if !deps.job.info.container.is_on_prem {
|
||||
temp_prefix = String::from("sample_"); // this is for seed in local dev to download the samples
|
||||
} else {
|
||||
temp_prefix = String::from(BUCKET_FILE_PREFIX_CREATE);
|
||||
}
|
||||
// let temp_extension = String::from(".bin");
|
||||
// let temp_prefix: String;
|
||||
//
|
||||
// if !deps.job.info.container.is_on_prem {
|
||||
// temp_prefix = String::from("sample_"); // this is for seed in local dev to download the samples
|
||||
// } else {
|
||||
// temp_prefix = String::from(BUCKET_FILE_PREFIX_CREATE);
|
||||
// }
|
||||
|
||||
let mut downloaded_dataset: Vec<PathBuf> = Vec::new();
|
||||
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
use crate::job::job_loop::process_single_job_error::ProcessSingleJobError;
|
||||
|
||||
pub fn categorize_error(stderr_contents: &str) -> Option<ProcessSingleJobError> {
|
||||
pub fn categorize_error(_stderr_contents: &str) -> Option<ProcessSingleJobError> {
|
||||
None
|
||||
}
|
||||
@@ -84,8 +84,8 @@ async fn main() -> AnyhowResult<()> {
|
||||
info!("Hostname: {}", &container_environment.hostname);
|
||||
|
||||
// NB: These are non-standard env vars we're injecting ourselves.
|
||||
let k8s_node_name = easyenv::get_env_string_optional("K8S_NODE_NAME");
|
||||
let k8s_pod_name = easyenv::get_env_string_optional("K8S_POD_NAME");
|
||||
let _k8s_node_name = easyenv::get_env_string_optional("K8S_NODE_NAME");
|
||||
let _k8s_pod_name = easyenv::get_env_string_optional("K8S_POD_NAME");
|
||||
|
||||
// Bucket stuff (shared)
|
||||
let access_key = easyenv::get_env_string_required(ENV_ACCESS_KEY)?;
|
||||
|
||||
@@ -43,11 +43,11 @@ where P: AsRef<Path> {
|
||||
if out.status.success() {
|
||||
Ok(
|
||||
u128::from_str_radix(String::from_utf8(out.stdout)
|
||||
.map_err(|e| io::Error::new(io::ErrorKind::Other, "audiowmark output parse failed"))?
|
||||
.map_err(|_e| io::Error::new(io::ErrorKind::Other, "audiowmark output parse failed"))?
|
||||
.split_whitespace().take(3).collect::<Vec<&str>>().get(2)
|
||||
.ok_or(io::Error::new(io::ErrorKind::Other, "audiowmark output didn't match expected format"))?
|
||||
, 16)
|
||||
.map_err(|e| io::Error::new(io::ErrorKind::Other, "audiowmark output parse failed"))?
|
||||
.map_err(|_e| io::Error::new(io::ErrorKind::Other, "audiowmark output parse failed"))?
|
||||
.to_be_bytes()
|
||||
)
|
||||
}
|
||||
|
||||
@@ -60,7 +60,7 @@ pub fn parse_model_types(comma_separated_types: &str) -> AnyhowResult<BTreeSet<I
|
||||
|
||||
for t in scoped_types.into_iter() {
|
||||
let model_type = InferenceModelType::from_str(&t)
|
||||
.map_err(|err| anyhow!(
|
||||
.map_err(|_err| anyhow!(
|
||||
"Invalid model type: {:?}; should include only items from: {:?}",
|
||||
t,
|
||||
InferenceModelType::all_variants()))?;
|
||||
|
||||
Reference in new issue
Block a user