From a669ac7f03817d778981d5fa8be5547df65bd7e1 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Thu, 30 Nov 2023 02:04:41 -0500 Subject: [PATCH] move remaining container_common::files -> filesys crate --- .../lib/deprecated/container_common/src/filesystem/mod.rs | 4 +--- crates/lib/files/filesys/src/lib.rs | 3 +++ .../filesys/src}/safe_delete_possible_temp_file.rs | 2 +- .../filesys/src}/safe_delete_temp_directory.rs | 0 .../filesys/src}/safe_delete_temp_file.rs | 0 .../job/download_job/src/job_loop/process_single_job.rs | 2 +- .../src/job_types/tts/tacotron/process_tacotron_model.rs | 4 ++-- .../src/job_types/tts/vits/process_vits_model.rs | 4 ++-- .../hifigan_softvc/process_hifigan_softvc_vocoder.rs | 4 ++-- .../vocoder/hifigan_tacotron/process_hifigan_vocoder.rs | 4 ++-- .../job_types/voice_conversion/rvc_v2/extract_rvc_files.rs | 2 +- .../voice_conversion/rvc_v2/pretrained_hubert_model.rs | 2 +- .../voice_conversion/rvc_v2/process_rvc_v2_model.rs | 6 +++--- .../so_vits_svc/process_so_vits_svc_model.rs | 4 ++-- .../voice_conversion/softvc/process_softvc_model.rs | 4 ++-- .../src/job/job_types/lipsync/sad_talker/process_job.rs | 4 ++-- .../job_types/tts/tacotron2_v2_early_fakeyou/process_job.rs | 4 ++-- .../inference_job/src/job/job_types/tts/vits/process_job.rs | 4 ++-- .../src/job/job_types/vc/rvc_v2/pretrained_hubert_model.rs | 2 +- .../src/job/job_types/vc/rvc_v2/process_job.rs | 4 ++-- .../src/job/job_types/vc/so_vits_svc/process_job.rs | 4 ++-- .../src/util/maybe_download_file_from_bucket.rs | 4 ++-- .../service/job/inference_job/src/util/model_downloader.rs | 2 +- crates/service/job/tts_download_job/src/main.rs | 4 ++-- .../tts_inference_job/src/job_steps/process_single_job.rs | 4 ++-- crates/service/job/w2l_download_job/src/main.rs | 4 ++-- crates/service/job/w2l_inference_job/src/main.rs | 4 ++-- 27 files changed, 45 insertions(+), 44 deletions(-) rename crates/lib/{deprecated/container_common/src/filesystem => files/filesys/src}/safe_delete_possible_temp_file.rs (73%) rename crates/lib/{deprecated/container_common/src/filesystem => files/filesys/src}/safe_delete_temp_directory.rs (100%) rename crates/lib/{deprecated/container_common/src/filesystem => files/filesys/src}/safe_delete_temp_file.rs (100%) diff --git a/crates/lib/deprecated/container_common/src/filesystem/mod.rs b/crates/lib/deprecated/container_common/src/filesystem/mod.rs index 7f4cf77e01..8b13789179 100644 --- a/crates/lib/deprecated/container_common/src/filesystem/mod.rs +++ b/crates/lib/deprecated/container_common/src/filesystem/mod.rs @@ -1,3 +1 @@ -pub mod safe_delete_possible_temp_file; -pub mod safe_delete_temp_directory; -pub mod safe_delete_temp_file; \ No newline at end of file + diff --git a/crates/lib/files/filesys/src/lib.rs b/crates/lib/files/filesys/src/lib.rs index 619d529781..05defce271 100644 --- a/crates/lib/files/filesys/src/lib.rs +++ b/crates/lib/files/filesys/src/lib.rs @@ -29,3 +29,6 @@ pub mod is_filesystem_full_error; pub mod path_to_string; pub mod rename_across_devices; pub mod check_directory_exists; +pub mod safe_delete_temp_file; +pub mod safe_delete_possible_temp_file; +pub mod safe_delete_temp_directory; diff --git a/crates/lib/deprecated/container_common/src/filesystem/safe_delete_possible_temp_file.rs b/crates/lib/files/filesys/src/safe_delete_possible_temp_file.rs similarity index 73% rename from crates/lib/deprecated/container_common/src/filesystem/safe_delete_possible_temp_file.rs rename to crates/lib/files/filesys/src/safe_delete_possible_temp_file.rs index 5d2f25c8eb..437193b31d 100644 --- a/crates/lib/deprecated/container_common/src/filesystem/safe_delete_possible_temp_file.rs +++ b/crates/lib/files/filesys/src/safe_delete_possible_temp_file.rs @@ -1,6 +1,6 @@ use std::path::Path; -use crate::filesystem::safe_delete_temp_file::safe_delete_temp_file; +use crate::safe_delete_temp_file::safe_delete_temp_file; pub fn safe_delete_possible_temp_file>(maybe_file_path: Option

) { if let Some(file_path) = maybe_file_path { diff --git a/crates/lib/deprecated/container_common/src/filesystem/safe_delete_temp_directory.rs b/crates/lib/files/filesys/src/safe_delete_temp_directory.rs similarity index 100% rename from crates/lib/deprecated/container_common/src/filesystem/safe_delete_temp_directory.rs rename to crates/lib/files/filesys/src/safe_delete_temp_directory.rs diff --git a/crates/lib/deprecated/container_common/src/filesystem/safe_delete_temp_file.rs b/crates/lib/files/filesys/src/safe_delete_temp_file.rs similarity index 100% rename from crates/lib/deprecated/container_common/src/filesystem/safe_delete_temp_file.rs rename to crates/lib/files/filesys/src/safe_delete_temp_file.rs diff --git a/crates/service/job/download_job/src/job_loop/process_single_job.rs b/crates/service/job/download_job/src/job_loop/process_single_job.rs index 91bb79ddec..ba69531e70 100644 --- a/crates/service/job/download_job/src/job_loop/process_single_job.rs +++ b/crates/service/job/download_job/src/job_loop/process_single_job.rs @@ -6,7 +6,7 @@ use tempdir::TempDir; use config::is_bad_download_url::is_bad_download_url; use container_common::anyhow_result::AnyhowResult; -use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_directory; +use filesys::safe_delete_temp_directory::safe_delete_temp_directory; use jobs_common::redis_job_status_logger::RedisJobStatusLogger; use mysql_queries::queries::generic_download::job::list_available_generic_download_jobs::AvailableDownloadJob; use mysql_queries::queries::generic_download::job::mark_generic_download_job_done::mark_generic_download_job_done; diff --git a/crates/service/job/download_job/src/job_types/tts/tacotron/process_tacotron_model.rs b/crates/service/job/download_job/src/job_types/tts/tacotron/process_tacotron_model.rs index 9b9dc6020f..255e4b3df4 100644 --- a/crates/service/job/download_job/src/job_types/tts/tacotron/process_tacotron_model.rs +++ b/crates/service/job/download_job/src/job_types/tts/tacotron/process_tacotron_model.rs @@ -6,12 +6,12 @@ use anyhow::anyhow; use log::{info, warn}; use tempdir::TempDir; -use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_directory; -use container_common::filesystem::safe_delete_temp_file::safe_delete_temp_file; use enums::by_table::tts_models::tts_model_type::TtsModelType; use enums::common::visibility::Visibility; use errors::AnyhowResult; use filesys::check_file_exists::check_file_exists; +use filesys::safe_delete_temp_directory::safe_delete_temp_directory; +use filesys::safe_delete_temp_file::safe_delete_temp_file; use hashing::sha256::sha256_hash_file::sha256_hash_file; use jobs_common::redis_job_status_logger::RedisJobStatusLogger; use mysql_queries::queries::generic_download::job::list_available_generic_download_jobs::AvailableDownloadJob; diff --git a/crates/service/job/download_job/src/job_types/tts/vits/process_vits_model.rs b/crates/service/job/download_job/src/job_types/tts/vits/process_vits_model.rs index 0d97715b51..e6b94eff1e 100644 --- a/crates/service/job/download_job/src/job_types/tts/vits/process_vits_model.rs +++ b/crates/service/job/download_job/src/job_types/tts/vits/process_vits_model.rs @@ -4,14 +4,14 @@ use anyhow::anyhow; use log::{error, info, warn}; use tempdir::TempDir; -use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_directory; -use container_common::filesystem::safe_delete_temp_file::safe_delete_temp_file; use enums::by_table::tts_models::tts_model_type::TtsModelType; use enums::common::visibility::Visibility; use errors::AnyhowResult; use filesys::check_file_exists::check_file_exists; use filesys::file_size::file_size; use filesys::filename_concat::filename_concat; +use filesys::safe_delete_temp_directory::safe_delete_temp_directory; +use filesys::safe_delete_temp_file::safe_delete_temp_file; use hashing::sha256::sha256_hash_file::sha256_hash_file; use jobs_common::redis_job_status_logger::RedisJobStatusLogger; use mysql_queries::queries::generic_download::job::list_available_generic_download_jobs::AvailableDownloadJob; diff --git a/crates/service/job/download_job/src/job_types/vocoder/hifigan_softvc/process_hifigan_softvc_vocoder.rs b/crates/service/job/download_job/src/job_types/vocoder/hifigan_softvc/process_hifigan_softvc_vocoder.rs index 43e8c7c80e..ac73745c77 100644 --- a/crates/service/job/download_job/src/job_types/vocoder/hifigan_softvc/process_hifigan_softvc_vocoder.rs +++ b/crates/service/job/download_job/src/job_types/vocoder/hifigan_softvc/process_hifigan_softvc_vocoder.rs @@ -6,11 +6,11 @@ use anyhow::anyhow; use log::{info, warn}; use tempdir::TempDir; -use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_directory; -use container_common::filesystem::safe_delete_temp_file::safe_delete_temp_file; use enums::common::vocoder_type::VocoderType; use errors::AnyhowResult; use filesys::check_file_exists::check_file_exists; +use filesys::safe_delete_temp_directory::safe_delete_temp_directory; +use filesys::safe_delete_temp_file::safe_delete_temp_file; use hashing::sha256::sha256_hash_file::sha256_hash_file; use jobs_common::redis_job_status_logger::RedisJobStatusLogger; use mysql_queries::queries::generic_download::job::list_available_generic_download_jobs::AvailableDownloadJob; diff --git a/crates/service/job/download_job/src/job_types/vocoder/hifigan_tacotron/process_hifigan_vocoder.rs b/crates/service/job/download_job/src/job_types/vocoder/hifigan_tacotron/process_hifigan_vocoder.rs index c6673fc4bd..610f61dc99 100644 --- a/crates/service/job/download_job/src/job_types/vocoder/hifigan_tacotron/process_hifigan_vocoder.rs +++ b/crates/service/job/download_job/src/job_types/vocoder/hifigan_tacotron/process_hifigan_vocoder.rs @@ -6,11 +6,11 @@ use anyhow::anyhow; use log::{info, warn}; use tempdir::TempDir; -use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_directory; -use container_common::filesystem::safe_delete_temp_file::safe_delete_temp_file; use enums::common::vocoder_type::VocoderType; use errors::AnyhowResult; use filesys::check_file_exists::check_file_exists; +use filesys::safe_delete_temp_directory::safe_delete_temp_directory; +use filesys::safe_delete_temp_file::safe_delete_temp_file; use hashing::sha256::sha256_hash_file::sha256_hash_file; use jobs_common::redis_job_status_logger::RedisJobStatusLogger; use mysql_queries::queries::generic_download::job::list_available_generic_download_jobs::AvailableDownloadJob; diff --git a/crates/service/job/download_job/src/job_types/voice_conversion/rvc_v2/extract_rvc_files.rs b/crates/service/job/download_job/src/job_types/voice_conversion/rvc_v2/extract_rvc_files.rs index 1992d388d8..fcd7457424 100644 --- a/crates/service/job/download_job/src/job_types/voice_conversion/rvc_v2/extract_rvc_files.rs +++ b/crates/service/job/download_job/src/job_types/voice_conversion/rvc_v2/extract_rvc_files.rs @@ -3,8 +3,8 @@ use std::path::{Path, PathBuf}; use log::{info, warn}; use tempdir::TempDir; -use container_common::filesystem::safe_delete_temp_file::safe_delete_temp_file; use errors::AnyhowResult; +use filesys::safe_delete_temp_file::safe_delete_temp_file; use mimetypes::mimetype_for_file::get_mimetype_for_file; #[derive(Debug)] diff --git a/crates/service/job/download_job/src/job_types/voice_conversion/rvc_v2/pretrained_hubert_model.rs b/crates/service/job/download_job/src/job_types/voice_conversion/rvc_v2/pretrained_hubert_model.rs index cc18241030..f6aa5807fc 100644 --- a/crates/service/job/download_job/src/job_types/voice_conversion/rvc_v2/pretrained_hubert_model.rs +++ b/crates/service/job/download_job/src/job_types/voice_conversion/rvc_v2/pretrained_hubert_model.rs @@ -5,10 +5,10 @@ use log::info; use tempdir::TempDir; use cloud_storage::bucket_client::BucketClient; -use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_directory; use errors::AnyhowResult; use filesys::create_dir_all_if_missing::create_dir_all_if_missing; use filesys::file_exists::file_exists; +use filesys::safe_delete_temp_directory::safe_delete_temp_directory; #[derive(Clone)] pub struct PretrainedHubertModel { diff --git a/crates/service/job/download_job/src/job_types/voice_conversion/rvc_v2/process_rvc_v2_model.rs b/crates/service/job/download_job/src/job_types/voice_conversion/rvc_v2/process_rvc_v2_model.rs index b141bef100..a7f7fea4d3 100644 --- a/crates/service/job/download_job/src/job_types/voice_conversion/rvc_v2/process_rvc_v2_model.rs +++ b/crates/service/job/download_job/src/job_types/voice_conversion/rvc_v2/process_rvc_v2_model.rs @@ -4,15 +4,15 @@ use anyhow::anyhow; use log::{error, info, warn}; use tempdir::TempDir; -use container_common::filesystem::safe_delete_possible_temp_file::safe_delete_possible_temp_file; -use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_directory; -use container_common::filesystem::safe_delete_temp_file::safe_delete_temp_file; use crockford::crockford_entropy_lower; use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; use enums::common::visibility::Visibility; use errors::AnyhowResult; use filesys::check_file_exists::check_file_exists; use filesys::file_size::file_size; +use filesys::safe_delete_possible_temp_file::safe_delete_possible_temp_file; +use filesys::safe_delete_temp_directory::safe_delete_temp_directory; +use filesys::safe_delete_temp_file::safe_delete_temp_file; use jobs_common::redis_job_status_logger::RedisJobStatusLogger; use mysql_queries::queries::generic_download::job::list_available_generic_download_jobs::AvailableDownloadJob; use mysql_queries::queries::voice_conversion::models::insert_voice_conversion_model_from_download_job::{insert_voice_conversion_model_from_download_job, InsertVoiceConversionModelArgs}; diff --git a/crates/service/job/download_job/src/job_types/voice_conversion/so_vits_svc/process_so_vits_svc_model.rs b/crates/service/job/download_job/src/job_types/voice_conversion/so_vits_svc/process_so_vits_svc_model.rs index c8eec94c11..d7500c91f3 100644 --- a/crates/service/job/download_job/src/job_types/voice_conversion/so_vits_svc/process_so_vits_svc_model.rs +++ b/crates/service/job/download_job/src/job_types/voice_conversion/so_vits_svc/process_so_vits_svc_model.rs @@ -4,13 +4,13 @@ use anyhow::anyhow; use log::{error, info, warn}; use tempdir::TempDir; -use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_directory; -use container_common::filesystem::safe_delete_temp_file::safe_delete_temp_file; use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; use enums::common::visibility::Visibility; use errors::AnyhowResult; use filesys::check_file_exists::check_file_exists; use filesys::file_size::file_size; +use filesys::safe_delete_temp_directory::safe_delete_temp_directory; +use filesys::safe_delete_temp_file::safe_delete_temp_file; use hashing::sha256::sha256_hash_file::sha256_hash_file; use jobs_common::redis_job_status_logger::RedisJobStatusLogger; use mysql_queries::queries::generic_download::job::list_available_generic_download_jobs::AvailableDownloadJob; diff --git a/crates/service/job/download_job/src/job_types/voice_conversion/softvc/process_softvc_model.rs b/crates/service/job/download_job/src/job_types/voice_conversion/softvc/process_softvc_model.rs index 9e381b22f4..ea656c8dab 100644 --- a/crates/service/job/download_job/src/job_types/voice_conversion/softvc/process_softvc_model.rs +++ b/crates/service/job/download_job/src/job_types/voice_conversion/softvc/process_softvc_model.rs @@ -6,12 +6,12 @@ use anyhow::anyhow; use log::{info, warn}; use tempdir::TempDir; -use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_directory; -use container_common::filesystem::safe_delete_temp_file::safe_delete_temp_file; use enums::by_table::voice_conversion_models::voice_conversion_model_type::VoiceConversionModelType; use enums::common::visibility::Visibility; use errors::AnyhowResult; use filesys::check_file_exists::check_file_exists; +use filesys::safe_delete_temp_directory::safe_delete_temp_directory; +use filesys::safe_delete_temp_file::safe_delete_temp_file; use hashing::sha256::sha256_hash_file::sha256_hash_file; use jobs_common::redis_job_status_logger::RedisJobStatusLogger; use mysql_queries::queries::generic_download::job::list_available_generic_download_jobs::AvailableDownloadJob; diff --git a/crates/service/job/inference_job/src/job/job_types/lipsync/sad_talker/process_job.rs b/crates/service/job/inference_job/src/job/job_types/lipsync/sad_talker/process_job.rs index 688b493261..14fd9a32e0 100644 --- a/crates/service/job/inference_job/src/job/job_types/lipsync/sad_talker/process_job.rs +++ b/crates/service/job/inference_job/src/job/job_types/lipsync/sad_talker/process_job.rs @@ -5,11 +5,11 @@ use anyhow::anyhow; use log::{error, info, warn}; use buckets::public::media_files::original_file::MediaFileBucketPath; -use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_directory; -use container_common::filesystem::safe_delete_temp_file::safe_delete_temp_file; use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; use filesys::check_file_exists::check_file_exists; use filesys::file_size::file_size; +use filesys::safe_delete_temp_directory::safe_delete_temp_directory; +use filesys::safe_delete_temp_file::safe_delete_temp_file; use hashing::sha256::sha256_hash_file::sha256_hash_file; use mimetypes::mimetype_for_file::get_mimetype_for_file; use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; diff --git a/crates/service/job/inference_job/src/job/job_types/tts/tacotron2_v2_early_fakeyou/process_job.rs b/crates/service/job/inference_job/src/job/job_types/tts/tacotron2_v2_early_fakeyou/process_job.rs index b3f9ed7f54..c6559a478a 100644 --- a/crates/service/job/inference_job/src/job/job_types/tts/tacotron2_v2_early_fakeyou/process_job.rs +++ b/crates/service/job/inference_job/src/job/job_types/tts/tacotron2_v2_early_fakeyou/process_job.rs @@ -7,11 +7,11 @@ use anyhow::anyhow; use log::{error, info}; use tempdir::TempDir; -use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_directory; -use container_common::filesystem::safe_delete_temp_file::safe_delete_temp_file; use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; use errors::AnyhowResult; use filesys::check_file_exists::check_file_exists; +use filesys::safe_delete_temp_directory::safe_delete_temp_directory; +use filesys::safe_delete_temp_file::safe_delete_temp_file; use hashing::sha256::sha256_hash_string::sha256_hash_string; use mysql_queries::column_types::vocoder_type::VocoderType; use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; diff --git a/crates/service/job/inference_job/src/job/job_types/tts/vits/process_job.rs b/crates/service/job/inference_job/src/job/job_types/tts/vits/process_job.rs index 802a09073a..336631315d 100644 --- a/crates/service/job/inference_job/src/job/job_types/tts/vits/process_job.rs +++ b/crates/service/job/inference_job/src/job/job_types/tts/vits/process_job.rs @@ -7,11 +7,11 @@ use anyhow::anyhow; use log::{error, info}; use tempdir::TempDir; -use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_directory; -use container_common::filesystem::safe_delete_temp_file::safe_delete_temp_file; use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; use errors::AnyhowResult; use filesys::check_file_exists::check_file_exists; +use filesys::safe_delete_temp_directory::safe_delete_temp_directory; +use filesys::safe_delete_temp_file::safe_delete_temp_file; use hashing::sha256::sha256_hash_string::sha256_hash_string; use mysql_queries::column_types::vocoder_type::VocoderType; use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; diff --git a/crates/service/job/inference_job/src/job/job_types/vc/rvc_v2/pretrained_hubert_model.rs b/crates/service/job/inference_job/src/job/job_types/vc/rvc_v2/pretrained_hubert_model.rs index 3f9f2f8c75..baf225cc84 100644 --- a/crates/service/job/inference_job/src/job/job_types/vc/rvc_v2/pretrained_hubert_model.rs +++ b/crates/service/job/inference_job/src/job/job_types/vc/rvc_v2/pretrained_hubert_model.rs @@ -4,10 +4,10 @@ use anyhow::anyhow; use log::{error, info}; use cloud_storage::bucket_client::BucketClient; -use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_directory; use filesys::create_dir_all_if_missing::create_dir_all_if_missing; use filesys::file_exists::file_exists; use filesys::rename_across_devices::rename_across_devices; +use filesys::safe_delete_temp_directory::safe_delete_temp_directory; use crate::job::job_loop::process_single_job_error::ProcessSingleJobError; use crate::util::scoped_temp_dir_creator::ScopedTempDirCreator; diff --git a/crates/service/job/inference_job/src/job/job_types/vc/rvc_v2/process_job.rs b/crates/service/job/inference_job/src/job/job_types/vc/rvc_v2/process_job.rs index 45efc8f1bc..16a8992dfd 100644 --- a/crates/service/job/inference_job/src/job/job_types/vc/rvc_v2/process_job.rs +++ b/crates/service/job/inference_job/src/job/job_types/vc/rvc_v2/process_job.rs @@ -6,12 +6,12 @@ use log::{error, info, warn}; use buckets::public::media_files::original_file::MediaFileBucketPath; use buckets::public::media_uploads::original_file::MediaUploadOriginalFilePath; -use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_directory; -use container_common::filesystem::safe_delete_temp_file::safe_delete_temp_file; use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; use filesys::check_file_exists::check_file_exists; use filesys::create_dir_all_if_missing::create_dir_all_if_missing; use filesys::file_size::file_size; +use filesys::safe_delete_temp_directory::safe_delete_temp_directory; +use filesys::safe_delete_temp_file::safe_delete_temp_file; use hashing::sha256::sha256_hash_file::sha256_hash_file; use media::decode_basic_audio_info::decode_basic_audio_file_info; use mimetypes::mimetype_for_file::get_mimetype_for_file; diff --git a/crates/service/job/inference_job/src/job/job_types/vc/so_vits_svc/process_job.rs b/crates/service/job/inference_job/src/job/job_types/vc/so_vits_svc/process_job.rs index dd41ff0d5f..5a54968f7a 100644 --- a/crates/service/job/inference_job/src/job/job_types/vc/so_vits_svc/process_job.rs +++ b/crates/service/job/inference_job/src/job/job_types/vc/so_vits_svc/process_job.rs @@ -5,12 +5,12 @@ use log::{error, info, warn}; use buckets::public::media_files::original_file::MediaFileBucketPath; use buckets::public::media_uploads::original_file::MediaUploadOriginalFilePath; -use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_directory; -use container_common::filesystem::safe_delete_temp_file::safe_delete_temp_file; use enums::by_table::generic_inference_jobs::inference_result_type::InferenceResultType; use filesys::check_file_exists::check_file_exists; use filesys::create_dir_all_if_missing::create_dir_all_if_missing; use filesys::file_size::file_size; +use filesys::safe_delete_temp_directory::safe_delete_temp_directory; +use filesys::safe_delete_temp_file::safe_delete_temp_file; use hashing::sha256::sha256_hash_file::sha256_hash_file; use media::decode_basic_audio_info::decode_basic_audio_file_info; use mimetypes::mimetype_for_file::get_mimetype_for_file; diff --git a/crates/service/job/inference_job/src/util/maybe_download_file_from_bucket.rs b/crates/service/job/inference_job/src/util/maybe_download_file_from_bucket.rs index c0905e4e7f..d5e6bffa90 100644 --- a/crates/service/job/inference_job/src/util/maybe_download_file_from_bucket.rs +++ b/crates/service/job/inference_job/src/util/maybe_download_file_from_bucket.rs @@ -3,10 +3,10 @@ use std::path::Path; use log::{error, info, warn}; use cloud_storage::bucket_client::BucketClient; -use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_directory; -use container_common::filesystem::safe_delete_temp_file::safe_delete_temp_file; use filesys::file_size::file_size; use filesys::rename_across_devices::{rename_across_devices, RenameError}; +use filesys::safe_delete_temp_directory::safe_delete_temp_directory; +use filesys::safe_delete_temp_file::safe_delete_temp_file; use jobs_common::job_progress_reporter::job_progress_reporter::JobProgressReporter; use crate::job::job_loop::process_single_job_error::ProcessSingleJobError; diff --git a/crates/service/job/inference_job/src/util/model_downloader.rs b/crates/service/job/inference_job/src/util/model_downloader.rs index 57bf7d8bbc..e450ce6354 100644 --- a/crates/service/job/inference_job/src/util/model_downloader.rs +++ b/crates/service/job/inference_job/src/util/model_downloader.rs @@ -5,10 +5,10 @@ use async_trait::async_trait; use log::{error, info}; use cloud_storage::bucket_client::BucketClient; -use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_directory; use filesys::create_dir_all_if_missing::create_dir_all_if_missing; use filesys::file_exists::file_exists; use filesys::rename_across_devices::{rename_across_devices, RenameError}; +use filesys::safe_delete_temp_directory::safe_delete_temp_directory; use crate::job::job_loop::process_single_job_error::ProcessSingleJobError; use crate::util::scoped_temp_dir_creator::ScopedTempDirCreator; diff --git a/crates/service/job/tts_download_job/src/main.rs b/crates/service/job/tts_download_job/src/main.rs index 36d88f885d..f7a915a4af 100644 --- a/crates/service/job/tts_download_job/src/main.rs +++ b/crates/service/job/tts_download_job/src/main.rs @@ -35,11 +35,11 @@ use config::common_env::CommonEnv; use config::shared_constants::DEFAULT_MYSQL_CONNECTION_STRING; use config::shared_constants::DEFAULT_RUST_LOG; use container_common::anyhow_result::AnyhowResult; -use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_directory; -use container_common::filesystem::safe_delete_temp_file::safe_delete_temp_file; use enums::by_table::tts_models::tts_model_type::TtsModelType; use filesys::check_directory_exists::check_directory_exists; use filesys::check_file_exists::check_file_exists; +use filesys::safe_delete_temp_directory::safe_delete_temp_directory; +use filesys::safe_delete_temp_file::safe_delete_temp_file; use google_drive_common::google_drive_download_command::GoogleDriveDownloadCommand; use hashing::sha256::sha256_hash_file::sha256_hash_file; use jobs_common::noop_logger::NoOpLogger; diff --git a/crates/service/job/tts_inference_job/src/job_steps/process_single_job.rs b/crates/service/job/tts_inference_job/src/job_steps/process_single_job.rs index 117b7ac8fe..bb9cd522a8 100644 --- a/crates/service/job/tts_inference_job/src/job_steps/process_single_job.rs +++ b/crates/service/job/tts_inference_job/src/job_steps/process_single_job.rs @@ -13,10 +13,10 @@ use log::{error, info, warn}; use tempdir::TempDir; use container_common::anyhow_result::AnyhowResult; -use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_directory; -use container_common::filesystem::safe_delete_temp_file::safe_delete_temp_file; use container_common::token::random_uuid::generate_random_uuid; use filesys::check_file_exists::check_file_exists; +use filesys::safe_delete_temp_directory::safe_delete_temp_directory; +use filesys::safe_delete_temp_file::safe_delete_temp_file; use hashing::sha256::sha256_hash_string::sha256_hash_string; use mysql_queries::column_types::vocoder_type::VocoderType; use mysql_queries::queries::tts::tts_inference_jobs::list_available_tts_inference_jobs::AvailableTtsInferenceJob; diff --git a/crates/service/job/w2l_download_job/src/main.rs b/crates/service/job/w2l_download_job/src/main.rs index b84b3075b3..324f2337c5 100644 --- a/crates/service/job/w2l_download_job/src/main.rs +++ b/crates/service/job/w2l_download_job/src/main.rs @@ -35,10 +35,10 @@ use config::is_bad_video_download_url::is_bad_video_download_url; use config::shared_constants::DEFAULT_MYSQL_CONNECTION_STRING; use config::shared_constants::DEFAULT_RUST_LOG; use container_common::anyhow_result::AnyhowResult; -use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_directory; -use container_common::filesystem::safe_delete_temp_file::safe_delete_temp_file; use filesys::check_directory_exists::check_directory_exists; use filesys::check_file_exists::check_file_exists; +use filesys::safe_delete_temp_directory::safe_delete_temp_directory; +use filesys::safe_delete_temp_file::safe_delete_temp_file; use google_drive_common::google_drive_download_command::GoogleDriveDownloadCommand; use hashing::sha256::sha256_hash_file::sha256_hash_file; use jobs_common::noop_logger::NoOpLogger; diff --git a/crates/service/job/w2l_inference_job/src/main.rs b/crates/service/job/w2l_inference_job/src/main.rs index f5682e76c9..a15ed3d06a 100644 --- a/crates/service/job/w2l_inference_job/src/main.rs +++ b/crates/service/job/w2l_inference_job/src/main.rs @@ -36,10 +36,10 @@ use config::common_env::CommonEnv; use config::shared_constants::DEFAULT_MYSQL_CONNECTION_STRING; use config::shared_constants::DEFAULT_RUST_LOG; use container_common::anyhow_result::AnyhowResult; -use container_common::filesystem::safe_delete_temp_directory::safe_delete_temp_directory; -use container_common::filesystem::safe_delete_temp_file::safe_delete_temp_file; use filesys::check_directory_exists::check_directory_exists; use filesys::check_file_exists::check_file_exists; +use filesys::safe_delete_temp_directory::safe_delete_temp_directory; +use filesys::safe_delete_temp_file::safe_delete_temp_file; use google_drive_common::google_drive_download_command::GoogleDriveDownloadCommand; use jobs_common::noop_logger::NoOpLogger; use jobs_common::redis_job_status_logger::RedisJobStatusLogger;