diff --git a/Cargo.lock b/Cargo.lock index 7b8572b96e..2e7275957d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -731,7 +731,7 @@ dependencies = [ "url_utils", "web_base64", "workspace-build-acceleration", - "world_labs_consumer_client", + "worldlabs_consumer_client", ] [[package]] @@ -15093,44 +15093,6 @@ dependencies = [ "zstd-sys", ] -[[package]] -name = "world_labs_consumer_client" -version = "0.0.1" -dependencies = [ - "anyhow", - "base64 0.22.1", - "bstr", - "byteorder", - "chrono", - "cloudflare_errors", - "cloudflare_mitigation", - "cookie_store 0.0.1", - "env", - "env_logger 0.11.9", - "errors", - "filesys", - "futures 0.3.31", - "http_headers", - "indexmap 2.9.0", - "jwt_light", - "log", - "log4rs", - "once_cell", - "regex", - "scraper 0.24.0", - "serde", - "serde_json", - "sha2 0.11.0-rc.2", - "test_data", - "testing", - "tokio", - "url", - "uuid 1.18.1", - "workspace-build-acceleration", - "wreq", - "wreq-util", -] - [[package]] name = "worldlabs-job" version = "0.0.1" @@ -15182,6 +15144,44 @@ dependencies = [ "wreq", ] +[[package]] +name = "worldlabs_consumer_client" +version = "0.0.1" +dependencies = [ + "anyhow", + "base64 0.22.1", + "bstr", + "byteorder", + "chrono", + "cloudflare_errors", + "cloudflare_mitigation", + "cookie_store 0.0.1", + "env", + "env_logger 0.11.9", + "errors", + "filesys", + "futures 0.3.31", + "http_headers", + "indexmap 2.9.0", + "jwt_light", + "log", + "log4rs", + "once_cell", + "regex", + "scraper 0.24.0", + "serde", + "serde_json", + "sha2 0.11.0-rc.2", + "test_data", + "testing", + "tokio", + "url", + "uuid 1.18.1", + "workspace-build-acceleration", + "wreq", + "wreq-util", +] + [[package]] name = "wreq" version = "6.0.0-rc.28" diff --git a/Cargo.toml b/Cargo.toml index e97aebf77d..67dd8ff863 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ members = [ "crates/api_clients/runwayml_client", "crates/api_clients/thumbnail_generator", "crates/api_clients/worldlabs_api_client", - "crates/api_clients/world_labs_consumer_client", + "crates/api_clients/worldlabs_consumer_client", # CLI tools for operations, etc. "crates/cli/devenv/dev-database-seed", @@ -263,7 +263,7 @@ url_utils = { path = "crates/lib/url_utils" } users = { path = "crates/lib/users" } web_base64 = { path = "crates/lib/data/web_base64" } worldlabs_api_client = { path = "crates/api_clients/worldlabs_api_client" } -world_labs_consumer_client = { path = "crates/api_clients/world_labs_consumer_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/world_labs_consumer_client/Cargo.toml b/crates/api_clients/worldlabs_consumer_client/Cargo.toml similarity index 94% rename from crates/api_clients/world_labs_consumer_client/Cargo.toml rename to crates/api_clients/worldlabs_consumer_client/Cargo.toml index 8f52608a87..9b3f95097a 100644 --- a/crates/api_clients/world_labs_consumer_client/Cargo.toml +++ b/crates/api_clients/worldlabs_consumer_client/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "world_labs_consumer_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_consumer_client" +name = "worldlabs_consumer_client" path = "src/lib.rs" [dependencies] diff --git a/crates/api_clients/world_labs_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_client/src/lib.rs b/crates/api_clients/worldlabs_consumer_client/src/lib.rs similarity index 100% rename from crates/api_clients/world_labs_consumer_client/src/lib.rs rename to crates/api_clients/worldlabs_consumer_client/src/lib.rs diff --git a/crates/api_clients/world_labs_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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_consumer_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 d943ec3438..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_consumer_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 446cc01a34..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_consumer_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 145183b2ca..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_consumer_client::credentials::world_labs_cookies::WorldLabsCookies; -use world_labs_consumer_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 dfa540573e..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_consumer_client::credentials::jwt_claims::JwtClaims; -use world_labs_consumer_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 3f21e82a83..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_consumer_client::credentials::world_labs_bearer_token::WorldLabsBearerToken; -use world_labs_consumer_client::credentials::world_labs_cookies::WorldLabsCookies; -use world_labs_consumer_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 978be74fc1..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_consumer_client::credentials::world_labs_bearer_token::WorldLabsBearerToken; -use world_labs_consumer_client::credentials::world_labs_cookies::WorldLabsCookies; -use world_labs_consumer_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 41bdb12092..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_consumer_client::api::api_types::world_id::WorldObjectId; -use world_labs_consumer_client::api::requests::worlds::poll_world_status::{poll_world_status, PollWorldStatusArgs}; -use world_labs_consumer_client::credentials::world_labs_bearer_token::WorldLabsBearerToken; -use world_labs_consumer_client::credentials::world_labs_cookies::WorldLabsCookies; -use world_labs_consumer_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 65f56edcd7..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_consumer_client::credentials::world_labs_bearer_token::WorldLabsBearerToken; -use world_labs_consumer_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,