move testing-related crates

- move a lot of "deprecated" crates so we don't use them
- kill several dead crates
- rename crates to be more semantic/clear
- roll back broken sha3 version bump

.gitignore

@@ -6,6 +6,7 @@
 .env-elasticsearch-secrets
 .env-migration-tool-secrets
 .env-secrets
+.env-support-tool-secrets
 _develop/tools/.secrets
 _develop/tools/db_secrets.toml
 crates/service/web/storyteller_web/config/storyteller-web.development-secrets.env

.idea/codeStyles/Project.xml

@@ -1,5 +1,9 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <codeStyleSettings language="Markdown">
+      <option name="RIGHT_MARGIN" value="100" />
+      <option name="WRAP_ON_TYPING" value="1" />
+    </codeStyleSettings>
     <codeStyleSettings language="Rust">
       <option name="RIGHT_MARGIN" value="180" />
       <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />

.sqlx/query-002cdb3d086f3b4181e2997befa54bd8516cb1d3d3bb6e389862695318d5c299.json

@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nINSERT INTO generic_inference_jobs\nSET\n  token = ?,\n  uuid_idempotency_token = ?,\n\n  job_type = ?,\n\n  maybe_external_third_party = ?,\n  maybe_external_third_party_id = ?,\n\n  product_category = ?,\n  inference_category = ?,\n\n  maybe_model_type = NULL,\n  maybe_model_token = NULL,\n\n  maybe_input_source_token = NULL,\n  maybe_input_source_token_type = NULL,\n\n  maybe_download_url = NULL,\n  maybe_cover_image_media_file_token = NULL,\n  \n  maybe_prompt_token = ?,\n\n  maybe_raw_inference_text = NULL,\n\n  maybe_inference_args = ?,\n\n  maybe_creator_user_token = ?,\n  maybe_creator_anonymous_visitor_token = ?,\n  creator_ip_address = ?,\n  creator_set_visibility = ?,\n\n  priority_level = 0,\n  is_keepalive_required = FALSE,\n  max_duration_seconds = 0,\n\n  is_debug_request = FALSE,\n  maybe_routing_tag = NULL,\n\n  status = ?\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 14
-    },
-    "nullable": []
-  },
-  "hash": "002cdb3d086f3b4181e2997befa54bd8516cb1d3d3bb6e389862695318d5c299"
-}

.sqlx/query-2436eb7bf4b0e23a899311a67a77f71d89eb35461e2113e43cd9d221bfa91c9a.json

@@ -1,6 +1,6 @@
 {
   "db_name": "SQLite",
-  "query": "\n    SELECT\n      id,\n      task_status,\n      task_type,\n      model_type,\n      provider,\n      provider_job_id,\n      frontend_caller,\n      frontend_subscriber_id,\n      frontend_subscriber_payload,\n      on_complete_primary_media_file_token,\n      on_complete_primary_media_file_class,\n      on_complete_batch_token,\n      on_complete_primary_media_file_cdn_url,\n      on_complete_primary_media_file_thumbnail_url_template,\n      created_at as \"created_at: DateTime<Utc>\",\n      updated_at as \"updated_at: DateTime<Utc>\",\n      completed_at as \"completed_at: DateTime<Utc>\"\n    FROM tasks\n    WHERE is_dismissed_by_user == 0\n  ",
+  "query": "\n    SELECT\n      id,\n      task_status,\n      task_type,\n      model_type,\n      provider,\n      provider_job_id,\n      frontend_caller,\n      frontend_subscriber_id,\n      frontend_subscriber_payload,\n      on_complete_primary_media_file_token,\n      on_complete_primary_media_file_class,\n      on_complete_batch_token,\n      on_complete_primary_media_file_cdn_url,\n      on_complete_primary_media_file_thumbnail_url_template,\n      on_failure_type,\n      on_failure_message,\n      created_at as \"created_at: DateTime<Utc>\",\n      updated_at as \"updated_at: DateTime<Utc>\",\n      completed_at as \"completed_at: DateTime<Utc>\"\n    FROM tasks\n    WHERE is_dismissed_by_user == 0\n  ",
   "describe": {
     "columns": [
       {
@@ -74,18 +74,28 @@
         "type_info": "Text"
       },
       {
-        "name": "created_at: DateTime<Utc>",
+        "name": "on_failure_type",
         "ordinal": 14,
+        "type_info": "Text"
+      },
+      {
+        "name": "on_failure_message",
+        "ordinal": 15,
+        "type_info": "Text"
+      },
+      {
+        "name": "created_at: DateTime<Utc>",
+        "ordinal": 16,
         "type_info": "Int64"
       },
       {
         "name": "updated_at: DateTime<Utc>",
-        "ordinal": 15,
+        "ordinal": 17,
         "type_info": "Int64"
       },
       {
         "name": "completed_at: DateTime<Utc>",
-        "ordinal": 16,
+        "ordinal": 18,
         "type_info": "Int64"
       }
     ],
@@ -107,10 +117,12 @@
       true,
       true,
       true,
+      true,
+      true,
       false,
       false,
       true
     ]
   },
-  "hash": "47f94c127abc20683b25c257aed3c2190b9bd29eb829d61392f08e10fd986767"
+  "hash": "2436eb7bf4b0e23a899311a67a77f71d89eb35461e2113e43cd9d221bfa91c9a"
 }

.sqlx/query-29916e73a1784ea0b70ef4f637520b05efccc31e01840f681e9b042f82eb8f7e.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\nINSERT INTO generic_inference_jobs\nSET\n  token = ?,\n  uuid_idempotency_token = ?,\n\n  job_type = ?,\n\n  maybe_external_third_party = ?,\n  maybe_external_third_party_id = ?,\n\n  product_category = ?,\n  inference_category = ?,\n\n  maybe_model_type = NULL,\n  maybe_model_token = NULL,\n\n  maybe_input_source_token = NULL,\n  maybe_input_source_token_type = NULL,\n\n  maybe_download_url = NULL,\n  maybe_cover_image_media_file_token = NULL,\n\n  maybe_prompt_token = ?,\n\n  maybe_raw_inference_text = NULL,\n\n  maybe_inference_args = ?,\n\n  maybe_creator_user_token = ?,\n  maybe_creator_anonymous_visitor_token = ?,\n  creator_ip_address = ?,\n  creator_set_visibility = ?,\n\n  priority_level = 0,\n  is_keepalive_required = FALSE,\n  max_duration_seconds = 0,\n\n  is_debug_request = FALSE,\n  maybe_routing_tag = NULL,\n\n  frontend_failure_category = ?,\n  failure_reason = ?,\n\n  status = ?\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 16
+    },
+    "nullable": []
+  },
+  "hash": "29916e73a1784ea0b70ef4f637520b05efccc31e01840f681e9b042f82eb8f7e"
+}

.sqlx/query-87d7233bb9a4bcae7c9b7d55bb93fab182343847f0bcf8d8ce849f3a2dcfb704.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\n      UPDATE media_files\n      SET maybe_thumbnail_version = ?\n      WHERE token = ?\n      LIMIT 1\n    ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": []
+  },
+  "hash": "87d7233bb9a4bcae7c9b7d55bb93fab182343847f0bcf8d8ce849f3a2dcfb704"
+}

.sqlx/query-9b99ccd0baf9a4b74d8903f63e3a3dcf4c09b75cad978f0532388cbd743b7516.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n    UPDATE tasks\n    SET task_status = ?,\n    on_failure_type = ?,\n    on_failure_message = ?\n    WHERE id = ?\n  ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 4
+    },
+    "nullable": []
+  },
+  "hash": "9b99ccd0baf9a4b74d8903f63e3a3dcf4c09b75cad978f0532388cbd743b7516"
+}

.sqlx/query-a2c9e2f61eba666254f8432b3c50a0a7738ee3b3faa77c5281bc8e4af96159b9.json

@@ -1,6 +1,6 @@
 {
   "db_name": "MySQL",
-  "query": "\nSELECT\n    jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n\n    jobs.status as `status: enums::common::job_status_plus::JobStatusPlus`,\n    jobs.attempt_count,\n\n    jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n    jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n    jobs.creator_ip_address,\n\n    jobs.product_category as `product_category: enums::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory`,\n    jobs.inference_category as `inference_category: enums::by_table::generic_inference_jobs::inference_category::InferenceCategory`,\n    jobs.maybe_model_type,\n    jobs.maybe_model_token,\n    jobs.maybe_raw_inference_text,\n    jobs.maybe_inference_args,\n\n    jobs.frontend_failure_category as `maybe_frontend_failure_category: enums::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory`,\n\n    jobs.on_success_result_entity_type as maybe_result_entity_type,\n    jobs.on_success_result_entity_token as maybe_result_entity_token,\n    jobs.on_success_result_batch_token as maybe_result_batch_token,\n\n    model_weights.title as maybe_model_weights_title,\n    tts_models.title as maybe_tts_model_title,\n    voice_conversion_models.title as maybe_voice_conversion_model_title,\n\n    tts_results.public_bucket_wav_audio_path as maybe_tts_public_bucket_path,\n    voice_conversion_results.public_bucket_hash as maybe_voice_conversion_public_bucket_hash,\n\n    media_files.public_bucket_directory_hash as maybe_media_file_public_bucket_directory_hash,\n    media_files.maybe_public_bucket_prefix as maybe_media_file_public_bucket_prefix,\n    media_files.maybe_public_bucket_extension as maybe_media_file_public_bucket_extension,\n\n    jobs.assigned_worker as maybe_assigned_worker,\n    jobs.assigned_cluster as maybe_assigned_cluster,\n\n    jobs.is_keepalive_required,\n\n    jobs.created_at,\n    jobs.updated_at,\n\n    jobs.first_started_at as maybe_first_started_at,\n    jobs.successfully_completed_at as maybe_successfully_completed_at,\n\n    NOW() as database_clock\n\nFROM generic_inference_jobs as jobs\n\nLEFT OUTER JOIN model_weights ON jobs.maybe_model_token = model_weights.token\nLEFT OUTER JOIN tts_models ON jobs.maybe_model_token = tts_models.token\nLEFT OUTER JOIN voice_conversion_models ON jobs.maybe_model_token = voice_conversion_models.token\n\nLEFT OUTER JOIN tts_results ON jobs.on_success_result_entity_token = tts_results.token\nLEFT OUTER JOIN voice_conversion_results ON jobs.on_success_result_entity_token = voice_conversion_results.token\nLEFT OUTER JOIN media_files ON jobs.on_success_result_entity_token = media_files.token\n\nWHERE jobs.token = ?\n        ",
+  "query": "\nSELECT\n    jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n\n    jobs.status as `status: enums::common::job_status_plus::JobStatusPlus`,\n    jobs.attempt_count,\n\n    jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n    jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n    jobs.creator_ip_address,\n\n    jobs.product_category as `product_category: enums::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory`,\n    jobs.inference_category as `inference_category: enums::by_table::generic_inference_jobs::inference_category::InferenceCategory`,\n    jobs.maybe_model_type,\n    jobs.maybe_model_token,\n    jobs.maybe_raw_inference_text,\n    jobs.maybe_inference_args,\n\n    jobs.frontend_failure_category as `maybe_frontend_failure_category: enums::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory`,\n    jobs.failure_reason,\n\n    jobs.on_success_result_entity_type as maybe_result_entity_type,\n    jobs.on_success_result_entity_token as maybe_result_entity_token,\n    jobs.on_success_result_batch_token as maybe_result_batch_token,\n\n    model_weights.title as maybe_model_weights_title,\n    tts_models.title as maybe_tts_model_title,\n    voice_conversion_models.title as maybe_voice_conversion_model_title,\n\n    tts_results.public_bucket_wav_audio_path as maybe_tts_public_bucket_path,\n    voice_conversion_results.public_bucket_hash as maybe_voice_conversion_public_bucket_hash,\n\n    media_files.public_bucket_directory_hash as maybe_media_file_public_bucket_directory_hash,\n    media_files.maybe_public_bucket_prefix as maybe_media_file_public_bucket_prefix,\n    media_files.maybe_public_bucket_extension as maybe_media_file_public_bucket_extension,\n\n    jobs.assigned_worker as maybe_assigned_worker,\n    jobs.assigned_cluster as maybe_assigned_cluster,\n\n    jobs.is_keepalive_required,\n\n    jobs.created_at,\n    jobs.updated_at,\n\n    jobs.first_started_at as maybe_first_started_at,\n    jobs.successfully_completed_at as maybe_successfully_completed_at,\n\n    NOW() as database_clock\n\nFROM generic_inference_jobs as jobs\n\nLEFT OUTER JOIN model_weights ON jobs.maybe_model_token = model_weights.token\nLEFT OUTER JOIN tts_models ON jobs.maybe_model_token = tts_models.token\nLEFT OUTER JOIN voice_conversion_models ON jobs.maybe_model_token = voice_conversion_models.token\n\nLEFT OUTER JOIN tts_results ON jobs.on_success_result_entity_token = tts_results.token\nLEFT OUTER JOIN voice_conversion_results ON jobs.on_success_result_entity_token = voice_conversion_results.token\nLEFT OUTER JOIN media_files ON jobs.on_success_result_entity_token = media_files.token\n\nWHERE jobs.token = ?\n        ",
   "describe": {
     "columns": [
       {
@@ -135,6 +135,16 @@
       },
       {
         "ordinal": 13,
+        "name": "failure_reason",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 2048
+        }
+      },
+      {
+        "ordinal": 14,
         "name": "maybe_result_entity_type",
         "type_info": {
           "type": "VarString",
@@ -144,7 +154,7 @@
         }
       },
       {
-        "ordinal": 14,
+        "ordinal": 15,
         "name": "maybe_result_entity_token",
         "type_info": {
           "type": "VarString",
@@ -154,7 +164,7 @@
         }
       },
       {
-        "ordinal": 15,
+        "ordinal": 16,
         "name": "maybe_result_batch_token",
         "type_info": {
           "type": "VarString",
@@ -164,7 +174,7 @@
         }
       },
       {
-        "ordinal": 16,
+        "ordinal": 17,
         "name": "maybe_model_weights_title",
         "type_info": {
           "type": "VarString",
@@ -174,7 +184,7 @@
         }
       },
       {
-        "ordinal": 17,
+        "ordinal": 18,
         "name": "maybe_tts_model_title",
         "type_info": {
           "type": "VarString",
@@ -184,7 +194,7 @@
         }
       },
       {
-        "ordinal": 18,
+        "ordinal": 19,
         "name": "maybe_voice_conversion_model_title",
         "type_info": {
           "type": "VarString",
@@ -194,7 +204,7 @@
         }
       },
       {
-        "ordinal": 19,
+        "ordinal": 20,
         "name": "maybe_tts_public_bucket_path",
         "type_info": {
           "type": "VarString",
@@ -204,7 +214,7 @@
         }
       },
       {
-        "ordinal": 20,
+        "ordinal": 21,
         "name": "maybe_voice_conversion_public_bucket_hash",
         "type_info": {
           "type": "VarString",
@@ -214,7 +224,7 @@
         }
       },
       {
-        "ordinal": 21,
+        "ordinal": 22,
         "name": "maybe_media_file_public_bucket_directory_hash",
         "type_info": {
           "type": "VarString",
@@ -224,7 +234,7 @@
         }
       },
       {
-        "ordinal": 22,
+        "ordinal": 23,
         "name": "maybe_media_file_public_bucket_prefix",
         "type_info": {
           "type": "VarString",
@@ -234,7 +244,7 @@
         }
       },
       {
-        "ordinal": 23,
+        "ordinal": 24,
         "name": "maybe_media_file_public_bucket_extension",
         "type_info": {
           "type": "VarString",
@@ -244,7 +254,7 @@
         }
       },
       {
-        "ordinal": 24,
+        "ordinal": 25,
         "name": "maybe_assigned_worker",
         "type_info": {
           "type": "VarString",
@@ -254,7 +264,7 @@
         }
       },
       {
-        "ordinal": 25,
+        "ordinal": 26,
         "name": "maybe_assigned_cluster",
         "type_info": {
           "type": "VarString",
@@ -264,7 +274,7 @@
         }
       },
       {
-        "ordinal": 26,
+        "ordinal": 27,
         "name": "is_keepalive_required",
         "type_info": {
           "type": "Tiny",
@@ -274,7 +284,7 @@
         }
       },
       {
-        "ordinal": 27,
+        "ordinal": 28,
         "name": "created_at",
         "type_info": {
           "type": "Timestamp",
@@ -284,7 +294,7 @@
         }
       },
       {
-        "ordinal": 28,
+        "ordinal": 29,
         "name": "updated_at",
         "type_info": {
           "type": "Timestamp",
@@ -294,7 +304,7 @@
         }
       },
       {
-        "ordinal": 29,
+        "ordinal": 30,
         "name": "maybe_first_started_at",
         "type_info": {
           "type": "Timestamp",
@@ -304,7 +314,7 @@
         }
       },
       {
-        "ordinal": 30,
+        "ordinal": 31,
         "name": "maybe_successfully_completed_at",
         "type_info": {
           "type": "Timestamp",
@@ -314,7 +324,7 @@
         }
       },
       {
-        "ordinal": 31,
+        "ordinal": 32,
         "name": "database_clock",
         "type_info": {
           "type": "Datetime",
@@ -354,6 +364,7 @@
       true,
       true,
       true,
+      true,
       false,
       false,
       false,
@@ -362,5 +373,5 @@
       false
     ]
   },
-  "hash": "243afe0bc574f9f233c7797add9faf96440e2bafd52032e07951272fb1ec78b1"
+  "hash": "a2c9e2f61eba666254f8432b3c50a0a7738ee3b3faa77c5281bc8e4af96159b9"
 }

.sqlx/query-be9867966f24f44e14f96966cf5113055f00c339dda75334e7e88d355b9bfe72.json

@@ -0,0 +1,58 @@
+{
+  "db_name": "MySQL",
+  "query": "\nSELECT\n  username,\n  display_name,\n  username_is_generated as `username_is_generated: bool`,\n  username_is_not_customized as `username_is_not_customized: bool`\nFROM users\nWHERE\n  token = ?\n  AND user_deleted_at IS NULL\n  AND mod_deleted_at IS NULL\nLIMIT 1\n    ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "username",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "display_name",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 80
+        }
+      },
+      {
+        "ordinal": 2,
+        "name": "username_is_generated: bool",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 1
+        }
+      },
+      {
+        "ordinal": 3,
+        "name": "username_is_not_customized: bool",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "NOT_NULL",
+          "char_set": 63,
+          "max_size": 1
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "be9867966f24f44e14f96966cf5113055f00c339dda75334e7e88d355b9bfe72"
+}

.sqlx/query-daed2dcd03b3c9fbdb9057b743df078f43e2af87a2c31f418234f98da5ff979f.json

@@ -0,0 +1,91 @@
+{
+  "db_name": "MySQL",
+  "query": "\nSELECT\n    id,\n    token as `token: MediaFileToken`,\n    created_at as `created_at: DateTime<Utc>`,\n    maybe_thumbnail_version as `maybe_thumbnail_version: u8`,\n    public_bucket_directory_hash,\n    maybe_public_bucket_prefix,\n    maybe_public_bucket_extension\nFROM media_files\nWHERE\n    id >= (SELECT COALESCE(MIN(id), 0) FROM media_files WHERE created_at >= NOW() - INTERVAL ? HOUR)\n    AND id < ?\n    AND media_class = ?\n    AND maybe_thumbnail_version IS NULL\n    AND user_deleted_at IS NULL\n    AND mod_deleted_at IS NULL\nORDER BY id DESC\nLIMIT ?\n    ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": {
+          "type": "LongLong",
+          "flags": "NOT_NULL | PRIMARY_KEY | AUTO_INCREMENT",
+          "char_set": 63,
+          "max_size": 20
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "token: MediaFileToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 2,
+        "name": "created_at: DateTime<Utc>",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | TIMESTAMP",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 3,
+        "name": "maybe_thumbnail_version: u8",
+        "type_info": {
+          "type": "Tiny",
+          "flags": "UNSIGNED",
+          "char_set": 63,
+          "max_size": 3
+        }
+      },
+      {
+        "ordinal": 4,
+        "name": "public_bucket_directory_hash",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 5,
+        "name": "maybe_public_bucket_prefix",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 6,
+        "name": "maybe_public_bucket_extension",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 64
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 4
+    },
+    "nullable": [
+      false,
+      false,
+      false,
+      true,
+      false,
+      true,
+      true
+    ]
+  },
+  "hash": "daed2dcd03b3c9fbdb9057b743df078f43e2af87a2c31f418234f98da5ff979f"
+}

.sqlx/query-f4fb945b4311bd4458a68d82e417b40f8c36c08d572c07881b89cd157a8a8699.json

