pagedraw: composite draw layer into reference image for default generation case

3D nodes and drawings on the canvas were missing from the reference image sent to the model in the default generation path. The fix mirrors the Nano Banana Pro approach: render a composite of the base image and the draw layer, upload it via uploadSceneSnapshot, and pass it as scene_image_media_token rather than putting editedImageToken in image_media_tokens.
hide website image and video gen for now (it's slightly broken) (#1155 )
2026-10-24 10:39:28 -04:00 · 2026-03-17 14:57:40 -07:00 · 2026-03-17 16:03:02 -04:00 · 2026-03-17 15:42:44 -04:00 · 2026-03-17 09:46:50 -04:00 · 2026-03-17 20:36:29 +07:00
543 changed files with 32513 additions and 2083 deletions
@@ -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
@@ -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" />
@@ -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"
-}
@@ -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"
 }
@@ -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"
+}
@@ -1,12 +1,12 @@
 {
  "db_name": "MySQL",
-  "query": "\n        INSERT INTO media_files\n        SET\n            token = ?,\n\n            media_class = ?,\n            media_type = ?,\n\n            is_user_upload = ?,\n            is_intermediate_system_file = ?,\n\n            origin_category = ?, \n            origin_product_category = ?, \n            maybe_origin_model_type = ?, \n            maybe_origin_model_token = ?, \n            maybe_origin_filename = ?,\n\n            is_batch_generated = ?,\n            maybe_batch_token = ?,\n\n            maybe_mime_type = ?,\n            file_size_bytes = ?,\n            maybe_duration_millis = ?,\n            maybe_audio_encoding = ?, \n            maybe_video_encoding = ?, \n            maybe_frame_width = ?, \n            maybe_frame_height = ?,\n            maybe_prompt_token = ?,\n            checksum_sha2 = ?,\n            \n            maybe_engine_category = ?,\n\n            maybe_title = ?,\n            maybe_text_transcript = ?,\n\n            maybe_scene_source_media_file_token = ?,\n\n            public_bucket_directory_hash = ?, \n            maybe_public_bucket_prefix = ?, \n            maybe_public_bucket_extension = ?, \n\n            maybe_creator_user_token = ?, \n            maybe_creator_anonymous_visitor_token = ?, \n\n            creator_ip_address = ?, \n            creator_set_visibility = ?, \n\n            maybe_creator_file_synthetic_id = ?, \n            maybe_creator_category_synthetic_id = ?,\n\n            extra_file_modification_info = ?,\n\n            maybe_mod_user_token = ?, \n            is_generated_on_prem = ?, \n            generated_by_worker = ?, \n            generated_by_cluster = ?\n        ",
+  "query": "\n        INSERT INTO media_files\n        SET\n            token = ?,\n\n            media_class = ?,\n            media_type = ?,\n\n            is_user_upload = ?,\n            is_intermediate_system_file = ?,\n\n            origin_category = ?, \n            origin_product_category = ?, \n            maybe_origin_model_type = ?, \n            maybe_origin_model_token = ?, \n            maybe_origin_filename = ?,\n\n            is_batch_generated = ?,\n            maybe_batch_token = ?,\n\n            maybe_mime_type = ?,\n            file_size_bytes = ?,\n            maybe_duration_millis = ?,\n            maybe_audio_encoding = ?, \n            maybe_video_encoding = ?, \n            maybe_frame_width = ?, \n            maybe_frame_height = ?,\n            maybe_prompt_token = ?,\n            checksum_sha2 = ?,\n            \n            maybe_engine_category = ?,\n\n            maybe_title = ?,\n            maybe_text_transcript = ?,\n\n            maybe_scene_source_media_file_token = ?,\n\n            public_bucket_directory_hash = ?, \n            maybe_public_bucket_prefix = ?, \n            maybe_public_bucket_extension = ?, \n\n            maybe_creator_user_token = ?, \n            maybe_creator_anonymous_visitor_token = ?, \n\n            creator_ip_address = ?, \n            creator_set_visibility = ?, \n\n            maybe_creator_file_synthetic_id = ?, \n            maybe_creator_category_synthetic_id = ?,\n\n            extra_file_modification_info = ?,\n\n            maybe_cover_image_media_file_token = ?,\n\n            maybe_mod_user_token = ?,\n            is_generated_on_prem = ?,\n            generated_by_worker = ?,\n            generated_by_cluster = ?\n        ",
  "describe": {
    "columns": [],
    "parameters": {
-      "Right": 39
+      "Right": 40
    },
    "nullable": []
  },
-  "hash": "b4470e607c005421dd8504b9f1d695080a581936ac6ce00b6f437b2764e741be"
+  "hash": "87d5511700985daaabfc9f2972f018d56b6672c07be082daa7c1a782400cb18d"
 }
@@ -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"
+}
@@ -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"
 }
@@ -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"
+}
@@ -0,0 +1,102 @@
+{
+  "db_name": "MySQL",
+  "query": "\nSELECT\n    jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n    jobs.maybe_external_third_party_id as `operation_id`,\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    jobs.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n    jobs.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n    jobs.maybe_wallet_ledger_entry_token as `maybe_wallet_ledger_entry_token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken`\n\nFROM generic_inference_jobs as jobs\n\nWHERE jobs.maybe_external_third_party = ?\n  AND jobs.status NOT IN ('complete_success', 'complete_failure')\n  AND jobs.maybe_external_third_party_id IS NOT NULL\n\nLIMIT 25000\n    ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "operation_id",
+        "type_info": {
+          "type": "VarString",
+          "flags": "MULTIPLE_KEY | BINARY",
+          "char_set": 224,
+          "max_size": 256
+        }
+      },
+      {
+        "ordinal": 2,
+        "name": "maybe_creator_user_token: tokens::tokens::users::UserToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "MULTIPLE_KEY | BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 3,
+        "name": "maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "MULTIPLE_KEY | BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 4,
+        "name": "creator_ip_address",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 160
+        }
+      },
+      {
+        "ordinal": 5,
+        "name": "creator_set_visibility: enums::common::visibility::Visibility",
+        "type_info": {
+          "type": "String",
+          "flags": "NOT_NULL | BINARY | ENUM",
+          "char_set": 224,
+          "max_size": 28
+        }
+      },
+      {
+        "ordinal": 6,
+        "name": "maybe_prompt_token: tokens::tokens::prompts::PromptToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 7,
+        "name": "maybe_wallet_ledger_entry_token: tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 1
+    },
+    "nullable": [
+      false,
+      true,
+      true,
+      true,
+      false,
+      false,
+      true,
+      true
+    ]
+  },
+  "hash": "d56a26a7300495fac9741e77e390f16402e2273dbab9a15d7c17eb1f0da7a1b1"
+}
@@ -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"
 }
