wip

create session
pass payload back
2026-10-31 07:45:55 -04:00 · 2026-01-29 19:44:07 -05:00 · 2026-01-29 10:28:39 -05:00 · 2026-01-29 10:15:30 -05:00 · 2026-01-29 10:05:30 -05:00 · 2026-01-29 09:58:06 -05:00
460 changed files with 3004 additions and 57293 deletions
@@ -233,8 +233,8 @@ jobs:
        with:
          projectPath: ./crates/desktop/artcraft
          tagName: artcraft-v__VERSION__ # the action automatically replaces __VERSION__ with the app version.
-          releaseName: "ArtCraft v__VERSION__"
-          releaseBody: "See the assets below to download this version and install."
+          releaseName: "Artcraft v__VERSION__"
+          releaseBody: "See the assets to download this version and install."
          releaseDraft: true
          prerelease: false
          args: ${{ matrix.args }}
@@ -99,9 +99,9 @@ jobs:
          SQLX_OFFLINE: true
        with:
          projectPath: ./crates/desktop/artcraft
-          tagName: artcraft-v__VERSION__ # the action automatically replaces __VERSION__ with the app version.
-          releaseName: "ArtCraft v__VERSION__"
-          releaseBody: "Production build of ArtCraft. See the assets below to download and install."
+          tagName: artcraft-windows-v__VERSION__ # the action automatically replaces __VERSION__ with the app version.
+          releaseName: "Artcraft Windows v__VERSION__"
+          releaseBody: "Windows build - See the assets to download this version and install."
          releaseDraft: true
          prerelease: false
          args: ${{ matrix.args }}
@@ -9,7 +9,6 @@ on:
      # NB: Default-branch doesn't work, despite Github's documentation.
      #- $default-branch
      - main
-      - test
 env:
  IMAGE_NAME: storyteller-rust

@@ -32,12 +32,6 @@ script/production_database_secret_backup.sh
 script/production_database_secret_connect.sh
 script/socat_dev_database_connect.sh

-# Python virtual envs (named by convention)
-venv/
-
-# Testing
-/requests/
-
 # Scratch data
 scratch/
 test_data/temp/
