cleanup

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"

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

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

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<'_>,

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<'_>,

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]

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]