rename google_drive_common -> google_drive_downloader

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",

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",

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

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]

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"

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)

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

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;

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;

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" }

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;

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,

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,

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;

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" }

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;

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" }

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;

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" }
 

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;