@@ -578,9 +578,9 @@ dependencies = [

 [[package]]
 name = "anstyle"
-version = "1.0.7"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
+checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78"

 [[package]]
 name = "anstyle-parse"
@@ -788,6 +788,8 @@ dependencies = [
 "artcraft_client",
 "fal_client",
 "log",
+ "muapi_client",
+ "reqwest 0.12.23",
 "seedance2pro",
 "serde",
 "serde_derive",
@@ -795,9 +797,11 @@ dependencies = [
 "test_data",
 "tokens",
 "tokio",
+ "url_utils",
 "uuid 1.18.1",
 "workspace-build-acceleration",
 "world_labs_api",
+ "wreq",
 ]

 [[package]]
@@ -2225,9 +2229,9 @@ dependencies = [

 [[package]]
 name = "clap"
-version = "4.5.13"
+version = "4.5.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc"
+checksum = "2797f34da339ce31042b27d23607e051786132987f595b02ba4f6a6dffb7030a"
 dependencies = [
 "clap_builder",
 "clap_derive",
@@ -2235,21 +2239,21 @@ dependencies = [

 [[package]]
 name = "clap_builder"
-version = "4.5.13"
+version = "4.5.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99"
+checksum = "24a241312cea5059b13574bb9b3861cabf758b879c15190b37b6d6fd63ab6876"
 dependencies = [
 "anstream",
 "anstyle",
- "clap_lex 0.7.4",
+ "clap_lex 1.0.0",
 "strsim 0.11.1",
 ]

 [[package]]
 name = "clap_derive"
-version = "4.5.13"
+version = "4.5.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
+checksum = "a92793da1a46a5f2a02a6f4c46c6496b28c43638adea8306fcb0caa1634f24e5"
 dependencies = [
 "heck 0.5.0",
 "proc-macro2",
@@ -2268,9 +2272,9 @@ dependencies = [

 [[package]]
 name = "clap_lex"
-version = "0.7.4"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
+checksum = "3a822ea5bc7590f9d40f1ba12c0dc3c2760f3482c6984db1573ad11031420831"

 [[package]]
 name = "cloud_storage"
@@ -3068,7 +3072,7 @@ version = "0.0.1"
 dependencies = [
 "anyhow",
 "chrono",
- "clap 4.5.13",
+ "clap 4.5.60",
 "datetimes",
 "dotenv",
 "easyenv",
@@ -3103,7 +3107,7 @@ name = "db-cleanup"
 version = "0.0.1"
 dependencies = [
 "bucket_paths",
- "clap 4.5.13",
+ "clap 4.5.60",
 "dotenv",
 "easyenv",
 "enums",
@@ -3263,7 +3267,7 @@ name = "dev-database-seed"
 version = "0.0.1"
 dependencies = [
 "bucket_paths",
- "clap 4.5.13",
+ "clap 4.5.60",
 "cloud_storage",
 "config",
 "easyenv",
@@ -3289,7 +3293,7 @@ name = "dev-upload-media-file"
 version = "0.0.1"
 dependencies = [
 "bucket_paths",
- "clap 4.5.13",
+ "clap 4.5.60",
 "cloud_storage",
 "config",
 "easyenv",
@@ -3763,7 +3767,7 @@ name = "elasticsearch-cli"
 version = "0.0.1"
 dependencies = [
 "bucket_paths",
- "clap 4.5.13",
+ "clap 4.5.60",
 "config",
 "easyenv",
 "elasticsearch",
@@ -3934,6 +3938,7 @@ dependencies = [
 name = "enums"
 version = "0.0.1"
 dependencies = [
+ "log",
 "serde",
 "serde_derive",
 "serde_json",
@@ -6744,7 +6749,7 @@ dependencies = [
 name = "lru-delete-models"
 version = "0.0.1"
 dependencies = [
- "clap 4.5.13",
+ "clap 4.5.60",
 "errors",
 "logging",
 "walkdir",
@@ -7054,7 +7059,7 @@ name = "migration-tool"
 version = "0.0.1"
 dependencies = [
 "bucket_paths",
- "clap 4.5.13",
+ "clap 4.5.60",
 "cloud_storage",
 "config",
 "easyenv",
@@ -7228,6 +7233,29 @@ dependencies = [
 "thiserror 1.0.63",
 ]

+[[package]]
+name = "muapi_client"
+version = "0.0.1"
+dependencies = [
+ "chrono",
+ "cloudflare_errors",
+ "env",
+ "env_logger 0.11.9",
+ "errors",
+ "log",
+ "rand 0.9.2",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "test_data",
+ "testing",
+ "tokio",
+ "url",
+ "workspace-build-acceleration",
+ "wreq",
+ "wreq-util",
+]
+
 [[package]]
 name = "muda"
 version = "0.17.1"
@@ -10316,7 +10344,7 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 name = "scrape-test"
 version = "0.0.1"
 dependencies = [
- "clap 4.5.13",
+ "clap 4.5.60",
 "errors",
 "tokio",
 "web_scrapers",
@@ -11597,6 +11625,7 @@ dependencies = [
 "tts_common",
 "url",
 "url_config",
+ "url_utils",
 "user_input_common",
 "user_traits_component",
 "users",
@@ -11749,6 +11778,20 @@ dependencies = [
 "rsa",
 ]

+[[package]]
+name = "support-tool"
+version = "0.0.1"
+dependencies = [
+ "anyhow",
+ "clap 4.5.60",
+ "easyenv",
+ "errors",
+ "log",
+ "seedance2pro",
+ "serde_json",
+ "tokio",
+]
+
 [[package]]
 name = "swift-rs"
 version = "1.0.7"
@@ -14914,7 +14957,7 @@ dependencies = [
 "bytes",
 "cc",
 "chrono",
- "clap 4.5.13",
+ "clap 4.5.60",
 "cookie 0.18.1",
 "core-foundation-sys",
 "crossbeam-utils",
@@ -15067,6 +15110,37 @@ dependencies = [
 "wreq-util",
 ]

+[[package]]
+name = "worldlabs-job"
+version = "0.0.1"
+dependencies = [
+ "actix-web",
+ "actix_helpers",
+ "anyhow",
+ "bootstrap",
+ "bucket_paths",
+ "cloud_storage",
+ "concurrency",
+ "config",
+ "easyenv",
+ "enums",
+ "errors",
+ "hashing",
+ "jobs_common",
+ "log",
+ "mysql_queries",
+ "reqwest 0.12.23",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "server_environment",
+ "sqlx",
+ "tokens",
+ "tokio",
+ "workspace-build-acceleration",
+ "world_labs_api",
+]
+
 [[package]]
 name = "wreq"
 version = "6.0.0-rc.28"
@@ -16,6 +16,7 @@ members = [
  "crates/api_clients/midjourney_client",
  "crates/api_clients/openai_sora_client",
  "crates/api_clients/openart_client",
+  "crates/api_clients/muapi_client",
  "crates/api_clients/seedance2pro",
  "crates/api_clients/runwayml_client",
  "crates/api_clients/thumbnail_generator",
@@ -33,6 +34,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",
@@ -120,6 +122,7 @@ members = [
  "crates/service/job/es-update-job",
  "crates/service/job/inference_job",
  "crates/service/job/seedance2_pro_job",
+  "crates/service/job/worldlabs_job",
  "crates/service/job/tts_download_job",
  "crates/service/job/tts_inference_job",
  "crates/service/job/w2l_download_job",
@@ -221,6 +224,7 @@ component_traits = { path = "crates/service/plugins/component_traits" }
 cookie_store = { path = "crates/lib/cookie_store" }
 cookies = { path = "crates/lib/cookies" }
 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" }
@@ -237,6 +241,7 @@ memory_store = { path = "crates/lib/caching/memory_store" }
 midjourney_client = { path = "crates/api_clients/midjourney_client" }
 mimetypes = { path = "crates/lib/files/mimetypes" }
 openai_sora_client = { path = "crates/api_clients/openai_sora_client" }
+muapi_client = { path = "crates/api_clients/muapi_client" }
 seedance2pro = { path = "crates/api_clients/seedance2pro" }
 primitives = { path = "crates/lib/data/primitives" }
 shared_service_components = { path = "crates/lib/shared_service_components" }
@@ -270,6 +275,7 @@ base64 = "0.22.1"
 bstr = "1.12.1"
 bytes = "1.10.1"
 chrono = { version = "0.4.41", features = ["serde"] }
+clap = { version = "4.5.60", features = ["derive"] }
 cookie = "0.18.1"
 env = "1.0.1"
 env_logger = "0.11.9"
@@ -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
@@ -0,0 +1,7 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+ALTER TABLE media_files
+DROP COLUMN
+maybe_thumbnail_version;
@@ -0,0 +1,7 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+ALTER TABLE media_files
+ADD COLUMN
+maybe_thumbnail_version TINYINT UNSIGNED DEFAULT NULL;
@@ -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
@@ -143,6 +143,12 @@ RUN SQLX_OFFLINE=true \
  --release \
  --bin seedance2-pro-job

+RUN SQLX_OFFLINE=true \
+  LD_LIBRARY_PATH=/usr/lib:${LD_LIBRARY_PATH} \
+  $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 \
@@ -203,6 +209,7 @@ RUN echo -n ${GIT_SHA} > GIT_SHA
 # Copy all the binaries (except those that need a GPU):
 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/dummy-service /
 COPY --from=builder /tmp/target/release/analytics-job /
 COPY --from=builder /tmp/target/release/email-sender-job  /
@@ -0,0 +1,56 @@
+use serde_derive::{Deserialize, Serialize};
+use tokens::tokens::generic_inference_jobs::InferenceJobToken;
+use tokens::tokens::media_files::MediaFileToken;
+use utoipa::ToSchema;
+
+pub const FLUX_2_LORA_EDIT_IMAGE_ANGLE_PATH: &str = "/v1/generate/image/angle/flux_2_lora";
+
+#[derive(Serialize, Deserialize, ToSchema, Debug)]
+pub struct Flux2LoraEditImageAngleRequest {
+  /// Idempotency token to prevent duplicate requests.
+  pub uuid_idempotency_token: String,
+
+  /// The image to edit with angle adjustment.
+  pub image_media_token: MediaFileToken,
+
+  /// Horizontal rotation angle in degrees.
+  pub horizontal_angle: Option<f64>,
+
+  /// Vertical rotation angle in degrees.
+  pub vertical_angle: Option<f64>,
+
+  /// Zoom level.
+  pub zoom: Option<f64>,
+
+  /// Number of images to generate. Default is one.
+  pub num_images: Option<Flux2LoraEditImageAngleNumImages>,
+
+  /// Output image size. Default is square_hd.
+  pub image_size: Option<Flux2LoraEditImageAngleImageSize>,
+}
+
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[serde(rename_all = "snake_case")]
+pub enum Flux2LoraEditImageAngleNumImages {
+  One,
+  Two,
+  Three,
+  Four,
+}
+
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[serde(rename_all = "snake_case")]
+pub enum Flux2LoraEditImageAngleImageSize {
+  Square,
+  SquareHd,
+  PortraitFourThree,
+  PortraitSixteenNine,
+  LandscapeFourThree,
+  LandscapeSixteenNine,
+}
+
+#[derive(Serialize, Deserialize, ToSchema)]
+pub struct Flux2LoraEditImageAngleResponse {
+  pub success: bool,
+  pub inference_job_token: InferenceJobToken,
+}
@@ -0,0 +1,2 @@
+pub mod flux_2_lora_edit_image_angle;
+pub mod qwen_edit_2511_edit_image_angle;
@@ -0,0 +1,59 @@
+use serde_derive::{Deserialize, Serialize};
+use tokens::tokens::generic_inference_jobs::InferenceJobToken;
+use tokens::tokens::media_files::MediaFileToken;
+use utoipa::ToSchema;
+
+pub const QWEN_EDIT_2511_EDIT_IMAGE_ANGLE_PATH: &str = "/v1/generate/image/angle/qwen_edit_2511";
+
+#[derive(Serialize, Deserialize, ToSchema, Debug)]
+pub struct QwenEdit2511EditImageAngleRequest {
+  /// Idempotency token to prevent duplicate requests.
+  pub uuid_idempotency_token: String,
+
+  /// The image to edit with angle adjustment.
+  pub image_media_token: MediaFileToken,
+
+  /// Horizontal rotation angle in degrees.
+  pub horizontal_angle: Option<f64>,
+
+  /// Vertical rotation angle in degrees.
+  pub vertical_angle: Option<f64>,
+
+  /// Zoom level.
+  pub zoom: Option<f64>,
+
+  /// Additional text prompt to guide the generation.
+  pub additional_prompt: Option<String>,
+
+  /// Number of images to generate. Default is one.
+  pub num_images: Option<QwenEdit2511EditImageAngleNumImages>,
+
+  /// Output image size. Default is square_hd.
+  pub image_size: Option<QwenEdit2511EditImageAngleImageSize>,
+}
+
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[serde(rename_all = "snake_case")]
+pub enum QwenEdit2511EditImageAngleNumImages {
+  One,
+  Two,
+  Three,
+  Four,
+}
+
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[serde(rename_all = "snake_case")]
+pub enum QwenEdit2511EditImageAngleImageSize {
+  Square,
+  SquareHd,
+  PortraitFourThree,
+  PortraitSixteenNine,
+  LandscapeFourThree,
+  LandscapeSixteenNine,
+}
+
+#[derive(Serialize, Deserialize, ToSchema)]
+pub struct QwenEdit2511EditImageAngleResponse {
+  pub success: bool,
+  pub inference_job_token: InferenceJobToken,
+}
@@ -1,3 +1,4 @@
+pub mod angle;
 pub mod bg_removal;
 pub mod edit;
 pub mod inpaint;
@@ -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>,

@@ -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>>,
 }
-
@@ -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;
@@ -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,
+}
@@ -0,0 +1,21 @@
+use crate::credentials::storyteller_credential_set::StorytellerCredentialSet;
+use crate::error::storyteller_error::StorytellerError;
+use crate::utils::api_host::ApiHost;
+use crate::utils::basic_json_post_request::basic_json_post_request;
+use artcraft_api_defs::generate::image::angle::flux_2_lora_edit_image_angle::{
+  Flux2LoraEditImageAngleRequest, Flux2LoraEditImageAngleResponse,
+  FLUX_2_LORA_EDIT_IMAGE_ANGLE_PATH,
+};
+
+pub async fn flux_2_lora_edit_image_angle(
+  api_host: &ApiHost,
+  maybe_creds: Option<&StorytellerCredentialSet>,
+  request: Flux2LoraEditImageAngleRequest,
+) -> Result<Flux2LoraEditImageAngleResponse, StorytellerError> {
+  Ok(basic_json_post_request(
+    api_host,
+    FLUX_2_LORA_EDIT_IMAGE_ANGLE_PATH,
+    maybe_creds,
+    request,
+  ).await?)
+}
@@ -0,0 +1,2 @@
+pub mod flux_2_lora_edit_image_angle;
+pub mod qwen_edit_2511_edit_image_angle;
@@ -0,0 +1,21 @@
+use crate::credentials::storyteller_credential_set::StorytellerCredentialSet;
+use crate::error::storyteller_error::StorytellerError;
+use crate::utils::api_host::ApiHost;
+use crate::utils::basic_json_post_request::basic_json_post_request;
+use artcraft_api_defs::generate::image::angle::qwen_edit_2511_edit_image_angle::{
+  QwenEdit2511EditImageAngleRequest, QwenEdit2511EditImageAngleResponse,
+  QWEN_EDIT_2511_EDIT_IMAGE_ANGLE_PATH,
+};
+
+pub async fn qwen_edit_2511_edit_image_angle(
+  api_host: &ApiHost,
+  maybe_creds: Option<&StorytellerCredentialSet>,
+  request: QwenEdit2511EditImageAngleRequest,
+) -> Result<QwenEdit2511EditImageAngleResponse, StorytellerError> {
+  Ok(basic_json_post_request(
+    api_host,
+    QWEN_EDIT_2511_EDIT_IMAGE_ANGLE_PATH,
+    maybe_creds,
+    request,
+  ).await?)
+}
@@ -1,3 +1,4 @@
+pub mod angle;
 pub mod bg_removal;
 pub mod edit;
 pub mod inpaint;
@@ -19,14 +19,18 @@ workspace-build-acceleration.workspace = true
 artcraft_api_defs.workspace = true
 artcraft_client.workspace = true
 fal_client.workspace = true
+muapi_client.workspace = true
 seedance2pro.workspace = true
 tokens.workspace = true
+url_utils.workspace = true
 world_labs_api.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
@@ -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>),
+}
@@ -27,4 +27,8 @@ pub enum CommonImageModel {
  Seedream4p5,
  #[serde(rename = "seedream_5_lite")]
  Seedream5Lite,
+  #[serde(rename = "qwen_edit_2511_angles")]
+  QwenEdit2511Angles,
+  #[serde(rename = "flux_2_lora_angles")]
+  Flux2LoraAngles,
 }
@@ -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;
@@ -6,4 +6,6 @@ use serde_derive::{Deserialize, Serialize};
 pub enum Provider {
  Artcraft,
  Fal,
+  Muapi,
+  Seedance2Pro,
 }
@@ -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>),
+}
@@ -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;
@@ -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))
+  }
 }
@@ -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,
    }
  }
 }
@@ -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)),
+    }
+  }
 }
@@ -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 }
+  }
+}
@@ -0,0 +1,11 @@
+use seedance2pro::creds::seedance2pro_session::Seedance2ProSession;
+
+pub struct RouterSeedance2ProClient {
+  pub(crate) session: Seedance2ProSession,
+}
+
+impl RouterSeedance2ProClient {
+  pub fn new(session: Seedance2ProSession) -> Self {
+    RouterSeedance2ProClient { session }
+  }
+}
@@ -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)
@@ -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")
+      }
    }
  }
 }
