update download links

2026-10-26 11:49:30 -04:00 · 2025-07-17 21:53:54 -04:00
1062 changed files with 48339 additions and 23771 deletions
@@ -26,23 +26,14 @@ jobs:
    steps:
      - uses: actions/checkout@v4

-      - name: install Rust stable
-        uses: dtolnay/rust-toolchain@stable
-
-      - name: install wreq dependencies
-        run: |
-          choco install cmake -y
-          choco install strawberryperl -y
-          choco install pkgconfiglite -y
-          choco install llvm -y
-          choco install nasm -y
-        shell: cmd
-
      - name: setup node
        uses: actions/setup-node@v4
        with:
          node-version: lts/*

+      - name: install Rust stable
+        uses: dtolnay/rust-toolchain@stable
+
      - name: install frontend dependencies
        run: |
          # Navigate to the frontend directory to install dependencies
@@ -92,8 +83,6 @@ jobs:
      - name: build and publish
        uses: tauri-apps/tauri-action@v0
        env:
-          # NB(bt): This is needed by wreq. Hopefully it doesn't kill Tauri
-          RUSTFLAGS: "-C target-feature=+crt-static"
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
          # Use the SQLx query cache for SQLite
          SQLX_OFFLINE: true
@@ -1,12 +0,0 @@
-{
-  "db_name": "SQLite",
-  "query": "\n    INSERT INTO tasks (\n      id,\n      task_status,\n      task_type,\n      model_type,\n      provider,\n      provider_job_id,\n      frontend_caller,\n      frontend_subscriber_id,\n      frontend_subscriber_payload\n    )\n    VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)\n  ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 9
-    },
-    "nullable": []
-  },
-  "hash": "01a0bf33e8331c19dc73f064c54eaa863bec158ef7713450a06c75e246f5f08c"
-}
@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nINSERT INTO prompts\nSET\n  token = ?,\n  prompt_type = ?,\n\n  maybe_creator_user_token = ?,\n  \n  maybe_model_type = ?,\n  maybe_generation_provider = ?,\n\n  maybe_positive_prompt = ?,\n  maybe_negative_prompt = ?,\n  \n  maybe_other_args = ?,\n\n  creator_ip_address = ?\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 9
-    },
-    "nullable": []
-  },
-  "hash": "08f52f15acf6afc7091a525e3dc88f706c71c3579e5e81aa9903807d85f469ef"
-}
@@ -1,69 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nSELECT\n    pci.media_token as `media_token: tokens::tokens::media_files::MediaFileToken`,\n    pci.context_semantic_type as `context_semantic_type: enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType`,\n\n    m.public_bucket_directory_hash,\n    m.maybe_public_bucket_prefix,\n    m.maybe_public_bucket_extension\n\nFROM prompt_context_items pci\nJOIN media_files m\nON\n    pci.media_token = m.token\nWHERE\n    pci.prompt_token = ?\nORDER BY pci.id ASC\n        ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "media_token: tokens::tokens::media_files::MediaFileToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 1,
-        "name": "context_semantic_type: enums::by_table::prompt_context_items::prompt_context_semantic_type::PromptContextSemanticType",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 64
-        }
-      },
-      {
-        "ordinal": 2,
-        "name": "public_bucket_directory_hash",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 3,
-        "name": "maybe_public_bucket_prefix",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 64
-        }
-      },
-      {
-        "ordinal": 4,
-        "name": "maybe_public_bucket_extension",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 64
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      true,
-      true
-    ]
-  },
-  "hash": "094eb099cde85835db0662c2700c6b82644b51bf9b3609391ed4d2945fe5e98f"
-}
@@ -1,12 +1,12 @@
 {
  "db_name": "MySQL",
-  "query": "\nINSERT INTO generic_inference_jobs\nSET\n  token = ?,\n  uuid_idempotency_token = ?,\n\n  job_type = ?,\n\n  maybe_external_third_party = ?,\n  maybe_external_third_party_id = ?,\n\n  product_category = ?,\n  inference_category = ?,\n\n  maybe_model_type = NULL,\n  maybe_model_token = NULL,\n\n  maybe_input_source_token = NULL,\n  maybe_input_source_token_type = NULL,\n\n  maybe_download_url = NULL,\n  maybe_cover_image_media_file_token = NULL,\n  \n  maybe_prompt_token = ?,\n\n  maybe_raw_inference_text = NULL,\n\n  maybe_inference_args = ?,\n\n  maybe_creator_user_token = ?,\n  maybe_creator_anonymous_visitor_token = ?,\n  creator_ip_address = ?,\n  creator_set_visibility = ?,\n\n  priority_level = 0,\n  is_keepalive_required = FALSE,\n  max_duration_seconds = 0,\n\n  is_debug_request = FALSE,\n  maybe_routing_tag = NULL,\n\n  status = ?\n        ",
+  "query": "\nINSERT INTO generic_inference_jobs\nSET\n  token = ?,\n  uuid_idempotency_token = ?,\n\n  job_type = ?,\n\n  maybe_external_third_party = ?,\n  maybe_external_third_party_id = ?,\n\n  product_category = ?,\n  inference_category = ?,\n\n  maybe_model_type = NULL,\n  maybe_model_token = NULL,\n\n  maybe_input_source_token = NULL,\n  maybe_input_source_token_type = NULL,\n\n  maybe_download_url = NULL,\n  maybe_cover_image_media_file_token = NULL,\n\n  maybe_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
+      "Right": 13
    },
    "nullable": []
  },
-  "hash": "002cdb3d086f3b4181e2997befa54bd8516cb1d3d3bb6e389862695318d5c299"
+  "hash": "0fa824822cd94024dce21243f41e69e4a3e8685c4de676834a7c0ee14982c976"
 }
@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\nINSERT INTO prompts\nSET\n  token = ?,\n  prompt_type = ?,\n\n  maybe_creator_user_token = ?,\n\n  maybe_positive_prompt = ?,\n  maybe_negative_prompt = ?,\n  maybe_other_args = ?,\n\n  creator_ip_address = ?\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 7
+    },
+    "nullable": []
+  },
+  "hash": "13ca06bcbb4a576f8a2229a8554b7488d379baa381d8d5cb60972750e81b2173"
+}
@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nUPDATE generic_inference_jobs\nSET\n  status = 'cancelled_by_system',\n  retry_at = NULL,\n  internal_debugging_failure_reason = 'reap_stale_fakeyou_jobs'\nWHERE\n  job_type != 'fal_queue'\n  AND status IN (\n    'pending',\n    'started',\n    'attempt_failed'\n   )\n   AND created_at > NOW() - INTERVAL 30 MINUTE\nLIMIT 5000\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 0
-    },
-    "nullable": []
-  },
-  "hash": "19708db99f2b3c6283d2115a511e0eb1c99fab396ad0effd9eb2dd79926e9c93"
-}
@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n    INSERT INTO tasks (\n      id,\n      task_status,\n      task_type,\n      model_type,\n      provider,\n      provider_job_id,\n      frontend_subscriber_id,\n      frontend_subscriber_payload\n    )\n    VALUES (?, ?, ?, ?, ?, ?, ?, ?)\n  ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 8
+    },
+    "nullable": []
+  },
+  "hash": "22b91a21cbb88abc9bc17b338cf2f9418e08e414667d44476623eb141ab17b87"
+}
@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\nINSERT INTO media_files\nSET\n  token = ?,\n\n  media_class = ?,\n  media_type = ?,\n\n  origin_category = ?,\n  origin_product_category = ?,\n\n  maybe_engine_category = ?,\n  maybe_animation_type = ?,\n\n  maybe_mime_type = ?,\n  file_size_bytes = ?,\n\n  checksum_sha2 = ?,\n\n  maybe_title = ?,\n  maybe_duration_millis = ?,\n\n  public_bucket_directory_hash = ?,\n  maybe_public_bucket_prefix = ?,\n  maybe_public_bucket_extension = ?,\n\n  maybe_creator_user_token = ?,\n  maybe_creator_anonymous_visitor_token = ?,\n  creator_ip_address = ?,\n\n  creator_set_visibility = ?,\n\n  maybe_scene_source_media_file_token = ?,\n  is_intermediate_system_file = ?,\n\n  maybe_creator_file_synthetic_id = ?,\n  maybe_creator_category_synthetic_id = ?,\n\n  is_user_upload = TRUE,\n\n  maybe_origin_model_type = NULL,\n  maybe_origin_model_token = NULL\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 23
+    },
+    "nullable": []
+  },
+  "hash": "28cac5883464613d29bedbf7308a71c258f1bf4abb8f5ca3ae320db34c137955"
+}
@@ -1,6 +1,6 @@
 {
  "db_name": "MySQL",
-  "query": "\nSELECT\n    p.token as `token: tokens::tokens::prompts::PromptToken`,\n\n    p.prompt_type as `prompt_type: enums::by_table::prompts::prompt_type::PromptType`,\n\n    p.maybe_model_type as `maybe_model_type: enums::common::model_type::ModelType`,\n    p.maybe_generation_provider as `maybe_generation_provider: enums::common::generation_provider::GenerationProvider`,\n\n    p.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n\n    p.maybe_positive_prompt,\n    p.maybe_negative_prompt,\n    p.maybe_other_args,\n\n    p.creator_ip_address,\n    p.created_at\n\nFROM prompts as p\nWHERE\n    p.token = ?\n        ",
+  "query": "\nSELECT\n    p.token as `token: tokens::tokens::prompts::PromptToken`,\n\n    p.prompt_type as `prompt_type: enums::by_table::prompts::prompt_type::PromptType`,\n\n    p.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n\n    p.maybe_positive_prompt,\n    p.maybe_negative_prompt,\n    p.maybe_other_args,\n\n    p.creator_ip_address,\n    p.created_at\n\nFROM prompts as p\nWHERE\n    p.token = ?\n        ",
  "describe": {
    "columns": [
      {
@@ -25,26 +25,6 @@
      },
      {
        "ordinal": 2,
-        "name": "maybe_model_type: enums::common::model_type::ModelType",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 3,
-        "name": "maybe_generation_provider: enums::common::generation_provider::GenerationProvider",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 64
-        }
-      },
-      {
-        "ordinal": 4,
        "name": "maybe_creator_user_token: tokens::tokens::users::UserToken",
        "type_info": {
          "type": "VarString",
@@ -54,7 +34,7 @@
        }
      },
      {
-        "ordinal": 5,
+        "ordinal": 3,
        "name": "maybe_positive_prompt",
        "type_info": {
          "type": "Blob",
@@ -64,7 +44,7 @@
        }
      },
      {
-        "ordinal": 6,
+        "ordinal": 4,
        "name": "maybe_negative_prompt",
        "type_info": {
          "type": "Blob",
@@ -74,7 +54,7 @@
        }
      },
      {
-        "ordinal": 7,
+        "ordinal": 5,
        "name": "maybe_other_args",
        "type_info": {
          "type": "Blob",
@@ -84,7 +64,7 @@
        }
      },
      {
-        "ordinal": 8,
+        "ordinal": 6,
        "name": "creator_ip_address",
        "type_info": {
          "type": "VarString",
@@ -94,7 +74,7 @@
        }
      },
      {
-        "ordinal": 9,
+        "ordinal": 7,
        "name": "created_at",
        "type_info": {
          "type": "Timestamp",
@@ -114,11 +94,9 @@
      true,
      true,
      true,
-      true,
-      true,
      false,
      false
    ]
  },
-  "hash": "b46b0d022790f4e10f6e47126df0fdc55172bf8cda77d4e0b2afac9e6ebd1630"
+  "hash": "61744bbf83f7cf00348bcc21e868d9c506fec46da4a33ac50d63c6d9e00c0cec"
 }
@@ -1,6 +1,6 @@
 {
  "db_name": "MySQL",
-  "query": "\nSELECT\n    jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n\n    jobs.status as `status: enums::common::job_status_plus::JobStatusPlus`,\n    \n    jobs.maybe_external_third_party as `external_third_party: enums::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty`,\n    jobs.maybe_external_third_party_id as `external_third_party_id`,\n\n    jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n    jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n    jobs.creator_ip_address,\n    \n    jobs.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n\n    jobs.created_at,\n    jobs.updated_at\n\nFROM generic_inference_jobs as jobs\n\nWHERE jobs.maybe_external_third_party = ?\nAND jobs.maybe_external_third_party_id = ?\n        ",
+  "query": "\nSELECT\n    jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n\n    jobs.status as `status: enums::common::job_status_plus::JobStatusPlus`,\n    \n    jobs.maybe_external_third_party as `external_third_party: enums::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty`,\n    jobs.maybe_external_third_party_id as `external_third_party_id`,\n\n    jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n    jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n    jobs.creator_ip_address,\n\n    jobs.created_at,\n    jobs.updated_at\n\nFROM generic_inference_jobs as jobs\n\nWHERE jobs.maybe_external_third_party = ?\nAND jobs.maybe_external_third_party_id = ?\n        ",
  "describe": {
    "columns": [
      {
@@ -75,16 +75,6 @@
      },
      {
        "ordinal": 7,
-        "name": "maybe_prompt_token: tokens::tokens::prompts::PromptToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 8,
        "name": "created_at",
        "type_info": {
          "type": "Timestamp",
@@ -94,7 +84,7 @@
        }
      },
      {
-        "ordinal": 9,
+        "ordinal": 8,
        "name": "updated_at",
        "type_info": {
          "type": "Timestamp",
@@ -115,10 +105,9 @@
      true,
      true,
      false,
-      true,
      false,
      false
    ]
  },
-  "hash": "fbe482c8987231c3b5d75f2e792d0fdd033de8a7eb821428fa034752c73edfb7"
+  "hash": "64dfacc1f0552d539f009fea91e902a2fe296c06ad539808596bbf2c8fc9eaa0"
 }
@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nUPDATE generic_inference_jobs\nSET\n  status = ?,\n  on_success_result_entity_type = ?,\n  on_success_result_entity_token = ?,\n  on_success_result_batch_token = ?,\n  failure_reason = NULL,\n  internal_debugging_failure_reason = NULL,\n  success_execution_millis = NULL,\n  success_inference_execution_millis = NULL,\n  retry_at = NULL,\n  successfully_completed_at = NOW()\nWHERE token = ?\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 5
-    },
-    "nullable": []
-  },
-  "hash": "7e223e284b992b6eaf31bec057bae00fc4e085d68b064e370f0e3d92b82049b2"
-}
@@ -1,6 +1,6 @@
 {
  "db_name": "MySQL",
-  "query": "\nSELECT\n    jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n\n    jobs.status as `status: enums::common::job_status_plus::JobStatusPlus`,\n    jobs.attempt_count,\n\n    jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n    jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n    jobs.creator_ip_address,\n\n    jobs.product_category as `product_category: enums::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory`,\n    jobs.inference_category as `inference_category: enums::by_table::generic_inference_jobs::inference_category::InferenceCategory`,\n    jobs.maybe_model_type,\n    jobs.maybe_model_token,\n    jobs.maybe_raw_inference_text,\n    jobs.maybe_inference_args,\n\n    jobs.frontend_failure_category as `maybe_frontend_failure_category: enums::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory`,\n\n    jobs.on_success_result_entity_type as maybe_result_entity_type,\n    jobs.on_success_result_entity_token as maybe_result_entity_token,\n    jobs.on_success_result_batch_token as maybe_result_batch_token,\n\n    model_weights.title as maybe_model_weights_title,\n    tts_models.title as maybe_tts_model_title,\n    voice_conversion_models.title as maybe_voice_conversion_model_title,\n\n    tts_results.public_bucket_wav_audio_path as maybe_tts_public_bucket_path,\n    voice_conversion_results.public_bucket_hash as maybe_voice_conversion_public_bucket_hash,\n\n    media_files.public_bucket_directory_hash as maybe_media_file_public_bucket_directory_hash,\n    media_files.maybe_public_bucket_prefix as maybe_media_file_public_bucket_prefix,\n    media_files.maybe_public_bucket_extension as maybe_media_file_public_bucket_extension,\n\n    jobs.assigned_worker as maybe_assigned_worker,\n    jobs.assigned_cluster as maybe_assigned_cluster,\n\n    jobs.is_keepalive_required,\n\n    jobs.created_at,\n    jobs.updated_at,\n\n    jobs.first_started_at as maybe_first_started_at,\n    jobs.successfully_completed_at as maybe_successfully_completed_at,\n\n    NOW() as database_clock\n\nFROM generic_inference_jobs as jobs\n\nLEFT OUTER JOIN model_weights ON jobs.maybe_model_token = model_weights.token\nLEFT OUTER JOIN tts_models ON jobs.maybe_model_token = tts_models.token\nLEFT OUTER JOIN voice_conversion_models ON jobs.maybe_model_token = voice_conversion_models.token\n\nLEFT OUTER JOIN tts_results ON jobs.on_success_result_entity_token = tts_results.token\nLEFT OUTER JOIN voice_conversion_results ON jobs.on_success_result_entity_token = voice_conversion_results.token\nLEFT OUTER JOIN media_files ON jobs.on_success_result_entity_token = media_files.token\n\nWHERE jobs.token = ?\n        ",
+  "query": "\nSELECT\n    jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n\n    jobs.status as `status: enums::common::job_status_plus::JobStatusPlus`,\n    jobs.attempt_count,\n\n    jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n    jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n    jobs.creator_ip_address,\n\n    jobs.product_category as `product_category: enums::by_table::generic_inference_jobs::inference_job_product_category::InferenceJobProductCategory`,\n    jobs.inference_category as `inference_category: enums::by_table::generic_inference_jobs::inference_category::InferenceCategory`,\n    jobs.maybe_model_type,\n    jobs.maybe_model_token,\n    jobs.maybe_raw_inference_text,\n    jobs.maybe_inference_args,\n\n    jobs.frontend_failure_category as `maybe_frontend_failure_category: enums::by_table::generic_inference_jobs::frontend_failure_category::FrontendFailureCategory`,\n\n    jobs.on_success_result_entity_type as maybe_result_entity_type,\n    jobs.on_success_result_entity_token as maybe_result_entity_token,\n\n    model_weights.title as maybe_model_weights_title,\n    tts_models.title as maybe_tts_model_title,\n    voice_conversion_models.title as maybe_voice_conversion_model_title,\n\n    tts_results.public_bucket_wav_audio_path as maybe_tts_public_bucket_path,\n    voice_conversion_results.public_bucket_hash as maybe_voice_conversion_public_bucket_hash,\n\n    media_files.public_bucket_directory_hash as maybe_media_file_public_bucket_directory_hash,\n    media_files.maybe_public_bucket_prefix as maybe_media_file_public_bucket_prefix,\n    media_files.maybe_public_bucket_extension as maybe_media_file_public_bucket_extension,\n\n    jobs.assigned_worker as maybe_assigned_worker,\n    jobs.assigned_cluster as maybe_assigned_cluster,\n\n    jobs.is_keepalive_required,\n\n    jobs.created_at,\n    jobs.updated_at,\n\n    jobs.first_started_at as maybe_first_started_at,\n    jobs.successfully_completed_at as maybe_successfully_completed_at,\n\n    NOW() as database_clock\n\nFROM generic_inference_jobs as jobs\n\nLEFT OUTER JOIN model_weights ON jobs.maybe_model_token = model_weights.token\nLEFT OUTER JOIN tts_models ON jobs.maybe_model_token = tts_models.token\nLEFT OUTER JOIN voice_conversion_models ON jobs.maybe_model_token = voice_conversion_models.token\n\nLEFT OUTER JOIN tts_results ON jobs.on_success_result_entity_token = tts_results.token\nLEFT OUTER JOIN voice_conversion_results ON jobs.on_success_result_entity_token = voice_conversion_results.token\nLEFT OUTER JOIN media_files ON jobs.on_success_result_entity_token = media_files.token\n\nWHERE jobs.token = ?\n        ",
  "describe": {
    "columns": [
      {
@@ -155,16 +155,6 @@
      },
      {
        "ordinal": 15,
-        "name": "maybe_result_batch_token",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 16,
        "name": "maybe_model_weights_title",
        "type_info": {
          "type": "VarString",
@@ -174,7 +164,7 @@
        }
      },
      {
-        "ordinal": 17,
+        "ordinal": 16,
        "name": "maybe_tts_model_title",
        "type_info": {
          "type": "VarString",
@@ -184,7 +174,7 @@
        }
      },
      {
-        "ordinal": 18,
+        "ordinal": 17,
        "name": "maybe_voice_conversion_model_title",
        "type_info": {
          "type": "VarString",
@@ -194,7 +184,7 @@
        }
      },
      {
-        "ordinal": 19,
+        "ordinal": 18,
        "name": "maybe_tts_public_bucket_path",
        "type_info": {
          "type": "VarString",
@@ -204,7 +194,7 @@
        }
      },
      {
-        "ordinal": 20,
+        "ordinal": 19,
        "name": "maybe_voice_conversion_public_bucket_hash",
        "type_info": {
          "type": "VarString",
@@ -214,7 +204,7 @@
        }
      },
      {
-        "ordinal": 21,
+        "ordinal": 20,
        "name": "maybe_media_file_public_bucket_directory_hash",
        "type_info": {
          "type": "VarString",
@@ -224,7 +214,7 @@
        }
      },
      {
-        "ordinal": 22,
+        "ordinal": 21,
        "name": "maybe_media_file_public_bucket_prefix",
        "type_info": {
          "type": "VarString",
@@ -234,7 +224,7 @@
        }
      },
      {
-        "ordinal": 23,
+        "ordinal": 22,
        "name": "maybe_media_file_public_bucket_extension",
        "type_info": {
          "type": "VarString",
@@ -244,7 +234,7 @@
        }
      },
      {
-        "ordinal": 24,
+        "ordinal": 23,
        "name": "maybe_assigned_worker",
        "type_info": {
          "type": "VarString",
@@ -254,7 +244,7 @@
        }
      },
      {
-        "ordinal": 25,
+        "ordinal": 24,
        "name": "maybe_assigned_cluster",
        "type_info": {
          "type": "VarString",
@@ -264,7 +254,7 @@
        }
      },
      {
-        "ordinal": 26,
+        "ordinal": 25,
        "name": "is_keepalive_required",
        "type_info": {
          "type": "Tiny",
@@ -274,7 +264,7 @@
        }
      },
      {
-        "ordinal": 27,
+        "ordinal": 26,
        "name": "created_at",
        "type_info": {
          "type": "Timestamp",
@@ -284,7 +274,7 @@
        }
      },
      {
-        "ordinal": 28,
+        "ordinal": 27,
        "name": "updated_at",
        "type_info": {
          "type": "Timestamp",
@@ -294,7 +284,7 @@
        }
      },
      {
-        "ordinal": 29,
+        "ordinal": 28,
        "name": "maybe_first_started_at",
        "type_info": {
          "type": "Timestamp",
@@ -304,7 +294,7 @@
        }
      },
      {
-        "ordinal": 30,
+        "ordinal": 29,
        "name": "maybe_successfully_completed_at",
        "type_info": {
          "type": "Timestamp",
@@ -314,7 +304,7 @@
        }
      },
      {
-        "ordinal": 31,
+        "ordinal": 30,
        "name": "database_clock",
        "type_info": {
          "type": "Datetime",
@@ -353,7 +343,6 @@
      true,
      true,
      true,
-      true,
      false,
      false,
      false,
@@ -362,5 +351,5 @@
      false
    ]
  },
-  "hash": "243afe0bc574f9f233c7797add9faf96440e2bafd52032e07951272fb1ec78b1"
+  "hash": "90366e1705a0343bdfe4fc472d701b8e1dbd3a2dabedaadb633ac3542de72fa7"
 }
@@ -1,311 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nSELECT\n    m.token as `token: tokens::tokens::media_files::MediaFileToken`,\n\n    m.media_class as `media_class: enums::by_table::media_files::media_file_class::MediaFileClass`,\n    m.media_type as `media_type: enums::by_table::media_files::media_file_type::MediaFileType`,\n\n    m.maybe_mime_type,\n\n    users.token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n    users.username as maybe_creator_username,\n    users.display_name as maybe_creator_display_name,\n    users.email_gravatar_hash as maybe_creator_gravatar_hash,\n\n    m.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n\n    m.maybe_batch_token as `maybe_batch_token: tokens::tokens::batch_generations::BatchGenerationToken`,\n\n    m.maybe_title,\n    m.maybe_text_transcript,\n\n    m.maybe_origin_filename,\n\n    m.maybe_duration_millis,\n\n    m.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n    prompts.maybe_other_args as maybe_other_prompt_args,\n\n    media_file_cover_image.public_bucket_directory_hash as maybe_file_cover_image_public_bucket_hash,\n    media_file_cover_image.maybe_public_bucket_prefix as maybe_file_cover_image_public_bucket_prefix,\n    media_file_cover_image.maybe_public_bucket_extension as maybe_file_cover_image_public_bucket_extension,\n\n    m.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n\n    m.is_user_upload,\n    m.is_intermediate_system_file,\n\n    m.public_bucket_directory_hash,\n    m.maybe_public_bucket_prefix,\n    m.maybe_public_bucket_extension,\n\n    m.created_at,\n    m.updated_at\n\nFROM media_files AS m\nLEFT OUTER JOIN users\n    ON m.maybe_creator_user_token = users.token\nLEFT OUTER JOIN media_files as media_file_cover_image\n    ON media_file_cover_image.token = m.maybe_cover_image_media_file_token\nLEFT OUTER JOIN prompts\n    ON prompts.token = m.maybe_prompt_token\nWHERE\n    m.maybe_batch_token = ?\n        ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "token: tokens::tokens::media_files::MediaFileToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 1,
-        "name": "media_class: enums::by_table::media_files::media_file_class::MediaFileClass",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 64
-        }
-      },
-      {
-        "ordinal": 2,
-        "name": "media_type: enums::by_table::media_files::media_file_type::MediaFileType",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 64
-        }
-      },
-      {
-        "ordinal": 3,
-        "name": "maybe_mime_type",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 4,
-        "name": "maybe_creator_user_token: tokens::tokens::users::UserToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 5,
-        "name": "maybe_creator_username",
-        "type_info": {
-          "type": "VarString",
-          "flags": "UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 80
-        }
-      },
-      {
-        "ordinal": 6,
-        "name": "maybe_creator_display_name",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 80
-        }
-      },
-      {
-        "ordinal": 7,
-        "name": "maybe_creator_gravatar_hash",
-        "type_info": {
-          "type": "String",
-          "flags": "BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 8,
-        "name": "maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 9,
-        "name": "maybe_batch_token: tokens::tokens::batch_generations::BatchGenerationToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 10,
-        "name": "maybe_title",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 1020
-        }
-      },
-      {
-        "ordinal": 11,
-        "name": "maybe_text_transcript",
-        "type_info": {
-          "type": "Blob",
-          "flags": "BLOB | BINARY",
-          "char_set": 224,
-          "max_size": 262140
-        }
-      },
-      {
-        "ordinal": 12,
-        "name": "maybe_origin_filename",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 1020
-        }
-      },
-      {
-        "ordinal": 13,
-        "name": "maybe_duration_millis",
-        "type_info": {
-          "type": "Long",
-          "flags": "",
-          "char_set": 63,
-          "max_size": 10
-        }
-      },
-      {
-        "ordinal": 14,
-        "name": "maybe_prompt_token: tokens::tokens::prompts::PromptToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 15,
-        "name": "maybe_other_prompt_args",
-        "type_info": {
-          "type": "Blob",
-          "flags": "BLOB | BINARY",
-          "char_set": 224,
-          "max_size": 262140
-        }
-      },
-      {
-        "ordinal": 16,
-        "name": "maybe_file_cover_image_public_bucket_hash",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 17,
-        "name": "maybe_file_cover_image_public_bucket_prefix",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 64
-        }
-      },
-      {
-        "ordinal": 18,
-        "name": "maybe_file_cover_image_public_bucket_extension",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 64
-        }
-      },
-      {
-        "ordinal": 19,
-        "name": "creator_set_visibility: enums::common::visibility::Visibility",
-        "type_info": {
-          "type": "String",
-          "flags": "NOT_NULL | BINARY | ENUM",
-          "char_set": 224,
-          "max_size": 28
-        }
-      },
-      {
-        "ordinal": 20,
-        "name": "is_user_upload",
-        "type_info": {
-          "type": "Tiny",
-          "flags": "NOT_NULL | MULTIPLE_KEY",
-          "char_set": 63,
-          "max_size": 1
-        }
-      },
-      {
-        "ordinal": 21,
-        "name": "is_intermediate_system_file",
-        "type_info": {
-          "type": "Tiny",
-          "flags": "NOT_NULL | MULTIPLE_KEY",
-          "char_set": 63,
-          "max_size": 1
-        }
-      },
-      {
-        "ordinal": 22,
-        "name": "public_bucket_directory_hash",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 23,
-        "name": "maybe_public_bucket_prefix",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 64
-        }
-      },
-      {
-        "ordinal": 24,
-        "name": "maybe_public_bucket_extension",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 64
-        }
-      },
-      {
-        "ordinal": 25,
-        "name": "created_at",
-        "type_info": {
-          "type": "Timestamp",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | TIMESTAMP",
-          "char_set": 63,
-          "max_size": 19
-        }
-      },
-      {
-        "ordinal": 26,
-        "name": "updated_at",
-        "type_info": {
-          "type": "Timestamp",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | TIMESTAMP | ON_UPDATE_NOW",
-          "char_set": 63,
-          "max_size": 19
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      false,
-      false,
-      false,
-      false,
-      true,
-      true,
-      false,
-      false
-    ]
-  },
-  "hash": "971471f349bcd22364b16b5d6c68e807ed897101eec1e8a62a7b8fab3359fa0c"
-}
@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nINSERT INTO media_files\nSET\n  token = ?,\n\n  media_class = ?,\n  media_type = ?,\n\n  origin_category = ?,\n  origin_product_category = ?,\n\n  maybe_engine_category = ?,\n  maybe_animation_type = ?,\n\n  maybe_mime_type = ?,\n  file_size_bytes = ?,\n\n  checksum_sha2 = ?,\n\n  maybe_prompt_token = ?,\n\n  maybe_title = ?,\n  maybe_duration_millis = ?,\n\n  public_bucket_directory_hash = ?,\n  maybe_public_bucket_prefix = ?,\n  maybe_public_bucket_extension = ?,\n\n  maybe_creator_user_token = ?,\n  maybe_creator_anonymous_visitor_token = ?,\n  creator_ip_address = ?,\n\n  creator_set_visibility = ?,\n\n  maybe_scene_source_media_file_token = ?,\n  is_intermediate_system_file = ?,\n\n  maybe_creator_file_synthetic_id = ?,\n  maybe_creator_category_synthetic_id = ?,\n\n  is_user_upload = TRUE,\n\n  maybe_origin_model_type = NULL,\n  maybe_origin_model_token = NULL\n        ",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Right": 24
-    },
-    "nullable": []
-  },
-  "hash": "e86494c0a53247903aa58009e2a26c4db90a89e9f6ea805ffb3929faf69a431d"
-}
@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\nUPDATE generic_inference_jobs\nSET\n  status = ?,\n  on_success_result_entity_type = ?,\n  on_success_result_entity_token = ?,\n  failure_reason = NULL,\n  internal_debugging_failure_reason = NULL,\n  success_execution_millis = NULL,\n  success_inference_execution_millis = NULL,\n  retry_at = NULL,\n  successfully_completed_at = NOW()\nWHERE token = ?\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 4
+    },
+    "nullable": []
+  },
+  "hash": "f68a8917e639418a0bb952bef606c96299001e143c745ee30df99b72d1235d35"
+}
@@ -1,311 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nSELECT\n    m.token as `token: tokens::tokens::media_files::MediaFileToken`,\n\n    m.media_class as `media_class: enums::by_table::media_files::media_file_class::MediaFileClass`,\n    m.media_type as `media_type: enums::by_table::media_files::media_file_type::MediaFileType`,\n\n    m.maybe_mime_type,\n\n    users.token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n    users.username as maybe_creator_username,\n    users.display_name as maybe_creator_display_name,\n    users.email_gravatar_hash as maybe_creator_gravatar_hash,\n\n    m.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n\n    m.maybe_batch_token as `maybe_batch_token: tokens::tokens::batch_generations::BatchGenerationToken`,\n\n    m.maybe_title,\n    m.maybe_text_transcript,\n\n    m.maybe_origin_filename,\n\n    m.maybe_duration_millis,\n\n    m.maybe_prompt_token as `maybe_prompt_token: tokens::tokens::prompts::PromptToken`,\n    prompts.maybe_other_args as maybe_other_prompt_args,\n\n    media_file_cover_image.public_bucket_directory_hash as maybe_file_cover_image_public_bucket_hash,\n    media_file_cover_image.maybe_public_bucket_prefix as maybe_file_cover_image_public_bucket_prefix,\n    media_file_cover_image.maybe_public_bucket_extension as maybe_file_cover_image_public_bucket_extension,\n\n    m.creator_set_visibility as `creator_set_visibility: enums::common::visibility::Visibility`,\n\n    m.is_user_upload,\n    m.is_intermediate_system_file,\n\n    m.public_bucket_directory_hash,\n    m.maybe_public_bucket_prefix,\n    m.maybe_public_bucket_extension,\n\n    m.created_at,\n    m.updated_at\n\nFROM media_files AS m\nLEFT OUTER JOIN users\n    ON m.maybe_creator_user_token = users.token\nLEFT OUTER JOIN media_files as media_file_cover_image\n    ON media_file_cover_image.token = m.maybe_cover_image_media_file_token\nLEFT OUTER JOIN prompts\n    ON prompts.token = m.maybe_prompt_token\nWHERE\n    m.maybe_batch_token = ?\n    AND m.user_deleted_at IS NULL\n    AND m.mod_deleted_at IS NULL\n        ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "token: tokens::tokens::media_files::MediaFileToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 1,
-        "name": "media_class: enums::by_table::media_files::media_file_class::MediaFileClass",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 64
-        }
-      },
-      {
-        "ordinal": 2,
-        "name": "media_type: enums::by_table::media_files::media_file_type::MediaFileType",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 64
-        }
-      },
-      {
-        "ordinal": 3,
-        "name": "maybe_mime_type",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 4,
-        "name": "maybe_creator_user_token: tokens::tokens::users::UserToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 5,
-        "name": "maybe_creator_username",
-        "type_info": {
-          "type": "VarString",
-          "flags": "UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 80
-        }
-      },
-      {
-        "ordinal": 6,
-        "name": "maybe_creator_display_name",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 80
-        }
-      },
-      {
-        "ordinal": 7,
-        "name": "maybe_creator_gravatar_hash",
-        "type_info": {
-          "type": "String",
-          "flags": "BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 8,
-        "name": "maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 9,
-        "name": "maybe_batch_token: tokens::tokens::batch_generations::BatchGenerationToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 10,
-        "name": "maybe_title",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 1020
-        }
-      },
-      {
-        "ordinal": 11,
-        "name": "maybe_text_transcript",
-        "type_info": {
-          "type": "Blob",
-          "flags": "BLOB | BINARY",
-          "char_set": 224,
-          "max_size": 262140
-        }
-      },
-      {
-        "ordinal": 12,
-        "name": "maybe_origin_filename",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 1020
-        }
-      },
-      {
-        "ordinal": 13,
-        "name": "maybe_duration_millis",
-        "type_info": {
-          "type": "Long",
-          "flags": "",
-          "char_set": 63,
-          "max_size": 10
-        }
-      },
-      {
-        "ordinal": 14,
-        "name": "maybe_prompt_token: tokens::tokens::prompts::PromptToken",
-        "type_info": {
-          "type": "VarString",
-          "flags": "MULTIPLE_KEY | BINARY",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 15,
-        "name": "maybe_other_prompt_args",
-        "type_info": {
-          "type": "Blob",
-          "flags": "BLOB | BINARY",
-          "char_set": 224,
-          "max_size": 262140
-        }
-      },
-      {
-        "ordinal": 16,
-        "name": "maybe_file_cover_image_public_bucket_hash",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 17,
-        "name": "maybe_file_cover_image_public_bucket_prefix",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 64
-        }
-      },
-      {
-        "ordinal": 18,
-        "name": "maybe_file_cover_image_public_bucket_extension",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 64
-        }
-      },
-      {
-        "ordinal": 19,
-        "name": "creator_set_visibility: enums::common::visibility::Visibility",
-        "type_info": {
-          "type": "String",
-          "flags": "NOT_NULL | BINARY | ENUM",
-          "char_set": 224,
-          "max_size": 28
-        }
-      },
-      {
-        "ordinal": 20,
-        "name": "is_user_upload",
-        "type_info": {
-          "type": "Tiny",
-          "flags": "NOT_NULL | MULTIPLE_KEY",
-          "char_set": 63,
-          "max_size": 1
-        }
-      },
-      {
-        "ordinal": 21,
-        "name": "is_intermediate_system_file",
-        "type_info": {
-          "type": "Tiny",
-          "flags": "NOT_NULL | MULTIPLE_KEY",
-          "char_set": 63,
-          "max_size": 1
-        }
-      },
-      {
-        "ordinal": 22,
-        "name": "public_bucket_directory_hash",
-        "type_info": {
-          "type": "VarString",
-          "flags": "NOT_NULL | BINARY | NO_DEFAULT_VALUE",
-          "char_set": 224,
-          "max_size": 128
-        }
-      },
-      {
-        "ordinal": 23,
-        "name": "maybe_public_bucket_prefix",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 64
-        }
-      },
-      {
-        "ordinal": 24,
-        "name": "maybe_public_bucket_extension",
-        "type_info": {
-          "type": "VarString",
-          "flags": "BINARY",
-          "char_set": 224,
-          "max_size": 64
-        }
-      },
-      {
-        "ordinal": 25,
-        "name": "created_at",
-        "type_info": {
-          "type": "Timestamp",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | TIMESTAMP",
-          "char_set": 63,
-          "max_size": 19
-        }
-      },
-      {
-        "ordinal": 26,
-        "name": "updated_at",
-        "type_info": {
-          "type": "Timestamp",
-          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | TIMESTAMP | ON_UPDATE_NOW",
-          "char_set": 63,
-          "max_size": 19
-        }
-      }
-    ],
-    "parameters": {
-      "Right": 1
-    },
-    "nullable": [
-      false,
-      false,
-      false,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      true,
-      false,
-      false,
-      false,
-      false,
-      true,
-      true,
-      false,
-      false
-    ]
-  },
-  "hash": "f75fedb86a93ac2542315ddb7ef0d46aa42ecc25a3cf9856219114064183337a"
-}
@@ -10,7 +10,6 @@ members = [
  "crates/api_clients/fal_client",
  "crates/api_clients/google_drive_common",
  "crates/api_clients/google_sign_in",
-  "crates/api_clients/midjourney_client",
  "crates/api_clients/openai_sora_client",
  "crates/api_clients/openart_client",
  "crates/api_clients/runwayml_client",
@@ -43,7 +42,6 @@ members = [
  "crates/lib/caching/redis_caching",
  "crates/lib/cloudflare_errors",
  "crates/lib/concurrency",
-  "crates/lib/cookie_store",
  "crates/lib/cookies",
  "crates/lib/data/collections",
  "crates/lib/data/crockford",
@@ -201,8 +199,7 @@ log = "0.4.27"
 once_cell = "1.21.3"
 rand = "0.9.1"
 regex = "1.11.1"
-reqwest = { version = "0.12.22", features = ["json", "cookies"] }
-reqwest-websocket = {  version = "0.5.0" }
+reqwest = { version = "0.12.15", features = ["json", "cookies"] }
 serde = {  version = "1.0.219", features = ["derive"] }
 serde_derive = "1.0.219"
 serde_json = "1.0.140"
@@ -221,7 +218,6 @@ artcraft_api_defs = { path = "crates/schema/public/api/artcraft_api_defs" }
 build_metadata = { path = "crates/lib/build_metadata" }
 cloud_storage = { path = "crates/api_clients/cloud_storage" }
 cloudflare_errors = { path = "crates/lib/cloudflare_errors" }
-cookie_store = { path = "crates/lib/cookie_store" }
 crockford = { path = "crates/lib/data/crockford" }
 enums = { path = "crates/schema/public/enums" }
 enums_public = { path = "crates/schema/public/enums_public" }
@@ -234,7 +230,6 @@ images = { path = "crates/lib/files/images" }
 jwt_light = { path = "crates/lib/jwt_light" }
 memory_caching = { path = "crates/lib/caching/memory_caching" }
 memory_store = { path = "crates/lib/caching/memory_store" }
-midjourney_client = { path = "crates/api_clients/midjourney_client" }
 mimetypes = { path = "crates/lib/files/mimetypes" }
 openai_sora_client = { path = "crates/api_clients/openai_sora_client" }
 primitives = { path = "crates/lib/data/primitives" }
@@ -243,6 +238,5 @@ sqlite_tasks = { path = "crates/schema/database/sqlite_tasks" }
 storyteller_client = { path = "crates/api_clients/storyteller_client" }
 subprocess_common = { path = "crates/lib/subprocess_common" }
 test_data = { path = "crates/lib/test_data" }
-testing = { path = "crates/lib/testing" }
 tokens = { path = "crates/schema/public/tokens" }
 web_base64 = { path = "crates/lib/data/web_base64" }
@@ -1,53 +1,20 @@
 -- noinspection SqlDialectInspectionForFile
--
-- NB: This version needs to be bumped even if just adding or changing comments!
--  Failure to do so will cause Windows to segfault at start. (This is horrible!)
--
-- NB: `app_state_dir.rs` contains the file version number.
--
 -- Migration history:
 --   tasks_v1.sqlite - initial version
 --   tasks_v2.sqlite - added model_type (nullable)
--   tasks_v3.sqlite - added frontend_caller, comments

 CREATE TABLE tasks (
-    -- Task auto-incrementing primary key.
-    -- We don't use this.
    id TEXT NOT NULL PRIMARY KEY,

-    -- TaskStatus enum
-    -- This is how the job system manages job states.
-    -- e.g. pending, started, complete_success, dead, etc.
    task_status TEXT NOT NULL,
-
-    -- TaskType enum
-    -- e.g. image_generation, video_generation, etc.
    task_type TEXT NOT NULL,

-    -- TaskModelType enum
-    -- e.g. flux_1_dev, veo_2, etc.
    model_type TEXT,

-    -- GenerationProvider enum
-    -- Together with `provider_job_id`, this creates a foreign key lookup to the job.
-    -- e.g. 'artcraft', 'fal', 'sora', etc.
    provider TEXT,
-
-    -- The primary key for the job in the provider's system.
    provider_job_id TEXT,

-    -- OPTIONAL.
-    -- Tell the job system which caller initiated the task.
-    -- e.g. 'canvas'
-    frontend_caller TEXT,
-
-    -- OPTIONAL.
-    -- An arbitrary opaque identifier that frontend can set.
    frontend_subscriber_id TEXT,
-
-    -- OPTIONAL.
-    -- An opaque JSON payload set by the frontend subscriber that
-    -- will be re-emitted back to the frontend.
    frontend_subscriber_payload TEXT,

    created_at INTEGER NOT NULL DEFAULT (unixepoch('now')),
@@ -1,5 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-ALTER TABLE prompts DROP COLUMN maybe_model_type;
@@ -1,6 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-ALTER TABLE prompts
-    ADD COLUMN maybe_model_type VARCHAR(32) DEFAULT NULL;
@@ -1,5 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-ALTER TABLE prompts DROP COLUMN maybe_generation_provider;
@@ -1,6 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-ALTER TABLE prompts
-    ADD COLUMN maybe_generation_provider VARCHAR(16) DEFAULT NULL;
@@ -1,5 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-ALTER TABLE prompts DROP COLUMN maybe_anonymous_visitor_token;
@@ -1,6 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-ALTER TABLE prompts
-    ADD COLUMN maybe_anonymous_visitor_token VARCHAR(32) DEFAULT NULL;
@@ -1,5 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-DROP TABLE prompt_context_items;
@@ -1,30 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-- An n:m join table between prompts and media_files.
-- This associates mostly image media files with prompts, though we could conceivably
-- also store 3D sets, etc.
-CREATE TABLE prompt_context_items (
-  -- Not used for anything except replication.
-  id BIGINT(20) NOT NULL AUTO_INCREMENT,
-
-  -- The semantic type of context.
-  context_semantic_type VARCHAR(16) NOT NULL,
-
-  -- Foreign key, many-to-many
-  -- There is no uniqueness constraint for (prompt_token, media_token) because a user
-  -- might attach many duplicate images to the same prompt.
-  prompt_token VARCHAR(32) NOT NULL,
-
-  -- Foreign key to the media token
-  -- There is no uniqueness constraint for (prompt_token, media_token) because a user
-  -- might attach many duplicate images to the same prompt.
-  media_token VARCHAR(32) NOT NULL,
-
-  -- INDICES --
-  PRIMARY KEY (id),
-  KEY index_prompt_token (prompt_token),
-  KEY index_media_token (media_token)
-
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
@@ -1,5 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-ALTER TABLE generic_inference_jobs DROP COLUMN maybe_prompt_token;
@@ -1,6 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-ALTER TABLE generic_inference_jobs
-    ADD COLUMN maybe_prompt_token VARCHAR(32) DEFAULT NULL;
@@ -1,5 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-ALTER TABLE media_files DROP COLUMN maybe_generation_provider;
@@ -1,6 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-ALTER TABLE media_files
-    ADD COLUMN maybe_generation_provider VARCHAR(16) DEFAULT NULL;
@@ -15,9 +15,9 @@ CREATE TABLE batch_generations (

  -- The type of record this is attached to
  -- Currently supported values:
-  --   * 'model_weight' (deprecated)
-  --   * 'comment' (deprecated)
+  --   * 'model_weight'
  --   * 'media_file'
+  --   * 'comment'
  entity_type VARCHAR(32) NOT NULL,

  -- The token for the record.
@@ -37,4 +37,6 @@ CREATE TABLE batch_generations (
  -- NB: Realistically, we probably don't need this index until we have a lot of entity types, and the entity_token
  -- entropy is probably sufficient enough as-is.
  -- KEY index_entity_type_and_token (entity_type, entity_token),
+
+
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
@@ -21,8 +21,6 @@ CREATE TABLE generic_inference_jobs (
  -- The new enum for the type of job, which will eventually replace `inference_category` and `maybe_model_type`.
  -- This isn't fully supported yet in the inference-job, but we'll start populating it and adding logic around it.
  -- We'll start this out as nullable, then migrate the old rows with a default column value.
-  --
-  -- Fal jobs have the type `fal_queue`.
  job_type VARCHAR(32) DEFAULT NULL,

  -- There is an index on this column.
@@ -105,11 +103,6 @@ CREATE TABLE generic_inference_jobs (
  -- And furthermore, not all download URLs have a cover image.
  maybe_cover_image_media_file_token VARCHAR(32) DEFAULT NULL,

-  -- If we pre-constructed a prompt, this will be copied to the resultant media generated.
-  -- This is especially important for Fal-related jobs and endpoints. We need this for keeping
-  -- track of all the prompt details, context images, etc.
-  maybe_prompt_token VARCHAR(30) DEFAULT NULL,
-
  -- A migration flag we can control from the backend API service which will tell
  -- the worker where to store the results. If false, GCP. If true, AWS.
  store_in_aws BOOLEAN NOT NULL DEFAULT FALSE,
@@ -61,9 +61,6 @@ CREATE TABLE media_files (
  --   * 'workflow' (DEPRECATED)
  origin_product_category VARCHAR(16) NOT NULL DEFAULT "unknown",

-  -- What service provided the generation (if any).
-  maybe_generation_provider VARCHAR(16) DEFAULT NULL,
-
  -- For inference that can be tied back to a model, the type of model.
  -- There are multiple indices on this column!
  -- DO NOT EXPOSE THIS TO USERS VIA THE API, as we may leak secrets in doing so.
@@ -19,25 +19,13 @@ CREATE TABLE prompts (
  -- Original product to which the prompt applied.
  -- Prompts may or may not be compatible across products.
  -- Possible values:
-  --  * 'artcraft_app'
-  --  * 'stable_diffusion' (legacy)
-  --  * 'comfy_ui' (legacy)
+  --  * 'stable_diffusion'
+  --  * 'comfy_ui'
  prompt_type VARCHAR(16) NOT NULL,

-  -- What type of model was used to generate the result.
-  -- NB: We're conflating prompts with outputs, but in a
-  -- sense the model is inextricably part of the prompt.
-  maybe_model_type VARCHAR(32) DEFAULT NULL,
-
-  -- What service provided the generation.
-  maybe_generation_provider VARCHAR(16) NOT NULL,
-
-  -- Whoever created the prompt
+  -- Whomever created the prompt
  maybe_creator_user_token VARCHAR(32) DEFAULT NULL,

-  -- Whoever created the prompt (anonymous user tracking)
-  maybe_anonymous_visitor_token VARCHAR(32) DEFAULT NULL,
-
  -- ========== PROMPT DETAILS ==========

  -- The positive prompt (optional)
@@ -1,30 +0,0 @@
-- noinspection SqlDialectInspectionForFile
-- noinspection SqlNoDataSourceInspectionForFile
-- noinspection SqlResolveForFile
-
-- An n:m join table between prompts and media_files.
-- This associates mostly image media files with prompts, though we could conceivably
-- also store 3D sets, etc.
-CREATE TABLE prompt_context_items (
-  -- Not used for anything except replication.
-  id BIGINT(20) NOT NULL AUTO_INCREMENT,
-
-  -- Foreign key, many-to-many
-  -- There is no uniqueness constraint for (prompt_token, media_token) because a user
-  -- might attach many duplicate images to the same prompt.
-  prompt_token VARCHAR(32) NOT NULL,
-
-  -- Foreign key to the media token
-  -- There is no uniqueness constraint for (prompt_token, media_token) because a user
-  -- might attach many duplicate images to the same prompt.
-  media_token VARCHAR(32) NOT NULL,
-
-  -- The semantic type of context.
-  context_semantic_type VARCHAR(16) NOT NULL,
-
-  -- INDICES --
-  PRIMARY KEY (id),
-  KEY index_prompt_token (prompt_token),
-  KEY index_media_token (media_token)
-
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
@@ -1,89 +0,0 @@
-use crate::creds::fal_api_key::FalApiKey;
-use crate::error::classify_fal_error::classify_fal_error;
-use crate::error::fal_error_plus::FalErrorPlus;
-use fal::prelude::fal_ai::flux_pro::kontext::max::{max, FluxProKontextMaxInput};
-use fal::webhook::WebhookResponse;
-use reqwest::IntoUrl;
-
-pub struct FluxProKontextMaxArgs<'a, U: IntoUrl, R: IntoUrl> {
-  // Request
-  pub prompt: &'a str,
-  pub image_url: U,
-  pub num_images: FluxProKontextMaxNumImages,
-
-  // Fulfillment
-  pub webhook_url: R,
-  pub api_key: &'a FalApiKey,
-}
-
-#[derive(Copy, Clone, Debug)]
-pub enum FluxProKontextMaxNumImages {
-  One, // Default
-  Two,
-  Three,
-  Four,
-}
-
-pub async fn enqueue_flux_pro_kontext_max_edit_webhook<U: IntoUrl, R: IntoUrl>(
-  args: FluxProKontextMaxArgs<'_, U, R>
-) -> Result<WebhookResponse, FalErrorPlus> {
-
-  let num_images = match args.num_images {
-    FluxProKontextMaxNumImages::One => 1,
-    FluxProKontextMaxNumImages::Two => 2,
-    FluxProKontextMaxNumImages::Three => 3,
-    FluxProKontextMaxNumImages::Four => 4,
-  };
-
-  let request = FluxProKontextMaxInput {
-    prompt: args.prompt.to_string(),
-    image_url: args.image_url.as_str().to_string(),
-    num_images: Some(num_images),
-
-    // Maybe expose
-    aspect_ratio: None,
-    safety_tolerance: Some("5".to_string()), // NB: 5 is most tolerant
-    output_format: Some("png".to_string()), // png or jpeg
-    seed: None,
-
-    // Constants
-    sync_mode: None, // Synchronous / slow
-  };
-
-  let result = max(request)
-      .with_api_key(&args.api_key.0)
-      .queue_webhook(args.webhook_url)
-      .await;
-
-  result.map_err(|err| classify_fal_error(err))
-}
-
-#[cfg(test)]
-mod tests {
-  use crate::creds::fal_api_key::FalApiKey;
-  use crate::requests::webhook::image::edit::enqueue_flux_pro_kontext_max_edit_webhook::{enqueue_flux_pro_kontext_max_edit_webhook, FluxProKontextMaxArgs, FluxProKontextMaxNumImages};
-  use errors::AnyhowResult;
-  use std::fs::read_to_string;
-  use test_data::web::image_urls::TALL_MOCHI_WITH_GLASSES_IMAGE_URL;
-
-  #[tokio::test]
-  #[ignore]
-  async fn test() -> AnyhowResult<()> {
-    // XXX: Don't commit secrets!
-    let secret = read_to_string("/Users/bt/Artcraft/credentials/fal_api_key.txt")?;
-
-    let api_key = FalApiKey::from_str(&secret);
-
-    let args = FluxProKontextMaxArgs {
-      image_url: TALL_MOCHI_WITH_GLASSES_IMAGE_URL,
-      prompt: "turn the glasses into sunglasses, make them sleek sunglasses with black rims, square shaped",
-      api_key: &api_key,
-      webhook_url: "https://example.com/webhook",
-      num_images: FluxProKontextMaxNumImages::One,
-    };
-
-    let result = enqueue_flux_pro_kontext_max_edit_webhook(args).await?;
-
-    Ok(())
-  }
-}
@@ -1 +0,0 @@
-pub mod enqueue_flux_pro_kontext_max_edit_webhook;
@@ -1,123 +0,0 @@
-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 fal::prelude::fal_ai::gpt_image_1::edit_image::byok::{gpt_text_to_image, GptTextToImageRequest};
-use fal::webhook::WebhookResponse;
-use reqwest::IntoUrl;
-
-pub struct GptTextToImageByokArgs<'a, V: IntoUrl> {
-  // Request
-  pub prompt: &'a str,
-  pub image_size: GptTextToImageSize,
-  pub num_images: GptTextToImageNumImages,
-  pub quality: GptTextToImageQuality,
-  
-  // Fulfillment
-  pub api_key: &'a FalApiKey,
-  pub openai_api_key: &'a OpenAiApiKey,
-  pub webhook_url: V,
-}
-
-#[derive(Copy, Clone, Debug)]
-pub enum GptTextToImageSize{
-  Auto,
-  Square,
-  Horizontal,
-  Vertical,
-}
-
-#[derive(Copy, Clone, Debug)]
-pub enum GptTextToImageQuality {
-  Auto,
-  Low,
-  Medium,
-  High,
-}
-
-#[derive(Copy, Clone, Debug)]
-pub enum GptTextToImageNumImages{
-  One,
-  Two,
-  Three,
-  Four,
-}
-
-pub async fn enqueue_gpt_image_1_text_to_image_webhook<V: IntoUrl>(
-  args: GptTextToImageByokArgs<'_, V>
-) -> Result<WebhookResponse, FalErrorPlus> {
-
-  // auto, 1024x1024, 1536x1024, 1024x1536
-  let image_size = match args.image_size {
-    GptTextToImageSize::Auto => "auto",
-    GptTextToImageSize::Square => "1024x1024",
-    GptTextToImageSize::Horizontal => "1536x1024",
-    GptTextToImageSize::Vertical => "1024x1536",
-  };
-  
-  let quality = match args.quality {
-    GptTextToImageQuality::Auto => "auto",
-    GptTextToImageQuality::Low => "low",
-    GptTextToImageQuality::Medium => "medium",
-    GptTextToImageQuality::High => "high",
-  };
-
-  let num_images = match args.num_images {
-    GptTextToImageNumImages::One => 1,
-    GptTextToImageNumImages::Two => 2,
-    GptTextToImageNumImages::Three => 3,
-    GptTextToImageNumImages::Four => 4,
-  };
-
-  let request = GptTextToImageRequest {
-    prompt: args.prompt.to_string(),
-    image_size: image_size.to_string(),
-    num_images,
-    quality: quality.to_string(),
-    openai_api_key: args.openai_api_key.0.to_string(),
-  };
-
-  let result = gpt_text_to_image(request)
-      .with_api_key(&args.api_key.0)
-      .queue_webhook(args.webhook_url)
-      .await;
-
-  result.map_err(|err| classify_fal_error(err))
-}
-
-
-#[cfg(test)]
-mod tests {
-  use crate::creds::fal_api_key::FalApiKey;
-  use crate::creds::open_ai_api_key::OpenAiApiKey;
-  use crate::requests::webhook::image::enqueue_gpt_image_1_text_to_image_webhook::{enqueue_gpt_image_1_text_to_image_webhook, GptTextToImageByokArgs, GptTextToImageNumImages, GptTextToImageQuality, GptTextToImageSize};
-  use errors::AnyhowResult;
-  use std::fs::read_to_string;
-
-  #[tokio::test]
-  #[ignore]
-  async fn test_gpt_image_1_edit_image() -> AnyhowResult<()> {
-    // XXX: Don't commit secrets!
-    let secret = read_to_string("/Users/bt/Artcraft/credentials/fal_api_key.txt")?;
-
-    let fal_api_key = FalApiKey::from_str(&secret);
-
-    let secret = read_to_string("/Users/bt/Artcraft/credentials/openai_api_key.txt")?;
-
-    let open_ai_api_key = OpenAiApiKey::from_str(&secret);
-
-    let args = GptTextToImageByokArgs {
-      prompt: "put the man and the ghost on the grassy hill. the man is scared of the friendly ghost.",
-      api_key: &fal_api_key,
-      openai_api_key: &open_ai_api_key,
-      webhook_url: "https://example.com/webhook",
-      image_size: GptTextToImageSize::Horizontal,
-      num_images: GptTextToImageNumImages::One,
-      quality: GptTextToImageQuality::High,
-    };
-
-    let result = enqueue_gpt_image_1_text_to_image_webhook(args).await?;
-
-    Ok(())
-  }
-}
@@ -1,96 +0,0 @@
-use crate::creds::fal_api_key::FalApiKey;
-use crate::error::classify_fal_error::classify_fal_error;
-use crate::error::fal_error_plus::FalErrorPlus;
-use fal::prelude::rundiffusion_fal::juggernaut_flux_lora::inpainting::{inpainting, InpaintInput};
-use fal::webhook::WebhookResponse;
-use reqwest::IntoUrl;
-
-pub struct FluxDevJuggernautInfillArgs<'a, U: IntoUrl, R: IntoUrl, L: IntoUrl> {
-  // Request
-  pub prompt: &'a str,
-  pub image_url: U,
-  pub mask_url: R,
-  pub num_images: FluxDevJuggernautInfillNumImages,
-
-  // Fulfillment
-  pub webhook_url: L,
-  pub api_key: &'a FalApiKey,
-}
-
-#[derive(Copy, Clone, Debug)]
-pub enum FluxDevJuggernautInfillNumImages {
-  One, // Default
-  Two,
-  Three,
-  Four,
-}
-
-pub async fn enqueue_flux_dev_juggernaut_infill_webhook<U: IntoUrl, R: IntoUrl, L: IntoUrl>(
-  args: FluxDevJuggernautInfillArgs<'_, U, R, L>
-) -> Result<WebhookResponse, FalErrorPlus> {
-
-  let num_images = match args.num_images {
-    FluxDevJuggernautInfillNumImages::One => 1,
-    FluxDevJuggernautInfillNumImages::Two => 2,
-    FluxDevJuggernautInfillNumImages::Three => 3,
-    FluxDevJuggernautInfillNumImages::Four => 4,
-  };
-
-  let request = InpaintInput {
-    prompt: args.prompt.to_string(),
-    image_url: args.image_url.as_str().to_string(),
-    mask_url: args.mask_url.as_str().to_string(),
-    num_images: Some(num_images),
-
-    // Maybe expose
-    output_format: Some("png".to_string()), // png or jpeg
-    seed: None,
-    strength: None,
-    loras: None,
-    num_inference_steps: None,
-    image_size: None,
-    enable_safety_checker: None,
-    guidance_scale: None,
-
-    // Constants
-    sync_mode: None, // Synchronous / slow
-  };
-
-  let result = inpainting(request)
-      .with_api_key(&args.api_key.0)
-      .queue_webhook(args.webhook_url)
-      .await;
-
-  result.map_err(|err| classify_fal_error(err))
-}
-
-#[cfg(test)]
-mod tests {
-  use crate::creds::fal_api_key::FalApiKey;
-  use crate::requests::webhook::image::infill::enqueue_flux_dev_juggernaut_infill_webhook::{enqueue_flux_dev_juggernaut_infill_webhook, FluxDevJuggernautInfillArgs, FluxDevJuggernautInfillNumImages};
-  use errors::AnyhowResult;
-  use std::fs::read_to_string;
-  use test_data::web::image_urls::{TALL_MOCHI_WITH_GLASSES_GLASSES_MASK_IMAGE_URL, TALL_MOCHI_WITH_GLASSES_IMAGE_URL};
-
-  #[tokio::test]
-  #[ignore]
-  async fn test() -> AnyhowResult<()> {
-    // XXX: Don't commit secrets!
-    let secret = read_to_string("/Users/bt/Artcraft/credentials/fal_api_key.txt")?;
-
-    let api_key = FalApiKey::from_str(&secret);
-
-    let args = FluxDevJuggernautInfillArgs {
-      image_url: TALL_MOCHI_WITH_GLASSES_IMAGE_URL,
-      mask_url: TALL_MOCHI_WITH_GLASSES_GLASSES_MASK_IMAGE_URL,
-      prompt: "slick sunglasses, cool glasses, reflection in glasses lenses",
-      api_key: &api_key,
-      webhook_url: "https://example.com/webhook",
-      num_images: FluxDevJuggernautInfillNumImages::Two,
-    };
-
-    let result = enqueue_flux_dev_juggernaut_infill_webhook(args).await?;
-
-    Ok(())
-  }
-}
@@ -1,92 +0,0 @@
-use crate::creds::fal_api_key::FalApiKey;
-use crate::error::classify_fal_error::classify_fal_error;
-use crate::error::fal_error_plus::FalErrorPlus;
-use fal::prelude::fal_ai::flux_pro::v1::fill::fill;
-use fal::prelude::fal_ai::flux_pro::v1::fill::FluxProFillInput;
-use fal::webhook::WebhookResponse;
-use reqwest::IntoUrl;
-
-pub struct FluxPro1InfillArgs<'a, U: IntoUrl, R: IntoUrl, L: IntoUrl> {
-  // Request
-  pub prompt: &'a str,
-  pub image_url: U,
-  pub mask_url: R,
-  pub num_images: FluxPro1InfillNumImages,
-
-  // Fulfillment
-  pub webhook_url: L,
-  pub api_key: &'a FalApiKey,
-}
-
-#[derive(Copy, Clone, Debug)]
-pub enum FluxPro1InfillNumImages {
-  One, // Default
-  Two,
-  Three,
-  Four,
-}
-
-pub async fn enqueue_flux_pro_1_infill_webhook<U: IntoUrl, R: IntoUrl, L: IntoUrl>(
-  args: FluxPro1InfillArgs<'_, U, R, L>
-) -> Result<WebhookResponse, FalErrorPlus> {
-
-  let num_images = match args.num_images {
-    FluxPro1InfillNumImages::One => 1,
-    FluxPro1InfillNumImages::Two => 2,
-    FluxPro1InfillNumImages::Three => 3,
-    FluxPro1InfillNumImages::Four => 4,
-  };
-
-  let request = FluxProFillInput {
-    prompt: args.prompt.to_string(),
-    image_url: args.image_url.as_str().to_string(),
-    mask_url: args.mask_url.as_str().to_string(),
-    num_images: Some(num_images),
-
-    // Maybe expose
-    safety_tolerance: Some("5".to_string()), // NB: 5 is most tolerant
-    output_format: Some("png".to_string()), // png or jpeg
-    seed: None,
-
-    // Constants
-    sync_mode: None, // Synchronous / slow
-  };
-
-  let result = fill(request)
-      .with_api_key(&args.api_key.0)
-      .queue_webhook(args.webhook_url)
-      .await;
-
-  result.map_err(|err| classify_fal_error(err))
-}
-
-#[cfg(test)]
-mod tests {
-  use crate::creds::fal_api_key::FalApiKey;
-  use crate::requests::webhook::image::infill::enqueue_flux_pro_1_infill_webhook::{enqueue_flux_pro_1_infill_webhook, FluxPro1InfillArgs, FluxPro1InfillNumImages};
-  use errors::AnyhowResult;
-  use std::fs::read_to_string;
-  use test_data::web::image_urls::{TALL_MOCHI_WITH_GLASSES_GLASSES_MASK_IMAGE_URL, TALL_MOCHI_WITH_GLASSES_IMAGE_URL};
-
-  #[tokio::test]
-  #[ignore]
-  async fn test() -> AnyhowResult<()> {
-    // XXX: Don't commit secrets!
-    let secret = read_to_string("/Users/bt/Artcraft/credentials/fal_api_key.txt")?;
-
-    let api_key = FalApiKey::from_str(&secret);
-
-    let args = FluxPro1InfillArgs {
-      image_url: TALL_MOCHI_WITH_GLASSES_IMAGE_URL,
-      mask_url: TALL_MOCHI_WITH_GLASSES_GLASSES_MASK_IMAGE_URL,
-      prompt: "slick sunglasses, cool glasses, reflection in glasses lenses",
-      api_key: &api_key,
-      webhook_url: "https://example.com/webhook",
-      num_images: FluxPro1InfillNumImages::One,
-    };
-
-    let result = enqueue_flux_pro_1_infill_webhook(args).await?;
-
-    Ok(())
-  }
-}
@@ -1,2 +0,0 @@
-pub mod enqueue_flux_dev_juggernaut_infill_webhook;
-pub mod enqueue_flux_pro_1_infill_webhook;
@@ -1,9 +1,6 @@
-pub mod edit;
 pub mod enqueue_flux_1_dev_text_to_image_webhook;
 pub mod enqueue_flux_1_schnell_text_to_image_webhook;
 pub mod enqueue_flux_pro_11_text_to_image_webhook;
 pub mod enqueue_flux_pro_11_ultra_text_to_image_webhook;
 pub mod enqueue_gpt_image_1_edit_image_webhook;
-pub mod enqueue_gpt_image_1_text_to_image_webhook;
-pub mod infill;
 pub mod remove_background_rembg_webhook;
@@ -1,55 +0,0 @@
-[package]
-name = "midjourney_client"
-edition = "2024"
-version = "0.0.1"
-publish = false
-
-[package.metadata.cargo-udeps.ignore]
-normal = ["workspace-build-acceleration"]
-
-[lib]
-name = "midjourney_client"
-path = "src/lib.rs"
-
-[dependencies]
-# Workspace hack (faster compile times)
-workspace-build-acceleration.workspace = true
-
-# Internal
-cloudflare_errors.workspace = true
-cookie_store.workspace = true
-errors.workspace = true
-
-# External
-anyhow.workspace = true
-futures.workspace = true
-log.workspace = true
-#reqwest-websocket.workspace = true
-#reqwest.workspace = true
-#reqwest-impersonate = { version = "0", features = ["websocket"] }
-serde.workspace = true
-serde_json.workspace = true
-#tokio.workspace = true
-url.workspace = true
-
-# NB: wreq gets past fingerprinting, but we have to deal with platform-specific build issues.
-#
-# Mac:
-#   brew install --formula cmake pkg-config llvm
-# Windows:
-#   choco install cmake -y
-#   choco install strawberryperl -y
-#   choco install pkgconfiglite -y
-#   choco install llvm -y
-#   choco install nasm -y
-wreq = { version = "5", features = ["json"] }
-wreq-util = "2"
-tokio = { version = "1", features = ["full"] }
-
-# NB: We need to parse HTML to get out the websocket token
-dom_query = "0.20.2"
-
-[dev-dependencies]
-filesys.workspace = true
-test_data.workspace = true
-testing.workspace = true
@@ -1,17 +0,0 @@
-
-/// Multiple third party Midjourney clients make this configurable.
-/// Not sure why, I'm just cargo culting it.
-#[derive(Clone)]
-pub enum MidjourneyHostname {
-  Standard,
-  Custom(String),
-}
-
-impl MidjourneyHostname {
-  pub fn as_str(&self) -> &str {
-    match self {
-      Self::Standard => "www.midjourney.com",
-      Self::Custom(domain) => domain,
-    }
-  }
-}
@@ -1,2 +0,0 @@
-pub mod midjourney_hostname;
-pub mod midjourney_websocket_client;
@@ -1,6 +0,0 @@
-
-/// One of the apparent authentication cookies used by Midjourney.
-pub (crate) const AUTH_COOKIE_NAME_R : &str = "__Host-Midjourney.AuthUserTokenV3_r";
-
-/// One of the apparent authentication cookies used by Midjourney.
-pub (crate) const AUTH_COOKIE_NAME_I : &str = "__Host-Midjourney.AuthUserTokenV3_i";
@@ -1,8 +0,0 @@
-use crate::credentials::cookie_names::{AUTH_COOKIE_NAME_I, AUTH_COOKIE_NAME_R};
-use cookie_store::cookie_store::CookieStore;
-
-/// Returns true if the given cookie store has the necessary authentication cookies.
-pub fn cookie_store_has_auth_cookies(cookie_store: &CookieStore) -> bool {
-  cookie_store.has_cookie(AUTH_COOKIE_NAME_I)
-      && cookie_store.has_cookie(AUTH_COOKIE_NAME_R)
-}
@@ -1,31 +0,0 @@
-
-/*
-{
-  "name": "u3869671173",
-  "picture": "https://lh3.googleusercontent.com/a/ACg8ocKw0aaXKYSqy-Xkkn69ydIJFGnJA37S13XvjNY4d9xCzUzKUw=s96-c",
-  "midjourney_id": "f8a57ac3-e416-4dd4-9be8-2c4223691b01",
-  "iss": "https://securetoken.google.com/authjourney",
-  "aud": "authjourney",
-  "auth_time": 1754970849,
-  "user_id": "bS9idl73DlSbE61KnCyKpDfazCX2",
-  "sub": "bS9idl73DlSbE61KnCyKpDfazCX2",
-  "iat": 1754970849,
-  "exp": 1754974449,
-  "email": "victorvoice89@gmail.com",
-  "email_verified": true,
-  "firebase": {
-    "identities": {
-      "google.com": [
-        "116459300198619888836"
-      ],
-      "email": [
-        "victorvoice89@gmail.com"
-      ]
-    },
-    "sign_in_provider": "google.com"
-  }
-}
-*/
-
-/*
- */
@@ -1,22 +0,0 @@
-
-/// The user ID used for several midjourney requests.
-#[derive(Clone, Debug, Eq, PartialEq, Hash)]
-pub struct MidjourneyUserId(pub String);
-
-impl MidjourneyUserId {
-  pub fn from_str(user_id: &str) -> Self {
-    Self(user_id.to_string())
-  }
-  
-  pub fn from_string(user_id: String) -> Self {
-    Self(user_id)
-  }
-
-  pub fn as_str(&self) -> &str {
-    &self.0
-  }
-  
-  pub fn to_string(&self) -> String {
-    self.0.to_string()
-  }
-}
@@ -1,4 +0,0 @@
-pub mod cookie_names;
-pub mod cookie_store_has_auth_cookies;
-pub mod jwt_decode;
-pub mod midjourney_user_id;
@@ -1,95 +0,0 @@
-use crate::client::midjourney_hostname::MidjourneyHostname;
-use crate::error::midjourney_api_error::MidjourneyApiError;
-use crate::error::midjourney_client_error::MidjourneyClientError;
-use crate::error::midjourney_error::MidjourneyError;
-use cloudflare_errors::filter_cloudflare_errors::filter_cloudflare_errors;
-use log::error;
-use serde::Deserialize;
-use wreq::Client;
-use wreq_util::Emulation;
-
-/// This grabs the pre-rendered HTML page, which contains the websocket token and other details.
-pub struct GetIndexPageRequest {
-  pub hostname: MidjourneyHostname,
-  pub cookie_header: String,
-}
-
-pub async fn get_index_page_html(req: GetIndexPageRequest) -> Result<String, MidjourneyError> {
-  let url = format!("https://{}/", req.hostname.as_str());
-
-  let client = Client::builder()
-      .emulation(Emulation::Firefox139)
-      .build()
-      .map_err(|err| MidjourneyClientError::WreqError(err))?;
-
-  let cookie_header = req.cookie_header.trim();
-
-  if cookie_header.len() < 20 {
-    error!("Cookie header is too short (len: {}): {}", cookie_header.len(), cookie_header);
-    return Err(MidjourneyClientError::CookieTooShort.into());
-  }
-
-  // NB: missing headers that were in the browser request:
-  // -H 'sec-ch-ua-platform: "macOS"' \
-  // -H 'sec-ch-ua: "Not)A;Brand";v="8", "Chromium";v="138", "Google Chrome";v="138"' \
-
-  let mut http_request = client.get(url)
-      .header("cookie", cookie_header)
-      .header("Referrer-Policy", "origin-when-cross-origin")
-      .header("accept", "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7")
-      .header("accept-language", "en-US,en;q=0.8")
-      .header("content-type", "application/json")
-      .header("priority", "u=0, i")
-      .header("sec-ch-ua-mobile", "?0")
-      .header("sec-fetch-dest", "document")
-      .header("sec-fetch-mode", "navigate")
-      .header("sec-fetch-site", "none")
-      .header("sec-fetch-user", "?1")
-      .header("upgrade-insecure-requests", "1");
-
-  let http_request  = http_request
-      .build()
-      .map_err(|err| MidjourneyClientError::WreqError(err))?;
-
-  let response = client.execute(http_request)
-      .await
-      .map_err(|e| MidjourneyApiError::NetworkError(e.to_string()))?;
-
-  let status = response.status();
-
-  let response_body = response.text().await
-      .map_err(|e| MidjourneyApiError::NetworkError(e.to_string()))?;
-
-  if !status.is_success() {
-    if let Err(err) = filter_cloudflare_errors(status.as_u16(), &response_body) {
-      return Err(MidjourneyApiError::CloudflareError(err).into());
-    }
-  }
-  
-  Ok(response_body)
-}
-
-#[cfg(test)]
-mod tests {
-  use crate::client::midjourney_hostname::MidjourneyHostname;
-  use errors::AnyhowResult;
-  use filesys::read_to_trimmed_string::read_to_trimmed_string;
-  use crate::endpoints::get_index_page_html::{get_index_page_html, GetIndexPageRequest};
-
-  #[ignore]
-  #[tokio::test]
-  async fn test() -> AnyhowResult<()> {
-    let cookie_header = read_to_trimmed_string("/Users/bt/secrets/midjourney/cookie.txt")?;
-
-    let result = get_index_page_html(GetIndexPageRequest {
-      cookie_header,
-      hostname: MidjourneyHostname::Standard,
-    }).await?;
-
-    println!("Response: {:?}\n\n", result);
-
-    assert_eq!(1, 2);
-
-    Ok(())
-  }
-}
@@ -1,251 +0,0 @@
-use crate::client::midjourney_hostname::MidjourneyHostname;
-use crate::credentials::midjourney_user_id::MidjourneyUserId;
-use crate::error::midjourney_api_error::MidjourneyApiError;
-use crate::error::midjourney_client_error::MidjourneyClientError;
-use crate::error::midjourney_error::MidjourneyError;
-use cloudflare_errors::filter_cloudflare_errors::filter_cloudflare_errors;
-use log::error;
-use serde::Deserialize;
-use wreq::Client;
-use wreq_util::Emulation;
-
-const DEFAULT_PAGE_SIZE : u64 = 1000;
-
-/// This returns Midjourney's job/media list
-pub struct ImagineRequest<'a> {
-  pub hostname: MidjourneyHostname,
-  pub cookie_header: String,
-  pub user_id: &'a MidjourneyUserId,
-  pub page_size: Option<u64>,
-}
-
-#[derive(Debug, Clone)]
-pub struct ImagineResponse {
-  pub items: Vec<ImagineItem>,
-  pub cursor: Option<String>,
-}
-
-#[derive(Debug, Clone)]
-pub struct ImagineItem {
-  pub id: Option<String>,
-
-  /// This is the prompt, e.g.
-  /// `cute puppy wearing a polar bear suit --ar 4:3 --raw --v 7.0`
-  pub full_command: Option<String>,
-
-  pub job_type: Option<MidjourneyJobType>,
-}
-
-#[derive(Debug, Clone)]
-pub enum MidjourneyJobType {
-  V6Diffusion,
-  V6p1Diffusion,
-  V6p1RawDiffusion,
-  V7Diffusion,
-  V7DraftDiffusion,
-  V7DraftRawDiffusion,
-  V7RawDiffusion,
-  Vid11I2vRenderAJointVideo,
-  Vid11I2vRenderBJointVideo,
-  Vid11I2vStartEndAVideo,
-  Vid11I2vStartEndBVideo,
-  Other(String),
-}
-
-impl MidjourneyJobType {
-  pub fn from_str(s: &str) -> MidjourneyJobType {
-    match s {
-      "v6_diffusion" => MidjourneyJobType::V6Diffusion,
-      "v6-1_diffusion" => MidjourneyJobType::V6p1Diffusion,
-      "v6-1_raw_diffusion" => MidjourneyJobType::V6p1RawDiffusion,
-      "v7_diffusion" => MidjourneyJobType::V7Diffusion,
-      "v7_draft_diffusion" => MidjourneyJobType::V7DraftDiffusion,
-      "v7_draft_raw_diffusion" => MidjourneyJobType::V7DraftRawDiffusion,
-      "v7_raw_diffusion" => MidjourneyJobType::V7RawDiffusion,
-      "vid_1.1_i2v_render_a_joint_video" => MidjourneyJobType::Vid11I2vRenderAJointVideo,
-      "vid_1.1_i2v_render_b_joint_video" => MidjourneyJobType::Vid11I2vRenderBJointVideo,
-      "vid_1.1_i2v_start_end_a_video" => MidjourneyJobType::Vid11I2vStartEndAVideo,
-      "vid_1.1_i2v_start_end_b_video" => MidjourneyJobType::Vid11I2vStartEndBVideo,
-      other => MidjourneyJobType::Other(other.to_string()),
-    }
-  }
-}
-
-pub async fn imagine(req: ImagineRequest<'_>) -> Result<ImagineResponse, MidjourneyError> {
-  let cookie_header = req.cookie_header.trim();
-
-  if cookie_header.len() < 20 {
-    error!("Cookie header is too short (len: {}): {}", cookie_header.len(), cookie_header);
-    return Err(MidjourneyClientError::CookieTooShort.into());
-  }
-
-  let page_size = req.page_size.unwrap_or(DEFAULT_PAGE_SIZE);
-
-  let referer = format!("https://{}/imagine", req.hostname.as_str());
-
-  let url = format!("https://{}/api/imagine?user_id={}&page_size={}",
-    req.hostname.as_str(),
-    req.user_id.as_str(),
-    page_size,
-  );
-
-  let client = Client::builder()
-      .emulation(Emulation::Firefox139)
-      .build()
-      .map_err(|err| MidjourneyClientError::WreqError(err))?;
-
-  // NB: missing headers that were in the browser request:
-  // -H 'sec-ch-ua-platform: "macOS"' \
-  // -H 'sec-ch-ua: "Not)A;Brand";v="8", "Chromium";v="138", "Google Chrome";v="138"' \
-
-  let mut http_request = client.get(url)
-      .header("cookie", cookie_header)
-      .header("Referer", &referer)
-      .header("Referrer-Policy", "origin-when-cross-origin")
-      .header("accept", "*/*")
-      .header("accept-encoding", "gzip, deflate, br, zstd")
-      .header("accept-language", "en-US,en;q=0.8")
-      .header("content-type", "application/json")
-      .header("priority", "u=1, i")
-      .header("sec-ch-ua-mobile", "?0")
-      .header("sec-fetch-dest", "empty")
-      .header("sec-fetch-mode", "cors")
-      .header("sec-fetch-site", "same-origin")
-      .header("x-csrf-protection", "1");
-
-  let http_request  = http_request
-      .build()
-      .map_err(|err| MidjourneyClientError::WreqError(err))?;
-
-  let response = client.execute(http_request)
-      .await
-      .map_err(|e| MidjourneyApiError::NetworkError(e.to_string()))?;
-
-  let status = response.status();
-
-  let response_body = response.text().await
-      .map_err(|e| MidjourneyApiError::NetworkError(e.to_string()))?;
-
-  if !status.is_success() {
-    if let Err(err) = filter_cloudflare_errors(status.as_u16(), &response_body) {
-      return Err(MidjourneyApiError::CloudflareError(err).into());
-    }
-  }
-
-  /*
-  {
-    "data": [
-        {
-            "id": "a2339f14-ff71-43e4-a69f-8da15e7ba871",
-            "enqueue_time": "2025-08-14T17:21:28.403560+00:00",
-            "parent_id": null,
-            "video_segments": null,
-            "rating": null,
-            "job_type": "v7_diffusion",
-            "event_type": "diffusion",
-            "parent_grid": null,
-            "full_command": "a modern n64 console",
-            "batch_size": 4,
-            "width": 1024,
-            "height": 1024,
-            "published": true,
-            "shown": true,
-            "user_hidden": false,
-            "template": null,
-            "vid_framecount": null
-        },
-      ],
-      "cursor": "encrypted cursor",
-      "checkpoint": "encrypted something ???"
-    }
-   */
-
-
-  #[derive(Deserialize, Debug)]
-  #[allow(non_snake_case)]
-  struct RawImagineResponse {
-    data: Vec<RawImagineItem>,
-    cursor: Option<String>,
-    //pub checkpoint: Option<String>,
-  }
-
-  #[derive(Deserialize, Debug)]
-  #[allow(non_snake_case)]
-  struct RawImagineItem {
-    // The job id
-    id: Option<String>,
-
-    // The prompt plus `--` args.
-    full_command: Option<String>,
-
-    // Number of images, typically 4
-    batch_size: Option<u8>,
-
-    // Some possible values:
-    // "v6_diffusion"
-    // "v7_diffusion"
-    // "v7_draft_raw_diffusion"
-    // "v7_raw_diffusion"
-    // "vid_1.1_i2v_render_b_joint_video",
-    // "vid_1.1_i2v_start_end_a_video"
-    // "vid_1.1_i2v_start_end_b_video"
-    job_type: Option<String>,
-
-    // Some possible values:
-    // "diffusion"
-    // "draft"
-    // "variation"
-    // "video_diffusion"
-    // "video_start_end"
-    event_type: Option<String>,
-  }
-
-  let response : RawImagineResponse = serde_json::from_str(&response_body)
-      .map_err(|err| MidjourneyApiError::DeserializationError(err))?;
-
-  Ok(ImagineResponse {
-    cursor: response.cursor.clone(),
-    items: response.data
-        .into_iter()
-        .map(|item| {
-          ImagineItem {
-            id: item.id,
-            full_command: item.full_command,
-            job_type: item.job_type.as_ref()
-                .map(|jt| MidjourneyJobType::from_str(jt))
-          }
-        }).collect(),
-  })
-}
-
-#[cfg(test)]
-mod tests {
-  use crate::client::midjourney_hostname::MidjourneyHostname;
-  use crate::credentials::midjourney_user_id::MidjourneyUserId;
-  use crate::endpoints::imagine::{imagine, ImagineRequest};
-  use errors::AnyhowResult;
-  use filesys::read_to_trimmed_string::read_to_trimmed_string;
-
-  #[ignore]
-  #[tokio::test]
-  async fn test() -> AnyhowResult<()> {
-    let cookie_header = read_to_trimmed_string("/Users/bt/secrets/midjourney/cookie.txt")?;
-    let user_id = read_to_trimmed_string("/Users/bt/secrets/midjourney/user_id.txt")?;
-    let user_id = MidjourneyUserId::from_string(user_id);
-
-    let result = imagine(ImagineRequest {
-      cookie_header,
-      hostname: MidjourneyHostname::Standard,
-      user_id: &user_id,
-      page_size: None,
-    }).await?;
-
-    println!("Response: {:?}\n\n", result);
-
-    assert_eq!(1, 2);
-
-    Ok(())
-  }
-}
-
-
@@ -1,5 +0,0 @@
-pub mod get_index_page_html;
-pub mod imagine;
-pub mod storage_list;
-pub mod submit_job;
-pub mod user_connections;
@@ -1,147 +0,0 @@
-use crate::client::midjourney_hostname::MidjourneyHostname;
-use crate::error::midjourney_api_error::MidjourneyApiError;
-use crate::error::midjourney_client_error::MidjourneyClientError;
-use crate::error::midjourney_error::MidjourneyError;
-use cloudflare_errors::filter_cloudflare_errors::filter_cloudflare_errors;
-use log::error;
-use serde::Deserialize;
-use wreq::Client;
-use wreq_util::Emulation;
-
-/// This endpoint returns the user id
-pub struct GetStorageListRequest {
-  pub hostname: MidjourneyHostname,
-  pub cookie_header: String,
-}
-
-#[derive(Debug)]
-pub struct StorageItem {
-  // NB: The path contains the user ID.
-  pub bucket_pathname: Option<String>,
-
-  // NB: Other fields aren't necessary for us right now.
-}
-
-pub async fn storage_list(req: GetStorageListRequest) -> Result<Vec<StorageItem>, MidjourneyError> {
-
-  let referer = format!("https://{}", req.hostname.as_str());
-
-  let url = format!("https://{}/api/storage-list", req.hostname.as_str());
-
-  let client = Client::builder()
-      .emulation(Emulation::Firefox139)
-      .build()
-      .map_err(|err| MidjourneyClientError::WreqError(err))?;
-
-  let cookie_header = req.cookie_header.trim();
-
-  if cookie_header.len() < 20 {
-    error!("Cookie header is too short (len: {}): {}", cookie_header.len(), cookie_header);
-    return Err(MidjourneyClientError::CookieTooShort.into());
-  }
-
-  // NB: missing headers that were in the browser request:
-  // -H 'sec-ch-ua-platform: "macOS"' \
-  // -H 'sec-ch-ua: "Not)A;Brand";v="8", "Chromium";v="138", "Google Chrome";v="138"' \
-
-  let mut http_request = client.get(url)
-      .header("cookie", cookie_header)
-      .header("Referer", &referer)
-      .header("Referrer-Policy", "origin-when-cross-origin")
-      .header("accept", "*/*")
-      .header("accept-language", "en-US,en;q=0.8")
-      .header("content-type", "application/json")
-      .header("priority", "u=1, i")
-      .header("sec-ch-ua-mobile", "?0")
-      .header("sec-fetch-dest", "empty")
-      .header("sec-fetch-mode", "cors")
-      .header("sec-fetch-site", "same-origin")
-      .header("x-csrf-protection", "1");
-
-  let http_request  = http_request
-      .build()
-      .map_err(|err| MidjourneyClientError::WreqError(err))?;
-
-  let response = client.execute(http_request)
-      .await
-      .map_err(|e| MidjourneyApiError::NetworkError(e.to_string()))?;
-
-  let status = response.status();
-
-  // if status == 301 {
-  //   for (name, value) in response.headers().iter() {
-  //     println!("- {}: {}", name.as_str(), value.to_str().unwrap());
-  //   }
-  // }
-
-  let response_body = &response.text().await
-      .map_err(|e| MidjourneyApiError::NetworkError(e.to_string()))?;
-
-  if !status.is_success() {
-    if let Err(err) = filter_cloudflare_errors(status.as_u16(), &response_body) {
-      return Err(MidjourneyApiError::CloudflareError(err).into());
-    }
-  }
-
-  /*
-  [
-      {
-          "bucketPathname": "UUID/OTHER_HEX_ENTROPY.png",
-          "shortUrl": null,
-          "type": "image-prompt",
-          "origin": "web",
-          "timeCreated": TIMESTAMP,
-          "hidden": false,
-          "contentType": "image/png",
-          "state": "loaded"
-      }
-  ]
-  */
-
-  #[derive(Deserialize, Debug)]
-  #[allow(non_snake_case)]
-  struct RawStorageItem {
-    bucketPathname: Option<String>,
-  }
-
-  let response : Vec<RawStorageItem> = serde_json::from_str(response_body)
-      .map_err(|err| MidjourneyApiError::DeserializationError(err))?;
-
-  let items = response
-      .into_iter()
-      .map(|r| StorageItem {
-        bucket_pathname: r.bucketPathname,
-      })
-      .collect::<Vec<_>>();
-
-  Ok(items)
-}
-
-#[cfg(test)]
-mod tests {
-  use crate::client::midjourney_hostname::MidjourneyHostname;
-  use errors::AnyhowResult;
-  use filesys::read_to_trimmed_string::read_to_trimmed_string;
-  use crate::endpoints::storage_list::{storage_list, GetStorageListRequest};
-
-  #[ignore]
-  #[tokio::test]
-  async fn test() -> AnyhowResult<()> {
-    let cookie_header = read_to_trimmed_string("/Users/bt/secrets/midjourney/cookie.txt")?;
-
-    let result = storage_list(GetStorageListRequest {
-      cookie_header,
-      hostname: MidjourneyHostname::Standard,
-    }).await?;
-
-    println!("Response: {:?}\n\n", result);
-
-    for provider in result {
-      println!("Provider: {:?}", provider);
-    }
-
-    assert_eq!(1, 2);
-
-    Ok(())
-  }
-}
@@ -1,230 +0,0 @@
-use crate::error::midjourney_api_error::MidjourneyApiError;
-use crate::error::midjourney_client_error::MidjourneyClientError;
-use crate::error::midjourney_error::MidjourneyError;
-use log::{error, warn};
-use serde::{Deserialize, Serialize};
-
-use crate::client::midjourney_hostname::MidjourneyHostname;
-use cloudflare_errors::filter_cloudflare_errors::filter_cloudflare_errors;
-use wreq::Client;
-use wreq_util::Emulation;
-
-pub struct SubmitJobRequest<'a> {
-  pub prompt: &'a str,
-  pub channel_id: &'a str,
-  pub hostname: MidjourneyHostname,
-  pub cookie_header: String,
-}
-
-#[derive(Debug, Clone)]
-pub struct SubmitJobResponse {
-  /// On success, the job ID is returned.
-  pub maybe_job_id: Option<String>,
-  
-  /// On error, we have a list of error messages.
-  pub maybe_errors: Option<Vec<SubmitJobError>>,
-}
-
-#[derive(Debug, Clone)]
-pub struct SubmitJobError {
-  pub error_type: Option<String>,
-  pub message: Option<String>,
-}
-
-pub async fn submit_job(req: SubmitJobRequest<'_>) -> Result<SubmitJobResponse, MidjourneyError> {
-  let client = Client::builder()
-      .emulation(Emulation::Firefox139)
-      .build()
-      .map_err(|err| MidjourneyClientError::WreqError(err))?;
-
-  let referer = format!("https://{}", req.hostname.as_str());
-
-  // NB: Other recent clients use /api/app/submit-jobs, but this appears invalid.
-  let url = format!("https://{}/api/submit-jobs", req.hostname.as_str());
-
-  let cookie_header = req.cookie_header.trim();
-
-  if cookie_header.len() < 20 {
-    error!("Cookie header is too short (len: {}): {}", cookie_header.len(), cookie_header);
-    return Err(MidjourneyClientError::CookieTooShort.into());
-  }
-
-  let mut http_request = client.post(url)
-      .header("cookie", cookie_header)
-      .header("Referer", &referer)
-      .header("Referrer-Policy", "origin-when-cross-origin")
-      .header("accept", "*/*")
-      .header("accept-language", "en-US,en;q=0.8")
-      .header("content-type", "application/json")
-      .header("priority", "u=1, i")
-      .header("sec-ch-ua-mobile", "?0")
-      .header("sec-fetch-dest", "empty")
-      .header("sec-fetch-mode", "cors")
-      .header("sec-fetch-site", "same-origin")
-      .header("x-csrf-protection", "1");
-
-  #[derive(Serialize)]
-  struct F {
-    mode: String,
-    private: bool,
-  }
-
-  #[derive(Serialize)]
-  #[allow(non_snake_case)]
-  struct Metadata {
-    imagePrompts: u8,
-    imageReferences: u8,
-    characterReferences: u8,
-    depthReferences: u8,
-    lightboxOpen: String,
-  }
-
-  #[derive(Serialize)]
-  #[allow(non_snake_case)]
-  struct RawRequest {
-    f: F,
-    channelId: String,
-    metadata: Metadata,
-    t: String,
-    prompt: String,
-  }
-
-  let body = RawRequest {
-    f: F {
-      mode: "fast".to_string(),
-      private: false,
-    },
-    channelId: req.channel_id.to_string(),
-    metadata: Metadata {
-      imagePrompts: 0,
-      imageReferences: 0,
-      characterReferences: 0,
-      depthReferences: 0,
-      lightboxOpen: "".to_string(),
-    },
-    t: "imagine".to_string(),
-    prompt: req.prompt.to_string(),
-  };
-
-  let http_request  = http_request
-      .json(&body)
-      .build()
-      .map_err(|err| MidjourneyClientError::WreqError(err))?;
-
-  let response = client.execute(http_request)
-      .await
-      .map_err(|e| MidjourneyApiError::NetworkError(e.to_string()))?;
-
-  let status = response.status();
-
-  // if status == 301 {
-  //   for (name, value) in response.headers().iter() {
-  //     println!("- {}: {}", name.as_str(), value.to_str().unwrap());
-  //   }
-  // }
-
-  let response_body = &response.text().await
-      .map_err(|e| MidjourneyApiError::NetworkError(e.to_string()))?;
-
-  if !status.is_success() {
-    if let Err(err) = filter_cloudflare_errors(status.as_u16(), &response_body) {
-      return Err(MidjourneyApiError::CloudflareError(err).into());
-    }
-  }
-
-  /*
-  {"success":[
-    {
-      "job_id":"UUID-like-string",
-      "prompt":"prompt",
-      "is_queued":false,
-      "event_type":"diffusion",
-      "flags":{
-        "mode":"fast","visibility":"public"
-      },
-      "meta":{
-        "height":1024,"width":1024,"batch_size":4,"parent_id":null,"parent_grid":null
-      },
-      "optimisticJobIndex":0,
-      "personalization_codes":null
-    }],
-    "failure":[]}
-   */
-
-  #[derive(Deserialize)]
-  struct SuccessPayload {
-    job_id: String,
-  }
-
-  #[derive(Deserialize)]
-  struct FailurePayload {
-    r#type: String,
-    message: String,
-  }
-
-  #[derive(Deserialize)]
-  #[allow(non_snake_case)]
-  struct RawResponse {
-    success: Vec<SuccessPayload>,
-    failure: Option<Vec<FailurePayload>>,
-  }
-
-  let response = serde_json::from_str::<RawResponse>(response_body)
-      .map_err(|err| MidjourneyApiError::DeserializationError(err))?;
-
-  let maybe_job_id = response.success
-      .get(0)
-      .map(|s| s.job_id.clone());
-  
-  if maybe_job_id.is_none() {
-    warn!("No job id found in body: {:?}", response_body);
-  }
-
-  let mut maybe_errors = None;
-  
-  if let Some(failures) = response.failure.as_ref() {
-    if !failures.is_empty() {
-      maybe_errors = Some(failures.iter()
-          .map(|f| SubmitJobError { 
-            error_type: Some(f.r#type.clone()), 
-            message: Some(f.message.clone()), 
-          }).collect());
-    }
-  }
-
-  Ok(SubmitJobResponse {
-    maybe_job_id,
-    maybe_errors,
-  })
-}
-
-#[cfg(test)]
-mod tests {
-  use crate::client::midjourney_hostname::MidjourneyHostname;
-  use crate::endpoints::submit_job::{submit_job, SubmitJobRequest};
-  use errors::AnyhowResult;
-  use filesys::read_to_trimmed_string::read_to_trimmed_string;
-
-  // Get channel id via:
-  // https://identitytoolkit.googleapis.com/v1/accounts:lookup?key=[TOKEN]
-  #[ignore]
-  #[tokio::test]
-  async fn test() -> AnyhowResult<()> {
-    let cookie_header = read_to_trimmed_string("/Users/bt/secrets/midjourney/cookie.txt")?;
-    let channel_id = read_to_trimmed_string("/Users/bt/secrets/midjourney/channel_id.txt")?;
-
-    let result = submit_job(SubmitJobRequest {
-      prompt: "a modern n64 console",
-      channel_id: &channel_id,
-      cookie_header,
-      hostname: MidjourneyHostname::Standard,
-    }).await?;
-
-    println!("Response: {:?}", result);
-
-    assert_eq!(1, 2);
-
-
-    Ok(())
-  }
-}
@@ -1,178 +0,0 @@
-use crate::client::midjourney_hostname::MidjourneyHostname;
-use crate::error::midjourney_api_error::MidjourneyApiError;
-use crate::error::midjourney_client_error::MidjourneyClientError;
-use crate::error::midjourney_error::MidjourneyError;
-use cloudflare_errors::filter_cloudflare_errors::filter_cloudflare_errors;
-use log::error;
-use serde::Deserialize;
-use wreq::Client;
-use wreq_util::Emulation;
-
-const USER_CONNECTIONS_URL :&str = "https://www.midjourney.com/api/user-connections";
-
-pub struct GetUserConnectionsRequest {
-  pub hostname: MidjourneyHostname,
-  pub cookie_header: String,
-}
-
-#[derive(Debug)]
-pub struct UserData {
-  pub provider_id: String,
-  pub display_name: Option<String>,
-  pub email: Option<String>,
-  pub user_id: Option<String>,
-}
-
-#[derive(Debug)]
-pub struct Provider {
-  pub provider_id: String,
-  pub user_data: Option<UserData>,
-  pub is_linked: bool,
-}
-
-pub async fn user_connections(req: GetUserConnectionsRequest) -> Result<Vec<Provider>, MidjourneyError> {
-
-  let referer = format!("https://{}", req.hostname.as_str());
-
-  let url = format!("https://{}/api/user-connections", req.hostname.as_str());
-
-  let client = Client::builder()
-      .emulation(Emulation::Firefox139)
-      .build()
-      .map_err(|err| MidjourneyClientError::WreqError(err))?;
-
-  let cookie_header = req.cookie_header.trim();
-
-  if cookie_header.len() < 20 {
-    error!("Cookie header is too short (len: {}): {}", cookie_header.len(), cookie_header);
-    return Err(MidjourneyClientError::CookieTooShort.into());
-  }
-
-  // NB: missing headers that were in the browser request:
-  // -H 'sec-ch-ua-platform: "macOS"' \
-  // -H 'sec-ch-ua: "Not)A;Brand";v="8", "Chromium";v="138", "Google Chrome";v="138"' \
-
-  let mut http_request = client.get(url)
-      .header("cookie", cookie_header)
-      .header("Referer", &referer)
-      .header("Referrer-Policy", "origin-when-cross-origin")
-      .header("accept", "*/*")
-      .header("accept-language", "en-US,en;q=0.8")
-      .header("content-type", "application/json")
-      .header("priority", "u=1, i")
-      .header("sec-ch-ua-mobile", "?0")
-      .header("sec-fetch-dest", "empty")
-      .header("sec-fetch-mode", "cors")
-      .header("sec-fetch-site", "same-origin")
-      .header("x-csrf-protection", "1");
-
-  let http_request  = http_request
-      .build()
-      .map_err(|err| MidjourneyClientError::WreqError(err))?;
-
-  let response = client.execute(http_request)
-      .await
-      .map_err(|e| MidjourneyApiError::NetworkError(e.to_string()))?;
-
-  let status = response.status();
-
-  // if status == 301 {
-  //   for (name, value) in response.headers().iter() {
-  //     println!("- {}: {}", name.as_str(), value.to_str().unwrap());
-  //   }
-  // }
-
-  let response_body = &response.text().await
-      .map_err(|e| MidjourneyApiError::NetworkError(e.to_string()))?;
-
-  if !status.is_success() {
-    if let Err(err) = filter_cloudflare_errors(status.as_u16(), &response_body) {
-      return Err(MidjourneyApiError::CloudflareError(err).into());
-    }
-  }
-
-  /*
-  [
-      {
-          "providerId": "google.com",
-          "userData": {
-              "providerId": "google.com",
-              "displayName": "John Doe",
-              "email": "john.doe@gmail.com",
-              "userId": "123456789000000001",
-          },
-          "isLinked": true
-      },
-      {
-          "providerId": "discord.com",
-          "isLinked": false
-      }
-  ]
-  */
-
-  #[derive(Deserialize, Debug)]
-  #[allow(non_snake_case)]
-  struct RawProviderUserData {
-    providerId: String,
-    displayName: Option<String>,
-    email: Option<String>,
-    userId: Option<String>,
-  }
-
-  #[derive(Deserialize, Debug)]
-  #[allow(non_snake_case)]
-  struct RawProvider {
-    providerId: String,
-    userData: Option<RawProviderUserData>,
-    isLinked: bool,
-  }
-
-  let response : Vec<RawProvider> = serde_json::from_str(response_body)
-      .map_err(|err| MidjourneyApiError::DeserializationError(err))?;
-
-  let providers = response
-      .into_iter()
-      .map(|r| Provider {
-        provider_id: r.providerId,
-        user_data: r.userData.map(|u| UserData {
-          provider_id: u.providerId,
-          display_name: u.displayName,
-          email: u.email,
-          user_id: u.userId,
-        }),
-        is_linked: r.isLinked,
-      })
-      .collect::<Vec<_>>();
-
-  Ok(providers)
-}
-
-#[cfg(test)]
-mod tests {
-  use crate::client::midjourney_hostname::MidjourneyHostname;
-  use crate::endpoints::user_connections::{user_connections, GetUserConnectionsRequest};
-  use errors::AnyhowResult;
-  use filesys::read_to_trimmed_string::read_to_trimmed_string;
-
-  #[ignore]
-  #[tokio::test]
-  async fn test() -> AnyhowResult<()> {
-    let cookie_header = read_to_trimmed_string("/Users/bt/secrets/midjourney/cookie.txt")?;
-
-    let result = user_connections(GetUserConnectionsRequest {
-      cookie_header,
-      hostname: MidjourneyHostname::Standard,
-    }).await?;
-
-    println!("Response: {:?}\n\n", result);
-
-    for provider in result {
-      println!("Provider: {:?}", provider);
-    }
-
-    assert_eq!(1, 2);
-
-    Ok(())
-  }
-}
-
@@ -1,117 +0,0 @@
-use cloudflare_errors::cloudflare_error::CloudflareError;
-use errors::AnyhowError;
-use std::error::Error;
-use std::fmt::{Display, Formatter};
-use std::io;
-
-#[derive(Debug)]
-pub enum MidjourneyApiError {
-  /// There was no user ID in an otherwise valid-looking response.
-  NoUserId,
-
-  /// No user props in index HTML payload.
-  /// We need this for the user ID and the websocket token.
-  NoUserProps,
-
-  /// No initialAuthUser in the index HTML payload.
-  /// We need this for the user ID and the websocket token.
-  NoInitialAuthUser,
-
-  /// 400. The request was invalid.
-  InvalidRequest(String),
-
-  /// 401. The request was not authorized.
-  Unauthorized(String),
-
-  /// 403. The request was forbidden.
-  Forbidden(String),
-
-  /// 404. The requested resource was not found.
-  NotFound(String),
-
-  /// 429. Too many requests.
-  TooManyRequests(String),
-
-  /// 500. An internal server error occurred.
-  InternalServerError {
-    body: String,
-    backend_hostname: Option<String>,
-  },
-
-  /// Eg. when downloading images
-  UnknownHttpFailure {
-    status_code: u16,
-    body: String,
-  },
-
-  /// Cloudflare errors.
-  CloudflareError(CloudflareError),
-
-  /// A deserialization error with the response.
-  DeserializationError(serde_json::Error),
-
-  /// The request timed out.
-  Timeout(String),
-
-  /// A network error occurred.
-  NetworkError(String),
-
-  /// An error doing file I/O (on our side)
-  IoError(io::Error),
-
-  /// Another type of error.
-  Other(AnyhowError),
-}
-
-impl Error for MidjourneyApiError {}
-
-impl Display for MidjourneyApiError {
-  fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-    match self {
-      // Response body errors
-      Self::NoUserId => write!(f, "No user ID found in the response body."),
-      Self::NoUserProps => write!(f, "No user properties found in the index HTML payload."),
-      Self::NoInitialAuthUser => write!(f, "No initialAuthUser in the index HTML payload."),
-      // Server response code errors
-      Self::InvalidRequest(msg) => write!(f, "Invalid request: {}", msg),
-      Self::Unauthorized(msg) => write!(f, "Unauthorized: {}", msg),
-      Self::Forbidden(msg) => write!(f, "Forbidden: {}", msg),
-      Self::NotFound(msg) => write!(f, "Not found: {}", msg),
-      Self::TooManyRequests(msg) => write!(f, "Too many requests: {}", msg),
-      Self::InternalServerError {body, backend_hostname} =>
-        write!(f, "Internal Server Error; backend hostname: {:?} ; body: {}; ", backend_hostname, body),
-      Self::UnknownHttpFailure {status_code, body} =>
-        write!(f, "Unknown HTTP failure; status code: {}; body: {}", status_code, body),
-      // Deserialization errors
-      // Server response handling errors
-      Self::DeserializationError(error) => write!(f, "Deserialization error: {}", error),
-      // Network errors
-      Self::Timeout(msg) => write!(f, "Timeout: {}", msg),
-      Self::NetworkError(msg) => write!(f, "Network error: {}", msg),
-      // Cloudflare errors
-      Self::CloudflareError(error) => write!(f, "Cloudflare Error: {}", error),
-      // I/O errors
-      Self::IoError(error) => write!(f, "IO error: {}", error),
-      // Other
-      Self::Other(error) => write!(f, "Other error: {}", error),
-    }
-  }
-}
-
-impl From<serde_json::Error> for MidjourneyApiError {
-  fn from(error: serde_json::Error) -> Self {
-    Self::DeserializationError(error)
-  }
-}
-
-impl From<io::Error> for MidjourneyApiError {
-  fn from(error: io::Error) -> Self {
-    Self::IoError(error)
-  }
-}
-
-impl From<CloudflareError> for MidjourneyApiError {
-  fn from(error: CloudflareError) -> Self {
-    Self::CloudflareError(error)
-  }
-}
@@ -1,71 +0,0 @@
-use std::error::Error;
-use std::fmt::{Display, Formatter};
-use std::io;
-use std::path::PathBuf;
-
-/// An error arising from the client, either before or after the request is sent.
-#[derive(Debug)]
-pub enum MidjourneyClientError {
-  /// The cookie was too short to be valid.
-  CookieTooShort,
-  
-  /// Tried to look up an image out of range [0,4)
-  InvalidImageIndex,
-  
-  /// Could not determine the filetype for the file.
-  FileTypeNotKnown(PathBuf),
-
-  /// Could not handle the file type.
-  FileTypeNotHandled(PathBuf),
-
-  /// An error doing file I/O (on our side)
-  IoError(io::Error),
-
-  // /// An error setting up the client
-  // ReqwestError(reqwest::Error),
-  WreqError(wreq::Error),
-
-  /// A serialization error with the request.
-  SerializationError(serde_json::Error),
-}
-
-impl Error for MidjourneyClientError {}
-
-impl Display for MidjourneyClientError {
-  fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-    match self {
-      Self::CookieTooShort => write!(f, "The cookie header is too short to be valid."),
-      Self::InvalidImageIndex => write!(f, "The image index is out of range. Valid range is [0, 4)."),
-      Self::FileTypeNotKnown(path) => write!(f, "Could not determine the filetype for the file: {:?}", path),
-      Self::FileTypeNotHandled(path) => write!(f, "Could not handle the file type for the file: {:?}", path),
-      Self::IoError(err) => write!(f, "IO error: {}", err),
-      //Self::ReqwestError(err) => write!(f, "Reqwest client error: {}", err),
-      Self::WreqError(err) => write!(f, "Wreq client error: {}", err),
-      Self::SerializationError(err) => write!(f, "Request serialization error: {}", err),
-    }
-  }
-}
-
-impl From<io::Error> for MidjourneyClientError {
-  fn from(error: io::Error) -> Self {
-    Self::IoError(error)
-  }
-}
-
-impl From<serde_json::Error> for MidjourneyClientError {
-  fn from(error: serde_json::Error) -> Self {
-    Self::SerializationError(error)
-  }
-}
-
-/*impl From<reqwest::Error> for MidjourneyClientError {
-  fn from(error: reqwest::Error) -> Self {
-    Self::ReqwestError(error)
-  }
-}*/
-
-impl From<wreq::Error> for MidjourneyClientError {
-  fn from(error: wreq::Error) -> Self {
-    Self::WreqError(error)
-  }
-}
@@ -1,32 +0,0 @@
-use crate::error::midjourney_api_error::MidjourneyApiError;
-use crate::error::midjourney_client_error::MidjourneyClientError;
-use std::error::Error;
-
-#[derive(Debug)]
-pub enum MidjourneyError {
-  Api(MidjourneyApiError),
-  Client(MidjourneyClientError),
-}
-
-impl Error for MidjourneyError {}
-
-impl std::fmt::Display for MidjourneyError {
-  fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-    match self {
-      Self::Api(e) => write!(f, "Midjourney API error: {:?}", e),
-      Self::Client(e) => write!(f, "Midjourney Client error: {:?}", e),
-    }
-  }
-}
-
-impl From<MidjourneyApiError> for MidjourneyError {
-  fn from(error: MidjourneyApiError) -> Self {
-    Self::Api(error)
-  }
-}
-
-impl From<MidjourneyClientError> for MidjourneyError {
-  fn from(error: MidjourneyClientError) -> Self {
-    Self::Client(error)
-  }
-}
@@ -1,3 +0,0 @@
-pub mod midjourney_error;
-pub mod midjourney_api_error;
-pub mod midjourney_client_error;
@@ -1,8 +0,0 @@
-//! A midjourney API client.
-
-pub mod client;
-pub mod credentials;
-pub mod endpoints;
-pub mod error;
-pub mod recipes;
-pub mod utils;
@@ -1,20 +0,0 @@
-use crate::credentials::midjourney_user_id::MidjourneyUserId;
-
-#[derive(Debug, Clone)]
-pub enum ChannelId {
-  /// Channel based on the user ID.
-  /// This is what Midjourney uses by default.
-  UserId(MidjourneyUserId),
-
-  // Bare string ID
-  Raw(String),
-}
-
-impl ChannelId {
-  pub fn to_string(&self) -> String {
-    match self {
-      Self::UserId(user_id) => format!("singleplayer_{}", user_id.0),
-      Self::Raw(id) => id.clone(),
-    }
-  }
-}
@@ -1,52 +0,0 @@
-use crate::client::midjourney_hostname::MidjourneyHostname;
-use crate::credentials::midjourney_user_id::MidjourneyUserId;
-use crate::endpoints::storage_list::{storage_list, GetStorageListRequest};
-use crate::error::midjourney_api_error::MidjourneyApiError;
-use crate::error::midjourney_error::MidjourneyError;
-
-pub struct GetMidjourneyUserIdRequest {
-  pub hostname: MidjourneyHostname,
-  pub cookie_header: String,
-}
-
-pub async fn get_midjourney_user_id_from_storage(req: GetMidjourneyUserIdRequest) -> Result<MidjourneyUserId, MidjourneyError> {
-  let items = storage_list(GetStorageListRequest {
-    hostname: req.hostname,
-    cookie_header: req.cookie_header,
-  }).await?;
-
-  let user_id = items
-    .into_iter()
-    .find_map(|item| item.bucket_pathname)
-    .and_then(|path| path.split('/').next().map(|id| id.to_owned()))
-    .map(|id| MidjourneyUserId(id.to_string()))
-    .ok_or(MidjourneyApiError::NoUserId)?;
-
-  Ok(user_id)
-}
-
-#[cfg(test)]
-mod tests {
-  use crate::client::midjourney_hostname::MidjourneyHostname;
-  use crate::recipes::get_midjourney_user_id_from_storage::{get_midjourney_user_id_from_storage, GetMidjourneyUserIdRequest};
-  use errors::AnyhowResult;
-  use filesys::read_to_trimmed_string::read_to_trimmed_string;
-
-  #[ignore]
-  #[tokio::test]
-  async fn test() -> AnyhowResult<()> {
-    let cookie_header = read_to_trimmed_string("/Users/bt/secrets/midjourney/cookie.txt")?;
-
-    let result = get_midjourney_user_id_from_storage(GetMidjourneyUserIdRequest {
-      cookie_header,
-      hostname: MidjourneyHostname::Standard,
-    }).await?;
-
-    println!("Response: {:?}\n\n", result);
-
-    assert_eq!(1, 2);
-
-    Ok(())
-  }
-}
-
@@ -1,153 +0,0 @@
-use crate::client::midjourney_hostname::MidjourneyHostname;
-use crate::credentials::midjourney_user_id::MidjourneyUserId;
-use crate::endpoints::get_index_page_html::{get_index_page_html, GetIndexPageRequest};
-use crate::error::midjourney_api_error::MidjourneyApiError;
-use crate::error::midjourney_error::MidjourneyError;
-use dom_query::Document;
-use serde::Deserialize;
-
-pub struct GetUserInfoRequest {
-  pub hostname: MidjourneyHostname,
-  pub cookie_header: String,
-}
-
-#[derive(Debug, Clone)]
-pub struct GetUserInfoResponse {
-  pub user_id: Option<MidjourneyUserId>,
-  pub email: Option<String>,
-  pub websocket_token: Option<String>,
-}
-
-pub async fn get_user_info(req: GetUserInfoRequest) -> Result<GetUserInfoResponse, MidjourneyError> {
-  let index_html = get_index_page_html(GetIndexPageRequest {
-    hostname: req.hostname,
-    cookie_header: req.cookie_header,
-  }).await?;
-
-  /*
-    <script id="initialProps" type="application/json">
-      {
-          "initialAuthUser": {
-              "idpID": "ENTROPY",
-              "id": "UUID",
-              "displayName": "uNUMBER",
-              "email": "USER@gmail.com",
-              "emailVerified": true,
-              "photoURL": "https://lh3.googleusercontent.com/a/ENTROPY",
-              "abilities": {
-                  "admin": false,
-                  "developer": false,
-                  "accepted_tos": true,
-                  "moderator": false,
-                  "guide": false,
-                  "vip": false,
-                  "employee": false,
-                  "content_moderator": false,
-                  "gdpr_preferences_set": false,
-                  "gdpr_allow_advertising": false,
-                  "gdpr_allow_analytics": false,
-                  "editor_whitelist": false,
-                  "allow_nsfw": false,
-                  "cooldowns_removed": false,
-                  "blocked": false,
-                  "community": false,
-                  "billing": false,
-                  "system_verified": false,
-                  "simplified_flow": false,
-                  "total_jobs": 57,
-                  "is_sub_at_least_one_year_old": false,
-                  "can_private": false,
-                  "can_relax": false,
-                  "has_discord": false,
-                  "delete_at": null,
-                  "subscription": {
-                      "type": "subscription",
-                      "plan_type": "basic",
-                      "recurring": "month"
-                  },
-                  "relax_video_job_concurrency": 0
-              },
-              "websocketToken": "WEBSOCKET_TOKEN_ENTROPY",
-              "providers": [
-                  "google.com"
-              ],
-              "system": "firebase",
-              "streamToken": "STREAM_TOKEN_ENTROPY"
-          },
-          "urlFromInitialServerRequest": "/"
-      }
-    </script>
-   */
-  
-  let document = Document::from(index_html);
-  let maybe_nodes = document.select("script[id=initialProps]");
-
-  let node = match maybe_nodes.get(0) {
-    Some(node) => node,
-    None => {
-      return Err(MidjourneyApiError::NoUserProps.into());
-    }
-  };
-
-  let inner_json = node.inner_html().to_string();
-
-  #[derive(Deserialize, Debug)]
-  #[allow(non_snake_case)]
-  struct RawAuthUser {
-    // NB: The Midjourney user id.
-    id: Option<String>,
-    email: Option<String>,
-    websocketToken: Option<String>,
-  }
-
-  #[derive(Deserialize, Debug)]
-  #[allow(non_snake_case)]
-  struct RawBody {
-    initialAuthUser: Option<RawAuthUser>,
-  }
-
-  let response : RawBody = serde_json::from_str(&inner_json)
-      .map_err(|err| MidjourneyApiError::DeserializationError(err))?;
-  
-  let props = match response.initialAuthUser {
-    Some(props) => props,
-    None => {
-      return Err(MidjourneyApiError::NoInitialAuthUser.into());
-    }
-  };
-
-  Ok(GetUserInfoResponse {
-    user_id: props.id
-        .map(|id| MidjourneyUserId::from_string(id)),
-    email: props.email
-        .map(|email| email.to_string()),
-    websocket_token: props.websocketToken
-        .map(|email| email.to_string()),
-  })
-}
-
-#[cfg(test)]
-mod tests {
-  use crate::client::midjourney_hostname::MidjourneyHostname;
-  use crate::recipes::get_user_info::{get_user_info, GetUserInfoRequest};
-  use errors::AnyhowResult;
-  use filesys::read_to_trimmed_string::read_to_trimmed_string;
-
-  #[ignore]
-  #[tokio::test]
-  async fn test() -> AnyhowResult<()> {
-    let cookie_header = read_to_trimmed_string("/Users/bt/secrets/midjourney/cookie.txt")?;
-
-    let result = get_user_info(GetUserInfoRequest {
-      cookie_header,
-      hostname: MidjourneyHostname::Standard,
-    }).await?;
-
-    println!("Response: {:?}\n\n", result);
-
-    assert_eq!(1, 2);
-
-    Ok(())
-  }
-}
-
@@ -1,4 +0,0 @@
-mod get_midjourney_user_id_from_storage;
-pub mod channel_id;
-pub mod get_user_info;
-pub mod text_to_image;
@@ -1,49 +0,0 @@
-use crate::client::midjourney_hostname::MidjourneyHostname;
-use crate::endpoints::submit_job::{submit_job, SubmitJobRequest};
-use crate::error::midjourney_error::MidjourneyError;
-use crate::recipes::channel_id::ChannelId;
-
-pub struct TextToImageRequest<'a> {
-  pub prompt: &'a str,
-  pub channel_id: &'a ChannelId,
-  pub hostname: MidjourneyHostname,
-  pub cookie_header: String,
-}
-
-#[derive(Debug, Clone)]
-pub struct TextToImageResponse {
-  /// On success, the job ID is returned.
-  pub maybe_job_id: Option<String>,
-
-  /// On error, we have a list of error messages.
-  pub maybe_errors: Option<Vec<TextToImageError>>,
-}
-
-#[derive(Debug, Clone)]
-pub struct TextToImageError {
-  pub error_type: Option<String>,
-  pub message: Option<String>,
-}
-
-/// Slightly more ergonomic text-to-image API.
-/// As we add more `submit_job()` cases, we'll keep this simple.
-pub async fn text_to_image(req: TextToImageRequest<'_>) -> Result<TextToImageResponse, MidjourneyError> {
-  let channel_id = req.channel_id.to_string();
-
-  let response = submit_job(SubmitJobRequest {
-    prompt: req.prompt,
-    channel_id: &channel_id,
-    hostname: req.hostname,
-    cookie_header: req.cookie_header,
-  }).await?;
-
-  Ok(TextToImageResponse {
-    maybe_job_id: response.maybe_job_id,
-    maybe_errors: response.maybe_errors.map(|errs| {
-      errs.into_iter().map(|e| TextToImageError {
-        error_type: e.error_type,
-        message: e.message,
-      }).collect()
-    }),
-  })
-}
@@ -1,9 +0,0 @@
-use crate::error::midjourney_client_error::MidjourneyClientError;
-use crate::error::midjourney_error::MidjourneyError;
-
-pub fn get_image_url(job_id: &str, image_index: u8) -> Result<String, MidjourneyError> {
-  if image_index > 3 {
-    return Err(MidjourneyClientError::InvalidImageIndex.into())
-  }
-  Ok(format!("https://cdn.midjourney.com/{}/0_{}.png", job_id, image_index))
-}
@@ -1,70 +0,0 @@
-use crate::error::midjourney_api_error::MidjourneyApiError;
-use crate::error::midjourney_client_error::MidjourneyClientError;
-use crate::error::midjourney_error::MidjourneyError;
-use crate::utils::get_image_url::get_image_url;
-use cloudflare_errors::filter_cloudflare_errors::filter_cloudflare_errors;
-use wreq::Client;
-use wreq_util::Emulation;
-
-#[derive(Clone)]
-pub struct ImageDownloaderClient {
-  client: Client,
-}
-
-impl ImageDownloaderClient {
-  pub fn create() -> Result<Self, MidjourneyClientError> {
-    Ok(Self {
-      client: Client::builder()
-          .emulation(Emulation::Firefox139)
-          .build()
-          .map_err(|err| MidjourneyClientError::WreqError(err))?
-    })
-  }
-
-  pub async fn download_image(&self, job_id: &str, image_index: u8) -> anyhow::Result<Vec<u8>, MidjourneyError> {
-    let url = get_image_url(job_id, image_index)?;
-
-    // TODO: Cookies
-    // TODO: Cache control headers?
-    let mut http_request = self.client.get(url)
-        //.header("Referrer-Policy", "origin-when-cross-origin")
-        //.header("content-type", "application/json")
-        //.header("sec-fetch-user", "?1")
-        //.header("upgrade-insecure-requests", "1");
-        .header("Referrer", "https://www.midjourney.com/")
-        .header("accept", "image/avif,image/webp,image/apng,image/svg+xml,image/*,*/*;q=0.8")
-        .header("accept-language", "en-US,en;q=0.8")
-        .header("priority", "i")
-        .header("sec-ch-ua-mobile", "?0")
-        .header("sec-fetch-dest", "image")
-        .header("sec-fetch-mode", "no-cors")
-        .header("sec-fetch-site", "same-site");
-
-    let http_request  = http_request
-        .build()
-        .map_err(|err| MidjourneyClientError::WreqError(err))?;
-
-    let response = self.client.execute(http_request)
-        .await
-        .map_err(|e| MidjourneyApiError::NetworkError(e.to_string()))?;
-
-    let status = response.status();
-
-    let response_bytes = response.bytes().await
-        .map_err(|e| MidjourneyApiError::NetworkError(e.to_string()))?;
-
-    if !status.is_success() {
-      let response_body = String::from_utf8_lossy(&response_bytes).to_string();
-      if let Err(err) = filter_cloudflare_errors(status.as_u16(), &response_body) {
-        return Err(MidjourneyApiError::CloudflareError(err).into());
-      }
-
-      return Err(MidjourneyApiError::UnknownHttpFailure {
-        status_code: status.as_u16(),
-        body: response_body,
-      }.into());
-    }
-
-    Ok(response_bytes.to_vec())
-  }
-}
@@ -1,2 +0,0 @@
-pub mod get_image_url;
-pub mod image_downloader_client;
@@ -59,7 +59,7 @@ impl Display for ApiError {
      ApiError::Unauthorized(msg) => write!(f, "Unauthorized: {}", msg),
      ApiError::Forbidden(msg) => write!(f, "Forbidden: {}", msg),
      ApiError::NotFound(msg) => write!(f, "Not found: {}", msg),
-      ApiError::TooManyRequests(msg) => write!(f, "Too many requests to Storyteller backend: {}", msg),
+      ApiError::TooManyRequests(msg) => write!(f, "Too many requests: {}", msg),
      ApiError::InternalServerError {body, backend_hostname} => 
        write!(f, "Internal Server Error; backend hostname: {:?} ; body: {}; ", backend_hostname, body),
      // Server response handling errors
@@ -7,9 +7,6 @@ use crate::error::api_error::ApiError;
 /// An error arising from the client, either before or after the request is sent.
 #[derive(Debug)]
 pub enum ClientError {
-  /// An invalid request was detected before it was sent.
-  InvalidPreflightRequest(String),
-  
  /// Could not determine the filetype for the file.
  FileTypeNotKnown(PathBuf),

@@ -31,7 +28,6 @@ impl Error for ClientError {}
 impl Display for ClientError {
  fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
    match self {
-      Self::InvalidPreflightRequest(msg) => write!(f, "Invalid preflight request: {}", msg),
      Self::FileTypeNotKnown(path) => write!(f, "Could not determine the filetype for the file: {:?}", path),
      Self::FileTypeNotHandled(path) => write!(f, "Could not handle the file type for the file: {:?}", path),
      Self::IoError(err) => write!(f, "IO error: {}", err),
@@ -13,8 +13,8 @@ impl Error for StorytellerError {}
 impl std::fmt::Display for StorytellerError {
  fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
    match self {
-      StorytellerError::Api(e) => write!(f, "Storyteller API error: {:?}", e),
-      StorytellerError::Client(e) => write!(f, "Storyteller Client error: {:?}", e),
+      StorytellerError::Api(e) => write!(f, "API error: {:?}", e),
+      StorytellerError::Client(e) => write!(f, "Client error: {:?}", e),
    }
  }
 }
@@ -1,19 +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::image::edit::flux_pro_kontext_max_edit_image::{FluxProKontextMaxEditImageRequest, FluxProKontextMaxEditImageResponse, FLUX_PRO_KONTEXT_MAX_EDIT_IMAGE_PATH};
-
-
-pub async fn flux_pro_kontext_max_edit_image(
-  api_host: &ApiHost,
-  maybe_creds: Option<&StorytellerCredentialSet>,
-  request: FluxProKontextMaxEditImageRequest,
-) -> Result<FluxProKontextMaxEditImageResponse, StorytellerError> {
-  Ok(basic_json_post_request(
-    api_host,
-    FLUX_PRO_KONTEXT_MAX_EDIT_IMAGE_PATH,
-    maybe_creds,
-    request,
-  ).await?)
-}
@@ -1,2 +1 @@
-pub mod flux_pro_kontext_max_edit_image;
 pub mod gpt_image_1_edit_image;
@@ -1,19 +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::image::generate_gpt_image_1_text_to_image::{GenerateGptImage1TextToImageRequest, GenerateGptImage1TextToImageResponse, GPT_IMAGE_1_TEXT_TO_IMAGE_PATH};
-
-
-pub async fn generate_gpt_image_1_text_to_image(
-  api_host: &ApiHost,
-  maybe_creds: Option<&StorytellerCredentialSet>,
-  request: GenerateGptImage1TextToImageRequest,
-) -> Result<GenerateGptImage1TextToImageResponse, StorytellerError> {
-  Ok(basic_json_post_request(
-    api_host,
-    GPT_IMAGE_1_TEXT_TO_IMAGE_PATH,
-    maybe_creds,
-    request,
-  ).await?)
-}
@@ -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::image::inpaint::flux_dev_juggernaut_inpaint_image::{FluxDevJuggernautInpaintImageRequest, FluxDevJuggernautInpaintImageResponse, FLUX_DEV_JUGGERNAUT_INPAINT_PATH};
-
-pub async fn flux_dev_juggernaut_inpaint_image(
-  api_host: &ApiHost,
-  maybe_creds: Option<&StorytellerCredentialSet>,
-  request: FluxDevJuggernautInpaintImageRequest,
-) -> Result<FluxDevJuggernautInpaintImageResponse, StorytellerError> {
-  Ok(basic_json_post_request(
-    api_host,
-    FLUX_DEV_JUGGERNAUT_INPAINT_PATH,
-    maybe_creds,
-    request,
-  ).await?)
-}
@@ -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::image::inpaint::flux_pro_1_inpaint_image::{FluxPro1InpaintImageRequest, FluxPro1InpaintImageResponse, FLUX_PRO_1_INPAINT_PATH};
-
-pub async fn flux_pro_1_inpaint_image(
-  api_host: &ApiHost,
-  maybe_creds: Option<&StorytellerCredentialSet>,
-  request: FluxPro1InpaintImageRequest,
-) -> Result<FluxPro1InpaintImageResponse, StorytellerError> {
-  Ok(basic_json_post_request(
-    api_host,
-    FLUX_PRO_1_INPAINT_PATH,
-    maybe_creds,
-    request,
-  ).await?)
-}
@@ -1,2 +0,0 @@
-pub mod flux_pro_1_inpaint_image;
-pub mod flux_dev_juggernaut_inpaint_image;
@@ -3,6 +3,4 @@ pub mod generate_flux_1_dev_text_to_image;
 pub mod generate_flux_1_schnell_text_to_image;
 pub mod generate_flux_pro_11_text_to_image;
 pub mod generate_flux_pro_11_ultra_text_to_image;
-pub mod generate_gpt_image_1_text_to_image;
-pub mod inpaint;
 pub mod remove_image_background;
@@ -5,6 +5,6 @@ pub mod error;
 pub mod generate;
 pub mod jobs;
 pub mod media_files;
-pub mod prompts;
 pub mod recipes;
+pub mod shared_response_types;
 pub mod utils;
@@ -1,12 +1,12 @@
 use crate::error::api_error::ApiError;
 use crate::error::storyteller_error::StorytellerError;
+use crate::shared_response_types::media_file_cover_image_details::MediaFileCoverImageDetails;
+use crate::shared_response_types::media_links::MediaLinks;
+use crate::shared_response_types::simple_entity_stats::SimpleEntityStats;
+use crate::shared_response_types::user_details_light::UserDetailsLight;
 use crate::utils::api_host::ApiHost;
 use crate::utils::filter_bad_response::filter_bad_response;
 use crate::utils::http_get_anonymous::http_get_anonymous;
-use artcraft_api_defs::common::responses::media_file_cover_image_details::MediaFileCoverImageDetails;
-use artcraft_api_defs::common::responses::media_links::MediaLinks;
-use artcraft_api_defs::common::responses::simple_entity_stats::SimpleEntityStats;
-use artcraft_api_defs::common::responses::user_details_light::UserDetailsLight;
 use chrono::{DateTime, Utc};
 use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType;
 use enums::by_table::media_files::media_file_class::MediaFileClass;
@@ -1,19 +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_get_request::basic_json_get_request;
-use artcraft_api_defs::media_file::list_batch_generated_media_files::{ListBatchGeneratedReduxMediaFilesSuccessResponse, LIST_BATCH_GENERATED_REDUX_MEDIA_FILES_URL_PATH};
-use tokens::tokens::batch_generations::BatchGenerationToken;
-
-pub async fn list_batch_generated_redux_media_files(
-  api_host: &ApiHost,
-  maybe_creds: Option<&StorytellerCredentialSet>,
-  batch_token: &BatchGenerationToken,
-) -> Result<ListBatchGeneratedReduxMediaFilesSuccessResponse, StorytellerError> {
-  let url = format!("{}/{}", LIST_BATCH_GENERATED_REDUX_MEDIA_FILES_URL_PATH, batch_token.to_string());
-  Ok(basic_json_get_request(
-    api_host,
-    &url,
-    maybe_creds,
-  ).await?)
-}
@@ -1,6 +1,4 @@
 pub mod get_media_file;
-pub mod list_batch_generated_redux_media_files;
-pub mod upload_image_media_file_from_bytes;
 pub mod upload_image_media_file_from_file;
 pub mod upload_new_engine_asset_from_file;
 pub mod upload_video_media_file_from_file;
@@ -1,134 +0,0 @@
-use crate::credentials::storyteller_credential_set::StorytellerCredentialSet;
-use crate::error::api_error::ApiError;
-use crate::error::client_error::ClientError;
-use crate::error::storyteller_error::StorytellerError;
-use crate::utils::api_host::ApiHost;
-use crate::utils::constants::{APPLICATION_JSON, USER_AGENT};
-use crate::utils::filter_bad_response::filter_bad_response;
-use crate::utils::http_get_anonymous::http_get_anonymous;
-use chrono::{DateTime, Utc};
-use enums::by_table::media_files::media_file_animation_type::MediaFileAnimationType;
-use enums::by_table::media_files::media_file_class::MediaFileClass;
-use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory;
-use enums::by_table::media_files::media_file_type::MediaFileType;
-use enums::by_table::model_weights::weights_category::WeightsCategory;
-use enums::common::visibility::Visibility;
-use enums::no_table::style_transfer::style_transfer_name::StyleTransferName;
-use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType;
-use idempotency::uuid::generate_random_uuid;
-use log::debug;
-use reqwest::multipart::{Form, Part};
-use reqwest::Client;
-use serde_derive::{Deserialize, Serialize};
-use std::fs::File;
-use std::io::Read;
-use std::path::Path;
-use tokens::tokens::batch_generations::BatchGenerationToken;
-use tokens::tokens::media_files::MediaFileToken;
-use tokens::tokens::model_weights::ModelWeightToken;
-use tokens::tokens::prompts::PromptToken;
-use uuid::uuid;
-
-pub struct UploadImageBytesArgs<'a> {
-  pub api_host: &'a ApiHost,
-  pub maybe_creds: Option<&'a StorytellerCredentialSet>,
-  
-  // NB: Bytes need to be owned for the request.
-  pub image_bytes: Vec<u8>,
-  pub image_type: ImageType,
-  
-  /// If true, we should hide the image from the user's gallery.
-  pub is_intermediate_system_file: bool,
-}
-
-#[derive(Clone, Copy, Debug)]
-pub enum ImageType {
-  Png,
-  Jpeg,
-  Gif,
-}
-
-impl ImageType {
-  pub fn mime_type(&self) -> &str {
-    match self {
-      ImageType::Png => "image/png",
-      ImageType::Jpeg => "image/jpeg",
-      ImageType::Gif => "image/gif",
-    }
-  }
-  pub fn file_extension(&self) -> &str {
-    match self {
-      ImageType::Png => "png",
-      ImageType::Jpeg => "jpg",
-      ImageType::Gif => "gif",
-    }
-  }
-}
-
-/// Upload an image media file from a file.
-/// NB: File type is not checked, so caller needs to enforce.
-/// NB: We need owned bytes for the request.
-pub async fn upload_image_media_file_from_bytes(
-  args: UploadImageBytesArgs<'_>
-) -> Result<UploadImageMediaFileSuccessResponse, StorytellerError> {
-
-  let url = get_route(args.api_host);
-
-  debug!("Requesting {:?}", &url);
-
-  let client = Client::builder()
-      .gzip(true)
-      .build()
-      .map_err(|err| StorytellerError::Client(ClientError::from(err)))?;
-
-  let part = Part::bytes(args.image_bytes)
-      .file_name(format!("image.{}", args.image_type.file_extension()))
-      .mime_str(args.image_type.mime_type())
-      .map_err(|err| StorytellerError::Client(ClientError::from(err)))?;
-
-  let mut form = Form::new()
-      .text("uuid_idempotency_token", generate_random_uuid())
-      .part("file", part);
-  
-  if args.is_intermediate_system_file {
-    form = form.text("is_intermediate_system_file", "true");
-  }
-
-  let mut request_builder = client.post(url)
-      .header("User-Agent", USER_AGENT)
-      .header("Accept", APPLICATION_JSON);
-  
-  if let Some(creds) = args.maybe_creds {
-    if let Some(header) = &creds.maybe_as_cookie_header() {
-      request_builder = request_builder.header("Cookie", header);
-    }
-  }
-  
-  let response = request_builder
-      .multipart(form)
-      .send()
-      .await
-      .map_err(|err| StorytellerError::Api(ApiError::from(err)))?;
-
-  let response = filter_bad_response(response).await?;
-  let response_body = &response.text().await
-      .map_err(|err| StorytellerError::Api(ApiError::from(err)))?;
-
-  let media_file = serde_json::from_str(&response_body)
-      .map_err(|err| StorytellerError::Api(ApiError::from(err)))?;
-
-  Ok(media_file)
-}
-
-fn get_route(api_host: &ApiHost) -> String {
-  let api_hostname_and_scheme = api_host.to_api_hostname_and_scheme();
-  format!("{}/v1/media_files/upload/image", api_hostname_and_scheme)
-}
-
-// TODO(bt,2025-04-22): Share API definitions between client and server in common crate.
-
-#[derive(Deserialize, Debug)]
-pub struct UploadImageMediaFileSuccessResponse {
-  pub success: bool,
-  pub media_file_token: MediaFileToken,
-}
@@ -2,6 +2,10 @@ use crate::credentials::storyteller_credential_set::StorytellerCredentialSet;
 use crate::error::api_error::ApiError;
 use crate::error::client_error::ClientError;
 use crate::error::storyteller_error::StorytellerError;
+use crate::shared_response_types::media_file_cover_image_details::MediaFileCoverImageDetails;
+use crate::shared_response_types::media_links::MediaLinks;
+use crate::shared_response_types::simple_entity_stats::SimpleEntityStats;
+use crate::shared_response_types::user_details_light::UserDetailsLight;
 use crate::utils::api_host::ApiHost;
 use crate::utils::constants::{APPLICATION_JSON, USER_AGENT};
 use crate::utils::filter_bad_response::filter_bad_response;
@@ -12,7 +16,6 @@ use enums::by_table::media_files::media_file_class::MediaFileClass;
 use enums::by_table::media_files::media_file_engine_category::MediaFileEngineCategory;
 use enums::by_table::media_files::media_file_type::MediaFileType;
 use enums::by_table::model_weights::weights_category::WeightsCategory;
-use enums::common::generation_provider::GenerationProvider;
 use enums::common::visibility::Visibility;
 use enums::no_table::style_transfer::style_transfer_name::StyleTransferName;
 use enums_public::by_table::model_weights::public_weights_types::PublicWeightsType;
@@ -30,34 +33,14 @@ use tokens::tokens::model_weights::ModelWeightToken;
 use tokens::tokens::prompts::PromptToken;
 use uuid::uuid;

-pub struct UploadImageFromFileArgs<'a, P: AsRef<Path>> {
-  pub api_host: &'a ApiHost,
-  pub maybe_creds: Option<&'a StorytellerCredentialSet>,
-  
-  // NB: Path needs to be owned for the request.
-  pub path: P,
-
-  /// If true, we should hide the image from the user's gallery.
-  pub is_intermediate_system_file: bool,
-
-  /// If provided, this is the prompt that this image is associated with.
-  /// NOTE: Cannot set `is_intermediate_system_file = true` if this is set.
-  pub maybe_prompt_token: Option<&'a PromptToken>,
-
-  // /// If provided, this is the service provider that created the image.
-  // /// NOTE: Cannot set `is_intermediate_system_file = true` if this is set.
-  // pub maybe_generation_provider: Option<GenerationProvider>,
-}
-
-
 /// Upload an image media file from a file.
 pub async fn upload_image_media_file_from_file<P: AsRef<Path>>(
-  args: UploadImageFromFileArgs<'_, P>,
+  api_host: &ApiHost,
+  maybe_creds: Option<&StorytellerCredentialSet>,
+  path: P,
 ) -> Result<UploadImageMediaFileSuccessResponse, StorytellerError> {
-  
-  validate_args(&args)?;

-  let url = get_route(args.api_host);
+  let url = get_route(api_host);

  debug!("Requesting {:?}", &url);

@@ -68,25 +51,17 @@ pub async fn upload_image_media_file_from_file<P: AsRef<Path>>(
      .build()
      .map_err(|err| StorytellerError::Client(ClientError::from(err)))?;

-  let mut form = Form::new()
+  let form = Form::new()
      .text("uuid_idempotency_token", generate_random_uuid())
-      .file("file", args.path)
+      .file("file", path)
      .await
      .map_err(|err| StorytellerError::Client(ClientError::from(err)))?;

-  if args.is_intermediate_system_file {
-    form = form.text("is_intermediate_system_file", "true");
-  }
-  
-  if let Some(prompt_token) = &args.maybe_prompt_token {
-    form = form.text("maybe_prompt_token", prompt_token.to_string());
-  }
-
  let mut request_builder = client.post(url)
      .header("User-Agent", USER_AGENT)
      .header("Accept", APPLICATION_JSON);
  
-  if let Some(creds) = args.maybe_creds {
+  if let Some(creds) = maybe_creds {
    if let Some(header) = &creds.maybe_as_cookie_header() {
      request_builder = request_builder.header("Cookie", header);
    }
@@ -120,15 +95,3 @@ pub struct UploadImageMediaFileSuccessResponse {
  pub success: bool,
  pub media_file_token: MediaFileToken,
 }
-
-fn validate_args<P: AsRef<Path>>(
-  args: &UploadImageFromFileArgs<'_, P>,
-) -> Result<(), StorytellerError> {
-  if args.is_intermediate_system_file && args.maybe_prompt_token.is_some() {
-    return Err(StorytellerError::Client(ClientError::InvalidPreflightRequest(
-      "Cannot set `is_intermediate_system_file` to true if `maybe_prompt_token` is provided."
-          .to_string())));
-  }
-
-  Ok(())
-}
@@ -1,5 +1,9 @@
 use crate::credentials::storyteller_credential_set::StorytellerCredentialSet;
 use crate::error::api_error::ApiError;
+use crate::shared_response_types::media_file_cover_image_details::MediaFileCoverImageDetails;
+use crate::shared_response_types::media_links::MediaLinks;
+use crate::shared_response_types::simple_entity_stats::SimpleEntityStats;
+use crate::shared_response_types::user_details_light::UserDetailsLight;
 use crate::utils::api_host::ApiHost;
 use crate::utils::constants::{APPLICATION_JSON, USER_AGENT};
 use crate::utils::filter_bad_response::filter_bad_response;
@@ -1,5 +1,9 @@
 use crate::credentials::storyteller_credential_set::StorytellerCredentialSet;
 use crate::error::api_error::ApiError;
+use crate::shared_response_types::media_file_cover_image_details::MediaFileCoverImageDetails;
+use crate::shared_response_types::media_links::MediaLinks;
+use crate::shared_response_types::simple_entity_stats::SimpleEntityStats;
+use crate::shared_response_types::user_details_light::UserDetailsLight;
 use crate::utils::api_host::ApiHost;
 use crate::utils::constants::{APPLICATION_JSON, USER_AGENT};
 use crate::utils::filter_bad_response::filter_bad_response;
@@ -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::prompts::create_prompt::{CreatePromptRequest, CreatePromptResponse, CREATE_PROMPT_PATH};
-
-pub async fn create_prompt(
-  api_host: &ApiHost,
-  maybe_creds: Option<&StorytellerCredentialSet>,
-  request: CreatePromptRequest,
-) -> Result<CreatePromptResponse, StorytellerError> {
-  Ok(basic_json_post_request(
-    api_host,
-    CREATE_PROMPT_PATH,
-    maybe_creds,
-    request,
-  ).await?)
-}
@@ -1 +0,0 @@
-pub mod create_prompt;
@@ -1,7 +1,7 @@
 use crate::credentials::storyteller_credential_set::StorytellerCredentialSet;
 use crate::error::client_error::ClientError;
 use crate::error::storyteller_error::StorytellerError;
-use crate::media_files::upload_image_media_file_from_file::{upload_image_media_file_from_file, UploadImageFromFileArgs};
+use crate::media_files::upload_image_media_file_from_file::upload_image_media_file_from_file;
 use crate::media_files::upload_new_engine_asset_from_file::upload_new_engine_asset_from_file;
 use crate::media_files::upload_video_media_file_from_file::upload_video_media_file_from_file;
 use crate::utils::api_host::ApiHost;
@@ -10,7 +10,6 @@ use mimetypes::mimetype_info::mimetype_info::MimetypeInfo;
 use serde_derive::Deserialize;
 use std::path::Path;
 use tokens::tokens::media_files::MediaFileToken;
-use tokens::tokens::prompts::PromptToken;

 #[derive(Deserialize, Debug)]
 pub struct UploadMediaFileSuccessResponse {
@@ -23,7 +22,6 @@ pub async fn upload_media_file_from_file<P: AsRef<Path>>(
  api_host: &ApiHost,
  maybe_creds: Option<&StorytellerCredentialSet>,
  path: P,
-  maybe_prompt_token: Option<&PromptToken>,
 ) -> Result<UploadMediaFileSuccessResponse, StorytellerError> {
  
  let maybe_type = MimetypeInfo::get_for_path(path.as_ref())
@@ -51,14 +49,7 @@ pub async fn upload_media_file_from_file<P: AsRef<Path>>(
      }
    }
    Some(FileExtension::Png) | Some(FileExtension::Jpg) | Some(FileExtension::Gif) | Some(FileExtension::Webp) => {
-      let result = upload_image_media_file_from_file(UploadImageFromFileArgs {
-        api_host,
-        maybe_creds,
-        path,
-        is_intermediate_system_file: false,
-        maybe_prompt_token,
-      }).await;
-      match result {
+      match upload_image_media_file_from_file(api_host, maybe_creds, path).await {
        Ok(result) => Ok(UploadMediaFileSuccessResponse {
          success: result.success,
          media_file_token: result.media_file_token,
@@ -1,11 +1,8 @@
-use serde_derive::{Deserialize, Serialize};
+use serde_derive::Deserialize;
 use url::Url;

-// TODO(bt,2025-08-20): Replace the storyteller-web version of this.
-//  All it needs is the impl ported into a builder.
-
 /// Cover image links can only be jpg, png, etc. No videos.
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Deserialize, Debug)]
 pub struct CoverImageLinks {
  /// Primary link to the cover image via the CDN.
  pub cdn_url: Url,
@@ -1,22 +1,19 @@
-use crate::common::responses::cover_image_links::CoverImageLinks;
-use serde_derive::{Deserialize, Serialize};
-
-// TODO(bt,2025-08-20): Replace the storyteller-web version of this.
-//  We can't drop the old version just yet due to the `impl` (easy)
-//  and a few differing fields.
+use serde_derive::{Deserialize};
+use url::Url;
+use crate::shared_response_types::cover_image_links::CoverImageLinks;

 /// Everything we need to create a cover image.
 /// Cover images are small descriptive images that can be set for any media file.
 /// If a cover image is set, this is the path to the asset.
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Deserialize, Debug)]
 pub struct MediaFileCoverImageDetails {
-  // /// (DEPRECATED) URL path to the media file
-  // #[deprecated(note="This field doesn't point to the full URL. Use media_links instead to leverage the CDN.")]
-  // pub maybe_cover_image_public_bucket_path: Option<String>,
+  //  /// (DEPRECATED) URL path to the media file
+  //  #[deprecated(note="This field doesn't point to the full URL. Use media_links instead to leverage the CDN.")]
+  //  pub maybe_cover_image_public_bucket_path: Option<String>,

-  // /// (DEPRECATED) Full URL to the media file
-  // #[deprecated(note="This points to the bucket. Use media_links instead to leverage the CDN.")]
-  // pub maybe_cover_image_public_bucket_url: Option<Url>,
+  //  /// (DEPRECATED) Full URL to the media file
+  //  #[deprecated(note="This points to the bucket. Use media_links instead to leverage the CDN.")]
+  //  pub maybe_cover_image_public_bucket_url: Option<Url>,

  // NB(bt,2024-09-19): I accidentally rolled this field out to production.
  // I don't think this field is in use, but maybe ...
@@ -36,7 +33,7 @@ pub struct MediaFileCoverImageDetails {

 /// The default cover is composed of an image and color pair that are
 /// predefined by the frontend.
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Deserialize, Debug)]
 pub struct MediaFileDefaultCover {
  pub image_index: u8,
  pub color_index: u8,
@@ -0,0 +1,34 @@
+use serde_derive::Deserialize;
+use url::Url;
+
+/// Links to media file locations (bucket, CDN, etc.)
+#[derive(Deserialize, Debug)]
+pub struct MediaLinks {
+  /// Primary link to the asset via the CDN.
+  pub cdn_url: Url,
+
+  /// Template to construct thumbnail URLs.
+  /// Replace the string `{WIDTH}` with the desired width.
+  /// Only relevant for image media files. (Video media files instead have
+  /// video previews, which, in turn, have their own thumbnail templates.)
+  pub maybe_thumbnail_template: Option<String>,
+
+  /// Video preview images (still and animated gif) for mp4 video files.
+  /// These are only set for video media files.
+  /// These are not set for "cover images" that are gif or webms, but rather video files.
+  pub maybe_video_previews: Option<VideoPreviews>,
+}
+
+#[derive(Deserialize, Debug)]
+pub struct VideoPreviews {
+  /// A static single frame preview image of the video.
+  pub still: Url,
+  /// An animated gif preview of the video.
+  pub animated: Url,
+  /// A template used to construct the still thumbnail URL.
+  /// Replace the string `{WIDTH}` with the desired width.
+  pub still_thumbnail_template: String,
+  /// A template used to construct the animated thumbnail URL.
+  /// Replace the string `{WIDTH}` with the desired width.
+  pub animated_thumbnail_template: String,
+}
@@ -0,0 +1,5 @@
+pub mod cover_image_links;
+pub mod media_file_cover_image_details;
+pub mod media_links;
+pub mod simple_entity_stats;
+pub mod user_details_light;
@@ -1,9 +1,7 @@
-use serde_derive::{Deserialize, Serialize};
-
-// TODO(bt,2025-08-20): Replace the storyteller-web version of this.
+use serde_derive::Deserialize;

 /// Simple stats that can be attached to any entity
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Deserialize, Debug)]
 pub struct SimpleEntityStats {
  /// Number of positive ratings (or "likes") for this item
  pub positive_rating_count: u32,
@@ -1,8 +1,8 @@
-use serde_derive::{Deserialize, Serialize};
+use serde_derive::Deserialize;
 use tokens::tokens::users::UserToken;

 /// Everything we need to refer to a user on the public web interface.
-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Deserialize, Debug)]
 pub struct UserDetailsLight {
  /// The token for the user
  pub user_token: UserToken,
@@ -26,7 +26,7 @@ pub struct UserDetailsLight {
  // In the future, we'll also support user-uploaded avatars that we store on our servers.
 }

-#[derive(Serialize, Deserialize, Debug)]
+#[derive(Deserialize, Debug)]
 pub struct UserDefaultAvatarInfo {
  pub image_index: u8,
  pub color_index: u8,
@@ -23,27 +23,24 @@ tauri-build = { version = "2.1.1", features = [] }

 [dependencies]
 # Workspace hack (faster compile times)
-workspace-build-acceleration.workspace =  true
+workspace-build-acceleration = { workspace =  true }

 # Internal
-artcraft_api_defs.workspace = true
-build_metadata.workspace = true
-cookie_store.workspace = true
-enums.workspace = true
-errors.workspace = true
-fal_client.workspace = true
-filesys.workspace = true
-idempotency.workspace = true
-images.workspace = true
-memory_store.workspace = true
-midjourney_client.workspace = true
-mimetypes.workspace = true
-openai_sora_client.workspace = true
-primitives.workspace = true
+artcraft_api_defs = { workspace = true }
+build_metadata = { workspace = true }
+enums = { workspace = true }
+errors = { workspace = true }
+fal_client = { workspace = true }
+filesys = { workspace = true }
+idempotency = { workspace = true }
+memory_store = { workspace = true }
+mimetypes = { workspace = true }
+openai_sora_client = { workspace = true }
+primitives = { workspace = true }
 sqlite_tasks.workspace = true
-storyteller_client.workspace = true
-tokens.workspace = true
-web_base64.workspace = true
+storyteller_client = { workspace = true }
+tokens = { workspace = true }
+web_base64 = { workspace = true }

 # External
 anyhow = { workspace = true }
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`pub mod enqueue_flux_pro_kontext_max_edit_webhook;`