From df4d46cc9d578ddc5e1bcde0b985e4012766d562 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Wed, 18 Mar 2026 16:49:04 -0400 Subject: [PATCH] rename both worldlabs crates (#1161) - api client crate - consumer client crate --- Cargo.lock | 72 +++++++++---------- Cargo.toml | 8 +-- .../artcraft/artcraft_router/Cargo.toml | 2 +- ...ate_splat_cost_artcraft_marble_0p1_mini.rs | 4 +- ...ate_splat_cost_artcraft_marble_0p1_plus.rs | 4 +- .../Cargo.toml | 4 +- .../src/api/api_types/media_asset_id.rs | 0 .../src/api/api_types/mod.rs | 0 .../src/api/api_types/operation_id.rs | 0 .../src/api/api_types/world_id.rs | 0 .../src/api/api_types/world_labs_model.rs | 0 .../src/api/mod.rs | 0 .../api/requests/delete_world/delete_world.rs | 0 .../api/requests/delete_world/http_request.rs | 0 .../src/api/requests/delete_world/mod.rs | 0 .../requests/generate_world/generate_world.rs | 0 .../requests/generate_world/http_request.rs | 0 .../src/api/requests/generate_world/mod.rs | 0 .../get_media_asset/get_media_asset.rs | 0 .../requests/get_media_asset/http_request.rs | 0 .../src/api/requests/get_media_asset/mod.rs | 0 .../requests/get_operation/get_operation.rs | 0 .../requests/get_operation/http_request.rs | 0 .../src/api/requests/get_operation/mod.rs | 0 .../src/api/requests/get_world/get_world.rs | 0 .../api/requests/get_world/http_request.rs | 0 .../src/api/requests/get_world/mod.rs | 0 .../api/requests/list_worlds/http_request.rs | 0 .../api/requests/list_worlds/list_worlds.rs | 0 .../src/api/requests/list_worlds/mod.rs | 0 .../src/api/requests/mod.rs | 0 .../requests/prepare_upload/http_request.rs | 0 .../src/api/requests/prepare_upload/mod.rs | 0 .../requests/prepare_upload/prepare_upload.rs | 0 .../api/requests/upload_to_signed_url/mod.rs | 0 .../upload_to_signed_url.rs | 0 .../src/credentials/mod.rs | 0 .../src/credentials/world_labs_api_creds.rs | 0 .../src/error/filter_world_labs_http_error.rs | 0 .../src/error/mod.rs | 0 .../src/error/world_labs_client_error.rs | 0 .../src/error/world_labs_error.rs | 0 .../src/error/world_labs_generic_api_error.rs | 0 .../error/world_labs_specific_api_error.rs | 0 .../src/lib.rs | 0 .../src/pricing/check_pricing.rs | 0 .../src/pricing/mod.rs | 0 .../src/recipes/mod.rs | 0 ...pload_image_and_create_world_with_retry.rs | 0 .../src/test_utils/get_test_api_key.rs | 0 .../src/test_utils/mod.rs | 0 .../src/test_utils/setup_test_logging.rs | 0 .../Cargo.toml | 4 +- .../api/api_types/image_input_object_id.rs | 0 .../src/api/api_types/meta_world_object_id.rs | 0 .../src/api/api_types/mod.rs | 0 .../src/api/api_types/pano_object_id.rs | 0 .../src/api/api_types/run_object.rs | 0 .../src/api/api_types/run_object_id.rs | 0 .../src/api/api_types/upload_mime_type.rs | 0 .../src/api/api_types/upload_object_id.rs | 0 .../src/api/api_types/world_id.rs | 0 .../src/api/common/common_header_values.rs | 0 .../src/api/common/mod.rs | 0 .../src/api/mod.rs | 0 .../google_refresh_token.rs | 0 .../api/requests/google_refresh_token/mod.rs | 0 .../google_upload/google_upload_image.rs | 0 .../src/api/requests/google_upload/mod.rs | 0 .../src/api/requests/mod.rs | 0 .../objects/begin_object_image_upload.rs | 0 .../api/requests/objects/create_run_object.rs | 0 .../requests/objects/create_upload_object.rs | 0 .../objects/finalize_object_image_upload.rs | 0 .../src/api/requests/objects/mod.rs | 0 .../objects/update_run_object_with_upload.rs | 0 .../objects/update_run_object_with_world.rs | 0 .../src/api/requests/recaption/mod.rs | 0 .../api/requests/recaption/recaption_image.rs | 0 .../src/api/requests/worlds/create_world.rs | 0 .../src/api/requests/worlds/mod.rs | 0 .../api/requests/worlds/poll_world_status.rs | 0 .../src/api/utils/mod.rs | 0 .../src/api/utils/upload_id_to_image_url.rs | 0 .../src/client/browser_user_agents.rs | 0 .../src/client/mod.rs | 0 .../src/credentials/jwt_claims.rs | 0 .../src/credentials/mod.rs | 0 .../credentials/world_labs_bearer_token.rs | 0 .../src/credentials/world_labs_cookies.rs | 0 .../credentials/worldlabs_refresh_token.rs | 0 .../src/error/filter_world_labs_http_error.rs | 0 .../src/error/mod.rs | 0 .../src/error/world_labs_client_error.rs | 0 .../src/error/world_labs_error.rs | 0 .../src/error/world_labs_generic_api_error.rs | 0 .../error/world_labs_specific_api_error.rs | 0 .../src/lib.rs | 0 .../src/recipes/mod.rs | 0 ...pload_image_and_create_world_with_retry.rs | 0 .../src/test_utils/get_test_bearer_token.rs | 0 .../src/test_utils/get_test_cookies.rs | 0 .../src/test_utils/get_test_refresh_token.rs | 0 .../src/test_utils/mod.rs | 0 .../src/test_utils/setup_test_logging.rs | 0 crates/desktop/artcraft/Cargo.toml | 2 +- .../core/commands/enqueue/generate_error.rs | 2 +- .../worldlabs/handle_worldlabs_marble.rs | 4 +- .../worldlabs_get_credential_info_command.rs | 4 +- .../state/worldlabs_credential_holder.rs | 6 +- .../state/worldlabs_credential_manager.rs | 6 +- .../threads/worldlabs_marble_task_polling.rs | 10 +-- .../worldlabs_login_window_thread.rs | 4 +- crates/service/job/worldlabs_job/Cargo.toml | 6 +- .../job/worldlabs_job/src/job_dependencies.rs | 2 +- crates/service/job/worldlabs_job/src/main.rs | 2 +- .../job/worldlabs_job/src/main_loop.rs | 4 +- .../src/process_job/process_successful_job.rs | 2 +- crates/service/web/storyteller_web/Cargo.toml | 2 +- ...worldlabs_marble_0p1_mini_splat_handler.rs | 10 +-- ...worldlabs_marble_0p1_plus_splat_handler.rs | 10 +-- 121 files changed, 87 insertions(+), 87 deletions(-) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/Cargo.toml (91%) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/src/api/api_types/media_asset_id.rs (100%) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/src/api/api_types/mod.rs (100%) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/src/api/api_types/operation_id.rs (100%) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/src/api/api_types/world_id.rs (100%) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/src/api/api_types/world_labs_model.rs (100%) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/src/api/mod.rs (100%) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/src/api/requests/delete_world/delete_world.rs (100%) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/src/api/requests/delete_world/http_request.rs (100%) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/src/api/requests/delete_world/mod.rs (100%) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/src/api/requests/generate_world/generate_world.rs (100%) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/src/api/requests/generate_world/http_request.rs (100%) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/src/api/requests/generate_world/mod.rs (100%) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/src/api/requests/get_media_asset/get_media_asset.rs (100%) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/src/api/requests/get_media_asset/http_request.rs (100%) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/src/api/requests/get_media_asset/mod.rs (100%) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/src/api/requests/get_operation/get_operation.rs (100%) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/src/api/requests/get_operation/http_request.rs (100%) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/src/api/requests/get_operation/mod.rs (100%) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/src/api/requests/get_world/get_world.rs (100%) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/src/api/requests/get_world/http_request.rs (100%) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/src/api/requests/get_world/mod.rs (100%) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/src/api/requests/list_worlds/http_request.rs (100%) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/src/api/requests/list_worlds/list_worlds.rs (100%) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/src/api/requests/list_worlds/mod.rs (100%) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/src/api/requests/mod.rs (100%) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/src/api/requests/prepare_upload/http_request.rs (100%) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/src/api/requests/prepare_upload/mod.rs (100%) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/src/api/requests/prepare_upload/prepare_upload.rs (100%) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/src/api/requests/upload_to_signed_url/mod.rs (100%) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/src/api/requests/upload_to_signed_url/upload_to_signed_url.rs (100%) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/src/credentials/mod.rs (100%) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/src/credentials/world_labs_api_creds.rs (100%) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/src/error/filter_world_labs_http_error.rs (100%) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/src/error/mod.rs (100%) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/src/error/world_labs_client_error.rs (100%) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/src/error/world_labs_error.rs (100%) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/src/error/world_labs_generic_api_error.rs (100%) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/src/error/world_labs_specific_api_error.rs (100%) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/src/lib.rs (100%) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/src/pricing/check_pricing.rs (100%) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/src/pricing/mod.rs (100%) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/src/recipes/mod.rs (100%) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/src/recipes/upload_image_and_create_world_with_retry.rs (100%) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/src/test_utils/get_test_api_key.rs (100%) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/src/test_utils/mod.rs (100%) rename crates/api_clients/{world_labs_api => worldlabs_api_client}/src/test_utils/setup_test_logging.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/Cargo.toml (94%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/api/api_types/image_input_object_id.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/api/api_types/meta_world_object_id.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/api/api_types/mod.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/api/api_types/pano_object_id.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/api/api_types/run_object.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/api/api_types/run_object_id.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/api/api_types/upload_mime_type.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/api/api_types/upload_object_id.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/api/api_types/world_id.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/api/common/common_header_values.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/api/common/mod.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/api/mod.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/api/requests/google_refresh_token/google_refresh_token.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/api/requests/google_refresh_token/mod.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/api/requests/google_upload/google_upload_image.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/api/requests/google_upload/mod.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/api/requests/mod.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/api/requests/objects/begin_object_image_upload.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/api/requests/objects/create_run_object.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/api/requests/objects/create_upload_object.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/api/requests/objects/finalize_object_image_upload.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/api/requests/objects/mod.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/api/requests/objects/update_run_object_with_upload.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/api/requests/objects/update_run_object_with_world.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/api/requests/recaption/mod.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/api/requests/recaption/recaption_image.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/api/requests/worlds/create_world.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/api/requests/worlds/mod.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/api/requests/worlds/poll_world_status.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/api/utils/mod.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/api/utils/upload_id_to_image_url.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/client/browser_user_agents.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/client/mod.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/credentials/jwt_claims.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/credentials/mod.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/credentials/world_labs_bearer_token.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/credentials/world_labs_cookies.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/credentials/worldlabs_refresh_token.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/error/filter_world_labs_http_error.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/error/mod.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/error/world_labs_client_error.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/error/world_labs_error.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/error/world_labs_generic_api_error.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/error/world_labs_specific_api_error.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/lib.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/recipes/mod.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/recipes/upload_image_and_create_world_with_retry.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/test_utils/get_test_bearer_token.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/test_utils/get_test_cookies.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/test_utils/get_test_refresh_token.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/test_utils/mod.rs (100%) rename crates/api_clients/{world_labs_client => worldlabs_consumer_client}/src/test_utils/setup_test_logging.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index adfa171ea8..2e7275957d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -731,7 +731,7 @@ dependencies = [ "url_utils", "web_base64", "workspace-build-acceleration", - "world_labs_client", + "worldlabs_consumer_client", ] [[package]] @@ -800,7 +800,7 @@ dependencies = [ "url_utils", "uuid 1.18.1", "workspace-build-acceleration", - "world_labs_api", + "worldlabs_api_client", "wreq", ] @@ -11647,7 +11647,7 @@ dependencies = [ "utoipa-swagger-ui", "videos", "workspace-build-acceleration", - "world_labs_api", + "worldlabs_api_client", "wreq", "zip 0.6.6", ] @@ -15094,7 +15094,38 @@ dependencies = [ ] [[package]] -name = "world_labs_api" +name = "worldlabs-job" +version = "0.0.1" +dependencies = [ + "actix-web", + "actix_helpers", + "anyhow", + "bootstrap", + "bucket_paths", + "cloud_storage", + "concurrency", + "config", + "easyenv", + "enums", + "errors", + "hashing", + "jobs_common", + "log", + "mysql_queries", + "reqwest 0.12.23", + "serde", + "serde_derive", + "serde_json", + "server_environment", + "sqlx", + "tokens", + "tokio", + "workspace-build-acceleration", + "worldlabs_api_client", +] + +[[package]] +name = "worldlabs_api_client" version = "0.0.1" dependencies = [ "anyhow", @@ -15114,7 +15145,7 @@ dependencies = [ ] [[package]] -name = "world_labs_client" +name = "worldlabs_consumer_client" version = "0.0.1" dependencies = [ "anyhow", @@ -15151,37 +15182,6 @@ dependencies = [ "wreq-util", ] -[[package]] -name = "worldlabs-job" -version = "0.0.1" -dependencies = [ - "actix-web", - "actix_helpers", - "anyhow", - "bootstrap", - "bucket_paths", - "cloud_storage", - "concurrency", - "config", - "easyenv", - "enums", - "errors", - "hashing", - "jobs_common", - "log", - "mysql_queries", - "reqwest 0.12.23", - "serde", - "serde_derive", - "serde_json", - "server_environment", - "sqlx", - "tokens", - "tokio", - "workspace-build-acceleration", - "world_labs_api", -] - [[package]] name = "wreq" version = "6.0.0-rc.28" diff --git a/Cargo.toml b/Cargo.toml index d6c27b165e..67dd8ff863 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,8 +20,8 @@ members = [ "crates/api_clients/seedance2pro_client", "crates/api_clients/runwayml_client", "crates/api_clients/thumbnail_generator", - "crates/api_clients/world_labs_api", - "crates/api_clients/world_labs_client", + "crates/api_clients/worldlabs_api_client", + "crates/api_clients/worldlabs_consumer_client", # CLI tools for operations, etc. "crates/cli/devenv/dev-database-seed", @@ -262,8 +262,8 @@ tokens = { path = "crates/schema/public/tokens" } url_utils = { path = "crates/lib/url_utils" } users = { path = "crates/lib/users" } web_base64 = { path = "crates/lib/data/web_base64" } -world_labs_api = { path = "crates/api_clients/world_labs_api" } -world_labs_client = { path = "crates/api_clients/world_labs_client" } +worldlabs_api_client = { path = "crates/api_clients/worldlabs_api_client" } +worldlabs_consumer_client = { path = "crates/api_clients/worldlabs_consumer_client" } # External libs # Centrally pinned versions so that we can uniformly upgrade/downgrade versions across the workspace diff --git a/crates/api_clients/artcraft/artcraft_router/Cargo.toml b/crates/api_clients/artcraft/artcraft_router/Cargo.toml index d5365db15a..d16a017724 100644 --- a/crates/api_clients/artcraft/artcraft_router/Cargo.toml +++ b/crates/api_clients/artcraft/artcraft_router/Cargo.toml @@ -23,7 +23,7 @@ muapi_client.workspace = true seedance2pro_client.workspace = true tokens.workspace = true url_utils.workspace = true -world_labs_api.workspace = true +worldlabs_api_client.workspace = true # External anyhow.workspace = true diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_splat/cost/artcraft/estimate_splat_cost_artcraft_marble_0p1_mini.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_splat/cost/artcraft/estimate_splat_cost_artcraft_marble_0p1_mini.rs index 3775fc9f43..245c379d70 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_splat/cost/artcraft/estimate_splat_cost_artcraft_marble_0p1_mini.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_splat/cost/artcraft/estimate_splat_cost_artcraft_marble_0p1_mini.rs @@ -1,7 +1,7 @@ use crate::generate::generate_splat::plan::artcraft::plan_generate_splat_artcraft_marble_0p1_mini::PlanArtcraftMarble0p1Mini; use crate::generate::generate_splat::splat_generation_cost_estimate::SplatGenerationCostEstimate; -use world_labs_api::api::api_types::world_labs_model::WorldLabsModel; -use world_labs_api::pricing::check_pricing::{calculate_cost, InputType}; +use worldlabs_api_client::api::api_types::world_labs_model::WorldLabsModel; +use worldlabs_api_client::pricing::check_pricing::{calculate_cost, InputType}; pub(crate) fn estimate_splat_cost_artcraft_marble_0p1_mini( plan: &PlanArtcraftMarble0p1Mini<'_>, diff --git a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_splat/cost/artcraft/estimate_splat_cost_artcraft_marble_0p1_plus.rs b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_splat/cost/artcraft/estimate_splat_cost_artcraft_marble_0p1_plus.rs index 289dd10664..a33e8c932a 100644 --- a/crates/api_clients/artcraft/artcraft_router/src/generate/generate_splat/cost/artcraft/estimate_splat_cost_artcraft_marble_0p1_plus.rs +++ b/crates/api_clients/artcraft/artcraft_router/src/generate/generate_splat/cost/artcraft/estimate_splat_cost_artcraft_marble_0p1_plus.rs @@ -1,7 +1,7 @@ use crate::generate::generate_splat::plan::artcraft::plan_generate_splat_artcraft_marble_0p1_plus::PlanArtcraftMarble0p1Plus; use crate::generate::generate_splat::splat_generation_cost_estimate::SplatGenerationCostEstimate; -use world_labs_api::api::api_types::world_labs_model::WorldLabsModel; -use world_labs_api::pricing::check_pricing::{calculate_cost, InputType}; +use worldlabs_api_client::api::api_types::world_labs_model::WorldLabsModel; +use worldlabs_api_client::pricing::check_pricing::{calculate_cost, InputType}; pub(crate) fn estimate_splat_cost_artcraft_marble_0p1_plus( plan: &PlanArtcraftMarble0p1Plus<'_>, diff --git a/crates/api_clients/world_labs_api/Cargo.toml b/crates/api_clients/worldlabs_api_client/Cargo.toml similarity index 91% rename from crates/api_clients/world_labs_api/Cargo.toml rename to crates/api_clients/worldlabs_api_client/Cargo.toml index e693bbd188..8f71b7cc2a 100644 --- a/crates/api_clients/world_labs_api/Cargo.toml +++ b/crates/api_clients/worldlabs_api_client/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "world_labs_api" +name = "worldlabs_api_client" edition = "2024" version = "0.0.1" publish = false @@ -8,7 +8,7 @@ publish = false normal = ["workspace-build-acceleration"] [lib] -name = "world_labs_api" +name = "worldlabs_api_client" path = "src/lib.rs" [dependencies] diff --git a/crates/api_clients/world_labs_api/src/api/api_types/media_asset_id.rs b/crates/api_clients/worldlabs_api_client/src/api/api_types/media_asset_id.rs similarity index 100% rename from crates/api_clients/world_labs_api/src/api/api_types/media_asset_id.rs rename to crates/api_clients/worldlabs_api_client/src/api/api_types/media_asset_id.rs diff --git a/crates/api_clients/world_labs_api/src/api/api_types/mod.rs b/crates/api_clients/worldlabs_api_client/src/api/api_types/mod.rs similarity index 100% rename from crates/api_clients/world_labs_api/src/api/api_types/mod.rs rename to crates/api_clients/worldlabs_api_client/src/api/api_types/mod.rs diff --git a/crates/api_clients/world_labs_api/src/api/api_types/operation_id.rs b/crates/api_clients/worldlabs_api_client/src/api/api_types/operation_id.rs similarity index 100% rename from crates/api_clients/world_labs_api/src/api/api_types/operation_id.rs rename to crates/api_clients/worldlabs_api_client/src/api/api_types/operation_id.rs diff --git a/crates/api_clients/world_labs_api/src/api/api_types/world_id.rs b/crates/api_clients/worldlabs_api_client/src/api/api_types/world_id.rs similarity index 100% rename from crates/api_clients/world_labs_api/src/api/api_types/world_id.rs rename to crates/api_clients/worldlabs_api_client/src/api/api_types/world_id.rs diff --git a/crates/api_clients/world_labs_api/src/api/api_types/world_labs_model.rs b/crates/api_clients/worldlabs_api_client/src/api/api_types/world_labs_model.rs similarity index 100% rename from crates/api_clients/world_labs_api/src/api/api_types/world_labs_model.rs rename to crates/api_clients/worldlabs_api_client/src/api/api_types/world_labs_model.rs diff --git a/crates/api_clients/world_labs_api/src/api/mod.rs b/crates/api_clients/worldlabs_api_client/src/api/mod.rs similarity index 100% rename from crates/api_clients/world_labs_api/src/api/mod.rs rename to crates/api_clients/worldlabs_api_client/src/api/mod.rs diff --git a/crates/api_clients/world_labs_api/src/api/requests/delete_world/delete_world.rs b/crates/api_clients/worldlabs_api_client/src/api/requests/delete_world/delete_world.rs similarity index 100% rename from crates/api_clients/world_labs_api/src/api/requests/delete_world/delete_world.rs rename to crates/api_clients/worldlabs_api_client/src/api/requests/delete_world/delete_world.rs diff --git a/crates/api_clients/world_labs_api/src/api/requests/delete_world/http_request.rs b/crates/api_clients/worldlabs_api_client/src/api/requests/delete_world/http_request.rs similarity index 100% rename from crates/api_clients/world_labs_api/src/api/requests/delete_world/http_request.rs rename to crates/api_clients/worldlabs_api_client/src/api/requests/delete_world/http_request.rs diff --git a/crates/api_clients/world_labs_api/src/api/requests/delete_world/mod.rs b/crates/api_clients/worldlabs_api_client/src/api/requests/delete_world/mod.rs similarity index 100% rename from crates/api_clients/world_labs_api/src/api/requests/delete_world/mod.rs rename to crates/api_clients/worldlabs_api_client/src/api/requests/delete_world/mod.rs diff --git a/crates/api_clients/world_labs_api/src/api/requests/generate_world/generate_world.rs b/crates/api_clients/worldlabs_api_client/src/api/requests/generate_world/generate_world.rs similarity index 100% rename from crates/api_clients/world_labs_api/src/api/requests/generate_world/generate_world.rs rename to crates/api_clients/worldlabs_api_client/src/api/requests/generate_world/generate_world.rs diff --git a/crates/api_clients/world_labs_api/src/api/requests/generate_world/http_request.rs b/crates/api_clients/worldlabs_api_client/src/api/requests/generate_world/http_request.rs similarity index 100% rename from crates/api_clients/world_labs_api/src/api/requests/generate_world/http_request.rs rename to crates/api_clients/worldlabs_api_client/src/api/requests/generate_world/http_request.rs diff --git a/crates/api_clients/world_labs_api/src/api/requests/generate_world/mod.rs b/crates/api_clients/worldlabs_api_client/src/api/requests/generate_world/mod.rs similarity index 100% rename from crates/api_clients/world_labs_api/src/api/requests/generate_world/mod.rs rename to crates/api_clients/worldlabs_api_client/src/api/requests/generate_world/mod.rs diff --git a/crates/api_clients/world_labs_api/src/api/requests/get_media_asset/get_media_asset.rs b/crates/api_clients/worldlabs_api_client/src/api/requests/get_media_asset/get_media_asset.rs similarity index 100% rename from crates/api_clients/world_labs_api/src/api/requests/get_media_asset/get_media_asset.rs rename to crates/api_clients/worldlabs_api_client/src/api/requests/get_media_asset/get_media_asset.rs diff --git a/crates/api_clients/world_labs_api/src/api/requests/get_media_asset/http_request.rs b/crates/api_clients/worldlabs_api_client/src/api/requests/get_media_asset/http_request.rs similarity index 100% rename from crates/api_clients/world_labs_api/src/api/requests/get_media_asset/http_request.rs rename to crates/api_clients/worldlabs_api_client/src/api/requests/get_media_asset/http_request.rs diff --git a/crates/api_clients/world_labs_api/src/api/requests/get_media_asset/mod.rs b/crates/api_clients/worldlabs_api_client/src/api/requests/get_media_asset/mod.rs similarity index 100% rename from crates/api_clients/world_labs_api/src/api/requests/get_media_asset/mod.rs rename to crates/api_clients/worldlabs_api_client/src/api/requests/get_media_asset/mod.rs diff --git a/crates/api_clients/world_labs_api/src/api/requests/get_operation/get_operation.rs b/crates/api_clients/worldlabs_api_client/src/api/requests/get_operation/get_operation.rs similarity index 100% rename from crates/api_clients/world_labs_api/src/api/requests/get_operation/get_operation.rs rename to crates/api_clients/worldlabs_api_client/src/api/requests/get_operation/get_operation.rs diff --git a/crates/api_clients/world_labs_api/src/api/requests/get_operation/http_request.rs b/crates/api_clients/worldlabs_api_client/src/api/requests/get_operation/http_request.rs similarity index 100% rename from crates/api_clients/world_labs_api/src/api/requests/get_operation/http_request.rs rename to crates/api_clients/worldlabs_api_client/src/api/requests/get_operation/http_request.rs diff --git a/crates/api_clients/world_labs_api/src/api/requests/get_operation/mod.rs b/crates/api_clients/worldlabs_api_client/src/api/requests/get_operation/mod.rs similarity index 100% rename from crates/api_clients/world_labs_api/src/api/requests/get_operation/mod.rs rename to crates/api_clients/worldlabs_api_client/src/api/requests/get_operation/mod.rs diff --git a/crates/api_clients/world_labs_api/src/api/requests/get_world/get_world.rs b/crates/api_clients/worldlabs_api_client/src/api/requests/get_world/get_world.rs similarity index 100% rename from crates/api_clients/world_labs_api/src/api/requests/get_world/get_world.rs rename to crates/api_clients/worldlabs_api_client/src/api/requests/get_world/get_world.rs diff --git a/crates/api_clients/world_labs_api/src/api/requests/get_world/http_request.rs b/crates/api_clients/worldlabs_api_client/src/api/requests/get_world/http_request.rs similarity index 100% rename from crates/api_clients/world_labs_api/src/api/requests/get_world/http_request.rs rename to crates/api_clients/worldlabs_api_client/src/api/requests/get_world/http_request.rs diff --git a/crates/api_clients/world_labs_api/src/api/requests/get_world/mod.rs b/crates/api_clients/worldlabs_api_client/src/api/requests/get_world/mod.rs similarity index 100% rename from crates/api_clients/world_labs_api/src/api/requests/get_world/mod.rs rename to crates/api_clients/worldlabs_api_client/src/api/requests/get_world/mod.rs diff --git a/crates/api_clients/world_labs_api/src/api/requests/list_worlds/http_request.rs b/crates/api_clients/worldlabs_api_client/src/api/requests/list_worlds/http_request.rs similarity index 100% rename from crates/api_clients/world_labs_api/src/api/requests/list_worlds/http_request.rs rename to crates/api_clients/worldlabs_api_client/src/api/requests/list_worlds/http_request.rs diff --git a/crates/api_clients/world_labs_api/src/api/requests/list_worlds/list_worlds.rs b/crates/api_clients/worldlabs_api_client/src/api/requests/list_worlds/list_worlds.rs similarity index 100% rename from crates/api_clients/world_labs_api/src/api/requests/list_worlds/list_worlds.rs rename to crates/api_clients/worldlabs_api_client/src/api/requests/list_worlds/list_worlds.rs diff --git a/crates/api_clients/world_labs_api/src/api/requests/list_worlds/mod.rs b/crates/api_clients/worldlabs_api_client/src/api/requests/list_worlds/mod.rs similarity index 100% rename from crates/api_clients/world_labs_api/src/api/requests/list_worlds/mod.rs rename to crates/api_clients/worldlabs_api_client/src/api/requests/list_worlds/mod.rs diff --git a/crates/api_clients/world_labs_api/src/api/requests/mod.rs b/crates/api_clients/worldlabs_api_client/src/api/requests/mod.rs similarity index 100% rename from crates/api_clients/world_labs_api/src/api/requests/mod.rs rename to crates/api_clients/worldlabs_api_client/src/api/requests/mod.rs diff --git a/crates/api_clients/world_labs_api/src/api/requests/prepare_upload/http_request.rs b/crates/api_clients/worldlabs_api_client/src/api/requests/prepare_upload/http_request.rs similarity index 100% rename from crates/api_clients/world_labs_api/src/api/requests/prepare_upload/http_request.rs rename to crates/api_clients/worldlabs_api_client/src/api/requests/prepare_upload/http_request.rs diff --git a/crates/api_clients/world_labs_api/src/api/requests/prepare_upload/mod.rs b/crates/api_clients/worldlabs_api_client/src/api/requests/prepare_upload/mod.rs similarity index 100% rename from crates/api_clients/world_labs_api/src/api/requests/prepare_upload/mod.rs rename to crates/api_clients/worldlabs_api_client/src/api/requests/prepare_upload/mod.rs diff --git a/crates/api_clients/world_labs_api/src/api/requests/prepare_upload/prepare_upload.rs b/crates/api_clients/worldlabs_api_client/src/api/requests/prepare_upload/prepare_upload.rs similarity index 100% rename from crates/api_clients/world_labs_api/src/api/requests/prepare_upload/prepare_upload.rs rename to crates/api_clients/worldlabs_api_client/src/api/requests/prepare_upload/prepare_upload.rs diff --git a/crates/api_clients/world_labs_api/src/api/requests/upload_to_signed_url/mod.rs b/crates/api_clients/worldlabs_api_client/src/api/requests/upload_to_signed_url/mod.rs similarity index 100% rename from crates/api_clients/world_labs_api/src/api/requests/upload_to_signed_url/mod.rs rename to crates/api_clients/worldlabs_api_client/src/api/requests/upload_to_signed_url/mod.rs diff --git a/crates/api_clients/world_labs_api/src/api/requests/upload_to_signed_url/upload_to_signed_url.rs b/crates/api_clients/worldlabs_api_client/src/api/requests/upload_to_signed_url/upload_to_signed_url.rs similarity index 100% rename from crates/api_clients/world_labs_api/src/api/requests/upload_to_signed_url/upload_to_signed_url.rs rename to crates/api_clients/worldlabs_api_client/src/api/requests/upload_to_signed_url/upload_to_signed_url.rs diff --git a/crates/api_clients/world_labs_api/src/credentials/mod.rs b/crates/api_clients/worldlabs_api_client/src/credentials/mod.rs similarity index 100% rename from crates/api_clients/world_labs_api/src/credentials/mod.rs rename to crates/api_clients/worldlabs_api_client/src/credentials/mod.rs diff --git a/crates/api_clients/world_labs_api/src/credentials/world_labs_api_creds.rs b/crates/api_clients/worldlabs_api_client/src/credentials/world_labs_api_creds.rs similarity index 100% rename from crates/api_clients/world_labs_api/src/credentials/world_labs_api_creds.rs rename to crates/api_clients/worldlabs_api_client/src/credentials/world_labs_api_creds.rs diff --git a/crates/api_clients/world_labs_api/src/error/filter_world_labs_http_error.rs b/crates/api_clients/worldlabs_api_client/src/error/filter_world_labs_http_error.rs similarity index 100% rename from crates/api_clients/world_labs_api/src/error/filter_world_labs_http_error.rs rename to crates/api_clients/worldlabs_api_client/src/error/filter_world_labs_http_error.rs diff --git a/crates/api_clients/world_labs_api/src/error/mod.rs b/crates/api_clients/worldlabs_api_client/src/error/mod.rs similarity index 100% rename from crates/api_clients/world_labs_api/src/error/mod.rs rename to crates/api_clients/worldlabs_api_client/src/error/mod.rs diff --git a/crates/api_clients/world_labs_api/src/error/world_labs_client_error.rs b/crates/api_clients/worldlabs_api_client/src/error/world_labs_client_error.rs similarity index 100% rename from crates/api_clients/world_labs_api/src/error/world_labs_client_error.rs rename to crates/api_clients/worldlabs_api_client/src/error/world_labs_client_error.rs diff --git a/crates/api_clients/world_labs_api/src/error/world_labs_error.rs b/crates/api_clients/worldlabs_api_client/src/error/world_labs_error.rs similarity index 100% rename from crates/api_clients/world_labs_api/src/error/world_labs_error.rs rename to crates/api_clients/worldlabs_api_client/src/error/world_labs_error.rs diff --git a/crates/api_clients/world_labs_api/src/error/world_labs_generic_api_error.rs b/crates/api_clients/worldlabs_api_client/src/error/world_labs_generic_api_error.rs similarity index 100% rename from crates/api_clients/world_labs_api/src/error/world_labs_generic_api_error.rs rename to crates/api_clients/worldlabs_api_client/src/error/world_labs_generic_api_error.rs diff --git a/crates/api_clients/world_labs_api/src/error/world_labs_specific_api_error.rs b/crates/api_clients/worldlabs_api_client/src/error/world_labs_specific_api_error.rs similarity index 100% rename from crates/api_clients/world_labs_api/src/error/world_labs_specific_api_error.rs rename to crates/api_clients/worldlabs_api_client/src/error/world_labs_specific_api_error.rs diff --git a/crates/api_clients/world_labs_api/src/lib.rs b/crates/api_clients/worldlabs_api_client/src/lib.rs similarity index 100% rename from crates/api_clients/world_labs_api/src/lib.rs rename to crates/api_clients/worldlabs_api_client/src/lib.rs diff --git a/crates/api_clients/world_labs_api/src/pricing/check_pricing.rs b/crates/api_clients/worldlabs_api_client/src/pricing/check_pricing.rs similarity index 100% rename from crates/api_clients/world_labs_api/src/pricing/check_pricing.rs rename to crates/api_clients/worldlabs_api_client/src/pricing/check_pricing.rs diff --git a/crates/api_clients/world_labs_api/src/pricing/mod.rs b/crates/api_clients/worldlabs_api_client/src/pricing/mod.rs similarity index 100% rename from crates/api_clients/world_labs_api/src/pricing/mod.rs rename to crates/api_clients/worldlabs_api_client/src/pricing/mod.rs diff --git a/crates/api_clients/world_labs_api/src/recipes/mod.rs b/crates/api_clients/worldlabs_api_client/src/recipes/mod.rs similarity index 100% rename from crates/api_clients/world_labs_api/src/recipes/mod.rs rename to crates/api_clients/worldlabs_api_client/src/recipes/mod.rs diff --git a/crates/api_clients/world_labs_api/src/recipes/upload_image_and_create_world_with_retry.rs b/crates/api_clients/worldlabs_api_client/src/recipes/upload_image_and_create_world_with_retry.rs similarity index 100% rename from crates/api_clients/world_labs_api/src/recipes/upload_image_and_create_world_with_retry.rs rename to crates/api_clients/worldlabs_api_client/src/recipes/upload_image_and_create_world_with_retry.rs diff --git a/crates/api_clients/world_labs_api/src/test_utils/get_test_api_key.rs b/crates/api_clients/worldlabs_api_client/src/test_utils/get_test_api_key.rs similarity index 100% rename from crates/api_clients/world_labs_api/src/test_utils/get_test_api_key.rs rename to crates/api_clients/worldlabs_api_client/src/test_utils/get_test_api_key.rs diff --git a/crates/api_clients/world_labs_api/src/test_utils/mod.rs b/crates/api_clients/worldlabs_api_client/src/test_utils/mod.rs similarity index 100% rename from crates/api_clients/world_labs_api/src/test_utils/mod.rs rename to crates/api_clients/worldlabs_api_client/src/test_utils/mod.rs diff --git a/crates/api_clients/world_labs_api/src/test_utils/setup_test_logging.rs b/crates/api_clients/worldlabs_api_client/src/test_utils/setup_test_logging.rs similarity index 100% rename from crates/api_clients/world_labs_api/src/test_utils/setup_test_logging.rs rename to crates/api_clients/worldlabs_api_client/src/test_utils/setup_test_logging.rs diff --git a/crates/api_clients/world_labs_client/Cargo.toml b/crates/api_clients/worldlabs_consumer_client/Cargo.toml similarity index 94% rename from crates/api_clients/world_labs_client/Cargo.toml rename to crates/api_clients/worldlabs_consumer_client/Cargo.toml index 4c3fa182a8..9b3f95097a 100644 --- a/crates/api_clients/world_labs_client/Cargo.toml +++ b/crates/api_clients/worldlabs_consumer_client/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "world_labs_client" +name = "worldlabs_consumer_client" edition = "2024" version = "0.0.1" publish = false @@ -8,7 +8,7 @@ publish = false normal = ["workspace-build-acceleration"] [lib] -name = "world_labs_client" +name = "worldlabs_consumer_client" path = "src/lib.rs" [dependencies] diff --git a/crates/api_clients/world_labs_client/src/api/api_types/image_input_object_id.rs b/crates/api_clients/worldlabs_consumer_client/src/api/api_types/image_input_object_id.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/api/api_types/image_input_object_id.rs rename to crates/api_clients/worldlabs_consumer_client/src/api/api_types/image_input_object_id.rs diff --git a/crates/api_clients/world_labs_client/src/api/api_types/meta_world_object_id.rs b/crates/api_clients/worldlabs_consumer_client/src/api/api_types/meta_world_object_id.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/api/api_types/meta_world_object_id.rs rename to crates/api_clients/worldlabs_consumer_client/src/api/api_types/meta_world_object_id.rs diff --git a/crates/api_clients/world_labs_client/src/api/api_types/mod.rs b/crates/api_clients/worldlabs_consumer_client/src/api/api_types/mod.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/api/api_types/mod.rs rename to crates/api_clients/worldlabs_consumer_client/src/api/api_types/mod.rs diff --git a/crates/api_clients/world_labs_client/src/api/api_types/pano_object_id.rs b/crates/api_clients/worldlabs_consumer_client/src/api/api_types/pano_object_id.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/api/api_types/pano_object_id.rs rename to crates/api_clients/worldlabs_consumer_client/src/api/api_types/pano_object_id.rs diff --git a/crates/api_clients/world_labs_client/src/api/api_types/run_object.rs b/crates/api_clients/worldlabs_consumer_client/src/api/api_types/run_object.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/api/api_types/run_object.rs rename to crates/api_clients/worldlabs_consumer_client/src/api/api_types/run_object.rs diff --git a/crates/api_clients/world_labs_client/src/api/api_types/run_object_id.rs b/crates/api_clients/worldlabs_consumer_client/src/api/api_types/run_object_id.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/api/api_types/run_object_id.rs rename to crates/api_clients/worldlabs_consumer_client/src/api/api_types/run_object_id.rs diff --git a/crates/api_clients/world_labs_client/src/api/api_types/upload_mime_type.rs b/crates/api_clients/worldlabs_consumer_client/src/api/api_types/upload_mime_type.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/api/api_types/upload_mime_type.rs rename to crates/api_clients/worldlabs_consumer_client/src/api/api_types/upload_mime_type.rs diff --git a/crates/api_clients/world_labs_client/src/api/api_types/upload_object_id.rs b/crates/api_clients/worldlabs_consumer_client/src/api/api_types/upload_object_id.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/api/api_types/upload_object_id.rs rename to crates/api_clients/worldlabs_consumer_client/src/api/api_types/upload_object_id.rs diff --git a/crates/api_clients/world_labs_client/src/api/api_types/world_id.rs b/crates/api_clients/worldlabs_consumer_client/src/api/api_types/world_id.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/api/api_types/world_id.rs rename to crates/api_clients/worldlabs_consumer_client/src/api/api_types/world_id.rs diff --git a/crates/api_clients/world_labs_client/src/api/common/common_header_values.rs b/crates/api_clients/worldlabs_consumer_client/src/api/common/common_header_values.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/api/common/common_header_values.rs rename to crates/api_clients/worldlabs_consumer_client/src/api/common/common_header_values.rs diff --git a/crates/api_clients/world_labs_client/src/api/common/mod.rs b/crates/api_clients/worldlabs_consumer_client/src/api/common/mod.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/api/common/mod.rs rename to crates/api_clients/worldlabs_consumer_client/src/api/common/mod.rs diff --git a/crates/api_clients/world_labs_client/src/api/mod.rs b/crates/api_clients/worldlabs_consumer_client/src/api/mod.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/api/mod.rs rename to crates/api_clients/worldlabs_consumer_client/src/api/mod.rs diff --git a/crates/api_clients/world_labs_client/src/api/requests/google_refresh_token/google_refresh_token.rs b/crates/api_clients/worldlabs_consumer_client/src/api/requests/google_refresh_token/google_refresh_token.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/api/requests/google_refresh_token/google_refresh_token.rs rename to crates/api_clients/worldlabs_consumer_client/src/api/requests/google_refresh_token/google_refresh_token.rs diff --git a/crates/api_clients/world_labs_client/src/api/requests/google_refresh_token/mod.rs b/crates/api_clients/worldlabs_consumer_client/src/api/requests/google_refresh_token/mod.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/api/requests/google_refresh_token/mod.rs rename to crates/api_clients/worldlabs_consumer_client/src/api/requests/google_refresh_token/mod.rs diff --git a/crates/api_clients/world_labs_client/src/api/requests/google_upload/google_upload_image.rs b/crates/api_clients/worldlabs_consumer_client/src/api/requests/google_upload/google_upload_image.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/api/requests/google_upload/google_upload_image.rs rename to crates/api_clients/worldlabs_consumer_client/src/api/requests/google_upload/google_upload_image.rs diff --git a/crates/api_clients/world_labs_client/src/api/requests/google_upload/mod.rs b/crates/api_clients/worldlabs_consumer_client/src/api/requests/google_upload/mod.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/api/requests/google_upload/mod.rs rename to crates/api_clients/worldlabs_consumer_client/src/api/requests/google_upload/mod.rs diff --git a/crates/api_clients/world_labs_client/src/api/requests/mod.rs b/crates/api_clients/worldlabs_consumer_client/src/api/requests/mod.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/api/requests/mod.rs rename to crates/api_clients/worldlabs_consumer_client/src/api/requests/mod.rs diff --git a/crates/api_clients/world_labs_client/src/api/requests/objects/begin_object_image_upload.rs b/crates/api_clients/worldlabs_consumer_client/src/api/requests/objects/begin_object_image_upload.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/api/requests/objects/begin_object_image_upload.rs rename to crates/api_clients/worldlabs_consumer_client/src/api/requests/objects/begin_object_image_upload.rs diff --git a/crates/api_clients/world_labs_client/src/api/requests/objects/create_run_object.rs b/crates/api_clients/worldlabs_consumer_client/src/api/requests/objects/create_run_object.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/api/requests/objects/create_run_object.rs rename to crates/api_clients/worldlabs_consumer_client/src/api/requests/objects/create_run_object.rs diff --git a/crates/api_clients/world_labs_client/src/api/requests/objects/create_upload_object.rs b/crates/api_clients/worldlabs_consumer_client/src/api/requests/objects/create_upload_object.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/api/requests/objects/create_upload_object.rs rename to crates/api_clients/worldlabs_consumer_client/src/api/requests/objects/create_upload_object.rs diff --git a/crates/api_clients/world_labs_client/src/api/requests/objects/finalize_object_image_upload.rs b/crates/api_clients/worldlabs_consumer_client/src/api/requests/objects/finalize_object_image_upload.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/api/requests/objects/finalize_object_image_upload.rs rename to crates/api_clients/worldlabs_consumer_client/src/api/requests/objects/finalize_object_image_upload.rs diff --git a/crates/api_clients/world_labs_client/src/api/requests/objects/mod.rs b/crates/api_clients/worldlabs_consumer_client/src/api/requests/objects/mod.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/api/requests/objects/mod.rs rename to crates/api_clients/worldlabs_consumer_client/src/api/requests/objects/mod.rs diff --git a/crates/api_clients/world_labs_client/src/api/requests/objects/update_run_object_with_upload.rs b/crates/api_clients/worldlabs_consumer_client/src/api/requests/objects/update_run_object_with_upload.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/api/requests/objects/update_run_object_with_upload.rs rename to crates/api_clients/worldlabs_consumer_client/src/api/requests/objects/update_run_object_with_upload.rs diff --git a/crates/api_clients/world_labs_client/src/api/requests/objects/update_run_object_with_world.rs b/crates/api_clients/worldlabs_consumer_client/src/api/requests/objects/update_run_object_with_world.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/api/requests/objects/update_run_object_with_world.rs rename to crates/api_clients/worldlabs_consumer_client/src/api/requests/objects/update_run_object_with_world.rs diff --git a/crates/api_clients/world_labs_client/src/api/requests/recaption/mod.rs b/crates/api_clients/worldlabs_consumer_client/src/api/requests/recaption/mod.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/api/requests/recaption/mod.rs rename to crates/api_clients/worldlabs_consumer_client/src/api/requests/recaption/mod.rs diff --git a/crates/api_clients/world_labs_client/src/api/requests/recaption/recaption_image.rs b/crates/api_clients/worldlabs_consumer_client/src/api/requests/recaption/recaption_image.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/api/requests/recaption/recaption_image.rs rename to crates/api_clients/worldlabs_consumer_client/src/api/requests/recaption/recaption_image.rs diff --git a/crates/api_clients/world_labs_client/src/api/requests/worlds/create_world.rs b/crates/api_clients/worldlabs_consumer_client/src/api/requests/worlds/create_world.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/api/requests/worlds/create_world.rs rename to crates/api_clients/worldlabs_consumer_client/src/api/requests/worlds/create_world.rs diff --git a/crates/api_clients/world_labs_client/src/api/requests/worlds/mod.rs b/crates/api_clients/worldlabs_consumer_client/src/api/requests/worlds/mod.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/api/requests/worlds/mod.rs rename to crates/api_clients/worldlabs_consumer_client/src/api/requests/worlds/mod.rs diff --git a/crates/api_clients/world_labs_client/src/api/requests/worlds/poll_world_status.rs b/crates/api_clients/worldlabs_consumer_client/src/api/requests/worlds/poll_world_status.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/api/requests/worlds/poll_world_status.rs rename to crates/api_clients/worldlabs_consumer_client/src/api/requests/worlds/poll_world_status.rs diff --git a/crates/api_clients/world_labs_client/src/api/utils/mod.rs b/crates/api_clients/worldlabs_consumer_client/src/api/utils/mod.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/api/utils/mod.rs rename to crates/api_clients/worldlabs_consumer_client/src/api/utils/mod.rs diff --git a/crates/api_clients/world_labs_client/src/api/utils/upload_id_to_image_url.rs b/crates/api_clients/worldlabs_consumer_client/src/api/utils/upload_id_to_image_url.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/api/utils/upload_id_to_image_url.rs rename to crates/api_clients/worldlabs_consumer_client/src/api/utils/upload_id_to_image_url.rs diff --git a/crates/api_clients/world_labs_client/src/client/browser_user_agents.rs b/crates/api_clients/worldlabs_consumer_client/src/client/browser_user_agents.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/client/browser_user_agents.rs rename to crates/api_clients/worldlabs_consumer_client/src/client/browser_user_agents.rs diff --git a/crates/api_clients/world_labs_client/src/client/mod.rs b/crates/api_clients/worldlabs_consumer_client/src/client/mod.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/client/mod.rs rename to crates/api_clients/worldlabs_consumer_client/src/client/mod.rs diff --git a/crates/api_clients/world_labs_client/src/credentials/jwt_claims.rs b/crates/api_clients/worldlabs_consumer_client/src/credentials/jwt_claims.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/credentials/jwt_claims.rs rename to crates/api_clients/worldlabs_consumer_client/src/credentials/jwt_claims.rs diff --git a/crates/api_clients/world_labs_client/src/credentials/mod.rs b/crates/api_clients/worldlabs_consumer_client/src/credentials/mod.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/credentials/mod.rs rename to crates/api_clients/worldlabs_consumer_client/src/credentials/mod.rs diff --git a/crates/api_clients/world_labs_client/src/credentials/world_labs_bearer_token.rs b/crates/api_clients/worldlabs_consumer_client/src/credentials/world_labs_bearer_token.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/credentials/world_labs_bearer_token.rs rename to crates/api_clients/worldlabs_consumer_client/src/credentials/world_labs_bearer_token.rs diff --git a/crates/api_clients/world_labs_client/src/credentials/world_labs_cookies.rs b/crates/api_clients/worldlabs_consumer_client/src/credentials/world_labs_cookies.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/credentials/world_labs_cookies.rs rename to crates/api_clients/worldlabs_consumer_client/src/credentials/world_labs_cookies.rs diff --git a/crates/api_clients/world_labs_client/src/credentials/worldlabs_refresh_token.rs b/crates/api_clients/worldlabs_consumer_client/src/credentials/worldlabs_refresh_token.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/credentials/worldlabs_refresh_token.rs rename to crates/api_clients/worldlabs_consumer_client/src/credentials/worldlabs_refresh_token.rs diff --git a/crates/api_clients/world_labs_client/src/error/filter_world_labs_http_error.rs b/crates/api_clients/worldlabs_consumer_client/src/error/filter_world_labs_http_error.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/error/filter_world_labs_http_error.rs rename to crates/api_clients/worldlabs_consumer_client/src/error/filter_world_labs_http_error.rs diff --git a/crates/api_clients/world_labs_client/src/error/mod.rs b/crates/api_clients/worldlabs_consumer_client/src/error/mod.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/error/mod.rs rename to crates/api_clients/worldlabs_consumer_client/src/error/mod.rs diff --git a/crates/api_clients/world_labs_client/src/error/world_labs_client_error.rs b/crates/api_clients/worldlabs_consumer_client/src/error/world_labs_client_error.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/error/world_labs_client_error.rs rename to crates/api_clients/worldlabs_consumer_client/src/error/world_labs_client_error.rs diff --git a/crates/api_clients/world_labs_client/src/error/world_labs_error.rs b/crates/api_clients/worldlabs_consumer_client/src/error/world_labs_error.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/error/world_labs_error.rs rename to crates/api_clients/worldlabs_consumer_client/src/error/world_labs_error.rs diff --git a/crates/api_clients/world_labs_client/src/error/world_labs_generic_api_error.rs b/crates/api_clients/worldlabs_consumer_client/src/error/world_labs_generic_api_error.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/error/world_labs_generic_api_error.rs rename to crates/api_clients/worldlabs_consumer_client/src/error/world_labs_generic_api_error.rs diff --git a/crates/api_clients/world_labs_client/src/error/world_labs_specific_api_error.rs b/crates/api_clients/worldlabs_consumer_client/src/error/world_labs_specific_api_error.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/error/world_labs_specific_api_error.rs rename to crates/api_clients/worldlabs_consumer_client/src/error/world_labs_specific_api_error.rs diff --git a/crates/api_clients/world_labs_client/src/lib.rs b/crates/api_clients/worldlabs_consumer_client/src/lib.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/lib.rs rename to crates/api_clients/worldlabs_consumer_client/src/lib.rs diff --git a/crates/api_clients/world_labs_client/src/recipes/mod.rs b/crates/api_clients/worldlabs_consumer_client/src/recipes/mod.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/recipes/mod.rs rename to crates/api_clients/worldlabs_consumer_client/src/recipes/mod.rs diff --git a/crates/api_clients/world_labs_client/src/recipes/upload_image_and_create_world_with_retry.rs b/crates/api_clients/worldlabs_consumer_client/src/recipes/upload_image_and_create_world_with_retry.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/recipes/upload_image_and_create_world_with_retry.rs rename to crates/api_clients/worldlabs_consumer_client/src/recipes/upload_image_and_create_world_with_retry.rs diff --git a/crates/api_clients/world_labs_client/src/test_utils/get_test_bearer_token.rs b/crates/api_clients/worldlabs_consumer_client/src/test_utils/get_test_bearer_token.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/test_utils/get_test_bearer_token.rs rename to crates/api_clients/worldlabs_consumer_client/src/test_utils/get_test_bearer_token.rs diff --git a/crates/api_clients/world_labs_client/src/test_utils/get_test_cookies.rs b/crates/api_clients/worldlabs_consumer_client/src/test_utils/get_test_cookies.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/test_utils/get_test_cookies.rs rename to crates/api_clients/worldlabs_consumer_client/src/test_utils/get_test_cookies.rs diff --git a/crates/api_clients/world_labs_client/src/test_utils/get_test_refresh_token.rs b/crates/api_clients/worldlabs_consumer_client/src/test_utils/get_test_refresh_token.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/test_utils/get_test_refresh_token.rs rename to crates/api_clients/worldlabs_consumer_client/src/test_utils/get_test_refresh_token.rs diff --git a/crates/api_clients/world_labs_client/src/test_utils/mod.rs b/crates/api_clients/worldlabs_consumer_client/src/test_utils/mod.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/test_utils/mod.rs rename to crates/api_clients/worldlabs_consumer_client/src/test_utils/mod.rs diff --git a/crates/api_clients/world_labs_client/src/test_utils/setup_test_logging.rs b/crates/api_clients/worldlabs_consumer_client/src/test_utils/setup_test_logging.rs similarity index 100% rename from crates/api_clients/world_labs_client/src/test_utils/setup_test_logging.rs rename to crates/api_clients/worldlabs_consumer_client/src/test_utils/setup_test_logging.rs diff --git a/crates/desktop/artcraft/Cargo.toml b/crates/desktop/artcraft/Cargo.toml index 13f79b524d..f2d8416ee7 100644 --- a/crates/desktop/artcraft/Cargo.toml +++ b/crates/desktop/artcraft/Cargo.toml @@ -46,7 +46,7 @@ sqlite_tasks.workspace = true tokens.workspace = true url_utils.workspace = true web_base64.workspace = true -world_labs_client.workspace = true +worldlabs_consumer_client.workspace = true # External anyhow.workspace = true diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/generate_error.rs b/crates/desktop/artcraft/src/core/commands/enqueue/generate_error.rs index c9fd633ea9..a8b34ffd9e 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/generate_error.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/generate_error.rs @@ -11,7 +11,7 @@ use midjourney_client::error::midjourney_error::MidjourneyError; use openai_sora_client::error::sora_error::SoraError; use artcraft_client::error::storyteller_error::StorytellerError; use artcraft_router::errors::download_error::DownloadError; -use world_labs_client::error::world_labs_error::WorldLabsError; +use worldlabs_consumer_client::error::world_labs_error::WorldLabsError; //use fal_client::error::fal_error_plus::FalErrorPlus; #[derive(Debug)] diff --git a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_gaussian/worldlabs/handle_worldlabs_marble.rs b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_gaussian/worldlabs/handle_worldlabs_marble.rs index a9d0e0faee..f739278c2e 100644 --- a/crates/desktop/artcraft/src/core/commands/enqueue/image_to_gaussian/worldlabs/handle_worldlabs_marble.rs +++ b/crates/desktop/artcraft/src/core/commands/enqueue/image_to_gaussian/worldlabs/handle_worldlabs_marble.rs @@ -19,8 +19,8 @@ use std::path::PathBuf; use artcraft_client::endpoints::media_files::get_media_file::get_media_file; use tauri::AppHandle; use tokens::tokens::media_files::MediaFileToken; -use world_labs_client::credentials::world_labs_cookies::WorldLabsCookies; -use world_labs_client::recipes::upload_image_and_create_world_with_retry::{upload_image_and_create_world_with_retry, FileBytesOrPath, UploadImageAndCreateWorldWithRetryArgs}; +use worldlabs_consumer_client::credentials::world_labs_cookies::WorldLabsCookies; +use worldlabs_consumer_client::recipes::upload_image_and_create_world_with_retry::{upload_image_and_create_world_with_retry, FileBytesOrPath, UploadImageAndCreateWorldWithRetryArgs}; pub(super) const MAX_IMAGES: usize = 10; diff --git a/crates/desktop/artcraft/src/services/worldlabs/commands/worldlabs_get_credential_info_command.rs b/crates/desktop/artcraft/src/services/worldlabs/commands/worldlabs_get_credential_info_command.rs index 4ebd87334d..5637024096 100644 --- a/crates/desktop/artcraft/src/services/worldlabs/commands/worldlabs_get_credential_info_command.rs +++ b/crates/desktop/artcraft/src/services/worldlabs/commands/worldlabs_get_credential_info_command.rs @@ -5,8 +5,8 @@ use errors::AnyhowResult; use log::{error, info}; use serde_derive::Serialize; use tauri::State; -use world_labs_client::credentials::jwt_claims::JwtClaims; -use world_labs_client::error::world_labs_error::WorldLabsError; +use worldlabs_consumer_client::credentials::jwt_claims::JwtClaims; +use worldlabs_consumer_client::error::world_labs_error::WorldLabsError; #[derive(Serialize)] pub struct WorldlabsGetCredentialInfoResponse { diff --git a/crates/desktop/artcraft/src/services/worldlabs/state/worldlabs_credential_holder.rs b/crates/desktop/artcraft/src/services/worldlabs/state/worldlabs_credential_holder.rs index 167fecf2e5..cd2ea123d4 100644 --- a/crates/desktop/artcraft/src/services/worldlabs/state/worldlabs_credential_holder.rs +++ b/crates/desktop/artcraft/src/services/worldlabs/state/worldlabs_credential_holder.rs @@ -1,7 +1,7 @@ use cookie_store::cookie_store::CookieStore; -use world_labs_client::credentials::world_labs_bearer_token::WorldLabsBearerToken; -use world_labs_client::credentials::world_labs_cookies::WorldLabsCookies; -use world_labs_client::credentials::worldlabs_refresh_token::WorldLabsRefreshToken; +use worldlabs_consumer_client::credentials::world_labs_bearer_token::WorldLabsBearerToken; +use worldlabs_consumer_client::credentials::world_labs_cookies::WorldLabsCookies; +use worldlabs_consumer_client::credentials::worldlabs_refresh_token::WorldLabsRefreshToken; #[derive(Clone)] pub struct WorldlabsCredentialHolder { diff --git a/crates/desktop/artcraft/src/services/worldlabs/state/worldlabs_credential_manager.rs b/crates/desktop/artcraft/src/services/worldlabs/state/worldlabs_credential_manager.rs index 778bed612d..f0b7a87e8c 100644 --- a/crates/desktop/artcraft/src/services/worldlabs/state/worldlabs_credential_manager.rs +++ b/crates/desktop/artcraft/src/services/worldlabs/state/worldlabs_credential_manager.rs @@ -6,9 +6,9 @@ use errors::AnyhowResult; use log::{info, warn}; use std::fs::read_to_string; use std::sync::{Arc, RwLock}; -use world_labs_client::credentials::world_labs_bearer_token::WorldLabsBearerToken; -use world_labs_client::credentials::world_labs_cookies::WorldLabsCookies; -use world_labs_client::credentials::worldlabs_refresh_token::WorldLabsRefreshToken; +use worldlabs_consumer_client::credentials::world_labs_bearer_token::WorldLabsBearerToken; +use worldlabs_consumer_client::credentials::world_labs_cookies::WorldLabsCookies; +use worldlabs_consumer_client::credentials::worldlabs_refresh_token::WorldLabsRefreshToken; #[derive(Clone)] pub struct WorldlabsCredentialManager { diff --git a/crates/desktop/artcraft/src/services/worldlabs/threads/worldlabs_marble_task_polling.rs b/crates/desktop/artcraft/src/services/worldlabs/threads/worldlabs_marble_task_polling.rs index a47b895ae7..5ae9f1ec44 100644 --- a/crates/desktop/artcraft/src/services/worldlabs/threads/worldlabs_marble_task_polling.rs +++ b/crates/desktop/artcraft/src/services/worldlabs/threads/worldlabs_marble_task_polling.rs @@ -58,11 +58,11 @@ use tauri::AppHandle; use tokens::tokens::batch_generations::BatchGenerationToken; use url::Url; use url_utils::download_extension::extract_download_extension_from_url::extract_download_extension_from_url_str; -use world_labs_client::api::api_types::world_id::WorldObjectId; -use world_labs_client::api::requests::worlds::poll_world_status::{poll_world_status, PollWorldStatusArgs}; -use world_labs_client::credentials::world_labs_bearer_token::WorldLabsBearerToken; -use world_labs_client::credentials::world_labs_cookies::WorldLabsCookies; -use world_labs_client::credentials::worldlabs_refresh_token::WorldLabsRefreshToken; +use worldlabs_consumer_client::api::api_types::world_id::WorldObjectId; +use worldlabs_consumer_client::api::requests::worlds::poll_world_status::{poll_world_status, PollWorldStatusArgs}; +use worldlabs_consumer_client::credentials::world_labs_bearer_token::WorldLabsBearerToken; +use worldlabs_consumer_client::credentials::world_labs_cookies::WorldLabsCookies; +use worldlabs_consumer_client::credentials::worldlabs_refresh_token::WorldLabsRefreshToken; pub async fn worldlabs_marble_task_polling( app_handle: AppHandle, diff --git a/crates/desktop/artcraft/src/services/worldlabs/windows/worldlabs_login_window/worldlabs_login_window_thread.rs b/crates/desktop/artcraft/src/services/worldlabs/windows/worldlabs_login_window/worldlabs_login_window_thread.rs index b8257e2060..d8d0640d77 100644 --- a/crates/desktop/artcraft/src/services/worldlabs/windows/worldlabs_login_window/worldlabs_login_window_thread.rs +++ b/crates/desktop/artcraft/src/services/worldlabs/windows/worldlabs_login_window/worldlabs_login_window_thread.rs @@ -24,8 +24,8 @@ use openai_sora_client::creds::sora_credential_set::SoraCredentialSet; use openai_sora_client::recipes::maybe_upgrade_or_renew_session::maybe_upgrade_or_renew_session; use openai_sora_client::utils::has_session_cookie::{has_session_cookie, SessionCookiePresence}; use tauri::{AppHandle, Manager, WebviewWindow}; -use world_labs_client::credentials::world_labs_bearer_token::WorldLabsBearerToken; -use world_labs_client::credentials::worldlabs_refresh_token::WorldLabsRefreshToken; +use worldlabs_consumer_client::credentials::world_labs_bearer_token::WorldLabsBearerToken; +use worldlabs_consumer_client::credentials::worldlabs_refresh_token::WorldLabsRefreshToken; pub async fn worldlabs_login_window_thread( app: AppHandle, diff --git a/crates/service/job/worldlabs_job/Cargo.toml b/crates/service/job/worldlabs_job/Cargo.toml index 9ffcf8d0df..59e28475ff 100644 --- a/crates/service/job/worldlabs_job/Cargo.toml +++ b/crates/service/job/worldlabs_job/Cargo.toml @@ -30,9 +30,9 @@ easyenv.workspace = true enums.workspace = true errors.workspace = true hashing = { path = "../../../lib/files/hashing" } -jobs_common = { path = "../../../lib/jobs_common" } -mysql_queries = { path = "../../../schema/database/mysql_queries" } -world_labs_api = { path = "../../../api_clients/world_labs_api" } +jobs_common.workspace = true +mysql_queries.workspace = true +worldlabs_api_client.workspace = true server_environment = { path = "../../../lib/server_environment" } tokens.workspace = true diff --git a/crates/service/job/worldlabs_job/src/job_dependencies.rs b/crates/service/job/worldlabs_job/src/job_dependencies.rs index dcf8e148ba..0978614964 100644 --- a/crates/service/job/worldlabs_job/src/job_dependencies.rs +++ b/crates/service/job/worldlabs_job/src/job_dependencies.rs @@ -3,7 +3,7 @@ use concurrency::relaxed_atomic_bool::RelaxedAtomicBool; use jobs_common::job_stats::JobStats; use server_environment::ServerEnvironment; use sqlx::MySqlPool; -use world_labs_api::credentials::world_labs_api_creds::WorldLabsApiCreds; +use worldlabs_api_client::credentials::world_labs_api_creds::WorldLabsApiCreds; pub struct JobDependencies { pub mysql_pool: MySqlPool, diff --git a/crates/service/job/worldlabs_job/src/main.rs b/crates/service/job/worldlabs_job/src/main.rs index da164f4e3c..30005a1bac 100644 --- a/crates/service/job/worldlabs_job/src/main.rs +++ b/crates/service/job/worldlabs_job/src/main.rs @@ -23,7 +23,7 @@ use config::shared_constants::DEFAULT_RUST_LOG; use errors::AnyhowResult; use jobs_common::job_stats::JobStats; use server_environment::ServerEnvironment; -use world_labs_api::credentials::world_labs_api_creds::WorldLabsApiCreds; +use worldlabs_api_client::credentials::world_labs_api_creds::WorldLabsApiCreds; use crate::http_server::run_http_server::{launch_http_server, CreateServerArgs}; use crate::main_loop::main_loop; diff --git a/crates/service/job/worldlabs_job/src/main_loop.rs b/crates/service/job/worldlabs_job/src/main_loop.rs index c3d7dea107..f4e4e62357 100644 --- a/crates/service/job/worldlabs_job/src/main_loop.rs +++ b/crates/service/job/worldlabs_job/src/main_loop.rs @@ -2,8 +2,8 @@ use std::time::Duration; use log::{error, info, warn}; use mysql_queries::queries::generic_inference::worldlabs::list_pending_worldlabs_jobs::list_pending_worldlabs_jobs; -use world_labs_api::api::api_types::operation_id::OperationId; -use world_labs_api::api::requests::get_operation::get_operation::{get_operation, GetOperationArgs}; +use worldlabs_api_client::api::api_types::operation_id::OperationId; +use worldlabs_api_client::api::requests::get_operation::get_operation::{get_operation, GetOperationArgs}; use crate::process_job::process_failed_job::process_failed_job; use crate::process_job::process_successful_job::process_successful_job; diff --git a/crates/service/job/worldlabs_job/src/process_job/process_successful_job.rs b/crates/service/job/worldlabs_job/src/process_job/process_successful_job.rs index 9afca8257c..be7f8a618a 100644 --- a/crates/service/job/worldlabs_job/src/process_job/process_successful_job.rs +++ b/crates/service/job/worldlabs_job/src/process_job/process_successful_job.rs @@ -13,7 +13,7 @@ use mysql_queries::queries::generic_inference::worldlabs::list_pending_worldlabs use mysql_queries::queries::media_files::create::insert_builder::media_file_insert_builder::MediaFileInsertBuilder; use mysql_queries::queries::generic_inference::web::mark_generic_inference_job_successfully_done_by_token::mark_generic_inference_job_successfully_done_by_token; use tokens::tokens::media_files::MediaFileToken; -use world_labs_api::api::requests::get_operation::get_operation::GetOperationResponse; +use worldlabs_api_client::api::requests::get_operation::get_operation::GetOperationResponse; use crate::job_dependencies::JobDependencies; const SPLAT_PREFIX: &str = "artcraft_"; diff --git a/crates/service/web/storyteller_web/Cargo.toml b/crates/service/web/storyteller_web/Cargo.toml index 50705e5b64..fcc1c24cf3 100644 --- a/crates/service/web/storyteller_web/Cargo.toml +++ b/crates/service/web/storyteller_web/Cargo.toml @@ -83,7 +83,7 @@ user_input_common = { path = "../../../lib/user_input_common" } users.workspace = true ffmpeg_utils.workspace = true videos = { path = "../../../lib/files/videos" } -world_labs_api.workspace = true +worldlabs_api_client.workspace = true # Internal Components billing_component = { path = "../../plugins/billing" } diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/splat/generate_worldlabs_marble_0p1_mini_splat_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/splat/generate_worldlabs_marble_0p1_mini_splat_handler.rs index df17394fa2..e6d94cfd13 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/splat/generate_worldlabs_marble_0p1_mini_splat_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/splat/generate_worldlabs_marble_0p1_mini_splat_handler.rs @@ -23,11 +23,11 @@ use mysql_queries::queries::prompt_context_items::insert_batch_prompt_context_it use mysql_queries::queries::prompts::insert_prompt::{insert_prompt, InsertPromptArgs}; use sqlx::Acquire; use tokens::tokens::generic_inference_jobs::InferenceJobToken; -use world_labs_api::api::api_types::world_labs_model::WorldLabsModel; -use world_labs_api::api::requests::generate_world::generate_world::{generate_world, GenerateWorldArgs}; -use world_labs_api::api::requests::generate_world::http_request::{ContentReference, WorldPrompt}; -use world_labs_api::credentials::world_labs_api_creds::WorldLabsApiCreds; -use world_labs_api::pricing::check_pricing::{calculate_cost, InputType}; +use worldlabs_api_client::api::api_types::world_labs_model::WorldLabsModel; +use worldlabs_api_client::api::requests::generate_world::generate_world::{generate_world, GenerateWorldArgs}; +use worldlabs_api_client::api::requests::generate_world::http_request::{ContentReference, WorldPrompt}; +use worldlabs_api_client::credentials::world_labs_api_creds::WorldLabsApiCreds; +use worldlabs_api_client::pricing::check_pricing::{calculate_cost, InputType}; /// World Labs Marble 0.1-mini Splat Generation #[utoipa::path( diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/splat/generate_worldlabs_marble_0p1_plus_splat_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/splat/generate_worldlabs_marble_0p1_plus_splat_handler.rs index 89b1210959..e23a7c6843 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/generate/splat/generate_worldlabs_marble_0p1_plus_splat_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/generate/splat/generate_worldlabs_marble_0p1_plus_splat_handler.rs @@ -23,11 +23,11 @@ use mysql_queries::queries::prompt_context_items::insert_batch_prompt_context_it use mysql_queries::queries::prompts::insert_prompt::{insert_prompt, InsertPromptArgs}; use sqlx::Acquire; use tokens::tokens::generic_inference_jobs::InferenceJobToken; -use world_labs_api::api::api_types::world_labs_model::WorldLabsModel; -use world_labs_api::api::requests::generate_world::generate_world::{generate_world, GenerateWorldArgs}; -use world_labs_api::api::requests::generate_world::http_request::{ContentReference, WorldPrompt}; -use world_labs_api::credentials::world_labs_api_creds::WorldLabsApiCreds; -use world_labs_api::pricing::check_pricing::{calculate_cost, InputType}; +use worldlabs_api_client::api::api_types::world_labs_model::WorldLabsModel; +use worldlabs_api_client::api::requests::generate_world::generate_world::{generate_world, GenerateWorldArgs}; +use worldlabs_api_client::api::requests::generate_world::http_request::{ContentReference, WorldPrompt}; +use worldlabs_api_client::credentials::world_labs_api_creds::WorldLabsApiCreds; +use worldlabs_api_client::pricing::check_pricing::{calculate_cost, InputType}; /// World Labs Marble 0.1-plus Splat Generation #[utoipa::path(