@@ -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)
+      }
+    }
+  }
+}
@@ -1,3 +1,4 @@
 pub mod artcraft_router_error;
 pub mod client_error;
+pub mod download_error;
 pub mod provider_error;
@@ -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::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)
+  }
+}
@@ -47,6 +47,9 @@ mod tests {
      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
      generation_mode_mismatch_strategy: None,
      idempotency_token: None,
+      horizontal_angle: None,
+      vertical_angle: None,
+      zoom: None,
    };
    request.build()
      .expect("build should succeed")
@@ -35,6 +35,9 @@ mod tests {
      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
      generation_mode_mismatch_strategy: None,
      idempotency_token: None,
+      horizontal_angle: None,
+      vertical_angle: None,
+      zoom: None,
    };
    let estimate = request.build()
      .expect("build should succeed")
@@ -0,0 +1,72 @@
+use artcraft_api_defs::generate::image::angle::flux_2_lora_edit_image_angle::Flux2LoraEditImageAngleNumImages;
+
+use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate;
+use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_flux_2_lora_angles::PlanArtcraftFlux2LoraAngles;
+
+pub(crate) fn estimate_image_cost_artcraft_flux_2_lora_angles(
+  plan: &PlanArtcraftFlux2LoraAngles<'_>,
+) -> ImageGenerationCostEstimate {
+  // Pricing: $0.04/image (4 cents). 1 credit = 1 USD cent.
+  let cost_per_image: u64 = 4;
+
+  let num_images: u64 = match plan.num_images {
+    Flux2LoraEditImageAngleNumImages::One => 1,
+    Flux2LoraEditImageAngleNumImages::Two => 2,
+    Flux2LoraEditImageAngleNumImages::Three => 3,
+    Flux2LoraEditImageAngleNumImages::Four => 4,
+  };
+
+  let cost_in_usd_cents = cost_per_image * num_images;
+
+  ImageGenerationCostEstimate {
+    cost_in_credits: Some(cost_in_usd_cents),
+    cost_in_usd_cents: Some(cost_in_usd_cents),
+    is_free: false,
+    is_unlimited: false,
+    is_rate_limited: false,
+    has_watermark: false,
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use crate::api::common_image_model::CommonImageModel;
+  use crate::api::image_list_ref::ImageListRef;
+  use crate::api::provider::Provider;
+  use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
+  use crate::generate::generate_image::generate_image_request::GenerateImageRequest;
+  use tokens::tokens::media_files::MediaFileToken;
+
+  fn estimate_usd_cents(image_batch_count: u16) -> u64 {
+    let tokens = vec![MediaFileToken::new_from_str("test_token")];
+    let request = GenerateImageRequest {
+      model: CommonImageModel::Flux2LoraAngles,
+      provider: Provider::Artcraft,
+      prompt: None,
+      image_inputs: Some(ImageListRef::MediaFileTokens(&tokens)),
+      resolution: None,
+      aspect_ratio: None,
+      image_batch_count: Some(image_batch_count),
+      horizontal_angle: None,
+      vertical_angle: None,
+      zoom: None,
+      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
+      generation_mode_mismatch_strategy: None,
+      idempotency_token: None,
+    };
+    request.build()
+      .expect("build should succeed")
+      .estimate_costs()
+      .cost_in_usd_cents
+      .expect("cost_in_usd_cents should be present")
+  }
+
+  #[test]
+  fn test_estimate_cost_usd_cents() {
+    // $0.04/image = 4 cents each
+    assert_eq!(estimate_usd_cents(1), 4);
+    assert_eq!(estimate_usd_cents(2), 8);
+    assert_eq!(estimate_usd_cents(3), 12);
+    assert_eq!(estimate_usd_cents(4), 16);
+  }
+}
@@ -47,6 +47,9 @@ mod tests {
      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
      generation_mode_mismatch_strategy: None,
      idempotency_token: None,
+      horizontal_angle: None,
+      vertical_angle: None,
+      zoom: None,
    };
    request.build()
      .expect("build should succeed")
@@ -47,6 +47,9 @@ mod tests {
      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
      generation_mode_mismatch_strategy: None,
      idempotency_token: None,
+      horizontal_angle: None,
+      vertical_angle: None,
+      zoom: None,
    };
    request.build()
      .expect("build should succeed")
@@ -86,6 +86,9 @@ mod tests {
      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
      generation_mode_mismatch_strategy: None,
      idempotency_token: None,
+      horizontal_angle: None,
+      vertical_angle: None,
+      zoom: None,
    };
    request.build()
      .expect("build should succeed")
@@ -47,6 +47,9 @@ mod tests {
      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
      generation_mode_mismatch_strategy: None,
      idempotency_token: None,
+      horizontal_angle: None,
+      vertical_angle: None,
+      zoom: None,
    };
    request.build()
      .expect("build should succeed")
@@ -55,6 +55,9 @@ mod tests {
      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
      generation_mode_mismatch_strategy: None,
      idempotency_token: None,
+      horizontal_angle: None,
+      vertical_angle: None,
+      zoom: None,
    };
    request.build()
      .expect("build should succeed")
@@ -54,6 +54,9 @@ mod tests {
      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
      generation_mode_mismatch_strategy: None,
      idempotency_token: None,
+      horizontal_angle: None,
+      vertical_angle: None,
+      zoom: None,
    };
    request.build()
      .expect("build should succeed")
@@ -0,0 +1,72 @@
+use artcraft_api_defs::generate::image::angle::qwen_edit_2511_edit_image_angle::QwenEdit2511EditImageAngleNumImages;
+
+use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate;
+use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_qwen_edit_2511_angles::PlanArtcraftQwenEdit2511Angles;
+
+pub(crate) fn estimate_image_cost_artcraft_qwen_edit_2511_angles(
+  plan: &PlanArtcraftQwenEdit2511Angles<'_>,
+) -> ImageGenerationCostEstimate {
+  // Pricing: $0.04/image (4 cents). 1 credit = 1 USD cent.
+  let cost_per_image: u64 = 4;
+
+  let num_images: u64 = match plan.num_images {
+    QwenEdit2511EditImageAngleNumImages::One => 1,
+    QwenEdit2511EditImageAngleNumImages::Two => 2,
+    QwenEdit2511EditImageAngleNumImages::Three => 3,
+    QwenEdit2511EditImageAngleNumImages::Four => 4,
+  };
+
+  let cost_in_usd_cents = cost_per_image * num_images;
+
+  ImageGenerationCostEstimate {
+    cost_in_credits: Some(cost_in_usd_cents),
+    cost_in_usd_cents: Some(cost_in_usd_cents),
+    is_free: false,
+    is_unlimited: false,
+    is_rate_limited: false,
+    has_watermark: false,
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use crate::api::common_image_model::CommonImageModel;
+  use crate::api::image_list_ref::ImageListRef;
+  use crate::api::provider::Provider;
+  use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
+  use crate::generate::generate_image::generate_image_request::GenerateImageRequest;
+  use tokens::tokens::media_files::MediaFileToken;
+
+  fn estimate_usd_cents(image_batch_count: u16) -> u64 {
+    let tokens = vec![MediaFileToken::new_from_str("test_token")];
+    let request = GenerateImageRequest {
+      model: CommonImageModel::QwenEdit2511Angles,
+      provider: Provider::Artcraft,
+      prompt: None,
+      image_inputs: Some(ImageListRef::MediaFileTokens(&tokens)),
+      resolution: None,
+      aspect_ratio: None,
+      image_batch_count: Some(image_batch_count),
+      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
+      generation_mode_mismatch_strategy: None,
+      idempotency_token: None,
+      horizontal_angle: None,
+      vertical_angle: None,
+      zoom: None,
+    };
+    request.build()
+      .expect("build should succeed")
+      .estimate_costs()
+      .cost_in_usd_cents
+      .expect("cost_in_usd_cents should be present")
+  }
+
+  #[test]
+  fn test_estimate_cost_usd_cents() {
+    // $0.04/image = 4 cents each
+    assert_eq!(estimate_usd_cents(1), 4);
+    assert_eq!(estimate_usd_cents(2), 8);
+    assert_eq!(estimate_usd_cents(3), 12);
+    assert_eq!(estimate_usd_cents(4), 16);
+  }
+}
@@ -47,6 +47,9 @@ mod tests {
      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
      generation_mode_mismatch_strategy: None,
      idempotency_token: None,
+      horizontal_angle: None,
+      vertical_angle: None,
+      zoom: None,
    };
    request.build()
      .expect("build should succeed")
@@ -47,6 +47,9 @@ mod tests {
      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
      generation_mode_mismatch_strategy: None,
      idempotency_token: None,
+      horizontal_angle: None,
+      vertical_angle: None,
+      zoom: None,
    };
    request.build()
      .expect("build should succeed")
@@ -47,6 +47,9 @@ mod tests {
      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
      generation_mode_mismatch_strategy: None,
      idempotency_token: None,
+      horizontal_angle: None,
+      vertical_angle: None,
+      zoom: None,
    };
    request.build()
      .expect("build should succeed")
@@ -9,3 +9,5 @@ pub mod estimate_image_cost_artcraft_nano_banana_pro;
 pub mod estimate_image_cost_artcraft_seedream_4;
 pub mod estimate_image_cost_artcraft_seedream_4p5;
 pub mod estimate_image_cost_artcraft_seedream_5_lite;
+pub mod estimate_image_cost_artcraft_qwen_edit_2511_angles;
+pub mod estimate_image_cost_artcraft_flux_2_lora_angles;
@@ -52,6 +52,9 @@ mod tests {
      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
      generation_mode_mismatch_strategy: None,
      idempotency_token: None,
+      horizontal_angle: None,
+      vertical_angle: None,
+      zoom: None,
    };
    request.build()
      .expect("build should succeed")
@@ -0,0 +1,72 @@
+use crate::client::router_artcraft_client::RouterArtcraftClient;
+use crate::errors::artcraft_router_error::ArtcraftRouterError;
+use crate::errors::provider_error::ProviderError;
+use crate::generate::generate_image::generate_image_response::{
+  ArtcraftImageResponsePayload, GenerateImageResponse,
+};
+use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_flux_2_lora_angles::PlanArtcraftFlux2LoraAngles;
+use artcraft_api_defs::generate::image::angle::flux_2_lora_edit_image_angle::Flux2LoraEditImageAngleRequest;
+use artcraft_client::endpoints::generate::image::angle::flux_2_lora_edit_image_angle::flux_2_lora_edit_image_angle;
+
+pub async fn execute_artcraft_flux_2_lora_angles(
+  plan: &PlanArtcraftFlux2LoraAngles<'_>,
+  artcraft_client: &RouterArtcraftClient,
+) -> Result<GenerateImageResponse, ArtcraftRouterError> {
+  let request = Flux2LoraEditImageAngleRequest {
+    uuid_idempotency_token: plan.idempotency_token.clone(),
+    image_media_token: plan.image_input.clone(),
+    horizontal_angle: plan.horizontal_angle,
+    vertical_angle: plan.vertical_angle,
+    zoom: plan.zoom,
+    num_images: Some(plan.num_images),
+    image_size: plan.image_size,
+  };
+
+  let response = flux_2_lora_edit_image_angle(
+    &artcraft_client.api_host,
+    Some(&artcraft_client.credentials),
+    request,
+  )
+    .await
+    .map_err(|err| ArtcraftRouterError::Provider(ProviderError::Storyteller(err)))?;
+
+  Ok(GenerateImageResponse::Artcraft(ArtcraftImageResponsePayload {
+    inference_job_token: response.inference_job_token,
+  }))
+}
+
+#[cfg(test)]
+mod tests {
+  use crate::api::common_aspect_ratio::CommonAspectRatio;
+  use crate::api::image_list_ref::ImageListRef;
+  use crate::generate::generate_image::generate_image_request::GenerateImageRequest;
+  use crate::generate::generate_image::image_generation_plan::ImageGenerationPlan;
+  use crate::test_helpers::{base_flux_2_lora_angles_image_request, get_artcraft_client};
+  use tokens::tokens::media_files::MediaFileToken;
+
+  #[tokio::test]
+  #[ignore] // manually run — fires a real API request and incurs cost
+  async fn test_angle_edit_flux_2_lora() {
+    let client = get_artcraft_client();
+    let tokens = vec![MediaFileToken::new_from_str("m_r45apt2swza6wp8j2z10237t92kkr8")];
+    let request = GenerateImageRequest {
+      aspect_ratio: Some(CommonAspectRatio::SquareHd),
+      image_batch_count: Some(1),
+      image_inputs: Some(ImageListRef::MediaFileTokens(&tokens)),
+      horizontal_angle: Some(30.0),
+      vertical_angle: Some(0.0),
+      zoom: Some(1.0),
+      ..base_flux_2_lora_angles_image_request()
+    };
+
+    let plan = request.build().unwrap();
+    let result = plan.generate_image(&client).await;
+
+    println!("Result: {:?}", result);
+    let response = result.expect("generate_image request failed");
+    let payload = response.get_artcraft_payload().expect("expected Artcraft payload");
+    println!("Job token: {:?}", payload.inference_job_token);
+
+    assert_eq!(1, 2); // NB: Intentional failure to inspect the response above.
+  }
+}
@@ -0,0 +1,74 @@
+use crate::client::router_artcraft_client::RouterArtcraftClient;
+use crate::errors::artcraft_router_error::ArtcraftRouterError;
+use crate::errors::provider_error::ProviderError;
+use crate::generate::generate_image::generate_image_response::{
+  ArtcraftImageResponsePayload, GenerateImageResponse,
+};
+use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_qwen_edit_2511_angles::PlanArtcraftQwenEdit2511Angles;
+use artcraft_api_defs::generate::image::angle::qwen_edit_2511_edit_image_angle::QwenEdit2511EditImageAngleRequest;
+use artcraft_client::endpoints::generate::image::angle::qwen_edit_2511_edit_image_angle::qwen_edit_2511_edit_image_angle;
+
+pub async fn execute_artcraft_qwen_edit_2511_angles(
+  plan: &PlanArtcraftQwenEdit2511Angles<'_>,
+  artcraft_client: &RouterArtcraftClient,
+) -> Result<GenerateImageResponse, ArtcraftRouterError> {
+  let request = QwenEdit2511EditImageAngleRequest {
+    uuid_idempotency_token: plan.idempotency_token.clone(),
+    image_media_token: plan.image_input.clone(),
+    horizontal_angle: plan.horizontal_angle,
+    vertical_angle: plan.vertical_angle,
+    zoom: plan.zoom,
+    additional_prompt: plan.prompt.map(|p| p.to_string()),
+    num_images: Some(plan.num_images),
+    image_size: plan.image_size,
+  };
+
+  let response = qwen_edit_2511_edit_image_angle(
+    &artcraft_client.api_host,
+    Some(&artcraft_client.credentials),
+    request,
+  )
+    .await
+    .map_err(|err| ArtcraftRouterError::Provider(ProviderError::Storyteller(err)))?;
+
+  Ok(GenerateImageResponse::Artcraft(ArtcraftImageResponsePayload {
+    inference_job_token: response.inference_job_token,
+  }))
+}
+
+#[cfg(test)]
+mod tests {
+  use crate::api::common_aspect_ratio::CommonAspectRatio;
+  use crate::api::image_list_ref::ImageListRef;
+  use crate::generate::generate_image::generate_image_request::GenerateImageRequest;
+  use crate::generate::generate_image::image_generation_plan::ImageGenerationPlan;
+  use crate::test_helpers::{base_qwen_edit_2511_angles_image_request, get_artcraft_client};
+  use tokens::tokens::media_files::MediaFileToken;
+
+  #[tokio::test]
+  #[ignore] // manually run — fires a real API request and incurs cost
+  async fn test_angle_edit_qwen_edit_2511() {
+    let client = get_artcraft_client();
+    let tokens = vec![MediaFileToken::new_from_str("m_r45apt2swza6wp8j2z10237t92kkr8")];
+    let request = GenerateImageRequest {
+      aspect_ratio: Some(CommonAspectRatio::SquareHd),
+      image_batch_count: Some(1),
+      prompt: None,
+      image_inputs: Some(ImageListRef::MediaFileTokens(&tokens)),
+      horizontal_angle: Some(30.0),
+      vertical_angle: Some(0.0),
+      zoom: Some(1.0),
+      ..base_qwen_edit_2511_angles_image_request()
+    };
+
+    let plan = request.build().unwrap();
+    let result = plan.generate_image(&client).await;
+
+    println!("Result: {:?}", result);
+    let response = result.expect("generate_image request failed");
+    let payload = response.get_artcraft_payload().expect("expected Artcraft payload");
+    println!("Job token: {:?}", payload.inference_job_token);
+
+    assert_eq!(1, 2); // NB: Intentional failure to inspect the response above.
+  }
+}
@@ -9,3 +9,5 @@ pub mod generate_image_artcraft_nano_banana_pro;
 pub mod generate_image_artcraft_seedream_4;
 pub mod generate_image_artcraft_seedream_4p5;
 pub mod generate_image_artcraft_seedream_5_lite;
+pub mod generate_image_artcraft_qwen_edit_2511_angles;
+pub mod generate_image_artcraft_flux_2_lora_angles;
@@ -19,6 +19,8 @@ use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraf
 use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_seedream_4::plan_generate_image_artcraft_seedream_4;
 use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_seedream_4p5::plan_generate_image_artcraft_seedream_4p5;
 use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_seedream_5_lite::plan_generate_image_artcraft_seedream_5_lite;
+use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_qwen_edit_2511_angles::plan_generate_image_artcraft_qwen_edit_2511_angles;
+use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_flux_2_lora_angles::plan_generate_image_artcraft_flux_2_lora_angles;
 use crate::generate::generate_image::plan::fal::plan_generate_image_fal_nano_banana_pro::plan_generate_image_fal_nano_banana_pro;

 pub struct GenerateImageRequest<'a> {
@@ -45,6 +47,15 @@ pub struct GenerateImageRequest<'a> {
  /// How many images to generate.
  pub image_batch_count: Option<u16>,

+  /// Only for angle manipulation models.
+  pub horizontal_angle: Option<f64>,
+
+  /// Only for angle manipulation models.
+  pub vertical_angle: Option<f64>,
+
+  /// Only for angle manipulation models.
+  pub zoom: Option<f64>,
+
  /// If the request is a mismatch with the (model/provider), how to mitigate it.
  pub request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy,

@@ -62,64 +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)
-        }
-      },
-      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 => {
-          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())
@@ -11,6 +11,8 @@ use crate::generate::generate_image::cost::artcraft::estimate_image_cost_artcraf
 use crate::generate::generate_image::cost::artcraft::estimate_image_cost_artcraft_seedream_4::estimate_image_cost_artcraft_seedream_4;
 use crate::generate::generate_image::cost::artcraft::estimate_image_cost_artcraft_seedream_4p5::estimate_image_cost_artcraft_seedream_4p5;
 use crate::generate::generate_image::cost::artcraft::estimate_image_cost_artcraft_seedream_5_lite::estimate_image_cost_artcraft_seedream_5_lite;