@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nUPDATE users\nSET\n  password_hash = ?,\n  ip_address_last_update = ?,\n  is_without_password = false,\n  password_version = password_version + 1,\n  version = version + 1\nWHERE\n  token = ?\nLIMIT 1\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 3
-    },
-    "nullable": []
-  },
-  "hash": "03761e50f94f2805f1c5c64f598a23af8d708e514a01c6090570b2e0bfabfe2c"
-}
@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\nUPDATE users\nSET\n  email_confirmed = true,\n  password_hash = ?,\n  ip_address_last_update = ?,\n  password_version = password_version + 1,\n  version = version + 1\nWHERE\n  token = ?\nLIMIT 1\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 3
+    },
+    "nullable": []
+  },
+  "hash": "05de463f1c408793d64fb011b1732e3c1b3cf485076b3e1a4a50d16683b99e46"
+}
@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nUPDATE generic_inference_jobs\nSET\n  status = ?,\n  failure_reason = ?,\n  internal_debugging_failure_reason = ?,\n  frontend_failure_category = ?,\n  retry_at = NULL\nWHERE token = ?\n    ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 5
-    },
-    "nullable": []
-  },
-  "hash": "15939605e0da2722693371799ba94c7d0cc2f77a5c5b37e346855996d16033ec"
-}
@@ -1,6 +1,6 @@
 {
  "db_name": "MySQL",
-  "query": "\nSELECT\n    users.token as user_token,\n    users.username,\n    users.display_name,\n\n    users.email_address,\n    users.email_gravatar_hash,\n    \n    users.email_confirmed,\n    users.email_confirmed_by_google,\n    users.email_is_synthetic,\n    users.is_without_password,\n    users.username_is_not_customized,\n\n    users.maybe_stripe_customer_id,\n    users.maybe_loyalty_program_key,\n\n    users.disable_gravatar,\n    users.auto_play_audio_preference,\n    users.auto_play_video_preference,\n    users.preferred_tts_result_visibility as `preferred_tts_result_visibility: enums::common::visibility::Visibility`,\n    users.preferred_w2l_result_visibility as `preferred_w2l_result_visibility: enums::common::visibility::Visibility`,\n\n    users.user_role_slug,\n    users.is_banned,\n\n    users.can_access_studio,\n    users.maybe_feature_flags,\n\n    user_roles.can_use_tts,\n    user_roles.can_use_w2l,\n    user_roles.can_delete_own_tts_results,\n    user_roles.can_delete_own_w2l_results,\n    user_roles.can_delete_own_account,\n\n    user_roles.can_upload_tts_models,\n    user_roles.can_upload_w2l_templates,\n    user_roles.can_delete_own_tts_models,\n    user_roles.can_delete_own_w2l_templates,\n\n    user_roles.can_approve_w2l_templates,\n    user_roles.can_edit_other_users_profiles,\n    user_roles.can_edit_other_users_tts_models,\n    user_roles.can_edit_other_users_w2l_templates,\n    user_roles.can_delete_other_users_tts_models,\n    user_roles.can_delete_other_users_tts_results,\n    user_roles.can_delete_other_users_w2l_templates,\n    user_roles.can_delete_other_users_w2l_results,\n    user_roles.can_ban_users,\n    user_roles.can_delete_users\n\nFROM users\nLEFT OUTER JOIN user_sessions\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\n        ",
+  "query": "\nSELECT\n    users.token as user_token,\n    users.username,\n    users.display_name,\n\n    users.email_address,\n    users.email_confirmed,\n    users.email_gravatar_hash,\n\n    users.maybe_stripe_customer_id,\n    users.maybe_loyalty_program_key,\n\n    users.disable_gravatar,\n    users.auto_play_audio_preference,\n    users.auto_play_video_preference,\n    users.preferred_tts_result_visibility as `preferred_tts_result_visibility: enums::common::visibility::Visibility`,\n    users.preferred_w2l_result_visibility as `preferred_w2l_result_visibility: enums::common::visibility::Visibility`,\n\n    users.user_role_slug,\n    users.is_banned,\n\n    users.can_access_studio,\n    users.maybe_feature_flags,\n\n    user_roles.can_use_tts,\n    user_roles.can_use_w2l,\n    user_roles.can_delete_own_tts_results,\n    user_roles.can_delete_own_w2l_results,\n    user_roles.can_delete_own_account,\n\n    user_roles.can_upload_tts_models,\n    user_roles.can_upload_w2l_templates,\n    user_roles.can_delete_own_tts_models,\n    user_roles.can_delete_own_w2l_templates,\n\n    user_roles.can_approve_w2l_templates,\n    user_roles.can_edit_other_users_profiles,\n    user_roles.can_edit_other_users_tts_models,\n    user_roles.can_edit_other_users_w2l_templates,\n    user_roles.can_delete_other_users_tts_models,\n    user_roles.can_delete_other_users_tts_results,\n    user_roles.can_delete_other_users_w2l_templates,\n    user_roles.can_delete_other_users_w2l_results,\n    user_roles.can_ban_users,\n    user_roles.can_delete_users\n\nFROM users\nLEFT OUTER JOIN user_sessions\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\n        ",
  "describe": {
    "columns": [
      {
@@ -45,16 +45,6 @@
      },
      {
        "ordinal": 4,
-        "name": "email_gravatar_hash",
-        "type_info": {
-          "type": "String",
-          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 5,
        "name": "email_confirmed",
        "type_info": {
          "type": "Tiny",
@@ -63,48 +53,18 @@
          "max_size": 1
        }
      },
+      {
+        "ordinal": 5,
+        "name": "email_gravatar_hash",
+        "type_info": {
+          "type": "String",
+          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
      {
        "ordinal": 6,
-        "name": "email_confirmed_by_google",
-        "type_info": {
-          "type": "Tiny",
-          "flags": "NOT_NULL",
-          "char_set": 63,
-          "max_size": 1
-        }
-      },
-      {
-        "ordinal": 7,
-        "name": "email_is_synthetic",
-        "type_info": {
-          "type": "Tiny",
-          "flags": "NOT_NULL",
-          "char_set": 63,
-          "max_size": 1
-        }
-      },
-      {
-        "ordinal": 8,
-        "name": "is_without_password",
-        "type_info": {
-          "type": "Tiny",
-          "flags": "NOT_NULL",
-          "char_set": 63,
-          "max_size": 1
-        }
-      },
-      {
-        "ordinal": 9,
-        "name": "username_is_not_customized",
-        "type_info": {
-          "type": "Tiny",
-          "flags": "NOT_NULL",
-          "char_set": 63,
-          "max_size": 1
-        }
-      },
-      {
-        "ordinal": 10,
        "name": "maybe_stripe_customer_id",
        "type_info": {
          "type": "VarString",
@@ -114,7 +74,7 @@
        }
      },
      {
-        "ordinal": 11,
+        "ordinal": 7,
        "name": "maybe_loyalty_program_key",
        "type_info": {
          "type": "VarString",
@@ -124,7 +84,7 @@
        }
      },
      {
-        "ordinal": 12,
+        "ordinal": 8,
        "name": "disable_gravatar",
        "type_info": {
          "type": "Tiny",
@@ -134,7 +94,7 @@
        }
      },
      {
-        "ordinal": 13,
+        "ordinal": 9,
        "name": "auto_play_audio_preference",
        "type_info": {
          "type": "Tiny",
@@ -144,7 +104,7 @@
        }
      },
      {
-        "ordinal": 14,
+        "ordinal": 10,
        "name": "auto_play_video_preference",
        "type_info": {
          "type": "Tiny",
@@ -154,7 +114,7 @@
        }
      },
      {
-        "ordinal": 15,
+        "ordinal": 11,
        "name": "preferred_tts_result_visibility: enums::common::visibility::Visibility",
        "type_info": {
          "type": "String",
@@ -164,7 +124,7 @@
        }
      },
      {
-        "ordinal": 16,
+        "ordinal": 12,
        "name": "preferred_w2l_result_visibility: enums::common::visibility::Visibility",
        "type_info": {
          "type": "String",
@@ -174,7 +134,7 @@
        }
      },
      {
-        "ordinal": 17,
+        "ordinal": 13,
        "name": "user_role_slug",
        "type_info": {
          "type": "VarString",
@@ -184,7 +144,7 @@
        }
      },
      {
-        "ordinal": 18,
+        "ordinal": 14,
        "name": "is_banned",
        "type_info": {
          "type": "Tiny",
@@ -194,7 +154,7 @@
        }
      },
      {
-        "ordinal": 19,
+        "ordinal": 15,
        "name": "can_access_studio",
        "type_info": {
          "type": "Tiny",
@@ -204,7 +164,7 @@
        }
      },
      {
-        "ordinal": 20,
+        "ordinal": 16,
        "name": "maybe_feature_flags",
        "type_info": {
          "type": "VarString",
@@ -214,7 +174,7 @@
        }
      },
      {
-        "ordinal": 21,
+        "ordinal": 17,
        "name": "can_use_tts",
        "type_info": {
          "type": "Tiny",
@@ -224,7 +184,7 @@
        }
      },
      {
-        "ordinal": 22,
+        "ordinal": 18,
        "name": "can_use_w2l",
        "type_info": {
          "type": "Tiny",
@@ -234,7 +194,7 @@
        }
      },
      {
-        "ordinal": 23,
+        "ordinal": 19,
        "name": "can_delete_own_tts_results",
        "type_info": {
          "type": "Tiny",
@@ -244,7 +204,7 @@
        }
      },
      {
-        "ordinal": 24,
+        "ordinal": 20,
        "name": "can_delete_own_w2l_results",
        "type_info": {
          "type": "Tiny",
@@ -254,7 +214,7 @@
        }
      },
      {
-        "ordinal": 25,
+        "ordinal": 21,
        "name": "can_delete_own_account",
        "type_info": {
          "type": "Tiny",
@@ -264,7 +224,7 @@
        }
      },
      {
-        "ordinal": 26,
+        "ordinal": 22,
        "name": "can_upload_tts_models",
        "type_info": {
          "type": "Tiny",
@@ -274,7 +234,7 @@
        }
      },
      {
-        "ordinal": 27,
+        "ordinal": 23,
        "name": "can_upload_w2l_templates",
        "type_info": {
          "type": "Tiny",
@@ -284,7 +244,7 @@
        }
      },
      {
-        "ordinal": 28,
+        "ordinal": 24,
        "name": "can_delete_own_tts_models",
        "type_info": {
          "type": "Tiny",
@@ -294,7 +254,7 @@
        }
      },
      {
-        "ordinal": 29,
+        "ordinal": 25,
        "name": "can_delete_own_w2l_templates",
        "type_info": {
          "type": "Tiny",
@@ -304,7 +264,7 @@
        }
      },
      {
-        "ordinal": 30,
+        "ordinal": 26,
        "name": "can_approve_w2l_templates",
        "type_info": {
          "type": "Tiny",
@@ -314,7 +274,7 @@
        }
      },
      {
-        "ordinal": 31,
+        "ordinal": 27,
        "name": "can_edit_other_users_profiles",
        "type_info": {
          "type": "Tiny",
@@ -324,7 +284,7 @@
        }
      },
      {
-        "ordinal": 32,
+        "ordinal": 28,
        "name": "can_edit_other_users_tts_models",
        "type_info": {
          "type": "Tiny",
@@ -334,7 +294,7 @@
        }
      },
      {
-        "ordinal": 33,
+        "ordinal": 29,
        "name": "can_edit_other_users_w2l_templates",
        "type_info": {
          "type": "Tiny",
@@ -344,7 +304,7 @@
        }
      },
      {
-        "ordinal": 34,
+        "ordinal": 30,
        "name": "can_delete_other_users_tts_models",
        "type_info": {
          "type": "Tiny",
@@ -354,7 +314,7 @@
        }
      },
      {
-        "ordinal": 35,
+        "ordinal": 31,
        "name": "can_delete_other_users_tts_results",
        "type_info": {
          "type": "Tiny",
@@ -364,7 +324,7 @@
        }
      },
      {
-        "ordinal": 36,
+        "ordinal": 32,
        "name": "can_delete_other_users_w2l_templates",
        "type_info": {
          "type": "Tiny",
@@ -374,7 +334,7 @@
        }
      },
      {
-        "ordinal": 37,
+        "ordinal": 33,
        "name": "can_delete_other_users_w2l_results",
        "type_info": {
          "type": "Tiny",
@@ -384,7 +344,7 @@
        }
      },
      {
-        "ordinal": 38,
+        "ordinal": 34,
        "name": "can_ban_users",
        "type_info": {
          "type": "Tiny",
@@ -394,7 +354,7 @@
        }
      },
      {
-        "ordinal": 39,
+        "ordinal": 35,
        "name": "can_delete_users",
        "type_info": {
          "type": "Tiny",
@@ -414,10 +374,6 @@
      false,
      false,
      false,
-      false,
-      false,
-      false,
-      false,
      true,
      true,
      false,
@@ -450,5 +406,5 @@
      true
    ]
  },
-  "hash": "3ca99449c071cb0a8d90a735e1a767a94be224a02e0d16e81997d569af8d4cbb"
+  "hash": "1c32bdb79ed2bc1b8988bbb6ea3f2a1db4ed4552d53cb4f31ff4b08de01691f7"
 }
@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nINSERT INTO generic_inference_jobs\nSET\n  token = ?,\n  uuid_idempotency_token = ?,\n\n  job_type = ?,\n\n  maybe_external_third_party = ?,\n  maybe_external_third_party_id = ?,\n\n  product_category = ?,\n  inference_category = ?,\n\n  maybe_model_type = NULL,\n  maybe_model_token = NULL,\n\n  maybe_input_source_token = NULL,\n  maybe_input_source_token_type = NULL,\n\n  maybe_download_url = NULL,\n  maybe_cover_image_media_file_token = NULL,\n\n  maybe_prompt_token = ?,\n\n  maybe_raw_inference_text = NULL,\n\n  maybe_inference_args = ?,\n\n  maybe_creator_user_token = ?,\n  maybe_creator_anonymous_visitor_token = ?,\n  creator_ip_address = ?,\n  creator_set_visibility = ?,\n\n  priority_level = 0,\n  is_keepalive_required = FALSE,\n  max_duration_seconds = 0,\n\n  is_debug_request = FALSE,\n  maybe_routing_tag = NULL,\n\n  status = ?\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 14
-    },
-    "nullable": []
-  },
-  "hash": "33aa8a1cf85bf1b8b68f4e2ab46541f25d7e8bb5eeb503c5ec14cb5e115f69ce"
-}
@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\nINSERT INTO users\nSET\n  token = ?,\n  username = ?,\n  display_name = ?,\n\n  username_is_generated = ?,\n  username_is_not_customized = ?,\n\n  email_address = ?,\n  email_gravatar_hash = ?,\n\n  email_confirmed = FALSE,\n  email_confirmed_by_google = ?,\n\n  profile_markdown = ?,\n  profile_rendered_html = ?,\n  user_role_slug = ?,\n\n  password_hash = ?,\n  is_without_password = ?,\n\n  maybe_feature_flags = ?,\n\n  ip_address_creation = ?,\n  ip_address_last_login = ?,\n  ip_address_last_update = ?,\n\n  maybe_source = ?,\n\n  maybe_signup_method = ?\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 19
+    },
+    "nullable": []
+  },
+  "hash": "453f0386cfe34e533501ba29dc2022fc449266f9858f16886bde9a0df6b82026"
+}
@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nUPDATE users\nSET\n  email_address = ?,\n  email_confirmed = false,\n  email_confirmed_by_google = false,\n  email_is_synthetic = false,\n  email_gravatar_hash = ?,\n  ip_address_last_update = ?,\n  version = version + 1\nWHERE\n  token = ?\nLIMIT 1\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 4
-    },
-    "nullable": []
-  },
-  "hash": "4737c44e7b1c73b21a245dd9d1f96aecfc4c614ed19ac4b590a26809c98fee03"
-}
@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nINSERT INTO users\nSET\n  token = ?,\n  \n  is_temporary = ?,\n  \n  username = ?,\n  display_name = ?,\n\n  username_is_generated = ?,\n  username_is_not_customized = ?,\n\n  email_address = ?,\n  email_gravatar_hash = ?,\n\n  email_confirmed = FALSE,\n  email_confirmed_by_google = ?,\n  email_is_synthetic = ?,\n  \n  was_eagerly_provisioned = ?,\n\n  profile_markdown = ?,\n  profile_rendered_html = ?,\n  user_role_slug = ?,\n\n  password_hash = ?,\n  is_without_password = ?,\n\n  maybe_feature_flags = ?,\n\n  ip_address_creation = ?,\n  ip_address_last_login = ?,\n  ip_address_last_update = ?,\n\n  maybe_source = ?,\n\n  maybe_signup_method = ?\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 22
-    },
-    "nullable": []
-  },
-  "hash": "56746bcb993cb33f5492f401ce4fc3fd44d91fed660c2f106cb22e482dffa740"
-}
@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nUPDATE users\nSET\n  email_address = ?,\n  email_gravatar_hash = ?,\n  email_confirmed = false,\n  email_confirmed_by_google = false,\n  email_is_synthetic = false,\n  version = version + 1\nWHERE\n  token = ?\nLIMIT 1\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 3
-    },
-    "nullable": []
-  },
-  "hash": "6fa90a16784c7b7e3436877c2a751bf0b60054640ebe69cb5f33938238def0fe"
-}
@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nUPDATE users\nSET\n  email_confirmed = true,\n  email_is_synthetic = false,\n  is_without_password = false,\n  is_temporary = false,\n  password_hash = ?,\n  ip_address_last_update = ?,\n  password_version = password_version + 1,\n  version = version + 1\nWHERE\n  token = ?\nLIMIT 1\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 3
-    },
-    "nullable": []
-  },
-  "hash": "9cd3a581f6857e5c1db68a103f47eba9714ee4b5eefc8ba02fc49a4b3a19310e"
-}
@@ -1,36 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nSELECT\n  email_address,\n  email_is_synthetic\nFROM users\nWHERE token = ?\nLIMIT 1\n        ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "email_address",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 1020
-        }
-      },
-      {
-        "ordinal": 1,
-        "name": "email_is_synthetic",
-        "type_info": {
-          "type": "Tiny",
-          "flags": "NOT_NULL",
-          "char_set": 63,
-          "max_size": 1
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      false,
-      false
-    ]
-  },
-  "hash": "c2dd5120b34d62153772acc94f97c3b7a22b7c53216721e54882c0019d2467e6"
-}
@@ -1,91 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nSELECT\n    jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n    jobs.maybe_external_third_party_id as `order_id`,\n    jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n    jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n    jobs.creator_ip_address,\n    jobs.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n    jobs.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`\n\nFROM generic_inference_jobs as jobs\n\nWHERE jobs.maybe_external_third_party = ?\n  AND jobs.status NOT IN ('complete_success', 'complete_failure')\n  AND jobs.maybe_external_third_party_id IS NOT NULL\n\nLIMIT 25000\n    ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 1,
-        "name": "order_id",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 256
-        }
-      },
-      {
-        "ordinal": 2,
-        "name": "maybe_creator_user_token: tokens::tokens::users::UserToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 3,
-        "name": "maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 4,
-        "name": "creator_ip_address",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 160
-        }
-      },
-      {
-        "ordinal": 5,
-        "name": "creator_set_visibility: enums::common::visibility::Visibility",
-        "type_info": {
-          "type": "String",
-          "flags": "NOT_NULL | BINARY | ENUM",
-          "char_set": 224,
-          "max_size": 28
-        }
-      },
-      {
-        "ordinal": 6,
-        "name": "maybe_prompt_token: tokens::tokens::prompts::PromptToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      false,
-      true,
-      true,
-      true,
-      false,
-      false,
-      true
-    ]
-  },
-  "hash": "ca96942d8214edb84f163cf40131ceed873209e86718054e1502219fc81d2dc6"
-}
@@ -16,7 +16,6 @@ members = [
  "crates/api_clients/midjourney_client",
  "crates/api_clients/openai_sora_client",
  "crates/api_clients/openart_client",
-  "crates/api_clients/seedance2pro",
  "crates/api_clients/runwayml_client",
  "crates/api_clients/thumbnail_generator",
  "crates/api_clients/world_labs_client",
@@ -117,7 +116,6 @@ members = [
  "crates/service/job/email_sender_job",
  "crates/service/job/es-update-job",
  "crates/service/job/inference_job",
-  "crates/service/job/seedance2_pro_job",
  "crates/service/job/tts_download_job",
  "crates/service/job/tts_inference_job",
  "crates/service/job/w2l_download_job",
@@ -138,23 +136,6 @@ members = [
  "crates/vendor/fal-rs/generate",
  "crates/vendor/limitation",
  "crates/vendor/tauri-plugin-http",
-  "crates/vendor/Symphonia/symphonia",
-  "crates/vendor/Symphonia/symphonia-bundle-flac",
-  "crates/vendor/Symphonia/symphonia-bundle-mp3",
-  "crates/vendor/Symphonia/symphonia-codec-aac",
-  "crates/vendor/Symphonia/symphonia-codec-alac",
-  "crates/vendor/Symphonia/symphonia-codec-opus",
-  "crates/vendor/Symphonia/symphonia-codec-pcm",
-  "crates/vendor/Symphonia/symphonia-codec-vorbis",
-  "crates/vendor/Symphonia/symphonia-codec-wavpack",
-  "crates/vendor/Symphonia/symphonia-core",
-  "crates/vendor/Symphonia/symphonia-format-isomp4",
-  "crates/vendor/Symphonia/symphonia-format-mkv",
-  "crates/vendor/Symphonia/symphonia-format-ogg",
-  "crates/vendor/Symphonia/symphonia-format-wav",
-  "crates/vendor/Symphonia/symphonia-metadata",
-  "crates/vendor/Symphonia/symphonia-play",
-  "crates/vendor/Symphonia/symphonia-utils-xiph",
  # NB(bt,2025-05-25): Too many failures on Mac. Disable for now.
  #"crates/vendor/candle/candle-core",
  #"crates/vendor/candle/candle-datasets",
@@ -234,7 +215,6 @@ memory_store = { path = "crates/lib/caching/memory_store" }
 midjourney_client = { path = "crates/api_clients/midjourney_client" }
 mimetypes = { path = "crates/lib/files/mimetypes" }
 openai_sora_client = { path = "crates/api_clients/openai_sora_client" }
-seedance2pro = { path = "crates/api_clients/seedance2pro" }
 primitives = { path = "crates/lib/data/primitives" }
 shared_service_components = { path = "crates/lib/shared_service_components" }
 sqlite_tasks = { path = "crates/schema/database/sqlite_tasks" }
@@ -261,25 +241,25 @@ actix-utils = "3.0.1"
 actix-web = "4.7.0" # TODO(bt): We're behind and need to bump versions.
 actix-web-actors = "4.3.1+deprecated"
 actix-web-lab = "0.20.2"
-anyhow = "1.0.102"
+anyhow = "1.0.98"
 base64 = "0.22.1"
 bstr = "1.12.1"
 bytes = "1.10.1"
 chrono = { version = "0.4.41", features = ["serde"] }
 cookie = "0.18.1"
 env = "1.0.1"
-env_logger = "0.11.9"
+env_logger = "0.11.8"
 futures = { version = "0.3.31" }
 hex-literal = "1.0.0"
 indexmap = "2.9.0"
-log = "0.4.29"
+log = "0.4.27"
 md-5 = "0.10.6" # insecure but used for gravatar
 once_cell = "1.21.3"
 r2d2 = "0.8.10"
 rand = "0.9.1"
 redis = { version = "1.0.2", features = ["r2d2", "tokio-rustls-comp", "tokio-comp", "cluster-async", "aio"] }
-regex = "1.12.3"
-reqwest = { version = "0.12.23", default-features = false, features = [ "charset", "http2", "system-proxy", "json", "cookies", "rustls-tls", "gzip" ] }
+regex = "1.12.2"
+reqwest = { version = "0.12.23", default-features = false, features = [ "charset", "http2", "system-proxy", "json", "cookies", "rustls-tls" ] }
 reqwest-websocket = {  version = "0.5.0" }
 serde = {  version = "1.0.219", features = ["derive"] }
 serde_derive = "1.0.219"
@@ -296,11 +276,11 @@ tempdir = "0.3.7"
 tempfile = "3.20.0"
 thiserror = "2.0.12"
 tokio = { version = "1.45.1", features = ["macros"] }
-toml = "0.8.23"
+toml = "0.8.22"
 url = { version = "2.5.4", features = ["serde"] }
 uuid = "1.18.1"

-# NB(1): wreq gets past fingerprinting, but we have to deal with platform-specific build issues.
+# NB: wreq gets past fingerprinting, but we have to deal with platform-specific build issues.
 #
 # Mac:
 #   brew install --formula cmake pkg-config llvm
@@ -310,6 +290,5 @@ uuid = "1.18.1"
 #   choco install pkgconfiglite -y
 #   choco install llvm -y
 #   choco install nasm -y
-wreq-util = "3.0.0-rc.10"
-wreq = { version = "6.0.0-rc.28", features = ["json", "query", "multipart", "cookies", "ws", "stream", "gzip", "form"] }
-
+wreq = { version = "6.0.0-rc.20", features = ["json", "multipart", "cookies", "ws", "stream"] }
+wreq-util = "3.0.0-rc.6"
@@ -3,7 +3,7 @@
 -- noinspection SqlResolveForFile

 ALTER TABLE media_files
-    ADD COLUMN origin_product_category VARCHAR(16) NOT NULL DEFAULT 'unknown'
+    ADD COLUMN origin_product_category VARCHAR(16) NOT NULL DEFAULT "unknown"
    AFTER origin_category;

 ALTER TABLE media_files
@@ -3,7 +3,7 @@
 -- noinspection SqlResolveForFile

 ALTER TABLE media_files
-    ADD COLUMN media_class VARCHAR(16) NOT NULL DEFAULT 'unknown'
+    ADD COLUMN media_class VARCHAR(16) NOT NULL DEFAULT "unknown"
    AFTER media_type;

 ALTER TABLE media_files
@@ -3,7 +3,7 @@
 -- noinspection SqlResolveForFile

 ALTER TABLE media_files
-  ADD COLUMN nsfw_status VARCHAR(32) NOT NULL DEFAULT 'unknown'
+  ADD COLUMN nsfw_status VARCHAR(32) NOT NULL DEFAULT "unknown"
  AFTER maybe_scene_source_media_file_token;

 ALTER TABLE media_files
@@ -1,45 +0,0 @@
-Dev Setup
-=========
-
-# ArtCraft 
-
-ArtCraft is a Rust / Tauri app.
-
-To set up the ArtCraft development environment,  install the following:
-
-1. [Install Rust](https://doc.rust-lang.org/cargo/getting-started/installation.html).
-2. [Install npm](https://nodejs.org/en/download) or [nvm](https://github.com/nvm-sh/nvm). (Node version `v24.13.0` works at time of writing.) 
-3. [Install nx](https://nx.dev/docs/getting-started/installation). (Nx version `v22.4.5` works at time of writing.)
-4. [Install Tauri CLI](https://v2.tauri.app/reference/cli/). (Version `tauri-cli 2.10.0` works at time of writing.)
-
-An easy way to get started with running the app in development is to run the two commands (in separate terminals):
-
-**Mac and Linux Development** 
-
-```bash
-# Run the frontend dev server
-./script/artcraft/unix_frontend_dev.sh
-
-# Run the Tauri Rust application
-./script/artcraft/unix_rust_dev.sh
-```
-
-**Windows Development**
-
-```powershell
-# Run the frontend dev server
-.\script\artcraft\windows_frontend_dev.ps1
-
-# Run the Tauri Rust application
-.\script\artcraft\windows_rust_dev.ps1
-```
-
-
-# ArtCraft Server
-
-ArtCraft's server is a Rust / Actix app called `storyteller-web`.
-
-You don't need to run this to develop the ArtCraft application, but it can be useful to spin up 
-a development instance for adding new server functions or as your own private local copy.
-
-See [dev_setup_server.md](./dev_setup_server.md) for instructions.
@@ -1,105 +0,0 @@
-# ArtCraft Server
-
-ArtCraft's server is a Rust / Actix app called `storyteller-web`.
-
-You don't need to run this to develop the ArtCraft application, but it can be useful to spin up
-a development instance for adding new server functions or as your own private local copy.
-
-`storyteller-web` can function entirely within the development environment, and ArtCraft can be
-pointed to a local instance of the server.
-
-**TODO**: Concisely describe setting up server components. Note: we have
-previous docs in `old/` that may still be relevant, though they're perhaps
-slightly out of date.
-
-## Server Setup (Mac)
-
-### Install and Migrate MySQL Database
-
-```bash
-# For now, the tooling doesn't support MySQL 9.6 as it was just released in January 2026.
-# This will probably change in the future to no longer need to specify the 8.* series.
-brew install mysql@8.4
-
-# Try to connect
-mysql -uroot
-
-# If connection fails, start service, then try again.
-brew services start mysql
-mysql -uroot
-
-# If that fails, reboot and try connecting again.
-```
-
-Create the `storyteller` database table. Connect to the database:
-
-```bash
-sudo mysql -u root
-
-# If it needs a password, use argument -p and when prompted use "root" as the typical default password
-```
-
-Then run this:
-
-```mysql
-use mysql;
-CREATE DATABASE storyteller;
-CREATE USER 'storyteller'@'localhost' IDENTIFIED BY 'password';
-GRANT ALL PRIVILEGES ON storyteller.* TO 'storyteller'@'localhost';
-```
-
-Then verify access with `./script/dev_mysql_connect.sh`
-
-```bash
-cargo install diesel_cli \
-  --no-default-features \
-  --features mysql,sqlite
-```
-
-If this fails,
-
-```bash
-brew install zstd
-brew install openssl
-```
-
-Possibly,
-
-```bash
-export RUSTFLAGS="-L$(brew --prefix zstd)/lib -L$(brew --prefix openssl)/lib"
-```
-
-In older Macs, there [have been some issues with Diesel CLI](https://github.com/diesel-rs/diesel/issues/2605)
-that require a few extra dependencies to be installed:
-
-```bash
-# If you're on Mac and the above command didn't work, run the following and then retry:
-brew install libpq
-```
-
-You're ready to run the migrations:
-
-```bash
-diesel migration run
-```
-
-You might get a scary message about `"Encountered unknown type for Mysql: enum"` -- you can safely ignore this
-error if you see it in isolation. It doesn't impact the migrations whatsoever.
-
-Finally, you'll need the sqlx CLI tool to run codegen. 
-You likely won't need this now, but if you change any queries, this will be necessary:
-
-```bash
-cargo install sqlx-cli --features rustls,mysql,sqlite
-```
-
-### Install Redis (Mac)
-
-```bash
-# Install Redis
-brew install redis
-
-# Start the service:
-brew services start redis
-```
-
@@ -33,7 +33,7 @@ RUN apt-get update \
 FROM ubuntu:jammy as rust-base

 # NB: This can be "stable" or another version.
-ARG RUST_TOOLCHAIN="1.93.0"
+ARG RUST_TOOLCHAIN="1.86.0"

 WORKDIR /tmp

@@ -48,12 +48,8 @@ RUN apt-get update \
        curl \
        ffmpeg \
        fontconfig \
-        git \
-        libclang-dev \
        libfontconfig1-dev \
        libssl-dev \
-        musl-tools \
-        perl \
        pkg-config

 # NB: Fix for fontconfig (servo-fontconfig-sys): https://github.com/alacritty/alacritty/issues/4423#issuecomment-727277235
@@ -137,12 +133,6 @@ RUN SQLX_OFFLINE=true \
  --release \
  --bin storyteller-web

-RUN SQLX_OFFLINE=true \
-  LD_LIBRARY_PATH=/usr/lib:${LD_LIBRARY_PATH} \
-  $HOME/.cargo/bin/cargo build \
-  --release \
-  --bin seedance2-pro-job
-
 RUN SQLX_OFFLINE=true \
  LD_LIBRARY_PATH=/usr/lib:${LD_LIBRARY_PATH} \
  $HOME/.cargo/bin/cargo build \
@@ -1,6 +1,5 @@
 pub mod kling_2_5_turbo_multi_function_video_gen;
 pub mod kling_2_6_multi_function_video_gen;
-pub mod seedance_2p0_multi_function_video_gen;
 pub mod sora_2_multi_function_video_gen;
 pub mod sora_2_pro_multi_function_video_gen;
 pub mod veo_3p1_fast_multi_function_video_gen;
@@ -1,68 +0,0 @@
-use serde::{Deserialize, Serialize};
-use tokens::tokens::generic_inference_jobs::InferenceJobToken;
-use tokens::tokens::media_files::MediaFileToken;
-use utoipa::ToSchema;
-
-pub const SEEDANCE_2P0_MULTI_FUNCTION_VIDEO_GEN_PATH: &str = "/v1/generate/video/multi_function/seedance_2p0";
-
-/// Seedance 2.0 multi-function video generation (text-to-video, image-to-video, and reference-based).
-#[derive(Serialize, Deserialize, ToSchema)]
-pub struct Seedance2p0MultiFunctionVideoGenRequest {
-  /// Idempotency token to prevent duplicate requests.
-  pub uuid_idempotency_token: String,
-
-  /// Text prompt.
-  pub prompt: Option<String>,
-
-  /// Optional start frame image.
-  pub start_frame_media_token: Option<MediaFileToken>,
-
-  /// Optional end frame image.
-  pub end_frame_media_token: Option<MediaFileToken>,
-
-  /// Optional reference images (reference mode). When present, takes priority over start/end frames.
-  pub reference_image_media_tokens: Option<Vec<MediaFileToken>>,
-
-  /// Video aspect ratio / resolution.
-  pub aspect_ratio: Option<Seedance2p0AspectRatio>,
-
-  /// Duration in seconds (4–15).
-  pub duration_seconds: Option<u8>,
-
-  /// Number of videos to generate.
-  pub batch_count: Option<Seedance2p0BatchCount>,
-}
-
-#[derive(Serialize, Deserialize, ToSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum Seedance2p0AspectRatio {
-  /// 16:9 landscape (1280x720)
-  Landscape16x9,
-  /// 9:16 portrait (720x1280)
-  Portrait9x16,
-  /// 1:1 square (720x720)
-  Square1x1,
-  /// 4:3 standard (960x720)
-  Standard4x3,
-  /// 3:4 portrait (720x960)
-  Portrait3x4,
-}
-
-#[derive(Serialize, Deserialize, ToSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum Seedance2p0BatchCount {
-  One,
-  Two,
-  Four,
-}
-
-#[derive(Serialize, Deserialize, ToSchema)]
-pub struct Seedance2p0MultiFunctionVideoGenResponse {
-  pub success: bool,
-
-  /// The first inference job token (always present).
-  pub inference_job_token: InferenceJobToken,
-
-  /// All inference job tokens for the batch (includes `inference_job_token` as the first entry).
-  pub all_inference_job_tokens: Vec<InferenceJobToken>,
-}
@@ -7,5 +7,4 @@ pub mod media_file;
 pub mod prompts;
 pub mod stripe_artcraft;
 pub mod subscriptions;
-pub mod users;
 pub mod utils;
@@ -1,13 +0,0 @@
-use serde_derive::{Deserialize, Serialize};
-use utoipa::ToSchema;
-
-#[derive(Serialize, Deserialize, ToSchema)]
-pub struct ChangePasswordRequest {
-  pub password: String,
-  pub password_confirmation: String,
-}
-
-#[derive(Serialize, Deserialize, ToSchema)]
-pub struct ChangePasswordResponse {
-  pub success: bool,
-}
@@ -1,12 +0,0 @@
-use serde_derive::{Deserialize, Serialize};
-use utoipa::ToSchema;
-
-#[derive(Serialize, Deserialize, ToSchema)]
-pub struct EditEmailRequest {
-  pub email_address: String,
-}
-
-#[derive(Serialize, Deserialize, ToSchema)]
-pub struct EditEmailResponse {
-  pub success: bool,
-}
@@ -1,12 +0,0 @@
-use serde_derive::{Deserialize, Serialize};
-use utoipa::ToSchema;
-
-#[derive(Serialize, Deserialize, ToSchema)]
-pub struct EditUsernameRequest {
-  pub display_name: String,
-}
-
-#[derive(Serialize, Deserialize, ToSchema)]
-pub struct EditUsernameResponse {
-  pub success: bool,
-}
@@ -1,4 +0,0 @@
-pub mod change_password;
-pub mod edit_email;
-pub mod edit_username;
-pub mod session_info;
@@ -1,99 +0,0 @@
-use crate::common::responses::user_details_light::UserDetailsLight;
-use enums::by_table::users::user_feature_flag::UserFeatureFlag;
-use serde_derive::Serialize;
-use std::collections::BTreeSet;
-use tokens::tokens::users::UserToken;
-use utoipa::ToSchema;
-
-#[derive(Serialize, Copy, Clone, ToSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum FakeYouPlan {
-  Free,
-  Basic,
-  Standard,
-  Pro,
-}
-
-#[derive(Serialize, Copy, Clone, ToSchema)]
-#[serde(rename_all = "snake_case")]
-pub enum StorytellerStreamPlan {
-  Free,
-  Basic,
-  Standard,
-  Pro,
-}
-
-#[derive(Serialize, ToSchema)]
-pub struct SessionUserInfo {
-  pub core_info: UserDetailsLight,
-
-  pub user_token: UserToken,
-  pub username: String,
-  pub display_name: String,
-  pub email_gravatar_hash: String,
-  
-  pub onboarding: SessionOnboardingState,
-
-  // TODO(bt,2024-03-30): Remove legacy feature flag
-  #[deprecated(note = "DO NOT USE. Use `maybe_feature_flags` instead! The flag you're looking for is `studio`.")]
-  pub can_access_studio: bool,
-
-  /// Collection of feature / rollout flags
-  /// This is the proper place to detect if a user has access to some rollout (non-paywall) feature.
-  /// NB: The BTreeSet maintains order so React doesn't introduce re-render state bugs when order changes
-  pub maybe_feature_flags: BTreeSet<UserFeatureFlag>,
-
-  // Premium plans:
-  #[deprecated(note = "DO NOT USE. This was never used and is 100% meaningless.")]
-  pub fakeyou_plan: FakeYouPlan,
-
-  #[deprecated(note = "DO NOT USE. This was never used and is 100% meaningless.")]
-  pub storyteller_stream_plan: StorytellerStreamPlan,
-
-  // Usage permissions:
-  pub can_use_tts: bool,
-  pub can_use_w2l: bool,
-  pub can_delete_own_tts_results: bool,
-  pub can_delete_own_w2l_results: bool,
-  pub can_delete_own_account: bool,
-
-  // Contribution permissions:
-  pub can_upload_tts_models: bool,
-  pub can_upload_w2l_templates: bool,
-  pub can_delete_own_tts_models: bool,
-  pub can_delete_own_w2l_templates: bool,
-
-  // Moderation permissions:
-  pub can_approve_w2l_templates: bool,
-  pub can_edit_other_users_profiles: bool,
-  pub can_edit_other_users_tts_models: bool,
-  pub can_edit_other_users_w2l_templates: bool,
-  pub can_delete_other_users_tts_models: bool,
-  pub can_delete_other_users_tts_results: bool,
-  pub can_delete_other_users_w2l_templates: bool,
-  pub can_delete_other_users_w2l_results: bool,
-  pub can_ban_users: bool,
-  pub can_delete_users: bool,
-}
-
-#[derive(Serialize, ToSchema)]
-pub struct SessionOnboardingState {
-  /// If true, the user hasn't set their email.
-  pub email_not_set: bool,
-  
-  /// If true, the user hasn't confirmed their email.
-  pub email_not_confirmed: bool,
-
-  /// If true, the user hasn't set their password.
-  pub password_not_set: bool,
-  
-  /// If true, the user hasn't set their username (the username they have is random).
-  pub username_not_customized: bool,
-}
-
-#[derive(Serialize, ToSchema)]
-pub struct SessionInfoSuccessResponse {
-  pub success: bool,
-  pub logged_in: bool,
-  pub user: Option<SessionUserInfo>,
-}
@@ -1,5 +1,4 @@
 pub mod kling_2p5_turbo_pro_multi_function_video_gen;
-pub mod seedance_2p0_multi_function_video_gen;
 pub mod kling_2p6_pro_multi_function_video_gen;
 pub mod sora_2_multi_function_video_gen;
 pub mod sora_2_pro_multi_function_video_gen;
@@ -1,18 +0,0 @@
-use crate::credentials::storyteller_credential_set::StorytellerCredentialSet;
-use crate::error::storyteller_error::StorytellerError;
-use crate::utils::api_host::ApiHost;
-use crate::utils::basic_json_post_request::basic_json_post_request;
-use artcraft_api_defs::generate::video::multi_function::seedance_2p0_multi_function_video_gen::{Seedance2p0MultiFunctionVideoGenRequest, Seedance2p0MultiFunctionVideoGenResponse, SEEDANCE_2P0_MULTI_FUNCTION_VIDEO_GEN_PATH};
-
-pub async fn seedance_2p0_multi_function_video_gen(
-  api_host: &ApiHost,
-  maybe_creds: Option<&StorytellerCredentialSet>,
-  request: Seedance2p0MultiFunctionVideoGenRequest,
-) -> Result<Seedance2p0MultiFunctionVideoGenResponse, StorytellerError> {
-  Ok(basic_json_post_request(
-    api_host,
-    SEEDANCE_2P0_MULTI_FUNCTION_VIDEO_GEN_PATH,
-    maybe_creds,
-    request,
-  ).await?)
-}
@@ -1,7 +1,6 @@
 use crate::creds::fal_api_key::FalApiKey;
 use crate::error::classify_fal_error::classify_fal_error;
 use crate::error::fal_error_plus::FalErrorPlus;
-use crate::requests::traits::fal_request_cost_calculator_trait::{FalRequestCostCalculator, UsdCents};
 use fal::endpoints::fal_ai::bytedance::seedream::bytedance_seedream_v4_edit_image::{bytedance_seedream_v4_edit_image, BytedanceSeedreamV4EditImageInput};
 use fal::webhook::WebhookResponse;
 use reqwest::IntoUrl;
@@ -54,23 +53,6 @@ pub enum EnqueueBytedanceSeedreamV4EditImageSize {
  Auto4k,
 }

-
-impl <U: IntoUrl> FalRequestCostCalculator for EnqueueBytedanceSeedreamV4EditImageArgs<'_, U> {
-  fn calculate_cost_in_cents(&self) -> UsdCents {
-    // Your request will cost $0.03 per image.
-    let unit_cost = 3;
-    let cost = match self.num_images {
-      None => unit_cost,
-      Some(EnqueueBytedanceSeedreamV4EditImageNumImages::One) => unit_cost,
-      Some(EnqueueBytedanceSeedreamV4EditImageNumImages::Two) => unit_cost * 2,
-      Some(EnqueueBytedanceSeedreamV4EditImageNumImages::Three) => unit_cost * 3,
-      Some(EnqueueBytedanceSeedreamV4EditImageNumImages::Four) => unit_cost * 4,
-    };
-    cost as UsdCents
-  }
-}
-
-
 pub async fn enqueue_bytedance_seedream_v4_edit_image_webhook<R: IntoUrl>(
  args: EnqueueBytedanceSeedreamV4EditImageArgs<'_, R>
 ) -> Result<WebhookResponse, FalErrorPlus> {
@@ -1,7 +1,6 @@
 use crate::creds::fal_api_key::FalApiKey;
 use crate::error::classify_fal_error::classify_fal_error;
 use crate::error::fal_error_plus::FalErrorPlus;
-use crate::requests::traits::fal_request_cost_calculator_trait::{FalRequestCostCalculator, UsdCents};
 use fal::endpoints::fal_ai::bytedance::seedream::bytedance_seedream_v4p5_edit_image::{bytedance_seedream_v4p5_edit_image, BytedanceSeedreamV4p5EditImageInput};
 use fal::webhook::WebhookResponse;
 use reqwest::IntoUrl;
@@ -53,23 +52,6 @@ pub enum EnqueueBytedanceSeedreamV4p5EditImageSize {
  Auto4k,
 }

-
-impl <U: IntoUrl> FalRequestCostCalculator for EnqueueBytedanceSeedreamV4p5EditImageArgs<'_, U> {
-  fn calculate_cost_in_cents(&self) -> UsdCents {
-    // Your request will cost $0.04 per image.
-    let unit_cost = 4;
-    let cost = match self.num_images {
-      None => unit_cost,
-      Some(EnqueueBytedanceSeedreamV4p5EditImageNumImages::One) => unit_cost,
-      Some(EnqueueBytedanceSeedreamV4p5EditImageNumImages::Two) => unit_cost * 2,
-      Some(EnqueueBytedanceSeedreamV4p5EditImageNumImages::Three) => unit_cost * 3,
-      Some(EnqueueBytedanceSeedreamV4p5EditImageNumImages::Four) => unit_cost * 4,
-    };
-    cost as UsdCents
-  }
-}
-
-
 pub async fn enqueue_bytedance_seedream_v4p5_edit_image_webhook<R: IntoUrl>(
  args: EnqueueBytedanceSeedreamV4p5EditImageArgs<'_, R>
 ) -> Result<WebhookResponse, FalErrorPlus> {
@@ -1,7 +1,6 @@
 use crate::creds::fal_api_key::FalApiKey;
 use crate::error::classify_fal_error::classify_fal_error;
 use crate::error::fal_error_plus::FalErrorPlus;
-use crate::requests::traits::fal_request_cost_calculator_trait::{FalRequestCostCalculator, UsdCents};
 use fal::endpoints::fal_ai::gemini_25_flash_image::edit::gemini_25_flash_image_edit;
 use fal::prelude::fal_ai::gemini_25_flash_image::edit::Gemini25FlashImageEditInput;
 use fal::webhook::WebhookResponse;
@@ -50,20 +49,6 @@ pub enum Gemini25FlashEditAspectRatio {
  NineBySixteen, // NB: No NineByTwentyOne ?
 }

-
-impl <U: IntoUrl> FalRequestCostCalculator for Gemini25FlashEditArgs<'_, U> {
-  fn calculate_cost_in_cents(&self) -> UsdCents {
-    // Your request will cost $0.039 per image. For $1.00, you can run this model 25 times.
-    match self.num_images {
-      Gemini25FlashEditNumImages::One => 4,
-      Gemini25FlashEditNumImages::Two => 8,
-      Gemini25FlashEditNumImages::Three => 12,
-      Gemini25FlashEditNumImages::Four => 16,
-    }
-  }
-}
-
-
 pub async fn enqueue_gemini_25_flash_edit_webhook<R: IntoUrl>(
  args: Gemini25FlashEditArgs<'_, R>
 ) -> Result<WebhookResponse, FalErrorPlus> {
@@ -2,7 +2,6 @@ use crate::creds::fal_api_key::FalApiKey;
 use crate::creds::open_ai_api_key::OpenAiApiKey;
 use crate::error::classify_fal_error::classify_fal_error;
 use crate::error::fal_error_plus::FalErrorPlus;
-use crate::requests::traits::fal_request_cost_calculator_trait::{FalRequestCostCalculator, UsdCents};
 use fal::endpoints::fal_ai::gpt_image_1::edit_image::byok::{gpt_edit_image, GptEditImageRequest};
 use fal::webhook::WebhookResponse;
 use reqwest::IntoUrl;
@@ -45,31 +44,6 @@ pub enum GptEditImageNumImages{
  Four,
 }

-
-// NB: These are BYOK, so they're not Fal's prices
-impl <U: IntoUrl> FalRequestCostCalculator for GptEditImageByokArgs<'_, U> {
-  fn calculate_cost_in_cents(&self) -> UsdCents {
-    // Can't find details, so using this: https://www.reddit.com/r/OpenAI/comments/1krfwa1/pricing_gpt_image_1_model/
-    // Prompts are billed similarly to other GPT models. Image outputs cost approximately $0.01 (low), $0.04 (medium),
-    // and $0.17 (high) for square images.
-    // We're likely losing money on this, but that's okay. Will adjust in the future to be fair to users and us.
-    let base_cost = match self.quality {
-      GptEditImageQuality::Auto => 17,
-      GptEditImageQuality::Low => 1,
-      GptEditImageQuality::Medium => 4,
-      GptEditImageQuality::High => 17,
-    };
-    let cost = match self.num_images {
-      GptEditImageNumImages::One => base_cost,
-      GptEditImageNumImages::Two => base_cost * 2,
-      GptEditImageNumImages::Three => base_cost * 3,
-      GptEditImageNumImages::Four => base_cost * 4,
-    };
-    cost as UsdCents
-  }
-}
-
-
 pub async fn enqueue_gpt_image_1_edit_image_webhook<V: IntoUrl>(
  args: GptEditImageByokArgs<'_, V>
 ) -> Result<WebhookResponse, FalErrorPlus> {
@@ -1,7 +1,6 @@
 use crate::creds::fal_api_key::FalApiKey;
 use crate::error::classify_fal_error::classify_fal_error;
 use crate::error::fal_error_plus::FalErrorPlus;
-use crate::requests::traits::fal_request_cost_calculator_trait::{FalRequestCostCalculator, UsdCents};
 use fal::endpoints::fal_ai::gpt_image::gpt_image_1p5_image_edit::{gpt_image_1p5_image_edit, GptImage1p5ImageEditInput};
 use fal::webhook::WebhookResponse;
 use reqwest::IntoUrl;
@@ -70,34 +69,6 @@ pub enum EnqueueGptImage1p5EditImageOutputFormat {
  Webp,
 }

-
-impl <U: IntoUrl> FalRequestCostCalculator for EnqueueGptImage1p5EditImageArgs<'_, U> {
-  fn calculate_cost_in_cents(&self) -> UsdCents {
-    // Your request will cost different amounts based on the number of images, quality, and size.
-    // For low quality, you will be charged $0.009 for 1024x1024 or $0.013 for any other size per image.
-    // For medium quality, you will be charged $0.034 for 1024x1024, $0.051 for 1024x1536 and $0.050 for 1536x1024 per image.
-    // For high quality, you will be charged $0.133 for 1024x1024, $0.200 for 1024x1536 or $0.199 for 1536x1024 per image.
-    let use_quality = self.quality.unwrap_or(EnqueueGptImage1p5EditImageQuality::Medium);
-    let use_size = self.image_size.unwrap_or(EnqueueGptImage1p5EditImageSize::Square);
-    let base_cost = match (use_quality, use_size) {
-      (EnqueueGptImage1p5EditImageQuality::Low, EnqueueGptImage1p5EditImageSize::Square) => 1,
-      (EnqueueGptImage1p5EditImageQuality::Low, _) => 1,
-      (EnqueueGptImage1p5EditImageQuality::Medium, EnqueueGptImage1p5EditImageSize::Square) => 3,
-      (EnqueueGptImage1p5EditImageQuality::Medium, _) => 5,
-      (EnqueueGptImage1p5EditImageQuality::High, EnqueueGptImage1p5EditImageSize::Square) => 13,
-      (EnqueueGptImage1p5EditImageQuality::High, _) => 20,
-    };
-    let cost = match self.num_images {
-      EnqueueGptImage1p5EditImageNumImages::One => base_cost,
-      EnqueueGptImage1p5EditImageNumImages::Two => base_cost * 2,
-      EnqueueGptImage1p5EditImageNumImages::Three => base_cost * 3,
-      EnqueueGptImage1p5EditImageNumImages::Four => base_cost * 4,
-    };
-    cost as UsdCents
-  }
-}
-
-
 pub async fn enqueue_gpt_image_1p5_image_edit_webhook<R: IntoUrl>(
  args: EnqueueGptImage1p5EditImageArgs<'_, R>
 ) -> Result<WebhookResponse, FalErrorPlus> {
@@ -1,7 +1,6 @@
 use crate::creds::fal_api_key::FalApiKey;
 use crate::error::classify_fal_error::classify_fal_error;
 use crate::error::fal_error_plus::FalErrorPlus;
-use crate::requests::traits::fal_request_cost_calculator_trait::{FalRequestCostCalculator, UsdCents};
 use fal::endpoints::fal_ai::nano_banana_pro::nano_banana_pro_image_edit::{nano_banana_pro_image_edit, NanoBananaProImageEditInput};
 use fal::webhook::WebhookResponse;
 use reqwest::IntoUrl;
@@ -57,30 +56,6 @@ pub enum EnqueueNanoBananaProEditImageAspectRatio {
  NineBySixteen, // NB: No NineByTwentyOne ?
 }

-
-impl <U: IntoUrl> FalRequestCostCalculator for EnqueueNanoBananaProEditImageArgs<'_, U> {
-  fn calculate_cost_in_cents(&self) -> UsdCents {
-    // Your request will cost $0.15 per image.
-    // For $1.00, you can run this model 7 times.
-    // 4K outputs will be charged at double the standard rate.
-    // If web search is used, an additional $0.015 will be charged.
-    // Note: Pricing may change in the future.
-    let cost = match self.resolution {
-      None => 15,
-      Some(EnqueueNanoBananaProEditImageResolution::OneK) => 15,
-      Some(EnqueueNanoBananaProEditImageResolution::TwoK) => 15,
-      Some(EnqueueNanoBananaProEditImageResolution::FourK) => 30,
-    };
-    let cost = match self.num_images {
-      EnqueueNanoBananaProEditImageNumImages::One => cost,
-      EnqueueNanoBananaProEditImageNumImages::Two => cost * 2,
-      EnqueueNanoBananaProEditImageNumImages::Three => cost * 3,
-      EnqueueNanoBananaProEditImageNumImages::Four => cost * 4,
-    };
-    cost as UsdCents
-  }
-}
-
 pub async fn enqueue_nano_banana_pro_image_edit_webhook<R: IntoUrl>(
  args: EnqueueNanoBananaProEditImageArgs<'_, R>
 ) -> Result<WebhookResponse, FalErrorPlus> {
@@ -1,7 +1,6 @@
 use crate::creds::fal_api_key::FalApiKey;
 use crate::error::classify_fal_error::classify_fal_error;
 use crate::error::fal_error_plus::FalErrorPlus;
-use crate::requests::traits::fal_request_cost_calculator_trait::{FalRequestCostCalculator, UsdCents};
 use fal::endpoints::fal_ai::qwen_image_edit::{qwen_image_edit, QwenImageEditInput};
 use fal::webhook::WebhookResponse;
 use reqwest::IntoUrl;
@@ -46,23 +45,6 @@ pub enum QwenImageEditSize {
  //Custom { width: u32, height: u32 }, // TODO
 }

-
-impl <U: IntoUrl, R: IntoUrl> FalRequestCostCalculator for QwenImageEditArgs<'_, U, R> {
-  fn calculate_cost_in_cents(&self) -> UsdCents {
-    // Your request will cost $0.03 per megapixel. -- Ugh, not calculating that
-    let base_cost = 3;
-    let cost = match self.num_images {
-      None => base_cost,
-      Some(QwenImageEditNumImages::One) => base_cost,
-      Some(QwenImageEditNumImages::Two) => base_cost * 2,
-      Some(QwenImageEditNumImages::Three) => base_cost * 3,
-      Some(QwenImageEditNumImages::Four) => base_cost * 4,
-    };
-    cost as UsdCents
-  }
-}
-
-
 pub async fn enqueue_qwen_image_edit_webhook<U: IntoUrl, R: IntoUrl>(
  args: QwenImageEditArgs<'_, U, R>
 ) -> Result<WebhookResponse, FalErrorPlus> {
@@ -1,7 +1,6 @@
 use crate::creds::fal_api_key::FalApiKey;
 use crate::error::classify_fal_error::classify_fal_error;
 use crate::error::fal_error_plus::FalErrorPlus;
-use crate::requests::traits::fal_request_cost_calculator_trait::{FalRequestCostCalculator, UsdCents};
 use fal::endpoints::fal_ai::flux_pro::v1_1::{v1_1, FluxProPlusTextToImageInput, ImageSizeProperty};
 use fal::webhook::WebhookResponse;
 use reqwest::IntoUrl;
@@ -34,22 +33,6 @@ pub enum FluxPro11NumImages {
  Four,
 }

-
-impl <U: IntoUrl> FalRequestCostCalculator for FluxPro11Args<'_, U> {
-  fn calculate_cost_in_cents(&self) -> UsdCents {
-    // Your request will cost $0.04 per megapixel. -- NB: What? Not going to calculate that.
-    let base_cost = 6;
-    let cost = match self.num_images {
-      FluxPro11NumImages::One => base_cost,
-      FluxPro11NumImages::Two => base_cost * 2,
-      FluxPro11NumImages::Three => base_cost * 3,
-      FluxPro11NumImages::Four => base_cost * 4,
-    };
-    cost as UsdCents
-  }
-}
-
-
 pub async fn enqueue_flux_pro_11_text_to_image_webhook<U: IntoUrl>(
  args: FluxPro11Args<'_, U>
 ) -> Result<WebhookResponse, FalErrorPlus> {
@@ -1,7 +1,6 @@
 use crate::creds::fal_api_key::FalApiKey;
 use crate::error::classify_fal_error::classify_fal_error;
 use crate::error::fal_error_plus::FalErrorPlus;
-use crate::requests::traits::fal_request_cost_calculator_trait::{FalRequestCostCalculator, UsdCents};
 use fal::endpoints::fal_ai::flux_pro::v1_1_ultra::{v1_1_ultra, AspectRatioProperty, FluxProUltraTextToImageInput};
 use fal::webhook::WebhookResponse;
 use reqwest::IntoUrl;
@@ -36,22 +35,6 @@ pub enum FluxPro11UltraNumImages {
  Four,
 }

-
-impl <U: IntoUrl> FalRequestCostCalculator for FluxPro11UltraArgs<'_, U> {
-  fn calculate_cost_in_cents(&self) -> UsdCents {
-    // Your request will cost $0.06 per image.
-    let base_cost = 6;
-    let cost = match self.num_images {
-      FluxPro11UltraNumImages::One => base_cost,
-      FluxPro11UltraNumImages::Two => base_cost * 2,
-      FluxPro11UltraNumImages::Three => base_cost * 3,
-      FluxPro11UltraNumImages::Four => base_cost * 4,
-    };
-    cost as UsdCents
-  }
-}
-
-
 pub async fn enqueue_flux_pro_11_ultra_text_to_image_webhook<U: IntoUrl>(
  args: FluxPro11UltraArgs<'_, U>
 ) -> Result<WebhookResponse, FalErrorPlus> {
@@ -2,7 +2,6 @@ use crate::creds::fal_api_key::FalApiKey;
 use crate::creds::open_ai_api_key::OpenAiApiKey;
 use crate::error::classify_fal_error::classify_fal_error;
 use crate::error::fal_error_plus::FalErrorPlus;
-use crate::requests::traits::fal_request_cost_calculator_trait::{FalRequestCostCalculator, UsdCents};
 use fal::prelude::fal_ai::gpt_image_1::edit_image::byok::{gpt_text_to_image, GptTextToImageRequest};
 use fal::webhook::WebhookResponse;
 use reqwest::IntoUrl;
@@ -44,31 +43,6 @@ pub enum GptTextToImageNumImages{
  Four,
 }

-
-// NB: These are BYOK, so they're not Fal's prices
-impl <U: IntoUrl> FalRequestCostCalculator for GptTextToImageByokArgs<'_, U> {
-  fn calculate_cost_in_cents(&self) -> UsdCents {
-    // Can't find details, so using this: https://www.reddit.com/r/OpenAI/comments/1krfwa1/pricing_gpt_image_1_model/
-    // Prompts are billed similarly to other GPT models. Image outputs cost approximately $0.01 (low), $0.04 (medium),
-    // and $0.17 (high) for square images.
-    // We're likely losing money on this, but that's okay. Will adjust in the future to be fair to users and us.
-    let base_cost = match self.quality {
-      GptTextToImageQuality::Auto => 17,
-      GptTextToImageQuality::Low => 1,
-      GptTextToImageQuality::Medium => 4,
-      GptTextToImageQuality::High => 17,
-    };
-    let cost = match self.num_images {
-      GptTextToImageNumImages::One => base_cost,
-      GptTextToImageNumImages::Two => base_cost * 2,
-      GptTextToImageNumImages::Three => base_cost * 3,
-      GptTextToImageNumImages::Four => base_cost * 4,
-    };
-    cost as UsdCents
-  }
-}
-
-
 pub async fn enqueue_gpt_image_1_text_to_image_webhook<V: IntoUrl>(
  args: GptTextToImageByokArgs<'_, V>
 ) -> Result<WebhookResponse, FalErrorPlus> {
@@ -1,7 +1,6 @@
 use crate::creds::fal_api_key::FalApiKey;
 use crate::error::classify_fal_error::classify_fal_error;
 use crate::error::fal_error_plus::FalErrorPlus;
-use crate::requests::traits::fal_request_cost_calculator_trait::{FalRequestCostCalculator, UsdCents};
 use fal::endpoints::fal_ai::bytedance::seedream::bytedance_seedream_v4_text_to_image::BytedanceSeedreamV4TextToImageInput;
 use fal::prelude::fal_ai::bytedance::seedream::bytedance_seedream_v4_text_to_image::bytedance_seedream_v4_text_to_image;
 use fal::webhook::WebhookResponse;
@@ -54,24 +53,6 @@ pub enum EnqueueBytedanceSeedreamV4TextToImageSize {
  Auto4k,
 }

-
-impl <U: IntoUrl> FalRequestCostCalculator for EnqueueBytedanceSeedreamV4TextToImageArgs<'_, U> {
-  fn calculate_cost_in_cents(&self) -> UsdCents {
-    // Copied from edit image version
-    // Your request will cost $0.03 per image.
-    let unit_cost = 3;
-    let cost = match self.num_images {
-      None => unit_cost,
-      Some(EnqueueBytedanceSeedreamV4TextToImageNumImages::One) => unit_cost,
-      Some(EnqueueBytedanceSeedreamV4TextToImageNumImages::Two) => unit_cost * 2,
-      Some(EnqueueBytedanceSeedreamV4TextToImageNumImages::Three) => unit_cost * 3,
-      Some(EnqueueBytedanceSeedreamV4TextToImageNumImages::Four) => unit_cost * 4,
-    };
-    cost as UsdCents
-  }
-}
-
-
 pub async fn enqueue_bytedance_seedream_v4_text_to_image_webhook<R: IntoUrl>(
  args: EnqueueBytedanceSeedreamV4TextToImageArgs<'_, R>
 ) -> Result<WebhookResponse, FalErrorPlus> {
@@ -4,8 +4,6 @@ use crate::error::fal_error_plus::FalErrorPlus;
 use fal::endpoints::fal_ai::bytedance::seedream::bytedance_seedream_v4p5_text_to_image::{bytedance_seedream_v4p5_text_to_image, BytedanceSeedreamV4p5TextToImageInput};
 use fal::webhook::WebhookResponse;
 use reqwest::IntoUrl;
-use crate::requests::traits::fal_request_cost_calculator_trait::{FalRequestCostCalculator, UsdCents};
-use crate::requests::webhook::image::edit::enqueue_bytedance_seedream_v4p5_edit_image_webhook::{EnqueueBytedanceSeedreamV4p5EditImageArgs, EnqueueBytedanceSeedreamV4p5EditImageNumImages};

 pub struct EnqueueBytedanceSeedreamV4p5TextToImageArgs<'a, R: IntoUrl> {
  // Request required
@@ -53,24 +51,6 @@ pub enum EnqueueBytedanceSeedreamV4p5TextToImageSize {
  Auto4k,
 }

-
-impl <U: IntoUrl> FalRequestCostCalculator for EnqueueBytedanceSeedreamV4p5TextToImageArgs<'_, U> {
-  fn calculate_cost_in_cents(&self) -> UsdCents {
-    // NB: Copied from edit image costs
-    // Your request will cost $0.04 per image.
-    let unit_cost = 4;
-    let cost = match self.num_images {
-      None => unit_cost,
-      Some(EnqueueBytedanceSeedreamV4p5TextToImageNumImages::One) => unit_cost,
-      Some(EnqueueBytedanceSeedreamV4p5TextToImageNumImages::Two) => unit_cost * 2,
-      Some(EnqueueBytedanceSeedreamV4p5TextToImageNumImages::Three) => unit_cost * 3,
-      Some(EnqueueBytedanceSeedreamV4p5TextToImageNumImages::Four) => unit_cost * 4,
-    };
-    cost as UsdCents
-  }
-}
-
-
 pub async fn enqueue_bytedance_seedream_v4p5_text_to_image_webhook<R: IntoUrl>(
  args: EnqueueBytedanceSeedreamV4p5TextToImageArgs<'_, R>
 ) -> Result<WebhookResponse, FalErrorPlus> {
@@ -5,8 +5,6 @@ use fal::prelude::fal_ai::gemini_25_flash_image::text_to_image::gemini_25_flash_
 use fal::prelude::fal_ai::gemini_25_flash_image::text_to_image::Gemini25FlashTextToImageInput;
 use fal::webhook::WebhookResponse;
 use reqwest::IntoUrl;
-use crate::requests::traits::fal_request_cost_calculator_trait::{FalRequestCostCalculator, UsdCents};
-use crate::requests::webhook::image::edit::enqueue_gemini_25_flash_edit_webhook::{Gemini25FlashEditArgs, Gemini25FlashEditNumImages};

 pub struct Gemini25FlashTextToImageArgs<'a, R: IntoUrl> {
  // Request required
@@ -48,21 +46,6 @@ pub enum Gemini25FlashTextToImageAspectRatio {
  NineBySixteen, // NB: No NineByTwentyOne ?
 }

-
-impl <U: IntoUrl> FalRequestCostCalculator for Gemini25FlashTextToImageArgs<'_, U> {
-  fn calculate_cost_in_cents(&self) -> UsdCents {
-    // NB: This was copied from the image-to-image case.
-    // Your request will cost $0.039 per image. For $1.00, you can run this model 25 times.
-    match self.num_images {
-      Gemini25FlashTextToImageNumImages::One => 4,
-      Gemini25FlashTextToImageNumImages::Two => 8,
-      Gemini25FlashTextToImageNumImages::Three => 12,
-      Gemini25FlashTextToImageNumImages::Four => 16,
-    }
-  }
-}
-
-
 pub async fn enqueue_gemini_25_flash_text_to_image_webhook<R: IntoUrl>(
  args: Gemini25FlashTextToImageArgs<'_, R>
 ) -> Result<WebhookResponse, FalErrorPlus> {
@@ -1,7 +1,6 @@
 use crate::creds::fal_api_key::FalApiKey;
 use crate::error::classify_fal_error::classify_fal_error;
 use crate::error::fal_error_plus::FalErrorPlus;
-use crate::requests::traits::fal_request_cost_calculator_trait::{FalRequestCostCalculator, UsdCents};
 use fal::endpoints::fal_ai::gpt_image::gpt_image_1p5_text_to_image::{gpt_image_1p5_text_to_image, GptImage1p5TextToImageInput};
 use fal::webhook::WebhookResponse;
 use reqwest::IntoUrl;
@@ -62,34 +61,6 @@ pub enum EnqueueGptImage1p5TextToImageOutputFormat {
 }


-impl <U: IntoUrl> FalRequestCostCalculator for EnqueueGptImage1p5TextToImageArgs<'_, U> {
-  fn calculate_cost_in_cents(&self) -> UsdCents {
-    // NB: copied from edit image case - should be correct, but not verified.
-    // Your request will cost different amounts based on the number of images, quality, and size.
-    // For low quality, you will be charged $0.009 for 1024x1024 or $0.013 for any other size per image.
-    // For medium quality, you will be charged $0.034 for 1024x1024, $0.051 for 1024x1536 and $0.050 for 1536x1024 per image.
-    // For high quality, you will be charged $0.133 for 1024x1024, $0.200 for 1024x1536 or $0.199 for 1536x1024 per image.
-    let use_quality = self.quality.unwrap_or(EnqueueGptImage1p5TextToImageQuality::Medium);
-    let use_size = self.image_size.unwrap_or(EnqueueGptImage1p5TextToImageSize::Square);
-    let base_cost = match (use_quality, use_size) {
-      (EnqueueGptImage1p5TextToImageQuality::Low, EnqueueGptImage1p5TextToImageSize::Square) => 1,
-      (EnqueueGptImage1p5TextToImageQuality::Low, _) => 1,
-      (EnqueueGptImage1p5TextToImageQuality::Medium, EnqueueGptImage1p5TextToImageSize::Square) => 3,
-      (EnqueueGptImage1p5TextToImageQuality::Medium, _) => 5,
-      (EnqueueGptImage1p5TextToImageQuality::High, EnqueueGptImage1p5TextToImageSize::Square) => 13,
-      (EnqueueGptImage1p5TextToImageQuality::High, _) => 20,
-    };
-    let cost = match self.num_images {
-      EnqueueGptImage1p5TextToImageNumImages::One => base_cost,
-      EnqueueGptImage1p5TextToImageNumImages::Two => base_cost * 2,
-      EnqueueGptImage1p5TextToImageNumImages::Three => base_cost * 3,
-      EnqueueGptImage1p5TextToImageNumImages::Four => base_cost * 4,
-    };
-    cost as UsdCents
-  }
-}
-
-
 pub async fn enqueue_gpt_image_1p5_text_to_image_webhook<R: IntoUrl>(
  args: EnqueueGptImage1p5TextToImageArgs<'_, R>
 ) -> Result<WebhookResponse, FalErrorPlus> {
@@ -4,8 +4,6 @@ use crate::error::fal_error_plus::FalErrorPlus;
 use fal::endpoints::fal_ai::nano_banana_pro::nano_banana_pro_text_to_image::{nano_banana_pro_text_to_image, NanoBananaProTextToImageInput};
 use fal::webhook::WebhookResponse;
 use reqwest::IntoUrl;
-use crate::requests::traits::fal_request_cost_calculator_trait::{FalRequestCostCalculator, UsdCents};
-use crate::requests::webhook::image::edit::enqueue_nano_banana_pro_edit_image_webhook::{EnqueueNanoBananaProEditImageArgs, EnqueueNanoBananaProEditImageNumImages, EnqueueNanoBananaProEditImageResolution};

 pub struct EnqueueNanoBananaProTextToImageArgs<'a, R: IntoUrl> {
  // Request required
@@ -55,31 +53,6 @@ pub enum EnqueueNanoBananaProTextToImageAspectRatio {
  NineBySixteen, // NB: No NineByTwentyOne ?
 }

-
-impl <U: IntoUrl> FalRequestCostCalculator for EnqueueNanoBananaProTextToImageArgs<'_, U> {
-  fn calculate_cost_in_cents(&self) -> UsdCents {
-    // Your request will cost $0.15 per image.
-    // For $1.00, you can run this model 7 times.
-    // 4K outputs will be charged at double the standard rate.
-    // If web search is used, an additional $0.015 will be charged.
-    // Note: Pricing may change in the future.
-    let cost = match self.resolution {
-      None => 15,
-      Some(EnqueueNanoBananaProTextToImageResolution::OneK) => 15,
-      Some(EnqueueNanoBananaProTextToImageResolution::TwoK) => 15,
-      Some(EnqueueNanoBananaProTextToImageResolution::FourK) => 30,
-    };
-    let cost = match self.num_images {
-      EnqueueNanoBananaProTextToImageNumImages::One => cost,
-      EnqueueNanoBananaProTextToImageNumImages::Two => cost * 2,
-      EnqueueNanoBananaProTextToImageNumImages::Three => cost * 3,
-      EnqueueNanoBananaProTextToImageNumImages::Four => cost * 4,
-    };
-    cost as UsdCents
-  }
-}
-
-
 pub async fn enqueue_nano_banana_pro_text_to_image_webhook<R: IntoUrl>(
  args: EnqueueNanoBananaProTextToImageArgs<'_, R>
 ) -> Result<WebhookResponse, FalErrorPlus> {
@@ -36,11 +36,11 @@ sha3.workspace = true
 thiserror.workspace = true
 #tokio.workspace = true
 toml.workspace = true
-url.workspace = true

 tokio = { version = "1", features = ["full"] }
 wreq-util.workspace = true
 wreq.workspace = true
+url.workspace = true

 [dev-dependencies]
 testing = { path = "../../lib/testing" }
@@ -1,38 +0,0 @@
-[package]
-name = "seedance2pro"
-edition = "2024"
-version = "0.0.1"
-publish = false
-
-[package.metadata.cargo-udeps.ignore]
-normal = ["workspace-build-acceleration"]
-
-[lib]
-name = "seedance2pro"
-path = "src/lib.rs"
-
-[dependencies]
-# Workspace hack (faster compile times)
-workspace-build-acceleration.workspace = true
-
-# Internal
-errors.workspace = true
-
-# External
-chrono.workspace = true
-cloudflare_errors.workspace = true
-log.workspace = true
-rand.workspace = true
-serde.workspace = true
-serde_derive.workspace = true
-serde_json.workspace = true
-wreq-util.workspace = true
-wreq.workspace = true
-url.workspace = true
-
-[dev-dependencies]
-chrono.workspace = true
-env.workspace = true
-env_logger.workspace = true
-testing = { path = "../../lib/testing" }
-tokio = { version = "1", features = ["full"] }
@@ -1,2 +0,0 @@
-pub mod seedance2pro_cookies;
-pub mod seedance2pro_session;
@@ -1,24 +0,0 @@
-/// Cookies are the credential required to interact with the Seedance2 Pro API.
-
-#[derive(Clone)]
-pub struct Seedance2ProCookies {
-  cookies: String,
-}
-
-impl Seedance2ProCookies {
-  pub fn new(cookies: String) -> Self {
-    Seedance2ProCookies { cookies }
-  }
-
-  pub fn as_str(&self) -> &str {
-    &self.cookies
-  }
-
-  pub fn as_bytes(&self) -> &[u8] {
-    self.cookies.as_bytes()
-  }
-
-  pub fn to_string(&self) -> String {
-    self.cookies.clone()
-  }
-}
@@ -1,19 +0,0 @@
-use crate::creds::seedance2pro_cookies::Seedance2ProCookies;
-
-/// Holds the full session data needed to make authenticated requests to Seedance2 Pro.
-#[derive(Clone)]
-pub struct Seedance2ProSession {
-  pub cookies: Seedance2ProCookies,
-}
-
-impl Seedance2ProSession {
-  pub fn new(cookies: Seedance2ProCookies) -> Self {
-    Seedance2ProSession { cookies }
-  }
-
-  pub fn from_cookies_string(cookies: String) -> Self {
-    Seedance2ProSession {
-      cookies: Seedance2ProCookies::new(cookies),
-    }
-  }
-}
@@ -1,4 +0,0 @@
-pub mod seedance2pro_client_error;
-pub mod seedance2pro_error;
-pub mod seedance2pro_generic_api_error;
-pub mod seedance2pro_specific_api_error;
@@ -1,26 +0,0 @@
-use std::error::Error;
-use std::fmt::{Display, Formatter};
-
-#[derive(Debug)]
-pub enum Seedance2ProClientError {
-  /// No cookies are present in the session.
-  NoCookiesPresent,
-
-  /// Error parsing a URL.
-  UrlParseError(url::ParseError),
-
-  /// An error was encountered in building the Wreq client.
-  WreqClientError(wreq::Error),
-}
-
-impl Error for Seedance2ProClientError {}
-
-impl Display for Seedance2ProClientError {
-  fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-    match self {
-      Self::NoCookiesPresent => write!(f, "No cookies present in the session."),
-      Self::UrlParseError(err) => write!(f, "URL parse error: {}", err),
-      Self::WreqClientError(err) => write!(f, "Wreq client error (during client creation): {}", err),
-    }
-  }
-}
@@ -1,54 +0,0 @@
-use crate::error::seedance2pro_client_error::Seedance2ProClientError;
-use crate::error::seedance2pro_generic_api_error::Seedance2ProGenericApiError;
-use crate::error::seedance2pro_specific_api_error::Seedance2ProSpecificApiError;
-use cloudflare_errors::cloudflare_error::CloudflareError;
-use std::error::Error;
-
-#[derive(Debug)]
-pub enum Seedance2ProError {
-  Client(Seedance2ProClientError),
-  ApiSpecific(Seedance2ProSpecificApiError),
-  ApiGeneric(Seedance2ProGenericApiError),
-}
-
-impl Seedance2ProError {
-  pub fn is_having_downtime_issues(&self) -> bool {
-    match self {
-      Self::ApiGeneric(Seedance2ProGenericApiError::Http502ErrorBadGateway(_)) => true,
-      Self::ApiGeneric(Seedance2ProGenericApiError::CloudflareError(CloudflareError::BadGateway502)) => true,
-      Self::ApiGeneric(Seedance2ProGenericApiError::CloudflareError(CloudflareError::GatewayTimeout504)) => true,
-      Self::ApiGeneric(Seedance2ProGenericApiError::CloudflareError(CloudflareError::TimeoutOccurred524)) => true,
-      _ => false,
-    }
-  }
-}
-
-impl Error for Seedance2ProError {}
-
-impl std::fmt::Display for Seedance2ProError {
-  fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-    match self {
-      Self::Client(e) => write!(f, "Seedance2ProClientError: {:?}", e),
-      Self::ApiSpecific(e) => write!(f, "Seedance2ProSpecificApiError: {:?}", e),
-      Self::ApiGeneric(e) => write!(f, "Seedance2ProGenericApiError: {:?}", e),
-    }
-  }
-}
-
-impl From<Seedance2ProClientError> for Seedance2ProError {
-  fn from(error: Seedance2ProClientError) -> Self {
-    Self::Client(error)
-  }
-}
-
-impl From<Seedance2ProSpecificApiError> for Seedance2ProError {
-  fn from(error: Seedance2ProSpecificApiError) -> Self {
-    Self::ApiSpecific(error)
-  }
-}
-
-impl From<Seedance2ProGenericApiError> for Seedance2ProError {
-  fn from(error: Seedance2ProGenericApiError) -> Self {
-    Self::ApiGeneric(error)
-  }
-}
@@ -1,50 +0,0 @@
-use cloudflare_errors::cloudflare_error::CloudflareError;
-use std::error::Error;
-use std::fmt::{Display, Formatter};
-use wreq::StatusCode;
-
-#[derive(Debug)]
-pub enum Seedance2ProGenericApiError {
-  /// Specific Cloudflare errors.
-  CloudflareError(CloudflareError),
-
-  /// HTTP 502 Bad Gateway.
-  /// We preserve the message for debugging.
-  Http502ErrorBadGateway(String),
-
-  /// serde_json::Error, likely from JSON deserialization schema mismatch.
-  /// Includes the original body.
-  SerdeResponseParseErrorWithBody(serde_json::Error, String),
-
-  /// serde_json::Error on a non-200 (error) response.
-  /// Includes the original body.
-  SerdeParseErrorWithBodyOnNon200(serde_json::Error, String),
-
-  /// An uncategorized bad HTTP response.
-  UncategorizedBadResponse(String),
-
-  /// An uncategorized bad HTTP response with status code and body.
-  UncategorizedBadResponseWithStatusAndBody {
-    status_code: StatusCode,
-    body: String,
-  },
-
-  /// An uncaught error from the HTTP client.
-  WreqError(wreq::Error),
-}
-
-impl Error for Seedance2ProGenericApiError {}
-
-impl Display for Seedance2ProGenericApiError {
-  fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-    match self {
-      Self::CloudflareError(err) => write!(f, "Cloudflare error: {}", err),
-      Self::Http502ErrorBadGateway(msg) => write!(f, "HTTP 502 Bad Gateway: {}", msg),
-      Self::SerdeResponseParseErrorWithBody(err, body) => write!(f, "Failed to parse response body: {:?}. Body: {}", err, body),
-      Self::SerdeParseErrorWithBodyOnNon200(err, body) => write!(f, "Failed to parse non-200 response body: {:?}. Body: {}", err, body),
-      Self::UncategorizedBadResponse(msg) => write!(f, "Uncategorized bad response: {}", msg),
-      Self::UncategorizedBadResponseWithStatusAndBody { status_code, body } => write!(f, "Uncategorized bad response: status code {}, body: {}", status_code, body),
-      Self::WreqError(err) => write!(f, "Wreq client error: {}", err),
-    }
-  }
-}
@@ -1,22 +0,0 @@
-use std::error::Error;
-use std::fmt::{Display, Formatter};
-
-#[derive(Debug)]
-pub enum Seedance2ProSpecificApiError {
-  /// The session cookies are expired or invalid.
-  UnauthorizedSessionExpired,
-
-  /// The video generation request was flagged as a content violation.
-  VideoGenerationViolation(String),
-}
-
-impl Error for Seedance2ProSpecificApiError {}
-
-impl Display for Seedance2ProSpecificApiError {
-  fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-    match self {
-      Self::UnauthorizedSessionExpired => write!(f, "Unauthorized: session cookies expired or invalid."),
-      Self::VideoGenerationViolation(body) => write!(f, "Video generation violation: {}", body),
-    }
-  }
-}
@@ -1,8 +0,0 @@
-#[cfg(test)]
-pub (crate) mod test_utils;
-
-// User API
-pub mod creds;
-pub mod error;
-pub mod requests;
-pub mod utils;
@@ -1,386 +0,0 @@
-use crate::creds::seedance2pro_session::Seedance2ProSession;
-use crate::error::seedance2pro_client_error::Seedance2ProClientError;
-use crate::error::seedance2pro_error::Seedance2ProError;
-use crate::error::seedance2pro_generic_api_error::Seedance2ProGenericApiError;
-use crate::error::seedance2pro_specific_api_error::Seedance2ProSpecificApiError;
-use crate::requests::generate_video::request_types::*;
-use crate::utils::common_headers::FIREFOX_USER_AGENT;
-use log::info;
-use wreq::Client;
-use wreq_util::Emulation;
-
-const RUN_TASK_URL: &str = "https://seedance2-pro.com/api/trpc/workflow.runTask?batch=1";
-
-// --- Request args ---
-
-pub struct GenerateVideoArgs<'a> {
-  pub session: &'a Seedance2ProSession,
-
-  pub prompt: String,
-
-  pub resolution: Resolution,
-
-  /// Duration in seconds (4–15).
-  pub duration_seconds: u8,
-
-  pub batch_count: BatchCount,
-
-  /// Optional start frame image URL (keyframe mode).
-  pub start_frame_url: Option<String>,
-
-  /// Optional end frame image URL (keyframe mode).
-  pub end_frame_url: Option<String>,
-
-  /// Optional reference image URLs (reference mode). When present, takes priority over start/end frames.
-  pub reference_image_urls: Option<Vec<String>>,
-}
-
-impl GenerateVideoArgs<'_> {
-  /// Estimates the credit cost for this generation request.
-  ///
-  /// Pricing rules:
-  /// - 40 credits per second of video (4s = 160, 15s = 600)
-  /// - Resolution has no effect on cost
-  /// - Input mode (text, keyframe, reference) has no effect on cost
-  /// - Batch 1 = 1×, Batch 2 = 2×, Batch 4 = 3× (not 4×)
-  pub fn estimate_credits(&self) -> u32 {
-    let per_video = u32::from(self.duration_seconds) * 40;
-    let batch_multiplier = match self.batch_count {
-      BatchCount::One => 1,
-      BatchCount::Two => 2,
-      BatchCount::Four => 3, // NB: 3x, not 4x.
-    };
-    per_video * batch_multiplier
-  }
-
-  pub fn estimate_cost_in_usd_cents(&self) -> u64 {
-    // 25000 Credits costs $99.99 as of 2026-02-20
-    // 250 for $1.
-    let credits = self.estimate_credits() as f64;
-    let cost = credits / 250.0 * 100.0;
-    cost.round() as u64
-  }
-}
-
-// --- Public enums ---
-
-/// Video resolution / aspect ratio.
-#[derive(Debug, Clone, Copy)]
-pub enum Resolution {
-  /// 16:9 landscape (1280x720)
-  Landscape16x9,
-  /// 9:16 portrait (720x1280)
-  Portrait9x16,
-  /// 1:1 square (720x720)
-  Square1x1,
-  /// 4:3 standard (960x720)
-  Standard4x3,
-  /// 3:4 portrait (720x960)
-  Portrait3x4,
-}
-
-impl Resolution {
-  fn as_str(&self) -> &'static str {
-    match self {
-      Self::Landscape16x9 => "1280x720",
-      Self::Portrait9x16 => "720x1280",
-      Self::Square1x1 => "720x720",
-      Self::Standard4x3 => "960x720",
-      Self::Portrait3x4 => "720x960",
-    }
-  }
-}
-
-/// Number of videos to generate in a single request.
-#[derive(Debug, Clone, Copy)]
-pub enum BatchCount {
-  One,
-  Two,
-  Four,
-}
-
-impl BatchCount {
-  fn as_u8(&self) -> u8 {
-    match self {
-      Self::One => 1,
-      Self::Two => 2,
-      Self::Four => 4,
-    }
-  }
-}
-
-// --- Response ---
-
-pub struct GenerateVideoResponse {
-  pub task_id: String,
-
-  pub order_id: String,
-
-  /// Present when batch_count > 1.
-  pub task_ids: Option<Vec<String>>,
-
-  /// Present when batch_count > 1.
-  pub order_ids: Option<Vec<String>>,
-}
-
-// --- Implementation ---
-
-pub async fn generate_video(args: GenerateVideoArgs<'_>) -> Result<GenerateVideoResponse, Seedance2ProError> {
-  let is_reference_mode = args.reference_image_urls.as_ref().is_some_and(|urls| !urls.is_empty());
-
-  let video_input_mode = if is_reference_mode { "reference" } else { "keyframe" };
-
-  let uploaded_urls: Option<Vec<String>> = if is_reference_mode {
-    args.reference_image_urls
-  } else {
-    let mut urls = Vec::new();
-    if let Some(url) = args.start_frame_url {
-      urls.push(url);
-    }
-    if let Some(url) = args.end_frame_url {
-      urls.push(url);
-    }
-    if urls.is_empty() { None } else { Some(urls) }
-  };
-
-  let batch_count_value = args.batch_count.as_u8();
-  let batch_count = if batch_count_value > 1 { Some(batch_count_value) } else { None };
-
-  let duration = format!("{}s", args.duration_seconds);
-
-  info!(
-    "Generating video: mode={}, resolution={}, duration={}, batch={}",
-    video_input_mode, args.resolution.as_str(), duration, batch_count_value
-  );
-
-  let request_body = BatchRequest {
-    zero: BatchRequestInner {
-      json: BatchRequestJson {
-        business_type: "wan22-video-generation",
-        api_params: ApiParams {
-          prompt: args.prompt,
-          resolution: args.resolution.as_str().to_string(),
-          mode: "normal",
-          model: "seedance-20",
-          duration,
-          video_input_mode,
-          uploaded_urls,
-          batch_count,
-        },
-      },
-    },
-  };
-
-  let cookie = args.session.cookies.as_str();
-
-  let client = Client::builder()
-    .emulation(Emulation::Firefox143)
-    .build()
-    .map_err(|err| Seedance2ProClientError::WreqClientError(err))?;
-
-  let response = client.post(RUN_TASK_URL)
-    .header("User-Agent", FIREFOX_USER_AGENT)
-    .header("Accept", "*/*")
-    .header("Accept-Language", "en-US,en;q=0.9")
-    .header("Accept-Encoding", "gzip, deflate, br, zstd")
-    .header("Referer", "https://seedance2-pro.com/")
-    .header("Content-Type", "application/json")
-    .header("x-trpc-source", "client")
-    .header("Origin", "https://seedance2-pro.com")
-    .header("Connection", "keep-alive")
-    .header("Cookie", cookie)
-    .header("Sec-Fetch-Dest", "empty")
-    .header("Sec-Fetch-Mode", "cors")
-    .header("Sec-Fetch-Site", "same-origin")
-    .header("Priority", "u=4")
-    .header("TE", "trailers")
-    .json(&request_body)
-    .send()
-    .await
-    .map_err(|err| Seedance2ProGenericApiError::WreqError(err))?;
-
-  let status = response.status();
-  let response_body = response.text()
-    .await
-    .map_err(|err| Seedance2ProGenericApiError::WreqError(err))?;
-
-  info!("Response status: {}, body: {}", status, response_body);
-
-  if !status.is_success() {
-    return Err(Seedance2ProGenericApiError::UncategorizedBadResponseWithStatusAndBody {
-      status_code: status,
-      body: response_body,
-    }.into());
-  }
-
-  let batch_response: Vec<BatchResponseItem> = serde_json::from_str(&response_body)
-    .map_err(|err| Seedance2ProGenericApiError::SerdeResponseParseErrorWithBody(err, response_body.clone()))?;
-
-  let task_data = batch_response
-    .into_iter()
-    .next()
-    .ok_or_else(|| Seedance2ProGenericApiError::UncategorizedBadResponse(
-      "Empty batch response array".to_string()
-    ))?
-    .result
-    .data
-    .json;
-
-  if task_data.violation_warning {
-    return Err(Seedance2ProSpecificApiError::VideoGenerationViolation(response_body).into());
-  }
-
-  Ok(GenerateVideoResponse {
-    task_id: task_data.task_id,
-    order_id: task_data.order_id,
-    task_ids: task_data.task_ids,
-    order_ids: task_data.order_ids,
-  })
-}
-
-#[cfg(test)]
-mod tests {
-  use super::*;
-  use crate::creds::seedance2pro_session::Seedance2ProSession;
-  use crate::test_utils::get_test_cookies::get_test_cookies;
-  use crate::test_utils::setup_test_logging::setup_test_logging;
-  use errors::AnyhowResult;
-  use log::LevelFilter;
-
-  fn dummy_session() -> Seedance2ProSession {
-    Seedance2ProSession::from_cookies_string(String::new())
-  }
-
-  fn args_with(duration_seconds: u8, batch_count: BatchCount) -> GenerateVideoArgs<'static> {
-    // Safety: the dummy session is leaked so the reference is 'static for test purposes.
-    let session = Box::leak(Box::new(dummy_session()));
-    GenerateVideoArgs {
-      session,
-      prompt: String::new(),
-      resolution: Resolution::Square1x1,
-      duration_seconds,
-      batch_count,
-      start_frame_url: None,
-      end_frame_url: None,
-      reference_image_urls: None,
-    }
-  }
-
-  #[test]
-  fn test_estimate_credits() {
-    // 40 credits per second, batch 1
-    assert_eq!(args_with(4, BatchCount::One).estimate_credits(), 160);
-    assert_eq!(args_with(5, BatchCount::One).estimate_credits(), 200);
-    assert_eq!(args_with(6, BatchCount::One).estimate_credits(), 240);
-    assert_eq!(args_with(7, BatchCount::One).estimate_credits(), 280);
-    assert_eq!(args_with(15, BatchCount::One).estimate_credits(), 600);
-
-    // Batch 2 = 2×
-    assert_eq!(args_with(4, BatchCount::Two).estimate_credits(), 320);
-    assert_eq!(args_with(5, BatchCount::Two).estimate_credits(), 400);
-    assert_eq!(args_with(15, BatchCount::Two).estimate_credits(), 1200);
-
-    // Batch 4 = 3× (not 4×)
-    assert_eq!(args_with(4, BatchCount::Four).estimate_credits(), 480);
-    assert_eq!(args_with(5, BatchCount::Four).estimate_credits(), 600);
-    assert_eq!(args_with(15, BatchCount::Four).estimate_credits(), 1800);
-  }
-
-  #[test]
-  fn test_estimate_cost_usd_cents() {
-    // 40 credits per second, batch 1
-    assert_eq!(args_with(4, BatchCount::One).estimate_cost_in_usd_cents(), 64);
-    assert_eq!(args_with(5, BatchCount::One).estimate_cost_in_usd_cents(), 80);
-    assert_eq!(args_with(6, BatchCount::One).estimate_cost_in_usd_cents(), 96);
-    assert_eq!(args_with(7, BatchCount::One).estimate_cost_in_usd_cents(), 112);
-    assert_eq!(args_with(15, BatchCount::One).estimate_cost_in_usd_cents(), 240);
-
-    // Batch 2 = 2×
-    assert_eq!(args_with(4, BatchCount::Two).estimate_cost_in_usd_cents(), 128);
-    assert_eq!(args_with(5, BatchCount::Two).estimate_cost_in_usd_cents(), 160);
-    assert_eq!(args_with(15, BatchCount::Two).estimate_cost_in_usd_cents(), 480);
-
-    // Batch 4 = 3× (not 4×)
-    assert_eq!(args_with(4, BatchCount::Four).estimate_cost_in_usd_cents(), 192);
-    assert_eq!(args_with(5, BatchCount::Four).estimate_cost_in_usd_cents(), 240);
-    assert_eq!(args_with(15, BatchCount::Four).estimate_cost_in_usd_cents(), 720);
-  }
-
-  fn test_session() -> AnyhowResult<Seedance2ProSession> {
-    let cookies = get_test_cookies()?;
-    Ok(Seedance2ProSession::from_cookies_string(cookies))
-  }
-
-  #[tokio::test]
-  #[ignore] // manually test — requires real cookies
-  async fn test_generate_text_to_video() -> AnyhowResult<()> {
-    setup_test_logging(LevelFilter::Trace);
-    let session = test_session()?;
-    let args = GenerateVideoArgs {
-      session: &session,
-      prompt: "A corgi eating a cake in a fancy kitchen.".to_string(),
-      resolution: Resolution::Square1x1,
-      duration_seconds: 5,
-      batch_count: BatchCount::One,
-      start_frame_url: None,
-      end_frame_url: None,
-      reference_image_urls: None,
-    };
-    let result = generate_video(args).await?;
-    println!("Task ID: {}", result.task_id);
-    println!("Order ID: {}", result.order_id);
-    assert!(!result.task_id.is_empty());
-    assert!(!result.order_id.is_empty());
-    assert_eq!(1, 2); // NB: Intentional failure to inspect output.
-    Ok(())
-  }
-
-  #[tokio::test]
-  #[ignore] // manually test — requires real cookies
-  async fn test_generate_keyframe_video() -> AnyhowResult<()> {
-    setup_test_logging(LevelFilter::Trace);
-    let session = test_session()?;
-    let args = GenerateVideoArgs {
-      session: &session,
-      prompt: "A dog shakes the glasses off its head. The camera pans out as the shiba shakes. The shiba barks.".to_string(),
-      resolution: Resolution::Landscape16x9,
-      duration_seconds: 15,
-      batch_count: BatchCount::One,
-      start_frame_url: Some("https://static.seedance2-pro.com/materials/20260219/1771496300184-fb32e08c.jpg".to_string()),
-      end_frame_url: None,
-      reference_image_urls: None,
-    };
-    let result = generate_video(args).await?;
-    println!("Task ID: {}", result.task_id);
-    println!("Order ID: {}", result.order_id);
-    assert!(!result.task_id.is_empty());
-    assert_eq!(1, 2); // NB: Intentional failure to inspect output.
-    Ok(())
-  }
-
-  #[tokio::test]
-  #[ignore] // manually test — requires real cookies
-  async fn test_generate_reference_video() -> AnyhowResult<()> {
-    setup_test_logging(LevelFilter::Trace);
-    let session = test_session()?;
-    let args = GenerateVideoArgs {
-      session: &session,
-      prompt: "The dog in @2 is in the office at @1 without the man. The office is dark and moonlight streams in through the windows. Particles of dust gleam in the moon beams. Suddenly, the dog jumps on the desk and barks.".to_string(),
-      resolution: Resolution::Standard4x3,
-      duration_seconds: 10,
-      batch_count: BatchCount::One,
-      start_frame_url: None,
-      end_frame_url: None,
-      reference_image_urls: Some(vec![
-        "https://static.seedance2-pro.com/materials/20260219/1771463564512-b14bfe90.png".to_string(),
-        "https://static.seedance2-pro.com/materials/20260219/1771496300184-fb32e08c.jpg".to_string(),
-      ]),
-    };
-    let result = generate_video(args).await?;
-    println!("Task ID: {}", result.task_id);
-    println!("Order ID: {}", result.order_id);
-    assert!(!result.task_id.is_empty());
-    assert_eq!(1, 2); // NB: Intentional failure to inspect output.
-    Ok(())
-  }
-}
@@ -1,2 +0,0 @@
-pub mod generate_video;
-mod request_types;
@@ -1,60 +0,0 @@
-use serde_derive::{Deserialize, Serialize};
-
-#[derive(Serialize)]
-pub (super) struct BatchRequest {
-  #[serde(rename = "0")]
-  pub zero: BatchRequestInner,
-}
-
-#[derive(Serialize)]
-pub (super) struct BatchRequestInner {
-  pub json: BatchRequestJson,
-}
-
-#[derive(Serialize)]
-pub (super) struct BatchRequestJson {
-  #[serde(rename = "businessType")]
-  pub business_type: &'static str,
-  #[serde(rename = "apiParams")]
-  pub api_params: ApiParams,
-}
-
-#[derive(Serialize)]
-pub (super) struct ApiParams {
-  pub prompt: String,
-  pub resolution: String,
-  pub mode: &'static str,
-  pub model: &'static str,
-  pub duration: String,
-  #[serde(rename = "videoInputMode")]
-  pub video_input_mode: &'static str,
-  #[serde(rename = "uploadedUrls", skip_serializing_if = "Option::is_none")]
-  pub uploaded_urls: Option<Vec<String>>,
-  #[serde(rename = "batchCount", skip_serializing_if = "Option::is_none")]
-  pub batch_count: Option<u8>,
-}
-
-#[derive(Deserialize, Debug)]
-pub (super) struct BatchResponseItem {
-  pub result: BatchResponseResult,
-}
-
-#[derive(Deserialize, Debug)]
-pub (super) struct BatchResponseResult {
-  pub data: BatchResponseData,
-}
-
-#[derive(Deserialize, Debug)]
-pub (super) struct BatchResponseData {
-  pub json: TaskResponseJson,
-}
-
-#[derive(Deserialize, Debug)]
-#[serde(rename_all = "camelCase")]
-pub (super) struct TaskResponseJson {
-  pub task_id: String,
-  pub order_id: String,
-  pub task_ids: Option<Vec<String>>,
-  pub order_ids: Option<Vec<String>>,
-  pub violation_warning: bool,
-}
@@ -1,4 +0,0 @@
-pub mod generate_video;
-pub mod poll_orders;
-pub mod prepare_image_upload;
-pub mod upload_image;
@@ -1,2 +0,0 @@
-pub mod poll_orders;
-mod request_types;
@@ -1,273 +0,0 @@
-use crate::creds::seedance2pro_session::Seedance2ProSession;
-use crate::error::seedance2pro_client_error::Seedance2ProClientError;
-use crate::error::seedance2pro_error::Seedance2ProError;
-use crate::error::seedance2pro_generic_api_error::Seedance2ProGenericApiError;
-use crate::requests::poll_orders::request_types::*;
-use crate::utils::common_headers::FIREFOX_USER_AGENT;
-use log::info;
-use wreq::Client;
-use wreq_util::Emulation;
-
-const GET_ORDERS_BASE_URL: &str = "https://seedance2-pro.com/api/trpc/userOrder.getOrders";
-
-/// Builds the tRPC `input` JSON for the getOrders endpoint.
-/// When `cursor` is `Some`, it is included in the JSON payload.
-fn build_input_json(cursor: Option<u64>) -> String {
-  match cursor {
-    None => r#"{"0":{"json":{"limit":30,"format":null,"direction":"forward"},"meta":{"values":{"format":["undefined"]},"v":1}}}"#.to_string(),
-    Some(c) => format!(
-      r#"{{"0":{{"json":{{"limit":30,"format":null,"cursor":{cursor},"direction":"forward"}},"meta":{{"values":{{"format":["undefined"]}},"v":1}}}}}}"#,
-      cursor = c
-    ),
-  }
-}
-
-// --- Args & response ---
-
-pub struct PollOrdersArgs<'a> {
-  pub session: &'a Seedance2ProSession,
-
-  /// Optional cursor from a previous `PollOrdersResponse::next_cursor`.
-  /// When `None`, the most recent orders are returned.
-  pub cursor: Option<u64>,
-}
-
-pub struct PollOrdersResponse {
-  pub orders: Vec<OrderStatus>,
-
-  /// Present when there are more orders to fetch.
-  /// Pass this value as `PollOrdersArgs::cursor` in the next call.
-  pub next_cursor: Option<u64>,
-}
-
-// --- Public types ---
-
-/// The lifecycle status of a video generation task.
-#[derive(Debug, Clone, PartialEq)]
-pub enum TaskStatus {
-  /// The task is queued and has not started yet.
-  Pending,
-  /// The task is actively being processed.
-  Processing,
-  /// The task finished successfully. `result_url` and `results` will be populated.
-  Completed,
-  /// The task failed. `fail_reason` will contain the reason.
-  Failed,
-  /// An unrecognised status string was returned by the server.
-  Unknown(String),
-}
-
-impl TaskStatus {
-  fn from_str(s: &str) -> Self {
-    match s {
-      "PENDING" => Self::Pending,
-      "PROCESSING" => Self::Processing,
-      "COMPLETED" => Self::Completed,
-      "FAILED" => Self::Failed,
-      other => Self::Unknown(other.to_string()),
-    }
-  }
-
-  pub fn is_terminal(&self) -> bool {
-    matches!(self, Self::Completed | Self::Failed)
-  }
-}
-
-/// A single generated video result attached to an order.
-#[derive(Debug, Clone)]
-pub struct VideoResult {
-  pub url: String,
-  pub width: u32,
-  pub height: u32,
-  /// Width / height ratio (e.g. 1.777… for 16:9).
-  pub ratio: f64,
-}
-
-/// The status of one order (one video generation task).
-#[derive(Debug, Clone)]
-pub struct OrderStatus {
-  pub order_id: String,
-
-  pub task_status: TaskStatus,
-
-  /// Top-level result video URL. Populated when `task_status` is `Completed`.
-  pub result_url: Option<String>,
-
-  /// Detailed result entries. Typically one entry per video.
-  pub results: Vec<VideoResult>,
-
-  /// Failure reason. Populated when `task_status` is `Failed`.
-  pub fail_reason: Option<String>,
-
-  /// ISO 8601 creation timestamp (e.g. `"2026-02-19T01:20:50.398Z"`).
-  pub created_at: String,
-}
-
-// --- Implementation ---
-
-pub async fn poll_orders(args: PollOrdersArgs<'_>) -> Result<PollOrdersResponse, Seedance2ProError> {
-  info!("Polling orders (cursor: {:?})...", args.cursor);
-
-  let input_json = build_input_json(args.cursor);
-
-  let client = Client::builder()
-    .emulation(Emulation::Firefox143)
-    .build()
-    .map_err(|err| Seedance2ProClientError::WreqClientError(err))?;
-
-  let cookie = args.session.cookies.as_str();
-
-  let request = client.get(GET_ORDERS_BASE_URL)
-    .query(&[("batch", "1"), ("input", input_json.as_str())])
-    .header("User-Agent", FIREFOX_USER_AGENT)
-    .header("Accept", "*/*")
-    .header("Accept-Language", "en-US,en;q=0.9")
-    .header("Accept-Encoding", "gzip, deflate, br, zstd")
-    .header("Referer", "https://seedance2-pro.com/app/gallery")
-    .header("content-type", "application/json")
-    .header("x-trpc-source", "client")
-    .header("Connection", "keep-alive")
-    .header("Cookie", cookie)
-    .header("Sec-Fetch-Dest", "empty")
-    .header("Sec-Fetch-Mode", "cors")
-    .header("Sec-Fetch-Site", "same-origin")
-    .header("Priority", "u=4")
-    .header("TE", "trailers")
-    .build()
-    .map_err(|err| Seedance2ProClientError::WreqClientError(err))?;
-
-  let response = client.execute(request)
-    .await
-    .map_err(|err| Seedance2ProGenericApiError::WreqError(err))?;
-
-  let status = response.status();
-  let response_body = response.text()
-    .await
-    .map_err(|err| Seedance2ProGenericApiError::WreqError(err))?;
-
-  info!("Poll orders response status: {}", status);
-
-  if !status.is_success() {
-    return Err(Seedance2ProGenericApiError::UncategorizedBadResponseWithStatusAndBody {
-      status_code: status,
-      body: response_body,
-    }.into());
-  }
-
-  let batch_response: Vec<BatchResponseItem> = serde_json::from_str(&response_body)
-    .map_err(|err| Seedance2ProGenericApiError::SerdeResponseParseErrorWithBody(err, response_body.clone()))?;
-
-  let json = batch_response
-    .into_iter()
-    .next()
-    .ok_or_else(|| Seedance2ProGenericApiError::UncategorizedBadResponse(
-      "Empty batch response array".to_string()
-    ))?
-    .result
-    .data
-    .json;
-
-  let next_cursor = json.next_cursor;
-
-  let orders: Vec<OrderStatus> = json.orders
-    .into_iter()
-    .map(|o| OrderStatus {
-      order_id: o.order_id,
-      task_status: TaskStatus::from_str(&o.task_status),
-      result_url: o.result_url,
-      results: o.results.into_iter().map(|r| VideoResult {
-        url: r.url,
-        width: r.width,
-        height: r.height,
-        ratio: r.ratio,
-      }).collect(),
-      fail_reason: o.fail_reason,
-      created_at: o.created_at,
-    })
-    .collect();
-
-  info!("Polled {} orders, next_cursor: {:?}", orders.len(), next_cursor);
-
-  Ok(PollOrdersResponse { orders, next_cursor })
-}
-
-#[cfg(test)]
-mod tests {
-  use super::*;
-  use crate::creds::seedance2pro_session::Seedance2ProSession;
-  use crate::test_utils::get_test_cookies::get_test_cookies;
-  use crate::test_utils::setup_test_logging::setup_test_logging;
-  use errors::AnyhowResult;
-  use log::LevelFilter;
-
-  fn test_session() -> AnyhowResult<Seedance2ProSession> {
-    let cookies = get_test_cookies()?;
-    Ok(Seedance2ProSession::from_cookies_string(cookies))
-  }
-
-  #[tokio::test]
-  #[ignore] // manually test — requires real cookies
-  async fn test_poll_all_orders() -> AnyhowResult<()> {
-    setup_test_logging(LevelFilter::Trace);
-    let session = test_session()?;
-    let result = poll_orders(PollOrdersArgs { session: &session, cursor: None }).await?;
-    println!("Orders returned: {}", result.orders.len());
-    println!("Next cursor: {:?}", result.next_cursor);
-    for order in &result.orders {
-      println!("  {} | {:?} | result_url={:?} | fail={:?}",
-        order.order_id, order.task_status, order.result_url, order.fail_reason);
-    }
-    assert_eq!(1, 2); // NB: Intentional failure to inspect output.
-    Ok(())
-  }
-
-  #[tokio::test]
-  #[ignore] // manually test — requires real cookies and a known cursor value
-  async fn test_poll_with_cursor() -> AnyhowResult<()> {
-    setup_test_logging(LevelFilter::Trace);
-    let session = test_session()?;
-    // Use the cursor value returned from a prior call (e.g. 394062 from the example responses).
-    let cursor: u64 = 394062;
-    let result = poll_orders(PollOrdersArgs { session: &session, cursor: Some(cursor) }).await?;
-    println!("Orders returned (with cursor {}): {}", cursor, result.orders.len());
-    println!("Next cursor: {:?}", result.next_cursor);
-    for order in &result.orders {
-      println!("  {} | {:?} | result_url={:?} | fail={:?}",
-        order.order_id, order.task_status, order.result_url, order.fail_reason);
-    }
-    assert_eq!(1, 2); // NB: Intentional failure to inspect output.
-    Ok(())
-  }
-
-  #[tokio::test]
-  #[ignore] // manually test — requires real cookies; exhausts all pages
-  async fn test_poll_all_pages() -> AnyhowResult<()> {
-    setup_test_logging(LevelFilter::Trace);
-    let session = test_session()?;
-
-    let mut cursor: Option<u64> = None;
-    let mut page = 0usize;
-    let mut total_orders = 0usize;
-
-    loop {
-      page += 1;
-      let result = poll_orders(PollOrdersArgs { session: &session, cursor }).await?;
-      let page_count = result.orders.len();
-      total_orders += page_count;
-
-      println!("Page {}: {} orders, next_cursor: {:?}", page, page_count, result.next_cursor);
-      for order in &result.orders {
-        println!("  {} | {:?}", order.order_id, order.task_status);
-      }
-
-      cursor = result.next_cursor;
-      if cursor.is_none() {
-        break;
-      }
-    }
-
-    println!("Total orders across {} pages: {}", page, total_orders);
-    assert_eq!(1, 2); // NB: Intentional failure to inspect output.
-    Ok(())
-  }
-}
@@ -1,42 +0,0 @@
-use serde_derive::Deserialize;
-
-#[derive(Deserialize, Debug)]
-pub(super) struct BatchResponseItem {
-  pub result: BatchResponseResult,
-}
-
-#[derive(Deserialize, Debug)]
-pub(super) struct BatchResponseResult {
-  pub data: BatchResponseData,
-}
-
-#[derive(Deserialize, Debug)]
-pub(super) struct BatchResponseData {
-  pub json: OrdersResponseJson,
-}
-
-#[derive(Deserialize, Debug)]
-#[serde(rename_all = "camelCase")]
-pub(super) struct OrdersResponseJson {
-  pub orders: Vec<RawOrder>,
-  pub next_cursor: Option<u64>,
-}
-
-#[derive(Deserialize, Debug)]
-#[serde(rename_all = "camelCase")]
-pub(super) struct RawOrder {
-  pub order_id: String,
-  pub result_url: Option<String>,
-  pub task_status: String,
-  pub results: Vec<RawVideoResult>,
-  pub fail_reason: Option<String>,
-  pub created_at: String,
-}
-
-#[derive(Deserialize, Debug)]
-pub(super) struct RawVideoResult {
-  pub url: String,
-  pub width: u32,
-  pub height: u32,
-  pub ratio: f64,
-}
@@ -1,2 +0,0 @@
-pub mod prepare_image_upload;
-mod request_types;
@@ -1,140 +0,0 @@
-use crate::creds::seedance2pro_session::Seedance2ProSession;
-use crate::error::seedance2pro_client_error::Seedance2ProClientError;
-use crate::error::seedance2pro_error::Seedance2ProError;
-use crate::error::seedance2pro_generic_api_error::Seedance2ProGenericApiError;
-use crate::requests::prepare_image_upload::request_types::*;
-use crate::utils::common_headers::FIREFOX_USER_AGENT;
-use chrono::Utc;
-use log::info;
-use rand::Rng;
-use wreq::Client;
-use wreq_util::Emulation;
-
-const SIGNED_UPLOAD_URL: &str = "https://seedance2-pro.com/api/trpc/uploads.signedUploadUrl?batch=1";
-
-/// Generates a material path based on the current time.
-/// Format: `materials/YYYYMMDD/<unix_millis>-<random_hex>.png`
-fn generate_material_path() -> String {
-  let now = Utc::now();
-  let date_part = now.format("%Y%m%d").to_string();
-  let timestamp_millis = now.timestamp_millis();
-  let random_hex: u32 = rand::rng().random();
-  let hex_part = format!("{:08x}", random_hex);
-  format!("materials/{}/{}-{}.png", date_part, timestamp_millis, hex_part)
-}
-
-pub struct PrepareImageUploadArgs<'a> {
-  pub session: &'a Seedance2ProSession,
-}
-
-pub struct PrepareImageUploadResponse {
-  /// The signed URL to upload the image to (Cloudflare R2 / S3-compatible).
-  pub upload_url: String,
-
-  /// The material path that was generated for this upload.
-  pub material_path: String,
-}
-
-pub async fn prepare_image_upload(args: PrepareImageUploadArgs<'_>) -> Result<PrepareImageUploadResponse, Seedance2ProError> {
-  let material_path = generate_material_path();
-
-  info!("Preparing image upload with path: {}", material_path);
-
-  let client = Client::builder()
-    .emulation(Emulation::Firefox143)
-    .build()
-    .map_err(|err| Seedance2ProClientError::WreqClientError(err))?;
-
-  let request_body = BatchRequest {
-    zero: BatchRequestInner {
-      json: BatchRequestJson {
-        path: material_path.clone(),
-      },
-    },
-  };
-
-  let cookie = args.session.cookies.as_str();
-
-  let response = client.post(SIGNED_UPLOAD_URL)
-    .header("User-Agent", FIREFOX_USER_AGENT)
-    .header("Accept", "*/*")
-    .header("Accept-Language", "en-US,en;q=0.9")
-    .header("Accept-Encoding", "gzip, deflate, br, zstd")
-    .header("Referer", "https://seedance2-pro.com/")
-    .header("Content-Type", "application/json")
-    .header("x-trpc-source", "client")
-    .header("Origin", "https://seedance2-pro.com")
-    .header("Connection", "keep-alive")
-    .header("Cookie", cookie)
-    .header("Sec-Fetch-Dest", "empty")
-    .header("Sec-Fetch-Mode", "cors")
-    .header("Sec-Fetch-Site", "same-origin")
-    .header("Priority", "u=4")
-    .header("TE", "trailers")
-    .json(&request_body)
-    .send()
-    .await
-    .map_err(|err| Seedance2ProGenericApiError::WreqError(err))?;
-
-  let status = response.status();
-  let response_body = response.text()
-    .await
-    .map_err(|err| Seedance2ProGenericApiError::WreqError(err))?;
-
-  info!("Response status: {}, body: {}", status, response_body);
-
-  if !status.is_success() {
-    return Err(Seedance2ProGenericApiError::UncategorizedBadResponseWithStatusAndBody {
-      status_code: status,
-      body: response_body,
-    }.into());
-  }
-
-  let batch_response: Vec<BatchResponseItem> = serde_json::from_str(&response_body)
-    .map_err(|err| Seedance2ProGenericApiError::SerdeResponseParseErrorWithBody(err, response_body.clone()))?;
-
-  let upload_url = batch_response
-    .into_iter()
-    .next()
-    .ok_or_else(|| Seedance2ProGenericApiError::UncategorizedBadResponse(
-      "Empty batch response array".to_string()
-    ))?
-    .result
-    .data
-    .json;
-
-  Ok(PrepareImageUploadResponse {
-    upload_url,
-    material_path,
-  })
-}
-
-#[cfg(test)]
-mod tests {
-  use super::*;
-  use crate::creds::seedance2pro_session::Seedance2ProSession;
-  use crate::test_utils::get_test_cookies::get_test_cookies;
-  use crate::test_utils::setup_test_logging::setup_test_logging;
-  use errors::AnyhowResult;
-  use log::LevelFilter;
-
-  #[tokio::test]
-  #[ignore] // manually test — requires real cookies
-  async fn test_prepare_image_upload() -> AnyhowResult<()> {
-    setup_test_logging(LevelFilter::Trace);
-    let cookies = get_test_cookies()?;
-    let session = Seedance2ProSession::from_cookies_string(cookies);
-    let args = PrepareImageUploadArgs {
-      session: &session,
-    };
-    let result = prepare_image_upload(args).await?;
-    println!("Upload URL: {}", result.upload_url);
-    println!("Material path: {}", result.material_path);
-    assert!(!result.upload_url.is_empty());
-    assert!(result.upload_url.contains("cloudflarestorage.com"));
-    assert!(result.material_path.starts_with("materials/"));
-
-    assert_eq!(1, 2); // NB: Intentional failure to check the response.
-    Ok(())
-  }
-}
@@ -1,32 +0,0 @@
-use serde_derive::{Deserialize, Serialize};
-
-#[derive(Serialize)]
-pub(super) struct BatchRequest {
-  #[serde(rename = "0")]
-  pub zero: BatchRequestInner,
-}
-
-#[derive(Serialize)]
-pub(super) struct BatchRequestInner {
-  pub json: BatchRequestJson,
-}
-
-#[derive(Serialize)]
-pub(super) struct BatchRequestJson {
-  pub path: String,
-}
-
-#[derive(Deserialize, Debug)]
-pub(super) struct BatchResponseItem {
-  pub result: BatchResponseResult,
-}
-
-#[derive(Deserialize, Debug)]
-pub(super) struct BatchResponseResult {
-  pub data: BatchResponseData,
-}
-
-#[derive(Deserialize, Debug)]
-pub(super) struct BatchResponseData {
-  pub json: String,
-}
@@ -1 +0,0 @@
-pub mod upload_image;
@@ -1,127 +0,0 @@
-use crate::error::seedance2pro_client_error::Seedance2ProClientError;
-use crate::error::seedance2pro_error::Seedance2ProError;
-use crate::error::seedance2pro_generic_api_error::Seedance2ProGenericApiError;
-use crate::utils::common_headers::FIREFOX_USER_AGENT;
-use log::info;
-use url::Url;
-use wreq::Client;
-use wreq_util::Emulation;
-
-const STATIC_BASE_URL: &str = "https://static.seedance2-pro.com";
-
-pub struct UploadImageArgs {
-  /// The signed upload URL returned by `prepare_image_upload`.
-  pub upload_url: String,
-
-  /// The raw image bytes to upload.
-  pub image_bytes: Vec<u8>,
-}
-
-pub struct UploadImageResponse {
-  /// The public-facing URL for the uploaded image.
-  /// e.g. `https://static.seedance2-pro.com/materials/20260219/1771463564512-b14bfe90.png`
-  pub public_url: String,
-}
-
-/// Extracts the path from the R2 upload URL and builds the static public URL.
-/// e.g. `https://comm.….r2.cloudflarestorage.com/materials/20260219/…?X-Amz-…`
-///   -> `https://static.seedance2-pro.com/materials/20260219/…`
-fn build_public_url(upload_url: &str) -> Result<String, Seedance2ProError> {
-  let parsed = Url::parse(upload_url)
-    .map_err(|err| Seedance2ProClientError::UrlParseError(err))?;
-  let path = parsed.path(); // e.g. "/materials/20260219/1771463564512-b14bfe90.png"
-  Ok(format!("{}{}", STATIC_BASE_URL, path))
-}
-
-pub async fn upload_image(args: UploadImageArgs) -> Result<UploadImageResponse, Seedance2ProError> {
-  info!("Uploading image to: {}", args.upload_url);
-
-  let client = Client::builder()
-    .emulation(Emulation::Firefox143)
-    .build()
-    .map_err(|err| Seedance2ProClientError::WreqClientError(err))?;
-
-  let response = client.put(&args.upload_url)
-    .header("User-Agent", FIREFOX_USER_AGENT)
-    .header("Accept", "*/*")
-    .header("Accept-Language", "en-US,en;q=0.9")
-    .header("Accept-Encoding", "gzip, deflate, br, zstd")
-    .header("Referer", "https://seedance2-pro.com/")
-    .header("Origin", "https://seedance2-pro.com")
-    .header("Connection", "keep-alive")
-    .header("Sec-Fetch-Dest", "empty")
-    .header("Sec-Fetch-Mode", "cors")
-    .header("Sec-Fetch-Site", "cross-site")
-    .header("Priority", "u=4")
-    .body(args.image_bytes)
-    .send()
-    .await
-    .map_err(|err| Seedance2ProGenericApiError::WreqError(err))?;
-
-  let status = response.status();
-
-  info!("Upload response status: {}", status);
-
-  if !status.is_success() {
-    let body = response.text()
-      .await
-      .map_err(|err| Seedance2ProGenericApiError::WreqError(err))?;
-
-    return Err(Seedance2ProGenericApiError::UncategorizedBadResponseWithStatusAndBody {
-      status_code: status,
-      body,
-    }.into());
-  }
-
-  let public_url = build_public_url(&args.upload_url)?;
-
-  info!("Public URL: {}", public_url);
-
-  Ok(UploadImageResponse { public_url })
-}
-
-#[cfg(test)]
-mod tests {
-  use super::*;
-  use crate::creds::seedance2pro_session::Seedance2ProSession;
-  use crate::test_utils::get_test_cookies::get_test_cookies;
-  use crate::test_utils::setup_test_logging::setup_test_logging;
-  use crate::requests::prepare_image_upload::prepare_image_upload::{
-    prepare_image_upload, PrepareImageUploadArgs,
-  };
-  use errors::AnyhowResult;
-  use log::LevelFilter;
-  use std::fs;
-
-  #[tokio::test]
-  #[ignore] // manually test — requires real cookies and a test image
-  async fn test_upload_image() -> AnyhowResult<()> {
-    setup_test_logging(LevelFilter::Trace);
-
-    // Step 1: Get a signed upload URL
-    let cookies = get_test_cookies()?;
-    let session = Seedance2ProSession::from_cookies_string(cookies);
-    let prepare_args = PrepareImageUploadArgs {
-      session: &session,
-    };
-    let prepare_result = prepare_image_upload(prepare_args).await?;
-    println!("Upload URL: {}", prepare_result.upload_url);
-
-    // Step 2: Read a test image
-    let image_bytes = fs::read("/Users/bt/dev/storyteller/artcraft/test_data/image/juno.jpg")?;
-    println!("Image size: {} bytes", image_bytes.len());
-
-    // Step 3: Upload
-    let upload_args = UploadImageArgs {
-      upload_url: prepare_result.upload_url,
-      image_bytes,
-    };
-    let result = upload_image(upload_args).await?;
-    println!("Public URL: {}", result.public_url);
-
-    assert!(result.public_url.starts_with("https://static.seedance2-pro.com/materials/"));
-    assert_eq!(1, 2); // NB: Intentional failure to check the response.
-
-    Ok(())
-  }
-}
@@ -1,9 +0,0 @@
-use errors::AnyhowResult;
-use std::fs::read_to_string;
-
-#[cfg(test)]
-pub fn get_test_cookies() -> AnyhowResult<String> {
-  let cookies = read_to_string("/Users/bt/Artcraft/credentials/seedance2pro_cookies.txt")?;
-  let cookies = cookies.trim().to_string();
-  Ok(cookies)
-}
@@ -1,5 +0,0 @@
-#[cfg(test)]
-pub (crate) mod get_test_cookies;
-
-#[cfg(test)]
-pub (crate) mod setup_test_logging;
@@ -1,52 +0,0 @@
-use chrono::Local;
-use env_logger::Builder;
-use log::{debug, error, info, trace, warn, LevelFilter};
-use std::io::Write;
-
-const RUST_LOG: &str = "RUST_LOG";
-
-pub fn setup_test_logging(level: LevelFilter) {
-  let level_str = get_level_str(level);
-
-  println!("Previous log level: {:?}", env::var(RUST_LOG));
-
-  let is_unsafe = env::set_var(RUST_LOG, level_str);
-
-  if is_unsafe.is_none() {
-    println!("Unsafely setting Rust Log Level...");
-    unsafe { std::env::set_var(RUST_LOG, level_str) }
-  }
-
-  println!("Log level: {:?}", env::var(RUST_LOG));
-
-  Builder::new()
-    .is_test(true)
-    .format(|buf, record| {
-      writeln!(buf,
-        "{} [{}] - {}",
-        Local::now().format("%H:%M:%S%.6f"),
-        record.level(),
-        record.args()
-      )
-    })
-    .filter(None, level)
-    .filter_level(level)
-    .init();
-
-  trace!("Test trace log");
-  debug!("Test debug log");
-  info!("Test info log");
-  warn!("Test warn log");
-  error!("Test error log");
-}
-
-fn get_level_str(level: LevelFilter) -> &'static str {
-  match level {
-    LevelFilter::Error => "error",
-    LevelFilter::Warn => "warn",
-    LevelFilter::Info => "info",
-    LevelFilter::Debug => "debug",
-    LevelFilter::Trace => "trace",
-    LevelFilter::Off => "off",
-  }
-}
@@ -1,2 +0,0 @@
-pub const FIREFOX_USER_AGENT: &str =
-  "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:147.0) Gecko/20100101 Firefox/147.0";
@@ -1 +0,0 @@
-pub mod common_headers;
@@ -12,10 +12,8 @@ normal = ["workspace-build-acceleration"]
 # Workspace hack (faster compile times)
 workspace-build-acceleration.workspace = true