@@ -1,6 +1,6 @@
 {
   "db_name": "MySQL",
-  "query": "\nINSERT INTO wallets\nSET\n  token = ?,\n  wallet_namespace = ?,\n\n  owner_user_token = ?,\n  \n  banked_credits = 0,\n  monthly_credits = 0\n        ",
+  "query": "\nINSERT INTO wallets\nSET\n  token = ?,\n  wallet_namespace = ?,\n\n  owner_user_token = ?,\n\n  banked_credits = 0,\n  monthly_credits = 0\n        ",
   "describe": {
     "columns": [],
     "parameters": {
@@ -8,5 +8,5 @@
     },
     "nullable": []
   },
-  "hash": "4f5100a2cfb465964e77eaacb1ae394daae94de20c56a0966a8222dc9bea63c6"
+  "hash": "f4fb945b4311bd4458a68d82e417b40f8c36c08d572c07881b89cd157a8a8699"
 }

Cargo.toml

@@ -10,22 +10,22 @@ members = [
   "crates/api_clients/artcraft/artcraft_client",
   "crates/api_clients/cloud_storage",
   "crates/api_clients/fal_client",
-  "crates/api_clients/google_drive_common",
+  "crates/api_clients/google_drive_downloader",
   "crates/api_clients/google_sign_in",
   "crates/api_clients/grok_client",
   "crates/api_clients/midjourney_client",
   "crates/api_clients/openai_sora_client",
   "crates/api_clients/openart_client",
-  "crates/api_clients/seedance2pro",
+  "crates/api_clients/muapi_client",
+  "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",
   "crates/cli/devenv/dev-upload-media-file",
-  "crates/cli/devenv/scrape-test",
   "crates/cli/production/db-backfill",
   "crates/cli/production/db-backup",
   "crates/cli/production/db-cleanup",
@@ -33,6 +33,7 @@ members = [
   "crates/cli/production/kubectl-pod-cleanup",
   "crates/cli/production/lru-delete-models",
   "crates/cli/production/migration-tool",
+  "crates/cli/production/support-tool",
 
   # Desktop apps
   "crates/desktop/artcraft",
@@ -42,7 +43,7 @@ members = [
   "crates/lib/actix_cors_configs",
   "crates/lib/actix_helpers",
   "crates/lib/bootstrap",
-  "crates/lib/bucket_paths",
+  "crates/schema/buckets/bucket_paths",
   "crates/lib/build_metadata",
   "crates/lib/caching/memory_caching",
   "crates/lib/caching/memory_store",
@@ -51,7 +52,7 @@ members = [
   "crates/lib/cloudflare_mitigation",
   "crates/lib/concurrency",
   "crates/lib/cookie_store",
-  "crates/lib/cookies",
+  "crates/lib/jwt_signer",
   "crates/lib/data/collections",
   "crates/lib/data/crockford",
   "crates/lib/data/datetimes",
@@ -59,11 +60,11 @@ members = [
   "crates/lib/data/web_base64",
   "crates/lib/deprecated/config", # TODO(bt, 2023-02-13): Deprecate or repurpose
   "crates/lib/deprecated/http_server_common", # TODO(bt, 2023-03-20): Move useful pieces to actix_helpers
-  "crates/lib/dimensions",
   "crates/lib/easyenv", # NB: Vendored version of https://github.com/echelon/easyenv.rs that we'll improve.
-  "crates/lib/email_sender",
+  "crates/lib/deprecated/email_sender",
   "crates/lib/errors",
-  "crates/lib/files/archives",
+  "crates/lib/ffmpeg_utils",
+  "crates/lib/files/zip_archives",
   "crates/lib/files/file_to_base64_url",
   "crates/lib/files/filesys",
   "crates/lib/files/hashing",
@@ -72,31 +73,30 @@ members = [
   "crates/lib/files/mimetypes",
   "crates/lib/files/videos",
   "crates/lib/http_headers",
-  "crates/lib/idempotency",
+  "crates/lib/uuid_utils",
   "crates/api_clients/artcraft/artcraft_router",
-  "crates/lib/image_algorithms",
+  "crates/lib/deprecated/image_algorithms",
   "crates/lib/jobs_common",
   "crates/lib/jwt_light",
   "crates/lib/logging",
-  "crates/lib/machine_learning/ml_weights_registry",
-  "crates/lib/machine_learning/prompt_engineering",
+  "crates/lib/deprecated/machine_learning/ml_weights_registry",
+  "crates/lib/deprecated/machine_learning/prompt_engineering",
   "crates/lib/markdown",
-  "crates/lib/migration",
+  "crates/schema/database/migration",
   "crates/lib/password",
   "crates/lib/server_environment",
   "crates/lib/sqlx_mysql_helpers",
   "crates/lib/storyteller_root",
-  "crates/lib/subprocess_common",
-  "crates/lib/test_data",
-  "crates/lib/testing",
-  "crates/lib/tts_common",
+  "crates/lib/deprecated/subprocess_common",
+  "crates/testing/test_data",
+  "crates/testing/test_utils",
+  "crates/lib/deprecated/tts_common",
   "crates/lib/url_config",
   "crates/lib/url_utils",
   "crates/lib/user_input_common",
   "crates/lib/users",
-  "crates/lib/web_scrapers",
   #"crates/lib/api_clients/fakeyou_client",
-  #"crates/lib/machine_learning/ml_models",
+  #"crates/lib/deprecated/machine_learning/ml_models",
 
   # Schema (database): queries, database layouts, Redis keys, etc.
   "crates/schema/database/elasticsearch_schema",
@@ -114,17 +114,18 @@ members = [
   "crates/schema/public/tokens",
 
   # Services: API servers, jobs, workers, etc.
-  "crates/service/job/analytics_job",
-  "crates/service/job/download_job",
-  "crates/service/job/email_sender_job",
-  "crates/service/job/es-update-job",
-  "crates/service/job/inference_job",
   "crates/service/job/seedance2_pro_job",
+  "crates/service/job/video_thumbnail_job",
   "crates/service/job/worldlabs_job",
-  "crates/service/job/tts_download_job",
-  "crates/service/job/tts_inference_job",
-  "crates/service/job/w2l_download_job",
-  "crates/service/job/w2l_inference_job",
+  "crates/service/job/deprecated/analytics_job",
+  "crates/service/job/deprecated/download_job",
+  "crates/service/job/deprecated/email_sender_job",
+  "crates/service/job/deprecated/es-update-job",
+  "crates/service/job/deprecated/inference_job",
+  "crates/service/job/deprecated/tts_download_job",
+  "crates/service/job/deprecated/tts_inference_job",
+  "crates/service/job/deprecated/w2l_download_job",
+  "crates/service/job/deprecated/w2l_inference_job",
   "crates/service/web/dummy_service",
   "crates/service/web/storyteller_web",
 
@@ -132,7 +133,6 @@ members = [
   "crates/service/plugins/billing",
   "crates/service/plugins/billing_artcraft",
   "crates/service/plugins/component_traits",
-  "crates/service/plugins/inference_workloads",
   "crates/service/plugins/user_traits_component",
 
   # Vendored code
@@ -210,48 +210,56 @@ workspace-build-acceleration = { path = "crates/workspace-build-acceleration" }
 # Setting paths here ensures we don't need to do so in every crate's Cargo.toml
 # It makes refactoring much easier.
 actix_artcraft = { path = "crates/lib/actix_artcraft" }
-artcraft_router = { path = "crates/api_clients/artcraft/artcraft_router" }
 actix_helpers = { path = "crates/lib/actix_helpers" }
 artcraft_api_defs = { path = "crates/api_clients/artcraft/artcraft_api_defs" }
+artcraft_client = { path = "crates/api_clients/artcraft/artcraft_client" }
+artcraft_router = { path = "crates/api_clients/artcraft/artcraft_router" }
+bootstrap = { path = "crates/lib/bootstrap" }
+bucket_paths = { path = "crates/schema/buckets/bucket_paths" }
 build_metadata = { path = "crates/lib/build_metadata" }
 cloud_storage = { path = "crates/api_clients/cloud_storage" }
 cloudflare_errors = { path = "crates/lib/cloudflare_errors" }
 cloudflare_mitigation = { path = "crates/lib/cloudflare_mitigation" }
 collections = { path = "crates/lib/data/collections" }
 component_traits = { path = "crates/service/plugins/component_traits" }
+concurrency = { path = "crates/lib/concurrency" }
 cookie_store = { path = "crates/lib/cookie_store" }
-cookies = { path = "crates/lib/cookies" }
+jwt_signer = { path = "crates/lib/jwt_signer" }
 crockford = { path = "crates/lib/data/crockford" }
+easyenv = { path = "crates/lib/easyenv" }
 enums = { path = "crates/schema/public/enums" }
 enums_public = { path = "crates/schema/public/enums_public" }
 errors = { path = "crates/lib/errors" }
+ffmpeg_utils = { path = "crates/lib/ffmpeg_utils" }
 fal_client = { path = "crates/api_clients/fal_client" }
 file_to_base64_url = { path = "crates/lib/files/file_to_base64_url" }
 filesys = { path = "crates/lib/files/filesys" }
 grok_client = { path = "crates/api_clients/grok_client" }
 http_headers = { path = "crates/lib/http_headers" }
-idempotency = { path = "crates/lib/idempotency" }
+uuid_utils = { path = "crates/lib/uuid_utils" }
 images = { path = "crates/lib/files/images" }
+jobs_common = { path = "crates/lib/jobs_common" }
 jwt_light = { path = "crates/lib/jwt_light" }
 memory_caching = { path = "crates/lib/caching/memory_caching" }
 memory_store = { path = "crates/lib/caching/memory_store" }
 midjourney_client = { path = "crates/api_clients/midjourney_client" }
 mimetypes = { path = "crates/lib/files/mimetypes" }
+muapi_client = { path = "crates/api_clients/muapi_client" }
+mysql_queries = { path = "crates/schema/database/mysql_queries" }
 openai_sora_client = { path = "crates/api_clients/openai_sora_client" }
-seedance2pro = { path = "crates/api_clients/seedance2pro" }
 primitives = { path = "crates/lib/data/primitives" }
+seedance2pro_client = { path = "crates/api_clients/seedance2pro_client" }
 shared_service_components = { path = "crates/lib/shared_service_components" }
 sqlite_tasks = { path = "crates/schema/database/sqlite_tasks" }
-artcraft_client = { path = "crates/api_clients/artcraft/artcraft_client" }
-subprocess_common = { path = "crates/lib/subprocess_common" }
-test_data = { path = "crates/lib/test_data" }
-testing = { path = "crates/lib/testing" }
+subprocess_common = { path = "crates/lib/deprecated/subprocess_common" }
+test_data = { path = "crates/testing/test_data" }
+test_utils = { path = "crates/testing/test_utils" }
 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
@@ -269,28 +277,29 @@ actix-web-lab = "0.20.2"
 anyhow = "1.0.102"
 base64 = "0.22.1"
 bstr = "1.12.1"
-bytes = "1.10.1"
-chrono = { version = "0.4.41", features = ["serde"] }
+bytes = "1.11.1"
+chrono = { version = "0.4.44", features = ["serde"] }
+clap = { version = "4.6.0", features = ["derive"] }
 cookie = "0.18.1"
 env = "1.0.1"
 env_logger = "0.11.9"
-futures = { version = "0.3.31" }
-hex-literal = "1.0.0"
-indexmap = "2.9.0"
+futures = { version = "0.3.32" }
+hex-literal = "1.1.0"
+indexmap = "2.13.0"
 log = "0.4.29"
 md-5 = "0.10.6" # insecure but used for gravatar
-once_cell = "1.21.3"
+once_cell = "1.21.4"
 r2d2 = "0.8.10"
 rand = "0.9.1"
 redis = { version = "1.0.2", features = ["r2d2", "tokio-rustls-comp", "tokio-comp", "cluster-async", "aio"] }
 regex = "1.12.3"
 reqwest = { version = "0.12.23", default-features = false, features = [ "charset", "http2", "system-proxy", "json", "cookies", "rustls-tls", "gzip" ] }
 reqwest-websocket = {  version = "0.5.0" }
-serde = { version = "1.0.219", features = ["derive"] }
-serde_derive = "1.0.219"
-serde_json = "1.0.140"
+serde = { version = "1.0.228", features = ["derive"] }
+serde_derive = "1.0.228"
+serde_json = "1.0.149"
 serde_yaml = "0.9.34+deprecated"
-sha2 = "0.11.0-rc.2"
+sha2 = "0.11.0-rc.5"
 sha3 = "0.10.8"
 strum = { version = "0.28.0", features = ["derive"] }
 tauri = { version = "2.8.3", features = ["unstable", "devtools"] } # NB: "devtools" prevents App Store distribution; "ubstable" is needed for window access
@@ -299,12 +308,12 @@ tauri-plugin-fs = "2.4.2"
 tauri-plugin-log = "2.6.0"
 tauri-plugin-upload = "2.3.1"
 tempdir = "0.3.7"
-tempfile = "3.20.0"
-thiserror = "2.0.12"
-tokio = { version = "1.45.1", features = ["macros"] }
-toml = "0.8.23"
-url = { version = "2.5.4", features = ["serde"] }
-uuid = "1.18.1"
+tempfile = "3.27.0"
+thiserror = "2.0.18"
+tokio = { version = "1.50.0", features = ["macros"] }
+toml = "1.0.7+spec-1.1.0"
+url = { version = "2.5.8", features = ["serde"] }
+uuid = "1.22.0"
 
 # NB: wreq gets past fingerprinting, but we have to deal with platform-specific build issues.
 #

_database/sql/artcraft_migrations/20250708000000_create_tasks_table.sql

@@ -16,7 +16,9 @@
 --      on_complete_primary_media_file_class,
 --      on_complete_primary_media_file_cdn_url,
 --      on_complete_primary_media_file_thumbnail_url_template,
---
+--   tasks_v6.sqlite - added two fields:
+--      on_failure_type
+--      on_failure_message
 
 CREATE TABLE tasks (
     -- Task auto-incrementing primary key.
@@ -84,6 +86,15 @@ CREATE TABLE tasks (
     -- The URL template for the thumbnail of the primary media file.
     on_complete_primary_media_file_thumbnail_url_template TEXT,
 
+    -- OPTIONAL.
+    -- An enum-like string describing the failure reason (even for non-terminal failures).
+    -- The enum is `TaskFailureType`, which is a close analogue of the backend API's `FrontendFailureCategory`.
+    on_failure_type TEXT,
+
+    -- OPTIONAL.
+    -- A human-readable message describing the failure reason (even for non-terminal failures).
+    on_failure_message TEXT,
+
     created_at INTEGER NOT NULL DEFAULT (unixepoch('now')),
     updated_at INTEGER NOT NULL DEFAULT (unixepoch('now')),
     completed_at INTEGER DEFAULT NULL

_database/sql/migrations/2026-03-17-193249-0000_alter_media_files_add_maybe_thumbnail_version/down.sql

@@ -0,0 +1,7 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+ALTER TABLE media_files
+DROP COLUMN
+maybe_thumbnail_version;

_database/sql/migrations/2026-03-17-193249-0000_alter_media_files_add_maybe_thumbnail_version/up.sql

@@ -0,0 +1,7 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+ALTER TABLE media_files
+ADD COLUMN
+maybe_thumbnail_version TINYINT UNSIGNED DEFAULT NULL;

_database/sql/migrations_squashed/media_files.sql

@@ -224,6 +224,12 @@ CREATE TABLE media_files (
   -- If so, we may not need to add a watermark downstream in further processing steps.
   has_watermark BOOLEAN NOT NULL DEFAULT FALSE,
 
+  -- Tracks the thumbnail algorithm/type used for this media file.
+  -- NULL = no thumbnail generated yet.
+  -- 1 = video thumbnail.
+  -- Other values are reserved for future thumbnail algorithms or media-specific types.
+  maybe_thumbnail_version TINYINT UNSIGNED DEFAULT NULL,
+
   -- ========== UPLOAD, TRANSCODING, AND TRUNCATION DETAILS ==========
 
   -- The hash for the bucket directory that contains the original upload

build/service_cpu.Dockerfile

@@ -148,7 +148,13 @@ RUN SQLX_OFFLINE=true \
   $HOME/.cargo/bin/cargo build \
   --release \
   --bin worldlabs-job
-    
+
+RUN SQLX_OFFLINE=true \
+  LD_LIBRARY_PATH=/usr/lib:${LD_LIBRARY_PATH} \
+  $HOME/.cargo/bin/cargo build \
+  --release \
+  --bin video-thumbnail-job
+
 RUN SQLX_OFFLINE=true \
   LD_LIBRARY_PATH=/usr/lib:${LD_LIBRARY_PATH} \
   $HOME/.cargo/bin/cargo build \
@@ -210,6 +216,7 @@ RUN echo -n ${GIT_SHA} > GIT_SHA
 COPY --from=builder /tmp/target/release/storyteller-web /
 COPY --from=builder /tmp/target/release/seedance2-pro-job /
 COPY --from=builder /tmp/target/release/worldlabs-job /
+COPY --from=builder /tmp/target/release/video-thumbnail-job /
 COPY --from=builder /tmp/target/release/dummy-service /
 COPY --from=builder /tmp/target/release/analytics-job /
 COPY --from=builder /tmp/target/release/email-sender-job  /

build/service_gpu.Dockerfile

@@ -178,11 +178,11 @@ RUN touch .env-secrets
 
 # Some services have default env files that live under their code directories
 # These should also be readable from the relative current path
-COPY crates/service/job/download_job/config/download-job.common.env .
-COPY crates/service/job/download_job/config/download-job.production.env .
+COPY crates/service/job/deprecated/download_job/config/download-job.common.env .
+COPY crates/service/job/deprecated/download_job/config/download-job.production.env .
 
-COPY crates/service/job/inference_job/config/inference-job.common.env .
-COPY crates/service/job/inference_job/config/inference-job.production.env .
+COPY crates/service/job/deprecated/inference_job/config/inference-job.common.env .
+COPY crates/service/job/deprecated/inference_job/config/inference-job.production.env .
 
 # # Need python to make use of other containers' venv
 # # TODO(bt,2023-04-26): This is only necessary for download-job and inference-job

crates/api_clients/artcraft/artcraft_api_defs/src/generate/video/multi_function/seedance_2p0_multi_function_video_gen.rs

@@ -23,6 +23,12 @@ pub struct Seedance2p0MultiFunctionVideoGenRequest {
   /// Optional reference images (reference mode). When present, takes priority over start/end frames.
   pub reference_image_media_tokens: Option<Vec<MediaFileToken>>,
 
+  /// Optional reference videos.
+  pub reference_video_media_tokens: Option<Vec<MediaFileToken>>,
+
+  /// Optional reference audio files.
+  pub reference_audio_media_tokens: Option<Vec<MediaFileToken>>,
+
   /// Video aspect ratio / resolution.
   pub aspect_ratio: Option<Seedance2p0AspectRatio>,
 

crates/api_clients/artcraft/artcraft_api_defs/src/jobs/list_session_jobs.rs

@@ -9,6 +9,8 @@ use serde::Deserialize;
 use serde::Serialize;
 use tokens::tokens::generic_inference_jobs::InferenceJobToken;
 use utoipa::{IntoParams, ToSchema};
+use enums::api_safe::by_table::generic_inference_jobs::frontend_failure_category_for_api_clients::FrontendFailureCategoryForApiClients;
+use enums::api_safe::by_table::generic_inference_jobs::frontend_failure_category_for_old_clients::FrontendFailureCategoryForOldClients;
 use tokens::tokens::batch_generations::BatchGenerationToken;
 
 pub const LIST_SESSION_JOBS_URL_PATH: &str = "/v1/jobs/session";
@@ -98,9 +100,19 @@ pub struct ListSessionStatusDetailsResponse {
   /// This is typically only for non-premium users.
   pub requires_keepalive: bool,
 
+  /// NB: DO NOT CHANGE: Old clients can't read the new enum payload values as they are introduced.
+  ///
   /// An enum the frontend can use to display localized/I18N error
   /// messages. These pertain to both transient and permanent failures.
-  pub maybe_failure_category: Option<FrontendFailureCategory>,
+  #[deprecated(note="use maybe_failure_category_updated")]
+  pub maybe_failure_category: Option<FrontendFailureCategoryForOldClients>,
+
+  /// An enum the frontend can use to display localized/I18N error
+  /// messages. These pertain to both transient and permanent failures.
+  pub maybe_failure_category_updated: Option<FrontendFailureCategoryForApiClients>,
+  
+  /// User-facing failure messages
+  pub maybe_failure_message: Option<String>,
 
   /// This is an integer number between 0 and 100 (both inclusive) that
   /// reports the completeness.
@@ -125,4 +137,3 @@ pub struct ListSessionResultDetailsResponse {
 
   pub maybe_successfully_completed_at: Option<DateTime<Utc>>,
 }
-

crates/api_clients/artcraft/artcraft_api_defs/src/moderation/wallets/mod.rs

@@ -1,3 +1,4 @@
 pub mod list_user_wallets;
 pub mod moderator_add_banked_balance_to_wallet;
+pub mod moderator_create_wallet_for_user;
 pub mod moderator_get_wallet;

crates/api_clients/artcraft/artcraft_api_defs/src/moderation/wallets/moderator_create_wallet_for_user.rs

@@ -0,0 +1,19 @@
+use enums::common::payments_namespace::PaymentsNamespace;
+use serde_derive::{Deserialize, Serialize};
+use tokens::tokens::users::UserToken;
+use tokens::tokens::wallets::WalletToken;
+use utoipa::ToSchema;
+
+pub const MODERATOR_CREATE_WALLET_FOR_USER_PATH: &str = "/v1/moderation/wallet/create_for_user";
+
+#[derive(Deserialize, ToSchema)]
+pub struct ModeratorCreateWalletForUserRequest {
+  pub user_token: Option<UserToken>,
+  pub payments_namespace: Option<PaymentsNamespace>,
+}
+
+#[derive(Serialize, ToSchema)]
+pub struct ModeratorCreateWalletForUserResponse {
+  pub success: bool,
+  pub wallet_token: WalletToken,
+}

crates/api_clients/artcraft/artcraft_client/Cargo.toml

@@ -28,7 +28,7 @@ cloudflare_errors.workspace = true
 enums.workspace = true
 enums_public.workspace = true
 errors.workspace = true
-idempotency.workspace = true
+uuid_utils.workspace = true
 mimetypes.workspace = true
 tokens.workspace = true
 

crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/legacy_upload_media_file_from_file.rs

@@ -16,7 +16,7 @@ use enums::common::generation_provider::GenerationProvider;
 use enums::common::visibility::Visibility;
 use enums::no_table::style_transfer::style_transfer_name::StyleTransferName;
 use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use log::debug;
 use reqwest::multipart::{Form, Part};
 use reqwest::Client;

crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_image_media_file_from_bytes.rs

@@ -15,7 +15,7 @@ use enums::by_table::model_weights::weights_category::WeightsCategory;
 use enums::common::visibility::Visibility;
 use enums::no_table::style_transfer::style_transfer_name::StyleTransferName;
 use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use log::debug;
 use reqwest::multipart::{Form, Part};
 use reqwest::Client;

crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_image_media_file_from_file.rs

@@ -16,7 +16,7 @@ use enums::common::generation_provider::GenerationProvider;
 use enums::common::visibility::Visibility;
 use enums::no_table::style_transfer::style_transfer_name::StyleTransferName;
 use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use log::debug;
 use reqwest::multipart::{Form, Part};
 use reqwest::Client;

crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_new_engine_asset_from_file.rs

@@ -13,7 +13,7 @@ use enums::by_table::model_weights::weights_category::WeightsCategory;
 use enums::common::visibility::Visibility;
 use enums::no_table::style_transfer::style_transfer_name::StyleTransferName;
 use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use log::debug;
 use reqwest::multipart::{Form, Part};
 use reqwest::Client;

crates/api_clients/artcraft/artcraft_client/src/endpoints/media_files/upload_video_media_file_from_file.rs

@@ -13,7 +13,7 @@ use enums::by_table::model_weights::weights_category::WeightsCategory;
 use enums::common::visibility::Visibility;
 use enums::no_table::style_transfer::style_transfer_name::StyleTransferName;
 use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType;
-use idempotency::uuid::generate_random_uuid;
+use uuid_utils::uuid::generate_random_uuid;
 use log::debug;
 use reqwest::multipart::{Form, Part};
 use reqwest::Client;

crates/api_clients/artcraft/artcraft_router/Cargo.toml

@@ -19,14 +19,18 @@ workspace-build-acceleration.workspace = true
 artcraft_api_defs.workspace = true
 artcraft_client.workspace = true
 fal_client.workspace = true
-seedance2pro.workspace = true
+muapi_client.workspace = true
+seedance2pro_client.workspace = true
 tokens.workspace = true
-world_labs_api.workspace = true
+url_utils.workspace = true
+worldlabs_api_client.workspace = true
 
 # External
 anyhow.workspace = true
 log.workspace = true
+reqwest.workspace = true
 serde.workspace = true
+wreq.workspace = true
 serde_derive.workspace = true
 tokio.workspace = true
 uuid.workspace = true

crates/api_clients/artcraft/artcraft_router/src/api/audio_list_ref.rs

@@ -0,0 +1,7 @@
+use tokens::tokens::media_files::MediaFileToken;
+
+#[derive(Copy, Clone)]
+pub enum AudioListRef<'a> {
+  MediaFileTokens(&'a Vec<MediaFileToken>),
+  Urls(&'a Vec<String>),
+}

crates/api_clients/artcraft/artcraft_router/src/api/mod.rs

@@ -1,3 +1,4 @@
+pub mod audio_list_ref;
 pub mod common_aspect_ratio;
 pub mod common_image_model;
 pub mod common_resolution;
@@ -6,3 +7,4 @@ pub mod common_video_model;
 pub mod image_list_ref;
 pub mod image_ref;
 pub mod provider;
+pub mod video_list_ref;

crates/api_clients/artcraft/artcraft_router/src/api/provider.rs

@@ -6,4 +6,6 @@ use serde_derive::{Deserialize, Serialize};
 pub enum Provider {
   Artcraft,
   Fal,
+  Muapi,
+  Seedance2Pro,
 }

crates/api_clients/artcraft/artcraft_router/src/api/video_list_ref.rs

@@ -0,0 +1,7 @@
+use tokens::tokens::media_files::MediaFileToken;
+
+#[derive(Copy, Clone)]
+pub enum VideoListRef<'a> {
+  MediaFileTokens(&'a Vec<MediaFileToken>),
+  Urls(&'a Vec<String>),
+}

crates/api_clients/artcraft/artcraft_router/src/client/mod.rs

@@ -5,3 +5,5 @@ pub mod request_mismatch_mitigation_strategy;
 pub mod router_artcraft_client;
 pub mod router_client;
 pub mod router_fal_client;
+pub mod router_muapi_client;
+pub mod router_seedance2pro_client;

crates/api_clients/artcraft/artcraft_router/src/client/multi_router_client.rs

@@ -1,10 +1,14 @@
 use crate::client::router_artcraft_client::RouterArtcraftClient;
 use crate::client::router_fal_client::RouterFalClient;
+use crate::client::router_muapi_client::RouterMuapiClient;
+use crate::client::router_seedance2pro_client::RouterSeedance2ProClient;
 use crate::errors::client_error::{ClientError, ClientType};
 
 pub struct MultiRouterClient {
   pub(crate) artcraft_client: Option<RouterArtcraftClient>,
   pub(crate) fal_client: Option<RouterFalClient>,
+  pub(crate) muapi_client: Option<RouterMuapiClient>,
+  pub(crate) seedance2pro_client: Option<RouterSeedance2ProClient>,
 }
 
 impl MultiRouterClient {
@@ -17,4 +21,14 @@ impl MultiRouterClient {
     self.fal_client.as_ref()
       .ok_or(ClientError::ClientNotConfigured(ClientType::Fal))
   }
+
+  pub fn get_muapi_client_ref(&self) -> Result<&RouterMuapiClient, ClientError> {
+    self.muapi_client.as_ref()
+      .ok_or(ClientError::ClientNotConfigured(ClientType::Muapi))
+  }
+
+  pub fn get_seedance2pro_client_ref(&self) -> Result<&RouterSeedance2ProClient, ClientError> {
+    self.seedance2pro_client.as_ref()
+      .ok_or(ClientError::ClientNotConfigured(ClientType::Seedance2Pro))
+  }
 }

crates/api_clients/artcraft/artcraft_router/src/client/multi_router_client_builder.rs

@@ -1,10 +1,14 @@
 use crate::client::multi_router_client::MultiRouterClient;
 use crate::client::router_artcraft_client::RouterArtcraftClient;
 use crate::client::router_fal_client::RouterFalClient;
+use crate::client::router_muapi_client::RouterMuapiClient;
+use crate::client::router_seedance2pro_client::RouterSeedance2ProClient;
 
 pub struct MultiRouterClientBuilder {
   artcraft_client: Option<RouterArtcraftClient>,
   fal_client: Option<RouterFalClient>,
+  muapi_client: Option<RouterMuapiClient>,
+  seedance2pro_client: Option<RouterSeedance2ProClient>,
 }
 
 impl MultiRouterClientBuilder {
@@ -12,6 +16,8 @@ impl MultiRouterClientBuilder {
     Self {
       artcraft_client: None,
       fal_client: None,
+      muapi_client: None,
+      seedance2pro_client: None,
     }
   }
 
@@ -25,10 +31,22 @@ impl MultiRouterClientBuilder {
     self
   }
 
+  pub fn set_muapi_client(mut self, client: RouterMuapiClient) -> Self {
+    self.muapi_client = Some(client);
+    self
+  }
+
+  pub fn set_seedance2pro_client(mut self, client: RouterSeedance2ProClient) -> Self {
+    self.seedance2pro_client = Some(client);
+    self
+  }
+
   pub fn build(self) -> MultiRouterClient {
     MultiRouterClient {
       artcraft_client: self.artcraft_client,
       fal_client: self.fal_client,
+      muapi_client: self.muapi_client,
+      seedance2pro_client: self.seedance2pro_client,
     }
   }
 }

crates/api_clients/artcraft/artcraft_router/src/client/router_client.rs

@@ -1,12 +1,16 @@
 use crate::client::multi_router_client::MultiRouterClient;
 use crate::client::router_artcraft_client::RouterArtcraftClient;
 use crate::client::router_fal_client::RouterFalClient;
+use crate::client::router_muapi_client::RouterMuapiClient;
+use crate::client::router_seedance2pro_client::RouterSeedance2ProClient;
 use crate::errors::client_error::{ClientError, ClientType};
 
 pub enum RouterClient {
   Multi(MultiRouterClient),
   Artcraft(RouterArtcraftClient),
   Fal(RouterFalClient),
+  Muapi(RouterMuapiClient),
+  Seedance2Pro(RouterSeedance2ProClient),
 }
 
 impl RouterClient {
@@ -25,4 +29,20 @@ impl RouterClient {
       _ => Err(ClientError::ClientNotConfigured(ClientType::Fal)),
     }
   }
+
+  pub fn get_muapi_client_ref(&self) -> Result<&RouterMuapiClient, ClientError> {
+    match self {
+      RouterClient::Muapi(client) => Ok(client),
+      RouterClient::Multi(multi) => multi.get_muapi_client_ref(),
+      _ => Err(ClientError::ClientNotConfigured(ClientType::Muapi)),
+    }
+  }
+
+  pub fn get_seedance2pro_client_ref(&self) -> Result<&RouterSeedance2ProClient, ClientError> {
+    match self {
+      RouterClient::Seedance2Pro(client) => Ok(client),
+      RouterClient::Multi(multi) => multi.get_seedance2pro_client_ref(),
+      _ => Err(ClientError::ClientNotConfigured(ClientType::Seedance2Pro)),
+    }
+  }
 }

crates/api_clients/artcraft/artcraft_router/src/client/router_muapi_client.rs

@@ -0,0 +1,11 @@
+use muapi_client::creds::muapi_session::MuapiSession;
+
+pub struct RouterMuapiClient {
+  pub(crate) session: MuapiSession,
+}
+
+impl RouterMuapiClient {
+  pub fn new(session: MuapiSession) -> Self {
+    RouterMuapiClient { session }
+  }
+}

crates/api_clients/artcraft/artcraft_router/src/client/router_seedance2pro_client.rs

@@ -0,0 +1,11 @@
+use seedance2pro_client::creds::seedance2pro_session::Seedance2ProSession;
+
+pub struct RouterSeedance2ProClient {
+  pub(crate) session: Seedance2ProSession,
+}
+
+impl RouterSeedance2ProClient {
+  pub fn new(session: Seedance2ProSession) -> Self {
+    RouterSeedance2ProClient { session }
+  }
+}

crates/api_clients/artcraft/artcraft_router/src/errors/artcraft_router_error.rs

@@ -1,4 +1,5 @@
 use crate::errors::client_error::ClientError;
+use crate::errors::download_error::DownloadError;
 use crate::errors::provider_error::ProviderError;
 use std::error::Error;
 use std::fmt::{Display, Formatter};
@@ -8,6 +9,9 @@ pub enum ArtcraftRouterError {
   /// A client configuration error.
   Client(ClientError),
 
+  /// Failed to download a file from a URL (e.g. when re-uploading to a provider's CDN).
+  Download(DownloadError),
+
   /// The requested model is not yet supported by the router.
   UnsupportedModel(String),
 
@@ -24,6 +28,7 @@ impl Display for ArtcraftRouterError {
   fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
     match self {
       Self::Client(e) => write!(f, "Client error: {}", e),
+      Self::Download(e) => write!(f, "Download error: {}", e),
       Self::UnsupportedModel(model) => write!(f, "Unsupported model: {}", model),
       Self::InvalidInput(msg) => write!(f, "Invalid input: {}", msg),
       Self::Provider(e) => write!(f, "Provider error: {}", e),
@@ -37,6 +42,12 @@ impl From<ClientError> for ArtcraftRouterError {
   }
 }
 
+impl From<DownloadError> for ArtcraftRouterError {
+  fn from(error: DownloadError) -> Self {
+    Self::Download(error)
+  }
+}
+
 impl From<ProviderError> for ArtcraftRouterError {
   fn from(error: ProviderError) -> Self {
     Self::Provider(error)

crates/api_clients/artcraft/artcraft_router/src/errors/client_error.rs

@@ -5,6 +5,8 @@ use std::fmt::{Display, Formatter};
 pub enum ClientType {
   Artcraft,
   Fal,
+  Muapi,
+  Seedance2Pro,
 }
 
 impl Display for ClientType {
@@ -12,6 +14,8 @@ impl Display for ClientType {
     match self {
       Self::Artcraft => write!(f, "Artcraft"),
       Self::Fal => write!(f, "Fal"),
+      Self::Muapi => write!(f, "Muapi"),
+      Self::Seedance2Pro => write!(f, "Seedance2Pro"),
     }
   }
 }
@@ -33,6 +37,12 @@ pub enum ClientError {
 
   /// Fal only accepts image URLs for image inputs, not media tokens.
   FalOnlySupportsUrls,
+
+  /// Muapi only accepts URLs for image inputs, not media tokens.
+  MuapiOnlySupportsUrls,
+
+  /// Seedance2Pro only accepts URLs for media inputs, not media tokens.
+  Seedance2ProOnlySupportsUrls,
 }
 
 impl Error for ClientError {}
@@ -55,6 +65,12 @@ impl Display for ClientError {
       Self::FalOnlySupportsUrls => {
         write!(f, "Fal only supports image URLs for image inputs, not media tokens")
       }
+      Self::MuapiOnlySupportsUrls => {
+        write!(f, "Muapi only supports URLs for image inputs; resolve media tokens to URLs before calling this provider")
+      }
+      Self::Seedance2ProOnlySupportsUrls => {
+        write!(f, "Seedance2Pro only supports URLs for media inputs; resolve media tokens to URLs before calling this provider")
+      }
     }
   }
 }

crates/api_clients/artcraft/artcraft_router/src/errors/download_error.rs

@@ -0,0 +1,40 @@
+use std::error::Error;
+use std::fmt::{Display, Formatter};
+
+#[derive(Debug)]
+pub enum DownloadError {
+  BadStatus {
+    url: String,
+    status_code: u16,
+  },
+
+  ReqwestDownload {
+    url: String,
+    error: reqwest::Error,
+    maybe_status: Option<reqwest::StatusCode>,
+  },
+
+  WreqDownload {
+    url: String,
+    error: wreq::Error,
+    maybe_status: Option<wreq::StatusCode>,
+  },
+}
+
+impl Error for DownloadError {}
+
+impl Display for DownloadError {
+  fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+    match self {
+      Self::BadStatus { url, status_code } => {
+        write!(f, "Download failed for {} with status {}", url, status_code)
+      }
+      Self::ReqwestDownload { url, error, maybe_status } => {
+        write!(f, "Reqwest download error for {}: {} (status: {:?})", url, error, maybe_status)
+      }
+      Self::WreqDownload { url, error, maybe_status } => {
+        write!(f, "Wreq download error for {}: {} (status: {:?})", url, error, maybe_status)
+      }
+    }
+  }
+}

crates/api_clients/artcraft/artcraft_router/src/errors/mod.rs

@@ -1,3 +1,4 @@
 pub mod artcraft_router_error;
 pub mod client_error;
+pub mod download_error;
 pub mod provider_error;

crates/api_clients/artcraft/artcraft_router/src/errors/provider_error.rs

@@ -2,11 +2,15 @@ use std::error::Error;
 use std::fmt::{Display, Formatter};
 use artcraft_client::error::storyteller_error::StorytellerError;
 use fal_client::error::fal_error_plus::FalErrorPlus;
+use muapi_client::error::muapi_error::MuapiError;
+use seedance2pro_client::error::seedance2pro_error::Seedance2ProError;
 
 #[derive(Debug)]
 pub enum ProviderError {
   Storyteller(StorytellerError),
   Fal(FalErrorPlus),
+  Muapi(MuapiError),
+  Seedance2Pro(Seedance2ProError),
 }
 
 impl Error for ProviderError {}
@@ -16,6 +20,8 @@ impl Display for ProviderError {
     match self {
       Self::Storyteller(e) => write!(f, "Storyteller provider error: {}", e),
       Self::Fal(e) => write!(f, "Fal provider error: {}", e),
+      Self::Muapi(e) => write!(f, "Muapi provider error: {}", e),
+      Self::Seedance2Pro(e) => write!(f, "Seedance2Pro provider error: {}", e),
     }
   }
 }
@@ -31,3 +37,15 @@ impl From<FalErrorPlus> for ProviderError {
     Self::Fal(error)
   }
 }
+
+impl From<MuapiError> for ProviderError {
+  fn from(error: MuapiError) -> Self {
+    Self::Muapi(error)
+  }
+}
+
+impl From<Seedance2ProError> for ProviderError {
+  fn from(error: Seedance2ProError) -> Self {
+    Self::Seedance2Pro(error)
+  }
+}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/generate_image_request.rs

@@ -73,72 +73,48 @@ impl<'a> GenerateImageRequest<'a> {
   /// Read the image generation request, construct a plan, then yield a means to execute it.
   pub fn build(&self) -> Result<ImageGenerationPlan<'_>, ArtcraftRouterError> {
     match self.provider {
-      Provider::Artcraft => match self.model {
-        CommonImageModel::Flux1Dev => {
-          plan_generate_image_artcraft_flux_1_dev(self).map(ImageGenerationPlan::ArtcraftFlux1Dev)
-        }
-        CommonImageModel::Flux1Schnell => {
-          plan_generate_image_artcraft_flux_1_schnell(self).map(ImageGenerationPlan::ArtcraftFlux1Schnell)
-        }
-        CommonImageModel::FluxPro11 => {
-          plan_generate_image_artcraft_flux_pro_1p1(self).map(ImageGenerationPlan::ArtcraftFluxPro11)
-        }
-        CommonImageModel::FluxPro11Ultra => {
-          plan_generate_image_artcraft_flux_pro_1p1_ultra(self).map(ImageGenerationPlan::ArtcraftFluxPro11Ultra)
-        }
-        CommonImageModel::GptImage1p5 => {
-          plan_generate_image_artcraft_gpt_image_1p5(self).map(ImageGenerationPlan::ArtcraftGptImage1p5)
-        }
-        CommonImageModel::NanaBanana => {
-          plan_generate_image_artcraft_nano_banana(self).map(ImageGenerationPlan::ArtcraftNanaBanana)
-        }
-        CommonImageModel::NanaBanana2 => {
-          plan_generate_image_artcraft_nano_banana_2(self).map(ImageGenerationPlan::ArtcraftNanaBanana2)
-        }
-        CommonImageModel::NanaBananaPro => {
-          plan_generate_image_artcraft_nano_banana_pro(self).map(ImageGenerationPlan::ArtcraftNanaBananaPro)
-        }
-        CommonImageModel::Seedream4 => {
-          plan_generate_image_artcraft_seedream_4(self).map(ImageGenerationPlan::ArtcraftSeedream4)
-        }
-        CommonImageModel::Seedream4p5 => {
-          plan_generate_image_artcraft_seedream_4p5(self).map(ImageGenerationPlan::ArtcraftSeedream4p5)
-        }
-        CommonImageModel::Seedream5Lite => {
-          plan_generate_image_artcraft_seedream_5_lite(self).map(ImageGenerationPlan::ArtcraftSeedream5Lite)
-        }
-        CommonImageModel::QwenEdit2511Angles => {
-          plan_generate_image_artcraft_qwen_edit_2511_angles(self).map(ImageGenerationPlan::ArtcraftQwenEdit2511Angles)
-        }
-        CommonImageModel::Flux2LoraAngles => {
-          plan_generate_image_artcraft_flux_2_lora_angles(self).map(ImageGenerationPlan::ArtcraftFlux2LoraAngles)
-        }
-      },
-      Provider::Fal => match self.model {
-        CommonImageModel::NanaBananaPro => {
-          plan_generate_image_fal_nano_banana_pro(self).map(ImageGenerationPlan::FalNanaBananaPro)
-        }
-        CommonImageModel::Flux1Dev
-        | CommonImageModel::Flux1Schnell
-        | CommonImageModel::FluxPro11
-        | CommonImageModel::FluxPro11Ultra
-        | CommonImageModel::GptImage1p5
-        | CommonImageModel::NanaBanana
-        | CommonImageModel::NanaBanana2
-        | CommonImageModel::Seedream4
-        | CommonImageModel::Seedream4p5
-        | CommonImageModel::Seedream5Lite
-        | CommonImageModel::QwenEdit2511Angles
-        | CommonImageModel::Flux2LoraAngles => {
-          Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
-            field: "provider",
-            value: format!("{:?} is only available on the Artcraft provider", self.model),
-          }))
-        }
-      },
+      Provider::Artcraft => self.build_artcraft(),
+      Provider::Fal => self.build_fal(),
+      _ => self.unsupported_provider(),
     }
   }
 
+  fn build_artcraft(&self) -> Result<ImageGenerationPlan<'_>, ArtcraftRouterError> {
+    match self.model {
+      CommonImageModel::Flux1Dev => plan_generate_image_artcraft_flux_1_dev(self),
+      CommonImageModel::Flux1Schnell => plan_generate_image_artcraft_flux_1_schnell(self),
+      CommonImageModel::FluxPro11 => plan_generate_image_artcraft_flux_pro_1p1(self),
+      CommonImageModel::FluxPro11Ultra => plan_generate_image_artcraft_flux_pro_1p1_ultra(self),
+      CommonImageModel::GptImage1p5 => plan_generate_image_artcraft_gpt_image_1p5(self),
+      CommonImageModel::NanaBanana => plan_generate_image_artcraft_nano_banana(self),
+      CommonImageModel::NanaBanana2 => plan_generate_image_artcraft_nano_banana_2(self),
+      CommonImageModel::NanaBananaPro => plan_generate_image_artcraft_nano_banana_pro(self),
+      CommonImageModel::Seedream4 => plan_generate_image_artcraft_seedream_4(self),
+      CommonImageModel::Seedream4p5 => plan_generate_image_artcraft_seedream_4p5(self),
+      CommonImageModel::Seedream5Lite => plan_generate_image_artcraft_seedream_5_lite(self),
+      CommonImageModel::QwenEdit2511Angles => plan_generate_image_artcraft_qwen_edit_2511_angles(self),
+      CommonImageModel::Flux2LoraAngles => plan_generate_image_artcraft_flux_2_lora_angles(self),
+    }
+  }
+
+  fn build_fal(&self) -> Result<ImageGenerationPlan<'_>, ArtcraftRouterError> {
+    match self.model {
+      CommonImageModel::NanaBananaPro => plan_generate_image_fal_nano_banana_pro(self),
+      _ => {
+        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
+          field: "provider",
+          value: format!("{:?} is only available on the Artcraft provider", self.model),
+        }))
+      }
+    }
+  }
+
+  fn unsupported_provider(&self) -> Result<ImageGenerationPlan<'_>, ArtcraftRouterError> {
+    Err(ArtcraftRouterError::UnsupportedModel(
+      format!("Image generation for model `{:?}` is not supported for provider {:?}", self.model, self.provider)
+    ))
+  }
+
   pub fn get_or_generate_idempotency_token(&self) -> String {
     self.idempotency_token.map(|t| t.to_string())
         .unwrap_or_else(|| uuid::Uuid::new_v4().to_string())

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/plan/artcraft/plan_generate_image_artcraft_flux_1_dev.rs

@@ -4,6 +4,7 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::client_error::ClientError;
 use crate::generate::generate_image::generate_image_request::GenerateImageRequest;
+use crate::generate::generate_image::image_generation_plan::ImageGenerationPlan;
 use artcraft_api_defs::generate::image::text::generate_flux_1_dev_text_to_image::{
   GenerateFlux1DevTextToImageAspectRatio, GenerateFlux1DevTextToImageNumImages,
 };
@@ -18,7 +19,7 @@ pub struct PlanArtcraftFlux1Dev<'a> {
 
 pub fn plan_generate_image_artcraft_flux_1_dev<'a>(
   request: &'a GenerateImageRequest<'a>,
-) -> Result<PlanArtcraftFlux1Dev<'a>, ArtcraftRouterError> {
+) -> Result<ImageGenerationPlan<'a>, ArtcraftRouterError> {
   // Flux 1 Dev is text-to-image only. Abort if image inputs are provided and
   // the caller has opted into strict mode.
   if request.image_inputs.is_some() {
@@ -35,12 +36,12 @@ pub fn plan_generate_image_artcraft_flux_1_dev<'a>(
   let aspect_ratio = plan_aspect_ratio(request.aspect_ratio, strategy)?;
   let num_images = plan_num_images(request.image_batch_count, strategy)?;
 
-  Ok(PlanArtcraftFlux1Dev {
+  Ok(ImageGenerationPlan::ArtcraftFlux1Dev(PlanArtcraftFlux1Dev {
     prompt: request.prompt,
     aspect_ratio,
     num_images,
     idempotency_token: request.get_or_generate_idempotency_token(),
-  })
+  }))
 }
 
 // Flux 1 Dev supported aspect ratios:
@@ -134,7 +135,6 @@ mod tests {
   use crate::errors::artcraft_router_error::ArtcraftRouterError;
   use crate::errors::client_error::ClientError;
   use crate::generate::generate_image::generate_image_request::GenerateImageRequest;
-  use crate::generate::generate_image::image_generation_plan::ImageGenerationPlan;
   use crate::test_helpers::base_flux_1_dev_image_request;
   use artcraft_api_defs::generate::image::text::generate_flux_1_dev_text_to_image::{
     GenerateFlux1DevTextToImageAspectRatio as FlAr,

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/plan/artcraft/plan_generate_image_artcraft_flux_1_schnell.rs

@@ -4,6 +4,7 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::client_error::ClientError;
 use crate::generate::generate_image::generate_image_request::GenerateImageRequest;
+use crate::generate::generate_image::image_generation_plan::ImageGenerationPlan;
 use artcraft_api_defs::generate::image::text::generate_flux_1_schnell_text_to_image::{
   GenerateFlux1SchnellTextToImageAspectRatio, GenerateFlux1SchnellTextToImageNumImages,
 };
@@ -18,7 +19,7 @@ pub struct PlanArtcraftFlux1Schnell<'a> {
 
 pub fn plan_generate_image_artcraft_flux_1_schnell<'a>(
   request: &'a GenerateImageRequest<'a>,
-) -> Result<PlanArtcraftFlux1Schnell<'a>, ArtcraftRouterError> {
+) -> Result<ImageGenerationPlan<'a>, ArtcraftRouterError> {
   // Flux 1 Schnell is text-to-image only. Abort if image inputs are provided and
   // the caller has opted into strict mode.
   if request.image_inputs.is_some() {
@@ -35,12 +36,12 @@ pub fn plan_generate_image_artcraft_flux_1_schnell<'a>(
   let aspect_ratio = plan_aspect_ratio(request.aspect_ratio, strategy)?;
   let num_images = plan_num_images(request.image_batch_count, strategy)?;
 
-  Ok(PlanArtcraftFlux1Schnell {
+  Ok(ImageGenerationPlan::ArtcraftFlux1Schnell(PlanArtcraftFlux1Schnell {
     prompt: request.prompt,
     aspect_ratio,
     num_images,
     idempotency_token: request.get_or_generate_idempotency_token(),
-  })
+  }))
 }
 
 // Flux 1 Schnell supported aspect ratios (identical to Flux 1 Dev):
@@ -134,7 +135,6 @@ mod tests {
   use crate::errors::artcraft_router_error::ArtcraftRouterError;
   use crate::errors::client_error::ClientError;
   use crate::generate::generate_image::generate_image_request::GenerateImageRequest;
-  use crate::generate::generate_image::image_generation_plan::ImageGenerationPlan;
   use crate::test_helpers::base_flux_1_schnell_image_request;
   use artcraft_api_defs::generate::image::text::generate_flux_1_schnell_text_to_image::{
     GenerateFlux1SchnellTextToImageAspectRatio as FlAr,

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/plan/artcraft/plan_generate_image_artcraft_flux_2_lora_angles.rs

@@ -4,6 +4,7 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::client_error::ClientError;
 use crate::generate::generate_image::generate_image_request::GenerateImageRequest;
+use crate::generate::generate_image::image_generation_plan::ImageGenerationPlan;
 use artcraft_api_defs::generate::image::angle::flux_2_lora_edit_image_angle::{
   Flux2LoraEditImageAngleImageSize,
   Flux2LoraEditImageAngleNumImages,
@@ -23,7 +24,7 @@ pub struct PlanArtcraftFlux2LoraAngles<'a> {
 
 pub fn plan_generate_image_artcraft_flux_2_lora_angles<'a>(
   request: &'a GenerateImageRequest<'a>,
-) -> Result<PlanArtcraftFlux2LoraAngles<'a>, ArtcraftRouterError> {
+) -> Result<ImageGenerationPlan<'a>, ArtcraftRouterError> {
   let strategy = request.request_mismatch_mitigation_strategy;
 
   // Angle models require exactly one input image.
@@ -31,7 +32,7 @@ pub fn plan_generate_image_artcraft_flux_2_lora_angles<'a>(
   let image_size = plan_image_size(request.aspect_ratio, strategy)?;
   let num_images = plan_num_images(request.image_batch_count, strategy)?;
 
-  Ok(PlanArtcraftFlux2LoraAngles {
+  Ok(ImageGenerationPlan::ArtcraftFlux2LoraAngles(PlanArtcraftFlux2LoraAngles {
     image_input,
     horizontal_angle: request.horizontal_angle,
     vertical_angle: request.vertical_angle,
@@ -39,7 +40,7 @@ pub fn plan_generate_image_artcraft_flux_2_lora_angles<'a>(
     image_size,
     num_images,
     idempotency_token: request.get_or_generate_idempotency_token(),
-  })
+  }))
 }
 
 fn resolve_single_image_input<'a>(
@@ -139,7 +140,6 @@ fn plan_num_images(
 mod tests {
   use super::*;
   use crate::api::image_list_ref::ImageListRef;
-  use crate::generate::generate_image::image_generation_plan::ImageGenerationPlan;
   use crate::test_helpers::base_flux_2_lora_angles_image_request;
   use artcraft_api_defs::generate::image::angle::flux_2_lora_edit_image_angle::{
     Flux2LoraEditImageAngleImageSize as S,

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/plan/artcraft/plan_generate_image_artcraft_flux_pro_1p1.rs

@@ -4,6 +4,7 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::client_error::ClientError;
 use crate::generate::generate_image::generate_image_request::GenerateImageRequest;
+use crate::generate::generate_image::image_generation_plan::ImageGenerationPlan;
 use artcraft_api_defs::generate::image::text::generate_flux_pro_11_text_to_image::{
   GenerateFluxPro11TextToImageAspectRatio, GenerateFluxPro11TextToImageNumImages,
 };
@@ -18,7 +19,7 @@ pub struct PlanArtcraftFluxPro11<'a> {
 
 pub fn plan_generate_image_artcraft_flux_pro_1p1<'a>(
   request: &'a GenerateImageRequest<'a>,
-) -> Result<PlanArtcraftFluxPro11<'a>, ArtcraftRouterError> {
+) -> Result<ImageGenerationPlan<'a>, ArtcraftRouterError> {
   // Flux Pro 1.1 is text-to-image only. Abort if image inputs are provided and
   // the caller has opted into strict mode.
   if request.image_inputs.is_some() {
@@ -35,12 +36,12 @@ pub fn plan_generate_image_artcraft_flux_pro_1p1<'a>(
   let aspect_ratio = plan_aspect_ratio(request.aspect_ratio, strategy)?;
   let num_images = plan_num_images(request.image_batch_count, strategy)?;
 
-  Ok(PlanArtcraftFluxPro11 {
+  Ok(ImageGenerationPlan::ArtcraftFluxPro11(PlanArtcraftFluxPro11 {
     prompt: request.prompt,
     aspect_ratio,
     num_images,
     idempotency_token: request.get_or_generate_idempotency_token(),
-  })
+  }))
 }
 
 // Flux Pro 1.1 supported aspect ratios (no SquareHd):
@@ -134,7 +135,6 @@ mod tests {
   use crate::errors::artcraft_router_error::ArtcraftRouterError;
   use crate::errors::client_error::ClientError;
   use crate::generate::generate_image::generate_image_request::GenerateImageRequest;
-  use crate::generate::generate_image::image_generation_plan::ImageGenerationPlan;
   use crate::test_helpers::base_flux_pro_1p1_image_request;
   use artcraft_api_defs::generate::image::text::generate_flux_pro_11_text_to_image::{
     GenerateFluxPro11TextToImageAspectRatio as FlAr,

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/plan/artcraft/plan_generate_image_artcraft_flux_pro_1p1_ultra.rs

@@ -4,6 +4,7 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::client_error::ClientError;
 use crate::generate::generate_image::generate_image_request::GenerateImageRequest;
+use crate::generate::generate_image::image_generation_plan::ImageGenerationPlan;
 use artcraft_api_defs::generate::image::text::generate_flux_pro_11_ultra_text_to_image::{
   GenerateFluxPro11UltraTextToImageAspectRatio, GenerateFluxPro11UltraTextToImageNumImages,
 };
@@ -18,7 +19,7 @@ pub struct PlanArtcraftFluxPro11Ultra<'a> {
 
 pub fn plan_generate_image_artcraft_flux_pro_1p1_ultra<'a>(
   request: &'a GenerateImageRequest<'a>,
-) -> Result<PlanArtcraftFluxPro11Ultra<'a>, ArtcraftRouterError> {
+) -> Result<ImageGenerationPlan<'a>, ArtcraftRouterError> {
   // Flux Pro 1.1 Ultra is text-to-image only. Abort if image inputs are provided and
   // the caller has opted into strict mode.
   if request.image_inputs.is_some() {
@@ -35,12 +36,12 @@ pub fn plan_generate_image_artcraft_flux_pro_1p1_ultra<'a>(
   let aspect_ratio = plan_aspect_ratio(request.aspect_ratio, strategy)?;
   let num_images = plan_num_images(request.image_batch_count, strategy)?;
 
-  Ok(PlanArtcraftFluxPro11Ultra {
+  Ok(ImageGenerationPlan::ArtcraftFluxPro11Ultra(PlanArtcraftFluxPro11Ultra {
     prompt: request.prompt,
     aspect_ratio,
     num_images,
     idempotency_token: request.get_or_generate_idempotency_token(),
-  })
+  }))
 }
 
 // Flux Pro 1.1 Ultra supported aspect ratios:
@@ -137,7 +138,6 @@ mod tests {
   use crate::errors::artcraft_router_error::ArtcraftRouterError;
   use crate::errors::client_error::ClientError;
   use crate::generate::generate_image::generate_image_request::GenerateImageRequest;
-  use crate::generate::generate_image::image_generation_plan::ImageGenerationPlan;
   use crate::test_helpers::base_flux_pro_1p1_ultra_image_request;
   use artcraft_api_defs::generate::image::text::generate_flux_pro_11_ultra_text_to_image::{
     GenerateFluxPro11UltraTextToImageAspectRatio as FlAr,

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/plan/artcraft/plan_generate_image_artcraft_gpt_image_1p5.rs

@@ -4,6 +4,7 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::client_error::ClientError;
 use crate::generate::generate_image::generate_image_request::GenerateImageRequest;
+use crate::generate::generate_image::image_generation_plan::ImageGenerationPlan;
 use artcraft_api_defs::generate::image::multi_function::gpt_image_1p5_multi_function_image_gen::{
   GptImage1p5MultiFunctionImageGenNumImages, GptImage1p5MultiFunctionImageGenQuality,
   GptImage1p5MultiFunctionImageGenSize,
@@ -24,21 +25,21 @@ pub struct PlanArtcraftGptImage1p5<'a> {
 
 pub fn plan_generate_image_artcraft_gpt_image_1p5<'a>(
   request: &'a GenerateImageRequest<'a>,
-) -> Result<PlanArtcraftGptImage1p5<'a>, ArtcraftRouterError> {
+) -> Result<ImageGenerationPlan<'a>, ArtcraftRouterError> {
   let strategy = request.request_mismatch_mitigation_strategy;
 
   let image_inputs = resolve_image_list_ref(request.image_inputs)?;
   let image_size = plan_image_size(request.aspect_ratio, strategy)?;
   let num_images = plan_num_images(request.image_batch_count, strategy)?;
 
-  Ok(PlanArtcraftGptImage1p5 {
+  Ok(ImageGenerationPlan::ArtcraftGptImage1p5(PlanArtcraftGptImage1p5 {
     prompt: request.prompt,
     image_inputs,
     image_size,
     quality: GptImage1p5MultiFunctionImageGenQuality::Medium,
     num_images,
     idempotency_token: request.get_or_generate_idempotency_token(),
-  })
+  }))
 }
 
 fn resolve_image_list_ref<'a>(
@@ -123,7 +124,6 @@ mod tests {
   use crate::api::image_list_ref::ImageListRef;
   use crate::errors::artcraft_router_error::ArtcraftRouterError;
   use crate::errors::client_error::ClientError;
-  use crate::generate::generate_image::image_generation_plan::ImageGenerationPlan;
   use crate::test_helpers::base_gpt_image_1p5_image_request;
   use artcraft_api_defs::generate::image::multi_function::gpt_image_1p5_multi_function_image_gen::{
     GptImage1p5MultiFunctionImageGenNumImages as GN,

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/plan/artcraft/plan_generate_image_artcraft_nano_banana.rs

@@ -4,6 +4,7 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::client_error::ClientError;
 use crate::generate::generate_image::generate_image_request::GenerateImageRequest;
+use crate::generate::generate_image::image_generation_plan::ImageGenerationPlan;
 use artcraft_api_defs::generate::image::multi_function::nano_banana_multi_function_image_gen::{
   NanoBananaMultiFunctionImageGenAspectRatio, NanoBananaMultiFunctionImageGenNumImages,
 };
@@ -21,7 +22,7 @@ pub struct PlanArtcraftNanaBanana<'a> {
 
 pub fn plan_generate_image_artcraft_nano_banana<'a>(
   request: &'a GenerateImageRequest<'a>,
-) -> Result<PlanArtcraftNanaBanana<'a>, ArtcraftRouterError> {
+) -> Result<ImageGenerationPlan<'a>, ArtcraftRouterError> {
   let strategy = request.request_mismatch_mitigation_strategy;
 
   let is_edit_mode = request.image_inputs.is_some();
@@ -29,13 +30,13 @@ pub fn plan_generate_image_artcraft_nano_banana<'a>(
   let aspect_ratio = plan_aspect_ratio(request.aspect_ratio, is_edit_mode, strategy)?;
   let num_images = plan_num_images(request.image_batch_count, strategy)?;
 
-  Ok(PlanArtcraftNanaBanana {
+  Ok(ImageGenerationPlan::ArtcraftNanaBanana(PlanArtcraftNanaBanana {
     prompt: request.prompt,
     image_inputs,
     aspect_ratio,
     num_images,
     idempotency_token: request.get_or_generate_idempotency_token(),
-  })
+  }))
 }
 
 fn resolve_image_list_ref<'a>(
@@ -148,7 +149,6 @@ mod tests {
   use crate::api::image_list_ref::ImageListRef;
   use crate::errors::artcraft_router_error::ArtcraftRouterError;
   use crate::errors::client_error::ClientError;
-  use crate::generate::generate_image::image_generation_plan::ImageGenerationPlan;
   use crate::test_helpers::base_nano_banana_image_request;
   use artcraft_api_defs::generate::image::multi_function::nano_banana_multi_function_image_gen::{
     NanoBananaMultiFunctionImageGenAspectRatio as NbAr,

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/plan/artcraft/plan_generate_image_artcraft_nano_banana_2.rs

@@ -5,6 +5,7 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::client_error::ClientError;
 use crate::generate::generate_image::generate_image_request::GenerateImageRequest;
+use crate::generate::generate_image::image_generation_plan::ImageGenerationPlan;
 use artcraft_api_defs::generate::image::multi_function::nano_banana_2_multi_function_image_gen::{
   NanaBanana2MultiFunctionImageGenAspectRatio, NanaBanana2MultiFunctionImageGenImageResolution,
   NanaBanana2MultiFunctionImageGenNumImages,
@@ -24,7 +25,7 @@ pub struct PlanArtcraftNanaBanana2<'a> {
 
 pub fn plan_generate_image_artcraft_nano_banana_2<'a>(
   request: &'a GenerateImageRequest<'a>,
-) -> Result<PlanArtcraftNanaBanana2<'a>, ArtcraftRouterError> {
+) -> Result<ImageGenerationPlan<'a>, ArtcraftRouterError> {
   let strategy = request.request_mismatch_mitigation_strategy;
 
   let is_edit_mode = request.image_inputs.is_some();
@@ -33,14 +34,14 @@ pub fn plan_generate_image_artcraft_nano_banana_2<'a>(
   let resolution = plan_resolution(request.resolution, strategy)?;
   let num_images = plan_num_images(request.image_batch_count, strategy)?;
 
-  Ok(PlanArtcraftNanaBanana2 {
+  Ok(ImageGenerationPlan::ArtcraftNanaBanana2(PlanArtcraftNanaBanana2 {
     prompt: request.prompt,
     image_inputs,
     aspect_ratio,
     resolution,
     num_images,
     idempotency_token: request.get_or_generate_idempotency_token(),
-  })
+  }))
 }
 
 fn resolve_image_list_ref<'a>(
@@ -172,7 +173,6 @@ mod tests {
   use crate::api::image_list_ref::ImageListRef;
   use crate::errors::artcraft_router_error::ArtcraftRouterError;
   use crate::errors::client_error::ClientError;
-  use crate::generate::generate_image::image_generation_plan::ImageGenerationPlan;
   use crate::test_helpers::base_nano_banana_2_image_request;
   use artcraft_api_defs::generate::image::multi_function::nano_banana_2_multi_function_image_gen::{
     NanaBanana2MultiFunctionImageGenAspectRatio as Nb2Ar,

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/plan/artcraft/plan_generate_image_artcraft_nano_banana_pro.rs

@@ -5,6 +5,7 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::client_error::ClientError;
 use crate::generate::generate_image::generate_image_request::GenerateImageRequest;
+use crate::generate::generate_image::image_generation_plan::ImageGenerationPlan;
 use artcraft_api_defs::generate::image::multi_function::nano_banana_pro_multi_function_image_gen::{
   NanoBananaProMultiFunctionImageGenAspectRatio, NanoBananaProMultiFunctionImageGenImageResolution,
   NanoBananaProMultiFunctionImageGenNumImages,
@@ -24,7 +25,7 @@ pub struct PlanArtcraftNanaBananaPro<'a> {
 
 pub fn plan_generate_image_artcraft_nano_banana_pro<'a>(
   request: &'a GenerateImageRequest<'a>,
-) -> Result<PlanArtcraftNanaBananaPro<'a>, ArtcraftRouterError> {
+) -> Result<ImageGenerationPlan<'a>, ArtcraftRouterError> {
   let strategy = request.request_mismatch_mitigation_strategy;
 
   let is_edit_mode = request.image_inputs.is_some();
@@ -33,14 +34,14 @@ pub fn plan_generate_image_artcraft_nano_banana_pro<'a>(
   let resolution = plan_resolution(request.resolution, strategy)?;
   let num_images = plan_num_images(request.image_batch_count, strategy)?;
 
-  Ok(PlanArtcraftNanaBananaPro {
+  Ok(ImageGenerationPlan::ArtcraftNanaBananaPro(PlanArtcraftNanaBananaPro {
     prompt: request.prompt,
     image_inputs,
     aspect_ratio,
     resolution,
     num_images,
     idempotency_token: request.get_or_generate_idempotency_token(),
-  })
+  }))
 }
 
 fn resolve_image_list_ref<'a>(
@@ -172,7 +173,6 @@ mod tests {
   use crate::api::image_list_ref::ImageListRef;
   use crate::errors::artcraft_router_error::ArtcraftRouterError;
   use crate::errors::client_error::ClientError;
-  use crate::generate::generate_image::image_generation_plan::ImageGenerationPlan;
   use crate::test_helpers::base_image_request;
   use artcraft_api_defs::generate::image::multi_function::nano_banana_pro_multi_function_image_gen::{
     NanoBananaProMultiFunctionImageGenAspectRatio as NbpAr,

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/plan/artcraft/plan_generate_image_artcraft_qwen_edit_2511_angles.rs

@@ -4,6 +4,7 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::client_error::ClientError;
 use crate::generate::generate_image::generate_image_request::GenerateImageRequest;
+use crate::generate::generate_image::image_generation_plan::ImageGenerationPlan;
 use artcraft_api_defs::generate::image::angle::qwen_edit_2511_edit_image_angle::{
   QwenEdit2511EditImageAngleImageSize,
   QwenEdit2511EditImageAngleNumImages,
@@ -24,7 +25,7 @@ pub struct PlanArtcraftQwenEdit2511Angles<'a> {
 
 pub fn plan_generate_image_artcraft_qwen_edit_2511_angles<'a>(
   request: &'a GenerateImageRequest<'a>,
-) -> Result<PlanArtcraftQwenEdit2511Angles<'a>, ArtcraftRouterError> {
+) -> Result<ImageGenerationPlan<'a>, ArtcraftRouterError> {
   let strategy = request.request_mismatch_mitigation_strategy;
 
   // Angle models require exactly one input image.
@@ -32,7 +33,7 @@ pub fn plan_generate_image_artcraft_qwen_edit_2511_angles<'a>(
   let image_size = plan_image_size(request.aspect_ratio, strategy)?;
   let num_images = plan_num_images(request.image_batch_count, strategy)?;
 
-  Ok(PlanArtcraftQwenEdit2511Angles {
+  Ok(ImageGenerationPlan::ArtcraftQwenEdit2511Angles(PlanArtcraftQwenEdit2511Angles {
     prompt: request.prompt,
     image_input,
     horizontal_angle: request.horizontal_angle,
@@ -41,7 +42,7 @@ pub fn plan_generate_image_artcraft_qwen_edit_2511_angles<'a>(
     image_size,
     num_images,
     idempotency_token: request.get_or_generate_idempotency_token(),
-  })
+  }))
 }
 
 fn resolve_single_image_input<'a>(
@@ -141,7 +142,6 @@ fn plan_num_images(
 mod tests {
   use super::*;
   use crate::api::image_list_ref::ImageListRef;
-  use crate::generate::generate_image::image_generation_plan::ImageGenerationPlan;
   use crate::test_helpers::base_qwen_edit_2511_angles_image_request;
   use artcraft_api_defs::generate::image::angle::qwen_edit_2511_edit_image_angle::{
     QwenEdit2511EditImageAngleImageSize as S,

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/plan/artcraft/plan_generate_image_artcraft_seedream_4.rs

@@ -4,6 +4,7 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::client_error::ClientError;
 use crate::generate::generate_image::generate_image_request::GenerateImageRequest;
+use crate::generate::generate_image::image_generation_plan::ImageGenerationPlan;
 use artcraft_api_defs::generate::image::multi_function::bytedance_seedream_v4_multi_function_image_gen::{
   BytedanceSeedreamV4MultiFunctionImageGenImageSize,
   BytedanceSeedreamV4MultiFunctionImageGenNumImages,
@@ -22,7 +23,7 @@ pub struct PlanArtcraftSeedream4<'a> {
 
 pub fn plan_generate_image_artcraft_seedream_4<'a>(
   request: &'a GenerateImageRequest<'a>,
-) -> Result<PlanArtcraftSeedream4<'a>, ArtcraftRouterError> {
+) -> Result<ImageGenerationPlan<'a>, ArtcraftRouterError> {
   let strategy = request.request_mismatch_mitigation_strategy;
 
   let is_edit_mode = request.image_inputs.is_some();
@@ -30,13 +31,13 @@ pub fn plan_generate_image_artcraft_seedream_4<'a>(
   let image_size = plan_image_size(request.aspect_ratio, is_edit_mode, strategy)?;
   let num_images = plan_num_images(request.image_batch_count, strategy)?;
 
-  Ok(PlanArtcraftSeedream4 {
+  Ok(ImageGenerationPlan::ArtcraftSeedream4(PlanArtcraftSeedream4 {
     prompt: request.prompt,
     image_inputs,
     image_size,
     num_images,
     idempotency_token: request.get_or_generate_idempotency_token(),
-  })
+  }))
 }
 
 fn resolve_image_list_ref<'a>(
@@ -147,7 +148,6 @@ mod tests {
   use crate::api::image_list_ref::ImageListRef;
   use crate::errors::artcraft_router_error::ArtcraftRouterError;
   use crate::errors::client_error::ClientError;
-  use crate::generate::generate_image::image_generation_plan::ImageGenerationPlan;
   use crate::test_helpers::base_seedream_4_image_request;
   use artcraft_api_defs::generate::image::multi_function::bytedance_seedream_v4_multi_function_image_gen::{
     BytedanceSeedreamV4MultiFunctionImageGenImageSize as S,

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/plan/artcraft/plan_generate_image_artcraft_seedream_4p5.rs

@@ -4,6 +4,7 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::client_error::ClientError;
 use crate::generate::generate_image::generate_image_request::GenerateImageRequest;
+use crate::generate::generate_image::image_generation_plan::ImageGenerationPlan;
 use artcraft_api_defs::generate::image::multi_function::bytedance_seedream_v4p5_multi_function_image_gen::{
   BytedanceSeedreamV4p5MultiFunctionImageGenImageSize,
   BytedanceSeedreamV4p5MultiFunctionImageGenNumImages,
@@ -22,7 +23,7 @@ pub struct PlanArtcraftSeedream4p5<'a> {
 
 pub fn plan_generate_image_artcraft_seedream_4p5<'a>(
   request: &'a GenerateImageRequest<'a>,
-) -> Result<PlanArtcraftSeedream4p5<'a>, ArtcraftRouterError> {
+) -> Result<ImageGenerationPlan<'a>, ArtcraftRouterError> {
   let strategy = request.request_mismatch_mitigation_strategy;
 
   let is_edit_mode = request.image_inputs.is_some();
@@ -30,13 +31,13 @@ pub fn plan_generate_image_artcraft_seedream_4p5<'a>(
   let image_size = plan_image_size(request.aspect_ratio, is_edit_mode, strategy)?;
   let num_images = plan_num_images(request.image_batch_count, strategy)?;
 
-  Ok(PlanArtcraftSeedream4p5 {
+  Ok(ImageGenerationPlan::ArtcraftSeedream4p5(PlanArtcraftSeedream4p5 {
     prompt: request.prompt,
     image_inputs,
     image_size,
     num_images,
     idempotency_token: request.get_or_generate_idempotency_token(),
-  })
+  }))
 }
 
 fn resolve_image_list_ref<'a>(
@@ -147,7 +148,6 @@ mod tests {
   use crate::api::image_list_ref::ImageListRef;
   use crate::errors::artcraft_router_error::ArtcraftRouterError;
   use crate::errors::client_error::ClientError;
-  use crate::generate::generate_image::image_generation_plan::ImageGenerationPlan;
   use crate::test_helpers::base_seedream_4p5_image_request;
   use artcraft_api_defs::generate::image::multi_function::bytedance_seedream_v4p5_multi_function_image_gen::{
     BytedanceSeedreamV4p5MultiFunctionImageGenImageSize as S,

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/plan/artcraft/plan_generate_image_artcraft_seedream_5_lite.rs

@@ -4,6 +4,7 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::client_error::ClientError;
 use crate::generate::generate_image::generate_image_request::GenerateImageRequest;
+use crate::generate::generate_image::image_generation_plan::ImageGenerationPlan;
 use artcraft_api_defs::generate::image::multi_function::bytedance_seedream_5_lite_multi_function_image_gen::{
   BytedanceSeedream5LiteMultiFunctionImageGenImageSize,
   BytedanceSeedream5LiteMultiFunctionImageGenNumImages,
@@ -22,7 +23,7 @@ pub struct PlanArtcraftSeedream5Lite<'a> {
 
 pub fn plan_generate_image_artcraft_seedream_5_lite<'a>(
   request: &'a GenerateImageRequest<'a>,
-) -> Result<PlanArtcraftSeedream5Lite<'a>, ArtcraftRouterError> {
+) -> Result<ImageGenerationPlan<'a>, ArtcraftRouterError> {
   let strategy = request.request_mismatch_mitigation_strategy;
 
   let is_edit_mode = request.image_inputs.is_some();
@@ -30,13 +31,13 @@ pub fn plan_generate_image_artcraft_seedream_5_lite<'a>(
   let image_size = plan_image_size(request.aspect_ratio, is_edit_mode, strategy)?;
   let num_images = plan_num_images(request.image_batch_count, strategy)?;
 
-  Ok(PlanArtcraftSeedream5Lite {
+  Ok(ImageGenerationPlan::ArtcraftSeedream5Lite(PlanArtcraftSeedream5Lite {
     prompt: request.prompt,
     image_inputs,
     image_size,
     num_images,
     idempotency_token: request.get_or_generate_idempotency_token(),
-  })
+  }))
 }
 
 fn resolve_image_list_ref<'a>(
@@ -148,7 +149,6 @@ mod tests {
   use crate::api::image_list_ref::ImageListRef;
   use crate::errors::artcraft_router_error::ArtcraftRouterError;
   use crate::errors::client_error::ClientError;
-  use crate::generate::generate_image::image_generation_plan::ImageGenerationPlan;
   use crate::test_helpers::base_seedream_5_lite_image_request;
   use artcraft_api_defs::generate::image::multi_function::bytedance_seedream_5_lite_multi_function_image_gen::{
     BytedanceSeedream5LiteMultiFunctionImageGenImageSize as S,

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/plan/fal/plan_generate_image_fal_nano_banana_pro.rs

@@ -5,6 +5,7 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::client_error::ClientError;
 use crate::generate::generate_image::generate_image_request::GenerateImageRequest;
+use crate::generate::generate_image::image_generation_plan::ImageGenerationPlan;
 use fal_client::requests::webhook::image::edit::enqueue_nano_banana_pro_edit_image_webhook::EnqueueNanoBananaProEditImageAspectRatio;
 use fal_client::requests::webhook::image::text::enqueue_nano_banana_pro_text_to_image_webhook::EnqueueNanoBananaProTextToImageAspectRatio;
 
@@ -44,7 +45,7 @@ pub struct PlanFalNanaBananaPro<'a> {
 
 pub fn plan_generate_image_fal_nano_banana_pro<'a>(
   request: &'a GenerateImageRequest<'a>,
-) -> Result<PlanFalNanaBananaPro<'a>, ArtcraftRouterError> {
+) -> Result<ImageGenerationPlan<'a>, ArtcraftRouterError> {
   let strategy = request.request_mismatch_mitigation_strategy;
   let is_edit_mode = request.image_inputs.is_some();
   let image_urls = resolve_image_list_ref(request.image_inputs)?;
@@ -53,14 +54,14 @@ pub fn plan_generate_image_fal_nano_banana_pro<'a>(
   let resolution = plan_resolution(request.resolution)?;
   let num_images = plan_num_images(request.image_batch_count, strategy)?;
 
-  Ok(PlanFalNanaBananaPro {
+  Ok(ImageGenerationPlan::FalNanaBananaPro(PlanFalNanaBananaPro {
     prompt: request.prompt,
     image_urls,
     t2i_aspect_ratio,
     edit_aspect_ratio,
     resolution,
     num_images,
-  })
+  }))
 }
 
 fn resolve_image_list_ref(
@@ -263,7 +264,10 @@ mod tests {
   fn build_plan<'a>(
     request: &'a GenerateImageRequest<'a>,
   ) -> PlanFalNanaBananaPro<'a> {
-    plan_generate_image_fal_nano_banana_pro(request).expect("plan should succeed")
+    let ImageGenerationPlan::FalNanaBananaPro(plan) = plan_generate_image_fal_nano_banana_pro(request).expect("plan should succeed") else {
+      panic!("expected FalNanaBananaPro variant")
+    };
+    plan
   }
 
   // ── Image inputs / mode detection ────────────────────────────────────────────

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/artcraft/artcraft_router/src/generate/generate_splat/generate_splat_request.rs

@@ -28,20 +28,24 @@ impl<'a> GenerateSplatRequest<'a> {
   /// Read the splat generation request, construct a plan, then yield a means to execute it.
   pub fn build(&self) -> Result<SplatGenerationPlan<'_>, ArtcraftRouterError> {
     match self.provider {
-      Provider::Artcraft => match self.model {
-        CommonSplatModel::Marble0p1Mini => {
-          plan_generate_splat_artcraft_marble_0p1_mini(self).map(SplatGenerationPlan::ArtcraftMarble0p1Mini)
-        }
-        CommonSplatModel::Marble0p1Plus => {
-          plan_generate_splat_artcraft_marble_0p1_plus(self).map(SplatGenerationPlan::ArtcraftMarble0p1Plus)
-        }
-      },
-      Provider::Fal => Err(ArtcraftRouterError::UnsupportedModel(
-        format!("Splat generation via Fal is not yet supported (model: {:?})", self.model)
-      )),
+      Provider::Artcraft => self.build_artcraft(),
+      _ => self.unsupported_provider(),
     }
   }
 
+  fn build_artcraft(&self) -> Result<SplatGenerationPlan<'_>, ArtcraftRouterError> {
+    match self.model {
+      CommonSplatModel::Marble0p1Mini => plan_generate_splat_artcraft_marble_0p1_mini(self),
+      CommonSplatModel::Marble0p1Plus => plan_generate_splat_artcraft_marble_0p1_plus(self),
+    }
+  }
+
+  fn unsupported_provider(&self) -> Result<SplatGenerationPlan<'_>, ArtcraftRouterError> {
+    Err(ArtcraftRouterError::UnsupportedModel(
+      format!("Splat generation for model `{:?}` is not supported for provider {:?}", self.model, self.provider)
+    ))
+  }
+
   pub fn get_or_generate_idempotency_token(&self) -> String {
     self.idempotency_token.map(|t| t.to_string())
         .unwrap_or_else(|| uuid::Uuid::new_v4().to_string())

crates/api_clients/artcraft/artcraft_router/src/generate/generate_splat/plan/artcraft/plan_generate_splat_artcraft_marble_0p1_mini.rs

@@ -2,6 +2,7 @@ use crate::api::image_list_ref::ImageListRef;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::client_error::ClientError;
 use crate::generate::generate_splat::generate_splat_request::GenerateSplatRequest;
+use crate::generate::generate_splat::splat_generation_plan::SplatGenerationPlan;
 use tokens::tokens::media_files::MediaFileToken;
 
 #[derive(Debug, Clone)]
@@ -13,14 +14,14 @@ pub struct PlanArtcraftMarble0p1Mini<'a> {
 
 pub fn plan_generate_splat_artcraft_marble_0p1_mini<'a>(
   request: &'a GenerateSplatRequest<'a>,
-) -> Result<PlanArtcraftMarble0p1Mini<'a>, ArtcraftRouterError> {
+) -> Result<SplatGenerationPlan<'a>, ArtcraftRouterError> {
   let reference_image = resolve_single_image_ref(request.reference_images)?;
 