+use crate::generate::generate_image::cost::artcraft::estimate_image_cost_artcraft_qwen_edit_2511_angles::estimate_image_cost_artcraft_qwen_edit_2511_angles;
+use crate::generate::generate_image::cost::artcraft::estimate_image_cost_artcraft_flux_2_lora_angles::estimate_image_cost_artcraft_flux_2_lora_angles;
 use crate::generate::generate_image::cost::fal::estimate_image_cost_fal_nano_banana_pro::estimate_image_cost_fal_nano_banana_pro;
 use crate::generate::generate_image::execute::artcraft::generate_image_artcraft_flux_1_dev::execute_artcraft_flux_1_dev;
 use crate::generate::generate_image::execute::artcraft::generate_image_artcraft_flux_1_schnell::execute_artcraft_flux_1_schnell;
@@ -23,6 +25,8 @@ use crate::generate::generate_image::execute::artcraft::generate_image_artcraft_
 use crate::generate::generate_image::execute::artcraft::generate_image_artcraft_seedream_4::execute_artcraft_seedream_4;
 use crate::generate::generate_image::execute::artcraft::generate_image_artcraft_seedream_4p5::execute_artcraft_seedream_4p5;
 use crate::generate::generate_image::execute::artcraft::generate_image_artcraft_seedream_5_lite::execute_artcraft_seedream_5_lite;
