Fix imports in FK

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

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

@@ -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
-
-          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

@@ -1,63 +0,0 @@
-name: 'publish'
-
-on:
-  push:
-    branches:
-      - tauri-prod-release
-
-# This workflow will trigger on each push to the `release` branch to create or update a GitHub release, build your app, and upload the artifacts to the release.
-
-jobs:
-  publish-tauri:
-    permissions:
-      contents: write
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - platform: 'macos-latest' # for Arm based macs (M1 and above).
-            args: '--target aarch64-apple-darwin'
-          # - platform: 'macos-latest' # for Intel based macs.
-          #   args: '--target x86_64-apple-darwin'
-          # - platform: 'ubuntu-22.04' # for Tauri v1 you could replace this with ubuntu-20.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:
-          # Those targets are only used on macos runners so it's in an `if` to slightly speed up windows and linux builds.
-          targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
-
-      - name: install dependencies (ubuntu only)
-        if: matrix.platform == 'ubuntu-22.04' # This must match the platform value defined above.
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libwebkit2gtk-4.0-dev libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
-        # webkitgtk 4.0 is for Tauri v1 - webkitgtk 4.1 is for Tauri v2.
-        # 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/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/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.'
-          releaseDraft: true
-          prerelease: false
-          args: ${{ matrix.args }}

.gitignore

@@ -24,13 +24,11 @@ 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/

.idea/codeStyles/Project.xml

@@ -1,13 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <codeStyleSettings language="Rust">
-      <option name="RIGHT_MARGIN" value="180" />
-      <option name="ALIGN_MULTILINE_PARAMETERS" value="false" />
-      <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="false" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-  </code_scheme>
-</component>

.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>

.sqlx/query-0fa824822cd94024dce21243f41e69e4a3e8685c4de676834a7c0ee14982c976.json

@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nINSERT INTO generic_inference_jobs\nSET\n  token = ?,\n  uuid_idempotency_token = ?,\n\n  job_type = ?,\n\n  maybe_external_third_party = ?,\n  maybe_external_third_party_id = ?,\n\n  product_category = ?,\n  inference_category = ?,\n\n  maybe_model_type = NULL,\n  maybe_model_token = NULL,\n\n  maybe_input_source_token = NULL,\n  maybe_input_source_token_type = NULL,\n\n  maybe_download_url = NULL,\n  maybe_cover_image_media_file_token = NULL,\n\n  maybe_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

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

.sqlx/query-2bd7a5b886c9624ae48533ddac409cfca0668f30ab1f7016c412876b5904168b.json

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

.sqlx/query-64dfacc1f0552d539f009fea91e902a2fe296c06ad539808596bbf2c8fc9eaa0.json

@@ -1,113 +0,0 @@
-{
-  "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": "MULTIPLE_KEY | BINARY",
+          "flags": "BINARY",
           "char_set": 224,
           "max_size": 128
         }

.sqlx/query-c58f414b5e4d0f0420d1894e2f40311e5613919f49f3ac91f81f5fc2bef1bea8.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_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        ",
+  "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        ",
   "describe": {
     "columns": [],
     "parameters": {
-      "Right": 39
+      "Right": 38
     },
     "nullable": []
   },
-  "hash": "b4470e607c005421dd8504b9f1d695080a581936ac6ce00b6f437b2764e741be"
+  "hash": "c58f414b5e4d0f0420d1894e2f40311e5613919f49f3ac91f81f5fc2bef1bea8"
 }

.sqlx/query-dc0367e9e43c3d7dda3623e77337ab4529eac2192475be7d08589886703ba1cb.json