-  Ok(PlanArtcraftMarble0p1Mini {
+  Ok(SplatGenerationPlan::ArtcraftMarble0p1Mini(PlanArtcraftMarble0p1Mini {
     prompt: request.prompt,
     reference_image,
     idempotency_token: request.get_or_generate_idempotency_token(),
-  })
+  }))
 }
 
 fn resolve_single_image_ref<'a>(

crates/api_clients/artcraft/artcraft_router/src/generate/generate_splat/plan/artcraft/plan_generate_splat_artcraft_marble_0p1_plus.rs

@@ -2,6 +2,7 @@ use crate::api::image_list_ref::ImageListRef;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::client_error::ClientError;
 use crate::generate::generate_splat::generate_splat_request::GenerateSplatRequest;
+use crate::generate::generate_splat::splat_generation_plan::SplatGenerationPlan;
 use tokens::tokens::media_files::MediaFileToken;
 
 #[derive(Debug, Clone)]
@@ -13,14 +14,14 @@ pub struct PlanArtcraftMarble0p1Plus<'a> {
 
 pub fn plan_generate_splat_artcraft_marble_0p1_plus<'a>(
   request: &'a GenerateSplatRequest<'a>,
-) -> Result<PlanArtcraftMarble0p1Plus<'a>, ArtcraftRouterError> {
+) -> Result<SplatGenerationPlan<'a>, ArtcraftRouterError> {
   let reference_image = resolve_single_image_ref(request.reference_images)?;
 