+use crate::generate::generate_image::execute::artcraft::generate_image_artcraft_qwen_edit_2511_angles::execute_artcraft_qwen_edit_2511_angles;
+use crate::generate::generate_image::execute::artcraft::generate_image_artcraft_flux_2_lora_angles::execute_artcraft_flux_2_lora_angles;
 use crate::generate::generate_image::execute::fal::generate_image_fal_nano_banana_pro::execute_fal_nano_banana_pro;
 use crate::generate::generate_image::generate_image_response::GenerateImageResponse;
 use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate;
@@ -37,6 +41,8 @@ use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraf
 use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_seedream_4::PlanArtcraftSeedream4;
 use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_seedream_4p5::PlanArtcraftSeedream4p5;
 use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_seedream_5_lite::PlanArtcraftSeedream5Lite;
+use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_qwen_edit_2511_angles::PlanArtcraftQwenEdit2511Angles;
+use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_flux_2_lora_angles::PlanArtcraftFlux2LoraAngles;
 use crate::generate::generate_image::plan::fal::plan_generate_image_fal_nano_banana_pro::PlanFalNanaBananaPro;

 #[derive(Debug)]
@@ -52,6 +58,8 @@ pub enum ImageGenerationPlan<'a> {
  ArtcraftSeedream4(PlanArtcraftSeedream4<'a>),
  ArtcraftSeedream4p5(PlanArtcraftSeedream4p5<'a>),
  ArtcraftSeedream5Lite(PlanArtcraftSeedream5Lite<'a>),
+  ArtcraftQwenEdit2511Angles(PlanArtcraftQwenEdit2511Angles<'a>),
+  ArtcraftFlux2LoraAngles(PlanArtcraftFlux2LoraAngles<'a>),
  FalNanaBananaPro(PlanFalNanaBananaPro<'a>),
 }

@@ -105,6 +113,14 @@ impl<'a> ImageGenerationPlan<'a> {
        let artcraft_client = client.get_artcraft_client_ref()?;
        execute_artcraft_seedream_5_lite(plan, artcraft_client).await
      }
+      ImageGenerationPlan::ArtcraftQwenEdit2511Angles(plan) => {
+        let artcraft_client = client.get_artcraft_client_ref()?;
+        execute_artcraft_qwen_edit_2511_angles(plan, artcraft_client).await
+      }
+      ImageGenerationPlan::ArtcraftFlux2LoraAngles(plan) => {
+        let artcraft_client = client.get_artcraft_client_ref()?;
+        execute_artcraft_flux_2_lora_angles(plan, artcraft_client).await
+      }
      ImageGenerationPlan::FalNanaBananaPro(plan) => {
        let fal_client = client.get_fal_client_ref()?;
        execute_fal_nano_banana_pro(plan, fal_client).await
@@ -147,6 +163,12 @@ impl<'a> ImageGenerationPlan<'a> {
      ImageGenerationPlan::ArtcraftSeedream5Lite(plan) => {
        estimate_image_cost_artcraft_seedream_5_lite(plan)
      }
+      ImageGenerationPlan::ArtcraftQwenEdit2511Angles(plan) => {
+        estimate_image_cost_artcraft_qwen_edit_2511_angles(plan)
+      }
+      ImageGenerationPlan::ArtcraftFlux2LoraAngles(plan) => {
+        estimate_image_cost_artcraft_flux_2_lora_angles(plan)
+      }
      ImageGenerationPlan::FalNanaBananaPro(plan) => {
        estimate_image_cost_fal_nano_banana_pro(plan)
      }
@@ -9,3 +9,5 @@ pub mod plan_generate_image_artcraft_nano_banana_pro;
 pub mod plan_generate_image_artcraft_seedream_4;
 pub mod plan_generate_image_artcraft_seedream_4p5;
 pub mod plan_generate_image_artcraft_seedream_5_lite;
+pub mod plan_generate_image_artcraft_qwen_edit_2511_angles;
+pub mod plan_generate_image_artcraft_flux_2_lora_angles;
@@ -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,
@@ -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,
@@ -0,0 +1,254 @@
+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_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,
+};
+use tokens::tokens::media_files::MediaFileToken;
+
+#[derive(Debug, Clone)]
+pub struct PlanArtcraftFlux2LoraAngles<'a> {
+  pub image_input: &'a MediaFileToken,
+  pub horizontal_angle: Option<f64>,
+  pub vertical_angle: Option<f64>,
+  pub zoom: Option<f64>,
+  pub image_size: Option<Flux2LoraEditImageAngleImageSize>,
+  pub num_images: Flux2LoraEditImageAngleNumImages,
+  pub idempotency_token: String,
+}
+
+pub fn plan_generate_image_artcraft_flux_2_lora_angles<'a>(
+  request: &'a GenerateImageRequest<'a>,
+) -> Result<ImageGenerationPlan<'a>, ArtcraftRouterError> {
+  let strategy = request.request_mismatch_mitigation_strategy;
+
+  // Angle models require exactly one input image.
+  let image_input = resolve_single_image_input(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(ImageGenerationPlan::ArtcraftFlux2LoraAngles(PlanArtcraftFlux2LoraAngles {
+    image_input,
+    horizontal_angle: request.horizontal_angle,
+    vertical_angle: request.vertical_angle,
+    zoom: request.zoom,
+    image_size,
+    num_images,
+    idempotency_token: request.get_or_generate_idempotency_token(),
+  }))
+}
+
+fn resolve_single_image_input<'a>(
+  image_list_ref: Option<ImageListRef<'a>>,
+) -> Result<&'a MediaFileToken, ArtcraftRouterError> {
+  match image_list_ref {
+    None => {
+      Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
+        field: "image_inputs",
+        value: "Angle models require exactly one input image".to_string(),
+      }))
+    }
+    Some(ImageListRef::MediaFileTokens(tokens)) => {
+      if tokens.len() != 1 {
+        return Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
+          field: "image_inputs",
+          value: format!("Angle models require exactly one input image, got {}", tokens.len()),
+        }));
+      }
+      Ok(&tokens[0])
+    }
+    Some(ImageListRef::Urls(_)) => {
+      Err(ArtcraftRouterError::Client(ClientError::ArtcraftOnlySupportsMediaTokens))
+    }
+  }
+}
+
+// Flux 2 LoRA supported image sizes:
+//   Square, SquareHd
+//   PortraitFourThree, PortraitSixteenNine
+//   LandscapeFourThree, LandscapeSixteenNine
+fn plan_image_size(
+  aspect_ratio: Option<CommonAspectRatio>,
+  strategy: RequestMismatchMitigationStrategy,
+) -> Result<Option<Flux2LoraEditImageAngleImageSize>, ArtcraftRouterError> {
+  use Flux2LoraEditImageAngleImageSize as S;
+  match aspect_ratio {
+    None => Ok(None),
+
+    Some(CommonAspectRatio::Auto) | Some(CommonAspectRatio::Auto2k) | Some(CommonAspectRatio::Auto4k) => {
+      Ok(Some(S::SquareHd))
+    }
+
+    Some(CommonAspectRatio::Square) => Ok(Some(S::Square)),
+    Some(CommonAspectRatio::SquareHd) => Ok(Some(S::SquareHd)),
+
+    Some(CommonAspectRatio::Wide) | Some(CommonAspectRatio::WideSixteenByNine) => Ok(Some(S::LandscapeSixteenNine)),
+    Some(CommonAspectRatio::WideFourByThree) => Ok(Some(S::LandscapeFourThree)),
+
+    Some(CommonAspectRatio::Tall) | Some(CommonAspectRatio::TallNineBySixteen) => Ok(Some(S::PortraitSixteenNine)),
+    Some(CommonAspectRatio::TallThreeByFour) => Ok(Some(S::PortraitFourThree)),
+
+    Some(unsupported @ CommonAspectRatio::WideFiveByFour)
+    | Some(unsupported @ CommonAspectRatio::WideThreeByTwo)
+    | Some(unsupported @ CommonAspectRatio::WideTwentyOneByNine)
+    | Some(unsupported @ CommonAspectRatio::TallFourByFive)
+    | Some(unsupported @ CommonAspectRatio::TallTwoByThree)
+    | Some(unsupported @ CommonAspectRatio::TallNineByTwentyOne) => match strategy {
+      RequestMismatchMitigationStrategy::ErrorOut => {
+        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
+          field: "aspect_ratio",
+          value: format!("{:?}", unsupported),
+        }))
+      }
+      RequestMismatchMitigationStrategy::PayMoreUpgrade
+      | RequestMismatchMitigationStrategy::PayLessDowngrade => Ok(Some(S::SquareHd)),
+    },
+  }
+}
+
+fn plan_num_images(
+  image_batch_count: Option<u16>,
+  strategy: RequestMismatchMitigationStrategy,
+) -> Result<Flux2LoraEditImageAngleNumImages, ArtcraftRouterError> {
+  use Flux2LoraEditImageAngleNumImages as N;
+  let count = image_batch_count.unwrap_or(1);
+  match count {
+    0 => Err(ArtcraftRouterError::Client(ClientError::UserRequestedZeroGenerations)),
+    1 => Ok(N::One),
+    2 => Ok(N::Two),
+    3 => Ok(N::Three),
+    4 => Ok(N::Four),
+    _ => match strategy {
+      RequestMismatchMitigationStrategy::ErrorOut => {
+        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
+          field: "image_batch_count",
+          value: format!("{}", count),
+        }))
+      }
+      RequestMismatchMitigationStrategy::PayMoreUpgrade
+      | RequestMismatchMitigationStrategy::PayLessDowngrade => Ok(N::Four),
+    },
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use super::*;
+  use crate::api::image_list_ref::ImageListRef;
+  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,
+    Flux2LoraEditImageAngleNumImages as N,
+  };
+  use tokens::tokens::media_files::MediaFileToken;
+
+  fn make_token() -> MediaFileToken {
+    MediaFileToken::new_from_str("test_token_123")
+  }
+
+  #[test]
+  fn requires_image_input() {
+    let request = GenerateImageRequest {
+      image_inputs: None,
+      ..base_flux_2_lora_angles_image_request()
+    };
+    let result = request.build();
+    assert!(result.is_err());
+  }
+
+  #[test]
+  fn rejects_urls() {
+    let urls = vec!["https://example.com/img.png".to_string()];
+    let request = GenerateImageRequest {
+      image_inputs: Some(ImageListRef::Urls(&urls)),
+      ..base_flux_2_lora_angles_image_request()
+    };
+    let result = request.build();
+    assert!(result.is_err());
+  }
+
+  #[test]
+  fn accepts_single_media_token() {
+    let tokens = vec![make_token()];
+    let request = GenerateImageRequest {
+      image_inputs: Some(ImageListRef::MediaFileTokens(&tokens)),
+      ..base_flux_2_lora_angles_image_request()
+    };
+    let result = request.build();
+    assert!(result.is_ok());
+  }
+
+  #[test]
+  fn rejects_multiple_media_tokens() {
+    let tokens = vec![make_token(), make_token()];
+    let request = GenerateImageRequest {
+      image_inputs: Some(ImageListRef::MediaFileTokens(&tokens)),
+      ..base_flux_2_lora_angles_image_request()
+    };
+    let result = request.build();
+    assert!(result.is_err());
+  }
+
+  #[test]
+  fn image_size_none_is_none() {
+    let tokens = vec![make_token()];
+    let request = GenerateImageRequest {
+      aspect_ratio: None,
+      image_inputs: Some(ImageListRef::MediaFileTokens(&tokens)),
+      ..base_flux_2_lora_angles_image_request()
+    };
+    let ImageGenerationPlan::ArtcraftFlux2LoraAngles(plan) = request.build().unwrap() else { panic!("expected ArtcraftFlux2LoraAngles") };
+    assert!(plan.image_size.is_none());
+  }
+
+  #[test]
+  fn image_size_square_maps_directly() {
+    let tokens = vec![make_token()];
+    let request = GenerateImageRequest {
+      aspect_ratio: Some(CommonAspectRatio::Square),
+      image_inputs: Some(ImageListRef::MediaFileTokens(&tokens)),
+      ..base_flux_2_lora_angles_image_request()
+    };
+    let ImageGenerationPlan::ArtcraftFlux2LoraAngles(plan) = request.build().unwrap() else { panic!("expected ArtcraftFlux2LoraAngles") };
+    assert!(matches!(plan.image_size, Some(S::Square)));
+  }
+
+  #[test]
+  fn num_images_direct_mapping() {
+    let tokens = vec![make_token()];
+    let cases = [(1, N::One), (2, N::Two), (3, N::Three), (4, N::Four)];
+    for (count, expected) in cases {
+      let request = GenerateImageRequest {
+        image_batch_count: Some(count),
+        image_inputs: Some(ImageListRef::MediaFileTokens(&tokens)),
+        ..base_flux_2_lora_angles_image_request()
+      };
+      let ImageGenerationPlan::ArtcraftFlux2LoraAngles(plan) = request.build().unwrap() else { panic!("expected ArtcraftFlux2LoraAngles") };
+      assert!(
+        std::mem::discriminant(&plan.num_images) == std::mem::discriminant(&expected),
+        "expected {:?} for count {}", expected, count,
+      );
+    }
+  }
+
+  #[test]
+  fn angle_fields_are_passed_through() {
+    let tokens = vec![make_token()];
+    let request = GenerateImageRequest {
+      horizontal_angle: Some(45.0),
+      vertical_angle: Some(-30.0),
+      zoom: Some(1.5),
+      image_inputs: Some(ImageListRef::MediaFileTokens(&tokens)),
+      ..base_flux_2_lora_angles_image_request()
+    };
+    let ImageGenerationPlan::ArtcraftFlux2LoraAngles(plan) = request.build().unwrap() else { panic!("expected ArtcraftFlux2LoraAngles") };
+    assert_eq!(plan.horizontal_angle, Some(45.0));
+    assert_eq!(plan.vertical_angle, Some(-30.0));
+    assert_eq!(plan.zoom, Some(1.5));
+  }
+}
@@ -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,
@@ -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,
@@ -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,
@@ -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,
@@ -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,
@@ -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,
@@ -0,0 +1,256 @@
+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_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,
+};
+use tokens::tokens::media_files::MediaFileToken;
+
+#[derive(Debug, Clone)]
+pub struct PlanArtcraftQwenEdit2511Angles<'a> {
+  pub prompt: Option<&'a str>,
+  pub image_input: &'a MediaFileToken,
+  pub horizontal_angle: Option<f64>,
+  pub vertical_angle: Option<f64>,
+  pub zoom: Option<f64>,
+  pub image_size: Option<QwenEdit2511EditImageAngleImageSize>,
+  pub num_images: QwenEdit2511EditImageAngleNumImages,
+  pub idempotency_token: String,
+}
+
+pub fn plan_generate_image_artcraft_qwen_edit_2511_angles<'a>(
+  request: &'a GenerateImageRequest<'a>,
+) -> Result<ImageGenerationPlan<'a>, ArtcraftRouterError> {
+  let strategy = request.request_mismatch_mitigation_strategy;
+
+  // Angle models require exactly one input image.
+  let image_input = resolve_single_image_input(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(ImageGenerationPlan::ArtcraftQwenEdit2511Angles(PlanArtcraftQwenEdit2511Angles {
+    prompt: request.prompt,
+    image_input,
+    horizontal_angle: request.horizontal_angle,
+    vertical_angle: request.vertical_angle,
+    zoom: request.zoom,
+    image_size,
+    num_images,
+    idempotency_token: request.get_or_generate_idempotency_token(),
+  }))
+}
+
+fn resolve_single_image_input<'a>(
+  image_list_ref: Option<ImageListRef<'a>>,
+) -> Result<&'a MediaFileToken, ArtcraftRouterError> {
+  match image_list_ref {
+    None => {
+      Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
+        field: "image_inputs",
+        value: "Angle models require exactly one input image".to_string(),
+      }))
+    }
+    Some(ImageListRef::MediaFileTokens(tokens)) => {
+      if tokens.len() != 1 {
+        return Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
+          field: "image_inputs",
+          value: format!("Angle models require exactly one input image, got {}", tokens.len()),
+        }));
+      }
+      Ok(&tokens[0])
+    }
+    Some(ImageListRef::Urls(_)) => {
+      Err(ArtcraftRouterError::Client(ClientError::ArtcraftOnlySupportsMediaTokens))
+    }
+  }
+}
+
+// Qwen Edit 2511 supported image sizes:
+//   Square, SquareHd
+//   PortraitFourThree, PortraitSixteenNine
+//   LandscapeFourThree, LandscapeSixteenNine
+fn plan_image_size(
+  aspect_ratio: Option<CommonAspectRatio>,
+  strategy: RequestMismatchMitigationStrategy,
+) -> Result<Option<QwenEdit2511EditImageAngleImageSize>, ArtcraftRouterError> {
+  use QwenEdit2511EditImageAngleImageSize as S;
+  match aspect_ratio {
+    None => Ok(None),
+
+    Some(CommonAspectRatio::Auto) | Some(CommonAspectRatio::Auto2k) | Some(CommonAspectRatio::Auto4k) => {
+      Ok(Some(S::SquareHd))
+    }
+
+    Some(CommonAspectRatio::Square) => Ok(Some(S::Square)),
+    Some(CommonAspectRatio::SquareHd) => Ok(Some(S::SquareHd)),
+
+    Some(CommonAspectRatio::Wide) | Some(CommonAspectRatio::WideSixteenByNine) => Ok(Some(S::LandscapeSixteenNine)),
+    Some(CommonAspectRatio::WideFourByThree) => Ok(Some(S::LandscapeFourThree)),
+
+    Some(CommonAspectRatio::Tall) | Some(CommonAspectRatio::TallNineBySixteen) => Ok(Some(S::PortraitSixteenNine)),
+    Some(CommonAspectRatio::TallThreeByFour) => Ok(Some(S::PortraitFourThree)),
+
+    Some(unsupported @ CommonAspectRatio::WideFiveByFour)
+    | Some(unsupported @ CommonAspectRatio::WideThreeByTwo)
+    | Some(unsupported @ CommonAspectRatio::WideTwentyOneByNine)
+    | Some(unsupported @ CommonAspectRatio::TallFourByFive)
+    | Some(unsupported @ CommonAspectRatio::TallTwoByThree)
+    | Some(unsupported @ CommonAspectRatio::TallNineByTwentyOne) => match strategy {
+      RequestMismatchMitigationStrategy::ErrorOut => {
+        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
+          field: "aspect_ratio",
+          value: format!("{:?}", unsupported),
+        }))
+      }
+      RequestMismatchMitigationStrategy::PayMoreUpgrade
+      | RequestMismatchMitigationStrategy::PayLessDowngrade => Ok(Some(S::SquareHd)),
+    },
+  }
+}
+
+fn plan_num_images(
+  image_batch_count: Option<u16>,
+  strategy: RequestMismatchMitigationStrategy,
+) -> Result<QwenEdit2511EditImageAngleNumImages, ArtcraftRouterError> {
+  use QwenEdit2511EditImageAngleNumImages as N;
+  let count = image_batch_count.unwrap_or(1);
+  match count {
+    0 => Err(ArtcraftRouterError::Client(ClientError::UserRequestedZeroGenerations)),
+    1 => Ok(N::One),
+    2 => Ok(N::Two),
+    3 => Ok(N::Three),
+    4 => Ok(N::Four),
+    _ => match strategy {
+      RequestMismatchMitigationStrategy::ErrorOut => {
+        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
+          field: "image_batch_count",
+          value: format!("{}", count),
+        }))
+      }
+      RequestMismatchMitigationStrategy::PayMoreUpgrade
+      | RequestMismatchMitigationStrategy::PayLessDowngrade => Ok(N::Four),
+    },
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use super::*;
+  use crate::api::image_list_ref::ImageListRef;
+  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,
+    QwenEdit2511EditImageAngleNumImages as N,
+  };
+  use tokens::tokens::media_files::MediaFileToken;
+
+  fn make_token() -> MediaFileToken {
+    MediaFileToken::new_from_str("test_token_123")
+  }
+
+  #[test]
+  fn requires_image_input() {
+    let request = GenerateImageRequest {
+      image_inputs: None,
+      ..base_qwen_edit_2511_angles_image_request()
+    };
+    let result = request.build();
+    assert!(result.is_err());
+  }
+
+  #[test]
+  fn rejects_urls() {
+    let urls = vec!["https://example.com/img.png".to_string()];
+    let request = GenerateImageRequest {
+      image_inputs: Some(ImageListRef::Urls(&urls)),
+      ..base_qwen_edit_2511_angles_image_request()
+    };
+    let result = request.build();
+    assert!(result.is_err());
+  }
+
+  #[test]
+  fn accepts_single_media_token() {
+    let tokens = vec![make_token()];
+    let request = GenerateImageRequest {
+      image_inputs: Some(ImageListRef::MediaFileTokens(&tokens)),
+      ..base_qwen_edit_2511_angles_image_request()
+    };
+    let result = request.build();
+    assert!(result.is_ok());
+  }
+
+  #[test]
+  fn rejects_multiple_media_tokens() {
+    let tokens = vec![make_token(), make_token()];
+    let request = GenerateImageRequest {
+      image_inputs: Some(ImageListRef::MediaFileTokens(&tokens)),
+      ..base_qwen_edit_2511_angles_image_request()
+    };
+    let result = request.build();
+    assert!(result.is_err());
+  }
+
+  #[test]
+  fn image_size_none_is_none() {
+    let tokens = vec![make_token()];
+    let request = GenerateImageRequest {
+      aspect_ratio: None,
+      image_inputs: Some(ImageListRef::MediaFileTokens(&tokens)),
+      ..base_qwen_edit_2511_angles_image_request()
+    };
+    let ImageGenerationPlan::ArtcraftQwenEdit2511Angles(plan) = request.build().unwrap() else { panic!("expected ArtcraftQwenEdit2511Angles") };
+    assert!(plan.image_size.is_none());
+  }
+
+  #[test]
+  fn image_size_square_maps_directly() {
+    let tokens = vec![make_token()];
+    let request = GenerateImageRequest {
+      aspect_ratio: Some(CommonAspectRatio::Square),
+      image_inputs: Some(ImageListRef::MediaFileTokens(&tokens)),
+      ..base_qwen_edit_2511_angles_image_request()
+    };
+    let ImageGenerationPlan::ArtcraftQwenEdit2511Angles(plan) = request.build().unwrap() else { panic!("expected ArtcraftQwenEdit2511Angles") };
+    assert!(matches!(plan.image_size, Some(S::Square)));
+  }
+
+  #[test]
+  fn num_images_direct_mapping() {
+    let tokens = vec![make_token()];
+    let cases = [(1, N::One), (2, N::Two), (3, N::Three), (4, N::Four)];
+    for (count, expected) in cases {
+      let request = GenerateImageRequest {
+        image_batch_count: Some(count),
+        image_inputs: Some(ImageListRef::MediaFileTokens(&tokens)),
+        ..base_qwen_edit_2511_angles_image_request()
+      };
+      let ImageGenerationPlan::ArtcraftQwenEdit2511Angles(plan) = request.build().unwrap() else { panic!("expected ArtcraftQwenEdit2511Angles") };
+      assert!(
+        std::mem::discriminant(&plan.num_images) == std::mem::discriminant(&expected),
+        "expected {:?} for count {}", expected, count,
+      );
+    }
+  }
+
+  #[test]
+  fn angle_fields_are_passed_through() {
+    let tokens = vec![make_token()];
+    let request = GenerateImageRequest {
+      horizontal_angle: Some(45.0),
+      vertical_angle: Some(-30.0),
+      zoom: Some(1.5),
+      image_inputs: Some(ImageListRef::MediaFileTokens(&tokens)),
+      ..base_qwen_edit_2511_angles_image_request()
+    };
+    let ImageGenerationPlan::ArtcraftQwenEdit2511Angles(plan) = request.build().unwrap() else { panic!("expected ArtcraftQwenEdit2511Angles") };
+    assert_eq!(plan.horizontal_angle, Some(45.0));
+    assert_eq!(plan.vertical_angle, Some(-30.0));
+    assert_eq!(plan.zoom, Some(1.5));
+  }
+}
@@ -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,
@@ -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,
@@ -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,
@@ -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(
@@ -254,13 +255,19 @@ mod tests {
      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
      generation_mode_mismatch_strategy: None,
      idempotency_token: None,
+      horizontal_angle: None,
+      vertical_angle: None,
+      zoom: None,
    }
  }

  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 ────────────────────────────────────────────
