update download links

This is currently a draft / work in progress.

---------

Co-authored-by: bflatastic <bombayapirat@gmail.com>

.github/workflows/artcraft-macos-publish.yml

@@ -0,0 +1,232 @@
+name: "Artcraft MacOS Publish"
+
+on:
+  push:
+    branches:
+      - release
+      - artcraft-release
+      - artcraft-macos  # Additional branch for MacOS testing
+
+# 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-xlarge'
+            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-xlarge' && '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: |
+          # Navigate to the frontend directory to install dependencies
+          cd ./frontend
+
+          npm cache clean --force
+
+          echo "Installing all workspace dependencies..."
+          npm ci
+
+          echo "=== Version Information ==="
+          echo "Node version:"
+          node --version
+          echo "NPM version:"
+          npm --version
+
+          # Remove mismatched @nx packages and reinstall with correct versions
+          npm install --save-dev @nx/remix@21.1.1 @nx/js@21.1.1 @nx/react@21.1.1 @nx/vite@21.1.1 @nx/eslint@21.1.1
+
+          echo "=== Nx versions after adjustment ==="
+          npm list --depth=0 | grep nx
+
+      - name: import Apple Developer Certificate
+        if: matrix.platform == 'macos-latest-xlarge'
+        env:
+          APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
+          APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
+          KEYCHAIN_PASSWORD: ${{ secrets.KEYCHAIN_PASSWORD }}
+        run: |
+          echo "Starting certificate import process..."
+
+          # Create certificate file
+          echo $APPLE_CERTIFICATE | base64 --decode > certificate.p12
+
+          # Debug: Check if certificate file exists and has content
+          echo "Certificate file info:"
+          ls -la certificate.p12
+          file certificate.p12
+
+          # Debug: Check certificate contents without password (just structure)
+          echo "Certificate structure (may show error if password protected):"
+          openssl pkcs12 -info -in certificate.p12 -passin pass:$APPLE_CERTIFICATE_PASSWORD -noout || echo "Could not read certificate structure"
+
+          # Debug: Try to list what's in the p12 file
+          echo "Attempting to list certificate contents:"
+          security cms -D -i certificate.p12 || echo "Not a CMS file, trying PKCS12..."
+          openssl pkcs12 -in certificate.p12 -passin pass:$APPLE_CERTIFICATE_PASSWORD -info -nodes 2>&1 | head -20 || echo "Failed to read PKCS12 contents"
+
+          # Debug: Extract certificate details to verify type and expiration
+          echo "Extracting certificate details..."
+          # Extract just the certificate portion and examine it
+          openssl pkcs12 -in certificate.p12 -passin pass:$APPLE_CERTIFICATE_PASSWORD -nokeys 2>/dev/null | openssl x509 -text -noout | grep -E "(Subject:|Issuer:|Not Before|Not After)" || echo "Failed to parse certificate details"
+
+          # Also try to see what type of certificate this is
+          echo "Certificate type check:"
+          openssl pkcs12 -in certificate.p12 -passin pass:$APPLE_CERTIFICATE_PASSWORD -nokeys 2>/dev/null | openssl x509 -text -noout | grep -E "(CN=|OU=)" || echo "Could not determine certificate type"
+
+          # Debug: Check if private key exists
+          echo "Checking for private key..."
+          openssl pkcs12 -in certificate.p12 -passin pass:$APPLE_CERTIFICATE_PASSWORD -nocerts -nodes 2>&1 | grep -E "(PRIVATE KEY|RSA KEY)" | head -5 || echo "No private key found"
+
+          # Create temporary keychain
+          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
+
+          # Import certificate - ensure both certificate and private key are imported
+          echo "Importing certificate into keychain..."
+          # Import the p12 directly - this is the most reliable method
+          security import certificate.p12 -k build.keychain -P "$APPLE_CERTIFICATE_PASSWORD" -T /usr/bin/codesign -T /usr/bin/security -T /usr/bin/productbuild
+
+          # Alternative: Try with additional flags if the first import didn't create an identity
+          echo "Verifying import..."
+          if ! security find-identity -v build.keychain | grep -q "1 valid identities found"; then
+            echo "First import didn't create identity, trying with -A flag..."
+            security import certificate.p12 -k build.keychain -P "$APPLE_CERTIFICATE_PASSWORD" -A
+          fi
+
+          # Set trust settings for the certificate
+          echo "Setting trust settings..."
+          security set-key-partition-list -S apple-tool:,apple:,codesign: -s -k "$KEYCHAIN_PASSWORD" build.keychain
+
+          # Unlock the keychain again to ensure it's accessible
+          security unlock-keychain -p "$KEYCHAIN_PASSWORD" build.keychain
+
+          # Add the keychain to the search list
+          security list-keychains -d user -s build.keychain $(security list-keychains -d user | sed 's/^[[:space:]]*"//;s/"$//')
+
+          # List all certificates to debug
+          echo "Listing all keychains:"
+          security list-keychains
+
+          echo "Listing all certificates in build keychain:"
+          security find-certificate -a -p build.keychain || echo "No certificates found"
+
+          echo "Detailed certificate info:"
+          security find-certificate -c "Learning Machines" build.keychain || echo "Certificate 'Learning Machines' not found"
+
+          # Check certificate trust settings
+          echo "Checking certificate trust settings:"
+          security dump-trust-settings || echo "No custom trust settings"
+
+          # Try to find codesigning identities
+          echo "Finding all identities in keychain:"
+          security find-identity -v build.keychain || echo "No identities found"
+
+          echo "Finding codesigning identities:"
+          security find-identity -v -p codesigning build.keychain || echo "No codesigning identities found"
+
+          # Additional debug: Check if this is a valid Developer ID cert
+          echo "Checking for Developer ID certificates:"
+          security find-certificate -a build.keychain | grep -A 5 -B 5 "Developer ID" || echo "No Developer ID certificates found"
+
+      - name: verify certificate
+        if: matrix.platform == 'macos-latest-xlarge'
+        run: |
+          echo "=== Certificate Verification ==="
+
+          echo "1. Checking codesigning identities:"
+          security find-identity -v -p codesigning build.keychain || echo "No codesigning identities found"
+
+          echo -e "\n2. Checking all identities:"
+          security find-identity -v build.keychain || echo "No identities found"
+
+          echo -e "\n3. Checking certificates in keychain:"
+          security find-certificate -c "Learning Machines" build.keychain -p | openssl x509 -text -noout | grep -E "(Subject:|CN=)" || echo "Could not parse certificate"
+
+          # Set the correct signing identity
+          echo "APPLE_SIGNING_IDENTITY=Developer ID Application: Learning Machines LLC (DJ6XS33FX8)" >> $GITHUB_ENV
+          echo "Proceeding with identity: Developer ID Application: Learning Machines LLC (DJ6XS33FX8)"
+
+          # Also set the team ID
+          echo "APPLE_DEVELOPMENT_TEAM=DJ6XS33FX8" >> $GITHUB_ENV
+
+      - 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
+          export 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..."
+          ls -la apps/editor3d/dist/ | head -10
+
+          # Update Tauri config to skip the build (since we already built)
+          cd ${{ github.workspace }}/crates/desktop/artcraft
+          cp tauri.conf.json tauri.conf.json.bak
+          # Set beforeBuildCommand to empty or a no-op command
+          if command -v jq &> /dev/null; then
+            jq '.build.beforeBuildCommand = ""' tauri.conf.json > tauri.conf.json.tmp
+            mv tauri.conf.json.tmp tauri.conf.json
+          else
+            node -e "const fs = require('fs'); const config = JSON.parse(fs.readFileSync('tauri.conf.json', 'utf8')); config.build.beforeBuildCommand = ''; fs.writeFileSync('tauri.conf.json', JSON.stringify(config, null, 2));"
+          fi
+
+
+      - 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_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
+          APPLE_SIGNING_IDENTITY: ${{ env.APPLE_SIGNING_IDENTITY }}
+          APPLE_DEVELOPMENT_TEAM: ${{ env.APPLE_DEVELOPMENT_TEAM }}
+          # Use the SQLx query cache for SQLite
+          SQLX_OFFLINE: true
+        with:
+          projectPath: ./crates/desktop/artcraft
+          tagName: artcraft-v__VERSION__ # the action automatically replaces __VERSION__ with the app version.
+          releaseName: "Artcraft v__VERSION__"
+          releaseBody: "See the assets to download this version and install."
+          releaseDraft: true
+          prerelease: false
+          args: ${{ matrix.args }}