-  Ok(PlanArtcraftMarble0p1Plus {
+  Ok(SplatGenerationPlan::ArtcraftMarble0p1Plus(PlanArtcraftMarble0p1Plus {
     prompt: request.prompt,
     reference_image,
     idempotency_token: request.get_or_generate_idempotency_token(),
-  })
+  }))
 }
 
 fn resolve_single_image_ref<'a>(

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/cost/artcraft/estimate_video_cost_artcraft_kling3p0_pro.rs

@@ -69,6 +69,8 @@ mod tests {
       start_frame: None,
       end_frame: None,
       reference_images: None,
+      reference_videos: None,
+      reference_audio: None,
       resolution: None,
       aspect_ratio: None,
       duration_seconds: Some(duration_seconds),

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/cost/artcraft/estimate_video_cost_artcraft_kling3p0_standard.rs

@@ -69,6 +69,8 @@ mod tests {
       start_frame: None,
       end_frame: None,
       reference_images: None,
+      reference_videos: None,
+      reference_audio: None,
       resolution: None,
       aspect_ratio: None,
       duration_seconds: Some(duration_seconds),

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/cost/artcraft/estimate_video_cost_artcraft_seedance1p5_pro.rs

@@ -72,6 +72,8 @@ mod tests {
       start_frame: None,
       end_frame: None,
       reference_images: None,
+      reference_videos: None,
+      reference_audio: None,
       resolution: None,
       aspect_ratio: None,
       duration_seconds: Some(duration_seconds),

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/cost/artcraft/estimate_video_cost_artcraft_seedance2p0.rs

@@ -1,6 +1,6 @@
 use artcraft_api_defs::generate::video::multi_function::seedance_2p0_multi_function_video_gen::Seedance2p0BatchCount;
-use seedance2pro::creds::seedance2pro_session::Seedance2ProSession;
-use seedance2pro::requests::generate_video::generate_video::{BatchCount, GenerateVideoArgs, Resolution};
+use seedance2pro_client::creds::seedance2pro_session::Seedance2ProSession;
+use seedance2pro_client::requests::generate_video::generate_video::{BatchCount, GenerateVideoArgs, Resolution};
 
 use crate::generate::generate_video::plan::artcraft::plan_generate_video_artcraft_seedance2p0::PlanArtcraftSeedance2p0;
 use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
@@ -31,6 +31,9 @@ pub (crate) fn estimate_video_cost_artcraft_seedance2p0(
     start_frame_url: None,
     end_frame_url: None,
     reference_image_urls: None,
+    reference_video_urls: None,
+    reference_audio_urls: None,
+    use_face_blur_hack: None,
   };
 
   let cost_in_usd_cents = args.estimate_cost_in_usd_cents();
@@ -61,6 +64,8 @@ mod tests {
       start_frame: None,
       end_frame: None,
       reference_images: None,
+      reference_videos: None,
+      reference_audio: None,
       resolution: None,
       aspect_ratio: None,
       duration_seconds: Some(duration_seconds),

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/cost/mod.rs

@@ -1 +1,3 @@
 pub (crate) mod artcraft;
+pub (crate) mod muapi;
+pub (crate) mod seedance2pro;

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/cost/muapi/estimate_video_cost_muapi_seedance2p0.rs

@@ -0,0 +1,59 @@
+use crate::generate::generate_video::plan::muapi::plan_generate_video_muapi_seedance2p0::{
+  MuapiSeedance2p0Mode, PlanMuapiSeedance2p0,
+};
+use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
+use muapi_client::creds::muapi_api_key::MuapiApiKey;
+use muapi_client::creds::muapi_session::MuapiSession;
+use muapi_client::requests::seedance_2p0_image_to_video::seedance_2p0_image_to_video::Seedance2p0ImageToVideoArgs;
+use muapi_client::requests::seedance_2p0_text_to_video::seedance_2p0_text_to_video::Seedance2p0TextToVideoArgs;
+
+pub(crate) fn estimate_video_cost_muapi_seedance2p0(
+  plan: &PlanMuapiSeedance2p0,
+) -> VideoGenerationCostEstimate {
+  // A dummy session is sufficient — cost estimation does not make any network calls.
+  let dummy_session = MuapiSession::new(MuapiApiKey::new(String::new()));
+
+  let cost_in_usd_cents;
+  let cost_in_credits;
+
+  match &plan.mode {
+    MuapiSeedance2p0Mode::TextToVideo { aspect_ratio, duration, quality } => {
+      let args = Seedance2p0TextToVideoArgs {
+        session: &dummy_session,
+        prompt: String::new(),
+        aspect_ratio: *aspect_ratio,
+        duration: *duration,
+        quality: *quality,
+      };
+
+      cost_in_usd_cents = args.estimate_cost_in_usd_cents();
+
+      // NB: This is off by a factor of 100 because they use a fractional system.
+      cost_in_credits = (args.estimate_credits() * 100.0f64).round() as u64;
+    }
+    MuapiSeedance2p0Mode::ImageToVideo { aspect_ratio, duration, quality, .. } => {
+      let args = Seedance2p0ImageToVideoArgs {
+        session: &dummy_session,
+        prompt: String::new(),
+        image_urls: vec![],
+        aspect_ratio: *aspect_ratio,
+        duration: *duration,
+        quality: *quality,
+      };
+
+      cost_in_usd_cents = args.estimate_cost_in_usd_cents();
+
+      // NB: This is off by a factor of 100 because they use a fractional system.
+      cost_in_credits = (args.estimate_credits() * 100.0f64).round() as u64;
+    }
+  }
+
+  VideoGenerationCostEstimate {
+    cost_in_credits: Some(cost_in_credits),
+    cost_in_usd_cents: Some(cost_in_usd_cents),
+    is_free: false,
+    is_unlimited: false,
+    is_rate_limited: false,
+    has_watermark: false,
+  }
+}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/cost/muapi/mod.rs

@@ -0,0 +1 @@
+pub mod estimate_video_cost_muapi_seedance2p0;

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/cost/seedance2pro/estimate_video_cost_seedance2pro_seedance2p0.rs

@@ -0,0 +1,38 @@
+use seedance2pro_client::creds::seedance2pro_session::Seedance2ProSession;
+use seedance2pro_client::requests::generate_video::generate_video::{GenerateVideoArgs, Resolution};
+
+use crate::generate::generate_video::plan::seedance2pro::plan_generate_video_seedance2pro_seedance2p0::PlanSeedance2proSeedance2p0;
+use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
+
+pub(crate) fn estimate_video_cost_seedance2pro_seedance2p0(
+  plan: &PlanSeedance2proSeedance2p0,
+) -> VideoGenerationCostEstimate {
+  // A dummy session is sufficient — cost estimation does not make any network calls.
+  let dummy_session = Seedance2ProSession::from_cookies_string(String::new());
+
+  let args = GenerateVideoArgs {
+    session: &dummy_session,
+    prompt: String::new(),
+    resolution: Resolution::Square1x1, // Resolution does not affect cost
+    duration_seconds: plan.duration_seconds,
+    batch_count: plan.batch_count,
+    start_frame_url: None,
+    end_frame_url: None,
+    reference_image_urls: None,
+    reference_video_urls: None,
+    reference_audio_urls: None,
+    use_face_blur_hack: None,
+  };
+
+  let cost_in_credits = args.estimate_credits();
+  let cost_in_usd_cents = args.estimate_cost_in_usd_cents();
+
+  VideoGenerationCostEstimate {
+    cost_in_credits: Some(cost_in_credits as u64),
+    cost_in_usd_cents: Some(cost_in_usd_cents),
+    is_free: false,
+    is_unlimited: false,
+    is_rate_limited: false,
+    has_watermark: false,
+  }
+}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/cost/seedance2pro/mod.rs

@@ -0,0 +1 @@
+pub mod estimate_video_cost_seedance2pro_seedance2p0;

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/execute/artcraft/generate_video_artcraft_seedance2p0.rs

@@ -18,6 +18,8 @@ pub async fn execute_artcraft_seedance2p0(
     start_frame_media_token: plan.start_frame.map(|t| t.to_owned()),
     end_frame_media_token: plan.end_frame.map(|t| t.to_owned()),
     reference_image_media_tokens: plan.reference_images.map(|tokens| tokens.to_owned()),
+    reference_video_media_tokens: plan.reference_videos.map(|tokens| tokens.to_owned()),
+    reference_audio_media_tokens: plan.reference_audio.map(|tokens| tokens.to_owned()),
     aspect_ratio: plan.aspect_ratio,
     duration_seconds: plan.duration_seconds,
     batch_count: Some(plan.batch_count),

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/execute/mod.rs

@@ -1 +1,3 @@
 pub mod artcraft;
+pub mod muapi;
+pub mod seedance2pro;

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/execute/muapi/execute_muapi_seedance2p0.rs

@@ -0,0 +1,56 @@
+use crate::client::router_muapi_client::RouterMuapiClient;
+use crate::errors::artcraft_router_error::ArtcraftRouterError;
+use crate::errors::provider_error::ProviderError;
+use crate::generate::generate_video::generate_video_response::{
+  GenerateVideoResponse, MuapiVideoResponsePayload,
+};
+use crate::generate::generate_video::plan::muapi::plan_generate_video_muapi_seedance2p0::{
+  MuapiSeedance2p0Mode, PlanMuapiSeedance2p0,
+};
+use muapi_client::requests::seedance_2p0_image_to_video::seedance_2p0_image_to_video::{
+  Seedance2p0ImageToVideoArgs, seedance_2p0_image_to_video,
+};
+use muapi_client::requests::seedance_2p0_text_to_video::seedance_2p0_text_to_video::{
+  Seedance2p0TextToVideoArgs, seedance_2p0_text_to_video,
+};
+
+pub async fn execute_muapi_seedance2p0(
+  plan: &PlanMuapiSeedance2p0,
+  muapi_client: &RouterMuapiClient,
+) -> Result<GenerateVideoResponse, ArtcraftRouterError> {
+  let session = &muapi_client.session;
+
+  let request_id = match &plan.mode {
+    MuapiSeedance2p0Mode::TextToVideo { aspect_ratio, duration, quality } => {
+      let args = Seedance2p0TextToVideoArgs {
+        session,
+        prompt: plan.prompt.clone(),
+        aspect_ratio: *aspect_ratio,
+        duration: *duration,
+        quality: *quality,
+      };
+      let response = seedance_2p0_text_to_video(args)
+        .await
+        .map_err(|err| ArtcraftRouterError::Provider(ProviderError::Muapi(err)))?;
+      response.request_id
+    }
+    MuapiSeedance2p0Mode::ImageToVideo { image_urls, aspect_ratio, duration, quality } => {
+      let args = Seedance2p0ImageToVideoArgs {
+        session,
+        prompt: plan.prompt.clone(),
+        image_urls: image_urls.clone(),
+        aspect_ratio: *aspect_ratio,
+        duration: *duration,
+        quality: *quality,
+      };
+      let response = seedance_2p0_image_to_video(args)
+        .await
+        .map_err(|err| ArtcraftRouterError::Provider(ProviderError::Muapi(err)))?;
+      response.request_id
+    }
+  };
+
+  Ok(GenerateVideoResponse::Muapi(MuapiVideoResponsePayload {
+    request_id,
+  }))
+}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/execute/muapi/mod.rs

@@ -0,0 +1 @@
+pub mod execute_muapi_seedance2p0;

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/execute/seedance2pro/execute_seedance2pro_seedance2p0.rs

@@ -0,0 +1,112 @@
+use crate::client::router_seedance2pro_client::RouterSeedance2ProClient;
+use crate::errors::artcraft_router_error::ArtcraftRouterError;
+use crate::errors::provider_error::ProviderError;
+use crate::generate::generate_video::generate_video_response::{
+  GenerateVideoResponse, Seedance2proVideoResponsePayload,
+};
+use crate::generate::generate_video::plan::seedance2pro::plan_generate_video_seedance2pro_seedance2p0::PlanSeedance2proSeedance2p0;
+use crate::utils::download_file::download_file;
+use seedance2pro_client::requests::generate_video::generate_video::{
+  generate_video, GenerateVideoArgs,
+};
+use seedance2pro_client::requests::prepare_file_upload::prepare_file_upload::{
+  prepare_file_upload, PrepareFileUploadArgs,
+};
+use seedance2pro_client::requests::upload_file::upload_file::{
+  upload_file, UploadFileArgs,
+};
+use url_utils::extension::extract_extension_from_url::{
+  extract_extension_from_url_str, ExtractExtensions,
+};
+
+pub async fn execute_seedance2pro_seedance2p0(
+  plan: &PlanSeedance2proSeedance2p0,
+  seedance2pro_client: &RouterSeedance2ProClient,
+) -> Result<GenerateVideoResponse, ArtcraftRouterError> {
+  let session = &seedance2pro_client.session;
+
+  // Upload media files to seedance2pro CDN
+  let start_frame_url = upload_optional_url(session, plan.start_frame_url.as_deref()).await?;
+  let end_frame_url = upload_optional_url(session, plan.end_frame_url.as_deref()).await?;
+  let reference_image_urls = upload_optional_url_list(session, plan.reference_image_urls.as_deref()).await?;
+  let reference_video_urls = upload_optional_url_list(session, plan.reference_video_urls.as_deref()).await?;
+  let reference_audio_urls = upload_optional_url_list(session, plan.reference_audio_urls.as_deref()).await?;
+
+  let args = GenerateVideoArgs {
+    session,
+    prompt: plan.prompt.clone().unwrap_or_default(),
+    resolution: plan.resolution,
+    duration_seconds: plan.duration_seconds,
+    batch_count: plan.batch_count,
+    start_frame_url,
+    end_frame_url,
+    reference_image_urls,
+    reference_video_urls,
+    reference_audio_urls,
+    use_face_blur_hack: None,
+  };
+
+  let response = generate_video(args)
+    .await
+    .map_err(|err| ArtcraftRouterError::Provider(ProviderError::Seedance2Pro(err)))?;
+
+  Ok(GenerateVideoResponse::Seedance2Pro(Seedance2proVideoResponsePayload {
+    order_id: response.order_id,
+    task_id: response.task_id,
+  }))
+}
+
+/// Downloads a file from a source URL and re-uploads it to seedance2pro CDN.
+async fn upload_to_seedance2pro(
+  session: &seedance2pro_client::creds::seedance2pro_session::Seedance2ProSession,
+  source_url: &str,
+) -> Result<String, ArtcraftRouterError> {
+  let extension = extract_extension_from_url_str(source_url, &ExtractExtensions::All)
+    .map(|ext| ext.without_period().to_string())
+    .unwrap_or_else(|| "jpg".to_string());
+
+  let file_bytes = download_file(source_url).await?;
+
+  let prepare_response = prepare_file_upload(PrepareFileUploadArgs {
+    session,
+    extension,
+  })
+    .await
+    .map_err(|err| ArtcraftRouterError::Provider(ProviderError::Seedance2Pro(err)))?;
+
+  let upload_response = upload_file(UploadFileArgs {
+    upload_url: prepare_response.upload_url,
+    file_bytes,
+  })
+    .await
+    .map_err(|err| ArtcraftRouterError::Provider(ProviderError::Seedance2Pro(err)))?;
+
+  Ok(upload_response.public_url)
+}
+
+async fn upload_optional_url(
+  session: &seedance2pro_client::creds::seedance2pro_session::Seedance2ProSession,
+  url: Option<&str>,
+) -> Result<Option<String>, ArtcraftRouterError> {
+  match url {
+    None => Ok(None),
+    Some(u) => Ok(Some(upload_to_seedance2pro(session, u).await?)),
+  }
+}
+
+async fn upload_optional_url_list(
+  session: &seedance2pro_client::creds::seedance2pro_session::Seedance2ProSession,
+  urls: Option<&[String]>,
+) -> Result<Option<Vec<String>>, ArtcraftRouterError> {
+  match urls {
+    None => Ok(None),
+    Some(url_list) if url_list.is_empty() => Ok(None),
+    Some(url_list) => {
+      let mut uploaded = Vec::with_capacity(url_list.len());
+      for url in url_list {
+        uploaded.push(upload_to_seedance2pro(session, url).await?);
+      }
+      Ok(Some(uploaded))
+    }
+  }
+}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/execute/seedance2pro/mod.rs

@@ -0,0 +1 @@
+pub mod execute_seedance2pro_seedance2p0;

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/generate_video_request.rs

@@ -1,17 +1,24 @@
 use crate::api::common_aspect_ratio::CommonAspectRatio;
 use crate::api::common_resolution::CommonResolution;
 use crate::api::common_video_model::CommonVideoModel;
+use crate::api::audio_list_ref::AudioListRef;
 use crate::api::image_list_ref::ImageListRef;
 use crate::api::image_ref::ImageRef;
 use crate::api::provider::Provider;
+use crate::api::video_list_ref::VideoListRef;
 use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::generate::generate_video::plan::artcraft::plan_generate_video_artcraft_kling3p0_pro::plan_generate_video_artcraft_kling3p0_pro;
 use crate::generate::generate_video::plan::artcraft::plan_generate_video_artcraft_kling3p0_standard::plan_generate_video_artcraft_kling3p0_standard;
 use crate::generate::generate_video::plan::artcraft::plan_generate_video_artcraft_seedance1p5_pro::plan_generate_video_artcraft_seedance1p5_pro;
 use crate::generate::generate_video::plan::artcraft::plan_generate_video_artcraft_seedance2p0::plan_generate_video_artcraft_seedance2p0;
+use crate::generate::generate_video::plan::muapi::plan_generate_video_muapi_seedance2p0::plan_generate_video_muapi_seedance2p0;
+use crate::generate::generate_video::plan::seedance2pro::plan_generate_video_seedance2pro_seedance2p0::plan_generate_video_seedance2pro_seedance2p0;
 use crate::generate::generate_video::video_generation_plan::VideoGenerationPlan;
 
+/// Plan to either (1) generate a video or (2) determine how much it costs to generate that video.
+/// This works across multiple providers by shaping a generic "GenerateVideoRequest" into a provider-specific plan.
+/// That plan can then be used to return a cost estimate for that given provider or return a struct that can be used to send a real generation request.
 pub struct GenerateVideoRequest<'a> {
   /// Which model to use.
   pub model: CommonVideoModel,
@@ -34,6 +41,12 @@ pub struct GenerateVideoRequest<'a> {
   /// Reference images (optional).
   pub reference_images: Option<ImageListRef<'a>>,
 
+  /// Reference videos (optional).
+  pub reference_videos: Option<VideoListRef<'a>>,
+
+  /// Reference audio (optional).
+  pub reference_audio: Option<AudioListRef<'a>>,
+
   /// The resolution to use
   pub resolution: Option<CommonResolution>,
 
@@ -64,27 +77,43 @@ impl<'a> GenerateVideoRequest<'a> {
   /// Read the video generation request, construct a plan, then yield a means to execute it.
   pub fn build(&self) -> Result<VideoGenerationPlan<'_>, ArtcraftRouterError> {
     match self.provider {
-      Provider::Artcraft => match self.model {
-        CommonVideoModel::Kling3p0Pro => {
-          plan_generate_video_artcraft_kling3p0_pro(self).map(VideoGenerationPlan::ArtcraftKling3p0Pro)
-        }
-        CommonVideoModel::Kling3p0Standard => {
-          plan_generate_video_artcraft_kling3p0_standard(self).map(VideoGenerationPlan::ArtcraftKling3p0Standard)
-        }
-        CommonVideoModel::Seedance1p5Pro => {
-          plan_generate_video_artcraft_seedance1p5_pro(self).map(VideoGenerationPlan::ArtcraftSeedance1p5Pro)
-        }
-        CommonVideoModel::Seedance2p0 => {
-          plan_generate_video_artcraft_seedance2p0(self).map(VideoGenerationPlan::ArtcraftSeedance2p0)
-        }
-        _ => Err(ArtcraftRouterError::UnsupportedModel(format!("{:?}", self.model))),
-      },
-      Provider::Fal => Err(ArtcraftRouterError::UnsupportedModel(
-        format!("Video generation via Fal is not yet supported (model: {:?})", self.model)
-      )),
+      Provider::Artcraft => self.build_artcraft(),
+      Provider::Muapi => self.build_muapi(),
+      Provider::Seedance2Pro => self.build_seedance2pro(),
+      _ => self.unsupported_provider(),
     }
   }
 
+  fn build_artcraft(&self) -> Result<VideoGenerationPlan<'_>, ArtcraftRouterError> {
+    match self.model {
+      CommonVideoModel::Kling3p0Pro => plan_generate_video_artcraft_kling3p0_pro(self),
+      CommonVideoModel::Kling3p0Standard => plan_generate_video_artcraft_kling3p0_standard(self),
+      CommonVideoModel::Seedance1p5Pro => plan_generate_video_artcraft_seedance1p5_pro(self),
+      CommonVideoModel::Seedance2p0 => plan_generate_video_artcraft_seedance2p0(self),
+      _ => Err(ArtcraftRouterError::UnsupportedModel(format!("{:?}", self.model))),
+    }
+  }
+
+  fn build_muapi(&self) -> Result<VideoGenerationPlan<'_>, ArtcraftRouterError> {
+    match self.model {
+      CommonVideoModel::Seedance2p0 => plan_generate_video_muapi_seedance2p0(self),
+      _ => Err(ArtcraftRouterError::UnsupportedModel(format!("{:?}", self.model))),
+    }
+  }
+
+  fn build_seedance2pro(&self) -> Result<VideoGenerationPlan<'_>, ArtcraftRouterError> {
+    match self.model {
+      CommonVideoModel::Seedance2p0 => plan_generate_video_seedance2pro_seedance2p0(self),
+      _ => Err(ArtcraftRouterError::UnsupportedModel(format!("{:?}", self.model))),
+    }
+  }
+
+  fn unsupported_provider(&self) -> Result<VideoGenerationPlan<'_>, ArtcraftRouterError> {
+    Err(ArtcraftRouterError::UnsupportedModel(
+      format!("Video generation for model `{:?}` is not supported for provider {:?}", self.model, self.provider)
+    ))
+  }
+
   pub fn get_or_generate_idempotency_token(&self) -> String {
     self.idempotency_token.map(|t| t.to_string())
         .unwrap_or_else(|| uuid::Uuid::new_v4().to_string())

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/generate_video_response.rs

@@ -1,3 +1,4 @@
+use muapi_client::api_types::request_id::RequestId as MuapiRequestId;
 use tokens::tokens::generic_inference_jobs::InferenceJobToken;
 
 #[derive(Clone, Debug)]
@@ -6,15 +7,43 @@ pub struct ArtcraftVideoResponsePayload {
   pub all_inference_job_tokens: Vec<InferenceJobToken>,
 }
 
+#[derive(Clone, Debug)]
+pub struct MuapiVideoResponsePayload {
+  pub request_id: MuapiRequestId,
+}
+
+#[derive(Clone, Debug)]
+pub struct Seedance2proVideoResponsePayload {
+  pub order_id: String,
+  pub task_id: String,
+}
+
 #[derive(Clone, Debug)]
 pub enum GenerateVideoResponse {
   Artcraft(ArtcraftVideoResponsePayload),
+  Muapi(MuapiVideoResponsePayload),
+  Seedance2Pro(Seedance2proVideoResponsePayload),
 }
 
 impl GenerateVideoResponse {
   pub fn get_artcraft_payload(&self) -> Option<ArtcraftVideoResponsePayload> {
     match self {
       Self::Artcraft(p) => Some(p.clone()),
+      _ => None,
+    }
+  }
+
+  pub fn get_muapi_payload(&self) -> Option<MuapiVideoResponsePayload> {
+    match self {
+      Self::Muapi(p) => Some(p.clone()),
+      _ => None,
+    }
+  }
+
+  pub fn get_seedance2pro_payload(&self) -> Option<Seedance2proVideoResponsePayload> {
+    match self {
+      Self::Seedance2Pro(p) => Some(p.clone()),
+      _ => None,
     }
   }
 }

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/plan/artcraft/plan_generate_video_artcraft_kling3p0_pro.rs

@@ -4,6 +4,7 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::client_error::ClientError;
 use crate::generate::generate_video::generate_video_request::GenerateVideoRequest;
+use crate::generate::generate_video::video_generation_plan::VideoGenerationPlan;
 use artcraft_api_defs::generate::video::multi_function::kling_3p0_pro_multi_function_video_gen::{
   Kling3p0ProMultiFunctionVideoGenAspectRatio,
   Kling3p0ProMultiFunctionVideoGenDuration,
@@ -24,7 +25,7 @@ pub struct PlanArtcraftKling3p0Pro<'a> {
 
 pub fn plan_generate_video_artcraft_kling3p0_pro<'a>(
   request: &'a GenerateVideoRequest<'a>,
-) -> Result<PlanArtcraftKling3p0Pro<'a>, ArtcraftRouterError> {
+) -> Result<VideoGenerationPlan<'a>, ArtcraftRouterError> {
   let strategy = request.request_mismatch_mitigation_strategy;
 
   let start_frame = resolve_image_ref(request.start_frame)?;
@@ -33,7 +34,7 @@ pub fn plan_generate_video_artcraft_kling3p0_pro<'a>(
   let aspect_ratio = plan_aspect_ratio(request.aspect_ratio, strategy)?;
   let duration = plan_duration(request.duration_seconds, strategy)?;
 
-  Ok(PlanArtcraftKling3p0Pro {
+  Ok(VideoGenerationPlan::ArtcraftKling3p0Pro(PlanArtcraftKling3p0Pro {
     prompt: request.prompt,
     negative_prompt: request.negative_prompt,
     start_frame,
@@ -42,7 +43,7 @@ pub fn plan_generate_video_artcraft_kling3p0_pro<'a>(
     duration,
     generate_audio: request.generate_audio,
     idempotency_token: request.get_or_generate_idempotency_token(),
-  })
+  }))
 }
 
 fn resolve_image_ref<'a>(