-# Internal
-easyenv = { path = "../../lib/easyenv" }
-
 # External
+easyenv = { path = "../../lib/easyenv" }
 log.workspace = true
 reqwest = {  version = "0.12.4", default-features = false, features = [ "charset", "http2", "system-proxy", "rustls-tls" ] }
 serde_json.workspace = true
@@ -1,6 +1,6 @@
 [package]
 name = "artcraft"
-version = "0.6.0"
+version = "0.5.0"
 description = "Artcraft"
 authors = ["you"]
 license = ""
@@ -54,7 +54,6 @@ bytes = "1.10.1"
 chrono.workspace = true
 directories = "6.0.0"
 dirs = "6.0.0"
-discord-rich-presence = "1.1.0"
 futures = "0.3"
 image = "0.25.5"
 indexmap.workspace = true
@@ -78,6 +77,10 @@ url.workspace = true

 # NB: We need to vendor this in so that we can access the cookies inside via the private API
 tauri-plugin-http = { path = "../../vendor/tauri-plugin-http" }
+
+# NB: The version of the `discord-rich-presence` crate (0.2.5) last published has non-Send/Sync error
+# types and can't do threading. We need to wait for a new version to unpin from Git.
+discord-rich-presence = { git = "https://github.com/vionya/discord-rich-presence" }
 tauri-plugin-opener = "2"

 # # Transparent title bar on MacOS