.github/workflows/artcraft-windows-publish.yml

@@ -0,0 +1,96 @@
+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
+
+          npm cache clean --force
+
+          echo "Installing all workspace dependencies..."
+          npm ci
+
+          echo "=== Version Information ==="
+          echo "Node version:"
+          node --version
+          echo "NPM version:"
+          npm --version
+
+          # Remove mismatched @nx packages and reinstall with correct versions
+          npm install --save-dev @nx/remix@21.1.1 @nx/js@21.1.1 @nx/react@21.1.1 @nx/vite@21.1.1 @nx/eslint@21.1.1
+
+          echo "=== Nx versions after adjustment ==="
+          npm list --depth=0 | findstr nx
+
+      - 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 }}
+          # Use the SQLx query cache for SQLite
+          SQLX_OFFLINE: true
+        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 }}

.github/workflows/tauri-publish-2d.yml

@@ -48,13 +48,13 @@ jobs:
         # You can remove the one that doesn't apply to your app to speed up the workflow a bit.
 
       - name: install frontend dependencies
-        run: cd ./crates/desktop/tauri-artcraft && yarn install # change this to npm, pnpm or bun depending on which one you use.
+        run: cd ./crates/desktop/artcraft && yarn install # change this to npm, pnpm or bun depending on which one you use.
 
       - uses: tauri-apps/tauri-action@v0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
-          projectPath: ./crates/desktop/tauri-artcraft
+          projectPath: ./crates/desktop/artcraft
           tagName: app-v__VERSION__ # the action automatically replaces \_\_VERSION\_\_ with the app version.
           releaseName: 'App v__VERSION__'
           releaseBody: 'See the assets to download this version and install.'

.gitignore

@@ -24,11 +24,13 @@ twitch_secrets.toml
 *-secrets.env
 
 # Utilities with secrets
-script/production_database_secret_backup.sh
-script/production_database_secret_connect.sh
 production_database_secret_connect.sh
 production_database_secret_query.sh
 production_database_voice_clone_report_download.sh
+script/artcraft/mac_signing_build.sh
+script/production_database_secret_backup.sh
+script/production_database_secret_connect.sh
+script/socat_dev_database_connect.sh
 
 # Scratch data
 scratch/

.sqlx/query-0fa824822cd94024dce21243f41e69e4a3e8685c4de676834a7c0ee14982c976.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "MySQL",
+  "query": "\nINSERT INTO generic_inference_jobs\nSET\n  token = ?,\n  uuid_idempotency_token = ?,\n\n  job_type = ?,\n\n  maybe_external_third_party = ?,\n  maybe_external_third_party_id = ?,\n\n  product_category = ?,\n  inference_category = ?,\n\n  maybe_model_type = NULL,\n  maybe_model_token = NULL,\n\n  maybe_input_source_token = NULL,\n  maybe_input_source_token_type = NULL,\n\n  maybe_download_url = NULL,\n  maybe_cover_image_media_file_token = NULL,\n\n  maybe_raw_inference_text = NULL,\n\n  maybe_inference_args = ?,\n\n  maybe_creator_user_token = ?,\n  maybe_creator_anonymous_visitor_token = ?,\n  creator_ip_address = ?,\n  creator_set_visibility = ?,\n\n  priority_level = 0,\n  is_keepalive_required = FALSE,\n  max_duration_seconds = 0,\n\n  is_debug_request = FALSE,\n  maybe_routing_tag = NULL,\n\n  status = ?\n        ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 13
+    },
+    "nullable": []
+  },
+  "hash": "0fa824822cd94024dce21243f41e69e4a3e8685c4de676834a7c0ee14982c976"
+}

.sqlx/query-22b91a21cbb88abc9bc17b338cf2f9418e08e414667d44476623eb141ab17b87.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n    INSERT INTO tasks (\n      id,\n      task_status,\n      task_type,\n      model_type,\n      provider,\n      provider_job_id,\n      frontend_subscriber_id,\n      frontend_subscriber_payload\n    )\n    VALUES (?, ?, ?, ?, ?, ?, ?, ?)\n  ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 8
+    },
+    "nullable": []
+  },
+  "hash": "22b91a21cbb88abc9bc17b338cf2f9418e08e414667d44476623eb141ab17b87"
+}

.sqlx/query-64dfacc1f0552d539f009fea91e902a2fe296c06ad539808596bbf2c8fc9eaa0.json

@@ -0,0 +1,113 @@
+{
+  "db_name": "MySQL",
+  "query": "\nSELECT\n    jobs.token as `job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken`,\n\n    jobs.status as `status: enums::common::job_status_plus::JobStatusPlus`,\n    \n    jobs.maybe_external_third_party as `external_third_party: enums::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty`,\n    jobs.maybe_external_third_party_id as `external_third_party_id`,\n\n    jobs.maybe_creator_user_token as `maybe_creator_user_token: tokens::tokens::users::UserToken`,\n    jobs.maybe_creator_anonymous_visitor_token as `maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken`,\n    jobs.creator_ip_address,\n\n    jobs.created_at,\n    jobs.updated_at\n\nFROM generic_inference_jobs as jobs\n\nWHERE jobs.maybe_external_third_party = ?\nAND jobs.maybe_external_third_party_id = ?\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "job_token: tokens::tokens::generic_inference_jobs::InferenceJobToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | UNIQUE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 1,
+        "name": "status: enums::common::job_status_plus::JobStatusPlus",
+        "type_info": {
+          "type": "String",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | ENUM",
+          "char_set": 224,
+          "max_size": 76
+        }
+      },
+      {
+        "ordinal": 2,
+        "name": "external_third_party: enums::by_table::generic_inference_jobs::inference_job_external_third_party::InferenceJobExternalThirdParty",
+        "type_info": {
+          "type": "VarString",
+          "flags": "MULTIPLE_KEY | BINARY",
+          "char_set": 224,
+          "max_size": 64
+        }
+      },
+      {
+        "ordinal": 3,
+        "name": "external_third_party_id",
+        "type_info": {
+          "type": "VarString",
+          "flags": "MULTIPLE_KEY | BINARY",
+          "char_set": 224,
+          "max_size": 256
+        }
+      },
+      {
+        "ordinal": 4,
+        "name": "maybe_creator_user_token: tokens::tokens::users::UserToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "MULTIPLE_KEY | BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 5,
+        "name": "maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken",
+        "type_info": {
+          "type": "VarString",
+          "flags": "MULTIPLE_KEY | BINARY",
+          "char_set": 224,
+          "max_size": 128
+        }
+      },
+      {
+        "ordinal": 6,
+        "name": "creator_ip_address",
+        "type_info": {
+          "type": "VarString",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | NO_DEFAULT_VALUE",
+          "char_set": 224,
+          "max_size": 160
+        }
+      },
+      {
+        "ordinal": 7,
+        "name": "created_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | MULTIPLE_KEY | BINARY | TIMESTAMP",
+          "char_set": 63,
+          "max_size": 19
+        }
+      },
+      {
+        "ordinal": 8,
+        "name": "updated_at",
+        "type_info": {
+          "type": "Timestamp",
+          "flags": "NOT_NULL | BINARY | TIMESTAMP | ON_UPDATE_NOW",
+          "char_set": 63,
+          "max_size": 19
+        }
+      }
+    ],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": [
+      false,
+      false,
+      true,
+      true,
+      true,
+      true,
+      false,
+      false,
+      false
+    ]
+  },
+  "hash": "64dfacc1f0552d539f009fea91e902a2fe296c06ad539808596bbf2c8fc9eaa0"
+}