@@ -1,12 +0,0 @@
-{
-  "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

@@ -1,12 +0,0 @@
-{
-  "db_name": "MySQL",
-  "query": "\nUPDATE generic_inference_jobs\nSET\n  status = ?,\n  on_success_result_entity_type = ?,\n  on_success_result_entity_token = ?,\n  failure_reason = NULL,\n  internal_debugging_failure_reason = NULL,\n  success_execution_millis = 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,15 +1,6 @@
 {
-  "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,
-  }
+    "files.exclude": {
+        "**/*~": true,
+        "frontend_old/**": true
+    }
 }

Cargo.toml

@@ -4,17 +4,12 @@ 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",
+  # 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",
 
   # CLI tools for operations, etc.
   "crates/cli/devenv/dev-database-seed",
@@ -29,33 +24,35 @@ members = [
   "crates/cli/production/migration-tool",
 
   # Desktop apps
-  "crates/desktop/artcraft",
+  "crates/desktop/tauri-artcraft",
+  "crates/desktop/tauri-realtime",
 
   # 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/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",
@@ -65,42 +62,28 @@ 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/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",
+  #"crates/lib/sqlite_queries",
 
   # Services: API servers, jobs, workers, etc.
   "crates/service/job/analytics_job",
@@ -121,23 +104,18 @@ members = [
   "crates/service/plugins/user_traits_component",
 
   # Vendored code
-  "crates/vendor/fal-rs",
-  "crates/vendor/fal-rs/fal-derive",
-  "crates/vendor/fal-rs/generate",
+  "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/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",
 
@@ -168,75 +146,36 @@ publish = false
 #  - tauri-runtime-wry
 #  - tauri-utils
 #
-# Broken on Windows:
-#  - core-foundation
-#  - core-foundation-sys
-#
 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
-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"
+anyhow = "1.0.97"
 base64 = "0.22.1"
-bytes = "1.10.1"
-chrono = { version = "0.4.41", features = ["serde"] }
-cookie = "0.18.1"
-futures = { version = "0.3.31" }
+chrono = { version = "0.4.40", features = ["serde"] }
 hex-literal = "1.0.0"
-indexmap = "2.9.0"
 log = "0.4.27"
 once_cell = "1.21.3"
-rand = "0.9.1"
+rand = "0.9.0"
 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.34+deprecated"
+serde_yaml = "0.9.1"
 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"
-tokio = { version = "1.45.1", features = ["macros"] }
-toml = "0.8.22"
-url = { version = "2.5.4", features = ["serde"] }
+thiserror = "2"
+toml = "0.7.4"
+url = "2.5.4"
 
 # 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/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/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" }
-sqlite_tasks = { path = "crates/schema/database/sqlite_tasks" }
-storyteller_client = { path = "crates/api_clients/storyteller_client" }
 subprocess_common = { path = "crates/lib/subprocess_common" }
-test_data = { path = "crates/lib/test_data" }
-tokens = { path = "crates/schema/public/tokens" }
-web_base64 = { path = "crates/lib/data/web_base64" }
+tokens = { path = "crates/_types/tokens" }

README.md

@@ -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)

_develop/docs/local_development/general_setup.md

@@ -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).

_docs/code_conventions.md

@@ -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

_sql/artcraft_migrations/20250708000000_create_tasks_table.sql

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

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

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

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

@@ -1,11 +0,0 @@
--- 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,20 +39,8 @@ 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
@@ -299,13 +287,11 @@ 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/composite_identifiers/Cargo.toml

@@ -16,21 +16,20 @@ path = "src/lib.rs"
 normal = ["workspace-build-acceleration"]
 
 [dependencies]
-# Workspace hack (faster compile times)
-workspace-build-acceleration = { workspace = true }
-
 # Internal
-enums = { workspace = true }
-tokens = { workspace = true }
+enums = { path = "../enums" }
+tokens = { path = "../tokens" }
 
+# Workspace hack (faster compile times)
+workspace-build-acceleration = { version = "0.1", path = "../../workspace-build-acceleration" }
 
 # Serialization
 serde = "1.0.125"
 serde_derive = "1.0.125"
 
-sqlx = { version = "0.7.4", features = [ "mysql", "sqlite", "runtime-tokio-native-tls", "chrono" ] }
-sqlx-core = { version = "0.7.4" }
-sqlx-mysql= { version = "0.7.4" }
+sqlx = { version = "0.7.2", features = [ "mysql", "sqlite", "runtime-tokio-native-tls", "chrono" ] }
+sqlx-core = { version = "0.7.2" }
+sqlx-mysql= { version = "0.7.2" }
 
 utoipa = { version = "4", features = ["chrono","actix_extras"] }
 

crates/_types/enums/Cargo.toml

@@ -8,32 +8,26 @@ authors = [
 ]
 publish = false
 
-[package.metadata.cargo-udeps.ignore]
-normal = ["workspace-build-acceleration"]
-
 [lib]
 name = "enums"
 path = "src/lib.rs"
 
-[features]
-default = []
-database = ["sqlx", "sqlx-core", "sqlx-mysql"]
+[package.metadata.cargo-udeps.ignore]
+normal = ["workspace-build-acceleration"]
 
 [dependencies]
-# Workspace hack (faster compile times)
-workspace-build-acceleration.workspace = true
-
 # Internal
-# (None yet)
+
+# Workspace hack (faster compile times)
+workspace-build-acceleration = { version = "0.1", path = "../../workspace-build-acceleration" }
 
 # Serialization
-serde.workspace = true
-serde_derive.workspace = true
+serde = "1.0.125"
+serde_derive = "1.0.125"
 
-# Database conversion of enum types is optional
-sqlx = { version = "0.7.4", features = [ "mysql", "runtime-tokio-native-tls", "chrono" ], optional = true }
-sqlx-core = { version = "0.7.4" , optional = true }
-sqlx-mysql = { version = "0.7.4" , optional = true }
+sqlx = { version = "0.7.2", features = [ "mysql", "sqlite", "runtime-tokio-native-tls", "chrono" ] }
+sqlx-core = { version = "0.7.2" }
+sqlx-mysql= { version = "0.7.2" }
 
 utoipa = { version = "4", features = ["chrono","actix_extras"] }
 
@@ -43,5 +37,5 @@ utoipa = { version = "4", features = ["chrono","actix_extras"] }
 strum = { version = "0.26", features = ["derive"] }
 
 # Test serialization
-serde_json.workspace = true
-toml.workspace = true
+serde_json = "1.0.108"
+toml = "0.8.14"

crates/_types/enums/src/by_table/generic_download_jobs/generic_download_type.rs

@@ -14,26 +14,25 @@ use strum::EnumIter;
 /// These types are present in the HTTP API and database columns as serialized here.
 ///
 /// DO NOT CHANGE VALUES WITHOUT A MIGRATION STRATEGY.
-#[derive(Clone, Copy, Eq, PartialEq, Debug, Deserialize, Serialize, Hash, Ord, PartialOrd)]
-#[cfg_attr(feature = "database", derive(sqlx::Type))]
 #[cfg_attr(test, derive(EnumIter, EnumCount))]
+#[derive(Clone, Copy, Eq, PartialEq, Debug, Deserialize, Serialize, sqlx::Type, Hash, Ord, PartialOrd)]
 pub enum GenericDownloadType {
   /// NB: Note - this is hifigan for Tacotron2.
   /// Some work will be needed to unify this with other hifigan types.
   #[serde(rename = "hifigan")]
-  #[cfg_attr(feature = "database", sqlx(rename = "hifigan"))]
+  #[sqlx(rename = "hifigan")]
   HifiGan,
 
   /// NB: Note - this is hifigan for SoftVC (our internal codename is "rocketvc").
   /// Some work will need to be done to unify this with other hifigan types.
   #[serde(rename = "hifigan_rocket_vc")]
-  #[cfg_attr(feature = "database", sqlx(rename = "hifigan_rocket_vc"))]
+  #[sqlx(rename = "hifigan_rocket_vc")]
   HifiGanRocketVc,
 
   /// NB: Note - this is hifigan for SoVitsSvc
   /// Some work will need to be done to unify this with other hifigan types.
   #[serde(rename = "hifigan_so_vits_svc")]
-  #[cfg_attr(feature = "database", sqlx(rename = "hifigan_so_vits_svc"))]
+  #[sqlx(rename = "hifigan_so_vits_svc")]
   HifiGanSoVitsSvc,
 
   //#[serde(rename = "melgan_vocodes")]
@@ -43,27 +42,27 @@ pub enum GenericDownloadType {
   /// NB: Our external-facing name for "softvc" is rocketvc.
   /// I wish we could stop being stupid about this.
   #[serde(rename = "rocket_vc")]
-  #[cfg_attr(feature = "database", sqlx(rename = "rocket_vc"))]
+  #[sqlx(rename = "rocket_vc")]
   RocketVc,
 
   /// RVC (v2) voice conversion models
   #[serde(rename = "rvc_v2")]
-  #[cfg_attr(feature = "database", sqlx(rename = "rvc_v2"))]
+  #[sqlx(rename = "rvc_v2")]
   RvcV2,
 
   /// so-vits-svc voice conversion models
   #[serde(rename = "so_vits_svc")]
-  #[cfg_attr(feature = "database", sqlx(rename = "so_vits_svc"))]
+  #[sqlx(rename = "so_vits_svc")]
   SoVitsSvc,
 
   /// Tacotron TTS models.
   #[serde(rename = "tacotron2")]
-  #[cfg_attr(feature = "database", sqlx(rename = "tacotron2"))]
+  #[sqlx(rename = "tacotron2")]
   Tacotron2,
 
   /// VITS TTS models.
   #[serde(rename = "vits")]
-  #[cfg_attr(feature = "database", sqlx(rename = "vits"))]
+  #[sqlx(rename = "vits")]
   Vits,
 }
 

crates/_types/enums/src/by_table/generic_inference_jobs/inference_category.rs

@@ -35,22 +35,10 @@ pub enum InferenceCategory {
   #[serde(rename = "voice_conversion")]
   VoiceConversion,
 
-  /// Image generation (eg. Stable Diffusion 1.5), FAL-powered image generation, etc.
+  /// Image generation (eg. Stable Diffusion 1.5)
   #[serde(rename = "image_generation")]
   ImageGeneration,
 
-  /// FAL-powered video generation
-  #[serde(rename = "video_generation")]
-  VideoGeneration,
-  
-  /// FAL-powered 3D object generation
-  #[serde(rename = "object_generation")]
-  ObjectGeneration,
-  
-  /// FAL-powered image background removal
-  #[serde(rename = "background_removal")]
-  BackgroundRemoval,
-
   /// Turn video into animation data with mocap processing (eg. Mocapnet).
   #[serde(rename = "mocap")]
   Mocap,
@@ -101,9 +89,6 @@ impl InferenceCategory {
       Self::TextToSpeech => "text_to_speech",
       Self::VoiceConversion => "voice_conversion",
       Self::ImageGeneration => "image_generation",
-      Self::VideoGeneration => "video_generation",
-      Self::ObjectGeneration => "object_generation",
-      Self::BackgroundRemoval => "background_removal",
       Self::Mocap => "mocap",
       Self::Workflow => "workflow",
       Self::F5TTS => "f5_tts",
@@ -122,9 +107,6 @@ impl InferenceCategory {
       "text_to_speech" => Ok(Self::TextToSpeech),
       "voice_conversion" => Ok(Self::VoiceConversion),
       "image_generation" => Ok(Self::ImageGeneration),
-      "video_generation" => Ok(Self::VideoGeneration),
-      "object_generation" => Ok(Self::ObjectGeneration),
-      "background_removal" => Ok(Self::BackgroundRemoval),
       "f5_tts" => Ok(Self::F5TTS),
       "mocap" => Ok(Self::Mocap),
       "workflow" => Ok(Self::Workflow),
@@ -146,9 +128,6 @@ impl InferenceCategory {
       Self::TextToSpeech,
       Self::VoiceConversion,
       Self::ImageGeneration,
-      Self::ObjectGeneration,
-      Self::VideoGeneration,
-      Self::BackgroundRemoval,
       Self::Mocap,
       Self::F5TTS,
       Self::SeedVc,
@@ -176,9 +155,6 @@ mod tests {
       assert_serialization(InferenceCategory::TextToSpeech, "text_to_speech");
       assert_serialization(InferenceCategory::VoiceConversion, "voice_conversion");
       assert_serialization(InferenceCategory::ImageGeneration, "image_generation");
-      assert_serialization(InferenceCategory::VideoGeneration, "video_generation");
-      assert_serialization(InferenceCategory::ObjectGeneration, "object_generation");
-      assert_serialization(InferenceCategory::BackgroundRemoval, "background_removal");
       assert_serialization(InferenceCategory::Mocap, "mocap");
       assert_serialization(InferenceCategory::F5TTS, "f5_tts");
       assert_serialization(InferenceCategory::SeedVc, "seed_vc");
@@ -196,9 +172,6 @@ mod tests {
       assert_eq!(InferenceCategory::TextToSpeech.to_str(), "text_to_speech");
       assert_eq!(InferenceCategory::VoiceConversion.to_str(), "voice_conversion");
       assert_eq!(InferenceCategory::ImageGeneration.to_str(), "image_generation");
-      assert_eq!(InferenceCategory::VideoGeneration.to_str(), "video_generation");
-      assert_eq!(InferenceCategory::ObjectGeneration.to_str(), "object_generation");
-      assert_eq!(InferenceCategory::BackgroundRemoval.to_str(), "background_removal");
       assert_eq!(InferenceCategory::F5TTS.to_str(), "f5_tts");
       assert_eq!(InferenceCategory::SeedVc.to_str(), "seed_vc");
       assert_eq!(InferenceCategory::Mocap.to_str(), "mocap");
@@ -216,9 +189,6 @@ mod tests {
       assert_eq!(InferenceCategory::from_str("text_to_speech").unwrap(), InferenceCategory::TextToSpeech);
       assert_eq!(InferenceCategory::from_str("voice_conversion").unwrap(), InferenceCategory::VoiceConversion);
       assert_eq!(InferenceCategory::from_str("image_generation").unwrap(), InferenceCategory::ImageGeneration);
-      assert_eq!(InferenceCategory::from_str("video_generation").unwrap(), InferenceCategory::VideoGeneration);
-      assert_eq!(InferenceCategory::from_str("object_generation").unwrap(), InferenceCategory::ObjectGeneration);
-      assert_eq!(InferenceCategory::from_str("background_removal").unwrap(), InferenceCategory::BackgroundRemoval);
       assert_eq!(InferenceCategory::from_str("f5_tts").unwrap(), InferenceCategory::F5TTS);
       assert_eq!(InferenceCategory::from_str("seed_vc").unwrap(), InferenceCategory::SeedVc);
       assert_eq!(InferenceCategory::from_str("mocap").unwrap(), InferenceCategory::Mocap);
@@ -232,10 +202,22 @@ mod tests {
     #[test]
     fn all_variants() {
       // Static check
-      const EXPECTED_COUNT : usize = 16;
-
-      assert_eq!(InferenceCategory::all_variants().len(), EXPECTED_COUNT);
-      assert_eq!(InferenceCategory::iter().len(), EXPECTED_COUNT);
+      let mut variants = InferenceCategory::all_variants();
+      assert_eq!(variants.len(), 12);
+      assert_eq!(variants.pop_first(), Some(InferenceCategory::DeprecatedField));
+      assert_eq!(variants.pop_first(), Some(InferenceCategory::LipsyncAnimation));
+      assert_eq!(variants.pop_first(), Some(InferenceCategory::TextToSpeech));
+      assert_eq!(variants.pop_first(), Some(InferenceCategory::VoiceConversion));
+      assert_eq!(variants.pop_first(), Some(InferenceCategory::ImageGeneration));
+      assert_eq!(variants.pop_first(), Some(InferenceCategory::F5TTS));
+      assert_eq!(variants.pop_first(), Some(InferenceCategory::Mocap));
+      assert_eq!(variants.pop_first(), Some(InferenceCategory::SeedVc));
+      assert_eq!(variants.pop_first(), Some(InferenceCategory::Workflow));
+      assert_eq!(variants.pop_first(), Some(InferenceCategory::FormatConversion));
+      assert_eq!(variants.pop_first(), Some(InferenceCategory::LivePortrait));
+      assert_eq!(variants.pop_first(), Some(InferenceCategory::VideoFilter));
+      assert_eq!(variants.pop_first(), Some(InferenceCategory::ConvertBvhToWorkflow));
+      assert_eq!(variants.pop_first(), None);
 
       // Generated check
       use strum::IntoEnumIterator;

crates/_types/enums/src/by_table/generic_inference_jobs/inference_job_product_category.rs

@@ -21,14 +21,6 @@ pub enum InferenceJobProductCategory {
   /// Download: GptSoVits
   #[default]
   DownloadGptSoVits,
-  
-  // =============== FAL ===============
-  
-  FalImage,
-  FalVideo,
-  /// Fal: 3D Object Generation
-  FalObject,
-  FalBgRemoval,
 
   // =============== TEXT TO SPEECH ===============
 
@@ -121,10 +113,6 @@ impl InferenceJobProductCategory {
   pub fn to_str(&self) -> &'static str {
     match self {
       Self::DownloadGptSoVits => "download_gpt_so_vits",
-      Self::FalImage => "fal_image",
-      Self::FalVideo => "fal_video",
-      Self::FalObject => "fal_object",
-      Self::FalBgRemoval => "fal_bg_removal",
       Self::TtsGptSoVits => "tts_gpt_so_vits",
       Self::TtsStyleTts2 => "tts_style_tts2",
       Self::TtsTacotron2 => "tts_tacotron2",
@@ -153,10 +141,6 @@ impl InferenceJobProductCategory {
   pub fn from_str(value: &str) -> Result<Self, String> {
     match value {
       "download_gpt_so_vits" => Ok(Self::DownloadGptSoVits),
-      "fal_image" => Ok(Self::FalImage),
-      "fal_video" => Ok(Self::FalVideo),
-      "fal_object" => Ok(Self::FalObject),
-      "fal_bg_removal" => Ok(Self::FalBgRemoval),
       "tts_gpt_so_vits" => Ok(Self::TtsGptSoVits),
       "tts_style_tts2" => Ok(Self::TtsStyleTts2),
       "tts_tacotron2" => Ok(Self::TtsTacotron2),
@@ -188,10 +172,6 @@ impl InferenceJobProductCategory {
     // NB: BTreeSet::from() isn't const, but not worth using LazyStatic, etc.
     BTreeSet::from([
       Self::DownloadGptSoVits,
-      Self::FalImage,
-      Self::FalVideo,
-      Self::FalObject,
-      Self::FalBgRemoval,
       Self::TtsGptSoVits,
       Self::TtsStyleTts2,
       Self::TtsTacotron2,
@@ -229,10 +209,6 @@ mod tests {
     #[test]
     fn test_serialization() {
       assert_serialization(InferenceJobProductCategory::DownloadGptSoVits, "download_gpt_so_vits");
-      assert_serialization(InferenceJobProductCategory::FalImage, "fal_image");
-      assert_serialization(InferenceJobProductCategory::FalVideo, "fal_video");
-      assert_serialization(InferenceJobProductCategory::FalObject, "fal_object");
-      assert_serialization(InferenceJobProductCategory::FalBgRemoval, "fal_bg_removal");
       assert_serialization(InferenceJobProductCategory::TtsGptSoVits, "tts_gpt_so_vits");
       assert_serialization(InferenceJobProductCategory::TtsStyleTts2, "tts_style_tts2");
       assert_serialization(InferenceJobProductCategory::TtsTacotron2, "tts_tacotron2");
@@ -260,10 +236,6 @@ mod tests {
     #[test]
     fn to_str() {
       assert_eq!(InferenceJobProductCategory::DownloadGptSoVits.to_str(), "download_gpt_so_vits");
-      assert_eq!(InferenceJobProductCategory::FalImage.to_str(), "fal_image");
-      assert_eq!(InferenceJobProductCategory::FalVideo.to_str(), "fal_video");
-      assert_eq!(InferenceJobProductCategory::FalObject.to_str(), "fal_object");
-      assert_eq!(InferenceJobProductCategory::FalBgRemoval.to_str(), "fal_bg_removal");
       assert_eq!(InferenceJobProductCategory::TtsGptSoVits.to_str(), "tts_gpt_so_vits");
       assert_eq!(InferenceJobProductCategory::TtsStyleTts2.to_str(), "tts_style_tts2");
       assert_eq!(InferenceJobProductCategory::TtsTacotron2.to_str(), "tts_tacotron2");
@@ -290,10 +262,6 @@ mod tests {
     #[test]
     fn from_str() {
       assert_eq!(InferenceJobProductCategory::from_str("download_gpt_so_vits").unwrap(), InferenceJobProductCategory::DownloadGptSoVits);
-      assert_eq!(InferenceJobProductCategory::from_str("fal_image").unwrap(), InferenceJobProductCategory::FalImage);
-      assert_eq!(InferenceJobProductCategory::from_str("fal_video").unwrap(), InferenceJobProductCategory::FalVideo);
-      assert_eq!(InferenceJobProductCategory::from_str("fal_object").unwrap(), InferenceJobProductCategory::FalObject);
-      assert_eq!(InferenceJobProductCategory::from_str("fal_bg_removal").unwrap(), InferenceJobProductCategory::FalBgRemoval);
       assert_eq!(InferenceJobProductCategory::from_str("tts_gpt_so_vits").unwrap(), InferenceJobProductCategory::TtsGptSoVits);
       assert_eq!(InferenceJobProductCategory::from_str("tts_style_tts2").unwrap(), InferenceJobProductCategory::TtsStyleTts2);
       assert_eq!(InferenceJobProductCategory::from_str("tts_tacotron2").unwrap(), InferenceJobProductCategory::TtsTacotron2);
@@ -320,11 +288,32 @@ mod tests {
     #[test]
     fn all_variants() {
       // Static check
-      const EXPECTED_COUNT : usize = 27;
+      let mut variants = InferenceJobProductCategory::all_variants();
+      assert_eq!(variants.len(), 21);
+      assert_eq!(variants.pop_first(), Some(InferenceJobProductCategory::DownloadGptSoVits));
+      assert_eq!(variants.pop_first(), Some(InferenceJobProductCategory::TtsGptSoVits));
+      assert_eq!(variants.pop_first(), Some(InferenceJobProductCategory::TtsStyleTts2));
+      assert_eq!(variants.pop_first(), Some(InferenceJobProductCategory::TtsTacotron2));
+      assert_eq!(variants.pop_first(), Some(InferenceJobProductCategory::VcRvc2));
+      assert_eq!(variants.pop_first(), Some(InferenceJobProductCategory::VcSeedVc));
+      assert_eq!(variants.pop_first(), Some(InferenceJobProductCategory::VcSvc));
+      assert_eq!(variants.pop_first(), Some(InferenceJobProductCategory::VidLipsyncFaceFusion));
+      assert_eq!(variants.pop_first(), Some(InferenceJobProductCategory::VidLipsyncSadTalker));
+      assert_eq!(variants.pop_first(), Some(InferenceJobProductCategory::VidLivePortrait));
+      assert_eq!(variants.pop_first(), Some(InferenceJobProductCategory::VidLivePortraitWebcam));
+      assert_eq!(variants.pop_first(), Some(InferenceJobProductCategory::VidStudio));
+      assert_eq!(variants.pop_first(), Some(InferenceJobProductCategory::VidStudioGen2));
+      assert_eq!(variants.pop_first(), Some(InferenceJobProductCategory::VidStyleTransfer));
+      assert_eq!(variants.pop_first(), Some(InferenceJobProductCategory::LipsyncFaceFusion));
+      assert_eq!(variants.pop_first(), Some(InferenceJobProductCategory::LipsyncSadTalker));
+      assert_eq!(variants.pop_first(), Some(InferenceJobProductCategory::LivePortrait));
+      assert_eq!(variants.pop_first(), Some(InferenceJobProductCategory::LivePortraitWebcam));
+      assert_eq!(variants.pop_first(), Some(InferenceJobProductCategory::StableDiffusion));
+      assert_eq!(variants.pop_first(), Some(InferenceJobProductCategory::Studio));
+      assert_eq!(variants.pop_first(), Some(InferenceJobProductCategory::VidFaceFusion));
+      assert_eq!(variants.pop_first(), Some(InferenceJobProductCategory::Vst));
+      assert_eq!(variants.pop_first(), None);
 
-      assert_eq!(InferenceJobProductCategory::all_variants().len(), EXPECTED_COUNT);
-      assert_eq!(InferenceJobProductCategory::iter().len(), EXPECTED_COUNT);
-      
       // Generated check
       use strum::IntoEnumIterator;
       assert_eq!(InferenceJobProductCategory::all_variants().len(), InferenceJobProductCategory::iter().len());

crates/_types/enums/src/by_table/generic_inference_jobs/inference_job_type.rs

@@ -15,10 +15,6 @@ use strum::EnumIter;
 #[derive(Clone, Copy, Eq, PartialEq, Hash, Ord, PartialOrd, Deserialize, Serialize, Default)]
 #[serde(rename_all = "snake_case")]
 pub enum InferenceJobType {
-  /// Fal jobs do not run on our job runners.
-  /// Instead, we receive web hook updates from Fal.
-  FalQueue,
-  
   /// Storyteller Studio and Video Style Transfer Jobs (which we may want to split).
   /// These run in Comfy.
   /// TODO(bt,2024-07-15): We may segregate these two job types in the future
@@ -109,7 +105,6 @@ impl_mysql_enum_coders!(InferenceJobType);
 impl InferenceJobType {
   pub fn to_str(&self) -> &'static str {
     match self {
-      Self::FalQueue => "fal_queue",
       Self::VideoRender => "video_render",
       Self::LivePortrait => "live_portrait",
       Self::FaceFusion => "face_fusion",
@@ -135,7 +130,6 @@ impl InferenceJobType {
 
   pub fn from_str(value: &str) -> Result<Self, String> {
     match value {
-      "fal_queue" => Ok(Self::FalQueue),
       "video_render" => Ok(Self::VideoRender),
       "live_portrait" => Ok(Self::LivePortrait),
       "face_fusion" => Ok(Self::FaceFusion),
@@ -164,7 +158,6 @@ impl InferenceJobType {
     // NB: BTreeSet is sorted
     // NB: BTreeSet::from() isn't const, but not worth using LazyStatic, etc.
     BTreeSet::from([
-      Self::FalQueue,
       Self::VideoRender,
       Self::LivePortrait,
       Self::FaceFusion,
@@ -204,7 +197,6 @@ mod tests {
 
     #[test]
     fn test_serialization() {
-      assert_serialization(InferenceJobType::FalQueue, "fal_queue");
       assert_serialization(InferenceJobType::VideoRender, "video_render");
       assert_serialization(InferenceJobType::LivePortrait, "live_portrait");
       assert_serialization(InferenceJobType::FaceFusion, "face_fusion");
@@ -229,7 +221,6 @@ mod tests {
 
     #[test]
     fn to_str() {
-      assert_eq!(InferenceJobType::FalQueue.to_str(), "fal_queue");
       assert_eq!(InferenceJobType::VideoRender.to_str(), "video_render");
       assert_eq!(InferenceJobType::LivePortrait.to_str(), "live_portrait");
       assert_eq!(InferenceJobType::FaceFusion.to_str(), "face_fusion");
@@ -254,7 +245,6 @@ mod tests {
 
     #[test]
     fn from_str() {
-      assert_eq!(InferenceJobType::from_str("fal_queue").unwrap(), InferenceJobType::FalQueue);
       assert_eq!(InferenceJobType::from_str("video_render").unwrap(), InferenceJobType::VideoRender);
       assert_eq!(InferenceJobType::from_str("live_portrait").unwrap(), InferenceJobType::LivePortrait);
       assert_eq!(InferenceJobType::from_str("face_fusion").unwrap(), InferenceJobType::FaceFusion);
@@ -280,10 +270,29 @@ mod tests {
     #[test]
     fn all_variants() {
       // Static check
-      const EXPECTED_COUNT : usize = 21;
-      
-      assert_eq!(InferenceJobType::all_variants().len(), EXPECTED_COUNT);
-      assert_eq!(InferenceJobType::iter().len(), EXPECTED_COUNT);
+      let mut variants = InferenceJobType::all_variants();
+      assert_eq!(variants.len(), 17);
+      assert_eq!(variants.pop_first(), Some(InferenceJobType::VideoRender));
+      assert_eq!(variants.pop_first(), Some(InferenceJobType::LivePortrait));
+      assert_eq!(variants.pop_first(), Some(InferenceJobType::FaceFusion));
+      assert_eq!(variants.pop_first(), Some(InferenceJobType::F5TTS));
+      assert_eq!(variants.pop_first(), Some(InferenceJobType::GptSovits));
+      assert_eq!(variants.pop_first(), Some(InferenceJobType::ComfyUi));
+      assert_eq!(variants.pop_first(), Some(InferenceJobType::StudioGen2));
+      assert_eq!(variants.pop_first(), Some(InferenceJobType::ImageGenApi));
+      assert_eq!(variants.pop_first(), Some(InferenceJobType::ConvertFbxToGltf));
+      assert_eq!(variants.pop_first(), Some(InferenceJobType::MocapNet));
+      assert_eq!(variants.pop_first(), Some(InferenceJobType::RvcV2));
+      assert_eq!(variants.pop_first(), Some(InferenceJobType::SadTalker));
+      assert_eq!(variants.pop_first(), Some(InferenceJobType::SeedVc));
+      assert_eq!(variants.pop_first(), Some(InferenceJobType::SoVitsSvc));
+      assert_eq!(variants.pop_first(), Some(InferenceJobType::StableDiffusion));
+      assert_eq!(variants.pop_first(), Some(InferenceJobType::StyleTTS2));
+      assert_eq!(variants.pop_first(), Some(InferenceJobType::Tacotron2));
+      assert_eq!(variants.pop_first(), Some(InferenceJobType::Unknown));
+      assert_eq!(variants.pop_first(), Some(InferenceJobType::BevyToWorkflow));
+      assert_eq!(variants.pop_first(), Some(InferenceJobType::RerenderAVideo));
+      assert_eq!(variants.pop_first(), None);
 
       // Generated check
       use strum::IntoEnumIterator;

crates/_types/enums/src/by_table/generic_inference_jobs/mod.rs

@@ -1,7 +1,6 @@
 pub mod frontend_failure_category;
 pub mod inference_category;
 pub mod inference_input_source_token_type;
-pub mod inference_job_external_third_party;
 pub mod inference_job_product_category;
 pub mod inference_job_type;
 pub mod inference_model_type;