@@ -177,6 +178,8 @@ mod tests {
       start_frame: None,
       end_frame: None,
       reference_images: None,
+      reference_videos: None,
+      reference_audio: None,
       resolution: None,
       aspect_ratio: None,
       duration_seconds: None,

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/plan/artcraft/plan_generate_video_artcraft_kling3p0_standard.rs

@@ -4,6 +4,7 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::client_error::ClientError;
 use crate::generate::generate_video::generate_video_request::GenerateVideoRequest;
+use crate::generate::generate_video::video_generation_plan::VideoGenerationPlan;
 use artcraft_api_defs::generate::video::multi_function::kling_3p0_standard_multi_function_video_gen::{
   Kling3p0StandardMultiFunctionVideoGenAspectRatio,
   Kling3p0StandardMultiFunctionVideoGenDuration,
@@ -24,7 +25,7 @@ pub struct PlanArtcraftKling3p0Standard<'a> {
 
 pub fn plan_generate_video_artcraft_kling3p0_standard<'a>(
   request: &'a GenerateVideoRequest<'a>,
-) -> Result<PlanArtcraftKling3p0Standard<'a>, ArtcraftRouterError> {
+) -> Result<VideoGenerationPlan<'a>, ArtcraftRouterError> {
   let strategy = request.request_mismatch_mitigation_strategy;
 
   let start_frame = resolve_image_ref(request.start_frame)?;