.sqlx/query-90366e1705a0343bdfe4fc472d701b8e1dbd3a2dabedaadb633ac3542de72fa7.json

@@ -48,7 +48,7 @@
         "name": "maybe_creator_anonymous_visitor_token: tokens::tokens::anonymous_visitor_tracking::AnonymousVisitorTrackingToken",
         "type_info": {
           "type": "VarString",
-          "flags": "BINARY",
+          "flags": "MULTIPLE_KEY | BINARY",
           "char_set": 224,
           "max_size": 128
         }

.sqlx/query-b4470e607c005421dd8504b9f1d695080a581936ac6ce00b6f437b2764e741be.json

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

.sqlx/query-dc0367e9e43c3d7dda3623e77337ab4529eac2192475be7d08589886703ba1cb.json

@@ -0,0 +1,12 @@
+{
+  "db_name": "SQLite",
+  "query": "\n    UPDATE tasks\n    SET task_status = ?\n    WHERE id = ?\n  ",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Right": 2
+    },
+    "nullable": []
+  },
+  "hash": "dc0367e9e43c3d7dda3623e77337ab4529eac2192475be7d08589886703ba1cb"
+}

.sqlx/query-f68a8917e639418a0bb952bef606c96299001e143c745ee30df99b72d1235d35.json

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

.vscode/settings.json

@@ -1,6 +1,15 @@
 {
-    "files.exclude": {
-        "**/*~": true,
-        "frontend_old/**": true
-    }
+  "files.exclude": {
+    "**/*~": true,
+    ".sqlx/**": true,
+    "_elasticsearch/**": true,
+    "_sql/**": true,
+    "frontend_old/**": true,
+    "includes/**": true,
+    "target/**": true,
+    "test_data/**": true,
+    "tmp/**": true,
+    "virtualenv/**": true,
+    "windows_dlls/**": true,
+  }
 }

Cargo.toml

