remove comment

.claude/rules/testing.md

@@ -1,25 +1,5 @@
 # Testing
 
-## Database Fixture Tests
-
-- Live in-crate (e.g. `storyteller-web`'s omni_gen video pricing tests) and
-  use the `mysql_testing` crate (`crates/schema/database/mysql_testing`) for
-  guarded pools, schema setup, and account/session/wallet fixtures
-- They RUN BY DEFAULT with `cargo test -p storyteller-web` and from the IDE
-  (requires a local MySQL with an `artcraft_test` database). Machines/CI
-  without MySQL skip them via the off switch:
-  `SQLX_OFFLINE=true cargo test -p storyteller-web --features skip_database_tests`
-- They connect ONLY via `ARTCRAFT_TEST_DATABASE_URL` (default
-  `mysql://root:@localhost:3306/artcraft_test`); the guard panics on any
-  database whose name lacks "test", on `storyteller`/`artcraft`, and on
-  cloud hosts — see `mysql_testing/README.md`
-- Database tests run in PARALLEL: each test creates its own users, wallets,
-  and rows; schema setup single-flights via a MySQL named lock. Only tests
-  mutating shared/global state take
-  `mysql_testing::serial::acquire_serial_test_lock().await`
-- External providers must never be called: the harness stubs Kinovi with an
-  in-process HTTP server via `KINOVI_CUSTOM_API_HOST`/`KINOVI_CUSTOM_CDN_HOST`
-
 ## Running Tests
 
 - Most crates: `cargo test -p {crate_name}`

.github/workflows/mcp-smoke.yml

@@ -1,43 +0,0 @@
-name: mcp smoke
-
-# The only place this project touches the real Artcraft backend: a read-only pass with the
-# demo account against production (docs/infra-request.md §2 and §4). Weekly, so a change on
-# the Claude/ChatGPT side or upstream shows up as a red badge rather than a support ticket.
-on:
-  schedule:
-    - cron: "0 9 * * 1" # Mondays 09:00 UTC
-  workflow_dispatch:
-    inputs:
-      base_url:
-        description: "MCP server origin to smoke (defaults to production)"
-        required: false
-        default: "https://mcp.getartcraft.com"
-
-jobs:
-  smoke:
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: mcp
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 22
-      - id: creds
-        run: |
-          if [ -n "$SMOKE_USERNAME" ] && [ -n "$SMOKE_PASSWORD" ]; then
-            echo "present=true" >> "$GITHUB_OUTPUT"
-          else
-            echo "::notice::SMOKE_USERNAME / SMOKE_PASSWORD not configured; skipping."
-            echo "present=false" >> "$GITHUB_OUTPUT"
-          fi
-        env:
-          SMOKE_USERNAME: ${{ secrets.SMOKE_USERNAME }}
-          SMOKE_PASSWORD: ${{ secrets.SMOKE_PASSWORD }}
-      - if: steps.creds.outputs.present == 'true'
-        run: node scripts/smoke.mjs
-        env:
-          SMOKE_BASE_URL: ${{ inputs.base_url || 'https://mcp.getartcraft.com' }}
-          SMOKE_USERNAME: ${{ secrets.SMOKE_USERNAME }}
-          SMOKE_PASSWORD: ${{ secrets.SMOKE_PASSWORD }}

.github/workflows/mcp.yml

@@ -1,79 +0,0 @@
-name: mcp
-
-on:
-  push:
-    branches: [main]
-    paths:
-      - "mcp/**"
-      - ".github/workflows/mcp.yml"
-  pull_request:
-    paths:
-      - "mcp/**"
-      - ".github/workflows/mcp.yml"
-
-defaults:
-  run:
-    working-directory: mcp
-
-jobs:
-  check:
-    name: typecheck · lint · format · test
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v4
-        with:
-          package_json_file: mcp/package.json
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 22
-          cache: pnpm
-          cache-dependency-path: mcp/pnpm-lock.yaml
-      - run: pnpm install --frozen-lockfile
-      - run: pnpm typecheck
-      - run: pnpm lint
-      - run: pnpm format
-      - run: pnpm test
-
-  deploy-production:
-    name: deploy · production
-    needs: check
-    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
-    runs-on: ubuntu-latest
-    environment: production
-    steps:
-      - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v4
-        with:
-          package_json_file: mcp/package.json
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 22
-          cache: pnpm
-          cache-dependency-path: mcp/pnpm-lock.yaml
-      - run: pnpm install --frozen-lockfile
-      # Deploys are skipped, not failed, until the Cloudflare secrets exist (docs/infra-request.md §2).
-      - id: creds
-        run: |
-          if [ -n "$CLOUDFLARE_API_TOKEN" ] && [ -n "$CLOUDFLARE_ACCOUNT_ID" ]; then
-            echo "present=true" >> "$GITHUB_OUTPUT"
-          else
-            echo "::notice::Cloudflare secrets not configured; skipping deploy."
-            echo "present=false" >> "$GITHUB_OUTPUT"
-          fi
-        env:
-          CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-          CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-      - if: steps.creds.outputs.present == 'true'
-        run: pnpm exec wrangler deploy --env production
-        env:
-          CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
-          CLOUDFLARE_ACCOUNT_ID: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
-      # Read-only smoke with the demo account, right after the deploy (skipped until the
-      # demo-account secrets exist; docs/infra-request.md §2 and §4).
-      - if: steps.creds.outputs.present == 'true' && env.SMOKE_USERNAME != ''
-        run: node scripts/smoke.mjs
-        env:
-          SMOKE_BASE_URL: https://mcp.getartcraft.com
-          SMOKE_USERNAME: ${{ secrets.SMOKE_USERNAME }}
-          SMOKE_PASSWORD: ${{ secrets.SMOKE_PASSWORD }}

.sqlx/query-03919ba8286d18980ecaa0038df76f43f5388db0d3838181fa8f15f4cbb932af.json

@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nUPDATE generic_inference_jobs\nSET\n  status = ?,\n  on_success_result_entity_type = ?,\n  on_success_result_entity_token = ?,\n  failure_reason = NULL,\n  internal_debugging_failure_reason = NULL,\n  success_execution_millis = ?,\n  success_inference_execution_millis = ?,\n  retry_at = NULL,\n  successfully_completed_at = NOW()\nWHERE token = ?\nAND status NOT IN ('complete_success', 'complete_failure')\n    ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 6
-    },
-    "nullable": []
-  },
-  "hash": "03919ba8286d18980ecaa0038df76f43f5388db0d3838181fa8f15f4cbb932af"
-}

.sqlx/query-258ac40d3fab39f110e1e82d50e73542423bfe9a21f8127e6cd83214c1726e25.json

@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nUPDATE generic_inference_jobs\nSET\n  status = ?,\n  assigned_worker = ?,\n  last_assigned_worker = ?,\n  assigned_cluster = ?,\n  first_started_at = NOW()\nWHERE token = ?\n    ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 5
-    },
-    "nullable": []
-  },
-  "hash": "258ac40d3fab39f110e1e82d50e73542423bfe9a21f8127e6cd83214c1726e25"
-}

.sqlx/query-6ca0fcdf495624cf347f612586868f6dea93f52d9f942a92dcd2b3e6aba7c63c.json

@@ -1,36 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nSELECT\n  token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n  maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`\nFROM generic_inference_jobs\nWHERE job_type = ?\nAND status = 'pending'\nORDER BY id ASC\nLIMIT 1\nFOR UPDATE SKIP LOCKED\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": "maybe_prompt_token: tokens::tokens::prompts::PromptToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      false,
-      true
-    ]
-  },
-  "hash": "6ca0fcdf495624cf347f612586868f6dea93f52d9f942a92dcd2b3e6aba7c63c"
-}

.sqlx/query-9188e235caa439d50628333c2f4722b9f1a8f575c192d4d36a2039709c412ac0.json

@@ -1,6 +1,6 @@
 {
   "db_name": "MySQL",
-  "query": "\nSELECT\n  users.token as `user_token: UserToken`,\n  users.username,\n  users.display_name,\n  users.email_address,\n  users.user_role_slug,\n  users.is_banned,\n  user_roles.can_ban_users,\n  users.maybe_feature_flags\nFROM user_sessions\nINNER JOIN users\n  ON users.token = user_sessions.user_token\nLEFT OUTER JOIN user_roles\n  ON users.user_role_slug = user_roles.slug\nWHERE user_sessions.token = ?\n  AND user_sessions.deleted_at IS NULL\n  AND users.user_deleted_at IS NULL\n  AND users.mod_deleted_at IS NULL\nLIMIT 1\n    ",
+  "query": "\nSELECT\n  users.token as `user_token: UserToken`,\n  users.username,\n  users.display_name,\n  users.email_address,\n  users.user_role_slug,\n  users.is_banned,\n  user_roles.can_ban_users,\n  api_keys.token as `api_key_token: ApiKeyToken`\nFROM api_keys\nINNER JOIN users\n  ON users.token = api_keys.owner_user_token\nLEFT OUTER JOIN user_roles\n  ON users.user_role_slug = user_roles.slug\nWHERE api_keys.api_key = ?\n  AND api_keys.maybe_deleted_at IS NULL\n  AND users.user_deleted_at IS NULL\n  AND users.mod_deleted_at IS NULL\nLIMIT 1\n    ",
   "describe": {
     "columns": [
       {
@@ -75,12 +75,12 @@
       },
       {
         "ordinal": 7,
-        "name": "maybe_feature_flags",
+        "name": "api_key_token: ApiKeyToken",
         "type_info": {
           "type": "VarString",
-          "flags": "BINARY",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
           "char_set": 224,
-          "max_size": 1020
+          "max_size": 128
         }
       }
     ],
@@ -95,8 +95,8 @@
       false,
       false,
       true,
-      true
+      false
     ]
   },
-  "hash": "cf2794c87868e77dfaa45bdbe630ae276dbb8c2d041442ba465af0b7a6d61af6"
+  "hash": "9188e235caa439d50628333c2f4722b9f1a8f575c192d4d36a2039709c412ac0"
 }

.sqlx/query-96599b4854248d84188b092db84edb50dc5402bb7771fd8ea96a96ad43e732c0.json

@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nUPDATE generic_inference_jobs\nSET\n  status = ?,\n  frontend_failure_category = ?,\n  failure_reason = ?,\n  internal_debugging_failure_reason = ?,\n  success_execution_millis = ?,\n  success_inference_execution_millis = ?\nWHERE token = ?\nAND status NOT IN ('complete_success', 'complete_failure')\n    ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 7
-    },
-    "nullable": []
-  },
-  "hash": "96599b4854248d84188b092db84edb50dc5402bb7771fd8ea96a96ad43e732c0"
-}

.sqlx/query-c77126adb36f9e2f0248720eb4d8c1cd9d14719f64a02678d8021e26addd2c18.json

@@ -1,6 +1,6 @@
 {
   "db_name": "MySQL",
-  "query": "\nSELECT\n  users.token as `user_token: UserToken`,\n  users.username,\n  users.display_name,\n  users.email_address,\n  users.user_role_slug,\n  users.is_banned,\n  user_roles.can_ban_users,\n  users.maybe_feature_flags,\n  api_keys.token as `api_key_token: ApiKeyToken`\nFROM api_keys\nINNER JOIN users\n  ON users.token = api_keys.owner_user_token\nLEFT OUTER JOIN user_roles\n  ON users.user_role_slug = user_roles.slug\nWHERE api_keys.api_key = ?\n  AND api_keys.maybe_deleted_at IS NULL\n  AND users.user_deleted_at IS NULL\n  AND users.mod_deleted_at IS NULL\nLIMIT 1\n    ",
+  "query": "\nSELECT\n  users.token as `user_token: UserToken`,\n  users.username,\n  users.display_name,\n  users.email_address,\n  users.user_role_slug,\n  users.is_banned,\n  user_roles.can_ban_users\nFROM user_sessions\nINNER JOIN users\n  ON users.token = user_sessions.user_token\nLEFT OUTER JOIN user_roles\n  ON users.user_role_slug = user_roles.slug\nWHERE user_sessions.token = ?\n  AND user_sessions.deleted_at IS NULL\n  AND users.user_deleted_at IS NULL\n  AND users.mod_deleted_at IS NULL\nLIMIT 1\n    ",
   "describe": {
     "columns": [
       {
@@ -72,26 +72,6 @@
           "char_set": 63,
           "max_size": 1
         }
-      },
-      {
-        "ordinal": 7,
-        "name": "maybe_feature_flags",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 1020
-        }
-      },
-      {
-        "ordinal": 8,
-        "name": "api_key_token: ApiKeyToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
       }
     ],
     "parameters": {
@@ -104,10 +84,8 @@
       false,
       false,
       false,
-      true,
-      true,
-      false
+      true
     ]
   },
-  "hash": "62b3e2e058331a6819acd98c634b3bf2d10aa38d43b49ab69fb8637497beec2f"
+  "hash": "c77126adb36f9e2f0248720eb4d8c1cd9d14719f64a02678d8021e26addd2c18"
 }

.sqlx/query-cd04f4f7b48ae9da53b6a210111f8e3edff94dee30263e22b45d5e29dbe9245a.json

@@ -1,179 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nSELECT\n    m.token as `token: tokens::tokens::media_files::MediaFileToken`,\n\n    m.media_class as `media_class: enums::by_table::media_files::media_file_class::MediaFileClass`,\n    m.media_type as `media_type: enums::by_table::media_files::media_file_type::MediaFileType`,\n\n    m.maybe_batch_token as `maybe_batch_token: tokens::tokens::batch_generations::BatchGenerationToken`,\n    m.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n\n    m.public_bucket_directory_hash,\n    m.maybe_public_bucket_prefix,\n    m.maybe_public_bucket_extension,\n\n    media_file_cover_image.public_bucket_directory_hash as maybe_file_cover_image_public_bucket_hash,\n    media_file_cover_image.maybe_public_bucket_prefix as maybe_file_cover_image_public_bucket_prefix,\n    media_file_cover_image.maybe_public_bucket_extension as maybe_file_cover_image_public_bucket_extension,\n\n    m.maybe_origin_filename,\n    m.maybe_duration_millis as `maybe_duration_millis: u64`,\n\n    m.created_at,\n    m.updated_at\n\nFROM media_files AS m\nLEFT OUTER JOIN media_files as media_file_cover_image\n    ON media_file_cover_image.token = m.maybe_cover_image_media_file_token\nWHERE\n    m.maybe_source_job_token = ?\n    AND m.maybe_creator_user_token = ?\n    AND m.user_deleted_at IS NULL\n    AND m.mod_deleted_at IS NULL\n    AND NOT m.is_intermediate_system_file\nORDER BY m.id ASC\nLIMIT ?\n      ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "token: tokens::tokens::media_files::MediaFileToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 1,
-        "name": "media_class: enums::by_table::media_files::media_file_class::MediaFileClass",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 64
-        }
-      },
-      {
-        "ordinal": 2,
-        "name": "media_type: enums::by_table::media_files::media_file_type::MediaFileType",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 64
-        }
-      },
-      {
-        "ordinal": 3,
-        "name": "maybe_batch_token: tokens::tokens::batch_generations::BatchGenerationToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 4,
-        "name": "maybe_prompt_token: tokens::tokens::prompts::PromptToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 5,
-        "name": "public_bucket_directory_hash",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 6,
-        "name": "maybe_public_bucket_prefix",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 64
-        }
-      },
-      {
-        "ordinal": 7,
-        "name": "maybe_public_bucket_extension",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 64
-        }
-      },
-      {
-        "ordinal": 8,
-        "name": "maybe_file_cover_image_public_bucket_hash",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 9,
-        "name": "maybe_file_cover_image_public_bucket_prefix",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 64
-        }
-      },
-      {
-        "ordinal": 10,
-        "name": "maybe_file_cover_image_public_bucket_extension",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 64
-        }
-      },
-      {
-        "ordinal": 11,
-        "name": "maybe_origin_filename",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 1020
-        }
-      },
-      {
-        "ordinal": 12,
-        "name": "maybe_duration_millis: u64",
-        "type_info": {
-          "type": "Long",
-          "flags": "",
-          "char_set": 63,
-          "max_size": 10
-        }
-      },
-      {
-        "ordinal": 13,
-        "name": "created_at",
-        "type_info": {
-          "type": "Timestamp",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | TIMESTAMP",
-          "char_set": 63,
-          "max_size": 19
-        }
-      },
-      {
-        "ordinal": 14,
-        "name": "updated_at",
-        "type_info": {
-          "type": "Timestamp",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | TIMESTAMP | ON_UPDATE_NOW",
-          "char_set": 63,
-          "max_size": 19
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 3
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      true,
-      true,
-      false,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      false,
-      false
-    ]
-  },
-  "hash": "cd04f4f7b48ae9da53b6a210111f8e3edff94dee30263e22b45d5e29dbe9245a"
-}

.sqlx/query-d88098343686ded52a71fc45a1b96d28ea3003975d6e7d20eee2022aa31d8189.json

@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\n        INSERT INTO media_files\n        SET\n            token = ?,\n\n            media_class = ?,\n            media_type = ?,\n\n            is_user_upload = ?,\n            is_intermediate_system_file = ?,\n\n            origin_category = ?,\n            origin_product_category = ?,\n            maybe_origin_model_type = ?,\n            maybe_origin_model_token = ?,\n            maybe_origin_filename = ?,\n\n            maybe_batch_token = ?,\n            maybe_source_job_token = ?,\n\n            maybe_mime_type = ?,\n            file_size_bytes = ?,\n            maybe_duration_millis = ?,\n            maybe_audio_encoding = ?,\n            maybe_video_encoding = ?,\n            maybe_frame_width = ?,\n            maybe_frame_height = ?,\n            maybe_prompt_token = ?,\n            checksum_sha2 = ?,\n\n            maybe_engine_category = ?,\n\n            maybe_title = ?,\n            maybe_text_transcript = ?,\n\n            maybe_scene_source_media_file_token = ?,\n\n            public_bucket_directory_hash = ?,\n            maybe_public_bucket_prefix = ?,\n            maybe_public_bucket_extension = ?,\n\n            maybe_creator_user_token = ?,\n            maybe_creator_anonymous_visitor_token = ?,\n\n            creator_ip_address = ?,\n            creator_set_visibility = ?,\n\n            maybe_creator_file_synthetic_id = ?,\n            maybe_creator_category_synthetic_id = ?,\n\n            extra_file_modification_info = ?,\n\n            maybe_generation_provider = ?,\n\n            platform_type = ?,\n\n            maybe_cover_image_media_file_token = ?,\n\n            maybe_mod_user_token = ?,\n            is_generated_on_prem = ?,\n            generated_by_worker = ?,\n            generated_by_cluster = ?\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 42
-    },
-    "nullable": []
-  },
-  "hash": "d88098343686ded52a71fc45a1b96d28ea3003975d6e7d20eee2022aa31d8189"
-}

.sqlx/query-f1d41ad17cb01f5aef0ce2eea042ccb3e5e649365a0befaf0f46492b75523442.json

@@ -1,124 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nSELECT\n  token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n  status as `status: enums::common::job_status_plus::JobStatusPlus`,\n  job_type as `job_type: enums::by_table::generic_inference_jobs::inference_job_type::InferenceJobType`,\n  maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n  maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n  creator_ip_address,\n  maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n  maybe_debug_log_event_token as `maybe_debug_log_event_token: tokens::tokens::non_unique::debug_logs_event_token::DebugLogEventToken`,\n  platform_type as `maybe_platform_type: enums::common::platform_type::PlatformType`,\n  on_success_result_entity_token as `maybe_result_media_file_token: tokens::tokens::media_files::MediaFileToken`\nFROM generic_inference_jobs\nWHERE token = ?\nAND job_type IN ('artcraft_minimax_h3_turbo', 'artcraft_minimax_h3_ultra')\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": "job_type: enums::by_table::generic_inference_jobs::inference_job_type::InferenceJobType",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "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": "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": 5,
-        "name": "creator_ip_address",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 160
-        }
-      },
-      {
-        "ordinal": 6,
-        "name": "maybe_prompt_token: tokens::tokens::prompts::PromptToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 7,
-        "name": "maybe_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": 8,
-        "name": "maybe_platform_type: enums::common::platform_type::PlatformType",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 64
-        }
-      },
-      {
-        "ordinal": 9,
-        "name": "maybe_result_media_file_token: tokens::tokens::media_files::MediaFileToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      false,
-      false,
-      true,
-      true,
-      true,
-      false,
-      true,
-      true,
-      true,
-      true
-    ]
-  },
-  "hash": "f1d41ad17cb01f5aef0ce2eea042ccb3e5e649365a0befaf0f46492b75523442"
-}

.sqlx/query-f5bc4a956a20f6c0998585092a0922301d53c95ae8ea9cb808ae2dbcf8d0bb32.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\n        INSERT INTO media_files\n        SET\n            token = ?,\n\n            media_class = ?,\n            media_type = ?,\n\n            is_user_upload = ?,\n            is_intermediate_system_file = ?,\n\n            origin_category = ?,\n            origin_product_category = ?,\n            maybe_origin_model_type = ?,\n            maybe_origin_model_token = ?,\n            maybe_origin_filename = ?,\n\n            maybe_batch_token = ?,\n\n            maybe_mime_type = ?,\n            file_size_bytes = ?,\n            maybe_duration_millis = ?,\n            maybe_audio_encoding = ?,\n            maybe_video_encoding = ?,\n            maybe_frame_width = ?,\n            maybe_frame_height = ?,\n            maybe_prompt_token = ?,\n            checksum_sha2 = ?,\n\n            maybe_engine_category = ?,\n\n            maybe_title = ?,\n            maybe_text_transcript = ?,\n\n            maybe_scene_source_media_file_token = ?,\n\n            public_bucket_directory_hash = ?,\n            maybe_public_bucket_prefix = ?,\n            maybe_public_bucket_extension = ?,\n\n            maybe_creator_user_token = ?,\n            maybe_creator_anonymous_visitor_token = ?,\n\n            creator_ip_address = ?,\n            creator_set_visibility = ?,\n\n            maybe_creator_file_synthetic_id = ?,\n            maybe_creator_category_synthetic_id = ?,\n\n            extra_file_modification_info = ?,\n\n            maybe_generation_provider = ?,\n\n            platform_type = ?,\n\n            maybe_cover_image_media_file_token = ?,\n\n            maybe_mod_user_token = ?,\n            is_generated_on_prem = ?,\n            generated_by_worker = ?,\n            generated_by_cluster = ?\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 41
+    },
+    "nullable": []
+  },
+  "hash": "f5bc4a956a20f6c0998585092a0922301d53c95ae8ea9cb808ae2dbcf8d0bb32"
+}

CLAUDE.md

@@ -51,7 +51,6 @@ artcraft/
 │       │   ├── artcraft/                # ArtCraft the Tauri app's frontend. Used in conjunction with `artcraft` the Rust crate.
 │       │   └── artcraft-website/        # The website for https://getartcraft.com
 │       └── libs/                        # Support libraries, reusable React components, etc.
-├── mcp/                                 # Artcraft MCP server (Cloudflare Workers, TypeScript). Standalone; see mcp/CLAUDE.md
 └── Cargo.toml                           # Rust monorepo workspace
 ```
 

Cargo.lock

@@ -7363,22 +7363,6 @@ dependencies = [
  "workspace-build-acceleration",
 ]
 
-[[package]]
-name = "mysql_testing"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "bcrypt",
- "bucket_paths",
- "chrono",
- "enums",
- "log",
- "mysql_queries",
- "sqlx",
- "tokens",
- "tokio",
-]
-
 [[package]]
 name = "mysqlclient-sys"
 version = "0.2.5"
@@ -11662,7 +11646,6 @@ dependencies = [
  "migration",
  "mimetypes",
  "mysql_queries",
- "mysql_testing",
  "once_cell",
  "opaque_cursors",
  "pager",

Cargo.toml

@@ -120,7 +120,6 @@ members = [
   "crates/schema/database/elasticsearch_schema",
   "crates/schema/database/migration",
   "crates/schema/database/mysql_queries",
-  "crates/schema/database/mysql_testing",
   "crates/schema/database/redis_common",
   "crates/schema/database/redis_schema",
   "crates/schema/database/sqlite_tasks",
@@ -283,7 +282,6 @@ mimetypes = { path = "crates/lib/files/mimetypes" }
 muapi_client = { path = "crates/api_clients/muapi_client" }
 metrics = { path = "crates/lib/metrics" }
 mysql_queries = { path = "crates/schema/database/mysql_queries" }
-mysql_testing = { path = "crates/schema/database/mysql_testing" }
 pager = { path = "crates/lib/pager" }
 openai_sora_client = { path = "crates/api_clients/openai_sora_client" }
 primitives = { path = "crates/lib/data/primitives" }

_database/sql/migrations/2026-08-04-205103-0000_alter_media_files_add_maybe_source_job_token/down.sql

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

_database/sql/migrations/2026-08-04-205103-0000_alter_media_files_add_maybe_source_job_token/up.sql

@@ -1,13 +0,0 @@
--- noinspection SqlDialectInspectionForFile
--- noinspection SqlNoDataSourceInspectionForFile
--- noinspection SqlResolveForFile
-
--- The inference job ('jinf_...') whose completion produced this media file.
--- Only set for files written as job outputs; uploads and other origins stay NULL.
-ALTER TABLE media_files
-  ADD COLUMN maybe_source_job_token VARCHAR(32) DEFAULT NULL;
-
--- For "outputs of this job"-style lookups.
--- The column is all-NULL at creation time, so the index build is cheap.
-ALTER TABLE media_files
-  ADD INDEX index_maybe_source_job_token (maybe_source_job_token);

_database/sql/migrations_squashed/media_files.sql

@@ -102,10 +102,6 @@ CREATE TABLE media_files (
   -- If the media file is generated as part of a batch, this designates the batch.
   maybe_batch_token VARCHAR(32) DEFAULT NULL,
 
-  -- The inference job ('jinf_...') whose completion produced this media file.
-  -- Only set for files written as job outputs; uploads and other origins stay NULL.
-  maybe_source_job_token VARCHAR(32) DEFAULT NULL,
-
   -- ========== METADATA ==========
 
   -- If the file is a user upload (not including studio renders).
@@ -331,7 +327,6 @@ CREATE TABLE media_files (
   KEY fk_maybe_origin_model_token (maybe_origin_model_token),
   KEY fk_maybe_origin_model_type_and_token (maybe_origin_model_type, maybe_origin_model_token),
   KEY index_maybe_batch_token (maybe_batch_token),
-  KEY index_maybe_source_job_token (maybe_source_job_token),
   KEY index_is_user_upload (is_user_upload),
   KEY index_is_intermediate_system_file (is_intermediate_system_file),
   KEY index_maybe_scene_source_media_file_token (maybe_scene_source_media_file_token),

_docs/pagescene_animations_handoff.md

@@ -1,227 +0,0 @@
-# PageScene Animations — Branch Handoff
-
-Branch: `frontend/pagescene-animations` (forked from `main` @ `6329045350`, 2026-08-04).
-Everything below is TypeScript-typechecked per-lib (`tsc -p <lib>/tsconfig.lib.json`); runtime
-verification status is tracked in the checklist at the bottom. Drag-and-drop has had one manual
-pass (confirmed working); most other surfaces have not been launched.
-
-## What this branch does
-
-Makes skeletal animations a first-class asset in the 3D editor (pagescene): browse them in the
-asset drawer, drag them onto characters or the timeline with live rig-compatibility feedback,
-play clips baked into uploaded models, preview animations everywhere models are previewed, and
-upload Mixamo FBX files (with or without mesh) end to end.
-
-## Commit map
-
-| Commit       | What                                                                    |
-|--------------|-------------------------------------------------------------------------|
-| `7af3fb9856` | Animations tab in AssetModal; AnimationsDrawer retired                   |
-| `1fcbc55780` | Pointer drag-and-drop with live rig-compatibility badge                  |
-| `79d7ade8bc` | Baked-in clips on the timeline (+ clip-row eligibility widened)          |
-| `142279414e` | Animation dropdown in Viewer3D + upload preview                          |
-| `913905308e` | Clip fixes: vanishing character, 1 s strips, select-to-delete, undo      |
-| `60251104e3` | FBX accepted at the picker, converted to GLB in-browser                  |
-| `0942ec4804` | Nx tsconfig references for the new ui-select dependency                  |
-| `d0c7b65a6e` | FBX conversion moved into a Web Worker (main-thread fallback)            |
-| `8e51b6c524` | Explicit "Upload as Animation" toggle + required duration_millis         |
-| `00ebeae10c` | User's uploaded animations merged into the Animations tab                |
-| `e1c7a0c7b0` | Persistent skeleton-helper toggle in the outliner                        |
-| `30f40c0ddb` | Previewer bone toggles + mesh-less framing/mixer-binding fixes           |
-| `5f7ba7bbc5` | AnimationsModal (All/Presets/Uploaded) + timeline quality-of-life        |
-| `d55735620a` | Timeline ruler tick marks + strip button spacing                         |
-| `79875d8c76` | Upload animations from the AnimationsModal (initialCategory)             |
-| *(this)*     | NodeHierarchyHelper: bone toggle works for converted mesh-less GLBs      |
-
-## Features
-
-### 1. Animations tab in the asset drawer (`AssetModal`)
-
-- New left-rail section fed by `GET /v1/media_files/list_featured?filter_engine_categories=animation`
-  (GLB/GLTF only — the clip loader is GLTF-based). Featured results REPLACE the 37 hardcoded
-  `demoAnimationItems`; demos are only the empty-API fallback.
-- The session user's own uploaded animations (`list/user`, same filter) render AHEAD of the
-  featured set. Fetched on every modal open and after each upload; fails silently for anonymous
-  users (`suppressErrorToast` on the user-media fetch path).
-- Card click appends the clip to the selected character's row at the earliest free slot (toast
-  when no character is selected or the row is full). The old right-docked `AnimationsDrawer` is
-  deleted; the old HTML5-DnD path (`ANIMATION_CLIP_MIME`) is gone with it.
-
-### 2. Drag-and-drop with rig-compatibility badge (`DndAsset`)
-
-- Animation cards ride the same pointer-drag pipeline as every other asset. On drag start the
-  clip's track node names are preloaded (`loadRawGlb`, cached per media id); hovering a
-  character (or any skinned object) checks those names against its nodes — the exact direct-bind
-  rule `CharacterAnimationManager` plays by. No retargeting (explicitly out of scope).
-- The shared `DragGhost` shows the verdict: green check (binds) / red slash (no target or rig
-  mismatch); nothing while the clip is still loading. Incompatible or slot-less drops are
-  rejected with a toast.
-- Drop targets: a character in the 3D scene (earliest free slot) or a timeline row
-  (`data-clip-drop-uuid`; pointer-x → time via the `data-timeline-ruler` rect).
-
-### 3. Timeline clips: behavior + UX
-
-- **Strips default to 1 s** and the strip width is the authoritative play window
-  (`LaneRuntime.stripDuration`): trimming genuinely cuts playback; loop repeats inside the
-  strip; a non-loop strip wider than its clip freezes on the last frame. On load a strip only
-  shrinks (clip shorter than default) — never grows.
-- **Rest-pose in gaps**: `Skeleton.pose()` was replaced with a rest-pose snapshot captured at
-  mixer creation (all nodes BELOW the object root; root excluded so gizmo/keyframes never snap
-  back). `pose()` rebuilds bone locals from inverse bind matrices and mis-scales cm-rigs — that
-  was the "character vanishes when moving a strip" bug.
-- **Selection UX**: strips are click-to-select; × renders only on the selected strip;
-  Del/Backspace deletes; removal is individually undoable (`RemoveClipLaneAction` — the one
-  exception to clip edits riding the timeline Save/Cancel session).
-- **Full rows reject adds**: `resolveFreeStart` returns null instead of accepting an
-  overlapping clamp.
-
-### 4. Baked-in clips
-
-- `ClipStrip.bakedClipIndex` marks a strip sourced from the object's own `animations[]`
-  (resolved synchronously — no media fetch). Objects with baked clips get a timeline clip row
-  with a "+" picker listing them.
-- Clip-row eligibility is wider than characters: any skinned object (creatures, rigged uploads)
-  accepts animation drags (bind check gates); baked-only objects get a row for the picker.
-- INVARIANT: baked clips are never removed from the THREE model. Removing a baked strip only
-  unschedules it; the clip stays on `object.animations` and in the picker. Library strips stay
-  fully removable.
-- Outliner metadata (`hasSkeleton`, `bakedClips`) is computed in `convert_object` and refreshed
-  after every GLB load (`SceneDeps.onGlbLoaded` → `refreshOutliner`).
-
-### 5. Previewers (Viewer3D + upload preview)
-
-- Both play baked clips: autoplay the first, dropdown with every clip + "T-pose (none)", hidden
-  entirely for animation-less models.
-- Both have a bone icon toggling a skeleton overlay — default ON when the model has no mesh
-  (Mixamo "without skin" exports), so animation-only files are visible. The upload thumbnail
-  snapshot then captures the skeleton render.
-- The overlay adapts to the rig kind: real `THREE.Bone` joints get `THREE.SkeletonHelper`;
-  mesh-less models whose joints re-imported as plain nodes get `NodeHierarchyHelper`
-  (exported from `viewer-3d`) — GLTF only round-trips bone-ness through a *skin*, and a
-  mesh-less export has no skin, so converted FBX animations lose `Bone`-ness entirely. The
-  toggle shows for `hasBones || !hasMesh`.
-- Latent bugs fixed: upload preview discarded `gltf.animations`; its child re-parenting loop
-  skipped every other child (`scene.add` mutates the array mid-forEach); its mixer bound before
-  the model entered the scene (silently played nothing); camera framing NaN'd on empty
-  bounding boxes (now falls back to bone world positions); camera now fits once, not per-child.
-
-### 6. FBX upload support
-
-- The 3D uploader accepts `.fbx` and normalizes it at the door: `FBXLoader` → `GLTFExporter`
-  → binary GLB with clips preserved. Runs in a dedicated Web Worker (transferred buffers, jobs
-  naturally serialized); a broken worker environment falls back to the main thread. The raw FBX
-  can never reach the backend — retry of a failed conversion re-converts.
-- Caveats: embedded textures may not survive; units are exported as parsed (cm-scaled Mixamo
-  rigs are not rescaled).
-
-### 7. Upload as Animation
-
-- Mutually exclusive checkbox next to "Upload as Character" → `engine_category=animation`.
-  Mesh-less files preselect it (preview loader reports `hasMesh:false`); a user click always
-  wins. Rig-type dropdown defaults to Mixamo (characters keep Mixamo ArKit first).
-- The backend-required `maybe_duration_millis` is read from the longest clip at submit time;
-  clip-less files are flagged and excluded client-side.
-
-### 8. Outliner skeleton toggle (`SkeletonHelperController`)
-
-- Bone icon on skinned rows toggles a persistent `SkeletonHelper` on LAYER 1 (editor-only —
-  the render camera renders layer 0, so skeletons never appear in captures/recordings).
-- Persists as `userData.skeletonVisible` through scene save/load (explicit restore in the proxy
-  load path). Reconciliation rides `OutlinerRefreshedEvent` — add/delete/load/new-scene and the
-  post-GLB-load refresh all funnel there.
-- FK/pose-mode compatible: `PoseModeChangedEvent("pose")` suppresses the persistent helper for
-  the posed character (FKHelper draws its own rig); exit restores it. The toggle state itself
-  is never touched.
-
-## Manual test checklist (outstanding)
-
-- [ ] Prod data: does `list_featured?filter_engine_categories=animation` return rows? If yes
-      they replace the demo clips in the tab; if empty, the 37 demos show.
-- [ ] Clip→rig bind smoke test on shipped characters (runtime-unverified `mixamorig:*`
-      assumption; a "bound 0 tracks" console warning means retargeting becomes the real task).
-- [ ] Creature experiment: drag a clip onto a creature — badge should reflect bind result.
-- [ ] Baked clips: "+" picker on an animated object's row; add/remove/re-add; save/reload
-      persistence (the `object.animations` stash on load is gated on `auto_add` — statically
-      unconfirmed for every load path).
-- [ ] Clip UX round: strips at 1 s; trim semantics; select → ×/Del; undo/redo of removal;
-      character stays visible when a strip moves off the playhead.
-- [ ] FBX round trip: pick `.fbx` → converts (worker; check console for worker load failures —
-      falls back to main thread) → skeleton visible + clip dropdown → Upload as Animation
-      preselected → appears at front of Animations tab → drag onto character → plays.
-- [ ] Converted-FBX scale: if placed objects come in ~100× too big, the converter needs a
-      normalize-scale step.
-- [ ] Outliner bone toggle: on/off, FK-mode enter/exit restore, save/reload persistence, and
-      absence from Capture/Record output.
-- [ ] Previewer dropdown + bone toggle across lightbox, media page, lightbox-modal,
-      ImageTo3DExperience, upload modal.
-
-## Debug pass + hardening round (post-review)
-
-A four-agent review of the combined branch produced 30 findings (5 high / 12 medium / 13 low);
-ALL have been fixed or explicitly closed, one commit per finding (range `72cb218e..b21732d1`).
-Highlights, roughly in commit order:
-
-- Highs: baked clips cloned per lane (shared-AnimationAction playback/removal corruption);
-  runtime revalidation for objects recreated under the same uuid (delete→undo, reloads) — later
-  hardened into LOOP-FREE terminal lane states (bound / missing / unbindable, reassessed only on
-  root-instance change; the pre-fetch rig gate is sound because every load path stamps the target
-  uuid only post-load); skeleton-helper sync self-heals across in-session reloads; upload modal
-  can no longer report success for empty/partial submissions; ref-guarded double-submit.
-- Mediums: strip removal mirrored into the Save/Cancel `saved` snapshot (Cancel can't resurrect,
-  no phantom undo); stale strip/keyframe selections pruned in the bridge + live-checked before
-  swallowing Del/Backspace; one winning lane per character at flush boundaries (blend-glitch
-  frame was being ENCODED into recordings); orphaned tracks/lanes filtered from scene JSON at
-  save; per-clip queued-drop tokens; animation raycasts gated to the canvas element + honest
-  front-most-surface occlusion; virtualized-grid thumbnail state keyed by item; one shared
-  lazily-fetched animation-library store (was double-fetch + double-toast + divergent lists);
-  previewer rest-pose snapshots replace `Skeleton.pose()` everywhere; all-node camera-framing
-  fallback for plain-node rigs; upload-preview races (superseded-load cancellation, snapshot
-  after helper creation, File-identity row statuses, retry re-entry).
-- Lows: duration-shrink re-fits strips; baked-clip picker portals out of the scrolling row list;
-  timeline resets on scene switch/new scene instead of leaking across; click-to-add accepts every
-  drag-eligible target; queued drops bail on a torn-down editor (`Editor.isLive`); top-level root
-  lookups unified; flick-click race killed via `wasDragGesture`; converting-overlay control reset;
-  conversion completions reload only the previewed entry; worker `onmessageerror` recovery +
-  corrupt-vs-clip-less error messages + explicit `initialCategory` wins over mesh-less
-  auto-detect; Uploaded tab pages past the 100-item cap.
-- Closed without code: the "compat cache stales on streaming characters" finding (invalidated —
-  uuid-resolvable roots are always fully loaded) and the Tauri `promptSignup` gap (desktop is
-  always signed in by adapter contract).
-
-## Landed since the original handoff
-
-- **AnimationsModal** (was deferred — now built, `5f7ba7bbc5`/`79875d8c76`): standalone modal
-  with All / Presets / Uploaded tabs, opened from an "Add Animation" button next to Enter Pose
-  Mode and from the "+" add-asset menu. Adding a clip expands the timeline and scrolls to the
-  character (`timelineRevealObjectUuid`); the modal closes after an add unless "Reopen after
-  adding" is on. Its "Upload animation" button opens `UploadModal3D` with
-  `initialCategory="animation"` (anonymous users get the signup prompt), landing on the
-  Uploaded tab afterwards. `AssetModal`'s animations tab was folded into this.
-- **Timeline QoL**: ruler tick marks (major/second/sub-tick), selected-object-only track
-  filter, directional expand/collapse chevrons, thumbnail-less animation cards get an icon
-  placeholder.
-
-## Deferred (explicitly out of scope for this branch)
-
-- **Split-screen preview window** (based on the `?output=` `DemoOutputOverlay`) — parked until
-  explicit approval.
-- **Retargeting** (`SkeletonUtils.retargetClip`) — too complex for now; mismatched rigs are
-  simply rejected by the bind check.
-- **Clip blending/layering** — one non-overlapping row per object, by design.
-
-## Key files
-
-| Area                | Files                                                                                     |
-|---------------------|-------------------------------------------------------------------------------------------|
-| Drawer tab          | `pagescene/src/lib/comps/AssetMenu/AssetModal.tsx`, `shared/ItemElement.tsx`               |
-| Drag-and-drop       | `pagescene/src/lib/DragAndDrop/DndAsset.ts`, `gallery-modal/src/lib/DragGhost.tsx`         |
-| Timeline data/engine| `pagescene/src/lib/engine/timeline/types.ts`, `engine/editor/TimelineController.ts`,       |
-|                     | `engine/animation/CharacterAnimationManager.ts`, `engine/editor/actions/RemoveClipLaneAction.ts` |
-| Timeline UI         | `pagescene/src/lib/comps/Timeline/TimelineEditor.tsx`, `TimelineClipRow.tsx`               |
-| Skeleton toggle     | `pagescene/src/lib/engine/editor/SkeletonHelperController.ts`, `comps/Outliner/Outliner.tsx` |
-| Previewers          | `viewer-3d/src/lib/viewer-3d.tsx`, `upload-modal/.../utilities/loadPreviewOnCanvas.ts`     |
-| FBX + upload        | `upload-modal/.../utilities/convertFbxToGlb.ts` (+ `.worker.ts`), `UploadModal3D.tsx`,     |
-|                     | `UploadFiles3D.tsx`, `utilities/readGlbAnimationDuration.ts`                               |
-
-The pagescene `CLAUDE.md` "Mixamo animation clips" section has been kept current with these
-changes and carries the same invariants in engine-doc form.

crates/api_clients/artcraft/artcraft_api_defs/src/internal/minimax_jobs/mark_minimax_job_failure.rs

@@ -1,29 +0,0 @@
-use serde_derive::{Deserialize, Serialize};
-use utoipa::ToSchema;
-
-use enums::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory;
-
-/// Request body for `POST /v1/internal/minimax_jobs/job/{job_token}/failure`.
-#[derive(Clone, Debug, Serialize, Deserialize, ToSchema)]
-pub struct MarkMinimaxJobFailureRequest {
-  /// Optional failure class the frontend can localize and present.
-  pub maybe_frontend_failure_category: Option<FrontendFailureCategory>,
-
-  /// Optional failure reason we can show the user (512 characters max).
-  pub maybe_user_failure_reason: Option<String>,
-
-  /// Optional internal-only stack trace or error (512 characters max).
-  pub maybe_internal_debugging_failure_reason: Option<String>,
-
-  /// Optional total wall-clock runtime of the failed attempt, in milliseconds.
-  pub execution_duration_millis: Option<u64>,
-
-  /// Optional inference-only runtime of the failed attempt, in milliseconds.
-  pub inference_duration_millis: Option<u64>,
-}
-
-/// Response body for `POST /v1/internal/minimax_jobs/job/{job_token}/failure`.
-#[derive(Clone, Debug, Serialize, Deserialize, ToSchema)]
-pub struct MarkMinimaxJobFailureResponse {
-  pub success: bool,
-}

crates/api_clients/artcraft/artcraft_api_defs/src/internal/minimax_jobs/mark_minimax_job_success.rs

@@ -1,29 +0,0 @@
-use serde_derive::{Deserialize, Serialize};
-use utoipa::ToSchema;
-
-use tokens::tokens::media_files::MediaFileToken;
-
-// NB: The success request is form-multipart (video bytes + optional
-// `duration_millis` / `width` / `height` metadata fields), so its form struct
-// lives with the actix handler; only the response shape is declared here.
-
-/// Response body for `POST /v1/internal/minimax_jobs/job/{job_token}/success`.
-#[derive(Clone, Debug, Serialize, Deserialize, ToSchema)]
-pub struct MarkMinimaxJobSuccessResponse {
-  pub success: bool,
-
-  /// The media file created from the uploaded video.
-  pub media_file_token: MediaFileToken,
-
-  /// Video duration stored on the media file record, in milliseconds
-  /// (worker-supplied, or probed from the file when not supplied).
-  pub maybe_duration_millis: Option<u64>,
-
-  /// Frame width stored on the media file record, in pixels
-  /// (worker-supplied, or probed from the file when not supplied).
-  pub maybe_width: Option<u32>,
-
-  /// Frame height stored on the media file record, in pixels
-  /// (worker-supplied, or probed from the file when not supplied).
-  pub maybe_height: Option<u32>,
-}

crates/api_clients/artcraft/artcraft_api_defs/src/internal/minimax_jobs/minimax_worker_model.rs

@@ -1,33 +0,0 @@
-use serde_derive::{Deserialize, Serialize};
-use utoipa::ToSchema;
-
-/// The first-party Minimax models a worker can request jobs for.
-///
-/// This is deliberately its own enum (not `CommonVideoModel`) so the internal
-/// worker API surface stays small and stable.
-#[derive(Copy, Clone, Debug, Eq, PartialEq, Serialize, Deserialize, ToSchema)]
-pub enum MinimaxWorkerModel {
-  #[serde(rename = "minimax_h3_turbo")]
-  MinimaxH3Turbo,
-
-  #[serde(rename = "minimax_h3_ultra")]
-  MinimaxH3Ultra,
-}
-
-#[cfg(test)]
-mod tests {
-  use super::*;
-
-  #[test]
-  fn serde_round_trip() {
-    let cases = [
-      (MinimaxWorkerModel::MinimaxH3Turbo, "\"minimax_h3_turbo\""),
-      (MinimaxWorkerModel::MinimaxH3Ultra, "\"minimax_h3_ultra\""),
-    ];
-    for (variant, json) in cases {
-      assert_eq!(serde_json::to_string(&variant).unwrap(), json);
-      let parsed: MinimaxWorkerModel = serde_json::from_str(json).unwrap();
-      assert_eq!(parsed, variant);
-    }
-  }
-}

crates/api_clients/artcraft/artcraft_api_defs/src/internal/minimax_jobs/mod.rs

@@ -1,4 +0,0 @@
-pub mod mark_minimax_job_failure;
-pub mod mark_minimax_job_success;
-pub mod minimax_worker_model;
-pub mod obtain_minimax_job;

crates/api_clients/artcraft/artcraft_api_defs/src/internal/minimax_jobs/obtain_minimax_job.rs

@@ -1,85 +0,0 @@
-use serde_derive::{Deserialize, Serialize};
-use utoipa::ToSchema;
-
-use enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType;
-use enums::common::generation::common_aspect_ratio::CommonAspectRatio;
-use enums::common::generation::common_bitrate::CommonBitrate;
-use enums::common::generation::common_generation_mode::CommonGenerationMode;
-use enums::common::generation::common_resolution::CommonResolution;
-use tokens::tokens::generic_inference_jobs::InferenceJobToken;
-use tokens::tokens::media_files::MediaFileToken;
-use tokens::tokens::prompts::PromptToken;
-
-use crate::common::responses::media_links::MediaLinks;
-use crate::internal::minimax_jobs::minimax_worker_model::MinimaxWorkerModel;
-
-/// Request body for `POST /v1/internal/minimax_jobs/obtain_job`.
-#[derive(Clone, Debug, Serialize, Deserialize, ToSchema)]
-pub struct ObtainMinimaxJobRequest {
-  /// Which model the worker wants a job for.
-  pub model: MinimaxWorkerModel,
-
-  /// The worker's hostname (linux hostname, k8s pod name), if reported.
-  pub worker_hostname: Option<String>,
-
-  /// The cluster the worker runs in (e.g. "runpod", "lambdalabs"), if reported.
-  pub cluster_name: Option<String>,
-}
-
-/// Response body for `POST /v1/internal/minimax_jobs/obtain_job`.
-#[derive(Clone, Debug, Serialize, Deserialize, ToSchema)]
-pub struct ObtainMinimaxJobResponse {
-  pub success: bool,
-
-  /// The obtained job, or `None` when no pending job is available.
-  pub maybe_job: Option<ObtainedMinimaxJob>,
-}
-
-/// A job the worker now holds a lock on (status was moved to `started`).
-#[derive(Clone, Debug, Serialize, Deserialize, ToSchema)]
-pub struct ObtainedMinimaxJob {
-  pub job_token: InferenceJobToken,
-
-  /// Echo of the requested model.
-  pub model: MinimaxWorkerModel,
-
-  /// The prompt and inputs the worker needs to run inference. Only `None`
-  /// when the job was somehow enqueued without a prompt record (or the
-  /// prompt lookup failed) — workers should fail such jobs via the failure
-  /// endpoint.
-  pub maybe_prompt: Option<MinimaxJobPromptDetails>,
-}
-
-/// The prompt (text + generation settings) and its attached media references.
-#[derive(Clone, Debug, Serialize, Deserialize, ToSchema)]
-pub struct MinimaxJobPromptDetails {
-  pub prompt_token: PromptToken,
-
-  pub maybe_positive_prompt: Option<String>,
-  pub maybe_negative_prompt: Option<String>,
-
-  pub maybe_generation_mode: Option<CommonGenerationMode>,
-  pub maybe_aspect_ratio: Option<CommonAspectRatio>,
-  pub maybe_resolution: Option<CommonResolution>,
-  pub maybe_bitrate: Option<CommonBitrate>,
-  pub maybe_generate_audio: Option<bool>,
-  pub maybe_duration_seconds: Option<u32>,
-
-  /// Image / video / audio references attached to the prompt, with full CDN
-  /// links, in their original order.
-  pub media_references: Vec<MinimaxJobMediaReference>,
-}
-
-/// One media input attached to the prompt (start frame, end frame, or an
-/// image / video / audio reference), with full CDN links.
-#[derive(Clone, Debug, Serialize, Deserialize, ToSchema)]
-pub struct MinimaxJobMediaReference {
-  pub media_file_token: MediaFileToken,
-
-  /// The role the media plays (start frame, end frame, image / video / audio
-  /// reference, etc.).
-  pub semantic_type: PromptContextSemanticType,
-
-  /// Full CDN links to the media file.
-  pub media_links: MediaLinks,
-}

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

@@ -1,4 +0,0 @@
-//! Internal-facing API surfaces (worker fleets, etc.). These are
-//! authenticated with internal API keys, never consumer credentials.
-
-pub mod minimax_jobs;

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

@@ -5,7 +5,6 @@ pub mod common;
 pub mod credits;
 pub mod folders;
 pub mod generate;
-pub mod internal;
 pub mod jobs;
 pub mod media_file;
 pub mod moderation;

crates/api_clients/artcraft/artcraft_api_defs/src/media_file/job/list_media_files_by_job.rs

@@ -1,61 +0,0 @@
-//! Types for `GET /v1/media_files/by_job/{job_token}` — list the media files
-//! produced by an inference job.
-
-use chrono::{DateTime, Utc};
-use serde_derive::{Deserialize, Serialize};
-use utoipa::ToSchema;
-
-use enums::by_table::media_files::media_file_class::MediaFileClass;
-use enums::by_table::media_files::media_file_type::MediaFileType;
-use tokens::tokens::batch_generations::BatchGenerationToken;
-use tokens::tokens::media_files::MediaFileToken;
-use tokens::tokens::prompts::PromptToken;
-
-use crate::common::responses::media_file_cover_image_details::MediaFileCoverImageDetails;
-use crate::common::responses::media_links::MediaLinks;
-
-#[derive(Serialize, Deserialize, ToSchema)]
-pub struct ListMediaFilesByJobSuccessResponse {
-  pub success: bool,
-
-  /// The job's output files, oldest first.
-  pub media_files: Vec<JobMediaFileInfo>,
-}
-
-#[derive(Serialize, Deserialize, ToSchema)]
-pub struct JobMediaFileInfo {
-  pub token: MediaFileToken,
-
-  /// The coarse-grained class of media file: image, video, etc.
-  pub media_class: MediaFileClass,
-
-  /// Type of media will dictate which fields are populated and what
-  /// the frontend should display (eg. video player vs audio player).
-  /// This is closer in meaning to a "mime type".
-  pub media_type: MediaFileType,
-
-  /// If the file was generated as part of a batch, this is the token for the batch.
-  pub maybe_batch_token: Option<BatchGenerationToken>,
-
-  /// The foreign key to the prompt used to generate the media, if applicable.
-  pub maybe_prompt_token: Option<PromptToken>,
-
-  /// Rich CDN links to the media, including thumbnails, previews, and more.
-  pub media_links: MediaLinks,
-
-  /// Information about the cover image. Many media files do not require a cover image,
-  /// e.g. image files, video files with thumbnails, audio files, etc.
-  /// 3D files require them.
-  pub cover_image: MediaFileCoverImageDetails,
-
-  /// The original filename for uploaded files, if they were provided.
-  /// In the future we'll provide our own internal optional filenames.
-  pub maybe_original_filename: Option<String>,
-
-  /// Duration for audio and video files, if available.
-  /// Measured in milliseconds.
-  pub maybe_duration_millis: Option<u64>,
-
-  pub created_at: DateTime<Utc>,
-  pub updated_at: DateTime<Utc>,
-}

crates/api_clients/artcraft/artcraft_api_defs/src/media_file/job/mod.rs

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

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

@@ -1,5 +1,4 @@
 pub mod delete_media_file;
-pub mod job;
 pub mod list;
 pub mod list_batch_generated_media_files;
 pub mod list_session_project_media_files;

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

@@ -69,23 +69,4 @@ pub struct OmniGenVideoCostAndGenerateRequest {
   /// Some models will default this to true, others will default it to false,
   /// so it's best to be explicit.
   pub generate_audio: Option<bool>,
-
-  /// Frontend-supplied hints for cost estimation only. IGNORED by
-  /// generation — the generate endpoints measure inputs themselves (e.g.
-  /// ffprobing reference videos) and bill from those measurements.
-  pub estimate_only: Option<EstimateFields>,
-}
-
-/// These fields are ignored by generation. They're only used by the frontend
-/// to aid in cost estimation (e.g. Seedance 2.5 bills reference-video input
-/// seconds, so the cost quote needs the combined input duration without the
-/// server downloading and probing the files on every poll).
-#[derive(Clone, Copy, Serialize, Deserialize, ToSchema, Debug, Default)]
-pub struct EstimateFields {
-  /// Combined duration of all reference video inputs, in milliseconds.
-  pub total_input_video_duration_millis: Option<u32>,
-
-  /// Combined duration of all reference audio inputs, in milliseconds.
-  /// (No model bills audio input seconds yet; accepted for future models.)
-  pub total_input_audio_duration_millis: Option<u32>,
 }

crates/api_clients/artcraft/artcraft_client/src/datatypes/common_enums/generation/api_client_video_model.rs

@@ -25,6 +25,8 @@ pub enum ApiClientVideoModel {
   Seedance2p0Fast,
   Seedance2p0BytePlus,
   Seedance2p0BytePlusFast,
+  Seedance2p0Ultra,
+  Seedance2p0UltraFast,
   Seedance2p0BytePlusUltra,
   Seedance2p0BytePlusUltraFast,
   Seedance2p0Mini,
@@ -63,6 +65,8 @@ impl From<String> for ApiClientVideoModel {
       "seedance_2p0_fast" => Self::Seedance2p0Fast,
       "seedance_2p0_bp" => Self::Seedance2p0BytePlus,
       "seedance_2p0_bp_fast" => Self::Seedance2p0BytePlusFast,
+      "seedance_2p0_u" => Self::Seedance2p0Ultra,
+      "seedance_2p0_u_fast" => Self::Seedance2p0UltraFast,
       "seedance_2p0_bpu" => Self::Seedance2p0BytePlusUltra,
       "seedance_2p0_bpu_fast" => Self::Seedance2p0BytePlusUltraFast,
       "seedance_2p0_mini" => Self::Seedance2p0Mini,
@@ -102,6 +106,8 @@ impl From<ApiClientVideoModel> for String {
       ApiClientVideoModel::Seedance2p0Fast => "seedance_2p0_fast".to_string(),
       ApiClientVideoModel::Seedance2p0BytePlus => "seedance_2p0_bp".to_string(),
       ApiClientVideoModel::Seedance2p0BytePlusFast => "seedance_2p0_bp_fast".to_string(),
+      ApiClientVideoModel::Seedance2p0Ultra => "seedance_2p0_u".to_string(),
+      ApiClientVideoModel::Seedance2p0UltraFast => "seedance_2p0_u_fast".to_string(),
       ApiClientVideoModel::Seedance2p0BytePlusUltra => "seedance_2p0_bpu".to_string(),
       ApiClientVideoModel::Seedance2p0BytePlusUltraFast => "seedance_2p0_bpu_fast".to_string(),
       ApiClientVideoModel::Seedance2p0Mini => "seedance_2p0_mini".to_string(),
@@ -159,6 +165,8 @@ mod tests {
       (ApiClientVideoModel::Seedance2p0Fast, "seedance_2p0_fast"),
       (ApiClientVideoModel::Seedance2p0BytePlus, "seedance_2p0_bp"),
       (ApiClientVideoModel::Seedance2p0BytePlusFast, "seedance_2p0_bp_fast"),
+      (ApiClientVideoModel::Seedance2p0Ultra, "seedance_2p0_u"),
+      (ApiClientVideoModel::Seedance2p0UltraFast, "seedance_2p0_u_fast"),
       (ApiClientVideoModel::Seedance2p0BytePlusUltra, "seedance_2p0_bpu"),
       (ApiClientVideoModel::Seedance2p0BytePlusUltraFast, "seedance_2p0_bpu_fast"),
       (ApiClientVideoModel::Seedance2p0Mini, "seedance_2p0_mini"),

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

@@ -14,12 +14,6 @@ pub enum RouterVideoModel {
   #[serde(rename = "grok_imagine_video_1p5")]
   GrokImagineVideo1p5,
 
-  #[serde(rename = "flux_3")]
-  Flux3,
-
-  #[serde(rename = "flux_3_draft")]
-  Flux3Draft,
-
   #[serde(rename = "kling_1p6_pro")]
   Kling16Pro,
 
@@ -41,15 +35,6 @@ pub enum RouterVideoModel {
   #[serde(rename = "kling_3p0_pro")]
   Kling3p0Pro,
 
-  #[serde(rename = "minimax_h3")]
-  MinimaxH3,
-
-  #[serde(rename = "minimax_h3_turbo")]
-  MinimaxH3Turbo,
-
-  #[serde(rename = "minimax_h3_ultra")]
-  MinimaxH3Ultra,
-
   #[serde(rename = "seedance_1p0_lite")]
   Seedance10Lite,
 
@@ -68,7 +53,11 @@ pub enum RouterVideoModel {
   #[serde(rename = "seedance_2p0_bp_fast")]
   Seedance2p0BytePlusFast,
 
+  #[serde(rename = "seedance_2p0_u")]
+  Seedance2p0Ultra,
 
+  #[serde(rename = "seedance_2p0_u_fast")]
+  Seedance2p0UltraFast,
 
   #[serde(rename = "seedance_2p0_bpu")]
   Seedance2p0BytePlusUltra,
@@ -88,12 +77,6 @@ pub enum RouterVideoModel {
   #[serde(rename = "seedance_2p5_preview")]
   Seedance2p5Preview,
 
-  #[serde(rename = "seedance_2p5")]
-  Seedance2p5,
-
-  #[serde(rename = "seedance_2p5_u")]
-  Seedance2p5Ultra,
-
   #[serde(rename = "happy_horse_1p0")]
   HappyHorse1p0,
 
@@ -158,20 +141,6 @@ mod tests {
     assert_serde_round_trip(RouterVideoModel::Seedance2p5Preview, "seedance_2p5_preview");
   }
 
-  #[test]
-  fn seedance_2p5_serializes() {
-    // NB: This string must match `CommonVideoModel` — the two enums convert
-    // via serde string round-trip in the omni handlers.
-    assert_serde_round_trip(RouterVideoModel::Seedance2p5, "seedance_2p5");
-  }
-
-  #[test]
-  fn seedance_2p5_ultra_serializes() {
-    // NB: This string must match `CommonVideoModel` — the two enums convert
-    // via serde string round-trip in the omni handlers.
-    assert_serde_round_trip(RouterVideoModel::Seedance2p5Ultra, "seedance_2p5_u");
-  }
-
   #[test]
   fn veo_3p1_lite_and_vidu_variants_serialize() {
     // NB: These strings must match `CommonVideoModel` — the two enums convert
@@ -180,27 +149,4 @@ mod tests {
     assert_serde_round_trip(RouterVideoModel::ViduQ3, "vidu_q3");
     assert_serde_round_trip(RouterVideoModel::ViduQ3Turbo, "vidu_q3_turbo");
   }
-
-  #[test]
-  fn flux_3_variants_serialize() {
-    // NB: These strings must match `CommonVideoModel` — the two enums convert
-    // via serde string round-trip in the omni handlers.
-    assert_serde_round_trip(RouterVideoModel::Flux3, "flux_3");
-    assert_serde_round_trip(RouterVideoModel::Flux3Draft, "flux_3_draft");
-  }
-
-  #[test]
-  fn minimax_h3_serializes() {
-    // NB: This string must match `CommonVideoModel` — the two enums convert
-    // via serde string round-trip in the omni handlers.
-    assert_serde_round_trip(RouterVideoModel::MinimaxH3, "minimax_h3");
-  }
-
-  #[test]
-  fn minimax_h3_turbo_and_ultra_serialize() {
-    // NB: These strings must match `CommonVideoModel` — the two enums convert
-    // via serde string round-trip in the omni handlers.
-    assert_serde_round_trip(RouterVideoModel::MinimaxH3Turbo, "minimax_h3_turbo");
-    assert_serde_round_trip(RouterVideoModel::MinimaxH3Ultra, "minimax_h3_ultra");
-  }
 }

crates/api_clients/artcraft/artcraft_router/src/generate/generate_audio/providers/kinovi/resolve.rs

@@ -71,7 +71,7 @@ pub(crate) async fn resolve_and_upload_audio_ref(
       })?
     }
   };
-  upload_to_kinovi_web(session, &source_url, None).await
+  upload_to_kinovi_web(session, &source_url).await
 }
 
 #[cfg(test)]

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/build_common.rs

@@ -22,15 +22,14 @@ use crate::generate::generate_image::generate_image_request_builder::GenerateIma
 /// Per-model build functions are expected to validate model-specific
 /// constraints (e.g. unsupported aspect ratios) BEFORE calling this helper.
 /// Validation that's identical across every Artcraft image model — batch count
-/// (1..=[`max_batch_count`]) and image_inputs shape — lives here.
+/// (1..=4) and image_inputs shape — lives here.
 pub fn build_artcraft_omni_image_request(
   builder: GenerateImageRequestBuilder,
   model: CommonImageModelEnum,
 ) -> Result<OmniGenImageCostAndGenerateRequest, ArtcraftRouterError> {
   let strategy = builder.request_mismatch_mitigation_strategy;
 
-  let image_batch_count =
-    plan_batch_count_with_max(builder.image_batch_count, strategy, max_batch_count(model))?;
+  let image_batch_count = plan_batch_count(builder.image_batch_count, strategy)?;
   let image_media_tokens = resolve_image_list_ref(builder.image_inputs.clone())?;
 
   let aspect_ratio = builder.aspect_ratio.map(to_aspect_ratio_enum);
@@ -53,47 +52,26 @@ pub fn build_artcraft_omni_image_request(
   })
 }
 
-/// The largest batch each Artcraft image model accepts. Seedream 5.0 Pro and
-/// Ultra accept batches of up to 8; every other model caps at 4.
-pub fn max_batch_count(model: CommonImageModelEnum) -> u16 {
-  match model {
-    CommonImageModelEnum::Seedream5p0Pro | CommonImageModelEnum::Seedream5p0ProUltra => 8,
-    _ => 4,
-  }
-}
-
 /// Validate batch count (1..=4). Mirrors the v1 plan-level validation that
 /// every Artcraft image model performs.
 pub fn plan_batch_count(
   image_batch_count: Option<u16>,
   strategy: RequestMismatchMitigationStrategy,
-) -> Result<u16, ArtcraftRouterError> {
-  plan_batch_count_with_max(image_batch_count, strategy, 4)
-}
-
-/// Validate batch count (1..=`max`), clamping or erroring per the mitigation
-/// strategy when the request exceeds the model's cap.
-pub fn plan_batch_count_with_max(
-  image_batch_count: Option<u16>,
-  strategy: RequestMismatchMitigationStrategy,
-  max: u16,
 ) -> Result<u16, ArtcraftRouterError> {
   let count = image_batch_count.unwrap_or(1);
-  if count == 0 {
-    return Err(ArtcraftRouterError::Client(ClientError::UserRequestedZeroGenerations));
-  }
-  if count <= max {
-    return Ok(count);
-  }
-  match strategy {
-    RequestMismatchMitigationStrategy::ErrorOut => {
-      Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
-        field: "image_batch_count",
-        value: format!("{}", count),
-      }))
-    }
-    RequestMismatchMitigationStrategy::PayMoreUpgrade
-    | RequestMismatchMitigationStrategy::PayLessDowngrade => Ok(max),
+  match count {
+    0 => Err(ArtcraftRouterError::Client(ClientError::UserRequestedZeroGenerations)),
+    1..=4 => Ok(count),
+    _ => match strategy {
+      RequestMismatchMitigationStrategy::ErrorOut => {
+        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
+          field: "image_batch_count",
+          value: format!("{}", count),
+        }))
+      }
+      RequestMismatchMitigationStrategy::PayMoreUpgrade
+      | RequestMismatchMitigationStrategy::PayLessDowngrade => Ok(4),
+    },
   }
 }
 

crates/api_clients/artcraft/artcraft_router/src/generate/generate_image/providers/artcraft/qwen_edit_2511_angles/cost.rs

@@ -16,9 +16,7 @@ impl ArtcraftQwenEdit2511AnglesCostState {
   }
 
   pub fn estimate_cost(&self) -> ImageGenerationCostEstimate {
-    // 4.6¢ per output image (held in hundredths of a cent, rounded up to
-    // whole cents across the batch).
-    let cost_in_usd_cents = (460u64 * self.num_images as u64).div_ceil(100);
+    let cost_in_usd_cents = 4u64 * self.num_images as u64;
     ImageGenerationCostEstimate {
       cost_in_credits: Some(cost_in_usd_cents),
       cost_in_usd_cents: Some(cost_in_usd_cents),
@@ -61,14 +59,14 @@ mod tests {
   }
 
   #[test]
-  fn one_image_costs_5_cents() { assert_eq!(cost_cents(1), 5); }
+  fn one_image_costs_4_cents() { assert_eq!(cost_cents(1), 4); }
 
   #[test]
-  fn two_images_costs_10_cents() { assert_eq!(cost_cents(2), 10); }
+  fn two_images_costs_8_cents() { assert_eq!(cost_cents(2), 8); }
 
   #[test]
-  fn three_images_costs_14_cents() { assert_eq!(cost_cents(3), 14); }
+  fn three_images_costs_12_cents() { assert_eq!(cost_cents(3), 12); }
 
   #[test]
-  fn four_images_costs_19_cents() { assert_eq!(cost_cents(4), 19); }
+  fn four_images_costs_16_cents() { assert_eq!(cost_cents(4), 16); }
 }

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

@@ -26,6 +26,8 @@ use crate::generate::generate_video::providers::artcraft::seedance_1p0_lite::bui
 use crate::generate::generate_video::providers::artcraft::seedance_1p5_pro::build::build_artcraft_seedance_1p5_pro;
 use crate::generate::generate_video::providers::artcraft::seedance_2p0::build::build_artcraft_seedance_2p0;
 use crate::generate::generate_video::providers::artcraft::seedance_2p0_fast::build::build_artcraft_seedance_2p0_fast;
+use crate::generate::generate_video::providers::artcraft::seedance_2p0_u::build::build_artcraft_seedance_2p0_u;
+use crate::generate::generate_video::providers::artcraft::seedance_2p0_u_fast::build::build_artcraft_seedance_2p0_u_fast;
 use crate::generate::generate_video::providers::artcraft::seedance_2p0_bp::build::build_artcraft_seedance_2p0_bp;
 use crate::generate::generate_video::providers::artcraft::seedance_2p0_bp_fast::build::build_artcraft_seedance_2p0_bp_fast;
 use crate::generate::generate_video::providers::artcraft::seedance_2p0_bpu::build::build_artcraft_seedance_2p0_bpu;
@@ -41,13 +43,12 @@ use crate::generate::generate_video::providers::artcraft::veo_3_fast::build::bui
 use crate::generate::generate_video::providers::artcraft::veo_3p1::build::build_artcraft_veo_3p1;
 use crate::generate::generate_video::providers::artcraft::veo_3p1_fast::build::build_artcraft_veo_3p1_fast;
 use crate::generate::generate_video::providers::artcraft::veo_3p1_lite::build::build_artcraft_veo_3p1_lite;
-use crate::generate::generate_video::providers::artcraft::flux_3::build::build_artcraft_flux_3;
-use crate::generate::generate_video::providers::artcraft::flux_3_draft::build::build_artcraft_flux_3_draft;
-use crate::generate::generate_video::providers::artcraft::minimax_h3::build::build_artcraft_minimax_h3;
 use crate::generate::generate_video::providers::artcraft::vidu_q3::build::build_artcraft_vidu_q3;
 use crate::generate::generate_video::providers::artcraft::vidu_q3_turbo::build::build_artcraft_vidu_q3_turbo;
 use crate::generate::generate_video::providers::kinovi::happy_horse_1p0::build::build_kinovi_happy_horse_1p0;
 use crate::generate::generate_video::providers::kinovi::seedance_2p0::build::build_kinovi_seedance_2p0;
+use crate::generate::generate_video::providers::gmicloud::seedance_2p0_g::build::build_gmicloud_seedance_2p0_u;
+use crate::generate::generate_video::providers::gmicloud::seedance_2p0_fast_g::build::build_gmicloud_seedance_2p0_u_fast;
 use crate::generate::generate_video::providers::grok_api::grok_imagine_video::build::build_grok_api_grok_imagine_video;
 use crate::generate::generate_video::providers::grok_api::grok_imagine_video_1p5::build::build_grok_api_grok_imagine_video_1p5;
 use crate::generate::generate_video::providers::fal::kling_1_6_pro::build::build_fal_kling_1_6_pro;
@@ -67,17 +68,11 @@ use crate::generate::generate_video::providers::fal::veo_3_fast::build::build_fa
 use crate::generate::generate_video::providers::fal::veo_3p1::build::build_fal_veo_3p1;
 use crate::generate::generate_video::providers::fal::veo_3p1_fast::build::build_fal_veo_3p1_fast;
 use crate::generate::generate_video::providers::fal::veo_3p1_lite::build::build_fal_veo_3p1_lite;
-use crate::generate::generate_video::providers::fal::flux_3::build::build_fal_flux_3;
-use crate::generate::generate_video::providers::fal::flux_3_draft::build::build_fal_flux_3_draft;
-use crate::generate::generate_video::providers::fal::minimax_h3::build::build_fal_minimax_h3;
 use crate::generate::generate_video::providers::fal::vidu_q3::build::build_fal_vidu_q3;
 use crate::generate::generate_video::providers::fal::vidu_q3_turbo::build::build_fal_vidu_q3_turbo;
 use crate::generate::generate_video::providers::kinovi::seedance_2p0_fast::build::build_kinovi_seedance_2p0_fast;
 use crate::generate::generate_video::providers::kinovi::seedance_2p0_mini::build::build_kinovi_seedance_2p0_mini;
-use crate::generate::generate_video::providers::artcraft::seedance_2p5::build::build_artcraft_seedance_2p5;
-use crate::generate::generate_video::providers::artcraft::seedance_2p5_u::build::build_artcraft_seedance_2p5_u;
 use crate::generate::generate_video::providers::artcraft::seedance_2p5_preview::build::build_artcraft_seedance_2p5_preview;
-use crate::generate::generate_video::providers::kinovi::seedance_2p5::build::build_kinovi_seedance_2p5;
 use crate::generate::generate_video::providers::kinovi::seedance_2p5_preview::build::build_kinovi_seedance_2p5_preview;
 use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
 
@@ -137,12 +132,6 @@ pub struct GenerateVideoRequestBuilder {
   /// so it's best to be explicit.
   pub generate_audio: Option<bool>,
 
-  /// CALCULATION-ONLY (never sent to any provider): the total seconds of
-  /// reference video input, summed across all reference videos and rounded
-  /// up to whole seconds per file. Models that bill reference-video input
-  /// seconds (e.g. Seedance 2.5) add this to the billed duration.
-  pub total_reference_video_input_seconds: Option<u16>,
-
   /// If the request is a mismatch with the (model/provider), how to mitigate it.
   pub request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy,
 
@@ -171,7 +160,6 @@ impl Default for GenerateVideoRequestBuilder {
       duration_seconds: None,
       video_batch_count: None,
       generate_audio: None,
-      total_reference_video_input_seconds: None,
       idempotency_token: None,
     }
   }
@@ -184,8 +172,6 @@ impl GenerateVideoRequestBuilder {
       // Artcraft
       (RouterProvider::Artcraft, RouterVideoModel::GrokImagineVideo) => build_artcraft_grok_imagine_video(self),
       (RouterProvider::Artcraft, RouterVideoModel::GrokImagineVideo1p5) => build_artcraft_grok_imagine_video_1p5(self),
-      (RouterProvider::Artcraft, RouterVideoModel::Flux3) => build_artcraft_flux_3(self),
-      (RouterProvider::Artcraft, RouterVideoModel::Flux3Draft) => build_artcraft_flux_3_draft(self),
       (RouterProvider::Artcraft, RouterVideoModel::HappyHorse1p0) => build_artcraft_happy_horse_1p0(self),
       (RouterProvider::Artcraft, RouterVideoModel::Kling16Pro) => build_artcraft_kling_1_6_pro(self),
       (RouterProvider::Artcraft, RouterVideoModel::Kling21Master) => build_artcraft_kling_2_1_master(self),
@@ -194,9 +180,10 @@ impl GenerateVideoRequestBuilder {
       (RouterProvider::Artcraft, RouterVideoModel::Kling2p6Pro) => build_artcraft_kling_2_6_pro(self),
       (RouterProvider::Artcraft, RouterVideoModel::Kling3p0Pro) => build_artcraft_kling_3p0_pro(self),
       (RouterProvider::Artcraft, RouterVideoModel::Kling3p0Standard) => build_artcraft_kling_3p0_standard(self),
-      (RouterProvider::Artcraft, RouterVideoModel::MinimaxH3) => build_artcraft_minimax_h3(self),
       (RouterProvider::Artcraft, RouterVideoModel::Seedance2p0) => build_artcraft_seedance_2p0(self),
       (RouterProvider::Artcraft, RouterVideoModel::Seedance2p0Fast) => build_artcraft_seedance_2p0_fast(self),
+      (RouterProvider::Artcraft, RouterVideoModel::Seedance2p0Ultra) => build_artcraft_seedance_2p0_u(self),
+      (RouterProvider::Artcraft, RouterVideoModel::Seedance2p0UltraFast) => build_artcraft_seedance_2p0_u_fast(self),
       (RouterProvider::Artcraft, RouterVideoModel::Seedance2p0BytePlus) => build_artcraft_seedance_2p0_bp(self),
       (RouterProvider::Artcraft, RouterVideoModel::Seedance2p0BytePlusFast) => build_artcraft_seedance_2p0_bp_fast(self),
       (RouterProvider::Artcraft, RouterVideoModel::Seedance2p0BytePlusUltra) => build_artcraft_seedance_2p0_bpu(self),
@@ -205,8 +192,6 @@ impl GenerateVideoRequestBuilder {
       (RouterProvider::Artcraft, RouterVideoModel::Seedance2p0BytePlusMini) => build_artcraft_seedance_2p0_bp_mini(self),
       (RouterProvider::Artcraft, RouterVideoModel::Seedance2p0BytePlusUltraMini) => build_artcraft_seedance_2p0_bpu_mini(self),
       (RouterProvider::Artcraft, RouterVideoModel::Seedance2p5Preview) => build_artcraft_seedance_2p5_preview(self),
-      (RouterProvider::Artcraft, RouterVideoModel::Seedance2p5) => build_artcraft_seedance_2p5(self),
-      (RouterProvider::Artcraft, RouterVideoModel::Seedance2p5Ultra) => build_artcraft_seedance_2p5_u(self),
       (RouterProvider::Artcraft, RouterVideoModel::PreviewModel) => build_artcraft_preview_model(self),
       (RouterProvider::Artcraft, RouterVideoModel::PreviewModelFast) => build_artcraft_preview_model_fast(self),
       (RouterProvider::Artcraft, RouterVideoModel::Seedance10Lite) => build_artcraft_seedance_1p0_lite(self),
@@ -222,8 +207,6 @@ impl GenerateVideoRequestBuilder {
       (RouterProvider::Artcraft, RouterVideoModel::ViduQ3) => build_artcraft_vidu_q3(self),
       (RouterProvider::Artcraft, RouterVideoModel::ViduQ3Turbo) => build_artcraft_vidu_q3_turbo(self),
       // Fal
-      (RouterProvider::Fal, RouterVideoModel::Flux3) => build_fal_flux_3(self),
-      (RouterProvider::Fal, RouterVideoModel::Flux3Draft) => build_fal_flux_3_draft(self),
       (RouterProvider::Fal, RouterVideoModel::Kling16Pro) => build_fal_kling_1_6_pro(self),
       (RouterProvider::Fal, RouterVideoModel::Kling21Master) => build_fal_kling_2_1_master(self),
       (RouterProvider::Fal, RouterVideoModel::Kling21Pro) => build_fal_kling_2_1_pro(self),
@@ -231,7 +214,6 @@ impl GenerateVideoRequestBuilder {
       (RouterProvider::Fal, RouterVideoModel::Kling2p6Pro) => build_fal_kling_2_6_pro(self),
       (RouterProvider::Fal, RouterVideoModel::Kling3p0Pro) => build_fal_kling_3p0_pro(self),
       (RouterProvider::Fal, RouterVideoModel::Kling3p0Standard) => build_fal_kling_3p0_standard(self),
-      (RouterProvider::Fal, RouterVideoModel::MinimaxH3) => build_fal_minimax_h3(self),
       (RouterProvider::Fal, RouterVideoModel::Seedance10Lite) => build_fal_seedance_1p0_lite(self),
       (RouterProvider::Fal, RouterVideoModel::Seedance1p5Pro) => build_fal_seedance_1p5_pro(self),
       (RouterProvider::Fal, RouterVideoModel::Sora2) => build_fal_sora_2(self),
@@ -244,6 +226,9 @@ impl GenerateVideoRequestBuilder {
       (RouterProvider::Fal, RouterVideoModel::Veo3p1Lite) => build_fal_veo_3p1_lite(self),
       (RouterProvider::Fal, RouterVideoModel::ViduQ3) => build_fal_vidu_q3(self),
       (RouterProvider::Fal, RouterVideoModel::ViduQ3Turbo) => build_fal_vidu_q3_turbo(self),
+      // GmiCloud
+      (RouterProvider::GmiCloud, RouterVideoModel::Seedance2p0Ultra) => build_gmicloud_seedance_2p0_u(self),
+      (RouterProvider::GmiCloud, RouterVideoModel::Seedance2p0UltraFast) => build_gmicloud_seedance_2p0_u_fast(self),
       // Grok
       (RouterProvider::GrokApi, RouterVideoModel::GrokImagineVideo) => build_grok_api_grok_imagine_video(self),
       (RouterProvider::GrokApi, RouterVideoModel::GrokImagineVideo1p5) => build_grok_api_grok_imagine_video_1p5(self),
@@ -255,7 +240,6 @@ impl GenerateVideoRequestBuilder {
       (RouterProvider::KinoviWeb, RouterVideoModel::Seedance2p0BytePlusMini) => build_kinovi_seedance_2p0_mini(self),
       (RouterProvider::KinoviWeb, RouterVideoModel::Seedance2p0BytePlusUltraMini) => build_kinovi_seedance_2p0_mini(self),
       (RouterProvider::KinoviWeb, RouterVideoModel::Seedance2p5Preview) => build_kinovi_seedance_2p5_preview(self),
-      (RouterProvider::KinoviWeb, RouterVideoModel::Seedance2p5) => build_kinovi_seedance_2p5(self),
       _ => self.unsupported_provider_and_model(),
     }
   }

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/build_common.rs

@@ -82,7 +82,6 @@ pub fn build_artcraft_omni_video_request(
     negative_prompt: None,
     generate_audio: None,
     quality: None,
-    estimate_only: None,
   })
 }
 
@@ -231,7 +230,7 @@ fn plan_output_resolution(
   }
 }
 
-/// Batch counts: 1 through 4.
+/// Batch counts: 1, 2, 4.
 pub fn plan_batch_count(
   video_batch_count: Option<u16>,
   strategy: RequestMismatchMitigationStrategy,
@@ -239,8 +238,7 @@ pub fn plan_batch_count(
   let count = video_batch_count.unwrap_or(1);
   match count {
     0 => Err(ArtcraftRouterError::Client(ClientError::UserRequestedZeroGenerations)),
-    1..=4 => Ok(count),
-    // 5 and above:
+    1 | 2 | 4 => Ok(count),
     _ => match strategy {
       RequestMismatchMitigationStrategy::ErrorOut => {
         Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
@@ -249,31 +247,9 @@ pub fn plan_batch_count(
         }))
       }
       RequestMismatchMitigationStrategy::PayMoreUpgrade => Ok(4),
-      RequestMismatchMitigationStrategy::PayLessDowngrade => Ok(4),
-    },
-  }
-}
-
-/// Batch counts for the Seedance 2.0 Mini family: 1-8 are all valid
-/// (wider than the shared 1/2/4 planning); higher counts clamp to 8 per the
-/// mitigation strategy.
-pub fn plan_mini_batch_count(
-  video_batch_count: Option<u16>,
-  strategy: RequestMismatchMitigationStrategy,
-) -> Result<u16, ArtcraftRouterError> {
-  let count = video_batch_count.unwrap_or(1);
-  match count {
-    0 => Err(ArtcraftRouterError::Client(ClientError::UserRequestedZeroGenerations)),
-    1..=8 => Ok(count),
-    _ => match strategy {
-      RequestMismatchMitigationStrategy::ErrorOut => {
-        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
-          field: "video_batch_count",
-          value: format!("{}", count),
-        }))
+      RequestMismatchMitigationStrategy::PayLessDowngrade => {
+        Ok(if count < 4 { 2 } else { 4 })
       }
-      RequestMismatchMitigationStrategy::PayMoreUpgrade
-      | RequestMismatchMitigationStrategy::PayLessDowngrade => Ok(8),
     },
   }
 }

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/flux_3/build.rs

@@ -1,64 +0,0 @@
-use enums::common::generation::common_video_model::CommonVideoModel as CommonVideoModelEnum;
-
-use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
-use crate::errors::artcraft_router_error::ArtcraftRouterError;
-use crate::errors::client_error::ClientError;
-use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-use crate::generate::generate_video::providers::artcraft::build_common::{
-  build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport,
-};
-use crate::generate::generate_video::providers::artcraft::flux_3::request::ArtcraftFlux3RequestState;
-use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
-
-pub fn build_artcraft_flux_3(builder: GenerateVideoRequestBuilder) -> Result<VideoGenerationDraftOrRequest, ArtcraftRouterError> {
-  let state = build_artcraft_flux_3_state(builder)?;
-  Ok(VideoGenerationDraftOrRequest::Request(VideoGenerationRequest::ArtcraftFlux3(state)))
-}
-
-pub(crate) fn build_artcraft_flux_3_state(mut builder: GenerateVideoRequestBuilder) -> Result<ArtcraftFlux3RequestState, ArtcraftRouterError> {
-  // Flux 3 accepts 5–20 seconds — wider than the generic helper's window —
-  // so pre-plan the duration and reapply it after (the helper would clamp
-  // 16–20s down). Also preserve generate_audio (the helper hardcodes None on
-  // its output).
-  let strategy = builder.request_mismatch_mitigation_strategy;
-  let final_duration = plan_flux_3_duration(builder.duration_seconds, strategy)?;
-  builder.duration_seconds = final_duration;
-
-  let generate_audio = builder.generate_audio;
-  let mut request = build_artcraft_omni_video_request(
-    builder,
-    CommonVideoModelEnum::Flux3,
-    SupportedResolutions::Full,
-    UltraWideSupport::Supported,
-  )?;
-  request.generate_audio = generate_audio;
-  request.duration_seconds = final_duration;
-
-  Ok(ArtcraftFlux3RequestState { request })
-}
-
-/// Flux 3 durations: 5–20 seconds (unset lets the model pick).
-pub(crate) fn plan_flux_3_duration(
-  duration_seconds: Option<u16>,
-  strategy: RequestMismatchMitigationStrategy,
-) -> Result<Option<u16>, ArtcraftRouterError> {
-  const MIN: u16 = 5;
-  const MAX: u16 = 20;
-  match duration_seconds {
-    None => Ok(None),
-    Some(d) if (MIN..=MAX).contains(&d) => Ok(Some(d)),
-    Some(other) => match strategy {
-      RequestMismatchMitigationStrategy::ErrorOut => {
-        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
-          field: "duration_seconds",
-          value: format!("{}", other),
-        }))
-      }
-      RequestMismatchMitigationStrategy::PayMoreUpgrade
-      | RequestMismatchMitigationStrategy::PayLessDowngrade => {
-        Ok(Some(other.clamp(MIN, MAX)))
-      }
-    },
-  }
-}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/flux_3/cost.rs

@@ -1,123 +0,0 @@
-use enums::common::generation::common_resolution::CommonResolution as CommonResolutionEnum;
-
-use crate::generate::generate_video::providers::artcraft::flux_3::request::ArtcraftFlux3RequestState;
-use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
-
-/// Per-second rates in hundredths of a US cent.
-const LOW_RES_RATE_HUNDREDTH_CENTS_PER_SEC: u64 = 1_955;
-const HIGH_RES_RATE_HUNDREDTH_CENTS_PER_SEC: u64 = 3_335;
-
-#[derive(Clone, Debug)]
-pub struct ArtcraftFlux3CostState {
-  pub duration_seconds: u64,
-  pub is_1080p: bool,
-}
-
-impl ArtcraftFlux3CostState {
-  pub fn from_request(request: &ArtcraftFlux3RequestState) -> Self {
-    Self {
-      // Flux 3 defaults None → 5s (the shortest selectable duration).
-      duration_seconds: request.request.duration_seconds.map(u64::from).unwrap_or(5),
-      is_1080p: is_1080p(request.request.resolution),
-    }
-  }
-
-  pub fn estimate_cost(&self) -> VideoGenerationCostEstimate {
-    let rate = if self.is_1080p {
-      HIGH_RES_RATE_HUNDREDTH_CENTS_PER_SEC
-    } else {
-      LOW_RES_RATE_HUNDREDTH_CENTS_PER_SEC
-    };
-    // Round up to the next whole cent.
-    let cost_in_usd_cents = (rate * self.duration_seconds).div_ceil(100);
-
-    VideoGenerationCostEstimate {
-      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,
-      failures_are_refunded: None,
-    }
-  }
-}
-
-/// Flux 3 renders 720p or 1080p; 1080p and above land on the higher tier,
-/// while 720p and below render at 720p. The default (unset) resolution is
-/// 720p.
-fn is_1080p(resolution: Option<CommonResolutionEnum>) -> bool {
-  match resolution {
-    None => false, // defaults to 720p
-    Some(CommonResolutionEnum::TenEightyP)
-    | Some(CommonResolutionEnum::OneK)
-    | Some(CommonResolutionEnum::TwoK)
-    | Some(CommonResolutionEnum::ThreeK)
-    | Some(CommonResolutionEnum::FourK) => true,
-    Some(CommonResolutionEnum::HalfK)
-    | Some(CommonResolutionEnum::FourEightyP)
-    | Some(CommonResolutionEnum::SevenTwentyP) => false,
-  }
-}
-
-#[cfg(test)]
-mod tests {
-  use enums::common::generation::common_resolution::CommonResolution as CommonResolutionEnum;
-
-  use crate::api::router_provider::RouterProvider;
-  use crate::api::router_resolution::RouterResolution;
-  use crate::api::router_video_model::RouterVideoModel;
-  use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-  use crate::generate::generate_video::providers::artcraft::flux_3::build::build_artcraft_flux_3_state;
-  use crate::generate::generate_video::providers::artcraft::flux_3::cost::ArtcraftFlux3CostState;
-
-  #[test]
-  fn default_settings_5s_is_98() { assert_eq!(cost_cents(Some(5), None), 98); }
-
-  #[test]
-  fn default_duration_is_5s() { assert_eq!(cost_cents(None, None), 98); }
-
-  #[test]
-  fn low_res_20s_is_391() { assert_eq!(cost_cents(Some(20), Some(RouterResolution::SevenTwentyP)), 391); }
-
-  #[test]
-  fn four_eighty_p_lands_on_low_tier() {
-    assert_eq!(cost_cents(Some(5), Some(RouterResolution::FourEightyP)), 98);
-  }
-
-  #[test]
-  fn high_res_5s_is_167() { assert_eq!(cost_cents(Some(5), Some(RouterResolution::TenEightyP)), 167); }
-
-  #[test]
-  fn high_res_10s_is_334() { assert_eq!(cost_cents(Some(10), Some(RouterResolution::TenEightyP)), 334); }
-
-  #[test]
-  fn odd_duration_rounds_up_to_whole_cents() {
-    // 7s low res: 1955 × 7 = 13685 hundredth-cents → 137 cents.
-    assert_eq!(cost_cents(Some(7), None), 137);
-  }
-
-  #[test]
-  fn resolution_classifier_defaults_720p() {
-    assert!(!super::is_1080p(None));
-    assert!(super::is_1080p(Some(CommonResolutionEnum::TenEightyP)));
-    assert!(!super::is_1080p(Some(CommonResolutionEnum::SevenTwentyP)));
-    assert!(!super::is_1080p(Some(CommonResolutionEnum::FourEightyP)));
-  }
-
-  fn cost_cents(
-    duration_seconds: Option<u16>,
-    resolution: Option<RouterResolution>,
-  ) -> u64 {
-    let b = GenerateVideoRequestBuilder {
-      model: RouterVideoModel::Flux3,
-      provider: RouterProvider::Artcraft,
-      prompt: Some("test".to_string()),
-      duration_seconds,
-      resolution,
-      ..Default::default()
-    };
-    let state = build_artcraft_flux_3_state(b).unwrap();
-    ArtcraftFlux3CostState::from_request(&state).estimate_cost().cost_in_usd_cents.unwrap()
-  }
-}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/flux_3/request.rs

@@ -1,104 +0,0 @@
-use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost_and_generate_request::OmniGenVideoCostAndGenerateRequest;
-
-use crate::client::router_artcraft_client::RouterArtcraftClient;
-use crate::errors::artcraft_router_error::ArtcraftRouterError;
-use crate::generate::generate_video::generate_video_response::GenerateVideoResponse;
-use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request;
-
-#[derive(Clone, Debug)]
-pub struct ArtcraftFlux3RequestState {
-  pub request: OmniGenVideoCostAndGenerateRequest,
-}
-
-impl ArtcraftFlux3RequestState {
-  pub async fn send(&self, client: &RouterArtcraftClient) -> Result<GenerateVideoResponse, ArtcraftRouterError> {
-    send_artcraft_omni_video_request(&self.request, client).await
-  }
-}
-
-#[cfg(test)]
-mod tests {
-  use tokens::tokens::media_files::MediaFileToken;
-
-  use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
-  use artcraft_client::utils::api_host::ApiHost;
-  use test_data::web::image_media_tokens::JUNO_AT_LAKE_PRODUCTION_MEDIA_TOKEN;
-
-  use crate::api::image_ref::ImageRef;
-  use crate::api::router_aspect_ratio::RouterAspectRatio;
-  use crate::api::router_provider::RouterProvider;
-  use crate::api::router_video_model::RouterVideoModel;
-  use crate::client::router_artcraft_client::RouterArtcraftClient;
-  use crate::client::router_client::RouterClient;
-  use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-  use crate::generate::generate_video::generate_video_response::GenerateVideoResponse;
-  use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-
-  #[tokio::test]
-  #[ignore] // sends a real generation to the Artcraft backend, incurs cost
-  async fn text_to_video() {
-    let response = run_pipeline(GenerateVideoRequestBuilder {
-      prompt: Some("A red kite soaring over coastal cliffs, cinematic.".to_string()),
-      aspect_ratio: Some(RouterAspectRatio::WideSixteenByNine),
-      ..artcraft_builder()
-    }).await;
-    assert!(matches!(response, GenerateVideoResponse::Artcraft(_)));
-    assert_eq!(1, 2, "Inspect output above");
-  }
-
-  #[tokio::test]
-  #[ignore] // sends a real generation to the Artcraft backend, incurs cost
-  async fn keyframe_start_frame() {
-    let response = run_pipeline(GenerateVideoRequestBuilder {
-      prompt: Some("The dog stands up and walks toward the lake.".to_string()),
-      start_frame: Some(ImageRef::MediaFileToken(MediaFileToken::new(JUNO_AT_LAKE_PRODUCTION_MEDIA_TOKEN.to_string()))),
-      ..artcraft_builder()
-    }).await;
-    assert!(matches!(response, GenerateVideoResponse::Artcraft(_)));
-    assert_eq!(1, 2, "Inspect output above");
-  }
-
-  // ── Helpers ──
-
-  fn artcraft_builder() -> GenerateVideoRequestBuilder {
-    GenerateVideoRequestBuilder {
-      model: RouterVideoModel::Flux3,
-      provider: RouterProvider::Artcraft,
-      duration_seconds: Some(5),
-      video_batch_count: Some(1),
-      ..Default::default()
-    }
-  }
-
-  fn get_artcraft_client() -> RouterClient {
-    let cookies = std::fs::read_to_string("/Users/bt/Artcraft/credentials/artcraft_cookies.txt")
-      .expect("Failed to read artcraft cookies");
-    let cookies = cookies.trim().to_string();
-    let credentials = StorytellerCredentialSet::parse_multi_cookie_header(&cookies)
-      .expect("Failed to parse cookies")
-      .expect("No credentials found");
-    RouterClient::Artcraft(RouterArtcraftClient::new(ApiHost::Storyteller, credentials))
-  }
-
-  async fn run_pipeline(builder: GenerateVideoRequestBuilder) -> GenerateVideoResponse {
-    let client = get_artcraft_client();
-
-    let draft_or_request = builder.build2().expect("build2 should succeed");
-    let request = match draft_or_request {
-      VideoGenerationDraftOrRequest::Request(r) => r,
-      _ => panic!("expected Request variant (Artcraft skips draft)"),
-    };
-
-    let response = request.send_request(&client).await.expect("send_request should succeed");
-
-    match &response {
-      GenerateVideoResponse::Artcraft(p) => {
-        println!("inference_job_token={:?}", p.inference_job_token);
-        println!("all_inference_job_tokens={:?}", p.all_inference_job_tokens);
-      }
-      other => println!("response: {:?}", other),
-    }
-
-    response
-  }
-}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/flux_3_draft/build.rs

@@ -1,37 +0,0 @@
-use enums::common::generation::common_video_model::CommonVideoModel as CommonVideoModelEnum;
-
-use crate::errors::artcraft_router_error::ArtcraftRouterError;
-use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-use crate::generate::generate_video::providers::artcraft::build_common::{
-  build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport,
-};
-use crate::generate::generate_video::providers::artcraft::flux_3::build::plan_flux_3_duration;
-use crate::generate::generate_video::providers::artcraft::flux_3_draft::request::ArtcraftFlux3DraftRequestState;
-use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
-
-pub fn build_artcraft_flux_3_draft(builder: GenerateVideoRequestBuilder) -> Result<VideoGenerationDraftOrRequest, ArtcraftRouterError> {
-  let state = build_artcraft_flux_3_draft_state(builder)?;
-  Ok(VideoGenerationDraftOrRequest::Request(VideoGenerationRequest::ArtcraftFlux3Draft(state)))
-}
-
-pub(crate) fn build_artcraft_flux_3_draft_state(mut builder: GenerateVideoRequestBuilder) -> Result<ArtcraftFlux3DraftRequestState, ArtcraftRouterError> {
-  // Same duration handling as full-quality Flux 3: 5–20 seconds is wider than
-  // the generic helper's window, so pre-plan and reapply after. Also preserve
-  // generate_audio (the helper hardcodes None on its output).
-  let strategy = builder.request_mismatch_mitigation_strategy;
-  let final_duration = plan_flux_3_duration(builder.duration_seconds, strategy)?;
-  builder.duration_seconds = final_duration;
-
-  let generate_audio = builder.generate_audio;
-  let mut request = build_artcraft_omni_video_request(
-    builder,
-    CommonVideoModelEnum::Flux3Draft,
-    SupportedResolutions::Full,
-    UltraWideSupport::Supported,
-  )?;
-  request.generate_audio = generate_audio;
-  request.duration_seconds = final_duration;
-
-  Ok(ArtcraftFlux3DraftRequestState { request })
-}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/flux_3_draft/cost.rs

@@ -1,86 +0,0 @@
-use crate::generate::generate_video::providers::artcraft::flux_3_draft::request::ArtcraftFlux3DraftRequestState;
-use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
-
-/// Per-second rate in hundredths of a US cent. Drafts always render 720p, so
-/// resolution does not affect the bill.
-const GENERATION_RATE_HUNDREDTH_CENTS_PER_SEC: u64 = 690;
-
-#[derive(Clone, Debug)]
-pub struct ArtcraftFlux3DraftCostState {
-  pub duration_seconds: u64,
-}
-
-impl ArtcraftFlux3DraftCostState {
-  pub fn from_request(request: &ArtcraftFlux3DraftRequestState) -> Self {
-    Self {
-      // Flux 3 Draft defaults None → 5s (the shortest selectable duration).
-      duration_seconds: request.request.duration_seconds.map(u64::from).unwrap_or(5),
-    }
-  }
-
-  pub fn estimate_cost(&self) -> VideoGenerationCostEstimate {
-    // Round up to the next whole cent.
-    let cost_in_usd_cents =
-      (GENERATION_RATE_HUNDREDTH_CENTS_PER_SEC * self.duration_seconds).div_ceil(100);
-
-    VideoGenerationCostEstimate {
-      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,
-      failures_are_refunded: None,
-    }
-  }
-}
-
-#[cfg(test)]
-mod tests {
-  use crate::api::router_provider::RouterProvider;
-  use crate::api::router_resolution::RouterResolution;
-  use crate::api::router_video_model::RouterVideoModel;
-  use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-  use crate::generate::generate_video::providers::artcraft::flux_3_draft::build::build_artcraft_flux_3_draft_state;
-  use crate::generate::generate_video::providers::artcraft::flux_3_draft::cost::ArtcraftFlux3DraftCostState;
-
-  #[test]
-  fn default_settings_5s_is_35() { assert_eq!(cost_cents(Some(5), None), 35); }
-
-  #[test]
-  fn default_duration_is_5s() { assert_eq!(cost_cents(None, None), 35); }
-
-  #[test]
-  fn twenty_seconds_is_138() { assert_eq!(cost_cents(Some(20), None), 138); }
-
-  /// Drafts always render 720p; a requested resolution does not change the
-  /// bill.
-  #[test]
-  fn cost_ignores_resolution() {
-    for resolution in [None, Some(RouterResolution::SevenTwentyP), Some(RouterResolution::TenEightyP)] {
-      assert_eq!(cost_cents(Some(5), resolution), 35, "resolution={resolution:?}");
-    }
-  }
-
-  #[test]
-  fn odd_duration_rounds_up_to_whole_cents() {
-    // 7s generation: 690 × 7 = 4830 hundredth-cents → 49 cents.
-    assert_eq!(cost_cents(Some(7), None), 49);
-  }
-
-  fn cost_cents(
-    duration_seconds: Option<u16>,
-    resolution: Option<RouterResolution>,
-  ) -> u64 {
-    let b = GenerateVideoRequestBuilder {
-      model: RouterVideoModel::Flux3Draft,
-      provider: RouterProvider::Artcraft,
-      prompt: Some("test".to_string()),
-      duration_seconds,
-      resolution,
-      ..Default::default()
-    };
-    let state = build_artcraft_flux_3_draft_state(b).unwrap();
-    ArtcraftFlux3DraftCostState::from_request(&state).estimate_cost().cost_in_usd_cents.unwrap()
-  }
-}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/flux_3_draft/request.rs

@@ -1,88 +0,0 @@
-use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost_and_generate_request::OmniGenVideoCostAndGenerateRequest;
-
-use crate::client::router_artcraft_client::RouterArtcraftClient;
-use crate::errors::artcraft_router_error::ArtcraftRouterError;
-use crate::generate::generate_video::generate_video_response::GenerateVideoResponse;
-use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request;
-
-#[derive(Clone, Debug)]
-pub struct ArtcraftFlux3DraftRequestState {
-  pub request: OmniGenVideoCostAndGenerateRequest,
-}
-
-impl ArtcraftFlux3DraftRequestState {
-  pub async fn send(&self, client: &RouterArtcraftClient) -> Result<GenerateVideoResponse, ArtcraftRouterError> {
-    send_artcraft_omni_video_request(&self.request, client).await
-  }
-}
-
-#[cfg(test)]
-mod tests {
-  use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
-  use artcraft_client::utils::api_host::ApiHost;
-
-  use crate::api::router_aspect_ratio::RouterAspectRatio;
-  use crate::api::router_provider::RouterProvider;
-  use crate::api::router_video_model::RouterVideoModel;
-  use crate::client::router_artcraft_client::RouterArtcraftClient;
-  use crate::client::router_client::RouterClient;
-  use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-  use crate::generate::generate_video::generate_video_response::GenerateVideoResponse;
-  use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-
-  #[tokio::test]
-  #[ignore] // sends a real generation to the Artcraft backend, incurs cost
-  async fn text_to_video() {
-    let response = run_pipeline(GenerateVideoRequestBuilder {
-      prompt: Some("A red kite soaring over coastal cliffs, cinematic.".to_string()),
-      aspect_ratio: Some(RouterAspectRatio::WideSixteenByNine),
-      ..artcraft_builder()
-    }).await;
-    assert!(matches!(response, GenerateVideoResponse::Artcraft(_)));
-    assert_eq!(1, 2, "Inspect output above");
-  }
-
-  // ── Helpers ──
-
-  fn artcraft_builder() -> GenerateVideoRequestBuilder {
-    GenerateVideoRequestBuilder {
-      model: RouterVideoModel::Flux3Draft,
-      provider: RouterProvider::Artcraft,
-      duration_seconds: Some(5),
-      video_batch_count: Some(1),
-      ..Default::default()
-    }
-  }
-
-  fn get_artcraft_client() -> RouterClient {
-    let cookies = std::fs::read_to_string("/Users/bt/Artcraft/credentials/artcraft_cookies.txt")
-      .expect("Failed to read artcraft cookies");
-    let cookies = cookies.trim().to_string();
-    let credentials = StorytellerCredentialSet::parse_multi_cookie_header(&cookies)
-      .expect("Failed to parse cookies")
-      .expect("No credentials found");
-    RouterClient::Artcraft(RouterArtcraftClient::new(ApiHost::Storyteller, credentials))
-  }
-
-  async fn run_pipeline(builder: GenerateVideoRequestBuilder) -> GenerateVideoResponse {
-    let client = get_artcraft_client();
-
-    let draft_or_request = builder.build2().expect("build2 should succeed");
-    let request = match draft_or_request {
-      VideoGenerationDraftOrRequest::Request(r) => r,
-      _ => panic!("expected Request variant (Artcraft skips draft)"),
-    };
-
-    let response = request.send_request(&client).await.expect("send_request should succeed");
-
-    match &response {
-      GenerateVideoResponse::Artcraft(p) => {
-        println!("inference_job_token={:?}", p.inference_job_token);
-        println!("all_inference_job_tokens={:?}", p.all_inference_job_tokens);
-      }
-      other => println!("response: {:?}", other),
-    }
-
-    response
-  }
-}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/grok_imagine_video_1p5/request.rs

@@ -63,7 +63,6 @@ mod tests {
         duration_seconds: Some(5),
         video_batch_count: Some(1),
         generate_audio: None,
-        estimate_only: None,
       },
     };
 

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_1_6_pro/cost.rs

@@ -15,8 +15,8 @@ impl ArtcraftKling16ProCostState {
   }
 
   pub fn estimate_cost(&self) -> VideoGenerationCostEstimate {
-    // 5s = 57¢, 10s = 113¢.
-    let cost_in_usd_cents: u64 = if self.is_ten_seconds { 113 } else { 57 };
+    // 5s = 52¢, 10s = 103¢.
+    let cost_in_usd_cents: u64 = if self.is_ten_seconds { 103 } else { 52 };
 
     VideoGenerationCostEstimate {
       cost_in_credits: Some(cost_in_usd_cents),
@@ -51,11 +51,11 @@ mod tests {
   }
 
   #[test]
-  fn five_seconds_is_57() { assert_eq!(cost_cents(Some(5)), 57); }
+  fn five_seconds_is_52() { assert_eq!(cost_cents(Some(5)), 52); }
 
   #[test]
-  fn ten_seconds_is_113() { assert_eq!(cost_cents(Some(10)), 113); }
+  fn ten_seconds_is_103() { assert_eq!(cost_cents(Some(10)), 103); }
 
   #[test]
-  fn default_duration_is_5s_priced_at_57() { assert_eq!(cost_cents(None), 57); }
+  fn default_duration_is_5s_priced_at_52() { assert_eq!(cost_cents(None), 52); }
 }

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_1_master/cost.rs

@@ -13,7 +13,7 @@ impl ArtcraftKling21MasterCostState {
 
   pub fn estimate_cost(&self) -> VideoGenerationCostEstimate {
     // Mirrors fal_client kling_v2p1_master: 5s = $1.40, 10s = $2.80.
-    let cost_in_usd_cents: u64 = if self.is_ten_seconds { 322 } else { 161 };
+    let cost_in_usd_cents: u64 = if self.is_ten_seconds { 280 } else { 140 };
 
     VideoGenerationCostEstimate {
       cost_in_credits: Some(cost_in_usd_cents),
@@ -48,11 +48,11 @@ mod tests {
   }
 
   #[test]
-  fn five_seconds_is_161() { assert_eq!(cost_cents(Some(5)), 161); }
+  fn five_seconds_is_140() { assert_eq!(cost_cents(Some(5)), 140); }
 
   #[test]
-  fn ten_seconds_is_322() { assert_eq!(cost_cents(Some(10)), 322); }
+  fn ten_seconds_is_280() { assert_eq!(cost_cents(Some(10)), 280); }
 
   #[test]
-  fn default_duration_is_5s_priced_at_161() { assert_eq!(cost_cents(None), 161); }
+  fn default_duration_is_5s_priced_at_140() { assert_eq!(cost_cents(None), 140); }
 }

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_1_pro/cost.rs

@@ -13,7 +13,7 @@ impl ArtcraftKling21ProCostState {
 
   pub fn estimate_cost(&self) -> VideoGenerationCostEstimate {
     // Mirrors fal_client kling_v2p1_pro: 5s = 45¢, 10s = 90¢.
-    let cost_in_usd_cents: u64 = if self.is_ten_seconds { 104 } else { 52 };
+    let cost_in_usd_cents: u64 = if self.is_ten_seconds { 90 } else { 45 };
 
     VideoGenerationCostEstimate {
       cost_in_credits: Some(cost_in_usd_cents),
@@ -48,11 +48,11 @@ mod tests {
   }
 
   #[test]
-  fn five_seconds_is_52() { assert_eq!(cost_cents(Some(5)), 52); }
+  fn five_seconds_is_45() { assert_eq!(cost_cents(Some(5)), 45); }
 
   #[test]
-  fn ten_seconds_is_104() { assert_eq!(cost_cents(Some(10)), 104); }
+  fn ten_seconds_is_90() { assert_eq!(cost_cents(Some(10)), 90); }
 
   #[test]
-  fn default_duration_is_5s_priced_at_52() { assert_eq!(cost_cents(None), 52); }
+  fn default_duration_is_5s_priced_at_45() { assert_eq!(cost_cents(None), 45); }
 }

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_5_turbo_pro/cost.rs

@@ -13,7 +13,7 @@ impl ArtcraftKling2p5TurboProCostState {
 
   pub fn estimate_cost(&self) -> VideoGenerationCostEstimate {
     // Mirrors fal_client kling_v2p5_turbo_pro: 5s = 35¢, 10s = 70¢.
-    let cost_in_usd_cents: u64 = if self.is_ten_seconds { 81 } else { 41 };
+    let cost_in_usd_cents: u64 = if self.is_ten_seconds { 70 } else { 35 };
 
     VideoGenerationCostEstimate {
       cost_in_credits: Some(cost_in_usd_cents),
@@ -45,11 +45,11 @@ mod tests {
   }
 
   #[test]
-  fn five_seconds_is_41() { assert_eq!(cost_cents(Some(5)), 41); }
+  fn five_seconds_is_35() { assert_eq!(cost_cents(Some(5)), 35); }
 
   #[test]
-  fn ten_seconds_is_81() { assert_eq!(cost_cents(Some(10)), 81); }
+  fn ten_seconds_is_70() { assert_eq!(cost_cents(Some(10)), 70); }
 
   #[test]
-  fn default_duration_is_5s_priced_at_41() { assert_eq!(cost_cents(None), 41); }
+  fn default_duration_is_5s_priced_at_35() { assert_eq!(cost_cents(None), 35); }
 }

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_2_6_pro/cost.rs

@@ -21,10 +21,10 @@ impl ArtcraftKling2p6ProCostState {
     //   audio off: $0.07/sec → 5s=35¢, 10s=70¢
     //   audio on:  $0.14/sec → 5s=70¢, 10s=140¢
     let cost_in_usd_cents: u64 = match (self.generate_audio, self.is_ten_seconds) {
-      (false, false) => 41,
-      (false, true) => 81,
-      (true, false) => 81,
-      (true, true) => 161,
+      (false, false) => 35,
+      (false, true) => 70,
+      (true, false) => 70,
+      (true, true) => 140,
     };
 
     VideoGenerationCostEstimate {
@@ -58,16 +58,16 @@ mod tests {
   }
 
   #[test]
-  fn audio_off_5s_is_41() { assert_eq!(cost_cents(Some(5), Some(false)), 41); }
+  fn audio_off_5s_is_35() { assert_eq!(cost_cents(Some(5), Some(false)), 35); }
 
   #[test]
-  fn audio_off_10s_is_81() { assert_eq!(cost_cents(Some(10), Some(false)), 81); }
+  fn audio_off_10s_is_70() { assert_eq!(cost_cents(Some(10), Some(false)), 70); }
 
   #[test]
-  fn audio_on_5s_is_81() { assert_eq!(cost_cents(Some(5), Some(true)), 81); }
+  fn audio_on_5s_is_70() { assert_eq!(cost_cents(Some(5), Some(true)), 70); }
 
   #[test]
-  fn audio_on_10s_is_161() { assert_eq!(cost_cents(Some(10), Some(true)), 161); }
+  fn audio_on_10s_is_140() { assert_eq!(cost_cents(Some(10), Some(true)), 140); }
 
   #[test]
   fn audio_default_is_on() {

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_3p0_pro/cost.rs

@@ -1,8 +1,4 @@
 use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
-
-// The markup is applied at cent granularity with ceiling rounding.
-const MARKUP_NUMERATOR: u64 = 115;
-const MARKUP_DENOMINATOR: u64 = 100;
 use crate::generate::generate_video::providers::artcraft::kling_3p0_pro::request::ArtcraftKling3p0ProRequestState;
 
 #[derive(Clone, Debug)]
@@ -21,11 +17,12 @@ impl ArtcraftKling3p0ProCostState {
   }
 
   pub fn estimate_cost(&self) -> VideoGenerationCostEstimate {
-    // Base rates in tenths of a cent per second; the total is
-    // ceiling-divided to whole cents, then the markup applied.
+    // Mirrors fal_client kling_3p0_pro:
+    //   audio off: $0.224/sec  (rate=224 in tenths-of-cents)
+    //   audio on:  $0.336/sec  (rate=336)
+    // ceiling-divided to whole cents.
     let rate: u64 = if self.generate_audio { 336 } else { 224 };
-    let base = (rate * self.duration_seconds + 9) / 10;
-    let cost_in_usd_cents = base.saturating_mul(MARKUP_NUMERATOR).div_ceil(MARKUP_DENOMINATOR);
+    let cost_in_usd_cents = (rate * self.duration_seconds + 9) / 10;
 
     VideoGenerationCostEstimate {
       cost_in_credits: Some(cost_in_usd_cents),
@@ -60,24 +57,24 @@ mod tests {
   #[test]
   fn audio_on_5s_is_168() {
     // rate=336, (336*5 + 9) / 10 = 1689/10 = 168.
-    assert_eq!(cost_cents(Some(5), Some(true)), 194);
+    assert_eq!(cost_cents(Some(5), Some(true)), 168);
   }
 
   #[test]
   fn audio_off_5s_is_112() {
     // rate=224, (224*5 + 9) / 10 = 1129/10 = 112.
-    assert_eq!(cost_cents(Some(5), Some(false)), 129);
+    assert_eq!(cost_cents(Some(5), Some(false)), 112);
   }
 
   #[test]
   fn audio_on_10s_is_336() {
-    assert_eq!(cost_cents(Some(10), Some(true)), 387);
+    assert_eq!(cost_cents(Some(10), Some(true)), 336);
   }
 
   #[test]
   fn audio_on_15s_is_504() {
     // rate=336, (336*15 + 9) / 10 = 5049/10 = 504.
-    assert_eq!(cost_cents(Some(15), Some(true)), 580);
+    assert_eq!(cost_cents(Some(15), Some(true)), 504);
   }
 
   #[test]

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/kling_3p0_standard/cost.rs

@@ -1,10 +1,6 @@
 use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
 use crate::generate::generate_video::providers::artcraft::kling_3p0_standard::request::ArtcraftKling3p0StandardRequestState;
 
-// The markup is applied at cent granularity with ceiling rounding.
-const MARKUP_NUMERATOR: u64 = 115;
-const MARKUP_DENOMINATOR: u64 = 100;
-
 #[derive(Clone, Debug)]
 pub struct ArtcraftKling3p0StandardCostState {
   pub duration_seconds: u64,
@@ -20,11 +16,11 @@ impl ArtcraftKling3p0StandardCostState {
   }
 
   pub fn estimate_cost(&self) -> VideoGenerationCostEstimate {
-    // Base rates in tenths of a cent per second; the total is
-    // ceiling-divided to whole cents, then the markup applied.
+    // Mirrors fal_client kling_3p0_standard:
+    //   audio off: $0.168/sec  (rate=168)
+    //   audio on:  $0.252/sec  (rate=252)
     let rate: u64 = if self.generate_audio { 252 } else { 168 };
-    let base = (rate * self.duration_seconds + 9) / 10;
-    let cost_in_usd_cents = base.saturating_mul(MARKUP_NUMERATOR).div_ceil(MARKUP_DENOMINATOR);
+    let cost_in_usd_cents = (rate * self.duration_seconds + 9) / 10;
 
     VideoGenerationCostEstimate {
       cost_in_credits: Some(cost_in_usd_cents),
@@ -57,26 +53,26 @@ mod tests {
   }
 
   #[test]
-  fn audio_on_5s_is_145() {
-    // rate=252, base (252*5 + 9) / 10 = 126, ×115/100 ceiled = 145.
-    assert_eq!(cost_cents(Some(5), Some(true)), 145);
+  fn audio_on_5s_is_126() {
+    // rate=252, (252*5 + 9) / 10 = 1269/10 = 126.
+    assert_eq!(cost_cents(Some(5), Some(true)), 126);
   }
 
   #[test]
-  fn audio_off_5s_is_97() {
-    // rate=168, base (168*5 + 9) / 10 = 84, ×115/100 ceiled = 97.
-    assert_eq!(cost_cents(Some(5), Some(false)), 97);
+  fn audio_off_5s_is_84() {
+    // rate=168, (168*5 + 9) / 10 = 849/10 = 84.
+    assert_eq!(cost_cents(Some(5), Some(false)), 84);
   }
 
   #[test]
-  fn audio_on_10s_is_290() {
-    assert_eq!(cost_cents(Some(10), Some(true)), 290);
+  fn audio_on_10s_is_252() {
+    assert_eq!(cost_cents(Some(10), Some(true)), 252);
   }
 
   #[test]
-  fn audio_on_15s_is_435() {
-    // base (252*15 + 9) / 10 = 378, ×115/100 ceiled = 435.
-    assert_eq!(cost_cents(Some(15), Some(true)), 435);
+  fn audio_on_15s_is_378() {
+    // (252*15 + 9) / 10 = 3789/10 = 378.
+    assert_eq!(cost_cents(Some(15), Some(true)), 378);
   }
 
   #[test]

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/minimax_h3/build.rs

@@ -1,25 +0,0 @@
-use enums::common::generation::common_video_model::CommonVideoModel as CommonVideoModelEnum;
-
-use crate::errors::artcraft_router_error::ArtcraftRouterError;
-use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-use crate::generate::generate_video::providers::artcraft::build_common::{
-  build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport,
-};
-use crate::generate::generate_video::providers::artcraft::minimax_h3::request::ArtcraftMinimaxH3RequestState;
-use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
-
-pub fn build_artcraft_minimax_h3(builder: GenerateVideoRequestBuilder) -> Result<VideoGenerationDraftOrRequest, ArtcraftRouterError> {
-  let state = build_artcraft_minimax_h3_state(builder)?;
-  Ok(VideoGenerationDraftOrRequest::Request(VideoGenerationRequest::ArtcraftMinimaxH3(state)))
-}
-
-pub(crate) fn build_artcraft_minimax_h3_state(builder: GenerateVideoRequestBuilder) -> Result<ArtcraftMinimaxH3RequestState, ArtcraftRouterError> {
-  let request = build_artcraft_omni_video_request(
-    builder,
-    CommonVideoModelEnum::MinimaxH3,
-    SupportedResolutions::Full,
-    UltraWideSupport::Supported,
-  )?;
-  Ok(ArtcraftMinimaxH3RequestState { request })
-}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/minimax_h3/cost.rs

@@ -1,158 +0,0 @@
-use enums::common::generation::common_resolution::CommonResolution as CommonResolutionEnum;
-
-use crate::generate::generate_video::providers::artcraft::minimax_h3::request::ArtcraftMinimaxH3RequestState;
-use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
-
-/// Per-second rates in hundredths of a US cent.
-const LOW_RES_RATE_HUNDREDTH_CENTS_PER_SEC: u64 = 1_840;
-const HIGH_RES_RATE_HUNDREDTH_CENTS_PER_SEC: u64 = 2_990;
-
-/// The first 5 reference images are included; each additional image bills a
-/// flat fee (in hundredths of a US cent).
-const INCLUDED_REFERENCE_IMAGES: u64 = 5;
-const EXTRA_REFERENCE_IMAGE_HUNDREDTH_CENTS: u64 = 920;
-
-#[derive(Clone, Debug)]
-pub struct ArtcraftMinimaxH3CostState {
-  pub duration_seconds: u64,
-  pub is_2k: bool,
-  pub reference_image_count: u64,
-}
-
-impl ArtcraftMinimaxH3CostState {
-  pub fn from_request(request: &ArtcraftMinimaxH3RequestState) -> Self {
-    Self {
-      // MiniMax H3 defaults None → 5s.
-      duration_seconds: request.request.duration_seconds.map(u64::from).unwrap_or(5),
-      is_2k: is_2k(request.request.resolution),
-      reference_image_count: request.request.reference_image_media_tokens
-        .as_ref()
-        .map_or(0, |tokens| tokens.len() as u64),
-    }
-  }
-
-  pub fn estimate_cost(&self) -> VideoGenerationCostEstimate {
-    let rate = if self.is_2k {
-      HIGH_RES_RATE_HUNDREDTH_CENTS_PER_SEC
-    } else {
-      LOW_RES_RATE_HUNDREDTH_CENTS_PER_SEC
-    };
-    let extra_images = self.reference_image_count.saturating_sub(INCLUDED_REFERENCE_IMAGES);
-    // Round up to the next whole cent.
-    let cost_in_usd_cents =
-      (rate * self.duration_seconds + extra_images * EXTRA_REFERENCE_IMAGE_HUNDREDTH_CENTS)
-        .div_ceil(100);
-
-    VideoGenerationCostEstimate {
-      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,
-      failures_are_refunded: None,
-    }
-  }
-}
-
-/// MiniMax H3 offers 768P and 2K output; 1080p and above land on the 2K tier,
-/// while 720p and below render at 768P. The default (unset) resolution is 2K.
-fn is_2k(resolution: Option<CommonResolutionEnum>) -> bool {
-  match resolution {
-    None => true, // defaults to 2K
-    Some(CommonResolutionEnum::TenEightyP)
-    | Some(CommonResolutionEnum::OneK)
-    | Some(CommonResolutionEnum::TwoK)
-    | Some(CommonResolutionEnum::ThreeK)
-    | Some(CommonResolutionEnum::FourK) => true,
-    Some(CommonResolutionEnum::HalfK)
-    | Some(CommonResolutionEnum::FourEightyP)
-    | Some(CommonResolutionEnum::SevenTwentyP) => false,
-  }
-}
-
-#[cfg(test)]
-mod tests {
-  use enums::common::generation::common_resolution::CommonResolution as CommonResolutionEnum;
-  use tokens::tokens::media_files::MediaFileToken;
-
-  use crate::api::image_list_ref::ImageListRef;
-  use crate::api::router_provider::RouterProvider;
-  use crate::api::router_resolution::RouterResolution;
-  use crate::api::router_video_model::RouterVideoModel;
-  use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-  use crate::generate::generate_video::providers::artcraft::minimax_h3::build::build_artcraft_minimax_h3_state;
-  use crate::generate::generate_video::providers::artcraft::minimax_h3::cost::ArtcraftMinimaxH3CostState;
-
-  #[test]
-  fn default_resolution_5s_is_150() { assert_eq!(cost_cents(Some(5), None, 0), 150); }
-
-  #[test]
-  fn default_duration_is_5s() { assert_eq!(cost_cents(None, None, 0), 150); }
-
-  #[test]
-  fn low_res_5s_is_92() { assert_eq!(cost_cents(Some(5), Some(RouterResolution::SevenTwentyP), 0), 92); }
-
-  #[test]
-  fn four_eighty_p_lands_on_low_tier() {
-    assert_eq!(cost_cents(Some(5), Some(RouterResolution::FourEightyP), 0), 92);
-  }
-
-  #[test]
-  fn low_res_15s_is_276() { assert_eq!(cost_cents(Some(15), Some(RouterResolution::SevenTwentyP), 0), 276); }
-
-  #[test]
-  fn high_res_10s_is_299() { assert_eq!(cost_cents(Some(10), Some(RouterResolution::TenEightyP), 0), 299); }
-
-  #[test]
-  fn odd_duration_rounds_up_to_whole_cents() {
-    // 7s high res: 2990 × 7 = 20930 hundredth-cents → 210 cents.
-    assert_eq!(cost_cents(Some(7), None, 0), 210);
-  }
-
-  #[test]
-  fn five_reference_images_are_included() {
-    assert_eq!(cost_cents(Some(5), None, 5), cost_cents(Some(5), None, 0));
-  }
-
-  #[test]
-  fn nine_reference_images_add_the_extra_image_fee() {
-    // 2990 × 5 + 4 × 920 = 18630 hundredth-cents → 187 cents.
-    assert_eq!(cost_cents(Some(5), None, 9), 187);
-  }
-
-  #[test]
-  fn resolution_classifier_defaults_2k() {
-    assert!(super::is_2k(None));
-    assert!(super::is_2k(Some(CommonResolutionEnum::TenEightyP)));
-    assert!(!super::is_2k(Some(CommonResolutionEnum::SevenTwentyP)));
-    assert!(!super::is_2k(Some(CommonResolutionEnum::FourEightyP)));
-  }
-
-  fn cost_cents(
-    duration_seconds: Option<u16>,
-    resolution: Option<RouterResolution>,
-    reference_image_count: usize,
-  ) -> u64 {
-    let reference_images = if reference_image_count == 0 {
-      None
-    } else {
-      Some(ImageListRef::MediaFileTokens(
-        (0..reference_image_count)
-          .map(|i| MediaFileToken::new(format!("m_test_{i}")))
-          .collect(),
-      ))
-    };
-    let b = GenerateVideoRequestBuilder {
-      model: RouterVideoModel::MinimaxH3,
-      provider: RouterProvider::Artcraft,
-      prompt: Some("test".to_string()),
-      duration_seconds,
-      resolution,
-      reference_images,
-      ..Default::default()
-    };
-    let state = build_artcraft_minimax_h3_state(b).unwrap();
-    ArtcraftMinimaxH3CostState::from_request(&state).estimate_cost().cost_in_usd_cents.unwrap()
-  }
-}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/minimax_h3/request.rs

@@ -1,117 +0,0 @@
-use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost_and_generate_request::OmniGenVideoCostAndGenerateRequest;
-
-use crate::client::router_artcraft_client::RouterArtcraftClient;
-use crate::errors::artcraft_router_error::ArtcraftRouterError;
-use crate::generate::generate_video::generate_video_response::GenerateVideoResponse;
-use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request;
-
-#[derive(Clone, Debug)]
-pub struct ArtcraftMinimaxH3RequestState {
-  pub request: OmniGenVideoCostAndGenerateRequest,
-}
-
-impl ArtcraftMinimaxH3RequestState {
-  pub async fn send(&self, client: &RouterArtcraftClient) -> Result<GenerateVideoResponse, ArtcraftRouterError> {
-    send_artcraft_omni_video_request(&self.request, client).await
-  }
-}
-
-#[cfg(test)]
-mod tests {
-  use tokens::tokens::media_files::MediaFileToken;
-
-  use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
-  use artcraft_client::utils::api_host::ApiHost;
-  use test_data::web::image_media_tokens::JUNO_AT_LAKE_PRODUCTION_MEDIA_TOKEN;
-
-  use crate::api::image_list_ref::ImageListRef;
-  use crate::api::image_ref::ImageRef;
-  use crate::api::router_aspect_ratio::RouterAspectRatio;
-  use crate::api::router_provider::RouterProvider;
-  use crate::api::router_video_model::RouterVideoModel;
-  use crate::client::router_artcraft_client::RouterArtcraftClient;
-  use crate::client::router_client::RouterClient;
-  use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-  use crate::generate::generate_video::generate_video_response::GenerateVideoResponse;
-  use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-
-  #[tokio::test]
-  #[ignore] // sends a real generation to the Artcraft backend, incurs cost
-  async fn text_to_video() {
-    let response = run_pipeline(GenerateVideoRequestBuilder {
-      prompt: Some("A red kite soaring over coastal cliffs, cinematic.".to_string()),
-      aspect_ratio: Some(RouterAspectRatio::WideSixteenByNine),
-      ..artcraft_builder()
-    }).await;
-    assert!(matches!(response, GenerateVideoResponse::Artcraft(_)));
-    assert_eq!(1, 2, "Inspect output above");
-  }
-
-  #[tokio::test]
-  #[ignore] // sends a real generation to the Artcraft backend, incurs cost
-  async fn keyframe_start_frame() {
-    let response = run_pipeline(GenerateVideoRequestBuilder {
-      prompt: Some("The dog stands up and walks toward the lake.".to_string()),
-      start_frame: Some(ImageRef::MediaFileToken(MediaFileToken::new(JUNO_AT_LAKE_PRODUCTION_MEDIA_TOKEN.to_string()))),
-      ..artcraft_builder()
-    }).await;
-    assert!(matches!(response, GenerateVideoResponse::Artcraft(_)));
-    assert_eq!(1, 2, "Inspect output above");
-  }
-
-  #[tokio::test]
-  #[ignore] // sends a real generation to the Artcraft backend, incurs cost
-  async fn reference_images_to_video() {
-    let response = run_pipeline(GenerateVideoRequestBuilder {
-      prompt: Some("Image 1 is the dog. The dog explores a mossy forest clearing.".to_string()),
-      reference_images: Some(ImageListRef::MediaFileTokens(vec![MediaFileToken::new(JUNO_AT_LAKE_PRODUCTION_MEDIA_TOKEN.to_string())])),
-      ..artcraft_builder()
-    }).await;
-    assert!(matches!(response, GenerateVideoResponse::Artcraft(_)));
-    assert_eq!(1, 2, "Inspect output above");
-  }
-
-  // ── Helpers ──
-
-  fn artcraft_builder() -> GenerateVideoRequestBuilder {
-    GenerateVideoRequestBuilder {
-      model: RouterVideoModel::MinimaxH3,
-      provider: RouterProvider::Artcraft,
-      duration_seconds: Some(5),
-      video_batch_count: Some(1),
-      ..Default::default()
-    }
-  }
-
-  fn get_artcraft_client() -> RouterClient {
-    let cookies = std::fs::read_to_string("/Users/bt/Artcraft/credentials/artcraft_cookies.txt")
-      .expect("Failed to read artcraft cookies");
-    let cookies = cookies.trim().to_string();
-    let credentials = StorytellerCredentialSet::parse_multi_cookie_header(&cookies)
-      .expect("Failed to parse cookies")
-      .expect("No credentials found");
-    RouterClient::Artcraft(RouterArtcraftClient::new(ApiHost::Storyteller, credentials))
-  }
-
-  async fn run_pipeline(builder: GenerateVideoRequestBuilder) -> GenerateVideoResponse {
-    let client = get_artcraft_client();
-
-    let draft_or_request = builder.build2().expect("build2 should succeed");
-    let request = match draft_or_request {
-      VideoGenerationDraftOrRequest::Request(r) => r,
-      _ => panic!("expected Request variant (Artcraft skips draft)"),
-    };
-
-    let response = request.send_request(&client).await.expect("send_request should succeed");
-
-    match &response {
-      GenerateVideoResponse::Artcraft(p) => {
-        println!("inference_job_token={:?}", p.inference_job_token);
-        println!("all_inference_job_tokens={:?}", p.all_inference_job_tokens);
-      }
-      other => println!("response: {:?}", other),
-    }
-
-    response
-  }
-}

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

@@ -4,8 +4,6 @@ pub(crate) mod seedance_common;
 mod parity_tests;
 pub mod grok_imagine_video;
 pub mod grok_imagine_video_1p5;
-pub mod flux_3;
-pub mod flux_3_draft;
 pub mod happy_horse_1p0;
 pub mod kling_1_6_pro;
 pub mod kling_2_1_master;
@@ -14,7 +12,6 @@ pub mod kling_2_5_turbo_pro;
 pub mod kling_2_6_pro;
 pub mod kling_3p0_pro;
 pub mod kling_3p0_standard;
-pub mod minimax_h3;
 pub mod preview_model;
 pub mod preview_model_fast;
 pub(crate) mod request_common;
@@ -23,6 +20,8 @@ pub mod seedance_1p0_lite;
 pub mod seedance_1p5_pro;
 pub mod seedance_2p0;
 pub mod seedance_2p0_fast;
+pub mod seedance_2p0_u_fast;
+pub mod seedance_2p0_u;
 pub mod seedance_2p0_bp;
 pub mod seedance_2p0_bp_fast;
 pub mod seedance_2p0_bpu;
@@ -30,9 +29,7 @@ pub mod seedance_2p0_bpu_fast;
 pub mod seedance_2p0_mini;
 pub mod seedance_2p0_bp_mini;
 pub mod seedance_2p0_bpu_mini;
-pub mod seedance_2p5;
 pub mod seedance_2p5_preview;
-pub mod seedance_2p5_u;
 pub mod sora_2;
 pub mod sora_2_pro;
 pub mod veo_2;

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/preview_model/cost.rs

@@ -79,12 +79,6 @@ mod tests {
       assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 15, 2), 750);
     }
 
-        #[test]
-    fn batch_3() {
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 3), 375);
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 15, 3), 1125);
-    }
-
     #[test]
     fn batch_4() {
       assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 4), 500);
@@ -115,11 +109,6 @@ mod tests {
       assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 2), 100);
     }
 
-        #[test]
-    fn batch_3() {
-      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 3), 150);
-    }
-
     #[test]
     fn batch_4() {
       assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 4), 200);
@@ -144,11 +133,6 @@ mod tests {
       assert_eq!(cost_cents(Some(RouterResolution::TenEightyP), 5, 2), 500);
     }
 
-        #[test]
-    fn batch_3() {
-      assert_eq!(cost_cents(Some(RouterResolution::TenEightyP), 5, 3), 750);
-    }
-
     #[test]
     fn batch_4() {
       assert_eq!(cost_cents(Some(RouterResolution::TenEightyP), 5, 4), 1000);

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/preview_model_fast/cost.rs

@@ -76,12 +76,6 @@ mod tests {
       assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 15, 2), 600);
     }
 
-        #[test]
-    fn batch_3() {
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 3), 300);
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 15, 3), 900);
-    }
-
     #[test]
     fn batch_4() {
       assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 4), 400);
@@ -112,11 +106,6 @@ mod tests {
       assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 2), 90);
     }
 
-        #[test]
-    fn batch_3() {
-      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 3), 135);
-    }
-
     #[test]
     fn batch_4() {
       assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 4), 180);

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_1p5_pro/cost.rs

@@ -8,10 +8,6 @@ use fal_client::requests_old::webhook::video::text::enqueue_seedance_1p5_pro_tex
 use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
 use crate::generate::generate_video::providers::artcraft::seedance_1p5_pro::request::ArtcraftSeedance1p5ProRequestState;
 
-// The markup is applied at cent granularity with ceiling rounding.
-const MARKUP_NUMERATOR: u64 = 115;
-const MARKUP_DENOMINATOR: u64 = 100;
-
 #[derive(Clone, Debug)]
 pub struct ArtcraftSeedance1p5ProCostState {
   pub duration: Option<EnqueueSeedance1p5ProTextToVideoDuration>,
@@ -41,8 +37,7 @@ impl ArtcraftSeedance1p5ProCostState {
       aspect_ratio: None,
       generate_audio: self.generate_audio,
     };
-    let base = req.calculate_cost_in_cents();
-    let cost_in_usd_cents = base.saturating_mul(MARKUP_NUMERATOR).div_ceil(MARKUP_DENOMINATOR);
+    let cost_in_usd_cents = req.calculate_cost_in_cents();
 
     VideoGenerationCostEstimate {
       cost_in_credits: Some(cost_in_usd_cents),
@@ -101,14 +96,14 @@ mod tests {
   // Numeric literals mirror the v1 Artcraft Seedance 1.5 Pro tests we deleted:
   // resolution=None + generate_audio=None → fal client defaults (720p, audio on).
   #[test]
-  fn default_5s_is_30() { assert_eq!(cost_cents(Some(5)), 30); }
+  fn default_5s_is_26() { assert_eq!(cost_cents(Some(5)), 26); }
 
   #[test]
-  fn default_4s_is_30() { assert_eq!(cost_cents(Some(4)), 30); }
+  fn default_4s_is_26() { assert_eq!(cost_cents(Some(4)), 26); }
 
   #[test]
-  fn default_10s_is_75() { assert_eq!(cost_cents(Some(10)), 75); }
+  fn default_10s_is_65() { assert_eq!(cost_cents(Some(10)), 65); }
 
   #[test]
-  fn default_12s_is_90() { assert_eq!(cost_cents(Some(12)), 90); }
+  fn default_12s_is_78() { assert_eq!(cost_cents(Some(12)), 78); }
 }

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0/cost.rs

@@ -8,25 +8,25 @@ use crate::generate::generate_video::video_generation_cost_estimate::VideoGenera
 //
 // ArtCraft credits: 100 credits = $1.00. Credits always equal USD cents.
 //
-// The per-second USD price varies by resolution.
+// The per-second USD cost varies by resolution. We compute cents directly
+// from the upstream credit rates and their credit-package prices,
+// then set ArtCraft credits = cents.
 
-/// USD cents per second by resolution.
+/// USD cents per second by resolution, derived from upstream rates:
+///   480p:  15 upstream-credits/sec ÷ 193 upstream-credits/$1 × 100 ≈ 7.772 ¢/s
+///   720p:  40 upstream-credits/sec ÷ 250 upstream-credits/$1 × 100 = 16.0 ¢/s
+///   1080p: 90 upstream-credits/sec ÷ 193 upstream-credits/$1 × 100 ≈ 46.632 ¢/s
 ///
-/// Kept as f64 because per-second rates are fractional; rounding happens
-/// once at the end after multiplying by duration × batch.
+/// We keep these as f64 because per-second rates are fractional; rounding
+/// happens once at the end after multiplying by duration × batch.
+///
+/// NB: Derivation is historical (193 credits/$1 package). The upstream
+/// package is now 525,000 credits for $2,159.0909 (~243 credits/$1), but
+/// user pricing is intentionally kept at these 193-derived rates.
 const CENTS_PER_SECOND_480P: f64 = 7.772;
-const CENTS_PER_SECOND_720P: f64 = 18.5;
+const CENTS_PER_SECOND_720P: f64 = 16.0;
 const CENTS_PER_SECOND_1080P: f64 = 46.632;
 
-/// USD cents per second, in hundredths of a cent, when one or more
-/// reference videos are attached. Held as integer hundredths so the math is
-/// exact; rounded up to whole cents once, after multiplying by
-/// duration × batch.
-const WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_480P: u64 = 881;
-const WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_720P: u64 = 2_205;
-const WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_1080P: u64 = 5_110;
-const WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_4K: u64 = 11_380;
-
 pub struct ArtcraftSeedance2p0CostState {
   pub resolution: CommonResolution,
   pub duration_seconds: u16,
@@ -48,23 +48,11 @@ impl ArtcraftSeedance2p0CostState {
   }
 
   pub fn estimate_cost(&self) -> VideoGenerationCostEstimate {
-    if self.has_video_reference {
-      let usd_cents = self.with_video_reference_usd_cents();
-      return VideoGenerationCostEstimate {
-        cost_in_credits: Some(usd_cents),
-        cost_in_usd_cents: Some(usd_cents),
-        is_free: false,
-        is_unlimited: false,
-        is_rate_limited: false,
-        has_watermark: false,
-        failures_are_refunded: None,
-      };
-    }
-
     if self.resolution == CommonResolution::FourK {
       let usd_cents = seedance_2p0_four_k_usd_cents(
         self.duration_seconds,
         self.batch_count,
+        self.has_video_reference,
       );
       return VideoGenerationCostEstimate {
         cost_in_credits: Some(usd_cents),
@@ -97,31 +85,12 @@ impl ArtcraftSeedance2p0CostState {
       failures_are_refunded: None,
     }
   }
-
-  /// Price when one or more reference videos are attached.
-  fn with_video_reference_usd_cents(&self) -> u64 {
-    let centi_cents_per_second = match self.resolution {
-      CommonResolution::FourEightyP => WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_480P,
-      CommonResolution::TenEightyP => WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_1080P,
-      CommonResolution::FourK => WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_4K,
-      // Everything else (including 720p) prices at 720p.
-      _ => WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_720P,
-    };
-
-    let seconds = self.duration_seconds as u64 * self.batch_count as u64;
-
-    // Round up to whole cents.
-    (centi_cents_per_second * seconds).div_ceil(100)
-  }
 }
 
 #[cfg(test)]
 mod tests {
-  use tokens::tokens::media_files::MediaFileToken;
-
   use crate::api::router_provider::RouterProvider;
   use crate::api::router_resolution::RouterResolution;
-  use crate::api::video_list_ref::VideoListRef;
   use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
 
   // -- 720p pricing --
@@ -131,32 +100,25 @@ mod tests {
 
     #[test]
     fn batch_1() {
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 4, 1), 74);
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 1), 93);
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 6, 1), 111);
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 10, 1), 185);
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 15, 1), 278);
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 4, 1), 64);
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 1), 80);
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 6, 1), 96);
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 10, 1), 160);
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 15, 1), 240);
     }
 
     #[test]
     fn batch_2() {
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 4, 2), 148);
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 2), 185);
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 15, 2), 555);
-    }
-
-        #[test]
-    fn batch_3() {
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 4, 3), 222);
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 3), 278);
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 15, 3), 833);
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 4, 2), 128);
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 2), 160);
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 15, 2), 480);
     }
 
     #[test]
     fn batch_4() {
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 4, 4), 296);
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 4), 370);
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 15, 4), 1110);
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 4, 4), 256);
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 4), 320);
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 15, 4), 960);
     }
 
     #[test]
@@ -183,11 +145,6 @@ mod tests {
       assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 2), 78);
     }
 
-        #[test]
-    fn batch_3() {
-      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 3), 117);
-    }
-
     #[test]
     fn batch_4() {
       assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 4), 155);
@@ -212,11 +169,6 @@ mod tests {
       assert_eq!(cost_cents(Some(RouterResolution::TenEightyP), 5, 2), 466);
     }
 
-        #[test]
-    fn batch_3() {
-      assert_eq!(cost_cents(Some(RouterResolution::TenEightyP), 5, 3), 699);
-    }
-
     #[test]
     fn batch_4() {
       assert_eq!(cost_cents(Some(RouterResolution::TenEightyP), 5, 4), 933);
@@ -242,118 +194,18 @@ mod tests {
 
     #[test]
     fn explicit_4k_without_video_reference() {
-      assert_eq!(artcraft_4k_cents(4, 1, false), 370);
-      assert_eq!(artcraft_4k_cents(5, 1, false), 463);
-      assert_eq!(artcraft_4k_cents(10, 1, false), 925);
-      assert_eq!(artcraft_4k_cents(15, 1, false), 1388);
+      assert_eq!(artcraft_4k_cents(4, 1, false), 347);
+      assert_eq!(artcraft_4k_cents(5, 1, false), 433);
+      assert_eq!(artcraft_4k_cents(10, 1, false), 866);
+      assert_eq!(artcraft_4k_cents(15, 1, false), 1299);
     }
 
     #[test]
     fn explicit_4k_with_video_reference() {
-      assert_eq!(artcraft_4k_cents(4, 1, true), 456);
-      assert_eq!(artcraft_4k_cents(5, 1, true), 569);
-      assert_eq!(artcraft_4k_cents(10, 1, true), 1138);
-      assert_eq!(artcraft_4k_cents(15, 1, true), 1707);
-    }
-  }
-
-  // -- With-video-reference pricing --
-
-  mod video_reference_pricing {
-    use super::*;
-
-    #[test]
-    fn table_480p() {
-      let expected = [36, 45, 53, 62, 71, 80, 89, 97, 106, 115, 124, 133];
-      for (i, cents) in expected.iter().enumerate() {
-        let duration = (i + 4) as u16;
-        assert_eq!(
-          cost_cents_with_video_ref(Some(RouterResolution::FourEightyP), duration, 1),
-          *cents,
-          "480p {duration}s",
-        );
-      }
-    }
-
-    #[test]
-    fn table_720p() {
-      let expected = [89, 111, 133, 155, 177, 199, 221, 243, 265, 287, 309, 331];
-      for (i, cents) in expected.iter().enumerate() {
-        let duration = (i + 4) as u16;
-        assert_eq!(
-          cost_cents_with_video_ref(Some(RouterResolution::SevenTwentyP), duration, 1),
-          *cents,
-          "720p {duration}s",
-        );
-      }
-    }
-
-    #[test]
-    fn table_1080p() {
-      let expected = [205, 256, 307, 358, 409, 460, 511, 563, 614, 665, 716, 767];
-      for (i, cents) in expected.iter().enumerate() {
-        let duration = (i + 4) as u16;
-        assert_eq!(
-          cost_cents_with_video_ref(Some(RouterResolution::TenEightyP), duration, 1),
-          *cents,
-          "1080p {duration}s",
-        );
-      }
-    }
-
-    #[test]
-    fn table_4k() {
-      let expected = [456, 569, 683, 797, 911, 1025, 1138, 1252, 1366, 1480, 1594, 1707];
-      for (i, cents) in expected.iter().enumerate() {
-        let duration = (i + 4) as u16;
-        assert_eq!(
-          cost_cents_with_video_ref(Some(RouterResolution::FourK), duration, 1),
-          *cents,
-          "4K {duration}s",
-        );
-      }
-    }
-
-    /// Batches price identically to the equivalent total seconds.
-    #[test]
-    fn batch_multiplies_total_seconds() {
-      assert_eq!(
-        cost_cents_with_video_ref(Some(RouterResolution::FourEightyP), 5, 2),
-        cost_cents_with_video_ref(Some(RouterResolution::FourEightyP), 10, 1),
-      );
-      assert_eq!(
-        cost_cents_with_video_ref(Some(RouterResolution::FourK), 5, 2),
-        cost_cents_with_video_ref(Some(RouterResolution::FourK), 10, 1),
-      );
-    }
-
-    /// Image and audio references do NOT trigger the with-reference pricing —
-    /// only reference videos do. (The non-reference price is unchanged.)
-    #[test]
-    fn image_and_audio_references_price_as_no_reference() {
-      use crate::api::audio_list_ref::AudioListRef;
-      use crate::api::image_list_ref::ImageListRef;
-
-      let builder = GenerateVideoRequestBuilder {
-        provider: RouterProvider::Artcraft,
-        resolution: Some(RouterResolution::SevenTwentyP),
-        duration_seconds: Some(5),
-        video_batch_count: Some(1),
-        reference_images: Some(ImageListRef::MediaFileTokens(vec![
-          MediaFileToken::new("mf_img".to_string()),
-        ])),
-        reference_audio: Some(AudioListRef::MediaFileTokens(vec![
-          MediaFileToken::new("mf_audio".to_string()),
-        ])),
-        ..Default::default()
-      };
-      let cents = builder.build2()
-        .expect("build2 should succeed")
-        .estimate_cost()
-        .expect("estimate_cost should succeed")
-        .cost_in_usd_cents
-        .unwrap();
-      assert_eq!(cents, cost_cents(Some(RouterResolution::SevenTwentyP), 5, 1));
+      assert_eq!(artcraft_4k_cents(4, 1, true), 416);
+      assert_eq!(artcraft_4k_cents(5, 1, true), 519);
+      assert_eq!(artcraft_4k_cents(10, 1, true), 1038);
+      assert_eq!(artcraft_4k_cents(15, 1, true), 1557);
     }
   }
 
@@ -456,98 +308,4 @@ mod tests {
       .cost_in_usd_cents
       .unwrap()
   }
-
-  /// Like [`cost_cents`], with one reference video attached.
-  fn cost_cents_with_video_ref(
-    resolution: Option<RouterResolution>,
-    duration_seconds: u16,
-    video_batch_count: u16,
-  ) -> u64 {
-    let builder = GenerateVideoRequestBuilder {
-      provider: RouterProvider::Artcraft,
-      resolution,
-      duration_seconds: Some(duration_seconds),
-      video_batch_count: Some(video_batch_count),
-      reference_videos: Some(VideoListRef::MediaFileTokens(vec![
-        MediaFileToken::new("mf_ref".to_string()),
-      ])),
-      ..Default::default()
-    };
-    builder.build2()
-      .expect("build2 should succeed")
-      .estimate_cost()
-      .expect("estimate_cost should succeed")
-      .cost_in_usd_cents
-      .unwrap()
-  }
-
-  // ── Video reference deltas ──
-  //
-  // References price on the with-reference rate card; the delta must be positive at every resolution and duration.
-
-  mod video_reference_deltas {
-    use enums::common::generation::common_resolution::CommonResolution;
-
-    use super::super::ArtcraftSeedance2p0CostState;
-
-    #[test]
-    fn refs_cost_more_at_480p() {
-      assert_ref_delta(CommonResolution::FourEightyP, 5, 39, 45, 6);
-      assert_ref_delta(CommonResolution::FourEightyP, 10, 78, 89, 11);
-      assert_ref_delta(CommonResolution::FourEightyP, 15, 117, 133, 16);
-    }
-
-    #[test]
-    fn refs_cost_more_at_720p() {
-      assert_ref_delta(CommonResolution::SevenTwentyP, 5, 93, 111, 18);
-      assert_ref_delta(CommonResolution::SevenTwentyP, 10, 185, 221, 36);
-      assert_ref_delta(CommonResolution::SevenTwentyP, 15, 278, 331, 53);
-    }
-
-    #[test]
-    fn refs_cost_more_at_1080p() {
-      assert_ref_delta(CommonResolution::TenEightyP, 5, 233, 256, 23);
-      assert_ref_delta(CommonResolution::TenEightyP, 10, 466, 511, 45);
-      assert_ref_delta(CommonResolution::TenEightyP, 15, 699, 767, 68);
-    }
-
-    #[test]
-    fn refs_cost_more_at_4k() {
-      assert_ref_delta(CommonResolution::FourK, 5, 463, 569, 106);
-      assert_ref_delta(CommonResolution::FourK, 10, 925, 1138, 213);
-      assert_ref_delta(CommonResolution::FourK, 15, 1388, 1707, 319);
-    }
-
-    /// Price the same generation with and without a reference video; pin
-    /// both prices and the delta, in USD cents AND credits (credits equal
-    /// cents, and both must show references costing more).
-    fn assert_ref_delta(
-      resolution: CommonResolution,
-      duration_seconds: u16,
-      expected_no_ref: u64,
-      expected_with_ref: u64,
-      expected_delta: u64,
-    ) {
-      let no_ref = ArtcraftSeedance2p0CostState {
-        resolution, duration_seconds, batch_count: 1, has_video_reference: false,
-      }.estimate_cost();
-      let with_ref = ArtcraftSeedance2p0CostState {
-        resolution, duration_seconds, batch_count: 1, has_video_reference: true,
-      }.estimate_cost();
-
-      let no_ref_cents = no_ref.cost_in_usd_cents.unwrap();
-      let with_ref_cents = with_ref.cost_in_usd_cents.unwrap();
-      assert_eq!(no_ref_cents, expected_no_ref);
-      assert_eq!(with_ref_cents, expected_with_ref);
-      assert_eq!(with_ref_cents - no_ref_cents, expected_delta);
-      assert!(with_ref_cents > no_ref_cents, "references must cost more");
-
-      let no_ref_credits = no_ref.cost_in_credits.unwrap();
-      let with_ref_credits = with_ref.cost_in_credits.unwrap();
-      assert_eq!(no_ref_credits, expected_no_ref);
-      assert_eq!(with_ref_credits, expected_with_ref);
-      assert_eq!(with_ref_credits - no_ref_credits, expected_delta);
-    }
-  }
-
 }

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bp/cost.rs

@@ -1,5 +1,6 @@
 use enums::common::generation::common_resolution::CommonResolution;
 
+use crate::generate::generate_video::providers::artcraft::seedance_common::seedance_2p0_four_k_usd_cents;
 use crate::generate::generate_video::providers::artcraft::seedance_2p0_bp::request::ArtcraftSeedance2p0BytePlusRequestState;
 use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
 
@@ -11,24 +12,6 @@ const CENTS_PER_SECOND_480P: f64 = 10.0;
 const CENTS_PER_SECOND_720P: f64 = 25.0;
 const CENTS_PER_SECOND_1080P: f64 = 50.0;
 
-/// USD cents per second, in hundredths of a cent, when one or more
-/// reference videos are attached. Held as integer hundredths so the math is
-/// exact; rounded up to whole cents once, after multiplying by
-/// duration × batch.
-///   480p:  10.20 ¢/s
-///   720p:  25.70 ¢/s
-///   1080p: 57.80 ¢/s
-///   4K:   119.00 ¢/s
-const WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_480P: u64 = 1_020;
-const WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_720P: u64 = 2_570;
-const WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_1080P: u64 = 5_780;
-const WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_4K: u64 = 11_900;
-
-/// 4K output price with no reference videos, in hundredths of a USD cent
-/// per second (95.00 ¢/s), rounded up to whole cents after multiplying by
-/// duration × batch.
-const CENTI_CENTS_PER_SECOND_4K: u64 = 9_500;
-
 pub struct ArtcraftSeedance2p0BytePlusCostState {
   pub resolution: CommonResolution,
   pub duration_seconds: u16,
@@ -49,24 +32,12 @@ impl ArtcraftSeedance2p0BytePlusCostState {
   }
 
   pub fn estimate_cost(&self) -> VideoGenerationCostEstimate {
-    if self.has_video_reference {
-      let usd_cents = self.with_video_reference_usd_cents();
-      return VideoGenerationCostEstimate {
-        cost_in_credits: Some(usd_cents),
-        cost_in_usd_cents: Some(usd_cents),
-        is_free: false,
-        is_unlimited: false,
-        is_rate_limited: false,
-        has_watermark: false,
-        failures_are_refunded: None,
-      };
-    }
-
     if self.resolution == CommonResolution::FourK {
-      let total_centi_cents = CENTI_CENTS_PER_SECOND_4K
-        * self.duration_seconds as u64
-        * self.batch_count as u64;
-      let usd_cents = total_centi_cents.div_ceil(100);
+      let usd_cents = seedance_2p0_four_k_usd_cents(
+        self.duration_seconds,
+        self.batch_count,
+        self.has_video_reference,
+      );
       return VideoGenerationCostEstimate {
         cost_in_credits: Some(usd_cents),
         cost_in_usd_cents: Some(usd_cents),
@@ -96,22 +67,6 @@ impl ArtcraftSeedance2p0BytePlusCostState {
       failures_are_refunded: None,
     }
   }
-
-  /// Price when one or more reference videos are attached.
-  fn with_video_reference_usd_cents(&self) -> u64 {
-    let centi_cents_per_second = match self.resolution {
-      CommonResolution::FourEightyP => WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_480P,
-      CommonResolution::TenEightyP => WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_1080P,
-      CommonResolution::FourK => WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_4K,
-      // Everything else (including 720p) prices at 720p.
-      _ => WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_720P,
-    };
-
-    let seconds = self.duration_seconds as u64 * self.batch_count as u64;
-
-    // Round up to whole cents.
-    (centi_cents_per_second * seconds).div_ceil(100)
-  }
 }
 
 #[cfg(test)]
@@ -137,11 +92,6 @@ mod tests {
       assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 2), 250);
     }
 
-        #[test]
-    fn batch_3() {
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 3), 375);
-    }
-
     #[test]
     fn batch_4() {
       assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 4), 500);
@@ -169,11 +119,6 @@ mod tests {
       assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 2), 100);
     }
 
-        #[test]
-    fn batch_3() {
-      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 3), 150);
-    }
-
     #[test]
     fn batch_4() {
       assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 4), 200);
@@ -196,11 +141,6 @@ mod tests {
       assert_eq!(cost_cents(Some(RouterResolution::TenEightyP), 5, 2), 500);
     }
 
-        #[test]
-    fn batch_3() {
-      assert_eq!(cost_cents(Some(RouterResolution::TenEightyP), 5, 3), 750);
-    }
-
     #[test]
     fn batch_4() {
       assert_eq!(cost_cents(Some(RouterResolution::TenEightyP), 5, 4), 1000);
@@ -224,20 +164,18 @@ mod tests {
 
     #[test]
     fn explicit_4k_without_video_reference() {
-      // 95.00 ¢/s card, rounded up to whole cents.
-      assert_eq!(artcraft_4k_cents(4, 1, false), 380);
-      assert_eq!(artcraft_4k_cents(5, 1, false), 475);
-      assert_eq!(artcraft_4k_cents(10, 1, false), 950);
-      assert_eq!(artcraft_4k_cents(15, 1, false), 1425);
+      assert_eq!(artcraft_4k_cents(4, 1, false), 347);
+      assert_eq!(artcraft_4k_cents(5, 1, false), 433);
+      assert_eq!(artcraft_4k_cents(10, 1, false), 866);
+      assert_eq!(artcraft_4k_cents(15, 1, false), 1299);
     }
 
     #[test]
     fn explicit_4k_with_video_reference() {
-      // 119.00 ¢/s with-reference card, rounded up to whole cents.
-      assert_eq!(artcraft_4k_cents(4, 1, true), 476);
-      assert_eq!(artcraft_4k_cents(5, 1, true), 595);
-      assert_eq!(artcraft_4k_cents(10, 1, true), 1190);
-      assert_eq!(artcraft_4k_cents(15, 1, true), 1785);
+      assert_eq!(artcraft_4k_cents(4, 1, true), 416);
+      assert_eq!(artcraft_4k_cents(5, 1, true), 519);
+      assert_eq!(artcraft_4k_cents(10, 1, true), 1038);
+      assert_eq!(artcraft_4k_cents(15, 1, true), 1557);
     }
   }
 
@@ -290,74 +228,4 @@ mod tests {
   fn cost_cents(resolution: Option<RouterResolution>, duration_seconds: u16, video_batch_count: u16) -> u64 {
     build_cost(resolution, duration_seconds, video_batch_count).cost_in_usd_cents.unwrap()
   }
-
-  // ── Video reference deltas ──
-  //
-  // References price on the with-reference rate card (10.20/25.70/57.80/113.80 ¢/s); the delta must be positive at every resolution and duration.
-
-  mod video_reference_deltas {
-    use enums::common::generation::common_resolution::CommonResolution;
-
-    use super::super::ArtcraftSeedance2p0BytePlusCostState;
-
-    #[test]
-    fn refs_cost_more_at_480p() {
-      assert_ref_delta(CommonResolution::FourEightyP, 5, 50, 51, 1);
-      assert_ref_delta(CommonResolution::FourEightyP, 10, 100, 102, 2);
-      assert_ref_delta(CommonResolution::FourEightyP, 15, 150, 153, 3);
-    }
-
-    #[test]
-    fn refs_cost_more_at_720p() {
-      assert_ref_delta(CommonResolution::SevenTwentyP, 5, 125, 129, 4);
-      assert_ref_delta(CommonResolution::SevenTwentyP, 10, 250, 257, 7);
-      assert_ref_delta(CommonResolution::SevenTwentyP, 15, 375, 386, 11);
-    }
-
-    #[test]
-    fn refs_cost_more_at_1080p() {
-      assert_ref_delta(CommonResolution::TenEightyP, 5, 250, 289, 39);
-      assert_ref_delta(CommonResolution::TenEightyP, 10, 500, 578, 78);
-      assert_ref_delta(CommonResolution::TenEightyP, 15, 750, 867, 117);
-    }
-
-    #[test]
-    fn refs_cost_more_at_4k() {
-      assert_ref_delta(CommonResolution::FourK, 5, 475, 595, 120);
-      assert_ref_delta(CommonResolution::FourK, 10, 950, 1190, 240);
-      assert_ref_delta(CommonResolution::FourK, 15, 1425, 1785, 360);
-    }
-
-    /// Price the same generation with and without a reference video; pin
-    /// both prices and the delta, in USD cents AND credits (credits equal
-    /// cents, and both must show references costing more).
-    fn assert_ref_delta(
-      resolution: CommonResolution,
-      duration_seconds: u16,
-      expected_no_ref: u64,
-      expected_with_ref: u64,
-      expected_delta: u64,
-    ) {
-      let no_ref = ArtcraftSeedance2p0BytePlusCostState {
-        resolution, duration_seconds, batch_count: 1, has_video_reference: false,
-      }.estimate_cost();
-      let with_ref = ArtcraftSeedance2p0BytePlusCostState {
-        resolution, duration_seconds, batch_count: 1, has_video_reference: true,
-      }.estimate_cost();
-
-      let no_ref_cents = no_ref.cost_in_usd_cents.unwrap();
-      let with_ref_cents = with_ref.cost_in_usd_cents.unwrap();
-      assert_eq!(no_ref_cents, expected_no_ref);
-      assert_eq!(with_ref_cents, expected_with_ref);
-      assert_eq!(with_ref_cents - no_ref_cents, expected_delta);
-      assert!(with_ref_cents > no_ref_cents, "references must cost more");
-
-      let no_ref_credits = no_ref.cost_in_credits.unwrap();
-      let with_ref_credits = with_ref.cost_in_credits.unwrap();
-      assert_eq!(no_ref_credits, expected_no_ref);
-      assert_eq!(with_ref_credits, expected_with_ref);
-      assert_eq!(with_ref_credits - no_ref_credits, expected_delta);
-    }
-  }
-
 }

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bp_fast/cost.rs

@@ -9,20 +9,10 @@ use crate::generate::generate_video::providers::artcraft::seedance_2p0_bp_fast::
 const CENTS_PER_SECOND_480P: f64 = 9.0;
 const CENTS_PER_SECOND_720P: f64 = 20.0;
 
-/// USD cents per second, in hundredths of a cent, when one or more
-/// reference videos are attached. Held as integer hundredths so the math is
-/// exact; rounded up to whole cents once, after multiplying by
-/// duration × batch.
-///   480p:  9.65 ¢/s
-///   720p: 20.50 ¢/s
-const WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_480P: u64 = 965;
-const WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_720P: u64 = 2_050;
-
 pub struct ArtcraftSeedance2p0BytePlusFastCostState {
   pub resolution: CommonResolution,
   pub duration_seconds: u16,
   pub batch_count: u16,
-  pub has_video_reference: bool,
 }
 
 impl ArtcraftSeedance2p0BytePlusFastCostState {
@@ -31,26 +21,10 @@ impl ArtcraftSeedance2p0BytePlusFastCostState {
       .unwrap_or(CommonResolution::SevenTwentyP);
     let duration_seconds = request.request.duration_seconds.unwrap_or(5);
     let batch_count = request.request.video_batch_count.unwrap_or(1);
-    let has_video_reference = request.request.reference_video_media_tokens
-      .as_ref()
-      .is_some_and(|tokens| !tokens.is_empty());
-    Self { resolution, duration_seconds, batch_count, has_video_reference }
+    Self { resolution, duration_seconds, batch_count }
   }
 
   pub fn estimate_cost(&self) -> VideoGenerationCostEstimate {
-    if self.has_video_reference {
-      let usd_cents = self.with_video_reference_usd_cents();
-      return VideoGenerationCostEstimate {
-        cost_in_credits: Some(usd_cents),
-        cost_in_usd_cents: Some(usd_cents),
-        is_free: false,
-        is_unlimited: false,
-        is_rate_limited: false,
-        has_watermark: false,
-        failures_are_refunded: None,
-      };
-    }
-
     let cents_per_second = match self.resolution {
       CommonResolution::FourEightyP => CENTS_PER_SECOND_480P,
       _ => CENTS_PER_SECOND_720P,
@@ -68,20 +42,6 @@ impl ArtcraftSeedance2p0BytePlusFastCostState {
       failures_are_refunded: None,
     }
   }
-
-  /// Price when one or more reference videos are attached.
-  fn with_video_reference_usd_cents(&self) -> u64 {
-    let centi_cents_per_second = match self.resolution {
-      CommonResolution::FourEightyP => WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_480P,
-      // Everything else (including 720p) prices at 720p.
-      _ => WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_720P,
-    };
-
-    let seconds = self.duration_seconds as u64 * self.batch_count as u64;
-
-    // Round up to whole cents.
-    (centi_cents_per_second * seconds).div_ceil(100)
-  }
 }
 
 #[cfg(test)]
@@ -107,11 +67,6 @@ mod tests {
       assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 2), 200);
     }
 
-        #[test]
-    fn batch_3() {
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 3), 300);
-    }
-
     #[test]
     fn batch_4() {
       assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 4), 400);
@@ -139,11 +94,6 @@ mod tests {
       assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 2), 90);
     }
 
-        #[test]
-    fn batch_3() {
-      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 3), 135);
-    }
-
     #[test]
     fn batch_4() {
       assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 4), 180);

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bp_mini/build.rs

@@ -3,28 +3,21 @@ use enums::common::generation::common_video_model::CommonVideoModel as CommonVid
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
 use crate::generate::generate_video::providers::artcraft::build_common::{
-  build_artcraft_omni_video_request, plan_mini_batch_count, SupportedResolutions, UltraWideSupport,
+  build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport,
 };
 use crate::generate::generate_video::providers::artcraft::seedance_2p0_bp_mini::request::ArtcraftSeedance2p0BytePlusMiniRequestState;
 use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
 use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
 
-pub fn build_artcraft_seedance_2p0_bp_mini(mut builder: GenerateVideoRequestBuilder) -> Result<VideoGenerationDraftOrRequest, ArtcraftRouterError> {
+pub fn build_artcraft_seedance_2p0_bp_mini(builder: GenerateVideoRequestBuilder) -> Result<VideoGenerationDraftOrRequest, ArtcraftRouterError> {
   // Seedance 2.0 Mini supports 480p and 720p only (higher resolutions downgrade
   // to 720p), and all six aspect ratios including 21:9.
-  // Mini supports batches of 1-8, wider than the shared 1/2/4 planning.
-  // Take the batch out before the shared build and set it after.
-  let strategy = builder.request_mismatch_mitigation_strategy;
-  let batch_count = plan_mini_batch_count(builder.video_batch_count.take(), strategy)?;
-
-  let mut request = build_artcraft_omni_video_request(
+  let request = build_artcraft_omni_video_request(
     builder,
     CommonVideoModelEnum::Seedance2p0BytePlusMini,
     SupportedResolutions::Fast,
     UltraWideSupport::Supported,
   )?;
-  request.video_batch_count = Some(batch_count);
-
   let state = ArtcraftSeedance2p0BytePlusMiniRequestState { request };
   Ok(VideoGenerationDraftOrRequest::Request(VideoGenerationRequest::ArtcraftSeedance2p0BytePlusMini(state)))
 }
@@ -87,18 +80,10 @@ mod tests {
     }
 
     #[test]
-    fn batch_count_up_to_eight_passed_through() {
-      // Mini supports batches of 1-8; execution and billing must agree.
-      for batch in 1..=8u16 {
-        let req = unwrap_request(builder_with(move |b| { b.video_batch_count = Some(batch); }));
-        assert_eq!(req.request.video_batch_count, Some(batch));
-      }
-    }
-
-    #[test]
-    fn batch_count_above_eight_clamps_to_eight() {
-      let req = unwrap_request(builder_with(|b| { b.video_batch_count = Some(9); }));
-      assert_eq!(req.request.video_batch_count, Some(8));
+    fn batch_count_clamped_to_platform_max() {
+      // The ArtCraft platform caps batch at 4 and downgrades higher requests.
+      let req = unwrap_request(builder_with(|b| { b.video_batch_count = Some(8); }));
+      assert_eq!(req.request.video_batch_count, Some(4));
     }
 
     #[test]

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bp_mini/cost.rs

@@ -65,18 +65,18 @@ mod tests {
 
     #[test]
     fn without_video_reference() {
-      assert_eq!(cents(RouterResolution::FourEightyP, 4, 1, false), 15);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 1, false), 18);
-      assert_eq!(cents(RouterResolution::FourEightyP, 10, 1, false), 36);
-      assert_eq!(cents(RouterResolution::FourEightyP, 15, 1, false), 54);
+      assert_eq!(cents(RouterResolution::FourEightyP, 4, 1, false), 14);
+      assert_eq!(cents(RouterResolution::FourEightyP, 5, 1, false), 17);
+      assert_eq!(cents(RouterResolution::FourEightyP, 10, 1, false), 33);
+      assert_eq!(cents(RouterResolution::FourEightyP, 15, 1, false), 50);
     }
 
     #[test]
     fn with_video_reference() {
-      assert_eq!(cents(RouterResolution::FourEightyP, 4, 1, true), 18);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 1, true), 23);
-      assert_eq!(cents(RouterResolution::FourEightyP, 10, 1, true), 45);
-      assert_eq!(cents(RouterResolution::FourEightyP, 15, 1, true), 68);
+      assert_eq!(cents(RouterResolution::FourEightyP, 4, 1, true), 17);
+      assert_eq!(cents(RouterResolution::FourEightyP, 5, 1, true), 21);
+      assert_eq!(cents(RouterResolution::FourEightyP, 10, 1, true), 42);
+      assert_eq!(cents(RouterResolution::FourEightyP, 15, 1, true), 63);
     }
   }
 
@@ -85,18 +85,18 @@ mod tests {
 
     #[test]
     fn without_video_reference() {
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 4, 1, false), 37);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 1, false), 46);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 10, 1, false), 91);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 15, 1, false), 137);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 4, 1, false), 35);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 1, false), 44);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 10, 1, false), 88);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 15, 1, false), 131);
     }
 
     #[test]
     fn with_video_reference() {
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 4, 1, true), 44);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 1, true), 55);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 10, 1, true), 110);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 15, 1, true), 165);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 4, 1, true), 42);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 1, true), 53);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 10, 1, true), 105);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 15, 1, true), 158);
     }
 
     #[test]
@@ -105,49 +105,6 @@ mod tests {
     }
   }
 
-  mod batch_pricing {
-    use super::*;
-
-    /// Mini bills batches of 1-8 in full (the platform's 1/2/4 cap does not
-    /// apply). Once, batch 8 executed in full but billed as batch 4.
-    #[test]
-    fn every_batch_size_720p_5s() {
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 1, false), 46);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 2, false), 91);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 3, false), 137);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 4, false), 182);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 5, false), 228);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 6, false), 273);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 7, false), 319);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 8, false), 364);
-    }
-
-    #[test]
-    fn every_batch_size_480p_5s() {
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 1, false), 18);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 2, false), 36);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 3, false), 54);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 4, false), 71);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 5, false), 89);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 6, false), 107);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 7, false), 125);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 8, false), 142);
-    }
-
-    #[test]
-    fn batch_eight_with_video_reference() {
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 8, true), 438);
-    }
-
-    #[test]
-    fn batch_above_eight_clamps_to_eight() {
-      assert_eq!(
-        cents(RouterResolution::SevenTwentyP, 5, 9, false),
-        cents(RouterResolution::SevenTwentyP, 5, 8, false),
-      );
-    }
-  }
-
   mod credits_tests {
     use super::*;
 

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bpu/cost.rs

@@ -1,5 +1,6 @@
 use enums::common::generation::common_resolution::CommonResolution;
 
+use crate::generate::generate_video::providers::artcraft::seedance_common::seedance_2p0_four_k_usd_cents;
 use crate::generate::generate_video::providers::artcraft::seedance_2p0_bpu::request::ArtcraftSeedance2p0BytePlusUltraRequestState;
 use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
 
@@ -11,24 +12,6 @@ const CENTS_PER_SECOND_480P: f64 = 10.0;
 const CENTS_PER_SECOND_720P: f64 = 25.0;
 const CENTS_PER_SECOND_1080P: f64 = 50.0;
 
-/// USD cents per second, in hundredths of a cent, when one or more
-/// reference videos are attached. Held as integer hundredths so the math is
-/// exact; rounded up to whole cents once, after multiplying by
-/// duration × batch.
-///   480p:  10.20 ¢/s
-///   720p:  25.70 ¢/s
-///   1080p: 57.80 ¢/s
-///   4K:   119.00 ¢/s
-const WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_480P: u64 = 1_020;
-const WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_720P: u64 = 2_570;
-const WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_1080P: u64 = 5_780;
-const WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_4K: u64 = 11_900;
-
-/// 4K output price with no reference videos, in hundredths of a USD cent
-/// per second (95.00 ¢/s), rounded up to whole cents after multiplying by
-/// duration × batch.
-const CENTI_CENTS_PER_SECOND_4K: u64 = 9_500;
-
 pub struct ArtcraftSeedance2p0BytePlusUltraCostState {
   pub resolution: CommonResolution,
   pub duration_seconds: u16,
@@ -49,24 +32,12 @@ impl ArtcraftSeedance2p0BytePlusUltraCostState {
   }
 
   pub fn estimate_cost(&self) -> VideoGenerationCostEstimate {
-    if self.has_video_reference {
-      let usd_cents = self.with_video_reference_usd_cents();
-      return VideoGenerationCostEstimate {
-        cost_in_credits: Some(usd_cents),
-        cost_in_usd_cents: Some(usd_cents),
-        is_free: false,
-        is_unlimited: false,
-        is_rate_limited: false,
-        has_watermark: false,
-        failures_are_refunded: None,
-      };
-    }
-
     if self.resolution == CommonResolution::FourK {
-      let total_centi_cents = CENTI_CENTS_PER_SECOND_4K
-        * self.duration_seconds as u64
-        * self.batch_count as u64;
-      let usd_cents = total_centi_cents.div_ceil(100);
+      let usd_cents = seedance_2p0_four_k_usd_cents(
+        self.duration_seconds,
+        self.batch_count,
+        self.has_video_reference,
+      );
       return VideoGenerationCostEstimate {
         cost_in_credits: Some(usd_cents),
         cost_in_usd_cents: Some(usd_cents),
@@ -96,22 +67,6 @@ impl ArtcraftSeedance2p0BytePlusUltraCostState {
       failures_are_refunded: None,
     }
   }
-
-  /// Price when one or more reference videos are attached.
-  fn with_video_reference_usd_cents(&self) -> u64 {
-    let centi_cents_per_second = match self.resolution {
-      CommonResolution::FourEightyP => WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_480P,
-      CommonResolution::TenEightyP => WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_1080P,
-      CommonResolution::FourK => WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_4K,
-      // Everything else (including 720p) prices at 720p.
-      _ => WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_720P,
-    };
-
-    let seconds = self.duration_seconds as u64 * self.batch_count as u64;
-
-    // Round up to whole cents.
-    (centi_cents_per_second * seconds).div_ceil(100)
-  }
 }
 
 #[cfg(test)]
@@ -137,11 +92,6 @@ mod tests {
       assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 2), 250);
     }
 
-        #[test]
-    fn batch_3() {
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 3), 375);
-    }
-
     #[test]
     fn batch_4() {
       assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 4), 500);
@@ -169,11 +119,6 @@ mod tests {
       assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 2), 100);
     }
 
-        #[test]
-    fn batch_3() {
-      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 3), 150);
-    }
-
     #[test]
     fn batch_4() {
       assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 4), 200);
@@ -196,11 +141,6 @@ mod tests {
       assert_eq!(cost_cents(Some(RouterResolution::TenEightyP), 5, 2), 500);
     }
 
-        #[test]
-    fn batch_3() {
-      assert_eq!(cost_cents(Some(RouterResolution::TenEightyP), 5, 3), 750);
-    }
-
     #[test]
     fn batch_4() {
       assert_eq!(cost_cents(Some(RouterResolution::TenEightyP), 5, 4), 1000);
@@ -224,20 +164,18 @@ mod tests {
 
     #[test]
     fn explicit_4k_without_video_reference() {
-      // 95.00 ¢/s card, rounded up to whole cents.
-      assert_eq!(artcraft_4k_cents(4, 1, false), 380);
-      assert_eq!(artcraft_4k_cents(5, 1, false), 475);
-      assert_eq!(artcraft_4k_cents(10, 1, false), 950);
-      assert_eq!(artcraft_4k_cents(15, 1, false), 1425);
+      assert_eq!(artcraft_4k_cents(4, 1, false), 347);
+      assert_eq!(artcraft_4k_cents(5, 1, false), 433);
+      assert_eq!(artcraft_4k_cents(10, 1, false), 866);
+      assert_eq!(artcraft_4k_cents(15, 1, false), 1299);
     }
 
     #[test]
     fn explicit_4k_with_video_reference() {
-      // 119.00 ¢/s with-reference card, rounded up to whole cents.
-      assert_eq!(artcraft_4k_cents(4, 1, true), 476);
-      assert_eq!(artcraft_4k_cents(5, 1, true), 595);
-      assert_eq!(artcraft_4k_cents(10, 1, true), 1190);
-      assert_eq!(artcraft_4k_cents(15, 1, true), 1785);
+      assert_eq!(artcraft_4k_cents(4, 1, true), 416);
+      assert_eq!(artcraft_4k_cents(5, 1, true), 519);
+      assert_eq!(artcraft_4k_cents(10, 1, true), 1038);
+      assert_eq!(artcraft_4k_cents(15, 1, true), 1557);
     }
   }
 
@@ -290,74 +228,4 @@ mod tests {
   fn cost_cents(resolution: Option<RouterResolution>, duration_seconds: u16, video_batch_count: u16) -> u64 {
     build_cost(resolution, duration_seconds, video_batch_count).cost_in_usd_cents.unwrap()
   }
-
-  // ── Video reference deltas ──
-  //
-  // References price on the with-reference rate card (10.20/25.70/57.80/113.80 ¢/s); the delta must be positive at every resolution and duration.
-
-  mod video_reference_deltas {
-    use enums::common::generation::common_resolution::CommonResolution;
-
-    use super::super::ArtcraftSeedance2p0BytePlusUltraCostState;
-
-    #[test]
-    fn refs_cost_more_at_480p() {
-      assert_ref_delta(CommonResolution::FourEightyP, 5, 50, 51, 1);
-      assert_ref_delta(CommonResolution::FourEightyP, 10, 100, 102, 2);
-      assert_ref_delta(CommonResolution::FourEightyP, 15, 150, 153, 3);
-    }
-
-    #[test]
-    fn refs_cost_more_at_720p() {
-      assert_ref_delta(CommonResolution::SevenTwentyP, 5, 125, 129, 4);
-      assert_ref_delta(CommonResolution::SevenTwentyP, 10, 250, 257, 7);
-      assert_ref_delta(CommonResolution::SevenTwentyP, 15, 375, 386, 11);
-    }
-
-    #[test]
-    fn refs_cost_more_at_1080p() {
-      assert_ref_delta(CommonResolution::TenEightyP, 5, 250, 289, 39);
-      assert_ref_delta(CommonResolution::TenEightyP, 10, 500, 578, 78);
-      assert_ref_delta(CommonResolution::TenEightyP, 15, 750, 867, 117);
-    }
-
-    #[test]
-    fn refs_cost_more_at_4k() {
-      assert_ref_delta(CommonResolution::FourK, 5, 475, 595, 120);
-      assert_ref_delta(CommonResolution::FourK, 10, 950, 1190, 240);
-      assert_ref_delta(CommonResolution::FourK, 15, 1425, 1785, 360);
-    }
-
-    /// Price the same generation with and without a reference video; pin
-    /// both prices and the delta, in USD cents AND credits (credits equal
-    /// cents, and both must show references costing more).
-    fn assert_ref_delta(
-      resolution: CommonResolution,
-      duration_seconds: u16,
-      expected_no_ref: u64,
-      expected_with_ref: u64,
-      expected_delta: u64,
-    ) {
-      let no_ref = ArtcraftSeedance2p0BytePlusUltraCostState {
-        resolution, duration_seconds, batch_count: 1, has_video_reference: false,
-      }.estimate_cost();
-      let with_ref = ArtcraftSeedance2p0BytePlusUltraCostState {
-        resolution, duration_seconds, batch_count: 1, has_video_reference: true,
-      }.estimate_cost();
-
-      let no_ref_cents = no_ref.cost_in_usd_cents.unwrap();
-      let with_ref_cents = with_ref.cost_in_usd_cents.unwrap();
-      assert_eq!(no_ref_cents, expected_no_ref);
-      assert_eq!(with_ref_cents, expected_with_ref);
-      assert_eq!(with_ref_cents - no_ref_cents, expected_delta);
-      assert!(with_ref_cents > no_ref_cents, "references must cost more");
-
-      let no_ref_credits = no_ref.cost_in_credits.unwrap();
-      let with_ref_credits = with_ref.cost_in_credits.unwrap();
-      assert_eq!(no_ref_credits, expected_no_ref);
-      assert_eq!(with_ref_credits, expected_with_ref);
-      assert_eq!(with_ref_credits - no_ref_credits, expected_delta);
-    }
-  }
-
 }

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bpu_fast/cost.rs

@@ -9,20 +9,10 @@ use crate::generate::generate_video::providers::artcraft::seedance_2p0_bpu_fast:
 const CENTS_PER_SECOND_480P: f64 = 9.0;
 const CENTS_PER_SECOND_720P: f64 = 20.0;
 
-/// USD cents per second, in hundredths of a cent, when one or more
-/// reference videos are attached. Held as integer hundredths so the math is
-/// exact; rounded up to whole cents once, after multiplying by
-/// duration × batch.
-///   480p:  9.65 ¢/s
-///   720p: 20.50 ¢/s
-const WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_480P: u64 = 965;
-const WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_720P: u64 = 2_050;
-
 pub struct ArtcraftSeedance2p0BytePlusUltraFastCostState {
   pub resolution: CommonResolution,
   pub duration_seconds: u16,
   pub batch_count: u16,
-  pub has_video_reference: bool,
 }
 
 impl ArtcraftSeedance2p0BytePlusUltraFastCostState {
@@ -31,26 +21,10 @@ impl ArtcraftSeedance2p0BytePlusUltraFastCostState {
       .unwrap_or(CommonResolution::SevenTwentyP);
     let duration_seconds = request.request.duration_seconds.unwrap_or(5);
     let batch_count = request.request.video_batch_count.unwrap_or(1);
-    let has_video_reference = request.request.reference_video_media_tokens
-      .as_ref()
-      .is_some_and(|tokens| !tokens.is_empty());
-    Self { resolution, duration_seconds, batch_count, has_video_reference }
+    Self { resolution, duration_seconds, batch_count }
   }
 
   pub fn estimate_cost(&self) -> VideoGenerationCostEstimate {
-    if self.has_video_reference {
-      let usd_cents = self.with_video_reference_usd_cents();
-      return VideoGenerationCostEstimate {
-        cost_in_credits: Some(usd_cents),
-        cost_in_usd_cents: Some(usd_cents),
-        is_free: false,
-        is_unlimited: false,
-        is_rate_limited: false,
-        has_watermark: false,
-        failures_are_refunded: None,
-      };
-    }
-
     let cents_per_second = match self.resolution {
       CommonResolution::FourEightyP => CENTS_PER_SECOND_480P,
       _ => CENTS_PER_SECOND_720P,
@@ -68,20 +42,6 @@ impl ArtcraftSeedance2p0BytePlusUltraFastCostState {
       failures_are_refunded: None,
     }
   }
-
-  /// Price when one or more reference videos are attached.
-  fn with_video_reference_usd_cents(&self) -> u64 {
-    let centi_cents_per_second = match self.resolution {
-      CommonResolution::FourEightyP => WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_480P,
-      // Everything else (including 720p) prices at 720p.
-      _ => WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_720P,
-    };
-
-    let seconds = self.duration_seconds as u64 * self.batch_count as u64;
-
-    // Round up to whole cents.
-    (centi_cents_per_second * seconds).div_ceil(100)
-  }
 }
 
 #[cfg(test)]
@@ -107,11 +67,6 @@ mod tests {
       assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 2), 200);
     }
 
-        #[test]
-    fn batch_3() {
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 3), 300);
-    }
-
     #[test]
     fn batch_4() {
       assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 4), 400);
@@ -139,11 +94,6 @@ mod tests {
       assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 2), 90);
     }
 
-        #[test]
-    fn batch_3() {
-      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 3), 135);
-    }
-
     #[test]
     fn batch_4() {
       assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 4), 180);

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bpu_mini/build.rs

@@ -3,28 +3,21 @@ use enums::common::generation::common_video_model::CommonVideoModel as CommonVid
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
 use crate::generate::generate_video::providers::artcraft::build_common::{
-  build_artcraft_omni_video_request, plan_mini_batch_count, SupportedResolutions, UltraWideSupport,
+  build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport,
 };
 use crate::generate::generate_video::providers::artcraft::seedance_2p0_bpu_mini::request::ArtcraftSeedance2p0BytePlusUltraMiniRequestState;
 use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
 use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
 
-pub fn build_artcraft_seedance_2p0_bpu_mini(mut builder: GenerateVideoRequestBuilder) -> Result<VideoGenerationDraftOrRequest, ArtcraftRouterError> {
+pub fn build_artcraft_seedance_2p0_bpu_mini(builder: GenerateVideoRequestBuilder) -> Result<VideoGenerationDraftOrRequest, ArtcraftRouterError> {
   // Seedance 2.0 Mini supports 480p and 720p only (higher resolutions downgrade
   // to 720p), and all six aspect ratios including 21:9.
-  // Mini supports batches of 1-8, wider than the shared 1/2/4 planning.
-  // Take the batch out before the shared build and set it after.
-  let strategy = builder.request_mismatch_mitigation_strategy;
-  let batch_count = plan_mini_batch_count(builder.video_batch_count.take(), strategy)?;
-
-  let mut request = build_artcraft_omni_video_request(
+  let request = build_artcraft_omni_video_request(
     builder,
     CommonVideoModelEnum::Seedance2p0BytePlusUltraMini,
     SupportedResolutions::Fast,
     UltraWideSupport::Supported,
   )?;
-  request.video_batch_count = Some(batch_count);
-
   let state = ArtcraftSeedance2p0BytePlusUltraMiniRequestState { request };
   Ok(VideoGenerationDraftOrRequest::Request(VideoGenerationRequest::ArtcraftSeedance2p0BytePlusUltraMini(state)))
 }
@@ -87,18 +80,10 @@ mod tests {
     }
 
     #[test]
-    fn batch_count_up_to_eight_passed_through() {
-      // Mini supports batches of 1-8; execution and billing must agree.
-      for batch in 1..=8u16 {
-        let req = unwrap_request(builder_with(move |b| { b.video_batch_count = Some(batch); }));
-        assert_eq!(req.request.video_batch_count, Some(batch));
-      }
-    }
-
-    #[test]
-    fn batch_count_above_eight_clamps_to_eight() {
-      let req = unwrap_request(builder_with(|b| { b.video_batch_count = Some(9); }));
-      assert_eq!(req.request.video_batch_count, Some(8));
+    fn batch_count_clamped_to_platform_max() {
+      // The ArtCraft platform caps batch at 4 and downgrades higher requests.
+      let req = unwrap_request(builder_with(|b| { b.video_batch_count = Some(8); }));
+      assert_eq!(req.request.video_batch_count, Some(4));
     }
 
     #[test]

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_bpu_mini/cost.rs

@@ -65,18 +65,18 @@ mod tests {
 
     #[test]
     fn without_video_reference() {
-      assert_eq!(cents(RouterResolution::FourEightyP, 4, 1, false), 15);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 1, false), 18);
-      assert_eq!(cents(RouterResolution::FourEightyP, 10, 1, false), 36);
-      assert_eq!(cents(RouterResolution::FourEightyP, 15, 1, false), 54);
+      assert_eq!(cents(RouterResolution::FourEightyP, 4, 1, false), 14);
+      assert_eq!(cents(RouterResolution::FourEightyP, 5, 1, false), 17);
+      assert_eq!(cents(RouterResolution::FourEightyP, 10, 1, false), 33);
+      assert_eq!(cents(RouterResolution::FourEightyP, 15, 1, false), 50);
     }
 
     #[test]
     fn with_video_reference() {
-      assert_eq!(cents(RouterResolution::FourEightyP, 4, 1, true), 18);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 1, true), 23);
-      assert_eq!(cents(RouterResolution::FourEightyP, 10, 1, true), 45);
-      assert_eq!(cents(RouterResolution::FourEightyP, 15, 1, true), 68);
+      assert_eq!(cents(RouterResolution::FourEightyP, 4, 1, true), 17);
+      assert_eq!(cents(RouterResolution::FourEightyP, 5, 1, true), 21);
+      assert_eq!(cents(RouterResolution::FourEightyP, 10, 1, true), 42);
+      assert_eq!(cents(RouterResolution::FourEightyP, 15, 1, true), 63);
     }
   }
 
@@ -85,18 +85,18 @@ mod tests {
 
     #[test]
     fn without_video_reference() {
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 4, 1, false), 37);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 1, false), 46);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 10, 1, false), 91);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 15, 1, false), 137);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 4, 1, false), 35);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 1, false), 44);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 10, 1, false), 88);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 15, 1, false), 131);
     }
 
     #[test]
     fn with_video_reference() {
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 4, 1, true), 44);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 1, true), 55);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 10, 1, true), 110);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 15, 1, true), 165);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 4, 1, true), 42);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 1, true), 53);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 10, 1, true), 105);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 15, 1, true), 158);
     }
 
     #[test]
@@ -105,49 +105,6 @@ mod tests {
     }
   }
 
-  mod batch_pricing {
-    use super::*;
-
-    /// Mini bills batches of 1-8 in full (the platform's 1/2/4 cap does not
-    /// apply). Once, batch 8 executed in full but billed as batch 4.
-    #[test]
-    fn every_batch_size_720p_5s() {
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 1, false), 46);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 2, false), 91);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 3, false), 137);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 4, false), 182);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 5, false), 228);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 6, false), 273);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 7, false), 319);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 8, false), 364);
-    }
-
-    #[test]
-    fn every_batch_size_480p_5s() {
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 1, false), 18);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 2, false), 36);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 3, false), 54);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 4, false), 71);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 5, false), 89);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 6, false), 107);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 7, false), 125);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 8, false), 142);
-    }
-
-    #[test]
-    fn batch_eight_with_video_reference() {
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 8, true), 438);
-    }
-
-    #[test]
-    fn batch_above_eight_clamps_to_eight() {
-      assert_eq!(
-        cents(RouterResolution::SevenTwentyP, 5, 9, false),
-        cents(RouterResolution::SevenTwentyP, 5, 8, false),
-      );
-    }
-  }
-
   mod credits_tests {
     use super::*;
 

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_fast/cost.rs

@@ -7,22 +7,21 @@ use crate::generate::generate_video::providers::artcraft::seedance_2p0_fast::req
 //
 // ArtCraft credits: 100 credits = $1.00. Credits always equal USD cents.
 //
-// The per-second USD price varies by resolution.
+// The per-second USD cost varies by resolution. We derive cents from the
+// upstream credit rates and their credit-package prices, then set
+// ArtCraft credits = cents.
 
-/// USD cents per second by resolution.
+/// USD cents per second by resolution, derived from upstream Fast rates:
+///   480p:  10 upstream-credits/sec / 193 upstream-credits/$1 * 100 ~= 5.181 c/s
+///   (historical 193 credits/$1 derivation; the upstream package is now
+///   ~243 credits/$1 but user pricing is intentionally unchanged)
+///   720p:  28 upstream-credits/sec / 220 upstream-credits/$1 * 100 ~= 12.727 c/s
 ///
-/// Kept as f64 because per-second rates are fractional; rounding happens
-/// once at the end after multiplying by duration * batch.
-const CENTS_PER_SECOND_480P: f64 = 7.13;
+/// We keep these as f64 because per-second rates are fractional; rounding
+/// happens once at the end after multiplying by duration * batch.
+const CENTS_PER_SECOND_480P: f64 = 5.181;
 const CENTS_PER_SECOND_720P: f64 = 12.727;
 
-/// USD cents per second, in hundredths of a cent, when one or more
-/// reference videos are attached. Held as integer hundredths so the math is
-/// exact; rounded up to whole cents once, after multiplying by
-/// duration * batch.
-const WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_480P: u64 = 841;
-const WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_720P: u64 = 1_560;
-
 pub struct ArtcraftSeedance2p0FastCostState {
   pub resolution: CommonResolution,
   pub duration_seconds: u16,
@@ -44,19 +43,6 @@ impl ArtcraftSeedance2p0FastCostState {
   }
 
   pub fn estimate_cost(&self) -> VideoGenerationCostEstimate {
-    if self.has_video_reference {
-      let usd_cents = self.with_video_reference_usd_cents();
-      return VideoGenerationCostEstimate {
-        cost_in_credits: Some(usd_cents),
-        cost_in_usd_cents: Some(usd_cents),
-        is_free: false,
-        is_unlimited: false,
-        is_rate_limited: false,
-        has_watermark: false,
-        failures_are_refunded: None,
-      };
-    }
-
     let cents_per_second = match self.resolution {
       CommonResolution::FourEightyP => CENTS_PER_SECOND_480P,
       // Everything else (including 720p and unsupported resolutions) prices at 720p.
@@ -76,30 +62,13 @@ impl ArtcraftSeedance2p0FastCostState {
       failures_are_refunded: None,
     }
   }
-
-  /// Price when one or more reference videos are attached.
-  fn with_video_reference_usd_cents(&self) -> u64 {
-    let centi_cents_per_second = match self.resolution {
-      CommonResolution::FourEightyP => WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_480P,
-      // Everything else (including 720p and unsupported resolutions) prices at 720p.
-      _ => WITH_VIDEO_REFERENCE_CENTI_CENTS_PER_SECOND_720P,
-    };
-
-    let seconds = self.duration_seconds as u64 * self.batch_count as u64;
-
-    // Round up to whole cents.
-    (centi_cents_per_second * seconds).div_ceil(100)
-  }
 }
 
 #[cfg(test)]
 mod tests {
-  use tokens::tokens::media_files::MediaFileToken;
-
   use crate::api::router_resolution::RouterResolution;
   use crate::api::router_video_model::RouterVideoModel;
   use crate::api::router_provider::RouterProvider;
-  use crate::api::video_list_ref::VideoListRef;
   use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
 
   // -- 720p pricing --
@@ -122,13 +91,6 @@ mod tests {
       assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 15, 2), 382);
     }
 
-        #[test]
-    fn batch_3() {
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 4, 3), 153);
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 3), 191);
-      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 15, 3), 573);
-    }
-
     #[test]
     fn batch_4() {
       assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 4, 4), 204);
@@ -149,100 +111,20 @@ mod tests {
 
     #[test]
     fn batch_1() {
-      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 4, 1), 29);
-      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 1), 36);
-      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 10, 1), 71);
-      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 15, 1), 107);
+      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 4, 1), 21);
+      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 1), 26);
+      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 10, 1), 52);
+      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 15, 1), 78);
     }
 
     #[test]
     fn batch_2() {
-      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 2), 71);
-    }
-
-        #[test]
-    fn batch_3() {
-      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 3), 107);
+      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 2), 52);
     }
 
     #[test]
     fn batch_4() {
-      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 4), 143);
-    }
-  }
-
-  // -- With-video-reference pricing --
-
-  mod video_reference_pricing {
-    use super::*;
-
-    #[test]
-    fn table_480p() {
-      let expected = [34, 43, 51, 59, 68, 76, 85, 93, 101, 110, 118, 127];
-      for (i, cents) in expected.iter().enumerate() {
-        let duration = (i + 4) as u16;
-        assert_eq!(
-          cost_cents_with_video_ref(Some(RouterResolution::FourEightyP), duration, 1),
-          *cents,
-          "480p {duration}s",
-        );
-      }
-    }
-
-    #[test]
-    fn table_720p() {
-      let expected = [63, 78, 94, 110, 125, 141, 156, 172, 188, 203, 219, 234];
-      for (i, cents) in expected.iter().enumerate() {
-        let duration = (i + 4) as u16;
-        assert_eq!(
-          cost_cents_with_video_ref(Some(RouterResolution::SevenTwentyP), duration, 1),
-          *cents,
-          "720p {duration}s",
-        );
-      }
-    }
-
-    /// Batches price identically to the equivalent total seconds.
-    #[test]
-    fn batch_multiplies_total_seconds() {
-      assert_eq!(
-        cost_cents_with_video_ref(Some(RouterResolution::FourEightyP), 5, 2),
-        cost_cents_with_video_ref(Some(RouterResolution::FourEightyP), 10, 1),
-      );
-      assert_eq!(
-        cost_cents_with_video_ref(Some(RouterResolution::SevenTwentyP), 5, 2),
-        cost_cents_with_video_ref(Some(RouterResolution::SevenTwentyP), 10, 1),
-      );
-    }
-
-    /// Image and audio references do NOT trigger the with-reference pricing --
-    /// only reference videos do. (The non-reference price is unchanged.)
-    #[test]
-    fn image_and_audio_references_price_as_no_reference() {
-      use crate::api::audio_list_ref::AudioListRef;
-      use crate::api::image_list_ref::ImageListRef;
-
-      let builder = GenerateVideoRequestBuilder {
-        model: RouterVideoModel::Seedance2p0Fast,
-        provider: RouterProvider::Artcraft,
-        resolution: Some(RouterResolution::SevenTwentyP),
-        duration_seconds: Some(5),
-        video_batch_count: Some(1),
-        reference_images: Some(ImageListRef::MediaFileTokens(vec![
-          MediaFileToken::new("mf_img".to_string()),
-        ])),
-        reference_audio: Some(AudioListRef::MediaFileTokens(vec![
-          MediaFileToken::new("mf_audio".to_string()),
-        ])),
-        ..Default::default()
-      };
-      let cents = builder.build2()
-        .expect("build2 should succeed")
-        .estimate_cost()
-        .expect("estimate_cost should succeed")
-        .cost_in_usd_cents
-        .unwrap();
-      assert_eq!(cents, cost_cents(Some(RouterResolution::SevenTwentyP), 5, 1));
+      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 4), 104);
     }
   }
 
@@ -275,76 +157,6 @@ mod tests {
       assert!(b1 < b2);
       assert!(b2 < b4);
     }
-
-    /// A video reference must never make a generation cheaper than the same
-    /// generation without one, at any resolution, duration, or batch size.
-    #[test]
-    fn no_reference_cheaper_than_with_reference() {
-      for resolution in [RouterResolution::FourEightyP, RouterResolution::SevenTwentyP] {
-        for duration in 4..=15u16 {
-          for batch in [1, 2, 4] {
-            let no_ref = cost_cents(Some(resolution), duration, batch);
-            let with_ref = cost_cents_with_video_ref(Some(resolution), duration, batch);
-            assert!(
-              no_ref < with_ref,
-              "{resolution:?} {duration}s batch {batch}: no-ref {no_ref}¢ should be cheaper than with-ref {with_ref}¢",
-            );
-          }
-        }
-      }
-    }
-
-    /// 480p must stay cheaper than 720p in the with-reference rate card too
-    /// (the no-reference case is covered by [`cost_480p_cheaper_than_720p`]).
-    #[test]
-    fn cost_480p_cheaper_than_720p_with_reference() {
-      for duration in 4..=15u16 {
-        let c480 = cost_cents_with_video_ref(Some(RouterResolution::FourEightyP), duration, 1);
-        let c720 = cost_cents_with_video_ref(Some(RouterResolution::SevenTwentyP), duration, 1);
-        assert!(c480 < c720, "{duration}s with-ref: 480p ({c480}¢) should be cheaper than 720p ({c720}¢)");
-      }
-    }
-
-    /// The BytePlus variants are premium tiers: plain Fast must stay cheaper
-    /// at every resolution, duration, and reference configuration.
-    #[test]
-    fn fast_cheaper_than_byteplus_variants() {
-      let premium_models = [
-        RouterVideoModel::Seedance2p0BytePlusFast,
-        RouterVideoModel::Seedance2p0BytePlusUltraFast,
-      ];
-      for premium_model in premium_models {
-        for resolution in [RouterResolution::FourEightyP, RouterResolution::SevenTwentyP] {
-          for with_video_reference in [false, true] {
-            for duration in 4..=15u16 {
-              let plain = model_cost_cents(RouterVideoModel::Seedance2p0Fast, resolution, duration, 1, with_video_reference);
-              let premium = model_cost_cents(premium_model, resolution, duration, 1, with_video_reference);
-              assert!(
-                plain < premium,
-                "{premium_model:?} {resolution:?} {duration}s ref={with_video_reference}: plain Fast ({plain}¢) should be cheaper than the premium tier ({premium}¢)",
-              );
-            }
-          }
-        }
-      }
-    }
-
-    /// BytePlus Fast and BytePlus Ultra Fast share one rate card.
-    #[test]
-    fn byteplus_fast_and_ultra_fast_price_identically() {
-      for resolution in [RouterResolution::FourEightyP, RouterResolution::SevenTwentyP] {
-        for with_video_reference in [false, true] {
-          for duration in 4..=15u16 {
-            let bp = model_cost_cents(RouterVideoModel::Seedance2p0BytePlusFast, resolution, duration, 1, with_video_reference);
-            let bpu = model_cost_cents(RouterVideoModel::Seedance2p0BytePlusUltraFast, resolution, duration, 1, with_video_reference);
-            assert_eq!(
-              bp, bpu,
-              "{resolution:?} {duration}s ref={with_video_reference}: BytePlus Fast ({bp}¢) and Ultra Fast ({bpu}¢) should price identically",
-            );
-          }
-        }
-      }
-    }
   }
 
   // -- Credits equal cents --
@@ -404,57 +216,4 @@ mod tests {
       .cost_in_usd_cents
       .unwrap()
   }
-
-  /// Like [`cost_cents`], with one reference video attached.
-  fn cost_cents_with_video_ref(
-    resolution: Option<RouterResolution>,
-    duration_seconds: u16,
-    video_batch_count: u16,
-  ) -> u64 {
-    let builder = GenerateVideoRequestBuilder {
-      model: RouterVideoModel::Seedance2p0Fast,
-      provider: RouterProvider::Artcraft,
-      resolution,
-      duration_seconds: Some(duration_seconds),
-      video_batch_count: Some(video_batch_count),
-      reference_videos: Some(VideoListRef::MediaFileTokens(vec![
-        MediaFileToken::new("mf_ref".to_string()),
-      ])),
-      ..Default::default()
-    };
-    builder.build2()
-      .expect("build2 should succeed")
-      .estimate_cost()
-      .expect("estimate_cost should succeed")
-      .cost_in_usd_cents
-      .unwrap()
-  }
-
-  /// Like [`cost_cents`], for any Fast-tier model and reference configuration.
-  fn model_cost_cents(
-    model: RouterVideoModel,
-    resolution: RouterResolution,
-    duration_seconds: u16,
-    video_batch_count: u16,
-    with_video_reference: bool,
-  ) -> u64 {
-    let reference_videos = with_video_reference.then(|| VideoListRef::MediaFileTokens(vec![
-      MediaFileToken::new("mf_ref".to_string()),
-    ]));
-    let builder = GenerateVideoRequestBuilder {
-      model,
-      provider: RouterProvider::Artcraft,
-      resolution: Some(resolution),
-      duration_seconds: Some(duration_seconds),
-      video_batch_count: Some(video_batch_count),
-      reference_videos,
-      ..Default::default()
-    };
-    builder.build2()
-      .expect("build2 should succeed")
-      .estimate_cost()
-      .expect("estimate_cost should succeed")
-      .cost_in_usd_cents
-      .unwrap()
-  }
 }

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_mini/build.rs

@@ -3,28 +3,21 @@ use enums::common::generation::common_video_model::CommonVideoModel as CommonVid
 use crate::errors::artcraft_router_error::ArtcraftRouterError;
 use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
 use crate::generate::generate_video::providers::artcraft::build_common::{
-  build_artcraft_omni_video_request, plan_mini_batch_count, SupportedResolutions, UltraWideSupport,
+  build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport,
 };
 use crate::generate::generate_video::providers::artcraft::seedance_2p0_mini::request::ArtcraftSeedance2p0MiniRequestState;
 use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
 use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
 
-pub fn build_artcraft_seedance_2p0_mini(mut builder: GenerateVideoRequestBuilder) -> Result<VideoGenerationDraftOrRequest, ArtcraftRouterError> {
+pub fn build_artcraft_seedance_2p0_mini(builder: GenerateVideoRequestBuilder) -> Result<VideoGenerationDraftOrRequest, ArtcraftRouterError> {
   // Seedance 2.0 Mini supports 480p and 720p only (higher resolutions downgrade
   // to 720p), and all six aspect ratios including 21:9.
-  // Mini supports batches of 1-8, wider than the shared 1/2/4 planning.
-  // Take the batch out before the shared build and set it after.
-  let strategy = builder.request_mismatch_mitigation_strategy;
-  let batch_count = plan_mini_batch_count(builder.video_batch_count.take(), strategy)?;
-
-  let mut request = build_artcraft_omni_video_request(
+  let request = build_artcraft_omni_video_request(
     builder,
     CommonVideoModelEnum::Seedance2p0Mini,
     SupportedResolutions::Fast,
     UltraWideSupport::Supported,
   )?;
-  request.video_batch_count = Some(batch_count);
-
   let state = ArtcraftSeedance2p0MiniRequestState { request };
   Ok(VideoGenerationDraftOrRequest::Request(VideoGenerationRequest::ArtcraftSeedance2p0Mini(state)))
 }
@@ -87,18 +80,10 @@ mod tests {
     }
 
     #[test]
-    fn batch_count_up_to_eight_passed_through() {
-      // Mini supports batches of 1-8; execution and billing must agree.
-      for batch in 1..=8u16 {
-        let req = unwrap_request(builder_with(move |b| { b.video_batch_count = Some(batch); }));
-        assert_eq!(req.request.video_batch_count, Some(batch));
-      }
-    }
-
-    #[test]
-    fn batch_count_above_eight_clamps_to_eight() {
-      let req = unwrap_request(builder_with(|b| { b.video_batch_count = Some(9); }));
-      assert_eq!(req.request.video_batch_count, Some(8));
+    fn batch_count_clamped_to_platform_max() {
+      // The ArtCraft platform caps batch at 4 and downgrades higher requests.
+      let req = unwrap_request(builder_with(|b| { b.video_batch_count = Some(8); }));
+      assert_eq!(req.request.video_batch_count, Some(4));
     }
 
     #[test]

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_mini/cost.rs

@@ -65,18 +65,18 @@ mod tests {
 
     #[test]
     fn without_video_reference() {
-      assert_eq!(cents(RouterResolution::FourEightyP, 4, 1, false), 14);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 1, false), 18);
-      assert_eq!(cents(RouterResolution::FourEightyP, 10, 1, false), 35);
-      assert_eq!(cents(RouterResolution::FourEightyP, 15, 1, false), 52);
+      assert_eq!(cents(RouterResolution::FourEightyP, 4, 1, false), 13);
+      assert_eq!(cents(RouterResolution::FourEightyP, 5, 1, false), 17);
+      assert_eq!(cents(RouterResolution::FourEightyP, 10, 1, false), 33);
+      assert_eq!(cents(RouterResolution::FourEightyP, 15, 1, false), 49);
     }
 
     #[test]
     fn with_video_reference() {
-      assert_eq!(cents(RouterResolution::FourEightyP, 4, 1, true), 18);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 1, true), 22);
-      assert_eq!(cents(RouterResolution::FourEightyP, 10, 1, true), 44);
-      assert_eq!(cents(RouterResolution::FourEightyP, 15, 1, true), 66);
+      assert_eq!(cents(RouterResolution::FourEightyP, 4, 1, true), 17);
+      assert_eq!(cents(RouterResolution::FourEightyP, 5, 1, true), 21);
+      assert_eq!(cents(RouterResolution::FourEightyP, 10, 1, true), 42);
+      assert_eq!(cents(RouterResolution::FourEightyP, 15, 1, true), 62);
     }
   }
 
@@ -85,18 +85,18 @@ mod tests {
 
     #[test]
     fn without_video_reference() {
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 4, 1, false), 36);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 1, false), 45);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 10, 1, false), 89);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 15, 1, false), 134);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 4, 1, false), 35);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 1, false), 44);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 10, 1, false), 87);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 15, 1, false), 130);
     }
 
     #[test]
     fn with_video_reference() {
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 4, 1, true), 43);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 1, true), 54);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 10, 1, true), 108);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 15, 1, true), 161);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 4, 1, true), 42);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 1, true), 52);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 10, 1, true), 104);
+      assert_eq!(cents(RouterResolution::SevenTwentyP, 15, 1, true), 156);
     }
 
     #[test]
@@ -105,49 +105,6 @@ mod tests {
     }
   }
 
-  mod batch_pricing {
-    use super::*;
-
-    /// Mini bills batches of 1-8 in full (the platform's 1/2/4 cap does not
-    /// apply). Once, batch 8 executed in full but billed as batch 4.
-    #[test]
-    fn every_batch_size_720p_5s() {
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 1, false), 45);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 2, false), 89);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 3, false), 134);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 4, false), 178);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 5, false), 223);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 6, false), 267);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 7, false), 312);
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 8, false), 356);
-    }
-
-    #[test]
-    fn every_batch_size_480p_5s() {
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 1, false), 18);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 2, false), 35);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 3, false), 52);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 4, false), 69);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 5, false), 87);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 6, false), 104);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 7, false), 121);
-      assert_eq!(cents(RouterResolution::FourEightyP, 5, 8, false), 138);
-    }
-
-    #[test]
-    fn batch_eight_with_video_reference() {
-      assert_eq!(cents(RouterResolution::SevenTwentyP, 5, 8, true), 429);
-    }
-
-    #[test]
-    fn batch_above_eight_clamps_to_eight() {
-      assert_eq!(
-        cents(RouterResolution::SevenTwentyP, 5, 9, false),
-        cents(RouterResolution::SevenTwentyP, 5, 8, false),
-      );
-    }
-  }
-
   mod credits_tests {
     use super::*;
 

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_u/build.rs

@@ -0,0 +1,189 @@
+use enums::common::generation::common_video_model::CommonVideoModel as CommonVideoModelEnum;
+
+use crate::errors::artcraft_router_error::ArtcraftRouterError;
+use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
+use crate::generate::generate_video::providers::artcraft::build_common::{
+  build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport,
+};
+use crate::generate::generate_video::providers::artcraft::seedance_2p0_u::request::ArtcraftSeedance2p0UltraRequestState;
+use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
+
+pub fn build_artcraft_seedance_2p0_u(builder: GenerateVideoRequestBuilder) -> Result<VideoGenerationDraftOrRequest, ArtcraftRouterError> {
+  let request = build_artcraft_omni_video_request(
+    builder,
+    CommonVideoModelEnum::Seedance2p0Ultra,
+    SupportedResolutions::FullWith4k,
+    UltraWideSupport::Supported,
+  )?;
+  let state = ArtcraftSeedance2p0UltraRequestState { request };
+  Ok(VideoGenerationDraftOrRequest::Request(VideoGenerationRequest::ArtcraftSeedance2p0Ultra(state)))
+}
+
+#[cfg(test)]
+mod tests {
+  use enums::common::generation::common_resolution::CommonResolution as CommonResolutionEnum;
+  use enums::common::generation::common_video_model::CommonVideoModel as CommonVideoModelEnum;
+  use enums::common::generation::common_bitrate::CommonBitrate as CommonBitrateEnum;
+  use crate::api::router_bitrate::RouterBitrate;
+  use tokens::tokens::characters::CharacterToken;
+  use tokens::tokens::media_files::MediaFileToken;
+
+  use crate::api::character_list_ref::CharacterListRef;
+  use crate::api::router_resolution::RouterResolution;
+  use crate::api::image_list_ref::ImageListRef;
+  use crate::api::image_ref::ImageRef;
+  use crate::api::router_provider::RouterProvider;
+  use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
+  use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+  use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
+
+  use super::*;
+
+  // ── Field conversions ──
+
+  mod field_conversions {
+    use super::*;
+
+    #[test]
+    fn model_is_seedance_2p0() {
+      let req = unwrap_request(make_builder(|_| {}));
+      assert!(matches!(req.request.model, Some(CommonVideoModelEnum::Seedance2p0Ultra)));
+    }
+
+    #[test]
+    fn prompt_passed_through() {
+      let req = unwrap_request(make_builder(|b| { b.prompt = Some("test".to_string()); }));
+      assert_eq!(req.request.prompt, Some("test".to_string()));
+    }
+
+    #[test]
+    fn duration_passed_through() {
+      let req = unwrap_request(make_builder(|b| { b.duration_seconds = Some(10); }));
+      assert_eq!(req.request.duration_seconds, Some(10));
+    }
+
+    #[test]
+    fn duration_clamped_to_max() {
+      let req = unwrap_request(make_builder(|b| { b.duration_seconds = Some(99); }));
+      assert_eq!(req.request.duration_seconds, Some(15));
+    }
+
+    #[test]
+    fn batch_count_passed_through() {
+      let req = unwrap_request(make_builder(|b| { b.video_batch_count = Some(4); }));
+      assert_eq!(req.request.video_batch_count, Some(4));
+    }
+
+    #[test]
+    fn bitrate_passed_through() {
+      let req = unwrap_request(make_builder(|b| { b.bitrate = Some(RouterBitrate::High); }));
+      assert_eq!(req.request.bitrate, Some(CommonBitrateEnum::High));
+    }
+  }
+
+  // ── Resolution ──
+
+  mod resolution_tests {
+    use super::*;
+
+    #[test]
+    fn res_480p() {
+      let req = unwrap_request(make_builder(|b| { b.resolution = Some(RouterResolution::FourEightyP); }));
+      assert_eq!(req.request.resolution, Some(CommonResolutionEnum::FourEightyP));
+    }
+
+    #[test]
+    fn res_720p() {
+      let req = unwrap_request(make_builder(|b| { b.resolution = Some(RouterResolution::SevenTwentyP); }));
+      assert_eq!(req.request.resolution, Some(CommonResolutionEnum::SevenTwentyP));
+    }
+
+    #[test]
+    fn res_1080p() {
+      let req = unwrap_request(make_builder(|b| { b.resolution = Some(RouterResolution::TenEightyP); }));
+      assert_eq!(req.request.resolution, Some(CommonResolutionEnum::TenEightyP));
+    }
+
+    #[test]
+    fn res_4k() {
+      let req = unwrap_request(make_builder(|b| { b.resolution = Some(RouterResolution::FourK); }));
+      assert_eq!(req.request.resolution, Some(CommonResolutionEnum::FourK));
+    }
+
+    #[test]
+    fn none_stays_none() {
+      let req = unwrap_request(make_builder(|_| {}));
+      assert!(req.request.resolution.is_none());
+    }
+  }
+
+  // ── Media tokens ──
+
+  mod media_token_tests {
+    use super::*;
+
+    #[test]
+    fn start_frame_token_passed_through() {
+      let token = MediaFileToken::new("mf_start".to_string());
+      let req = unwrap_request(make_builder(|b| {
+        b.start_frame = Some(ImageRef::MediaFileToken(token.clone()));
+      }));
+      assert_eq!(req.request.start_frame_image_media_token, Some(token));
+    }
+
+    #[test]
+    fn url_start_frame_rejected() {
+      let result = build_artcraft_seedance_2p0_u(GenerateVideoRequestBuilder {
+        start_frame: Some(ImageRef::Url("https://example.com".to_string())),
+        ..base_builder()
+      });
+      assert!(result.is_err());
+    }
+
+    #[test]
+    fn reference_image_tokens_passed_through() {
+      let tokens = vec![MediaFileToken::new("mf_a".to_string()), MediaFileToken::new("mf_b".to_string())];
+      let req = unwrap_request(make_builder(|b| {
+        b.reference_images = Some(ImageListRef::MediaFileTokens(tokens.clone()));
+      }));
+      assert_eq!(req.request.reference_image_media_tokens, Some(tokens));
+    }
+
+    #[test]
+    fn character_tokens_passed_through() {
+      let tokens = vec![CharacterToken::new("char_a".to_string()), CharacterToken::new("char_b".to_string())];
+      let req = unwrap_request(make_builder(|b| {
+        b.reference_character_tokens = Some(CharacterListRef::CharacterTokens(tokens.clone()));
+      }));
+      assert_eq!(req.request.reference_character_tokens, Some(tokens));
+    }
+  }
+
+  // ── Helpers ──
+
+  fn base_builder() -> GenerateVideoRequestBuilder {
+    GenerateVideoRequestBuilder {
+      provider: RouterProvider::Artcraft,
+      duration_seconds: Some(5),
+      video_batch_count: Some(1),
+      ..Default::default()
+    }
+  }
+
+  fn make_builder(f: impl FnOnce(&mut GenerateVideoRequestBuilder)) -> GenerateVideoRequestBuilder {
+    let mut builder = base_builder();
+    f(&mut builder);
+    builder
+  }
+
+  fn unwrap_request(builder: GenerateVideoRequestBuilder) -> ArtcraftSeedance2p0UltraRequestState {
+    let result = build_artcraft_seedance_2p0_u(builder).expect("build should succeed");
+    match result {
+      VideoGenerationDraftOrRequest::Request(
+        VideoGenerationRequest::ArtcraftSeedance2p0Ultra(state)
+      ) => state,
+      _ => panic!("expected ArtcraftSeedance2p0 request"),
+    }
+  }
+}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_u/cost.rs

@@ -0,0 +1,237 @@
+use enums::common::generation::common_resolution::CommonResolution;
+
+use crate::generate::generate_video::providers::artcraft::seedance_common::seedance_2p0_four_k_usd_cents;
+use crate::generate::generate_video::providers::artcraft::seedance_2p0_u::request::ArtcraftSeedance2p0UltraRequestState;
+use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
+
+// ── Pricing constants ──
+
+const CENTS_PER_SECOND_480P: f64 = 5.4404;
+const CENTS_PER_SECOND_720P: f64 = 11.2;
+const CENTS_PER_SECOND_1080P: f64 = 32.6424;
+
+pub struct ArtcraftSeedance2p0UltraCostState {
+  pub resolution: CommonResolution,
+  pub duration_seconds: u16,
+  pub batch_count: u16,
+  pub has_video_reference: bool,
+}
+
+impl ArtcraftSeedance2p0UltraCostState {
+  pub fn from_request(request: &ArtcraftSeedance2p0UltraRequestState) -> Self {
+    let resolution = request.request.resolution
+      .unwrap_or(CommonResolution::SevenTwentyP);
+    let duration_seconds = request.request.duration_seconds.unwrap_or(5);
+    let batch_count = request.request.video_batch_count.unwrap_or(1);
+    let has_video_reference = request.request.reference_video_media_tokens
+      .as_ref()
+      .is_some_and(|tokens| !tokens.is_empty());
+
+    Self { resolution, duration_seconds, batch_count, has_video_reference }
+  }
+
+  pub fn estimate_cost(&self) -> VideoGenerationCostEstimate {
+    if self.resolution == CommonResolution::FourK {
+      let usd_cents = seedance_2p0_four_k_usd_cents(
+        self.duration_seconds,
+        self.batch_count,
+        self.has_video_reference,
+      );
+      return VideoGenerationCostEstimate {
+        cost_in_credits: Some(usd_cents),
+        cost_in_usd_cents: Some(usd_cents),
+        is_free: false,
+        is_unlimited: false,
+        is_rate_limited: false,
+        has_watermark: false,
+        failures_are_refunded: None,
+      };
+    }
+
+    let cents_per_second = match self.resolution {
+      CommonResolution::FourEightyP => CENTS_PER_SECOND_480P,
+      CommonResolution::TenEightyP => CENTS_PER_SECOND_1080P,
+      _ => CENTS_PER_SECOND_720P,
+    };
+
+    let cents_per_video = (cents_per_second * self.duration_seconds as f64).ceil() as u64;
+    let usd_cents = cents_per_video * self.batch_count as u64;
+
+    VideoGenerationCostEstimate {
+      cost_in_credits: Some(usd_cents),
+      cost_in_usd_cents: Some(usd_cents),
+      is_free: false,
+      is_unlimited: false,
+      is_rate_limited: false,
+      has_watermark: false,
+      failures_are_refunded: None,
+    }
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use crate::api::router_provider::RouterProvider;
+  use crate::api::router_resolution::RouterResolution;
+  use crate::api::router_video_model::RouterVideoModel;
+  use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
+
+  mod pricing_720p {
+    use super::*;
+
+    #[test]
+    fn batch_1() {
+      // 11.2 * 5 = 56¢
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 1), 56);
+      // 11.2 * 10 = 112¢
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 10, 1), 112);
+      // 11.2 * 15 = 168¢
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 15, 1), 168);
+    }
+
+    #[test]
+    fn batch_2() {
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 2), 112);
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 10, 2), 224);
+    }
+
+    #[test]
+    fn batch_4() {
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 4), 224);
+    }
+
+    #[test]
+    fn none_defaults_to_720p() {
+      assert_eq!(cost_cents(None, 10, 1), cost_cents(Some(RouterResolution::SevenTwentyP), 10, 1));
+    }
+  }
+
+  mod pricing_480p {
+    use super::*;
+
+    #[test]
+    fn batch_1() {
+      // 5.4404 * 5 = 27.202 → ceil = 28¢
+      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 1), 28);
+      // 5.4404 * 10 = 54.404 → ceil = 55¢
+      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 10, 1), 55);
+      // 5.4404 * 15 = 81.606 → ceil = 82¢
+      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 15, 1), 82);
+    }
+
+    #[test]
+    fn batch_4() {
+      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 10, 4), 220);
+    }
+  }
+
+  mod pricing_1080p {
+    use super::*;
+
+    #[test]
+    fn batch_1() {
+      // 32.6424 * 5 = 163.212 → ceil = 164¢
+      assert_eq!(cost_cents(Some(RouterResolution::TenEightyP), 5, 1), 164);
+      // 32.6424 * 10 = 326.424 → ceil = 327¢
+      assert_eq!(cost_cents(Some(RouterResolution::TenEightyP), 10, 1), 327);
+      // 32.6424 * 15 = 489.636 → ceil = 490¢
+      assert_eq!(cost_cents(Some(RouterResolution::TenEightyP), 15, 1), 490);
+    }
+
+    #[test]
+    fn batch_4() {
+      assert_eq!(cost_cents(Some(RouterResolution::TenEightyP), 10, 4), 1308);
+    }
+  }
+
+  mod four_k_pricing {
+    use enums::common::generation::common_resolution::CommonResolution;
+
+    fn artcraft_4k_cents(duration_seconds: u16, batch_count: u16, has_video_reference: bool) -> u64 {
+      super::super::ArtcraftSeedance2p0UltraCostState {
+        resolution: CommonResolution::FourK,
+        duration_seconds,
+        batch_count,
+        has_video_reference,
+      }
+      .estimate_cost()
+      .cost_in_usd_cents
+      .unwrap()
+    }
+
+    #[test]
+    fn explicit_4k_without_video_reference() {
+      assert_eq!(artcraft_4k_cents(4, 1, false), 347);
+      assert_eq!(artcraft_4k_cents(5, 1, false), 433);
+      assert_eq!(artcraft_4k_cents(10, 1, false), 866);
+      assert_eq!(artcraft_4k_cents(15, 1, false), 1299);
+    }
+
+    #[test]
+    fn explicit_4k_with_video_reference() {
+      assert_eq!(artcraft_4k_cents(4, 1, true), 416);
+      assert_eq!(artcraft_4k_cents(5, 1, true), 519);
+      assert_eq!(artcraft_4k_cents(10, 1, true), 1038);
+      assert_eq!(artcraft_4k_cents(15, 1, true), 1557);
+    }
+  }
+
+  mod relative_pricing {
+    use super::*;
+
+    #[test]
+    fn cost_480p_cheaper_than_720p_cheaper_than_1080p() {
+      let c480 = cost_cents(Some(RouterResolution::FourEightyP), 10, 1);
+      let c720 = cost_cents(Some(RouterResolution::SevenTwentyP), 10, 1);
+      let c1080 = cost_cents(Some(RouterResolution::TenEightyP), 10, 1);
+      assert!(c480 < c720);
+      assert!(c720 < c1080);
+    }
+
+    #[test]
+    fn cost_scales_with_duration() {
+      let c5 = cost_cents(None, 5, 1);
+      let c10 = cost_cents(None, 10, 1);
+      let c15 = cost_cents(None, 15, 1);
+      assert!(c5 < c10);
+      assert!(c10 < c15);
+    }
+
+    #[test]
+    fn cost_scales_with_batch() {
+      let b1 = cost_cents(None, 10, 1);
+      let b2 = cost_cents(None, 10, 2);
+      let b4 = cost_cents(None, 10, 4);
+      assert!(b1 < b2);
+      assert!(b2 < b4);
+    }
+
+    #[test]
+    fn credits_equal_usd_cents() {
+      let cost = build_cost(None, 10, 1);
+      assert_eq!(cost.cost_in_credits, cost.cost_in_usd_cents);
+    }
+  }
+
+  // -- Helpers --
+
+  fn build_cost(
+    resolution: Option<RouterResolution>,
+    duration_seconds: u16,
+    video_batch_count: u16,
+  ) -> crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate {
+    let builder = GenerateVideoRequestBuilder {
+      model: RouterVideoModel::Seedance2p0Ultra,
+      provider: RouterProvider::Artcraft,
+      resolution,
+      duration_seconds: Some(duration_seconds),
+      video_batch_count: Some(video_batch_count),
+      ..Default::default()
+    };
+    builder.build2().expect("build2").estimate_cost().expect("estimate_cost")
+  }
+
+  fn cost_cents(resolution: Option<RouterResolution>, duration_seconds: u16, batch: u16) -> u64 {
+    build_cost(resolution, duration_seconds, batch).cost_in_usd_cents.unwrap()
+  }
+}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_u/request.rs

@@ -0,0 +1,237 @@
+use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost_and_generate_request::OmniGenVideoCostAndGenerateRequest;
+
+use crate::client::router_artcraft_client::RouterArtcraftClient;
+use crate::errors::artcraft_router_error::ArtcraftRouterError;
+use crate::generate::generate_video::generate_video_response::GenerateVideoResponse;
+use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request;
+
+#[derive(Clone, Debug)]
+pub struct ArtcraftSeedance2p0UltraRequestState {
+  pub request: OmniGenVideoCostAndGenerateRequest,
+}
+
+impl ArtcraftSeedance2p0UltraRequestState {
+  pub async fn send(&self, client: &RouterArtcraftClient) -> Result<GenerateVideoResponse, ArtcraftRouterError> {
+    send_artcraft_omni_video_request(&self.request, client).await
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use tokens::tokens::characters::CharacterToken;
+  use tokens::tokens::media_files::MediaFileToken;
+
+  use crate::api::character_list_ref::CharacterListRef;
+  use crate::api::router_aspect_ratio::RouterAspectRatio;
+  use crate::api::router_resolution::RouterResolution;
+  use crate::api::image_list_ref::ImageListRef;
+  use crate::api::image_ref::ImageRef;
+  use crate::api::router_provider::RouterProvider;
+  use crate::client::router_artcraft_client::RouterArtcraftClient;
+  use crate::client::router_client::RouterClient;
+  use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
+  use crate::generate::generate_video::generate_video_response::GenerateVideoResponse;
+  use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+  use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
+  use artcraft_client::utils::api_host::ApiHost;
+
+  use test_data::web::character_tokens::{JIM, KNIGHT};
+  use test_data::web::image_media_tokens::{
+    FOREST_BACKDROP_PRODUCTION_MEDIA_TOKEN,
+    JUNO_AT_LAKE_PRODUCTION_MEDIA_TOKEN,
+    WHITE_HOUSE_SUNSET_PRODUCTION_MEDIA_TOKEN,
+  };
+
+  // -- Aspect ratio tests --
+
+  mod aspect_ratio_tests {
+    use super::*;
+
+    #[tokio::test]
+    #[ignore]
+    async fn landscape() {
+      let response = run_pipeline(GenerateVideoRequestBuilder {
+        prompt: Some("A corgi running through a field of wildflowers at sunset.".to_string()),
+        aspect_ratio: Some(RouterAspectRatio::WideSixteenByNine),
+        ..artcraft_builder()
+      }).await;
+      assert!(matches!(response, GenerateVideoResponse::Artcraft(_)));
+      assert_eq!(1, 2, "Inspect output above");
+    }
+
+    #[tokio::test]
+    #[ignore]
+    async fn portrait() {
+      let response = run_pipeline(GenerateVideoRequestBuilder {
+        prompt: Some("A cat sitting on a windowsill watching rain.".to_string()),
+        aspect_ratio: Some(RouterAspectRatio::TallNineBySixteen),
+        ..artcraft_builder()
+      }).await;
+      assert!(matches!(response, GenerateVideoResponse::Artcraft(_)));
+      assert_eq!(1, 2, "Inspect output above");
+    }
+
+    #[tokio::test]
+    #[ignore]
+    async fn square() {
+      let response = run_pipeline(GenerateVideoRequestBuilder {
+        prompt: Some("A hummingbird hovering near a flower.".to_string()),
+        aspect_ratio: Some(RouterAspectRatio::Square),
+        ..artcraft_builder()
+      }).await;
+      assert!(matches!(response, GenerateVideoResponse::Artcraft(_)));
+      assert_eq!(1, 2, "Inspect output above");
+    }
+  }
+
+  // -- Resolution tests --
+
+  mod resolution_tests {
+    use super::*;
+
+    #[tokio::test]
+    #[ignore]
+    async fn res_480p() {
+      let response = run_pipeline(GenerateVideoRequestBuilder {
+        prompt: Some("A shiba inu playing in autumn leaves.".to_string()),
+        resolution: Some(RouterResolution::FourEightyP),
+        ..artcraft_builder()
+      }).await;
+      assert!(matches!(response, GenerateVideoResponse::Artcraft(_)));
+      assert_eq!(1, 2, "Inspect output above");
+    }
+
+    #[tokio::test]
+    #[ignore]
+    async fn res_720p() {
+      let response = run_pipeline(GenerateVideoRequestBuilder {
+        prompt: Some("A golden retriever catching a frisbee on the beach.".to_string()),
+        resolution: Some(RouterResolution::SevenTwentyP),
+        ..artcraft_builder()
+      }).await;
+      assert!(matches!(response, GenerateVideoResponse::Artcraft(_)));
+      assert_eq!(1, 2, "Inspect output above");
+    }
+
+    #[tokio::test]
+    #[ignore]
+    async fn res_1080p() {
+      let response = run_pipeline(GenerateVideoRequestBuilder {
+        prompt: Some("A fox walking through a snowy forest.".to_string()),
+        resolution: Some(RouterResolution::TenEightyP),
+        ..artcraft_builder()
+      }).await;
+      assert!(matches!(response, GenerateVideoResponse::Artcraft(_)));
+      assert_eq!(1, 2, "Inspect output above");
+    }
+  }
+
+  // -- Modality tests --
+
+  mod modality_tests {
+    use super::*;
+    use test_data::web::image_media_tokens::TALL_MOCHI_WITH_GLASSES_PRODUCTION_MEDIA_TOKEN;
+
+    #[tokio::test]
+    #[ignore]
+    async fn text_to_video() {
+      let response = run_pipeline(GenerateVideoRequestBuilder {
+        prompt: Some("A whale breaching in the open ocean at dawn, cinematic.".to_string()),
+        aspect_ratio: Some(RouterAspectRatio::WideSixteenByNine),
+        ..artcraft_builder()
+      }).await;
+      assert!(matches!(response, GenerateVideoResponse::Artcraft(_)));
+      assert_eq!(1, 2, "Inspect output above");
+    }
+
+    #[tokio::test]
+    #[ignore]
+    async fn keyframe_start_and_end_frame() {
+      let response = run_pipeline(GenerateVideoRequestBuilder {
+        prompt: Some("The dog walks from the lake to the forest.".to_string()),
+        start_frame: Some(ImageRef::MediaFileToken(MediaFileToken::new(JUNO_AT_LAKE_PRODUCTION_MEDIA_TOKEN.to_string()))),
+        end_frame: Some(ImageRef::MediaFileToken(MediaFileToken::new(FOREST_BACKDROP_PRODUCTION_MEDIA_TOKEN.to_string()))),
+        aspect_ratio: Some(RouterAspectRatio::WideSixteenByNine),
+        ..artcraft_builder()
+      }).await;
+      assert!(matches!(response, GenerateVideoResponse::Artcraft(_)));
+      assert_eq!(1, 2, "Inspect output above");
+    }
+
+    #[tokio::test]
+    #[ignore]
+    async fn image_references() {
+      let response = run_pipeline(GenerateVideoRequestBuilder {
+        prompt: Some("The dog in @2 runs through the scenery in @1 towards the building in @3.".to_string()),
+        reference_images: Some(ImageListRef::MediaFileTokens(vec![
+          MediaFileToken::new(FOREST_BACKDROP_PRODUCTION_MEDIA_TOKEN.to_string()),
+          MediaFileToken::new(TALL_MOCHI_WITH_GLASSES_PRODUCTION_MEDIA_TOKEN.to_string()),
+          MediaFileToken::new(WHITE_HOUSE_SUNSET_PRODUCTION_MEDIA_TOKEN.to_string()),
+        ])),
+        aspect_ratio: Some(RouterAspectRatio::WideSixteenByNine),
+        ..artcraft_builder()
+      }).await;
+      assert!(matches!(response, GenerateVideoResponse::Artcraft(_)));
+      assert_eq!(1, 2, "Inspect output above");
+    }
+
+    #[tokio::test]
+    #[ignore]
+    async fn character_references() {
+      let response = run_pipeline(GenerateVideoRequestBuilder {
+        prompt: Some("@Jim and @Knight are sparring in a medieval arena.".to_string()),
+        reference_character_tokens: Some(CharacterListRef::CharacterTokens(vec![
+          CharacterToken::new(JIM.token.to_string()),
+          CharacterToken::new(KNIGHT.token.to_string()),
+        ])),
+        aspect_ratio: Some(RouterAspectRatio::WideSixteenByNine),
+        ..artcraft_builder()
+      }).await;
+      assert!(matches!(response, GenerateVideoResponse::Artcraft(_)));
+      assert_eq!(1, 2, "Inspect output above");
+    }
+  }
+
+  // -- Helpers --
+
+  fn artcraft_builder() -> GenerateVideoRequestBuilder {
+    GenerateVideoRequestBuilder {
+      provider: RouterProvider::Artcraft,
+      duration_seconds: Some(4),
+      video_batch_count: Some(1),
+      ..Default::default()
+    }
+  }
+
+  fn get_artcraft_client() -> RouterClient {
+    let cookies = std::fs::read_to_string("/Users/bt/Artcraft/credentials/artcraft_cookies.txt")
+      .expect("Failed to read artcraft cookies");
+    let cookies = cookies.trim().to_string();
+    let credentials = StorytellerCredentialSet::parse_multi_cookie_header(&cookies)
+      .expect("Failed to parse cookies")
+      .expect("No credentials found");
+    RouterClient::Artcraft(RouterArtcraftClient::new(ApiHost::Storyteller, credentials))
+  }
+
+  async fn run_pipeline(builder: GenerateVideoRequestBuilder) -> GenerateVideoResponse {
+    let client = get_artcraft_client();
+
+    let draft_or_request = builder.build2().expect("build2 should succeed");
+    let request = match draft_or_request {
+      VideoGenerationDraftOrRequest::Request(r) => r,
+      _ => panic!("expected Request variant (Artcraft skips draft)"),
+    };
+
+    let response = request.send_request(&client).await.expect("send_request should succeed");
+
+    match &response {
+      GenerateVideoResponse::Artcraft(p) => {
+        println!("inference_job_token={:?}", p.inference_job_token);
+        println!("all_inference_job_tokens={:?}", p.all_inference_job_tokens);
+      }
+      other => println!("response: {:?}", other),
+    }
+
+    response
+  }
+}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_u_fast/build.rs

@@ -0,0 +1,253 @@
+use enums::common::generation::common_video_model::CommonVideoModel as CommonVideoModelEnum;
+
+use crate::errors::artcraft_router_error::ArtcraftRouterError;
+use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
+use crate::generate::generate_video::providers::artcraft::build_common::{
+  build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport,
+};
+use crate::generate::generate_video::providers::artcraft::seedance_2p0_u_fast::request::ArtcraftSeedance2p0UltraFastRequestState;
+use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
+
+pub fn build_artcraft_seedance_2p0_u_fast(builder: GenerateVideoRequestBuilder) -> Result<VideoGenerationDraftOrRequest, ArtcraftRouterError> {
+  let request = build_artcraft_omni_video_request(
+    builder,
+    CommonVideoModelEnum::Seedance2p0UltraFast,
+    SupportedResolutions::Fast,
+    UltraWideSupport::Supported,
+  )?;
+  let state = ArtcraftSeedance2p0UltraFastRequestState { request };
+  Ok(VideoGenerationDraftOrRequest::Request(VideoGenerationRequest::ArtcraftSeedance2p0UltraFast(state)))
+}
+
+#[cfg(test)]
+mod tests {
+  use enums::common::generation::common_aspect_ratio::CommonAspectRatio as CommonAspectRatioEnum;
+  use enums::common::generation::common_resolution::CommonResolution as CommonResolutionEnum;
+  use enums::common::generation::common_video_model::CommonVideoModel as CommonVideoModelEnum;
+  use enums::common::generation::common_bitrate::CommonBitrate as CommonBitrateEnum;
+  use crate::api::router_bitrate::RouterBitrate;
+  use tokens::tokens::characters::CharacterToken;
+  use tokens::tokens::media_files::MediaFileToken;
+
+  use crate::api::character_list_ref::CharacterListRef;
+  use crate::api::router_aspect_ratio::RouterAspectRatio;
+  use crate::api::router_resolution::RouterResolution;
+  use crate::api::router_video_model::RouterVideoModel;
+  use crate::api::image_list_ref::ImageListRef;
+  use crate::api::image_ref::ImageRef;
+  use crate::api::router_provider::RouterProvider;
+  use crate::api::video_list_ref::VideoListRef;
+  use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
+  use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
+  use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+  use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
+
+  use super::*;
+
+  // ── Field conversions ──
+
+  mod field_conversions {
+    use super::*;
+
+    #[test]
+    fn prompt_is_passed_through() {
+      let req = unwrap_request(artcraft_fast_builder_with(|b| { b.prompt = Some("test".to_string()); }));
+      assert_eq!(req.request.prompt, Some("test".to_string()));
+    }
+
+    #[test]
+    fn prompt_none_stays_none() {
+      let req = unwrap_request(artcraft_fast_builder_with(|_| {}));
+      assert!(req.request.prompt.is_none());
+    }
+
+    #[test]
+    fn model_is_seedance_2p0_fast() {
+      let req = unwrap_request(artcraft_fast_builder_with(|_| {}));
+      assert!(matches!(req.request.model, Some(CommonVideoModelEnum::Seedance2p0UltraFast)));
+    }
+
+    #[test]
+    fn duration_passed_through() {
+      let req = unwrap_request(artcraft_fast_builder_with(|b| { b.duration_seconds = Some(10); }));
+      assert_eq!(req.request.duration_seconds, Some(10));
+    }
+
+    #[test]
+    fn duration_clamped_to_max() {
+      let req = unwrap_request(artcraft_fast_builder_with(|b| { b.duration_seconds = Some(99); }));
+      assert_eq!(req.request.duration_seconds, Some(15));
+    }
+
+    #[test]
+    fn batch_count_passed_through() {
+      let req = unwrap_request(artcraft_fast_builder_with(|b| { b.video_batch_count = Some(4); }));
+      assert_eq!(req.request.video_batch_count, Some(4));
+    }
+
+    #[test]
+    fn bitrate_passed_through() {
+      let req = unwrap_request(artcraft_fast_builder_with(|b| { b.bitrate = Some(RouterBitrate::High); }));
+      assert_eq!(req.request.bitrate, Some(CommonBitrateEnum::High));
+    }
+  }
+
+  // ── Aspect ratio ──
+
+  mod aspect_ratio_tests {
+    use super::*;
+
+    #[test]
+    fn wide() {
+      let req = unwrap_request(artcraft_fast_builder_with(|b| {
+        b.aspect_ratio = Some(RouterAspectRatio::WideSixteenByNine);
+      }));
+      assert_eq!(req.request.aspect_ratio, Some(CommonAspectRatioEnum::WideSixteenByNine));
+    }
+
+    #[test]
+    fn tall() {
+      let req = unwrap_request(artcraft_fast_builder_with(|b| {
+        b.aspect_ratio = Some(RouterAspectRatio::TallNineBySixteen);
+      }));
+      assert_eq!(req.request.aspect_ratio, Some(CommonAspectRatioEnum::TallNineBySixteen));
+    }
+
+    #[test]
+    fn square() {
+      let req = unwrap_request(artcraft_fast_builder_with(|b| {
+        b.aspect_ratio = Some(RouterAspectRatio::Square);
+      }));
+      assert_eq!(req.request.aspect_ratio, Some(CommonAspectRatioEnum::Square));
+    }
+
+    #[test]
+    fn none_stays_none() {
+      let req = unwrap_request(artcraft_fast_builder_with(|_| {}));
+      assert!(req.request.aspect_ratio.is_none());
+    }
+  }
+
+  // ── Resolution ──
+
+  mod resolution_tests {
+    use super::*;
+
+    #[test]
+    fn res_480p() {
+      let req = unwrap_request(artcraft_fast_builder_with(|b| {
+        b.resolution = Some(RouterResolution::FourEightyP);
+      }));
+      assert_eq!(req.request.resolution, Some(CommonResolutionEnum::FourEightyP));
+    }
+
+    #[test]
+    fn res_720p() {
+      let req = unwrap_request(artcraft_fast_builder_with(|b| {
+        b.resolution = Some(RouterResolution::SevenTwentyP);
+      }));
+      assert_eq!(req.request.resolution, Some(CommonResolutionEnum::SevenTwentyP));
+    }
+
+    #[test]
+    fn res_1080p_downgrades_to_720p() {
+      let req = unwrap_request(artcraft_fast_builder_with(|b| {
+        b.resolution = Some(RouterResolution::TenEightyP);
+      }));
+      assert_eq!(req.request.resolution, Some(CommonResolutionEnum::SevenTwentyP));
+    }
+
+    #[test]
+    fn res_1080p_error_out() {
+      let result = build_artcraft_seedance_2p0_u_fast(GenerateVideoRequestBuilder {
+        model: RouterVideoModel::Seedance2p0UltraFast,
+        provider: RouterProvider::Artcraft,
+        resolution: Some(RouterResolution::TenEightyP),
+        request_mismatch_mitigation_strategy: RequestMismatchMitigationStrategy::ErrorOut,
+        ..Default::default()
+      });
+      assert!(result.is_err());
+    }
+
+    #[test]
+    fn none_stays_none() {
+      let req = unwrap_request(artcraft_fast_builder_with(|_| {}));
+      assert!(req.request.resolution.is_none());
+    }
+  }
+
+  // ── Media tokens ──
+
+  mod media_token_tests {
+    use super::*;
+
+    #[test]
+    fn start_frame_token_passed_through() {
+      let token = MediaFileToken::new("mf_start".to_string());
+      let req = unwrap_request(artcraft_fast_builder_with(|b| {
+        b.start_frame = Some(ImageRef::MediaFileToken(token.clone()));
+      }));
+      assert_eq!(req.request.start_frame_image_media_token, Some(token));
+    }
+
+    #[test]
+    fn url_start_frame_rejected() {
+      let result = build_artcraft_seedance_2p0_u_fast(GenerateVideoRequestBuilder {
+        model: RouterVideoModel::Seedance2p0UltraFast,
+        provider: RouterProvider::Artcraft,
+        start_frame: Some(ImageRef::Url("https://example.com".to_string())),
+        ..Default::default()
+      });
+      assert!(result.is_err());
+    }
+
+    #[test]
+    fn reference_image_tokens_passed_through() {
+      let tokens = vec![
+        MediaFileToken::new("mf_a".to_string()),
+        MediaFileToken::new("mf_b".to_string()),
+      ];
+      let req = unwrap_request(artcraft_fast_builder_with(|b| {
+        b.reference_images = Some(ImageListRef::MediaFileTokens(tokens.clone()));
+      }));
+      assert_eq!(req.request.reference_image_media_tokens, Some(tokens));
+    }
+
+    #[test]
+    fn character_tokens_passed_through() {
+      let tokens = vec![
+        CharacterToken::new("char_a".to_string()),
+        CharacterToken::new("char_b".to_string()),
+      ];
+      let req = unwrap_request(artcraft_fast_builder_with(|b| {
+        b.reference_character_tokens = Some(CharacterListRef::CharacterTokens(tokens.clone()));
+      }));
+      assert_eq!(req.request.reference_character_tokens, Some(tokens));
+    }
+  }
+
+  // ── Helpers ──
+
+  fn artcraft_fast_builder_with(f: impl FnOnce(&mut GenerateVideoRequestBuilder)) -> GenerateVideoRequestBuilder {
+    let mut builder = GenerateVideoRequestBuilder {
+      model: RouterVideoModel::Seedance2p0UltraFast,
+      provider: RouterProvider::Artcraft,
+      duration_seconds: Some(5),
+      video_batch_count: Some(1),
+      ..Default::default()
+    };
+    f(&mut builder);
+    builder
+  }
+
+  fn unwrap_request(builder: GenerateVideoRequestBuilder) -> ArtcraftSeedance2p0UltraFastRequestState {
+    let result = build_artcraft_seedance_2p0_u_fast(builder).expect("build should succeed");
+    match result {
+      VideoGenerationDraftOrRequest::Request(
+        VideoGenerationRequest::ArtcraftSeedance2p0UltraFast(state)
+      ) => state,
+      _ => panic!("expected ArtcraftSeedance2p0Fast request"),
+    }
+  }
+}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_u_fast/cost.rs

@@ -0,0 +1,168 @@
+use enums::common::generation::common_resolution::CommonResolution;
+
+use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
+use crate::generate::generate_video::providers::artcraft::seedance_2p0_u_fast::request::ArtcraftSeedance2p0UltraFastRequestState;
+
+// ── Pricing constants ──
+
+const CENTS_PER_SECOND_480P: f64 = 3.6267;
+const CENTS_PER_SECOND_720P: f64 = 8.9089;
+
+pub struct ArtcraftSeedance2p0UltraFastCostState {
+  pub resolution: CommonResolution,
+  pub duration_seconds: u16,
+  pub batch_count: u16,
+}
+
+impl ArtcraftSeedance2p0UltraFastCostState {
+  pub fn from_request(request: &ArtcraftSeedance2p0UltraFastRequestState) -> Self {
+    let resolution = request.request.resolution
+      .unwrap_or(CommonResolution::SevenTwentyP);
+    let duration_seconds = request.request.duration_seconds.unwrap_or(5);
+    let batch_count = request.request.video_batch_count.unwrap_or(1);
+
+    Self { resolution, duration_seconds, batch_count }
+  }
+
+  pub fn estimate_cost(&self) -> VideoGenerationCostEstimate {
+    let cents_per_second = match self.resolution {
+      CommonResolution::FourEightyP => CENTS_PER_SECOND_480P,
+      // Fast model doesn't support 1080p; all non-480p resolves to 720p pricing
+      _ => CENTS_PER_SECOND_720P,
+    };
+
+    let cents_per_video = (cents_per_second * self.duration_seconds as f64).ceil() as u64;
+    let usd_cents = cents_per_video * self.batch_count as u64;
+
+    VideoGenerationCostEstimate {
+      cost_in_credits: Some(usd_cents),
+      cost_in_usd_cents: Some(usd_cents),
+      is_free: false,
+      is_unlimited: false,
+      is_rate_limited: false,
+      has_watermark: false,
+      failures_are_refunded: None,
+    }
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use crate::api::router_resolution::RouterResolution;
+  use crate::api::router_video_model::RouterVideoModel;
+  use crate::api::router_provider::RouterProvider;
+  use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
+
+  mod pricing_720p {
+    use super::*;
+
+    #[test]
+    fn batch_1() {
+      // 8.9089 * 5 = 44.5445 → ceil = 45¢
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 5, 1), 45);
+      // 8.9089 * 10 = 89.089 → ceil = 90¢
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 10, 1), 90);
+      // 8.9089 * 15 = 133.6335 → ceil = 134¢
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 15, 1), 134);
+    }
+
+    #[test]
+    fn batch_2() {
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 10, 2), 180);
+    }
+
+    #[test]
+    fn batch_4() {
+      assert_eq!(cost_cents(Some(RouterResolution::SevenTwentyP), 10, 4), 360);
+    }
+
+    #[test]
+    fn none_defaults_to_720p() {
+      assert_eq!(cost_cents(None, 10, 1), cost_cents(Some(RouterResolution::SevenTwentyP), 10, 1));
+    }
+  }
+
+  mod pricing_480p {
+    use super::*;
+
+    #[test]
+    fn batch_1() {
+      // 3.6267 * 5 = 18.1335 → ceil = 19¢
+      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 5, 1), 19);
+      // 3.6267 * 10 = 36.267 → ceil = 37¢
+      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 10, 1), 37);
+      // 3.6267 * 15 = 54.4005 → ceil = 55¢
+      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 15, 1), 55);
+    }
+
+    #[test]
+    fn batch_4() {
+      assert_eq!(cost_cents(Some(RouterResolution::FourEightyP), 10, 4), 148);
+    }
+  }
+
+  mod relative_pricing {
+    use super::*;
+
+    #[test]
+    fn cost_480p_cheaper_than_720p() {
+      let c480 = cost_cents(Some(RouterResolution::FourEightyP), 10, 1);
+      let c720 = cost_cents(Some(RouterResolution::SevenTwentyP), 10, 1);
+      assert!(c480 < c720, "480p ({c480}) should be < 720p ({c720})");
+    }
+
+    #[test]
+    fn cost_scales_with_duration() {
+      let c5 = cost_cents(None, 5, 1);
+      let c10 = cost_cents(None, 10, 1);
+      let c15 = cost_cents(None, 15, 1);
+      assert!(c5 < c10);
+      assert!(c10 < c15);
+    }
+
+    #[test]
+    fn fast_g_cheaper_than_standard_g() {
+      let fast = cost_cents(Some(RouterResolution::SevenTwentyP), 10, 1);
+      let standard = {
+        let builder = GenerateVideoRequestBuilder {
+          model: RouterVideoModel::Seedance2p0Ultra,
+          provider: RouterProvider::Artcraft,
+          resolution: Some(RouterResolution::SevenTwentyP),
+          duration_seconds: Some(10),
+          video_batch_count: Some(1),
+          ..Default::default()
+        };
+        builder.build2().unwrap().estimate_cost().unwrap().cost_in_usd_cents.unwrap()
+      };
+      assert!(fast < standard, "Fast ({fast}¢) should be < Standard ({standard}¢)");
+    }
+
+    #[test]
+    fn credits_equal_usd_cents() {
+      let cost = build_cost(None, 10, 1);
+      assert_eq!(cost.cost_in_credits, cost.cost_in_usd_cents);
+    }
+  }
+
+  // -- Helpers --
+
+  fn build_cost(
+    resolution: Option<RouterResolution>,
+    duration_seconds: u16,
+    video_batch_count: u16,
+  ) -> crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate {
+    let builder = GenerateVideoRequestBuilder {
+      model: RouterVideoModel::Seedance2p0UltraFast,
+      provider: RouterProvider::Artcraft,
+      resolution,
+      duration_seconds: Some(duration_seconds),
+      video_batch_count: Some(video_batch_count),
+      ..Default::default()
+    };
+    builder.build2().expect("build2").estimate_cost().expect("estimate_cost")
+  }
+
+  fn cost_cents(resolution: Option<RouterResolution>, duration_seconds: u16, batch: u16) -> u64 {
+    build_cost(resolution, duration_seconds, batch).cost_in_usd_cents.unwrap()
+  }
+}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p0_u_fast/request.rs

@@ -0,0 +1,227 @@
+use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost_and_generate_request::OmniGenVideoCostAndGenerateRequest;
+
+use crate::client::router_artcraft_client::RouterArtcraftClient;
+use crate::errors::artcraft_router_error::ArtcraftRouterError;
+use crate::generate::generate_video::generate_video_response::GenerateVideoResponse;
+use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request;
+
+#[derive(Clone, Debug)]
+pub struct ArtcraftSeedance2p0UltraFastRequestState {
+  pub request: OmniGenVideoCostAndGenerateRequest,
+}
+
+impl ArtcraftSeedance2p0UltraFastRequestState {
+  pub async fn send(&self, client: &RouterArtcraftClient) -> Result<GenerateVideoResponse, ArtcraftRouterError> {
+    send_artcraft_omni_video_request(&self.request, client).await
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use tokens::tokens::characters::CharacterToken;
+  use tokens::tokens::media_files::MediaFileToken;
+
+  use crate::api::character_list_ref::CharacterListRef;
+  use crate::api::router_aspect_ratio::RouterAspectRatio;
+  use crate::api::router_resolution::RouterResolution;
+  use crate::api::router_video_model::RouterVideoModel;
+  use crate::api::image_list_ref::ImageListRef;
+  use crate::api::image_ref::ImageRef;
+  use crate::api::router_provider::RouterProvider;
+  use crate::client::router_artcraft_client::RouterArtcraftClient;
+  use crate::client::router_client::RouterClient;
+  use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
+  use crate::generate::generate_video::generate_video_response::GenerateVideoResponse;
+  use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
+  use artcraft_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
+  use artcraft_client::utils::api_host::ApiHost;
+
+  use test_data::web::character_tokens::{JIM, KNIGHT};
+  use test_data::web::image_media_tokens::{
+    FOREST_BACKDROP_PRODUCTION_MEDIA_TOKEN,
+    JUNO_AT_LAKE_PRODUCTION_MEDIA_TOKEN,
+    WHITE_HOUSE_SUNSET_PRODUCTION_MEDIA_TOKEN,
+  };
+
+  // -- Aspect ratio tests --
+
+  mod aspect_ratio_tests {
+    use super::*;
+
+    #[tokio::test]
+    #[ignore] // manually run — fires a real API request and incurs cost
+    async fn landscape() {
+      let response = run_pipeline(GenerateVideoRequestBuilder {
+        prompt: Some("A corgi running through a field of wildflowers at sunset.".to_string()),
+        aspect_ratio: Some(RouterAspectRatio::WideSixteenByNine),
+        ..artcraft_fast_builder()
+      }).await;
+      assert!(matches!(response, GenerateVideoResponse::Artcraft(_)));
+      assert_eq!(1, 2, "Inspect output above");
+    }
+
+    #[tokio::test]
+    #[ignore] // manually run — fires a real API request and incurs cost
+    async fn portrait() {
+      let response = run_pipeline(GenerateVideoRequestBuilder {
+        prompt: Some("A cat sitting on a windowsill watching rain.".to_string()),
+        aspect_ratio: Some(RouterAspectRatio::TallNineBySixteen),
+        ..artcraft_fast_builder()
+      }).await;
+      assert!(matches!(response, GenerateVideoResponse::Artcraft(_)));
+      assert_eq!(1, 2, "Inspect output above");
+    }
+
+    #[tokio::test]
+    #[ignore] // manually run — fires a real API request and incurs cost
+    async fn square() {
+      let response = run_pipeline(GenerateVideoRequestBuilder {
+        prompt: Some("A hummingbird hovering near a flower.".to_string()),
+        aspect_ratio: Some(RouterAspectRatio::Square),
+        ..artcraft_fast_builder()
+      }).await;
+      assert!(matches!(response, GenerateVideoResponse::Artcraft(_)));
+      assert_eq!(1, 2, "Inspect output above");
+    }
+  }
+
+  // -- Resolution tests --
+
+  mod resolution_tests {
+    use super::*;
+
+    #[tokio::test]
+    #[ignore] // manually run — fires a real API request and incurs cost
+    async fn res_480p() {
+      let response = run_pipeline(GenerateVideoRequestBuilder {
+        prompt: Some("A shiba inu playing in autumn leaves.".to_string()),
+        resolution: Some(RouterResolution::FourEightyP),
+        ..artcraft_fast_builder()
+      }).await;
+      assert!(matches!(response, GenerateVideoResponse::Artcraft(_)));
+      assert_eq!(1, 2, "Inspect output above");
+    }
+
+    #[tokio::test]
+    #[ignore] // manually run — fires a real API request and incurs cost
+    async fn res_720p() {
+      let response = run_pipeline(GenerateVideoRequestBuilder {
+        prompt: Some("A golden retriever catching a frisbee on the beach.".to_string()),
+        resolution: Some(RouterResolution::SevenTwentyP),
+        ..artcraft_fast_builder()
+      }).await;
+      assert!(matches!(response, GenerateVideoResponse::Artcraft(_)));
+      assert_eq!(1, 2, "Inspect output above");
+    }
+  }
+
+  // -- Modality tests --
+
+  mod modality_tests {
+    use super::*;
+    use test_data::web::image_media_tokens::TALL_MOCHI_WITH_GLASSES_PRODUCTION_MEDIA_TOKEN;
+
+    #[tokio::test]
+    #[ignore] // manually run — fires a real API request and incurs cost
+    async fn text_to_video() {
+      let response = run_pipeline(GenerateVideoRequestBuilder {
+        prompt: Some("A sky whale breaching in the open sky, pink clouds at dawn, cinematic.".to_string()),
+        aspect_ratio: Some(RouterAspectRatio::WideSixteenByNine),
+        ..artcraft_fast_builder()
+      }).await;
+      assert!(matches!(response, GenerateVideoResponse::Artcraft(_)));
+      assert_eq!(1, 2, "Inspect output above");
+    }
+
+    #[tokio::test]
+    #[ignore] // manually run — fires a real API request and incurs cost
+    async fn keyframe_start_and_end_frame() {
+      let response = run_pipeline(GenerateVideoRequestBuilder {
+        prompt: Some("The dog walks from the lake to the forest.".to_string()),
+        start_frame: Some(ImageRef::MediaFileToken(MediaFileToken::new(JUNO_AT_LAKE_PRODUCTION_MEDIA_TOKEN.to_string()))),
+        end_frame: Some(ImageRef::MediaFileToken(MediaFileToken::new(FOREST_BACKDROP_PRODUCTION_MEDIA_TOKEN.to_string()))),
+        aspect_ratio: Some(RouterAspectRatio::WideSixteenByNine),
+        ..artcraft_fast_builder()
+      }).await;
+      assert!(matches!(response, GenerateVideoResponse::Artcraft(_)));
+      assert_eq!(1, 2, "Inspect output above");
+    }
+
+    #[tokio::test]
+    #[ignore] // manually run — fires a real API request and incurs cost
+    async fn image_references() {
+      let response = run_pipeline(GenerateVideoRequestBuilder {
+        prompt: Some("The dog in @2 runs through the scenery in @1 towards the building in @3.".to_string()),
+        reference_images: Some(ImageListRef::MediaFileTokens(vec![
+          MediaFileToken::new(FOREST_BACKDROP_PRODUCTION_MEDIA_TOKEN.to_string()),
+          MediaFileToken::new(TALL_MOCHI_WITH_GLASSES_PRODUCTION_MEDIA_TOKEN.to_string()),
+          MediaFileToken::new(WHITE_HOUSE_SUNSET_PRODUCTION_MEDIA_TOKEN.to_string()),
+        ])),
+        aspect_ratio: Some(RouterAspectRatio::WideSixteenByNine),
+        ..artcraft_fast_builder()
+      }).await;
+      assert!(matches!(response, GenerateVideoResponse::Artcraft(_)));
+      assert_eq!(1, 2, "Inspect output above");
+    }
+
+    #[tokio::test]
+    #[ignore] // manually run — fires a real API request and incurs cost
+    async fn character_references() {
+      let response = run_pipeline(GenerateVideoRequestBuilder {
+        prompt: Some("@Jim and @Knight are sparring in a medieval arena.".to_string()),
+        reference_character_tokens: Some(CharacterListRef::CharacterTokens(vec![
+          CharacterToken::new(JIM.token.to_string()),
+          CharacterToken::new(KNIGHT.token.to_string()),
+        ])),
+        aspect_ratio: Some(RouterAspectRatio::WideSixteenByNine),
+        ..artcraft_fast_builder()
+      }).await;
+      assert!(matches!(response, GenerateVideoResponse::Artcraft(_)));
+      assert_eq!(1, 2, "Inspect output above");
+    }
+  }
+
+  // -- Helpers --
+
+  fn artcraft_fast_builder() -> GenerateVideoRequestBuilder {
+    GenerateVideoRequestBuilder {
+      model: RouterVideoModel::Seedance2p0UltraFast,
+      provider: RouterProvider::Artcraft,
+      duration_seconds: Some(4),
+      video_batch_count: Some(1),
+      ..Default::default()
+    }
+  }
+
+  fn get_artcraft_client() -> RouterClient {
+    let cookies = std::fs::read_to_string("/Users/bt/Artcraft/credentials/artcraft_cookies.txt")
+      .expect("Failed to read artcraft cookies");
+    let cookies = cookies.trim().to_string();
+    let credentials = StorytellerCredentialSet::parse_multi_cookie_header(&cookies)
+      .expect("Failed to parse cookies")
+      .expect("No credentials found");
+    RouterClient::Artcraft(RouterArtcraftClient::new(ApiHost::Storyteller, credentials))
+  }
+
+  async fn run_pipeline(builder: GenerateVideoRequestBuilder) -> GenerateVideoResponse {
+    let client = get_artcraft_client();
+
+    let draft_or_request = builder.build2().expect("build2 should succeed");
+    let request = match draft_or_request {
+      VideoGenerationDraftOrRequest::Request(r) => r,
+      _ => panic!("expected Request variant (Artcraft skips draft)"),
+    };
+
+    let response = request.send_request(&client).await.expect("send_request should succeed");
+
+    match &response {
+      GenerateVideoResponse::Artcraft(p) => {
+        println!("inference_job_token={:?}", p.inference_job_token);
+        println!("all_inference_job_tokens={:?}", p.all_inference_job_tokens);
+      }
+      other => println!("response: {:?}", other),
+    }
+
+    response
+  }
+}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p5/build.rs

@@ -1,250 +0,0 @@
-use enums::common::generation::common_video_model::CommonVideoModel as CommonVideoModelEnum;
-
-use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
-use crate::errors::artcraft_router_error::ArtcraftRouterError;
-use crate::errors::client_error::ClientError;
-use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-use crate::generate::generate_video::providers::artcraft::build_common::{
-  build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport,
-};
-use crate::generate::generate_video::providers::artcraft::seedance_2p5::request::ArtcraftSeedance2p5RequestState;
-use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
-
-pub fn build_artcraft_seedance_2p5(mut builder: GenerateVideoRequestBuilder) -> Result<VideoGenerationDraftOrRequest, ArtcraftRouterError> {
-  let strategy = builder.request_mismatch_mitigation_strategy;
-
-  // Parity with the Kinovi build: keyframes and reference media are mutually
-  // exclusive, an end frame requires a start frame, and there is no
-  // character support. Erroring here keeps the billing estimate consistent
-  // with the execution build.
-  let has_keyframes = builder.start_frame.is_some() || builder.end_frame.is_some();
-  let has_references = builder.reference_images.is_some()
-    || builder.reference_videos.is_some()
-    || builder.reference_audio.is_some();
-
-  if has_keyframes && has_references {
-    return Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
-      field: "reference_images",
-      value: "Seedance 2.5 cannot combine keyframes with reference media; send one or the other".to_string(),
-    }));
-  }
-  if builder.end_frame.is_some() && builder.start_frame.is_none() {
-    return Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
-      field: "end_frame",
-      value: "Seedance 2.5 requires a start frame when an end frame is set".to_string(),
-    }));
-  }
-  if builder.reference_character_tokens.is_some() {
-    return Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
-      field: "reference_character_tokens",
-      value: "Seedance 2.5 does not support character references".to_string(),
-    }));
-  }
-
-  // 2.5 allows 4-30 second durations (longer than the shared 4-15 range in
-  // build_common) and generates a single video per request. Plan both here,
-  // leaving None for the shared builder, then set them after.
-  let duration_seconds = plan_duration(builder.duration_seconds.take(), strategy)?;
-  plan_batch_count(builder.video_batch_count.take(), strategy)?;
-
-  let total_input_seconds = builder.total_reference_video_input_seconds.take();
-
-  let mut request = build_artcraft_omni_video_request(
-    builder,
-    CommonVideoModelEnum::Seedance2p5,
-    SupportedResolutions::Full,
-    UltraWideSupport::Supported,
-  )?;
-  request.duration_seconds = duration_seconds;
-  request.video_batch_count = Some(1);
-
-  let state = ArtcraftSeedance2p5RequestState { request, total_input_seconds };
-  Ok(VideoGenerationDraftOrRequest::Request(VideoGenerationRequest::ArtcraftSeedance2p5(state)))
-}
-
-// Seedance 2.5 supports durations of 4-30 seconds.
-fn plan_duration(
-  duration_seconds: Option<u16>,
-  strategy: RequestMismatchMitigationStrategy,
-) -> Result<Option<u16>, ArtcraftRouterError> {
-  const MIN: u16 = 4;
-  const MAX: u16 = 30;
-  match duration_seconds {
-    None => Ok(None),
-    Some(d) if d >= MIN && d <= MAX => Ok(Some(d)),
-    Some(d) => match strategy {
-      RequestMismatchMitigationStrategy::ErrorOut => {
-        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
-          field: "duration_seconds",
-          value: format!("{}", d),
-        }))
-      }
-      _ => Ok(Some(d.clamp(MIN, MAX))),
-    },
-  }
-}
-
-// Seedance 2.5 generates a single video per request (no batching).
-fn plan_batch_count(
-  video_batch_count: Option<u16>,
-  strategy: RequestMismatchMitigationStrategy,
-) -> Result<(), ArtcraftRouterError> {
-  let count = video_batch_count.unwrap_or(1);
-  match count {
-    0 => Err(ArtcraftRouterError::Client(ClientError::UserRequestedZeroGenerations)),
-    1 => Ok(()),
-    _ => match strategy {
-      RequestMismatchMitigationStrategy::ErrorOut => {
-        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
-          field: "video_batch_count",
-          value: format!("{}", count),
-        }))
-      }
-      RequestMismatchMitigationStrategy::PayMoreUpgrade
-      | RequestMismatchMitigationStrategy::PayLessDowngrade => Ok(()),
-    },
-  }
-}
-
-#[cfg(test)]
-mod tests {
-  use enums::common::generation::common_resolution::CommonResolution as CommonResolutionEnum;
-  use enums::common::generation::common_video_model::CommonVideoModel as CommonVideoModelEnum;
-  use tokens::tokens::characters::CharacterToken;
-  use tokens::tokens::media_files::MediaFileToken;
-
-  use crate::api::character_list_ref::CharacterListRef;
-  use crate::api::image_list_ref::ImageListRef;
-  use crate::api::image_ref::ImageRef;
-  use crate::api::router_provider::RouterProvider;
-  use crate::api::router_resolution::RouterResolution;
-  use crate::api::router_video_model::RouterVideoModel;
-  use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-  use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-  use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
-
-  use super::*;
-
-  mod field_conversions {
-    use super::*;
-
-    #[test]
-    fn model_is_correct() {
-      let req = unwrap_request(builder_with(|_| {}));
-      assert!(matches!(req.request.model, Some(CommonVideoModelEnum::Seedance2p5)));
-    }
-
-    #[test]
-    fn duration_30_is_passed_through() {
-      let req = unwrap_request(builder_with(|b| { b.duration_seconds = Some(30); }));
-      assert_eq!(req.request.duration_seconds, Some(30));
-    }
-
-    #[test]
-    fn duration_clamped_to_range() {
-      let req = unwrap_request(builder_with(|b| { b.duration_seconds = Some(99); }));
-      assert_eq!(req.request.duration_seconds, Some(30));
-
-      let req = unwrap_request(builder_with(|b| { b.duration_seconds = Some(2); }));
-      assert_eq!(req.request.duration_seconds, Some(4));
-    }
-
-    #[test]
-    fn batch_count_is_always_one() {
-      let req = unwrap_request(builder_with(|b| { b.video_batch_count = Some(4); }));
-      assert_eq!(req.request.video_batch_count, Some(1));
-    }
-
-    #[test]
-    fn total_input_seconds_is_carried_through() {
-      let req = unwrap_request(builder_with(|b| { b.total_reference_video_input_seconds = Some(14); }));
-      assert_eq!(req.total_input_seconds, Some(14));
-    }
-  }
-
-  mod modality_rules {
-    use super::*;
-
-    #[test]
-    fn keyframes_are_accepted() {
-      let req = unwrap_request(builder_with(|b| {
-        b.start_frame = Some(ImageRef::MediaFileToken(MediaFileToken::new("mf_start".to_string())));
-        b.end_frame = Some(ImageRef::MediaFileToken(MediaFileToken::new("mf_end".to_string())));
-      }));
-      assert!(req.request.start_frame_image_media_token.is_some());
-      assert!(req.request.end_frame_image_media_token.is_some());
-    }
-
-    #[test]
-    fn end_frame_without_start_frame_errors() {
-      let result = build_artcraft_seedance_2p5(builder_with(|b| {
-        b.end_frame = Some(ImageRef::MediaFileToken(MediaFileToken::new("mf_end".to_string())));
-      }));
-      assert!(result.is_err());
-    }
-
-    #[test]
-    fn keyframes_plus_references_error() {
-      let result = build_artcraft_seedance_2p5(builder_with(|b| {
-        b.start_frame = Some(ImageRef::MediaFileToken(MediaFileToken::new("mf_start".to_string())));
-        b.reference_images = Some(ImageListRef::MediaFileTokens(vec![
-          MediaFileToken::new("mf_ref".to_string()),
-        ]));
-      }));
-      assert!(result.is_err());
-    }
-
-    #[test]
-    fn character_references_error() {
-      let result = build_artcraft_seedance_2p5(builder_with(|b| {
-        b.reference_character_tokens = Some(CharacterListRef::CharacterTokens(vec![
-          CharacterToken::new("char_abc".to_string()),
-        ]));
-      }));
-      assert!(result.is_err());
-    }
-  }
-
-  mod resolution_tests {
-    use super::*;
-
-    #[test]
-    fn res_480p() {
-      let req = unwrap_request(builder_with(|b| { b.resolution = Some(RouterResolution::FourEightyP); }));
-      assert_eq!(req.request.resolution, Some(CommonResolutionEnum::FourEightyP));
-    }
-
-    #[test]
-    fn res_1080p_maps_directly() {
-      let req = unwrap_request(builder_with(|b| { b.resolution = Some(RouterResolution::TenEightyP); }));
-      assert_eq!(req.request.resolution, Some(CommonResolutionEnum::TenEightyP));
-    }
-
-    #[test]
-    fn res_4k_downgrades_to_1080p() {
-      let req = unwrap_request(builder_with(|b| { b.resolution = Some(RouterResolution::FourK); }));
-      assert_eq!(req.request.resolution, Some(CommonResolutionEnum::TenEightyP));
-    }
-  }
-
-  fn builder_with(f: impl FnOnce(&mut GenerateVideoRequestBuilder)) -> GenerateVideoRequestBuilder {
-    let mut builder = GenerateVideoRequestBuilder {
-      model: RouterVideoModel::Seedance2p5,
-      provider: RouterProvider::Artcraft,
-      duration_seconds: Some(5),
-      video_batch_count: Some(1),
-      ..Default::default()
-    };
-    f(&mut builder);
-    builder
-  }
-
-  fn unwrap_request(builder: GenerateVideoRequestBuilder) -> ArtcraftSeedance2p5RequestState {
-    let result = build_artcraft_seedance_2p5(builder).expect("build should succeed");
-    match result {
-      VideoGenerationDraftOrRequest::Request(VideoGenerationRequest::ArtcraftSeedance2p5(state)) => state,
-      _ => panic!("expected ArtcraftSeedance2p5 request"),
-    }
-  }
-}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p5/cost.rs

@@ -1,224 +0,0 @@
-use enums::common::generation::common_resolution::CommonResolution;
-
-use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
-use crate::generate::generate_video::providers::artcraft::seedance_common::seedance_2p5_usd_cents;
-use crate::generate::generate_video::providers::artcraft::seedance_2p5::request::ArtcraftSeedance2p5RequestState;
-
-/// Seedance 2.5 pricing depends on the resolution, the output duration, and
-/// — when reference videos are attached — the total seconds of reference
-/// video input, which are billed on top of the output duration (at a lower
-/// per-second rate). The TOTAL input duration clamps to the 4..=30 second
-/// billing range. No batching.
-pub struct ArtcraftSeedance2p5CostState {
-  pub resolution: CommonResolution,
-  pub duration_seconds: u16,
-  pub has_video_references: bool,
-  pub maybe_total_input_seconds: Option<u16>,
-}
-
-impl ArtcraftSeedance2p5CostState {
-  pub fn from_request(request: &ArtcraftSeedance2p5RequestState) -> Self {
-    let resolution = request.request.resolution
-      .unwrap_or(CommonResolution::SevenTwentyP);
-    let duration_seconds = request.request.duration_seconds.unwrap_or(5);
-
-    let has_video_references = request.request.reference_video_media_tokens
-      .as_ref()
-      .is_some_and(|tokens| !tokens.is_empty());
-
-    Self {
-      resolution,
-      duration_seconds,
-      has_video_references,
-      maybe_total_input_seconds: request.total_input_seconds,
-    }
-  }
-
-  pub fn estimate_cost(&self) -> VideoGenerationCostEstimate {
-    // Input-second clamping (the 4..=30 billing range) and the
-    // unknown-or-zero-input failsafe happen inside the shared pricing
-    // function.
-    let maybe_total_input_seconds = self.maybe_total_input_seconds;
-
-    let usd_cents = seedance_2p5_usd_cents(
-      self.resolution,
-      self.duration_seconds,
-      self.has_video_references,
-      maybe_total_input_seconds,
-    );
-
-    // ArtCraft credits: 100 credits = $1.00, so credits = cents.
-    VideoGenerationCostEstimate {
-      cost_in_credits: Some(usd_cents),
-      cost_in_usd_cents: Some(usd_cents),
-      is_free: false,
-      is_unlimited: false,
-      is_rate_limited: false,
-      has_watermark: false,
-      failures_are_refunded: None,
-    }
-  }
-}
-
-#[cfg(test)]
-mod tests {
-  use crate::api::router_provider::RouterProvider;
-  use crate::api::router_resolution::RouterResolution;
-  use crate::api::router_video_model::RouterVideoModel;
-  use crate::api::video_list_ref::VideoListRef;
-  use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-  use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
-
-  use tokens::tokens::media_files::MediaFileToken;
-
-  mod pricing_without_video_references {
-    use super::*;
-
-    #[test]
-    fn table_480p() {
-      // 11.76954733 ¢/s, rounded up.
-      assert_eq!(cents(Some(RouterResolution::FourEightyP), 4), 48);
-      assert_eq!(cents(Some(RouterResolution::FourEightyP), 5), 59);
-      assert_eq!(cents(Some(RouterResolution::FourEightyP), 10), 118);
-      assert_eq!(cents(Some(RouterResolution::FourEightyP), 30), 354);
-    }
-
-    #[test]
-    fn table_720p() {
-      // 26.70781893 ¢/s, rounded up.
-      assert_eq!(cents(Some(RouterResolution::SevenTwentyP), 4), 107);
-      assert_eq!(cents(Some(RouterResolution::SevenTwentyP), 5), 134);
-      assert_eq!(cents(Some(RouterResolution::SevenTwentyP), 10), 268);
-      assert_eq!(cents(Some(RouterResolution::SevenTwentyP), 30), 802);
-    }
-
-    #[test]
-    fn table_1080p() {
-      // 45.85869386 ¢/s, rounded up.
-      assert_eq!(cents(Some(RouterResolution::TenEightyP), 4), 184);
-      assert_eq!(cents(Some(RouterResolution::TenEightyP), 5), 230);
-      assert_eq!(cents(Some(RouterResolution::TenEightyP), 10), 459);
-      assert_eq!(cents(Some(RouterResolution::TenEightyP), 30), 1376);
-    }
-
-    #[test]
-    fn four_k_downgrades_to_1080p_and_prices_accordingly() {
-      assert_eq!(cents(Some(RouterResolution::FourK), 10), cents(Some(RouterResolution::TenEightyP), 10));
-    }
-
-    #[test]
-    fn none_defaults_to_720p() {
-      assert_eq!(cents(None, 10), cents(Some(RouterResolution::SevenTwentyP), 10));
-    }
-  }
-
-  mod pricing_with_video_references {
-    use super::*;
-
-    #[test]
-    fn thirty_second_output_with_ten_input_seconds_bills_forty() {
-      // 7.24279835 ¢/s × 40 = 289.71 → 290¢.
-      assert_eq!(cents_with_video_refs(Some(RouterResolution::FourEightyP), 30, Some(10)), 290);
-      // 15.84362140 ¢/s × 40 = 633.74 → 634¢.
-      assert_eq!(cents_with_video_refs(Some(RouterResolution::SevenTwentyP), 30, Some(10)), 634);
-      // 27.39973680 ¢/s × 40 = 1095.99 → 1096¢.
-      assert_eq!(cents_with_video_refs(Some(RouterResolution::TenEightyP), 30, Some(10)), 1096);
-    }
-
-    #[test]
-    fn table_1080p_with_ten_input_seconds() {
-      // 27.39973680 ¢/s over (output + 10) billed seconds, rounded up.
-      assert_eq!(cents_with_video_refs(Some(RouterResolution::TenEightyP), 5, Some(10)), 411);
-      assert_eq!(cents_with_video_refs(Some(RouterResolution::TenEightyP), 10, Some(10)), 548);
-      assert_eq!(cents_with_video_refs(Some(RouterResolution::TenEightyP), 30, Some(10)), 1096);
-    }
-
-    #[test]
-    fn fourteen_input_seconds_bill_forty_four() {
-      // 7.24279835 ¢/s × 44 = 318.68 → 319¢.
-      assert_eq!(cents_with_video_refs(Some(RouterResolution::FourEightyP), 30, Some(14)), 319);
-    }
-
-    #[test]
-    fn missing_or_zero_input_seconds_bill_the_thirty_second_maximum() {
-      // FAILSAFE: an unmeasured (or zero) input bills the 30-second MAXIMUM,
-      // matching the provider client's fallback:
-      // 7.24279835 ¢/s × (10+30) = 289.71 → 290¢.
-      assert_eq!(cents_with_video_refs(Some(RouterResolution::FourEightyP), 10, None), 290);
-      assert_eq!(cents_with_video_refs(Some(RouterResolution::FourEightyP), 10, Some(0)), 290);
-    }
-
-    #[test]
-    fn input_totals_under_four_seconds_clamp_to_four() {
-      // 1s, 3s, and 4s totals price identically; 5s bills more.
-      let at_minimum = cents_with_video_refs(Some(RouterResolution::FourEightyP), 10, Some(4));
-      assert_eq!(cents_with_video_refs(Some(RouterResolution::FourEightyP), 10, Some(1)), at_minimum);
-      assert_eq!(cents_with_video_refs(Some(RouterResolution::FourEightyP), 10, Some(3)), at_minimum);
-      assert!(cents_with_video_refs(Some(RouterResolution::FourEightyP), 10, Some(5)) > at_minimum);
-    }
-
-    #[test]
-    fn input_seconds_clamp_to_max_billed_input_seconds() {
-      // 200 input seconds clamp to 30: 7.24279835 ¢/s × (30+30) = 434.57 → 435¢.
-      assert_eq!(cents_with_video_refs(Some(RouterResolution::FourEightyP), 30, Some(200)), 435);
-      assert_eq!(
-        cents_with_video_refs(Some(RouterResolution::FourEightyP), 30, Some(200)),
-        cents_with_video_refs(Some(RouterResolution::FourEightyP), 30, Some(30)),
-      );
-    }
-  }
-
-  mod credits_tests {
-    use super::*;
-
-    #[test]
-    fn credits_equal_usd_cents() {
-      for dur in [4u16, 10, 30] {
-        let estimate = estimate_with(|b| {
-          b.resolution = Some(RouterResolution::FourEightyP);
-          b.duration_seconds = Some(dur);
-        });
-        assert_eq!(estimate.cost_in_credits, estimate.cost_in_usd_cents);
-      }
-    }
-  }
-
-  // ── Helpers ──
-
-  fn estimate_with(f: impl FnOnce(&mut GenerateVideoRequestBuilder)) -> VideoGenerationCostEstimate {
-    let mut builder = GenerateVideoRequestBuilder {
-      model: RouterVideoModel::Seedance2p5,
-      provider: RouterProvider::Artcraft,
-      duration_seconds: Some(5),
-      video_batch_count: Some(1),
-      ..Default::default()
-    };
-    f(&mut builder);
-    builder.build2()
-      .expect("build should succeed")
-      .estimate_cost()
-      .expect("estimate should succeed")
-  }
-
-  fn cents(resolution: Option<RouterResolution>, duration_seconds: u16) -> u64 {
-    estimate_with(|b| {
-      b.resolution = resolution;
-      b.duration_seconds = Some(duration_seconds);
-    }).cost_in_usd_cents.unwrap()
-  }
-
-  fn cents_with_video_refs(
-    resolution: Option<RouterResolution>,
-    duration_seconds: u16,
-    total_input_seconds: Option<u16>,
-  ) -> u64 {
-    estimate_with(|b| {
-      b.resolution = resolution;
-      b.duration_seconds = Some(duration_seconds);
-      b.reference_videos = Some(VideoListRef::MediaFileTokens(vec![
-        MediaFileToken::new("mf_ref".to_string()),
-      ]));
-      b.total_reference_video_input_seconds = total_input_seconds;
-    }).cost_in_usd_cents.unwrap()
-  }
-}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p5/request.rs

@@ -1,22 +0,0 @@
-use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost_and_generate_request::OmniGenVideoCostAndGenerateRequest;
-
-use crate::client::router_artcraft_client::RouterArtcraftClient;
-use crate::errors::artcraft_router_error::ArtcraftRouterError;
-use crate::generate::generate_video::generate_video_response::GenerateVideoResponse;
-use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request;
-
-#[derive(Clone, Debug)]
-pub struct ArtcraftSeedance2p5RequestState {
-  pub request: OmniGenVideoCostAndGenerateRequest,
-
-  /// Calculation-only: total seconds of reference video input, billed on top
-  /// of the output duration when reference videos are attached. Not part of
-  /// the omni request wire shape.
-  pub total_input_seconds: Option<u16>,
-}
-
-impl ArtcraftSeedance2p5RequestState {
-  pub async fn send(&self, client: &RouterArtcraftClient) -> Result<GenerateVideoResponse, ArtcraftRouterError> {
-    send_artcraft_omni_video_request(&self.request, client).await
-  }
-}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p5_preview/cost.rs

@@ -55,12 +55,12 @@ mod tests {
 
     #[test]
     fn full_duration_table() {
-      assert_eq!(cents(Some(RouterResolution::FourEightyP), 4), 86);
-      assert_eq!(cents(Some(RouterResolution::FourEightyP), 10), 214);
-      assert_eq!(cents(Some(RouterResolution::FourEightyP), 15), 321);
-      assert_eq!(cents(Some(RouterResolution::FourEightyP), 20), 428);
-      assert_eq!(cents(Some(RouterResolution::FourEightyP), 25), 535);
-      assert_eq!(cents(Some(RouterResolution::FourEightyP), 30), 642);
+      assert_eq!(cents(Some(RouterResolution::FourEightyP), 4), 82);
+      assert_eq!(cents(Some(RouterResolution::FourEightyP), 10), 205);
+      assert_eq!(cents(Some(RouterResolution::FourEightyP), 15), 307);
+      assert_eq!(cents(Some(RouterResolution::FourEightyP), 20), 409);
+      assert_eq!(cents(Some(RouterResolution::FourEightyP), 25), 511);
+      assert_eq!(cents(Some(RouterResolution::FourEightyP), 30), 613);
     }
   }
 
@@ -69,12 +69,12 @@ mod tests {
 
     #[test]
     fn full_duration_table() {
-      assert_eq!(cents(Some(RouterResolution::SevenTwentyP), 4), 172);
-      assert_eq!(cents(Some(RouterResolution::SevenTwentyP), 10), 428);
-      assert_eq!(cents(Some(RouterResolution::SevenTwentyP), 15), 642);
-      assert_eq!(cents(Some(RouterResolution::SevenTwentyP), 20), 856);
-      assert_eq!(cents(Some(RouterResolution::SevenTwentyP), 25), 1070);
-      assert_eq!(cents(Some(RouterResolution::SevenTwentyP), 30), 1283);
+      assert_eq!(cents(Some(RouterResolution::SevenTwentyP), 4), 164);
+      assert_eq!(cents(Some(RouterResolution::SevenTwentyP), 10), 409);
+      assert_eq!(cents(Some(RouterResolution::SevenTwentyP), 15), 613);
+      assert_eq!(cents(Some(RouterResolution::SevenTwentyP), 20), 817);
+      assert_eq!(cents(Some(RouterResolution::SevenTwentyP), 25), 1021);
+      assert_eq!(cents(Some(RouterResolution::SevenTwentyP), 30), 1226);
     }
 
     #[test]

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p5_u/build.rs

@@ -1,250 +0,0 @@
-use enums::common::generation::common_video_model::CommonVideoModel as CommonVideoModelEnum;
-
-use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
-use crate::errors::artcraft_router_error::ArtcraftRouterError;
-use crate::errors::client_error::ClientError;
-use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-use crate::generate::generate_video::providers::artcraft::build_common::{
-  build_artcraft_omni_video_request, SupportedResolutions, UltraWideSupport,
-};
-use crate::generate::generate_video::providers::artcraft::seedance_2p5_u::request::ArtcraftSeedance2p5UltraRequestState;
-use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
-
-pub fn build_artcraft_seedance_2p5_u(mut builder: GenerateVideoRequestBuilder) -> Result<VideoGenerationDraftOrRequest, ArtcraftRouterError> {
-  let strategy = builder.request_mismatch_mitigation_strategy;
-
-  // Parity with the Kinovi build: keyframes and reference media are mutually
-  // exclusive, an end frame requires a start frame, and there is no
-  // character support. Erroring here keeps the billing estimate consistent
-  // with the execution build.
-  let has_keyframes = builder.start_frame.is_some() || builder.end_frame.is_some();
-  let has_references = builder.reference_images.is_some()
-    || builder.reference_videos.is_some()
-    || builder.reference_audio.is_some();
-
-  if has_keyframes && has_references {
-    return Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
-      field: "reference_images",
-      value: "Seedance 2.5 Ultra cannot combine keyframes with reference media; send one or the other".to_string(),
-    }));
-  }
-  if builder.end_frame.is_some() && builder.start_frame.is_none() {
-    return Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
-      field: "end_frame",
-      value: "Seedance 2.5 Ultra requires a start frame when an end frame is set".to_string(),
-    }));
-  }
-  if builder.reference_character_tokens.is_some() {
-    return Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
-      field: "reference_character_tokens",
-      value: "Seedance 2.5 Ultra does not support character references".to_string(),
-    }));
-  }
-
-  // 2.5 allows 4-30 second durations (longer than the shared 4-15 range in
-  // build_common) and generates a single video per request. Plan both here,
-  // leaving None for the shared builder, then set them after.
-  let duration_seconds = plan_duration(builder.duration_seconds.take(), strategy)?;
-  plan_batch_count(builder.video_batch_count.take(), strategy)?;
-
-  let total_input_seconds = builder.total_reference_video_input_seconds.take();
-
-  let mut request = build_artcraft_omni_video_request(
-    builder,
-    CommonVideoModelEnum::Seedance2p5Ultra,
-    SupportedResolutions::Full,
-    UltraWideSupport::Supported,
-  )?;
-  request.duration_seconds = duration_seconds;
-  request.video_batch_count = Some(1);
-
-  let state = ArtcraftSeedance2p5UltraRequestState { request, total_input_seconds };
-  Ok(VideoGenerationDraftOrRequest::Request(VideoGenerationRequest::ArtcraftSeedance2p5Ultra(state)))
-}
-
-// Seedance 2.5 supports durations of 4-30 seconds.
-fn plan_duration(
-  duration_seconds: Option<u16>,
-  strategy: RequestMismatchMitigationStrategy,
-) -> Result<Option<u16>, ArtcraftRouterError> {
-  const MIN: u16 = 4;
-  const MAX: u16 = 30;
-  match duration_seconds {
-    None => Ok(None),
-    Some(d) if d >= MIN && d <= MAX => Ok(Some(d)),
-    Some(d) => match strategy {
-      RequestMismatchMitigationStrategy::ErrorOut => {
-        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
-          field: "duration_seconds",
-          value: format!("{}", d),
-        }))
-      }
-      _ => Ok(Some(d.clamp(MIN, MAX))),
-    },
-  }
-}
-
-// Seedance 2.5 generates a single video per request (no batching).
-fn plan_batch_count(
-  video_batch_count: Option<u16>,
-  strategy: RequestMismatchMitigationStrategy,
-) -> Result<(), ArtcraftRouterError> {
-  let count = video_batch_count.unwrap_or(1);
-  match count {
-    0 => Err(ArtcraftRouterError::Client(ClientError::UserRequestedZeroGenerations)),
-    1 => Ok(()),
-    _ => match strategy {
-      RequestMismatchMitigationStrategy::ErrorOut => {
-        Err(ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
-          field: "video_batch_count",
-          value: format!("{}", count),
-        }))
-      }
-      RequestMismatchMitigationStrategy::PayMoreUpgrade
-      | RequestMismatchMitigationStrategy::PayLessDowngrade => Ok(()),
-    },
-  }
-}
-
-#[cfg(test)]
-mod tests {
-  use enums::common::generation::common_resolution::CommonResolution as CommonResolutionEnum;
-  use enums::common::generation::common_video_model::CommonVideoModel as CommonVideoModelEnum;
-  use tokens::tokens::characters::CharacterToken;
-  use tokens::tokens::media_files::MediaFileToken;
-
-  use crate::api::character_list_ref::CharacterListRef;
-  use crate::api::image_list_ref::ImageListRef;
-  use crate::api::image_ref::ImageRef;
-  use crate::api::router_provider::RouterProvider;
-  use crate::api::router_resolution::RouterResolution;
-  use crate::api::router_video_model::RouterVideoModel;
-  use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-  use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-  use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
-
-  use super::*;
-
-  mod field_conversions {
-    use super::*;
-
-    #[test]
-    fn model_is_correct() {
-      let req = unwrap_request(builder_with(|_| {}));
-      assert!(matches!(req.request.model, Some(CommonVideoModelEnum::Seedance2p5Ultra)));
-    }
-
-    #[test]
-    fn duration_30_is_passed_through() {
-      let req = unwrap_request(builder_with(|b| { b.duration_seconds = Some(30); }));
-      assert_eq!(req.request.duration_seconds, Some(30));
-    }
-
-    #[test]
-    fn duration_clamped_to_range() {
-      let req = unwrap_request(builder_with(|b| { b.duration_seconds = Some(99); }));
-      assert_eq!(req.request.duration_seconds, Some(30));
-
-      let req = unwrap_request(builder_with(|b| { b.duration_seconds = Some(2); }));
-      assert_eq!(req.request.duration_seconds, Some(4));
-    }
-
-    #[test]
-    fn batch_count_is_always_one() {
-      let req = unwrap_request(builder_with(|b| { b.video_batch_count = Some(4); }));
-      assert_eq!(req.request.video_batch_count, Some(1));
-    }
-
-    #[test]
-    fn total_input_seconds_is_carried_through() {
-      let req = unwrap_request(builder_with(|b| { b.total_reference_video_input_seconds = Some(14); }));
-      assert_eq!(req.total_input_seconds, Some(14));
-    }
-  }
-
-  mod modality_rules {
-    use super::*;
-
-    #[test]
-    fn keyframes_are_accepted() {
-      let req = unwrap_request(builder_with(|b| {
-        b.start_frame = Some(ImageRef::MediaFileToken(MediaFileToken::new("mf_start".to_string())));
-        b.end_frame = Some(ImageRef::MediaFileToken(MediaFileToken::new("mf_end".to_string())));
-      }));
-      assert!(req.request.start_frame_image_media_token.is_some());
-      assert!(req.request.end_frame_image_media_token.is_some());
-    }
-
-    #[test]
-    fn end_frame_without_start_frame_errors() {
-      let result = build_artcraft_seedance_2p5_u(builder_with(|b| {
-        b.end_frame = Some(ImageRef::MediaFileToken(MediaFileToken::new("mf_end".to_string())));
-      }));
-      assert!(result.is_err());
-    }
-
-    #[test]
-    fn keyframes_plus_references_error() {
-      let result = build_artcraft_seedance_2p5_u(builder_with(|b| {
-        b.start_frame = Some(ImageRef::MediaFileToken(MediaFileToken::new("mf_start".to_string())));
-        b.reference_images = Some(ImageListRef::MediaFileTokens(vec![
-          MediaFileToken::new("mf_ref".to_string()),
-        ]));
-      }));
-      assert!(result.is_err());
-    }
-
-    #[test]
-    fn character_references_error() {
-      let result = build_artcraft_seedance_2p5_u(builder_with(|b| {
-        b.reference_character_tokens = Some(CharacterListRef::CharacterTokens(vec![
-          CharacterToken::new("char_abc".to_string()),
-        ]));
-      }));
-      assert!(result.is_err());
-    }
-  }
-
-  mod resolution_tests {
-    use super::*;
-
-    #[test]
-    fn res_480p() {
-      let req = unwrap_request(builder_with(|b| { b.resolution = Some(RouterResolution::FourEightyP); }));
-      assert_eq!(req.request.resolution, Some(CommonResolutionEnum::FourEightyP));
-    }
-
-    #[test]
-    fn res_1080p_maps_directly() {
-      let req = unwrap_request(builder_with(|b| { b.resolution = Some(RouterResolution::TenEightyP); }));
-      assert_eq!(req.request.resolution, Some(CommonResolutionEnum::TenEightyP));
-    }
-
-    #[test]
-    fn res_4k_downgrades_to_1080p() {
-      let req = unwrap_request(builder_with(|b| { b.resolution = Some(RouterResolution::FourK); }));
-      assert_eq!(req.request.resolution, Some(CommonResolutionEnum::TenEightyP));
-    }
-  }
-
-  fn builder_with(f: impl FnOnce(&mut GenerateVideoRequestBuilder)) -> GenerateVideoRequestBuilder {
-    let mut builder = GenerateVideoRequestBuilder {
-      model: RouterVideoModel::Seedance2p5Ultra,
-      provider: RouterProvider::Artcraft,
-      duration_seconds: Some(5),
-      video_batch_count: Some(1),
-      ..Default::default()
-    };
-    f(&mut builder);
-    builder
-  }
-
-  fn unwrap_request(builder: GenerateVideoRequestBuilder) -> ArtcraftSeedance2p5UltraRequestState {
-    let result = build_artcraft_seedance_2p5_u(builder).expect("build should succeed");
-    match result {
-      VideoGenerationDraftOrRequest::Request(VideoGenerationRequest::ArtcraftSeedance2p5Ultra(state)) => state,
-      _ => panic!("expected ArtcraftSeedance2p5Ultra request"),
-    }
-  }
-}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p5_u/cost.rs

@@ -1,250 +0,0 @@
-use enums::common::generation::common_resolution::CommonResolution;
-
-use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
-use crate::generate::generate_video::providers::artcraft::seedance_common::seedance_2p5_ultra_usd_cents;
-use crate::generate::generate_video::providers::artcraft::seedance_2p5_u::request::ArtcraftSeedance2p5UltraRequestState;
-
-/// Seedance 2.5 Ultra pricing depends on the resolution, the output
-/// duration, and — when reference videos are attached — the total seconds of
-/// reference video input, which are billed on top of the output duration (at
-/// a lower per-second rate). Input seconds are clamped to
-/// [`MAX_BILLED_INPUT_SECONDS`] — the model accepts at most 30 seconds of
-/// video. No batching.
-pub struct ArtcraftSeedance2p5UltraCostState {
-  pub resolution: CommonResolution,
-  pub duration_seconds: u16,
-  pub has_video_references: bool,
-  pub maybe_total_input_seconds: Option<u16>,
-}
-
-impl ArtcraftSeedance2p5UltraCostState {
-  pub fn from_request(request: &ArtcraftSeedance2p5UltraRequestState) -> Self {
-    let resolution = request.request.resolution
-      .unwrap_or(CommonResolution::SevenTwentyP);
-    let duration_seconds = request.request.duration_seconds.unwrap_or(5);
-
-    let has_video_references = request.request.reference_video_media_tokens
-      .as_ref()
-      .is_some_and(|tokens| !tokens.is_empty());
-
-    Self {
-      resolution,
-      duration_seconds,
-      has_video_references,
-      maybe_total_input_seconds: request.total_input_seconds,
-    }
-  }
-
-  pub fn estimate_cost(&self) -> VideoGenerationCostEstimate {
-    // Input-second clamping (the 4..=30 billing range) and the
-    // unknown-or-zero-input failsafe happen inside the shared pricing
-    // function.
-    let maybe_total_input_seconds = self.maybe_total_input_seconds;
-
-    let usd_cents = seedance_2p5_ultra_usd_cents(
-      self.resolution,
-      self.duration_seconds,
-      self.has_video_references,
-      maybe_total_input_seconds,
-    );
-
-    // ArtCraft credits: 100 credits = $1.00, so credits = cents.
-    VideoGenerationCostEstimate {
-      cost_in_credits: Some(usd_cents),
-      cost_in_usd_cents: Some(usd_cents),
-      is_free: false,
-      is_unlimited: false,
-      is_rate_limited: false,
-      has_watermark: false,
-      failures_are_refunded: None,
-    }
-  }
-}
-
-#[cfg(test)]
-mod tests {
-  use crate::api::router_provider::RouterProvider;
-  use crate::api::router_resolution::RouterResolution;
-  use crate::api::router_video_model::RouterVideoModel;
-  use crate::api::video_list_ref::VideoListRef;
-  use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-  use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
-
-  use tokens::tokens::media_files::MediaFileToken;
-
-  mod pricing_without_video_references {
-    use super::*;
-
-    #[test]
-    fn table_480p() {
-      // 13.90946502 ¢/s, rounded up.
-      assert_eq!(cents(Some(RouterResolution::FourEightyP), 4), 56);
-      assert_eq!(cents(Some(RouterResolution::FourEightyP), 5), 70);
-      assert_eq!(cents(Some(RouterResolution::FourEightyP), 10), 140);
-      assert_eq!(cents(Some(RouterResolution::FourEightyP), 30), 418);
-    }
-
-    #[test]
-    fn table_720p() {
-      // 31.56378601 ¢/s, rounded up.
-      assert_eq!(cents(Some(RouterResolution::SevenTwentyP), 4), 127);
-      assert_eq!(cents(Some(RouterResolution::SevenTwentyP), 5), 158);
-      assert_eq!(cents(Some(RouterResolution::SevenTwentyP), 10), 316);
-      assert_eq!(cents(Some(RouterResolution::SevenTwentyP), 30), 947);
-    }
-
-    #[test]
-    fn table_1080p() {
-      // 50.10486922 ¢/s, rounded up.
-      assert_eq!(cents(Some(RouterResolution::TenEightyP), 4), 201);
-      assert_eq!(cents(Some(RouterResolution::TenEightyP), 5), 251);
-      assert_eq!(cents(Some(RouterResolution::TenEightyP), 10), 502);
-      assert_eq!(cents(Some(RouterResolution::TenEightyP), 30), 1504);
-    }
-
-    #[test]
-    fn four_k_downgrades_to_1080p_and_prices_accordingly() {
-      assert_eq!(cents(Some(RouterResolution::FourK), 10), cents(Some(RouterResolution::TenEightyP), 10));
-    }
-
-    #[test]
-    fn none_defaults_to_720p() {
-      assert_eq!(cents(None, 10), cents(Some(RouterResolution::SevenTwentyP), 10));
-    }
-
-    #[test]
-    fn ultra_prices_above_regular_seedance_2p5() {
-      for (resolution, duration) in [
-        (RouterResolution::FourEightyP, 5u16),
-        (RouterResolution::FourEightyP, 30),
-        (RouterResolution::SevenTwentyP, 5),
-        (RouterResolution::SevenTwentyP, 30),
-        (RouterResolution::TenEightyP, 5),
-        (RouterResolution::TenEightyP, 30),
-      ] {
-        let ultra = cents(Some(resolution), duration);
-        let regular = estimate_for_model(RouterVideoModel::Seedance2p5, |b| {
-          b.resolution = Some(resolution);
-          b.duration_seconds = Some(duration);
-        }).cost_in_usd_cents.unwrap();
-        assert!(ultra > regular, "{resolution:?} {duration}s: ultra {ultra} <= regular {regular}");
-      }
-    }
-  }
-
-  mod pricing_with_video_references {
-    use super::*;
-
-    #[test]
-    fn thirty_second_output_with_ten_input_seconds_bills_forty() {
-      // 8.55967078 ¢/s × 40 = 342.39 → 343¢.
-      assert_eq!(cents_with_video_refs(Some(RouterResolution::FourEightyP), 30, Some(10)), 343);
-      // 18.72427984 ¢/s × 40 = 748.97 → 749¢.
-      assert_eq!(cents_with_video_refs(Some(RouterResolution::SevenTwentyP), 30, Some(10)), 749);
-      // 29.93674947 ¢/s × 40 = 1197.47 → 1198¢.
-      assert_eq!(cents_with_video_refs(Some(RouterResolution::TenEightyP), 30, Some(10)), 1198);
-    }
-
-    #[test]
-    fn table_1080p_with_ten_input_seconds() {
-      // 29.93674947 ¢/s over (output + 10) billed seconds, rounded up.
-      assert_eq!(cents_with_video_refs(Some(RouterResolution::TenEightyP), 5, Some(10)), 450);
-      assert_eq!(cents_with_video_refs(Some(RouterResolution::TenEightyP), 10, Some(10)), 599);
-      assert_eq!(cents_with_video_refs(Some(RouterResolution::TenEightyP), 30, Some(10)), 1198);
-    }
-
-    #[test]
-    fn fourteen_input_seconds_bill_forty_four() {
-      // 8.55967078 ¢/s × 44 = 376.63 → 377¢.
-      assert_eq!(cents_with_video_refs(Some(RouterResolution::FourEightyP), 30, Some(14)), 377);
-    }
-
-    #[test]
-    fn missing_or_zero_input_seconds_bill_the_thirty_second_maximum() {
-      // FAILSAFE: an unmeasured (or zero) input bills the 30-second MAXIMUM,
-      // matching the provider client's fallback:
-      // 8.55967078 ¢/s × (10+30) = 342.39 → 343¢.
-      assert_eq!(cents_with_video_refs(Some(RouterResolution::FourEightyP), 10, None), 343);
-      assert_eq!(cents_with_video_refs(Some(RouterResolution::FourEightyP), 10, Some(0)), 343);
-    }
-
-    #[test]
-    fn input_totals_under_four_seconds_clamp_to_four() {
-      let at_minimum = cents_with_video_refs(Some(RouterResolution::FourEightyP), 10, Some(4));
-      assert_eq!(cents_with_video_refs(Some(RouterResolution::FourEightyP), 10, Some(1)), at_minimum);
-      assert_eq!(cents_with_video_refs(Some(RouterResolution::FourEightyP), 10, Some(3)), at_minimum);
-      assert!(cents_with_video_refs(Some(RouterResolution::FourEightyP), 10, Some(5)) > at_minimum);
-    }
-
-    #[test]
-    fn input_seconds_clamp_to_max_billed_input_seconds() {
-      // 200 input seconds clamp to 30: 8.55967078 ¢/s × (30+30) = 513.58 → 514¢.
-      assert_eq!(cents_with_video_refs(Some(RouterResolution::FourEightyP), 30, Some(200)), 514);
-      assert_eq!(
-        cents_with_video_refs(Some(RouterResolution::FourEightyP), 30, Some(200)),
-        cents_with_video_refs(Some(RouterResolution::FourEightyP), 30, Some(30)),
-      );
-    }
-  }
-
-  mod credits_tests {
-    use super::*;
-
-    #[test]
-    fn credits_equal_usd_cents() {
-      for dur in [4u16, 10, 30] {
-        let estimate = estimate_with(|b| {
-          b.resolution = Some(RouterResolution::FourEightyP);
-          b.duration_seconds = Some(dur);
-        });
-        assert_eq!(estimate.cost_in_credits, estimate.cost_in_usd_cents);
-      }
-    }
-  }
-
-  // ── Helpers ──
-
-  fn estimate_with(f: impl FnOnce(&mut GenerateVideoRequestBuilder)) -> VideoGenerationCostEstimate {
-    estimate_for_model(RouterVideoModel::Seedance2p5Ultra, f)
-  }
-
-  fn estimate_for_model(
-    model: RouterVideoModel,
-    f: impl FnOnce(&mut GenerateVideoRequestBuilder),
-  ) -> VideoGenerationCostEstimate {
-    let mut builder = GenerateVideoRequestBuilder {
-      model,
-      provider: RouterProvider::Artcraft,
-      duration_seconds: Some(5),
-      video_batch_count: Some(1),
-      ..Default::default()
-    };
-    f(&mut builder);
-    builder.build2()
-      .expect("build should succeed")
-      .estimate_cost()
-      .expect("estimate should succeed")
-  }
-
-  fn cents(resolution: Option<RouterResolution>, duration_seconds: u16) -> u64 {
-    estimate_with(|b| {
-      b.resolution = resolution;
-      b.duration_seconds = Some(duration_seconds);
-    }).cost_in_usd_cents.unwrap()
-  }
-
-  fn cents_with_video_refs(
-    resolution: Option<RouterResolution>,
-    duration_seconds: u16,
-    total_input_seconds: Option<u16>,
-  ) -> u64 {
-    estimate_with(|b| {
-      b.resolution = resolution;
-      b.duration_seconds = Some(duration_seconds);
-      b.reference_videos = Some(VideoListRef::MediaFileTokens(vec![
-        MediaFileToken::new("mf_ref".to_string()),
-      ]));
-      b.total_reference_video_input_seconds = total_input_seconds;
-    }).cost_in_usd_cents.unwrap()
-  }
-}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p5_u/mod.rs

@@ -1,3 +0,0 @@
-pub mod build;
-pub mod cost;
-pub mod request;

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_2p5_u/request.rs

@@ -1,22 +0,0 @@
-use artcraft_api_defs::omni_gen::cost_and_generate_requests::omni_gen_video_cost_and_generate_request::OmniGenVideoCostAndGenerateRequest;
-
-use crate::client::router_artcraft_client::RouterArtcraftClient;
-use crate::errors::artcraft_router_error::ArtcraftRouterError;
-use crate::generate::generate_video::generate_video_response::GenerateVideoResponse;
-use crate::generate::generate_video::providers::artcraft::request_common::send_artcraft_omni_video_request;
-
-#[derive(Clone, Debug)]
-pub struct ArtcraftSeedance2p5UltraRequestState {
-  pub request: OmniGenVideoCostAndGenerateRequest,
-
-  /// Calculation-only: total seconds of reference video input, billed on top
-  /// of the output duration when reference videos are attached. Not part of
-  /// the omni request wire shape.
-  pub total_input_seconds: Option<u16>,
-}
-
-impl ArtcraftSeedance2p5UltraRequestState {
-  pub async fn send(&self, client: &RouterArtcraftClient) -> Result<GenerateVideoResponse, ArtcraftRouterError> {
-    send_artcraft_omni_video_request(&self.request, client).await
-  }
-}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/seedance_common.rs

@@ -3,27 +3,35 @@
 //! ArtCraft credits equal USD cents (100 credits = $1.00).
 
 use enums::common::generation::common_resolution::CommonResolution;
-use kinovi_web_client::generate::video::generate_seedance_2p5::{
-  MAX_BILLED_INPUT_SECONDS, MIN_BILLED_INPUT_SECONDS,
-};
 
 // 4K is priced uniformly across the non-Fast Seedance 2.0 models. Rates are held
 // in hundredths of a USD cent per second so the math is exact integer arithmetic
 // (no floating point), then rounded up to whole cents.
 
-/// 4K output price, in hundredths of a USD cent per second (92.50 ¢/s).
-const FOUR_K_CENTI_CENTS_PER_SECOND: u64 = 9250;
+/// 4K output price, in hundredths of a USD cent per second (86.60 ¢/s).
+const FOUR_K_CENTI_CENTS_PER_SECOND: u64 = 8660;
 
-/// ArtCraft's price (USD cents) for Seedance 2.0 at 4K with no reference
-/// videos attached. Each model prices reference videos through its own
-/// with-reference rate card. The cost scales with duration and batch count,
-/// rounded up to whole cents.
+/// Extra hundredths of a USD cent per second when a reference video is attached
+/// at 4K (17.20 ¢/s surcharge).
+const FOUR_K_VIDEO_REFERENCE_SURCHARGE_CENTI_CENTS_PER_SECOND: u64 = 1720;
+
+/// ArtCraft's price (USD cents) for Seedance 2.0 at 4K.
+///
+/// A reference video adds a per-second surcharge (4K with and without a video
+/// reference are priced differently). The cost scales with duration and batch
+/// count, rounded up to whole cents.
 pub fn seedance_2p0_four_k_usd_cents(
   duration_seconds: u16,
   batch_count: u16,
+  has_video_reference: bool,
 ) -> u64 {
+  let mut centi_cents_per_second = FOUR_K_CENTI_CENTS_PER_SECOND;
+  if has_video_reference {
+    centi_cents_per_second += FOUR_K_VIDEO_REFERENCE_SURCHARGE_CENTI_CENTS_PER_SECOND;
+  }
+
   let total_centi_cents =
-    FOUR_K_CENTI_CENTS_PER_SECOND * duration_seconds as u64 * batch_count as u64;
+    centi_cents_per_second * duration_seconds as u64 * batch_count as u64;
 
   // Round up to whole cents.
   total_centi_cents.div_ceil(100)
@@ -40,22 +48,22 @@ pub fn seedance_2p0_four_k_usd_cents(
 // rate sets and helpers below.
 
 /// Regular Mini — 480p price, USD cents per second.
-const MINI_CENTS_PER_SECOND_480P: f64 = 3.45;
+const MINI_CENTS_PER_SECOND_480P: f64 = 3.24074074;
 /// Regular Mini — 480p reference-video surcharge, USD cents per second.
-const MINI_VIDEO_REFERENCE_SURCHARGE_CENTS_PER_SECOND_480P: f64 = 0.90;
+const MINI_VIDEO_REFERENCE_SURCHARGE_CENTS_PER_SECOND_480P: f64 = 0.86419753;
 /// Regular Mini — 720p price, USD cents per second.
-const MINI_CENTS_PER_SECOND_720P: f64 = 8.90;
+const MINI_CENTS_PER_SECOND_720P: f64 = 8.64197531;
 /// Regular Mini — 720p reference-video surcharge, USD cents per second.
-const MINI_VIDEO_REFERENCE_SURCHARGE_CENTS_PER_SECOND_720P: f64 = 1.80;
+const MINI_VIDEO_REFERENCE_SURCHARGE_CENTS_PER_SECOND_720P: f64 = 1.72839506;
 
 /// BytePlus / BytePlus Ultra Mini — 480p price, USD cents per second.
-const BYTEPLUS_MINI_CENTS_PER_SECOND_480P: f64 = 3.55;
+const BYTEPLUS_MINI_CENTS_PER_SECOND_480P: f64 = 3.27160494;
 /// BytePlus / BytePlus Ultra Mini — 480p reference-video surcharge, USD cents per second.
-const BYTEPLUS_MINI_VIDEO_REFERENCE_SURCHARGE_CENTS_PER_SECOND_480P: f64 = 0.95;
+const BYTEPLUS_MINI_VIDEO_REFERENCE_SURCHARGE_CENTS_PER_SECOND_480P: f64 = 0.87242798;
 /// BytePlus / BytePlus Ultra Mini — 720p price, USD cents per second.
-const BYTEPLUS_MINI_CENTS_PER_SECOND_720P: f64 = 9.10;
+const BYTEPLUS_MINI_CENTS_PER_SECOND_720P: f64 = 8.72427984;
 /// BytePlus / BytePlus Ultra Mini — 720p reference-video surcharge, USD cents per second.
-const BYTEPLUS_MINI_VIDEO_REFERENCE_SURCHARGE_CENTS_PER_SECOND_720P: f64 = 1.85;
+const BYTEPLUS_MINI_VIDEO_REFERENCE_SURCHARGE_CENTS_PER_SECOND_720P: f64 = 1.74485597;
 
 /// ArtCraft's price (USD cents) for the regular Seedance 2.0 Mini.
 ///
@@ -111,9 +119,9 @@ pub fn seedance_2p0_byteplus_mini_usd_cents(
 // change the price.
 
 /// Seedance 2.5 Preview — 480p price, USD cents per second.
-const SEEDANCE_2P5_PREVIEW_CENTS_PER_SECOND_480P: f64 = 21.38234568;
+const SEEDANCE_2P5_PREVIEW_CENTS_PER_SECOND_480P: f64 = 20.41909465;
 /// Seedance 2.5 Preview — 720p price, USD cents per second.
-const SEEDANCE_2P5_PREVIEW_CENTS_PER_SECOND_720P: f64 = 42.76469136;
+const SEEDANCE_2P5_PREVIEW_CENTS_PER_SECOND_720P: f64 = 40.8381893;
 
 /// ArtCraft's price (USD cents) for Seedance 2.5 Preview.
 ///
@@ -133,130 +141,6 @@ pub fn seedance_2p5_preview_usd_cents(
   (cents_per_second * duration_seconds as f64).ceil() as u64
 }
 
-/// Seedance 2.5 — 480p price, USD cents per second.
-const SEEDANCE_2P5_CENTS_PER_SECOND_480P: f64 = 11.76954733;
-/// Seedance 2.5 — 720p price, USD cents per second.
-const SEEDANCE_2P5_CENTS_PER_SECOND_720P: f64 = 26.70781893;
-/// Seedance 2.5 — 1080p price, USD cents per second.
-const SEEDANCE_2P5_CENTS_PER_SECOND_1080P: f64 = 45.85869386;
-/// Seedance 2.5 — 480p price with video references, USD cents per second.
-const SEEDANCE_2P5_VIDEO_REFERENCE_CENTS_PER_SECOND_480P: f64 = 7.24279835;
-/// Seedance 2.5 — 720p price with video references, USD cents per second.
-const SEEDANCE_2P5_VIDEO_REFERENCE_CENTS_PER_SECOND_720P: f64 = 15.84362140;
-/// Seedance 2.5 — 1080p price with video references, USD cents per second.
-const SEEDANCE_2P5_VIDEO_REFERENCE_CENTS_PER_SECOND_1080P: f64 = 27.39973680;
-
-/// ArtCraft's price (USD cents) for Seedance 2.5.
-///
-/// 480p, 720p, and 1080p are offered; any other resolution prices at 720p
-/// (the request planner maps unsupported resolutions before pricing, so
-/// this fallback is only a failsafe). Without video references, billed
-/// seconds = output duration. With video references, the per-second rate
-/// drops but the billed seconds are the output duration PLUS the total
-/// seconds of reference video input (clamped to the 4..=30 second billing
-/// range). The fractional total is rounded UP to a whole cent. No batching.
-pub fn seedance_2p5_usd_cents(
-  resolution: CommonResolution,
-  duration_seconds: u16,
-  has_video_references: bool,
-  maybe_total_input_seconds: Option<u16>,
-) -> u64 {
-  let (cents_per_second, billed_seconds) = if has_video_references {
-    let rate = match resolution {
-      CommonResolution::FourEightyP => SEEDANCE_2P5_VIDEO_REFERENCE_CENTS_PER_SECOND_480P,
-      CommonResolution::TenEightyP => SEEDANCE_2P5_VIDEO_REFERENCE_CENTS_PER_SECOND_1080P,
-      // Everything else (including 720p and unsupported resolutions) prices at 720p.
-      _ => SEEDANCE_2P5_VIDEO_REFERENCE_CENTS_PER_SECOND_720P,
-    };
-    // The TOTAL input duration clamps to the 4..=30 second billing range
-    // (three 1s videos sum to 3 and bill 4; three 3s videos bill 9).
-    //
-    // FAILSAFE: an unknown (never probed) or zero input duration bills the
-    // 30-second MAXIMUM, matching the provider client's own fallback. It
-    // must never default toward the minimum — billing 4 input seconds for
-    // an unmeasured input while the provider assumes 30 sells input seconds
-    // far below cost.
-    let billed_input_seconds = match maybe_total_input_seconds {
-      None | Some(0) => u16::from(MAX_BILLED_INPUT_SECONDS),
-      Some(seconds) => {
-        seconds.clamp(u16::from(MIN_BILLED_INPUT_SECONDS), u16::from(MAX_BILLED_INPUT_SECONDS))
-      }
-    };
-    (rate, u64::from(duration_seconds) + u64::from(billed_input_seconds))
-  } else {
-    let rate = match resolution {
-      CommonResolution::FourEightyP => SEEDANCE_2P5_CENTS_PER_SECOND_480P,
-      CommonResolution::TenEightyP => SEEDANCE_2P5_CENTS_PER_SECOND_1080P,
-      _ => SEEDANCE_2P5_CENTS_PER_SECOND_720P,
-    };
-    (rate, u64::from(duration_seconds))
-  };
-
-  (cents_per_second * billed_seconds as f64).ceil() as u64
-}
-
-/// Seedance 2.5 Ultra — 480p price, USD cents per second.
-const SEEDANCE_2P5_ULTRA_CENTS_PER_SECOND_480P: f64 = 13.90946502;
-/// Seedance 2.5 Ultra — 720p price, USD cents per second.
-const SEEDANCE_2P5_ULTRA_CENTS_PER_SECOND_720P: f64 = 31.56378601;
-/// Seedance 2.5 Ultra — 1080p price, USD cents per second.
-const SEEDANCE_2P5_ULTRA_CENTS_PER_SECOND_1080P: f64 = 50.10486922;
-/// Seedance 2.5 Ultra — 480p price with video references, USD cents per second.
-const SEEDANCE_2P5_ULTRA_VIDEO_REFERENCE_CENTS_PER_SECOND_480P: f64 = 8.55967078;
-/// Seedance 2.5 Ultra — 720p price with video references, USD cents per second.
-const SEEDANCE_2P5_ULTRA_VIDEO_REFERENCE_CENTS_PER_SECOND_720P: f64 = 18.72427984;
-/// Seedance 2.5 Ultra — 1080p price with video references, USD cents per second.
-const SEEDANCE_2P5_ULTRA_VIDEO_REFERENCE_CENTS_PER_SECOND_1080P: f64 = 29.93674947;
-
-/// ArtCraft's price (USD cents) for Seedance 2.5 Ultra.
-///
-/// 480p, 720p, and 1080p are offered; any other resolution prices at 720p
-/// (the request planner maps unsupported resolutions before pricing, so
-/// this fallback is only a failsafe). Without video references, billed
-/// seconds = output duration. With video references, the per-second rate
-/// drops but the billed seconds are the output duration PLUS the total
-/// seconds of reference video input. The fractional total is rounded UP to
-/// a whole cent. No batching.
-pub fn seedance_2p5_ultra_usd_cents(
-  resolution: CommonResolution,
-  duration_seconds: u16,
-  has_video_references: bool,
-  maybe_total_input_seconds: Option<u16>,
-) -> u64 {
-  let (cents_per_second, billed_seconds) = if has_video_references {
-    let rate = match resolution {
-      CommonResolution::FourEightyP => SEEDANCE_2P5_ULTRA_VIDEO_REFERENCE_CENTS_PER_SECOND_480P,
-      CommonResolution::TenEightyP => SEEDANCE_2P5_ULTRA_VIDEO_REFERENCE_CENTS_PER_SECOND_1080P,
-      // Everything else (including 720p and unsupported resolutions) prices at 720p.
-      _ => SEEDANCE_2P5_ULTRA_VIDEO_REFERENCE_CENTS_PER_SECOND_720P,
-    };
-    // The TOTAL input duration clamps to the 4..=30 second billing range
-    // (three 1s videos sum to 3 and bill 4; three 3s videos bill 9).
-    //
-    // FAILSAFE: an unknown (never probed) or zero input duration bills the
-    // 30-second MAXIMUM, matching the provider client's own fallback. It
-    // must never default toward the minimum — billing 4 input seconds for
-    // an unmeasured input while the provider assumes 30 sells input seconds
-    // far below cost.
-    let billed_input_seconds = match maybe_total_input_seconds {
-      None | Some(0) => u16::from(MAX_BILLED_INPUT_SECONDS),
-      Some(seconds) => {
-        seconds.clamp(u16::from(MIN_BILLED_INPUT_SECONDS), u16::from(MAX_BILLED_INPUT_SECONDS))
-      }
-    };
-    (rate, u64::from(duration_seconds) + u64::from(billed_input_seconds))
-  } else {
-    let rate = match resolution {
-      CommonResolution::FourEightyP => SEEDANCE_2P5_ULTRA_CENTS_PER_SECOND_480P,
-      CommonResolution::TenEightyP => SEEDANCE_2P5_ULTRA_CENTS_PER_SECOND_1080P,
-      _ => SEEDANCE_2P5_ULTRA_CENTS_PER_SECOND_720P,
-    };
-    (rate, u64::from(duration_seconds))
-  };
-
-  (cents_per_second * billed_seconds as f64).ceil() as u64
-}
-
 #[allow(clippy::too_many_arguments)]
 fn mini_usd_cents(
   resolution: CommonResolution,
@@ -287,17 +171,37 @@ mod tests {
   use super::*;
 
   #[test]
-  fn four_k_base_prices() {
-    assert_eq!(seedance_2p0_four_k_usd_cents(4, 1), 370);
-    assert_eq!(seedance_2p0_four_k_usd_cents(5, 1), 463);
-    assert_eq!(seedance_2p0_four_k_usd_cents(10, 1), 925);
-    assert_eq!(seedance_2p0_four_k_usd_cents(15, 1), 1388);
+  fn four_k_without_video_reference() {
+    assert_eq!(seedance_2p0_four_k_usd_cents(4, 1, false), 347);
+    assert_eq!(seedance_2p0_four_k_usd_cents(5, 1, false), 433);
+    assert_eq!(seedance_2p0_four_k_usd_cents(10, 1, false), 866);
+    assert_eq!(seedance_2p0_four_k_usd_cents(15, 1, false), 1299);
+  }
+
+  #[test]
+  fn four_k_with_video_reference() {
+    assert_eq!(seedance_2p0_four_k_usd_cents(4, 1, true), 416);
+    assert_eq!(seedance_2p0_four_k_usd_cents(5, 1, true), 519);
+    assert_eq!(seedance_2p0_four_k_usd_cents(10, 1, true), 1038);
+    assert_eq!(seedance_2p0_four_k_usd_cents(15, 1, true), 1557);
+  }
+
+  #[test]
+  fn video_reference_always_costs_more() {
+    for &duration in &[4u16, 5, 10, 15] {
+      assert!(
+        seedance_2p0_four_k_usd_cents(duration, 1, true)
+          > seedance_2p0_four_k_usd_cents(duration, 1, false),
+        "video reference should cost more at {duration}s",
+      );
+    }
   }
 
   #[test]
   fn batch_count_multiplies() {
-    assert_eq!(seedance_2p0_four_k_usd_cents(5, 2), 925);
-    assert_eq!(seedance_2p0_four_k_usd_cents(5, 4), 1850);
+    assert_eq!(seedance_2p0_four_k_usd_cents(5, 2, false), 866);
+    assert_eq!(seedance_2p0_four_k_usd_cents(5, 4, false), 1732);
+    assert_eq!(seedance_2p0_four_k_usd_cents(5, 2, true), 1038);
   }
 
   // ── Seedance 2.0 Mini ──
@@ -314,34 +218,34 @@ mod tests {
 
     #[test]
     fn four_eighty_p_without_video_reference() {
-      assert_eq!(cents(CommonResolution::FourEightyP, 4, false), 14);
-      assert_eq!(cents(CommonResolution::FourEightyP, 5, false), 18);
-      assert_eq!(cents(CommonResolution::FourEightyP, 10, false), 35);
-      assert_eq!(cents(CommonResolution::FourEightyP, 15, false), 52);
+      assert_eq!(cents(CommonResolution::FourEightyP, 4, false), 13);
+      assert_eq!(cents(CommonResolution::FourEightyP, 5, false), 17);
+      assert_eq!(cents(CommonResolution::FourEightyP, 10, false), 33);
+      assert_eq!(cents(CommonResolution::FourEightyP, 15, false), 49);
     }
 
     #[test]
     fn four_eighty_p_with_video_reference() {
-      assert_eq!(cents(CommonResolution::FourEightyP, 4, true), 18);
-      assert_eq!(cents(CommonResolution::FourEightyP, 5, true), 22);
-      assert_eq!(cents(CommonResolution::FourEightyP, 10, true), 44);
-      assert_eq!(cents(CommonResolution::FourEightyP, 15, true), 66);
+      assert_eq!(cents(CommonResolution::FourEightyP, 4, true), 17);
+      assert_eq!(cents(CommonResolution::FourEightyP, 5, true), 21);
+      assert_eq!(cents(CommonResolution::FourEightyP, 10, true), 42);
+      assert_eq!(cents(CommonResolution::FourEightyP, 15, true), 62);
     }
 
     #[test]
     fn seven_twenty_p_without_video_reference() {
-      assert_eq!(cents(CommonResolution::SevenTwentyP, 4, false), 36);
-      assert_eq!(cents(CommonResolution::SevenTwentyP, 5, false), 45);
-      assert_eq!(cents(CommonResolution::SevenTwentyP, 10, false), 89);
-      assert_eq!(cents(CommonResolution::SevenTwentyP, 15, false), 134);
+      assert_eq!(cents(CommonResolution::SevenTwentyP, 4, false), 35);
+      assert_eq!(cents(CommonResolution::SevenTwentyP, 5, false), 44);
+      assert_eq!(cents(CommonResolution::SevenTwentyP, 10, false), 87);
+      assert_eq!(cents(CommonResolution::SevenTwentyP, 15, false), 130);
     }
 
     #[test]
     fn seven_twenty_p_with_video_reference() {
-      assert_eq!(cents(CommonResolution::SevenTwentyP, 4, true), 43);
-      assert_eq!(cents(CommonResolution::SevenTwentyP, 5, true), 54);
-      assert_eq!(cents(CommonResolution::SevenTwentyP, 10, true), 108);
-      assert_eq!(cents(CommonResolution::SevenTwentyP, 15, true), 161);
+      assert_eq!(cents(CommonResolution::SevenTwentyP, 4, true), 42);
+      assert_eq!(cents(CommonResolution::SevenTwentyP, 5, true), 52);
+      assert_eq!(cents(CommonResolution::SevenTwentyP, 10, true), 104);
+      assert_eq!(cents(CommonResolution::SevenTwentyP, 15, true), 156);
     }
 
     #[test]
@@ -368,9 +272,9 @@ mod tests {
     fn batch_count_scales_the_total() {
       // Batch is baked in before the single round-up, so batched totals can be
       // a cent under N× the single price.
-      assert_eq!(seedance_2p0_mini_usd_cents(CommonResolution::SevenTwentyP, 5, 2, false), 89);
-      assert_eq!(seedance_2p0_mini_usd_cents(CommonResolution::SevenTwentyP, 5, 4, false), 178);
-      assert_eq!(seedance_2p0_mini_usd_cents(CommonResolution::FourEightyP, 5, 2, false), 35);
+      assert_eq!(seedance_2p0_mini_usd_cents(CommonResolution::SevenTwentyP, 5, 2, false), 87);
+      assert_eq!(seedance_2p0_mini_usd_cents(CommonResolution::SevenTwentyP, 5, 4, false), 173);
+      assert_eq!(seedance_2p0_mini_usd_cents(CommonResolution::FourEightyP, 5, 2, false), 33);
     }
   }
 
@@ -388,34 +292,34 @@ mod tests {
 
     #[test]
     fn four_eighty_p_without_video_reference() {
-      assert_eq!(cents(CommonResolution::FourEightyP, 4, false), 15);
-      assert_eq!(cents(CommonResolution::FourEightyP, 5, false), 18);
-      assert_eq!(cents(CommonResolution::FourEightyP, 10, false), 36);
-      assert_eq!(cents(CommonResolution::FourEightyP, 15, false), 54);
+      assert_eq!(cents(CommonResolution::FourEightyP, 4, false), 14);
+      assert_eq!(cents(CommonResolution::FourEightyP, 5, false), 17);
+      assert_eq!(cents(CommonResolution::FourEightyP, 10, false), 33);
+      assert_eq!(cents(CommonResolution::FourEightyP, 15, false), 50);
     }
 
     #[test]
     fn four_eighty_p_with_video_reference() {
-      assert_eq!(cents(CommonResolution::FourEightyP, 4, true), 18);
-      assert_eq!(cents(CommonResolution::FourEightyP, 5, true), 23);
-      assert_eq!(cents(CommonResolution::FourEightyP, 10, true), 45);
-      assert_eq!(cents(CommonResolution::FourEightyP, 15, true), 68);
+      assert_eq!(cents(CommonResolution::FourEightyP, 4, true), 17);
+      assert_eq!(cents(CommonResolution::FourEightyP, 5, true), 21);
+      assert_eq!(cents(CommonResolution::FourEightyP, 10, true), 42);
+      assert_eq!(cents(CommonResolution::FourEightyP, 15, true), 63);
     }
 
     #[test]
     fn seven_twenty_p_without_video_reference() {
-      assert_eq!(cents(CommonResolution::SevenTwentyP, 4, false), 37);
-      assert_eq!(cents(CommonResolution::SevenTwentyP, 5, false), 46);
-      assert_eq!(cents(CommonResolution::SevenTwentyP, 10, false), 91);
-      assert_eq!(cents(CommonResolution::SevenTwentyP, 15, false), 137);
+      assert_eq!(cents(CommonResolution::SevenTwentyP, 4, false), 35);
+      assert_eq!(cents(CommonResolution::SevenTwentyP, 5, false), 44);
+      assert_eq!(cents(CommonResolution::SevenTwentyP, 10, false), 88);
+      assert_eq!(cents(CommonResolution::SevenTwentyP, 15, false), 131);
     }
 
     #[test]
     fn seven_twenty_p_with_video_reference() {
-      assert_eq!(cents(CommonResolution::SevenTwentyP, 4, true), 44);
-      assert_eq!(cents(CommonResolution::SevenTwentyP, 5, true), 55);
-      assert_eq!(cents(CommonResolution::SevenTwentyP, 10, true), 110);
-      assert_eq!(cents(CommonResolution::SevenTwentyP, 15, true), 165);
+      assert_eq!(cents(CommonResolution::SevenTwentyP, 4, true), 42);
+      assert_eq!(cents(CommonResolution::SevenTwentyP, 5, true), 53);
+      assert_eq!(cents(CommonResolution::SevenTwentyP, 10, true), 105);
+      assert_eq!(cents(CommonResolution::SevenTwentyP, 15, true), 158);
     }
 
     #[test]
@@ -443,9 +347,9 @@ mod tests {
 
     #[test]
     fn batch_count_scales_the_total() {
-      assert_eq!(seedance_2p0_byteplus_mini_usd_cents(CommonResolution::SevenTwentyP, 5, 2, false), 91);
-      assert_eq!(seedance_2p0_byteplus_mini_usd_cents(CommonResolution::SevenTwentyP, 5, 4, false), 182);
-      assert_eq!(seedance_2p0_byteplus_mini_usd_cents(CommonResolution::FourEightyP, 5, 2, false), 36);
+      assert_eq!(seedance_2p0_byteplus_mini_usd_cents(CommonResolution::SevenTwentyP, 5, 2, false), 88);
+      assert_eq!(seedance_2p0_byteplus_mini_usd_cents(CommonResolution::SevenTwentyP, 5, 4, false), 175);
+      assert_eq!(seedance_2p0_byteplus_mini_usd_cents(CommonResolution::FourEightyP, 5, 2, false), 33);
     }
   }
 }

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/sora_2/cost.rs

@@ -15,9 +15,8 @@ impl ArtcraftSora2CostState {
   }
 
   pub fn estimate_cost(&self) -> VideoGenerationCostEstimate {
-    // Sora 2: 11.5¢/second (held in hundredths of a cent, rounded up to
-    // whole cents). Default duration 4s.
-    let cost_in_usd_cents = (self.duration_seconds * 1_150).div_ceil(100);
+    // Sora 2: $0.10/second. Default duration 4s.
+    let cost_in_usd_cents = self.duration_seconds * 10;
 
     VideoGenerationCostEstimate {
       cost_in_credits: Some(cost_in_usd_cents),
@@ -49,14 +48,14 @@ mod tests {
   }
 
   #[test]
-  fn four_seconds_is_46() { assert_eq!(cost_cents(Some(4)), 46); }
+  fn four_seconds_is_40() { assert_eq!(cost_cents(Some(4)), 40); }
 
   #[test]
-  fn eight_seconds_is_92() { assert_eq!(cost_cents(Some(8)), 92); }
+  fn eight_seconds_is_80() { assert_eq!(cost_cents(Some(8)), 80); }
 
   #[test]
-  fn twelve_seconds_is_138() { assert_eq!(cost_cents(Some(12)), 138); }
+  fn twelve_seconds_is_120() { assert_eq!(cost_cents(Some(12)), 120); }
 
   #[test]
-  fn default_duration_is_4s_priced_at_46() { assert_eq!(cost_cents(None), 46); }
+  fn default_duration_is_4s_priced_at_40() { assert_eq!(cost_cents(None), 40); }
 }

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/sora_2_pro/cost.rs

@@ -19,10 +19,9 @@ impl ArtcraftSora2ProCostState {
   }
 
   pub fn estimate_cost(&self) -> VideoGenerationCostEstimate {
-    // Sora 2 Pro: 34.5¢/sec @ 720p, 57.5¢/sec @ 1080p (held in hundredths
-    // of a cent, rounded up to whole cents). Default 4s.
-    let per_second_centi_cents: u64 = if self.is_ten_eighty_p { 5_750 } else { 3_450 };
-    let cost_in_usd_cents = (per_second_centi_cents * self.duration_seconds).div_ceil(100);
+    // Sora 2 Pro: $0.30/sec @ 720p, $0.50/sec @ 1080p. Default 4s.
+    let per_second_cents: u64 = if self.is_ten_eighty_p { 50 } else { 30 };
+    let cost_in_usd_cents = per_second_cents * self.duration_seconds;
 
     VideoGenerationCostEstimate {
       cost_in_credits: Some(cost_in_usd_cents),
@@ -78,30 +77,30 @@ mod tests {
     use super::*;
 
     #[test]
-    fn p720_4s_is_138() { assert_eq!(cost_cents(Some(4), Some(RouterResolution::SevenTwentyP), false), 138); }
+    fn p720_4s_is_120() { assert_eq!(cost_cents(Some(4), Some(RouterResolution::SevenTwentyP), false), 120); }
 
     #[test]
-    fn p720_8s_is_276() { assert_eq!(cost_cents(Some(8), Some(RouterResolution::SevenTwentyP), false), 276); }
+    fn p720_8s_is_240() { assert_eq!(cost_cents(Some(8), Some(RouterResolution::SevenTwentyP), false), 240); }
 
     #[test]
-    fn p720_12s_is_414() { assert_eq!(cost_cents(Some(12), Some(RouterResolution::SevenTwentyP), false), 414); }
+    fn p720_12s_is_360() { assert_eq!(cost_cents(Some(12), Some(RouterResolution::SevenTwentyP), false), 360); }
 
     #[test]
-    fn p1080_4s_is_230() { assert_eq!(cost_cents(Some(4), Some(RouterResolution::TenEightyP), false), 230); }
+    fn p1080_4s_is_200() { assert_eq!(cost_cents(Some(4), Some(RouterResolution::TenEightyP), false), 200); }
 
     #[test]
-    fn p1080_12s_is_690() { assert_eq!(cost_cents(Some(12), Some(RouterResolution::TenEightyP), false), 690); }
+    fn p1080_12s_is_600() { assert_eq!(cost_cents(Some(12), Some(RouterResolution::TenEightyP), false), 600); }
 
     #[test]
     fn t2v_default_resolution_priced_as_1080p() {
-      // T2V (no start_frame) with no resolution → 1080p default → 230¢ at 4s.
-      assert_eq!(cost_cents(Some(4), None, false), 230);
+      // T2V (no start_frame) with no resolution → 1080p default → 200¢ at 4s.
+      assert_eq!(cost_cents(Some(4), None, false), 200);
     }
 
     #[test]
     fn i2v_default_resolution_priced_as_720p() {
-      // I2V (with start_frame) with no resolution → 720p default → 138¢ at 4s.
-      assert_eq!(cost_cents(Some(4), None, true), 138);
+      // I2V (with start_frame) with no resolution → 720p default → 120¢ at 4s.
+      assert_eq!(cost_cents(Some(4), None, true), 120);
     }
   }
 

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3/cost.rs

@@ -11,8 +11,8 @@ impl ArtcraftVeo3CostState {
   pub fn from_request(request: &ArtcraftVeo3RequestState) -> Self {
     Self {
       duration_seconds: duration_seconds_for_cost(request.request.duration_seconds),
-      // Unset defaults to audio on.
-      generate_audio: request.request.generate_audio.unwrap_or(true),
+      // v1 legacy Veo 3 handler defaults generate_audio to false.
+      generate_audio: request.request.generate_audio.unwrap_or(false),
     }
   }
 
@@ -81,7 +81,8 @@ mod tests {
   }
 
   #[test]
-  fn audio_default_is_on() {
-    assert_eq!(cost_cents(Some(8), None), cost_cents(Some(8), Some(true)));
+  fn audio_default_is_off() {
+    // None → audio defaults to false.
+    assert_eq!(cost_cents(Some(8), None), cost_cents(Some(8), Some(false)));
   }
 }

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3_fast/cost.rs

@@ -1,32 +1,22 @@
 use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
 use crate::generate::generate_video::providers::artcraft::veo_3_fast::request::ArtcraftVeo3FastRequestState;
 
-/// Per-second rates in hundredths of a US cent.
-const CENTI_CENTS_PER_SECOND_AUDIO_OFF: u64 = 1_150;
-const CENTI_CENTS_PER_SECOND_AUDIO_ON: u64 = 1_725;
-
 #[derive(Clone, Debug)]
 pub struct ArtcraftVeo3FastCostState {
-  pub duration_seconds: u64,
   pub generate_audio: bool,
 }
 
 impl ArtcraftVeo3FastCostState {
   pub fn from_request(request: &ArtcraftVeo3FastRequestState) -> Self {
     Self {
-      duration_seconds: duration_seconds_for_cost(request.request.duration_seconds),
-      // Unset defaults to audio on.
-      generate_audio: request.request.generate_audio.unwrap_or(true),
+      // v1 legacy Veo 3 Fast handler defaults generate_audio to false.
+      generate_audio: request.request.generate_audio.unwrap_or(false),
     }
   }
 
   pub fn estimate_cost(&self) -> VideoGenerationCostEstimate {
-    let rate = if self.generate_audio {
-      CENTI_CENTS_PER_SECOND_AUDIO_ON
-    } else {
-      CENTI_CENTS_PER_SECOND_AUDIO_OFF
-    };
-    let cost_in_usd_cents = (rate * self.duration_seconds).div_ceil(100);
+    // Flat per-video price: 88¢ audio off, 132¢ audio on.
+    let cost_in_usd_cents: u64 = if self.generate_audio { 132 } else { 88 };
 
     VideoGenerationCostEstimate {
       cost_in_credits: Some(cost_in_usd_cents),
@@ -40,16 +30,6 @@ impl ArtcraftVeo3FastCostState {
   }
 }
 
-/// Mirrors Veo 3's `duration_seconds_for_cost`: s≤4 → 4, s≤6 → 6, else → 8
-/// (incl. None and 7+).
-fn duration_seconds_for_cost(d: Option<u16>) -> u64 {
-  match d {
-    Some(s) if s <= 4 => 4,
-    Some(s) if s <= 6 => 6,
-    _ => 8,
-  }
-}
-
 #[cfg(test)]
 mod tests {
   use crate::api::router_video_model::RouterVideoModel;
@@ -69,34 +49,22 @@ mod tests {
   }
 
   #[test]
-  fn audio_off_4s_is_46() { assert_eq!(cost_cents(Some(4), Some(false)), 46); }
+  fn audio_off_is_88() { assert_eq!(cost_cents(Some(8), Some(false)), 88); }
 
   #[test]
-  fn audio_off_6s_is_69() { assert_eq!(cost_cents(Some(6), Some(false)), 69); }
+  fn audio_on_is_132() { assert_eq!(cost_cents(Some(8), Some(true)), 132); }
 
   #[test]
-  fn audio_off_8s_is_92() { assert_eq!(cost_cents(Some(8), Some(false)), 92); }
-
-  #[test]
-  fn audio_on_4s_is_69() { assert_eq!(cost_cents(Some(4), Some(true)), 69); }
-
-  #[test]
-  fn audio_on_6s_is_104() {
-    // 1725 × 6 = 10350 hundredth-cents → 104 cents (rounded up).
-    assert_eq!(cost_cents(Some(6), Some(true)), 104);
+  fn audio_default_is_off() {
+    assert_eq!(cost_cents(Some(8), None), 88);
   }
 
   #[test]
-  fn audio_on_8s_is_138() { assert_eq!(cost_cents(Some(8), Some(true)), 138); }
-
-  #[test]
-  fn default_duration_is_8s() {
-    assert_eq!(cost_cents(None, Some(false)), cost_cents(Some(8), Some(false)));
+  fn duration_does_not_affect_cost() {
+    // v1 always bills 8s regardless of duration_seconds.
+    assert_eq!(cost_cents(Some(4), Some(false)), 88);
+    assert_eq!(cost_cents(Some(6), Some(false)), 88);
+    assert_eq!(cost_cents(Some(8), Some(false)), 88);
+    assert_eq!(cost_cents(None, Some(false)), 88);
   }
-
-  #[test]
-  fn audio_default_is_on() {
-    assert_eq!(cost_cents(Some(8), None), cost_cents(Some(8), Some(true)));
-  }
-
 }

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/artcraft/veo_3p1_lite/cost.rs

@@ -4,10 +4,10 @@ use crate::generate::generate_video::video_generation_cost_estimate::VideoGenera
 use crate::generate::generate_video::providers::artcraft::veo_3p1_lite::request::ArtcraftVeo3p1LiteRequestState;
 
 /// Per-second rates in hundredths of a US cent.
-const SEVEN_TWENTY_P_AUDIO_OFF_RATE: u64 = 345;
-const SEVEN_TWENTY_P_AUDIO_ON_RATE: u64 = 575;
-const TEN_EIGHTY_P_AUDIO_OFF_RATE: u64 = 575;
-const TEN_EIGHTY_P_AUDIO_ON_RATE: u64 = 920;
+const SEVEN_TWENTY_P_AUDIO_OFF_RATE: u64 = 315;
+const SEVEN_TWENTY_P_AUDIO_ON_RATE: u64 = 525;
+const TEN_EIGHTY_P_AUDIO_OFF_RATE: u64 = 525;
+const TEN_EIGHTY_P_AUDIO_ON_RATE: u64 = 840;
 
 #[derive(Clone, Debug)]
 pub struct ArtcraftVeo3p1LiteCostState {
@@ -88,28 +88,28 @@ mod tests {
   }
 
   #[test]
-  fn defaults_8s_720p_audio_on_is_46() { assert_eq!(cost_cents(None, None, None), 46); }
+  fn defaults_8s_720p_audio_on_is_42() { assert_eq!(cost_cents(None, None, None), 42); }
 
   #[test]
-  fn audio_off_8s_720p_is_28() {
-    // 345 * 8 = 2760 hundredth-cents → 28 cents.
-    assert_eq!(cost_cents(Some(8), None, Some(false)), 28);
+  fn audio_off_8s_720p_is_26() {
+    // 315 * 8 = 2520 hundredth-cents → 26 cents.
+    assert_eq!(cost_cents(Some(8), None, Some(false)), 26);
   }
 
   #[test]
-  fn audio_on_8s_1080p_is_74() {
-    // 920 * 8 = 7360 hundredth-cents → 74 cents.
-    assert_eq!(cost_cents(Some(8), Some(RouterResolution::TenEightyP), Some(true)), 74);
+  fn audio_on_8s_1080p_is_68() {
+    // 840 * 8 = 6720 hundredth-cents → 68 cents.
+    assert_eq!(cost_cents(Some(8), Some(RouterResolution::TenEightyP), Some(true)), 68);
   }
 
   #[test]
-  fn audio_off_8s_1080p_is_46() {
-    assert_eq!(cost_cents(Some(8), Some(RouterResolution::TenEightyP), Some(false)), 46);
+  fn audio_off_8s_1080p_is_42() {
+    assert_eq!(cost_cents(Some(8), Some(RouterResolution::TenEightyP), Some(false)), 42);
   }
 
   #[test]
-  fn audio_on_4s_720p_is_23() {
-    assert_eq!(cost_cents(Some(4), None, Some(true)), 23);
+  fn audio_on_4s_720p_is_21() {
+    assert_eq!(cost_cents(Some(4), None, Some(true)), 21);
   }
 
   #[test]

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/flux_3/build.rs

@@ -1,416 +0,0 @@
-use fal_client::requests::api::video::image::flux_3::api::Flux3ImageToVideoRequest;
-use fal_client::requests::api::video::images::flux_3::api::Flux3FirstLastFrameToVideoRequest;
-use fal_client::requests::api::video::text::flux_3::api::{
-  Flux3AspectRatio, Flux3Duration, Flux3Resolution, Flux3TextToVideoRequest,
-};
-
-use crate::api::audio_list_ref::AudioListRef;
-use crate::api::image_list_ref::ImageListRef;
-use crate::api::image_ref::ImageRef;
-use crate::api::router_aspect_ratio::RouterAspectRatio;
-use crate::api::router_resolution::RouterResolution;
-use crate::api::video_list_ref::VideoListRef;
-use crate::client::request_mismatch_mitigation_strategy::RequestMismatchMitigationStrategy;
-use crate::errors::artcraft_router_error::ArtcraftRouterError;
-use crate::errors::client_error::ClientError;
-use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-use crate::generate::generate_video::providers::fal::flux_3::request::{
-  FalFlux3Mode, FalFlux3RequestState,
-};
-use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
-
-pub(crate) const MIN_DURATION_SECONDS: u16 = 5;
-pub(crate) const MAX_DURATION_SECONDS: u16 = 20;
-
-#[derive(Debug, Clone, Copy)]
-pub(crate) enum PlanAspectRatio {
-  Auto,
-  TwentyOneByNine,
-  SixteenByNine,
-  FourByThree,
-  Square,
-  ThreeByFour,
-  NineBySixteen,
-}
-
-pub fn build_fal_flux_3(
-  builder: GenerateVideoRequestBuilder,
-) -> Result<VideoGenerationDraftOrRequest, ArtcraftRouterError> {
-  let state = build_fal_flux_3_state(builder)?;
-  Ok(VideoGenerationDraftOrRequest::Request(VideoGenerationRequest::FalFlux3(state)))
-}
-
-pub(crate) fn build_fal_flux_3_state(
-  builder: GenerateVideoRequestBuilder,
-) -> Result<FalFlux3RequestState, ArtcraftRouterError> {
-  let strategy = builder.request_mismatch_mitigation_strategy;
-
-  // Flux 3 exposes no reference modality here — only text, starting keyframe,
-  // and start/end keyframes.
-  reject_references(&builder)?;
-
-  let start = optional_url(builder.start_frame.clone())?;
-  let end = optional_url(builder.end_frame.clone())?;
-
-  let aspect_ratio = plan_aspect_ratio(builder.aspect_ratio, strategy)?;
-  let resolution = plan_resolution(builder.resolution, strategy)?;
-  let flexible_duration = plan_flexible_duration(builder.duration_seconds, strategy)?;
-  let fixed_duration = plan_fixed_duration(builder.duration_seconds, strategy)?;
-  let prompt = builder.prompt.clone().unwrap_or_default();
-  let generate_audio = builder.generate_audio;
-
-  // Modality dispatch:
-  //   start + end frames → first-last-frame-to-video
-  //   start frame only   → image-to-video
-  //   no media           → text-to-video
-  let mode = match (start, end) {
-    (None, None) => FalFlux3Mode::TextToVideo(Flux3TextToVideoRequest {
-      prompt,
-      duration: flexible_duration,
-      resolution,
-      aspect_ratio: aspect_ratio.map(to_flux_3_aspect_ratio),
-      generate_audio,
-      safety_tolerance: Some(4), // NB: 4 is the most permissive.
-    }),
-    (Some(image_url), None) => FalFlux3Mode::ImageToVideo(Flux3ImageToVideoRequest {
-      prompt,
-      image_url,
-      duration: flexible_duration,
-      resolution,
-      aspect_ratio: aspect_ratio.map(to_flux_3_aspect_ratio),
-      generate_audio,
-      safety_tolerance: Some(4), // NB: 4 is the most permissive.
-    }),
-    (Some(start_image_url), Some(end_image_url)) => FalFlux3Mode::FirstLastFrameToVideo(
-      Flux3FirstLastFrameToVideoRequest {
-        prompt,
-        start_image_url,
-        end_image_url,
-        duration: fixed_duration,
-        resolution,
-        aspect_ratio: aspect_ratio.map(to_flux_3_aspect_ratio),
-        generate_audio,
-        safety_tolerance: Some(4), // NB: 4 is the most permissive.
-      },
-    ),
-    (None, Some(_)) => {
-      return Err(unsupported(
-        "end_frame",
-        "Flux 3 requires a start_frame when end_frame is provided",
-      ));
-    }
-  };
-
-  Ok(FalFlux3RequestState { mode })
-}
-
-// ── Input helpers (shared with the draft variant) ──
-
-pub(crate) fn unsupported(field: &'static str, value: &str) -> ArtcraftRouterError {
-  ArtcraftRouterError::Client(ClientError::ModelDoesNotSupportOption {
-    field,
-    value: value.to_string(),
-  })
-}
-
-/// Flux 3 supports no reference inputs — no image, video, or audio references.
-pub(crate) fn reject_references(builder: &GenerateVideoRequestBuilder) -> Result<(), ArtcraftRouterError> {
-  let has_reference_images = match &builder.reference_images {
-    None => false,
-    Some(ImageListRef::Urls(urls)) => !urls.is_empty(),
-    Some(ImageListRef::MediaFileTokens(tokens)) => !tokens.is_empty(),
-  };
-  if has_reference_images {
-    return Err(unsupported("reference_images", "Flux 3 does not support image references"));
-  }
-
-  let has_reference_videos = match &builder.reference_videos {
-    None => false,
-    Some(VideoListRef::Urls(urls)) => !urls.is_empty(),
-    Some(VideoListRef::MediaFileTokens(tokens)) => !tokens.is_empty(),
-  };
-  if has_reference_videos {
-    return Err(unsupported("reference_videos", "Flux 3 does not support video references"));
-  }
-
-  let has_reference_audio = match &builder.reference_audio {
-    None => false,
-    Some(AudioListRef::Urls(urls)) => !urls.is_empty(),
-    Some(AudioListRef::MediaFileTokens(tokens)) => !tokens.is_empty(),
-  };
-  if has_reference_audio {
-    return Err(unsupported("reference_audio", "Flux 3 does not support audio references"));
-  }
-
-  Ok(())
-}
-
-pub(crate) fn optional_url(image_ref: Option<ImageRef>) -> Result<Option<String>, ArtcraftRouterError> {
-  match image_ref {
-    None => Ok(None),
-    Some(ImageRef::Url(url)) => Ok(Some(url)),
-    Some(ImageRef::MediaFileToken(_)) => {
-      Err(ArtcraftRouterError::Client(ClientError::FalOnlySupportsUrls))
-    }
-  }
-}
-
-// ── Plan helpers (shared with the draft variant) ──
-
-pub(crate) fn plan_aspect_ratio(
-  aspect_ratio: Option<RouterAspectRatio>,
-  strategy: RequestMismatchMitigationStrategy,
-) -> Result<Option<PlanAspectRatio>, ArtcraftRouterError> {
-  use PlanAspectRatio as Ar;
-  match aspect_ratio {
-    None => Ok(None),
-
-    Some(RouterAspectRatio::Auto)
-    | Some(RouterAspectRatio::Auto2k)
-    | Some(RouterAspectRatio::Auto3k)
-    | Some(RouterAspectRatio::Auto4k) => Ok(Some(Ar::Auto)),
-
-    Some(RouterAspectRatio::WideTwentyOneByNine) => Ok(Some(Ar::TwentyOneByNine)),
-    Some(RouterAspectRatio::WideSixteenByNine) | Some(RouterAspectRatio::Wide) => Ok(Some(Ar::SixteenByNine)),
-    Some(RouterAspectRatio::TallNineBySixteen) | Some(RouterAspectRatio::Tall) => Ok(Some(Ar::NineBySixteen)),
-    Some(RouterAspectRatio::WideFourByThree) => Ok(Some(Ar::FourByThree)),
-    Some(RouterAspectRatio::TallThreeByFour) => Ok(Some(Ar::ThreeByFour)),
-    Some(RouterAspectRatio::Square) | Some(RouterAspectRatio::SquareHd) => Ok(Some(Ar::Square)),
-
-    Some(other) => match strategy {
-      RequestMismatchMitigationStrategy::ErrorOut => {
-        Err(unsupported("aspect_ratio", &format!("{:?}", other)))
-      }
-      _ => Ok(Some(Ar::Auto)),
-    },
-  }
-}
-
-/// Flux 3 renders 720p or 1080p; 480p rounds up to 720p (same billing tier).
-pub(crate) fn plan_resolution(
-  resolution: Option<RouterResolution>,
-  strategy: RequestMismatchMitigationStrategy,
-) -> Result<Option<Flux3Resolution>, ArtcraftRouterError> {
-  match resolution {
-    None => Ok(None),
-
-    Some(RouterResolution::FourEightyP)
-    | Some(RouterResolution::SevenTwentyP) => Ok(Some(Flux3Resolution::SevenTwentyP)),
-    Some(RouterResolution::TenEightyP) => Ok(Some(Flux3Resolution::TenEightyP)),
-
-    Some(other) => match strategy {
-      RequestMismatchMitigationStrategy::ErrorOut => {
-        Err(unsupported("resolution", &format!("{:?}", other)))
-      }
-      RequestMismatchMitigationStrategy::PayMoreUpgrade => Ok(Some(Flux3Resolution::TenEightyP)),
-      RequestMismatchMitigationStrategy::PayLessDowngrade => Ok(Some(Flux3Resolution::SevenTwentyP)),
-    },
-  }
-}
-
-/// Duration for the modalities that accept `auto` (text, image). `None` stays
-/// unset so fal's `auto` default applies.
-pub(crate) fn plan_flexible_duration(
-  duration_seconds: Option<u16>,
-  strategy: RequestMismatchMitigationStrategy,
-) -> Result<Option<Flux3Duration>, ArtcraftRouterError> {
-  Ok(plan_fixed_duration(duration_seconds, strategy)?.map(Flux3Duration::Seconds))
-}
-
-/// Duration for the fixed-duration first-last-frame modality. `None` stays
-/// unset so fal's 5-second default applies.
-pub(crate) fn plan_fixed_duration(
-  duration_seconds: Option<u16>,
-  strategy: RequestMismatchMitigationStrategy,
-) -> Result<Option<u8>, ArtcraftRouterError> {
-  match duration_seconds {
-    None => Ok(None),
-    Some(seconds) if (MIN_DURATION_SECONDS..=MAX_DURATION_SECONDS).contains(&seconds) => {
-      Ok(Some(seconds as u8))
-    }
-    Some(other) => match strategy {
-      RequestMismatchMitigationStrategy::ErrorOut => {
-        Err(unsupported("duration_seconds", &format!("{}", other)))
-      }
-      RequestMismatchMitigationStrategy::PayMoreUpgrade
-      | RequestMismatchMitigationStrategy::PayLessDowngrade => {
-        Ok(Some(other.clamp(MIN_DURATION_SECONDS, MAX_DURATION_SECONDS) as u8))
-      }
-    },
-  }
-}
-
-// ── Leaf converters ──
-
-pub(crate) fn to_flux_3_aspect_ratio(a: PlanAspectRatio) -> Flux3AspectRatio {
-  match a {
-    PlanAspectRatio::Auto => Flux3AspectRatio::Auto,
-    PlanAspectRatio::TwentyOneByNine => Flux3AspectRatio::TwentyOneByNine,
-    PlanAspectRatio::SixteenByNine => Flux3AspectRatio::SixteenByNine,
-    PlanAspectRatio::FourByThree => Flux3AspectRatio::FourByThree,
-    PlanAspectRatio::Square => Flux3AspectRatio::Square,
-    PlanAspectRatio::ThreeByFour => Flux3AspectRatio::ThreeByFour,
-    PlanAspectRatio::NineBySixteen => Flux3AspectRatio::NineBySixteen,
-  }
-}
-
-#[cfg(test)]
-mod tests {
-  use crate::api::router_provider::RouterProvider;
-  use crate::api::router_video_model::RouterVideoModel;
-
-  use super::*;
-
-  const START_URL: &str = "https://example.com/start.png";
-  const END_URL: &str = "https://example.com/end.png";
-
-  mod dispatch_tests {
-    use super::*;
-
-    #[test]
-    fn no_inputs_picks_t2v() {
-      let state = build_fal_flux_3_state(base_builder()).expect("build");
-      assert!(matches!(state.mode, FalFlux3Mode::TextToVideo(_)));
-    }
-
-    #[test]
-    fn start_frame_picks_i2v() {
-      let mut b = base_builder();
-      b.start_frame = Some(ImageRef::Url(START_URL.to_string()));
-      let state = build_fal_flux_3_state(b).expect("build");
-      assert!(matches!(state.mode, FalFlux3Mode::ImageToVideo(_)));
-    }
-
-    #[test]
-    fn start_and_end_frames_pick_first_last_frame() {
-      let mut b = base_builder();
-      b.start_frame = Some(ImageRef::Url(START_URL.to_string()));
-      b.end_frame = Some(ImageRef::Url(END_URL.to_string()));
-      let state = build_fal_flux_3_state(b).expect("build");
-      let FalFlux3Mode::FirstLastFrameToVideo(req) = state.mode else {
-        panic!("expected FirstLastFrameToVideo");
-      };
-      assert_eq!(req.start_image_url, START_URL);
-      assert_eq!(req.end_image_url, END_URL);
-    }
-
-    #[test]
-    fn end_frame_without_start_frame_errors() {
-      let mut b = base_builder();
-      b.end_frame = Some(ImageRef::Url(END_URL.to_string()));
-      assert!(build_fal_flux_3_state(b).is_err());
-    }
-
-    #[test]
-    fn reference_images_error() {
-      let mut b = base_builder();
-      b.reference_images = Some(ImageListRef::Urls(vec!["https://example.com/ref.png".to_string()]));
-      assert!(build_fal_flux_3_state(b).is_err());
-    }
-
-    #[test]
-    fn reference_videos_error() {
-      let mut b = base_builder();
-      b.reference_videos = Some(VideoListRef::Urls(vec!["https://example.com/v.mp4".to_string()]));
-      assert!(build_fal_flux_3_state(b).is_err());
-    }
-
-    #[test]
-    fn reference_audio_errors() {
-      let mut b = base_builder();
-      b.reference_audio = Some(AudioListRef::Urls(vec!["https://example.com/a.mp3".to_string()]));
-      assert!(build_fal_flux_3_state(b).is_err());
-    }
-
-    #[test]
-    fn empty_reference_lists_are_ignored() {
-      let mut b = base_builder();
-      b.reference_images = Some(ImageListRef::Urls(vec![]));
-      b.reference_videos = Some(VideoListRef::Urls(vec![]));
-      b.reference_audio = Some(AudioListRef::Urls(vec![]));
-      let state = build_fal_flux_3_state(b).expect("build");
-      assert!(matches!(state.mode, FalFlux3Mode::TextToVideo(_)));
-    }
-  }
-
-  mod plan_tests {
-    use super::*;
-
-    #[test]
-    fn duration_25_errors_under_error_out() {
-      let mut b = base_builder();
-      b.duration_seconds = Some(25);
-      b.request_mismatch_mitigation_strategy = RequestMismatchMitigationStrategy::ErrorOut;
-      assert!(build_fal_flux_3_state(b).is_err());
-    }
-
-    #[test]
-    fn duration_25_clamps_to_20_under_pay_less() {
-      let mut b = base_builder();
-      b.duration_seconds = Some(25);
-      b.request_mismatch_mitigation_strategy = RequestMismatchMitigationStrategy::PayLessDowngrade;
-      let state = build_fal_flux_3_state(b).expect("build");
-      let FalFlux3Mode::TextToVideo(req) = state.mode else {
-        panic!("expected TextToVideo");
-      };
-      assert_eq!(req.duration, Some(Flux3Duration::Seconds(20)));
-    }
-
-    #[test]
-    fn resolution_480p_and_720p_map_to_720p() {
-      for res in [RouterResolution::FourEightyP, RouterResolution::SevenTwentyP] {
-        let mut b = base_builder();
-        b.resolution = Some(res);
-        let state = build_fal_flux_3_state(b).expect("build");
-        let FalFlux3Mode::TextToVideo(req) = state.mode else {
-          panic!("expected TextToVideo");
-        };
-        assert_eq!(req.resolution, Some(Flux3Resolution::SevenTwentyP), "res={res:?}");
-      }
-    }
-
-    #[test]
-    fn auto_aspect_ratio_maps_to_flux_auto() {
-      let mut b = base_builder();
-      b.aspect_ratio = Some(RouterAspectRatio::Auto);
-      let state = build_fal_flux_3_state(b).expect("build");
-      let FalFlux3Mode::TextToVideo(req) = state.mode else {
-        panic!("expected TextToVideo");
-      };
-      assert_eq!(req.aspect_ratio, Some(Flux3AspectRatio::Auto));
-    }
-
-    #[test]
-    fn twenty_one_by_nine_is_supported() {
-      let mut b = base_builder();
-      b.aspect_ratio = Some(RouterAspectRatio::WideTwentyOneByNine);
-      b.request_mismatch_mitigation_strategy = RequestMismatchMitigationStrategy::ErrorOut;
-      let state = build_fal_flux_3_state(b).expect("build");
-      let FalFlux3Mode::TextToVideo(req) = state.mode else {
-        panic!("expected TextToVideo");
-      };
-      assert_eq!(req.aspect_ratio, Some(Flux3AspectRatio::TwentyOneByNine));
-    }
-
-    #[test]
-    fn generate_audio_propagates() {
-      let mut b = base_builder();
-      b.generate_audio = Some(false);
-      let state = build_fal_flux_3_state(b).expect("build");
-      let FalFlux3Mode::TextToVideo(req) = state.mode else {
-        panic!("expected TextToVideo");
-      };
-      assert_eq!(req.generate_audio, Some(false));
-    }
-  }
-
-  fn base_builder() -> GenerateVideoRequestBuilder {
-    GenerateVideoRequestBuilder {
-      model: RouterVideoModel::Flux3,
-      provider: RouterProvider::Fal,
-      prompt: Some("test".to_string()),
-      ..Default::default()
-    }
-  }
-}

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

@@ -1,106 +0,0 @@
-use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator;
-
-use crate::generate::generate_video::providers::fal::flux_3::request::{
-  FalFlux3Mode, FalFlux3RequestState,
-};
-use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
-
-#[derive(Clone, Debug)]
-pub struct FalFlux3CostState {
-  pub cost_in_usd_cents: u64,
-}
-
-impl FalFlux3CostState {
-  pub fn from_request(request: &FalFlux3RequestState) -> Self {
-    // Cost math is owned by fal_client's per-endpoint
-    // `FalRequestCostCalculator` implementations. The router state just
-    // forwards the result so router cost ≡ fal_client cost by construction.
-    let cost_in_usd_cents = match &request.mode {
-      FalFlux3Mode::TextToVideo(req) => req.calculate_cost_in_cents(),
-      FalFlux3Mode::ImageToVideo(req) => req.calculate_cost_in_cents(),
-      FalFlux3Mode::FirstLastFrameToVideo(req) => req.calculate_cost_in_cents(),
-    };
-    Self { cost_in_usd_cents }
-  }
-
-  pub fn estimate_cost(&self) -> VideoGenerationCostEstimate {
-    VideoGenerationCostEstimate {
-      cost_in_credits: Some(self.cost_in_usd_cents),
-      cost_in_usd_cents: Some(self.cost_in_usd_cents),
-      is_free: false,
-      is_unlimited: false,
-      is_rate_limited: false,
-      has_watermark: false,
-      failures_are_refunded: None,
-    }
-  }
-}
-
-#[cfg(test)]
-mod tests {
-  use crate::api::image_ref::ImageRef;
-  use crate::api::router_provider::RouterProvider;
-  use crate::api::router_resolution::RouterResolution;
-  use crate::api::router_video_model::RouterVideoModel;
-  use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-  use crate::generate::generate_video::providers::fal::flux_3::build::build_fal_flux_3_state;
-
-  use super::*;
-
-  // Pricing (from fal_client's flux_3 cost modules):
-  //   720p: $0.17/s, 1080p: $0.29/s (all modalities)
-  // fal defaults when unset: duration = 5s (auto estimates at the 5s floor),
-  // resolution = 720p.
-
-  #[test]
-  fn t2v_default_settings_is_85() {
-    assert_eq!(cost_cents(base_builder(None, None)), 85);
-  }
-
-  #[test]
-  fn t2v_10s_1080p_is_290() {
-    assert_eq!(cost_cents(base_builder(Some(10), Some(RouterResolution::TenEightyP))), 290);
-  }
-
-  #[test]
-  fn i2v_5s_720p_is_85() {
-    let mut b = base_builder(Some(5), Some(RouterResolution::SevenTwentyP));
-    b.start_frame = Some(ImageRef::Url("https://example.com/start.png".to_string()));
-    assert_eq!(cost_cents(b), 85);
-  }
-
-  #[test]
-  fn first_last_frame_20s_1080p_is_580() {
-    let mut b = base_builder(Some(20), Some(RouterResolution::TenEightyP));
-    b.start_frame = Some(ImageRef::Url("https://example.com/start.png".to_string()));
-    b.end_frame = Some(ImageRef::Url("https://example.com/end.png".to_string()));
-    assert_eq!(cost_cents(b), 580);
-  }
-
-  #[test]
-  fn estimate_cost_forwards_cents() {
-    let estimate = FalFlux3CostState { cost_in_usd_cents: 85 }.estimate_cost();
-    assert_eq!(estimate.cost_in_usd_cents, Some(85));
-    assert_eq!(estimate.cost_in_credits, Some(85));
-    assert!(!estimate.is_free);
-  }
-
-  fn base_builder(
-    duration_seconds: Option<u16>,
-    resolution: Option<RouterResolution>,
-  ) -> GenerateVideoRequestBuilder {
-    GenerateVideoRequestBuilder {
-      model: RouterVideoModel::Flux3,
-      provider: RouterProvider::Fal,
-      prompt: Some("test".to_string()),
-      duration_seconds,
-      resolution,
-      ..Default::default()
-    }
-  }
-
-  fn cost_cents(builder: GenerateVideoRequestBuilder) -> u64 {
-    let state = build_fal_flux_3_state(builder).expect("build");
-    FalFlux3CostState::from_request(&state).cost_in_usd_cents
-  }
-}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/flux_3/mod.rs

@@ -1,3 +0,0 @@
-pub mod build;
-pub mod cost;
-pub mod request;

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/flux_3/request.rs

@@ -1,144 +0,0 @@
-use std::fmt::Debug;
-use std::sync::Arc;
-
-use fal_client::requests::api::video::image::flux_3::api::Flux3ImageToVideoRequest;
-use fal_client::requests::api::video::images::flux_3::api::Flux3FirstLastFrameToVideoRequest;
-use fal_client::requests::api::video::text::flux_3::api::Flux3TextToVideoRequest;
-use fal_client::requests::traits::fal_endpoint_trait::FalEndpoint;
-
-use crate::client::router_fal_client::RouterFalClient;
-use crate::errors::artcraft_router_error::ArtcraftRouterError;
-use crate::generate::generate_video::generate_video_response::{
-  FalVideoResponsePayload, GenerateVideoResponse,
-};
-
-#[derive(Clone, Debug)]
-pub enum FalFlux3Mode {
-  TextToVideo(Flux3TextToVideoRequest),
-  ImageToVideo(Flux3ImageToVideoRequest),
-  FirstLastFrameToVideo(Flux3FirstLastFrameToVideoRequest),
-}
-
-#[derive(Clone, Debug)]
-pub struct FalFlux3RequestState {
-  pub mode: FalFlux3Mode,
-}
-
-impl FalFlux3RequestState {
-  pub async fn send(&self, client: &RouterFalClient) -> Result<GenerateVideoResponse, ArtcraftRouterError> {
-    match &self.mode {
-      FalFlux3Mode::TextToVideo(request) => send_request(request, client).await,
-      FalFlux3Mode::ImageToVideo(request) => send_request(request, client).await,
-      FalFlux3Mode::FirstLastFrameToVideo(request) => send_request(request, client).await,
-    }
-  }
-}
-
-// ── Helpers ──
-
-async fn send_request<T>(request: &T, client: &RouterFalClient) -> Result<GenerateVideoResponse, ArtcraftRouterError>
-where
-  T: FalEndpoint + Clone + Debug + Send + Sync + 'static,
-{
-  let outbound: Arc<dyn Debug + Send + Sync> = Arc::new(request.clone());
-  let payload = send_fal_request(request, client).await?;
-  Ok(GenerateVideoResponse::Fal(FalVideoResponsePayload {
-    request_id: payload.request_id,
-    gateway_request_id: payload.gateway_request_id,
-    maybe_status_url: payload.status_url,
-    maybe_response_url: payload.response_url,
-    maybe_outbound_request: Some(outbound),
-  }))
-}
-
-struct FalResponseIds {
-  request_id: Option<String>,
-  gateway_request_id: Option<String>,
-  status_url: Option<String>,
-  response_url: Option<String>,
-}
-
-async fn send_fal_request<T: FalEndpoint>(
-  request: &T,
-  client: &RouterFalClient,
-) -> Result<FalResponseIds, ArtcraftRouterError> {
-  if let Some(webhook_url) = &client.webhook_url {
-    let response = request.send_webhook_request(&client.api_key, webhook_url).await?;
-    Ok(FalResponseIds {
-      request_id: response.request_id,
-      gateway_request_id: response.gateway_request_id,
-      status_url: None,
-      response_url: None,
-    })
-  } else {
-    let response = request.send_queue_request(&client.api_key).await?;
-    Ok(FalResponseIds {
-      request_id: Some(response.request_id),
-      gateway_request_id: None,
-      status_url: Some(response.status_url),
-      response_url: Some(response.response_url),
-    })
-  }
-}
-
-#[cfg(test)]
-mod tests {
-  use super::*;
-  use fal_client::creds::fal_api_key::FalApiKey;
-  use fal_client::requests::api::video::text::flux_3::api::{
-    Flux3AspectRatio, Flux3Duration, Flux3Resolution,
-  };
-  use test_data::web::image_urls::JUNO_AT_LAKE_IMAGE_URL;
-
-  #[tokio::test]
-  #[ignore] // requires real API key, incurs cost
-  async fn send_text_to_video_webhook() {
-    let state = FalFlux3RequestState {
-      mode: FalFlux3Mode::TextToVideo(Flux3TextToVideoRequest {
-        prompt: "a calm lake at sunrise".to_string(),
-        duration: Some(Flux3Duration::Seconds(5)),
-        resolution: Some(Flux3Resolution::SevenTwentyP),
-        aspect_ratio: Some(Flux3AspectRatio::SixteenByNine),
-        generate_audio: Some(false),
-        safety_tolerance: Some(4), // NB: 4 is the most permissive.
-      }),
-    };
-    let response = state.send(&client_with_webhook()).await.expect("send should succeed");
-    let payload = response.get_fal_payload().expect("expected Fal payload");
-    assert!(payload.request_id.is_some() || payload.gateway_request_id.is_some());
-  }
-
-  #[tokio::test]
-  #[ignore] // requires real API key, incurs cost
-  async fn send_image_to_video_webhook() {
-    let state = FalFlux3RequestState {
-      mode: FalFlux3Mode::ImageToVideo(Flux3ImageToVideoRequest {
-        prompt: "the lake comes alive".to_string(),
-        image_url: JUNO_AT_LAKE_IMAGE_URL.to_string(),
-        duration: Some(Flux3Duration::Seconds(5)),
-        resolution: Some(Flux3Resolution::SevenTwentyP),
-        aspect_ratio: None,
-        generate_audio: Some(false),
-        safety_tolerance: None,
-      }),
-    };
-    let response = state.send(&client_with_webhook()).await.expect("send should succeed");
-    let payload = response.get_fal_payload().expect("expected Fal payload");
-    assert!(payload.request_id.is_some() || payload.gateway_request_id.is_some());
-  }
-
-  // ── Helpers ──
-
-  fn read_fal_api_key() -> FalApiKey {
-    let secret = std::fs::read_to_string("/Users/bt/Artcraft/credentials/fal_api_key.txt")
-      .expect("Failed to read fal_api_key.txt");
-    FalApiKey::from_str(secret.trim())
-  }
-
-  fn client_with_webhook() -> RouterFalClient {
-    RouterFalClient::new_with_webhook(
-      read_fal_api_key(),
-      "https://example.com/fal-webhook-test".to_string(),
-    )
-  }
-}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/flux_3_draft/build.rs

@@ -1,151 +0,0 @@
-use fal_client::requests::api::video::image::flux_3_draft::api::Flux3DraftImageToVideoRequest;
-use fal_client::requests::api::video::images::flux_3_draft::api::Flux3DraftFirstLastFrameToVideoRequest;
-use fal_client::requests::api::video::text::flux_3_draft::api::Flux3DraftTextToVideoRequest;
-
-use crate::errors::artcraft_router_error::ArtcraftRouterError;
-use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-use crate::generate::generate_video::providers::fal::flux_3::build::{
-  optional_url, plan_aspect_ratio, plan_fixed_duration, plan_flexible_duration,
-  reject_references, to_flux_3_aspect_ratio, unsupported,
-};
-use crate::generate::generate_video::providers::fal::flux_3_draft::request::{
-  FalFlux3DraftMode, FalFlux3DraftRequestState,
-};
-use crate::generate::generate_video::video_generation_draft_or_request::VideoGenerationDraftOrRequest;
-use crate::generate::generate_video::video_generation_request::VideoGenerationRequest;
-
-pub fn build_fal_flux_3_draft(
-  builder: GenerateVideoRequestBuilder,
-) -> Result<VideoGenerationDraftOrRequest, ArtcraftRouterError> {
-  let state = build_fal_flux_3_draft_state(builder)?;
-  Ok(VideoGenerationDraftOrRequest::Request(VideoGenerationRequest::FalFlux3Draft(state)))
-}
-
-/// Same modality dispatch as full-quality Flux 3 (see that build module) —
-/// text, starting keyframe, and start/end keyframes; no references — but
-/// against the draft endpoints, which always render 720p and take no
-/// resolution input, so any requested resolution is silently dropped.
-pub(crate) fn build_fal_flux_3_draft_state(
-  builder: GenerateVideoRequestBuilder,
-) -> Result<FalFlux3DraftRequestState, ArtcraftRouterError> {
-  let strategy = builder.request_mismatch_mitigation_strategy;
-
-  reject_references(&builder)?;
-
-  let start = optional_url(builder.start_frame.clone())?;
-  let end = optional_url(builder.end_frame.clone())?;
-
-  let aspect_ratio = plan_aspect_ratio(builder.aspect_ratio, strategy)?;
-  let flexible_duration = plan_flexible_duration(builder.duration_seconds, strategy)?;
-  let fixed_duration = plan_fixed_duration(builder.duration_seconds, strategy)?;
-  let prompt = builder.prompt.clone().unwrap_or_default();
-  let generate_audio = builder.generate_audio;
-
-  let mode = match (start, end) {
-    (None, None) => FalFlux3DraftMode::TextToVideo(Flux3DraftTextToVideoRequest {
-      prompt,
-      duration: flexible_duration,
-      aspect_ratio: aspect_ratio.map(to_flux_3_aspect_ratio),
-      generate_audio,
-      safety_tolerance: Some(4), // NB: 4 is the most permissive.
-    }),
-    (Some(image_url), None) => FalFlux3DraftMode::ImageToVideo(Flux3DraftImageToVideoRequest {
-      prompt,
-      image_url,
-      duration: flexible_duration,
-      aspect_ratio: aspect_ratio.map(to_flux_3_aspect_ratio),
-      generate_audio,
-      safety_tolerance: Some(4), // NB: 4 is the most permissive.
-    }),
-    (Some(start_image_url), Some(end_image_url)) => FalFlux3DraftMode::FirstLastFrameToVideo(
-      Flux3DraftFirstLastFrameToVideoRequest {
-        prompt,
-        start_image_url,
-        end_image_url,
-        duration: fixed_duration,
-        aspect_ratio: aspect_ratio.map(to_flux_3_aspect_ratio),
-        generate_audio,
-        safety_tolerance: Some(4), // NB: 4 is the most permissive.
-      },
-    ),
-    (None, Some(_)) => {
-      return Err(unsupported(
-        "end_frame",
-        "Flux 3 Draft requires a start_frame when end_frame is provided",
-      ));
-    }
-  };
-
-  Ok(FalFlux3DraftRequestState { mode })
-}
-
-#[cfg(test)]
-mod tests {
-  use crate::api::image_list_ref::ImageListRef;
-  use crate::api::image_ref::ImageRef;
-  use crate::api::router_provider::RouterProvider;
-  use crate::api::router_video_model::RouterVideoModel;
-  use crate::api::video_list_ref::VideoListRef;
-
-  use super::*;
-
-  const START_URL: &str = "https://example.com/start.png";
-  const END_URL: &str = "https://example.com/end.png";
-
-  mod dispatch_tests {
-    use super::*;
-
-    #[test]
-    fn no_inputs_picks_t2v() {
-      let state = build_fal_flux_3_draft_state(base_builder()).expect("build");
-      assert!(matches!(state.mode, FalFlux3DraftMode::TextToVideo(_)));
-    }
-
-    #[test]
-    fn start_frame_picks_i2v() {
-      let mut b = base_builder();
-      b.start_frame = Some(ImageRef::Url(START_URL.to_string()));
-      let state = build_fal_flux_3_draft_state(b).expect("build");
-      assert!(matches!(state.mode, FalFlux3DraftMode::ImageToVideo(_)));
-    }
-
-    #[test]
-    fn start_and_end_frames_pick_first_last_frame() {
-      let mut b = base_builder();
-      b.start_frame = Some(ImageRef::Url(START_URL.to_string()));
-      b.end_frame = Some(ImageRef::Url(END_URL.to_string()));
-      let state = build_fal_flux_3_draft_state(b).expect("build");
-      assert!(matches!(state.mode, FalFlux3DraftMode::FirstLastFrameToVideo(_)));
-    }
-
-    #[test]
-    fn end_frame_without_start_frame_errors() {
-      let mut b = base_builder();
-      b.end_frame = Some(ImageRef::Url(END_URL.to_string()));
-      assert!(build_fal_flux_3_draft_state(b).is_err());
-    }
-
-    #[test]
-    fn reference_images_error() {
-      let mut b = base_builder();
-      b.reference_images = Some(ImageListRef::Urls(vec!["https://example.com/ref.png".to_string()]));
-      assert!(build_fal_flux_3_draft_state(b).is_err());
-    }
-
-    #[test]
-    fn reference_videos_error() {
-      let mut b = base_builder();
-      b.reference_videos = Some(VideoListRef::Urls(vec!["https://example.com/v.mp4".to_string()]));
-      assert!(build_fal_flux_3_draft_state(b).is_err());
-    }
-  }
-
-  fn base_builder() -> GenerateVideoRequestBuilder {
-    GenerateVideoRequestBuilder {
-      model: RouterVideoModel::Flux3Draft,
-      provider: RouterProvider::Fal,
-      prompt: Some("test".to_string()),
-      ..Default::default()
-    }
-  }
-}

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

@@ -1,76 +0,0 @@
-use fal_client::requests::traits::fal_request_cost_calculator_trait::FalRequestCostCalculator;
-
-use crate::generate::generate_video::providers::fal::flux_3_draft::request::{
-  FalFlux3DraftMode, FalFlux3DraftRequestState,
-};
-use crate::generate::generate_video::video_generation_cost_estimate::VideoGenerationCostEstimate;
-
-#[derive(Clone, Debug)]
-pub struct FalFlux3DraftCostState {
-  pub cost_in_usd_cents: u64,
-}
-
-impl FalFlux3DraftCostState {
-  pub fn from_request(request: &FalFlux3DraftRequestState) -> Self {
-    // Cost math is owned by fal_client's per-endpoint
-    // `FalRequestCostCalculator` implementations. The router state just
-    // forwards the result so router cost ≡ fal_client cost by construction.
-    let cost_in_usd_cents = match &request.mode {
-      FalFlux3DraftMode::TextToVideo(req) => req.calculate_cost_in_cents(),
-      FalFlux3DraftMode::ImageToVideo(req) => req.calculate_cost_in_cents(),
-      FalFlux3DraftMode::FirstLastFrameToVideo(req) => req.calculate_cost_in_cents(),
-    };
-    Self { cost_in_usd_cents }
-  }
-
-  pub fn estimate_cost(&self) -> VideoGenerationCostEstimate {
-    VideoGenerationCostEstimate {
-      cost_in_credits: Some(self.cost_in_usd_cents),
-      cost_in_usd_cents: Some(self.cost_in_usd_cents),
-      is_free: false,
-      is_unlimited: false,
-      is_rate_limited: false,
-      has_watermark: false,
-      failures_are_refunded: None,
-    }
-  }
-}
-
-#[cfg(test)]
-mod tests {
-  use crate::api::router_provider::RouterProvider;
-  use crate::api::router_video_model::RouterVideoModel;
-  use crate::generate::generate_video::generate_video_request_builder::GenerateVideoRequestBuilder;
-  use crate::generate::generate_video::providers::fal::flux_3_draft::build::build_fal_flux_3_draft_state;
-
-  use super::*;
-
-  // Pricing (from fal_client's flux_3_draft cost modules):
-  //   $0.06/s (always 720p, all modalities)
-  // fal defaults when unset: duration = 5s (auto estimates at the 5s floor).
-
-  #[test]
-  fn t2v_default_settings_is_30() {
-    assert_eq!(cost_cents(base_builder(None)), 30);
-  }
-
-  #[test]
-  fn t2v_20s_is_120() {
-    assert_eq!(cost_cents(base_builder(Some(20))), 120);
-  }
-
-  fn base_builder(duration_seconds: Option<u16>) -> GenerateVideoRequestBuilder {
-    GenerateVideoRequestBuilder {
-      model: RouterVideoModel::Flux3Draft,
-      provider: RouterProvider::Fal,
-      prompt: Some("test".to_string()),
-      duration_seconds,
-      ..Default::default()
-    }
-  }
-
-  fn cost_cents(builder: GenerateVideoRequestBuilder) -> u64 {
-    let state = build_fal_flux_3_draft_state(builder).expect("build");
-    FalFlux3DraftCostState::from_request(&state).cost_in_usd_cents
-  }
-}

crates/api_clients/artcraft/artcraft_router/src/generate/generate_video/providers/fal/flux_3_draft/mod.rs

@@ -1,3 +0,0 @@
-pub mod build;
-pub mod cost;
-pub mod request;