task queue, toast, wrong character fixes

.claude/rules/code-style.md

@@ -42,21 +42,6 @@ then the story, then the fine print.
    - A method that calls another method in the same file should appear *above* the method
      it calls. This lets readers follow the call chain downward.
 
-### Ordering within test modules
-
-Put test cases first, helpers last. A reader opening a test file should immediately see
-*what* is being tested before *how* the test machinery works.
-
-1. **Imports**
-2. **Constants** (test IDs, URLs, fixture data) — small context that tests reference
-3. **Test functions** or **sub-modules** grouped by category
-4. **Helper functions** (builders, pipeline runners, assertions)
-
-Group related tests into sub-modules (`mod pricing_tests { ... }`) when a category has 2+
-tests. Don't create a sub-module for a single test. Keep nesting to two levels max
-(`mod tests { mod category { ... } }`). Shared helpers go in the parent module so
-sub-modules can reach them via `use super::*`.
-
 ## Naming
 
 - Handler functions: `{verb}_{noun}_handler` (e.g. `get_health_check_handler`, `login_handler`)
@@ -68,10 +53,7 @@ sub-modules can reach them via `use super::*`.
 ## Imports
 
 - Group imports: std, external crates, internal workspace crates, `crate::` imports
-- Prefer `use` imports over inline fully-qualified paths. Inline qualification is acceptable
-  only for genuine one-off references where adding an import would be noise, or for types
-  that collide with std prelude names (`Result`, `Option`, `Error`). If you reference a symbol
-  more than once, always import it.
+- Use fully qualified paths for one-off references; `use` for repeated references
 - Prefer specific imports over wildcards, except in `api_doc.rs` and test modules
 - When two crates export a type with the same name, alias with a suffix describing the source crate:
   `use enums::...::CommonResolution as CommonResolutionEnum;`

.claude/rules/testing.md

@@ -10,28 +10,10 @@
 ## Test Patterns
 
 - Tests live in `#[cfg(test)] mod tests { ... }` at the bottom of each file
-- Group related tests into sub-modules by category (e.g. `mod pricing_tests`, `mod resolution_tests`)
-- Only create a sub-module when it has 2+ tests — don't wrap a single test in its own module
-- Keep nesting shallow: `mod tests { mod category { ... } }` is fine; a third level is rarely needed
-- Shared helpers used by multiple sub-modules belong in the parent `mod tests`, not duplicated in each sub-module
+- Group related tests in sub-modules: `mod explicit_checks`, `mod mechanical_checks`
 - Enum tests should cover: serialization, deserialization, `to_str`/`from_str` round-trip, variant count
 - Password/crypto tests: be mindful of computation cost, don't add too many bcrypt test cases
 
-## Test File Layout
-
-Put test cases first, helpers last. Engineers should see the actual tests before scrolling
-to understand helper plumbing.
-
-Within a `mod tests { ... }` block:
-
-1. **Imports** at the top
-2. **Constants** (test data IDs, URLs, etc.) — small context that tests reference
-3. **Test functions** (`#[test]` / `#[tokio::test]`) grouped by category
-4. **Helper functions** (builders, pipeline runners, etc.) at the very bottom
-
-If tests are grouped into sub-modules, the same rule applies within each sub-module:
-constants first, then tests, then helpers at the end of that sub-module.
-
 ## What to Test
 
 - New error types and their mappings
@@ -39,14 +21,6 @@ constants first, then tests, then helpers at the end of that sub-module.
 - Hash/deduplication functions with known inputs
 - Edge cases in parsers (empty input, missing fields, malformed data)
 
-## Imports in Tests
-
-- Import test fixtures and constants with `use`, not inline fully-qualified paths.
-  Write `use test_data::web::image_urls::JUNO_AT_LAKE_IMAGE_URL;` at the top,
-  then reference `JUNO_AT_LAKE_IMAGE_URL` in test bodies.
-- Same rule applies to enum variants used in match arms — import them, don't write
-  `crate::some::deep::module::MyEnum::Variant` inline.
-
 ## What Not to Test
 
 - Don't add integration tests that require a running database unless explicitly asked

.sqlx/query-29916e73a1784ea0b70ef4f637520b05efccc31e01840f681e9b042f82eb8f7e.json

@@ -1,12 +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  maybe_debug_log_event_token = ?,\n\n  frontend_failure_category = ?,\n  failure_reason = ?,\n\n  status = ?\n        ",
+  "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": 17
+      "Right": 16
     },
     "nullable": []
   },
-  "hash": "c73be10c5677f78f81bc1c29872fd5af889790c3b2a8de27eb8ab64383c638d6"
+  "hash": "29916e73a1784ea0b70ef4f637520b05efccc31e01840f681e9b042f82eb8f7e"
 }

.sqlx/query-31d85cc0013f29e6db2d272ee6e709cca79b46496a2c222960f1a1419175f00b.json

@@ -1,135 +0,0 @@
-{
-  "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\n    jobs.maybe_external_third_party as `external_third_party: enums::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty`,\n    jobs.maybe_external_third_party_id as `external_third_party_id`,\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.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n    jobs.maybe_debug_log_event_token as `maybe_debug_log_event_token: tokens::tokens::non_unique::debug_logs_event_token::DebugLogEventToken`,\n\n    jobs.created_at,\n    jobs.updated_at\n\nFROM generic_inference_jobs as jobs\n\nWHERE jobs.maybe_external_third_party = ?\nAND jobs.maybe_external_third_party_id = ?\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": "status: enums::common::job_status_plus::JobStatusPlus",
-        "type_info": {
-          "type": "String",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM",
-          "char_set": 224,
-          "max_size": 76
-        }
-      },
-      {
-        "ordinal": 2,
-        "name": "external_third_party: enums::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 64
-        }
-      },
-      {
-        "ordinal": 3,
-        "name": "external_third_party_id",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 256
-        }
-      },
-      {
-        "ordinal": 4,
-        "name": "maybe_creator_user_token: tokens::tokens::users::UserToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 5,
-        "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": 6,
-        "name": "creator_ip_address",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 160
-        }
-      },
-      {
-        "ordinal": 7,
-        "name": "maybe_prompt_token: tokens::tokens::prompts::PromptToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 8,
-        "name": "maybe_debug_log_event_token: tokens::tokens::non_unique::debug_logs_event_token::DebugLogEventToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 9,
-        "name": "created_at",
-        "type_info": {
-          "type": "Timestamp",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | TIMESTAMP",
-          "char_set": 63,
-          "max_size": 19
-        }
-      },
-      {
-        "ordinal": 10,
-        "name": "updated_at",
-        "type_info": {
-          "type": "Timestamp",
-          "flags": "NOT_NULL | BINARY | TIMESTAMP | ON_UPDATE_NOW",
-          "char_set": 63,
-          "max_size": 19
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": [
-      false,
-      false,
-      true,
-      true,
-      true,
-      true,
-      false,
-      true,
-      true,
-      false,
-      false
-    ]
-  },
-  "hash": "31d85cc0013f29e6db2d272ee6e709cca79b46496a2c222960f1a1419175f00b"
-}

.sqlx/query-8f8b64c0af5383ff3baaa8aa2f2aa22cc760addd850d618ce543fe05816d11e0.json

@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nINSERT INTO generic_inference_jobs\nSET\n  token = ?,\n  uuid_idempotency_token = ?,\n\n  job_type = ?,\n\n  maybe_external_third_party = ?,\n  maybe_external_third_party_id = ?,\n\n  product_category = ?,\n  inference_category = ?,\n\n  maybe_model_type = NULL,\n  maybe_model_token = NULL,\n\n  maybe_input_source_token = NULL,\n  maybe_input_source_token_type = NULL,\n\n  maybe_download_url = NULL,\n  maybe_cover_image_media_file_token = NULL,\n\n  maybe_prompt_token = ?,\n\n  maybe_wallet_ledger_entry_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  maybe_debug_log_event_token = ?,\n\n  status = ?\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 16
-    },
-    "nullable": []
-  },
-  "hash": "8f8b64c0af5383ff3baaa8aa2f2aa22cc760addd850d618ce543fe05816d11e0"
-}

.sqlx/query-a2c9e2f61eba666254f8432b3c50a0a7738ee3b3faa77c5281bc8e4af96159b9.json

@@ -1,6 +1,6 @@
 {
   "db_name": "MySQL",
-  "query": "\nSELECT\n    jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n\n    jobs.status as `status: enums::common::job_status_plus::JobStatusPlus`,\n    jobs.attempt_count,\n\n    jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n    jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n    jobs.creator_ip_address,\n\n    jobs.product_category as `product_category: enums::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory`,\n    jobs.inference_category as `inference_category: enums::by_table::generic_inference_jobs::inference_category::InferenceCategory`,\n    jobs.maybe_model_type,\n    jobs.maybe_model_token,\n    jobs.maybe_raw_inference_text,\n    jobs.maybe_inference_args,\n    jobs.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\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        ",
+  "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": [
       {
@@ -125,16 +125,6 @@
       },
       {
         "ordinal": 12,
-        "name": "maybe_prompt_token: tokens::tokens::prompts::PromptToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 13,
         "name": "maybe_frontend_failure_category: enums::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory",
         "type_info": {
           "type": "VarString",
@@ -144,7 +134,7 @@
         }
       },
       {
-        "ordinal": 14,
+        "ordinal": 13,
         "name": "failure_reason",
         "type_info": {
           "type": "VarString",
@@ -154,7 +144,7 @@
         }
       },
       {
-        "ordinal": 15,
+        "ordinal": 14,
         "name": "maybe_result_entity_type",
         "type_info": {
           "type": "VarString",
@@ -164,7 +154,7 @@
         }
       },
       {
-        "ordinal": 16,
+        "ordinal": 15,
         "name": "maybe_result_entity_token",
         "type_info": {
           "type": "VarString",
@@ -174,7 +164,7 @@
         }
       },
       {
-        "ordinal": 17,
+        "ordinal": 16,
         "name": "maybe_result_batch_token",
         "type_info": {
           "type": "VarString",
@@ -184,7 +174,7 @@
         }
       },
       {
-        "ordinal": 18,
+        "ordinal": 17,
         "name": "maybe_model_weights_title",
         "type_info": {
           "type": "VarString",
@@ -194,7 +184,7 @@
         }
       },
       {
-        "ordinal": 19,
+        "ordinal": 18,
         "name": "maybe_tts_model_title",
         "type_info": {
           "type": "VarString",
@@ -204,7 +194,7 @@
         }
       },
       {
-        "ordinal": 20,
+        "ordinal": 19,
         "name": "maybe_voice_conversion_model_title",
         "type_info": {
           "type": "VarString",
@@ -214,7 +204,7 @@
         }
       },
       {
-        "ordinal": 21,
+        "ordinal": 20,
         "name": "maybe_tts_public_bucket_path",
         "type_info": {
           "type": "VarString",
@@ -224,7 +214,7 @@
         }
       },
       {
-        "ordinal": 22,
+        "ordinal": 21,
         "name": "maybe_voice_conversion_public_bucket_hash",
         "type_info": {
           "type": "VarString",
@@ -234,7 +224,7 @@
         }
       },
       {
-        "ordinal": 23,
+        "ordinal": 22,
         "name": "maybe_media_file_public_bucket_directory_hash",
         "type_info": {
           "type": "VarString",
@@ -244,7 +234,7 @@
         }
       },
       {
-        "ordinal": 24,
+        "ordinal": 23,
         "name": "maybe_media_file_public_bucket_prefix",
         "type_info": {
           "type": "VarString",
@@ -254,7 +244,7 @@
         }
       },
       {
-        "ordinal": 25,
+        "ordinal": 24,
         "name": "maybe_media_file_public_bucket_extension",
         "type_info": {
           "type": "VarString",
@@ -264,7 +254,7 @@
         }
       },
       {
-        "ordinal": 26,
+        "ordinal": 25,
         "name": "maybe_assigned_worker",
         "type_info": {
           "type": "VarString",
@@ -274,7 +264,7 @@
         }
       },
       {
-        "ordinal": 27,
+        "ordinal": 26,
         "name": "maybe_assigned_cluster",
         "type_info": {
           "type": "VarString",
@@ -284,7 +274,7 @@
         }
       },
       {
-        "ordinal": 28,
+        "ordinal": 27,
         "name": "is_keepalive_required",
         "type_info": {
           "type": "Tiny",
@@ -294,7 +284,7 @@
         }
       },
       {
-        "ordinal": 29,
+        "ordinal": 28,
         "name": "created_at",
         "type_info": {
           "type": "Timestamp",
@@ -304,7 +294,7 @@
         }
       },
       {
-        "ordinal": 30,
+        "ordinal": 29,
         "name": "updated_at",
         "type_info": {
           "type": "Timestamp",
@@ -314,7 +304,7 @@
         }
       },
       {
-        "ordinal": 31,
+        "ordinal": 30,
         "name": "maybe_first_started_at",
         "type_info": {
           "type": "Timestamp",
@@ -324,7 +314,7 @@
         }
       },
       {
-        "ordinal": 32,
+        "ordinal": 31,
         "name": "maybe_successfully_completed_at",
         "type_info": {
           "type": "Timestamp",
@@ -334,7 +324,7 @@
         }
       },
       {
-        "ordinal": 33,
+        "ordinal": 32,
         "name": "database_clock",
         "type_info": {
           "type": "Datetime",
@@ -375,7 +365,6 @@
       true,
       true,
       true,
-      true,
       false,
       false,
       false,
@@ -384,5 +373,5 @@
       false
     ]
   },
-  "hash": "6948edca3f06643605695665df51cc94f897e2cb9a2d6906910d58d4d56ee73e"
+  "hash": "a2c9e2f61eba666254f8432b3c50a0a7738ee3b3faa77c5281bc8e4af96159b9"
 }

.sqlx/query-a62b88fec40a11952cc199383090ea338f97091e8bfc6b68aad67416685889af.json

@@ -1,80 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nSELECT\n  id as `id: u64`,\n  event_token as `event_token: tokens::tokens::non_unique::debug_logs_event_token::DebugLogEventToken`,\n  debug_log_type as `debug_log_type: enums::by_table::debug_logs::debug_log_type::DebugLogType`,\n  maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n  message,\n  created_at\nFROM debug_logs\nWHERE event_token = ?\nORDER BY id ASC\nLIMIT ?\n    ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "id: u64",
-        "type_info": {
-          "type": "LongLong",
-          "flags": "NOT_NULL | PRIMARY_KEY | UNSIGNED | AUTO_INCREMENT",
-          "char_set": 63,
-          "max_size": 20
-        }
-      },
-      {
-        "ordinal": 1,
-        "name": "event_token: tokens::tokens::non_unique::debug_logs_event_token::DebugLogEventToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 2,
-        "name": "debug_log_type: enums::by_table::debug_logs::debug_log_type::DebugLogType",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 96
-        }
-      },
-      {
-        "ordinal": 3,
-        "name": "maybe_creator_user_token: tokens::tokens::users::UserToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 4,
-        "name": "message",
-        "type_info": {
-          "type": "Blob",
-          "flags": "NOT_NULL | BLOB | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 67108860
-        }
-      },
-      {
-        "ordinal": 5,
-        "name": "created_at",
-        "type_info": {
-          "type": "Datetime",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY",
-          "char_set": 63,
-          "max_size": 19
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 2
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      true,
-      false,
-      false
-    ]
-  },
-  "hash": "a62b88fec40a11952cc199383090ea338f97091e8bfc6b68aad67416685889af"
-}

.sqlx/query-a9745ecf60b564ab096ee1dbe124221b5f288a4ae38e788e19bbd359db0b580f.json

@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nINSERT INTO debug_logs\nSET\n  event_token = ?,\n  debug_log_type = ?,\n  maybe_creator_user_token = ?,\n  message = ?\n    ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 4
-    },
-    "nullable": []
-  },
-  "hash": "a9745ecf60b564ab096ee1dbe124221b5f288a4ae38e788e19bbd359db0b580f"
-}

.sqlx/query-e869f065e6f184abbabae04ecd0da6ea02c0576cc22ee55e47eb91dd34048ef1.json

@@ -1,355 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nSELECT\n  token as `token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n  uuid_idempotency_token,\n  job_type as `maybe_job_type`,\n  product_category as `maybe_product_category`,\n  inference_category,\n  maybe_external_third_party,\n  maybe_external_third_party_id,\n  maybe_model_type,\n  maybe_model_token,\n  maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n  maybe_inference_args,\n  maybe_download_url,\n  on_success_result_entity_type,\n  on_success_result_entity_token,\n  on_success_result_batch_token,\n  maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n  maybe_creator_anonymous_visitor_token,\n  creator_ip_address,\n  creator_set_visibility,\n  maybe_wallet_ledger_entry_token,\n  maybe_debug_log_event_token as `maybe_debug_log_event_token: tokens::tokens::non_unique::debug_logs_event_token::DebugLogEventToken`,\n  status,\n  attempt_count as `attempt_count: u16`,\n  failure_reason,\n  internal_debugging_failure_reason,\n  frontend_failure_category,\n  maybe_routing_tag,\n  assigned_worker,\n  assigned_cluster,\n  created_at,\n  updated_at\nFROM generic_inference_jobs\nWHERE token = ?\n    ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "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": "uuid_idempotency_token",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 144
-        }
-      },
-      {
-        "ordinal": 2,
-        "name": "maybe_job_type",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 3,
-        "name": "maybe_product_category",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 4,
-        "name": "inference_category",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 5,
-        "name": "maybe_external_third_party",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 64
-        }
-      },
-      {
-        "ordinal": 6,
-        "name": "maybe_external_third_party_id",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 256
-        }
-      },
-      {
-        "ordinal": 7,
-        "name": "maybe_model_type",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 8,
-        "name": "maybe_model_token",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 9,
-        "name": "maybe_prompt_token: tokens::tokens::prompts::PromptToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 10,
-        "name": "maybe_inference_args",
-        "type_info": {
-          "type": "Blob",
-          "flags": "BLOB | BINARY",
-          "char_set": 224,
-          "max_size": 262140
-        }
-      },
-      {
-        "ordinal": 11,
-        "name": "maybe_download_url",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 4096
-        }
-      },
-      {
-        "ordinal": 12,
-        "name": "on_success_result_entity_type",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 13,
-        "name": "on_success_result_entity_token",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 14,
-        "name": "on_success_result_batch_token",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 15,
-        "name": "maybe_creator_user_token: tokens::tokens::users::UserToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 16,
-        "name": "maybe_creator_anonymous_visitor_token",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 17,
-        "name": "creator_ip_address",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 160
-        }
-      },
-      {
-        "ordinal": 18,
-        "name": "creator_set_visibility",
-        "type_info": {
-          "type": "String",
-          "flags": "NOT_NULL | BINARY | ENUM",
-          "char_set": 224,
-          "max_size": 28
-        }
-      },
-      {
-        "ordinal": 19,
-        "name": "maybe_wallet_ledger_entry_token",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 20,
-        "name": "maybe_debug_log_event_token: tokens::tokens::non_unique::debug_logs_event_token::DebugLogEventToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 21,
-        "name": "status",
-        "type_info": {
-          "type": "String",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM",
-          "char_set": 224,
-          "max_size": 76
-        }
-      },
-      {
-        "ordinal": 22,
-        "name": "attempt_count: u16",
-        "type_info": {
-          "type": "Short",
-          "flags": "NOT_NULL | UNSIGNED",
-          "char_set": 63,
-          "max_size": 5
-        }
-      },
-      {
-        "ordinal": 23,
-        "name": "failure_reason",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 2048
-        }
-      },
-      {
-        "ordinal": 24,
-        "name": "internal_debugging_failure_reason",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 2048
-        }
-      },
-      {
-        "ordinal": 25,
-        "name": "frontend_failure_category",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 26,
-        "name": "maybe_routing_tag",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 256
-        }
-      },
-      {
-        "ordinal": 27,
-        "name": "assigned_worker",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 512
-        }
-      },
-      {
-        "ordinal": 28,
-        "name": "assigned_cluster",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 512
-        }
-      },
-      {
-        "ordinal": 29,
-        "name": "created_at",
-        "type_info": {
-          "type": "Timestamp",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | TIMESTAMP",
-          "char_set": 63,
-          "max_size": 19
-        }
-      },
-      {
-        "ordinal": 30,
-        "name": "updated_at",
-        "type_info": {
-          "type": "Timestamp",
-          "flags": "NOT_NULL | BINARY | TIMESTAMP | ON_UPDATE_NOW",
-          "char_set": 63,
-          "max_size": 19
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      false,
-      false,
-      true,
-      true,
-      false,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      false,
-      false,
-      true,
-      true,
-      false,
-      false,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      false,
-      false
-    ]
-  },
-  "hash": "e869f065e6f184abbabae04ecd0da6ea02c0576cc22ee55e47eb91dd34048ef1"
-}

.sqlx/query-fbe482c8987231c3b5d75f2e792d0fdd033de8a7eb821428fa034752c73edfb7.json

@@ -1,6 +1,6 @@
 {
   "db_name": "MySQL",
-  "query": "\nSELECT\n    jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n\n    jobs.status as `status: enums::common::job_status_plus::JobStatusPlus`,\n    \n    jobs.maybe_external_third_party as `external_third_party: enums::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty`,\n    jobs.maybe_external_third_party_id as `external_third_party_id`,\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.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n    jobs.maybe_debug_log_event_token as `maybe_debug_log_event_token: tokens::tokens::non_unique::debug_logs_event_token::DebugLogEventToken`,\n\n    jobs.created_at,\n    jobs.updated_at\n\nFROM generic_inference_jobs as jobs\n\nWHERE jobs.maybe_external_third_party = ?\nAND jobs.maybe_external_third_party_id = ?\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    \n    jobs.maybe_external_third_party as `external_third_party: enums::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty`,\n    jobs.maybe_external_third_party_id as `external_third_party_id`,\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.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n\n    jobs.created_at,\n    jobs.updated_at\n\nFROM generic_inference_jobs as jobs\n\nWHERE jobs.maybe_external_third_party = ?\nAND jobs.maybe_external_third_party_id = ?\n        ",
   "describe": {
     "columns": [
       {
@@ -85,16 +85,6 @@
       },
       {
         "ordinal": 8,
-        "name": "maybe_debug_log_event_token: tokens::tokens::non_unique::debug_logs_event_token::DebugLogEventToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 9,
         "name": "created_at",
         "type_info": {
           "type": "Timestamp",
@@ -104,7 +94,7 @@
         }
       },
       {
-        "ordinal": 10,
+        "ordinal": 9,
         "name": "updated_at",
         "type_info": {
           "type": "Timestamp",
@@ -126,10 +116,9 @@
       true,
       false,
       true,
-      true,
       false,
       false
     ]
   },
-  "hash": "2c98621c08055374fd09502c94ac40bb01d23fcea3f844cceea7446a5c0cb4dc"
+  "hash": "fbe482c8987231c3b5d75f2e792d0fdd033de8a7eb821428fa034752c73edfb7"
 }

CLAUDE.md

@@ -62,7 +62,6 @@ artcraft/
 - A mix of wreq and reqwest for Rust HTTP clients
 - Never use `println!` or `eprintln!` outside of tests; use `log` crate macros instead
 - When two crates export the same type name, alias imports with a suffix: `use foo::Bar as BarFoo;`
-- Prefer `use` imports over inline fully-qualified paths; only qualify inline for true one-offs or std collisions
 - TypeScript with Nx, React, Vite, Zustand, and Three.js
 - Use two spaces for indentation
 
@@ -76,4 +75,3 @@ Organize for top-to-bottom reading. Important things first, details later.
 - **In impl blocks**: constructors first, then public methods, then private helpers
 - Private helpers go *below* the methods that call them
 - Among helpers: meatier logic above leaf-level formatters
-- **In test modules**: constants first, then test cases (grouped into sub-modules when 2+), then helper functions last

Cargo.lock

@@ -1404,22 +1404,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "beeble_client"
-version = "0.0.1"
-dependencies = [
- "anyhow",
- "errors",
- "log",
- "reqwest 0.12.23",
- "serde",
- "serde_derive",
- "serde_json",
- "test_data",
- "tokio",
- "workspace-build-acceleration",
-]
-
 [[package]]
 name = "bigdecimal"
 version = "0.3.1"
@@ -11250,7 +11234,6 @@ dependencies = [
  "async-stripe 0.26.0",
  "async-trait",
  "base64 0.22.1",
- "beeble_client",
  "billing_artcraft_component",
  "billing_component",
  "bootstrap",
@@ -11486,18 +11469,13 @@ name = "support-tool"
 version = "0.0.1"
 dependencies = [
  "anyhow",
- "artcraft_api_defs",
- "artcraft_client",
  "clap 4.5.60",
  "easyenv",
- "enums",
  "errors",
  "log",
  "seedance2pro_client",
  "serde_json",
- "tokens",
  "tokio",
- "uuid 1.22.0",
 ]
 
 [[package]]

Cargo.toml

@@ -16,7 +16,6 @@ members = [
   "crates/api_clients/grok_client",
   "crates/api_clients/midjourney_client",
   "crates/api_clients/muapi_client",
-  "crates/api_clients/beeble_client",
   "crates/api_clients/openai_sora_client",
   "crates/api_clients/openart_client",
   "crates/api_clients/rootly_client",
@@ -245,7 +244,6 @@ fal_client = { path = "crates/api_clients/fal_client" }
 ffmpeg_utils = { path = "crates/lib/ffmpeg_utils" }
 file_to_base64_url = { path = "crates/lib/files/file_to_base64_url" }
 filesys = { path = "crates/lib/files/filesys" }
-beeble_client = { path = "crates/api_clients/beeble_client" }
 grok_client = { path = "crates/api_clients/grok_client" }
 rootly_client = { path = "crates/api_clients/rootly_client" }
 rootly_config = { path = "crates/schema/config/rootly_config" }

_database/sql/migrations/2026-04-30-232213-0000_alter_prompts_add_quality/down.sql

@@ -1,6 +0,0 @@
--- noinspection SqlDialectInspectionForFile
--- noinspection SqlNoDataSourceInspectionForFile
--- noinspection SqlResolveForFile
-
-ALTER TABLE prompts
-  DROP COLUMN maybe_quality;

_database/sql/migrations/2026-04-30-232213-0000_alter_prompts_add_quality/up.sql

@@ -1,8 +0,0 @@
--- noinspection SqlDialectInspectionForFile
--- noinspection SqlNoDataSourceInspectionForFile
--- noinspection SqlResolveForFile
-
--- Add quality parameter to prompts table.
--- Represented by the enum `CommonQuality` (high, medium, low).
-ALTER TABLE prompts
-  ADD COLUMN maybe_quality VARCHAR(16) DEFAULT NULL;

_database/sql/migrations/2026-05-04-022013-0000_debug_logs/down.sql

@@ -1,5 +0,0 @@
--- noinspection SqlDialectInspectionForFile
--- noinspection SqlNoDataSourceInspectionForFile
--- noinspection SqlResolveForFile
-
-DROP TABLE IF EXISTS debug_logs;

_database/sql/migrations/2026-05-04-022013-0000_debug_logs/up.sql

@@ -1,31 +0,0 @@
--- noinspection SqlDialectInspectionForFile
--- noinspection SqlNoDataSourceInspectionForFile
--- noinspection SqlResolveForFile
-
-CREATE TABLE debug_logs (
-
-  -- Not used for anything except replication.
-  id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
-
-  -- Event token. Not unique — multiple log rows can share the same event.
-  event_token VARCHAR(32) NOT NULL,
-
-  -- The type of debug log entry.
-  debug_log_type VARCHAR(24) NOT NULL,
-
-  -- The user who created the log entry (if any).
-  maybe_creator_user_token VARCHAR(32) DEFAULT NULL,
-
-  -- The log message body.
-  message MEDIUMTEXT NOT NULL,
-
-  created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-
-  -- INDICES --
-  PRIMARY KEY (id),
-  KEY index_event_token (event_token),
-  KEY index_debug_log_type (debug_log_type),
-  KEY index_maybe_creator_user_token (maybe_creator_user_token),
-  KEY index_created_at (created_at)
-
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;

_database/sql/migrations/2026-05-04-032408-0000_alter_generic_inference_jobs_add_debug_log_event_token/down.sql

@@ -1,6 +0,0 @@
--- noinspection SqlDialectInspectionForFile
--- noinspection SqlNoDataSourceInspectionForFile
--- noinspection SqlResolveForFile
-
-ALTER TABLE generic_inference_jobs
-  DROP COLUMN maybe_debug_log_event_token;

_database/sql/migrations/2026-05-04-032408-0000_alter_generic_inference_jobs_add_debug_log_event_token/up.sql

@@ -1,6 +0,0 @@
--- noinspection SqlDialectInspectionForFile
--- noinspection SqlNoDataSourceInspectionForFile
--- noinspection SqlResolveForFile
-
-ALTER TABLE generic_inference_jobs
-  ADD COLUMN maybe_debug_log_event_token VARCHAR(32) DEFAULT NULL;

_database/sql/migrations_squashed/debug_logs.sql

@@ -1,31 +0,0 @@
--- noinspection SqlDialectInspectionForFile
--- noinspection SqlNoDataSourceInspectionForFile
--- noinspection SqlResolveForFile
-
-CREATE TABLE debug_logs (
-
-  -- Not used for anything except replication.
-  id BIGINT(20) UNSIGNED NOT NULL AUTO_INCREMENT,
-
-  -- Event token. Not unique — multiple log rows can share the same event.
-  event_token VARCHAR(32) NOT NULL,
-
-  -- The type of debug log entry.
-  debug_log_type VARCHAR(24) NOT NULL,
-
-  -- The user who created the log entry (if any).
-  maybe_creator_user_token VARCHAR(32) DEFAULT NULL,
-
-  -- The log message body.
-  message MEDIUMTEXT NOT NULL,
-
-  created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-
-  -- INDICES --
-  PRIMARY KEY (id),
-  KEY index_event_token (event_token),
-  KEY index_debug_log_type (debug_log_type),
-  KEY index_maybe_creator_user_token (maybe_creator_user_token),
-  KEY index_created_at (created_at)
-
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;

_database/sql/migrations_squashed/generic_inference_jobs.sql

@@ -109,7 +109,7 @@ CREATE TABLE generic_inference_jobs (
   -- If we pre-constructed a prompt, this will be copied to the resultant media generated.
   -- This is especially important for Fal-related jobs and endpoints. We need this for keeping
   -- track of all the prompt details, context images, etc.
-  maybe_prompt_token VARCHAR(32) DEFAULT NULL,
+  maybe_prompt_token VARCHAR(30) DEFAULT NULL,
 
   -- A migration flag we can control from the backend API service which will tell
   -- the worker where to store the results. If false, GCP. If true, AWS.
@@ -204,10 +204,6 @@ CREATE TABLE generic_inference_jobs (
   -- off special workers to handle certain jobs.
   maybe_routing_tag VARCHAR(64) DEFAULT NULL,
 
-  -- Foreign key to the debug_logs table (event_token column).
-  -- Multiple debug_logs rows can share the same event token.
-  maybe_debug_log_event_token VARCHAR(32) DEFAULT NULL,
-
   -- ========== JOB SYSTEM DETAILS ==========
 
   -- Jobs begin as "pending", then transition to other states.

_database/sql/migrations_squashed/prompts/prompts.sql

@@ -68,10 +68,6 @@ CREATE TABLE prompts (
   -- The resolution for the prompt (eg. four_k, 720p, etc.)
   maybe_resolution VARCHAR(16) DEFAULT NULL,
 
-  -- Represented by the enum `CommonQuality`.
-  -- The quality setting (eg. high, medium, low)
-  maybe_quality VARCHAR(16) DEFAULT NULL,
-
   -- The duration in seconds
   maybe_duration_seconds INT UNSIGNED DEFAULT NULL,
 

_tools/postman/collections/ArtCraft API/generate/cost/Estimate Image Cost.request.yaml

@@ -15,12 +15,11 @@ body:
   type: json
   content: |
     {
-        "model": "gpt_image_2",
+        "model": "seedream_5_lite",
         "provider": "artcraft",
         "generation_mode": {"type": "text_to_image" },
         "aspect_ratio": "wide_sixteen_by_nine",
         "resolution": "two_k",
-        "quality": "low",
         "image_batch_count": 1
     }
 order: 2000

_tools/postman/collections/ArtCraft API/generate/video/edit/.resources/definition.yaml

@@ -1,3 +0,0 @@
-$kind: collection
-name: edit
-order: 312

_tools/postman/collections/ArtCraft API/generate/video/edit/Beeble SwitchX Edit Video.request.yaml

@@ -1,23 +0,0 @@
-$kind: http-request
-name: Beeble SwitchX Edit Video
-url: "{{api_host}}/v1/generate/video/edit/beeble_switchx"
-method: POST
-headers:
-  - key: Accept
-    value: application/json
-  - key: Session
-    value: ""
-    disabled: true
-body:
-  type: json
-  content: >-
-    {
-        "uuid_idempotency_token": "{{$randomUUID}}",
-        //"source_video_media_token": "m_6vve5gffn2r4rajyvy8z2380x15kqc", // two corgis (dev)
-        "source_video_media_token": "m_rkgdk7qw0a7gz4mrzfv0q78ax57kbx", // corgi cowboy (dev)
-        //"source_video_media_token": "m_1k19k6dgdny253zag8g3jqf3bgemss", // corgi watermellon (prod)
-        "reference_image_media_token": "m_pf310vdhc4v98n7r8mz70bz9geest3"  // tornado (dev)
-        //"reference_image_media_token": "m_z4y097t9pdmbyatf70z0qb8zvfphvm"  // cactus (prod)
-        //"prompt": "Stormy skies, there's a rotating tornado in the background"
-    }
-order: 1778262498846

_tools/postman/collections/ArtCraft API/prompts/Batch Get Prompt.request.yaml

@@ -1,11 +0,0 @@
-$kind: http-request
-name: Batch Get Prompt
-url: "{{api_host}}/v1/prompts/prompt_8q8fwcmh93nn8pjb2szeqbxgz"
-method: GET
-headers:
-  - key: Accept
-    value: application/json
-  - key: Session
-    value: ""
-    disabled: true
-order: 2171327660164107

_tools/postman/collections/ArtCraft API/users/Login.request.yaml

@@ -9,7 +9,7 @@ body:
         // hanashi : password (dev)
         //"username_or_email": "hanashi",
         //"password": "hanashi"
-        "username_or_email": "newuser4",
-        "password": "newuser4"
+        "username_or_email": "newuser2",
+        "password": "newuser2"
     }
 order: 1000

crates/CLAUDE.md

@@ -1,59 +0,0 @@
-# Rust Workspace
-
-All Rust code lives under `crates/`. The workspace is defined in `Cargo.toml` at the repo root.
-
-## Code Style
-
-- Two spaces for indentation (not four)
-- No minimum supported Rust version; use latest stable features freely
-- Never use `println!` or `eprintln!` outside of tests; use `log` crate macros instead
-- Use `anyhow::Result` / `AnyhowResult` for fallible functions in application code
-- Fields that are optional use the `maybe_` prefix: `maybe_creator_user_token`
-- When two crates export the same type name, alias with a suffix: `use foo::Bar as BarFoo;`
-- Prefer `use` imports over inline fully-qualified paths; only qualify inline for true one-offs or std prelude collisions (`Result`, `Option`, `Error`)
-
-## File Layout
-
-Organize for top-to-bottom reading. Important things first, details later.
-
-1. **Constants** at the top (after imports)
-2. **Primary public type** (the main struct/enum the file defines)
-3. **Supporting types** below the primary type
-4. **API types** in order: Request, Response, Error
-5. **`impl` blocks** after their type definitions
-   - Constructors first, then public methods, then private helpers
-   - Callers above callees — follow the call chain downward
-
-## Test Layout
-
-Within `#[cfg(test)] mod tests { ... }`:
-
-1. **Imports**
-2. **Constants** (test IDs, URLs, fixture data) — small context that tests reference
-3. **Test functions or sub-modules** grouped by category
-4. **Helper functions** (builders, pipeline runners, assertions)
-
-Constants provide small context up front. Test cases come next so engineers see *what* is
-tested before *how* the helpers work.
-
-Group related tests into sub-modules (`mod pricing_tests { ... }`) when a category has 2+
-tests. Don't wrap a single test in its own module. Keep nesting to two levels max. Shared
-helpers go in the parent `mod tests` so sub-modules can `use super::*`.
-
-## Building
-
-- Most crates: `cargo check -p {crate_name}` or `cargo test -p {crate_name}`
-- Crates using SQLx: `SQLX_OFFLINE=true cargo check -p {crate_name}`
-- `storyteller-web` and `mysql_queries` require `SQLX_OFFLINE=true`
-- `storyteller-web` has ~370 pre-existing warnings — check the last few lines for actual errors
-
-## Key Crates
-
-- `storyteller_web` — main HTTP API monolith (actix-web)
-- `artcraft` (desktop) — Tauri desktop app
-- `artcraft_router` — provider routing for image/video generation (Artcraft, Fal, Seedance2Pro, Muapi)
-- `artcraft_api_defs` — shared HTTP API type definitions
-- `seedance2pro_client` — HTTP client for the Kinovi/Seedance2Pro video generation service
-- `enums` — database-backed enums stored as VARCHAR fields
-- `tokens` — primary key identifiers with Stripe-like prefixes (e.g. `user_`, `mf_`)
-- `mysql_queries` — SQLx MySQL queries for the backend