@@ -4,12 +4,17 @@ resolver = "2"
 # This block defines the workspace members.
 # When we add a library or binary crate, it needs an entry here.
 members = [
-  # Types: common strongly-typed tokens, ids, payloads, etc.
-  "crates/_types/composite_identifiers",
-  "crates/_types/enums",
-  "crates/_types/enums_public",
-  "crates/_types/reusable_types", # TODO(bt, 2022-12-21): Deprecate
-  "crates/_types/tokens",
+  # 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",
@@ -24,37 +29,33 @@ members = [
   "crates/cli/production/migration-tool",
 
   # Desktop apps
-  "crates/desktop/tauri-artcraft",
-  "crates/desktop/tauri-realtime",
+  "crates/desktop/artcraft",
 
   # Shared libraries
   "crates/lib/actix_cors_configs",
   "crates/lib/actix_helpers",
-  "crates/lib/api_clients/cloud_storage",
-  "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/storyteller_client",
-  "crates/lib/api_clients/thumbnail_generator",
   "crates/lib/bootstrap",
   "crates/lib/bucket_paths",
+  "crates/lib/build_metadata",
   "crates/lib/caching/memory_caching",
   "crates/lib/caching/memory_store",
   "crates/lib/caching/redis_caching",
+  "crates/lib/cloudflare_errors",
   "crates/lib/concurrency",
   "crates/lib/cookies",
   "crates/lib/data/collections",
   "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",
   "crates/lib/easyenv", # NB: Vendored version of https://github.com/echelon/easyenv.rs that we'll improve.
-  "crates/lib/elasticsearch_schema",
   "crates/lib/email_sender",
   "crates/lib/errors",
   "crates/lib/files/archives",
+  "crates/lib/files/file_to_base64_url",
   "crates/lib/files/filesys",
   "crates/lib/files/hashing",
   "crates/lib/files/images",
@@ -64,28 +65,42 @@ members = [
   "crates/lib/idempotency",
   "crates/lib/image_algorithms",
   "crates/lib/jobs_common",
+  "crates/lib/jwt_light",
   "crates/lib/logging",
-  "crates/lib/machine_learning/ml_models",
   "crates/lib/machine_learning/ml_weights_registry",
   "crates/lib/machine_learning/prompt_engineering",
   "crates/lib/markdown",
   "crates/lib/migration",
-  "crates/lib/mysql_queries",
   "crates/lib/password",
-  "crates/lib/redis_common",
-  "crates/lib/redis_schema",
   "crates/lib/server_environment",
   "crates/lib/shared_service_components",
   "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",
   "crates/lib/user_input_common",
   "crates/lib/web_scrapers",
   #"crates/lib/api_clients/fakeyou_client",
-  #"crates/lib/sqlite_queries",
+  #"crates/lib/machine_learning/ml_models",
+
+  # Schema (database): queries, database layouts, Redis keys, etc.
+  "crates/schema/database/elasticsearch_schema",
+  "crates/schema/database/mysql_queries",
+  "crates/schema/database/redis_common",
+  "crates/schema/database/redis_schema",
+  "crates/schema/database/sqlite_tasks",
+  #"crates/schema/database/sqlite_queries",
+
+  # Schema (public): common strongly-typed tokens, ids, payloads, etc.
+  "crates/schema/public/api/artcraft_api_defs",
+  "crates/schema/public/composite_identifiers",
+  "crates/schema/public/enums",
+  "crates/schema/public/enums_public",
+  "crates/schema/public/reusable_types", # TODO(bt, 2022-12-21): Deprecate
+  "crates/schema/public/tokens",
 
   # Services: API servers, jobs, workers, etc.
   "crates/service/job/analytics_job",
@@ -106,18 +121,23 @@ members = [
   "crates/service/plugins/user_traits_component",
 
   # Vendored code
-  "crates/vendor/candle/candle-core",
-  "crates/vendor/candle/candle-datasets",
-  "crates/vendor/candle/candle-examples",
-  "crates/vendor/candle/candle-flash-attn",
-  "crates/vendor/candle/candle-kernels",
-  "crates/vendor/candle/candle-metal-kernels",
-  "crates/vendor/candle/candle-nn",
-  "crates/vendor/candle/candle-onnx",
-  "crates/vendor/candle/candle-pyo3",
-  "crates/vendor/candle/candle-transformers",
-  "crates/vendor/candle/tensor-tools",
+  "crates/vendor/fal-rs",
+  "crates/vendor/fal-rs/fal-derive",
+  "crates/vendor/fal-rs/generate",
   "crates/vendor/limitation",
+  "crates/vendor/tauri-plugin-http",
+  # NB(bt,2025-05-25): Too many failures on Mac. Disable for now.
+  #"crates/vendor/candle/candle-core",
+  #"crates/vendor/candle/candle-datasets",
+  #"crates/vendor/candle/candle-examples",
+  #"crates/vendor/candle/candle-flash-attn",
+  #"crates/vendor/candle/candle-kernels",
+  #"crates/vendor/candle/candle-metal-kernels",
+  #"crates/vendor/candle/candle-nn",
+  #"crates/vendor/candle/candle-onnx",
+  #"crates/vendor/candle/candle-pyo3",
+  #"crates/vendor/candle/candle-transformers",
+  #"crates/vendor/candle/tensor-tools",
   # NB(bt,2023-12-12): Newrelic keeps breaking with upgrades. Kill for now.
   #"crates/vendor/newrelic-telemetry-sdk-rust",
 
@@ -157,39 +177,66 @@ workspace-build-acceleration = { path = "crates/workspace-build-acceleration" }
 # External libs
 # Centrally pinned versions so that we can uniformly upgrade/downgrade versions across the workspace
 # If a crate needs to use an older/newer version, the dependency should be managed in that crate's own Cargo.toml
-anyhow = "1.0.97"
+actix = "0.13.5"
+actix-cors = "0.6.4" # TODO(bt): Carefully upgrade this. CORS broke last time.
+actix-http = "3.7.0"
+actix-multipart = "0.6.2"
+actix-rt = "2.10.0"
+actix-service = "2.0.3"
+actix-utils = "3.0.1"
+actix-web = "4.7.0" # TODO(bt): We're behind and need to bump versions.
+actix-web-actors = "4.3.1+deprecated"
+actix-web-lab = "0.20.2"
+anyhow = "1.0.98"
 base64 = "0.22.1"
-chrono = { version = "0.4.40", features = ["serde"] }
+bytes = "1.10.1"
+chrono = { version = "0.4.41", features = ["serde"] }
 cookie = "0.18.1"
+futures = { version = "0.3.31" }
 hex-literal = "1.0.0"
 indexmap = "2.9.0"
 log = "0.4.27"
 once_cell = "1.21.3"
-rand = "0.9.0"
+rand = "0.9.1"
 regex = "1.11.1"
 reqwest = { version = "0.12.15", features = ["json", "cookies"] }
 serde = {  version = "1.0.219", features = ["derive"] }
 serde_derive = "1.0.219"
 serde_json = "1.0.140"
-serde_yaml = "0.9.1"
+serde_yaml = "0.9.34+deprecated"
 sha3 = "0.10.8"
+tauri = { version = "2.4.1", features = ["unstable", "devtools"] } # NB: "devtools" prevents App Store distribution
+tempdir = "0.3.7"
+tempfile = "3.20.0"
 thiserror = "2.0.12"
-toml = "0.8.20"
+tokio = { version = "1.45.1", features = ["macros"] }
+toml = "0.8.22"
 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" }
+cloudflare_errors = { path = "crates/lib/cloudflare_errors" }
 crockford = { path = "crates/lib/data/crockford" }
-enums = { path = "crates/_types/enums" }
-enums_public = { path = "crates/_types/enums_public" }
+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" }
+file_to_base64_url = { path = "crates/lib/files/file_to_base64_url" }
 filesys = { path = "crates/lib/files/filesys" }
+idempotency = { path = "crates/lib/idempotency" }
 images = { path = "crates/lib/files/images" }
+jwt_light = { path = "crates/lib/jwt_light" }
 memory_caching = { path = "crates/lib/caching/memory_caching" }
 memory_store = { path = "crates/lib/caching/memory_store" }
 mimetypes = { path = "crates/lib/files/mimetypes" }
-openai_sora_client = { path = "crates/lib/api_clients/openai_sora_client" }
+openai_sora_client = { path = "crates/api_clients/openai_sora_client" }
 primitives = { path = "crates/lib/data/primitives" }
 shared_service_components = { path = "crates/lib/shared_service_components" }
-storyteller_client = { path = "crates/lib/api_clients/storyteller_client" }
+sqlite_tasks = { path = "crates/schema/database/sqlite_tasks" }
+storyteller_client = { path = "crates/api_clients/storyteller_client" }
 subprocess_common = { path = "crates/lib/subprocess_common" }
-tokens = { path = "crates/_types/tokens" }
+test_data = { path = "crates/lib/test_data" }
+tokens = { path = "crates/schema/public/tokens" }
+web_base64 = { path = "crates/lib/data/web_base64" }

README.md

@@ -1,7 +1,7 @@
 storyteller-rust
 ================
 
-Our Rust monorepo, which serves both our API surface area and our downloadable client applications.
+Our Artcraft monorepo, which serves our desktop application, backend infrastructure, and more.
 
 ```
                  ."-,.__
@@ -45,5 +45,6 @@ Our Rust monorepo, which serves both our API surface area and our downloadable c
                  / ,"'"\,'               `/  `-.|" 
 ```
 
-- [documentation](./_develop/docs)
-- [tools, misc](./_develop)
+- [developer documentation](./_docs)
+- [server API reference](https://storyteller-docs.netlify.app/)
+- [tools, scripts, misc](./script)

_docs/code_conventions.md

@@ -0,0 +1,26 @@
+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

_docs/local_development_setup_guide.md

@@ -1,5 +1,5 @@
-FakeYou Development Setup (bare metal)
-======================================
+Local Development Setup Guide (for bare metal)
+==============================================
 
 This document describes how to run the FakeYou infrastructure on your development 
 machine's bare metal (no containers).

_sql/artcraft_migrations/20250708000000_create_tasks_table.sql

@@ -0,0 +1,30 @@
+-- noinspection SqlDialectInspectionForFile
+-- Migration history:
+--   tasks_v1.sqlite - initial version
+--   tasks_v2.sqlite - added model_type (nullable)
+
+CREATE TABLE tasks (
+    id TEXT NOT NULL PRIMARY KEY,
+
+    task_status TEXT NOT NULL,
+    task_type TEXT NOT NULL,
+
+    model_type TEXT,
+
+    provider TEXT,
+    provider_job_id TEXT,
+
+    frontend_subscriber_id TEXT,
+    frontend_subscriber_payload TEXT,
+
+    created_at INTEGER NOT NULL DEFAULT (unixepoch('now')),
+    updated_at INTEGER NOT NULL DEFAULT (unixepoch('now')),
+    completed_at INTEGER DEFAULT NULL
+);
+
+-- Unique Indices
+CREATE UNIQUE INDEX idx_tasks_on_provider_job_id ON tasks(provider_job_id);
+
+-- Indices
+CREATE INDEX idx_tasks_on_status ON tasks(task_status);
+CREATE INDEX idx_tasks_on_provider ON tasks(provider);

_sql/migrations/2025-06-02-085011_jobs_add_third_party_columns/down.sql

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

_sql/migrations/2025-06-02-085011_jobs_add_third_party_columns/up.sql

@@ -0,0 +1,9 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+ALTER TABLE generic_inference_jobs
+ADD COLUMN maybe_external_third_party VARCHAR(16) DEFAULT NULL;
+
+ALTER TABLE generic_inference_jobs
+ADD COLUMN maybe_external_third_party_id VARCHAR(64) DEFAULT NULL;

_sql/migrations/2025-06-02-085015_jobs_add_third_party_indices/down.sql

@@ -0,0 +1,9 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+DROP INDEX `index_maybe_external_third_party_id`
+    ON `generic_inference_jobs`;
+
+DROP INDEX `index_maybe_external_third_party_and_id`
+    ON `generic_inference_jobs`;

_sql/migrations/2025-06-02-085015_jobs_add_third_party_indices/up.sql

@@ -0,0 +1,11 @@
+-- noinspection SqlDialectInspectionForFile
+-- noinspection SqlNoDataSourceInspectionForFile
+-- noinspection SqlResolveForFile
+
+ALTER TABLE generic_inference_jobs
+    ADD UNIQUE INDEX index_maybe_external_third_party_and_id (maybe_external_third_party, maybe_external_third_party_id),
+    ALGORITHM=INPLACE, LOCK=NONE;
+
+ALTER TABLE generic_inference_jobs
+    ADD INDEX index_maybe_external_third_party_id (maybe_external_third_party_id),
+    ALGORITHM=INPLACE, LOCK=NONE;

_sql/migrations_squashed/generic_inference_jobs.sql

@@ -39,8 +39,20 @@ CREATE TABLE generic_inference_jobs (
   -- Examples (may not be up to date):
   --  * text_to_speech
   --  * voice_conversion
+  --  * image_generation
+  --  * video_generation  
+  --  * background_removal
   inference_category VARCHAR(32) NOT NULL,
 
+  -- If the job is externally enqueued, this is the third-party service
+  -- responsible for the job. Typically, we won't run an inference job for
+  -- jobs being run on a third party.
+  maybe_external_third_party VARCHAR(16) DEFAULT NULL,
+
+  -- If the job is externally enqueued, this is the ID the third-party
+  -- service uses.
+  maybe_external_third_party_id VARCHAR(64) DEFAULT NULL,
+
   -- There is an index on this column.
   -- NB: See notes on inference_category. This is becoming a problematic field. We're using
   -- this to load the container spin-up arguments and dependencies, but the former is being
@@ -287,11 +299,13 @@ CREATE TABLE generic_inference_jobs (
   PRIMARY KEY (id),
   UNIQUE KEY (token),
   UNIQUE KEY (uuid_idempotency_token),
+  UNIQUE KEY (maybe_external_third_party, maybe_external_third_party_id),
   KEY index_job_type (job_type),
   KEY index_product_category (product_category),
   KEY index_inference_category (inference_category),
   KEY index_maybe_model_type_and_maybe_model_token (maybe_model_type, maybe_model_token),
   KEY index_maybe_model_type (maybe_model_type),
+  KEY index_maybe_external_third_party_id (maybe_external_third_party_id),
   KEY fk_maybe_model_token (maybe_model_token),
   KEY fk_maybe_input_source_token (maybe_input_source_token),
   KEY fk_maybe_input_source_token_and_type (maybe_input_source_token, maybe_input_source_token_type),

crates/_types/enums/src/traits/mod.rs

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

crates/_types/tokens/src/tokens/weight_uploads.rs

@@ -1,14 +0,0 @@
-use std::fmt::Debug;
-
-use serde::Deserialize;
-use serde::Serialize;
-
-use crate::prefixes::TokenPrefix;
-
-/// The primary key for user weight uploads
-#[derive(Clone, PartialEq, Eq, sqlx::Type, Debug, Serialize, Deserialize)]
-#[sqlx(transparent)]
-pub struct WeightUploadToken(pub String);
-
-impl_string_token!(WeightUploadToken);
-impl_crockford_generator!(WeightUploadToken, 32usize, TokenPrefix::WeightUpload, CrockfordLower);

crates/api_clients/cloud_storage/Cargo.toml

@@ -0,0 +1,42 @@
+[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

crates/api_clients/fakeyou_client/Cargo.toml

@@ -8,27 +8,33 @@ authors = [
 ]
 publish = false
 
+[package.metadata.cargo-udeps.ignore]
+normal = ["workspace-build-acceleration"]
+
 [lib]
 name = "fakeyou_client"
 path = "src/lib.rs"
 
 [dependencies]
+# Workspace hack (faster compile times)
+workspace-build-acceleration.workspace = true
+
 # Internal
-enums = { path = "../../../_types/enums" }
-errors = { path = "../../errors" }
-tokens = { path = "../../../_types/tokens" }
+enums.workspace = true
+errors.workspace = true
+tokens.workspace = true
 
 # External
-bytes = "1.3"
-chrono = { version = "0.4.22", features = ["serde"] }
-log = "0.4.14"
-once_cell = "1.9.0"
+bytes.workspace = true
+chrono.workspace = true
+log.workspace = true
+once_cell.workspace = true
 
 # Serialization
-serde = "1.0.125"
-serde_derive = "1.0.125"
-serde_json = "1.0.64"
-toml = "0.5.8"
+serde.workspace = true
+serde_derive.workspace = true
+serde_json.workspace = true
+toml.workspace = true
 
 # HTTP
 backoff = { version = "0.4.0", features = ["futures"] } # Exponential backoff retry

crates/api_clients/fal_client/Cargo.toml

@@ -0,0 +1,38 @@
+[package]
+name = "fal_client"
+edition = "2021"
+version = "0.0.1"
+publish = false
+
+[package.metadata.cargo-udeps.ignore]
+normal = ["workspace-build-acceleration"]
+
+[lib]
+name = "fal_client"
+path = "src/lib.rs"
+
+[dependencies]
+# Workspace hack (faster compile times)
+workspace-build-acceleration.workspace = true
+
+# Internal
+errors.workspace = true
+file_to_base64_url.workspace = true
+
+# External
+anyhow.workspace = true
+futures.workspace = true
+log.workspace = true
+reqwest.workspace = true
+serde.workspace = true
+tokio.workspace = true
+url.workspace = true
+
+# For now, we'll vendor in fal.
+# We need to implement webhooks and the upstream doesn't support them yet.
+#fal = { version = "0.3.6", features = ["endpoints"] }
+fal = { path = "../../vendor/fal-rs", features = ["endpoints"] }
+
+[dev-dependencies]
+testing = { path = "../../lib/testing" }
+test_data.workspace = true

crates/api_clients/fal_client/src/creds/fal_api_key.rs

@@ -0,0 +1,14 @@
+
+#[derive(Clone)]
+pub struct FalApiKey(pub String);
+
+impl FalApiKey {
+  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)
+  }
+}

crates/api_clients/fal_client/src/creds/mod.rs

@@ -0,0 +1,2 @@
+pub mod fal_api_key;
+pub mod open_ai_api_key;

crates/api_clients/fal_client/src/creds/open_ai_api_key.rs

@@ -0,0 +1,15 @@
+
+/// 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)
+  }
+}

crates/api_clients/fal_client/src/error/classify_fal_error.rs

@@ -0,0 +1,20 @@
+use crate::error::fal_error_plus::FalErrorPlus;
+
+/// Better classify the `fal::FalError` into a more user-friendly `FalErrorPlus`.
+pub fn classify_fal_error(err: fal::FalError) -> FalErrorPlus {
+  match err {
+    fal::FalError::RequestError(_) => FalErrorPlus::FalError(err),
+    fal::FalError::ImageError(_) => FalErrorPlus::FalError(err),
+    fal::FalError::SerializeError(_) => FalErrorPlus::FalError(err),
+    fal::FalError::StreamError(_) => FalErrorPlus::FalError(err),
+    fal::FalError::Other(ref inner) => {
+      if inner.contains("Invalid Key Authorization header format") {
+        FalErrorPlus::FalApiKeyError(inner.to_string())
+      } else if inner.contains("No user found for Key ID and Secret") {
+        FalErrorPlus::FalApiKeyError(inner.to_string())
+      } else {
+        FalErrorPlus::FalError(err)
+      }
+    }
+  }
+}

crates/api_clients/fal_client/src/error/fal_error_plus.rs

@@ -0,0 +1,59 @@
+use crate::error::classify_fal_error::classify_fal_error;
+use std::error::Error;
+use std::fmt::{Display, Formatter};
+
+/// Additional errors that aren't included in `fal::FalError`.
+#[derive(Debug)]
+pub enum FalErrorPlus {
+  /// An error arising in the `fal` crate.
+  FalError(fal::FalError),
+  /// The fal API key is invalid.
+  FalApiKeyError(String),
+  /// Another error we didn't handle.
+  AnyhowError(anyhow::Error),
+  /// URL parse errors.
+  UrlParseError(url::ParseError),
+  /// An endpoint we don't support yet.
+  UnhandledEndpoint(String),
+  /// Error from the `reqwest` crate.
+  ReqwestError(reqwest::Error),
+}
+
+impl Display for FalErrorPlus {
+  fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+    match self {
+      Self::FalError(err) => write!(f, "FalErrorPlus::FalError: {:?}", err),
+      Self::FalApiKeyError(reason) => write!(f, "FalErrorPlus::FalApiKeyError: {}", reason),
+      Self::AnyhowError(err) => write!(f, "FalErrorPlus::AnyhowError: {:?}", err),
+      Self::UrlParseError(err) => write!(f, "FalErrorPlus::UrlParseError: {:?}", err),
+      Self::UnhandledEndpoint(endpoint) => write!(f, "FalErrorPlus::UnhandledEndpoint: {:?}", endpoint),
+      Self::ReqwestError(err) => write!(f, "FalErrorPlus::ReqwestError: {:?}", err),
+    }
+  }
+}
+
+impl Error for FalErrorPlus {}
+
+impl From<fal::FalError> for FalErrorPlus {
+  fn from(err: fal::FalError) -> Self {
+    classify_fal_error(err)
+  }
+}
+
+impl From<anyhow::Error> for FalErrorPlus {
+  fn from(err: anyhow::Error) -> Self {
+    FalErrorPlus::AnyhowError(err)
+  }
+}
+
+impl From<url::ParseError> for FalErrorPlus {
+  fn from(err: url::ParseError) -> Self {
+    FalErrorPlus::UrlParseError(err)
+  }
+}
+
+impl From<reqwest::Error> for FalErrorPlus {
+  fn from(err: reqwest::Error) -> Self {
+    FalErrorPlus::ReqwestError(err)
+  }
+}

crates/api_clients/fal_client/src/error/mod.rs

@@ -0,0 +1,2 @@
+pub mod classify_fal_error;
+pub mod fal_error_plus;

crates/api_clients/fal_client/src/lib.rs

@@ -0,0 +1,14 @@
+//! A wrapper for the "fal" crate that bakes in a few extra recipes and utilities.
+
+extern crate fal;
+
+// Re-export
+pub mod export {
+  pub use fal::*;
+}
+
+pub mod creds;
+pub mod error;
+pub mod model;
+pub mod requests;
+pub mod utils;

crates/api_clients/fal_client/src/model/enqueued_request.rs

@@ -0,0 +1,41 @@
+use crate::creds::fal_api_key::FalApiKey;
+use crate::model::fal_endpoint::FalEndpoint;
+use crate::model::fal_request_id::FalRequestId;
+use errors::AnyhowResult;
+use fal::queue::{Queue, QueueResponse};
+use reqwest::Client;
+use serde::de::DeserializeOwned;
+
+#[derive(Clone, Debug)]
+pub struct EnqueuedRequest {
+  pub fal_endpoint: FalEndpoint,
+  pub request_id: FalRequestId,
+  pub response_url: String,
+  pub status_url: String,
+  pub cancel_url: String,
+}
+
+impl EnqueuedRequest {
+  pub fn from_queue_response<R: DeserializeOwned>(queue: &Queue<R>) -> AnyhowResult<Self> {
+    let endpoint = FalEndpoint::from_queue_response(queue);
+    Ok(Self {
+      fal_endpoint: endpoint.clone(),
+      request_id: FalRequestId(queue.payload.request_id.clone()),
+      response_url: queue.payload.response_url.clone(),
+      status_url: queue.payload.status_url.clone(),
+      cancel_url: queue.payload.cancel_url.clone(),
+    })
+  }
+
+  pub fn to_queue_response<R: DeserializeOwned>(&self, api_key: &FalApiKey) -> AnyhowResult<Queue<R>> {
+    let client = Client::new();
+    let endpoint = self.fal_endpoint.url();
+    let payload = QueueResponse {
+      request_id: self.request_id.0.clone(),
+      response_url: self.response_url.clone(),
+      status_url: self.status_url.clone(),
+      cancel_url: self.cancel_url.clone(),
+    };
+    Ok(Queue::new(client, endpoint, api_key.0.clone(), payload))
+  }
+}

crates/api_clients/fal_client/src/model/fal_endpoint.rs

@@ -0,0 +1,47 @@
+use fal::queue::Queue;
+use serde::de::DeserializeOwned;
+
+// TODO(bt,2025-05-26): A macro to define these + tests.
+
+const FLUX_PRO_ULTRA_TEXT_TO_IMAGE: &str = "fal-ai/flux-pro/v1.1-ultra";
+
+const HUNYUAN_3D_2_BASE: &str = "fal-ai/hunyuan3d/v2";
+
+const KLING16_IMAGE_TO_VIDEO: &str = "fal-ai/kling-video/v1.6/pro/image-to-video";
+
+const MINIMAX_IMAGE_TO_VIDEO: &str = "fal-ai/minimax/image-to-video";
+
+const RECRAFT_V3_TEXT_TO_IMAGE: &str = "fal-ai/recraft-v3";
+
+#[derive(Clone, Debug)]
+pub enum FalEndpoint {
+  FluxProUltraTextToImage,
+  Hunyuan3d2Base,
+  Kling16ImageToVideo,
+  Minimax01ImageToVideo,
+  RecraftV3TextToImage,
+  Other(String),
+}
+
+impl FalEndpoint {
+  pub fn from_queue_response<R: DeserializeOwned>(queue: &Queue<R>) -> Self {
+    match queue.endpoint.as_str() {
+      FLUX_PRO_ULTRA_TEXT_TO_IMAGE => FalEndpoint::FluxProUltraTextToImage,
+      HUNYUAN_3D_2_BASE => FalEndpoint::Hunyuan3d2Base,
+      KLING16_IMAGE_TO_VIDEO => FalEndpoint::Kling16ImageToVideo,
+      MINIMAX_IMAGE_TO_VIDEO => FalEndpoint::Minimax01ImageToVideo,
+      RECRAFT_V3_TEXT_TO_IMAGE => FalEndpoint::RecraftV3TextToImage,
+      _ => FalEndpoint::Other(queue.endpoint.clone()),
+    }
+  }
+  pub fn url(&self) -> &str {
+    match self {
+      Self::FluxProUltraTextToImage => FLUX_PRO_ULTRA_TEXT_TO_IMAGE,
+      Self::Hunyuan3d2Base => HUNYUAN_3D_2_BASE,
+      Self::Kling16ImageToVideo => KLING16_IMAGE_TO_VIDEO,
+      Self::Minimax01ImageToVideo => MINIMAX_IMAGE_TO_VIDEO,
+      Self::RecraftV3TextToImage => RECRAFT_V3_TEXT_TO_IMAGE,
+      Self::Other(url) => url,
+    }
+  }
+}

crates/api_clients/fal_client/src/model/fal_request_id.rs

@@ -0,0 +1,13 @@
+use std::fmt::Display;
+use serde::{Deserialize, Serialize};
+use crate::model::fal_endpoint::FalEndpoint;
+
+/// A strongly typed request ID for the Fal API.
+#[derive(Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Debug, Serialize, Deserialize)]
+pub struct FalRequestId(pub String);
+
+impl Display for FalRequestId {
+  fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+    Display::fmt(&self.0, f)
+  }
+}

crates/api_clients/fal_client/src/model/mod.rs

@@ -0,0 +1,3 @@
+pub mod enqueued_request;
+pub mod fal_endpoint;
+pub mod fal_request_id;

crates/api_clients/fal_client/src/requests/mod.rs

@@ -0,0 +1,2 @@
+pub mod queue;
+pub mod webhook;

crates/api_clients/fal_client/src/requests/queue/enqueue_hunyuan2_image_to_3d.rs

@@ -0,0 +1,69 @@
+use crate::creds::fal_api_key::FalApiKey;
+use crate::error::classify_fal_error::classify_fal_error;
+use crate::error::fal_error_plus::FalErrorPlus;
+use crate::model::enqueued_request::EnqueuedRequest;
+use fal::endpoints::fal_ai::hunyuan3d::v2::v2;
+use fal::endpoints::fal_ai::hunyuan3d::v2::Hunyuan3DInput;
+use fal_client::file_to_base64_url::file_to_base64_url;
+use futures::StreamExt;
+use std::io::Write;
+use std::path::Path;
+
+pub struct Hunyuan2Args<'a, P: AsRef<Path>> {
+  pub image_path: P,
+  pub api_key: &'a FalApiKey,
+}
+
+pub async fn enqueue_hunyuan2_image_to_3d<P: AsRef<Path>>(args: Hunyuan2Args<'_, P>) -> Result<EnqueuedRequest, FalErrorPlus> {
+  let image_url = file_to_base64_url(args.image_path)?;
+
+  let request = Hunyuan3DInput {
+    input_image_url: image_url,
+    textured_mesh: Some(true),
+    guidance_scale: None,
+    num_inference_steps: None,
+    octree_resolution: None,
+    seed: None,
+  };
+
+  let result = v2(request)
+      .with_api_key(&args.api_key.0)
+      .queue()
+      .await;
+  
+  let result = match result {
+    Ok(result) => result,
+    Err(err) => return Err(classify_fal_error(err)),
+  };
+  
+  Ok(EnqueuedRequest::from_queue_response(&result)?)
+}
+
+#[cfg(test)]
+mod tests {
+  use crate::creds::fal_api_key::FalApiKey;
+  use crate::requests::queue::enqueue_hunyuan2_image_to_3d::{enqueue_hunyuan2_image_to_3d, Hunyuan2Args};
+  use errors::AnyhowResult;
+  use std::fs::read_to_string;
+  use testing::test_file_path::test_file_path;
+
+  #[tokio::test]
+  #[ignore]
+  async fn test() -> AnyhowResult<()> {
+    let image = test_file_path("test_data/image/juno.jpg")?;
+
+    // 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 = Hunyuan2Args {
+      image_path: image,
+      api_key: &api_key,
+    };
+
+    let result = enqueue_hunyuan2_image_to_3d(args).await?;
+
+    Ok(())
+  }
+}

