Merge branch 'main' into feature/bugfixes

Fixed one off issue.
Wired ContextMenu debugging small issue.
2026-10-27 20:20:07 -04:00 · 2025-06-11 13:42:28 -04:00 · 2025-06-11 13:25:27 -04:00 · 2025-06-11 13:06:07 -04:00 · 2025-06-10 20:29:52 -04:00 · 2025-06-10 17:39:10 -04:00
925 changed files with 8781 additions and 16778 deletions
@@ -1,107 +0,0 @@
-name: "Artcraft Publish"
-
-on:
-  push:
-    branches:
-      - release
-      - artcraft-release
-
-# This workflow creates Universal macOS builds with signing certificate support.
-# On each push to the release branches it will create or update a GitHub release, build your app, and upload the artifacts to the release.
-
-jobs:
-  publish-artcraft:
-    permissions:
-      contents: write
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          # Universal macOS builds (arm64 and x86_64)
-          - platform: 'macos-latest'
-            args: '--target universal-apple-darwin'
-          # Uncomment below for additional platforms
-          # - platform: 'ubuntu-22.04'
-          #   args: ''
-          # - platform: 'windows-latest'
-          #   args: ''
-
-    runs-on: ${{ matrix.platform }}
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: setup node
-        uses: actions/setup-node@v4
-        with:
-          node-version: lts/*
-
-      - name: install Rust stable
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
-
-      - name: install dependencies (ubuntu only)
-        if: matrix.platform == 'ubuntu-22.04'
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
-
-      - name: install frontend dependencies
-        run: |
-          cd ./crates/desktop/artcraft
-          yarn install
-
-      - name: import Apple Developer Certificate
-        if: matrix.platform == 'macos-latest'
-        # Prevents keychain from locking automatically for 3600 seconds.
-        env:
-          APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
-          APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
-          KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
-        run: |
-          echo $APPLE_CERTIFICATE | base64 --decode > certificate.p12
-          security create-keychain -p "$KEYCHAIN_PASSWORD" build.keychain
-          security default-keychain -s build.keychain
-          security unlock-keychain -p "$KEYCHAIN_PASSWORD" build.keychain
-          security set-keychain-settings -t 3600 -u build.keychain
-          security import certificate.p12 -k build.keychain -P "$APPLE_CERTIFICATE_PASSWORD" -T /usr/bin/codesign
-          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$KEYCHAIN_PASSWORD" build.keychain
-          security find-identity -v -p codesigning build.keychain
-
-      - name: verify certificate
-        if: matrix.platform == 'macos-latest'
-        run: |
-          echo "Available certificates:"
-          security find-identity -v -p codesigning build.keychain
-          
-          # Try multiple certificate patterns
-          CERT_INFO=$(security find-identity -v -p codesigning build.keychain | grep -E "(Developer ID Application|Apple Development|Storyteller Developer)" | head -1)
-          
-          if [ -z "$CERT_INFO" ]; then
-            echo "No matching certificate found. Using first available certificate."
-            CERT_INFO=$(security find-identity -v -p codesigning build.keychain | grep -v "Policy" | head -1)
-          fi
-          
-          CERT_ID=$(echo "$CERT_INFO" | awk -F'"' '{print $2}')
-          echo "CERT_ID=$CERT_ID" >> $GITHUB_ENV
-          echo "Using certificate: $CERT_ID"
-
-      - name: build and publish
-        uses: tauri-apps/tauri-action@v0
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          APPLE_ID: ${{ secrets.APPLE_ID }}
-          APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
-          APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
-          APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
-          APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
-          APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
-          APPLE_SIGNING_IDENTITY: ${{ env.CERT_ID }}
-        with:
-          projectPath: ./crates/desktop/artcraft
-          tagName: artcraft-v__VERSION__ # the action automatically replaces __VERSION__ with the app version.
-          releaseName: "Artcraft v__VERSION__"
-          releaseBody: "See the assets to download this version and install."
-          releaseDraft: true
-          prerelease: false
-          args: ${{ matrix.args }}
@@ -1,96 +0,0 @@
-name: "Artcraft Windows Publish"
-
-on:
-  push:
-    branches:
-      - release
-      - artcraft-release
-      - artcraft-windows  # Additional branch for Windows testing
-
-# This workflow creates Windows builds.
-# On each push to the release branches it will create or update a GitHub release, build your app, and upload the artifacts to the release.
-
-jobs:
-  publish-artcraft-windows:
-    permissions:
-      contents: write
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          # Windows builds
-          - platform: 'windows-latest'
-            args: ''
-
-    runs-on: ${{ matrix.platform }}
-    steps:
-      - uses: actions/checkout@v4
-
-      - 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
-          cd ./frontend
-
-          yarn cache clean
-
-          echo "Installing all workspace dependencies..."
-          yarn install --production=false --frozen-lockfile
-
-          echo "=== Version Information ==="
-          echo "Node version:"
-          node --version
-          echo "NPM version:"
-          npm --version
-          echo "Yarn version:"
-          yarn --version
-
-          # Remove mismatched @nx packages and reinstall with correct versions
-          yarn add @nx/remix@20.7.2 @nx/js@20.7.2 @nx/react@20.7.2 @nx/vite@20.7.2 @nx/eslint@20.7.2 --dev -W
-
-          echo "=== Nx versions after adjustment ==="
-          yarn list --pattern "nx" --depth=0
-
-      - name: Pre-build frontend to avoid Tauri build issues
-        run: |
-          # Build the frontend app from the correct directory
-          cd ./frontend
-
-          # Increase Node.js memory limit for the build
-          $env:NODE_OPTIONS="--max-old-space-size=8192"
-
-          # Use npx to ensure we use the local nx version
-          echo "Building with npx nx..."
-          npx nx run editor3d:build
-
-          echo "Checking build output..."
-          dir apps/editor3d/dist/ | Select-Object -First 10
-
-          # Update Tauri config to skip the build (since we already built)
-          cd ${{ github.workspace }}/crates/desktop/artcraft
-          Copy-Item tauri.conf.json tauri.conf.json.bak
-          
-          # Set beforeBuildCommand to empty using PowerShell
-          $config = Get-Content tauri.conf.json | ConvertFrom-Json
-          $config.build.beforeBuildCommand = ""
-          $config | ConvertTo-Json -Depth 10 | Set-Content tauri.conf.json
-
-      - name: build and publish
-        uses: tauri-apps/tauri-action@v0
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          projectPath: ./crates/desktop/artcraft
-          tagName: artcraft-windows-v__VERSION__ # the action automatically replaces __VERSION__ with the app version.
-          releaseName: "Artcraft Windows v__VERSION__"
-          releaseBody: "Windows build - See the assets to download this version and install."
-          releaseDraft: true
-          prerelease: false
-          args: ${{ matrix.args }}
@@ -688,7 +688,6 @@ dependencies = [
 "tokio",
 "tokio-util",
 "url",
- "web_base64",
 "workspace-build-acceleration",
 ]

@@ -2765,7 +2764,7 @@ dependencies = [
 "log",
 "mimetypes",
 "mysql_queries",
- "rand 0.9.1",
+ "rand 0.8.5",
 "sqlx",
 "storyteller_root",
 "tokens",
@@ -3598,10 +3597,8 @@ dependencies = [
 "fal",
 "file_to_base64_url",
 "futures 0.3.31",
- "log",
 "reqwest 0.12.15",
 "serde",
- "test_data",
 "testing",
 "tokio",
 "url",
@@ -10854,15 +10851,6 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"

-[[package]]
-name = "test_data"
-version = "0.0.1"
-dependencies = [
- "anyhow",
- "errors",
- "workspace-build-acceleration",
-]
-
 [[package]]
 name = "testing"
 version = "0.0.1"
@@ -12222,14 +12210,6 @@ dependencies = [
 "wasm-bindgen",
 ]

-[[package]]
-name = "web_base64"
-version = "0.0.1"
-dependencies = [
- "base64 0.22.1",
- "workspace-build-acceleration",
-]
-
 [[package]]
 name = "web_scrapers"
 version = "0.0.1"
@@ -4,18 +4,6 @@ resolver = "2"
 # This block defines the workspace members.
 # When we add a library or binary crate, it needs an entry here.
 members = [
-  # API clients for external services
-  # These might be custom implementations or wrappers over other client libraries.
-  "crates/api_clients/cloud_storage",
-  "crates/api_clients/fal_client",
-  "crates/api_clients/google_drive_common",
-  "crates/api_clients/google_sign_in",
-  "crates/api_clients/openai_sora_client",
-  "crates/api_clients/openart_client",
-  "crates/api_clients/runwayml_client",
-  "crates/api_clients/storyteller_client",
-  "crates/api_clients/thumbnail_generator",
-
  # CLI tools for operations, etc.
  "crates/cli/devenv/dev-database-seed",
  "crates/cli/devenv/dev-upload-media-file",
@@ -34,6 +22,15 @@ members = [
  # Shared libraries
  "crates/lib/actix_cors_configs",
  "crates/lib/actix_helpers",
+  "crates/lib/api_clients/cloud_storage",
+  "crates/lib/api_clients/fal_client",
+  "crates/lib/api_clients/google_drive_common",
+  "crates/lib/api_clients/google_sign_in",
+  "crates/lib/api_clients/openai_sora_client",
+  "crates/lib/api_clients/openart_client",
+  "crates/lib/api_clients/runwayml_client",
+  "crates/lib/api_clients/storyteller_client",
+  "crates/lib/api_clients/thumbnail_generator",
  "crates/lib/bootstrap",
  "crates/lib/bucket_paths",
  "crates/lib/build_metadata",
@@ -46,7 +43,6 @@ members = [
  "crates/lib/data/crockford",
  "crates/lib/data/datetimes",
  "crates/lib/data/primitives",
-  "crates/lib/data/web_base64",
  "crates/lib/deprecated/config", # TODO(bt, 2023-02-13): Deprecate or repurpose
  "crates/lib/deprecated/http_server_common", # TODO(bt, 2023-03-20): Move useful pieces to actix_helpers
  "crates/lib/dimensions",
@@ -76,7 +72,6 @@ members = [
  "crates/lib/sqlx_mysql_helpers",
  "crates/lib/storyteller_root",
  "crates/lib/subprocess_common",
-  "crates/lib/test_data",
  "crates/lib/testing",
  "crates/lib/tts_common",
  "crates/lib/url_config",
@@ -214,12 +209,11 @@ url = { version = "2.5.4", features = ["serde"] }
 # Internal libs
 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" }
 crockford = { path = "crates/lib/data/crockford" }
 enums = { path = "crates/schema/public/enums" }
 enums_public = { path = "crates/schema/public/enums_public" }
 errors = { path = "crates/lib/errors" }
-fal_client = { path = "crates/api_clients/fal_client" }
+fal_client = { path = "crates/lib/api_clients/fal_client" }
 file_to_base64_url = { path = "crates/lib/files/file_to_base64_url" }
 filesys = { path = "crates/lib/files/filesys" }
 idempotency = { path = "crates/lib/idempotency" }
@@ -228,11 +222,9 @@ jwt_light = { path = "crates/lib/jwt_light" }
 memory_caching = { path = "crates/lib/caching/memory_caching" }
 memory_store = { path = "crates/lib/caching/memory_store" }
 mimetypes = { path = "crates/lib/files/mimetypes" }
-openai_sora_client = { path = "crates/api_clients/openai_sora_client" }
+openai_sora_client = { path = "crates/lib/api_clients/openai_sora_client" }
 primitives = { path = "crates/lib/data/primitives" }
 shared_service_components = { path = "crates/lib/shared_service_components" }
-storyteller_client = { path = "crates/api_clients/storyteller_client" }
+storyteller_client = { path = "crates/lib/api_clients/storyteller_client" }
 subprocess_common = { path = "crates/lib/subprocess_common" }
-test_data = { path = "crates/lib/test_data" }
 tokens = { path = "crates/schema/public/tokens" }
-web_base64 = { path = "crates/lib/data/web_base64" }
@@ -1,7 +1,7 @@
 storyteller-rust
 ================

-Our Artcraft monorepo, which serves our desktop application, backend infrastructure, and more.
+Our Rust monorepo, which serves both our API surface area and our downloadable client applications.

 ```
                 ."-,.__
@@ -45,6 +45,5 @@ Our Artcraft monorepo, which serves our desktop application, backend infrastruct
                 / ,"'"\,'               `/  `-.|" 
 ```

- [developer documentation](./_docs)
- [server API reference](https://storyteller-docs.netlify.app/)
- [tools, scripts, misc](./script)
+- [documentation](./_develop/docs)
+- [tools, misc](./_develop)
@@ -1,5 +1,5 @@
-Local Development Setup Guide (for bare metal)
-==============================================
+FakeYou Development Setup (bare metal)
+======================================

 This document describes how to run the FakeYou infrastructure on your development 
 machine's bare metal (no containers).
@@ -1,26 +0,0 @@
-Code Conventions
-================
-
-We use three languages at Artcraft: Rust, TypeScript, and Python.
-
-## Rust style guide
-
-We deviate from the official Rust style guide in a few places:
-
- We use two spaces for indentation instead of four.
- We typically keep one function or type definition per file, though this isn't a steadfast rule.
- We use a Cargo workspace to share code within our monorepo.
-
-### Rust Preferred Libraries
-
-We use the following Rust libraries, though we are open to migrating to alternatives:
-
- `actix-web` for our HTTP web server
- `reqwest` for HTTP client requests
- `sqlx` for SQL database operations
- `tokio` for asynchronous programming
-
-## TypeScript style guide
-
- We use two spaces for indentation instead of four.
- We use `nx` for monorepo management
@@ -1,42 +0,0 @@
-[package]
-name = "cloud_storage"
-edition = "2018"
-version = "0.0.1"
-authors = [
-    "Brandon Thomas <bt@brand.io>",
-    "Brandon Thomas <echelon@gmail.com>",
-]
-publish = false
-
-[lib]
-name = "cloud_storage"
-path = "src/lib.rs"
-
-[package.metadata.cargo-udeps.ignore]
-normal = ["workspace-build-acceleration"]
-
-[dependencies]
-# Workspace hack (faster compile times)
-workspace-build-acceleration.workspace = true
-
-# Internal
-bucket_paths = { path = "../../lib/bucket_paths" }
-crockford.workspace = true
-easyenv = { path = "../../lib/easyenv" }
-errors.workspace = true
-filesys.workspace = true
-hashing = { path = "../../lib/files/hashing" }
-mimetypes.workspace = true
-storyteller_root = { path = "../../lib/storyteller_root" }
-
-# External
-anyhow.workspace = true
-log.workspace = true
-env_logger = "0.11.3"
-async-trait = "0.1.75"
-# The "never-encode-slash" feature seems to have been removed:
-# https://github.com/durch/rust-s3/pull/254
-rust-s3 = { version = "0.36.0-beta.2" }
-
-# Runtime
-tokio.workspace = true
@@ -1,2 +0,0 @@
-pub mod fal_api_key;
-pub mod open_ai_api_key;
@@ -1,15 +0,0 @@
-
-/// This is for Fal's OpenAI "Bring Your Own Key" (BYOK) endpoints.
-#[derive(Clone)]
-pub struct OpenAiApiKey(pub String);
-
-impl OpenAiApiKey {
-  pub fn new(api_key: String) -> Self {
-    Self(api_key)
-  }
-
-  pub fn from_str(api_key: &str) -> Self {
-    let api_key = api_key.trim().to_string();
-    Self(api_key)
-  }
-}
@@ -1,2 +0,0 @@
-pub mod enqueue_flux_pro_11_ultra_text_to_image;
-pub mod enqueue_recraft3_text_to_image;
@@ -1,2 +0,0 @@
-pub mod enqueue_kling_16_pro_image_to_video;
-pub mod enqueue_minimax_01_image_to_video;
@@ -1,106 +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::endpoints::fal_ai::flux::dev::dev;
-use fal::endpoints::fal_ai::flux::dev::DevTextToImageInput;
-use fal::prelude::fal_ai::flux::dev::ImageSizeProperty;
-use fal::webhook::WebhookResponse;
-use reqwest::IntoUrl;
-
-pub struct Flux1DevArgs<'a, U: IntoUrl> {
-  pub prompt: &'a str,
-  pub webhook_url: U,
-  pub api_key: &'a FalApiKey,
-  pub aspect_ratio: Flux1DevAspectRatio,
-  pub num_images: Flux1DevNumImages,
-}
-
-#[derive(Copy, Clone, Debug)]
-pub enum Flux1DevAspectRatio {
-  Square, // 1:1
-  SquareHd, // 1:1
-  LandscapeFourByThree, // 4:3
-  LandscapeSixteenByNine, // 16:9
-  PortraitThreeByFour, // 3:4
-  PortraitNineBySixteen, // 9:16
-  //Custom { width: u32, height: u32 }, // TODO
-}
-
-#[derive(Copy, Clone, Debug)]
-pub enum Flux1DevNumImages {
-  One, // Default
-  Two,
-  Three,
-  Four,
-}
-
-pub async fn enqueue_flux_1_dev_text_to_image_webhook<U: IntoUrl>(
-  args: Flux1DevArgs<'_, U>
-) -> Result<WebhookResponse, FalErrorPlus> {
-  
-  let num_images = match args.num_images {
-    Flux1DevNumImages::One => 1,
-    Flux1DevNumImages::Two => 2,
-    Flux1DevNumImages::Three => 3,
-    Flux1DevNumImages::Four => 4,
-  };
-  
-  let image_size = match args.aspect_ratio {
-    Flux1DevAspectRatio::Square => ImageSizeProperty::Square,
-    Flux1DevAspectRatio::SquareHd => ImageSizeProperty::SquareHd,
-    Flux1DevAspectRatio::LandscapeFourByThree => ImageSizeProperty::Landscape43,
-    Flux1DevAspectRatio::LandscapeSixteenByNine => ImageSizeProperty::Landscape169,
-    Flux1DevAspectRatio::PortraitThreeByFour => ImageSizeProperty::Portrait43,
-    Flux1DevAspectRatio::PortraitNineBySixteen => ImageSizeProperty::Portrait169,
-  };
-  
-  let request = DevTextToImageInput {
-    prompt: args.prompt.to_string(),
-    num_images: Some(num_images),
-    image_size: Some(image_size),
-    // Maybe abstract
-    enable_safety_checker: Some(false),
-    // Maybe expose
-    seed: None,
-    guidance_scale: None,
-    num_inference_steps: None,
-    // Constants
-    sync_mode: None, // Synchronous / slow
-  };
-  
-  let result = dev(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::enqueue_flux_1_dev_text_to_image_webhook::{enqueue_flux_1_dev_text_to_image_webhook, Flux1DevArgs, Flux1DevAspectRatio, Flux1DevNumImages};
-  use errors::AnyhowResult;
-  use std::fs::read_to_string;
-
-  #[tokio::test]
-  #[ignore]
-  async fn test_flux_1_dev() -> 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 = Flux1DevArgs {
-      prompt: "a giant robot fighting a dragon in a futuristic city",
-      api_key: &api_key,
-      webhook_url: "https://example.com/webhook",
-      num_images: Flux1DevNumImages::One,
-      aspect_ratio: Flux1DevAspectRatio::LandscapeFourByThree
-    };
-
-    let result = enqueue_flux_1_dev_text_to_image_webhook(args).await?;
-
-    Ok(())
-  }
-}
@@ -1,105 +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::endpoints::fal_ai::flux::schnell::schnell;
-use fal::endpoints::fal_ai::flux::schnell::SchnellTextToImageInput;
-use fal::prelude::fal_ai::flux::schnell::ImageSizeProperty;
-use fal::webhook::WebhookResponse;
-use reqwest::IntoUrl;
-
-pub struct Flux1SchnellArgs<'a, U: IntoUrl> {
-  pub prompt: &'a str,
-  pub webhook_url: U,
-  pub api_key: &'a FalApiKey,
-  pub aspect_ratio: Flux1SchnellAspectRatio,
-  pub num_images: Flux1SchnellNumImages,
-}
-
-#[derive(Copy, Clone, Debug)]
-pub enum Flux1SchnellAspectRatio {
-  Square, // 1:1
-  SquareHd, // 1:1
-  LandscapeFourByThree, // 4:3
-  LandscapeSixteenByNine, // 16:9
-  PortraitThreeByFour, // 3:4
-  PortraitNineBySixteen, // 9:16
-  //Custom { width: u32, height: u32 }, // TODO
-}
-
-#[derive(Copy, Clone, Debug)]
-pub enum Flux1SchnellNumImages {
-  One, // Default
-  Two,
-  Three,
-  Four,
-}
-
-pub async fn enqueue_flux_1_schnell_text_to_image_webhook<U: IntoUrl>(
-  args: Flux1SchnellArgs<'_, U>
-) -> Result<WebhookResponse, FalErrorPlus> {
-  
-  let num_images = match args.num_images {
-    Flux1SchnellNumImages::One => 1,
-    Flux1SchnellNumImages::Two => 2,
-    Flux1SchnellNumImages::Three => 3,
-    Flux1SchnellNumImages::Four => 4,
-  };
-  
-  let image_size = match args.aspect_ratio {
-    Flux1SchnellAspectRatio::Square => ImageSizeProperty::Square,
-    Flux1SchnellAspectRatio::SquareHd => ImageSizeProperty::SquareHd,
-    Flux1SchnellAspectRatio::LandscapeFourByThree => ImageSizeProperty::Landscape43,
-    Flux1SchnellAspectRatio::LandscapeSixteenByNine => ImageSizeProperty::Landscape169,
-    Flux1SchnellAspectRatio::PortraitThreeByFour => ImageSizeProperty::Portrait43,
-    Flux1SchnellAspectRatio::PortraitNineBySixteen => ImageSizeProperty::Portrait169,
-  };
-  
-  let request = SchnellTextToImageInput {
-    prompt: args.prompt.to_string(),
-    num_images: Some(num_images),
-    image_size: Some(image_size),
-    // Maybe abstract
-    enable_safety_checker: Some(false),
-    // Maybe expose
-    seed: None,
-    num_inference_steps: None,
-    // Constants
-    sync_mode: None, // Synchronous / slow
-  };
-  
-  let result = schnell(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::enqueue_flux_1_schnell_text_to_image_webhook::{enqueue_flux_1_schnell_text_to_image_webhook, Flux1SchnellArgs, Flux1SchnellAspectRatio, Flux1SchnellNumImages};
-  use errors::AnyhowResult;
-  use std::fs::read_to_string;
-
-  #[tokio::test]
-  #[ignore]
-  async fn test_flux_1_schnell() -> 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 = Flux1SchnellArgs {
-      prompt: "a giant robot fighting a dragon in a futuristic city",
-      api_key: &api_key,
-      webhook_url: "https://example.com/webhook",
-      num_images: Flux1SchnellNumImages::One,
-      aspect_ratio: Flux1SchnellAspectRatio::LandscapeSixteenByNine,
-    };
-
-    let result = enqueue_flux_1_schnell_text_to_image_webhook(args).await?;
-
-    Ok(())
-  }
-}
@@ -1,104 +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::endpoints::fal_ai::flux_pro::v1_1::{v1_1, FluxProPlusTextToImageInput, ImageSizeProperty};
-use fal::webhook::WebhookResponse;
-use reqwest::IntoUrl;
-
-pub struct FluxPro11Args<'a, U: IntoUrl> {
-  pub prompt: &'a str,
-  pub webhook_url: U,
-  pub api_key: &'a FalApiKey,
-  pub aspect_ratio: FluxPro11AspectRatio,
-  pub num_images: FluxPro11NumImages,
-}
-
-#[derive(Copy, Clone, Debug)]
-pub enum FluxPro11AspectRatio {
-  Square, // 1:1
-  SquareHd, // 1:1
-  LandscapeFourByThree, // 4:3
-  LandscapeSixteenByNine, // 16:9
-  PortraitThreeByFour, // 3:4
-  PortraitNineBySixteen, // 9:16
-  //Custom { width: u32, height: u32 }, // TODO
-}
-
-#[derive(Copy, Clone, Debug)]
-pub enum FluxPro11NumImages {
-  One, // Default
-  Two,
-  Three,
-  Four,
-}
-
-pub async fn enqueue_flux_pro_11_text_to_image_webhook<U: IntoUrl>(
-  args: FluxPro11Args<'_, U>
-) -> Result<WebhookResponse, FalErrorPlus> {
-  
-  let num_images = match args.num_images {
-    FluxPro11NumImages::One => 1,
-    FluxPro11NumImages::Two => 2,
-    FluxPro11NumImages::Three => 3,
-    FluxPro11NumImages::Four => 4,
-  };
-
-  let image_size = match args.aspect_ratio {
-    FluxPro11AspectRatio::Square => ImageSizeProperty::Square,
-    FluxPro11AspectRatio::SquareHd => ImageSizeProperty::SquareHd,
-    FluxPro11AspectRatio::LandscapeFourByThree => ImageSizeProperty::Landscape43,
-    FluxPro11AspectRatio::LandscapeSixteenByNine => ImageSizeProperty::Landscape169,
-    FluxPro11AspectRatio::PortraitThreeByFour => ImageSizeProperty::Portrait43,
-    FluxPro11AspectRatio::PortraitNineBySixteen => ImageSizeProperty::Portrait169,
-  };
-  
-  let request = FluxProPlusTextToImageInput {
-    prompt: args.prompt.to_string(),
-    num_images: Some(num_images),
-    image_size: Some(image_size),
-    // Maybe expose
-    seed: None,
-    // Maybe abstract
-    enable_safety_checker: Some(false),
-    safety_tolerance: Some("5".to_string()), // 1 is most strict, 5 is most permissive
-    // Constants
-    output_format: Some("png".to_string()),
-    sync_mode: None, // Synchronous / slow
-  };
-  
-  let result = v1_1(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::enqueue_flux_pro_11_text_to_image_webhook::{enqueue_flux_pro_11_text_to_image_webhook, FluxPro11Args, FluxPro11AspectRatio, FluxPro11NumImages};
-  use errors::AnyhowResult;
-  use std::fs::read_to_string;
-
-  #[tokio::test]
-  #[ignore]
-  async fn test_flux_11_pro() -> 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 = FluxPro11Args {
-      prompt: "a giant red panda fighting a dragon in a futuristic city",
-      api_key: &api_key,
-      webhook_url: "https://example.com/webhook",
-      num_images: FluxPro11NumImages::One,
-      aspect_ratio: FluxPro11AspectRatio::LandscapeSixteenByNine,
-    };
-
-    let result = enqueue_flux_pro_11_text_to_image_webhook(args).await?;
-
-    Ok(())
-  }
-}
@@ -1,74 +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::endpoints::fal_ai::flux_pro::v1_1_ultra::{v1_1_ultra, AspectRatioProperty, FluxProUltraTextToImageInput};
-use fal::webhook::WebhookResponse;
-use reqwest::IntoUrl;
-
-pub struct FluxPro11UltraArgs<'a, U: IntoUrl> {
-  pub prompt: &'a str,
-  pub webhook_url: U,
-  pub api_key: &'a FalApiKey,
-  pub aspect_ratio: FluxPro11UltraAspectRatio,
-  pub num_images: FluxPro11UltraNumImages,
-}
-
-#[derive(Copy, Clone, Debug)]
-pub enum FluxPro11UltraAspectRatio {
-  Square, // 1:1
-  LandscapeFourByThree, // 4:3
-  LandscapeSixteenByNine, // 16:9
-  PortraitThreeByFour, // 3:4
-  PortraitNineBySixteen, // 9:16
-  //Custom { width: u32, height: u32 }, // TODO
-}
-
-#[derive(Copy, Clone, Debug)]
-pub enum FluxPro11UltraNumImages {
-  One, // Default
-  Two,
-  Three,
-  Four,
-}
-
-pub async fn enqueue_flux_pro_11_ultra_text_to_image_webhook<U: IntoUrl>(
-  args: FluxPro11UltraArgs<'_, U>
-) -> Result<WebhookResponse, FalErrorPlus> {
-  
-  let num_images = match args.num_images {
-    FluxPro11UltraNumImages::One => 1,
-    FluxPro11UltraNumImages::Two => 2,
-    FluxPro11UltraNumImages::Three => 3,
-    FluxPro11UltraNumImages::Four => 4,
-  };
-
-  let aspect_ratio = match args.aspect_ratio {
-    FluxPro11UltraAspectRatio::Square => AspectRatioProperty::Property_1_1,
-    FluxPro11UltraAspectRatio::LandscapeFourByThree => AspectRatioProperty::Property_4_3,
-    FluxPro11UltraAspectRatio::LandscapeSixteenByNine => AspectRatioProperty::Property_16_9,
-    FluxPro11UltraAspectRatio::PortraitThreeByFour => AspectRatioProperty::Property_3_4,
-    FluxPro11UltraAspectRatio::PortraitNineBySixteen => AspectRatioProperty::Property_9_16,
-  };
-  
-  let request = FluxProUltraTextToImageInput {
-    prompt: args.prompt.to_string(),
-    num_images: Some(num_images),
-    aspect_ratio: Some(aspect_ratio),
-    // Maybe expose
-    seed: None,
-    raw: Some(true), // Generate less processed, more natural-looking images. Default is false.
-    // Maybe abstract
-    enable_safety_checker: Some(false),
-    safety_tolerance: Some("5".to_string()), // 1 is most strict, 5 is most permissive
-    // Constants
-    output_format: Some("png".to_string()),
-    sync_mode: None, // Synchronous / slow
-  };
-  
-  let result = v1_1_ultra(request)
-      .with_api_key(&args.api_key.0)
-      .queue_webhook(args.webhook_url)
-      .await;
-
-  result.map_err(|err| classify_fal_error(err))
-}
@@ -1,133 +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::endpoints::fal_ai::gpt_image_1::edit_image::byok::{gpt_edit_image, GptEditImageRequest};
-use fal::webhook::WebhookResponse;
-use reqwest::IntoUrl;
-
-pub struct GptEditImageByokArgs<'a, V: IntoUrl> {
-  // Request
-  pub image_urls: Vec<String>,
-  pub prompt: &'a str,
-  pub image_size: GptEditImageSize,
-  pub num_images: GptEditImageNumImages,
-  pub quality: GptEditImageQuality,
-  
-  // Fulfillment
-  pub api_key: &'a FalApiKey,
-  pub openai_api_key: &'a OpenAiApiKey,
-  pub webhook_url: V,
-}
-
-#[derive(Copy, Clone, Debug)]
-pub enum GptEditImageSize{
-  Auto,
-  Square,
-  Horizontal,
-  Vertical,
-}
-
-#[derive(Copy, Clone, Debug)]
-pub enum GptEditImageQuality {
-  Auto,
-  Low,
-  Medium,
-  High,
-}
-
-#[derive(Copy, Clone, Debug)]
-pub enum GptEditImageNumImages{
-  One,
-  Two,
-  Three,
-  Four,
-}
-
-pub async fn enqueue_gpt_image_1_edit_image_webhook<V: IntoUrl>(
-  args: GptEditImageByokArgs<'_, V>
-) -> Result<WebhookResponse, FalErrorPlus> {
-
-  // auto, 1024x1024, 1536x1024, 1024x1536
-  let image_size = match args.image_size {
-    GptEditImageSize::Auto => "auto",
-    GptEditImageSize::Square => "1024x1024",
-    GptEditImageSize::Horizontal => "1536x1024",
-    GptEditImageSize::Vertical => "1024x1536",
-  };
-  
-  let quality = match args.quality {
-    GptEditImageQuality::Auto => "auto",
-    GptEditImageQuality::Low => "low",
-    GptEditImageQuality::Medium => "medium",
-    GptEditImageQuality::High => "high",
-  };
-
-  let num_images = match args.num_images {
-    GptEditImageNumImages::One => 1,
-    GptEditImageNumImages::Two => 2,
-    GptEditImageNumImages::Three => 3,
-    GptEditImageNumImages::Four => 4,
-  };
-
-  let request = GptEditImageRequest {
-    image_urls: args.image_urls,
-    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_edit_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_edit_image_webhook::{enqueue_gpt_image_1_edit_image_webhook, GptEditImageByokArgs, GptEditImageNumImages, GptEditImageQuality, GptEditImageSize};
-  use errors::AnyhowResult;
-  use std::fs::read_to_string;
-  use test_data::web::image_urls::{ERNEST_SCARED_STUPID_IMAGE_URL, GHOST_IMAGE_URL, GRASSY_HILL_TRANSPARENT_IMAGE_URL};
-
-  #[tokio::test]
-  #[ignore]
-  async fn test_gpt_image_1_edit_image() -> AnyhowResult<()> {
-    let image_url = "https://cdn-2.fakeyou.com/media/3/4/h/f/s/34hfsmt8e38rvne6mwa4pwbxr6292sgy/image_34hfsmt8e38rvne6mwa4pwbxr6292sgy.png";
-
-    // 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 = GptEditImageByokArgs {
-      image_urls: vec![
-        ERNEST_SCARED_STUPID_IMAGE_URL.to_string(),
-        GHOST_IMAGE_URL.to_string(),
-        GRASSY_HILL_TRANSPARENT_IMAGE_URL.to_string(),
-      ],
-      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: GptEditImageSize::Horizontal,
-      num_images: GptEditImageNumImages::One,
-      quality: GptEditImageQuality::High,
-    };
-
-    let result = enqueue_gpt_image_1_edit_image_webhook(args).await?;
-
-    Ok(())
-  }
-}
@@ -1,6 +0,0 @@
-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 remove_background_rembg_webhook;
@@ -1,65 +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::hunyuan3d::v21::{v21, Hunyuan3DInput};
-use fal::webhook::WebhookResponse;
-use reqwest::IntoUrl;
-
-pub struct Hunyuan3d21Args<'a, U: IntoUrl, V: IntoUrl> {
-  pub image_url: U,
-  pub webhook_url: V,
-  pub api_key: &'a FalApiKey,
-}
-
-pub async fn enqueue_hunyuan_3d_2_1_image_to_3d_webhook<U: IntoUrl, V: IntoUrl>(
-  args: Hunyuan3d21Args<'_, U, V>
-) -> Result<WebhookResponse, FalErrorPlus> {
-  
-  let image_url = args.image_url.as_str().to_string();
-
-  let request = Hunyuan3DInput {
-    input_image_url: image_url,
-    textured_mesh: Some(true),
-    // TODO: Maybe expose these later
-    guidance_scale: None,
-    num_inference_steps: None,
-    octree_resolution: None,
-    seed: None,
-  };
-
-  let result = v21(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::object::enqueue_hunyuan_3d_21_image_to_3d_webhook::{enqueue_hunyuan_3d_2_1_image_to_3d_webhook, Hunyuan3d21Args};
-  use errors::AnyhowResult;
-  use std::fs::read_to_string;
-
-  #[tokio::test]
-  #[ignore]
-  async fn test_hunyuan3d_21() -> AnyhowResult<()> {
-    let image_url = "https://cdn-2.fakeyou.com/media/p/a/c/7/j/pac7jgp2tkehm7j7sm4sky1fpnkrnbve/image_pac7jgp2tkehm7j7sm4sky1fpnkrnbve.png";
-
-    // 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 = Hunyuan3d21Args {
-      image_url: image_url,
-      api_key: &api_key,
-      webhook_url: "https://example.com/webhook",
-    };
-
-    let result = enqueue_hunyuan_3d_2_1_image_to_3d_webhook(args).await?;
-
-    Ok(())
-  }
-}
@@ -1,2 +0,0 @@
-pub mod enqueue_hunyuan_3d_2_image_to_3d_webhook;
-pub mod enqueue_hunyuan_3d_21_image_to_3d_webhook;
@@ -1,98 +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::endpoints::fal_ai::kling_video::v2_1::master::image_to_video::{image_to_video, MasterImageToVideoRequest};
-use fal::webhook::WebhookResponse;
-use reqwest::IntoUrl;
-
-pub struct Kling21MasterArgs<'a, U: IntoUrl, V: IntoUrl> {
-  pub image_url: U,
-  pub webhook_url: V,
-  pub prompt: &'a str,
-  pub api_key: &'a FalApiKey,
-  pub duration: Kling21MasterDuration,
-  pub aspect_ratio: Kling21MasterAspectRatio,
-}
-
-#[derive(Copy, Clone, Debug)]
-pub enum Kling21MasterDuration {
-  Default,
-  FiveSeconds,
-  TenSeconds,
-}
-
-#[derive(Copy, Clone, Debug)]
-pub enum Kling21MasterAspectRatio {
-  Square, // 1:1
-  WideSixteenNine, // 16:9
-  TallNineSixteen, // 9:16
-}
-
-pub async fn enqueue_kling_21_master_image_to_video_webhook<U: IntoUrl, V: IntoUrl>(
-  args: Kling21MasterArgs<'_, U, V>
-) -> Result<WebhookResponse, FalErrorPlus> {
-  let duration = match args.duration {
-    Kling21MasterDuration::Default => None,
-    Kling21MasterDuration::FiveSeconds => Some("5".to_string()), // Gross...
-    Kling21MasterDuration::TenSeconds => Some("10".to_string()),
-  };
-  
-  let aspect_ratio = match args.aspect_ratio {
-    Kling21MasterAspectRatio::Square => Some("1:1".to_string()),
-    Kling21MasterAspectRatio::WideSixteenNine => Some("16:9".to_string()),
-    Kling21MasterAspectRatio::TallNineSixteen => Some("9:16".to_string()),
-  };
-
-  let image_url = args.image_url.as_str().to_string();
-
-  let request = MasterImageToVideoRequest {
-    image_url,
-    prompt: args.prompt.to_string(),
-    aspect_ratio,
-    duration,
-    // Maybe expose these later
-    cfg_scale: None,
-    negative_prompt: None,
-    tail_image_url: None,
-  };
-
-  let result = image_to_video(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::video::enqueue_kling_21_master_image_to_video_webhook::{enqueue_kling_21_master_image_to_video_webhook, Kling21MasterArgs, Kling21MasterAspectRatio, Kling21MasterDuration};
-  use errors::AnyhowResult;
-  use std::fs::read_to_string;
-
-  #[tokio::test]
-  #[ignore]
-  async fn test_kling21_master_video() -> AnyhowResult<()> {
-    let image_url = "https://cdn-2.fakeyou.com/media/3/4/h/f/s/34hfsmt8e38rvne6mwa4pwbxr6292sgy/image_34hfsmt8e38rvne6mwa4pwbxr6292sgy.png";
-
-    // 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 = Kling21MasterArgs {
-      image_url: image_url,
-      prompt: "a shot of the mountains, the camera rotates around to show the mountain range, the sun begins to set, and the moon becomes visible",
-      api_key: &api_key,
-      duration: Kling21MasterDuration::Default,
-      aspect_ratio: Kling21MasterAspectRatio::WideSixteenNine,
-      webhook_url: "https://example.com/webhook",
-    };
-
-    let result = enqueue_kling_21_master_image_to_video_webhook(args).await?;
-
-    Ok(())
-  }
-}
@@ -1,98 +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::endpoints::fal_ai::kling_video::v2_1::pro::image_to_video::{image_to_video, ProImageToVideoRequest};
-use fal::webhook::WebhookResponse;
-use reqwest::IntoUrl;
-
-pub struct Kling21ProArgs<'a, U: IntoUrl, V: IntoUrl> {
-  pub image_url: U,
-  pub webhook_url: V,
-  pub prompt: &'a str,
-  pub api_key: &'a FalApiKey,
-  pub duration: Kling21ProDuration,
-  pub aspect_ratio: Kling21ProAspectRatio,
-}
-
-#[derive(Copy, Clone, Debug)]
-pub enum Kling21ProDuration {
-  Default,
-  FiveSeconds,
-  TenSeconds,
-}
-
-#[derive(Copy, Clone, Debug)]
-pub enum Kling21ProAspectRatio {
-  Square, // 1:1
-  WideSixteenNine, // 16:9
-  TallNineSixteen, // 9:16
-}
-
-pub async fn enqueue_kling_21_pro_image_to_video_webhook<U: IntoUrl, V: IntoUrl>(
-  args: Kling21ProArgs<'_, U, V>
-) -> Result<WebhookResponse, FalErrorPlus> {
-  let duration = match args.duration {
-    Kling21ProDuration::Default => None,
-    Kling21ProDuration::FiveSeconds => Some("5".to_string()), // Gross...
-    Kling21ProDuration::TenSeconds => Some("10".to_string()),
-  };
-  
-  let aspect_ratio = match args.aspect_ratio {
-    Kling21ProAspectRatio::Square => Some("1:1".to_string()),
-    Kling21ProAspectRatio::WideSixteenNine => Some("16:9".to_string()),
-    Kling21ProAspectRatio::TallNineSixteen => Some("9:16".to_string()),
-  };
-
-  let image_url = args.image_url.as_str().to_string();
-
-  let request = ProImageToVideoRequest {
-    image_url,
-    prompt: args.prompt.to_string(),
-    aspect_ratio,
-    duration,
-    // Maybe expose these later
-    cfg_scale: None,
-    negative_prompt: None,
-    tail_image_url: None,
-  };
-
-  let result = image_to_video(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::video::enqueue_kling_21_pro_image_to_video_webhook::{enqueue_kling_21_pro_image_to_video_webhook, Kling21ProArgs, Kling21ProAspectRatio, Kling21ProDuration};
-  use errors::AnyhowResult;
-  use std::fs::read_to_string;
-
-  #[tokio::test]
-  #[ignore]
-  async fn test_kling21_pro_video() -> AnyhowResult<()> {
-    let image_url = "https://cdn-2.fakeyou.com/media/3/4/h/f/s/34hfsmt8e38rvne6mwa4pwbxr6292sgy/image_34hfsmt8e38rvne6mwa4pwbxr6292sgy.png";
-
-    // 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 = Kling21ProArgs {
-      image_url: image_url,
-      prompt: "a shot of the mountains, the camera rotates around to show the mountain range",
-      api_key: &api_key,
-      duration: Kling21ProDuration::Default,
-      aspect_ratio: Kling21ProAspectRatio::WideSixteenNine,
-      webhook_url: "https://example.com/webhook",
-    };
-
-    let result = enqueue_kling_21_pro_image_to_video_webhook(args).await?;
-
-    Ok(())
-  }
-}
@@ -1,98 +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::endpoints::fal_ai::bytedance::seedance::v1::lite::image_to_video::image_to_video;
-use fal::endpoints::fal_ai::bytedance::seedance::v1::lite::image_to_video::ImageToVideoRequest;
-use fal::webhook::WebhookResponse;
-use reqwest::IntoUrl;
-
-pub struct Seedance1LiteArgs<'a, U: IntoUrl, V: IntoUrl> {
-  pub image_url: U,
-  pub webhook_url: V,
-  pub prompt: &'a str,
-  pub api_key: &'a FalApiKey,
-  pub camera_fixed: bool,
-  pub duration: Seedance1LiteDuration,
-  pub resolution: Seedance1LiteResolution,
-  pub seed: Option<u32>,
-}
-
-#[derive(Copy, Clone, Debug)]
-pub enum Seedance1LiteDuration {
-  FiveSeconds,
-  TenSeconds,
-}
-
-#[derive(Copy, Clone, Debug)]
-pub enum Seedance1LiteResolution {
-  FourEightyP, // 480p
-  SevenTwentyP, // 720p
-}
-
-pub async fn enqueue_seedance_1_lite_image_to_video_webhook<U: IntoUrl, V: IntoUrl>(
-  args: Seedance1LiteArgs<'_, U, V>
-) -> Result<WebhookResponse, FalErrorPlus> {
-  let duration = match args.duration {
-    Seedance1LiteDuration::FiveSeconds => Some("5".to_string()),
-    Seedance1LiteDuration::TenSeconds => Some("10".to_string()),
-  };
-  
-  let resolution = match args.resolution {
-    Seedance1LiteResolution::FourEightyP => Some("480p".to_string()),
-    Seedance1LiteResolution::SevenTwentyP => Some("720p".to_string()),
-  };
-
-  let image_url = args.image_url.as_str().to_string();
-
-  let request = ImageToVideoRequest {
-    image_url,
-    prompt: args.prompt.to_string(),
-    duration,
-    resolution,
-    // TODO: Add these later
-    camera_fixed: None,
-    seed: -1,
-  };
-
-  let result = image_to_video(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::video::enqueue_seedance_1_lite_image_to_video_webhook::{enqueue_seedance_1_lite_image_to_video_webhook, Seedance1LiteArgs, Seedance1LiteDuration, Seedance1LiteResolution};
-  use errors::AnyhowResult;
-  use std::fs::read_to_string;
-
-  #[tokio::test]
-  #[ignore]
-  async fn test_kling21_pro_video() -> AnyhowResult<()> {
-    let image_url = "https://cdn-2.fakeyou.com/media/3/4/h/f/s/34hfsmt8e38rvne6mwa4pwbxr6292sgy/image_34hfsmt8e38rvne6mwa4pwbxr6292sgy.png";
-
-    // 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 = Seedance1LiteArgs {
-      image_url: image_url,
-      prompt: "a shot of the mountains as the sun sets and reveals the moon and stars",
-      api_key: &api_key,
-      camera_fixed: false,
-      duration: Seedance1LiteDuration::FiveSeconds,
-      resolution: Seedance1LiteResolution::SevenTwentyP,
-      seed: None,
-      webhook_url: "https://example.com/webhook",
-    };
-
-    let result = enqueue_seedance_1_lite_image_to_video_webhook(args).await?;
-
-    Ok(())
-  }
-}
@@ -1,102 +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::endpoints::fal_ai::veo2::image_to_video::image_to_video;
-use fal::endpoints::fal_ai::veo2::image_to_video::ImageToVideoInput;
-use fal::webhook::WebhookResponse;
-use reqwest::IntoUrl;
-
-pub struct Veo2Args<'a, U: IntoUrl, V: IntoUrl> {
-  pub image_url: U,
-  pub webhook_url: V,
-  pub prompt: &'a str,
-  pub api_key: &'a FalApiKey,
-  pub duration: Veo2Duration,
-  pub aspect_ratio: Veo2AspectRatio,
-}
-
-#[derive(Copy, Clone, Debug)]
-pub enum Veo2Duration {
-  Default,
-  FiveSeconds,
-  SixSeconds,
-  SevenSeconds,
-  EightSeconds,
-}
-
-#[derive(Copy, Clone, Debug)]
-pub enum Veo2AspectRatio {
-  Auto,
-  AutoPreferPortrait,
-  WideSixteenNine, // 16:9
-  TallNineSixteen, // 9:16
-}
-
-pub async fn enqueue_veo_2_image_to_video_webhook<U: IntoUrl, V: IntoUrl>(
-  args: Veo2Args<'_, U, V>
-) -> Result<WebhookResponse, FalErrorPlus> {
-  let duration = match args.duration {
-    Veo2Duration::Default => None,
-    Veo2Duration::FiveSeconds => Some("5".to_string()),
-    Veo2Duration::SixSeconds => Some("6".to_string()),
-    Veo2Duration::SevenSeconds => Some("7".to_string()),
-    Veo2Duration::EightSeconds => Some("8".to_string()),
-  };
-  
-  let aspect_ratio = match args.aspect_ratio {
-    Veo2AspectRatio::Auto => Some("auto".to_string()),
-    Veo2AspectRatio::AutoPreferPortrait => Some("auto_prefer_portrait".to_string()),
-    Veo2AspectRatio::WideSixteenNine => Some("16:9".to_string()),
-    Veo2AspectRatio::TallNineSixteen => Some("9:16".to_string()),
-  };
-
-  let image_url = args.image_url.as_str().to_string();
-
-  let request = ImageToVideoInput {
-    image_url,
-    prompt: args.prompt.to_string(),
-    aspect_ratio,
-    duration,
-    // Maybe expose these later
-  };
-
-  let result = image_to_video(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::video::enqueue_veo_2_image_to_video_webhook::{enqueue_veo_2_image_to_video_webhook, Veo2Args, Veo2AspectRatio, Veo2Duration};
-  use errors::AnyhowResult;
-  use std::fs::read_to_string;
-
-  #[tokio::test]
-  #[ignore]
-  async fn test_kling21_pro_video() -> AnyhowResult<()> {
-    let image_url = "https://cdn-2.fakeyou.com/media/3/4/h/f/s/34hfsmt8e38rvne6mwa4pwbxr6292sgy/image_34hfsmt8e38rvne6mwa4pwbxr6292sgy.png";
-
-    // 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 = Veo2Args {
-      image_url: image_url,
-      prompt: "a shot of the mountains as the sun sets and reveals the moon and stars",
-      api_key: &api_key,
-      duration: Veo2Duration::Default,
-      aspect_ratio: Veo2AspectRatio::WideSixteenNine,
-      webhook_url: "https://example.com/webhook",
-    };
-
-    let result = enqueue_veo_2_image_to_video_webhook(args).await?;
-
-    Ok(())
-  }
-}
@@ -1,5 +0,0 @@
-pub mod enqueue_kling_16_pro_image_to_video_webhook;
-pub mod enqueue_kling_21_master_image_to_video_webhook;
-pub mod enqueue_kling_21_pro_image_to_video_webhook;
-pub mod enqueue_seedance_1_lite_image_to_video_webhook;
-pub mod enqueue_veo_2_image_to_video_webhook;
@@ -1,40 +0,0 @@
-[package]
-name = "openai_sora_client"
-edition = "2024"
-version = "0.0.1"
-publish = false
-
-[package.metadata.cargo-udeps.ignore]
-normal = ["workspace-build-acceleration"]
-
-[lib]
-name = "openai_sora_client"
-path = "src/lib.rs"
-
-[dependencies]
-# Workspace hack (faster compile times)
-workspace-build-acceleration.workspace = true
-
-# Internal
-errors.workspace = true
-idempotency.workspace = true
-
-# External
-anyhow.workspace = true
-base64.workspace = true
-chrono.workspace = true
-cookie.workspace = true
-log.workspace = true
-once_cell.workspace = true
-rand.workspace = true
-reqwest = { workspace = true, features = ["multipart", "gzip"] }
-serde.workspace = true
-serde_derive.workspace = true
-serde_json.workspace = true
-sha3.workspace = true
-thiserror.workspace = true
-tokio.workspace = true
-toml.workspace = true
-
-[dev-dependencies]
-testing = { path = "../../lib/testing" }
@@ -1,45 +0,0 @@
-[package]
-name = "openart_client"
-edition = "2024"
-version = "0.0.1"
-publish = false
-
-[package.metadata.cargo-udeps.ignore]
-normal = ["workspace-build-acceleration"]
-
-[lib]
-name = "openart_client"
-path = "src/lib.rs"
-
-[dependencies]
-
-# Workspace hack (faster compile times)
-workspace-build-acceleration.workspace = true
-
-# Internal
-crockford.workspace = true
-errors.workspace = true
-idempotency.workspace = true
-subprocess_common = { path = "../../lib/subprocess_common" }
-
-# External
-anyhow.workspace = true
-base64.workspace = true
-chrono.workspace = true
-cookie.workspace = true
-hex-literal.workspace = true
-log.workspace = true
-once_cell.workspace = true
-rand.workspace = true
-reqwest = { workspace = true, features = ["multipart", "gzip"] }
-serde.workspace = true
-serde_derive.workspace = true
-serde_json.workspace = true
-sha3.workspace = true
-thiserror.workspace = true
-tokio.workspace = true
-toml.workspace = true
-
-[dev-dependencies]
-testing = { path = "../../lib/testing" }
-filesys.workspace = true
@@ -1,46 +0,0 @@
-[package]
-name = "runwayml_client"
-edition = "2021"
-version = "0.0.1"
-publish = false
-
-[package.metadata.cargo-udeps.ignore]
-normal = ["workspace-build-acceleration"]
-
-[lib]
-name = "runwayml_client"
-path = "src/lib.rs"
-
-[dependencies]
-
-# Workspace hack (faster compile times)
-workspace-build-acceleration.workspace = true
-
-# Internal
-crockford.workspace = true
-errors.workspace = true
-idempotency.workspace = true
-jwt_light.workspace = true
-subprocess_common = { path = "../../lib/subprocess_common" }
-
-# External
-anyhow.workspace = true
-base64.workspace = true
-chrono.workspace = true
-cookie.workspace = true
-hex-literal.workspace = true
-log.workspace = true
-once_cell.workspace = true
-rand.workspace = true
-reqwest.workspace = true
-serde.workspace = true
-serde_derive.workspace = true
-serde_json.workspace = true
-sha3.workspace = true
-thiserror.workspace = true
-tokio.workspace = true
-toml.workspace = true
-
-[dev-dependencies]
-testing = { path = "../../lib/testing" }
-filesys.workspace = true
@@ -1,52 +0,0 @@
-[package]
-name = "storyteller_client"
-edition = "2021"
-version = "0.0.1"
-authors = [
-    "Brandon Thomas <bt@brand.io>",
-    "Brandon Thomas <echelon@gmail.com>",
-]
-publish = false
-
-[package.metadata.cargo-udeps.ignore]
-normal = ["workspace-build-acceleration"]
-
-# [lints.rust]
-# unused_imports = "forbid"
-
-[lib]
-name = "storyteller_client"
-path = "src/lib.rs"
-
-[dependencies]
-# Workspace hack (faster compile times)
-workspace-build-acceleration.workspace = true
-
-# Internal
-artcraft_api_defs.workspace = true
-enums.workspace = true
-enums_public.workspace = true
-errors.workspace = true
-idempotency.workspace = true
-tokens.workspace = true
-mimetypes.workspace = true
-
-# External
-anyhow.workspace = true
-chrono.workspace = true
-cookie.workspace = true
-log.workspace = true
-reqwest = { workspace = true, features = ["multipart", "gzip"] }
-url.workspace = true
-
-# Serialization
-serde.workspace = true
-serde_derive.workspace = true
-serde_json.workspace = true
-
-# HTTP
-backoff = { version = "0.4.0", features = ["futures"] }
-uuid = { version = "1.8.0", features = ["v4"] } # Exponential backoff retry
-
-[dev-dependencies]
-tokio.workspace = true
@@ -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::gpt_image_1_edit_image::{GptImage1EditImageRequest, GptImage1EditImageResponse, GPT_IMAGE_1_EDIT_IMAGE_PATH};
-
-
-pub async fn gpt_image_1_edit_image(
-  api_host: &ApiHost,
-  maybe_creds: Option<&StorytellerCredentialSet>,
-  request: GptImage1EditImageRequest,
-) -> Result<GptImage1EditImageResponse, StorytellerError> {
-  Ok(basic_json_post_request(
-    api_host,
-    GPT_IMAGE_1_EDIT_IMAGE_PATH,
-    maybe_creds,
-    request,
-  ).await?)
-}
@@ -1 +0,0 @@
-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_flux_1_dev_text_to_image::{GenerateFlux1DevTextToImageRequest, GenerateFlux1DevTextToImageResponse, GENERATE_FLUX_1_DEV_TEXT_TO_IMAGE_PATH};
-
-
-pub async fn generate_flux_1_dev_text_to_image(
-  api_host: &ApiHost,
-  maybe_creds: Option<&StorytellerCredentialSet>,
-  request: GenerateFlux1DevTextToImageRequest,
-) -> Result<GenerateFlux1DevTextToImageResponse, StorytellerError> {
-  Ok(basic_json_post_request(
-    api_host,
-    GENERATE_FLUX_1_DEV_TEXT_TO_IMAGE_PATH,
-    maybe_creds,
-    request,
-  ).await?)
-}
@@ -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_flux_1_schnell_text_to_image::{GenerateFlux1SchnellTextToImageRequest, GenerateFlux1SchnellTextToImageResponse, GENERATE_FLUX_1_SCHNELL_TEXT_TO_IMAGE_PATH};
-
-
-pub async fn generate_flux_1_schnell_text_to_image(
-  api_host: &ApiHost,
-  maybe_creds: Option<&StorytellerCredentialSet>,
-  request: GenerateFlux1SchnellTextToImageRequest,
-) -> Result<GenerateFlux1SchnellTextToImageResponse, StorytellerError> {
-  Ok(basic_json_post_request(
-    api_host,
-    GENERATE_FLUX_1_SCHNELL_TEXT_TO_IMAGE_PATH,
-    maybe_creds,
-    request,
-  ).await?)
-}
@@ -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_flux_pro_11_text_to_image::{GenerateFluxPro11TextToImageRequest, GenerateFluxPro11TextToImageResponse, GENERATE_FLUX_PRO_11_TEXT_TO_IMAGE_PATH};
-
-
-pub async fn generate_flux_pro_11_text_to_image(
-  api_host: &ApiHost,
-  maybe_creds: Option<&StorytellerCredentialSet>,
-  request: GenerateFluxPro11TextToImageRequest,
-) -> Result<GenerateFluxPro11TextToImageResponse, StorytellerError> {
-  Ok(basic_json_post_request(
-    api_host,
-    GENERATE_FLUX_PRO_11_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::generate_flux_pro_11_ultra_text_to_image::{GenerateFluxPro11UltraTextToImageRequest, GenerateFluxPro11UltraTextToImageResponse, GENERATE_FLUX_PRO_11_ULTRA_TEXT_TO_IMAGE_PATH};
-
-pub async fn generate_flux_pro_11_ultra_text_to_image(
-  api_host: &ApiHost,
-  maybe_creds: Option<&StorytellerCredentialSet>,
-  request: GenerateFluxPro11UltraTextToImageRequest,
-) -> Result<GenerateFluxPro11UltraTextToImageResponse, StorytellerError> {
-  Ok(basic_json_post_request(
-    api_host,
-    GENERATE_FLUX_PRO_11_ULTRA_TEXT_TO_IMAGE_PATH,
-    maybe_creds,
-    request,
-  ).await?)
-}
@@ -1,6 +0,0 @@
-pub mod edit;
-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 remove_image_background;
@@ -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::remove_image_background::{RemoveImageBackgroundRequest, RemoveImageBackgroundResponse, REMOVE_IMAGE_BACKGROUND_PATH};
-
-pub async fn remove_image_background(
-  api_host: &ApiHost,
-  maybe_creds: Option<&StorytellerCredentialSet>,
-  request: RemoveImageBackgroundRequest,
-) -> Result<RemoveImageBackgroundResponse, StorytellerError> {
-  Ok(basic_json_post_request(
-    api_host,
-    REMOVE_IMAGE_BACKGROUND_PATH,
-    maybe_creds,
-    request,
-  ).await?)
-}
@@ -1,3 +0,0 @@
-pub mod image;
-pub mod object;
-pub mod video;
@@ -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::object::generate_hunyuan_2_0_image_to_3d::{GenerateHunyuan20ImageTo3dRequest, GenerateHunyuan20ImageTo3dResponse, GENERATE_HUNYUAN_2_0_IMAGE_TO_3D_URL_PATH};
-
-pub async fn generate_hunyuan3d_2_0_image_to_3d(
-  api_host: &ApiHost,
-  maybe_creds: Option<&StorytellerCredentialSet>,
-  request: GenerateHunyuan20ImageTo3dRequest,
-) -> Result<GenerateHunyuan20ImageTo3dResponse, StorytellerError> {
-  Ok(basic_json_post_request(
-    api_host,
-    GENERATE_HUNYUAN_2_0_IMAGE_TO_3D_URL_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::object::generate_hunyuan_2_1_image_to_3d::{GenerateHunyuan21ImageTo3dRequest, GenerateHunyuan21ImageTo3dResponse, GENERATE_HUNYUAN_2_1_IMAGE_TO_3D_URL_PATH};
-
-pub async fn generate_hunyuan3d_2_1_image_to_3d(
-  api_host: &ApiHost,
-  maybe_creds: Option<&StorytellerCredentialSet>,
-  request: GenerateHunyuan21ImageTo3dRequest,
-) -> Result<GenerateHunyuan21ImageTo3dResponse, StorytellerError> {
-  Ok(basic_json_post_request(
-    api_host,
-    GENERATE_HUNYUAN_2_1_IMAGE_TO_3D_URL_PATH,
-    maybe_creds,
-    request,
-  ).await?)
-}
@@ -1,2 +0,0 @@
-pub mod generate_hunyuan_3d_2_0_image_to_3d;
-pub mod generate_hunyuan_3d_2_1_image_to_3d;
@@ -1,18 +0,0 @@
-use crate::credentials::storyteller_credential_set::StorytellerCredentialSet;
-use crate::error::storyteller_error::StorytellerError;
-use crate::utils::api_host::ApiHost;
-use crate::utils::basic_json_post_request::basic_json_post_request;
-use artcraft_api_defs::generate::video::generate_kling_1_6_pro_image_to_video::{GenerateKling16ProImageToVideoRequest, GenerateKling16ProImageToVideoResponse, GENERATE_KLING_1_6_PRO_IMAGE_TO_VIDEO_URL_PATH};
-
-pub async fn generate_kling_16_pro_image_to_video(
-  api_host: &ApiHost,
-  maybe_creds: Option<&StorytellerCredentialSet>,
-  request: GenerateKling16ProImageToVideoRequest,
-) -> Result<GenerateKling16ProImageToVideoResponse, StorytellerError> {
-  Ok(basic_json_post_request(
-    api_host,
-    GENERATE_KLING_1_6_PRO_IMAGE_TO_VIDEO_URL_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::video::generate_kling_2_1_master_image_to_video::{GenerateKling21MasterImageToVideoRequest, GenerateKling21MasterImageToVideoResponse, GENERATE_KLING_2_1_MASTER_IMAGE_TO_VIDEO_URL_PATH};
-
-pub async fn generate_kling_21_master_image_to_video(
-  api_host: &ApiHost,
-  maybe_creds: Option<&StorytellerCredentialSet>,
-  request: GenerateKling21MasterImageToVideoRequest,
-) -> Result<GenerateKling21MasterImageToVideoResponse, StorytellerError> {
-  Ok(basic_json_post_request(
-    api_host,
-    GENERATE_KLING_2_1_MASTER_IMAGE_TO_VIDEO_URL_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::video::generate_kling_2_1_pro_image_to_video::{GenerateKling21ProImageToVideoRequest, GenerateKling21ProImageToVideoResponse, GENERATE_KLING_2_1_PRO_IMAGE_TO_VIDEO_URL_PATH};
-
-pub async fn generate_kling_21_pro_image_to_video(
-  api_host: &ApiHost,
-  maybe_creds: Option<&StorytellerCredentialSet>,
-  request: GenerateKling21ProImageToVideoRequest,
-) -> Result<GenerateKling21ProImageToVideoResponse, StorytellerError> {
-  Ok(basic_json_post_request(
-    api_host,
-    GENERATE_KLING_2_1_PRO_IMAGE_TO_VIDEO_URL_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::video::generate_seedance_1_0_lite_image_to_video::{GenerateSeedance10LiteImageToVideoRequest, GenerateSeedance10LiteImageToVideoResponse, GENERATE_SEEDANCE_1_0_LITE_IMAGE_TO_VIDEO_URL_PATH};
-
-pub async fn generate_seedance_1_0_lite_image_to_video(
-  api_host: &ApiHost,
-  maybe_creds: Option<&StorytellerCredentialSet>,
-  request: GenerateSeedance10LiteImageToVideoRequest,
-) -> Result<GenerateSeedance10LiteImageToVideoResponse, StorytellerError> {
-  Ok(basic_json_post_request(
-    api_host,
-    GENERATE_SEEDANCE_1_0_LITE_IMAGE_TO_VIDEO_URL_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::video::generate_veo_2_image_to_video::{GenerateVeo2ImageToVideoRequest, GenerateVeo2ImageToVideoResponse, GENERATE_VEO_2_IMAGE_TO_VIDEO_URL_PATH};
-
-pub async fn generate_veo_2_image_to_video(
-  api_host: &ApiHost,
-  maybe_creds: Option<&StorytellerCredentialSet>,
-  request: GenerateVeo2ImageToVideoRequest,
-) -> Result<GenerateVeo2ImageToVideoResponse, StorytellerError> {
-  Ok(basic_json_post_request(
-    api_host,
-    GENERATE_VEO_2_IMAGE_TO_VIDEO_URL_PATH,
-    maybe_creds,
-    request,
-  ).await?)
-}
@@ -1,5 +0,0 @@
-pub mod generate_kling_16_pro_image_to_video;
-pub mod generate_kling_21_master_image_to_video;
-pub mod generate_kling_21_pro_image_to_video;
-pub mod generate_seedance_1_0_lite_image_to_video;
-pub mod generate_veo_2_image_to_video;
@@ -21,24 +21,23 @@ workspace-build-acceleration = { workspace = true }

 # Internal
 bucket_paths = { path = "../../../lib/bucket_paths" }
-cloud_storage.workspace = true
+cloud_storage = { path = "../../../lib/api_clients/cloud_storage" }
 config = { path = "../../../lib/deprecated/config" }
 easyenv = { path = "../../../lib/easyenv" }
-enums.workspace = true
-errors.workspace = true
-filesys.workspace = true
+enums = { path = "../../../schema/public/enums" }
+errors = { path = "../../../lib/errors" }
+filesys = { path = "../../../lib/files/filesys" }
 hashing = { path = "../../../lib/files/hashing" }
-idempotency.workspace = true
-mimetypes.workspace = true
+idempotency = { path = "../../../lib/idempotency" }
+mimetypes = { path = "../../../lib/files/mimetypes" }
 mysql_queries = { path = "../../../schema/database/mysql_queries" }
 storyteller_root = { path = "../../../lib/storyteller_root" }
-tokens.workspace = true
+tokens = { path = "../../../schema/public/tokens" }

 # External
-log.workspace = true
+log = "0.4.14"
 clap = "4.4.8"
-rand.workspace = true
-
+rand = "0.8.5" 
 # Runtime
 # NB: We switched to Tokio from `async-std` for broader ecosystem support.
 tokio = { version = "1.38.0", features = ["macros"] }
@@ -21,23 +21,23 @@ workspace-build-acceleration = { workspace = true }

 # Internal
 bucket_paths = { path = "../../../lib/bucket_paths" }
-cloud_storage.workspace = true
+cloud_storage = { path = "../../../lib/api_clients/cloud_storage" }
 config = { path = "../../../lib/deprecated/config" }
 easyenv = { path = "../../../lib/easyenv" }
-enums.workspace = true
-errors.workspace = true
-filesys.workspace = true
-mimetypes.workspace = true
+enums = { path = "../../../schema/public/enums" }
+errors = { path = "../../../lib/errors" }
+filesys = { path = "../../../lib/files/filesys" }
+mimetypes = { path = "../../../lib/files/mimetypes" }
 mysql_queries = { path = "../../../schema/database/mysql_queries" }
-tokens.workspace = true
+tokens = { path = "../../../schema/public/tokens" }

 # External
 clap = "4.4.8"
-log.workspace = true
+log = "0.4.14"

 # Runtime
 # NB: We switched to Tokio from `async-std` for broader ecosystem support.
-tokio.workspace = true
+tokio = { version = "1.38.0", features = ["macros"] }

 sqlx = { version = "0.7.2", features = [ "mysql", "runtime-tokio", "tls-rustls", "chrono" ] }

@@ -17,35 +17,35 @@ normal = ["workspace-build-acceleration"]

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

 # Internal
 bucket_paths = { path = "../../../lib/bucket_paths" }
-cloud_storage.workspace = true
+cloud_storage = { path = "../../../lib/api_clients/cloud_storage" }
 config = { path = "../../../lib/deprecated/config" }
 easyenv = { path = "../../../lib/easyenv" }
-enums.workspace = true
-errors.workspace = true
-filesys.workspace = true
+enums = { path = "../../../schema/public/enums" }
+errors = { path = "../../../lib/errors" }
+filesys = { path = "../../../lib/files/filesys" }
 hashing = { path = "../../../lib/files/hashing" }
 mysql_queries = { path = "../../../schema/database/mysql_queries" }
 storyteller_root = { path = "../../../lib/storyteller_root" }
-tokens.workspace = true
+tokens = { path = "../../../schema/public/tokens" }

 # External
 clap = "4.4.8"
-log.workspace = true
+log = "0.4.14"
 strum = { version = "0.26", features = ["derive"] }
-tempdir.workspace = true
+tempdir = "0.3.7"

 # Async + clients
-tokio.workspace = true
+tokio = { version = "1.38.0", features = ["macros"] }
 sqlx = { version = "0.7.2", features = [ "mysql", "runtime-tokio", "tls-rustls", "chrono" ] }

 # Serialization
-serde.workspace = true
-serde_derive.workspace = true
-serde_json.workspace = true
+serde = "1.0.125"
+serde_derive = "1.0.125"
+serde_json = "1.0.108"

 [dev-dependencies]
 # None yet
@@ -9,9 +9,6 @@ edition = "2021"
 rust-version = "1.77.2"
 publish = false

-# [lints.rust]
-# unused_imports = "forbid"
-
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

 [lib]
@@ -38,7 +35,6 @@ openai_sora_client = { workspace = true }
 primitives = { workspace = true }
 storyteller_client = { workspace = true }
 tokens = { workspace = true }
-web_base64 = { workspace = true }

 # External
 anyhow = { workspace = true }
@@ -16,9 +16,6 @@
      "allow": [
        {
          "url": "https://*"
-        },
-        {
-          "url": "http://localhost:12345"
        }
      ]
    },
@@ -1,48 +0,0 @@
-use std::error::Error;
-use std::fmt::{Display, Formatter};
-use storyteller_client::error::storyteller_error::StorytellerError;
-
-#[derive(Debug)]
-pub enum ArtcraftError {
-  AnyhowError(anyhow::Error),
-  DecodeError(base64::DecodeError),
-  IoError(std::io::Error),
-  StorytellerError(StorytellerError),
-}
-
-impl Error for ArtcraftError {}
-
-impl Display for ArtcraftError {
-  fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
-    match self {
-      Self::AnyhowError(e) => write!(f, "AnyhowError: {:?}", e),
-      Self::DecodeError(e) => write!(f, "DecodeError: {:?}", e),
-      Self::IoError(e) => write!(f, "IoError: {:?}", e),
-      Self::StorytellerError(e) => write!(f, "StorytellerError: {:?}", e),
-    }
-  }
-}
-
-impl From<anyhow::Error> for ArtcraftError {
-  fn from(value: anyhow::Error) -> Self {
-    Self::AnyhowError(value)
-  }
-}
-
-impl From<base64::DecodeError> for ArtcraftError {
-  fn from(value: base64::DecodeError) -> Self {
-    Self::DecodeError(value)
-  }
-}
-
-impl From<std::io::Error> for ArtcraftError {
-  fn from(value: std::io::Error) -> Self {
-    Self::IoError(value)
-  }
-}
-
-impl From<StorytellerError> for ArtcraftError {
-  fn from(value: StorytellerError) -> Self {
-    Self::StorytellerError(value)
-  }
-}
@@ -3,7 +3,7 @@ use crate::core::state::app_preferences::preferred_download_directory::Preferred
 use errors::AnyhowResult;
 use log::{error, info};
 use serde_derive::Serialize;
-use tauri::State;
+use tauri::{AppHandle, State};

 #[derive(Serialize)]
 pub struct GetAppPreferencesResponse {
@@ -4,8 +4,9 @@ use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use anyhow::anyhow;
 use errors::AnyhowResult;
 use log::{error, info};
+use openai_sora_client::sora_error::SoraError::AnyhowError;
 use serde_derive::{Deserialize, Serialize};
-use tauri::State;
+use tauri::{AppHandle, State};

 /// For now, we'll only update a single preference at a time.
 #[derive(Deserialize)]
@@ -1,28 +1,60 @@
-use crate::core::commands::enqueue::image::handle_image_artcraft::handle_image_artcraft;
-use crate::core::commands::enqueue::image::handle_image_fal::handle_image_fal;
-use crate::core::commands::enqueue::image::handle_image_sora::handle_image_sora;
+use crate::core::commands::enqueue::image::handle_fal::handle_fal;
+use crate::core::commands::enqueue::image::handle_sora::handle_sora;
 use crate::core::commands::enqueue::image::internal_image_error::InternalImageError;
-use crate::core::commands::enqueue::image::success_event::SuccessEvent;
 use crate::core::commands::response::failure_response_wrapper::{CommandErrorResponseWrapper, CommandErrorStatus};
 use crate::core::commands::response::shorthand::Response;
 use crate::core::commands::response::success_response_wrapper::SerializeMarker;
-use crate::core::events::basic_sendable_event_trait::BasicSendableEvent;
-use crate::core::events::generation_events::common::{GenerationAction, GenerationServiceProvider};
-use crate::core::events::generation_events::generation_enqueue_success_event::GenerationEnqueueSuccessEvent;
 use crate::core::events::sendable_event_trait::SendableEvent;
-use crate::core::model::image_models::ImageModel;
-use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs;
 use crate::core::state::data_dir::app_data_root::AppDataRoot;
-use crate::core::state::provider_priority::{Provider, ProviderPriorityStore};
+use crate::core::state::data_dir::trait_data_subdir::DataSubdir;
+use crate::core::utils::download_media_file_to_temp_dir::download_media_file_to_temp_dir;
+use crate::core::utils::get_url_file_extension::get_url_file_extension;
+use crate::core::utils::save_base64_image_to_temp_dir::save_base64_image_to_temp_dir;
+use crate::core::utils::simple_http_download::simple_http_download;
+use crate::core::utils::simple_http_download_to_tempfile::simple_http_download_to_tempfile;
 use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
 use crate::services::fal::state::fal_task_queue::FalTaskQueue;
+use crate::services::sora::state::read_sora_credentials_from_disk::read_sora_credentials_from_disk;
+use crate::services::sora::state::sora_credential_holder::SoraCredentialHolder;
 use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
 use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
 use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
-use fal_client::requests::queue::image_gen::enqueue_flux_pro_11_ultra_text_to_image::{enqueue_flux_pro_11_ultra_text_to_image, FluxPro11UltraTextToImageArgs};
-use log::{error, info, warn};
-use serde::{Deserialize, Serialize};
-use tauri::{AppHandle, State};
+use anyhow::anyhow;
+use base64::prelude::BASE64_STANDARD;
+use base64::{DecodeError, Engine};
+use errors::{AnyhowError, AnyhowResult};
+use fal_client::error::fal_error_plus::FalErrorPlus;
+use fal_client::requests::queue::image_gen::enqueue_flux_pro_ultra_text_to_image::{enqueue_flux_pro_ultra_text_to_image, FluxProUltraTextToImageArgs};
+use fal_client::requests::queue::image_gen::enqueue_recraft3_text_to_image::{enqueue_recraft3_text_to_image, Recraft3TextToImageArgs};
+use filesys::file_read_bytes::file_read_bytes;
+use image::codecs::png::{CompressionType, FilterType, PngEncoder};
+use image::{DynamicImage, EncodableLayout, ImageReader};
+use log::{debug, error, info, warn};
+use mimetypes::mimetype_info::mimetype_info::MimetypeInfo;
+use openai_sora_client::credentials::SoraCredentials;
+use openai_sora_client::creds::credential_migration::CredentialMigrationRef;
+use openai_sora_client::recipes::image_remix_with_session_auto_renew::{image_remix_with_session_auto_renew, ImageRemixAutoRenewRequest};
+use openai_sora_client::recipes::image_upload_from_file_with_session_auto_renew::{image_upload_from_file_with_session_auto_renew, ImageUploadFromFileAutoRenewRequest};
+use openai_sora_client::recipes::maybe_upgrade_or_renew_session::maybe_upgrade_or_renew_session;
+use openai_sora_client::requests::image_gen::common::{ImageSize, NumImages};
+use openai_sora_client::requests::image_gen::sora_image_gen_remix::{sora_image_gen_remix, SoraImageGenRemixRequest};
+use openai_sora_client::requests::upload::upload_media_from_bytes::sora_media_upload_from_bytes;
+use openai_sora_client::requests::upload::upload_media_from_file::sora_media_upload_from_file;
+use openai_sora_client::sora_error::SoraError;
+use reqwest::Url;
+use serde_derive::{Deserialize, Serialize};
+use std::fs::read_to_string;
+use std::io::{Cursor, Read, Write};
+use std::ops::Add;
+use std::path::PathBuf;
+use std::time::Duration;
+use storyteller_client::error::api_error::ApiError;
+use storyteller_client::error::api_error::ApiError::InternalServerError;
+use storyteller_client::media_files::get_media_file::{get_media_file, GetMediaFileSuccessResponse};
+use storyteller_client::media_files::upload_image_media_file_from_file::upload_image_media_file_from_file;
+use storyteller_client::utils::api_host::ApiHost;
+use tauri::{AppHandle, Emitter, Manager, State};
+use tempfile::NamedTempFile;

 #[derive(Deserialize)]
 pub struct EnqueueTextToImageRequest {
@@ -30,9 +62,19 @@ pub struct EnqueueTextToImageRequest {
  pub prompt: Option<String>,

  /// The model to use.
-  pub model: Option<ImageModel>,
+  pub model: Option<EnqueueTextToImageModel>,
 }

+#[derive(Deserialize, Debug, Copy, Clone)]
+#[serde(rename_all = "snake_case")]
+pub enum EnqueueTextToImageModel {
+  #[serde(rename = "flux_pro_ultra")]
+  FluxProUltra,
+  #[serde(rename = "gpt_image_1")]
+  GptImage1,
+  #[serde(rename = "recraft_3")]
+  Recraft3,
+}

 #[derive(Serialize)]
 pub struct EnqueueTextToImageSuccessResponse {
@@ -45,16 +87,12 @@ impl SerializeMarker for EnqueueTextToImageSuccessResponse {}
 pub enum EnqueueTextToImageErrorType {
  /// Caller didn't specify a model
  ModelNotSpecified,
-  /// No model available for image generation
-  NoProviderAvailable,
  /// Generic server error
  ServerError,
  /// No Fal API key available
  NeedsFalApiKey,
  /// Fal had an API error
  FalError,
-  /// Needs to be logged into Artcraft
-  NeedsStorytellerCredentials,
 }


@@ -63,8 +101,6 @@ pub async fn enqueue_text_to_image_command(
  app: AppHandle,
  request: EnqueueTextToImageRequest,
  app_data_root: State<'_, AppDataRoot>,
-  app_env_configs: State<'_, AppEnvConfigs>,
-  provider_priority_store: State<'_, ProviderPriorityStore>,
  fal_creds_manager: State<'_, FalCredentialManager>,
  storyteller_creds_manager: State<'_, StorytellerCredentialManager>,
  fal_task_queue: State<'_, FalTaskQueue>,
@@ -78,10 +114,8 @@ pub async fn enqueue_text_to_image_command(
    &app,
    request,
    &app_data_root,
-    &provider_priority_store,
    &fal_creds_manager,
    &storyteller_creds_manager,
-    &app_env_configs,
    &fal_task_queue,
    &sora_creds_manager,
    &sora_task_queue,
@@ -101,11 +135,6 @@ pub async fn enqueue_text_to_image_command(
          error_type = EnqueueTextToImageErrorType::ModelNotSpecified;
          error_message = "No model specified for image generation";
        }
-        InternalImageError::NoProviderAvailable => {
-          status = CommandErrorStatus::ServerError;
-          error_type = EnqueueTextToImageErrorType::NoProviderAvailable;
-          error_message = "No configured provider available for image generation";
-        }
        InternalImageError::NeedsFalApiKey => {
          status = CommandErrorStatus::Unauthorized;
          error_type = EnqueueTextToImageErrorType::NeedsFalApiKey;
@@ -121,17 +150,7 @@ pub async fn enqueue_text_to_image_command(
        error_details: None,
      })
    }
-    Ok(event) => {
-      let event = GenerationEnqueueSuccessEvent {
-        action: GenerationAction::GenerateImage,
-        service: event.service_provider,
-        model: Some(event.tauri_event_model()),
-      };
-
-      if let Err(err) = event.send(&app) {
-        error!("Failed to emit event: {:?}", err); // Fail open.
-      }
-
+    Ok(()) => {
      Ok(EnqueueTextToImageSuccessResponse {}.into())
    }
  }
@@ -142,47 +161,24 @@ pub async fn handle_request(
  app: &AppHandle,
  request: EnqueueTextToImageRequest,
  app_data_root: &AppDataRoot,
-  provider_priority_store: &ProviderPriorityStore,
  fal_creds_manager: &FalCredentialManager,
  storyteller_creds_manager: &StorytellerCredentialManager,
-  app_env_configs: &AppEnvConfigs,
  fal_task_queue: &FalTaskQueue,
  sora_creds_manager: &SoraCredentialManager,
  sora_task_queue: &SoraTaskQueue,
-) -> Result<SuccessEvent, InternalImageError> {
+) -> Result<(), InternalImageError> {

  match request.model {
    None => {
      return Err(InternalImageError::NoModelSpecified);
    }
-    Some(ImageModel::GptImage1) => {
-      handle_image_sora(&app, request, sora_creds_manager, sora_task_queue).await?;
-      return Ok(SuccessEvent {
-        service_provider: GenerationServiceProvider::Sora,
-        model: ImageModel::GptImage1,
-      });
-    }
-    _ => {
-      // Fall-through
+    Some(EnqueueTextToImageModel::FluxProUltra) | Some(EnqueueTextToImageModel::Recraft3) => {
+      handle_fal(&app, request, fal_creds_manager, fal_task_queue).await?;
+    },
+    Some(EnqueueTextToImageModel::GptImage1) => {
+      handle_sora(&app, request, sora_creds_manager, sora_task_queue).await?;
    }
  };

-  let priority = provider_priority_store.get_priority()?;
-  
-  for provider in priority.iter() {
-    match provider {
-      Provider::Sora => {} // Fallthrough
-      Provider::Artcraft => {
-        return handle_image_artcraft(
-          request, &app, app_env_configs, app_data_root, storyteller_creds_manager).await;
-      }
-      Provider::Fal => {
-        if fal_creds_manager.has_apparent_api_token()? {
-          return handle_image_fal(&app, request, fal_creds_manager, fal_task_queue).await;
-        }
-      }
-    }
-  }
-  
-  Err(InternalImageError::NoProviderAvailable)
+  Ok(())
 }
@@ -1,24 +1,28 @@
-use crate::core::commands::enqueue::image::enqueue_text_to_image_command::EnqueueTextToImageRequest;
+use crate::core::commands::enqueue::image::enqueue_text_to_image_command::{EnqueueTextToImageModel, EnqueueTextToImageRequest};
 use crate::core::commands::enqueue::image::internal_image_error::InternalImageError;
-use crate::core::commands::enqueue::image::success_event::SuccessEvent;
 use crate::core::events::basic_sendable_event_trait::BasicSendableEvent;
 use crate::core::events::generation_events::common::{GenerationAction, GenerationServiceProvider};
 use crate::core::events::generation_events::generation_enqueue_failure_event::GenerationEnqueueFailureEvent;
-use crate::core::model::image_models::ImageModel;
+use crate::core::events::generation_events::generation_enqueue_success_event::GenerationEnqueueSuccessEvent;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
 use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
 use crate::services::fal::state::fal_task_queue::FalTaskQueue;
+use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
+use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
+use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
 use anyhow::anyhow;
-use fal_client::requests::queue::image_gen::enqueue_flux_pro_11_ultra_text_to_image::{enqueue_flux_pro_11_ultra_text_to_image, FluxPro11UltraTextToImageArgs};
+use fal_client::creds::fal_api_key::FalApiKey;
+use fal_client::requests::queue::image_gen::enqueue_flux_pro_ultra_text_to_image::{enqueue_flux_pro_ultra_text_to_image, FluxProUltraTextToImageArgs};
 use fal_client::requests::queue::image_gen::enqueue_recraft3_text_to_image::{enqueue_recraft3_text_to_image, Recraft3TextToImageArgs};
-use log::{error, info};
+use log::{error, info, warn};
 use tauri::AppHandle;

-pub async fn handle_image_fal(
+pub async fn handle_fal(
  app: &AppHandle,
  request: EnqueueTextToImageRequest,
  fal_creds_manager: &FalCredentialManager,
  fal_task_queue: &FalTaskQueue,
-) -> Result<SuccessEvent, InternalImageError> {
+) -> Result<(), InternalImageError> {

  let api_key = match fal_creds_manager.get_key()? {
    Some(key) => key,
@@ -43,32 +47,21 @@ pub async fn handle_image_fal(

  let prompt = request.prompt.as_deref().unwrap_or("");

-  let model;
-  
  let result = match request.model {
    None => {
      return Err(InternalImageError::NoModelSpecified);
    }
-    Some(ImageModel::GptImage1) => {
+    Some(EnqueueTextToImageModel::GptImage1) => {
      return Err(InternalImageError::AnyhowError(anyhow!("wrong logic: fal is handling sora images")));
    }
-    Some(
-      ImageModel::Flux1Dev | 
-      ImageModel::Flux1Schnell | 
-      ImageModel::FluxPro11
-    ) => {
-      return Err(InternalImageError::AnyhowError(anyhow!("not yet implemented: {:?}", request.model)));
-    }
-    Some(ImageModel::FluxPro11Ultra) => {
-      model = ImageModel::FluxPro11Ultra;
-      info!("enqueue Flux Pro 1.1 Ultra text-to-image with prompt: {}", prompt);
-      enqueue_flux_pro_11_ultra_text_to_image(FluxPro11UltraTextToImageArgs {
+    Some(EnqueueTextToImageModel::FluxProUltra) => {
+      info!("enqueue Flux Pro Ultra text-to-image with prompt: {}", prompt);
+      enqueue_flux_pro_ultra_text_to_image(FluxProUltraTextToImageArgs {
        prompt,
        api_key: &api_key,
      }).await
    }
-    Some(ImageModel::Recraft3) => {
-      model = ImageModel::Recraft3;
+    Some(EnqueueTextToImageModel::Recraft3) => {
      info!("enqueue Recraft v3 text-to-image with prompt: {}", prompt);
      enqueue_recraft3_text_to_image(Recraft3TextToImageArgs {
        prompt,
@@ -81,15 +74,15 @@ pub async fn handle_image_fal(
    Ok(enqueued) => {
      info!("Successfully enqueued text to image");

-      //let event = GenerationEnqueueSuccessEvent {
-      //  action: GenerationAction::GenerateImage,
-      //  service: GenerationServiceProvider::Fal,
-      //  model: None,
-      //};
+      let event = GenerationEnqueueSuccessEvent {
+        action: GenerationAction::GenerateImage,
+        service: GenerationServiceProvider::Fal,
+        model: None,
+      };

-      //if let Err(err) = event.send(app) {
-      //  error!("Failed to emit event: {:?}", err); // Fail open.
-      //}
+      if let Err(err) = event.send(app) {
+        error!("Failed to emit event: {:?}", err); // Fail open.
+      }

      if let Err(err) = fal_task_queue.insert(&enqueued) {
        error!("Failed to enqueue task: {:?}", err);
@@ -114,8 +107,5 @@ pub async fn handle_image_fal(
    }
  }

-  Ok(SuccessEvent {
-    service_provider: GenerationServiceProvider::Fal,
-    model,
-  })
+  Ok(())
 }
@@ -1,170 +0,0 @@
-use crate::core::commands::enqueue::image::enqueue_text_to_image_command::EnqueueTextToImageRequest;
-use crate::core::commands::enqueue::image::internal_image_error::InternalImageError;
-use crate::core::commands::enqueue::image::success_event::SuccessEvent;
-use crate::core::events::basic_sendable_event_trait::BasicSendableEvent;
-use crate::core::events::generation_events::common::{GenerationAction, GenerationServiceProvider};
-use crate::core::events::generation_events::generation_enqueue_failure_event::GenerationEnqueueFailureEvent;
-use crate::core::model::image_models::ImageModel;
-use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs;
-use crate::core::state::data_dir::app_data_root::AppDataRoot;
-use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
-use anyhow::anyhow;
-use artcraft_api_defs::generate::image::generate_flux_1_dev_text_to_image::GenerateFlux1DevTextToImageRequest;
-use artcraft_api_defs::generate::image::generate_flux_1_schnell_text_to_image::GenerateFlux1SchnellTextToImageRequest;
-use artcraft_api_defs::generate::image::generate_flux_pro_11_text_to_image::GenerateFluxPro11TextToImageRequest;
-use artcraft_api_defs::generate::image::generate_flux_pro_11_ultra_text_to_image::GenerateFluxPro11UltraTextToImageRequest;
-use fal_client::requests::queue::image_gen::enqueue_flux_pro_11_ultra_text_to_image::{enqueue_flux_pro_11_ultra_text_to_image, FluxPro11UltraTextToImageArgs};
-use idempotency::uuid::generate_random_uuid;
-use log::{error, info};
-use storyteller_client::generate::image::generate_flux_1_dev_text_to_image::generate_flux_1_dev_text_to_image;
-use storyteller_client::generate::image::generate_flux_1_schnell_text_to_image::generate_flux_1_schnell_text_to_image;
-use storyteller_client::generate::image::generate_flux_pro_11_text_to_image::generate_flux_pro_11_text_to_image;
-use storyteller_client::generate::image::generate_flux_pro_11_ultra_text_to_image::generate_flux_pro_11_ultra_text_to_image;
-use tauri::AppHandle;
-
-pub async fn handle_image_artcraft(
-  request: EnqueueTextToImageRequest,
-  app: &AppHandle,
-  app_env_configs: &AppEnvConfigs,
-  app_data_root: &AppDataRoot,
-  storyteller_creds_manager: &StorytellerCredentialManager,
-) -> Result<SuccessEvent, InternalImageError> {
-
-  let creds = match storyteller_creds_manager.get_credentials()? {
-    Some(creds) => creds,
-    None => {
-      error!("No Artcraft credentials are set. Can't perform action.");
-      let event =
-          GenerationEnqueueFailureEvent::no_artcraft_credentials(GenerationAction::GenerateImage);
-
-      if let Err(err) = event.send(&app) {
-        error!("Failed to emit event: {:?}", err); // Fail open.
-      }
-      
-      return Err(InternalImageError::NeedsStorytellerCredentials);
-    },
-  };
-  
-  info!("Calling Artcraft text to image...");
-
-  let uuid_idempotency_token = generate_random_uuid();
-  
-  let mut selected_model;
-  
-  let job_token = match request.model {
-    None => {
-      return Err(InternalImageError::NoModelSpecified);
-    }
-    Some(ImageModel::GptImage1) => {
-      return Err(InternalImageError::AnyhowError(anyhow!("wrong logic: artcraft is handling sora images")));
-    }
-    Some(ImageModel::Recraft3) => {
-      return Err(InternalImageError::AnyhowError(anyhow!("not yet implemented in Artcraft")));
-    }
-    Some(ImageModel::Flux1Dev) => {
-      info!("enqueue Flux 1 Dev");
-      selected_model = ImageModel::Flux1Dev;
-      let request = GenerateFlux1DevTextToImageRequest {
-        uuid_idempotency_token,
-        prompt: request.prompt,
-        aspect_ratio: None,
-        num_images: None,
-      };
-      let result = generate_flux_1_dev_text_to_image(
-        &app_env_configs.storyteller_host,
-        Some(&creds),
-        request,
-      ).await;
-      match result {
-        Ok(enqueued) => {
-          info!("Successfully enqueued Artcraft Flux 1 Dev text to image generation");
-          enqueued.inference_job_token
-        }
-        Err(err) => {
-          error!("Failed to use Artcraft Flux 1 Dev text to image generation: {:?}", err);
-          return Err(InternalImageError::StorytellerError(err));
-        }
-      }
-    }
-    Some(ImageModel::Flux1Schnell) => {
-      info!("enqueue Flux 1 Schnell");
-      selected_model = ImageModel::Flux1Schnell;
-      let request = GenerateFlux1SchnellTextToImageRequest {
-        uuid_idempotency_token,
-        prompt: request.prompt,
-        aspect_ratio: None,
-        num_images: None,
-      };
-      let result = generate_flux_1_schnell_text_to_image(
-        &app_env_configs.storyteller_host,
-        Some(&creds),
-        request,
-      ).await;
-      match result {
-        Ok(enqueued) => {
-          info!("Successfully enqueued Artcraft Flux 1 Schnell text to image generation");
-          enqueued.inference_job_token
-        }
-        Err(err) => {
-          error!("Failed to use Artcraft Flux 1 Schnell text to image generation: {:?}", err);
-          return Err(InternalImageError::StorytellerError(err));
-        }
-      }
-    }
-    Some(ImageModel::FluxPro11) => {
-      info!("enqueue Flux Pro 1.1");
-      selected_model = ImageModel::FluxPro11;
-      let request = GenerateFluxPro11TextToImageRequest {
-        uuid_idempotency_token,
-        prompt: request.prompt,
-        aspect_ratio: None,
-        num_images: None,
-      };
-      let result = generate_flux_pro_11_text_to_image(
-        &app_env_configs.storyteller_host,
-        Some(&creds),
-        request,
-      ).await;
-      match result {
-        Ok(enqueued) => {
-          info!("Successfully enqueued Artcraft Flux Pro 1.1 text to image generation");
-          enqueued.inference_job_token
-        }
-        Err(err) => {
-          error!("Failed to use Artcraft Flux Pro 1.1 text to image generation: {:?}", err);
-          return Err(InternalImageError::StorytellerError(err));
-        }
-      }
-    }
-    Some(ImageModel::FluxPro11Ultra) => {
-      info!("enqueue Flux Pro 1.1 Ultra");
-      selected_model = ImageModel::FluxPro11Ultra;
-      let request = GenerateFluxPro11UltraTextToImageRequest {
-        uuid_idempotency_token,
-        prompt: request.prompt,
-        aspect_ratio: None,
-        num_images: None,
-      };
-      let result = generate_flux_pro_11_ultra_text_to_image(
-        &app_env_configs.storyteller_host,
-        Some(&creds),
-        request,
-      ).await;
-      match result {
-        Ok(enqueued) => {
-          info!("Successfully enqueued Artcraft Flux Pro 1.1 Ultra text to image generation");
-          enqueued.inference_job_token
-        }
-        Err(err) => {
-          error!("Failed to use Artcraft Flux Pro 1.1 Ultra text to image generation: {:?}", err);
-          return Err(InternalImageError::StorytellerError(err));
-        }
-      }
-    }
-  };
-
-  Ok(SuccessEvent {
-    service_provider: GenerationServiceProvider::Artcraft,
-    model:selected_model,
-  })
-}
@@ -1,21 +1,31 @@
-use crate::core::commands::enqueue::image::enqueue_text_to_image_command::EnqueueTextToImageRequest;
+use crate::core::commands::enqueue::image::enqueue_text_to_image_command::{EnqueueTextToImageModel, EnqueueTextToImageRequest};
 use crate::core::commands::enqueue::image::internal_image_error::InternalImageError;
 use crate::core::events::basic_sendable_event_trait::BasicSendableEvent;
 use crate::core::events::generation_events::common::{GenerationAction, GenerationServiceProvider};
 use crate::core::events::generation_events::generation_enqueue_failure_event::GenerationEnqueueFailureEvent;
+use crate::core::events::generation_events::generation_enqueue_success_event::GenerationEnqueueSuccessEvent;
+use crate::core::state::data_dir::app_data_root::AppDataRoot;
+use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
+use crate::services::fal::state::fal_task_queue::FalTaskQueue;
 use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
 use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
-use fal_client::requests::queue::image_gen::enqueue_flux_pro_11_ultra_text_to_image::{enqueue_flux_pro_11_ultra_text_to_image, FluxPro11UltraTextToImageArgs};
-use log::{error, info};
+use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
+use anyhow::anyhow;
+use fal_client::requests::queue::image_gen::enqueue_flux_pro_ultra_text_to_image::{enqueue_flux_pro_ultra_text_to_image, FluxProUltraTextToImageArgs};
+use fal_client::requests::queue::image_gen::enqueue_recraft3_text_to_image::{enqueue_recraft3_text_to_image, Recraft3TextToImageArgs};
+use log::{error, info, warn};
+use openai_sora_client::creds::sora_credential_set::SoraCredentialSet;
+use openai_sora_client::recipes::image_remix_with_session_auto_renew::{image_remix_with_session_auto_renew, ImageRemixAutoRenewRequest};
 use openai_sora_client::recipes::maybe_upgrade_or_renew_session::maybe_upgrade_or_renew_session;
 use openai_sora_client::recipes::simple_image_gen_with_session_auto_renew::{simple_image_gen_with_session_auto_renew, SimpleImageGenAutoRenewRequest};
-use openai_sora_client::requests::image_gen::common::{ImageSize, NumImages};
+use openai_sora_client::requests::image_gen::common::{ImageSize, NumImages, SoraImageGenResponse};
+use openai_sora_client::sora_error::SoraError;
 use std::time::Duration;
 use tauri::AppHandle;

 const SORA_SIMPLE_IMAGE_GEN_TIMEOUT : Duration = Duration::from_millis(1000 * 30); // 30 seconds

-pub async fn handle_image_sora(
+pub async fn handle_sora(
  app: &AppHandle,
  request: EnqueueTextToImageRequest,
  sora_creds_manager: &SoraCredentialManager,
@@ -80,5 +90,15 @@ pub async fn handle_image_sora(

  sora_task_queue.insert(&response.task_id)?;

+  let event = GenerationEnqueueSuccessEvent {
+    action: GenerationAction::GenerateImage,
+    service: GenerationServiceProvider::Sora,
+    model: None,
+  };
+
+  if let Err(err) = event.send(app) {
+    error!("Failed to emit event: {:?}", err); // Fail open.
+  }
+
  Ok(())
 }
@@ -1,24 +1,20 @@
-use crate::core::artcraft_error::ArtcraftError;
 use base64::DecodeError;
 use errors::AnyhowError;
 use fal_client::error::fal_error_plus::FalErrorPlus;
 use openai_sora_client::sora_error::SoraError;
-use storyteller_client::error::storyteller_error::StorytellerError;
+use storyteller_client::error::api_error::ApiError;

 #[derive(Debug)]
 pub enum InternalImageError {
  NoModelSpecified,
-  NoProviderAvailable,
  NeedsFalApiKey,
  NeedsSoraCredentials,
-  NeedsStorytellerCredentials,
  FalError(FalErrorPlus),
  SoraError(SoraError),
  AnyhowError(AnyhowError),
-  StorytellerError(StorytellerError),
+  StorytellerApiError(ApiError),
  DecodeError(DecodeError),
  IoError(std::io::Error),
-  ArtcraftError(ArtcraftError),
 }

 impl From<AnyhowError> for InternalImageError {
@@ -39,9 +35,9 @@ impl From<SoraError> for InternalImageError {
  }
 }

-impl From<StorytellerError> for InternalImageError {
-  fn from(value: StorytellerError) -> Self {
-    Self::StorytellerError(value)
+impl From<ApiError> for InternalImageError {
+  fn from(value: ApiError) -> Self {
+    Self::StorytellerApiError(value)
  }
 }

@@ -56,15 +52,3 @@ impl From<std::io::Error> for InternalImageError {
    Self::IoError(value)
  }
 }
-
-impl From<ArtcraftError> for InternalImageError {
-  fn from(value: ArtcraftError) -> Self {
-    match value {
-      ArtcraftError::AnyhowError(e) => Self::AnyhowError(e),
-      ArtcraftError::DecodeError(e) => Self::DecodeError(e),
-      ArtcraftError::IoError(e) => Self::IoError(e),
-      ArtcraftError::StorytellerError(e) => Self::StorytellerError(e),
-      _ => Self::ArtcraftError(value),
-    }
-  }
-}
@@ -1,6 +1,4 @@
 pub mod enqueue_text_to_image_command;
-pub mod handle_image_artcraft;
-pub mod handle_image_fal;
-pub mod handle_image_sora;
-pub mod internal_image_error;
-mod success_event;
+pub mod handle_fal;
+pub mod handle_sora;
+pub mod internal_image_error;
@@ -1,20 +0,0 @@
-use crate::core::events::generation_events::common::{GenerationModel, GenerationServiceProvider};
-use crate::core::model::image_models::ImageModel;
-
-pub struct SuccessEvent {
-  pub service_provider: GenerationServiceProvider,
-  pub model: ImageModel,
-}
-
-impl SuccessEvent {
-  pub fn tauri_event_model(&self) -> GenerationModel {
-    match self.model {
-      ImageModel::Flux1Dev => GenerationModel::Flux1Dev,
-      ImageModel::Flux1Schnell => GenerationModel::Flux1Schnell,
-      ImageModel::FluxPro11 => GenerationModel::FluxPro11,
-      ImageModel::FluxPro11Ultra => GenerationModel::FluxPro11Ultra,
-      ImageModel::GptImage1 => GenerationModel::GptImage1,
-      ImageModel::Recraft3 => GenerationModel::Recraft3,
-    }
-  }
-}
@@ -1,167 +0,0 @@
-use crate::core::commands::enqueue::image::enqueue_text_to_image_command::{EnqueueTextToImageRequest, EnqueueTextToImageSuccessResponse};
-use crate::core::commands::enqueue::image::handle_image_artcraft::handle_image_artcraft;
-use crate::core::commands::enqueue::image::handle_image_fal::handle_image_fal;
-use crate::core::commands::enqueue::image::handle_image_sora::handle_image_sora;
-use crate::core::commands::enqueue::image::internal_image_error::InternalImageError;
-use crate::core::commands::enqueue::image_bg_removal::errors::InternalBgRemovalError;
-use crate::core::commands::enqueue::image_bg_removal::generic::handle_generic_bg_removal::handle_generic_bg_removal;
-use crate::core::commands::enqueue::image_bg_removal::success_event::EnqueueImageBgRemovalSuccessEvent;
-use crate::core::commands::enqueue::image_edit::errors::InternalContextualEditImageError;
-use crate::core::commands::enqueue::image_edit::gpt_image_1::handle_gpt_image_1::handle_gpt_image_1;
-use crate::core::commands::enqueue::image_edit::success_event::ContextualEditImageSuccessEvent;
-use crate::core::commands::response::failure_response_wrapper::{CommandErrorResponseWrapper, CommandErrorStatus};
-use crate::core::commands::response::shorthand::{Response, ResponseOrErrorType};
-use crate::core::commands::response::success_response_wrapper::SerializeMarker;
-use crate::core::events::basic_sendable_event_trait::BasicSendableEvent;
-use crate::core::events::generation_events::common::{GenerationAction, GenerationServiceProvider};
-use crate::core::events::generation_events::generation_enqueue_failure_event::GenerationEnqueueFailureEvent;
-use crate::core::events::generation_events::generation_enqueue_success_event::GenerationEnqueueSuccessEvent;
-use crate::core::events::sendable_event_trait::SendableEvent;
-use crate::core::model::contextual_image_edit_models::ContextualImageEditModel;
-use crate::core::model::image_models::ImageModel;
-use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs;
-use crate::core::state::data_dir::app_data_root::AppDataRoot;
-use crate::core::state::data_dir::trait_data_subdir::DataSubdir;
-use crate::core::state::provider_priority::{Provider, ProviderPriorityStore};
-use crate::core::utils::get_url_file_extension::get_url_file_extension;
-use crate::core::utils::simple_http_download::simple_http_download;
-use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
-use crate::services::fal::state::fal_task_queue::FalTaskQueue;
-use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
-use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
-use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
-use errors::AnyhowError;
-use log::{error, info, warn};
-use openai_sora_client::recipes::image_remix_with_session_auto_renew::{image_remix_with_session_auto_renew, ImageRemixAutoRenewRequest};
-use openai_sora_client::recipes::image_upload_from_file_with_session_auto_renew::{image_upload_from_file_with_session_auto_renew, ImageUploadFromFileAutoRenewRequest};
-use openai_sora_client::recipes::maybe_upgrade_or_renew_session::maybe_upgrade_or_renew_session;
-use openai_sora_client::requests::image_gen::common::{ImageSize, NumImages};
-use openai_sora_client::sora_error::SoraError;
-use serde_derive::{Deserialize, Serialize};
-use std::time::Duration;
-use storyteller_client::error::storyteller_error::StorytellerError;
-use storyteller_client::media_files::get_media_file::get_media_file;
-use storyteller_client::utils::api_host::ApiHost;
-use tauri::{AppHandle, Manager, State};
-use tokens::tokens::media_files::MediaFileToken;
-
-#[derive(Deserialize, Debug)]
-pub struct EnqueueImageBgRemovalCommand {
-  // /// The bg removal model to use (optional).
-  // pub model: Option<TODO>,
-
-  /// Image media file; the image to remove the background from.
-  pub image_media_token: Option<MediaFileToken>,
-
-  /// Base64-encoded image
-  pub base64_image: Option<String>,
-}
-
-#[derive(Serialize, Debug)]
-#[serde(rename_all = "snake_case")]
-pub enum EnqueueImageBgRemovalErrorType {
-  /// No model available for image generation
-  NoProviderAvailable,
-
-  /// No image was provided for background removal
-  MissingImage,
-  
-  /// Bad base64 image data
-  Base64DecodeError,
-  
-  /// Generic bad request error
-  BadRequest,
-
-  /// Generic server error
-  ServerError,
-}
-
-#[derive(Serialize)]
-pub struct EnqueueImageBgRemovalSuccessResponse {
-}
-
-impl SerializeMarker for EnqueueImageBgRemovalSuccessResponse {}
-
-#[tauri::command]
-pub async fn enqueue_image_bg_removal_command(
-  app: AppHandle,
-  request: EnqueueImageBgRemovalCommand,
-  app_data_root: State<'_, AppDataRoot>,
-  app_env_configs: State<'_, AppEnvConfigs>,
-  provider_priority_store: State<'_, ProviderPriorityStore>,
-  storyteller_creds_manager: State<'_, StorytellerCredentialManager>,
-  fal_creds_manager: State<'_, FalCredentialManager>,
-  fal_task_queue: State<'_, FalTaskQueue>,
-) -> ResponseOrErrorType<EnqueueImageBgRemovalSuccessResponse, EnqueueImageBgRemovalErrorType> {
-
-  info!("enqueue_image_bg_removal_command called");
-
-  let result = handle_request(
-    &request,
-    &app,
-    &app_data_root,
-    &app_env_configs,
-    &provider_priority_store,
-    &storyteller_creds_manager,
-    &fal_creds_manager,
-    &fal_task_queue,
-  ).await;
-
-  match result {
-    Err(err) => {
-      error!("Error removing background: {:?}", err);
-
-      // TODO: Derive from err. Make service provider optional.
-      let event = GenerationEnqueueFailureEvent {
-        action: GenerationAction::RemoveBackground,
-        service: GenerationServiceProvider::Artcraft, // FIXME: This is wrong.
-        model: None,
-        reason: None,
-      };
-
-      if let Err(err) = event.send(&app) {
-        error!("Failed to emit event: {:?}", err); // Fail open.
-      }
-
-      Err(err.to_tauri_response())
-    }
-    Ok(event) => {
-      let event = GenerationEnqueueSuccessEvent {
-        action: GenerationAction::RemoveBackground,
-        service: event.service_provider,
-        model: None, // FIXME: This isn't right, though we probably don't care for simple bg removal.
-      };
-
-      if let Err(err) = event.send(&app) {
-        error!("Failed to emit event: {:?}", err); // Fail open.
-      }
-
-      Ok(EnqueueImageBgRemovalSuccessResponse {}.into())
-    }
-  }
-}
-
-pub async fn handle_request(
-  request: &EnqueueImageBgRemovalCommand,
-  app: &AppHandle,
-  app_data_root: &AppDataRoot,
-  app_env_configs: &AppEnvConfigs,
-  provider_priority_store: &ProviderPriorityStore,
-  storyteller_creds_manager: &StorytellerCredentialManager,
-  fal_creds_manager: &FalCredentialManager,
-  fal_task_queue: &FalTaskQueue,
-) -> Result<EnqueueImageBgRemovalSuccessEvent, InternalBgRemovalError> {
-  
-  // TODO(bt,2025-07-07): Other model/provider routing...
-  
-  handle_generic_bg_removal(
-    request,
-    app,
-    app_data_root,
-    app_env_configs,
-    provider_priority_store,
-    storyteller_creds_manager,
-    fal_creds_manager,
-    fal_task_queue,
-  ).await
-}
@@ -1,71 +0,0 @@
-use crate::core::commands::enqueue::image_bg_removal::enqueue_image_bg_removal_command::EnqueueImageBgRemovalErrorType;
-use crate::core::commands::response::failure_response_wrapper::{CommandErrorResponseWrapper, CommandErrorStatus};
-use errors::AnyhowError;
-use serde::Serialize;
-use storyteller_client::error::storyteller_error::StorytellerError;
-
-#[derive(Debug)]
-pub enum InternalBgRemovalError {
-  /// No provider is configured for the model type.
-  NoProviderAvailable,
-  
-  /// No storyteller credentials are set.
-  NeedsStorytellerCredentials,
-  
-  /// No image was provided for background removal.
-  MissingImage,
-  
-  /// Could not decode the base64 image data.
-  Base64DecodeError,
-  
-  AnyhowError(AnyhowError),
-  StorytellerError(StorytellerError),
-}
-
-impl From<AnyhowError> for InternalBgRemovalError {
-  fn from(value: AnyhowError) -> Self {
-    Self::AnyhowError(value)
-  }
-}
-
-impl From<StorytellerError> for InternalBgRemovalError {
-  fn from(value: StorytellerError) -> Self {
-    Self::StorytellerError(value)
-  }
-}
-
-impl InternalBgRemovalError {
-  pub fn to_tauri_response<E: Serialize>(&self) -> CommandErrorResponseWrapper<EnqueueImageBgRemovalErrorType, E> {
-    let mut status = CommandErrorStatus::ServerError;
-    let mut error_type = EnqueueImageBgRemovalErrorType::ServerError;
-    let mut error_message = "A server error occurred. Please try again. If it continues, please tell our staff about the problem.".to_string();
-    
-    match self {
-      InternalBgRemovalError::NoProviderAvailable => {
-        status = CommandErrorStatus::ServerError;
-        error_type = EnqueueImageBgRemovalErrorType::NoProviderAvailable;
-        error_message = "No configured provider available for background removal".to_string();
-      }
-      InternalBgRemovalError::MissingImage => {
-        status = CommandErrorStatus::BadRequest;
-        error_type = EnqueueImageBgRemovalErrorType::MissingImage;
-        error_message = "No image provided for background removal".to_string();
-      }
-      InternalBgRemovalError::Base64DecodeError => {
-        status = CommandErrorStatus::BadRequest;
-        error_type = EnqueueImageBgRemovalErrorType::Base64DecodeError;
-        error_message = "Failed to decode base64 image data".to_string();
-      }
-      InternalBgRemovalError::AnyhowError(_) => {}
-      InternalBgRemovalError::StorytellerError(_) => {}
-      InternalBgRemovalError::NeedsStorytellerCredentials => {}
-    }
-    
-    CommandErrorResponseWrapper {
-      status,
-      error_message: Some(error_message.to_string()),
-      error_type: Some(error_type),
-      error_details: None,
-    }
-  }
-}
@@ -1,70 +0,0 @@
-use crate::core::commands::enqueue::image_bg_removal::enqueue_image_bg_removal_command::EnqueueImageBgRemovalCommand;
-use crate::core::commands::enqueue::image_bg_removal::errors::InternalBgRemovalError;
-use crate::core::commands::enqueue::image_bg_removal::generic::handle_generic_bg_removal_artcraft::handle_generic_bg_removal_artcraft;
-use crate::core::commands::enqueue::image_bg_removal::generic::handle_generic_bg_removal_fal::handle_generic_bg_removal_fal;
-use crate::core::commands::enqueue::image_bg_removal::success_event::EnqueueImageBgRemovalSuccessEvent;
-use crate::core::commands::enqueue::image_edit::enqueue_contextual_edit_image_command::EnqueueContextualEditImageCommand;
-use crate::core::commands::enqueue::image_edit::errors::InternalContextualEditImageError;
-use crate::core::commands::enqueue::image_edit::gpt_image_1::handle_gpt_image_1_artcraft::handle_gpt_image_1_artcraft;
-use crate::core::commands::enqueue::image_edit::gpt_image_1::handle_gpt_image_1_sora::handle_gpt_image_1_sora;
-use crate::core::commands::enqueue::image_edit::success_event::ContextualEditImageSuccessEvent;
-use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs;
-use crate::core::state::data_dir::app_data_root::AppDataRoot;
-use crate::core::state::provider_priority::{Provider, ProviderPriorityStore};
-use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
-use crate::services::fal::state::fal_task_queue::FalTaskQueue;
-use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
-use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
-use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
-use log::info;
-use tauri::AppHandle;
-
-pub async fn handle_generic_bg_removal(
-  request: &EnqueueImageBgRemovalCommand,
-  app: &AppHandle,
-  app_data_root: &AppDataRoot,
-  app_env_configs: &AppEnvConfigs,
-  provider_priority_store: &ProviderPriorityStore,
-  storyteller_creds_manager: &StorytellerCredentialManager,
-  fal_creds_manager: &FalCredentialManager,
-  fal_task_queue: &FalTaskQueue,
-) -> Result<EnqueueImageBgRemovalSuccessEvent, InternalBgRemovalError> {
-
-  let priority = provider_priority_store.get_priority()?;
-
-  // TODO: Check if providers are available before proceeding.
-
-  info!("Providers by priority: {:?}", priority);
-
-  for provider in priority.iter() {
-    match provider {
-      Provider::Sora => {
-        // Fallthrough
-        // Sora doesn't have background removal
-      }
-      Provider::Artcraft => {
-        info!("Removing background via Artcraft...");
-        return handle_generic_bg_removal_artcraft(
-          request,
-          app,
-          app_data_root,
-          app_env_configs,
-          storyteller_creds_manager
-        ).await;
-      }
-      Provider::Fal => {
-        info!("Removing background via Fal...");
-        return handle_generic_bg_removal_fal(
-          request,
-          app,
-          app_data_root,
-          app_env_configs,
-          fal_creds_manager,
-          fal_task_queue,
-        ).await;
-      }
-    }
-  }
-
-  Err(InternalBgRemovalError::NoProviderAvailable)
-}
@@ -1,130 +0,0 @@
-use crate::core::commands::enqueue::image::enqueue_text_to_image_command::EnqueueTextToImageRequest;
-use crate::core::commands::enqueue::image::internal_image_error::InternalImageError;
-use crate::core::commands::enqueue::image_bg_removal::enqueue_image_bg_removal_command::EnqueueImageBgRemovalCommand;
-use crate::core::commands::enqueue::image_bg_removal::errors::InternalBgRemovalError;
-use crate::core::commands::enqueue::image_bg_removal::success_event::EnqueueImageBgRemovalSuccessEvent;
-use crate::core::commands::enqueue::image_edit::enqueue_contextual_edit_image_command::{EditImageQuality, EditImageSize, EnqueueContextualEditImageCommand};
-use crate::core::commands::enqueue::image_edit::errors::InternalContextualEditImageError;
-use crate::core::commands::enqueue::image_edit::success_event::ContextualEditImageSuccessEvent;
-use crate::core::events::basic_sendable_event_trait::BasicSendableEvent;
-use crate::core::events::generation_events::common::{GenerationAction, GenerationServiceProvider};
-use crate::core::events::generation_events::generation_enqueue_failure_event::GenerationEnqueueFailureEvent;
-use crate::core::model::contextual_image_edit_models::ContextualImageEditModel;
-use crate::core::model::image_models::ImageModel;
-use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs;
-use crate::core::state::data_dir::app_data_root::AppDataRoot;
-use crate::core::state::provider_priority::ProviderPriorityStore;
-use crate::core::utils::save_base64_image_to_temp_dir::save_base64_image_to_temp_dir;
-use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
-use crate::services::fal::state::fal_task_queue::FalTaskQueue;
-use crate::services::sora::state::sora_credential_manager::SoraCredentialManager;
-use crate::services::sora::state::sora_task_queue::SoraTaskQueue;
-use crate::services::storyteller::state::storyteller_credential_manager::StorytellerCredentialManager;
-use anyhow::anyhow;
-use artcraft_api_defs::generate::image::edit::gpt_image_1_edit_image::{GptImage1EditImageImageQuality, GptImage1EditImageImageSize, GptImage1EditImageNumImages, GptImage1EditImageRequest};
-use artcraft_api_defs::generate::image::generate_flux_1_dev_text_to_image::GenerateFlux1DevTextToImageRequest;
-use artcraft_api_defs::generate::image::generate_flux_1_schnell_text_to_image::GenerateFlux1SchnellTextToImageRequest;
-use artcraft_api_defs::generate::image::generate_flux_pro_11_text_to_image::GenerateFluxPro11TextToImageRequest;
-use artcraft_api_defs::generate::image::generate_flux_pro_11_ultra_text_to_image::GenerateFluxPro11UltraTextToImageRequest;
-use artcraft_api_defs::generate::image::remove_image_background::RemoveImageBackgroundRequest;
-use fal_client::requests::queue::image_gen::enqueue_flux_pro_11_ultra_text_to_image::{enqueue_flux_pro_11_ultra_text_to_image, FluxPro11UltraTextToImageArgs};
-use fal_client::requests::webhook::image::enqueue_gpt_image_1_edit_image_webhook::GptEditImageQuality;
-use idempotency::uuid::generate_random_uuid;
-use log::{error, info};
-use storyteller_client::credentials::storyteller_credential_set::StorytellerCredentialSet;
-use storyteller_client::generate::image::edit::gpt_image_1_edit_image::gpt_image_1_edit_image;
-use storyteller_client::generate::image::generate_flux_1_dev_text_to_image::generate_flux_1_dev_text_to_image;
-use storyteller_client::generate::image::generate_flux_1_schnell_text_to_image::generate_flux_1_schnell_text_to_image;
-use storyteller_client::generate::image::generate_flux_pro_11_text_to_image::generate_flux_pro_11_text_to_image;
-use storyteller_client::generate::image::generate_flux_pro_11_ultra_text_to_image::generate_flux_pro_11_ultra_text_to_image;
-use storyteller_client::generate::image::remove_image_background::remove_image_background;
-use storyteller_client::media_files::upload_image_media_file_from_file::upload_image_media_file_from_file;
-use tauri::AppHandle;
-use tokens::tokens::media_files::MediaFileToken;
-
-pub async fn handle_generic_bg_removal_artcraft(
-  request: &EnqueueImageBgRemovalCommand,
-  app: &AppHandle,
-  app_data_root: &AppDataRoot,
-  app_env_configs: &AppEnvConfigs,
-  storyteller_creds_manager: &StorytellerCredentialManager,
-) -> Result<EnqueueImageBgRemovalSuccessEvent, InternalBgRemovalError> {
-
-  let creds = match storyteller_creds_manager.get_credentials()? {
-    Some(creds) => creds,
-    None => {
-      return Err(InternalBgRemovalError::NeedsStorytellerCredentials);
-    },
-  };
-
-  info!("Calling Artcraft bg removal ...");
-
-  let uuid_idempotency_token = generate_random_uuid();
-
-  let image_media_token = match &request.image_media_token {
-    Some(image_media_token) => image_media_token.clone(),
-    None => {
-      upload_image_from_base64_bytes(&request, &app_data_root, &app_env_configs, &creds).await?
-    }
-  };
-  
-  let request = RemoveImageBackgroundRequest {
-    uuid_idempotency_token,
-    media_file_token: Some(image_media_token),
-  };
-
-  let result = remove_image_background(
-    &app_env_configs.storyteller_host,
-    Some(&creds),
-    request,
-  ).await;
-
-  match result {
-    Ok(enqueued) => {
-      // TODO(bt,2025-07-05): Enqueue job token?
-      info!("Successfully enqueued Artcraft background removal. Job token: {}", 
-        enqueued.inference_job_token);
-    }
-    Err(err) => {
-      error!("Failed to use Artcraft background removal: {:?}", err);
-      return Err(InternalBgRemovalError::StorytellerError(err));
-    }
-  }
-
-  Ok(EnqueueImageBgRemovalSuccessEvent {
-    service_provider: GenerationServiceProvider::Artcraft,
-  })
-}
-
-async fn upload_image_from_base64_bytes(
-  request: &EnqueueImageBgRemovalCommand, 
-  app_data_root: &AppDataRoot, 
-  app_env_configs: &AppEnvConfigs, 
-  creds: &StorytellerCredentialSet
-) -> Result<MediaFileToken, InternalBgRemovalError> {
-  let temp_file;
-  
-  if let Some(base64_bytes) = &request.base64_image {
-    info!("Saving base64 image to temp dir ...");
-    temp_file = save_base64_image_to_temp_dir(&app_data_root, base64_bytes)
-        .await
-        .map_err(|err| {
-          error!("Failed to save base64 image to temp dir: {:?}", err);
-          InternalBgRemovalError::Base64DecodeError
-        })?;
-  } else {
-    return Err(InternalBgRemovalError::MissingImage);
-  };
-
-  info!("Uploading image media file from temp file: {:?}", temp_file.path());
-
-  let result = 
-      upload_image_media_file_from_file(&app_env_configs.storyteller_host, Some(&creds), temp_file)
-          .await
-          .map_err(|err| {
-            error!("Failed to upload image media file: {:?}", err);
-            InternalBgRemovalError::StorytellerError(err)
-          })?;
-  
-  Ok(result.media_file_token)
-}
@@ -1,19 +0,0 @@
-use crate::core::commands::enqueue::image_bg_removal::enqueue_image_bg_removal_command::EnqueueImageBgRemovalCommand;
-use crate::core::commands::enqueue::image_bg_removal::errors::InternalBgRemovalError;
-use crate::core::commands::enqueue::image_bg_removal::success_event::EnqueueImageBgRemovalSuccessEvent;
-use crate::core::state::app_env_configs::app_env_configs::AppEnvConfigs;
-use crate::core::state::data_dir::app_data_root::AppDataRoot;
-use crate::services::fal::state::fal_credential_manager::FalCredentialManager;
-use crate::services::fal::state::fal_task_queue::FalTaskQueue;
-use tauri::AppHandle;
-
-pub async fn handle_generic_bg_removal_fal(
-  request: &EnqueueImageBgRemovalCommand,
-  app: &AppHandle,
-  app_data_root: &AppDataRoot,
-  app_env_configs: &AppEnvConfigs,
-  fal_creds_manager: &FalCredentialManager,
-  fal_task_queue: &FalTaskQueue,
-) -> Result<EnqueueImageBgRemovalSuccessEvent, InternalBgRemovalError> {
-  unimplemented!("TODO: Implement fal background removal handling");
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
CrossPr0duct	6c96f21bd7	Merge branch 'main' into feature/bugfixes	2025-06-11 13:42:28 -04:00
CrossPr0duct	245409de08	Fixed one off issue.	2025-06-11 13:25:27 -04:00
CrossPr0duct	90d0f15176	Wired ContextMenu debugging small issue.	2025-06-11 13:06:07 -04:00
CrossPr0duct	257db9b892	render order is now correct.	2025-06-10 20:29:52 -04:00
CrossPr0duct	70348a922a	Z indicies for paint seem to be ignored.	2025-06-10 17:39:10 -04:00
CrossPr0duct	95e724e4bd	Fixed outline problem	2025-06-10 12:37:20 -04:00
CrossPr0duct	21ea7d05e2	Fixed brush	2025-06-09 17:07:16 -04:00
CrossPr0duct	e8305bd112	Add in redo and undo and hide a few components.	2025-06-09 14:55:07 -04:00