@@ -1,62 +0,0 @@
-use crate::core::commands::enqueue::generate_error::GenerateError;
-use crate::core::commands::enqueue::image_to_video::enqueue_image_to_video_command::{EnqueueImageToVideoRequest, SoraOrientation};
-use crate::core::commands::enqueue::task_enqueue_success::TaskEnqueueSuccess;
-use crate::core::events::generation_events::common::{GenerationModel};
-use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs;
-use artcraft_api_defs::generate::video::multi_function::seedance_2p0_multi_function_video_gen::{Seedance2p0AspectRatio, Seedance2p0MultiFunctionVideoGenRequest};
-use enums::common::generation_provider::GenerationProvider;
-use enums::tauri::tasks::task_type::TaskType;
-use idempotency::uuid::generate_random_uuid;
-use log::{error, info};
-use storyteller_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
-use storyteller_client::endpoints::generate::video::multi_function::seedance_2p0_multi_function_video_gen::seedance_2p0_multi_function_video_gen;
-
-pub (super) async fn handle_artcraft_seedance_2p0(
-  request: &EnqueueImageToVideoRequest,
-  app_env_configs: &AppEnvConfigs,
-  creds: &StorytellerCredentialSet,
-) -> Result<TaskEnqueueSuccess, GenerateError> {
-
-  let uuid_idempotency_token = generate_random_uuid();
-
-  let aspect_ratio = match request.sora_orientation {
-    Some(SoraOrientation::Portrait) => Seedance2p0AspectRatio::Portrait9x16,
-    Some(SoraOrientation::Landscape) => Seedance2p0AspectRatio::Landscape16x9,
-    None => Seedance2p0AspectRatio::Landscape16x9,
-  };
-
-  let request = Seedance2p0MultiFunctionVideoGenRequest {
-    uuid_idempotency_token,
-    prompt: request.prompt.clone(),
-    start_frame_media_token: request.image_media_token.clone(),
-    end_frame_media_token: request.end_frame_image_media_token.clone(),
-    reference_image_media_tokens: None,
-    aspect_ratio: Some(aspect_ratio),
-    duration_seconds: None, // TODO: Parameterize
-    batch_count: None,
-  };
-
-  let result = seedance_2p0_multi_function_video_gen(
-    &app_env_configs.storyteller_host,
-    Some(&creds),
-    request,
-  ).await;
-
-  let job_token = match result {
-    Ok(enqueued) => {
-      info!("Successfully enqueued.");
-      enqueued.inference_job_token
-    }
-    Err(err) => {
-      error!("Failed to enqueue: {:?}", err);
-      return Err(GenerateError::from(err));
-    }
-  };
-
-  Ok(TaskEnqueueSuccess {
-    task_type: TaskType::VideoGeneration,
-    model: Some(GenerationModel::Seedance2p0),
-    provider: GenerationProvider::Artcraft,
-    provider_job_id: Some(job_token.to_string()),
-  })
-}
@@ -6,7 +6,6 @@ use crate::core::commands::enqueue::image_to_video::artcraft::handle_artcraft_kl
 use crate::core::commands::enqueue::image_to_video::artcraft::handle_artcraft_kling_2p5_turbo_pro::handle_artcraft_kling_2p5_turbo_pro;
 use crate::core::commands::enqueue::image_to_video::artcraft::handle_artcraft_kling_2p6_pro::handle_artcraft_kling_2p6_pro;
 use crate::core::commands::enqueue::image_to_video::artcraft::handle_artcraft_seedance_1_lite::handle_artcraft_seedance_1_lite;
