diff --git a/Cargo.lock b/Cargo.lock index 62703108f6..4c746015a7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2765,7 +2765,7 @@ dependencies = [ "log", "mimetypes", "mysql_queries", - "rand 0.8.5", + "rand 0.9.1", "sqlx", "storyteller_root", "tokens", diff --git a/Cargo.toml b/Cargo.toml index 02d95bec34..6e92078e87 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,6 +4,18 @@ resolver = "2" # This block defines the workspace members. # When we add a library or binary crate, it needs an entry here. members = [ + # API clients for external services + # These might be custom implementations or wrappers over other client libraries. + "crates/api_clients/cloud_storage", + "crates/api_clients/fal_client", + "crates/api_clients/google_drive_common", + "crates/api_clients/google_sign_in", + "crates/api_clients/openai_sora_client", + "crates/api_clients/openart_client", + "crates/api_clients/runwayml_client", + "crates/api_clients/storyteller_client", + "crates/api_clients/thumbnail_generator", + # CLI tools for operations, etc. "crates/cli/devenv/dev-database-seed", "crates/cli/devenv/dev-upload-media-file", @@ -22,15 +34,6 @@ members = [ # Shared libraries "crates/lib/actix_cors_configs", "crates/lib/actix_helpers", - "crates/lib/api_clients/cloud_storage", - "crates/lib/api_clients/fal_client", - "crates/lib/api_clients/google_drive_common", - "crates/lib/api_clients/google_sign_in", - "crates/lib/api_clients/openai_sora_client", - "crates/lib/api_clients/openart_client", - "crates/lib/api_clients/runwayml_client", - "crates/lib/api_clients/storyteller_client", - "crates/lib/api_clients/thumbnail_generator", "crates/lib/bootstrap", "crates/lib/bucket_paths", "crates/lib/build_metadata", @@ -210,11 +213,12 @@ url = { version = "2.5.4", features = ["serde"] } # Internal libs artcraft_api_defs = { path = "crates/schema/public/api/artcraft_api_defs" } build_metadata = { path = "crates/lib/build_metadata" } +cloud_storage = { path = "crates/api_clients/cloud_storage" } crockford = { path = "crates/lib/data/crockford" } enums = { path = "crates/schema/public/enums" } enums_public = { path = "crates/schema/public/enums_public" } errors = { path = "crates/lib/errors" } -fal_client = { path = "crates/lib/api_clients/fal_client" } +fal_client = { path = "crates/api_clients/fal_client" } file_to_base64_url = { path = "crates/lib/files/file_to_base64_url" } filesys = { path = "crates/lib/files/filesys" } idempotency = { path = "crates/lib/idempotency" } @@ -223,10 +227,10 @@ jwt_light = { path = "crates/lib/jwt_light" } memory_caching = { path = "crates/lib/caching/memory_caching" } memory_store = { path = "crates/lib/caching/memory_store" } mimetypes = { path = "crates/lib/files/mimetypes" } -openai_sora_client = { path = "crates/lib/api_clients/openai_sora_client" } +openai_sora_client = { path = "crates/api_clients/openai_sora_client" } primitives = { path = "crates/lib/data/primitives" } shared_service_components = { path = "crates/lib/shared_service_components" } -storyteller_client = { path = "crates/lib/api_clients/storyteller_client" } +storyteller_client = { path = "crates/api_clients/storyteller_client" } subprocess_common = { path = "crates/lib/subprocess_common" } tokens = { path = "crates/schema/public/tokens" } -web_base64= { path = "crates/lib/data/web_base64" } +web_base64 = { path = "crates/lib/data/web_base64" } diff --git a/crates/api_clients/cloud_storage/Cargo.toml b/crates/api_clients/cloud_storage/Cargo.toml new file mode 100644 index 0000000000..20f74c5f0f --- /dev/null +++ b/crates/api_clients/cloud_storage/Cargo.toml @@ -0,0 +1,42 @@ +[package] +name = "cloud_storage" +edition = "2018" +version = "0.0.1" +authors = [ + "Brandon Thomas ", + "Brandon Thomas ", +] +publish = false + +[lib] +name = "cloud_storage" +path = "src/lib.rs" + +[package.metadata.cargo-udeps.ignore] +normal = ["workspace-build-acceleration"] + +[dependencies] +# Workspace hack (faster compile times) +workspace-build-acceleration.workspace = true + +# Internal +bucket_paths = { path = "../../lib/bucket_paths" } +crockford.workspace = true +easyenv = { path = "../../lib/easyenv" } +errors.workspace = true +filesys.workspace = true +hashing = { path = "../../lib/files/hashing" } +mimetypes.workspace = true +storyteller_root = { path = "../../lib/storyteller_root" } + +# External +anyhow.workspace = true +log.workspace = true +env_logger = "0.11.3" +async-trait = "0.1.75" +# 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" } + +# Runtime +tokio.workspace = true diff --git a/crates/lib/api_clients/cloud_storage/src/bucket_client.rs b/crates/api_clients/cloud_storage/src/bucket_client.rs similarity index 100% rename from crates/lib/api_clients/cloud_storage/src/bucket_client.rs rename to crates/api_clients/cloud_storage/src/bucket_client.rs diff --git a/crates/lib/api_clients/cloud_storage/src/lib.rs b/crates/api_clients/cloud_storage/src/lib.rs similarity index 100% rename from crates/lib/api_clients/cloud_storage/src/lib.rs rename to crates/api_clients/cloud_storage/src/lib.rs diff --git a/crates/lib/api_clients/cloud_storage/src/remote_file_manager/bucket_orchestration.rs b/crates/api_clients/cloud_storage/src/remote_file_manager/bucket_orchestration.rs similarity index 100% rename from crates/lib/api_clients/cloud_storage/src/remote_file_manager/bucket_orchestration.rs rename to crates/api_clients/cloud_storage/src/remote_file_manager/bucket_orchestration.rs diff --git a/crates/lib/api_clients/cloud_storage/src/remote_file_manager/file_meta_data.rs b/crates/api_clients/cloud_storage/src/remote_file_manager/file_meta_data.rs similarity index 100% rename from crates/lib/api_clients/cloud_storage/src/remote_file_manager/file_meta_data.rs rename to crates/api_clients/cloud_storage/src/remote_file_manager/file_meta_data.rs diff --git a/crates/lib/api_clients/cloud_storage/src/remote_file_manager/mod.rs b/crates/api_clients/cloud_storage/src/remote_file_manager/mod.rs similarity index 100% rename from crates/lib/api_clients/cloud_storage/src/remote_file_manager/mod.rs rename to crates/api_clients/cloud_storage/src/remote_file_manager/mod.rs diff --git a/crates/lib/api_clients/cloud_storage/src/remote_file_manager/remote_cloud_file_manager.rs b/crates/api_clients/cloud_storage/src/remote_file_manager/remote_cloud_file_manager.rs similarity index 100% rename from crates/lib/api_clients/cloud_storage/src/remote_file_manager/remote_cloud_file_manager.rs rename to crates/api_clients/cloud_storage/src/remote_file_manager/remote_cloud_file_manager.rs diff --git a/crates/lib/api_clients/fakeyou_client/Cargo.toml b/crates/api_clients/fakeyou_client/Cargo.toml similarity index 52% rename from crates/lib/api_clients/fakeyou_client/Cargo.toml rename to crates/api_clients/fakeyou_client/Cargo.toml index 3f529409dc..db62b5d498 100644 --- a/crates/lib/api_clients/fakeyou_client/Cargo.toml +++ b/crates/api_clients/fakeyou_client/Cargo.toml @@ -8,27 +8,33 @@ authors = [ ] publish = false +[package.metadata.cargo-udeps.ignore] +normal = ["workspace-build-acceleration"] + [lib] name = "fakeyou_client" path = "src/lib.rs" [dependencies] +# Workspace hack (faster compile times) +workspace-build-acceleration.workspace = true + # Internal -enums = { path = "../../../schema/public/enums" } -errors = { path = "../../errors" } -tokens = { path = "../../../schema/public/tokens" } +enums.workspace = true +errors.workspace = true +tokens.workspace = true # External -bytes = "1.3" -chrono = { version = "0.4.22", features = ["serde"] } -log = "0.4.14" -once_cell = "1.9.0" +bytes.workspace = true +chrono.workspace = true +log.workspace = true +once_cell.workspace = true # Serialization -serde = "1.0.125" -serde_derive = "1.0.125" -serde_json = "1.0.64" -toml = "0.5.8" +serde.workspace = true +serde_derive.workspace = true +serde_json.workspace = true +toml.workspace = true # HTTP backoff = { version = "0.4.0", features = ["futures"] } # Exponential backoff retry diff --git a/crates/lib/api_clients/fakeyou_client/src/api/mod.rs b/crates/api_clients/fakeyou_client/src/api/mod.rs similarity index 100% rename from crates/lib/api_clients/fakeyou_client/src/api/mod.rs rename to crates/api_clients/fakeyou_client/src/api/mod.rs diff --git a/crates/lib/api_clients/fakeyou_client/src/api/tts_inference.rs b/crates/api_clients/fakeyou_client/src/api/tts_inference.rs similarity index 100% rename from crates/lib/api_clients/fakeyou_client/src/api/tts_inference.rs rename to crates/api_clients/fakeyou_client/src/api/tts_inference.rs diff --git a/crates/lib/api_clients/fakeyou_client/src/credentials.rs b/crates/api_clients/fakeyou_client/src/credentials.rs similarity index 100% rename from crates/lib/api_clients/fakeyou_client/src/credentials.rs rename to crates/api_clients/fakeyou_client/src/credentials.rs diff --git a/crates/lib/api_clients/fakeyou_client/src/fakeyou_api_client.rs b/crates/api_clients/fakeyou_client/src/fakeyou_api_client.rs similarity index 100% rename from crates/lib/api_clients/fakeyou_client/src/fakeyou_api_client.rs rename to crates/api_clients/fakeyou_client/src/fakeyou_api_client.rs diff --git a/crates/lib/api_clients/fakeyou_client/src/get_audio_url.rs b/crates/api_clients/fakeyou_client/src/get_audio_url.rs similarity index 100% rename from crates/lib/api_clients/fakeyou_client/src/get_audio_url.rs rename to crates/api_clients/fakeyou_client/src/get_audio_url.rs diff --git a/crates/lib/api_clients/fakeyou_client/src/lib.rs b/crates/api_clients/fakeyou_client/src/lib.rs similarity index 100% rename from crates/lib/api_clients/fakeyou_client/src/lib.rs rename to crates/api_clients/fakeyou_client/src/lib.rs diff --git a/crates/lib/api_clients/fal_client/Cargo.toml b/crates/api_clients/fal_client/Cargo.toml similarity index 52% rename from crates/lib/api_clients/fal_client/Cargo.toml rename to crates/api_clients/fal_client/Cargo.toml index 3fbe4cdba1..eeabae067e 100644 --- a/crates/lib/api_clients/fal_client/Cargo.toml +++ b/crates/api_clients/fal_client/Cargo.toml @@ -12,27 +12,26 @@ name = "fal_client" path = "src/lib.rs" [dependencies] - # Workspace hack (faster compile times) -workspace-build-acceleration = { workspace = true } +workspace-build-acceleration.workspace = true # Internal -file_to_base64_url = { workspace = true } -errors = { workspace = true } +file_to_base64_url.workspace = true +errors.workspace = true # External -anyhow = { workspace = true } -futures = { workspace = true } -log = { workspace = true } -reqwest = { workspace = true } -serde = { workspace = true } -tokio = { workspace = true } -url = { workspace = true } +anyhow.workspace = true +futures.workspace = true +log.workspace = true +reqwest.workspace = true +serde.workspace = true +tokio.workspace = true +url.workspace = true # For now, we'll vendor in fal. # We need to implement webhooks and the upstream doesn't support them yet. #fal = { version = "0.3.6", features = ["endpoints"] } -fal = { path = "../../../vendor/fal-rs", features = ["endpoints"] } +fal = { path = "../../vendor/fal-rs", features = ["endpoints"] } [dev-dependencies] -testing = { path = "../../testing" } +testing = { path = "../../lib/testing" } diff --git a/crates/lib/api_clients/fal_client/src/creds/fal_api_key.rs b/crates/api_clients/fal_client/src/creds/fal_api_key.rs similarity index 100% rename from crates/lib/api_clients/fal_client/src/creds/fal_api_key.rs rename to crates/api_clients/fal_client/src/creds/fal_api_key.rs diff --git a/crates/lib/api_clients/fal_client/src/creds/mod.rs b/crates/api_clients/fal_client/src/creds/mod.rs similarity index 100% rename from crates/lib/api_clients/fal_client/src/creds/mod.rs rename to crates/api_clients/fal_client/src/creds/mod.rs diff --git a/crates/lib/api_clients/fal_client/src/error/classify_fal_error.rs b/crates/api_clients/fal_client/src/error/classify_fal_error.rs similarity index 100% rename from crates/lib/api_clients/fal_client/src/error/classify_fal_error.rs rename to crates/api_clients/fal_client/src/error/classify_fal_error.rs diff --git a/crates/lib/api_clients/fal_client/src/error/fal_error_plus.rs b/crates/api_clients/fal_client/src/error/fal_error_plus.rs similarity index 100% rename from crates/lib/api_clients/fal_client/src/error/fal_error_plus.rs rename to crates/api_clients/fal_client/src/error/fal_error_plus.rs diff --git a/crates/lib/api_clients/fal_client/src/error/mod.rs b/crates/api_clients/fal_client/src/error/mod.rs similarity index 100% rename from crates/lib/api_clients/fal_client/src/error/mod.rs rename to crates/api_clients/fal_client/src/error/mod.rs diff --git a/crates/lib/api_clients/fal_client/src/lib.rs b/crates/api_clients/fal_client/src/lib.rs similarity index 100% rename from crates/lib/api_clients/fal_client/src/lib.rs rename to crates/api_clients/fal_client/src/lib.rs diff --git a/crates/lib/api_clients/fal_client/src/model/enqueued_request.rs b/crates/api_clients/fal_client/src/model/enqueued_request.rs similarity index 100% rename from crates/lib/api_clients/fal_client/src/model/enqueued_request.rs rename to crates/api_clients/fal_client/src/model/enqueued_request.rs diff --git a/crates/lib/api_clients/fal_client/src/model/fal_endpoint.rs b/crates/api_clients/fal_client/src/model/fal_endpoint.rs similarity index 100% rename from crates/lib/api_clients/fal_client/src/model/fal_endpoint.rs rename to crates/api_clients/fal_client/src/model/fal_endpoint.rs diff --git a/crates/lib/api_clients/fal_client/src/model/fal_request_id.rs b/crates/api_clients/fal_client/src/model/fal_request_id.rs similarity index 100% rename from crates/lib/api_clients/fal_client/src/model/fal_request_id.rs rename to crates/api_clients/fal_client/src/model/fal_request_id.rs diff --git a/crates/lib/api_clients/fal_client/src/model/mod.rs b/crates/api_clients/fal_client/src/model/mod.rs similarity index 100% rename from crates/lib/api_clients/fal_client/src/model/mod.rs rename to crates/api_clients/fal_client/src/model/mod.rs diff --git a/crates/lib/api_clients/fal_client/src/requests/mod.rs b/crates/api_clients/fal_client/src/requests/mod.rs similarity index 100% rename from crates/lib/api_clients/fal_client/src/requests/mod.rs rename to crates/api_clients/fal_client/src/requests/mod.rs diff --git a/crates/lib/api_clients/fal_client/src/requests/queue/enqueue_hunyuan2_image_to_3d.rs b/crates/api_clients/fal_client/src/requests/queue/enqueue_hunyuan2_image_to_3d.rs similarity index 100% rename from crates/lib/api_clients/fal_client/src/requests/queue/enqueue_hunyuan2_image_to_3d.rs rename to crates/api_clients/fal_client/src/requests/queue/enqueue_hunyuan2_image_to_3d.rs diff --git a/crates/lib/api_clients/fal_client/src/requests/queue/image_gen/enqueue_flux_pro_11_ultra_text_to_image.rs b/crates/api_clients/fal_client/src/requests/queue/image_gen/enqueue_flux_pro_11_ultra_text_to_image.rs similarity index 100% rename from crates/lib/api_clients/fal_client/src/requests/queue/image_gen/enqueue_flux_pro_11_ultra_text_to_image.rs rename to crates/api_clients/fal_client/src/requests/queue/image_gen/enqueue_flux_pro_11_ultra_text_to_image.rs diff --git a/crates/lib/api_clients/fal_client/src/requests/queue/image_gen/enqueue_recraft3_text_to_image.rs b/crates/api_clients/fal_client/src/requests/queue/image_gen/enqueue_recraft3_text_to_image.rs similarity index 100% rename from crates/lib/api_clients/fal_client/src/requests/queue/image_gen/enqueue_recraft3_text_to_image.rs rename to crates/api_clients/fal_client/src/requests/queue/image_gen/enqueue_recraft3_text_to_image.rs diff --git a/crates/lib/api_clients/fal_client/src/requests/queue/image_gen/mod.rs b/crates/api_clients/fal_client/src/requests/queue/image_gen/mod.rs similarity index 100% rename from crates/lib/api_clients/fal_client/src/requests/queue/image_gen/mod.rs rename to crates/api_clients/fal_client/src/requests/queue/image_gen/mod.rs diff --git a/crates/lib/api_clients/fal_client/src/requests/queue/mod.rs b/crates/api_clients/fal_client/src/requests/queue/mod.rs similarity index 100% rename from crates/lib/api_clients/fal_client/src/requests/queue/mod.rs rename to crates/api_clients/fal_client/src/requests/queue/mod.rs diff --git a/crates/lib/api_clients/fal_client/src/requests/queue/remove_background_rembg.rs b/crates/api_clients/fal_client/src/requests/queue/remove_background_rembg.rs similarity index 100% rename from crates/lib/api_clients/fal_client/src/requests/queue/remove_background_rembg.rs rename to crates/api_clients/fal_client/src/requests/queue/remove_background_rembg.rs diff --git a/crates/lib/api_clients/fal_client/src/requests/queue/video_gen/enqueue_kling_16_pro_image_to_video.rs b/crates/api_clients/fal_client/src/requests/queue/video_gen/enqueue_kling_16_pro_image_to_video.rs similarity index 100% rename from crates/lib/api_clients/fal_client/src/requests/queue/video_gen/enqueue_kling_16_pro_image_to_video.rs rename to crates/api_clients/fal_client/src/requests/queue/video_gen/enqueue_kling_16_pro_image_to_video.rs diff --git a/crates/lib/api_clients/fal_client/src/requests/queue/video_gen/enqueue_minimax_01_image_to_video.rs b/crates/api_clients/fal_client/src/requests/queue/video_gen/enqueue_minimax_01_image_to_video.rs similarity index 100% rename from crates/lib/api_clients/fal_client/src/requests/queue/video_gen/enqueue_minimax_01_image_to_video.rs rename to crates/api_clients/fal_client/src/requests/queue/video_gen/enqueue_minimax_01_image_to_video.rs diff --git a/crates/lib/api_clients/fal_client/src/requests/queue/video_gen/mod.rs b/crates/api_clients/fal_client/src/requests/queue/video_gen/mod.rs similarity index 100% rename from crates/lib/api_clients/fal_client/src/requests/queue/video_gen/mod.rs rename to crates/api_clients/fal_client/src/requests/queue/video_gen/mod.rs diff --git a/crates/lib/api_clients/fal_client/src/requests/webhook/image/enqueue_flux_1_dev_text_to_image_webhook.rs b/crates/api_clients/fal_client/src/requests/webhook/image/enqueue_flux_1_dev_text_to_image_webhook.rs similarity index 100% rename from crates/lib/api_clients/fal_client/src/requests/webhook/image/enqueue_flux_1_dev_text_to_image_webhook.rs rename to crates/api_clients/fal_client/src/requests/webhook/image/enqueue_flux_1_dev_text_to_image_webhook.rs diff --git a/crates/lib/api_clients/fal_client/src/requests/webhook/image/enqueue_flux_1_schnell_text_to_image_webhook.rs b/crates/api_clients/fal_client/src/requests/webhook/image/enqueue_flux_1_schnell_text_to_image_webhook.rs similarity index 100% rename from crates/lib/api_clients/fal_client/src/requests/webhook/image/enqueue_flux_1_schnell_text_to_image_webhook.rs rename to crates/api_clients/fal_client/src/requests/webhook/image/enqueue_flux_1_schnell_text_to_image_webhook.rs diff --git a/crates/lib/api_clients/fal_client/src/requests/webhook/image/enqueue_flux_pro_11_text_to_image_webhook.rs b/crates/api_clients/fal_client/src/requests/webhook/image/enqueue_flux_pro_11_text_to_image_webhook.rs similarity index 100% rename from crates/lib/api_clients/fal_client/src/requests/webhook/image/enqueue_flux_pro_11_text_to_image_webhook.rs rename to crates/api_clients/fal_client/src/requests/webhook/image/enqueue_flux_pro_11_text_to_image_webhook.rs diff --git a/crates/lib/api_clients/fal_client/src/requests/webhook/image/enqueue_flux_pro_11_ultra_text_to_image_webhook.rs b/crates/api_clients/fal_client/src/requests/webhook/image/enqueue_flux_pro_11_ultra_text_to_image_webhook.rs similarity index 100% rename from crates/lib/api_clients/fal_client/src/requests/webhook/image/enqueue_flux_pro_11_ultra_text_to_image_webhook.rs rename to crates/api_clients/fal_client/src/requests/webhook/image/enqueue_flux_pro_11_ultra_text_to_image_webhook.rs diff --git a/crates/lib/api_clients/fal_client/src/requests/webhook/image/mod.rs b/crates/api_clients/fal_client/src/requests/webhook/image/mod.rs similarity index 100% rename from crates/lib/api_clients/fal_client/src/requests/webhook/image/mod.rs rename to crates/api_clients/fal_client/src/requests/webhook/image/mod.rs diff --git a/crates/lib/api_clients/fal_client/src/requests/webhook/image/remove_background_rembg_webhook.rs b/crates/api_clients/fal_client/src/requests/webhook/image/remove_background_rembg_webhook.rs similarity index 100% rename from crates/lib/api_clients/fal_client/src/requests/webhook/image/remove_background_rembg_webhook.rs rename to crates/api_clients/fal_client/src/requests/webhook/image/remove_background_rembg_webhook.rs diff --git a/crates/lib/api_clients/fal_client/src/requests/webhook/mod.rs b/crates/api_clients/fal_client/src/requests/webhook/mod.rs similarity index 100% rename from crates/lib/api_clients/fal_client/src/requests/webhook/mod.rs rename to crates/api_clients/fal_client/src/requests/webhook/mod.rs diff --git a/crates/lib/api_clients/fal_client/src/requests/webhook/object/enqueue_hunyuan_3d_21_image_to_3d_webhook.rs b/crates/api_clients/fal_client/src/requests/webhook/object/enqueue_hunyuan_3d_21_image_to_3d_webhook.rs similarity index 100% rename from crates/lib/api_clients/fal_client/src/requests/webhook/object/enqueue_hunyuan_3d_21_image_to_3d_webhook.rs rename to crates/api_clients/fal_client/src/requests/webhook/object/enqueue_hunyuan_3d_21_image_to_3d_webhook.rs diff --git a/crates/lib/api_clients/fal_client/src/requests/webhook/object/enqueue_hunyuan_3d_2_image_to_3d_webhook.rs b/crates/api_clients/fal_client/src/requests/webhook/object/enqueue_hunyuan_3d_2_image_to_3d_webhook.rs similarity index 100% rename from crates/lib/api_clients/fal_client/src/requests/webhook/object/enqueue_hunyuan_3d_2_image_to_3d_webhook.rs rename to crates/api_clients/fal_client/src/requests/webhook/object/enqueue_hunyuan_3d_2_image_to_3d_webhook.rs diff --git a/crates/lib/api_clients/fal_client/src/requests/webhook/object/mod.rs b/crates/api_clients/fal_client/src/requests/webhook/object/mod.rs similarity index 100% rename from crates/lib/api_clients/fal_client/src/requests/webhook/object/mod.rs rename to crates/api_clients/fal_client/src/requests/webhook/object/mod.rs diff --git a/crates/lib/api_clients/fal_client/src/requests/webhook/video/enqueue_kling_16_pro_image_to_video_webhook.rs b/crates/api_clients/fal_client/src/requests/webhook/video/enqueue_kling_16_pro_image_to_video_webhook.rs similarity index 100% rename from crates/lib/api_clients/fal_client/src/requests/webhook/video/enqueue_kling_16_pro_image_to_video_webhook.rs rename to crates/api_clients/fal_client/src/requests/webhook/video/enqueue_kling_16_pro_image_to_video_webhook.rs diff --git a/crates/lib/api_clients/fal_client/src/requests/webhook/video/enqueue_kling_21_master_image_to_video_webhook.rs b/crates/api_clients/fal_client/src/requests/webhook/video/enqueue_kling_21_master_image_to_video_webhook.rs similarity index 100% rename from crates/lib/api_clients/fal_client/src/requests/webhook/video/enqueue_kling_21_master_image_to_video_webhook.rs rename to crates/api_clients/fal_client/src/requests/webhook/video/enqueue_kling_21_master_image_to_video_webhook.rs diff --git a/crates/lib/api_clients/fal_client/src/requests/webhook/video/enqueue_kling_21_pro_image_to_video_webhook.rs b/crates/api_clients/fal_client/src/requests/webhook/video/enqueue_kling_21_pro_image_to_video_webhook.rs similarity index 100% rename from crates/lib/api_clients/fal_client/src/requests/webhook/video/enqueue_kling_21_pro_image_to_video_webhook.rs rename to crates/api_clients/fal_client/src/requests/webhook/video/enqueue_kling_21_pro_image_to_video_webhook.rs diff --git a/crates/lib/api_clients/fal_client/src/requests/webhook/video/enqueue_seedance_1_lite_image_to_video_webhook.rs b/crates/api_clients/fal_client/src/requests/webhook/video/enqueue_seedance_1_lite_image_to_video_webhook.rs similarity index 100% rename from crates/lib/api_clients/fal_client/src/requests/webhook/video/enqueue_seedance_1_lite_image_to_video_webhook.rs rename to crates/api_clients/fal_client/src/requests/webhook/video/enqueue_seedance_1_lite_image_to_video_webhook.rs diff --git a/crates/lib/api_clients/fal_client/src/requests/webhook/video/enqueue_veo_2_image_to_video_webhook.rs b/crates/api_clients/fal_client/src/requests/webhook/video/enqueue_veo_2_image_to_video_webhook.rs similarity index 100% rename from crates/lib/api_clients/fal_client/src/requests/webhook/video/enqueue_veo_2_image_to_video_webhook.rs rename to crates/api_clients/fal_client/src/requests/webhook/video/enqueue_veo_2_image_to_video_webhook.rs diff --git a/crates/lib/api_clients/fal_client/src/requests/webhook/video/mod.rs b/crates/api_clients/fal_client/src/requests/webhook/video/mod.rs similarity index 100% rename from crates/lib/api_clients/fal_client/src/requests/webhook/video/mod.rs rename to crates/api_clients/fal_client/src/requests/webhook/video/mod.rs diff --git a/crates/lib/api_clients/fal_client/src/utils/clone_queue_payload.rs b/crates/api_clients/fal_client/src/utils/clone_queue_payload.rs similarity index 100% rename from crates/lib/api_clients/fal_client/src/utils/clone_queue_payload.rs rename to crates/api_clients/fal_client/src/utils/clone_queue_payload.rs diff --git a/crates/lib/api_clients/fal_client/src/utils/clone_queue_response.rs b/crates/api_clients/fal_client/src/utils/clone_queue_response.rs similarity index 100% rename from crates/lib/api_clients/fal_client/src/utils/clone_queue_response.rs rename to crates/api_clients/fal_client/src/utils/clone_queue_response.rs diff --git a/crates/lib/api_clients/fal_client/src/utils/mod.rs b/crates/api_clients/fal_client/src/utils/mod.rs similarity index 100% rename from crates/lib/api_clients/fal_client/src/utils/mod.rs rename to crates/api_clients/fal_client/src/utils/mod.rs diff --git a/crates/lib/api_clients/fal_client/src/utils/queue_status_checker.rs b/crates/api_clients/fal_client/src/utils/queue_status_checker.rs similarity index 100% rename from crates/lib/api_clients/fal_client/src/utils/queue_status_checker.rs rename to crates/api_clients/fal_client/src/utils/queue_status_checker.rs diff --git a/crates/lib/api_clients/google_drive_common/Cargo.toml b/crates/api_clients/google_drive_common/Cargo.toml similarity index 58% rename from crates/lib/api_clients/google_drive_common/Cargo.toml rename to crates/api_clients/google_drive_common/Cargo.toml index c15e528624..8f575ca32a 100644 --- a/crates/lib/api_clients/google_drive_common/Cargo.toml +++ b/crates/api_clients/google_drive_common/Cargo.toml @@ -8,25 +8,24 @@ authors = [ ] publish = false +[package.metadata.cargo-udeps.ignore] +normal = ["workspace-build-acceleration"] + [lib] name = "google_drive_common" path = "src/lib.rs" -[package.metadata.cargo-udeps.ignore] -normal = ["workspace-build-acceleration"] - [dependencies] +# Workspace hack (faster compile times) +workspace-build-acceleration.workspace = true # Internal -crockford = { path = "../../data/crockford" } -errors = { path = "../../errors" } -subprocess_common = { path = "../../subprocess_common" } - -# Workspace hack (faster compile times) -workspace-build-acceleration = { version = "0.1", path = "../../../workspace-build-acceleration" } +crockford.workspace = true +errors.workspace = true +subprocess_common = { path = "../../lib/subprocess_common" } # External -anyhow = "1.0.86" -log = "0.4.14" -tempdir = "0.3.7" +anyhow.workspace = true +log.workspace = true +tempdir.workspace = true diff --git a/crates/lib/api_clients/google_drive_common/src/google_drive_download_command.rs b/crates/api_clients/google_drive_common/src/google_drive_download_command.rs similarity index 100% rename from crates/lib/api_clients/google_drive_common/src/google_drive_download_command.rs rename to crates/api_clients/google_drive_common/src/google_drive_download_command.rs diff --git a/crates/lib/api_clients/google_drive_common/src/lib.rs b/crates/api_clients/google_drive_common/src/lib.rs similarity index 100% rename from crates/lib/api_clients/google_drive_common/src/lib.rs rename to crates/api_clients/google_drive_common/src/lib.rs diff --git a/crates/lib/api_clients/google_sign_in/Cargo.toml b/crates/api_clients/google_sign_in/Cargo.toml similarity index 74% rename from crates/lib/api_clients/google_sign_in/Cargo.toml rename to crates/api_clients/google_sign_in/Cargo.toml index 807300e31a..efddbc8c12 100644 --- a/crates/lib/api_clients/google_sign_in/Cargo.toml +++ b/crates/api_clients/google_sign_in/Cargo.toml @@ -8,20 +8,20 @@ authors = [ ] publish = false +[package.metadata.cargo-udeps.ignore] +normal = ["workspace-build-acceleration"] + [lib] # NB: Public "google_sign_in" crate does not exist, so we're fine to use this internally. name = "google_sign_in" path = "src/lib.rs" -[package.metadata.cargo-udeps.ignore] -normal = ["workspace-build-acceleration"] - [dependencies] # Workspace hack (faster compile times) -workspace-build-acceleration = { version = "0.1", path = "../../../workspace-build-acceleration" } +workspace-build-acceleration.workspace = true # Internal -errors = { path = "../../errors" } +errors.workspace = true # External @@ -29,13 +29,13 @@ errors = { path = "../../errors" } jwt-simple = { version = "0.12.10" , default-features=false, features=["pure-rust"] } base64 = "0.13" -reqwest = "0.12.7" +reqwest.workspace = true # Serialization -serde = "1.0.125" -serde_derive = "1.0.125" -serde_json = "1.0.108" +serde.workspace = true +serde_derive.workspace = true +serde_json.workspace = true [dev-dependencies] -testing = { path = "../../testing" } +testing = { path = "../../lib/testing" } coarsetime = "0.1.34" # To set the clock for testing diff --git a/crates/lib/api_clients/google_sign_in/src/certs/download_certs.rs b/crates/api_clients/google_sign_in/src/certs/download_certs.rs similarity index 100% rename from crates/lib/api_clients/google_sign_in/src/certs/download_certs.rs rename to crates/api_clients/google_sign_in/src/certs/download_certs.rs diff --git a/crates/lib/api_clients/google_sign_in/src/certs/jwk_to_public_key.rs b/crates/api_clients/google_sign_in/src/certs/jwk_to_public_key.rs similarity index 100% rename from crates/lib/api_clients/google_sign_in/src/certs/jwk_to_public_key.rs rename to crates/api_clients/google_sign_in/src/certs/jwk_to_public_key.rs diff --git a/crates/lib/api_clients/google_sign_in/src/certs/key_map.rs b/crates/api_clients/google_sign_in/src/certs/key_map.rs similarity index 100% rename from crates/lib/api_clients/google_sign_in/src/certs/key_map.rs rename to crates/api_clients/google_sign_in/src/certs/key_map.rs diff --git a/crates/lib/api_clients/google_sign_in/src/certs/mod.rs b/crates/api_clients/google_sign_in/src/certs/mod.rs similarity index 100% rename from crates/lib/api_clients/google_sign_in/src/certs/mod.rs rename to crates/api_clients/google_sign_in/src/certs/mod.rs diff --git a/crates/lib/api_clients/google_sign_in/src/claims/claims.rs b/crates/api_clients/google_sign_in/src/claims/claims.rs similarity index 100% rename from crates/lib/api_clients/google_sign_in/src/claims/claims.rs rename to crates/api_clients/google_sign_in/src/claims/claims.rs diff --git a/crates/lib/api_clients/google_sign_in/src/claims/google_custom_claims.rs b/crates/api_clients/google_sign_in/src/claims/google_custom_claims.rs similarity index 100% rename from crates/lib/api_clients/google_sign_in/src/claims/google_custom_claims.rs rename to crates/api_clients/google_sign_in/src/claims/google_custom_claims.rs diff --git a/crates/lib/api_clients/google_sign_in/src/claims/mod.rs b/crates/api_clients/google_sign_in/src/claims/mod.rs similarity index 100% rename from crates/lib/api_clients/google_sign_in/src/claims/mod.rs rename to crates/api_clients/google_sign_in/src/claims/mod.rs diff --git a/crates/lib/api_clients/google_sign_in/src/decode_and_verify_token_claims.rs b/crates/api_clients/google_sign_in/src/decode_and_verify_token_claims.rs similarity index 100% rename from crates/lib/api_clients/google_sign_in/src/decode_and_verify_token_claims.rs rename to crates/api_clients/google_sign_in/src/decode_and_verify_token_claims.rs diff --git a/crates/lib/api_clients/google_sign_in/src/errors.rs b/crates/api_clients/google_sign_in/src/errors.rs similarity index 100% rename from crates/lib/api_clients/google_sign_in/src/errors.rs rename to crates/api_clients/google_sign_in/src/errors.rs diff --git a/crates/lib/api_clients/google_sign_in/src/jwt/decode_jwt_header.rs b/crates/api_clients/google_sign_in/src/jwt/decode_jwt_header.rs similarity index 100% rename from crates/lib/api_clients/google_sign_in/src/jwt/decode_jwt_header.rs rename to crates/api_clients/google_sign_in/src/jwt/decode_jwt_header.rs diff --git a/crates/lib/api_clients/google_sign_in/src/jwt/mod.rs b/crates/api_clients/google_sign_in/src/jwt/mod.rs similarity index 100% rename from crates/lib/api_clients/google_sign_in/src/jwt/mod.rs rename to crates/api_clients/google_sign_in/src/jwt/mod.rs diff --git a/crates/lib/api_clients/google_sign_in/src/lib.rs b/crates/api_clients/google_sign_in/src/lib.rs similarity index 100% rename from crates/lib/api_clients/google_sign_in/src/lib.rs rename to crates/api_clients/google_sign_in/src/lib.rs diff --git a/crates/api_clients/openai_sora_client/Cargo.toml b/crates/api_clients/openai_sora_client/Cargo.toml new file mode 100644 index 0000000000..66d75d137f --- /dev/null +++ b/crates/api_clients/openai_sora_client/Cargo.toml @@ -0,0 +1,40 @@ +[package] +name = "openai_sora_client" +edition = "2024" +version = "0.0.1" +publish = false + +[package.metadata.cargo-udeps.ignore] +normal = ["workspace-build-acceleration"] + +[lib] +name = "openai_sora_client" +path = "src/lib.rs" + +[dependencies] +# Workspace hack (faster compile times) +workspace-build-acceleration.workspace = true + +# Internal +errors.workspace = true +idempotency.workspace = true + +# External +anyhow.workspace = true +base64.workspace = true +chrono.workspace = true +cookie.workspace = true +log.workspace = true +once_cell.workspace = true +rand.workspace = true +reqwest = { workspace = true, features = ["multipart", "gzip"] } +serde.workspace = true +serde_derive.workspace = true +serde_json.workspace = true +sha3.workspace = true +thiserror.workspace = true +tokio.workspace = true +toml.workspace = true + +[dev-dependencies] +testing = { path = "../../lib/testing" } diff --git a/crates/lib/api_clients/openai_sora_client/src/credentials.rs b/crates/api_clients/openai_sora_client/src/credentials.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/credentials.rs rename to crates/api_clients/openai_sora_client/src/credentials.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/creds/credential_migration.rs b/crates/api_clients/openai_sora_client/src/creds/credential_migration.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/creds/credential_migration.rs rename to crates/api_clients/openai_sora_client/src/creds/credential_migration.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/creds/mod.rs b/crates/api_clients/openai_sora_client/src/creds/mod.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/creds/mod.rs rename to crates/api_clients/openai_sora_client/src/creds/mod.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/creds/sora_cookies.rs b/crates/api_clients/openai_sora_client/src/creds/sora_cookies.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/creds/sora_cookies.rs rename to crates/api_clients/openai_sora_client/src/creds/sora_cookies.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/creds/sora_credential_set.rs b/crates/api_clients/openai_sora_client/src/creds/sora_credential_set.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/creds/sora_credential_set.rs rename to crates/api_clients/openai_sora_client/src/creds/sora_credential_set.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/creds/sora_jwt_bearer_token.rs b/crates/api_clients/openai_sora_client/src/creds/sora_jwt_bearer_token.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/creds/sora_jwt_bearer_token.rs rename to crates/api_clients/openai_sora_client/src/creds/sora_jwt_bearer_token.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/creds/sora_sentinel.rs b/crates/api_clients/openai_sora_client/src/creds/sora_sentinel.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/creds/sora_sentinel.rs rename to crates/api_clients/openai_sora_client/src/creds/sora_sentinel.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/lib.rs b/crates/api_clients/openai_sora_client/src/lib.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/lib.rs rename to crates/api_clients/openai_sora_client/src/lib.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/recipes/image_remix_with_session_auto_renew.rs b/crates/api_clients/openai_sora_client/src/recipes/image_remix_with_session_auto_renew.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/recipes/image_remix_with_session_auto_renew.rs rename to crates/api_clients/openai_sora_client/src/recipes/image_remix_with_session_auto_renew.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/recipes/image_upload_from_bytes_with_session_auto_renew.rs b/crates/api_clients/openai_sora_client/src/recipes/image_upload_from_bytes_with_session_auto_renew.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/recipes/image_upload_from_bytes_with_session_auto_renew.rs rename to crates/api_clients/openai_sora_client/src/recipes/image_upload_from_bytes_with_session_auto_renew.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/recipes/image_upload_from_file_with_session_auto_renew.rs b/crates/api_clients/openai_sora_client/src/recipes/image_upload_from_file_with_session_auto_renew.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/recipes/image_upload_from_file_with_session_auto_renew.rs rename to crates/api_clients/openai_sora_client/src/recipes/image_upload_from_file_with_session_auto_renew.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/recipes/list_sora_task_status_with_session_auto_renew.rs b/crates/api_clients/openai_sora_client/src/recipes/list_sora_task_status_with_session_auto_renew.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/recipes/list_sora_task_status_with_session_auto_renew.rs rename to crates/api_clients/openai_sora_client/src/recipes/list_sora_task_status_with_session_auto_renew.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/recipes/maybe_refresh_credentials_on_sora_error.rs b/crates/api_clients/openai_sora_client/src/recipes/maybe_refresh_credentials_on_sora_error.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/recipes/maybe_refresh_credentials_on_sora_error.rs rename to crates/api_clients/openai_sora_client/src/recipes/maybe_refresh_credentials_on_sora_error.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/recipes/maybe_upgrade_or_renew_session.rs b/crates/api_clients/openai_sora_client/src/recipes/maybe_upgrade_or_renew_session.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/recipes/maybe_upgrade_or_renew_session.rs rename to crates/api_clients/openai_sora_client/src/recipes/maybe_upgrade_or_renew_session.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/recipes/mod.rs b/crates/api_clients/openai_sora_client/src/recipes/mod.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/recipes/mod.rs rename to crates/api_clients/openai_sora_client/src/recipes/mod.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/recipes/simple_image_gen_with_session_auto_renew.rs b/crates/api_clients/openai_sora_client/src/recipes/simple_image_gen_with_session_auto_renew.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/recipes/simple_image_gen_with_session_auto_renew.rs rename to crates/api_clients/openai_sora_client/src/recipes/simple_image_gen_with_session_auto_renew.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/recipes/wait_for_image_gen_status.rs b/crates/api_clients/openai_sora_client/src/recipes/wait_for_image_gen_status.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/recipes/wait_for_image_gen_status.rs rename to crates/api_clients/openai_sora_client/src/recipes/wait_for_image_gen_status.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/requests/bearer/generate_bearer_with_cookie.rs b/crates/api_clients/openai_sora_client/src/requests/bearer/generate_bearer_with_cookie.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/requests/bearer/generate_bearer_with_cookie.rs rename to crates/api_clients/openai_sora_client/src/requests/bearer/generate_bearer_with_cookie.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/requests/bearer/mod.rs b/crates/api_clients/openai_sora_client/src/requests/bearer/mod.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/requests/bearer/mod.rs rename to crates/api_clients/openai_sora_client/src/requests/bearer/mod.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/requests/image_gen/common.rs b/crates/api_clients/openai_sora_client/src/requests/image_gen/common.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/requests/image_gen/common.rs rename to crates/api_clients/openai_sora_client/src/requests/image_gen/common.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/requests/image_gen/image_gen_http_request.rs b/crates/api_clients/openai_sora_client/src/requests/image_gen/image_gen_http_request.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/requests/image_gen/image_gen_http_request.rs rename to crates/api_clients/openai_sora_client/src/requests/image_gen/image_gen_http_request.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/requests/image_gen/image_gen_status.rs b/crates/api_clients/openai_sora_client/src/requests/image_gen/image_gen_status.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/requests/image_gen/image_gen_status.rs rename to crates/api_clients/openai_sora_client/src/requests/image_gen/image_gen_status.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/requests/image_gen/mod.rs b/crates/api_clients/openai_sora_client/src/requests/image_gen/mod.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/requests/image_gen/mod.rs rename to crates/api_clients/openai_sora_client/src/requests/image_gen/mod.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/requests/image_gen/sora_image_gen_remix.rs b/crates/api_clients/openai_sora_client/src/requests/image_gen/sora_image_gen_remix.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/requests/image_gen/sora_image_gen_remix.rs rename to crates/api_clients/openai_sora_client/src/requests/image_gen/sora_image_gen_remix.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/requests/image_gen/sora_image_gen_simple.rs b/crates/api_clients/openai_sora_client/src/requests/image_gen/sora_image_gen_simple.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/requests/image_gen/sora_image_gen_simple.rs rename to crates/api_clients/openai_sora_client/src/requests/image_gen/sora_image_gen_simple.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/requests/image_gen/test_status_response.json b/crates/api_clients/openai_sora_client/src/requests/image_gen/test_status_response.json similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/requests/image_gen/test_status_response.json rename to crates/api_clients/openai_sora_client/src/requests/image_gen/test_status_response.json diff --git a/crates/lib/api_clients/openai_sora_client/src/requests/image_gen/test_status_response_long.json b/crates/api_clients/openai_sora_client/src/requests/image_gen/test_status_response_long.json similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/requests/image_gen/test_status_response_long.json rename to crates/api_clients/openai_sora_client/src/requests/image_gen/test_status_response_long.json diff --git a/crates/lib/api_clients/openai_sora_client/src/requests/job/mod.rs b/crates/api_clients/openai_sora_client/src/requests/job/mod.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/requests/job/mod.rs rename to crates/api_clients/openai_sora_client/src/requests/job/mod.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/requests/job/sora_job_status.rs b/crates/api_clients/openai_sora_client/src/requests/job/sora_job_status.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/requests/job/sora_job_status.rs rename to crates/api_clients/openai_sora_client/src/requests/job/sora_job_status.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/requests/list_media/list_media.rs b/crates/api_clients/openai_sora_client/src/requests/list_media/list_media.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/requests/list_media/list_media.rs rename to crates/api_clients/openai_sora_client/src/requests/list_media/list_media.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/requests/list_media/mod.rs b/crates/api_clients/openai_sora_client/src/requests/list_media/mod.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/requests/list_media/mod.rs rename to crates/api_clients/openai_sora_client/src/requests/list_media/mod.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/requests/mod.rs b/crates/api_clients/openai_sora_client/src/requests/mod.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/requests/mod.rs rename to crates/api_clients/openai_sora_client/src/requests/mod.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/requests/sentinel_refresh/generate/config.rs b/crates/api_clients/openai_sora_client/src/requests/sentinel_refresh/generate/config.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/requests/sentinel_refresh/generate/config.rs rename to crates/api_clients/openai_sora_client/src/requests/sentinel_refresh/generate/config.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/requests/sentinel_refresh/generate/mod.rs b/crates/api_clients/openai_sora_client/src/requests/sentinel_refresh/generate/mod.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/requests/sentinel_refresh/generate/mod.rs rename to crates/api_clients/openai_sora_client/src/requests/sentinel_refresh/generate/mod.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/requests/sentinel_refresh/generate/request.rs b/crates/api_clients/openai_sora_client/src/requests/sentinel_refresh/generate/request.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/requests/sentinel_refresh/generate/request.rs rename to crates/api_clients/openai_sora_client/src/requests/sentinel_refresh/generate/request.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/requests/sentinel_refresh/generate/token.rs b/crates/api_clients/openai_sora_client/src/requests/sentinel_refresh/generate/token.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/requests/sentinel_refresh/generate/token.rs rename to crates/api_clients/openai_sora_client/src/requests/sentinel_refresh/generate/token.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/requests/sentinel_refresh/mod.rs b/crates/api_clients/openai_sora_client/src/requests/sentinel_refresh/mod.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/requests/sentinel_refresh/mod.rs rename to crates/api_clients/openai_sora_client/src/requests/sentinel_refresh/mod.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/requests/upload/mod.rs b/crates/api_clients/openai_sora_client/src/requests/upload/mod.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/requests/upload/mod.rs rename to crates/api_clients/openai_sora_client/src/requests/upload/mod.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/requests/upload/upload_media_from_bytes.rs b/crates/api_clients/openai_sora_client/src/requests/upload/upload_media_from_bytes.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/requests/upload/upload_media_from_bytes.rs rename to crates/api_clients/openai_sora_client/src/requests/upload/upload_media_from_bytes.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/requests/upload/upload_media_from_file.rs b/crates/api_clients/openai_sora_client/src/requests/upload/upload_media_from_file.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/requests/upload/upload_media_from_file.rs rename to crates/api_clients/openai_sora_client/src/requests/upload/upload_media_from_file.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/requests/upload/upload_media_http_request.rs b/crates/api_clients/openai_sora_client/src/requests/upload/upload_media_http_request.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/requests/upload/upload_media_http_request.rs rename to crates/api_clients/openai_sora_client/src/requests/upload/upload_media_http_request.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/sora_error.rs b/crates/api_clients/openai_sora_client/src/sora_error.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/sora_error.rs rename to crates/api_clients/openai_sora_client/src/sora_error.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/utils/classify_general_http_error.rs b/crates/api_clients/openai_sora_client/src/utils/classify_general_http_error.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/utils/classify_general_http_error.rs rename to crates/api_clients/openai_sora_client/src/utils/classify_general_http_error.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/utils/classify_general_http_status_code_and_body.rs b/crates/api_clients/openai_sora_client/src/utils/classify_general_http_status_code_and_body.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/utils/classify_general_http_status_code_and_body.rs rename to crates/api_clients/openai_sora_client/src/utils/classify_general_http_status_code_and_body.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/utils/has_session_cookie.rs b/crates/api_clients/openai_sora_client/src/utils/has_session_cookie.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/utils/has_session_cookie.rs rename to crates/api_clients/openai_sora_client/src/utils/has_session_cookie.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/utils/lightweight_sora_jwt_parse.rs b/crates/api_clients/openai_sora_client/src/utils/lightweight_sora_jwt_parse.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/utils/lightweight_sora_jwt_parse.rs rename to crates/api_clients/openai_sora_client/src/utils/lightweight_sora_jwt_parse.rs diff --git a/crates/lib/api_clients/openai_sora_client/src/utils/mod.rs b/crates/api_clients/openai_sora_client/src/utils/mod.rs similarity index 100% rename from crates/lib/api_clients/openai_sora_client/src/utils/mod.rs rename to crates/api_clients/openai_sora_client/src/utils/mod.rs diff --git a/crates/api_clients/openart_client/Cargo.toml b/crates/api_clients/openart_client/Cargo.toml new file mode 100644 index 0000000000..ffea137a7c --- /dev/null +++ b/crates/api_clients/openart_client/Cargo.toml @@ -0,0 +1,45 @@ +[package] +name = "openart_client" +edition = "2024" +version = "0.0.1" +publish = false + +[package.metadata.cargo-udeps.ignore] +normal = ["workspace-build-acceleration"] + +[lib] +name = "openart_client" +path = "src/lib.rs" + +[dependencies] + +# Workspace hack (faster compile times) +workspace-build-acceleration.workspace = true + +# Internal +crockford.workspace = true +errors.workspace = true +idempotency.workspace = true +subprocess_common = { path = "../../lib/subprocess_common" } + +# External +anyhow.workspace = true +base64.workspace = true +chrono.workspace = true +cookie.workspace = true +hex-literal.workspace = true +log.workspace = true +once_cell.workspace = true +rand.workspace = true +reqwest = { workspace = true, features = ["multipart", "gzip"] } +serde.workspace = true +serde_derive.workspace = true +serde_json.workspace = true +sha3.workspace = true +thiserror.workspace = true +tokio.workspace = true +toml.workspace = true + +[dev-dependencies] +testing = { path = "../../lib/testing" } +filesys.workspace = true diff --git a/crates/lib/api_clients/openart_client/src/creds/mod.rs b/crates/api_clients/openart_client/src/creds/mod.rs similarity index 100% rename from crates/lib/api_clients/openart_client/src/creds/mod.rs rename to crates/api_clients/openart_client/src/creds/mod.rs diff --git a/crates/lib/api_clients/openart_client/src/creds/openart_cookies.rs b/crates/api_clients/openart_client/src/creds/openart_cookies.rs similarity index 100% rename from crates/lib/api_clients/openart_client/src/creds/openart_cookies.rs rename to crates/api_clients/openart_client/src/creds/openart_cookies.rs diff --git a/crates/lib/api_clients/openart_client/src/creds/openart_credentials.rs b/crates/api_clients/openart_client/src/creds/openart_credentials.rs similarity index 100% rename from crates/lib/api_clients/openart_client/src/creds/openart_credentials.rs rename to crates/api_clients/openart_client/src/creds/openart_credentials.rs diff --git a/crates/lib/api_clients/openart_client/src/creds/openart_session_info.rs b/crates/api_clients/openart_client/src/creds/openart_session_info.rs similarity index 100% rename from crates/lib/api_clients/openart_client/src/creds/openart_session_info.rs rename to crates/api_clients/openart_client/src/creds/openart_session_info.rs diff --git a/crates/lib/api_clients/openart_client/src/error/api_error.rs b/crates/api_clients/openart_client/src/error/api_error.rs similarity index 100% rename from crates/lib/api_clients/openart_client/src/error/api_error.rs rename to crates/api_clients/openart_client/src/error/api_error.rs diff --git a/crates/lib/api_clients/openart_client/src/error/classify_http_error_response.rs b/crates/api_clients/openart_client/src/error/classify_http_error_response.rs similarity index 100% rename from crates/lib/api_clients/openart_client/src/error/classify_http_error_response.rs rename to crates/api_clients/openart_client/src/error/classify_http_error_response.rs diff --git a/crates/lib/api_clients/openart_client/src/error/classify_http_error_status_code_and_body.rs b/crates/api_clients/openart_client/src/error/classify_http_error_status_code_and_body.rs similarity index 100% rename from crates/lib/api_clients/openart_client/src/error/classify_http_error_status_code_and_body.rs rename to crates/api_clients/openart_client/src/error/classify_http_error_status_code_and_body.rs diff --git a/crates/lib/api_clients/openart_client/src/error/client_error.rs b/crates/api_clients/openart_client/src/error/client_error.rs similarity index 100% rename from crates/lib/api_clients/openart_client/src/error/client_error.rs rename to crates/api_clients/openart_client/src/error/client_error.rs diff --git a/crates/lib/api_clients/openart_client/src/error/mod.rs b/crates/api_clients/openart_client/src/error/mod.rs similarity index 100% rename from crates/lib/api_clients/openart_client/src/error/mod.rs rename to crates/api_clients/openart_client/src/error/mod.rs diff --git a/crates/lib/api_clients/openart_client/src/error/openart_error.rs b/crates/api_clients/openart_client/src/error/openart_error.rs similarity index 100% rename from crates/lib/api_clients/openart_client/src/error/openart_error.rs rename to crates/api_clients/openart_client/src/error/openart_error.rs diff --git a/crates/lib/api_clients/openart_client/src/lib.rs b/crates/api_clients/openart_client/src/lib.rs similarity index 100% rename from crates/lib/api_clients/openart_client/src/lib.rs rename to crates/api_clients/openart_client/src/lib.rs diff --git a/crates/lib/api_clients/openart_client/src/requests/get_session_request.rs b/crates/api_clients/openart_client/src/requests/get_session_request.rs similarity index 100% rename from crates/lib/api_clients/openart_client/src/requests/get_session_request.rs rename to crates/api_clients/openart_client/src/requests/get_session_request.rs diff --git a/crates/lib/api_clients/openart_client/src/requests/mod.rs b/crates/api_clients/openart_client/src/requests/mod.rs similarity index 100% rename from crates/lib/api_clients/openart_client/src/requests/mod.rs rename to crates/api_clients/openart_client/src/requests/mod.rs diff --git a/crates/lib/api_clients/openart_client/src/requests/upload_image_from_file_request.rs b/crates/api_clients/openart_client/src/requests/upload_image_from_file_request.rs similarity index 100% rename from crates/lib/api_clients/openart_client/src/requests/upload_image_from_file_request.rs rename to crates/api_clients/openart_client/src/requests/upload_image_from_file_request.rs diff --git a/crates/api_clients/runwayml_client/Cargo.toml b/crates/api_clients/runwayml_client/Cargo.toml new file mode 100644 index 0000000000..02536d192e --- /dev/null +++ b/crates/api_clients/runwayml_client/Cargo.toml @@ -0,0 +1,46 @@ +[package] +name = "runwayml_client" +edition = "2021" +version = "0.0.1" +publish = false + +[package.metadata.cargo-udeps.ignore] +normal = ["workspace-build-acceleration"] + +[lib] +name = "runwayml_client" +path = "src/lib.rs" + +[dependencies] + +# Workspace hack (faster compile times) +workspace-build-acceleration.workspace = true + +# Internal +crockford.workspace = true +errors.workspace = true +idempotency.workspace = true +jwt_light.workspace = true +subprocess_common = { path = "../../lib/subprocess_common" } + +# External +anyhow.workspace = true +base64.workspace = true +chrono.workspace = true +cookie.workspace = true +hex-literal.workspace = true +log.workspace = true +once_cell.workspace = true +rand.workspace = true +reqwest.workspace = true +serde.workspace = true +serde_derive.workspace = true +serde_json.workspace = true +sha3.workspace = true +thiserror.workspace = true +tokio.workspace = true +toml.workspace = true + +[dev-dependencies] +testing = { path = "../../lib/testing" } +filesys.workspace = true diff --git a/crates/lib/api_clients/runwayml_client/src/creds/credentials.rs b/crates/api_clients/runwayml_client/src/creds/credentials.rs similarity index 100% rename from crates/lib/api_clients/runwayml_client/src/creds/credentials.rs rename to crates/api_clients/runwayml_client/src/creds/credentials.rs diff --git a/crates/lib/api_clients/runwayml_client/src/creds/jwt_bearer_token.rs b/crates/api_clients/runwayml_client/src/creds/jwt_bearer_token.rs similarity index 100% rename from crates/lib/api_clients/runwayml_client/src/creds/jwt_bearer_token.rs rename to crates/api_clients/runwayml_client/src/creds/jwt_bearer_token.rs diff --git a/crates/lib/api_clients/runwayml_client/src/creds/jwt_claims.rs b/crates/api_clients/runwayml_client/src/creds/jwt_claims.rs similarity index 100% rename from crates/lib/api_clients/runwayml_client/src/creds/jwt_claims.rs rename to crates/api_clients/runwayml_client/src/creds/jwt_claims.rs diff --git a/crates/lib/api_clients/runwayml_client/src/creds/mod.rs b/crates/api_clients/runwayml_client/src/creds/mod.rs similarity index 100% rename from crates/lib/api_clients/runwayml_client/src/creds/mod.rs rename to crates/api_clients/runwayml_client/src/creds/mod.rs diff --git a/crates/lib/api_clients/runwayml_client/src/error/api_error.rs b/crates/api_clients/runwayml_client/src/error/api_error.rs similarity index 100% rename from crates/lib/api_clients/runwayml_client/src/error/api_error.rs rename to crates/api_clients/runwayml_client/src/error/api_error.rs diff --git a/crates/lib/api_clients/runwayml_client/src/error/classify_http_error_response.rs b/crates/api_clients/runwayml_client/src/error/classify_http_error_response.rs similarity index 100% rename from crates/lib/api_clients/runwayml_client/src/error/classify_http_error_response.rs rename to crates/api_clients/runwayml_client/src/error/classify_http_error_response.rs diff --git a/crates/lib/api_clients/runwayml_client/src/error/client_error.rs b/crates/api_clients/runwayml_client/src/error/client_error.rs similarity index 100% rename from crates/lib/api_clients/runwayml_client/src/error/client_error.rs rename to crates/api_clients/runwayml_client/src/error/client_error.rs diff --git a/crates/lib/api_clients/runwayml_client/src/error/mod.rs b/crates/api_clients/runwayml_client/src/error/mod.rs similarity index 100% rename from crates/lib/api_clients/runwayml_client/src/error/mod.rs rename to crates/api_clients/runwayml_client/src/error/mod.rs diff --git a/crates/lib/api_clients/runwayml_client/src/error/runwayml_error.rs b/crates/api_clients/runwayml_client/src/error/runwayml_error.rs similarity index 100% rename from crates/lib/api_clients/runwayml_client/src/error/runwayml_error.rs rename to crates/api_clients/runwayml_client/src/error/runwayml_error.rs diff --git a/crates/lib/api_clients/runwayml_client/src/lib.rs b/crates/api_clients/runwayml_client/src/lib.rs similarity index 100% rename from crates/lib/api_clients/runwayml_client/src/lib.rs rename to crates/api_clients/runwayml_client/src/lib.rs diff --git a/crates/lib/api_clients/runwayml_client/src/requests/gen4_image_to_video.rs b/crates/api_clients/runwayml_client/src/requests/gen4_image_to_video.rs similarity index 100% rename from crates/lib/api_clients/runwayml_client/src/requests/gen4_image_to_video.rs rename to crates/api_clients/runwayml_client/src/requests/gen4_image_to_video.rs diff --git a/crates/lib/api_clients/runwayml_client/src/requests/mod.rs b/crates/api_clients/runwayml_client/src/requests/mod.rs similarity index 100% rename from crates/lib/api_clients/runwayml_client/src/requests/mod.rs rename to crates/api_clients/runwayml_client/src/requests/mod.rs diff --git a/crates/lib/api_clients/storyteller_client/Cargo.toml b/crates/api_clients/storyteller_client/Cargo.toml similarity index 50% rename from crates/lib/api_clients/storyteller_client/Cargo.toml rename to crates/api_clients/storyteller_client/Cargo.toml index 91ce1559f2..ebf22637bb 100644 --- a/crates/lib/api_clients/storyteller_client/Cargo.toml +++ b/crates/api_clients/storyteller_client/Cargo.toml @@ -8,6 +8,9 @@ authors = [ ] publish = false +[package.metadata.cargo-udeps.ignore] +normal = ["workspace-build-acceleration"] + # [lints.rust] # unused_imports = "forbid" @@ -17,33 +20,33 @@ path = "src/lib.rs" [dependencies] # Workspace hack (faster compile times) -workspace-build-acceleration = { workspace = true } +workspace-build-acceleration.workspace = true # Internal -artcraft_api_defs = { workspace = true } -enums = { workspace = true } -enums_public = { workspace = true } -errors = { workspace = true } -idempotency = { workspace = true } -tokens = { workspace = true } -mimetypes = { workspace = true } +artcraft_api_defs.workspace = true +enums.workspace = true +enums_public.workspace = true +errors.workspace = true +idempotency.workspace = true +tokens.workspace = true +mimetypes.workspace = true # External -anyhow = { workspace = true } -chrono = { workspace = true } -cookie = { workspace = true } -log = { workspace = true } +anyhow.workspace = true +chrono.workspace = true +cookie.workspace = true +log.workspace = true reqwest = { workspace = true, features = ["multipart", "gzip"] } -url = { workspace = true } +url.workspace = true # Serialization -serde = { workspace = true } -serde_derive = { workspace = true } -serde_json = { workspace = true } +serde.workspace = true +serde_derive.workspace = true +serde_json.workspace = true # HTTP backoff = { version = "0.4.0", features = ["futures"] } uuid = { version = "1.8.0", features = ["v4"] } # Exponential backoff retry [dev-dependencies] -tokio = { version = "1.38.0", features = ["macros"] } +tokio.workspace = true diff --git a/crates/lib/api_clients/storyteller_client/src/credentials/mod.rs b/crates/api_clients/storyteller_client/src/credentials/mod.rs similarity index 100% rename from crates/lib/api_clients/storyteller_client/src/credentials/mod.rs rename to crates/api_clients/storyteller_client/src/credentials/mod.rs diff --git a/crates/lib/api_clients/storyteller_client/src/credentials/storyteller_avt_cookie.rs b/crates/api_clients/storyteller_client/src/credentials/storyteller_avt_cookie.rs similarity index 100% rename from crates/lib/api_clients/storyteller_client/src/credentials/storyteller_avt_cookie.rs rename to crates/api_clients/storyteller_client/src/credentials/storyteller_avt_cookie.rs diff --git a/crates/lib/api_clients/storyteller_client/src/credentials/storyteller_credential_set.rs b/crates/api_clients/storyteller_client/src/credentials/storyteller_credential_set.rs similarity index 100% rename from crates/lib/api_clients/storyteller_client/src/credentials/storyteller_credential_set.rs rename to crates/api_clients/storyteller_client/src/credentials/storyteller_credential_set.rs diff --git a/crates/lib/api_clients/storyteller_client/src/credentials/storyteller_session_cookie.rs b/crates/api_clients/storyteller_client/src/credentials/storyteller_session_cookie.rs similarity index 100% rename from crates/lib/api_clients/storyteller_client/src/credentials/storyteller_session_cookie.rs rename to crates/api_clients/storyteller_client/src/credentials/storyteller_session_cookie.rs diff --git a/crates/lib/api_clients/storyteller_client/src/error/api_error.rs b/crates/api_clients/storyteller_client/src/error/api_error.rs similarity index 100% rename from crates/lib/api_clients/storyteller_client/src/error/api_error.rs rename to crates/api_clients/storyteller_client/src/error/api_error.rs diff --git a/crates/lib/api_clients/storyteller_client/src/error/client_error.rs b/crates/api_clients/storyteller_client/src/error/client_error.rs similarity index 100% rename from crates/lib/api_clients/storyteller_client/src/error/client_error.rs rename to crates/api_clients/storyteller_client/src/error/client_error.rs diff --git a/crates/lib/api_clients/storyteller_client/src/error/mod.rs b/crates/api_clients/storyteller_client/src/error/mod.rs similarity index 100% rename from crates/lib/api_clients/storyteller_client/src/error/mod.rs rename to crates/api_clients/storyteller_client/src/error/mod.rs diff --git a/crates/lib/api_clients/storyteller_client/src/error/storyteller_error.rs b/crates/api_clients/storyteller_client/src/error/storyteller_error.rs similarity index 100% rename from crates/lib/api_clients/storyteller_client/src/error/storyteller_error.rs rename to crates/api_clients/storyteller_client/src/error/storyteller_error.rs diff --git a/crates/lib/api_clients/storyteller_client/src/generate/image/generate_flux_1_dev_text_to_image.rs b/crates/api_clients/storyteller_client/src/generate/image/generate_flux_1_dev_text_to_image.rs similarity index 100% rename from crates/lib/api_clients/storyteller_client/src/generate/image/generate_flux_1_dev_text_to_image.rs rename to crates/api_clients/storyteller_client/src/generate/image/generate_flux_1_dev_text_to_image.rs diff --git a/crates/lib/api_clients/storyteller_client/src/generate/image/generate_flux_1_schnell_text_to_image.rs b/crates/api_clients/storyteller_client/src/generate/image/generate_flux_1_schnell_text_to_image.rs similarity index 100% rename from crates/lib/api_clients/storyteller_client/src/generate/image/generate_flux_1_schnell_text_to_image.rs rename to crates/api_clients/storyteller_client/src/generate/image/generate_flux_1_schnell_text_to_image.rs diff --git a/crates/lib/api_clients/storyteller_client/src/generate/image/generate_flux_pro_11_text_to_image.rs b/crates/api_clients/storyteller_client/src/generate/image/generate_flux_pro_11_text_to_image.rs similarity index 100% rename from crates/lib/api_clients/storyteller_client/src/generate/image/generate_flux_pro_11_text_to_image.rs rename to crates/api_clients/storyteller_client/src/generate/image/generate_flux_pro_11_text_to_image.rs diff --git a/crates/lib/api_clients/storyteller_client/src/generate/image/generate_flux_pro_11_ultra_text_to_image.rs b/crates/api_clients/storyteller_client/src/generate/image/generate_flux_pro_11_ultra_text_to_image.rs similarity index 100% rename from crates/lib/api_clients/storyteller_client/src/generate/image/generate_flux_pro_11_ultra_text_to_image.rs rename to crates/api_clients/storyteller_client/src/generate/image/generate_flux_pro_11_ultra_text_to_image.rs diff --git a/crates/lib/api_clients/storyteller_client/src/generate/image/mod.rs b/crates/api_clients/storyteller_client/src/generate/image/mod.rs similarity index 100% rename from crates/lib/api_clients/storyteller_client/src/generate/image/mod.rs rename to crates/api_clients/storyteller_client/src/generate/image/mod.rs diff --git a/crates/lib/api_clients/storyteller_client/src/generate/mod.rs b/crates/api_clients/storyteller_client/src/generate/mod.rs similarity index 100% rename from crates/lib/api_clients/storyteller_client/src/generate/mod.rs rename to crates/api_clients/storyteller_client/src/generate/mod.rs diff --git a/crates/lib/api_clients/storyteller_client/src/generate/object/generate_hunyuan_3d_2_0_image_to_3d.rs b/crates/api_clients/storyteller_client/src/generate/object/generate_hunyuan_3d_2_0_image_to_3d.rs similarity index 100% rename from crates/lib/api_clients/storyteller_client/src/generate/object/generate_hunyuan_3d_2_0_image_to_3d.rs rename to crates/api_clients/storyteller_client/src/generate/object/generate_hunyuan_3d_2_0_image_to_3d.rs diff --git a/crates/lib/api_clients/storyteller_client/src/generate/object/generate_hunyuan_3d_2_1_image_to_3d.rs b/crates/api_clients/storyteller_client/src/generate/object/generate_hunyuan_3d_2_1_image_to_3d.rs similarity index 100% rename from crates/lib/api_clients/storyteller_client/src/generate/object/generate_hunyuan_3d_2_1_image_to_3d.rs rename to crates/api_clients/storyteller_client/src/generate/object/generate_hunyuan_3d_2_1_image_to_3d.rs diff --git a/crates/lib/api_clients/storyteller_client/src/generate/object/mod.rs b/crates/api_clients/storyteller_client/src/generate/object/mod.rs similarity index 100% rename from crates/lib/api_clients/storyteller_client/src/generate/object/mod.rs rename to crates/api_clients/storyteller_client/src/generate/object/mod.rs diff --git a/crates/lib/api_clients/storyteller_client/src/generate/video/generate_kling_16_pro_image_to_video.rs b/crates/api_clients/storyteller_client/src/generate/video/generate_kling_16_pro_image_to_video.rs similarity index 100% rename from crates/lib/api_clients/storyteller_client/src/generate/video/generate_kling_16_pro_image_to_video.rs rename to crates/api_clients/storyteller_client/src/generate/video/generate_kling_16_pro_image_to_video.rs diff --git a/crates/lib/api_clients/storyteller_client/src/generate/video/generate_kling_21_master_image_to_video.rs b/crates/api_clients/storyteller_client/src/generate/video/generate_kling_21_master_image_to_video.rs similarity index 100% rename from crates/lib/api_clients/storyteller_client/src/generate/video/generate_kling_21_master_image_to_video.rs rename to crates/api_clients/storyteller_client/src/generate/video/generate_kling_21_master_image_to_video.rs diff --git a/crates/lib/api_clients/storyteller_client/src/generate/video/generate_kling_21_pro_image_to_video.rs b/crates/api_clients/storyteller_client/src/generate/video/generate_kling_21_pro_image_to_video.rs similarity index 100% rename from crates/lib/api_clients/storyteller_client/src/generate/video/generate_kling_21_pro_image_to_video.rs rename to crates/api_clients/storyteller_client/src/generate/video/generate_kling_21_pro_image_to_video.rs diff --git a/crates/lib/api_clients/storyteller_client/src/generate/video/generate_seedance_1_0_lite_image_to_video.rs b/crates/api_clients/storyteller_client/src/generate/video/generate_seedance_1_0_lite_image_to_video.rs similarity index 100% rename from crates/lib/api_clients/storyteller_client/src/generate/video/generate_seedance_1_0_lite_image_to_video.rs rename to crates/api_clients/storyteller_client/src/generate/video/generate_seedance_1_0_lite_image_to_video.rs diff --git a/crates/lib/api_clients/storyteller_client/src/generate/video/generate_veo_2_image_to_video.rs b/crates/api_clients/storyteller_client/src/generate/video/generate_veo_2_image_to_video.rs similarity index 100% rename from crates/lib/api_clients/storyteller_client/src/generate/video/generate_veo_2_image_to_video.rs rename to crates/api_clients/storyteller_client/src/generate/video/generate_veo_2_image_to_video.rs diff --git a/crates/lib/api_clients/storyteller_client/src/generate/video/mod.rs b/crates/api_clients/storyteller_client/src/generate/video/mod.rs similarity index 100% rename from crates/lib/api_clients/storyteller_client/src/generate/video/mod.rs rename to crates/api_clients/storyteller_client/src/generate/video/mod.rs diff --git a/crates/lib/api_clients/storyteller_client/src/lib.rs b/crates/api_clients/storyteller_client/src/lib.rs similarity index 100% rename from crates/lib/api_clients/storyteller_client/src/lib.rs rename to crates/api_clients/storyteller_client/src/lib.rs diff --git a/crates/lib/api_clients/storyteller_client/src/media_files/get_media_file.rs b/crates/api_clients/storyteller_client/src/media_files/get_media_file.rs similarity index 100% rename from crates/lib/api_clients/storyteller_client/src/media_files/get_media_file.rs rename to crates/api_clients/storyteller_client/src/media_files/get_media_file.rs diff --git a/crates/lib/api_clients/storyteller_client/src/media_files/mod.rs b/crates/api_clients/storyteller_client/src/media_files/mod.rs similarity index 100% rename from crates/lib/api_clients/storyteller_client/src/media_files/mod.rs rename to crates/api_clients/storyteller_client/src/media_files/mod.rs diff --git a/crates/lib/api_clients/storyteller_client/src/media_files/upload_image_media_file_from_file.rs b/crates/api_clients/storyteller_client/src/media_files/upload_image_media_file_from_file.rs similarity index 100% rename from crates/lib/api_clients/storyteller_client/src/media_files/upload_image_media_file_from_file.rs rename to crates/api_clients/storyteller_client/src/media_files/upload_image_media_file_from_file.rs diff --git a/crates/lib/api_clients/storyteller_client/src/media_files/upload_new_engine_asset_from_file.rs b/crates/api_clients/storyteller_client/src/media_files/upload_new_engine_asset_from_file.rs similarity index 100% rename from crates/lib/api_clients/storyteller_client/src/media_files/upload_new_engine_asset_from_file.rs rename to crates/api_clients/storyteller_client/src/media_files/upload_new_engine_asset_from_file.rs diff --git a/crates/lib/api_clients/storyteller_client/src/media_files/upload_video_media_file_from_file.rs b/crates/api_clients/storyteller_client/src/media_files/upload_video_media_file_from_file.rs similarity index 100% rename from crates/lib/api_clients/storyteller_client/src/media_files/upload_video_media_file_from_file.rs rename to crates/api_clients/storyteller_client/src/media_files/upload_video_media_file_from_file.rs diff --git a/crates/lib/api_clients/storyteller_client/src/recipes/mod.rs b/crates/api_clients/storyteller_client/src/recipes/mod.rs similarity index 100% rename from crates/lib/api_clients/storyteller_client/src/recipes/mod.rs rename to crates/api_clients/storyteller_client/src/recipes/mod.rs diff --git a/crates/lib/api_clients/storyteller_client/src/recipes/upload_media_file_from_file.rs b/crates/api_clients/storyteller_client/src/recipes/upload_media_file_from_file.rs similarity index 100% rename from crates/lib/api_clients/storyteller_client/src/recipes/upload_media_file_from_file.rs rename to crates/api_clients/storyteller_client/src/recipes/upload_media_file_from_file.rs diff --git a/crates/lib/api_clients/storyteller_client/src/shared_response_types/cover_image_links.rs b/crates/api_clients/storyteller_client/src/shared_response_types/cover_image_links.rs similarity index 100% rename from crates/lib/api_clients/storyteller_client/src/shared_response_types/cover_image_links.rs rename to crates/api_clients/storyteller_client/src/shared_response_types/cover_image_links.rs diff --git a/crates/lib/api_clients/storyteller_client/src/shared_response_types/media_file_cover_image_details.rs b/crates/api_clients/storyteller_client/src/shared_response_types/media_file_cover_image_details.rs similarity index 100% rename from crates/lib/api_clients/storyteller_client/src/shared_response_types/media_file_cover_image_details.rs rename to crates/api_clients/storyteller_client/src/shared_response_types/media_file_cover_image_details.rs diff --git a/crates/lib/api_clients/storyteller_client/src/shared_response_types/media_links.rs b/crates/api_clients/storyteller_client/src/shared_response_types/media_links.rs similarity index 100% rename from crates/lib/api_clients/storyteller_client/src/shared_response_types/media_links.rs rename to crates/api_clients/storyteller_client/src/shared_response_types/media_links.rs diff --git a/crates/lib/api_clients/storyteller_client/src/shared_response_types/mod.rs b/crates/api_clients/storyteller_client/src/shared_response_types/mod.rs similarity index 100% rename from crates/lib/api_clients/storyteller_client/src/shared_response_types/mod.rs rename to crates/api_clients/storyteller_client/src/shared_response_types/mod.rs diff --git a/crates/lib/api_clients/storyteller_client/src/shared_response_types/simple_entity_stats.rs b/crates/api_clients/storyteller_client/src/shared_response_types/simple_entity_stats.rs similarity index 100% rename from crates/lib/api_clients/storyteller_client/src/shared_response_types/simple_entity_stats.rs rename to crates/api_clients/storyteller_client/src/shared_response_types/simple_entity_stats.rs diff --git a/crates/lib/api_clients/storyteller_client/src/shared_response_types/user_details_light.rs b/crates/api_clients/storyteller_client/src/shared_response_types/user_details_light.rs similarity index 100% rename from crates/lib/api_clients/storyteller_client/src/shared_response_types/user_details_light.rs rename to crates/api_clients/storyteller_client/src/shared_response_types/user_details_light.rs diff --git a/crates/lib/api_clients/storyteller_client/src/utils/api_host.rs b/crates/api_clients/storyteller_client/src/utils/api_host.rs similarity index 100% rename from crates/lib/api_clients/storyteller_client/src/utils/api_host.rs rename to crates/api_clients/storyteller_client/src/utils/api_host.rs diff --git a/crates/lib/api_clients/storyteller_client/src/utils/basic_json_post_request.rs b/crates/api_clients/storyteller_client/src/utils/basic_json_post_request.rs similarity index 100% rename from crates/lib/api_clients/storyteller_client/src/utils/basic_json_post_request.rs rename to crates/api_clients/storyteller_client/src/utils/basic_json_post_request.rs diff --git a/crates/lib/api_clients/storyteller_client/src/utils/constants.rs b/crates/api_clients/storyteller_client/src/utils/constants.rs similarity index 100% rename from crates/lib/api_clients/storyteller_client/src/utils/constants.rs rename to crates/api_clients/storyteller_client/src/utils/constants.rs diff --git a/crates/lib/api_clients/storyteller_client/src/utils/filter_bad_response.rs b/crates/api_clients/storyteller_client/src/utils/filter_bad_response.rs similarity index 100% rename from crates/lib/api_clients/storyteller_client/src/utils/filter_bad_response.rs rename to crates/api_clients/storyteller_client/src/utils/filter_bad_response.rs diff --git a/crates/lib/api_clients/storyteller_client/src/utils/http_get_anonymous.rs b/crates/api_clients/storyteller_client/src/utils/http_get_anonymous.rs similarity index 100% rename from crates/lib/api_clients/storyteller_client/src/utils/http_get_anonymous.rs rename to crates/api_clients/storyteller_client/src/utils/http_get_anonymous.rs diff --git a/crates/lib/api_clients/storyteller_client/src/utils/mod.rs b/crates/api_clients/storyteller_client/src/utils/mod.rs similarity index 100% rename from crates/lib/api_clients/storyteller_client/src/utils/mod.rs rename to crates/api_clients/storyteller_client/src/utils/mod.rs diff --git a/crates/lib/api_clients/storyteller_client/src/utils/status_codes.rs b/crates/api_clients/storyteller_client/src/utils/status_codes.rs similarity index 100% rename from crates/lib/api_clients/storyteller_client/src/utils/status_codes.rs rename to crates/api_clients/storyteller_client/src/utils/status_codes.rs diff --git a/crates/lib/api_clients/thumbnail_generator/Cargo.toml b/crates/api_clients/thumbnail_generator/Cargo.toml similarity index 66% rename from crates/lib/api_clients/thumbnail_generator/Cargo.toml rename to crates/api_clients/thumbnail_generator/Cargo.toml index 5657fa6f4d..10c57d4786 100644 --- a/crates/lib/api_clients/thumbnail_generator/Cargo.toml +++ b/crates/api_clients/thumbnail_generator/Cargo.toml @@ -10,10 +10,10 @@ normal = ["workspace-build-acceleration"] [dependencies] # Workspace hack (faster compile times) -workspace-build-acceleration = { version = "0.1", path = "../../../workspace-build-acceleration" } +workspace-build-acceleration.workspace = true # External -easyenv = { path = "../../easyenv" } -log = "0.4.20" +easyenv = { path = "../../lib/easyenv" } +log.workspace = true reqwest = "0.12.4" -serde_json = "1.0.113" +serde_json.workspace = true diff --git a/crates/lib/api_clients/thumbnail_generator/src/lib.rs b/crates/api_clients/thumbnail_generator/src/lib.rs similarity index 100% rename from crates/lib/api_clients/thumbnail_generator/src/lib.rs rename to crates/api_clients/thumbnail_generator/src/lib.rs diff --git a/crates/lib/api_clients/thumbnail_generator/src/task_client/mod.rs b/crates/api_clients/thumbnail_generator/src/task_client/mod.rs similarity index 100% rename from crates/lib/api_clients/thumbnail_generator/src/task_client/mod.rs rename to crates/api_clients/thumbnail_generator/src/task_client/mod.rs diff --git a/crates/lib/api_clients/thumbnail_generator/src/task_client/thumbnail_task.rs b/crates/api_clients/thumbnail_generator/src/task_client/thumbnail_task.rs similarity index 100% rename from crates/lib/api_clients/thumbnail_generator/src/task_client/thumbnail_task.rs rename to crates/api_clients/thumbnail_generator/src/task_client/thumbnail_task.rs diff --git a/crates/cli/devenv/dev-database-seed/Cargo.toml b/crates/cli/devenv/dev-database-seed/Cargo.toml index c77ad5a9b3..5880416a04 100644 --- a/crates/cli/devenv/dev-database-seed/Cargo.toml +++ b/crates/cli/devenv/dev-database-seed/Cargo.toml @@ -21,23 +21,24 @@ workspace-build-acceleration = { workspace = true } # Internal bucket_paths = { path = "../../../lib/bucket_paths" } -cloud_storage = { path = "../../../lib/api_clients/cloud_storage" } +cloud_storage.workspace = true config = { path = "../../../lib/deprecated/config" } easyenv = { path = "../../../lib/easyenv" } -enums = { path = "../../../schema/public/enums" } -errors = { path = "../../../lib/errors" } -filesys = { path = "../../../lib/files/filesys" } +enums.workspace = true +errors.workspace = true +filesys.workspace = true hashing = { path = "../../../lib/files/hashing" } -idempotency = { path = "../../../lib/idempotency" } -mimetypes = { path = "../../../lib/files/mimetypes" } +idempotency.workspace = true +mimetypes.workspace = true mysql_queries = { path = "../../../schema/database/mysql_queries" } storyteller_root = { path = "../../../lib/storyteller_root" } -tokens = { path = "../../../schema/public/tokens" } +tokens.workspace = true # External -log = "0.4.14" +log.workspace = true clap = "4.4.8" -rand = "0.8.5" +rand.workspace = true + # Runtime # NB: We switched to Tokio from `async-std` for broader ecosystem support. tokio = { version = "1.38.0", features = ["macros"] } diff --git a/crates/cli/devenv/dev-upload-media-file/Cargo.toml b/crates/cli/devenv/dev-upload-media-file/Cargo.toml index 6b8dc5266d..0da11de5b0 100644 --- a/crates/cli/devenv/dev-upload-media-file/Cargo.toml +++ b/crates/cli/devenv/dev-upload-media-file/Cargo.toml @@ -21,23 +21,23 @@ workspace-build-acceleration = { workspace = true } # Internal bucket_paths = { path = "../../../lib/bucket_paths" } -cloud_storage = { path = "../../../lib/api_clients/cloud_storage" } +cloud_storage.workspace = true config = { path = "../../../lib/deprecated/config" } easyenv = { path = "../../../lib/easyenv" } -enums = { path = "../../../schema/public/enums" } -errors = { path = "../../../lib/errors" } -filesys = { path = "../../../lib/files/filesys" } -mimetypes = { path = "../../../lib/files/mimetypes" } +enums.workspace = true +errors.workspace = true +filesys.workspace = true +mimetypes.workspace = true mysql_queries = { path = "../../../schema/database/mysql_queries" } -tokens = { path = "../../../schema/public/tokens" } +tokens.workspace = true # External clap = "4.4.8" -log = "0.4.14" +log.workspace = true # Runtime # NB: We switched to Tokio from `async-std` for broader ecosystem support. -tokio = { version = "1.38.0", features = ["macros"] } +tokio.workspace = true sqlx = { version = "0.7.2", features = [ "mysql", "runtime-tokio", "tls-rustls", "chrono" ] } diff --git a/crates/cli/production/migration-tool/Cargo.toml b/crates/cli/production/migration-tool/Cargo.toml index 04fa3e22e6..3efbe09249 100644 --- a/crates/cli/production/migration-tool/Cargo.toml +++ b/crates/cli/production/migration-tool/Cargo.toml @@ -17,35 +17,35 @@ normal = ["workspace-build-acceleration"] [dependencies] # Workspace hack (faster compile times) -workspace-build-acceleration = { workspace = true } +workspace-build-acceleration.workspace = true # Internal bucket_paths = { path = "../../../lib/bucket_paths" } -cloud_storage = { path = "../../../lib/api_clients/cloud_storage" } +cloud_storage.workspace = true config = { path = "../../../lib/deprecated/config" } easyenv = { path = "../../../lib/easyenv" } -enums = { path = "../../../schema/public/enums" } -errors = { path = "../../../lib/errors" } -filesys = { path = "../../../lib/files/filesys" } +enums.workspace = true +errors.workspace = true +filesys.workspace = true hashing = { path = "../../../lib/files/hashing" } mysql_queries = { path = "../../../schema/database/mysql_queries" } storyteller_root = { path = "../../../lib/storyteller_root" } -tokens = { path = "../../../schema/public/tokens" } +tokens.workspace = true # External clap = "4.4.8" -log = "0.4.14" +log.workspace = true strum = { version = "0.26", features = ["derive"] } -tempdir = "0.3.7" +tempdir.workspace = true # Async + clients -tokio = { version = "1.38.0", features = ["macros"] } +tokio.workspace = true sqlx = { version = "0.7.2", features = [ "mysql", "runtime-tokio", "tls-rustls", "chrono" ] } # Serialization -serde = "1.0.125" -serde_derive = "1.0.125" -serde_json = "1.0.108" +serde.workspace = true +serde_derive.workspace = true +serde_json.workspace = true [dev-dependencies] # None yet diff --git a/crates/lib/api_clients/cloud_storage/Cargo.toml b/crates/lib/api_clients/cloud_storage/Cargo.toml deleted file mode 100644 index 6925f87b33..0000000000 --- a/crates/lib/api_clients/cloud_storage/Cargo.toml +++ /dev/null @@ -1,44 +0,0 @@ -[package] -name = "cloud_storage" -edition = "2018" -version = "0.0.1" -authors = [ - "Brandon Thomas ", - "Brandon Thomas ", -] -publish = false - -[lib] -name = "cloud_storage" -path = "src/lib.rs" - -[package.metadata.cargo-udeps.ignore] -normal = ["workspace-build-acceleration"] - -[dependencies] -# Workspace hack (faster compile times) -workspace-build-acceleration = { version = "0.1", path = "../../../workspace-build-acceleration" } - -# Internal -bucket_paths = { path = "../../../lib/bucket_paths" } -crockford = { path = "../../../lib/data/crockford" } -easyenv = { path = "../../../lib/easyenv" } -errors = { path = "../../../lib/errors" } -filesys = { path = "../../../lib/files/filesys" } -hashing = { path = "../../../lib/files/hashing" } -mimetypes = { path = "../../../lib/files/mimetypes" } -storyteller_root = { path = "../../../lib/storyteller_root" } - -# External -anyhow = "1.0.86" -log = "0.4.14" -env_logger = "0.11.3" -async-trait = "0.1.75" -# 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" } - -# Runtime -# NB: We switched to Tokio from `async-std` for broader ecosystem support. -tokio = { version = "1.38.0", features = ["macros"] } - diff --git a/crates/lib/api_clients/openai_sora_client/Cargo.toml b/crates/lib/api_clients/openai_sora_client/Cargo.toml deleted file mode 100644 index 26e4f779f4..0000000000 --- a/crates/lib/api_clients/openai_sora_client/Cargo.toml +++ /dev/null @@ -1,41 +0,0 @@ -[package] -name = "openai_sora_client" -edition = "2024" -version = "0.0.1" -publish = false - -[package.metadata.cargo-udeps.ignore] -normal = ["workspace-build-acceleration"] - -[lib] -name = "openai_sora_client" -path = "src/lib.rs" - -[dependencies] - -# Workspace hack (faster compile times) -workspace-build-acceleration = { workspace = true } - -# Internal -errors = { path = "../../errors" } -idempotency = { path = "../../idempotency" } - -# External -anyhow = { workspace = true } -base64 = { workspace = true } -chrono = { workspace = true} -cookie = { workspace = true } -log = { workspace = true } -once_cell= { workspace = true } -rand = { workspace = true } -reqwest = { workspace = true, features = ["multipart", "gzip"] } -serde = { workspace = true } -serde_derive = { workspace = true } -serde_json = { workspace = true } -sha3 = { workspace = true } -thiserror = { workspace = true } -tokio = { version = "1.38.0", features = ["macros"] } -toml = { workspace = true } - -[dev-dependencies] -testing = { path = "../../testing" } diff --git a/crates/lib/api_clients/openart_client/Cargo.toml b/crates/lib/api_clients/openart_client/Cargo.toml deleted file mode 100644 index 4ee1b99512..0000000000 --- a/crates/lib/api_clients/openart_client/Cargo.toml +++ /dev/null @@ -1,45 +0,0 @@ -[package] -name = "openart_client" -edition = "2024" -version = "0.0.1" -publish = false - -[package.metadata.cargo-udeps.ignore] -normal = ["workspace-build-acceleration"] - -[lib] -name = "openart_client" -path = "src/lib.rs" - -[dependencies] - -# Workspace hack (faster compile times) -workspace-build-acceleration = { workspace = true } - -# Internal -crockford = { path = "../../data/crockford" } -errors = { path = "../../errors" } -idempotency = { path = "../../idempotency" } -subprocess_common = { path = "../../subprocess_common" } - -# External -anyhow = { workspace = true } -base64 = { workspace = true } -chrono = { workspace = true} -cookie = { workspace = true } -hex-literal = { workspace = true } -log = { workspace = true } -once_cell= { workspace = true } -rand = { workspace = true } -reqwest = { workspace = true, features = ["multipart", "gzip"] } -serde = { workspace = true } -serde_derive = { workspace = true } -serde_json = { workspace = true } -sha3 = { workspace = true } -thiserror = { workspace = true } -tokio = { version = "1.38.0", features = ["macros"] } -toml = { workspace = true } - -[dev-dependencies] -testing = { path = "../../testing" } -filesys = { path = "../../files/filesys" } diff --git a/crates/lib/api_clients/runwayml_client/Cargo.toml b/crates/lib/api_clients/runwayml_client/Cargo.toml deleted file mode 100644 index 5c688943c7..0000000000 --- a/crates/lib/api_clients/runwayml_client/Cargo.toml +++ /dev/null @@ -1,46 +0,0 @@ -[package] -name = "runwayml_client" -edition = "2021" -version = "0.0.1" -publish = false - -[package.metadata.cargo-udeps.ignore] -normal = ["workspace-build-acceleration"] - -[lib] -name = "runwayml_client" -path = "src/lib.rs" - -[dependencies] - -# Workspace hack (faster compile times) -workspace-build-acceleration = { workspace = true } - -# Internal -crockford = { path = "../../data/crockford" } -errors = { path = "../../errors" } -idempotency = { path = "../../idempotency" } -jwt_light = { workspace = true } -subprocess_common = { path = "../../subprocess_common" } - -# External -anyhow = { workspace = true } -base64 = { workspace = true } -chrono = { workspace = true} -cookie = { workspace = true } -hex-literal = { workspace = true } -log = { workspace = true } -once_cell= { workspace = true } -rand = { workspace = true } -reqwest = { workspace = true, features = ["multipart", "gzip"] } -serde = { workspace = true } -serde_derive = { workspace = true } -serde_json = { workspace = true } -sha3 = { workspace = true } -thiserror = { workspace = true } -tokio = { version = "1.38.0", features = ["macros"] } -toml = { workspace = true } - -[dev-dependencies] -testing = { path = "../../testing" } -filesys = { path = "../../files/filesys" } diff --git a/crates/lib/migration/Cargo.toml b/crates/lib/migration/Cargo.toml index 5f861330c8..5046b09771 100644 --- a/crates/lib/migration/Cargo.toml +++ b/crates/lib/migration/Cargo.toml @@ -17,32 +17,32 @@ path = "src/lib.rs" normal = ["workspace-build-acceleration"] [dependencies] +# Workspace hack (faster compile times) +workspace-build-acceleration.workspace = true + # Internal bucket_paths = { path = "../../lib/bucket_paths" } -cloud_storage = { path = "../../lib/api_clients/cloud_storage" } -enums = { path = "../../schema/public/enums" } -errors = { path = "../../lib/errors" } +cloud_storage.workspace = true +enums.workspace = true +errors.workspace = true jobs_common = { path = "../../lib/jobs_common" } mysql_queries = { path = "../../schema/database/mysql_queries" } -tokens = { path = "../../schema/public/tokens" } +tokens.workspace = true # External -anyhow = "1.0.86" -chrono = { version = "0.4.22", features = ["serde"] } -once_cell = "1.18.0" +anyhow.workspace = true +chrono.workspace = true +once_cell.workspace = true # Serialization -serde = "1.0.125" -serde_derive = "1.0.125" -serde_json = "1.0.108" -toml = "0.8.14" +serde.workspace = true +serde_derive.workspace = true +serde_json.workspace = true +toml.workspace = true # Runtime + Clients tokio = { version = "1.38.0", features = ["full"] } sqlx = { version = "0.7.2", features = [ "mysql", "runtime-tokio", "tls-rustls", "chrono" ] } -# Workspace hack (faster compile times) -workspace-build-acceleration = { version = "0.1", path = "../../workspace-build-acceleration" } - [dev-dependencies] # None yet diff --git a/crates/service/job/download_job/Cargo.toml b/crates/service/job/download_job/Cargo.toml index d3d44ac463..696658ea0d 100644 --- a/crates/service/job/download_job/Cargo.toml +++ b/crates/service/job/download_job/Cargo.toml @@ -16,39 +16,38 @@ path = "src/main.rs" normal = ["workspace-build-acceleration"] [dependencies] +# Workspace hack (faster compile times) +workspace-build-acceleration.workspace = true # Internal bootstrap = { path = "../../../lib/bootstrap" } bucket_paths = { path = "../../../lib/bucket_paths" } -cloud_storage = { path = "../../../lib/api_clients/cloud_storage" } +cloud_storage.workspace = true concurrency = { path = "../../../lib/concurrency" } config = { path = "../../../lib/deprecated/config" } crockford = { path = "../../../lib/data/crockford" } easyenv = { path = "../../../lib/easyenv" } -enums = { path = "../../../schema/public/enums" } -errors = { path = "../../../lib/errors" } -filesys = { path = "../../../lib/files/filesys" } -google_drive_common = { path = "../../../lib/api_clients/google_drive_common" } +enums.workspace = true +errors.workspace = true +filesys.workspace = true +google_drive_common = { path = "../../../api_clients/google_drive_common" } hashing = { path = "../../../lib/files/hashing" } jobs_common = { path = "../../../lib/jobs_common" } -mimetypes = { path = "../../../lib/files/mimetypes" } +mimetypes.workspace = true mysql_queries = { path = "../../../schema/database/mysql_queries" } reusable_types = { path = "../../../schema/public/reusable_types" } storyteller_root = { path = "../../../lib/storyteller_root" } subprocess_common = { path = "../../../lib/subprocess_common" } -tokens = { path = "../../../schema/public/tokens" } - -# Workspace hack (faster compile times) -workspace-build-acceleration = { version = "0.1", path = "../../../workspace-build-acceleration" } +tokens.workspace = true # External -anyhow = "1.0.86" -chrono = { version = "0.4.22", features = ["serde"] } +anyhow.workspace = true +chrono.workspace = true dotenv = "0.15.0" hostname = "0.4.0" -log = "0.4.14" +log.workspace = true subprocess = "0.2.9" -tempdir = "0.3.7" +tempdir.workspace = true zip = "0.6.6" sqlx = { version = "0.7.2", features = [ "mysql", "runtime-tokio", "tls-rustls", "chrono" ] } @@ -58,13 +57,13 @@ r2d2_redis = "0.14.0" # Runtime # NB: We switched to Tokio from `async-std` for broader ecosystem support. -tokio = { version = "1.38.0", features = ["macros"] } +tokio.workspace = true # NB: Hyper is just for HTTP client use in jobs. I'd use Actix client, but I need tokio runtime # NB: Furthermore, the Tokio runtime is old, so I have to use an older Hyper. hyper = { version = "1.3.1" } # Serialization -serde = "1.0.125" -serde_derive = "1.0.125" -serde_json = "1.0.108" +serde.workspace = true +serde_derive.workspace = true +serde_json.workspace = true diff --git a/crates/service/job/inference_job/Cargo.toml b/crates/service/job/inference_job/Cargo.toml index 5a99866e2b..660cdc573b 100644 --- a/crates/service/job/inference_job/Cargo.toml +++ b/crates/service/job/inference_job/Cargo.toml @@ -17,52 +17,52 @@ normal = ["workspace-build-acceleration"] [dependencies] # cargo-hakari workspace hack (faster compile times) -workspace-build-acceleration = { workspace = true } +workspace-build-acceleration.workspace = true # Internal actix_helpers = { path = "../../../lib/actix_helpers" } bootstrap = { path = "../../../lib/bootstrap" } bucket_paths = { path = "../../../lib/bucket_paths" } -cloud_storage = { path = "../../../lib/api_clients/cloud_storage" } +cloud_storage.workspace = true collections = { path = "../../../lib/data/collections" } composite_identifiers = { path = "../../../schema/public/composite_identifiers" } concurrency = { path = "../../../lib/concurrency" } config = { path = "../../../lib/deprecated/config" } -crockford = { path = "../../../lib/data/crockford" } +crockford.workspace = true easyenv = { path = "../../../lib/easyenv" } -enums = { path = "../../../schema/public/enums" } -errors = { workspace = true } -filesys = { workspace = true } -google_drive_common = { path = "../../../lib/api_clients/google_drive_common" } +enums.workspace = true +errors.workspace = true +filesys.workspace = true +google_drive_common = { path = "../../../api_clients/google_drive_common" } hashing = { path = "../../../lib/files/hashing" } -images = { path = "../../../lib/files/images" } +images.workspace = true jobs_common = { path = "../../../lib/jobs_common" } media = { path = "../../../lib/files/media" } memory_caching = { path = "../../../lib/caching/memory_caching" } migration = { path = "../../../lib/migration" } mimetypes = { path = "../../../lib/files/mimetypes" } mysql_queries = { path = "../../../schema/database/mysql_queries" } -openai_sora_client = { path = "../../../lib/api_clients/openai_sora_client" } -primitives = { path = "../../../lib/data/primitives" } +openai_sora_client = { path = "../../../api_clients/openai_sora_client" } +primitives.workspace = true redis_common = { path = "../../../schema/database/redis_common" } redis_schema = { path = "../../../schema/database/redis_schema" } shared_service_components = { workspace = true } subprocess_common = { path = "../../../lib/subprocess_common" } -thumbnail_generator = { path = "../../../lib/api_clients/thumbnail_generator"} -tokens = { path = "../../../schema/public/tokens" } +thumbnail_generator = { path = "../../../api_clients/thumbnail_generator"} +tokens.workspace = true tts_common = { path = "../../../lib/tts_common" } videos = { path = "../../../lib/files/videos" } # External -anyhow = { workspace = true } -chrono = { workspace = true } +anyhow.workspace = true +chrono.workspace = true dotenv = "0.15.0" hostname = "0.4.0" lfu = "0.2.5" -log = { workspace = true } -once_cell = { workspace = true } +log.workspace = true +once_cell.workspace = true subprocess = "0.2.9" -tempdir = "0.3.7" +tempdir.workspace = true sqlx = { version = "0.7.2", features = [ "mysql", "runtime-tokio", "tls-rustls", "chrono" ] } @@ -79,12 +79,12 @@ tokio-stream = "0.1.16" reqwest = { version = "0.12.4", features = ["blocking"] } # HTTP Server -actix-web = { workspace = true } +actix-web.workspace = true # Serialization -serde = { workspace = true } -serde_derive = { workspace = true } -serde_json = { workspace = true } +serde.workspace = true +serde_derive.workspace = true +serde_json.workspace = true # Async traits # NB: note: `async` trait functions are not currently supported diff --git a/crates/service/job/tts_download_job/Cargo.toml b/crates/service/job/tts_download_job/Cargo.toml index 7b17a80c79..0c1e9091bc 100644 --- a/crates/service/job/tts_download_job/Cargo.toml +++ b/crates/service/job/tts_download_job/Cargo.toml @@ -19,13 +19,13 @@ normal = ["workspace-build-acceleration"] # Internal bucket_paths = { path = "../../../lib/bucket_paths" } -cloud_storage = { path = "../../../lib/api_clients/cloud_storage" } +cloud_storage.workspace = true config = { path = "../../../lib/deprecated/config" } easyenv = { path = "../../../lib/easyenv" } -enums = { path = "../../../schema/public/enums" } -errors = { path = "../../../lib/errors" } -filesys = { path = "../../../lib/files/filesys" } -google_drive_common = { path = "../../../lib/api_clients/google_drive_common" } +enums.workspace = true +errors.workspace = true +filesys.workspace = true +google_drive_common = { path = "../../../api_clients/google_drive_common" } hashing = { path = "../../../lib/files/hashing" } jobs_common = { path = "../../../lib/jobs_common" } mysql_queries = { path = "../../../schema/database/mysql_queries" } @@ -34,13 +34,13 @@ mysql_queries = { path = "../../../schema/database/mysql_queries" } workspace-build-acceleration = { version = "0.1", path = "../../../workspace-build-acceleration" } # External -anyhow = "1.0.86" -chrono = { version = "0.4.22", features = ["serde"] } +anyhow.workspace = true +chrono.workspace = true dotenv = "0.15.0" hostname = "0.4.0" -log = "0.4.14" +log.workspace = true subprocess = "0.2.9" -tempdir = "0.3.7" +tempdir.workspace = true sqlx = { version = "0.7.2", features = [ "mysql", "runtime-tokio", "tls-rustls", "chrono" ] } @@ -48,14 +48,13 @@ sqlx = { version = "0.7.2", features = [ "mysql", "runtime-tokio", "tls-rustls", r2d2_redis = "0.14.0" # Runtime -# NB: We switched to Tokio from `async-std` for broader ecosystem support. -tokio = { version = "1.38.0", features = ["macros"] } +tokio.workspace = true # NB: Hyper is just for HTTP client use in jobs. I'd use Actix client, but I need tokio runtime # NB: Furthermore, the Tokio runtime is old, so I have to use an older Hyper. hyper = { version = "1.3.1" } # Serialization -serde = "1.0.125" -serde_derive = "1.0.125" -serde_json = "1.0.108" +serde.workspace = true +serde_derive.workspace = true +serde_json.workspace = true diff --git a/crates/service/job/tts_inference_job/Cargo.toml b/crates/service/job/tts_inference_job/Cargo.toml index 6bcc147388..8eb82b7370 100644 --- a/crates/service/job/tts_inference_job/Cargo.toml +++ b/crates/service/job/tts_inference_job/Cargo.toml @@ -16,32 +16,31 @@ path = "src/main.rs" normal = ["workspace-build-acceleration"] [dependencies] +# Workspace hack (faster compile times) +workspace-build-acceleration.workspace = true # Internal bucket_paths = { path = "../../../lib/bucket_paths" } -cloud_storage = { path = "../../../lib/api_clients/cloud_storage" } +cloud_storage.workspace = true collections = { path = "../../../lib/data/collections" } config = { path = "../../../lib/deprecated/config" } easyenv = { path = "../../../lib/easyenv" } -errors = { path = "../../../lib/errors" } -filesys = { path = "../../../lib/files/filesys" } +errors.workspace = true +filesys.workspace = true hashing = { path = "../../../lib/files/hashing" } jobs_common = { path = "../../../lib/jobs_common" } memory_caching = { path = "../../../lib/caching/memory_caching" } mysql_queries = { path = "../../../schema/database/mysql_queries" } tts_common = { path = "../../../lib/tts_common" } -# Workspace hack (faster compile times) -workspace-build-acceleration = { version = "0.1", path = "../../../workspace-build-acceleration" } - # External -anyhow = "1.0.86" -chrono = { version = "0.4.22", features = ["serde"] } +anyhow.workspace = true +chrono.workspace = true dotenv = "0.15.0" hostname = "0.4.0" lfu = "0.2.5" log = "0.4.14" -tempdir = "0.3.7" +tempdir.workspace = true sqlx = { version = "0.7.2", features = [ "mysql", "runtime-tokio", "tls-rustls", "chrono" ] } @@ -49,13 +48,12 @@ sqlx = { version = "0.7.2", features = [ "mysql", "runtime-tokio", "tls-rustls", r2d2_redis = "0.14.0" # Runtime -# NB: We switched to Tokio from `async-std` for broader ecosystem support. -tokio = { version = "1.38.0", features = ["macros"] } +tokio.workspace = true # HTTP reqwest = { version = "0.12.4", features = ["blocking"] } # Serialization -serde = "1.0.125" -serde_derive = "1.0.125" -serde_json = "1.0.108" +serde.workspace = true +serde_derive.workspace = true +serde_json.workspace = true diff --git a/crates/service/job/w2l_download_job/Cargo.toml b/crates/service/job/w2l_download_job/Cargo.toml index 5f6f3ecf85..f167fcf5c6 100644 --- a/crates/service/job/w2l_download_job/Cargo.toml +++ b/crates/service/job/w2l_download_job/Cargo.toml @@ -16,30 +16,29 @@ path = "src/main.rs" normal = ["workspace-build-acceleration"] [dependencies] +# Workspace hack (faster compile times) +workspace-build-acceleration.workspace = true # Internal bucket_paths = { path = "../../../lib/bucket_paths" } -cloud_storage = { path = "../../../lib/api_clients/cloud_storage" } +cloud_storage = { path = "../../../api_clients/cloud_storage" } config = { path = "../../../lib/deprecated/config" } easyenv = { path = "../../../lib/easyenv" } -errors = { path = "../../../lib/errors" } -filesys = { path = "../../../lib/files/filesys" } -google_drive_common = { path = "../../../lib/api_clients/google_drive_common" } +errors.workspace = true +filesys.workspace = true +google_drive_common = { path = "../../../api_clients/google_drive_common" } hashing = { path = "../../../lib/files/hashing" } jobs_common = { path = "../../../lib/jobs_common" } mysql_queries = { path = "../../../schema/database/mysql_queries" } -# Workspace hack (faster compile times) -workspace-build-acceleration = { version = "0.1", path = "../../../workspace-build-acceleration" } - # External -anyhow = "1.0.86" -chrono = { version = "0.4.22", features = ["serde"] } +anyhow.workspace = true +chrono.workspace = true dotenv = "0.15.0" hostname = "0.4.0" -log = "0.4.14" +log.workspace = true subprocess = "0.2.9" -tempdir = "0.3.7" +tempdir.workspace = true sqlx = { version = "0.7.2", features = [ "mysql", "runtime-tokio", "tls-rustls", "chrono" ] } @@ -48,13 +47,13 @@ r2d2_redis = "0.14.0" # Runtime # NB: We switched to Tokio from `async-std` for broader ecosystem support. -tokio = { version = "1.38.0", features = ["macros"] } +tokio.workspace = true # NB: Hyper is just for HTTP client use in jobs. I'd use Actix client, but I need tokio runtime # NB: Furthermore, the Tokio runtime is old, so I have to use an older Hyper. hyper = { version = "1.3.1" } # Serialization -serde = "1.0.125" -serde_derive = "1.0.125" -serde_json = "1.0.108" +serde.workspace = true +serde_derive.workspace = true +serde_json.workspace = true diff --git a/crates/service/job/w2l_inference_job/Cargo.toml b/crates/service/job/w2l_inference_job/Cargo.toml index f52dd8ec1e..d4867873df 100644 --- a/crates/service/job/w2l_inference_job/Cargo.toml +++ b/crates/service/job/w2l_inference_job/Cargo.toml @@ -17,28 +17,28 @@ normal = ["workspace-build-acceleration"] [dependencies] +# Workspace hack (faster compile times) +workspace-build-acceleration.workspace = true + # Internal bucket_paths = { path = "../../../lib/bucket_paths" } -cloud_storage = { path = "../../../lib/api_clients/cloud_storage" } +cloud_storage.workspace = true config = { path = "../../../lib/deprecated/config" } easyenv = { path = "../../../lib/easyenv" } -errors = { path = "../../../lib/errors" } -filesys = { path = "../../../lib/files/filesys" } -google_drive_common = { path = "../../../lib/api_clients/google_drive_common" } +errors.workspace = true +filesys.workspace = true +google_drive_common = { path = "../../../api_clients/google_drive_common" } jobs_common = { path = "../../../lib/jobs_common" } mysql_queries = { path = "../../../schema/database/mysql_queries" } -# Workspace hack (faster compile times) -workspace-build-acceleration = { version = "0.1", path = "../../../workspace-build-acceleration" } - # External -anyhow = "1.0.86" -chrono = { version = "0.4.22", features = ["serde"] } +anyhow.workspace = true +chrono.workspace = true dotenv = "0.15.0" hostname = "0.4.0" -log = "0.4.14" +log.workspace = true subprocess = "0.2.9" -tempdir = "0.3.7" +tempdir.workspace = true sqlx = { version = "0.7.2", features = [ "mysql", "runtime-tokio", "tls-rustls", "chrono" ] } @@ -47,13 +47,13 @@ r2d2_redis = "0.14.0" # Runtime # NB: We switched to Tokio from `async-std` for broader ecosystem support. -tokio = { version = "1.38.0", features = ["macros"] } +tokio.workspace = true # NB: Hyper is just for HTTP client use in jobs. I'd use Actix client, but I need tokio runtime # NB: Furthermore, the Tokio runtime is old, so I have to use an older Hyper. hyper = { version = "1.3.1" } # Serialization -serde = "1.0.125" -serde_derive = "1.0.125" -serde_json = "1.0.108" +serde.workspace = true +serde_derive.workspace = true +serde_json.workspace = true diff --git a/crates/service/web/storyteller_web/Cargo.toml b/crates/service/web/storyteller_web/Cargo.toml index d37096c13d..869bef8a89 100644 --- a/crates/service/web/storyteller_web/Cargo.toml +++ b/crates/service/web/storyteller_web/Cargo.toml @@ -29,15 +29,15 @@ path = "src/api_doc_cli.rs" [dependencies] # cargo-hakari workspace hack (faster compile times) -workspace-build-acceleration = { workspace = true } +workspace-build-acceleration.workspace = true # Internal actix_cors_configs = { path = "../../../lib/actix_cors_configs" } actix_helpers = { path = "../../../lib/actix_helpers" } -artcraft_api_defs = { workspace = true } +artcraft_api_defs.workspace = true bootstrap = { path = "../../../lib/bootstrap" } bucket_paths = { path = "../../../lib/bucket_paths" } -cloud_storage = { path = "../../../lib/api_clients/cloud_storage" } +cloud_storage.workspace = true collections = { path = "../../../lib/data/collections" } composite_identifiers = { path = "../../../schema/public/composite_identifiers" } config = { path = "../../../lib/deprecated/config" } @@ -47,23 +47,23 @@ datetimes = { path = "../../../lib/data/datetimes" } easyenv = { path = "../../../lib/easyenv" } elasticsearch_schema = { path = "../../../schema/database/elasticsearch_schema" } email_sender= { path = "../../../lib/email_sender" } -enums = { workspace = true } -enums_public = { workspace = true } -errors = { workspace = true } -fal_client = { workspace = true } -filesys = { workspace = true } -google_sign_in = { path = "../../../lib/api_clients/google_sign_in" } +enums.workspace = true +enums_public.workspace = true +errors.workspace = true +fal_client.workspace = true +filesys.workspace = true +google_sign_in = { path = "../../../api_clients/google_sign_in" } hashing = { path = "../../../lib/files/hashing" } http_server_common = { path = "../../../lib/deprecated/http_server_common" } idempotency = { path = "../../../lib/idempotency" } -images = { workspace = true } +images.workspace = true markdown = { path = "../../../lib/markdown" } media = { path = "../../../lib/files/media" } memory_caching = { path = "../../../lib/caching/memory_caching" } migration = { path = "../../../lib/migration" } -mimetypes = { workspace = true } +mimetypes.workspace = true mysql_queries = { path = "../../../schema/database/mysql_queries" } -openai_sora_client = { path = "../../../lib/api_clients/openai_sora_client" } +openai_sora_client = { path = "../../../api_clients/openai_sora_client" } password = { path = "../../../lib/password" } primitives = { path = "../../../lib/data/primitives" } prompt_engineering = { path = "../../../lib/machine_learning/prompt_engineering" } @@ -72,9 +72,9 @@ redis_common = { path = "../../../schema/database/redis_common" } redis_schema = { path = "../../../schema/database/redis_schema" } reusable_types = { path = "../../../schema/public/reusable_types" } server_environment = { path = "../../../lib/server_environment" } -shared_service_components = { workspace = true } -thumbnail_generator = { path = "../../../lib/api_clients/thumbnail_generator" } -tokens = { workspace = true } +shared_service_components.workspace = true +thumbnail_generator = { path = "../../../api_clients/thumbnail_generator" } +tokens.workspace = true tts_common = { path = "../../../lib/tts_common" } url_config = { path = "../../../lib/url_config" } user_input_common = { path = "../../../lib/user_input_common" } @@ -85,19 +85,19 @@ billing_component = { path = "../../plugins/billing" } user_traits_component = { path = "../../plugins/user_traits_component" } # External -anyhow = { workspace = true } -base64 = { workspace = true } -chrono = { workspace = true } +anyhow.workspace = true +base64.workspace = true +chrono.workspace = true derive_more = "0.99.17" hostname = "0.4.0" lexical-sort = "0.3.1" -log = { workspace = true } -once_cell = { workspace = true } -rand = { workspace = true } -regex = { workspace = true } +log.workspace = true +once_cell.workspace = true +rand.workspace = true +regex.workspace = true strum_macros = "0.26.4" time = "0.3.30" -url = { workspace = true } +url.workspace = true # Language tag parsing # TODO: Move to language support crate @@ -105,11 +105,10 @@ language-tags = "0.3.2" # Parsing single tags richly # HTTP # TODO/NB: This is just for Twitch, but we might need it later. -reqwest = { workspace = true } +reqwest.workspace = true # Runtime -# NB: We switched to Tokio from `async-std` for broader ecosystem support. -tokio = { version = "1.38.0", features = ["macros"] } +tokio.workspace = true # Futures futures = { version = "0.3.17", features = ["thread-pool"] } # feature for ThreadPool @@ -127,21 +126,21 @@ elasticsearch = "8.5.0-alpha.1" # Files infer = "0.16.0" -bytes = { workspace = true } -tempdir = { workspace = true } -tempfile = { workspace = true } +bytes.workspace = true +tempdir.workspace = true +tempfile.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" } -actix = { workspace = true } -actix-http = { workspace = true } -actix-multipart = { workspace = true } -actix-service = { workspace = true } -actix-web = { workspace = true } -actix-web-actors = { workspace = true } -actix-web-lab = { workspace = true } +actix.workspace = true +actix-http.workspace = true +actix-multipart.workspace = true +actix-service.workspace = true +actix-web.workspace = true +actix-web-actors.workspace = true +actix-web-lab.workspace = true # Money async-stripe = { version = "0.26.0", default-features = false, features = ["runtime-tokio-hyper", "connect", "billing", "checkout", "webhook-events"] } @@ -151,10 +150,10 @@ magic-crypt = "3.1.13" # encrypting sort IDs for the frontend so we don't leak i md-5 = "0.10.6" # gravatar # Serialization -serde = { workspace = true } -serde_derive = { workspace = true } -serde_json = { workspace = true } -toml = { workspace = true } +serde.workspace = true +serde_derive.workspace = true +serde_json.workspace = true +toml.workspace = true # Async traits # NB: note: `async` trait functions are not currently supported @@ -179,4 +178,4 @@ testing = { path = "../../../lib/testing" } # Testing/Dev Deps: External speculoos = "0.11.0" # Fluent assertions strum = { version = "0.26", features = ["derive"] } -tempfile = "3.10.1" # For testing +tempfile.workspace = true