crates/api_clients/fal_client/src/requests/queue/image_gen/enqueue_flux_pro_11_ultra_text_to_image.rs

@@ -0,0 +1,69 @@
+use crate::creds::fal_api_key::FalApiKey;
+use crate::error::classify_fal_error::classify_fal_error;
+use crate::error::fal_error_plus::FalErrorPlus;
+use crate::model::enqueued_request::EnqueuedRequest;
+use fal::endpoints::fal_ai::flux_pro::v1_1_ultra::v1_1_ultra;
+use fal::endpoints::fal_ai::flux_pro::v1_1_ultra::FluxProUltraTextToImageInput;
+use futures::StreamExt;
+use std::io::Write;
+
+pub struct FluxPro11UltraTextToImageArgs<'a> {
+  pub prompt: &'a str,
+  pub api_key: &'a FalApiKey,
+  // TODO: Size parameter
+}
+
+pub async fn enqueue_flux_pro_11_ultra_text_to_image(args: FluxPro11UltraTextToImageArgs<'_>) -> Result<EnqueuedRequest, FalErrorPlus> {
+  let request = FluxProUltraTextToImageInput {
+    prompt: args.prompt.to_string(),
+    // Maybe expose
+    aspect_ratio: None, // Default is "16:9"
+    num_images: Some(1), // Default is 1
+    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()
+      .await;
+
+  let result = match result {
+    Ok(result) => result,
+    Err(err) => return Err(classify_fal_error(err)),
+  };
+  
+  Ok(EnqueuedRequest::from_queue_response(&result)?)
+}
+
+#[cfg(test)]
+mod tests {
+  use crate::creds::fal_api_key::FalApiKey;
+  use crate::requests::queue::image_gen::enqueue_flux_pro_11_ultra_text_to_image::{enqueue_flux_pro_11_ultra_text_to_image, FluxPro11UltraTextToImageArgs};
+  use errors::AnyhowResult;
+  use std::fs::read_to_string;
+
+  #[tokio::test]
+  #[ignore]
+  async fn test_flux_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 = FluxPro11UltraTextToImageArgs {
+      prompt: "a corgi smiles at the camera, inside retro video game store, lots of sci-fi props from Cowboy Bebop, photorealistic",
+      api_key: &api_key,
+    };
+
+    let result = enqueue_flux_pro_11_ultra_text_to_image(args).await?;
+
+    Ok(())
+  }
+}

