From 837343d166d1193db246ec5d35d41bcd00d4258f Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Wed, 18 Mar 2026 18:49:03 -0400 Subject: [PATCH] rename google_drive_common -> google_drive_downloader --- Cargo.lock | 12 ++++++------ Cargo.toml | 2 +- crates/api_clients/cloud_storage/Cargo.toml | 13 ++++++------- .../Cargo.toml | 4 ++-- .../src/google_drive_download_command.rs | 0 .../src/lib.rs | 0 crates/lib/cookies/Cargo.toml | 6 +++--- crates/lib/jwt_light/Cargo.toml | 6 +++--- .../service/job/deprecated/download_job/Cargo.toml | 2 +- .../job/deprecated/download_job/src/job_state.rs | 2 +- .../service/job/deprecated/download_job/src/main.rs | 2 +- .../service/job/deprecated/inference_job/Cargo.toml | 2 +- .../upload_model/process_gpt_sovits_upload_job.rs | 2 +- .../image_generation/sd/process_job_lora_upload.rs | 2 +- .../image_generation/sd/process_job_sd_upload.rs | 2 +- .../upload_workflow/process_upload_workflow_job.rs | 2 +- .../job/deprecated/tts_download_job/Cargo.toml | 2 +- .../job/deprecated/tts_download_job/src/main.rs | 2 +- .../job/deprecated/w2l_download_job/Cargo.toml | 2 +- .../job/deprecated/w2l_download_job/src/main.rs | 2 +- .../job/deprecated/w2l_inference_job/Cargo.toml | 2 +- .../job/deprecated/w2l_inference_job/src/main.rs | 2 +- 22 files changed, 35 insertions(+), 36 deletions(-) rename crates/api_clients/{google_drive_common => google_drive_downloader}/Cargo.toml (89%) rename crates/api_clients/{google_drive_common => google_drive_downloader}/src/google_drive_download_command.rs (100%) rename crates/api_clients/{google_drive_common => google_drive_downloader}/src/lib.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index 47e757a067..450d2bcb16 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3489,7 +3489,7 @@ dependencies = [ "enums", "errors", "filesys", - "google_drive_common", + "google_drive_downloader", "hashing", "hostname 0.4.0", "hyper 1.6.0", @@ -4805,7 +4805,7 @@ dependencies = [ ] [[package]] -name = "google_drive_common" +name = "google_drive_downloader" version = "0.0.1" dependencies = [ "anyhow", @@ -5853,7 +5853,7 @@ dependencies = [ "errors", "ffmpeg_utils", "filesys", - "google_drive_common", + "google_drive_downloader", "hashing", "hostname 0.4.0", "images", @@ -13011,7 +13011,7 @@ dependencies = [ "enums", "errors", "filesys", - "google_drive_common", + "google_drive_downloader", "hashing", "hostname 0.4.0", "hyper 1.6.0", @@ -13576,7 +13576,7 @@ dependencies = [ "easyenv", "errors", "filesys", - "google_drive_common", + "google_drive_downloader", "hashing", "hostname 0.4.0", "hyper 1.6.0", @@ -13607,7 +13607,7 @@ dependencies = [ "easyenv", "errors", "filesys", - "google_drive_common", + "google_drive_downloader", "hostname 0.4.0", "hyper 1.6.0", "jobs_common", diff --git a/Cargo.toml b/Cargo.toml index 54ae869cab..47580e960e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ members = [ "crates/api_clients/artcraft/artcraft_client", "crates/api_clients/cloud_storage", "crates/api_clients/fal_client", - "crates/api_clients/google_drive_common", + "crates/api_clients/google_drive_downloader", "crates/api_clients/google_sign_in", "crates/api_clients/grok_client", "crates/api_clients/midjourney_client", diff --git a/crates/api_clients/cloud_storage/Cargo.toml b/crates/api_clients/cloud_storage/Cargo.toml index 64c90c7e44..2695812cbb 100644 --- a/crates/api_clients/cloud_storage/Cargo.toml +++ b/crates/api_clients/cloud_storage/Cargo.toml @@ -16,13 +16,13 @@ path = "src/lib.rs" normal = ["workspace-build-acceleration"] [dependencies] -# Workspace hack (faster compile times) +# cargo-hakari workspace hack (faster compile times) workspace-build-acceleration.workspace = true # Internal bucket_paths.workspace = true crockford.workspace = true -easyenv = { path = "../../lib/easyenv" } +easyenv.workspace = true errors.workspace = true filesys.workspace = true hashing = { path = "../../lib/files/hashing" } @@ -31,12 +31,11 @@ storyteller_root = { path = "../../lib/storyteller_root" } # External anyhow.workspace = true -log.workspace = true -env_logger = "0.11.3" async-trait = "0.1.75" +env_logger.workspace = true +log.workspace = true +tokio.workspace = true + # The "never-encode-slash" feature seems to have been removed: # https://github.com/durch/rust-s3/pull/254 rust-s3 = { version = "0.36.0-beta.2", default-features = false, features = ["fail-on-err", "tags", "tokio-rustls-tls"] } - -# Runtime -tokio.workspace = true diff --git a/crates/api_clients/google_drive_common/Cargo.toml b/crates/api_clients/google_drive_downloader/Cargo.toml similarity index 89% rename from crates/api_clients/google_drive_common/Cargo.toml rename to crates/api_clients/google_drive_downloader/Cargo.toml index 8f575ca32a..ce1b7ece05 100644 --- a/crates/api_clients/google_drive_common/Cargo.toml +++ b/crates/api_clients/google_drive_downloader/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "google_drive_common" +name = "google_drive_downloader" edition = "2018" version = "0.0.1" authors = [ @@ -12,7 +12,7 @@ publish = false normal = ["workspace-build-acceleration"] [lib] -name = "google_drive_common" +name = "google_drive_downloader" path = "src/lib.rs" [dependencies] diff --git a/crates/api_clients/google_drive_common/src/google_drive_download_command.rs b/crates/api_clients/google_drive_downloader/src/google_drive_download_command.rs similarity index 100% rename from crates/api_clients/google_drive_common/src/google_drive_download_command.rs rename to crates/api_clients/google_drive_downloader/src/google_drive_download_command.rs diff --git a/crates/api_clients/google_drive_common/src/lib.rs b/crates/api_clients/google_drive_downloader/src/lib.rs similarity index 100% rename from crates/api_clients/google_drive_common/src/lib.rs rename to crates/api_clients/google_drive_downloader/src/lib.rs diff --git a/crates/lib/cookies/Cargo.toml b/crates/lib/cookies/Cargo.toml index f16b493b84..03d171a095 100644 --- a/crates/lib/cookies/Cargo.toml +++ b/crates/lib/cookies/Cargo.toml @@ -17,12 +17,12 @@ path = "src/lib.rs" normal = ["workspace-build-acceleration"] [dependencies] -# Internal -errors = { path = "../errors" } - # Workspace hack (faster compile times) workspace-build-acceleration = { version = "0.1", path = "../../workspace-build-acceleration" } +# Internal +errors.workspace = true + # External hmac = "0.10.1" # jwt signing jwt = "0.13.0" diff --git a/crates/lib/jwt_light/Cargo.toml b/crates/lib/jwt_light/Cargo.toml index f1a5b275ec..9958c3a00f 100644 --- a/crates/lib/jwt_light/Cargo.toml +++ b/crates/lib/jwt_light/Cargo.toml @@ -20,9 +20,9 @@ workspace-build-acceleration = { workspace = true } # (None) # External -base64 = { workspace = true } -chrono = { workspace = true} -serde_json = { workspace = true } +base64.workspace = true +chrono.workspace = true +serde_json.workspace = true [dev-dependencies] # (None) \ No newline at end of file diff --git a/crates/service/job/deprecated/download_job/Cargo.toml b/crates/service/job/deprecated/download_job/Cargo.toml index 9687065888..b374c1e294 100644 --- a/crates/service/job/deprecated/download_job/Cargo.toml +++ b/crates/service/job/deprecated/download_job/Cargo.toml @@ -30,7 +30,7 @@ easyenv = { path = "../../../../lib/easyenv" } enums.workspace = true errors.workspace = true filesys.workspace = true -google_drive_common = { path = "../../../../api_clients/google_drive_common" } +google_drive_downloader = { path = "../../../../api_clients/google_drive_downloader" } hashing = { path = "../../../../lib/files/hashing" } jobs_common = { path = "../../../../lib/jobs_common" } mimetypes.workspace = true diff --git a/crates/service/job/deprecated/download_job/src/job_state.rs b/crates/service/job/deprecated/download_job/src/job_state.rs index 572e94c0a6..d535769bda 100644 --- a/crates/service/job/deprecated/download_job/src/job_state.rs +++ b/crates/service/job/deprecated/download_job/src/job_state.rs @@ -7,7 +7,7 @@ use sqlx::MySqlPool; use bootstrap::bootstrap::ContainerEnvironment; use cloud_storage::bucket_client::BucketClient; use bucket_paths::legacy::old_bespoke_paths::bucket_path_unifier::BucketPathUnifier; -use google_drive_common::google_drive_download_command::GoogleDriveDownloadCommand; +use google_drive_downloader::google_drive_download_command::GoogleDriveDownloadCommand; use mysql_queries::common_inputs::container_environment_arg::ContainerEnvironmentArg; use mysql_queries::mediators::badge_granter::BadgeGranter; use mysql_queries::mediators::firehose_publisher::FirehosePublisher; diff --git a/crates/service/job/deprecated/download_job/src/main.rs b/crates/service/job/deprecated/download_job/src/main.rs index 8601ec9bb9..6d8c32e58e 100644 --- a/crates/service/job/deprecated/download_job/src/main.rs +++ b/crates/service/job/deprecated/download_job/src/main.rs @@ -36,7 +36,7 @@ use config::shared_constants::DEFAULT_MYSQL_CONNECTION_STRING; use config::shared_constants::DEFAULT_RUST_LOG; use errors::AnyhowResult; use filesys::check_directory_exists::check_directory_exists; -use google_drive_common::google_drive_download_command::GoogleDriveDownloadCommand; +use google_drive_downloader::google_drive_download_command::GoogleDriveDownloadCommand; use mysql_queries::common_inputs::container_environment_arg::ContainerEnvironmentArg; use mysql_queries::mediators::badge_granter::BadgeGranter; use mysql_queries::mediators::firehose_publisher::FirehosePublisher; diff --git a/crates/service/job/deprecated/inference_job/Cargo.toml b/crates/service/job/deprecated/inference_job/Cargo.toml index 5ce798b71e..1015b3727e 100644 --- a/crates/service/job/deprecated/inference_job/Cargo.toml +++ b/crates/service/job/deprecated/inference_job/Cargo.toml @@ -33,7 +33,7 @@ easyenv = { path = "../../../../lib/easyenv" } enums.workspace = true errors.workspace = true filesys.workspace = true -google_drive_common = { path = "../../../../api_clients/google_drive_common" } +google_drive_downloader = { path = "../../../../api_clients/google_drive_downloader" } hashing = { path = "../../../../lib/files/hashing" } images.workspace = true jobs_common = { path = "../../../../lib/jobs_common" } diff --git a/crates/service/job/deprecated/inference_job/src/job/job_types/gpt_sovits/upload_model/process_gpt_sovits_upload_job.rs b/crates/service/job/deprecated/inference_job/src/job/job_types/gpt_sovits/upload_model/process_gpt_sovits_upload_job.rs index 0df5edef37..a35e593799 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_types/gpt_sovits/upload_model/process_gpt_sovits_upload_job.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_types/gpt_sovits/upload_model/process_gpt_sovits_upload_job.rs @@ -12,7 +12,7 @@ use enums::common::visibility::Visibility; use filesys::file_exists::file_exists; use filesys::file_read_bytes::file_read_bytes; use filesys::file_size::file_size; -use google_drive_common::google_drive_download_command::GoogleDriveDownloadCommand; +use google_drive_downloader::google_drive_download_command::GoogleDriveDownloadCommand; use hashing::sha256::sha256_hash_file::sha256_hash_file; use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; use mysql_queries::queries::model_weights::create::create_weight; diff --git a/crates/service/job/deprecated/inference_job/src/job/job_types/image_generation/sd/process_job_lora_upload.rs b/crates/service/job/deprecated/inference_job/src/job/job_types/image_generation/sd/process_job_lora_upload.rs index 415cd60bd4..e32c0b9ed9 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_types/image_generation/sd/process_job_lora_upload.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_types/image_generation/sd/process_job_lora_upload.rs @@ -12,7 +12,7 @@ use enums::by_table::model_weights::weights_category::WeightsCategory; use enums::by_table::model_weights::weights_types::WeightsType; use filesys::file_exists::file_exists; use filesys::path_to_string::path_to_string; -use google_drive_common::google_drive_download_command::GoogleDriveDownloadCommand; +use google_drive_downloader::google_drive_download_command::GoogleDriveDownloadCommand; use mysql_queries::queries::model_weights::create::create_weight::{ create_weight, CreateModelWeightsArgs, diff --git a/crates/service/job/deprecated/inference_job/src/job/job_types/image_generation/sd/process_job_sd_upload.rs b/crates/service/job/deprecated/inference_job/src/job/job_types/image_generation/sd/process_job_sd_upload.rs index 8da004bbfc..60b30cbf2e 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_types/image_generation/sd/process_job_sd_upload.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_types/image_generation/sd/process_job_sd_upload.rs @@ -13,7 +13,7 @@ use enums::by_table::model_weights::weights_category::WeightsCategory; use enums::by_table::model_weights::weights_types::WeightsType; use filesys::file_exists::file_exists; use filesys::path_to_string::path_to_string; -use google_drive_common::google_drive_download_command::GoogleDriveDownloadCommand; +use google_drive_downloader::google_drive_download_command::GoogleDriveDownloadCommand; use mysql_queries::queries::model_weights::create::create_weight::{ create_weight, CreateModelWeightsArgs, diff --git a/crates/service/job/deprecated/inference_job/src/job/job_types/workflow/upload_workflow/process_upload_workflow_job.rs b/crates/service/job/deprecated/inference_job/src/job/job_types/workflow/upload_workflow/process_upload_workflow_job.rs index 78b450c5d0..5fa9500891 100644 --- a/crates/service/job/deprecated/inference_job/src/job/job_types/workflow/upload_workflow/process_upload_workflow_job.rs +++ b/crates/service/job/deprecated/inference_job/src/job/job_types/workflow/upload_workflow/process_upload_workflow_job.rs @@ -10,7 +10,7 @@ use enums::by_table::model_weights::weights_category::WeightsCategory; use enums::by_table::model_weights::weights_types::WeightsType; use enums::common::visibility::Visibility; use filesys::file_exists::file_exists; -use google_drive_common::google_drive_download_command::GoogleDriveDownloadCommand; +use google_drive_downloader::google_drive_download_command::GoogleDriveDownloadCommand; use mysql_queries::queries::generic_inference::job::list_available_generic_inference_jobs::AvailableInferenceJob; use mysql_queries::queries::model_weights::create::create_weight; use mysql_queries::queries::model_weights::create::create_weight::CreateModelWeightsArgs; diff --git a/crates/service/job/deprecated/tts_download_job/Cargo.toml b/crates/service/job/deprecated/tts_download_job/Cargo.toml index 8e9dd0a4e9..f09478c237 100644 --- a/crates/service/job/deprecated/tts_download_job/Cargo.toml +++ b/crates/service/job/deprecated/tts_download_job/Cargo.toml @@ -25,7 +25,7 @@ easyenv = { path = "../../../../lib/easyenv" } enums.workspace = true errors.workspace = true filesys.workspace = true -google_drive_common = { path = "../../../../api_clients/google_drive_common" } +google_drive_downloader = { path = "../../../../api_clients/google_drive_downloader" } hashing = { path = "../../../../lib/files/hashing" } jobs_common = { path = "../../../../lib/jobs_common" } mysql_queries = { path = "../../../../schema/database/mysql_queries" } diff --git a/crates/service/job/deprecated/tts_download_job/src/main.rs b/crates/service/job/deprecated/tts_download_job/src/main.rs index edff5198ef..765a36093a 100644 --- a/crates/service/job/deprecated/tts_download_job/src/main.rs +++ b/crates/service/job/deprecated/tts_download_job/src/main.rs @@ -41,7 +41,7 @@ use filesys::check_directory_exists::check_directory_exists; use filesys::check_file_exists::check_file_exists; use filesys::file_deletion::safe_delete_directory::safe_delete_directory; use filesys::file_deletion::safe_delete_file::safe_delete_file; -use google_drive_common::google_drive_download_command::GoogleDriveDownloadCommand; +use google_drive_downloader::google_drive_download_command::GoogleDriveDownloadCommand; use hashing::sha256::sha256_hash_file::sha256_hash_file; use jobs_common::noop_logger::NoOpLogger; use jobs_common::redis_job_status_logger::RedisJobStatusLogger; diff --git a/crates/service/job/deprecated/w2l_download_job/Cargo.toml b/crates/service/job/deprecated/w2l_download_job/Cargo.toml index f29e90e465..ca39440dd5 100644 --- a/crates/service/job/deprecated/w2l_download_job/Cargo.toml +++ b/crates/service/job/deprecated/w2l_download_job/Cargo.toml @@ -26,7 +26,7 @@ config = { path = "../../../../lib/deprecated/config" } easyenv = { path = "../../../../lib/easyenv" } errors.workspace = true filesys.workspace = true -google_drive_common = { path = "../../../../api_clients/google_drive_common" } +google_drive_downloader = { path = "../../../../api_clients/google_drive_downloader" } hashing = { path = "../../../../lib/files/hashing" } jobs_common = { path = "../../../../lib/jobs_common" } mysql_queries = { path = "../../../../schema/database/mysql_queries" } diff --git a/crates/service/job/deprecated/w2l_download_job/src/main.rs b/crates/service/job/deprecated/w2l_download_job/src/main.rs index c82c14e4e8..9b81e05322 100644 --- a/crates/service/job/deprecated/w2l_download_job/src/main.rs +++ b/crates/service/job/deprecated/w2l_download_job/src/main.rs @@ -39,7 +39,7 @@ use filesys::check_directory_exists::check_directory_exists; use filesys::check_file_exists::check_file_exists; use filesys::file_deletion::safe_delete_directory::safe_delete_directory; use filesys::file_deletion::safe_delete_file::safe_delete_file; -use google_drive_common::google_drive_download_command::GoogleDriveDownloadCommand; +use google_drive_downloader::google_drive_download_command::GoogleDriveDownloadCommand; use hashing::sha256::sha256_hash_file::sha256_hash_file; use jobs_common::noop_logger::NoOpLogger; use jobs_common::redis_job_status_logger::RedisJobStatusLogger; diff --git a/crates/service/job/deprecated/w2l_inference_job/Cargo.toml b/crates/service/job/deprecated/w2l_inference_job/Cargo.toml index 0f6db05494..95e0671598 100644 --- a/crates/service/job/deprecated/w2l_inference_job/Cargo.toml +++ b/crates/service/job/deprecated/w2l_inference_job/Cargo.toml @@ -27,7 +27,7 @@ config = { path = "../../../../lib/deprecated/config" } easyenv = { path = "../../../../lib/easyenv" } errors.workspace = true filesys.workspace = true -google_drive_common = { path = "../../../../api_clients/google_drive_common" } +google_drive_downloader = { path = "../../../../api_clients/google_drive_downloader" } jobs_common = { path = "../../../../lib/jobs_common" } mysql_queries = { path = "../../../../schema/database/mysql_queries" } diff --git a/crates/service/job/deprecated/w2l_inference_job/src/main.rs b/crates/service/job/deprecated/w2l_inference_job/src/main.rs index f555377950..0c1cf7256f 100644 --- a/crates/service/job/deprecated/w2l_inference_job/src/main.rs +++ b/crates/service/job/deprecated/w2l_inference_job/src/main.rs @@ -41,7 +41,7 @@ use filesys::check_directory_exists::check_directory_exists; use filesys::check_file_exists::check_file_exists; use filesys::file_deletion::safe_delete_directory::safe_delete_directory; use filesys::file_deletion::safe_delete_file::safe_delete_file; -use google_drive_common::google_drive_download_command::GoogleDriveDownloadCommand; +use google_drive_downloader::google_drive_download_command::GoogleDriveDownloadCommand; use jobs_common::noop_logger::NoOpLogger; use jobs_common::redis_job_status_logger::RedisJobStatusLogger; use jobs_common::semi_persistent_cache_dir::SemiPersistentCacheDir;