@@ -33,7 +34,7 @@ pub fn plan_generate_video_artcraft_kling3p0_standard<'a>(
   let aspect_ratio = plan_aspect_ratio(request.aspect_ratio, strategy)?;
   let duration = plan_duration(request.duration_seconds, strategy)?;
 
-  Ok(PlanArtcraftKling3p0Standard {
+  Ok(VideoGenerationPlan::ArtcraftKling3p0Standard(PlanArtcraftKling3p0Standard {
     prompt: request.prompt,
     negative_prompt: request.negative_prompt,
     start_frame,
@@ -42,7 +43,7 @@ pub fn plan_generate_video_artcraft_kling3p0_standard<'a>(
     duration,
     generate_audio: request.generate_audio,
     idempotency_token: request.get_or_generate_idempotency_token(),
-  })
+  }))
 }
 
 fn resolve_image_ref<'a>(
@@ -177,6 +178,8 @@ mod tests {
       start_frame: None,
       end_frame: None,
       reference_images: None,
+      reference_videos: None,
+      reference_audio: None,
       resolution: None,
       aspect_ratio: None,
       duration_seconds: None,

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/plan/artcraft/plan_generate_video_artcraft_seedance1p5_pro.rs

@@ -4,6 +4,7 @@ use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigati
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::client_error::ClientError;
 use crate::generate::generate_video::generate_video_request::GenerateVideoRequest;
+use crate::generate::generate_video::video_generation_plan::VideoGenerationPlan;
 use artcraft_api_defs::generate::video::multi_function::seedance_1p5_pro_multi_function_video_gen::{
   Seedance1p5ProMultiFunctionVideoGenAspectRatio,
   Seedance1p5ProMultiFunctionVideoGenDuration,
@@ -25,7 +26,7 @@ pub struct PlanArtcraftSeedance1p5Pro<'a> {
 
 pub fn plan_generate_video_artcraft_seedance1p5_pro<'a>(
   request: &'a GenerateVideoRequest<'a>,
-) -> Result<PlanArtcraftSeedance1p5Pro<'a>, ArtcraftRouterError> {
+) -> Result<VideoGenerationPlan<'a>, ArtcraftRouterError> {
   let strategy = request.request_mismatch_mitigation_strategy;
 
   let start_frame = resolve_image_ref(request.start_frame)?;