crates/api_clients/fal_client/src/requests/queue/image_gen/enqueue_recraft3_text_to_image.rs

@@ -0,0 +1,63 @@
+use crate::creds::fal_api_key::FalApiKey;
+use crate::error::classify_fal_error::classify_fal_error;
+use crate::error::fal_error_plus::FalErrorPlus;
+use crate::model::enqueued_request::EnqueuedRequest;
+use fal::endpoints::fal_ai::recraft_v3::recraft_v3;
+use fal::endpoints::fal_ai::recraft_v3::ImageSizeProperty;
+use fal::endpoints::fal_ai::recraft_v3::TextToImageInput;
+use futures::StreamExt;
+use std::io::Write;
+
+pub struct Recraft3TextToImageArgs<'a> {
+  pub prompt: &'a str,
+  pub api_key: &'a FalApiKey,
+  // TODO: Size parameter
+}
+
+pub async fn enqueue_recraft3_text_to_image(args: Recraft3TextToImageArgs<'_>) -> Result<EnqueuedRequest, FalErrorPlus> {
+  let request = TextToImageInput {
+    image_size: Some(ImageSizeProperty::SquareHd),
+    prompt: args.prompt.to_string(),
+    style: None, // eg. "realistic_image"
+    style_id: None, // LoRA.
+    colors: None, // Preferable colors. We can offer this later.
+  };
+
+  let result = recraft_v3(request)
+      .with_api_key(&args.api_key.0)
+      .queue()
+      .await;
+
+  let result = match result {
+    Ok(result) => result,
+    Err(err) => return Err(classify_fal_error(err)),
+  };
+  
+  Ok(EnqueuedRequest::from_queue_response(&result)?)
+}
+
+#[cfg(test)]
+mod tests {
+  use crate::creds::fal_api_key::FalApiKey;
+  use crate::requests::queue::image_gen::enqueue_recraft3_text_to_image::{enqueue_recraft3_text_to_image, Recraft3TextToImageArgs};
+  use errors::AnyhowResult;
+  use std::fs::read_to_string;
+
+  #[tokio::test]
+  #[ignore]
+  async fn test_recraft3() -> 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 = Recraft3TextToImageArgs {
+      prompt: "a corgi looks out over the water",
+      api_key: &api_key,
+    };
+
+    let result = enqueue_recraft3_text_to_image(args).await?;
+
+    Ok(())
+  }
+}