-use crate::core::commands::enqueue::image_to_video::artcraft::handle_artcraft_seedance_2p0::handle_artcraft_seedance_2p0;
 use crate::core::commands::enqueue::image_to_video::artcraft::handle_artcraft_sora2::handle_artcraft_sora2;
 use crate::core::commands::enqueue::image_to_video::artcraft::handle_artcraft_sora2_pro::handle_artcraft_sora2_pro;
 use crate::core::commands::enqueue::image_to_video::artcraft::handle_artcraft_veo2::handle_artcraft_veo2;
@@ -40,7 +39,6 @@ pub async fn handle_video_artcraft(
    Some(VideoModel::Kling2p5TurboPro) => handle_artcraft_kling_2p5_turbo_pro(request, app_env_configs, &creds).await,
    Some(VideoModel::Kling2p6Pro) => handle_artcraft_kling_2p6_pro(request, app_env_configs, &creds).await,
    Some(VideoModel::Seedance10Lite) => handle_artcraft_seedance_1_lite(request, app_env_configs, &creds).await,
-    Some(VideoModel::Seedance2p0) => handle_artcraft_seedance_2p0(request, app_env_configs, &creds).await,
    Some(VideoModel::Sora2) => handle_artcraft_sora2(request, app_env_configs, &creds).await,
    Some(VideoModel::Sora2Pro) => handle_artcraft_sora2_pro(request, app_env_configs, &creds).await,
    Some(VideoModel::Veo2) => handle_artcraft_veo2(request, app_env_configs, &creds).await,
@@ -5,7 +5,6 @@ mod handle_artcraft_kling_2p1_pro;
 mod handle_artcraft_kling_2p5_turbo_pro;
 mod handle_artcraft_kling_2p6_pro;
 mod handle_artcraft_seedance_1_lite;
-mod handle_artcraft_seedance_2p0;
 mod handle_artcraft_sora2;
 mod handle_artcraft_sora2_pro;
 mod handle_artcraft_veo2;
@@ -56,9 +56,6 @@ pub enum VideoModel {
  #[serde(rename = "seedance_1.0_lite")]
  Seedance10Lite,

-  #[serde(rename = "seedance_2p0")]
-  Seedance2p0,
-
  #[serde(rename = "sora_2")]
  Sora2,

@@ -82,7 +82,6 @@ impl TaskEnqueueSuccess{
      Some(GenerationModel::Kling2p5TurboPro) => Some(TaskModelType::Kling2p5TurboPro),
      Some(GenerationModel::Kling2p6Pro) => Some(TaskModelType::Kling2p6Pro),
      Some(GenerationModel::Seedance10Lite) => Some(TaskModelType::Seedance10Lite),
-      Some(GenerationModel::Seedance2p0) => Some(TaskModelType::Seedance2p0),
      Some(GenerationModel::Sora2) => Some(TaskModelType::Sora2),
      Some(GenerationModel::Sora2Pro) => Some(TaskModelType::Sora2Pro),
      Some(GenerationModel::Veo2) => Some(TaskModelType::Veo2),
@@ -86,8 +86,6 @@ pub enum GenerationModel {
  Sora2Pro,
  #[serde(rename = "seedance_1.0_lite")]
  Seedance10Lite,
-  #[serde(rename = "seedance_2p0")]
-  Seedance2p0,
  #[serde(rename = "veo_2")]
  Veo2,
  #[serde(rename = "veo_3")]
@@ -1,4 +1,4 @@

 /// The version of the ArtCraft desktop app reported in the UI and via Analytics.
 /// This should match the CI builds.
-pub const ARTCRAFT_VERSION: &str = "0.6.0";
+pub const ARTCRAFT_VERSION: &str = "0.5.0";
@@ -1,7 +1,7 @@
 {
  "$schema": "https://schema.tauri.app/config/2.0.0-rc",
  "productName": "ArtCraft",
-  "version": "0.6.0",
+  "version": "0.5.0",
  "identifier": "ai.artcraft.app",
  "build": {
    "frontendDist": "../../../frontend/apps/artcraft/dist",
@@ -1,7 +1,7 @@
 {
  "$schema": "https://schema.tauri.app/config/2.0.0-rc",
  "productName": "ArtCraft",
-  "version": "0.6.0",
+  "version": "0.5.0",
  "identifier": "ai.artcraft.app",
  "build": {
    "frontendDist": "../../../frontend/apps/artcraft/dist",
@@ -0,0 +1,117 @@
+use actix_helpers::extractors::get_request_origin_uri::get_request_origin_uri;
+use actix_web::HttpRequest;
+use log::warn;
+
+const ARTCRAFT : &str = "artcraft";
+const FAKEYOU : &str = "fakeyou";
+const STORYTELLER : &str = "storyteller";
+
+/// This is for the users table `maybe_source` field which is populated during account creation.
+/// While we could back this with an enum, there may be a motivation to use this VARCHAR(255) field 
+/// for more robust payloads and user tracking in the future.
+pub fn get_request_signup_source(http_request: &HttpRequest) -> Option<&'static str> {
+  // NB: "Origin" vs "Referrer"
+  //
+  // Basically:
+  //  - "In order to preserve privacy, any browser request can decide to omit the Referer header."
+  //  - "The Origin header is similar to the Referer header, but does not disclose the path, and may be null."
+  //  - "Origin" is sent on cross-origin, same-origin (except GET and HEAD requests - typically).
+  //
+  // Reading:
+  //  - https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Origin
+  //  - https://stackoverflow.com/a/71040145
+  //
+  let maybe_origin = get_request_origin_uri(&http_request);
+
+  match maybe_origin {
+    Ok(Some(uri)) => {
+      if let Some(host) = uri.host() {
+        if host.contains(ARTCRAFT) {
+          return Some(ARTCRAFT);
+        } else if host.contains(STORYTELLER) {
+          return Some(STORYTELLER);
+        } else if host.contains(FAKEYOU) {
+          return Some(FAKEYOU);
+        }
+      }
+    }
+    // Fail open for now.
+    Ok(None) => {}
+    Err(err) => {
+      warn!("Origin header error: {:?}", err);
+    }
+  }
+
+  // NB: We don't want to check the "Host" header because we might have misconfigured
+  // a future frontend to talk to some other API gateway and might be improperly and
+  // silently misattributing signup statistics.
+
+  None
+}
+
+
+#[cfg(test)]
+mod tests {
+  use actix_web::test::TestRequest;
+
+  mod origin_header_str {
+    use super::*;
+    use crate::requests::get_request_signup_source::get_request_signup_source;
+
+    #[test]
+    fn artcraft_dot_ai() {
+      let request = TestRequest::get()
+          .insert_header(("origin", "https://artcraft.ai"))
+          .to_http_request();
+      assert_eq!(get_request_signup_source(&request), Some("artcraft"));
+    }
+
+    #[test]
+    fn get_artcraft_dot_com() {
+      let request = TestRequest::get()
+          .insert_header(("origin", "https://getartcraft.com"))
+          .to_http_request();
+      assert_eq!(get_request_signup_source(&request), Some("artcraft"));
+    }
+
+    #[test]
+    fn api_dot_get_artcraft_dot_com() {
+      let request = TestRequest::get()
+          .insert_header(("origin", "https://api.getartcraft.com"))
+          .to_http_request();
+      assert_eq!(get_request_signup_source(&request), Some("artcraft"));
+    }
+
+    #[test]
+    fn fakeyou_dot_com() {
+      let request = TestRequest::get()
+          .insert_header(("origin", "https://fakeyou.com"))
+          .to_http_request();
+      assert_eq!(get_request_signup_source(&request), Some("fakeyou"));
+    }
+
+    #[test]
+    fn api_dot_fakeyou_dot_com() {
+      let request = TestRequest::get()
+          .insert_header(("origin", "https://api.fakeyou.com"))
+          .to_http_request();
+      assert_eq!(get_request_signup_source(&request), Some("fakeyou"));
+    }
+
+    #[test]
+    fn storyteller_dot_ai() {
+      let request = TestRequest::get()
+          .insert_header(("origin", "https://storyteller.ai"))
+          .to_http_request();
+      assert_eq!(get_request_signup_source(&request), Some("storyteller"));
+    }
+
+    #[test]
+    fn api_dot_storyteller_dot_ai() {
+      let request = TestRequest::get()
+          .insert_header(("origin", "https://api.storyteller.ai"))
+          .to_http_request();
+      assert_eq!(get_request_signup_source(&request), Some("storyteller"));
+    }
+  }
+}
@@ -1,48 +1,10 @@
-use actix_helpers::extractors::get_request_origin_uri::get_request_origin_uri;
+use crate::requests::get_request_signup_source::get_request_signup_source;
 use actix_web::HttpRequest;
 use enums::by_table::users::user_signup_source::UserSignupSource;
-use log::warn;

 pub fn get_request_signup_source_enum(http_request: &HttpRequest) -> Option<UserSignupSource> {
-  // NB: "Origin" vs "Referrer"
-  //
-  // Basically:
-  //  - "In order to preserve privacy, any browser request can decide to omit the Referer header."
-  //  - "The Origin header is similar to the Referer header, but does not disclose the path, and may be null."
-  //  - "Origin" is sent on cross-origin, same-origin (except GET and HEAD requests - typically).
-  //
-  // Reading:
-  //  - https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Origin
-  //  - https://stackoverflow.com/a/71040145
-  //
-  let maybe_origin = get_request_origin_uri(&http_request);
-
-  match maybe_origin {
-    Ok(Some(uri)) => {
-      if let Some(host) = uri.host() {
-        if host.contains("getartcraft.com") {
-          return Some(UserSignupSource::ArtCraftGetWeb);
-        } else if host.contains("artcraft.ai") {
-          return Some(UserSignupSource::ArtCraftAiWeb);
-        } else if host.contains("storyteller") {
-          return Some(UserSignupSource::Storyteller);
-        } else if host.contains("fakeyou") {
-          return Some(UserSignupSource::FakeYou);
-        }
-      }
-    }
-    // Fail open for now.
-    Ok(None) => {}
-    Err(err) => {
-      warn!("Origin header error: {:?}", err);
-    }
-  }
-
-  // NB: We don't want to check the "Host" header because we might have misconfigured
-  // a future frontend to talk to some other API gateway and might be improperly and
-  // silently misattributing signup statistics.
-
-  None
+  get_request_signup_source(http_request)
+      .and_then(|source_str| UserSignupSource::from_str(source_str).ok())
 }

 #[cfg(test)]
@@ -59,7 +21,7 @@ mod tests {
      let request = TestRequest::get()
          .insert_header(("origin", "https://artcraft.ai"))
          .to_http_request();
-      assert_eq!(get_request_signup_source_enum(&request), Some(UserSignupSource::ArtCraftAiWeb));
+      assert_eq!(get_request_signup_source_enum(&request), Some(UserSignupSource::ArtCraft));
    }

    #[test]
@@ -67,7 +29,7 @@ mod tests {
      let request = TestRequest::get()
          .insert_header(("origin", "https://getartcraft.com"))
          .to_http_request();
-      assert_eq!(get_request_signup_source_enum(&request), Some(UserSignupSource::ArtCraftGetWeb));
+      assert_eq!(get_request_signup_source_enum(&request), Some(UserSignupSource::ArtCraft));
    }

    #[test]
@@ -75,7 +37,7 @@ mod tests {
      let request = TestRequest::get()
          .insert_header(("origin", "https://api.getartcraft.com"))
          .to_http_request();
-      assert_eq!(get_request_signup_source_enum(&request), Some(UserSignupSource::ArtCraftGetWeb));
+      assert_eq!(get_request_signup_source_enum(&request), Some(UserSignupSource::ArtCraft));
    }

    #[test]
@@ -1 +1,2 @@
+pub mod get_request_signup_source;
 pub mod get_request_signup_source_enum;
@@ -16,5 +16,4 @@ pub fn add_artcraft_3d(cors: Cors, _is_production: bool) -> Cors {
      .allowed_origin("http://localhost:5175") // If already started
      .allowed_origin("https://macaroni-1.tailce84f.ts.net") // TODO
      .allowed_origin("https://halide.tailce84f.ts.net") // TODO
-      .allowed_origin("https://brandons-macbook-pro.taild62114.ts.net") // TODO
 }
@@ -22,8 +22,5 @@ workspace-build-acceleration.workspace = true
 once_cell.workspace = true
 wreq.workspace = true

-[target.'cfg(target_os = "linux")'.dependencies]
-wreq = { workspace = true, features = ["prefix-symbols"] }
-
 [dev-dependencies]
 # (None)
@@ -29,8 +29,7 @@ log = { workspace = true }
 #symphonia = { version = "0.5.2", features = ["aac", "alac", "flac", "isomp4", "mkv", "mp3", "ogg", "vorbis", "wav"] }
 # Opus support still hasn't landed in Symphonia, so we have to use an older version (~0.5) off-master.
 # Opus is the browser's default (only) recording codec: https://blog.addpipe.com/audio-constraints-getusermedia/
-# symphonia = { git = "https://github.com/pdeljanov/Symphonia.git", rev = "e1a70095c4409478c1ded499fb8dd4afa540fb90", features = ["aac", "alac", "flac", "isomp4", "mkv", "mp3", "ogg", "opus", "vorbis", "wav"] }
-symphonia = { path = "../../../vendor/Symphonia/symphonia", features = ["aac", "alac", "flac", "isomp4", "mkv", "mp3", "ogg", "opus", "vorbis", "wav"] }
+symphonia = { git = "https://github.com/pdeljanov/Symphonia.git", rev = "e1a70095c4409478c1ded499fb8dd4afa540fb90", features = ["aac", "alac", "flac", "isomp4", "mkv", "mp3", "ogg", "opus", "vorbis", "wav"] }

 [dev-dependencies]
 # None yet
@@ -0,0 +1,34 @@
+use md5::{Digest, Md5};
+
+pub fn email_to_gravatar(email_address: &str) -> String {
+  let email = email_address.trim().to_lowercase();
+
+  let mut hasher = Md5::new();
+  hasher.update(email);
+  let hash = hasher.finalize();
+  let gravatar_hash = format!("{:x}", hash);
+
+  gravatar_hash
+}
+
+#[cfg(test)]
+pub mod tests {
+  use crate::email::email_to_gravatar::email_to_gravatar;
+
+  #[test]
+  fn test_gravatar() {
+    // Email 1
+    assert_eq!(email_to_gravatar("example@example.com"), "23463b99b62a72f26ed677cc556c44e8".to_string());
+    assert_eq!(email_to_gravatar("EXAMPLE@EXAMPLE.COM"), "23463b99b62a72f26ed677cc556c44e8".to_string());
+    assert_eq!(email_to_gravatar("  example@example.com \n "), "23463b99b62a72f26ed677cc556c44e8".to_string());
+
+    // Email 2
+    assert_eq!(email_to_gravatar("echelon@gmail.com"), "37e7e18f19d8f654a1ace405c846a9de".to_string());
+    assert_eq!(email_to_gravatar("ECHELON@GMAIL.COM"), "37e7e18f19d8f654a1ace405c846a9de".to_string());
+    assert_eq!(email_to_gravatar("  ECHELON@GMAIL.COM  "), "37e7e18f19d8f654a1ace405c846a9de".to_string());
+
+    // Misc
+    assert_eq!(email_to_gravatar(""), "d41d8cd98f00b204e9800998ecf8427e".to_string());
+    assert_eq!(email_to_gravatar("   "), "d41d8cd98f00b204e9800998ecf8427e".to_string());
+  }
+}
@@ -1,34 +0,0 @@
-use md5::{Digest, Md5};
-
-pub fn email_to_gravatar_hash(email_address: &str) -> String {
-  let email = email_address.trim().to_lowercase();
-
-  let mut hasher = Md5::new();
-  hasher.update(email);
-  let hash = hasher.finalize();
-  let gravatar_hash = format!("{:x}", hash);
-
-  gravatar_hash
-}
-
-#[cfg(test)]
-pub mod tests {
-  use crate::email::email_to_gravatar_hash::email_to_gravatar_hash;
-
-  #[test]
-  fn test_gravatar() {
-    // Email 1
-    assert_eq!(email_to_gravatar_hash("example@example.com"), "23463b99b62a72f26ed677cc556c44e8".to_string());
-    assert_eq!(email_to_gravatar_hash("EXAMPLE@EXAMPLE.COM"), "23463b99b62a72f26ed677cc556c44e8".to_string());
-    assert_eq!(email_to_gravatar_hash("  example@example.com \n "), "23463b99b62a72f26ed677cc556c44e8".to_string());
-
-    // Email 2
-    assert_eq!(email_to_gravatar_hash("echelon@gmail.com"), "37e7e18f19d8f654a1ace405c846a9de".to_string());
-    assert_eq!(email_to_gravatar_hash("ECHELON@GMAIL.COM"), "37e7e18f19d8f654a1ace405c846a9de".to_string());
-    assert_eq!(email_to_gravatar_hash("  ECHELON@GMAIL.COM  "), "37e7e18f19d8f654a1ace405c846a9de".to_string());
-
-    // Misc
-    assert_eq!(email_to_gravatar_hash(""), "d41d8cd98f00b204e9800998ecf8427e".to_string());
-    assert_eq!(email_to_gravatar_hash("   "), "d41d8cd98f00b204e9800998ecf8427e".to_string());
-  }
-}
@@ -1,17 +1,17 @@
 use rand::Rng;

-const SYNTHETIC_EMAIL_PREFIX : &str = "synthetic.email";
-const SYNTHETIC_EMAIL_DOMAIN : &str = "getartcraft.com";
+const EMAIL_PREFIX : &str = "synthetic.email";
+const EMAIL_DOMAIN : &str = "getartcraft.com";

 pub fn generate_random_synthetic_email() -> String {
  let random_digit = rand::thread_rng().gen_range(u32::MIN..u32::MAX);
-  format!("{}.{}@{}", SYNTHETIC_EMAIL_PREFIX, random_digit, SYNTHETIC_EMAIL_DOMAIN)
+  format!("{}.{}@{}", EMAIL_PREFIX, random_digit, EMAIL_DOMAIN)
 }

 #[cfg(test)]
 mod tests {
-  use crate::email::generate_random_synthetic_email::generate_random_synthetic_email;
  use std::collections::HashSet;
+  use crate::email::generate_random_synthetic_email::generate_random_synthetic_email;

  #[test]
  fn test_base_case_success() {
@@ -26,11 +26,4 @@ mod tests {
    }
    assert!(collection.len() > 50); // NB: Should be an easy bar to hit
  }
-
-  #[test]
-  fn test_email_format() {
-    let email = generate_random_synthetic_email();
-    assert!(email.contains("@"));
-    assert!(email.contains("."));
-  }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Brandon Thomas	957d510a04	wip	2026-01-29 19:44:07 -05:00
Brandon Thomas	20bf5608eb	create session	2026-01-29 10:28:39 -05:00
Brandon Thomas	03e5d735d8	pass payload back	2026-01-29 10:15:30 -05:00
Brandon Thomas	114171f985	wip	2026-01-29 10:05:30 -05:00
Brandon Thomas	17fbc3f841	plumbing database fields	2026-01-29 09:58:06 -05:00
Brandon Thomas	972420b5d5	wip	2026-01-29 09:26:04 -05:00
Brandon Thomas	6face4ab4f	undo change	2026-01-29 02:39:54 -05:00
Brandon Thomas	dffc831ce1	wip	2026-01-29 02:24:34 -05:00
Brandon Thomas	671ac9310f	endpoints wip	2026-01-28 21:25:59 -05:00
Brandon Thomas	a752c64a99	new users table fields	2026-01-28 20:01:31 -05:00