@@ -35,7 +36,7 @@ pub fn plan_generate_video_artcraft_seedance1p5_pro<'a>(
   let duration = plan_duration(request.duration_seconds, strategy)?;
   let resolution = plan_resolution(request.resolution, strategy)?;
 
-  Ok(PlanArtcraftSeedance1p5Pro {
+  Ok(VideoGenerationPlan::ArtcraftSeedance1p5Pro(PlanArtcraftSeedance1p5Pro {
     prompt: request.prompt,
     start_frame,
     end_frame,
@@ -44,7 +45,7 @@ pub fn plan_generate_video_artcraft_seedance1p5_pro<'a>(
     resolution,
     generate_audio: request.generate_audio,
     idempotency_token: request.get_or_generate_idempotency_token(),
-  })
+  }))
 }
 
 fn resolve_image_ref<'a>(
@@ -190,6 +191,8 @@ mod tests {
       start_frame: None,
       end_frame: None,
       reference_images: None,
+      reference_videos: None,
+      reference_audio: None,
       resolution: None,
       aspect_ratio: None,
       duration_seconds: None,

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/plan/artcraft/plan_generate_video_artcraft_seedance2p0.rs

@@ -1,10 +1,13 @@
+use crate::api::audio_list_ref::AudioListRef;
 use crate::api::common_aspect_ratio::CommonAspectRatio;
 use crate::api::image_list_ref::ImageListRef;
 use crate::api::image_ref::ImageRef;
+use crate::api::video_list_ref::VideoListRef;
 use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::client_error::ClientError;
 use crate::generate::generate_video::generate_video_request::GenerateVideoRequest;
+use crate::generate::generate_video::video_generation_plan::VideoGenerationPlan;
 use artcraft_api_defs::generate::video::multi_function::seedance_2p0_multi_function_video_gen::{
   Seedance2p0AspectRatio, Seedance2p0BatchCount,
 };
@@ -16,6 +19,8 @@ pub struct PlanArtcraftSeedance2p0<'a> {
   pub start_frame: Option<&'a MediaFileToken>,
   pub end_frame: Option<&'a MediaFileToken>,
   pub reference_images: Option<&'a Vec<MediaFileToken>>,
+  pub reference_videos: Option<&'a Vec<MediaFileToken>>,
+  pub reference_audio: Option<&'a Vec<MediaFileToken>>,
   pub aspect_ratio: Option<Seedance2p0AspectRatio>,
   pub duration_seconds: Option<u8>,
   pub batch_count: Seedance2p0BatchCount,
@@ -24,27 +29,31 @@ pub struct PlanArtcraftSeedance2p0<'a> {
 
 pub fn plan_generate_video_artcraft_seedance2p0<'a>(
   request: &'a GenerateVideoRequest<'a>,
-) -> Result<PlanArtcraftSeedance2p0<'a>, ArtcraftRouterError> {
+) -> Result<VideoGenerationPlan<'a>, ArtcraftRouterError> {
   let strategy = request.request_mismatch_mitigation_strategy;
 
   let start_frame = resolve_image_ref(request.start_frame)?;
   let end_frame = resolve_image_ref(request.end_frame)?;
   let reference_images = resolve_image_list_ref(request.reference_images)?;
+  let reference_videos = resolve_video_list_ref(request.reference_videos)?;
+  let reference_audio = resolve_audio_list_ref(request.reference_audio)?;
 
   let aspect_ratio = plan_aspect_ratio(request.aspect_ratio, strategy)?;
   let batch_count = plan_batch_count(request.video_batch_count, strategy)?;
   let duration_seconds = plan_duration(request.duration_seconds, strategy)?;
 
-  Ok(PlanArtcraftSeedance2p0 {
+  Ok(VideoGenerationPlan::ArtcraftSeedance2p0(PlanArtcraftSeedance2p0 {
     prompt: request.prompt,
     start_frame,
     end_frame,
     reference_images,
+    reference_videos,
+    reference_audio,
     aspect_ratio,
     duration_seconds,
     batch_count,
     idempotency_token: request.get_or_generate_idempotency_token(),
-  })
+  }))
 }
 
 fn resolve_image_ref<'a>(
@@ -71,6 +80,30 @@ fn resolve_image_list_ref<'a>(
   }
 }
 
+fn resolve_video_list_ref<'a>(
+  video_list_ref: Option<VideoListRef<'a>>,
+) -> Result<Option<&'a Vec<MediaFileToken>>, ArtcraftRouterError> {
+  match video_list_ref {
+    None => Ok(None),
+    Some(VideoListRef::MediaFileTokens(tokens)) => Ok(Some(tokens)),
+    Some(VideoListRef::Urls(_)) => {
+      Err(ArtcraftRouterError::Client(ClientError::ArtcraftOnlySupportsMediaTokens))
+    }
+  }
+}
+
+fn resolve_audio_list_ref<'a>(
+  audio_list_ref: Option<AudioListRef<'a>>,
+) -> Result<Option<&'a Vec<MediaFileToken>>, ArtcraftRouterError> {
+  match audio_list_ref {
+    None => Ok(None),
+    Some(AudioListRef::MediaFileTokens(tokens)) => Ok(Some(tokens)),
+    Some(AudioListRef::Urls(_)) => {
+      Err(ArtcraftRouterError::Client(ClientError::ArtcraftOnlySupportsMediaTokens))
+    }
+  }
+}
+
 // Supported aspect ratios and their AR values (width / height):
 //   Portrait9x16 = 0.5625, Portrait3x4 = 0.75, Square1x1 = 1.0, Standard4x3 = 1.33, Landscape16x9 = 1.78
 //

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/plan/mod.rs

@@ -1 +1,3 @@
-pub mod artcraft;
+pub mod artcraft;
+pub mod muapi;
+pub mod seedance2pro;

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/plan/muapi/mod.rs

@@ -0,0 +1 @@
+pub mod plan_generate_video_muapi_seedance2p0;

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/plan/muapi/plan_generate_video_muapi_seedance2p0.rs

@@ -0,0 +1,259 @@
+use crate::api::common_aspect_ratio::CommonAspectRatio;
+use crate::api::image_list_ref::ImageListRef;
+use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
+use crate::errors::artcraft_router_error::ArtcraftRouterError;
+use crate::errors::client_error::ClientError;
+use crate::generate::generate_video::generate_video_request::GenerateVideoRequest;
+use crate::generate::generate_video::video_generation_plan::VideoGenerationPlan;
+use muapi_client::requests::seedance_2p0_image_to_video::seedance_2p0_image_to_video::{
+  AspectRatio as I2vAspectRatio,
+  Duration as I2vDuration,
+  Quality as I2vQuality,
+};
+use muapi_client::requests::seedance_2p0_text_to_video::seedance_2p0_text_to_video::{
+  AspectRatio as T2vAspectRatio,
+  Duration as T2vDuration,
+  Quality as T2vQuality,
+};
+
+/// The generation mode determined at plan time.
+/// Muapi has separate text-to-video and image-to-video endpoints.
+/// If reference images are present, we use image-to-video; otherwise text-to-video.
+#[derive(Debug, Clone)]
+pub enum MuapiSeedance2p0Mode {
+  TextToVideo {
+    aspect_ratio: T2vAspectRatio,
+    duration: T2vDuration,
+    quality: T2vQuality,
+  },
+  ImageToVideo {
+    image_urls: Vec<String>,
+    aspect_ratio: I2vAspectRatio,
+    duration: I2vDuration,
+    quality: I2vQuality,
+  },
+}
+
+#[derive(Debug, Clone)]
+pub struct PlanMuapiSeedance2p0 {
+  pub prompt: String,
+  pub mode: MuapiSeedance2p0Mode,
+}
+
+pub fn plan_generate_video_muapi_seedance2p0<'a>(
+  request: &'a GenerateVideoRequest<'a>,
+) -> Result<VideoGenerationPlan<'a>, ArtcraftRouterError> {
+  let strategy = request.request_mismatch_mitigation_strategy;
+
+  // Muapi does not support start/end frames, video references, or audio references.
+  if request.start_frame.is_some() {
+    return Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
+      field: "start_frame",
+      value: "Muapi does not support start frame keyframes".to_string(),
+    }));
+  }
+  if request.end_frame.is_some() {
+    return Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
+      field: "end_frame",
+      value: "Muapi does not support end frame keyframes".to_string(),
+    }));
+  }
+  if request.reference_videos.is_some() {
+    return Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
+      field: "reference_videos",
+      value: "Muapi does not support video references".to_string(),
+    }));
+  }
+  if request.reference_audio.is_some() {
+    return Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
+      field: "reference_audio",
+      value: "Muapi does not support audio references".to_string(),
+    }));
+  }
+
+  let image_urls = resolve_image_urls(request.reference_images)?;
+
+  let prompt = request.prompt.unwrap_or("").to_string();
+
+  let mode = match image_urls {
+    Some(urls) => {
+      MuapiSeedance2p0Mode::ImageToVideo {
+        image_urls: urls,
+        aspect_ratio: plan_i2v_aspect_ratio(request.aspect_ratio, strategy)?,
+        duration: plan_i2v_duration(request.duration_seconds, strategy)?,
+        quality: I2vQuality::High, // NB: "Low" is a "fast" mode, I think
+      }
+    }
+    None => {
+      MuapiSeedance2p0Mode::TextToVideo {
+        aspect_ratio: plan_t2v_aspect_ratio(request.aspect_ratio, strategy)?,
+        duration: plan_t2v_duration(request.duration_seconds, strategy)?,
+        quality: T2vQuality::High, // NB: "Low" is a "fast" mode, I think
+      }
+    }
+  };
+
+  Ok(VideoGenerationPlan::MuapiSeedance2p0(PlanMuapiSeedance2p0 {
+    prompt,
+    mode,
+  }))
+}
+
+fn resolve_image_urls(
+  reference_images: Option<ImageListRef<'_>>,
+) -> Result<Option<Vec<String>>, ArtcraftRouterError> {
+  match reference_images {
+    None => Ok(None),
+    Some(ImageListRef::Urls(urls)) => {
+      if urls.is_empty() {
+        Ok(None)
+      } else {
+        Ok(Some(urls.clone()))
+      }
+    }
+    Some(ImageListRef::MediaFileTokens(_)) => {
+      Err(ArtcraftRouterError::Client(ClientError::MuapiOnlySupportsUrls))
+    }
+  }
+}
+
+// Muapi supports: 16:9, 9:16, 4:3, 3:4 (no square, no 1:1)
+fn plan_t2v_aspect_ratio(
+  aspect_ratio: Option<CommonAspectRatio>,
+  strategy: RequestMismatchMitigationStrategy,
+) -> Result<T2vAspectRatio, ArtcraftRouterError> {
+  match aspect_ratio {
+    None
+    | Some(CommonAspectRatio::Auto)
+    | Some(CommonAspectRatio::Auto2k)
+    | Some(CommonAspectRatio::Auto4k) => Ok(T2vAspectRatio::Landscape16x9),
+
+    Some(CommonAspectRatio::WideSixteenByNine) | Some(CommonAspectRatio::Wide) => {
+      Ok(T2vAspectRatio::Landscape16x9)
+    }
+    Some(CommonAspectRatio::TallNineBySixteen) | Some(CommonAspectRatio::Tall) => {
+      Ok(T2vAspectRatio::Portrait9x16)
+    }
+    Some(CommonAspectRatio::WideFourByThree) => Ok(T2vAspectRatio::Standard4x3),
+    Some(CommonAspectRatio::TallThreeByFour) => Ok(T2vAspectRatio::Portrait3x4),
+
+    // Square and others are not supported by Muapi
+    Some(unsupported) => match strategy {
+      RequestMismatchMitigationStrategy::ErrorOut => {
+        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
+          field: "aspect_ratio",
+          value: format!("{:?}", unsupported),
+        }))
+      }
+      RequestMismatchMitigationStrategy::PayMoreUpgrade
+      | RequestMismatchMitigationStrategy::PayLessDowngrade => {
+        Ok(nearest_t2v_aspect_ratio(unsupported))
+      }
+    },
+  }
+}
+
+fn nearest_t2v_aspect_ratio(aspect_ratio: CommonAspectRatio) -> T2vAspectRatio {
+  match aspect_ratio {
+    // Wide ratios → nearest wide
+    CommonAspectRatio::Square | CommonAspectRatio::SquareHd
+    | CommonAspectRatio::WideFiveByFour => T2vAspectRatio::Standard4x3,
+    CommonAspectRatio::WideThreeByTwo => T2vAspectRatio::Landscape16x9,
+    CommonAspectRatio::WideTwentyOneByNine => T2vAspectRatio::Landscape16x9,
+    // Tall ratios → nearest tall
+    CommonAspectRatio::TallFourByFive => T2vAspectRatio::Portrait3x4,
+    CommonAspectRatio::TallTwoByThree => T2vAspectRatio::Portrait9x16,
+    CommonAspectRatio::TallNineByTwentyOne => T2vAspectRatio::Portrait9x16,
+    _ => T2vAspectRatio::Landscape16x9,
+  }
+}
+
+fn plan_i2v_aspect_ratio(
+  aspect_ratio: Option<CommonAspectRatio>,
+  strategy: RequestMismatchMitigationStrategy,
+) -> Result<I2vAspectRatio, ArtcraftRouterError> {
+  match aspect_ratio {
+    None
+    | Some(CommonAspectRatio::Auto)
+    | Some(CommonAspectRatio::Auto2k)
+    | Some(CommonAspectRatio::Auto4k) => Ok(I2vAspectRatio::Landscape16x9),
+
+    Some(CommonAspectRatio::WideSixteenByNine) | Some(CommonAspectRatio::Wide) => {
+      Ok(I2vAspectRatio::Landscape16x9)
+    }
+    Some(CommonAspectRatio::TallNineBySixteen) | Some(CommonAspectRatio::Tall) => {
+      Ok(I2vAspectRatio::Portrait9x16)
+    }
+    Some(CommonAspectRatio::WideFourByThree) => Ok(I2vAspectRatio::Standard4x3),
+    Some(CommonAspectRatio::TallThreeByFour) => Ok(I2vAspectRatio::Portrait3x4),
+
+    Some(unsupported) => match strategy {
+      RequestMismatchMitigationStrategy::ErrorOut => {
+        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
+          field: "aspect_ratio",
+          value: format!("{:?}", unsupported),
+        }))
+      }
+      RequestMismatchMitigationStrategy::PayMoreUpgrade
+      | RequestMismatchMitigationStrategy::PayLessDowngrade => {
+        Ok(nearest_i2v_aspect_ratio(unsupported))
+      }
+    },
+  }
+}
+
+fn nearest_i2v_aspect_ratio(aspect_ratio: CommonAspectRatio) -> I2vAspectRatio {
+  match aspect_ratio {
+    CommonAspectRatio::Square | CommonAspectRatio::SquareHd
+    | CommonAspectRatio::WideFiveByFour => I2vAspectRatio::Standard4x3,
+    CommonAspectRatio::WideThreeByTwo => I2vAspectRatio::Landscape16x9,
+    CommonAspectRatio::WideTwentyOneByNine => I2vAspectRatio::Landscape16x9,
+    CommonAspectRatio::TallFourByFive => I2vAspectRatio::Portrait3x4,
+    CommonAspectRatio::TallTwoByThree => I2vAspectRatio::Portrait9x16,
+    CommonAspectRatio::TallNineByTwentyOne => I2vAspectRatio::Portrait9x16,
+    _ => I2vAspectRatio::Landscape16x9,
+  }
+}
+
+// Muapi supports durations of 5, 10, and 15 seconds.
+fn plan_t2v_duration(
+  duration_seconds: Option<u16>,
+  strategy: RequestMismatchMitigationStrategy,
+) -> Result<T2vDuration, ArtcraftRouterError> {
+  let d = duration_seconds.unwrap_or(5);
+  match d {
+    0..=5 => Ok(T2vDuration::FiveSeconds),
+    6..=10 => Ok(T2vDuration::TenSeconds),
+    11..=15 => Ok(T2vDuration::FifteenSeconds),
+    _ => match strategy {
+      RequestMismatchMitigationStrategy::ErrorOut => {
+        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
+          field: "duration_seconds",
+          value: format!("{}", d),
+        }))
+      }
+      _ => Ok(T2vDuration::FifteenSeconds), // clamp to max
+    },
+  }
+}
+
+fn plan_i2v_duration(
+  duration_seconds: Option<u16>,
+  strategy: RequestMismatchMitigationStrategy,
+) -> Result<I2vDuration, ArtcraftRouterError> {
+  let d = duration_seconds.unwrap_or(5);
+  match d {
+    0..=5 => Ok(I2vDuration::FiveSeconds),
+    6..=10 => Ok(I2vDuration::TenSeconds),
+    11..=15 => Ok(I2vDuration::FifteenSeconds),
+    _ => match strategy {
+      RequestMismatchMitigationStrategy::ErrorOut => {
+        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
+          field: "duration_seconds",
+          value: format!("{}", d),
+        }))
+      }
+      _ => Ok(I2vDuration::FifteenSeconds),
+    },
+  }
+}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/plan/seedance2pro/mod.rs