crates/api_clients/fal_client/src/requests/queue/image_gen/mod.rs

@@ -0,0 +1,2 @@
+pub mod enqueue_flux_pro_11_ultra_text_to_image;
+pub mod enqueue_recraft3_text_to_image;

crates/api_clients/fal_client/src/requests/queue/mod.rs

@@ -0,0 +1,4 @@
+pub mod enqueue_hunyuan2_image_to_3d;
+pub mod image_gen;
+pub mod remove_background_rembg;
+pub mod video_gen;

crates/api_clients/fal_client/src/requests/queue/remove_background_rembg.rs

@@ -0,0 +1,75 @@
+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::imageutils::rembg::RemoveBackgroundInput;
+use fal::prelude::fal_ai::imageutils::rembg::rembg;
+use fal::prelude::*;
+use fal_client::file_to_base64_url::file_to_base64_url;
+use futures::StreamExt;
+use std::path::Path;
+use url::Url;
+
+pub struct RemBgResponse {
+  pub image_url: Url,
+}
+
+/// remove background using `fal_ai/imageutils/rembg`
+pub async fn remove_background_rembg<P: AsRef<Path>>(image_path: P, api_key: &FalApiKey) -> Result<RemBgResponse, FalErrorPlus> {
+  let image_url = file_to_base64_url(image_path)?;
+  
+  let request = RemoveBackgroundInput {
+    image_url,
+    crop_to_bbox: None,
+    sync_mode: None
+  };
+
+  let result = rembg(request)
+      .with_api_key(&api_key.0)
+      .queue()
+      .await;
+
+  let result = match result {
+    Ok(result) => result,
+    Err(err) => return Err(classify_fal_error(err)),
+  };
+
+  let mut stream = result.stream(true).await?;
+
+  while let Some(status) = stream.next().await {
+    let status = status?;
+    if status.status == Status::Completed {
+      break;
+    }
+  }
+
+  let output = result.response().await?;
+
+  let url = Url::parse(&output.image.url)?;
+  
+  Ok(RemBgResponse {
+    image_url: url,
+  })
+}
+
+#[cfg(test)]
+mod tests {
+  use crate::creds::fal_api_key::FalApiKey;
+  use crate::requests::queue::remove_background_rembg::remove_background_rembg;
+  use errors::AnyhowResult;
+  use std::fs::read_to_string;
+  use testing::test_file_path::test_file_path;
+
+  #[tokio::test]
+  #[ignore]
+  async fn test_remove_background_rembg() -> AnyhowResult<()> {
+    let image = test_file_path("test_data/image/juno.jpg")?;
+
+    // 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 result = remove_background_rembg(image, &api_key).await?;
+
+    Ok(())
+  }
+}