crates/api_clients/artcraft/artcraft_api_defs/src/generate/cost_estimate/estimate_image_cost.rs

@@ -3,14 +3,13 @@ use utoipa::ToSchema;
 
 use enums::common::generation::common_aspect_ratio::CommonAspectRatio;
 use enums::common::generation::common_image_model::CommonImageModel;
-use enums::common::generation::common_quality::CommonQuality;
 use enums::common::generation::common_resolution::CommonResolution;
 use enums::common::generation_provider::GenerationProvider;
 
 pub const ESTIMATE_IMAGE_COST_PATH: &str = "/v1/generate/cost_estimate/image";
 
 /// Request body for the image cost estimate endpoint.
-#[derive(Serialize, Deserialize, ToSchema, Debug)]
+#[derive(Serialize, Deserialize, ToSchema)]
 pub struct EstimateImageCostRequest {
   /// The image model to estimate costs for.
   pub model: CommonImageModel,
@@ -30,15 +29,12 @@ pub struct EstimateImageCostRequest {
   /// Optional resolution.
   pub resolution: Option<CommonResolution>,
 
-  // Optional quality.
-  pub quality: Option<CommonQuality>,
-
   /// Number of images to generate in parallel.
   pub image_batch_count: Option<u16>,
 }
 
 /// Describes the type of image generation being requested.
-#[derive(Serialize, Deserialize, ToSchema, Debug)]
+#[derive(Serialize, Deserialize, ToSchema)]
 #[serde(tag = "type", rename_all = "snake_case")]
 pub enum GenerationMode {
   /// No input images — generate from prompt only.
@@ -98,7 +94,6 @@ mod tests {
       generation_mode: GenerationMode::TextToImage,
       aspect_ratio: None,
       resolution: None,
-      quality: None,
       image_batch_count: None,
     };
     let serialized = serde_json::to_string(&request).unwrap();
@@ -113,7 +108,6 @@ mod tests {
       generation_mode: GenerationMode::ImageEdit { count: 2 },
       aspect_ratio: None,
       resolution: None,
-      quality: None,
       image_batch_count: None,
     };
     let serialized = serde_json::to_string(&request).unwrap();

crates/api_clients/artcraft/artcraft_api_defs/src/generate/video/edit/beeble_switchx_edit_video.rs

@@ -1,20 +0,0 @@
-use serde_derive::{Deserialize, Serialize};
-use tokens::tokens::generic_inference_jobs::InferenceJobToken;
-use tokens::tokens::media_files::MediaFileToken;
-use utoipa::ToSchema;
-
-pub const BEEBLE_SWITCHX_EDIT_VIDEO_PATH: &str = "/v1/generate/video/edit/beeble_switchx";
-
-#[derive(Serialize, Deserialize, ToSchema, Debug)]
-pub struct BeebleSwitchXEditVideoRequest {
-  pub uuid_idempotency_token: String,
-  pub source_video_media_token: Option<MediaFileToken>,
-  pub reference_image_media_token: Option<MediaFileToken>,
-  pub prompt: Option<String>,
-}
-
-#[derive(Serialize, Deserialize, ToSchema)]
-pub struct BeebleSwitchXEditVideoResponse {
-  pub success: bool,
-  pub inference_job_token: InferenceJobToken,
-}

crates/api_clients/artcraft/artcraft_api_defs/src/generate/video/edit/mod.rs

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

crates/api_clients/artcraft/artcraft_api_defs/src/generate/video/mod.rs

@@ -1,4 +1,3 @@
-pub mod edit;
 pub mod generate_kling_1_6_pro_image_to_video;
 pub mod generate_kling_2_1_master_image_to_video;
 pub mod generate_kling_2_1_pro_image_to_video;

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

@@ -7,7 +7,7 @@ use utoipa::ToSchema;
 pub const SEEDANCE_2P0_MULTI_FUNCTION_VIDEO_GEN_PATH: &str = "/v1/generate/video/multi_function/seedance_2p0";
 
 /// Seedance 2.0 multi-function video generation (text-to-video, image-to-video, and reference-based).
-#[derive(Clone, Debug, Serialize, Deserialize, ToSchema)]
+#[derive(Serialize, Deserialize, ToSchema)]
 pub struct Seedance2p0MultiFunctionVideoGenRequest {
   /// Idempotency token to prevent duplicate requests.
   pub uuid_idempotency_token: String,
@@ -37,9 +37,6 @@ pub struct Seedance2p0MultiFunctionVideoGenRequest {
   /// Video aspect ratio / resolution.
   pub aspect_ratio: Option<Seedance2p0AspectRatio>,
 
-  /// Output resolution quality tier (480p, 720p, 1080p).
-  pub output_resolution: Option<Seedance2p0OutputResolution>,
-
   /// Duration in seconds (4–15).
   pub duration_seconds: Option<u8>,
 
@@ -70,17 +67,6 @@ pub enum Seedance2p0BatchCount {
   Four,
 }
 
-#[derive(Copy, Clone, Debug, Serialize, Deserialize, ToSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum Seedance2p0OutputResolution {
-  /// 480p
-  FourEightyP,
-  /// 720p (default)
-  SevenTwentyP,
-  /// 1080p
-  TenEightyP,
-}
-
 #[derive(Serialize, Deserialize, ToSchema)]
 pub struct Seedance2p0MultiFunctionVideoGenResponse {
   pub success: bool,

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

@@ -1,17 +1,16 @@
 use crate::common::responses::job_details::{JobDetailsLipsyncRequest, JobDetailsLivePortraitRequest};
 use crate::common::responses::media_links::MediaLinks;
 use chrono::{DateTime, Utc};
-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 enums::by_table::generic_inference_jobs::inference_category::InferenceCategory;
 use enums::common::job_status_plus::JobStatusPlus;
 use enums::no_table::style_transfer::style_transfer_name::StyleTransferName;
 use serde::Deserialize;
 use serde::Serialize;
-use tokens::tokens::batch_generations::BatchGenerationToken;
 use tokens::tokens::generic_inference_jobs::InferenceJobToken;
-use tokens::tokens::prompts::PromptToken;
 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";
 
@@ -54,9 +53,6 @@ pub struct ListSessionJobsItem {
 #[derive(Serialize, Deserialize, ToSchema)]
 pub struct ListSessionRequestDetailsResponse {
   pub inference_category: InferenceCategory,
-
-  pub maybe_prompt_token: Option<PromptToken>,
-
   pub maybe_model_type: Option<String>,
   pub maybe_model_token: Option<String>,
 

crates/api_clients/artcraft/artcraft_api_defs/src/omni_gen/cost_and_generate_requests/omni_gen_video_cost_and_generate_request.rs

@@ -9,7 +9,7 @@ use tokens::tokens::characters::CharacterToken;
 use tokens::tokens::media_files::MediaFileToken;
 
 /// Shared request body for both the video cost estimate and video generation endpoints.
-#[derive(Clone, Serialize, Deserialize, ToSchema, Debug)]
+#[derive(Serialize, Deserialize, ToSchema, Debug)]
 pub struct OmniGenVideoCostAndGenerateRequest {
   /// REQUIRED (even if marked optional)
   /// Idempotency token to prevent duplicate requests.

crates/api_clients/artcraft/artcraft_api_defs/src/omni_gen/generate_response/omni_gen_video_generate_response.rs

@@ -6,12 +6,5 @@ use utoipa::ToSchema;
 #[derive(Serialize, Deserialize, ToSchema)]
 pub struct OmniGenVideoGenerateResponse {
   pub success: bool,
-
   pub inference_job_token: InferenceJobToken,
-
-  /// All job tokens created by this request (including the primary).
-  /// For single-job requests this will contain just one element matching
-  /// `inference_job_token`. For batch requests (eg. Seedance2Pro with
-  /// multiple order IDs) this will contain all of them.
-  pub all_job_tokens: Vec<InferenceJobToken>,
 }

crates/api_clients/artcraft/artcraft_api_defs/src/prompts/batch_get_prompts.rs

@@ -1,71 +0,0 @@
-use crate::prompts::get_prompt::GetPromptImageContextItem;
-use chrono::{DateTime, Utc};
-use enums::by_table::prompts::prompt_type::PromptType;
-use enums::common::generation::common_aspect_ratio::CommonAspectRatio;
-use enums::common::generation::common_generation_mode::CommonGenerationMode;
-use enums::common::generation::common_model_class::CommonModelClass;
-use enums::common::generation::common_model_type::CommonModelType;
-use enums::common::generation::common_resolution::CommonResolution;
-use enums::common::generation_provider::GenerationProvider;
-use std::collections::HashSet;
-
-use serde_derive::{Deserialize, Serialize};
-use tokens::tokens::prompts::PromptToken;
-use utoipa::{IntoParams, ToSchema};
-
-pub const BATCH_GET_PROMPTS_PATH: &str = "/v1/prompt/batch";
-
-#[derive(Deserialize, ToSchema, IntoParams)]
-pub struct BatchGetPromptsQuery {
-  /// Prompt tokens to look up.
-  pub tokens: HashSet<String>,
-}
-
-#[derive(Serialize, ToSchema)]
-pub struct BatchGetPromptsResponse {
-  pub success: bool,
-  pub prompts: Vec<BatchPromptInfo>,
-}
-
-#[derive(Serialize, ToSchema)]
-pub struct BatchPromptInfo {
-  pub token: PromptToken,
-
-  /// The type of model used
-  pub maybe_model_type: Option<CommonModelType>,
-
-  /// The class of model used
-  pub maybe_model_class: Option<CommonModelClass>,
-
-  /// The service provider used
-  pub maybe_generation_provider: Option<GenerationProvider>,
-
-  /// Positive prompt (technically optional, but usually present)
-  pub maybe_positive_prompt: Option<String>,
-
-  /// Negative prompt (optional)
-  pub maybe_negative_prompt: Option<String>,
-
-  /// OPTIONAL. The generation mode (eg. keyframe, reference, inpaint, etc.)
-  pub maybe_generation_mode: Option<CommonGenerationMode>,
-
-  /// OPTIONAL. The aspect ratio (eg. square, auto, wide_three_by_two, etc.)
-  pub maybe_aspect_ratio: Option<CommonAspectRatio>,
-
-  /// OPTIONAL. The resolution (eg. one_k, two_k, four_k, etc.)
-  pub maybe_resolution: Option<CommonResolution>,
-
-  /// OPTIONAL. The number of outputs to generate (0-255).
-  pub maybe_batch_count: Option<u8>,
-
-  /// OPTIONAL. Whether to generate audio.
-  pub maybe_generate_audio: Option<bool>,
-
-  /// OPTIONAL. The duration in seconds.
-  pub maybe_duration_seconds: Option<u32>,
-
-  /// Context images (optional)
-  pub maybe_context_images: Option<Vec<GetPromptImageContextItem>>,
-
-  pub created_at: DateTime<Utc>,
-}

crates/api_clients/artcraft/artcraft_api_defs/src/prompts/get_prompt.rs

@@ -27,6 +27,13 @@ pub struct GetPromptSuccessResponse {
   pub prompt: PromptInfo,
 }
 
+#[derive(Serialize, ToSchema)]
+pub struct GetPromptImageContextItem {
+  pub media_token: MediaFileToken,
+  pub semantic: PromptContextSemanticType,
+  pub media_links: MediaLinks,
+}
+
 #[derive(Serialize, ToSchema)]
 pub struct PromptInfo {
   pub token: PromptToken,
@@ -123,13 +130,6 @@ pub struct PromptInfo {
   pub created_at: DateTime<Utc>,
 }
 
-#[derive(Serialize, ToSchema)]
-pub struct GetPromptImageContextItem {
-  pub media_token: MediaFileToken,
-  pub semantic: PromptContextSemanticType,
-  pub media_links: MediaLinks,
-}
-
 #[derive(Serialize, ToSchema)]
 pub struct PromptInfoModeratorFields {
   /// How many milliseconds it took to run generation.

crates/api_clients/artcraft/artcraft_api_defs/src/prompts/mod.rs

@@ -1,3 +1,2 @@
-pub mod batch_get_prompts;
 pub mod create_prompt;
 pub mod get_prompt;

crates/api_clients/artcraft/artcraft_client/src/endpoints/generate/video/edit/beeble_switchx_edit_video.rs

@@ -1,20 +0,0 @@
-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::video::edit::beeble_switchx_edit_video::{
-  BeebleSwitchXEditVideoRequest, BeebleSwitchXEditVideoResponse, BEEBLE_SWITCHX_EDIT_VIDEO_PATH,
-};
-
-pub async fn beeble_switchx_edit_video(
-  api_host: &ApiHost,
-  maybe_creds: Option<&StorytellerCredentialSet>,
-  request: BeebleSwitchXEditVideoRequest,
-) -> Result<BeebleSwitchXEditVideoResponse, StorytellerError> {
-  Ok(basic_json_post_request(
-    api_host,
-    BEEBLE_SWITCHX_EDIT_VIDEO_PATH,
-    maybe_creds,
-    request,
-  ).await?)
-}

crates/api_clients/artcraft/artcraft_client/src/endpoints/generate/video/edit/mod.rs

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

crates/api_clients/artcraft/artcraft_client/src/endpoints/generate/video/mod.rs

@@ -1,4 +1,3 @@
-pub mod edit;
 pub mod generate_kling_16_pro_image_to_video;
 pub mod generate_kling_21_master_image_to_video;
 pub mod generate_kling_21_pro_image_to_video;

crates/api_clients/artcraft/artcraft_client/src/endpoints/omni_gen/generate/image/mod.rs

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

crates/api_clients/artcraft/artcraft_client/src/endpoints/omni_gen/generate/image/omni_gen_image.rs

@@ -1,21 +0,0 @@
-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::omni_gen::cost_and_generate_requests::omni_gen_image_cost_and_generate_request::OmniGenImageCostAndGenerateRequest;
-use artcraft_api_defs::omni_gen::generate_response::omni_gen_image_generate_response::OmniGenImageGenerateResponse;
-
-pub const OMNI_GEN_IMAGE_GENERATE_PATH: &str = "/v1/omni_gen/generate/image";
-
-pub async fn omni_gen_image_generate(
-  api_host: &ApiHost,
-  maybe_creds: Option<&StorytellerCredentialSet>,
-  request: OmniGenImageCostAndGenerateRequest,
-) -> Result<OmniGenImageGenerateResponse, StorytellerError> {
-  Ok(basic_json_post_request(
-    api_host,
-    OMNI_GEN_IMAGE_GENERATE_PATH,
-    maybe_creds,
-    request,
-  ).await?)
-}

crates/api_clients/artcraft/artcraft_client/src/endpoints/omni_gen/generate/mod.rs

@@ -1,2 +1 @@
-pub mod image;
 pub mod video;

crates/api_clients/artcraft/artcraft_client/src/error/api_error.rs

@@ -1,6 +1,5 @@
 use cloudflare_errors::cloudflare_error::CloudflareError;
 use errors::AnyhowError;
-use reqwest::StatusCode;
 use std::error::Error;
 use std::fmt::{Display, Formatter};
 use std::io;
@@ -31,12 +30,6 @@ pub enum ApiError {
     backend_hostname: Option<String>,
   },
 
-  /// An uncategorized bad HTTP response with status code and body.
-  UncategorizedBadResponseWithStatusAndBody {
-    status_code: StatusCode,
-    body: String,
-  },
-
   /// Cloudflare errors.
   CloudflareError(CloudflareError),
 
@@ -73,8 +66,6 @@ impl Display for ApiError {
       ApiError::TooManyRequests(msg) => write!(f, "Too many requests to Storyteller backend: {}", msg),
       ApiError::InternalServerError {body, backend_hostname} => 
         write!(f, "Internal Server Error; backend hostname: {:?} ; body: {}; ", backend_hostname, body),
-      ApiError::UncategorizedBadResponseWithStatusAndBody { status_code, body } => 
-        write!(f, "Uncategorized bad response with status code {} and body: {}", status_code, body),
       // Server response handling errors
       ApiError::DeserializationError(error) => write!(f, "Deserialization error: {}", error),
       // Network errors

crates/api_clients/artcraft/artcraft_client/src/recipes/download_media_file.rs

@@ -1,157 +0,0 @@
-use std::fs;
-use std::io::Write;
-use std::path::{Path, PathBuf};
-
-use log::{info, warn};
-use reqwest::Client;
-use url::Url;
-
-use tokens::tokens::media_files::MediaFileToken;
-
-use crate::endpoints::media_files::get_media_file::{get_media_file, GetMediaFileSuccessResponse};
-use crate::error::api_error::ApiError;
-use crate::error::client_error::ClientError;
-use crate::error::storyteller_error::StorytellerError;
-use crate::utils::api_host::ApiHost;
-
-pub struct DownloadMediaFileArgs<'a, P: AsRef<Path>> {
-  pub media_token: &'a MediaFileToken,
-  pub api_host: &'a ApiHost,
-  pub download_path: DownloadPath<P>,
-}
-
-pub enum DownloadPath<P: AsRef<Path>> {
-  /// Write the file to this exact path.
-  ExactFilename(P),
-  /// Write the file into this directory, generating a filename from the CDN URL extension.
-  Directory(P),
-}
-
-pub struct DownloadMediaFileResult {
-  /// The path the file was written to.
-  pub downloaded_file_path: PathBuf,
-
-  /// The full media file response from the API.
-  pub media_file_response: GetMediaFileSuccessResponse,
-
-  /// Size of downloaded file in bytes.
-  pub filesize_bytes: usize,
-}
-
-pub async fn download_media_file<P: AsRef<Path>>(
-  args: DownloadMediaFileArgs<'_, P>,
-) -> Result<DownloadMediaFileResult, StorytellerError> {
-  let DownloadMediaFileArgs {
-    media_token,
-    api_host,
-    download_path
-  } = args;
-
-  // 1. Fetch media file info from the API.
-  let response = get_media_file(api_host, media_token).await?;
-  let media_class = &response.media_file.media_class;
-  let cdn_url = &response.media_file.media_links.cdn_url;
-
-  info!("Downloading media file {} of class {} from CDN: {}",
-    media_token.as_str(), media_class.to_str(), cdn_url);
-
-  // 2. Determine the output file path.
-  let output_path = match &download_path {
-    DownloadPath::ExactFilename(path) => path.as_ref().to_path_buf(),
-    DownloadPath::Directory(dir) => {
-      let filename = derive_filename_from_url(cdn_url, &media_token);
-      dir.as_ref().join(filename)
-    }
-  };
-
-  // 3. Download the bytes from the CDN.
-  let bytes = download_bytes(cdn_url).await?;
-
-  // 4. Write to disk.
-  let mut file = fs::File::create(&output_path)
-    .map_err(|err| StorytellerError::Client(ClientError::IoError(err)))?;
-
-  file.write_all(&bytes)
-    .map_err(|err| StorytellerError::Client(ClientError::IoError(err)))?;
-
-  file.flush()
-    .map_err(|err| StorytellerError::Client(ClientError::IoError(err)))?;
-
-  info!("Downloaded {} bytes to {:?}", bytes.len(), output_path);
-
-  Ok(DownloadMediaFileResult {
-    downloaded_file_path: output_path,
-    media_file_response: response,
-    filesize_bytes: bytes.len(),
-  })
-}
-
-// ── Helpers ──
-
-async fn download_bytes(url: &Url) -> Result<Vec<u8>, StorytellerError> {
-  let client = Client::builder()
-    .gzip(true)
-    .build()
-    .map_err(|err| StorytellerError::Client(ClientError::ReqwestError(err)))?;
-
-  let response = client.get(url.as_str())
-    .send()
-    .await
-    .map_err(|err| StorytellerError::Api(ApiError::OtherReqwestError(err)))?;
-
-  let status_code = response.status();
-
-  if !status_code.is_success() {
-    let body = response.text().await.unwrap_or_else(|err| {
-      warn!("Failed to retrieve response body: {}", err);
-      "".to_string()
-    });
-    return Err(StorytellerError::Api(ApiError::UncategorizedBadResponseWithStatusAndBody {
-      status_code,
-      body,
-    }));
-  }
-
-  let bytes = response.bytes()
-    .await
-    .map_err(|err| StorytellerError::Client(ClientError::ReqwestError(err)))?;
-
-  Ok(bytes.to_vec())
-}
-
-/// Derive a filename from the CDN URL's path extension, falling back to the media token.
-fn derive_filename_from_url(url: &Url, media_token: &MediaFileToken) -> String {
-  let path = url.path();
-  let extension = Path::new(path)
-    .extension() // NB: without dot '.'
-    .and_then(|ext| ext.to_str())
-    .unwrap_or("bin");
-
-  format!("{}.{}", media_token.as_str(), extension)
-}
-
-#[cfg(test)]
-mod tests {
-  use super::*;
-
-  #[test]
-  fn derive_filename_from_url_extracts_extension() {
-    let url = Url::parse("https://cdn.example.com/files/abc123.png").unwrap();
-    let token = MediaFileToken::new_from_str("mf_test123");
-    assert_eq!(derive_filename_from_url(&url, &token), "mf_test123.png");
-  }
-
-  #[test]
-  fn derive_filename_from_url_handles_no_extension() {
-    let url = Url::parse("https://cdn.example.com/files/abc123").unwrap();
-    let token = MediaFileToken::new_from_str("mf_test123");
-    assert_eq!(derive_filename_from_url(&url, &token), "mf_test123.bin");
-  }
-
-  #[test]
-  fn derive_filename_from_url_handles_query_params() {
-    let url = Url::parse("https://cdn.example.com/files/abc123.mp4?token=xyz").unwrap();
-    let token = MediaFileToken::new_from_str("mf_test123");
-    assert_eq!(derive_filename_from_url(&url, &token), "mf_test123.mp4");
-  }
-}

crates/api_clients/artcraft/artcraft_client/src/recipes/mod.rs

@@ -1,2 +1 @@
-pub mod download_media_file;
 pub mod upload_media_file_from_file;

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

@@ -17,8 +17,6 @@ pub enum CommonImageModel {
   GptImage1,
   #[serde(rename = "gpt_image_1p5")]
   GptImage1p5,
-  #[serde(rename = "gpt_image_2")]
-  GptImage2,
   #[serde(rename = "nano_banana")]
   NanoBanana,
   #[serde(rename = "nano_banana_2")]

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

@@ -41,9 +41,6 @@ pub enum CommonVideoModel {
   #[serde(rename = "seedance_2p0_fast")]
   Seedance2p0Fast,
 
-  #[serde(rename = "happy_horse_1p0")]
-  HappyHorse1p0,
-
   #[serde(rename = "sora_2")]
   Sora2,
 

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

@@ -15,9 +15,6 @@ pub enum ArtcraftRouterError {
   /// The requested model is not yet supported by the router.
   UnsupportedModel(String),
 
-  /// [Temporary during migration] The requested model/provider is not yet supported by the router.
-  UnsupportedProviderAndModelForNewApi(String),
-
   /// Invalid or missing input arguments.
   InvalidInput(String),
 
@@ -33,7 +30,6 @@ impl Display for ArtcraftRouterError {
       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::UnsupportedProviderAndModelForNewApi(msg) => write!(f, "Unsupported provider/model (for new API during migration): {}", msg),
       Self::InvalidInput(msg) => write!(f, "Invalid input: {}", msg),
       Self::Provider(e) => write!(f, "Provider error: {}", e),
     }

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

@@ -1,7 +1,5 @@
 use std::error::Error;
 use std::fmt::{Display, Formatter};
-use tokens::tokens::characters::CharacterToken;
-use tokens::tokens::media_files::MediaFileToken;
 
 #[derive(Debug, Clone, Copy)]
 pub enum ClientType {
@@ -24,9 +22,6 @@ impl Display for ClientType {
 
 #[derive(Debug)]
 pub enum ClientError {
-  /// A RouterClient was required but not provided on the draft context.
-  RouterClientNotProvided,
-
   /// The requested client is not configured on the RouterClient.
   ClientNotConfigured(ClientType),
 
@@ -48,18 +43,6 @@ pub enum ClientError {
 
   /// Seedance2Pro only accepts URLs for media inputs, not media tokens.
   Seedance2ProOnlySupportsUrls,
-  
-  /// The pre-dispatch context of media file token to URL map was not supplied.
-  MediaFileToUrlMapNotProvided,
-
-  /// A media file token was not found in the provided media-file-to-URL map.
-  MediaFileTokenNotFoundInMap { token: MediaFileToken },
-
-  /// The pre-dispatch context of character token to ID map was not supplied.
-  CharacterTokenToKinoviCharacterIdNotProvided,
-
-  /// A character token was not found in the provided character-token-to-id map
-  CharacterTokenNotFoundInMap { token: CharacterToken },
 }
 
 impl Error for ClientError {}
@@ -67,9 +50,6 @@ impl Error for ClientError {}
 impl Display for ClientError {
   fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
     match self {
-      Self::RouterClientNotProvided => {
-        write!(f, "A RouterClient is required but was not provided on the draft context")
-      }
       Self::ClientNotConfigured(client_type) => {
         write!(f, "{} client is not configured on the RouterClient", client_type)
       }
@@ -91,18 +71,6 @@ impl Display for ClientError {
       Self::Seedance2ProOnlySupportsUrls => {
         write!(f, "Seedance2Pro only supports URLs for media inputs; resolve media tokens to URLs before calling this provider")
       }
-      Self::MediaFileToUrlMapNotProvided => {
-        write!(f, "Media file to URL map was not provided")
-      }
-      Self::MediaFileTokenNotFoundInMap { token } => {
-        write!(f, "Media file token '{}' was not found in the provided URL map", token.as_str())
-      }
-      Self::CharacterTokenToKinoviCharacterIdNotProvided => {
-        write!(f, "Character token to Kinovi character ID map was not provided")
-      }
-      Self::CharacterTokenNotFoundInMap { token } => {
-        write!(f, "Character token '{}' was not found in the provided character-token-to-id map", token.as_str())
-      }
     }
   }
 }

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/cost/artcraft/estimate_image_cost_artcraft_gpt_image_2.rs

@@ -1,210 +0,0 @@
-use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate;
-use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_gpt_image_2::{
-  ArtcraftGptImage2ImageSize, ArtcraftGptImage2Quality, PlanArtcraftGptImage2,
-};
-
-pub(crate) fn estimate_image_cost_artcraft_gpt_image_2(
-  plan: &PlanArtcraftGptImage2,
-) -> ImageGenerationCostEstimate {
-  // Same cost table as the Fal GPT Image 2 estimator.
-  //
-  //   Output image cost (per output image), rounded up to whole cents:
-  //     Low:    all sizes                        →  1¢
-  //     Medium: landscape_4_3/portrait_4_3       →  4¢
-  //             landscape_16_9/portrait_16_9     →  4¢
-  //             square                           →  6¢
-  //             square_hd                        →  6¢
-  //     High:   landscape_4_3/portrait_4_3       → 15¢
-  //             landscape_16_9/portrait_16_9     → 16¢
-  //             square                           → 22¢
-  //             square_hd                        → 23¢
-  //
-  use ArtcraftGptImage2ImageSize as S;
-
-  let cost_per_image: u64 = match (plan.quality, plan.image_size) {
-    // Low quality
-    (ArtcraftGptImage2Quality::Low, _) => 1,
-
-    // Medium quality
-    (ArtcraftGptImage2Quality::Medium, None | Some(S::Square) | Some(S::SquareHd)) => 6,
-    (ArtcraftGptImage2Quality::Medium, Some(S::Landscape4x3) | Some(S::Portrait4x3)) => 4,
-    (ArtcraftGptImage2Quality::Medium, Some(S::Landscape16x9) | Some(S::Portrait16x9)) => 4,
-    (ArtcraftGptImage2Quality::Medium, Some(S::Auto)) => 6,
-
-    // High quality
-    (ArtcraftGptImage2Quality::High, None | Some(S::Square)) => 22,
-    (ArtcraftGptImage2Quality::High, Some(S::SquareHd)) => 23,
-    (ArtcraftGptImage2Quality::High, Some(S::Landscape4x3) | Some(S::Portrait4x3)) => 15,
-    (ArtcraftGptImage2Quality::High, Some(S::Landscape16x9) | Some(S::Portrait16x9)) => 16,
-    (ArtcraftGptImage2Quality::High, Some(S::Auto)) => 23,
-  };
-  let cost_in_usd_cents = cost_per_image * plan.num_images.as_u64();
-
-  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 super::*;
-  use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_gpt_image_2::ArtcraftGptImage2NumImages;
-
-  fn plan(
-    quality: ArtcraftGptImage2Quality,
-    image_size: Option<ArtcraftGptImage2ImageSize>,
-    num_images: ArtcraftGptImage2NumImages,
-  ) -> PlanArtcraftGptImage2 {
-    PlanArtcraftGptImage2 {
-      prompt: Some("p".to_string()),
-      image_inputs: None,
-      image_size,
-      quality,
-      num_images,
-      idempotency_token: "test".to_string(),
-    }
-  }
-
-  fn cents(
-    quality: ArtcraftGptImage2Quality,
-    image_size: Option<ArtcraftGptImage2ImageSize>,
-    num_images: ArtcraftGptImage2NumImages,
-  ) -> u64 {
-    estimate_image_cost_artcraft_gpt_image_2(&plan(quality, image_size, num_images))
-      .cost_in_usd_cents.unwrap()
-  }
-
-  // -- Low quality (1c for all sizes) -------------------------------------------
-
-  #[test]
-  fn low_square() {
-    assert_eq!(cents(ArtcraftGptImage2Quality::Low, Some(ArtcraftGptImage2ImageSize::Square), ArtcraftGptImage2NumImages::One), 1);
-  }
-
-  #[test]
-  fn low_square_hd() {
-    assert_eq!(cents(ArtcraftGptImage2Quality::Low, Some(ArtcraftGptImage2ImageSize::SquareHd), ArtcraftGptImage2NumImages::One), 1);
-  }
-
-  #[test]
-  fn low_unset() {
-    assert_eq!(cents(ArtcraftGptImage2Quality::Low, None, ArtcraftGptImage2NumImages::One), 1);
-  }
-
-  #[test]
-  fn low_landscape_4x3() {
-    assert_eq!(cents(ArtcraftGptImage2Quality::Low, Some(ArtcraftGptImage2ImageSize::Landscape4x3), ArtcraftGptImage2NumImages::One), 1);
-  }
-
-  #[test]
-  fn low_four() {
-    assert_eq!(cents(ArtcraftGptImage2Quality::Low, None, ArtcraftGptImage2NumImages::Four), 4);
-  }
-
-  // -- Medium quality -----------------------------------------------------------
-
-  #[test]
-  fn medium_square() {
-    assert_eq!(cents(ArtcraftGptImage2Quality::Medium, Some(ArtcraftGptImage2ImageSize::Square), ArtcraftGptImage2NumImages::One), 6);
-  }
-
-  #[test]
-  fn medium_square_hd() {
-    assert_eq!(cents(ArtcraftGptImage2Quality::Medium, Some(ArtcraftGptImage2ImageSize::SquareHd), ArtcraftGptImage2NumImages::One), 6);
-  }
-
-  #[test]
-  fn medium_unset() {
-    assert_eq!(cents(ArtcraftGptImage2Quality::Medium, None, ArtcraftGptImage2NumImages::One), 6);
-  }
-
-  #[test]
-  fn medium_landscape_4x3() {
-    assert_eq!(cents(ArtcraftGptImage2Quality::Medium, Some(ArtcraftGptImage2ImageSize::Landscape4x3), ArtcraftGptImage2NumImages::One), 4);
-  }
-
-  #[test]
-  fn medium_portrait_4x3() {
-    assert_eq!(cents(ArtcraftGptImage2Quality::Medium, Some(ArtcraftGptImage2ImageSize::Portrait4x3), ArtcraftGptImage2NumImages::One), 4);
-  }
-
-  #[test]
-  fn medium_landscape_16x9() {
-    assert_eq!(cents(ArtcraftGptImage2Quality::Medium, Some(ArtcraftGptImage2ImageSize::Landscape16x9), ArtcraftGptImage2NumImages::One), 4);
-  }
-
-  #[test]
-  fn medium_portrait_16x9() {
-    assert_eq!(cents(ArtcraftGptImage2Quality::Medium, Some(ArtcraftGptImage2ImageSize::Portrait16x9), ArtcraftGptImage2NumImages::One), 4);
-  }
-
-  #[test]
-  fn medium_square_four() {
-    assert_eq!(cents(ArtcraftGptImage2Quality::Medium, Some(ArtcraftGptImage2ImageSize::Square), ArtcraftGptImage2NumImages::Four), 24);
-  }
-
-  // -- High quality -------------------------------------------------------------
-
-  #[test]
-  fn high_square() {
-    assert_eq!(cents(ArtcraftGptImage2Quality::High, Some(ArtcraftGptImage2ImageSize::Square), ArtcraftGptImage2NumImages::One), 22);
-  }
-
-  #[test]
-  fn high_square_hd() {
-    assert_eq!(cents(ArtcraftGptImage2Quality::High, Some(ArtcraftGptImage2ImageSize::SquareHd), ArtcraftGptImage2NumImages::One), 23);
-  }
-
-  #[test]
-  fn high_unset() {
-    assert_eq!(cents(ArtcraftGptImage2Quality::High, None, ArtcraftGptImage2NumImages::One), 22);
-  }
-
-  #[test]
-  fn high_landscape_4x3() {
-    assert_eq!(cents(ArtcraftGptImage2Quality::High, Some(ArtcraftGptImage2ImageSize::Landscape4x3), ArtcraftGptImage2NumImages::One), 15);
-  }
-
-  #[test]
-  fn high_portrait_4x3() {
-    assert_eq!(cents(ArtcraftGptImage2Quality::High, Some(ArtcraftGptImage2ImageSize::Portrait4x3), ArtcraftGptImage2NumImages::One), 15);
-  }
-
-  #[test]
-  fn high_landscape_16x9() {
-    assert_eq!(cents(ArtcraftGptImage2Quality::High, Some(ArtcraftGptImage2ImageSize::Landscape16x9), ArtcraftGptImage2NumImages::One), 16);
-  }
-
-  #[test]
-  fn high_portrait_16x9() {
-    assert_eq!(cents(ArtcraftGptImage2Quality::High, Some(ArtcraftGptImage2ImageSize::Portrait16x9), ArtcraftGptImage2NumImages::One), 16);
-  }
-
-  #[test]
-  fn high_square_four() {
-    assert_eq!(cents(ArtcraftGptImage2Quality::High, Some(ArtcraftGptImage2ImageSize::Square), ArtcraftGptImage2NumImages::Four), 88);
-  }
-
-  #[test]
-  fn high_square_hd_four() {
-    assert_eq!(cents(ArtcraftGptImage2Quality::High, Some(ArtcraftGptImage2ImageSize::SquareHd), ArtcraftGptImage2NumImages::Four), 92);
-  }
-
-  // -- Metadata flags -----------------------------------------------------------
-
-  #[test]
-  fn metadata_flags_are_default() {
-    let estimate = estimate_image_cost_artcraft_gpt_image_2(&plan(
-      ArtcraftGptImage2Quality::Medium, None, ArtcraftGptImage2NumImages::One,
-    ));
-    assert!(!estimate.is_free);
-    assert!(!estimate.is_unlimited);
-    assert!(!estimate.is_rate_limited);
-    assert!(!estimate.has_watermark);
-  }
-}

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

@@ -4,7 +4,6 @@ pub mod estimate_image_cost_artcraft_flux_pro_1p1;
 pub mod estimate_image_cost_artcraft_flux_pro_1p1_ultra;
 pub mod estimate_image_cost_artcraft_gpt_image_1;
 pub mod estimate_image_cost_artcraft_gpt_image_1p5;
-pub mod estimate_image_cost_artcraft_gpt_image_2;
 pub mod estimate_image_cost_artcraft_nano_banana;
 pub mod estimate_image_cost_artcraft_nano_banana_2;
 pub mod estimate_image_cost_artcraft_nano_banana_pro;

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/cost/fal/estimate_image_cost_fal_gpt_image_2.rs

@@ -1,209 +0,0 @@
-use crate::generate::generate_image::image_generation_cost_estimate::ImageGenerationCostEstimate;
-use crate::generate::generate_image::plan::fal::plan_generate_image_fal_gpt_image_2::{
-  FalGptImage2ImageSize, FalGptImage2Quality, PlanFalGptImage2,
-};
-
-pub(crate) fn estimate_image_cost_fal_gpt_image_2(
-  plan: &PlanFalGptImage2,
-) -> ImageGenerationCostEstimate {
-  // Per fal docs (fal-ai/gpt-image-2 and fal-ai/gpt-image-2/edit):
-  //
-  //   Output image cost (per output image), rounded up to whole cents:
-  //     Low:    all sizes                        →  1¢
-  //     Medium: landscape_4_3/portrait_4_3       →  4¢
-  //             landscape_16_9/portrait_16_9     →  4¢
-  //             square                           →  6¢
-  //             square_hd                        →  6¢
-  //     High:   landscape_4_3/portrait_4_3       → 15¢
-  //             landscape_16_9/portrait_16_9     → 16¢
-  //             square                           → 22¢
-  //             square_hd                        → 23¢
-  //
-  use FalGptImage2ImageSize as S;
-
-  let cost_per_image: u64 = match (plan.quality, plan.image_size) {
-    // Low quality
-    (FalGptImage2Quality::Low, _) => 1,
-
-    // Medium quality
-    (FalGptImage2Quality::Medium, None | Some(S::Square) | Some(S::SquareHd)) => 6,
-    (FalGptImage2Quality::Medium, Some(S::Landscape4x3) | Some(S::Portrait4x3)) => 4,
-    (FalGptImage2Quality::Medium, Some(S::Landscape16x9) | Some(S::Portrait16x9)) => 4,
-    (FalGptImage2Quality::Medium, Some(S::Auto)) => 6, // TODO: Not checked
-
-    // High quality
-    (FalGptImage2Quality::High, None | Some(S::Square)) => 22,
-    (FalGptImage2Quality::High, Some(S::SquareHd)) => 23,
-    (FalGptImage2Quality::High, Some(S::Landscape4x3) | Some(S::Portrait4x3)) => 15,
-    (FalGptImage2Quality::High, Some(S::Landscape16x9) | Some(S::Portrait16x9)) => 16,
-    (FalGptImage2Quality::High, Some(S::Auto)) => 23, // TODO: Not checked
-  };
-  let cost_in_usd_cents = cost_per_image * plan.num_images.as_u64();
-
-  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 super::*;
-  use crate::generate::generate_image::plan::fal::plan_generate_image_fal_gpt_image_2::FalGptImage2NumImages;
-
-  fn plan(
-    quality: FalGptImage2Quality,
-    image_size: Option<FalGptImage2ImageSize>,
-    num_images: FalGptImage2NumImages,
-  ) -> PlanFalGptImage2 {
-    PlanFalGptImage2 {
-      prompt: Some("p".to_string()),
-      image_urls: vec![],
-      image_size,
-      quality,
-      num_images,
-    }
-  }
-
-  fn cents(
-    quality: FalGptImage2Quality,
-    image_size: Option<FalGptImage2ImageSize>,
-    num_images: FalGptImage2NumImages,
-  ) -> u64 {
-    estimate_image_cost_fal_gpt_image_2(&plan(quality, image_size, num_images))
-      .cost_in_usd_cents.unwrap()
-  }
-
-  // -- Low quality (1c for all sizes) -------------------------------------------
-
-  #[test]
-  fn low_square() {
-    assert_eq!(cents(FalGptImage2Quality::Low, Some(FalGptImage2ImageSize::Square), FalGptImage2NumImages::One), 1);
-  }
-
-  #[test]
-  fn low_square_hd() {
-    assert_eq!(cents(FalGptImage2Quality::Low, Some(FalGptImage2ImageSize::SquareHd), FalGptImage2NumImages::One), 1);
-  }
-
-  #[test]
-  fn low_unset() {
-    assert_eq!(cents(FalGptImage2Quality::Low, None, FalGptImage2NumImages::One), 1);
-  }
-
-  #[test]
-  fn low_landscape_4x3() {
-    assert_eq!(cents(FalGptImage2Quality::Low, Some(FalGptImage2ImageSize::Landscape4x3), FalGptImage2NumImages::One), 1);
-  }
-
-  #[test]
-  fn low_four() {
-    assert_eq!(cents(FalGptImage2Quality::Low, None, FalGptImage2NumImages::Four), 4);
-  }
-
-  // -- Medium quality -----------------------------------------------------------
-
-  #[test]
-  fn medium_square() {
-    assert_eq!(cents(FalGptImage2Quality::Medium, Some(FalGptImage2ImageSize::Square), FalGptImage2NumImages::One), 6);
-  }
-
-  #[test]
-  fn medium_square_hd() {
-    assert_eq!(cents(FalGptImage2Quality::Medium, Some(FalGptImage2ImageSize::SquareHd), FalGptImage2NumImages::One), 6);
-  }
-
-  #[test]
-  fn medium_unset() {
-    assert_eq!(cents(FalGptImage2Quality::Medium, None, FalGptImage2NumImages::One), 6);
-  }
-
-  #[test]
-  fn medium_landscape_4x3() {
-    assert_eq!(cents(FalGptImage2Quality::Medium, Some(FalGptImage2ImageSize::Landscape4x3), FalGptImage2NumImages::One), 4);
-  }
-
-  #[test]
-  fn medium_portrait_4x3() {
-    assert_eq!(cents(FalGptImage2Quality::Medium, Some(FalGptImage2ImageSize::Portrait4x3), FalGptImage2NumImages::One), 4);
-  }
-
-  #[test]
-  fn medium_landscape_16x9() {
-    assert_eq!(cents(FalGptImage2Quality::Medium, Some(FalGptImage2ImageSize::Landscape16x9), FalGptImage2NumImages::One), 4);
-  }
-
-  #[test]
-  fn medium_portrait_16x9() {
-    assert_eq!(cents(FalGptImage2Quality::Medium, Some(FalGptImage2ImageSize::Portrait16x9), FalGptImage2NumImages::One), 4);
-  }
-
-  #[test]
-  fn medium_square_four() {
-    assert_eq!(cents(FalGptImage2Quality::Medium, Some(FalGptImage2ImageSize::Square), FalGptImage2NumImages::Four), 24);
-  }
-
-  // -- High quality -------------------------------------------------------------
-
-  #[test]
-  fn high_square() {
-    assert_eq!(cents(FalGptImage2Quality::High, Some(FalGptImage2ImageSize::Square), FalGptImage2NumImages::One), 22);
-  }
-
-  #[test]
-  fn high_square_hd() {
-    assert_eq!(cents(FalGptImage2Quality::High, Some(FalGptImage2ImageSize::SquareHd), FalGptImage2NumImages::One), 23);
-  }
-
-  #[test]
-  fn high_unset() {
-    assert_eq!(cents(FalGptImage2Quality::High, None, FalGptImage2NumImages::One), 22);
-  }
-
-  #[test]
-  fn high_landscape_4x3() {
-    assert_eq!(cents(FalGptImage2Quality::High, Some(FalGptImage2ImageSize::Landscape4x3), FalGptImage2NumImages::One), 15);
-  }
-
-  #[test]
-  fn high_portrait_4x3() {
-    assert_eq!(cents(FalGptImage2Quality::High, Some(FalGptImage2ImageSize::Portrait4x3), FalGptImage2NumImages::One), 15);
-  }
-
-  #[test]
-  fn high_landscape_16x9() {
-    assert_eq!(cents(FalGptImage2Quality::High, Some(FalGptImage2ImageSize::Landscape16x9), FalGptImage2NumImages::One), 16);
-  }
-
-  #[test]
-  fn high_portrait_16x9() {
-    assert_eq!(cents(FalGptImage2Quality::High, Some(FalGptImage2ImageSize::Portrait16x9), FalGptImage2NumImages::One), 16);
-  }
-
-  #[test]
-  fn high_square_four() {
-    assert_eq!(cents(FalGptImage2Quality::High, Some(FalGptImage2ImageSize::Square), FalGptImage2NumImages::Four), 88);
-  }
-
-  #[test]
-  fn high_square_hd_four() {
-    assert_eq!(cents(FalGptImage2Quality::High, Some(FalGptImage2ImageSize::SquareHd), FalGptImage2NumImages::Four), 92);
-  }
-
-  // -- Metadata flags -----------------------------------------------------------
-
-  #[test]
-  fn metadata_flags_are_default() {
-    let estimate = estimate_image_cost_fal_gpt_image_2(&plan(
-      FalGptImage2Quality::Medium, None, FalGptImage2NumImages::One,
-    ));
-    assert!(!estimate.is_free);
-    assert!(!estimate.is_unlimited);
-    assert!(!estimate.is_rate_limited);
-    assert!(!estimate.has_watermark);
-  }
-}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/cost/fal/mod.rs

@@ -4,7 +4,6 @@ pub(crate) mod estimate_image_cost_fal_flux_pro_1p1;
 pub(crate) mod estimate_image_cost_fal_flux_pro_1p1_ultra;
 pub(crate) mod estimate_image_cost_fal_gpt_image_1;
 pub(crate) mod estimate_image_cost_fal_gpt_image_1p5;
-pub(crate) mod estimate_image_cost_fal_gpt_image_2;
 pub(crate) mod estimate_image_cost_fal_seedream_4;
 pub(crate) mod estimate_image_cost_fal_seedream_4p5;
 pub(crate) mod estimate_image_cost_fal_seedream_5_lite;

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/execute/artcraft/generate_image_artcraft_gpt_image_2.rs

@@ -1,145 +0,0 @@
-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_gpt_image_2::PlanArtcraftGptImage2;
-use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_image_cost_and_generate_request::OmniGenImageCostAndGenerateRequest;
-use artcraft_client::endpoints::omni_gen::generate::image::omni_gen_image::omni_gen_image_generate;
-use enums::common::generation::common_image_model::CommonImageModel;
-
-/// Execute GPT Image 2 via the Artcraft omni-gen image endpoint.
-pub async fn execute_artcraft_gpt_image_2(
-  plan: &PlanArtcraftGptImage2,
-  artcraft_client: &RouterArtcraftClient,
-) -> Result<GenerateImageResponse, ArtcraftRouterError> {
-  let request = OmniGenImageCostAndGenerateRequest {
-    idempotency_token: Some(plan.idempotency_token.clone()),
-    model: Some(CommonImageModel::GptImage2),
-    prompt: plan.prompt.clone(),
-    image_media_tokens: plan.image_inputs.clone(),
-    resolution: None,
-    aspect_ratio: plan.aspect_ratio_enum(),
-    quality: Some(plan.quality_enum()),
-    image_batch_count: Some(plan.num_images_u16()),
-    adjust_horizontal_angle: None,
-    adjust_vertical_angle: None,
-    adjust_zoom: None,
-  };
-
-  let response = omni_gen_image_generate(
-    &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 artcraft_client::utils::api_host::ApiHost;
-  use crate::api::common_aspect_ratio::CommonAspectRatio;
-  use crate::api::common_quality::CommonQuality;
-  use crate::api::image_list_ref::ImageListRef;
-  use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
-  use crate::generate::generate_image::generate_image_request::GenerateImageRequest;
-  use crate::generate::generate_image::image_generation_plan::ImageGenerationPlan;
-  use crate::test_helpers::{get_artcraft_client, get_artcraft_client_for_env};
-  use tokens::tokens::media_files::MediaFileToken;
-
-  fn base_gpt_image_2_request() -> GenerateImageRequest {
-    GenerateImageRequest {
-      model: crate::api::common_image_model::CommonImageModel::GptImage2,
-      provider: crate::api::provider::Provider::Artcraft,
-      prompt: Some("a t-rex walking through a cyberpunk city at night".to_string()),
-      image_inputs: None,
-      resolution: None,
-      aspect_ratio: None,
-      quality: None,
-      image_batch_count: None,
-      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
-      generation_mode_mismatch_strategy: None,
-      idempotency_token: None,
-      horizontal_angle: None,
-      vertical_angle: None,
-      zoom: None,
-    }
-  }
-
-  #[tokio::test]
-  #[ignore] // manually run — fires a real API request and incurs cost
-  async fn test_text_to_image_gpt_image_2() {
-    let client = get_artcraft_client_for_env(ApiHost::Localhost { port: 12345 });
-    let request = GenerateImageRequest {
-      aspect_ratio: Some(CommonAspectRatio::WideSixteenByNine),
-      image_batch_count: Some(1),
-      ..base_gpt_image_2_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.
-  }
-
-  #[tokio::test]
-  #[ignore] // manually run — fires a real API request and incurs cost
-  async fn test_edit_image_gpt_image_2() {
-    let client = get_artcraft_client();
-
-    let image_tokens = vec![
-      MediaFileToken::new_from_str("m_r45apt2swza6wp8j2z10237t92kkr8"),
-    ];
-
-    let request = GenerateImageRequest {
-      prompt: Some("Change the background to a desert with cacti".to_string()),
-      image_inputs: Some(ImageListRef::MediaFileTokens(image_tokens)),
-      aspect_ratio: Some(CommonAspectRatio::Auto),
-      image_batch_count: Some(1),
-      ..base_gpt_image_2_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.
-  }
-
-  #[tokio::test]
-  #[ignore] // manually run — fires a real API request and incurs cost
-  async fn test_text_to_image_gpt_image_2_high_quality() {
-    let client = get_artcraft_client();
-    let request = GenerateImageRequest {
-      aspect_ratio: Some(CommonAspectRatio::Square),
-      quality: Some(CommonQuality::High),
-      image_batch_count: Some(1),
-      ..base_gpt_image_2_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.
-  }
-}

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

@@ -4,7 +4,6 @@ pub mod generate_image_artcraft_flux_pro_1p1;
 pub mod generate_image_artcraft_flux_pro_1p1_ultra;
 pub mod generate_image_artcraft_gpt_image_1;
 pub mod generate_image_artcraft_gpt_image_1p5;
-pub mod generate_image_artcraft_gpt_image_2;
 pub mod generate_image_artcraft_nano_banana;
 pub mod generate_image_artcraft_nano_banana_2;
 pub mod generate_image_artcraft_nano_banana_pro;

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/execute/fal/generate_image_fal_flux_1_dev.rs

@@ -1,6 +1,3 @@
-use std::fmt::Debug;
-use std::sync::Arc;
-
 use crate::client::router_fal_client::RouterFalClient;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::provider_error::ProviderError;
@@ -9,55 +6,44 @@ use crate::generate::generate_image::generate_image_response::{
 };
 use crate::generate::generate_image::plan::fal::plan_generate_image_fal_flux_1_dev::PlanFalFlux1Dev;
 use fal_client::requests::webhook::image::edit::enqueue_flux_1_dev_edit_image_webhook::{
-  enqueue_flux_1_dev_edit_image_webhook, Flux1DevEditImageArgs, Flux1DevEditImageRequest,
+  enqueue_flux_1_dev_edit_image_webhook, Flux1DevEditImageArgs,
 };
 use fal_client::requests::webhook::image::text::enqueue_flux_1_dev_text_to_image_webhook::{
-  enqueue_flux_1_dev_text_to_image_webhook, Flux1DevArgs, Flux1DevRequest,
+  enqueue_flux_1_dev_text_to_image_webhook, Flux1DevArgs,
 };
 
 pub async fn execute_fal_flux_1_dev(
   plan: &PlanFalFlux1Dev,
   fal_client: &RouterFalClient,
 ) -> Result<GenerateImageResponse, ArtcraftRouterError> {
-  let (webhook_response, outbound_request) = if let Some(image_url) = &plan.maybe_image_url {
+  let webhook_response = if let Some(image_url) = &plan.maybe_image_url {
     // Image-to-image mode
-    let request = Flux1DevEditImageRequest {
-      prompt: plan.prompt.as_deref().unwrap_or("").to_string(),
+    let args = Flux1DevEditImageArgs {
+      prompt: plan.prompt.as_deref().unwrap_or(""),
       image_url: image_url.clone(),
       num_images: plan.num_images.to_edit(),
-    };
-    let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
-    let args = Flux1DevEditImageArgs {
-      request,
       webhook_url: fal_client.webhook_url.as_str(),
       api_key: &fal_client.api_key,
     };
-    let resp = enqueue_flux_1_dev_edit_image_webhook(args)
+    enqueue_flux_1_dev_edit_image_webhook(args)
       .await
-      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?;
-    (resp, outbound)
+      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?
   } else {
     // Text-to-image mode
-    let request = Flux1DevRequest {
-      prompt: plan.prompt.clone().unwrap_or_default(),
+    let args = Flux1DevArgs {
+      prompt: plan.prompt.as_deref().unwrap_or(""),
       aspect_ratio: plan.aspect_ratio,
       num_images: plan.num_images.to_t2i(),
-    };
-    let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
-    let args = Flux1DevArgs {
-      request,
       webhook_url: fal_client.webhook_url.as_str(),
       api_key: &fal_client.api_key,
     };
-    let resp = enqueue_flux_1_dev_text_to_image_webhook(args)
+    enqueue_flux_1_dev_text_to_image_webhook(args)
       .await
-      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?;
-    (resp, outbound)
+      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?
   };
 
   Ok(GenerateImageResponse::Fal(FalImageResponsePayload {
     request_id: webhook_response.request_id,
     gateway_request_id: webhook_response.gateway_request_id,
-    maybe_outbound_request: Some(outbound_request),
   }))
 }

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/execute/fal/generate_image_fal_flux_1_schnell.rs

@@ -1,6 +1,3 @@
-use std::fmt::Debug;
-use std::sync::Arc;
-
 use crate::client::router_fal_client::RouterFalClient;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::provider_error::ProviderError;
@@ -9,55 +6,44 @@ use crate::generate::generate_image::generate_image_response::{
 };
 use crate::generate::generate_image::plan::fal::plan_generate_image_fal_flux_1_schnell::PlanFalFlux1Schnell;
 use fal_client::requests::webhook::image::edit::enqueue_flux_1_schnell_edit_image_webhook::{
-  enqueue_flux_1_schnell_edit_image_webhook, Flux1SchnellEditImageArgs, Flux1SchnellEditImageRequest,
+  enqueue_flux_1_schnell_edit_image_webhook, Flux1SchnellEditImageArgs,
 };
 use fal_client::requests::webhook::image::text::enqueue_flux_1_schnell_text_to_image_webhook::{
-  enqueue_flux_1_schnell_text_to_image_webhook, Flux1SchnellArgs, Flux1SchnellRequest,
+  enqueue_flux_1_schnell_text_to_image_webhook, Flux1SchnellArgs,
 };
 
 pub async fn execute_fal_flux_1_schnell(
   plan: &PlanFalFlux1Schnell,
   fal_client: &RouterFalClient,
 ) -> Result<GenerateImageResponse, ArtcraftRouterError> {
-  let (webhook_response, outbound_request) = if let Some(image_url) = &plan.maybe_image_url {
+  let webhook_response = if let Some(image_url) = &plan.maybe_image_url {
     // Image-to-image (redux) mode
-    let request = Flux1SchnellEditImageRequest {
+    let args = Flux1SchnellEditImageArgs {
       image_url: image_url.clone(),
       num_images: plan.num_images.to_edit(),
       image_size: plan.edit_image_size,
-    };
-    let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
-    let args = Flux1SchnellEditImageArgs {
-      request,
       webhook_url: fal_client.webhook_url.as_str(),
       api_key: &fal_client.api_key,
     };
-    let resp = enqueue_flux_1_schnell_edit_image_webhook(args)
+    enqueue_flux_1_schnell_edit_image_webhook(args)
       .await
-      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?;
-    (resp, outbound)
+      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?
   } else {
     // Text-to-image mode
-    let request = Flux1SchnellRequest {
-      prompt: plan.prompt.clone().unwrap_or_default(),
+    let args = Flux1SchnellArgs {
+      prompt: plan.prompt.as_deref().unwrap_or(""),
       aspect_ratio: plan.t2i_aspect_ratio,
       num_images: plan.num_images.to_t2i(),
-    };
-    let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
-    let args = Flux1SchnellArgs {
-      request,
       webhook_url: fal_client.webhook_url.as_str(),
       api_key: &fal_client.api_key,
     };
-    let resp = enqueue_flux_1_schnell_text_to_image_webhook(args)
+    enqueue_flux_1_schnell_text_to_image_webhook(args)
       .await
-      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?;
-    (resp, outbound)
+      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?
   };
 
   Ok(GenerateImageResponse::Fal(FalImageResponsePayload {
     request_id: webhook_response.request_id,
     gateway_request_id: webhook_response.gateway_request_id,
-    maybe_outbound_request: Some(outbound_request),
   }))
 }

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/execute/fal/generate_image_fal_flux_pro_1p1.rs

@@ -1,6 +1,3 @@
-use std::fmt::Debug;
-use std::sync::Arc;
-
 use crate::client::router_fal_client::RouterFalClient;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::provider_error::ProviderError;
@@ -9,21 +6,17 @@ use crate::generate::generate_image::generate_image_response::{
 };
 use crate::generate::generate_image::plan::fal::plan_generate_image_fal_flux_pro_1p1::PlanFalFluxPro11;
 use fal_client::requests::webhook::image::text::enqueue_flux_pro_11_text_to_image_webhook::{
-  enqueue_flux_pro_11_text_to_image_webhook, FluxPro11Args, FluxPro11Request,
+  enqueue_flux_pro_11_text_to_image_webhook, FluxPro11Args,
 };
 
 pub async fn execute_fal_flux_pro_1p1(
   plan: &PlanFalFluxPro11,
   fal_client: &RouterFalClient,
 ) -> Result<GenerateImageResponse, ArtcraftRouterError> {
-  let request = FluxPro11Request {
-    prompt: plan.prompt.clone().unwrap_or_default(),
+  let args = FluxPro11Args {
+    prompt: plan.prompt.as_deref().unwrap_or(""),
     aspect_ratio: plan.aspect_ratio,
     num_images: plan.num_images.to_fal(),
-  };
-  let outbound_request: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
-  let args = FluxPro11Args {
-    request,
     webhook_url: fal_client.webhook_url.as_str(),
     api_key: &fal_client.api_key,
   };
@@ -35,6 +28,5 @@ pub async fn execute_fal_flux_pro_1p1(
   Ok(GenerateImageResponse::Fal(FalImageResponsePayload {
     request_id: webhook_response.request_id,
     gateway_request_id: webhook_response.gateway_request_id,
-    maybe_outbound_request: Some(outbound_request),
   }))
 }

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/execute/fal/generate_image_fal_flux_pro_1p1_ultra.rs

@@ -1,6 +1,3 @@
-use std::fmt::Debug;
-use std::sync::Arc;
-
 use crate::client::router_fal_client::RouterFalClient;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::provider_error::ProviderError;
@@ -9,21 +6,17 @@ use crate::generate::generate_image::generate_image_response::{
 };
 use crate::generate::generate_image::plan::fal::plan_generate_image_fal_flux_pro_1p1_ultra::PlanFalFluxPro11Ultra;
 use fal_client::requests::webhook::image::text::enqueue_flux_pro_11_ultra_text_to_image_webhook::{
-  enqueue_flux_pro_11_ultra_text_to_image_webhook, FluxPro11UltraArgs, FluxPro11UltraRequest,
+  enqueue_flux_pro_11_ultra_text_to_image_webhook, FluxPro11UltraArgs,
 };
 
 pub async fn execute_fal_flux_pro_1p1_ultra(
   plan: &PlanFalFluxPro11Ultra,
   fal_client: &RouterFalClient,
 ) -> Result<GenerateImageResponse, ArtcraftRouterError> {
-  let request = FluxPro11UltraRequest {
-    prompt: plan.prompt.clone().unwrap_or_default(),
+  let args = FluxPro11UltraArgs {
+    prompt: plan.prompt.as_deref().unwrap_or(""),
     aspect_ratio: plan.aspect_ratio,
     num_images: plan.num_images.to_fal(),
-  };
-  let outbound_request: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
-  let args = FluxPro11UltraArgs {
-    request,
     webhook_url: fal_client.webhook_url.as_str(),
     api_key: &fal_client.api_key,
   };
@@ -35,6 +28,5 @@ pub async fn execute_fal_flux_pro_1p1_ultra(
   Ok(GenerateImageResponse::Fal(FalImageResponsePayload {
     request_id: webhook_response.request_id,
     gateway_request_id: webhook_response.gateway_request_id,
-    maybe_outbound_request: Some(outbound_request),
   }))
 }

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/execute/fal/generate_image_fal_gpt_image_1.rs

@@ -1,6 +1,3 @@
-use std::fmt::Debug;
-use std::sync::Arc;
-
 use crate::client::router_fal_client::RouterFalClient;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::provider_error::ProviderError;
@@ -10,39 +7,32 @@ use crate::generate::generate_image::generate_image_response::{
 use crate::generate::generate_image::plan::fal::plan_generate_image_fal_gpt_image_1::PlanFalGptImage1;
 use fal_client::requests::webhook::image::edit::enqueue_gpt_image_1_edit_image_webhook::{
   enqueue_gpt_image_1_edit_image_webhook, EnqueueGptImage1EditImageArgs,
-  EnqueueGptImage1EditImageRequest,
 };
 use fal_client::requests::webhook::image::text::enqueue_gpt_image_1_text_to_image_webhook::{
   enqueue_gpt_image_1_text_to_image_webhook, EnqueueGptImage1TextToImageArgs,
-  EnqueueGptImage1TextToImageRequest,
 };
 
 pub async fn execute_fal_gpt_image_1(
   plan: &PlanFalGptImage1,
   fal_client: &RouterFalClient,
 ) -> Result<GenerateImageResponse, ArtcraftRouterError> {
-  let (webhook_response, outbound_request) = if plan.image_urls.is_empty() {
-    let request = EnqueueGptImage1TextToImageRequest {
-      prompt: plan.prompt.as_deref().unwrap_or("").to_string(),
+  let webhook_response = if plan.image_urls.is_empty() {
+    let args = EnqueueGptImage1TextToImageArgs {
+      prompt: plan.prompt.as_deref().unwrap_or(""),
       num_images: plan.num_images.to_t2i(),
       image_size: plan.image_size.map(|s| s.to_t2i()),
       quality: Some(plan.quality.to_t2i()),
       background: None,
       output_format: None,
-    };
-    let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
-    let args = EnqueueGptImage1TextToImageArgs {
-      request,
       webhook_url: fal_client.webhook_url.as_str(),
       api_key: &fal_client.api_key,
     };
-    let resp = enqueue_gpt_image_1_text_to_image_webhook(args)
+    enqueue_gpt_image_1_text_to_image_webhook(args)
       .await
-      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?;
-    (resp, outbound)
+      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?
   } else {
-    let request = EnqueueGptImage1EditImageRequest {
-      prompt: plan.prompt.as_deref().unwrap_or("").to_string(),
+    let args = EnqueueGptImage1EditImageArgs {
+      prompt: plan.prompt.as_deref().unwrap_or(""),
       image_urls: plan.image_urls.clone(),
       num_images: plan.num_images.to_edit(),
       mask_image_url: None,
@@ -51,23 +41,17 @@ pub async fn execute_fal_gpt_image_1(
       input_fidelity: None,
       background: None,
       output_format: None,
-    };
-    let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
-    let args = EnqueueGptImage1EditImageArgs {
-      request,
       webhook_url: fal_client.webhook_url.as_str(),
       api_key: &fal_client.api_key,
     };
-    let resp = enqueue_gpt_image_1_edit_image_webhook(args)
+    enqueue_gpt_image_1_edit_image_webhook(args)
       .await
-      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?;
-    (resp, outbound)
+      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?
   };
 
   Ok(GenerateImageResponse::Fal(FalImageResponsePayload {
     request_id: webhook_response.request_id,
     gateway_request_id: webhook_response.gateway_request_id,
-    maybe_outbound_request: Some(outbound_request),
   }))
 }
 

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/execute/fal/generate_image_fal_gpt_image_1p5.rs

@@ -1,6 +1,3 @@
-use std::fmt::Debug;
-use std::sync::Arc;
-
 use crate::client::router_fal_client::RouterFalClient;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::provider_error::ProviderError;
@@ -10,39 +7,32 @@ use crate::generate::generate_image::generate_image_response::{
 use crate::generate::generate_image::plan::fal::plan_generate_image_fal_gpt_image_1p5::PlanFalGptImage1p5;
 use fal_client::requests::webhook::image::edit::enqueue_gpt_image_1p5_edit_image_webhook::{
   enqueue_gpt_image_1p5_image_edit_webhook, EnqueueGptImage1p5EditImageArgs,
-  EnqueueGptImage1p5EditImageRequest,
 };
 use fal_client::requests::webhook::image::text::enqueue_gpt_image_1p5_text_to_image_webhook::{
   enqueue_gpt_image_1p5_text_to_image_webhook, EnqueueGptImage1p5TextToImageArgs,
-  EnqueueGptImage1p5TextToImageRequest,
 };
 
 pub async fn execute_fal_gpt_image_1p5(
   plan: &PlanFalGptImage1p5,
   fal_client: &RouterFalClient,
 ) -> Result<GenerateImageResponse, ArtcraftRouterError> {
-  let (webhook_response, outbound_request) = if plan.image_urls.is_empty() {
-    let request = EnqueueGptImage1p5TextToImageRequest {
-      prompt: plan.prompt.as_deref().unwrap_or("").to_string(),
+  let webhook_response = if plan.image_urls.is_empty() {
+    let args = EnqueueGptImage1p5TextToImageArgs {
+      prompt: plan.prompt.as_deref().unwrap_or(""),
       num_images: plan.num_images.to_t2i(),
       image_size: plan.image_size.map(|s| s.to_t2i()),
       background: None,
       quality: Some(plan.quality.to_t2i()),
       output_format: None,
-    };
-    let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
-    let args = EnqueueGptImage1p5TextToImageArgs {
-      request,
       webhook_url: fal_client.webhook_url.as_str(),
       api_key: &fal_client.api_key,
     };
-    let resp = enqueue_gpt_image_1p5_text_to_image_webhook(args)
+    enqueue_gpt_image_1p5_text_to_image_webhook(args)
       .await
-      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?;
-    (resp, outbound)
+      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?
   } else {
-    let request = EnqueueGptImage1p5EditImageRequest {
-      prompt: plan.prompt.as_deref().unwrap_or("").to_string(),
+    let args = EnqueueGptImage1p5EditImageArgs {
+      prompt: plan.prompt.as_deref().unwrap_or(""),
       image_urls: plan.image_urls.clone(),
       num_images: plan.num_images.to_edit(),
       mask_image_url: None,
@@ -51,22 +41,16 @@ pub async fn execute_fal_gpt_image_1p5(
       quality: Some(plan.quality.to_edit()),
       input_fidelity: None,
       output_format: None,
-    };
-    let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
-    let args = EnqueueGptImage1p5EditImageArgs {
-      request,
       webhook_url: fal_client.webhook_url.as_str(),
       api_key: &fal_client.api_key,
     };
-    let resp = enqueue_gpt_image_1p5_image_edit_webhook(args)
+    enqueue_gpt_image_1p5_image_edit_webhook(args)
       .await
-      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?;
-    (resp, outbound)
+      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?
   };
 
   Ok(GenerateImageResponse::Fal(FalImageResponsePayload {
     request_id: webhook_response.request_id,
     gateway_request_id: webhook_response.gateway_request_id,
-    maybe_outbound_request: Some(outbound_request),
   }))
 }

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/execute/fal/generate_image_fal_gpt_image_2.rs

@@ -1,191 +0,0 @@
-use std::fmt::Debug;
-use std::sync::Arc;
-
-use crate::client::router_fal_client::RouterFalClient;
-use crate::errors::artcraft_router_error::ArtcraftRouterError;
-use crate::errors::provider_error::ProviderError;
-use crate::generate::generate_image::generate_image_response::{
-  FalImageResponsePayload, GenerateImageResponse,
-};
-use crate::generate::generate_image::plan::fal::plan_generate_image_fal_gpt_image_2::PlanFalGptImage2;
-use fal_client::requests::webhook::image::edit::enqueue_gpt_image_2_edit_image_webhook::{
-  enqueue_gpt_image_2_edit_image_webhook, EnqueueGptImage2EditImageArgs,
-  EnqueueGptImage2EditImageRequest,
-};
-use fal_client::requests::webhook::image::text::enqueue_gpt_image_2_text_to_image_webhook::{
-  enqueue_gpt_image_2_text_to_image_webhook, EnqueueGptImage2TextToImageArgs,
-  EnqueueGptImage2TextToImageRequest,
-};
-
-pub async fn execute_fal_gpt_image_2(
-  plan: &PlanFalGptImage2,
-  fal_client: &RouterFalClient,
-) -> Result<GenerateImageResponse, ArtcraftRouterError> {
-  let (webhook_response, outbound_request) = if plan.image_urls.is_empty() {
-    let request = EnqueueGptImage2TextToImageRequest {
-      prompt: plan.prompt.as_deref().unwrap_or("").to_string(),
-      num_images: plan.num_images.to_t2i(),
-      image_size: plan.image_size.map(|s| s.to_t2i()),
-      quality: Some(plan.quality.to_t2i()),
-      output_format: None,
-    };
-    let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
-    let args = EnqueueGptImage2TextToImageArgs {
-      request,
-      webhook_url: fal_client.webhook_url.as_str(),
-      api_key: &fal_client.api_key,
-    };
-    let resp = enqueue_gpt_image_2_text_to_image_webhook(args)
-      .await
-      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?;
-    (resp, outbound)
-  } else {
-    let request = EnqueueGptImage2EditImageRequest {
-      prompt: plan.prompt.as_deref().unwrap_or("").to_string(),
-      image_urls: plan.image_urls.clone(),
-      num_images: plan.num_images.to_edit(),
-      mask_url: None,
-      image_size: plan.image_size.map(|s| s.to_edit()),
-      quality: Some(plan.quality.to_edit()),
-      output_format: None,
-    };
-    let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
-    let args = EnqueueGptImage2EditImageArgs {
-      request,
-      webhook_url: fal_client.webhook_url.as_str(),
-      api_key: &fal_client.api_key,
-    };
-    let resp = enqueue_gpt_image_2_edit_image_webhook(args)
-      .await
-      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?;
-    (resp, outbound)
-  };
-
-  Ok(GenerateImageResponse::Fal(FalImageResponsePayload {
-    request_id: webhook_response.request_id,
-    gateway_request_id: webhook_response.gateway_request_id,
-    maybe_outbound_request: Some(outbound_request),
-  }))
-}
-
-#[cfg(test)]
-mod tests {
-  use test_data::web::image_urls::{GHOST_IMAGE_URL, JUNO_AT_LAKE_IMAGE_URL, TREX_SKELETON_IMAGE_URL};
-  use crate::api::common_aspect_ratio::CommonAspectRatio;
-  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 crate::generate::generate_image::image_generation_plan::ImageGenerationPlan;
-  use crate::test_helpers::get_fal_client;
-
-  // ── Build smoke tests ──
-
-  mod build_smoke_tests {
-    use super::*;
-
-    #[test]
-    fn text_to_image_plan() {
-      let request = GenerateImageRequest {
-        aspect_ratio: Some(CommonAspectRatio::Square),
-        image_batch_count: Some(1),
-        ..base_request()
-      };
-      let plan = request.build().expect("plan should build");
-      let ImageGenerationPlan::FalGptImage2(plan) = plan else {
-        panic!("expected FalGptImage2")
-      };
-      assert!(plan.image_urls.is_empty(), "text mode must have no image_urls");
-    }
-
-    #[test]
-    fn edit_image_plan() {
-      let urls = vec![
-        JUNO_AT_LAKE_IMAGE_URL.to_string(),
-        GHOST_IMAGE_URL.to_string(),
-      ];
-      let request = GenerateImageRequest {
-        prompt: Some("dog running from a scary ghost".to_string()),
-        image_inputs: Some(ImageListRef::Urls(urls.clone())),
-        ..base_request()
-      };
-      let plan = request.build().expect("plan should build");
-      let ImageGenerationPlan::FalGptImage2(plan) = plan else {
-        panic!("expected FalGptImage2")
-      };
-      assert_eq!(plan.image_urls, urls);
-    }
-  }
-
-  // ── Live API tests ──
-
-  mod live_api_tests {
-    use super::*;
-
-    #[tokio::test]
-    #[ignore] // manually run — fires a real fal API request and incurs cost
-    async fn text_to_image() {
-      let client = get_fal_client();
-      let request = GenerateImageRequest {
-        aspect_ratio: Some(CommonAspectRatio::WideSixteenByNine),
-        image_batch_count: Some(1),
-        prompt: Some("a horse walking through a cyberpunk city at night".to_string()),
-        ..base_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_fal_payload().expect("expected Fal payload");
-      println!("Request id: {:?}", payload.request_id);
-      assert_eq!(1, 2, "Inspect output above");
-    }
-
-    #[tokio::test]
-    #[ignore] // manually run — fires a real fal API request and incurs cost
-    async fn edit_image() {
-      let client = get_fal_client();
-      let request = GenerateImageRequest {
-        prompt: Some("dog running from a scary ghost".to_string()),
-        image_inputs: Some(ImageListRef::Urls(vec![
-          JUNO_AT_LAKE_IMAGE_URL.to_string(),
-          GHOST_IMAGE_URL.to_string(),
-        ])),
-        aspect_ratio: Some(CommonAspectRatio::Square),
-        image_batch_count: Some(1),
-        ..base_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_fal_payload().expect("expected Fal payload");
-      println!("Request id: {:?}", payload.request_id);
-      assert_eq!(1, 2, "Inspect output above");
-    }
-  }
-
-  // ── Helpers ──
-
-  fn base_request() -> GenerateImageRequest {
-    GenerateImageRequest {
-      model: CommonImageModel::GptImage2,
-      provider: Provider::Fal,
-      prompt: Some("a cat in space".to_string()),
-      image_inputs: None,
-      resolution: None,
-      aspect_ratio: None,
-      quality: None,
-      image_batch_count: None,
-      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
-      generation_mode_mismatch_strategy: None,
-      idempotency_token: None,
-      horizontal_angle: None,
-      vertical_angle: None,
-      zoom: None,
-    }
-  }
-}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/execute/fal/generate_image_fal_nano_banana.rs

@@ -1,6 +1,3 @@
-use std::fmt::Debug;
-use std::sync::Arc;
-
 use crate::client::router_fal_client::RouterFalClient;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::provider_error::ProviderError;
@@ -12,58 +9,47 @@ use crate::generate::generate_image::plan::fal::plan_generate_image_fal_nano_ban
 };
 use fal_client::requests::webhook::image::edit::enqueue_gemini_25_flash_edit_webhook::{
   enqueue_gemini_25_flash_edit_webhook, Gemini25FlashEditArgs,
-  Gemini25FlashEditNumImages, Gemini25FlashEditRequest,
+  Gemini25FlashEditNumImages,
 };
 use fal_client::requests::webhook::image::text::enqueue_gemini_25_flash_text_to_image_webhook::{
   enqueue_gemini_25_flash_text_to_image_webhook, Gemini25FlashTextToImageArgs,
-  Gemini25FlashTextToImageNumImages, Gemini25FlashTextToImageRequest,
+  Gemini25FlashTextToImageNumImages,
 };
 
 pub async fn execute_fal_nano_banana(
   plan: &PlanFalNanoBanana,
   fal_client: &RouterFalClient,
 ) -> Result<GenerateImageResponse, ArtcraftRouterError> {
-  let (webhook_response, outbound_request) = if plan.image_urls.is_empty() {
+  let webhook_response = if plan.image_urls.is_empty() {
     // Text-to-image mode
-    let request = Gemini25FlashTextToImageRequest {
-      prompt: plan.prompt.as_deref().unwrap_or("").to_string(),
+    let args = Gemini25FlashTextToImageArgs {
+      prompt: plan.prompt.as_deref().unwrap_or(""),
       num_images: to_t2i_num_images(plan.num_images),
       aspect_ratio: plan.t2i_aspect_ratio,
-    };
-    let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
-    let args = Gemini25FlashTextToImageArgs {
-      request,
       webhook_url: fal_client.webhook_url.as_str(),
       api_key: &fal_client.api_key,
     };
-    let resp = enqueue_gemini_25_flash_text_to_image_webhook(args)
+    enqueue_gemini_25_flash_text_to_image_webhook(args)
       .await
-      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?;
-    (resp, outbound)
+      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?
   } else {
     // Image-edit mode
-    let request = Gemini25FlashEditRequest {
-      prompt: plan.prompt.as_deref().unwrap_or("").to_string(),
+    let args = Gemini25FlashEditArgs {
+      prompt: plan.prompt.as_deref().unwrap_or(""),
       image_urls: plan.image_urls.clone(),
       num_images: to_edit_num_images(plan.num_images),
       aspect_ratio: plan.edit_aspect_ratio,
-    };
-    let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
-    let args = Gemini25FlashEditArgs {
-      request,
       webhook_url: fal_client.webhook_url.as_str(),
       api_key: &fal_client.api_key,
     };
-    let resp = enqueue_gemini_25_flash_edit_webhook(args)
+    enqueue_gemini_25_flash_edit_webhook(args)
       .await
-      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?;
-    (resp, outbound)
+      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?
   };
 
   Ok(GenerateImageResponse::Fal(FalImageResponsePayload {
     request_id: webhook_response.request_id,
     gateway_request_id: webhook_response.gateway_request_id,
-    maybe_outbound_request: Some(outbound_request),
   }))
 }
 

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/execute/fal/generate_image_fal_nano_banana_2.rs

@@ -1,6 +1,3 @@
-use std::fmt::Debug;
-use std::sync::Arc;
-
 use crate::client::router_fal_client::RouterFalClient;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::provider_error::ProviderError;
@@ -12,62 +9,49 @@ use crate::generate::generate_image::plan::fal::plan_generate_image_fal_nano_ban
 };
 use fal_client::requests::webhook::image::edit::enqueue_nano_banana_2_edit_image_webhook::{
   enqueue_nano_banana_2_edit_image_webhook, EnqueueNanoBanana2EditImageArgs,
-  EnqueueNanoBanana2EditImageNumImages, EnqueueNanoBanana2EditImageRequest,
-  EnqueueNanoBanana2EditImageResolution,
+  EnqueueNanoBanana2EditImageNumImages, EnqueueNanoBanana2EditImageResolution,
 };
 use fal_client::requests::webhook::image::text::enqueue_nano_banana_2_text_to_image_webhook::{
   enqueue_nano_banana_2_text_to_image_webhook, EnqueueNanoBanana2TextToImageArgs,
-  EnqueueNanoBanana2TextToImageNumImages, EnqueueNanoBanana2TextToImageRequest,
-  EnqueueNanoBanana2TextToImageResolution,
+  EnqueueNanoBanana2TextToImageNumImages, EnqueueNanoBanana2TextToImageResolution,
 };
 
 pub async fn execute_fal_nano_banana_2(
   plan: &PlanFalNanaBanana2,
   fal_client: &RouterFalClient,
 ) -> Result<GenerateImageResponse, ArtcraftRouterError> {
-  let (webhook_response, outbound_request) = if plan.image_urls.is_empty() {
+  let webhook_response = if plan.image_urls.is_empty() {
     // Text-to-image mode
-    let request = EnqueueNanoBanana2TextToImageRequest {
-      prompt: plan.prompt.as_deref().unwrap_or("").to_string(),
+    let args = EnqueueNanoBanana2TextToImageArgs {
+      prompt: plan.prompt.as_deref().unwrap_or(""),
       num_images: to_t2i_num_images(plan.num_images),
       resolution: plan.resolution.map(to_t2i_resolution),
       aspect_ratio: plan.t2i_aspect_ratio,
-    };
-    let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
-    let args = EnqueueNanoBanana2TextToImageArgs {
-      request,
       webhook_url: fal_client.webhook_url.as_str(),
       api_key: &fal_client.api_key,
     };
-    let resp = enqueue_nano_banana_2_text_to_image_webhook(args)
+    enqueue_nano_banana_2_text_to_image_webhook(args)
       .await
-      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?;
-    (resp, outbound)
+      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?
   } else {
     // Image-edit mode
-    let request = EnqueueNanoBanana2EditImageRequest {
-      prompt: plan.prompt.as_deref().unwrap_or("").to_string(),
+    let args = EnqueueNanoBanana2EditImageArgs {
+      prompt: plan.prompt.as_deref().unwrap_or(""),
       image_urls: plan.image_urls.clone(),
       num_images: to_edit_num_images(plan.num_images),
       resolution: plan.resolution.map(to_edit_resolution),
       aspect_ratio: plan.edit_aspect_ratio,
-    };
-    let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
-    let args = EnqueueNanoBanana2EditImageArgs {
-      request,
       webhook_url: fal_client.webhook_url.as_str(),
       api_key: &fal_client.api_key,
     };
-    let resp = enqueue_nano_banana_2_edit_image_webhook(args)
+    enqueue_nano_banana_2_edit_image_webhook(args)
       .await
-      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?;
-    (resp, outbound)
+      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?
   };
 
   Ok(GenerateImageResponse::Fal(FalImageResponsePayload {
     request_id: webhook_response.request_id,
     gateway_request_id: webhook_response.gateway_request_id,
-    maybe_outbound_request: Some(outbound_request),
   }))
 }
 

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/execute/fal/generate_image_fal_nano_banana_pro.rs

@@ -1,6 +1,3 @@
-use std::fmt::Debug;
-use std::sync::Arc;
-
 use crate::client::router_fal_client::RouterFalClient;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::provider_error::ProviderError;
@@ -12,61 +9,48 @@ use crate::generate::generate_image::plan::fal::plan_generate_image_fal_nano_ban
 };
 use fal_client::requests::webhook::image::edit::enqueue_nano_banana_pro_edit_image_webhook::{
   enqueue_nano_banana_pro_image_edit_webhook, EnqueueNanoBananaProEditImageArgs,
-  EnqueueNanoBananaProEditImageNumImages, EnqueueNanoBananaProEditImageRequest,
-  EnqueueNanoBananaProEditImageResolution,
+  EnqueueNanoBananaProEditImageNumImages, EnqueueNanoBananaProEditImageResolution,
 };
 use fal_client::requests::webhook::image::text::enqueue_nano_banana_pro_text_to_image_webhook::{
   enqueue_nano_banana_pro_text_to_image_webhook, EnqueueNanoBananaProTextToImageArgs,
-  EnqueueNanoBananaProTextToImageNumImages, EnqueueNanoBananaProTextToImageRequest,
-  EnqueueNanoBananaProTextToImageResolution,
+  EnqueueNanoBananaProTextToImageNumImages, EnqueueNanoBananaProTextToImageResolution,
 };
 pub async fn execute_fal_nano_banana_pro(
   plan: &PlanFalNanaBananaPro,
   fal_client: &RouterFalClient,
 ) -> Result<GenerateImageResponse, ArtcraftRouterError> {
-  let (webhook_response, outbound_request) = if plan.image_urls.is_empty() {
+  let webhook_response = if plan.image_urls.is_empty() {
     // Text-to-image mode
-    let request = EnqueueNanoBananaProTextToImageRequest {
-      prompt: plan.prompt.as_deref().unwrap_or("").to_string(),
+    let args = EnqueueNanoBananaProTextToImageArgs {
+      prompt: plan.prompt.as_deref().unwrap_or(""),
       num_images: to_t2i_num_images(plan.num_images),
       resolution: plan.resolution.map(to_t2i_resolution),
       aspect_ratio: plan.t2i_aspect_ratio,
-    };
-    let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
-    let args = EnqueueNanoBananaProTextToImageArgs {
-      request,
       webhook_url: fal_client.webhook_url.as_str(),
       api_key: &fal_client.api_key,
     };
-    let resp = enqueue_nano_banana_pro_text_to_image_webhook(args)
+    enqueue_nano_banana_pro_text_to_image_webhook(args)
       .await
-      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?;
-    (resp, outbound)
+      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?
   } else {
     // Image-edit mode
-    let request = EnqueueNanoBananaProEditImageRequest {
-      prompt: plan.prompt.as_deref().unwrap_or("").to_string(),
+    let args = EnqueueNanoBananaProEditImageArgs {
+      prompt: plan.prompt.as_deref().unwrap_or(""),
       image_urls: plan.image_urls.clone(),
       num_images: to_edit_num_images(plan.num_images),
       resolution: plan.resolution.map(to_edit_resolution),
       aspect_ratio: plan.edit_aspect_ratio,
-    };
-    let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
-    let args = EnqueueNanoBananaProEditImageArgs {
-      request,
       webhook_url: fal_client.webhook_url.as_str(),
       api_key: &fal_client.api_key,
     };
-    let resp = enqueue_nano_banana_pro_image_edit_webhook(args)
+    enqueue_nano_banana_pro_image_edit_webhook(args)
       .await
-      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?;
-    (resp, outbound)
+      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?
   };
 
   Ok(GenerateImageResponse::Fal(FalImageResponsePayload {
     request_id: webhook_response.request_id,
     gateway_request_id: webhook_response.gateway_request_id,
-    maybe_outbound_request: Some(outbound_request),
   }))
 }
 

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/execute/fal/generate_image_fal_seedream_4.rs

@@ -1,6 +1,3 @@
-use std::fmt::Debug;
-use std::sync::Arc;
-
 use crate::client::router_fal_client::RouterFalClient;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::provider_error::ProviderError;
@@ -10,57 +7,44 @@ use crate::generate::generate_image::generate_image_response::{
 use crate::generate::generate_image::plan::fal::plan_generate_image_fal_seedream_4::PlanFalSeedream4;
 use fal_client::requests::webhook::image::edit::enqueue_bytedance_seedream_v4_edit_image_webhook::{
   enqueue_bytedance_seedream_v4_edit_image_webhook, EnqueueBytedanceSeedreamV4EditImageArgs,
-  EnqueueBytedanceSeedreamV4EditImageRequest,
 };
 use fal_client::requests::webhook::image::text::enqueue_bytedance_seedream_v4_text_to_image_webhook::{
   enqueue_bytedance_seedream_v4_text_to_image_webhook, EnqueueBytedanceSeedreamV4TextToImageArgs,
-  EnqueueBytedanceSeedreamV4TextToImageRequest,
 };
 
 pub async fn execute_fal_seedream_4(
   plan: &PlanFalSeedream4,
   fal_client: &RouterFalClient,
 ) -> Result<GenerateImageResponse, ArtcraftRouterError> {
-  let (webhook_response, outbound_request) = if plan.image_urls.is_empty() {
-    let request = EnqueueBytedanceSeedreamV4TextToImageRequest {
-      prompt: plan.prompt.clone().unwrap_or_default(),
+  let webhook_response = if plan.image_urls.is_empty() {
+    let args = EnqueueBytedanceSeedreamV4TextToImageArgs {
+      prompt: plan.prompt.as_deref().unwrap_or(""),
       num_images: Some(plan.num_images.to_t2i()),
       max_images: None,
       image_size: plan.image_size.map(|s| s.to_t2i()),
-    };
-    let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
-    let args = EnqueueBytedanceSeedreamV4TextToImageArgs {
-      request,
       webhook_url: fal_client.webhook_url.as_str(),
       api_key: &fal_client.api_key,
     };
-    let resp = enqueue_bytedance_seedream_v4_text_to_image_webhook(args)
+    enqueue_bytedance_seedream_v4_text_to_image_webhook(args)
       .await
-      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?;
-    (resp, outbound)
+      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?
   } else {
-    let request = EnqueueBytedanceSeedreamV4EditImageRequest {
-      prompt: plan.prompt.clone().unwrap_or_default(),
+    let args = EnqueueBytedanceSeedreamV4EditImageArgs {
+      prompt: plan.prompt.as_deref().unwrap_or(""),
       image_urls: plan.image_urls.clone(),
       num_images: Some(plan.num_images.to_edit()),
       max_images: None,
       image_size: plan.image_size.map(|s| s.to_edit()),
-    };
-    let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
-    let args = EnqueueBytedanceSeedreamV4EditImageArgs {
-      request,
       webhook_url: fal_client.webhook_url.as_str(),
       api_key: &fal_client.api_key,
     };
-    let resp = enqueue_bytedance_seedream_v4_edit_image_webhook(args)
+    enqueue_bytedance_seedream_v4_edit_image_webhook(args)
       .await
-      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?;
-    (resp, outbound)
+      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?
   };
 
   Ok(GenerateImageResponse::Fal(FalImageResponsePayload {
     request_id: webhook_response.request_id,
     gateway_request_id: webhook_response.gateway_request_id,
-    maybe_outbound_request: Some(outbound_request),
   }))
 }

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/execute/fal/generate_image_fal_seedream_4p5.rs

@@ -1,6 +1,3 @@
-use std::fmt::Debug;
-use std::sync::Arc;
-
 use crate::client::router_fal_client::RouterFalClient;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::provider_error::ProviderError;
@@ -10,57 +7,44 @@ use crate::generate::generate_image::generate_image_response::{
 use crate::generate::generate_image::plan::fal::plan_generate_image_fal_seedream_4p5::PlanFalSeedream4p5;
 use fal_client::requests::webhook::image::edit::enqueue_bytedance_seedream_v4p5_edit_image_webhook::{
   enqueue_bytedance_seedream_v4p5_edit_image_webhook, EnqueueBytedanceSeedreamV4p5EditImageArgs,
-  EnqueueBytedanceSeedreamV4p5EditImageRequest,
 };
 use fal_client::requests::webhook::image::text::enqueue_bytedance_seedream_v4p5_text_to_image_webhook::{
   enqueue_bytedance_seedream_v4p5_text_to_image_webhook, EnqueueBytedanceSeedreamV4p5TextToImageArgs,
-  EnqueueBytedanceSeedreamV4p5TextToImageRequest,
 };
 
 pub async fn execute_fal_seedream_4p5(
   plan: &PlanFalSeedream4p5,
   fal_client: &RouterFalClient,
 ) -> Result<GenerateImageResponse, ArtcraftRouterError> {
-  let (webhook_response, outbound_request) = if plan.image_urls.is_empty() {
-    let request = EnqueueBytedanceSeedreamV4p5TextToImageRequest {
-      prompt: plan.prompt.clone().unwrap_or_default(),
+  let webhook_response = if plan.image_urls.is_empty() {
+    let args = EnqueueBytedanceSeedreamV4p5TextToImageArgs {
+      prompt: plan.prompt.as_deref().unwrap_or(""),
       num_images: Some(plan.num_images.to_t2i()),
       max_images: None,
       image_size: plan.image_size.map(|s| s.to_t2i()),
-    };
-    let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
-    let args = EnqueueBytedanceSeedreamV4p5TextToImageArgs {
-      request,
       webhook_url: fal_client.webhook_url.as_str(),
       api_key: &fal_client.api_key,
     };
-    let resp = enqueue_bytedance_seedream_v4p5_text_to_image_webhook(args)
+    enqueue_bytedance_seedream_v4p5_text_to_image_webhook(args)
       .await
-      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?;
-    (resp, outbound)
+      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?
   } else {
-    let request = EnqueueBytedanceSeedreamV4p5EditImageRequest {
-      prompt: plan.prompt.clone().unwrap_or_default(),
+    let args = EnqueueBytedanceSeedreamV4p5EditImageArgs {
+      prompt: plan.prompt.as_deref().unwrap_or(""),
       image_urls: plan.image_urls.clone(),
       num_images: Some(plan.num_images.to_edit()),
       max_images: None,
       image_size: plan.image_size.map(|s| s.to_edit()),
-    };
-    let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
-    let args = EnqueueBytedanceSeedreamV4p5EditImageArgs {
-      request,
       webhook_url: fal_client.webhook_url.as_str(),
       api_key: &fal_client.api_key,
     };
-    let resp = enqueue_bytedance_seedream_v4p5_edit_image_webhook(args)
+    enqueue_bytedance_seedream_v4p5_edit_image_webhook(args)
       .await
-      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?;
-    (resp, outbound)
+      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?
   };
 
   Ok(GenerateImageResponse::Fal(FalImageResponsePayload {
     request_id: webhook_response.request_id,
     gateway_request_id: webhook_response.gateway_request_id,
-    maybe_outbound_request: Some(outbound_request),
   }))
 }

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/execute/fal/generate_image_fal_seedream_5_lite.rs

@@ -1,6 +1,3 @@
-use std::fmt::Debug;
-use std::sync::Arc;
-
 use crate::client::router_fal_client::RouterFalClient;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::provider_error::ProviderError;
@@ -10,57 +7,44 @@ use crate::generate::generate_image::generate_image_response::{
 use crate::generate::generate_image::plan::fal::plan_generate_image_fal_seedream_5_lite::PlanFalSeedream5Lite;
 use fal_client::requests::webhook::image::edit::enqueue_bytedance_seedream_v5_lite_edit_image_webhook::{
   enqueue_bytedance_seedream_v5_lite_edit_image_webhook, EnqueueBytedanceSeedreamV5LiteEditImageArgs,
-  EnqueueBytedanceSeedreamV5LiteEditImageRequest,
 };
 use fal_client::requests::webhook::image::text::enqueue_bytedance_seedream_v5_lite_text_to_image_webhook::{
   enqueue_bytedance_seedream_v5_lite_text_to_image_webhook, EnqueueBytedanceSeedreamV5LiteTextToImageArgs,
-  EnqueueBytedanceSeedreamV5LiteTextToImageRequest,
 };
 
 pub async fn execute_fal_seedream_5_lite(
   plan: &PlanFalSeedream5Lite,
   fal_client: &RouterFalClient,
 ) -> Result<GenerateImageResponse, ArtcraftRouterError> {
-  let (webhook_response, outbound_request) = if plan.image_urls.is_empty() {
-    let request = EnqueueBytedanceSeedreamV5LiteTextToImageRequest {
-      prompt: plan.prompt.clone().unwrap_or_default(),
+  let webhook_response = if plan.image_urls.is_empty() {
+    let args = EnqueueBytedanceSeedreamV5LiteTextToImageArgs {
+      prompt: plan.prompt.as_deref().unwrap_or(""),
       num_images: Some(plan.num_images.to_t2i()),
       max_images: None,
       image_size: plan.image_size.map(|s| s.to_t2i()),
-    };
-    let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
-    let args = EnqueueBytedanceSeedreamV5LiteTextToImageArgs {
-      request,
       webhook_url: fal_client.webhook_url.as_str(),
       api_key: &fal_client.api_key,
     };
-    let resp = enqueue_bytedance_seedream_v5_lite_text_to_image_webhook(args)
+    enqueue_bytedance_seedream_v5_lite_text_to_image_webhook(args)
       .await
-      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?;
-    (resp, outbound)
+      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?
   } else {
-    let request = EnqueueBytedanceSeedreamV5LiteEditImageRequest {
-      prompt: plan.prompt.clone().unwrap_or_default(),
+    let args = EnqueueBytedanceSeedreamV5LiteEditImageArgs {
+      prompt: plan.prompt.as_deref().unwrap_or(""),
       image_urls: plan.image_urls.clone(),
       num_images: Some(plan.num_images.to_edit()),
       max_images: None,
       image_size: plan.image_size.map(|s| s.to_edit()),
-    };
-    let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
-    let args = EnqueueBytedanceSeedreamV5LiteEditImageArgs {
-      request,
       webhook_url: fal_client.webhook_url.as_str(),
       api_key: &fal_client.api_key,
     };
-    let resp = enqueue_bytedance_seedream_v5_lite_edit_image_webhook(args)
+    enqueue_bytedance_seedream_v5_lite_edit_image_webhook(args)
       .await
-      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?;
-    (resp, outbound)
+      .map_err(|e| ArtcraftRouterError::Provider(ProviderError::Fal(e)))?
   };
 
   Ok(GenerateImageResponse::Fal(FalImageResponsePayload {
     request_id: webhook_response.request_id,
     gateway_request_id: webhook_response.gateway_request_id,
-    maybe_outbound_request: Some(outbound_request),
   }))
 }

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/execute/fal/mod.rs

@@ -4,7 +4,6 @@ pub mod generate_image_fal_flux_pro_1p1;
 pub mod generate_image_fal_flux_pro_1p1_ultra;
 pub mod generate_image_fal_gpt_image_1;
 pub mod generate_image_fal_gpt_image_1p5;
-pub mod generate_image_fal_gpt_image_2;
 pub mod generate_image_fal_seedream_4;
 pub mod generate_image_fal_seedream_4p5;
 pub mod generate_image_fal_seedream_5_lite;

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

@@ -16,7 +16,6 @@ use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraf
 use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_flux_pro_1p1_ultra::plan_generate_image_artcraft_flux_pro_1p1_ultra;
 use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_gpt_image_1::plan_generate_image_artcraft_gpt_image_1;
 use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_gpt_image_1p5::plan_generate_image_artcraft_gpt_image_1p5;
-use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_gpt_image_2::plan_generate_image_artcraft_gpt_image_2;
 use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_nano_banana::plan_generate_image_artcraft_nano_banana;
 use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_nano_banana_2::plan_generate_image_artcraft_nano_banana_2;
 use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_nano_banana_pro::plan_generate_image_artcraft_nano_banana_pro;
@@ -30,7 +29,6 @@ use crate::generate::generate_image::plan::fal::plan_generate_image_fal_flux_pro
 use crate::generate::generate_image::plan::fal::plan_generate_image_fal_flux_pro_1p1_ultra::plan_generate_image_fal_flux_pro_1p1_ultra;
 use crate::generate::generate_image::plan::fal::plan_generate_image_fal_gpt_image_1::plan_generate_image_fal_gpt_image_1;
 use crate::generate::generate_image::plan::fal::plan_generate_image_fal_gpt_image_1p5::plan_generate_image_fal_gpt_image_1p5;
-use crate::generate::generate_image::plan::fal::plan_generate_image_fal_gpt_image_2::plan_generate_image_fal_gpt_image_2;
 use crate::generate::generate_image::plan::fal::plan_generate_image_fal_seedream_4::plan_generate_image_fal_seedream_4;
 use crate::generate::generate_image::plan::fal::plan_generate_image_fal_seedream_4p5::plan_generate_image_fal_seedream_4p5;
 use crate::generate::generate_image::plan::fal::plan_generate_image_fal_seedream_5_lite::plan_generate_image_fal_seedream_5_lite;
@@ -102,20 +100,18 @@ impl GenerateImageRequest {
     match self.model {
       CommonImageModel::Flux1Dev => plan_generate_image_artcraft_flux_1_dev(self),
       CommonImageModel::Flux1Schnell => plan_generate_image_artcraft_flux_1_schnell(self),
-      CommonImageModel::Flux2LoraAngles => plan_generate_image_artcraft_flux_2_lora_angles(self),
       CommonImageModel::FluxPro11 => plan_generate_image_artcraft_flux_pro_1p1(self),
       CommonImageModel::FluxPro11Ultra => plan_generate_image_artcraft_flux_pro_1p1_ultra(self),
       CommonImageModel::GptImage1 => plan_generate_image_artcraft_gpt_image_1(self),
       CommonImageModel::GptImage1p5 => plan_generate_image_artcraft_gpt_image_1p5(self),
-      CommonImageModel::GptImage2 => plan_generate_image_artcraft_gpt_image_2(self),
       CommonImageModel::NanoBanana => plan_generate_image_artcraft_nano_banana(self),
       CommonImageModel::NanoBanana2 => plan_generate_image_artcraft_nano_banana_2(self),
       CommonImageModel::NanoBananaPro => plan_generate_image_artcraft_nano_banana_pro(self),
-      CommonImageModel::QwenEdit2511Angles => plan_generate_image_artcraft_qwen_edit_2511_angles(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),
-      _ => Err(ArtcraftRouterError::UnsupportedModel(format!("{:?}", self.model))),
+      CommonImageModel::QwenEdit2511Angles => plan_generate_image_artcraft_qwen_edit_2511_angles(self),
+      CommonImageModel::Flux2LoraAngles => plan_generate_image_artcraft_flux_2_lora_angles(self),
     }
   }
 
@@ -127,13 +123,12 @@ impl GenerateImageRequest {
       CommonImageModel::FluxPro11Ultra => plan_generate_image_fal_flux_pro_1p1_ultra(self),
       CommonImageModel::GptImage1 => plan_generate_image_fal_gpt_image_1(self),
       CommonImageModel::GptImage1p5 => plan_generate_image_fal_gpt_image_1p5(self),
-      CommonImageModel::GptImage2 => plan_generate_image_fal_gpt_image_2(self),
-      CommonImageModel::NanoBanana => plan_generate_image_fal_nano_banana(self),
-      CommonImageModel::NanoBanana2 => plan_generate_image_fal_nano_banana_2(self),
-      CommonImageModel::NanoBananaPro => plan_generate_image_fal_nano_banana_pro(self),
       CommonImageModel::Seedream4 => plan_generate_image_fal_seedream_4(self),
       CommonImageModel::Seedream4p5 => plan_generate_image_fal_seedream_4p5(self),
       CommonImageModel::Seedream5Lite => plan_generate_image_fal_seedream_5_lite(self),
+      CommonImageModel::NanoBanana => plan_generate_image_fal_nano_banana(self),
+      CommonImageModel::NanoBanana2 => plan_generate_image_fal_nano_banana_2(self),
+      CommonImageModel::NanoBananaPro => plan_generate_image_fal_nano_banana_pro(self),
       _ => {
         Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
           field: "provider",

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

@@ -1,6 +1,3 @@
-use std::fmt::Debug;
-use std::sync::Arc;
-
 use tokens::tokens::generic_inference_jobs::InferenceJobToken;
 
 #[derive(Clone, Debug)]
@@ -12,11 +9,6 @@ pub struct ArtcraftImageResponsePayload {
 pub struct FalImageResponsePayload {
   pub request_id: Option<String>,
   pub gateway_request_id: Option<String>,
-
-  /// The outbound request that was sent to Fal.
-  /// Stored as a trait object so any Request type can be captured.
-  /// Use `format!("{:?}", ...)` or `format!("{:#?}", ...)` to print.
-  pub maybe_outbound_request: Option<Arc<dyn Debug + Send + Sync>>,
 }
 
 #[derive(Clone, Debug)]

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

@@ -6,7 +6,6 @@ use crate::generate::generate_image::cost::artcraft::estimate_image_cost_artcraf
 use crate::generate::generate_image::cost::artcraft::estimate_image_cost_artcraft_flux_pro_1p1_ultra::estimate_image_cost_artcraft_flux_pro_1p1_ultra;
 use crate::generate::generate_image::cost::artcraft::estimate_image_cost_artcraft_gpt_image_1::estimate_image_cost_artcraft_gpt_image_1;
 use crate::generate::generate_image::cost::artcraft::estimate_image_cost_artcraft_gpt_image_1p5::estimate_image_cost_artcraft_gpt_image_1p5;
-use crate::generate::generate_image::cost::artcraft::estimate_image_cost_artcraft_gpt_image_2::estimate_image_cost_artcraft_gpt_image_2;
 use crate::generate::generate_image::cost::artcraft::estimate_image_cost_artcraft_nano_banana::estimate_image_cost_artcraft_nano_banana;
 use crate::generate::generate_image::cost::artcraft::estimate_image_cost_artcraft_nano_banana_2::estimate_image_cost_artcraft_nano_banana_2;
 use crate::generate::generate_image::cost::artcraft::estimate_image_cost_artcraft_nano_banana_pro::estimate_image_cost_artcraft_nano_banana_pro;
@@ -21,7 +20,6 @@ use crate::generate::generate_image::cost::fal::estimate_image_cost_fal_flux_pro
 use crate::generate::generate_image::cost::fal::estimate_image_cost_fal_flux_pro_1p1_ultra::estimate_image_cost_fal_flux_pro_1p1_ultra;
 use crate::generate::generate_image::cost::fal::estimate_image_cost_fal_gpt_image_1::estimate_image_cost_fal_gpt_image_1;
 use crate::generate::generate_image::cost::fal::estimate_image_cost_fal_gpt_image_1p5::estimate_image_cost_fal_gpt_image_1p5;
-use crate::generate::generate_image::cost::fal::estimate_image_cost_fal_gpt_image_2::estimate_image_cost_fal_gpt_image_2;
 use crate::generate::generate_image::cost::fal::estimate_image_cost_fal_seedream_4::estimate_image_cost_fal_seedream_4;
 use crate::generate::generate_image::cost::fal::estimate_image_cost_fal_seedream_4p5::estimate_image_cost_fal_seedream_4p5;
 use crate::generate::generate_image::cost::fal::estimate_image_cost_fal_seedream_5_lite::estimate_image_cost_fal_seedream_5_lite;
@@ -34,7 +32,6 @@ use crate::generate::generate_image::execute::artcraft::generate_image_artcraft_
 use crate::generate::generate_image::execute::artcraft::generate_image_artcraft_flux_pro_1p1_ultra::execute_artcraft_flux_pro_1p1_ultra;
 use crate::generate::generate_image::execute::artcraft::generate_image_artcraft_gpt_image_1::execute_artcraft_gpt_image_1;
 use crate::generate::generate_image::execute::artcraft::generate_image_artcraft_gpt_image_1p5::execute_artcraft_gpt_image_1p5;
-use crate::generate::generate_image::execute::artcraft::generate_image_artcraft_gpt_image_2::execute_artcraft_gpt_image_2;
 use crate::generate::generate_image::execute::artcraft::generate_image_artcraft_nano_banana::execute_artcraft_nano_banana;
 use crate::generate::generate_image::execute::artcraft::generate_image_artcraft_nano_banana_2::execute_artcraft_nano_banana_2;
 use crate::generate::generate_image::execute::artcraft::generate_image_artcraft_nano_banana_pro::execute_artcraft_nano_banana_pro;
@@ -49,7 +46,6 @@ use crate::generate::generate_image::execute::fal::generate_image_fal_flux_pro_1
 use crate::generate::generate_image::execute::fal::generate_image_fal_flux_pro_1p1_ultra::execute_fal_flux_pro_1p1_ultra;
 use crate::generate::generate_image::execute::fal::generate_image_fal_gpt_image_1::execute_fal_gpt_image_1;
 use crate::generate::generate_image::execute::fal::generate_image_fal_gpt_image_1p5::execute_fal_gpt_image_1p5;
-use crate::generate::generate_image::execute::fal::generate_image_fal_gpt_image_2::execute_fal_gpt_image_2;
 use crate::generate::generate_image::execute::fal::generate_image_fal_seedream_4::execute_fal_seedream_4;
 use crate::generate::generate_image::execute::fal::generate_image_fal_seedream_4p5::execute_fal_seedream_4p5;
 use crate::generate::generate_image::execute::fal::generate_image_fal_seedream_5_lite::execute_fal_seedream_5_lite;
@@ -64,7 +60,6 @@ use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraf
 use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_flux_pro_1p1_ultra::PlanArtcraftFluxPro11Ultra;
 use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_gpt_image_1::PlanArtcraftGptImage1;
 use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_gpt_image_1p5::PlanArtcraftGptImage1p5;
-use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_gpt_image_2::PlanArtcraftGptImage2;
 use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_nano_banana::PlanArtcraftNanaBanana;
 use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_nano_banana_2::PlanArtcraftNanaBanana2;
 use crate::generate::generate_image::plan::artcraft::plan_generate_image_artcraft_nano_banana_pro::PlanArtcraftNanaBananaPro;
@@ -79,7 +74,6 @@ use crate::generate::generate_image::plan::fal::plan_generate_image_fal_flux_pro
 use crate::generate::generate_image::plan::fal::plan_generate_image_fal_flux_pro_1p1_ultra::PlanFalFluxPro11Ultra;
 use crate::generate::generate_image::plan::fal::plan_generate_image_fal_gpt_image_1::PlanFalGptImage1;
 use crate::generate::generate_image::plan::fal::plan_generate_image_fal_gpt_image_1p5::PlanFalGptImage1p5;
-use crate::generate::generate_image::plan::fal::plan_generate_image_fal_gpt_image_2::PlanFalGptImage2;
 use crate::generate::generate_image::plan::fal::plan_generate_image_fal_seedream_4::PlanFalSeedream4;
 use crate::generate::generate_image::plan::fal::plan_generate_image_fal_seedream_4p5::PlanFalSeedream4p5;
 use crate::generate::generate_image::plan::fal::plan_generate_image_fal_seedream_5_lite::PlanFalSeedream5Lite;
@@ -95,7 +89,6 @@ pub enum ImageGenerationPlan {
   ArtcraftFluxPro11Ultra(PlanArtcraftFluxPro11Ultra),
   ArtcraftGptImage1(PlanArtcraftGptImage1),
   ArtcraftGptImage1p5(PlanArtcraftGptImage1p5),
-  ArtcraftGptImage2(PlanArtcraftGptImage2),
   ArtcraftNanaBanana(PlanArtcraftNanaBanana),
   ArtcraftNanaBanana2(PlanArtcraftNanaBanana2),
   ArtcraftNanaBananaPro(PlanArtcraftNanaBananaPro),
@@ -110,7 +103,6 @@ pub enum ImageGenerationPlan {
   FalFluxPro11Ultra(PlanFalFluxPro11Ultra),
   FalGptImage1(PlanFalGptImage1),
   FalGptImage1p5(PlanFalGptImage1p5),
-  FalGptImage2(PlanFalGptImage2),
   FalSeedream4(PlanFalSeedream4),
   FalSeedream4p5(PlanFalSeedream4p5),
   FalSeedream5Lite(PlanFalSeedream5Lite),
@@ -149,10 +141,6 @@ impl ImageGenerationPlan {
         let artcraft_client = client.get_artcraft_client_ref()?;
         execute_artcraft_gpt_image_1p5(plan, artcraft_client).await
       }
-      ImageGenerationPlan::ArtcraftGptImage2(plan) => {
-        let artcraft_client = client.get_artcraft_client_ref()?;
-        execute_artcraft_gpt_image_2(plan, artcraft_client).await
-      }
       ImageGenerationPlan::ArtcraftNanaBanana(plan) => {
         let artcraft_client = client.get_artcraft_client_ref()?;
         execute_artcraft_nano_banana(plan, artcraft_client).await
@@ -209,10 +197,6 @@ impl ImageGenerationPlan {
         let fal_client = client.get_fal_client_ref()?;
         execute_fal_gpt_image_1p5(plan, fal_client).await
       }
-      ImageGenerationPlan::FalGptImage2(plan) => {
-        let fal_client = client.get_fal_client_ref()?;
-        execute_fal_gpt_image_2(plan, fal_client).await
-      }
       ImageGenerationPlan::FalSeedream4(plan) => {
         let fal_client = client.get_fal_client_ref()?;
         execute_fal_seedream_4(plan, fal_client).await
@@ -260,9 +244,6 @@ impl ImageGenerationPlan {
       ImageGenerationPlan::ArtcraftGptImage1p5(plan) => {
         estimate_image_cost_artcraft_gpt_image_1p5(plan)
       }
-      ImageGenerationPlan::ArtcraftGptImage2(plan) => {
-        estimate_image_cost_artcraft_gpt_image_2(plan)
-      }
       ImageGenerationPlan::ArtcraftNanaBanana(plan) => {
         estimate_image_cost_artcraft_nano_banana(plan)
       }
@@ -305,9 +286,6 @@ impl ImageGenerationPlan {
       ImageGenerationPlan::FalGptImage1p5(plan) => {
         estimate_image_cost_fal_gpt_image_1p5(plan)
       }
-      ImageGenerationPlan::FalGptImage2(plan) => {
-        estimate_image_cost_fal_gpt_image_2(plan)
-      }
       ImageGenerationPlan::FalSeedream4(plan) => {
         estimate_image_cost_fal_seedream_4(plan)
       }

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

@@ -4,7 +4,6 @@ pub mod plan_generate_image_artcraft_flux_pro_1p1;
 pub mod plan_generate_image_artcraft_flux_pro_1p1_ultra;
 pub mod plan_generate_image_artcraft_gpt_image_1;
 pub mod plan_generate_image_artcraft_gpt_image_1p5;
-pub mod plan_generate_image_artcraft_gpt_image_2;
 pub mod plan_generate_image_artcraft_nano_banana;
 pub mod plan_generate_image_artcraft_nano_banana_2;
 pub mod plan_generate_image_artcraft_nano_banana_pro;

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

@@ -1,435 +0,0 @@
-use crate::api::common_aspect_ratio::CommonAspectRatio;
-use crate::api::common_quality::CommonQuality;
-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 enums::common::generation::common_aspect_ratio::CommonAspectRatio as CommonAspectRatioEnum;
-use enums::common::generation::common_quality::CommonQuality as CommonQualityEnum;
-use tokens::tokens::media_files::MediaFileToken;
-
-/// GPT Image 2 supports six image sizes.
-#[derive(Debug, Clone, Copy)]
-pub enum ArtcraftGptImage2ImageSize {
-  SquareHd,
-  Square,
-  Portrait4x3,
-  Portrait16x9,
-  Landscape4x3,
-  Landscape16x9,
-  Auto,
-}
-
-/// Quality: Low / Medium / High.
-#[derive(Debug, Clone, Copy)]
-pub enum ArtcraftGptImage2Quality {
-  Low,
-  Medium,
-  High,
-}
-
-#[derive(Debug, Clone, Copy)]
-pub enum ArtcraftGptImage2NumImages {
-  One,
-  Two,
-  Three,
-  Four,
-}
-
-#[derive(Debug, Clone)]
-pub struct PlanArtcraftGptImage2 {
-  pub prompt: Option<String>,
-  pub image_inputs: Option<Vec<MediaFileToken>>,
-  pub image_size: Option<ArtcraftGptImage2ImageSize>,
-  pub quality: ArtcraftGptImage2Quality,
-  pub num_images: ArtcraftGptImage2NumImages,
-  pub idempotency_token: String,
-}
-
-pub fn plan_generate_image_artcraft_gpt_image_2(
-  request: &GenerateImageRequest,
-) -> Result<ImageGenerationPlan, ArtcraftRouterError> {
-  let strategy = request.request_mismatch_mitigation_strategy;
-
-  let image_inputs = resolve_image_list_ref(request.image_inputs.clone())?;
-  let image_size = plan_image_size(request.aspect_ratio);
-  let quality = plan_quality(request.quality);
-  let num_images = plan_num_images(request.image_batch_count, strategy)?;
-
-  Ok(ImageGenerationPlan::ArtcraftGptImage2(PlanArtcraftGptImage2 {
-    prompt: request.prompt.clone(),
-    image_inputs,
-    image_size,
-    quality,
-    num_images,
-    idempotency_token: request.get_or_generate_idempotency_token(),
-  }))
-}
-
-impl PlanArtcraftGptImage2 {
-  /// Map the plan's aspect ratio to the `CommonAspectRatioEnum` used by the
-  /// omni-gen request.
-  pub fn aspect_ratio_enum(&self) -> Option<CommonAspectRatioEnum> {
-    self.image_size.map(|s| match s {
-      ArtcraftGptImage2ImageSize::SquareHd => CommonAspectRatioEnum::SquareHd,
-      ArtcraftGptImage2ImageSize::Square => CommonAspectRatioEnum::Square,
-      ArtcraftGptImage2ImageSize::Portrait4x3 => CommonAspectRatioEnum::TallThreeByFour,
-      ArtcraftGptImage2ImageSize::Portrait16x9 => CommonAspectRatioEnum::TallNineBySixteen,
-      ArtcraftGptImage2ImageSize::Landscape4x3 => CommonAspectRatioEnum::WideFourByThree,
-      ArtcraftGptImage2ImageSize::Landscape16x9 => CommonAspectRatioEnum::WideSixteenByNine,
-      ArtcraftGptImage2ImageSize::Auto => CommonAspectRatioEnum::Auto,
-    })
-  }
-
-  /// Map the plan's quality to the `CommonQualityEnum` used by the omni-gen
-  /// request.
-  pub fn quality_enum(&self) -> CommonQualityEnum {
-    match self.quality {
-      ArtcraftGptImage2Quality::Low => CommonQualityEnum::Low,
-      ArtcraftGptImage2Quality::Medium => CommonQualityEnum::Medium,
-      ArtcraftGptImage2Quality::High => CommonQualityEnum::High,
-    }
-  }
-
-  pub fn num_images_u16(&self) -> u16 {
-    match self.num_images {
-      ArtcraftGptImage2NumImages::One => 1,
-      ArtcraftGptImage2NumImages::Two => 2,
-      ArtcraftGptImage2NumImages::Three => 3,
-      ArtcraftGptImage2NumImages::Four => 4,
-    }
-  }
-}
-
-impl ArtcraftGptImage2NumImages {
-  pub fn as_u64(self) -> u64 {
-    match self {
-      Self::One => 1,
-      Self::Two => 2,
-      Self::Three => 3,
-      Self::Four => 4,
-    }
-  }
-}
-
-fn resolve_image_list_ref(
-  image_list_ref: Option<ImageListRef>,
-) -> Result<Option<Vec<MediaFileToken>>, ArtcraftRouterError> {
-  match image_list_ref {
-    None => Ok(None),
-    Some(ImageListRef::MediaFileTokens(tokens)) => Ok(Some(tokens)),
-    Some(ImageListRef::Urls(_)) => Ok(None),
-  }
-}
-
-fn plan_quality(quality: Option<CommonQuality>) -> ArtcraftGptImage2Quality {
-  match quality {
-    Some(CommonQuality::Low) => ArtcraftGptImage2Quality::Low,
-    Some(CommonQuality::Medium) => ArtcraftGptImage2Quality::Medium,
-    Some(CommonQuality::High) => ArtcraftGptImage2Quality::High,
-    None => ArtcraftGptImage2Quality::High,
-  }
-}
-
-fn plan_image_size(aspect_ratio: Option<CommonAspectRatio>) -> Option<ArtcraftGptImage2ImageSize> {
-  use ArtcraftGptImage2ImageSize as S;
-  match aspect_ratio {
-    None
-    | Some(CommonAspectRatio::Auto)
-    | Some(CommonAspectRatio::Auto2k)
-    | Some(CommonAspectRatio::Auto3k)
-    | Some(CommonAspectRatio::Auto4k) => Some(S::Auto),
-
-    Some(CommonAspectRatio::Square) => Some(S::Square),
-    Some(CommonAspectRatio::SquareHd) => Some(S::SquareHd),
-
-    Some(CommonAspectRatio::WideFourByThree)
-    | Some(CommonAspectRatio::WideFiveByFour) => Some(S::Landscape4x3),
-
-    Some(CommonAspectRatio::WideThreeByTwo)
-    | Some(CommonAspectRatio::WideSixteenByNine)
-    | Some(CommonAspectRatio::WideTwentyOneByNine)
-    | Some(CommonAspectRatio::Wide) => Some(S::Landscape16x9),
-
-    Some(CommonAspectRatio::TallThreeByFour)
-    | Some(CommonAspectRatio::TallFourByFive) => Some(S::Portrait4x3),
-
-    Some(CommonAspectRatio::TallTwoByThree)
-    | Some(CommonAspectRatio::TallNineBySixteen)
-    | Some(CommonAspectRatio::TallNineByTwentyOne)
-    | Some(CommonAspectRatio::Tall) => Some(S::Portrait16x9),
-  }
-}
-
-fn plan_num_images(
-  image_batch_count: Option<u16>,
-  strategy: RequestMismatchMitigationStrategy,
-) -> Result<ArtcraftGptImage2NumImages, ArtcraftRouterError> {
-  let count = image_batch_count.unwrap_or(1);
-  match count {
-    0 => Err(ArtcraftRouterError::Client(ClientError::UserRequestedZeroGenerations)),
-    1 => Ok(ArtcraftGptImage2NumImages::One),
-    2 => Ok(ArtcraftGptImage2NumImages::Two),
-    3 => Ok(ArtcraftGptImage2NumImages::Three),
-    4 => Ok(ArtcraftGptImage2NumImages::Four),
-    _ => match strategy {
-      RequestMismatchMitigationStrategy::ErrorOut => {
-        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
-          field: "image_batch_count",
-          value: format!("{}", count),
-        }))
-      }
-      _ => Ok(ArtcraftGptImage2NumImages::Four),
-    },
-  }
-}
-
-#[cfg(test)]
-mod tests {
-  use super::*;
-  use crate::api::common_image_model::CommonImageModel;
-  use crate::api::provider::Provider;
-
-  // ── Mode detection ──
-
-  mod mode_detection {
-    use super::*;
-
-    #[test]
-    fn no_image_inputs_yields_none() {
-      let plan = build_plan(&GenerateImageRequest { image_inputs: None, ..base_request() });
-      assert!(plan.image_inputs.is_none());
-    }
-
-    #[test]
-    fn media_token_inputs_are_extracted() {
-      let tokens = vec![
-        MediaFileToken::new_from_str("mf_test_a"),
-        MediaFileToken::new_from_str("mf_test_b"),
-      ];
-      let plan = build_plan(&GenerateImageRequest {
-        image_inputs: Some(ImageListRef::MediaFileTokens(tokens.clone())),
-        ..base_request()
-      });
-      assert!(plan.image_inputs.is_some());
-      assert_eq!(plan.image_inputs.unwrap().len(), 2);
-    }
-
-    #[test]
-    fn url_inputs_are_accepted_for_cost_path() {
-      let urls = vec!["https://example.com/a.jpg".to_string()];
-      let plan = build_plan(&GenerateImageRequest {
-        image_inputs: Some(ImageListRef::Urls(urls)),
-        ..base_request()
-      });
-      assert!(plan.image_inputs.is_none());
-    }
-  }
-
-  // ── Quality ──
-
-  mod quality_tests {
-    use super::*;
-
-    #[test]
-    fn defaults_to_high() {
-      let plan = build_plan(&base_request());
-      assert!(matches!(plan.quality, ArtcraftGptImage2Quality::High));
-    }
-
-    #[test]
-    fn low() {
-      let plan = build_plan(&GenerateImageRequest { quality: Some(CommonQuality::Low), ..base_request() });
-      assert!(matches!(plan.quality, ArtcraftGptImage2Quality::Low));
-    }
-
-    #[test]
-    fn medium() {
-      let plan = build_plan(&GenerateImageRequest { quality: Some(CommonQuality::Medium), ..base_request() });
-      assert!(matches!(plan.quality, ArtcraftGptImage2Quality::Medium));
-    }
-
-    #[test]
-    fn high() {
-      let plan = build_plan(&GenerateImageRequest { quality: Some(CommonQuality::High), ..base_request() });
-      assert!(matches!(plan.quality, ArtcraftGptImage2Quality::High));
-    }
-  }
-
-  // ── Image size mapping ──
-
-  mod image_size_tests {
-    use super::*;
-
-    #[test]
-    fn none_yields_auto() {
-      let plan = build_plan(&GenerateImageRequest { aspect_ratio: None, ..base_request() });
-      assert!(matches!(plan.image_size, Some(ArtcraftGptImage2ImageSize::Auto)));
-    }
-
-    #[test]
-    fn auto_variants_yield_auto() {
-      for ar in [CommonAspectRatio::Auto, CommonAspectRatio::Auto2k, CommonAspectRatio::Auto4k] {
-        let plan = build_plan(&GenerateImageRequest { aspect_ratio: Some(ar), ..base_request() });
-        assert!(matches!(plan.image_size, Some(ArtcraftGptImage2ImageSize::Auto)), "expected Auto for {:?}", ar);
-      }
-    }
-
-    #[test]
-    fn square() {
-      let plan = build_plan(&GenerateImageRequest { aspect_ratio: Some(CommonAspectRatio::Square), ..base_request() });
-      assert!(matches!(plan.image_size, Some(ArtcraftGptImage2ImageSize::Square)));
-    }
-
-    #[test]
-    fn square_hd() {
-      let plan = build_plan(&GenerateImageRequest { aspect_ratio: Some(CommonAspectRatio::SquareHd), ..base_request() });
-      assert!(matches!(plan.image_size, Some(ArtcraftGptImage2ImageSize::SquareHd)));
-    }
-
-    #[test]
-    fn landscape_4x3_variants() {
-      for ar in [CommonAspectRatio::WideFourByThree, CommonAspectRatio::WideFiveByFour] {
-        let plan = build_plan(&GenerateImageRequest { aspect_ratio: Some(ar), ..base_request() });
-        assert!(matches!(plan.image_size, Some(ArtcraftGptImage2ImageSize::Landscape4x3)), "expected Landscape4x3 for {:?}", ar);
-      }
-    }
-
-    #[test]
-    fn landscape_16x9_variants() {
-      for ar in [
-        CommonAspectRatio::WideThreeByTwo,
-        CommonAspectRatio::WideSixteenByNine,
-        CommonAspectRatio::WideTwentyOneByNine,
-        CommonAspectRatio::Wide,
-      ] {
-        let plan = build_plan(&GenerateImageRequest { aspect_ratio: Some(ar), ..base_request() });
-        assert!(matches!(plan.image_size, Some(ArtcraftGptImage2ImageSize::Landscape16x9)), "expected Landscape16x9 for {:?}", ar);
-      }
-    }
-
-    #[test]
-    fn portrait_4x3_variants() {
-      for ar in [CommonAspectRatio::TallThreeByFour, CommonAspectRatio::TallFourByFive] {
-        let plan = build_plan(&GenerateImageRequest { aspect_ratio: Some(ar), ..base_request() });
-        assert!(matches!(plan.image_size, Some(ArtcraftGptImage2ImageSize::Portrait4x3)), "expected Portrait4x3 for {:?}", ar);
-      }
-    }
-
-    #[test]
-    fn portrait_16x9_variants() {
-      for ar in [
-        CommonAspectRatio::TallTwoByThree,
-        CommonAspectRatio::TallNineBySixteen,
-        CommonAspectRatio::TallNineByTwentyOne,
-        CommonAspectRatio::Tall,
-      ] {
-        let plan = build_plan(&GenerateImageRequest { aspect_ratio: Some(ar), ..base_request() });
-        assert!(matches!(plan.image_size, Some(ArtcraftGptImage2ImageSize::Portrait16x9)), "expected Portrait16x9 for {:?}", ar);
-      }
-    }
-  }
-
-  // ── Num images ──
-
-  mod num_images_tests {
-    use super::*;
-
-    #[test]
-    fn default_is_one() {
-      let plan = build_plan(&GenerateImageRequest { image_batch_count: None, ..base_request() });
-      assert!(matches!(plan.num_images, ArtcraftGptImage2NumImages::One));
-    }
-
-    #[test]
-    fn direct_mapping() {
-      for (count, expected) in [(1, 1), (2, 2), (3, 3), (4, 4)] {
-        let plan = build_plan(&GenerateImageRequest { image_batch_count: Some(count), ..base_request() });
-        assert_eq!(plan.num_images.as_u64(), expected);
-      }
-    }
-
-    #[test]
-    fn zero_is_always_error() {
-      for strategy in [
-        RequestMismatchMitigationStrategy::ErrorOut,
-        RequestMismatchMitigationStrategy::PayMoreUpgrade,
-        RequestMismatchMitigationStrategy::PayLessDowngrade,
-      ] {
-        let result = plan_generate_image_artcraft_gpt_image_2(&GenerateImageRequest {
-          image_batch_count: Some(0),
-          request_mismatch_mitigation_strategy: strategy,
-          ..base_request()
-        });
-        assert!(matches!(result, Err(ArtcraftRouterError::Client(ClientError::UserRequestedZeroGenerations))));
-      }
-    }
-
-    #[test]
-    fn out_of_range_error_out() {
-      let result = plan_generate_image_artcraft_gpt_image_2(&GenerateImageRequest {
-        image_batch_count: Some(5),
-        request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
-        ..base_request()
-      });
-      assert!(matches!(result, Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption { .. }))));
-    }
-
-    #[test]
-    fn out_of_range_clamps_to_four() {
-      for strategy in [
-        RequestMismatchMitigationStrategy::PayMoreUpgrade,
-        RequestMismatchMitigationStrategy::PayLessDowngrade,
-      ] {
-        let plan = build_plan(&GenerateImageRequest {
-          image_batch_count: Some(9),
-          request_mismatch_mitigation_strategy: strategy,
-          ..base_request()
-        });
-        assert!(matches!(plan.num_images, ArtcraftGptImage2NumImages::Four));
-      }
-    }
-  }
-
-  // ── as_u64 ──
-
-  #[test]
-  fn num_images_as_u64() {
-    assert_eq!(ArtcraftGptImage2NumImages::One.as_u64(), 1);
-    assert_eq!(ArtcraftGptImage2NumImages::Two.as_u64(), 2);
-    assert_eq!(ArtcraftGptImage2NumImages::Three.as_u64(), 3);
-    assert_eq!(ArtcraftGptImage2NumImages::Four.as_u64(), 4);
-  }
-
-  // ── Helpers ──
-
-  fn base_request() -> GenerateImageRequest {
-    GenerateImageRequest {
-      model: CommonImageModel::GptImage2,
-      provider: Provider::Artcraft,
-      prompt: Some("a cat in space".to_string()),
-      image_inputs: None,
-      resolution: None,
-      aspect_ratio: None,
-      quality: None,
-      image_batch_count: None,
-      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(request: &GenerateImageRequest) -> PlanArtcraftGptImage2 {
-    let ImageGenerationPlan::ArtcraftGptImage2(plan) =
-      plan_generate_image_artcraft_gpt_image_2(request).expect("plan should succeed")
-    else {
-      panic!("expected ArtcraftGptImage2 variant")
-    };
-    plan
-  }
-}

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

@@ -4,7 +4,6 @@ pub mod plan_generate_image_fal_flux_pro_1p1;
 pub mod plan_generate_image_fal_flux_pro_1p1_ultra;
 pub mod plan_generate_image_fal_gpt_image_1;
 pub mod plan_generate_image_fal_gpt_image_1p5;
-pub mod plan_generate_image_fal_gpt_image_2;
 pub mod plan_generate_image_fal_seedream_4;
 pub mod plan_generate_image_fal_seedream_4p5;
 pub mod plan_generate_image_fal_seedream_5_lite;

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

@@ -1,535 +0,0 @@
-use crate::api::common_aspect_ratio::CommonAspectRatio;
-use crate::api::common_quality::CommonQuality;
-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 fal_client::requests::webhook::image::edit::enqueue_gpt_image_2_edit_image_webhook::{
-  EnqueueGptImage2EditImageNumImages, EnqueueGptImage2EditImageQuality,
-  EnqueueGptImage2EditImageSize,
-};
-use fal_client::requests::webhook::image::text::enqueue_gpt_image_2_text_to_image_webhook::{
-  EnqueueGptImage2TextToImageNumImages, EnqueueGptImage2TextToImageQuality,
-  EnqueueGptImage2TextToImageSize,
-};
-
-#[derive(Debug, Clone, Copy)]
-pub enum FalGptImage2NumImages {
-  One,
-  Two,
-  Three,
-  Four,
-}
-
-/// Quality is shared between t2i and edit (Low / Medium / High).
-#[derive(Debug, Clone, Copy)]
-pub enum FalGptImage2Quality {
-  Low,
-  Medium,
-  High,
-}
-
-/// GPT Image 2 supports six image sizes.
-#[derive(Debug, Clone, Copy)]
-pub enum FalGptImage2ImageSize {
-  SquareHd,
-  Square,
-  Portrait4x3,
-  Portrait16x9,
-  Landscape4x3,
-  Landscape16x9,
-  Auto,
-}
-
-#[derive(Debug, Clone)]
-pub struct PlanFalGptImage2 {
-  pub prompt: Option<String>,
-  pub image_urls: Vec<String>,
-  pub image_size: Option<FalGptImage2ImageSize>,
-  pub quality: FalGptImage2Quality,
-  pub num_images: FalGptImage2NumImages,
-}
-
-pub fn plan_generate_image_fal_gpt_image_2(
-  request: &GenerateImageRequest,
-) -> Result<ImageGenerationPlan, ArtcraftRouterError> {
-  let strategy = request.request_mismatch_mitigation_strategy;
-  let image_urls = resolve_image_list_ref(request.image_inputs.clone())?;
-  let image_size = plan_image_size(request.aspect_ratio);
-  let quality = plan_quality(request.quality);
-  let num_images = plan_num_images(request.image_batch_count, strategy)?;
-
-  Ok(ImageGenerationPlan::FalGptImage2(PlanFalGptImage2 {
-    prompt: request.prompt.clone(),
-    image_urls,
-    image_size,
-    quality,
-    num_images,
-  }))
-}
-
-fn resolve_image_list_ref(
-  image_list_ref: Option<ImageListRef>,
-) -> Result<Vec<String>, ArtcraftRouterError> {
-  match image_list_ref {
-    None => Ok(vec![]),
-    Some(ImageListRef::Urls(urls)) => Ok(urls.clone()),
-    Some(ImageListRef::MediaFileTokens(_)) => {
-      Err(ArtcraftRouterError::Client(ClientError::FalOnlySupportsUrls))
-    }
-  }
-}
-
-fn plan_quality(quality: Option<CommonQuality>) -> FalGptImage2Quality {
-  match quality {
-    Some(CommonQuality::Low) => FalGptImage2Quality::Low,
-    Some(CommonQuality::Medium) => FalGptImage2Quality::Medium,
-    Some(CommonQuality::High) => FalGptImage2Quality::High,
-    None => FalGptImage2Quality::High,
-  }
-}
-
-fn plan_image_size(aspect_ratio: Option<CommonAspectRatio>) -> Option<FalGptImage2ImageSize> {
-  use FalGptImage2ImageSize as S;
-  match aspect_ratio {
-    None
-    | Some(CommonAspectRatio::Auto)
-    | Some(CommonAspectRatio::Auto2k)
-    | Some(CommonAspectRatio::Auto3k)
-    | Some(CommonAspectRatio::Auto4k) => Some(S::Auto),
-
-    Some(CommonAspectRatio::Square) => Some(S::Square),
-    Some(CommonAspectRatio::SquareHd) => Some(S::SquareHd),
-
-    Some(CommonAspectRatio::WideFourByThree)
-    | Some(CommonAspectRatio::WideFiveByFour) => Some(S::Landscape4x3),
-
-    Some(CommonAspectRatio::WideThreeByTwo)
-    | Some(CommonAspectRatio::WideSixteenByNine)
-    | Some(CommonAspectRatio::WideTwentyOneByNine)
-    | Some(CommonAspectRatio::Wide) => Some(S::Landscape16x9),
-
-    Some(CommonAspectRatio::TallThreeByFour)
-    | Some(CommonAspectRatio::TallFourByFive) => Some(S::Portrait4x3),
-
-    Some(CommonAspectRatio::TallTwoByThree)
-    | Some(CommonAspectRatio::TallNineBySixteen)
-    | Some(CommonAspectRatio::TallNineByTwentyOne)
-    | Some(CommonAspectRatio::Tall) => Some(S::Portrait16x9),
-  }
-}
-
-fn plan_num_images(
-  image_batch_count: Option<u16>,
-  strategy: RequestMismatchMitigationStrategy,
-) -> Result<FalGptImage2NumImages, ArtcraftRouterError> {
-  let count = image_batch_count.unwrap_or(1);
-  match count {
-    0 => Err(ArtcraftRouterError::Client(ClientError::UserRequestedZeroGenerations)),
-    1 => Ok(FalGptImage2NumImages::One),
-    2 => Ok(FalGptImage2NumImages::Two),
-    3 => Ok(FalGptImage2NumImages::Three),
-    4 => Ok(FalGptImage2NumImages::Four),
-    _ => match strategy {
-      RequestMismatchMitigationStrategy::ErrorOut => {
-        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
-          field: "image_batch_count",
-          value: format!("{}", count),
-        }))
-      }
-      _ => Ok(FalGptImage2NumImages::Four),
-    },
-  }
-}
-
-impl FalGptImage2NumImages {
-  pub fn to_t2i(self) -> EnqueueGptImage2TextToImageNumImages {
-    use EnqueueGptImage2TextToImageNumImages as T;
-    match self {
-      Self::One => T::One,
-      Self::Two => T::Two,
-      Self::Three => T::Three,
-      Self::Four => T::Four,
-    }
-  }
-
-  pub fn to_edit(self) -> EnqueueGptImage2EditImageNumImages {
-    use EnqueueGptImage2EditImageNumImages as E;
-    match self {
-      Self::One => E::One,
-      Self::Two => E::Two,
-      Self::Three => E::Three,
-      Self::Four => E::Four,
-    }
-  }
-
-  pub fn as_u64(self) -> u64 {
-    match self {
-      Self::One => 1,
-      Self::Two => 2,
-      Self::Three => 3,
-      Self::Four => 4,
-    }
-  }
-}
-
-impl FalGptImage2Quality {
-  pub fn to_t2i(self) -> EnqueueGptImage2TextToImageQuality {
-    use EnqueueGptImage2TextToImageQuality as T;
-    match self {
-      Self::Low => T::Low,
-      Self::Medium => T::Medium,
-      Self::High => T::High,
-    }
-  }
-
-  pub fn to_edit(self) -> EnqueueGptImage2EditImageQuality {
-    use EnqueueGptImage2EditImageQuality as E;
-    match self {
-      Self::Low => E::Low,
-      Self::Medium => E::Medium,
-      Self::High => E::High,
-    }
-  }
-}
-
-impl FalGptImage2ImageSize {
-  pub fn to_t2i(self) -> EnqueueGptImage2TextToImageSize {
-    use EnqueueGptImage2TextToImageSize as T;
-    match self {
-      Self::SquareHd => T::SquareHd,
-      Self::Square => T::Square,
-      Self::Portrait4x3 => T::Portrait4x3,
-      Self::Portrait16x9 => T::Portrait16x9,
-      Self::Landscape4x3 => T::Landscape4x3,
-      Self::Landscape16x9 => T::Landscape16x9,
-      Self::Auto => T::SquareHd,
-    }
-  }
-
-  pub fn to_edit(self) -> EnqueueGptImage2EditImageSize {
-    use EnqueueGptImage2EditImageSize as E;
-    match self {
-      Self::SquareHd => E::SquareHd,
-      Self::Square => E::Square,
-      Self::Portrait4x3 => E::Portrait4x3,
-      Self::Portrait16x9 => E::Portrait16x9,
-      Self::Landscape4x3 => E::Landscape4x3,
-      Self::Landscape16x9 => E::Landscape16x9,
-      Self::Auto => E::Auto,
-    }
-  }
-}
-
-#[cfg(test)]
-mod tests {
-  use super::*;
-  use crate::api::common_image_model::CommonImageModel;
-  use crate::api::provider::Provider;
-
-  // ── Mode detection ──
-
-  mod mode_detection {
-    use super::*;
-
-    #[test]
-    fn no_image_inputs_yields_empty_urls() {
-      let plan = build_plan(&GenerateImageRequest { image_inputs: None, ..base_request() });
-      assert!(plan.image_urls.is_empty());
-    }
-
-    #[test]
-    fn url_image_inputs_are_extracted() {
-      let urls = vec![
-        "https://example.com/a.jpg".to_string(),
-        "https://example.com/b.jpg".to_string(),
-      ];
-      let plan = build_plan(&GenerateImageRequest {
-        image_inputs: Some(ImageListRef::Urls(urls.clone())),
-        ..base_request()
-      });
-      assert_eq!(plan.image_urls, urls);
-    }
-
-    #[test]
-    fn media_token_inputs_return_error() {
-      let result = plan_generate_image_fal_gpt_image_2(&GenerateImageRequest {
-        image_inputs: Some(ImageListRef::MediaFileTokens(vec![])),
-        ..base_request()
-      });
-      assert!(matches!(result, Err(ArtcraftRouterError::Client(ClientError::FalOnlySupportsUrls))));
-    }
-  }
-
-  // ── Quality ──
-
-  mod quality_tests {
-    use super::*;
-
-    #[test]
-    fn defaults_to_high() {
-      let plan = build_plan(&base_request());
-      assert!(matches!(plan.quality, FalGptImage2Quality::High));
-    }
-
-    #[test]
-    fn low() {
-      let plan = build_plan(&GenerateImageRequest { quality: Some(CommonQuality::Low), ..base_request() });
-      assert!(matches!(plan.quality, FalGptImage2Quality::Low));
-    }
-
-    #[test]
-    fn medium() {
-      let plan = build_plan(&GenerateImageRequest { quality: Some(CommonQuality::Medium), ..base_request() });
-      assert!(matches!(plan.quality, FalGptImage2Quality::Medium));
-    }
-
-    #[test]
-    fn high() {
-      let plan = build_plan(&GenerateImageRequest { quality: Some(CommonQuality::High), ..base_request() });
-      assert!(matches!(plan.quality, FalGptImage2Quality::High));
-    }
-  }
-
-  // ── Image size mapping ──
-
-  mod image_size_tests {
-    use super::*;
-
-    #[test]
-    fn none_yields_auto() {
-      let plan = build_plan(&GenerateImageRequest { aspect_ratio: None, ..base_request() });
-      assert!(matches!(plan.image_size, Some(FalGptImage2ImageSize::Auto)));
-    }
-
-    #[test]
-    fn auto_variants_yield_auto() {
-      for ar in [CommonAspectRatio::Auto, CommonAspectRatio::Auto2k, CommonAspectRatio::Auto4k] {
-        let plan = build_plan(&GenerateImageRequest { aspect_ratio: Some(ar), ..base_request() });
-        assert!(matches!(plan.image_size, Some(FalGptImage2ImageSize::Auto)), "expected Auto for {:?}", ar);
-      }
-    }
-
-    #[test]
-    fn square() {
-      let plan = build_plan(&GenerateImageRequest { aspect_ratio: Some(CommonAspectRatio::Square), ..base_request() });
-      assert!(matches!(plan.image_size, Some(FalGptImage2ImageSize::Square)));
-    }
-
-    #[test]
-    fn square_hd() {
-      let plan = build_plan(&GenerateImageRequest { aspect_ratio: Some(CommonAspectRatio::SquareHd), ..base_request() });
-      assert!(matches!(plan.image_size, Some(FalGptImage2ImageSize::SquareHd)));
-    }
-
-    #[test]
-    fn landscape_4x3_variants() {
-      for ar in [CommonAspectRatio::WideFourByThree, CommonAspectRatio::WideFiveByFour] {
-        let plan = build_plan(&GenerateImageRequest { aspect_ratio: Some(ar), ..base_request() });
-        assert!(matches!(plan.image_size, Some(FalGptImage2ImageSize::Landscape4x3)), "expected Landscape4x3 for {:?}", ar);
-      }
-    }
-
-    #[test]
-    fn landscape_16x9_variants() {
-      for ar in [
-        CommonAspectRatio::WideThreeByTwo,
-        CommonAspectRatio::WideSixteenByNine,
-        CommonAspectRatio::WideTwentyOneByNine,
-        CommonAspectRatio::Wide,
-      ] {
-        let plan = build_plan(&GenerateImageRequest { aspect_ratio: Some(ar), ..base_request() });
-        assert!(matches!(plan.image_size, Some(FalGptImage2ImageSize::Landscape16x9)), "expected Landscape16x9 for {:?}", ar);
-      }
-    }
-
-    #[test]
-    fn portrait_4x3_variants() {
-      for ar in [CommonAspectRatio::TallThreeByFour, CommonAspectRatio::TallFourByFive] {
-        let plan = build_plan(&GenerateImageRequest { aspect_ratio: Some(ar), ..base_request() });
-        assert!(matches!(plan.image_size, Some(FalGptImage2ImageSize::Portrait4x3)), "expected Portrait4x3 for {:?}", ar);
-      }
-    }
-
-    #[test]
-    fn portrait_16x9_variants() {
-      for ar in [
-        CommonAspectRatio::TallTwoByThree,
-        CommonAspectRatio::TallNineBySixteen,
-        CommonAspectRatio::TallNineByTwentyOne,
-        CommonAspectRatio::Tall,
-      ] {
-        let plan = build_plan(&GenerateImageRequest { aspect_ratio: Some(ar), ..base_request() });
-        assert!(matches!(plan.image_size, Some(FalGptImage2ImageSize::Portrait16x9)), "expected Portrait16x9 for {:?}", ar);
-      }
-    }
-  }
-
-  // ── Num images ──
-
-  mod num_images_tests {
-    use super::*;
-
-    #[test]
-    fn default_is_one() {
-      let plan = build_plan(&GenerateImageRequest { image_batch_count: None, ..base_request() });
-      assert!(matches!(plan.num_images, FalGptImage2NumImages::One));
-    }
-
-    #[test]
-    fn direct_mapping() {
-      for (count, expected) in [(1, 1), (2, 2), (3, 3), (4, 4)] {
-        let plan = build_plan(&GenerateImageRequest { image_batch_count: Some(count), ..base_request() });
-        assert_eq!(plan.num_images.as_u64(), expected);
-      }
-    }
-
-    #[test]
-    fn zero_is_always_error() {
-      for strategy in [
-        RequestMismatchMitigationStrategy::ErrorOut,
-        RequestMismatchMitigationStrategy::PayMoreUpgrade,
-        RequestMismatchMitigationStrategy::PayLessDowngrade,
-      ] {
-        let result = plan_generate_image_fal_gpt_image_2(&GenerateImageRequest {
-          image_batch_count: Some(0),
-          request_mismatch_mitigation_strategy: strategy,
-          ..base_request()
-        });
-        assert!(matches!(result, Err(ArtcraftRouterError::Client(ClientError::UserRequestedZeroGenerations))));
-      }
-    }
-
-    #[test]
-    fn out_of_range_error_out() {
-      let result = plan_generate_image_fal_gpt_image_2(&GenerateImageRequest {
-        image_batch_count: Some(5),
-        request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
-        ..base_request()
-      });
-      assert!(matches!(result, Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption { .. }))));
-    }
-
-    #[test]
-    fn out_of_range_clamps_to_four() {
-      for strategy in [
-        RequestMismatchMitigationStrategy::PayMoreUpgrade,
-        RequestMismatchMitigationStrategy::PayLessDowngrade,
-      ] {
-        let plan = build_plan(&GenerateImageRequest {
-          image_batch_count: Some(9),
-          request_mismatch_mitigation_strategy: strategy,
-          ..base_request()
-        });
-        assert!(matches!(plan.num_images, FalGptImage2NumImages::Four));
-      }
-    }
-  }
-
-  // ── as_u64 ──
-
-  #[test]
-  fn num_images_as_u64() {
-    assert_eq!(FalGptImage2NumImages::One.as_u64(), 1);
-    assert_eq!(FalGptImage2NumImages::Two.as_u64(), 2);
-    assert_eq!(FalGptImage2NumImages::Three.as_u64(), 3);
-    assert_eq!(FalGptImage2NumImages::Four.as_u64(), 4);
-  }
-
-  // ── Conversions to fal-client enqueue enums ──
-
-  mod conversion_tests {
-    use super::*;
-
-    #[test]
-    fn num_images_to_t2i() {
-      use EnqueueGptImage2TextToImageNumImages as T;
-      assert!(matches!(FalGptImage2NumImages::One.to_t2i(), T::One));
-      assert!(matches!(FalGptImage2NumImages::Two.to_t2i(), T::Two));
-      assert!(matches!(FalGptImage2NumImages::Three.to_t2i(), T::Three));
-      assert!(matches!(FalGptImage2NumImages::Four.to_t2i(), T::Four));
-    }
-
-    #[test]
-    fn num_images_to_edit() {
-      use EnqueueGptImage2EditImageNumImages as E;
-      assert!(matches!(FalGptImage2NumImages::One.to_edit(), E::One));
-      assert!(matches!(FalGptImage2NumImages::Two.to_edit(), E::Two));
-      assert!(matches!(FalGptImage2NumImages::Three.to_edit(), E::Three));
-      assert!(matches!(FalGptImage2NumImages::Four.to_edit(), E::Four));
-    }
-
-    #[test]
-    fn quality_to_t2i() {
-      use EnqueueGptImage2TextToImageQuality as T;
-      assert!(matches!(FalGptImage2Quality::Low.to_t2i(), T::Low));
-      assert!(matches!(FalGptImage2Quality::Medium.to_t2i(), T::Medium));
-      assert!(matches!(FalGptImage2Quality::High.to_t2i(), T::High));
-    }
-
-    #[test]
-    fn quality_to_edit() {
-      use EnqueueGptImage2EditImageQuality as E;
-      assert!(matches!(FalGptImage2Quality::Low.to_edit(), E::Low));
-      assert!(matches!(FalGptImage2Quality::Medium.to_edit(), E::Medium));
-      assert!(matches!(FalGptImage2Quality::High.to_edit(), E::High));
-    }
-
-    #[test]
-    fn size_to_t2i() {
-      use EnqueueGptImage2TextToImageSize as T;
-      assert!(matches!(FalGptImage2ImageSize::SquareHd.to_t2i(), T::SquareHd));
-      assert!(matches!(FalGptImage2ImageSize::Square.to_t2i(), T::Square));
-      assert!(matches!(FalGptImage2ImageSize::Portrait4x3.to_t2i(), T::Portrait4x3));
-      assert!(matches!(FalGptImage2ImageSize::Portrait16x9.to_t2i(), T::Portrait16x9));
-      assert!(matches!(FalGptImage2ImageSize::Landscape4x3.to_t2i(), T::Landscape4x3));
-      assert!(matches!(FalGptImage2ImageSize::Landscape16x9.to_t2i(), T::Landscape16x9));
-      // Auto falls back to SquareHd for t2i (which doesn't have an Auto variant)
-      assert!(matches!(FalGptImage2ImageSize::Auto.to_t2i(), T::SquareHd));
-    }
-
-    #[test]
-    fn size_to_edit() {
-      use EnqueueGptImage2EditImageSize as E;
-      assert!(matches!(FalGptImage2ImageSize::SquareHd.to_edit(), E::SquareHd));
-      assert!(matches!(FalGptImage2ImageSize::Square.to_edit(), E::Square));
-      assert!(matches!(FalGptImage2ImageSize::Portrait4x3.to_edit(), E::Portrait4x3));
-      assert!(matches!(FalGptImage2ImageSize::Portrait16x9.to_edit(), E::Portrait16x9));
-      assert!(matches!(FalGptImage2ImageSize::Landscape4x3.to_edit(), E::Landscape4x3));
-      assert!(matches!(FalGptImage2ImageSize::Landscape16x9.to_edit(), E::Landscape16x9));
-      assert!(matches!(FalGptImage2ImageSize::Auto.to_edit(), E::Auto));
-    }
-  }
-
-  // ── Helpers ──
-
-  fn base_request() -> GenerateImageRequest {
-    GenerateImageRequest {
-      model: CommonImageModel::GptImage2,
-      provider: Provider::Fal,
-      prompt: Some("a cat in space".to_string()),
-      image_inputs: None,
-      resolution: None,
-      aspect_ratio: None,
-      quality: None,
-      image_batch_count: None,
-      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(request: &GenerateImageRequest) -> PlanFalGptImage2 {
-    let ImageGenerationPlan::FalGptImage2(plan) =
-      plan_generate_image_fal_gpt_image_2(request).expect("plan should succeed")
-    else {
-      panic!("expected FalGptImage2 variant")
-    };
-    plan
-  }
-}

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

@@ -1,7 +1,7 @@
 use artcraft_api_defs::generate::video::multi_function::kling_3p0_pro_multi_function_video_gen::Kling3p0ProMultiFunctionVideoGenDuration;
 use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator;
 use fal_client::requests::webhook::video::text::enqueue_kling_3p0_pro_text_to_video_webhook::{
-  EnqueueKling3p0ProTextToVideoRequest,
+  EnqueueKling3p0ProTextToVideoArgs,
   EnqueueKling3p0ProTextToVideoDuration,
 };
 
@@ -29,16 +29,19 @@ pub(crate) fn estimate_video_cost_artcraft_kling3p0_pro(
       });
 
   // Use text-to-video cost calculator (same pricing for both modes)
-  let req = EnqueueKling3p0ProTextToVideoRequest {
+  let api_key = fal_client::creds::fal_api_key::FalApiKey::from_str("");
+  let args = EnqueueKling3p0ProTextToVideoArgs {
     prompt: String::new(),
     generate_audio: plan.generate_audio,
     negative_prompt: None,
     duration,
     aspect_ratio: None,
     shot_type: None,
+    webhook_url: "https://example.com",
+    api_key: &api_key,
   };
 
-  let cost_in_usd_cents = req.calculate_cost_in_cents();
+  let cost_in_usd_cents = args.calculate_cost_in_cents();
 
   VideoGenerationCostEstimate {
     cost_in_credits: Some(cost_in_usd_cents),
@@ -55,10 +58,10 @@ mod tests {
   use crate::api::common_video_model::CommonVideoModel;
   use crate::api::provider::Provider;
   use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
-  use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
+  use crate::generate::generate_video::generate_video_request::GenerateVideoRequest;
 
   fn estimate_usd_cents(duration_seconds: u16) -> u64 {
-    let request = GenerateVideoRequestBuilder {
+    let request = GenerateVideoRequest {
       model: CommonVideoModel::Kling3p0Pro,
       provider: Provider::Artcraft,
       prompt: None,

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

@@ -1,7 +1,7 @@
 use artcraft_api_defs::generate::video::multi_function::kling_3p0_standard_multi_function_video_gen::Kling3p0StandardMultiFunctionVideoGenDuration;
 use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator;
 use fal_client::requests::webhook::video::text::enqueue_kling_3p0_standard_text_to_video_webhook::{
-  EnqueueKling3p0StandardTextToVideoRequest,
+  EnqueueKling3p0StandardTextToVideoArgs,
   EnqueueKling3p0StandardTextToVideoDuration,
 };
 
@@ -29,16 +29,19 @@ pub(crate) fn estimate_video_cost_artcraft_kling3p0_standard(
       });
 
   // Use text-to-video cost calculator (same pricing for both modes)
-  let req = EnqueueKling3p0StandardTextToVideoRequest {
+  let api_key = fal_client::creds::fal_api_key::FalApiKey::from_str("");
+  let args = EnqueueKling3p0StandardTextToVideoArgs {
     prompt: String::new(),
     generate_audio: plan.generate_audio,
     negative_prompt: None,
     duration,
     aspect_ratio: None,
     shot_type: None,
+    webhook_url: "https://example.com",
+    api_key: &api_key,
   };
 
-  let cost_in_usd_cents = req.calculate_cost_in_cents();
+  let cost_in_usd_cents = args.calculate_cost_in_cents();
 
   VideoGenerationCostEstimate {
     cost_in_credits: Some(cost_in_usd_cents),
@@ -55,10 +58,10 @@ mod tests {
   use crate::api::common_video_model::CommonVideoModel;
   use crate::api::provider::Provider;
   use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
-  use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
+  use crate::generate::generate_video::generate_video_request::GenerateVideoRequest;
 
   fn estimate_usd_cents(duration_seconds: u16) -> u64 {
-    let request = GenerateVideoRequestBuilder {
+    let request = GenerateVideoRequest {
       model: CommonVideoModel::Kling3p0Standard,
       provider: Provider::Artcraft,
       prompt: None,

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

@@ -1,7 +1,7 @@
 use artcraft_api_defs::generate::video::multi_function::seedance_1p5_pro_multi_function_video_gen::Seedance1p5ProMultiFunctionVideoGenDuration;
 use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator;
 use fal_client::requests::webhook::video::text::enqueue_seedance_1p5_pro_text_to_video_webhook::{
-  EnqueueSeedance1p5ProTextToVideoRequest,
+  EnqueueSeedance1p5ProTextToVideoArgs,
   EnqueueSeedance1p5ProTextToVideoDuration,
   EnqueueSeedance1p5ProTextToVideoResolution,
 };
@@ -33,15 +33,18 @@ pub(crate) fn estimate_video_cost_artcraft_seedance1p5_pro(
       });
 
   // Use text-to-video cost calculator (same pricing for both modes)
-  let req = EnqueueSeedance1p5ProTextToVideoRequest {
+  let api_key = fal_client::creds::fal_api_key::FalApiKey::from_str("");
+  let args = EnqueueSeedance1p5ProTextToVideoArgs {
     prompt: String::new(),
     duration,
     resolution,
     aspect_ratio: None,
     generate_audio: plan.generate_audio,
+    webhook_url: "https://example.com",
+    api_key: &api_key,
   };
 
-  let cost_in_usd_cents = req.calculate_cost_in_cents();
+  let cost_in_usd_cents = args.calculate_cost_in_cents();
 
   VideoGenerationCostEstimate {
     cost_in_credits: Some(cost_in_usd_cents),
@@ -58,10 +61,10 @@ mod tests {
   use crate::api::common_video_model::CommonVideoModel;
   use crate::api::provider::Provider;
   use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
-  use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
+  use crate::generate::generate_video::generate_video_request::GenerateVideoRequest;
 
   fn estimate_usd_cents(duration_seconds: u16) -> u64 {
-    let request = GenerateVideoRequestBuilder {
+    let request = GenerateVideoRequest {
       model: CommonVideoModel::Seedance1p5Pro,
       provider: Provider::Artcraft,
       prompt: None,

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

@@ -1,7 +1,7 @@
 use artcraft_api_defs::generate::video::multi_function::seedance_2p0_multi_function_video_gen::Seedance2p0BatchCount;
-use seedance2pro_client::requests::generate_video::generate_video::{KinoviAspectRatio, KinoviBatchCount, KinoviGenerateVideoRequest, KinoviModelType, KinoviOutputResolution};
+use seedance2pro_client::creds::seedance2pro_session::Seedance2ProSession;
+use seedance2pro_client::requests::generate_video::generate_video::{KinoviBatchCount, GenerateVideoArgs, KinoviModelType, KinoviResolution};
 
-use crate::api::common_resolution::CommonResolution;
 use crate::generate::generate_video::plan::artcraft::plan_generate_video_artcraft_seedance2p0::PlanArtcraftSeedance2p0;
 use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
 
@@ -16,29 +16,30 @@ pub (crate) fn estimate_video_cost_artcraft_seedance2p0(
     Seedance2p0BatchCount::Four => KinoviBatchCount::Four,
   };
 
-  let output_resolution = plan.resolution.map(map_common_resolution_to_kinovi);
+  // TODO: Make a better client that doesn't require this.
+  // A dummy session is sufficient — cost estimation does not make any network calls.
+  let dummy_session = Seedance2ProSession::from_cookies_string(String::new());
 
-  let request = KinoviGenerateVideoRequest {
+  let args = GenerateVideoArgs {
+    session: &dummy_session,
     model_type: KinoviModelType::Seedance2Pro,
     prompt: String::new(),
-    aspect_ratio: KinoviAspectRatio::Square1x1,
+    resolution: KinoviResolution::Square1x1,
     duration_seconds,
     batch_count,
-    output_resolution,
-
-    // TODO: This is a cost factor
-    reference_video_urls: None,
 
     // NB: These do not contribute to costs in the Seedance2 integration
     start_frame_url: None,
     end_frame_url: None,
     reference_image_urls: None,
+    reference_video_urls: None,
     reference_audio_urls: None,
     character_ids: None,
     use_face_blur_hack: None,
+    host_override: None,
   };
 
-  let cost_in_usd_cents = request.estimate_cost_in_usd_cents();
+  let cost_in_usd_cents = args.estimate_cost_in_usd_cents();
 
   VideoGenerationCostEstimate {
     cost_in_credits: Some(cost_in_usd_cents),
@@ -50,30 +51,15 @@ pub (crate) fn estimate_video_cost_artcraft_seedance2p0(
   }
 }
 
-fn map_common_resolution_to_kinovi(resolution: CommonResolution) -> KinoviOutputResolution {
-  match resolution {
-    CommonResolution::FourEightyP => KinoviOutputResolution::FourEightyP,
-    CommonResolution::SevenTwentyP => KinoviOutputResolution::SevenTwentyP,
-    CommonResolution::TenEightyP => KinoviOutputResolution::TenEightyP,
-    // For resolutions that don't map directly, default to 720p
-    _ => KinoviOutputResolution::SevenTwentyP,
-  }
-}
-
 #[cfg(test)]
 mod tests {
-  use crate::api::common_resolution::CommonResolution;
   use crate::api::common_video_model::CommonVideoModel;
   use crate::api::provider::Provider;
   use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
-  use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
+  use crate::generate::generate_video::generate_video_request::GenerateVideoRequest;
 
-  fn estimate_usd_cents(
-    duration_seconds: u16,
-    video_batch_count: u16,
-    resolution: Option<CommonResolution>,
-  ) -> u64 {
-    let request = GenerateVideoRequestBuilder {
+  fn estimate_usd_cents(duration_seconds: u16, video_batch_count: u16) -> u64 {
+    let request = GenerateVideoRequest {
       model: CommonVideoModel::Seedance2p0,
       provider: Provider::Artcraft,
       prompt: None,
@@ -84,7 +70,7 @@ mod tests {
       reference_videos: None,
       reference_audio: None,
       reference_character_tokens: None,
-      resolution,
+      resolution: None,
       aspect_ratio: None,
       duration_seconds: Some(duration_seconds),
       video_batch_count: Some(video_batch_count),
@@ -99,105 +85,23 @@ mod tests {
       .expect("cost_in_usd_cents should be present")
   }
 
-  // -- 720p (default / legacy pricing: 250 credits/$1) --
-
   #[test]
-  fn pro_720p_batch_1() {
-    assert_eq!(estimate_usd_cents(4, 1, Some(CommonResolution::SevenTwentyP)), 64);
-    assert_eq!(estimate_usd_cents(5, 1, Some(CommonResolution::SevenTwentyP)), 80);
-    assert_eq!(estimate_usd_cents(6, 1, Some(CommonResolution::SevenTwentyP)), 96);
-    assert_eq!(estimate_usd_cents(7, 1, Some(CommonResolution::SevenTwentyP)), 112);
-    assert_eq!(estimate_usd_cents(15, 1, Some(CommonResolution::SevenTwentyP)), 240);
-  }
+  fn test_estimate_cost_usd_cents() {
+    // Batch 1:
+    assert_eq!(estimate_usd_cents(4, 1), 64);
+    assert_eq!(estimate_usd_cents(5, 1), 80);
+    assert_eq!(estimate_usd_cents(6, 1), 96);
+    assert_eq!(estimate_usd_cents(7, 1), 112);
+    assert_eq!(estimate_usd_cents(15, 1), 240);
 
-  #[test]
-  fn pro_720p_batch_2() {
-    assert_eq!(estimate_usd_cents(4, 2, Some(CommonResolution::SevenTwentyP)), 128);
-    assert_eq!(estimate_usd_cents(5, 2, Some(CommonResolution::SevenTwentyP)), 160);
-    assert_eq!(estimate_usd_cents(15, 2, Some(CommonResolution::SevenTwentyP)), 480);
-  }
+    // Batch 2 = 2×
+    assert_eq!(estimate_usd_cents(4, 2), 128);
+    assert_eq!(estimate_usd_cents(5, 2), 160);
+    assert_eq!(estimate_usd_cents(15, 2), 480);
 
-  #[test]
-  fn pro_720p_batch_4() {
-    assert_eq!(estimate_usd_cents(4, 4, Some(CommonResolution::SevenTwentyP)), 256);
-    assert_eq!(estimate_usd_cents(5, 4, Some(CommonResolution::SevenTwentyP)), 320);
-    assert_eq!(estimate_usd_cents(15, 4, Some(CommonResolution::SevenTwentyP)), 960);
-  }
-
-  #[test]
-  fn pro_none_resolution_same_as_720p() {
-    assert_eq!(
-      estimate_usd_cents(5, 1, None),
-      estimate_usd_cents(5, 1, Some(CommonResolution::SevenTwentyP)),
-    );
-  }
-
-  // -- 480p (new pricing: 193 credits/$1) --
-
-  #[test]
-  fn pro_480p_batch_1() {
-    assert_eq!(estimate_usd_cents(4, 1, Some(CommonResolution::FourEightyP)), 31);
-    assert_eq!(estimate_usd_cents(5, 1, Some(CommonResolution::FourEightyP)), 39);
-    assert_eq!(estimate_usd_cents(10, 1, Some(CommonResolution::FourEightyP)), 78);
-    assert_eq!(estimate_usd_cents(15, 1, Some(CommonResolution::FourEightyP)), 117);
-  }
-
-  #[test]
-  fn pro_480p_batch_2() {
-    assert_eq!(estimate_usd_cents(5, 2, Some(CommonResolution::FourEightyP)), 78);
-  }
-
-  #[test]
-  fn pro_480p_batch_4() {
-    assert_eq!(estimate_usd_cents(5, 4, Some(CommonResolution::FourEightyP)), 155);
-  }
-
-  // -- 1080p (new pricing: 193 credits/$1) --
-
-  #[test]
-  fn pro_1080p_batch_1() {
-    assert_eq!(estimate_usd_cents(4, 1, Some(CommonResolution::TenEightyP)), 187);
-    assert_eq!(estimate_usd_cents(5, 1, Some(CommonResolution::TenEightyP)), 233);
-    assert_eq!(estimate_usd_cents(10, 1, Some(CommonResolution::TenEightyP)), 466);
-    assert_eq!(estimate_usd_cents(15, 1, Some(CommonResolution::TenEightyP)), 699);
-  }
-
-  #[test]
-  fn pro_1080p_batch_2() {
-    assert_eq!(estimate_usd_cents(5, 2, Some(CommonResolution::TenEightyP)), 466);
-  }
-
-  #[test]
-  fn pro_1080p_batch_4() {
-    assert_eq!(estimate_usd_cents(5, 4, Some(CommonResolution::TenEightyP)), 933);
-  }
-
-  // -- Relative pricing --
-
-  #[test]
-  fn pro_480p_cheaper_than_720p_cheaper_than_1080p() {
-    let c480 = estimate_usd_cents(5, 1, Some(CommonResolution::FourEightyP));
-    let c720 = estimate_usd_cents(5, 1, Some(CommonResolution::SevenTwentyP));
-    let c1080 = estimate_usd_cents(5, 1, Some(CommonResolution::TenEightyP));
-    assert!(c480 < c720, "480p ({}) should be cheaper than 720p ({})", c480, c720);
-    assert!(c720 < c1080, "720p ({}) should be cheaper than 1080p ({})", c720, c1080);
-  }
-
-  #[test]
-  fn cost_scales_with_duration() {
-    let c4 = estimate_usd_cents(4, 1, Some(CommonResolution::SevenTwentyP));
-    let c10 = estimate_usd_cents(10, 1, Some(CommonResolution::SevenTwentyP));
-    let c15 = estimate_usd_cents(15, 1, Some(CommonResolution::SevenTwentyP));
-    assert!(c4 < c10);
-    assert!(c10 < c15);
-  }
-
-  #[test]
-  fn cost_scales_with_batch() {
-    let b1 = estimate_usd_cents(5, 1, Some(CommonResolution::TenEightyP));
-    let b2 = estimate_usd_cents(5, 2, Some(CommonResolution::TenEightyP));
-    let b4 = estimate_usd_cents(5, 4, Some(CommonResolution::TenEightyP));
-    assert!(b1 < b2);
-    assert!(b2 < b4);
+    // Batch 4 = 4×
+    assert_eq!(estimate_usd_cents(4, 4), 256);
+    assert_eq!(estimate_usd_cents(5, 4), 320);
+    assert_eq!(estimate_usd_cents(15, 4), 960);
   }
 }

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

@@ -1,7 +1,7 @@
 use artcraft_api_defs::generate::video::multi_function::seedance_2p0_multi_function_video_gen::Seedance2p0BatchCount;
-use seedance2pro_client::requests::generate_video::generate_video::{KinoviGenerateVideoRequest, KinoviBatchCount, KinoviModelType, KinoviOutputResolution, KinoviAspectRatio};
+use seedance2pro_client::creds::seedance2pro_session::Seedance2ProSession;
+use seedance2pro_client::requests::generate_video::generate_video::{KinoviBatchCount, GenerateVideoArgs, KinoviModelType, KinoviResolution};
 
-use crate::api::common_resolution::CommonResolution;
 use crate::generate::generate_video::plan::artcraft::plan_generate_video_artcraft_seedance2p0::PlanArtcraftSeedance2p0;
 use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
 
@@ -16,29 +16,26 @@ pub(crate) fn estimate_video_cost_artcraft_seedance2p0_fast(
     Seedance2p0BatchCount::Four => KinoviBatchCount::Four,
   };
 
-  let output_resolution = plan.resolution.map(map_common_resolution_to_kinovi);
+  let dummy_session = Seedance2ProSession::from_cookies_string(String::new());
 
-  let request = KinoviGenerateVideoRequest {
-    model_type: KinoviModelType::Seedance2Fast,
+  let args = GenerateVideoArgs {
+    session: &dummy_session,
+    model_type: KinoviModelType::Seedance2Fast, // <-- Fast, not Pro
     prompt: String::new(),
-    aspect_ratio: KinoviAspectRatio::Square1x1,
+    resolution: KinoviResolution::Square1x1,
     duration_seconds,
     batch_count,
-    output_resolution,
-
-    // TODO: This is a cost factor
-    reference_video_urls: None,
-    
-    // NB: These do not contribute to costs in the Seedance2 integration
     start_frame_url: None,
     end_frame_url: None,
     reference_image_urls: None,
+    reference_video_urls: None,
     reference_audio_urls: None,
     character_ids: None,
     use_face_blur_hack: None,
+    host_override: None,
   };
 
-  let cost_in_usd_cents = request.estimate_cost_in_usd_cents();
+  let cost_in_usd_cents = args.estimate_cost_in_usd_cents();
 
   VideoGenerationCostEstimate {
     cost_in_credits: Some(cost_in_usd_cents),
@@ -50,30 +47,15 @@ pub(crate) fn estimate_video_cost_artcraft_seedance2p0_fast(
   }
 }
 
-fn map_common_resolution_to_kinovi(resolution: CommonResolution) -> KinoviOutputResolution {
-  match resolution {
-    CommonResolution::FourEightyP => KinoviOutputResolution::FourEightyP,
-    CommonResolution::SevenTwentyP => KinoviOutputResolution::SevenTwentyP,
-    CommonResolution::TenEightyP => KinoviOutputResolution::TenEightyP,
-    // For resolutions that don't map directly, default to 720p
-    _ => KinoviOutputResolution::SevenTwentyP,
-  }
-}
-
 #[cfg(test)]
 mod tests {
-  use crate::api::common_resolution::CommonResolution;
   use crate::api::common_video_model::CommonVideoModel;
   use crate::api::provider::Provider;
   use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
-  use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
+  use crate::generate::generate_video::generate_video_request::GenerateVideoRequest;
 
-  fn estimate_usd_cents(
-    duration_seconds: u16,
-    video_batch_count: u16,
-    resolution: Option<CommonResolution>,
-  ) -> u64 {
-    let request = GenerateVideoRequestBuilder {
+  fn estimate_usd_cents(duration_seconds: u16, video_batch_count: u16) -> u64 {
+    let request = GenerateVideoRequest {
       model: CommonVideoModel::Seedance2p0Fast,
       provider: Provider::Artcraft,
       prompt: None,
@@ -84,7 +66,7 @@ mod tests {
       reference_videos: None,
       reference_audio: None,
       reference_character_tokens: None,
-      resolution,
+      resolution: None,
       aspect_ratio: None,
       duration_seconds: Some(duration_seconds),
       video_batch_count: Some(video_batch_count),
@@ -99,43 +81,8 @@ mod tests {
       .expect("cost_in_usd_cents should be present")
   }
 
-  fn estimate_usd_cents_downgrade(
-    duration_seconds: u16,
-    video_batch_count: u16,
-    resolution: Option<CommonResolution>,
-  ) -> u64 {
-    let request = GenerateVideoRequestBuilder {
-      model: CommonVideoModel::Seedance2p0Fast,
-      provider: Provider::Artcraft,
-      prompt: None,
-      negative_prompt: None,
-      start_frame: None,
-      end_frame: None,
-      reference_images: None,
-      reference_videos: None,
-      reference_audio: None,
-      reference_character_tokens: None,
-      resolution,
-      aspect_ratio: None,
-      duration_seconds: Some(duration_seconds),
-      video_batch_count: Some(video_batch_count),
-      generate_audio: None,
-      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::PayLessDowngrade,
-      idempotency_token: None,
-    };
-    request.build()
-      .expect("build should succeed")
-      .estimate_costs()
-      .cost_in_usd_cents
-      .expect("cost_in_usd_cents should be present")
-  }
-
-  fn estimate_pro_usd_cents(
-    duration_seconds: u16,
-    video_batch_count: u16,
-    resolution: Option<CommonResolution>,
-  ) -> u64 {
-    let request = GenerateVideoRequestBuilder {
+  fn estimate_pro_usd_cents(duration_seconds: u16, video_batch_count: u16) -> u64 {
+    let request = GenerateVideoRequest {
       model: CommonVideoModel::Seedance2p0,
       provider: Provider::Artcraft,
       prompt: None,
@@ -146,7 +93,7 @@ mod tests {
       reference_videos: None,
       reference_audio: None,
       reference_character_tokens: None,
-      resolution,
+      resolution: None,
       aspect_ratio: None,
       duration_seconds: Some(duration_seconds),
       video_batch_count: Some(video_batch_count),
@@ -161,133 +108,56 @@ mod tests {
       .expect("cost_in_usd_cents should be present")
   }
 
-  // -- 720p (default / legacy pricing: 220 credits/$1) --
-
   #[test]
-  fn fast_720p_batch_1() {
-    assert_eq!(estimate_usd_cents(4, 1, Some(CommonResolution::SevenTwentyP)), 51);
-    assert_eq!(estimate_usd_cents(5, 1, Some(CommonResolution::SevenTwentyP)), 64);
-    assert_eq!(estimate_usd_cents(10, 1, Some(CommonResolution::SevenTwentyP)), 127);
-    assert_eq!(estimate_usd_cents(15, 1, Some(CommonResolution::SevenTwentyP)), 191);
+  fn cost_is_present() {
+    assert!(estimate_usd_cents(5, 1) > 0);
   }
 
   #[test]
-  fn fast_720p_batch_2() {
-    assert_eq!(estimate_usd_cents(5, 2, Some(CommonResolution::SevenTwentyP)), 127);
+  fn cost_batch_1() {
+    assert_eq!(estimate_usd_cents(4, 1), 51);
+    assert_eq!(estimate_usd_cents(5, 1), 64);
+    assert_eq!(estimate_usd_cents(10, 1), 127);
+    assert_eq!(estimate_usd_cents(15, 1), 191);
   }
 
   #[test]
-  fn fast_720p_batch_4() {
-    assert_eq!(estimate_usd_cents(5, 4, Some(CommonResolution::SevenTwentyP)), 255);
+  fn cost_batch_2() {
+    assert_eq!(estimate_usd_cents(5, 2), 127);
   }
 
   #[test]
-  fn fast_none_resolution_same_as_720p() {
-    assert_eq!(
-      estimate_usd_cents(5, 1, None),
-      estimate_usd_cents(5, 1, Some(CommonResolution::SevenTwentyP)),
-    );
-  }
-
-  // -- 480p (new pricing: 193 credits/$1) --
-
-  #[test]
-  fn fast_480p_batch_1() {
-    assert_eq!(estimate_usd_cents(4, 1, Some(CommonResolution::FourEightyP)), 21);
-    assert_eq!(estimate_usd_cents(5, 1, Some(CommonResolution::FourEightyP)), 26);
-    assert_eq!(estimate_usd_cents(10, 1, Some(CommonResolution::FourEightyP)), 52);
-    assert_eq!(estimate_usd_cents(15, 1, Some(CommonResolution::FourEightyP)), 78);
-  }
-
-  #[test]
-  fn fast_480p_batch_2() {
-    assert_eq!(estimate_usd_cents(5, 2, Some(CommonResolution::FourEightyP)), 52);
-  }
-
-  #[test]
-  fn fast_480p_batch_4() {
-    assert_eq!(estimate_usd_cents(5, 4, Some(CommonResolution::FourEightyP)), 104);
-  }
-
-  // -- 1080p is not supported by Fast; ErrorOut rejects it --
-
-  #[test]
-  fn fast_1080p_error_out_rejects() {
-    let request = GenerateVideoRequestBuilder {
-      model: CommonVideoModel::Seedance2p0Fast,
-      provider: Provider::Artcraft,
-      prompt: None,
-      negative_prompt: None,
-      start_frame: None,
-      end_frame: None,
-      reference_images: None,
-      reference_videos: None,
-      reference_audio: None,
-      reference_character_tokens: None,
-      resolution: Some(CommonResolution::TenEightyP),
-      aspect_ratio: None,
-      duration_seconds: Some(5),
-      video_batch_count: Some(1),
-      generate_audio: None,
-      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
-      idempotency_token: None,
-    };
-    assert!(request.build().is_err());
-  }
-
-  // -- 1080p rounds down to 720p with PayLessDowngrade --
-
-  #[test]
-  fn fast_1080p_downgraded_same_as_720p() {
-    for duration in [4, 5, 10, 15] {
-      assert_eq!(
-        estimate_usd_cents_downgrade(duration, 1, Some(CommonResolution::TenEightyP)),
-        estimate_usd_cents(duration, 1, Some(CommonResolution::SevenTwentyP)),
-      );
-    }
-  }
-
-  // -- Relative pricing --
-
-  #[test]
-  fn fast_480p_cheaper_than_720p() {
-    let c480 = estimate_usd_cents(5, 1, Some(CommonResolution::FourEightyP));
-    let c720 = estimate_usd_cents(5, 1, Some(CommonResolution::SevenTwentyP));
-    assert!(c480 < c720, "480p ({}) should be cheaper than 720p ({})", c480, c720);
+  fn cost_batch_4() {
+    assert_eq!(estimate_usd_cents(5, 4), 255);
   }
 
   #[test]
   fn fast_is_cheaper_than_pro() {
-    for res in [
-      Some(CommonResolution::FourEightyP),
-      Some(CommonResolution::SevenTwentyP),
-    ] {
-      for duration in [4, 5, 10, 15] {
-        let fast = estimate_usd_cents(duration, 1, res);
-        let pro = estimate_pro_usd_cents(duration, 1, res);
-        assert!(
-          fast < pro,
-          "Fast ({}) should be cheaper than Pro ({}) at {}s {:?}",
-          fast, pro, duration, res,
-        );
-      }
+    for duration in [4, 5, 10, 15] {
+      let fast = estimate_usd_cents(duration, 1);
+      let pro = estimate_pro_usd_cents(duration, 1);
+      assert!(
+        fast < pro,
+        "Fast ({}) should be cheaper than Pro ({}) at {}s",
+        fast, pro, duration,
+      );
     }
   }
 
   #[test]
   fn cost_scales_with_duration() {
-    let c4 = estimate_usd_cents(4, 1, Some(CommonResolution::SevenTwentyP));
-    let c10 = estimate_usd_cents(10, 1, Some(CommonResolution::SevenTwentyP));
-    let c15 = estimate_usd_cents(15, 1, Some(CommonResolution::SevenTwentyP));
+    let c4 = estimate_usd_cents(4, 1);
+    let c10 = estimate_usd_cents(10, 1);
+    let c15 = estimate_usd_cents(15, 1);
     assert!(c4 < c10);
     assert!(c10 < c15);
   }
 
   #[test]
   fn cost_scales_with_batch() {
-    let b1 = estimate_usd_cents(5, 1, Some(CommonResolution::SevenTwentyP));
-    let b2 = estimate_usd_cents(5, 2, Some(CommonResolution::SevenTwentyP));
-    let b4 = estimate_usd_cents(5, 4, Some(CommonResolution::SevenTwentyP));
+    let b1 = estimate_usd_cents(5, 1);
+    let b2 = estimate_usd_cents(5, 2);
+    let b4 = estimate_usd_cents(5, 4);
     assert!(b1 < b2);
     assert!(b2 < b4);
   }

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

@@ -1,7 +1,8 @@
 use artcraft_api_defs::generate::video::generate_seedance_1_0_lite_image_to_video::GenerateSeedance10LiteResolution;
+use fal_client::creds::fal_api_key::FalApiKey;
 use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator;
 use fal_client::requests::webhook::video::image::enqueue_seedance_1_lite_image_to_video_webhook::{
-  Seedance1LiteDuration, Seedance1LiteRequest, Seedance1LiteResolution,
+  Seedance1LiteArgs, Seedance1LiteDuration, Seedance1LiteResolution,
 };
 
 use crate::generate::generate_video::plan::artcraft::plan_generate_video_artcraft_seedance_1_0_lite::PlanArtcraftSeedance10Lite;
@@ -12,6 +13,7 @@ pub(crate) fn estimate_video_cost_artcraft_seedance_1_0_lite(
 ) -> VideoGenerationCostEstimate {
   // Legacy handler defaults: 5 seconds, 720p. Delegate to the Fal client's
   // cost calculator to guarantee parity with what we actually charge.
+  let api_key = FalApiKey::from_str("");
   let duration = if plan.duration_seconds_for_cost() == 10 {
     Seedance1LiteDuration::TenSeconds
   } else {
@@ -22,18 +24,21 @@ pub(crate) fn estimate_video_cost_artcraft_seedance_1_0_lite(
     GenerateSeedance10LiteResolution::SevenTwentyP => Seedance1LiteResolution::SevenTwentyP,
   };
 
-  let req = Seedance1LiteRequest {
-    image_url: String::new(),
-    end_frame_image_url: None,
-    prompt: String::new(),
+  let end_frame: Option<&str> = None;
+  let args = Seedance1LiteArgs {
+    image_url: "",
+    end_frame_image_url: end_frame,
+    prompt: "",
     duration,
     resolution,
     aspect_ratio: None,
     camera_fixed: false,
     seed: None,
+    api_key: &api_key,
+    webhook_url: "https://example.com",
   };
 
-  let cost_in_usd_cents = req.calculate_cost_in_cents();
+  let cost_in_usd_cents = args.calculate_cost_in_cents();
 
   VideoGenerationCostEstimate {
     cost_in_credits: Some(cost_in_usd_cents),

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/cost/fal/estimate_video_cost_fal_seedance_1_0_lite.rs

@@ -1,5 +1,6 @@
+use fal_client::creds::fal_api_key::FalApiKey;
 use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator;
-use fal_client::requests::webhook::video::image::enqueue_seedance_1_lite_image_to_video_webhook::Seedance1LiteRequest;
+use fal_client::requests::webhook::video::image::enqueue_seedance_1_lite_image_to_video_webhook::Seedance1LiteArgs;
 
 use crate::generate::generate_video::plan::fal::plan_generate_video_fal_seedance_1_0_lite::PlanFalSeedance10Lite;
 use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
@@ -8,18 +9,22 @@ pub(crate) fn estimate_video_cost_fal_seedance_1_0_lite(
   plan: &PlanFalSeedance10Lite,
 ) -> VideoGenerationCostEstimate {
   // Delegate to the Fal client's cost calculator to guarantee parity with billing.
-  let req = Seedance1LiteRequest {
-    image_url: plan.image_url.clone(),
-    end_frame_image_url: plan.end_image_url.clone(),
-    prompt: plan.prompt.clone(),
+  let api_key = FalApiKey::from_str("");
+  let end_frame: Option<&str> = plan.end_image_url.as_deref();
+  let args = Seedance1LiteArgs {
+    image_url: plan.image_url.as_str(),
+    end_frame_image_url: end_frame,
+    prompt: plan.prompt.as_str(),
     duration: plan.duration,
     resolution: plan.resolution,
     aspect_ratio: plan.aspect_ratio,
     camera_fixed: false,
     seed: None,
+    api_key: &api_key,
+    webhook_url: "https://example.com",
   };
 
-  let cost_in_usd_cents = req.calculate_cost_in_cents();
+  let cost_in_usd_cents = args.calculate_cost_in_cents();
 
   VideoGenerationCostEstimate {
     cost_in_credits: Some(cost_in_usd_cents),

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/cost/fal/estimate_video_cost_fal_seedance_1p5_pro.rs

@@ -1,6 +1,7 @@
+use fal_client::creds::fal_api_key::FalApiKey;
 use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator;
 use fal_client::requests::webhook::video::text::enqueue_seedance_1p5_pro_text_to_video_webhook::{
-  EnqueueSeedance1p5ProTextToVideoRequest, EnqueueSeedance1p5ProTextToVideoDuration,
+  EnqueueSeedance1p5ProTextToVideoArgs, EnqueueSeedance1p5ProTextToVideoDuration,
   EnqueueSeedance1p5ProTextToVideoResolution,
 };
 
@@ -14,15 +15,18 @@ pub(crate) fn estimate_video_cost_fal_seedance_1p5_pro(
 ) -> VideoGenerationCostEstimate {
   // Seedance 1.5 Pro t2v and i2v have identical pricing; delegate to the t2v
   // calculator to guarantee parity with billing.
-  let req = EnqueueSeedance1p5ProTextToVideoRequest {
+  let api_key = FalApiKey::from_str("");
+  let args = EnqueueSeedance1p5ProTextToVideoArgs {
     prompt: String::new(),
     resolution: plan.resolution.map(to_t2v_resolution),
     duration: plan.duration.map(to_t2v_duration),
     aspect_ratio: None,
     generate_audio: plan.generate_audio,
+    webhook_url: "https://example.com",
+    api_key: &api_key,
   };
 
-  let cost_in_usd_cents = req.calculate_cost_in_cents();
+  let cost_in_usd_cents = args.calculate_cost_in_cents();
 
   VideoGenerationCostEstimate {
     cost_in_credits: Some(cost_in_usd_cents),

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

@@ -1,11 +1,34 @@
+use seedance2pro_client::creds::seedance2pro_session::Seedance2ProSession;
+use seedance2pro_client::requests::generate_video::generate_video::{GenerateVideoArgs, KinoviModelType, KinoviResolution};
+
 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 {
-  let cost_in_credits = plan.request.estimate_credits();
-  let cost_in_usd_cents = plan.request.estimate_cost_in_usd_cents();
+  // 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,
+    model_type: KinoviModelType::Seedance2Pro,
+    prompt: String::new(),
+    resolution: KinoviResolution::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,
+    character_ids: None,
+    use_face_blur_hack: None,
+    host_override: 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),
@@ -16,146 +39,3 @@ pub(crate) fn estimate_video_cost_seedance2pro_seedance2p0(
     has_watermark: false,
   }
 }
-
-#[cfg(test)]
-mod tests {
-  use crate::api::common_resolution::CommonResolution;
-  use crate::api::common_video_model::CommonVideoModel;
-  use crate::api::provider::Provider;
-  use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
-  use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-
-  fn estimate_usd_cents(
-    duration_seconds: u16,
-    video_batch_count: u16,
-    resolution: Option<CommonResolution>,
-  ) -> u64 {
-    let request = GenerateVideoRequestBuilder {
-      model: CommonVideoModel::Seedance2p0,
-      provider: Provider::Seedance2Pro,
-      prompt: None,
-      negative_prompt: None,
-      start_frame: None,
-      end_frame: None,
-      reference_images: None,
-      reference_videos: None,
-      reference_audio: None,
-      reference_character_tokens: None,
-      resolution,
-      aspect_ratio: None,
-      duration_seconds: Some(duration_seconds),
-      video_batch_count: Some(video_batch_count),
-      generate_audio: None,
-      request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::PayMoreUpgrade,
-      idempotency_token: None,
-    };
-    request.build()
-      .expect("build should succeed")
-      .estimate_costs()
-      .cost_in_usd_cents
-      .expect("cost_in_usd_cents should be present")
-  }
-
-  // -- 720p (default / legacy pricing: 250 credits/$1) --
-
-  #[test]
-  fn pro_720p_batch_1() {
-    assert_eq!(estimate_usd_cents(4, 1, Some(CommonResolution::SevenTwentyP)), 64);
-    assert_eq!(estimate_usd_cents(5, 1, Some(CommonResolution::SevenTwentyP)), 80);
-    assert_eq!(estimate_usd_cents(6, 1, Some(CommonResolution::SevenTwentyP)), 96);
-    assert_eq!(estimate_usd_cents(7, 1, Some(CommonResolution::SevenTwentyP)), 112);
-    assert_eq!(estimate_usd_cents(10, 1, Some(CommonResolution::SevenTwentyP)), 160);
-    assert_eq!(estimate_usd_cents(15, 1, Some(CommonResolution::SevenTwentyP)), 240);
-  }
-
-  #[test]
-  fn pro_720p_batch_2() {
-    assert_eq!(estimate_usd_cents(4, 2, Some(CommonResolution::SevenTwentyP)), 128);
-    assert_eq!(estimate_usd_cents(5, 2, Some(CommonResolution::SevenTwentyP)), 160);
-    assert_eq!(estimate_usd_cents(15, 2, Some(CommonResolution::SevenTwentyP)), 480);
-  }
-
-  #[test]
-  fn pro_720p_batch_4() {
-    assert_eq!(estimate_usd_cents(4, 4, Some(CommonResolution::SevenTwentyP)), 256);
-    assert_eq!(estimate_usd_cents(5, 4, Some(CommonResolution::SevenTwentyP)), 320);
-    assert_eq!(estimate_usd_cents(15, 4, Some(CommonResolution::SevenTwentyP)), 960);
-  }
-
-  #[test]
-  fn pro_none_resolution_same_as_720p() {
-    assert_eq!(
-      estimate_usd_cents(5, 1, None),
-      estimate_usd_cents(5, 1, Some(CommonResolution::SevenTwentyP)),
-    );
-  }
-
-  // -- 480p (new pricing: 193 credits/$1) --
-
-  #[test]
-  fn pro_480p_batch_1() {
-    assert_eq!(estimate_usd_cents(4, 1, Some(CommonResolution::FourEightyP)), 31);
-    assert_eq!(estimate_usd_cents(5, 1, Some(CommonResolution::FourEightyP)), 39);
-    assert_eq!(estimate_usd_cents(10, 1, Some(CommonResolution::FourEightyP)), 78);
-    assert_eq!(estimate_usd_cents(15, 1, Some(CommonResolution::FourEightyP)), 117);
-  }
-
-  #[test]
-  fn pro_480p_batch_2() {
-    assert_eq!(estimate_usd_cents(5, 2, Some(CommonResolution::FourEightyP)), 78);
-  }
-
-  #[test]
-  fn pro_480p_batch_4() {
-    assert_eq!(estimate_usd_cents(5, 4, Some(CommonResolution::FourEightyP)), 155);
-  }
-
-  // -- 1080p (new pricing: 193 credits/$1) --
-
-  #[test]
-  fn pro_1080p_batch_1() {
-    assert_eq!(estimate_usd_cents(4, 1, Some(CommonResolution::TenEightyP)), 187);
-    assert_eq!(estimate_usd_cents(5, 1, Some(CommonResolution::TenEightyP)), 233);
-    assert_eq!(estimate_usd_cents(10, 1, Some(CommonResolution::TenEightyP)), 466);
-    assert_eq!(estimate_usd_cents(15, 1, Some(CommonResolution::TenEightyP)), 699);
-  }
-
-  #[test]
-  fn pro_1080p_batch_2() {
-    assert_eq!(estimate_usd_cents(5, 2, Some(CommonResolution::TenEightyP)), 466);
-  }
-
-  #[test]
-  fn pro_1080p_batch_4() {
-    assert_eq!(estimate_usd_cents(5, 4, Some(CommonResolution::TenEightyP)), 933);
-  }
-
-  // -- Relative pricing --
-
-  #[test]
-  fn pro_480p_cheaper_than_720p_cheaper_than_1080p() {
-    let c480 = estimate_usd_cents(5, 1, Some(CommonResolution::FourEightyP));
-    let c720 = estimate_usd_cents(5, 1, Some(CommonResolution::SevenTwentyP));
-    let c1080 = estimate_usd_cents(5, 1, Some(CommonResolution::TenEightyP));
-    assert!(c480 < c720, "480p ({}) should be cheaper than 720p ({})", c480, c720);
-    assert!(c720 < c1080, "720p ({}) should be cheaper than 1080p ({})", c720, c1080);
-  }
-
-  #[test]
-  fn cost_scales_with_duration() {
-    let c4 = estimate_usd_cents(4, 1, Some(CommonResolution::SevenTwentyP));
-    let c10 = estimate_usd_cents(10, 1, Some(CommonResolution::SevenTwentyP));
-    let c15 = estimate_usd_cents(15, 1, Some(CommonResolution::SevenTwentyP));
-    assert!(c4 < c10);
-    assert!(c10 < c15);
-  }
-
-  #[test]
-  fn cost_scales_with_batch() {
-    let b1 = estimate_usd_cents(5, 1, Some(CommonResolution::TenEightyP));
-    let b2 = estimate_usd_cents(5, 2, Some(CommonResolution::TenEightyP));
-    let b4 = estimate_usd_cents(5, 4, Some(CommonResolution::TenEightyP));
-    assert!(b1 < b2);
-    assert!(b2 < b4);
-  }
-}

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

@@ -1,11 +1,34 @@
+use seedance2pro_client::creds::seedance2pro_session::Seedance2ProSession;
+use seedance2pro_client::requests::generate_video::generate_video::{GenerateVideoArgs, KinoviModelType, KinoviResolution};
+
 use crate::generate::generate_video::plan::seedance2pro::plan_generate_video_seedance2pro_seedance2p0_fast::PlanSeedance2proSeedance2p0Fast;
 use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
 
 pub(crate) fn estimate_video_cost_seedance2pro_seedance2p0_fast(
   plan: &PlanSeedance2proSeedance2p0Fast,
 ) -> VideoGenerationCostEstimate {
-  let cost_in_credits = plan.request.estimate_credits();
-  let cost_in_usd_cents = plan.request.estimate_cost_in_usd_cents();
+  // 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,
+    model_type: KinoviModelType::Seedance2Fast, // <-- Fast, not Pro
+    prompt: String::new(),
+    resolution: KinoviResolution::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,
+    character_ids: None,
+    use_face_blur_hack: None,
+    host_override: 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),
@@ -19,18 +42,13 @@ pub(crate) fn estimate_video_cost_seedance2pro_seedance2p0_fast(
 
 #[cfg(test)]
 mod tests {
-  use crate::api::common_resolution::CommonResolution;
   use crate::api::common_video_model::CommonVideoModel;
   use crate::api::provider::Provider;
   use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
-  use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
+  use crate::generate::generate_video::generate_video_request::GenerateVideoRequest;
 
-  fn estimate_usd_cents(
-    duration_seconds: u16,
-    video_batch_count: u16,
-    resolution: Option<CommonResolution>,
-  ) -> u64 {
-    let request = GenerateVideoRequestBuilder {
+  fn estimate_usd_cents(duration_seconds: u16, video_batch_count: u16) -> u64 {
+    let request = GenerateVideoRequest {
       model: CommonVideoModel::Seedance2p0Fast,
       provider: Provider::Seedance2Pro,
       prompt: None,
@@ -41,7 +59,7 @@ mod tests {
       reference_videos: None,
       reference_audio: None,
       reference_character_tokens: None,
-      resolution,
+      resolution: None,
       aspect_ratio: None,
       duration_seconds: Some(duration_seconds),
       video_batch_count: Some(video_batch_count),
@@ -56,12 +74,36 @@ mod tests {
       .expect("cost_in_usd_cents should be present")
   }
 
-  fn estimate_pro_usd_cents(
-    duration_seconds: u16,
-    video_batch_count: u16,
-    resolution: Option<CommonResolution>,
-  ) -> u64 {
-    let request = GenerateVideoRequestBuilder {
+  #[test]
+  fn cost_is_present() {
+    let cents = estimate_usd_cents(5, 1);
+    assert!(cents > 0);
+  }
+
+  #[test]
+  fn cost_batch_1() {
+    // Seedance2Fast: 28 credits/sec, 220 credits/$1 (with rounding)
+    assert_eq!(estimate_usd_cents(4, 1), 51);
+    assert_eq!(estimate_usd_cents(5, 1), 64);
+    assert_eq!(estimate_usd_cents(10, 1), 127);
+    assert_eq!(estimate_usd_cents(15, 1), 191);
+  }
+
+  #[test]
+  fn cost_batch_2() {
+    assert_eq!(estimate_usd_cents(5, 2), 127);
+  }
+
+  #[test]
+  fn cost_batch_4() {
+    assert_eq!(estimate_usd_cents(5, 4), 255);
+  }
+
+  #[test]
+  fn fast_is_cheaper_than_pro() {
+    let fast = estimate_usd_cents(5, 1);
+
+    let pro_request = GenerateVideoRequest {
       model: CommonVideoModel::Seedance2p0,
       provider: Provider::Seedance2Pro,
       prompt: None,
@@ -72,140 +114,16 @@ mod tests {
       reference_videos: None,
       reference_audio: None,
       reference_character_tokens: None,
-      resolution,
+      resolution: None,
       aspect_ratio: None,
-      duration_seconds: Some(duration_seconds),
-      video_batch_count: Some(video_batch_count),
+      duration_seconds: Some(5),
+      video_batch_count: Some(1),
       generate_audio: None,
       request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::PayMoreUpgrade,
       idempotency_token: None,
     };
-    request.build()
-      .expect("build should succeed")
-      .estimate_costs()
-      .cost_in_usd_cents
-      .expect("cost_in_usd_cents should be present")
-  }
+    let pro = pro_request.build().unwrap().estimate_costs().cost_in_usd_cents.unwrap();
 
-  // -- 720p (default / legacy pricing: 220 credits/$1) --
-
-  #[test]
-  fn fast_720p_batch_1() {
-    assert_eq!(estimate_usd_cents(4, 1, Some(CommonResolution::SevenTwentyP)), 51);
-    assert_eq!(estimate_usd_cents(5, 1, Some(CommonResolution::SevenTwentyP)), 64);
-    assert_eq!(estimate_usd_cents(10, 1, Some(CommonResolution::SevenTwentyP)), 127);
-    assert_eq!(estimate_usd_cents(15, 1, Some(CommonResolution::SevenTwentyP)), 191);
-  }
-
-  #[test]
-  fn fast_720p_batch_2() {
-    assert_eq!(estimate_usd_cents(5, 2, Some(CommonResolution::SevenTwentyP)), 127);
-  }
-
-  #[test]
-  fn fast_720p_batch_4() {
-    assert_eq!(estimate_usd_cents(5, 4, Some(CommonResolution::SevenTwentyP)), 255);
-  }
-
-  #[test]
-  fn fast_none_resolution_same_as_720p() {
-    assert_eq!(
-      estimate_usd_cents(5, 1, None),
-      estimate_usd_cents(5, 1, Some(CommonResolution::SevenTwentyP)),
-    );
-  }
-
-  // -- 480p (new pricing: 193 credits/$1) --
-
-  #[test]
-  fn fast_480p_batch_1() {
-    assert_eq!(estimate_usd_cents(4, 1, Some(CommonResolution::FourEightyP)), 21);
-    assert_eq!(estimate_usd_cents(5, 1, Some(CommonResolution::FourEightyP)), 26);
-    assert_eq!(estimate_usd_cents(10, 1, Some(CommonResolution::FourEightyP)), 52);
-    assert_eq!(estimate_usd_cents(15, 1, Some(CommonResolution::FourEightyP)), 78);
-  }
-
-  #[test]
-  fn fast_480p_batch_2() {
-    assert_eq!(estimate_usd_cents(5, 2, Some(CommonResolution::FourEightyP)), 52);
-  }
-
-  #[test]
-  fn fast_480p_batch_4() {
-    assert_eq!(estimate_usd_cents(5, 4, Some(CommonResolution::FourEightyP)), 104);
-  }
-
-  // -- 1080p maps to 720p for Fast (Kinovi doesn't support 1080p fast) --
-
-  #[test]
-  fn fast_1080p_same_as_720p() {
-    for duration in [4, 5, 10, 15] {
-      assert_eq!(
-        estimate_usd_cents(duration, 1, Some(CommonResolution::TenEightyP)),
-        estimate_usd_cents(duration, 1, Some(CommonResolution::SevenTwentyP)),
-      );
-    }
-  }
-
-  #[test]
-  fn fast_1080p_batch_2() {
-    assert_eq!(
-      estimate_usd_cents(5, 2, Some(CommonResolution::TenEightyP)),
-      estimate_usd_cents(5, 2, Some(CommonResolution::SevenTwentyP)),
-    );
-  }
-
-  #[test]
-  fn fast_1080p_batch_4() {
-    assert_eq!(
-      estimate_usd_cents(5, 4, Some(CommonResolution::TenEightyP)),
-      estimate_usd_cents(5, 4, Some(CommonResolution::SevenTwentyP)),
-    );
-  }
-
-  // -- Relative pricing --
-
-  #[test]
-  fn fast_480p_cheaper_than_720p() {
-    let c480 = estimate_usd_cents(5, 1, Some(CommonResolution::FourEightyP));
-    let c720 = estimate_usd_cents(5, 1, Some(CommonResolution::SevenTwentyP));
-    assert!(c480 < c720, "480p ({}) should be cheaper than 720p ({})", c480, c720);
-  }
-
-  #[test]
-  fn fast_is_cheaper_than_pro() {
-    for res in [
-      Some(CommonResolution::FourEightyP),
-      Some(CommonResolution::SevenTwentyP),
-      Some(CommonResolution::TenEightyP),
-    ] {
-      for duration in [4, 5, 10, 15] {
-        let fast = estimate_usd_cents(duration, 1, res);
-        let pro = estimate_pro_usd_cents(duration, 1, res);
-        assert!(
-          fast < pro,
-          "Fast ({}) should be cheaper than Pro ({}) at {}s {:?}",
-          fast, pro, duration, res,
-        );
-      }
-    }
-  }
-
-  #[test]
-  fn cost_scales_with_duration() {
-    let c4 = estimate_usd_cents(4, 1, Some(CommonResolution::SevenTwentyP));
-    let c10 = estimate_usd_cents(10, 1, Some(CommonResolution::SevenTwentyP));
-    let c15 = estimate_usd_cents(15, 1, Some(CommonResolution::SevenTwentyP));
-    assert!(c4 < c10);
-    assert!(c10 < c15);
-  }
-
-  #[test]
-  fn cost_scales_with_batch() {
-    let b1 = estimate_usd_cents(5, 1, Some(CommonResolution::TenEightyP));
-    let b2 = estimate_usd_cents(5, 2, Some(CommonResolution::TenEightyP));
-    let b4 = estimate_usd_cents(5, 4, Some(CommonResolution::TenEightyP));
-    assert!(b1 < b2);
-    assert!(b2 < b4);
+    assert!(fast < pro, "Fast ({}) should be cheaper than Pro ({})", fast, pro);
   }
 }

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

@@ -5,23 +5,13 @@ use crate::generate::generate_video::plan::artcraft::plan_generate_video_artcraf
 use crate::generate::generate_video::generate_video_response::{
   ArtcraftVideoResponsePayload, GenerateVideoResponse,
 };
-use crate::api::common_resolution::CommonResolution as CommonResolutionRouter;
-use artcraft_api_defs::generate::video::multi_function::seedance_2p0_multi_function_video_gen::{
-  Seedance2p0MultiFunctionVideoGenRequest, Seedance2p0OutputResolution,
-};
+use artcraft_api_defs::generate::video::multi_function::seedance_2p0_multi_function_video_gen::Seedance2p0MultiFunctionVideoGenRequest;
 use artcraft_client::endpoints::generate::video::multi_function::seedance_2p0_multi_function_video_gen::seedance_2p0_multi_function_video_gen;
 
 pub async fn execute_artcraft_seedance2p0(
   plan: &PlanArtcraftSeedance2p0,
   artcraft_client: &RouterArtcraftClient,
 ) -> Result<GenerateVideoResponse, ArtcraftRouterError> {
-  let output_resolution = plan.resolution.map(|r| match r {
-    CommonResolutionRouter::FourEightyP => Seedance2p0OutputResolution::FourEightyP,
-    CommonResolutionRouter::SevenTwentyP => Seedance2p0OutputResolution::SevenTwentyP,
-    CommonResolutionRouter::TenEightyP => Seedance2p0OutputResolution::TenEightyP,
-    _ => Seedance2p0OutputResolution::SevenTwentyP,
-  });
-
   let request = Seedance2p0MultiFunctionVideoGenRequest {
     uuid_idempotency_token: plan.idempotency_token.clone(),
     prompt: plan.prompt.clone(),
@@ -32,7 +22,6 @@ pub async fn execute_artcraft_seedance2p0(
     reference_audio_media_tokens: plan.reference_audio.clone(),
     reference_character_tokens: plan.reference_characters.clone(),
     aspect_ratio: plan.aspect_ratio,
-    output_resolution,
     duration_seconds: plan.duration_seconds,
     batch_count: Some(plan.batch_count),
   };
@@ -61,7 +50,7 @@ mod tests {
   #[ignore] // manually run — fires a real API request and incurs cost
   async fn test_text_to_video_seedance_2p0() {
     let client = get_artcraft_client();
-    let request = crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder {
+    let request = crate::generate::generate_video::generate_video_request::GenerateVideoRequest {
       aspect_ratio: Some(CommonAspectRatio::WideSixteenByNine),
       video_batch_count: Some(1),
       prompt: Some("a cat walking through a cyberpunk city at night".to_string()),
@@ -84,7 +73,7 @@ mod tests {
   #[ignore] // manually run — fires a real API request and incurs cost
   async fn test_text_to_video_seedance_2p0_batch_two() {
     let client = get_artcraft_client();
-    let request = crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder {
+    let request = crate::generate::generate_video::generate_video_request::GenerateVideoRequest {
       aspect_ratio: Some(CommonAspectRatio::Square),
       video_batch_count: Some(2),
       prompt: Some("a dog surfing a wave, cinematic".to_string()),

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

@@ -1,4 +1,3 @@
-use crate::api::common_resolution::CommonResolution as CommonResolutionRouter;
 use crate::client::router_artcraft_client::RouterArtcraftClient;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::provider_error::ProviderError;
@@ -6,11 +5,9 @@ use crate::generate::generate_video::generate_video_response::{
   ArtcraftVideoResponsePayload, GenerateVideoResponse,
 };
 use crate::generate::generate_video::plan::artcraft::plan_generate_video_artcraft_seedance2p0::PlanArtcraftSeedance2p0;
-use artcraft_api_defs::generate::video::multi_function::seedance_2p0_multi_function_video_gen::{Seedance2p0AspectRatio, Seedance2p0BatchCount};
 use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost_and_generate_request::OmniGenVideoCostAndGenerateRequest;
 use artcraft_client::endpoints::omni_gen::generate::video::omni_gen_video::omni_gen_video_generate;
 use enums::common::generation::common_aspect_ratio::CommonAspectRatio;
-use enums::common::generation::common_resolution::CommonResolution;
 use enums::common::generation::common_video_model::CommonVideoModel;
 
 /// Execute Seedance 2.0 Fast via the Artcraft omni-gen video endpoint.
@@ -22,45 +19,34 @@ pub async fn execute_artcraft_seedance2p0_fast(
   artcraft_client: &RouterArtcraftClient,
 ) -> Result<GenerateVideoResponse, ArtcraftRouterError> {
   let aspect_ratio = plan.aspect_ratio.map(|ar| match ar {
-    Seedance2p0AspectRatio::Landscape16x9 => CommonAspectRatio::WideSixteenByNine,
-    Seedance2p0AspectRatio::Portrait9x16 => CommonAspectRatio::TallNineBySixteen,
-    Seedance2p0AspectRatio::Square1x1 => CommonAspectRatio::Square,
-    Seedance2p0AspectRatio::Standard4x3 => CommonAspectRatio::WideFourByThree,
-    Seedance2p0AspectRatio::Portrait3x4 => CommonAspectRatio::TallThreeByFour,
-  });
-
-  let resolution = plan.resolution.map(|r| match r {
-    CommonResolutionRouter::FourEightyP => CommonResolution::FourEightyP,
-    CommonResolutionRouter::SevenTwentyP => CommonResolution::SevenTwentyP,
-    CommonResolutionRouter::TenEightyP => CommonResolution::TenEightyP,
-    CommonResolutionRouter::HalfK => CommonResolution::HalfK,
-    CommonResolutionRouter::OneK => CommonResolution::OneK,
-    CommonResolutionRouter::TwoK => CommonResolution::TwoK,
-    CommonResolutionRouter::ThreeK => CommonResolution::ThreeK,
-    CommonResolutionRouter::FourK => CommonResolution::FourK,
+    artcraft_api_defs::generate::video::multi_function::seedance_2p0_multi_function_video_gen::Seedance2p0AspectRatio::Landscape16x9 => CommonAspectRatio::WideSixteenByNine,
+    artcraft_api_defs::generate::video::multi_function::seedance_2p0_multi_function_video_gen::Seedance2p0AspectRatio::Portrait9x16 => CommonAspectRatio::TallNineBySixteen,
+    artcraft_api_defs::generate::video::multi_function::seedance_2p0_multi_function_video_gen::Seedance2p0AspectRatio::Square1x1 => CommonAspectRatio::Square,
+    artcraft_api_defs::generate::video::multi_function::seedance_2p0_multi_function_video_gen::Seedance2p0AspectRatio::Standard4x3 => CommonAspectRatio::WideFourByThree,
+    artcraft_api_defs::generate::video::multi_function::seedance_2p0_multi_function_video_gen::Seedance2p0AspectRatio::Portrait3x4 => CommonAspectRatio::TallThreeByFour,
   });
 
   let request = OmniGenVideoCostAndGenerateRequest {
     idempotency_token: Some(plan.idempotency_token.clone()),
     model: Some(CommonVideoModel::Seedance2p0Fast),
     prompt: plan.prompt.clone(),
+    negative_prompt: None,
     start_frame_image_media_token: plan.start_frame.clone(),
     end_frame_image_media_token: plan.end_frame.clone(),
     reference_image_media_tokens: plan.reference_images.clone(),
     reference_video_media_tokens: plan.reference_videos.clone(),
     reference_audio_media_tokens: plan.reference_audio.clone(),
-    reference_character_tokens: plan.reference_characters.clone(),
-    resolution,
+    reference_character_tokens: None,
+    resolution: None,
     aspect_ratio,
+    quality: None,
     duration_seconds: plan.duration_seconds.map(|d| d as u16),
     video_batch_count: Some(match plan.batch_count {
-      Seedance2p0BatchCount::One => 1,
-      Seedance2p0BatchCount::Two => 2,
-      Seedance2p0BatchCount::Four => 4,
+      artcraft_api_defs::generate::video::multi_function::seedance_2p0_multi_function_video_gen::Seedance2p0BatchCount::One => 1,
+      artcraft_api_defs::generate::video::multi_function::seedance_2p0_multi_function_video_gen::Seedance2p0BatchCount::Two => 2,
+      artcraft_api_defs::generate::video::multi_function::seedance_2p0_multi_function_video_gen::Seedance2p0BatchCount::Four => 4,
     }),
-    quality: None,
     generate_audio: None,
-    negative_prompt: None,
   };
 
   let response = omni_gen_video_generate(
@@ -77,160 +63,3 @@ pub async fn execute_artcraft_seedance2p0_fast(
     all_inference_job_tokens: all_tokens,
   }))
 }
-
-#[cfg(test)]
-mod tests {
-  use crate::api::common_aspect_ratio::CommonAspectRatio;
-  use crate::api::common_resolution::CommonResolution;
-  use crate::api::common_video_model::CommonVideoModel;
-  use crate::api::image_ref::ImageRef;
-  use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-  use crate::generate::generate_video::video_generation_plan::VideoGenerationPlan;
-  use crate::test_helpers::{base_video_request, get_artcraft_client};
-  use tokens::tokens::media_files::MediaFileToken;
-
-  fn fast_request() -> GenerateVideoRequestBuilder {
-    GenerateVideoRequestBuilder {
-      model: CommonVideoModel::Seedance2p0Fast,
-      prompt: Some("a corgi walking through a cyberpunk city at night".to_string()),
-      ..base_video_request()
-    }
-  }
-
-  #[tokio::test]
-  #[ignore] // manually run — fires a real API request and incurs cost
-  async fn test_text_to_video_fast_720p_wide() {
-    let client = get_artcraft_client();
-    let request = GenerateVideoRequestBuilder {
-      aspect_ratio: Some(CommonAspectRatio::WideSixteenByNine),
-      resolution: Some(CommonResolution::SevenTwentyP),
-      video_batch_count: Some(1),
-      ..fast_request()
-    };
-
-    let plan = request.build().unwrap();
-    let result = plan.generate_video(&client).await;
-    println!("Result: {:?}", result);
-    let response = result.expect("generate_video 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.
-  }
-
-  #[tokio::test]
-  #[ignore] // manually run — fires a real API request and incurs cost
-  async fn test_text_to_video_fast_480p_square() {
-    let client = get_artcraft_client();
-    let request = GenerateVideoRequestBuilder {
-      aspect_ratio: Some(CommonAspectRatio::Square),
-      resolution: Some(CommonResolution::FourEightyP),
-      video_batch_count: Some(1),
-      ..fast_request()
-    };
-
-    let plan = request.build().unwrap();
-    let result = plan.generate_video(&client).await;
-    println!("Result: {:?}", result);
-    let response = result.expect("generate_video request failed");
-    let payload = response.get_artcraft_payload().expect("expected Artcraft payload");
-    println!("Job token: {:?}", payload.inference_job_token);
-    assert_eq!(1, 2);
-  }
-
-  #[tokio::test]
-  #[ignore] // manually run — fires a real API request and incurs cost
-  async fn test_image_to_video_fast_with_start_keyframe() {
-    let client = get_artcraft_client();
-    let request = GenerateVideoRequestBuilder {
-      start_frame: Some(ImageRef::MediaFileToken(
-        MediaFileToken::new("mf_test_keyframe_placeholder".to_string()),
-      )),
-      aspect_ratio: Some(CommonAspectRatio::WideSixteenByNine),
-      resolution: Some(CommonResolution::SevenTwentyP),
-      video_batch_count: Some(1),
-      ..fast_request()
-    };
-
-    let plan = request.build().unwrap();
-    let result = plan.generate_video(&client).await;
-    println!("Result: {:?}", result);
-    let response = result.expect("generate_video request failed");
-    let payload = response.get_artcraft_payload().expect("expected Artcraft payload");
-    println!("Job token: {:?}", payload.inference_job_token);
-    assert_eq!(1, 2);
-  }
-
-  #[tokio::test]
-  #[ignore] // manually run — fires a real API request and incurs cost
-  async fn test_text_to_video_fast_batch_2() {
-    let client = get_artcraft_client();
-    let request = GenerateVideoRequestBuilder {
-      aspect_ratio: Some(CommonAspectRatio::TallNineBySixteen),
-      resolution: Some(CommonResolution::SevenTwentyP),
-      video_batch_count: Some(2),
-      ..fast_request()
-    };
-
-    let plan = request.build().unwrap();
-    let result = plan.generate_video(&client).await;
-    println!("Result: {:?}", result);
-    let response = result.expect("generate_video request failed");
-    let payload = response.get_artcraft_payload().expect("expected Artcraft payload");
-    println!("Job tokens ({} total):", payload.all_inference_job_tokens.len());
-    for token in &payload.all_inference_job_tokens {
-      println!("  {:?}", token);
-    }
-    assert_eq!(1, 2);
-  }
-
-  #[tokio::test]
-  #[ignore] // manually run — fires a real API request and incurs cost
-  async fn test_text_to_video_fast_with_reference_images() {
-    let client = get_artcraft_client();
-    let request = GenerateVideoRequestBuilder {
-      reference_images: Some(crate::api::image_list_ref::ImageListRef::MediaFileTokens(vec![
-        MediaFileToken::new("mf_test_ref_image_placeholder".to_string()),
-      ])),
-      aspect_ratio: Some(CommonAspectRatio::WideSixteenByNine),
-      resolution: Some(CommonResolution::SevenTwentyP),
-      video_batch_count: Some(1),
-      ..fast_request()
-    };
-
-    let plan = request.build().unwrap();
-    let result = plan.generate_video(&client).await;
-    println!("Result: {:?}", result);
-    let response = result.expect("generate_video request failed");
-    let payload = response.get_artcraft_payload().expect("expected Artcraft payload");
-    println!("Job token: {:?}", payload.inference_job_token);
-    assert_eq!(1, 2);
-  }
-
-  #[test]
-  fn plan_includes_resolution() {
-    let request = GenerateVideoRequestBuilder {
-      resolution: Some(CommonResolution::FourEightyP),
-      ..fast_request()
-    };
-    let plan = request.build().unwrap();
-    let VideoGenerationPlan::ArtcraftSeedance2p0Fast(p) = plan else { panic!("wrong variant") };
-    assert!(matches!(p.resolution, Some(CommonResolution::FourEightyP)));
-  }
-
-  #[test]
-  fn plan_includes_characters() {
-    use crate::api::character_list_ref::CharacterListRef;
-    use tokens::tokens::characters::CharacterToken;
-
-    let request = GenerateVideoRequestBuilder {
-      reference_character_tokens: Some(CharacterListRef::CharacterTokens(vec![
-        CharacterToken::new("char_test123".to_string()),
-      ])),
-      ..fast_request()
-    };
-    let plan = request.build().unwrap();
-    let VideoGenerationPlan::ArtcraftSeedance2p0Fast(p) = plan else { panic!("wrong variant") };
-    assert!(p.reference_characters.is_some());
-    assert_eq!(p.reference_characters.unwrap().len(), 1);
-  }
-}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/execute/fal/generate_video_fal_kling_1_6_pro.rs

@@ -1,6 +1,3 @@
-use std::fmt::Debug;
-use std::sync::Arc;
-
 use crate::client::router_fal_client::RouterFalClient;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::provider_error::ProviderError;
@@ -9,28 +6,26 @@ use crate::generate::generate_video::generate_video_response::{
 };
 use crate::generate::generate_video::plan::fal::plan_generate_video_fal_kling_1_6_pro::PlanFalKling16Pro;
 use fal_client::requests::webhook::video::image::enqueue_kling_v1p6_pro_image_to_video_webhook::{
-  enqueue_kling_v1p6_pro_image_to_video_webhook, Kling1p6ProArgs, Kling1p6ProRequest,
+  enqueue_kling_v1p6_pro_image_to_video_webhook, Kling1p6ProArgs,
 };
 
 pub async fn execute_fal_kling_1_6_pro(
   plan: &PlanFalKling16Pro,
   fal_client: &RouterFalClient,
 ) -> Result<GenerateVideoResponse, ArtcraftRouterError> {
-  let request = Kling1p6ProRequest {
-    image_url: plan.image_url.clone(),
-    end_frame_image_url: plan.end_image_url.clone(),
-    prompt: plan.prompt.clone(),
+  // The Fal arg type is generic over `Option<T: IntoUrl>` for the end frame URL —
+  // explicitly bind T to String here.
+  let end_frame_image_url: Option<String> = plan.end_image_url.clone();
+
+  let args = Kling1p6ProArgs {
+    image_url: plan.image_url.as_str(),
+    end_frame_image_url,
+    webhook_url: fal_client.webhook_url.as_str(),
+    prompt: plan.prompt.as_str(),
+    api_key: &fal_client.api_key,
     duration: plan.duration,
     aspect_ratio: plan.aspect_ratio,
   };
-  
-  let outbound_request: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
-  
-  let args = Kling1p6ProArgs {
-    request,
-    webhook_url: fal_client.webhook_url.as_str(),
-    api_key: &fal_client.api_key,
-  };
 
   let webhook_response = enqueue_kling_v1p6_pro_image_to_video_webhook(args)
     .await
@@ -39,6 +34,5 @@ pub async fn execute_fal_kling_1_6_pro(
   Ok(GenerateVideoResponse::Fal(FalVideoResponsePayload {
     request_id: webhook_response.request_id,
     gateway_request_id: webhook_response.gateway_request_id,
-    maybe_outbound_request: Some(outbound_request),
   }))
 }

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/execute/fal/generate_video_fal_kling_2_1_master.rs

@@ -1,6 +1,3 @@
-use std::fmt::Debug;
-use std::sync::Arc;
-
 use crate::client::router_fal_client::RouterFalClient;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::provider_error::ProviderError;
@@ -9,27 +6,21 @@ use crate::generate::generate_video::generate_video_response::{
 };
 use crate::generate::generate_video::plan::fal::plan_generate_video_fal_kling_2_1_master::PlanFalKling21Master;
 use fal_client::requests::webhook::video::image::enqueue_kling_v2p1_master_image_to_video_webhook::{
-  enqueue_kling_v2p1_master_image_to_video_webhook, Kling2p1MasterArgs, Kling2p1MasterRequest,
+  enqueue_kling_v2p1_master_image_to_video_webhook, Kling2p1MasterArgs,
 };
 
 pub async fn execute_fal_kling_2_1_master(
   plan: &PlanFalKling21Master,
   fal_client: &RouterFalClient,
 ) -> Result<GenerateVideoResponse, ArtcraftRouterError> {
-  let request = Kling2p1MasterRequest {
-    image_url: plan.image_url.clone(),
-    prompt: plan.prompt.clone(),
+  let args = Kling2p1MasterArgs {
+    image_url: plan.image_url.as_str(),
+    webhook_url: fal_client.webhook_url.as_str(),
+    prompt: plan.prompt.as_str(),
+    api_key: &fal_client.api_key,
     duration: plan.duration,
     aspect_ratio: plan.aspect_ratio,
   };
-  
-  let outbound_request: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
-  
-  let args = Kling2p1MasterArgs {
-    request,
-    webhook_url: fal_client.webhook_url.as_str(),
-    api_key: &fal_client.api_key,
-  };
 
   let webhook_response = enqueue_kling_v2p1_master_image_to_video_webhook(args)
     .await
@@ -38,6 +29,5 @@ pub async fn execute_fal_kling_2_1_master(
   Ok(GenerateVideoResponse::Fal(FalVideoResponsePayload {
     request_id: webhook_response.request_id,
     gateway_request_id: webhook_response.gateway_request_id,
-    maybe_outbound_request: Some(outbound_request),
   }))
 }

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/execute/fal/generate_video_fal_kling_2_1_pro.rs

@@ -1,6 +1,3 @@
-use std::fmt::Debug;
-use std::sync::Arc;
-
 use crate::client::router_fal_client::RouterFalClient;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::provider_error::ProviderError;
@@ -9,27 +6,23 @@ use crate::generate::generate_video::generate_video_response::{
 };
 use crate::generate::generate_video::plan::fal::plan_generate_video_fal_kling_2_1_pro::PlanFalKling21Pro;
 use fal_client::requests::webhook::video::image::enqueue_kling_v2p1_pro_image_to_video_webhook::{
-  enqueue_kling_v2p1_pro_image_to_video_webhook, Kling2p1ProArgs, Kling2p1ProRequest,
+  enqueue_kling_v2p1_pro_image_to_video_webhook, Kling2p1ProArgs,
 };
 
 pub async fn execute_fal_kling_2_1_pro(
   plan: &PlanFalKling21Pro,
   fal_client: &RouterFalClient,
 ) -> Result<GenerateVideoResponse, ArtcraftRouterError> {
-  let request = Kling2p1ProRequest {
-    image_url: plan.image_url.clone(),
-    end_frame_image_url: plan.end_image_url.clone(),
-    prompt: plan.prompt.clone(),
-    duration: plan.duration,
-    aspect_ratio: plan.aspect_ratio,
-  };
-
-  let outbound_request: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
+  let end_frame_image_url: Option<String> = plan.end_image_url.clone();
 
   let args = Kling2p1ProArgs {
-    request,
+    image_url: plan.image_url.as_str(),
+    end_frame_image_url,
     webhook_url: fal_client.webhook_url.as_str(),
+    prompt: plan.prompt.as_str(),
     api_key: &fal_client.api_key,
+    duration: plan.duration,
+    aspect_ratio: plan.aspect_ratio,
   };
 
   let webhook_response = enqueue_kling_v2p1_pro_image_to_video_webhook(args)
@@ -39,6 +32,5 @@ pub async fn execute_fal_kling_2_1_pro(
   Ok(GenerateVideoResponse::Fal(FalVideoResponsePayload {
     request_id: webhook_response.request_id,
     gateway_request_id: webhook_response.gateway_request_id,
-    maybe_outbound_request: Some(outbound_request),
   }))
 }

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/execute/fal/generate_video_fal_kling_2_5_turbo_pro.rs

@@ -1,6 +1,3 @@
-use std::fmt::Debug;
-use std::sync::Arc;
-
 use crate::client::router_fal_client::RouterFalClient;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::provider_error::ProviderError;
@@ -13,49 +10,40 @@ use crate::generate::generate_video::plan::fal::plan_generate_video_fal_kling_2_
 };
 use fal_client::requests::webhook::video::image::enqueue_kling_v2p5_turbo_pro_image_to_video_webhook::{
   enqueue_kling_v2p5_turbo_pro_image_to_video_webhook, EnqueueKlingV2p5TurboProImageToVideoArgs,
-  EnqueueKlingV2p5TurboProImageToVideoRequest, EnqueueKlingV2p5TurboProImageToVideoDurationSeconds,
+  EnqueueKlingV2p5TurboProImageToVideoDurationSeconds,
 };
 use fal_client::requests::webhook::video::text::enqueue_kling_v2p5_turbo_pro_text_to_video_webhook::{
   enqueue_kling_v2p5_turbo_pro_text_to_video_webhook, EnqueueKlingV2p5TurboProTextToVideoArgs,
-  EnqueueKlingV2p5TurboProTextToVideoRequest, EnqueueKlingV2p5TurboProTextToVideoAspectRatio,
-  EnqueueKlingV2p5TurboProTextToVideoDurationSeconds,
+  EnqueueKlingV2p5TurboProTextToVideoAspectRatio, EnqueueKlingV2p5TurboProTextToVideoDurationSeconds,
 };
 
 pub async fn execute_fal_kling_2_5_turbo_pro(
   plan: &PlanFalKling2p5TurboPro,
   fal_client: &RouterFalClient,
 ) -> Result<GenerateVideoResponse, ArtcraftRouterError> {
-  let (webhook_response, outbound_request) = match &plan.mode {
+  let webhook_response = match &plan.mode {
     FalKling2p5TurboProMode::TextToVideo => {
-      let request = EnqueueKlingV2p5TurboProTextToVideoRequest {
+      let args = EnqueueKlingV2p5TurboProTextToVideoArgs {
         prompt: plan.prompt.clone(),
         negative_prompt: plan.negative_prompt.clone(),
         duration: plan.duration.map(to_t2v_duration),
         aspect_ratio: plan.aspect_ratio.map(to_t2v_aspect_ratio),
-      };
-      let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
-      let args = EnqueueKlingV2p5TurboProTextToVideoArgs {
-        request,
         webhook_url: fal_client.webhook_url.as_str(),
         api_key: &fal_client.api_key,
       };
-      (enqueue_kling_v2p5_turbo_pro_text_to_video_webhook(args).await, outbound)
+      enqueue_kling_v2p5_turbo_pro_text_to_video_webhook(args).await
     }
     FalKling2p5TurboProMode::ImageToVideo { image_url, end_image_url } => {
-      let request = EnqueueKlingV2p5TurboProImageToVideoRequest {
+      let args = EnqueueKlingV2p5TurboProImageToVideoArgs {
         prompt: plan.prompt.clone(),
         image_url: image_url.clone(),
         tail_image_url: end_image_url.clone(),
         negative_prompt: plan.negative_prompt.clone(),
         duration: plan.duration.map(to_i2v_duration),
-      };
-      let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
-      let args = EnqueueKlingV2p5TurboProImageToVideoArgs {
-        request,
         webhook_url: fal_client.webhook_url.as_str(),
         api_key: &fal_client.api_key,
       };
-      (enqueue_kling_v2p5_turbo_pro_image_to_video_webhook(args).await, outbound)
+      enqueue_kling_v2p5_turbo_pro_image_to_video_webhook(args).await
     }
   };
 
@@ -65,7 +53,6 @@ pub async fn execute_fal_kling_2_5_turbo_pro(
   Ok(GenerateVideoResponse::Fal(FalVideoResponsePayload {
     request_id: webhook_response.request_id,
     gateway_request_id: webhook_response.gateway_request_id,
-    maybe_outbound_request: Some(outbound_request),
   }))
 }
 

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/execute/fal/generate_video_fal_kling_2_6_pro.rs

@@ -1,6 +1,3 @@
-use std::fmt::Debug;
-use std::sync::Arc;
-
 use crate::client::router_fal_client::RouterFalClient;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::provider_error::ProviderError;
@@ -12,50 +9,41 @@ use crate::generate::generate_video::plan::fal::plan_generate_video_fal_kling_2_
 };
 use fal_client::requests::webhook::video::image::enqueue_kling_v2p6_pro_image_to_video_webhook::{
   enqueue_kling_v2p6_pro_image_to_video_webhook, EnqueueKlingV2p6ProImageToVideoArgs,
-  EnqueueKlingV2p6ProImageToVideoRequest, EnqueueKlingV2p6ProImageToVideoDurationSeconds,
+  EnqueueKlingV2p6ProImageToVideoDurationSeconds,
 };
 use fal_client::requests::webhook::video::text::enqueue_kling_v2p6_pro_text_to_video_webhook::{
   enqueue_kling_v2p6_pro_text_to_video_webhook, EnqueueKlingV2p6ProTextToVideoArgs,
-  EnqueueKlingV2p6ProTextToVideoRequest, EnqueueKlingV2p6ProTextToVideoAspectRatio,
-  EnqueueKlingV2p6ProTextToVideoDurationSeconds,
+  EnqueueKlingV2p6ProTextToVideoAspectRatio, EnqueueKlingV2p6ProTextToVideoDurationSeconds,
 };
 
 pub async fn execute_fal_kling_2_6_pro(
   plan: &PlanFalKling2p6Pro,
   fal_client: &RouterFalClient,
 ) -> Result<GenerateVideoResponse, ArtcraftRouterError> {
-  let (webhook_response, outbound_request) = match &plan.mode {
+  let webhook_response = match &plan.mode {
     FalKling2p6ProMode::TextToVideo => {
-      let request = EnqueueKlingV2p6ProTextToVideoRequest {
+      let args = EnqueueKlingV2p6ProTextToVideoArgs {
         prompt: plan.prompt.clone(),
         generate_audio: plan.generate_audio,
         negative_prompt: plan.negative_prompt.clone(),
         duration: plan.duration.map(to_t2v_duration),
         aspect_ratio: plan.aspect_ratio.map(to_t2v_aspect_ratio),
-      };
-      let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
-      let args = EnqueueKlingV2p6ProTextToVideoArgs {
-        request,
         webhook_url: fal_client.webhook_url.as_str(),
         api_key: &fal_client.api_key,
       };
-      (enqueue_kling_v2p6_pro_text_to_video_webhook(args).await, outbound)
+      enqueue_kling_v2p6_pro_text_to_video_webhook(args).await
     }
     FalKling2p6ProMode::ImageToVideo { image_url } => {
-      let request = EnqueueKlingV2p6ProImageToVideoRequest {
+      let args = EnqueueKlingV2p6ProImageToVideoArgs {
         prompt: plan.prompt.clone(),
         image_url: image_url.clone(),
         generate_audio: plan.generate_audio,
         negative_prompt: plan.negative_prompt.clone(),
         duration: plan.duration.map(to_i2v_duration),
-      };
-      let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
-      let args = EnqueueKlingV2p6ProImageToVideoArgs {
-        request,
         webhook_url: fal_client.webhook_url.as_str(),
         api_key: &fal_client.api_key,
       };
-      (enqueue_kling_v2p6_pro_image_to_video_webhook(args).await, outbound)
+      enqueue_kling_v2p6_pro_image_to_video_webhook(args).await
     }
   };
 
@@ -65,7 +53,6 @@ pub async fn execute_fal_kling_2_6_pro(
   Ok(GenerateVideoResponse::Fal(FalVideoResponsePayload {
     request_id: webhook_response.request_id,
     gateway_request_id: webhook_response.gateway_request_id,
-    maybe_outbound_request: Some(outbound_request),
   }))
 }
 

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/execute/fal/generate_video_fal_kling_3p0_pro.rs

@@ -1,6 +1,3 @@
-use std::fmt::Debug;
-use std::sync::Arc;
-
 use crate::client::router_fal_client::RouterFalClient;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::provider_error::ProviderError;
@@ -12,39 +9,33 @@ use crate::generate::generate_video::plan::fal::plan_generate_video_fal_kling_3p
 };
 use fal_client::requests::webhook::video::image::enqueue_kling_3p0_pro_image_to_video_webhook::{
   enqueue_kling_3p0_pro_image_to_video_webhook, EnqueueKling3p0ProImageToVideoArgs,
-  EnqueueKling3p0ProImageToVideoRequest, EnqueueKling3p0ProImageToVideoAspectRatio,
-  EnqueueKling3p0ProImageToVideoDuration,
+  EnqueueKling3p0ProImageToVideoAspectRatio, EnqueueKling3p0ProImageToVideoDuration,
 };
 use fal_client::requests::webhook::video::text::enqueue_kling_3p0_pro_text_to_video_webhook::{
   enqueue_kling_3p0_pro_text_to_video_webhook, EnqueueKling3p0ProTextToVideoArgs,
-  EnqueueKling3p0ProTextToVideoRequest, EnqueueKling3p0ProTextToVideoAspectRatio,
-  EnqueueKling3p0ProTextToVideoDuration,
+  EnqueueKling3p0ProTextToVideoAspectRatio, EnqueueKling3p0ProTextToVideoDuration,
 };
 
 pub async fn execute_fal_kling_3p0_pro(
   plan: &PlanFalKling3p0Pro,
   fal_client: &RouterFalClient,
 ) -> Result<GenerateVideoResponse, ArtcraftRouterError> {
-  let (webhook_response, outbound_request) = match &plan.mode {
+  let webhook_response = match &plan.mode {
     FalKling3p0Mode::TextToVideo => {
-      let request = EnqueueKling3p0ProTextToVideoRequest {
+      let args = EnqueueKling3p0ProTextToVideoArgs {
         prompt: plan.prompt.clone(),
         generate_audio: plan.generate_audio,
         negative_prompt: plan.negative_prompt.clone(),
         duration: plan.duration.map(to_t2v_duration),
         aspect_ratio: plan.aspect_ratio.map(to_t2v_aspect_ratio),
         shot_type: None,
-      };
-      let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
-      let args = EnqueueKling3p0ProTextToVideoArgs {
-        request,
         webhook_url: fal_client.webhook_url.as_str(),
         api_key: &fal_client.api_key,
       };
-      (enqueue_kling_3p0_pro_text_to_video_webhook(args).await, outbound)
+      enqueue_kling_3p0_pro_text_to_video_webhook(args).await
     }
     FalKling3p0Mode::ImageToVideo { image_url, end_image_url } => {
-      let request = EnqueueKling3p0ProImageToVideoRequest {
+      let args = EnqueueKling3p0ProImageToVideoArgs {
         prompt: plan.prompt.clone(),
         image_url: image_url.clone(),
         end_image_url: end_image_url.clone(),
@@ -53,14 +44,10 @@ pub async fn execute_fal_kling_3p0_pro(
         duration: plan.duration.map(to_i2v_duration),
         aspect_ratio: plan.aspect_ratio.map(to_i2v_aspect_ratio),
         shot_type: None,
-      };
-      let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
-      let args = EnqueueKling3p0ProImageToVideoArgs {
-        request,
         webhook_url: fal_client.webhook_url.as_str(),
         api_key: &fal_client.api_key,
       };
-      (enqueue_kling_3p0_pro_image_to_video_webhook(args).await, outbound)
+      enqueue_kling_3p0_pro_image_to_video_webhook(args).await
     }
   };
 
@@ -70,7 +57,6 @@ pub async fn execute_fal_kling_3p0_pro(
   Ok(GenerateVideoResponse::Fal(FalVideoResponsePayload {
     request_id: webhook_response.request_id,
     gateway_request_id: webhook_response.gateway_request_id,
-    maybe_outbound_request: Some(outbound_request),
   }))
 }
 

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/execute/fal/generate_video_fal_kling_3p0_standard.rs

@@ -1,6 +1,3 @@
-use std::fmt::Debug;
-use std::sync::Arc;
-
 use crate::client::router_fal_client::RouterFalClient;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::provider_error::ProviderError;
@@ -13,39 +10,33 @@ use crate::generate::generate_video::plan::fal::plan_generate_video_fal_kling_3p
 use crate::generate::generate_video::plan::fal::plan_generate_video_fal_kling_3p0_standard::PlanFalKling3p0Standard;
 use fal_client::requests::webhook::video::image::enqueue_kling_3p0_standard_image_to_video_webhook::{
   enqueue_kling_3p0_standard_image_to_video_webhook, EnqueueKling3p0StandardImageToVideoArgs,
-  EnqueueKling3p0StandardImageToVideoRequest, EnqueueKling3p0StandardImageToVideoAspectRatio,
-  EnqueueKling3p0StandardImageToVideoDuration,
+  EnqueueKling3p0StandardImageToVideoAspectRatio, EnqueueKling3p0StandardImageToVideoDuration,
 };
 use fal_client::requests::webhook::video::text::enqueue_kling_3p0_standard_text_to_video_webhook::{
   enqueue_kling_3p0_standard_text_to_video_webhook, EnqueueKling3p0StandardTextToVideoArgs,
-  EnqueueKling3p0StandardTextToVideoRequest, EnqueueKling3p0StandardTextToVideoAspectRatio,
-  EnqueueKling3p0StandardTextToVideoDuration,
+  EnqueueKling3p0StandardTextToVideoAspectRatio, EnqueueKling3p0StandardTextToVideoDuration,
 };
 
 pub async fn execute_fal_kling_3p0_standard(
   plan: &PlanFalKling3p0Standard,
   fal_client: &RouterFalClient,
 ) -> Result<GenerateVideoResponse, ArtcraftRouterError> {
-  let (webhook_response, outbound_request) = match &plan.mode {
+  let webhook_response = match &plan.mode {
     FalKling3p0Mode::TextToVideo => {
-      let request = EnqueueKling3p0StandardTextToVideoRequest {
+      let args = EnqueueKling3p0StandardTextToVideoArgs {
         prompt: plan.prompt.clone(),
         generate_audio: plan.generate_audio,
         negative_prompt: plan.negative_prompt.clone(),
         duration: plan.duration.map(to_t2v_duration),
         aspect_ratio: plan.aspect_ratio.map(to_t2v_aspect_ratio),
         shot_type: None,
-      };
-      let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
-      let args = EnqueueKling3p0StandardTextToVideoArgs {
-        request,
         webhook_url: fal_client.webhook_url.as_str(),
         api_key: &fal_client.api_key,
       };
-      (enqueue_kling_3p0_standard_text_to_video_webhook(args).await, outbound)
+      enqueue_kling_3p0_standard_text_to_video_webhook(args).await
     }
     FalKling3p0Mode::ImageToVideo { image_url, end_image_url } => {
-      let request = EnqueueKling3p0StandardImageToVideoRequest {
+      let args = EnqueueKling3p0StandardImageToVideoArgs {
         prompt: plan.prompt.clone(),
         image_url: image_url.clone(),
         end_image_url: end_image_url.clone(),
@@ -54,14 +45,10 @@ pub async fn execute_fal_kling_3p0_standard(
         duration: plan.duration.map(to_i2v_duration),
         aspect_ratio: plan.aspect_ratio.map(to_i2v_aspect_ratio),
         shot_type: None,
-      };
-      let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
-      let args = EnqueueKling3p0StandardImageToVideoArgs {
-        request,
         webhook_url: fal_client.webhook_url.as_str(),
         api_key: &fal_client.api_key,
       };
-      (enqueue_kling_3p0_standard_image_to_video_webhook(args).await, outbound)
+      enqueue_kling_3p0_standard_image_to_video_webhook(args).await
     }
   };
 
@@ -71,7 +58,6 @@ pub async fn execute_fal_kling_3p0_standard(
   Ok(GenerateVideoResponse::Fal(FalVideoResponsePayload {
     request_id: webhook_response.request_id,
     gateway_request_id: webhook_response.gateway_request_id,
-    maybe_outbound_request: Some(outbound_request),
   }))
 }
 

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/execute/fal/generate_video_fal_seedance_1_0_lite.rs

@@ -1,6 +1,3 @@
-use std::fmt::Debug;
-use std::sync::Arc;
-
 use crate::client::router_fal_client::RouterFalClient;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::provider_error::ProviderError;
@@ -9,28 +6,24 @@ use crate::generate::generate_video::generate_video_response::{
 };
 use crate::generate::generate_video::plan::fal::plan_generate_video_fal_seedance_1_0_lite::PlanFalSeedance10Lite;
 use fal_client::requests::webhook::video::image::enqueue_seedance_1_lite_image_to_video_webhook::{
-  enqueue_seedance_1_lite_image_to_video_webhook, Seedance1LiteArgs, Seedance1LiteRequest,
+  enqueue_seedance_1_lite_image_to_video_webhook, Seedance1LiteArgs,
 };
 
 pub async fn execute_fal_seedance_1_0_lite(
   plan: &PlanFalSeedance10Lite,
   fal_client: &RouterFalClient,
 ) -> Result<GenerateVideoResponse, ArtcraftRouterError> {
-  let request = Seedance1LiteRequest {
-    image_url: plan.image_url.clone(),
-    end_frame_image_url: plan.end_image_url.clone(),
-    prompt: plan.prompt.clone(),
+  let end_frame: Option<&str> = plan.end_image_url.as_deref();
+
+  let args = Seedance1LiteArgs {
+    image_url: plan.image_url.as_str(),
+    end_frame_image_url: end_frame,
+    prompt: plan.prompt.as_str(),
     duration: plan.duration,
     resolution: plan.resolution,
     aspect_ratio: plan.aspect_ratio,
     camera_fixed: false,
     seed: None,
-  };
-  
-  let outbound_request: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
-  
-  let args = Seedance1LiteArgs {
-    request,
     api_key: &fal_client.api_key,
     webhook_url: fal_client.webhook_url.as_str(),
   };
@@ -42,6 +35,5 @@ pub async fn execute_fal_seedance_1_0_lite(
   Ok(GenerateVideoResponse::Fal(FalVideoResponsePayload {
     request_id: webhook_response.request_id,
     gateway_request_id: webhook_response.gateway_request_id,
-    maybe_outbound_request: Some(outbound_request),
   }))
 }

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/execute/fal/generate_video_fal_seedance_1p5_pro.rs

@@ -1,6 +1,3 @@
-use std::fmt::Debug;
-use std::sync::Arc;
-
 use crate::client::router_fal_client::RouterFalClient;
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::errors::provider_error::ProviderError;
@@ -14,37 +11,33 @@ use crate::generate::generate_video::plan::fal::plan_generate_video_fal_seedance
 use fal_client::requests::webhook::video::image::enqueue_seedance_1p5_pro_image_to_video_webhook::{
   enqueue_seedance_1p5_pro_image_to_video_webhook, EnqueueSeedance1p5ProImageToVideoArgs,
   EnqueueSeedance1p5ProImageToVideoAspectRatio, EnqueueSeedance1p5ProImageToVideoDuration,
-  EnqueueSeedance1p5ProImageToVideoRequest, EnqueueSeedance1p5ProImageToVideoResolution,
+  EnqueueSeedance1p5ProImageToVideoResolution,
 };
 use fal_client::requests::webhook::video::text::enqueue_seedance_1p5_pro_text_to_video_webhook::{
   enqueue_seedance_1p5_pro_text_to_video_webhook, EnqueueSeedance1p5ProTextToVideoArgs,
-  EnqueueSeedance1p5ProTextToVideoRequest, EnqueueSeedance1p5ProTextToVideoAspectRatio,
-  EnqueueSeedance1p5ProTextToVideoDuration, EnqueueSeedance1p5ProTextToVideoResolution,
+  EnqueueSeedance1p5ProTextToVideoAspectRatio, EnqueueSeedance1p5ProTextToVideoDuration,
+  EnqueueSeedance1p5ProTextToVideoResolution,
 };
 
 pub async fn execute_fal_seedance_1p5_pro(
   plan: &PlanFalSeedance1p5Pro,
   fal_client: &RouterFalClient,
 ) -> Result<GenerateVideoResponse, ArtcraftRouterError> {
-  let (webhook_response, outbound_request) = match &plan.mode {
+  let webhook_response = match &plan.mode {
     FalSeedance1p5ProMode::TextToVideo => {
-      let request = EnqueueSeedance1p5ProTextToVideoRequest {
+      let args = EnqueueSeedance1p5ProTextToVideoArgs {
         prompt: plan.prompt.clone(),
         resolution: plan.resolution.map(to_t2v_resolution),
         duration: plan.duration.map(to_t2v_duration),
         aspect_ratio: plan.aspect_ratio.map(to_t2v_aspect_ratio),
         generate_audio: plan.generate_audio,
-      };
-      let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
-      let args = EnqueueSeedance1p5ProTextToVideoArgs {
-        request,
         webhook_url: fal_client.webhook_url.as_str(),
         api_key: &fal_client.api_key,
       };
-      (enqueue_seedance_1p5_pro_text_to_video_webhook(args).await, outbound)
+      enqueue_seedance_1p5_pro_text_to_video_webhook(args).await
     }
     FalSeedance1p5ProMode::ImageToVideo { image_url, end_image_url } => {
-      let request = EnqueueSeedance1p5ProImageToVideoRequest {
+      let args = EnqueueSeedance1p5ProImageToVideoArgs {
         prompt: plan.prompt.clone(),
         image_url: image_url.clone(),
         end_image_url: end_image_url.clone(),
@@ -52,14 +45,10 @@ pub async fn execute_fal_seedance_1p5_pro(
         duration: plan.duration.map(to_i2v_duration),
         aspect_ratio: plan.aspect_ratio.map(to_i2v_aspect_ratio),
         generate_audio: plan.generate_audio,
-      };
-      let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
-      let args = EnqueueSeedance1p5ProImageToVideoArgs {
-        request,
         webhook_url: fal_client.webhook_url.as_str(),
         api_key: &fal_client.api_key,
       };
-      (enqueue_seedance_1p5_pro_image_to_video_webhook(args).await, outbound)
+      enqueue_seedance_1p5_pro_image_to_video_webhook(args).await
     }
   };
 
@@ -69,7 +58,6 @@ pub async fn execute_fal_seedance_1p5_pro(
   Ok(GenerateVideoResponse::Fal(FalVideoResponsePayload {
     request_id: webhook_response.request_id,
     gateway_request_id: webhook_response.gateway_request_id,
-    maybe_outbound_request: Some(outbound_request),
   }))
 }