@@ -0,0 +1 @@
+pub mod plan_generate_video_seedance2pro_seedance2p0;

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/plan/seedance2pro/plan_generate_video_seedance2pro_seedance2p0.rs

@@ -0,0 +1,209 @@
+use crate::api::audio_list_ref::AudioListRef;
+use crate::api::common_aspect_ratio::CommonAspectRatio;
+use crate::api::image_list_ref::ImageListRef;
+use crate::api::image_ref::ImageRef;
+use crate::api::video_list_ref::VideoListRef;
+use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
+use crate::errors::artcraft_router_error::ArtcraftRouterError;
+use crate::errors::client_error::ClientError;
+use crate::generate::generate_video::generate_video_request::GenerateVideoRequest;
+use crate::generate::generate_video::video_generation_plan::VideoGenerationPlan;
+use seedance2pro_client::requests::generate_video::generate_video::{BatchCount, Resolution};
+
+#[derive(Debug, Clone)]
+pub struct PlanSeedance2proSeedance2p0 {
+  pub prompt: Option<String>,
+  pub start_frame_url: Option<String>,
+  pub end_frame_url: Option<String>,
+  pub reference_image_urls: Option<Vec<String>>,
+  pub reference_video_urls: Option<Vec<String>>,
+  pub reference_audio_urls: Option<Vec<String>>,
+  pub resolution: Resolution,
+  pub duration_seconds: u8,
+  pub batch_count: BatchCount,
+}
+
+pub fn plan_generate_video_seedance2pro_seedance2p0<'a>(
+  request: &'a GenerateVideoRequest<'a>,
+) -> Result<VideoGenerationPlan<'a>, ArtcraftRouterError> {
+  let strategy = request.request_mismatch_mitigation_strategy;
+
+  let start_frame_url = resolve_image_ref_url(request.start_frame)?;
+  let end_frame_url = resolve_image_ref_url(request.end_frame)?;
+  let reference_image_urls = resolve_image_list_ref_urls(request.reference_images)?;
+  let reference_video_urls = resolve_video_list_ref_urls(request.reference_videos)?;
+  let reference_audio_urls = resolve_audio_list_ref_urls(request.reference_audio)?;
+
+  let resolution = plan_resolution(request.aspect_ratio, strategy)?;
+  let batch_count = plan_batch_count(request.video_batch_count, strategy)?;
+  let duration_seconds = plan_duration(request.duration_seconds, strategy)?;
+
+  Ok(VideoGenerationPlan::Seedance2proSeedance2p0(PlanSeedance2proSeedance2p0 {
+    prompt: request.prompt.map(|p| p.to_string()),
+    start_frame_url,
+    end_frame_url,
+    reference_image_urls,
+    reference_video_urls,
+    reference_audio_urls,
+    resolution,
+    duration_seconds,
+    batch_count,
+  }))
+}
+
+fn resolve_image_ref_url(
+  image_ref: Option<ImageRef<'_>>,
+) -> Result<Option<String>, ArtcraftRouterError> {
+  match image_ref {
+    None => Ok(None),
+    Some(ImageRef::Url(url)) => Ok(Some(url.to_string())),
+    Some(ImageRef::MediaFileToken(_)) => {
+      Err(ArtcraftRouterError::Client(ClientError::Seedance2ProOnlySupportsUrls))
+    }
+  }
+}
+
+fn resolve_image_list_ref_urls(
+  image_list_ref: Option<ImageListRef<'_>>,
+) -> Result<Option<Vec<String>>, ArtcraftRouterError> {
+  match image_list_ref {
+    None => Ok(None),
+    Some(ImageListRef::Urls(urls)) => Ok(Some(urls.clone())),
+    Some(ImageListRef::MediaFileTokens(_)) => {
+      Err(ArtcraftRouterError::Client(ClientError::Seedance2ProOnlySupportsUrls))
+    }
+  }
+}
+
+fn resolve_video_list_ref_urls(
+  video_list_ref: Option<VideoListRef<'_>>,
+) -> Result<Option<Vec<String>>, ArtcraftRouterError> {
+  match video_list_ref {
+    None => Ok(None),
+    Some(VideoListRef::Urls(urls)) => Ok(Some(urls.clone())),
+    Some(VideoListRef::MediaFileTokens(_)) => {
+      Err(ArtcraftRouterError::Client(ClientError::Seedance2ProOnlySupportsUrls))
+    }
+  }
+}
+
+fn resolve_audio_list_ref_urls(
+  audio_list_ref: Option<AudioListRef<'_>>,
+) -> Result<Option<Vec<String>>, ArtcraftRouterError> {
+  match audio_list_ref {
+    None => Ok(None),
+    Some(AudioListRef::Urls(urls)) => Ok(Some(urls.clone())),
+    Some(AudioListRef::MediaFileTokens(_)) => {
+      Err(ArtcraftRouterError::Client(ClientError::Seedance2ProOnlySupportsUrls))
+    }
+  }
+}
+
+// Supported aspect ratios and their AR values (width / height):
+//   Portrait9x16 = 0.5625, Portrait3x4 = 0.75, Square1x1 = 1.0, Standard4x3 = 1.33, Landscape16x9 = 1.78
+//
+// All supported ratios cost the same, so PayMoreUpgrade and PayLessDowngrade both
+// select the nearest match rather than rounding in a specific direction.
+fn plan_resolution(
+  aspect_ratio: Option<CommonAspectRatio>,
+  strategy: RequestMismatchMitigationStrategy,
+) -> Result<Resolution, ArtcraftRouterError> {
+  match aspect_ratio {
+    // No preference or auto — default to landscape
+    None
+    | Some(CommonAspectRatio::Auto)
+    | Some(CommonAspectRatio::Auto2k)
+    | Some(CommonAspectRatio::Auto4k) => Ok(Resolution::Landscape16x9),
+
+    // Direct mappings
+    Some(CommonAspectRatio::WideSixteenByNine) | Some(CommonAspectRatio::Wide) => {
+      Ok(Resolution::Landscape16x9)
+    }
+    Some(CommonAspectRatio::TallNineBySixteen) | Some(CommonAspectRatio::Tall) => {
+      Ok(Resolution::Portrait9x16)
+    }
+    Some(CommonAspectRatio::Square) | Some(CommonAspectRatio::SquareHd) => {
+      Ok(Resolution::Square1x1)
+    }
+    Some(CommonAspectRatio::WideFourByThree) => Ok(Resolution::Standard4x3),
+    Some(CommonAspectRatio::TallThreeByFour) => Ok(Resolution::Portrait3x4),
+
+    // Mismatches — apply strategy
+    Some(unsupported) => match strategy {
+      RequestMismatchMitigationStrategy::ErrorOut => {
+        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
+          field: "aspect_ratio",
+          value: format!("{:?}", unsupported),
+        }))
+      }
+      RequestMismatchMitigationStrategy::PayMoreUpgrade
+      | RequestMismatchMitigationStrategy::PayLessDowngrade => {
+        Ok(nearest_resolution(unsupported))
+      }
+    },
+  }
+}
+
+/// Pick the nearest supported resolution by AR value (width / height).
+fn nearest_resolution(aspect_ratio: CommonAspectRatio) -> Resolution {
+  match aspect_ratio {
+    CommonAspectRatio::WideFiveByFour => Resolution::Standard4x3,         // 1.25, nearest 1.33
+    CommonAspectRatio::WideThreeByTwo => Resolution::Standard4x3,         // 1.50, nearest 1.33
+    CommonAspectRatio::WideTwentyOneByNine => Resolution::Landscape16x9,  // 2.33, nearest 1.78
+    CommonAspectRatio::TallFourByFive => Resolution::Portrait3x4,         // 0.80, nearest 0.75
+    CommonAspectRatio::TallTwoByThree => Resolution::Portrait3x4,         // 0.67, nearest 0.75
+    CommonAspectRatio::TallNineByTwentyOne => Resolution::Portrait9x16,   // 0.43, nearest 0.56
+    _ => Resolution::Square1x1,
+  }
+}
+
+// Seedance2p0 supports batch counts of 1, 2, and 4 only.
+fn plan_batch_count(
+  video_batch_count: Option<u16>,
+  strategy: RequestMismatchMitigationStrategy,
+) -> Result<BatchCount, ArtcraftRouterError> {
+  let count = video_batch_count.unwrap_or(1);
+  match count {
+    0 => Err(ArtcraftRouterError::Client(ClientError::UserRequestedZeroGenerations)),
+    1 => Ok(BatchCount::One),
+    2 => Ok(BatchCount::Two),
+    4 => Ok(BatchCount::Four),
+    _ => match strategy {
+      RequestMismatchMitigationStrategy::ErrorOut => {
+        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
+          field: "video_batch_count",
+          value: format!("{}", count),
+        }))
+      }
+      RequestMismatchMitigationStrategy::PayMoreUpgrade => {
+        Ok(if count < 4 { BatchCount::Four } else { BatchCount::Four })
+      }
+      RequestMismatchMitigationStrategy::PayLessDowngrade => {
+        Ok(if count < 4 { BatchCount::Two } else { BatchCount::Four })
+      }
+    },
+  }
+}
+
+// Seedance2p0 supports duration of 4–15 seconds.
+fn plan_duration(
+  duration_seconds: Option<u16>,
+  strategy: RequestMismatchMitigationStrategy,
+) -> Result<u8, ArtcraftRouterError> {
+  const MIN: u16 = 4;
+  const MAX: u16 = 15;
+  const DEFAULT: u8 = 5;
+  match duration_seconds {
+    None => Ok(DEFAULT),
+    Some(d) if d >= MIN && d <= MAX => Ok(d as u8),
+    Some(d) => match strategy {
+      RequestMismatchMitigationStrategy::ErrorOut => {
+        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
+          field: "duration_seconds",
+          value: format!("{}", d),
+        }))
+      }
+      _ => Ok(d.clamp(MIN, MAX) as u8),
+    },
+  }
+}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/video_generation_plan.rs

@@ -4,15 +4,21 @@ use crate::generate::generate_video::cost::artcraft::estimate_video_cost_artcraf
 use crate::generate::generate_video::cost::artcraft::estimate_video_cost_artcraft_kling3p0_standard::estimate_video_cost_artcraft_kling3p0_standard;
 use crate::generate::generate_video::cost::artcraft::estimate_video_cost_artcraft_seedance1p5_pro::estimate_video_cost_artcraft_seedance1p5_pro;
 use crate::generate::generate_video::cost::artcraft::estimate_video_cost_artcraft_seedance2p0::estimate_video_cost_artcraft_seedance2p0;
+use crate::generate::generate_video::cost::muapi::estimate_video_cost_muapi_seedance2p0::estimate_video_cost_muapi_seedance2p0;
+use crate::generate::generate_video::cost::seedance2pro::estimate_video_cost_seedance2pro_seedance2p0::estimate_video_cost_seedance2pro_seedance2p0;
 use crate::generate::generate_video::execute::artcraft::generate_video_artcraft_kling3p0_pro::execute_artcraft_kling3p0_pro;
 use crate::generate::generate_video::execute::artcraft::generate_video_artcraft_kling3p0_standard::execute_artcraft_kling3p0_standard;
 use crate::generate::generate_video::execute::artcraft::generate_video_artcraft_seedance1p5_pro::execute_artcraft_seedance1p5_pro;
 use crate::generate::generate_video::execute::artcraft::generate_video_artcraft_seedance2p0::execute_artcraft_seedance2p0;
+use crate::generate::generate_video::execute::muapi::execute_muapi_seedance2p0::execute_muapi_seedance2p0;
+use crate::generate::generate_video::execute::seedance2pro::execute_seedance2pro_seedance2p0::execute_seedance2pro_seedance2p0;
 use crate::generate::generate_video::generate_video_response::GenerateVideoResponse;
 use crate::generate::generate_video::plan::artcraft::plan_generate_video_artcraft_kling3p0_pro::PlanArtcraftKling3p0Pro;
 use crate::generate::generate_video::plan::artcraft::plan_generate_video_artcraft_kling3p0_standard::PlanArtcraftKling3p0Standard;
 use crate::generate::generate_video::plan::artcraft::plan_generate_video_artcraft_seedance1p5_pro::PlanArtcraftSeedance1p5Pro;
 use crate::generate::generate_video::plan::artcraft::plan_generate_video_artcraft_seedance2p0::PlanArtcraftSeedance2p0;
+use crate::generate::generate_video::plan::muapi::plan_generate_video_muapi_seedance2p0::PlanMuapiSeedance2p0;
+use crate::generate::generate_video::plan::seedance2pro::plan_generate_video_seedance2pro_seedance2p0::PlanSeedance2proSeedance2p0;
 use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
 
 #[derive(Debug)]
@@ -21,6 +27,8 @@ pub enum VideoGenerationPlan<'a> {
   ArtcraftKling3p0Standard(PlanArtcraftKling3p0Standard<'a>),
   ArtcraftSeedance1p5Pro(PlanArtcraftSeedance1p5Pro<'a>),
   ArtcraftSeedance2p0(PlanArtcraftSeedance2p0<'a>),
+  MuapiSeedance2p0(PlanMuapiSeedance2p0),
+  Seedance2proSeedance2p0(PlanSeedance2proSeedance2p0),
 }
 
 impl<'a> VideoGenerationPlan<'a> {
@@ -45,6 +53,14 @@ impl<'a> VideoGenerationPlan<'a> {
         let artcraft_client = client.get_artcraft_client_ref()?;
         execute_artcraft_seedance2p0(plan, artcraft_client).await
       }
+      VideoGenerationPlan::MuapiSeedance2p0(plan) => {
+        let muapi_client = client.get_muapi_client_ref()?;
+        execute_muapi_seedance2p0(plan, muapi_client).await
+      }
+      VideoGenerationPlan::Seedance2proSeedance2p0(plan) => {
+        let seedance2pro_client = client.get_seedance2pro_client_ref()?;
+        execute_seedance2pro_seedance2p0(plan, seedance2pro_client).await
+      }
     }
   }
 
@@ -62,6 +78,12 @@ impl<'a> VideoGenerationPlan<'a> {
       VideoGenerationPlan::ArtcraftSeedance2p0(plan) => {
         estimate_video_cost_artcraft_seedance2p0(plan)
       }
+      VideoGenerationPlan::MuapiSeedance2p0(plan) => {
+        estimate_video_cost_muapi_seedance2p0(plan)
+      }
+      VideoGenerationPlan::Seedance2proSeedance2p0(plan) => {
+        estimate_video_cost_seedance2pro_seedance2p0(plan)
+      }
     }
   }
 }

crates/api_clients/artcraft/artcraft_router/src/lib.rs

@@ -2,6 +2,7 @@ pub mod api;
 pub mod client;
 pub mod errors;
 pub mod generate;
+pub mod utils;
 
 #[cfg(test)]
 pub mod test_helpers;

crates/api_clients/artcraft/artcraft_router/src/test_helpers.rs

@@ -290,6 +290,8 @@ pub fn base_video_request() -> GenerateVideoRequest<'static> {
     start_frame: None,
     end_frame: None,
     reference_images: None,
+    reference_videos: None,
+    reference_audio: None,
     resolution: None,
     aspect_ratio: None,
     duration_seconds: None,

crates/api_clients/artcraft/artcraft_router/src/utils/download_file.rs

@@ -0,0 +1,30 @@
+use crate::errors::artcraft_router_error::ArtcraftRouterError;
+use crate::errors::download_error::DownloadError;
+
+/// Download a file from a URL, returning its bytes.
+pub async fn download_file(url: &str) -> Result<Vec<u8>, ArtcraftRouterError> {
+  let response = reqwest::get(url)
+    .await
+    .map_err(|err| DownloadError::ReqwestDownload {
+      url: url.to_string(),
+      maybe_status: err.status(),
+      error: err,
+    })?;
+
+  let status = response.status();
+  if !status.is_success() {
+    return Err(DownloadError::BadStatus {
+      url: url.to_string(),
+      status_code: status.as_u16(),
+    }.into());
+  }
+
+  response.bytes()
+    .await
+    .map(|b| b.to_vec())
+    .map_err(|err| DownloadError::ReqwestDownload {
+      url: url.to_string(),
+      maybe_status: err.status(),
+      error: err,
+    }.into())
+}

crates/api_clients/artcraft/artcraft_router/src/utils/mod.rs

@@ -0,0 +1 @@
+pub mod download_file;

crates/api_clients/cloud_storage/Cargo.toml

@@ -16,13 +16,13 @@ path = "src/lib.rs"
 normal = ["workspace-build-acceleration"]
 
 [dependencies]
-# Workspace hack (faster compile times)
+# cargo-hakari workspace hack (faster compile times)
 workspace-build-acceleration.workspace = true
 
 # Internal
-bucket_paths = { path = "../../lib/bucket_paths" }
+bucket_paths.workspace = true
 crockford.workspace = true
-easyenv = { path = "../../lib/easyenv" }
+easyenv.workspace = true
 errors.workspace = true
 filesys.workspace = true
 hashing = { path = "../../lib/files/hashing" }
@@ -31,12 +31,11 @@ storyteller_root = { path = "../../lib/storyteller_root" }
 
 # External
 anyhow.workspace = true
-log.workspace = true
-env_logger = "0.11.3"
 async-trait = "0.1.75"
+env_logger.workspace = true
+log.workspace = true
+tokio.workspace = true
+
 # The "never-encode-slash" feature seems to have been removed:
 # https://github.com/durch/rust-s3/pull/254
 rust-s3 = { version = "0.36.0-beta.2", default-features = false, features = ["fail-on-err", "tags", "tokio-rustls-tls"] }
-
-# Runtime
-tokio.workspace = true

crates/api_clients/fal_client/Cargo.toml

@@ -35,5 +35,5 @@ url.workspace = true
 fal = { path = "../../vendor/fal-rs", features = ["endpoints"] }
 
 [dev-dependencies]
-testing = { path = "../../lib/testing" }
+test_utils = { path = "../../testing/test_utils" }
 test_data.workspace = true

crates/api_clients/fal_client/src/requests/queue/enqueue_hunyuan2_image_to_3d.rs

@@ -45,7 +45,7 @@ mod tests {
   use crate::requests::queue::enqueue_hunyuan2_image_to_3d::{enqueue_hunyuan2_image_to_3d, Hunyuan2Args};
   use errors::AnyhowResult;
   use std::fs::read_to_string;
-  use testing::test_file_path::test_file_path;
+  use test_utils::test_file_path::test_file_path;
 
   #[tokio::test]
   #[ignore]

crates/api_clients/fal_client/src/requests/queue/remove_background_rembg.rs

@@ -57,7 +57,7 @@ mod tests {
   use crate::requests::queue::remove_background_rembg::remove_background_rembg;
   use errors::AnyhowResult;
   use std::fs::read_to_string;
-  use testing::test_file_path::test_file_path;
+  use test_utils::test_file_path::test_file_path;
 
   #[tokio::test]
   #[ignore]