crates/api_clients/fal_client/src/requests/queue/video_gen/enqueue_kling_16_pro_image_to_video.rs

@@ -0,0 +1,102 @@
+use crate::creds::fal_api_key::FalApiKey;
+use crate::error::classify_fal_error::classify_fal_error;
+use crate::error::fal_error_plus::FalErrorPlus;
+use crate::model::enqueued_request::EnqueuedRequest;
+use fal::endpoints::fal_ai::kling_video::v1_6::pro::image_to_video::{image_to_video, ProImageToVideoRequest};
+use fal_client::file_to_base64_url::file_to_base64_url;
+use futures::StreamExt;
+use std::io::Write;
+use std::path::Path;
+
+pub struct Kling16ProArgs<'a, P: AsRef<Path>> {
+  pub image_path: P,
+  pub prompt: &'a str,
+  pub api_key: &'a FalApiKey,
+  pub duration: Kling16ProDuration,
+  pub aspect_ratio: Kling16ProAspectRatio,
+}
+
+#[derive(Copy, Clone, Debug)]
+pub enum Kling16ProDuration {
+  Default,
+  FiveSeconds,
+  TenSeconds,
+}
+
+#[derive(Copy, Clone, Debug)]
+pub enum Kling16ProAspectRatio {
+  Square, // 1:1
+  WideSixteenNine, // 16:9
+  TallNineSixteen, // 9:16
+}
+
+pub async fn enqueue_kling_16_pro_image_to_video<P: AsRef<Path>>(args: Kling16ProArgs<'_, P>) -> Result<EnqueuedRequest, FalErrorPlus> {
+  let image_url = file_to_base64_url(args.image_path)?;
+
+  let duration = match args.duration{
+    Kling16ProDuration::Default => None,
+    Kling16ProDuration::FiveSeconds => Some("5".to_string()), // Gross...
+    Kling16ProDuration::TenSeconds => Some("10".to_string()),
+  };
+  
+  let aspect_ratio = match args.aspect_ratio {
+    Kling16ProAspectRatio::Square => Some("1:1".to_string()),
+    Kling16ProAspectRatio::WideSixteenNine => Some("16:9".to_string()),
+    Kling16ProAspectRatio::TallNineSixteen => Some("9:16".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()
+      .await;
+
+  let result = match result {
+    Ok(result) => result,
+    Err(err) => return Err(classify_fal_error(err)),
+  };
+  
+  Ok(EnqueuedRequest::from_queue_response(&result)?)
+}
+
+#[cfg(test)]
+mod tests {
+  use crate::creds::fal_api_key::FalApiKey;
+  use crate::requests::queue::video_gen::enqueue_kling_16_pro_image_to_video::{enqueue_kling_16_pro_image_to_video, Kling16ProArgs, Kling16ProAspectRatio, Kling16ProDuration};
+  use errors::AnyhowResult;
+  use std::fs::read_to_string;
+  use testing::test_file_path::test_file_path;
+
+  #[tokio::test]
+  #[ignore]
+  async fn test_kling16_video() -> AnyhowResult<()> {
+    let image = test_file_path("test_data/image/juno.jpg")?;
+
+    // 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 = Kling16ProArgs {
+      image_path: image,
+      prompt: "a corgi looks out over the water",
+      api_key: &api_key,
+      duration: Kling16ProDuration::Default,
+      aspect_ratio: Kling16ProAspectRatio::Square,
+    };
+
+    let result = enqueue_kling_16_pro_image_to_video(args).await?;
+
+    Ok(())
+  }
+}

crates/api_clients/fal_client/src/requests/queue/video_gen/enqueue_minimax_01_image_to_video.rs

@@ -0,0 +1,70 @@
+use crate::creds::fal_api_key::FalApiKey;
+use crate::error::classify_fal_error::classify_fal_error;
+use crate::error::fal_error_plus::FalErrorPlus;
+use crate::model::enqueued_request::EnqueuedRequest;
+use fal::endpoints::fal_ai::minimax::image_to_video::image_to_video;
+use fal::endpoints::fal_ai::minimax::image_to_video::ImageToVideoRequest;
+use fal_client::file_to_base64_url::file_to_base64_url;
+use futures::StreamExt;
+use std::io::Write;
+use std::path::Path;
+
+pub struct Minimax01Args<'a, P: AsRef<Path>> {
+  pub image_path: P,
+  pub prompt: &'a str,
+  pub api_key: &'a FalApiKey,
+}
+
+pub async fn enqueue_minimax_01_image_to_video<P: AsRef<Path>>(args: Minimax01Args<'_, P>) -> Result<EnqueuedRequest, FalErrorPlus> {
+  let image_url = file_to_base64_url(args.image_path)?;
+
+  let request = ImageToVideoRequest {
+    image_url,
+    prompt: args.prompt.to_string(),
+    prompt_optimizer: None,
+  };
+
+  let result = image_to_video(request)
+      .with_api_key(&args.api_key.0)
+      .queue()
+      .await;
+
+  let result = match result {
+    Ok(result) => result,
+    Err(err) => return Err(classify_fal_error(err)),
+  };
+  
+  Ok(EnqueuedRequest::from_queue_response(&result)?)
+}
+
+#[cfg(test)]
+mod tests {
+  use crate::creds::fal_api_key::FalApiKey;
+  use crate::requests::queue::video_gen::enqueue_minimax_01_image_to_video::{enqueue_minimax_01_image_to_video, Minimax01Args};
+  use errors::AnyhowResult;
+  use std::fs::read_to_string;
+  use testing::test_file_path::test_file_path;
+
+  #[tokio::test]
+  #[ignore]
+  async fn test_minimax_video() -> AnyhowResult<()> {
+    let image = test_file_path("test_data/image/juno.jpg")?;
+
+    // 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 = Minimax01Args {
+      image_path: image,
+      prompt: "a dog jumps into the water",
+      api_key: &api_key,
+    };
+
+    let result = enqueue_minimax_01_image_to_video(args).await?;
+    
+    println!("Request ID: {:?}", result.request_id);
+
+    Ok(())
+  }
+}

crates/api_clients/fal_client/src/requests/queue/video_gen/mod.rs

@@ -0,0 +1,2 @@
+pub mod enqueue_kling_16_pro_image_to_video;
+pub mod enqueue_minimax_01_image_to_video;

crates/api_clients/fal_client/src/requests/webhook/image/enqueue_flux_1_dev_text_to_image_webhook.rs

@@ -0,0 +1,106 @@
+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(())
+  }
+}

crates/api_clients/fal_client/src/requests/webhook/image/enqueue_flux_1_schnell_text_to_image_webhook.rs

@@ -0,0 +1,105 @@
+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(())
+  }
+}

crates/api_clients/fal_client/src/requests/webhook/image/enqueue_flux_pro_11_text_to_image_webhook.rs

@@ -0,0 +1,104 @@
+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(())
+  }
+}

crates/api_clients/fal_client/src/requests/webhook/image/enqueue_flux_pro_11_ultra_text_to_image_webhook.rs

@@ -0,0 +1,74 @@
+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))
+}

crates/api_clients/fal_client/src/requests/webhook/image/enqueue_gpt_image_1_edit_image_webhook.rs

@@ -0,0 +1,133 @@
+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(())
+  }
+}

crates/api_clients/fal_client/src/requests/webhook/image/mod.rs

@@ -0,0 +1,6 @@
+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;