@@ -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())
@@ -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>(
@@ -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>(
@@ -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),
@@ -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),
@@ -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),
@@ -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),
@@ -1 +1,3 @@
 pub (crate) mod artcraft;
+pub (crate) mod muapi;
+pub (crate) mod seedance2pro;
@@ -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,
+  }
+}
@@ -0,0 +1 @@
+pub mod estimate_video_cost_muapi_seedance2p0;
@@ -0,0 +1,38 @@
+use seedance2pro::creds::seedance2pro_session::Seedance2ProSession;
+use seedance2pro::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,
+  }
+}
@@ -0,0 +1 @@
+pub mod estimate_video_cost_seedance2pro_seedance2p0;
@@ -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),
@@ -1 +1,3 @@
 pub mod artcraft;
+pub mod muapi;
+pub mod seedance2pro;
@@ -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,
+  }))
+}
@@ -0,0 +1 @@
+pub mod execute_muapi_seedance2p0;
@@ -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::requests::generate_video::generate_video::{
+  generate_video, GenerateVideoArgs,
+};
+use seedance2pro::requests::prepare_file_upload::prepare_file_upload::{
+  prepare_file_upload, PrepareFileUploadArgs,
+};
+use seedance2pro::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::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::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::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))
+    }
+  }
+}
@@ -0,0 +1 @@
+pub mod execute_seedance2pro_seedance2p0;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Tanish Manku	e7fc884d73	pagedraw: composite draw layer into reference image for default generation case 3D nodes and drawings on the canvas were missing from the reference image sent to the model in the default generation path. The fix mirrors the Nano Banana Pro approach: render a composite of the base image and the draw layer, upload it via uploadSceneSnapshot, and pass it as scene_image_media_token rather than putting editedImageToken in image_media_tokens.	2026-03-17 14:57:40 -07:00
Brandon Thomas	42bb07c110	hide website image and video gen for now (it's slightly broken) (#1155 )	2026-03-17 16:03:02 -04:00
Brandon Thomas	5afa81b57d	alter media_files to include thumbnail information (#1154 )	2026-03-17 15:42:44 -04:00
Brandon Thomas	81cadf35b0	fix compile error	2026-03-17 09:46:50 -04:00
BFlat	d4b3579915	web image and video generations (#1146 ) Image and video generation pages on getartcraft website.	2026-03-17 20:36:29 +07:00
Brandon Thomas	7cd8c0299b	artcraft router: seedance (#1153 ) add multiple providers to artcraft router for seedance	2026-03-16 22:43:50 -04:00
Brandon Thomas	87296752a5	Use muapi as backup (#1152 ) Possible problem in our Seedance 2.0 provider means we need a backup. This is here in case we need it. Muapi is inferior for several reasons: - Videos contain watermarks - Videos cost 2x as much - Not as many aspect ratio controls - Not as many duration controls - No starting frame / ending frame - No video references - No audio references It does seem fast, however.	2026-03-16 17:15:53 -04:00
Brandon Thomas	1416c5cd17	bump 0.14 -> 0.15	2026-03-16 13:27:54 -04:00
BFlat	de29444626	allow playing audio ref in seedance prompt input (#1151 )	2026-03-16 22:02:39 +07:00
Brandon Thomas	41988a4462	plumb references to seedance (#1150 )	2026-03-16 10:49:00 -04:00
BFlat	4c0c536fb0	video and audio references seedance 2.0 (#1121 ) <img width="846" height="544" alt="image" src="https://github.com/user-attachments/assets/1ca92a7e-1faa-47a4-b32c-24d9587aff61" /> <img width="374" height="308" alt="image" src="https://github.com/user-attachments/assets/2331fc09-b576-4556-9a56-225d24eb30e1" /> Do not merge: awaiting backend.	2026-03-16 09:26:26 -04:00
bflatastic	b15a5d532a	angles history stack base thumbnail to use cdn image instead of blob	2026-03-16 19:55:30 +07:00
Brandon Thomas	8ae983ee32	seedance omni video (#1148 )	2026-03-16 08:53:47 -04:00
bflatastic	279a79e60a	angles local upload thumbnails not showing and get rid of double toast	2026-03-16 19:48:33 +07:00
bflatastic	ebd2a276f9	body font updates and fixed title font in app	2026-03-14 15:52:02 +07:00
bflatastic	0d2f1cfa2c	website and app font update	2026-03-14 13:13:34 +07:00
Tanish Manku	3592111019	Improve 2D (PageDraw) render stability and performance (#1143 ) Generous use of caching used for react elements. Made a pretty significant difference too. Minor refactor to move helper functions outside instead of within component tree.	2026-03-13 16:42:11 -07:00
Tanish Manku	9d12603d1f	2D Editor support for 3D objects (#1142 ) 3D objects can now be drag-n-dropped from gallery onto 2D canvas, with support for scale, rotation and FOV changes. History is tracks so changes support undo/redo as well.	2026-03-13 16:35:46 -07:00
bflatastic	8902f77a18	Show both enum failure reason and dynamic failure message in task queue	2026-03-14 04:18:40 +07:00
Brandon Thomas	6d91b5616f	add failure messages to backend + tauri (#1141 )	2026-03-13 13:45:54 -04:00
Brandon Thomas	3783c194e3	make job statuses forward- and backwards- compatible (#1140 ) this could have possibly been breaking older clients	2026-03-13 10:44:29 -04:00
bflatastic	b7770d5566	performance fix - thumbnails to load smaller images not full size	2026-03-13 13:17:05 +07:00
bflatastic	2fb1eb957b	removed generation count blocker (image)	2026-03-13 09:30:09 +07:00
Brandon Thomas	9b4ffa7986	long lived url tech debt hurting local dev (#1139 ) kill some local dev tech debt on url construction	2026-03-12 21:34:31 -04:00
bflatastic	2dca4884b1	seedance 2.0 temporary alerts	2026-03-12 22:22:23 +07:00
bflatastic	1d280ba2e0	build fix 3	2026-03-12 21:35:29 +07:00
bflatastic	777758dc16	build fix 2	2026-03-12 21:23:43 +07:00
bflatastic	f2cf78514b	build fix	2026-03-12 21:18:51 +07:00
BFlat	c04586c785	genhub start mock to ui (#1138 )	2026-03-12 21:12:46 +07:00
BFlat	fd89d5ab39	Revert nextjs genhub (#1137 )	2026-03-12 15:49:24 +07:00
BFlat	bbfbc40147	fix react version mismatch genhub	2026-03-12 15:36:55 +07:00
BFlat	76d120916b	downgrade nextjs version for genhub (#1136 )	2026-03-12 15:30:16 +07:00
BFlat	efb33bfe38	fix: replace bare libs/ import paths with workspace package names	2026-03-12 14:37:59 +07:00
BFlat	e7d1d796e1	nx version fixed to before and path (#1135 )	2026-03-12 14:29:52 +07:00
BFlat	fc81854b99	genhub to use nextjs instead of vite for seo (#1134 )	2026-03-12 11:14:41 +07:00
bflatastic	6e9981acc2	genhub netlify redirects	2026-03-12 01:40:12 +07:00
bflatastic	94637e0d0b	netlify build file for genhub	2026-03-12 01:31:03 +07:00
bflatastic	04b6957dfd	netlify build command for genhub	2026-03-12 01:24:32 +07:00
BFlat	6a0627a493	genhub init (#1133 )	2026-03-12 01:21:54 +07:00
Brandon Thomas	6e2ed226d8	api docs	2026-03-11 12:19:06 -04:00
bflatastic	0c20a10a78	add models with missing name mapping	2026-03-11 23:05:30 +07:00
bflatastic	92bba52502	failure reason in task queue	2026-03-11 19:43:43 +07:00
bflatastic	6d3ec8bfee	"Make 3D" button to not enqueue directly but go to 3D object page	2026-03-11 14:17:12 +07:00
Brandon Thomas	c7744ae545	update oncall script	2026-03-11 00:36:12 -04:00
Brandon Thomas	65b97a7636	moderation: create wallet (#1131 )	2026-03-11 00:14:03 -04:00
Brandon Thomas	dd630c5993	tauri task failure reasons (#1130 )	2026-03-10 23:27:55 -04:00
Brandon Thomas	b39f208bd3	add robust job failure reasons to seedance (#1129 )	2026-03-10 19:30:31 -04:00
Brandon Thomas	53f34061b6	CLI tool for support issues (#1128 )	2026-03-10 17:06:38 -04:00
Brandon Thomas	d3acef8467	bump linkst	2026-03-10 15:14:03 -04:00
bflatastic	167a7f996e	fixed angles history persistence, non blocking generations	2026-03-10 23:35:03 +07:00
Brandon Thomas	7fca050c56	bump artcraft version	2026-03-10 12:18:47 -04:00
bflatastic	e9316bcdb5	bug fixes	2026-03-10 21:04:53 +07:00
bflatastic	40a2e8a514	added angles models name mapping	2026-03-10 20:10:03 +07:00
bflatastic	02ab54bc8c	angles fixed and history stack	2026-03-10 20:04:46 +07:00
Brandon Thomas	ff268c4e4e	WorldLabs download job (#1125 )	2026-03-10 08:44:03 -04:00
BFlatandBrandon Thomas	f97def83e1	Angles UI (#1090 ) Co-authored-by: Brandon Thomas <echelon@gmail.com>	2026-03-09 21:49:17 -04:00
jtoy	9e9156cd32	fix monterey (#1042 ) an api for safari that is not supported was used, this fixes it as a fallback. Tested and works. Fixes: https://github.com/storytold/artcraft/issues/1008	2026-03-09 20:37:55 -04:00
Brandon Thomas	c7b817ac3f	angle edit models (fal, handlers, routing) (#1124 )	2026-03-09 19:48:09 -04:00
bflatastic	66afce8889	Merge branch 'main' of https://github.com/storytold/storyteller-rust	2026-03-10 02:20:02 +07:00
bflatastic	f7e7c132bc	cost estimates for splats in frontend ui	2026-03-10 02:19:59 +07:00
				`@@ -0,0 +1 @@`
				`pub mod estimate_video_cost_muapi_seedance2p0;`
				`@@ -0,0 +1 @@`
				`pub mod estimate_video_cost_seedance2pro_seedance2p0;`