Merge branch 'master' into feat/cut-release-workflow

- approval gate now honors latest review state per reviewer; a reviewer
  who later submits CHANGES_REQUESTED or has their approval dismissed no
  longer counts as approved. Plain COMMENTED follow-ups don't override
  an existing approval (matches GitHub's own behavior).

- success summary links to the tag's tree URL instead of /releases/tag/,
  which would 404 because this workflow creates an annotated git tag,
  not a GitHub Release object.

.github/workflows/backport_release.yaml

@@ -1,484 +0,0 @@
-name: Backport Release
-
-on:
-  workflow_dispatch:
-    inputs:
-      commit:
-        description: 'Full 40-char SHA of the tip commit of the backport source branch (the PR head commit that passed tests). The branch is resolved from this SHA and must be unique.'
-        required: true
-        type: string
-
-permissions:
-  contents: read
-  pull-requests: read
-  checks: read
-
-jobs:
-  backport-release:
-    name: Create backport release
-    runs-on: ubuntu-latest
-    environment: backport release
-
-    steps:
-      - name: Generate GitHub App token
-        id: app-token
-        uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1
-        with:
-          app-id: ${{ secrets.FEN_RELEASE_APP_ID }}
-          private-key: ${{ secrets.FEN_RELEASE_PRIVATE_KEY }}
-
-      - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd
-        with:
-          token: ${{ steps.app-token.outputs.token }}
-          fetch-depth: 0
-          fetch-tags: true
-
-      - name: Configure git
-        run: |
-          git config user.name  "fen-release[bot]"
-          git config user.email "fen-release[bot]@users.noreply.github.com"
-
-      - name: Resolve source branch from commit SHA
-        id: resolve
-        env:
-          SOURCE_COMMIT:  ${{ inputs.commit }}
-          DEFAULT_BRANCH: ${{ github.event.repository.default_branch }}
-        run: |
-          set -euo pipefail
-
-          # Require a full 40-char lowercase-hex SHA. Short SHAs are ambiguous
-          # and we will be comparing this value against API responses (PR head
-          # SHA, ref tips) that always return the full form.
-          if [[ ! "${SOURCE_COMMIT}" =~ ^[0-9a-f]{40}$ ]]; then
-            echo "::error::Input commit '${SOURCE_COMMIT}' is not a full 40-char lowercase hex SHA."
-            exit 1
-          fi
-
-          # Fetch all remote branches so we can search for which one(s) point
-          # at this SHA. `actions/checkout` with fetch-depth: 0 fetches full
-          # history of the checked-out ref but does not necessarily populate
-          # every refs/remotes/origin/*, so do it explicitly.
-          git fetch --prune origin '+refs/heads/*:refs/remotes/origin/*'
-
-          # Verify the commit actually exists in this repo's object DB.
-          if ! git cat-file -e "${SOURCE_COMMIT}^{commit}" 2>/dev/null; then
-            echo "::error::Commit ${SOURCE_COMMIT} was not found in the repository."
-            exit 1
-          fi
-
-          # Find every remote branch whose tip == SOURCE_COMMIT. Exactly one
-          # branch must point at it. If zero, the commit isn't anyone's tip
-          # (likely stale, force-pushed past, or never the PR head). If more
-          # than one, the (branch -> SHA) mapping is ambiguous and we refuse
-          # to guess — the operator must give us a unique branch to release.
-          mapfile -t matching_branches < <(
-            git for-each-ref \
-              --format='%(refname:strip=3)' \
-              --points-at="${SOURCE_COMMIT}" \
-              refs/remotes/origin/ \
-              | grep -vx 'HEAD' || true
-          )
-
-          if [[ "${#matching_branches[@]}" -eq 0 ]]; then
-            echo "::error::No branch on origin has ${SOURCE_COMMIT} as its tip."
-            echo "::error::Either the branch was updated after you copied this SHA, or this commit was never the head of a branch."
-            exit 1
-          fi
-
-          if [[ "${#matching_branches[@]}" -gt 1 ]]; then
-            echo "::error::More than one branch on origin has ${SOURCE_COMMIT} as its tip; cannot pick one:"
-            for b in "${matching_branches[@]}"; do
-              echo "::error::  - ${b}"
-            done
-            echo "::error::Refusing to proceed with an ambiguous source branch."
-            exit 1
-          fi
-
-          source_branch="${matching_branches[0]}"
-
-          if [[ "${source_branch}" == "${DEFAULT_BRANCH}" ]]; then
-            echo "::error::Source branch must not be the default branch ('${DEFAULT_BRANCH}')."
-            exit 1
-          fi
-
-          echo "Resolved commit ${SOURCE_COMMIT} to branch '${source_branch}'."
-          echo "source_branch=${source_branch}" >> "$GITHUB_OUTPUT"
-
-      - name: Determine latest stable release
-        id: latest
-        env:
-          GH_TOKEN: ${{ steps.app-token.outputs.token }}
-        run: |
-          set -euo pipefail
-
-          # List all tags matching vMAJOR.MINOR.PATCH and pick the highest by numeric
-          # comparison of each component. We DO NOT use `sort -V` because it treats
-          # v0.19.99 as higher than v0.20.1.
-          latest_tag="$(
-            git tag --list 'v[0-9]*.[0-9]*.[0-9]*' \
-              | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$' \
-              | awk -F'[v.]' '{ printf "%010d %010d %010d %s\n", $2, $3, $4, $0 }' \
-              | sort -k1,1n -k2,2n -k3,3n \
-              | tail -n1 \
-              | awk '{print $4}'
-          )"
-
-          if [[ -z "${latest_tag}" ]]; then
-            echo "::error::No stable release tags (vMAJOR.MINOR.PATCH) were found."
-            exit 1
-          fi
-
-          # Parse components
-          ver="${latest_tag#v}"
-          major="${ver%%.*}"
-          rest="${ver#*.}"
-          minor="${rest%%.*}"
-          patch="${rest#*.}"
-
-          new_patch=$((patch + 1))
-          new_version="v${major}.${minor}.${new_patch}"
-          release_branch="release/v${major}.${minor}"
-
-          latest_sha="$(git rev-list -n 1 "refs/tags/${latest_tag}")"
-
-          echo "latest_tag=${latest_tag}"             >> "$GITHUB_OUTPUT"
-          echo "latest_sha=${latest_sha}"             >> "$GITHUB_OUTPUT"
-          echo "major=${major}"                       >> "$GITHUB_OUTPUT"
-          echo "minor=${minor}"                       >> "$GITHUB_OUTPUT"
-          echo "patch=${patch}"                       >> "$GITHUB_OUTPUT"
-          echo "new_version=${new_version}"           >> "$GITHUB_OUTPUT"
-          echo "new_version_no_v=${major}.${minor}.${new_patch}" >> "$GITHUB_OUTPUT"
-          echo "release_branch=${release_branch}"     >> "$GITHUB_OUTPUT"
-
-          echo "Latest stable release: ${latest_tag} (${latest_sha})"
-          echo "New version will be:   ${new_version}"
-          echo "Release branch:        ${release_branch}"
-
-      - name: Validate source branch is cut directly from the latest stable release
-        env:
-          SOURCE_BRANCH:   ${{ steps.resolve.outputs.source_branch }}
-          SOURCE_COMMIT:   ${{ inputs.commit }}
-          LATEST_TAG_SHA:  ${{ steps.latest.outputs.latest_sha }}
-          LATEST_TAG:      ${{ steps.latest.outputs.latest_tag }}
-        run: |
-          set -euo pipefail
-
-          # Use the user-provided SHA directly rather than re-resolving the branch
-          # tip — the resolve step already proved the branch tip equals SOURCE_COMMIT,
-          # and pinning to the SHA here makes the rest of the job TOCTOU-safe against
-          # someone pushing to the branch mid-run.
-          source_sha="${SOURCE_COMMIT}"
-
-          # Walking first-parent from the source tip must reach LATEST_TAG_SHA.
-          # We capture rev-list into a variable and grep against a here-string
-          # rather than piping `rev-list | grep -q`: under `set -o pipefail`,
-          # `grep -q` would exit on first match and SIGPIPE the still-streaming
-          # `rev-list`, propagating exit 141 as a spurious "not found".
-          first_parent_chain="$(git rev-list --first-parent "${source_sha}")"
-          if ! grep -Fxq "${LATEST_TAG_SHA}" <<< "${first_parent_chain}"; then
-            echo "::error::Source branch '${SOURCE_BRANCH}' is not cut from '${LATEST_TAG}'."
-            echo "::error::Its first-parent history does not include ${LATEST_TAG_SHA}."
-            exit 1
-          fi
-
-          # Additionally, every commit added on top of the tag (the set we are
-          # about to publish) must itself be a descendant of the tag along
-          # first-parent — i.e. no sibling commits from master sneak in via a
-          # non-first-parent path. Enforce by requiring that the symmetric
-          # difference is empty in one direction: commits in source that are
-          # NOT first-parent-reachable from source starting at the tag.
-          # We do this by intersecting:
-          #   A = commits reachable from source but not from tag (full DAG)
-          #   B = commits on the first-parent chain from source down to tag
-          # and requiring A == B.
-          all_added="$(git rev-list "${LATEST_TAG_SHA}..${source_sha}" | sort)"
-          first_parent_added="$(
-            git rev-list --first-parent "${LATEST_TAG_SHA}..${source_sha}" | sort
-          )"
-
-          if [[ "${all_added}" != "${first_parent_added}" ]]; then
-            echo "::error::Source branch '${SOURCE_BRANCH}' contains commits not on its first-parent chain from '${LATEST_TAG}'."
-            echo "::error::This usually means the branch was cut from master (not from the tag) or contains a merge from master."
-            echo "Commits reachable but not on first-parent chain:"
-            comm -23 <(printf '%s\n' "${all_added}") <(printf '%s\n' "${first_parent_added}") \
-              | while read -r sha; do
-                  echo "  $(git log -1 --format='%h %s' "${sha}")"
-                done
-            exit 1
-          fi
-
-          added_count="$(printf '%s\n' "${all_added}" | grep -c . || true)"
-          echo "Source branch is cut directly from ${LATEST_TAG} with ${added_count} commit(s) on top."
-
-      - name: Validate PR exists, is open, named correctly, has latest commit, and checks pass
-        env:
-          GH_TOKEN:      ${{ steps.app-token.outputs.token }}
-          SOURCE_BRANCH: ${{ steps.resolve.outputs.source_branch }}
-          SOURCE_COMMIT: ${{ inputs.commit }}
-          NEW_VERSION:   ${{ steps.latest.outputs.new_version }}
-          REPO:          ${{ github.repository }}
-        run: |
-          set -euo pipefail
-
-          expected_title="ComfyUI backport release ${NEW_VERSION}"
-
-          # Find open PRs from this branch into master. The --state open filter
-          # is load-bearing: a closed/merged PR with passing checks must not be
-          # accepted as authorization for a new release.
-          pr_json="$(
-            gh pr list \
-              --repo "${REPO}" \
-              --state open \
-              --head "${SOURCE_BRANCH}" \
-              --base master \
-              --json number,title,headRefOid,state \
-              --limit 10
-          )"
-
-          pr_count="$(echo "${pr_json}" | jq 'length')"
-          if [[ "${pr_count}" -eq 0 ]]; then
-            echo "::error::No open PR found from '${SOURCE_BRANCH}' into 'master'. The PR must exist and be open."
-            exit 1
-          fi
-
-          # Pick the PR matching the expected title
-          pr_number="$(echo "${pr_json}" | jq -r --arg t "${expected_title}" '
-            map(select(.title == $t)) | .[0].number // empty
-          ')"
-          pr_head_sha="$(echo "${pr_json}" | jq -r --arg t "${expected_title}" '
-            map(select(.title == $t)) | .[0].headRefOid // empty
-          ')"
-
-          if [[ -z "${pr_number}" ]]; then
-            echo "::error::No open PR from '${SOURCE_BRANCH}' into 'master' is titled '${expected_title}'."
-            echo "Found PRs:"
-            echo "${pr_json}" | jq -r '.[] | "  #\(.number): \(.title)"'
-            exit 1
-          fi
-
-          # The PR's current head commit must equal the SHA the operator gave us.
-          # This is what closes the door on releasing stale code: if anyone has
-          # pushed to the branch since the operator validated tests passed, the
-          # PR head will have advanced past SOURCE_COMMIT and we abort. (The
-          # resolve step already proved the branch tip == SOURCE_COMMIT; this
-          # ties that same SHA to the PR that authorizes the release.)
-          if [[ "${pr_head_sha}" != "${SOURCE_COMMIT}" ]]; then
-            echo "::error::PR #${pr_number} head commit is ${pr_head_sha}, but the operator-provided commit is ${SOURCE_COMMIT}."
-            echo "::error::The PR has new commits since this release was authorized. Re-run with the new head SHA after verifying its checks."
-            exit 1
-          fi
-
-          echo "Found open PR #${pr_number} titled '${expected_title}' at head ${pr_head_sha} (matches operator-provided commit)."
-
-          # Verify all check runs on the head commit have completed successfully.
-          # A check is considered passing if conclusion is success, neutral, or skipped.
-          checks_json="$(
-            gh api \
-              --paginate \
-              "repos/${REPO}/commits/${pr_head_sha}/check-runs" \
-              --jq '.check_runs[] | {name: .name, status: .status, conclusion: .conclusion}'
-          )"
-
-          if [[ -z "${checks_json}" ]]; then
-            echo "::error::No check runs found on PR head commit ${pr_head_sha}."
-            exit 1
-          fi
-
-          echo "Check runs on ${pr_head_sha}:"
-          echo "${checks_json}" | jq -s '.'
-
-          failing="$(echo "${checks_json}" | jq -s '
-            map(select(
-              .status != "completed"
-              or (.conclusion as $c
-                  | ["success","neutral","skipped"]
-                  | index($c) | not)
-            ))
-          ')"
-
-          failing_count="$(echo "${failing}" | jq 'length')"
-          if [[ "${failing_count}" -gt 0 ]]; then
-            echo "::error::One or more checks have not passed on PR head commit ${pr_head_sha}:"
-            echo "${failing}" | jq -r '.[] | "  - \(.name): status=\(.status) conclusion=\(.conclusion)"'
-            exit 1
-          fi
-
-          echo "All checks have passed on ${pr_head_sha}."
-
-      - name: Prepare release branch
-        id: prepare
-        env:
-          GH_TOKEN:        ${{ steps.app-token.outputs.token }}
-          REPO:            ${{ github.repository }}
-          RELEASE_BRANCH:  ${{ steps.latest.outputs.release_branch }}
-          LATEST_TAG:      ${{ steps.latest.outputs.latest_tag }}
-          LATEST_TAG_SHA:  ${{ steps.latest.outputs.latest_sha }}
-          PATCH:           ${{ steps.latest.outputs.patch }}
-        run: |
-          set -euo pipefail
-
-          # Try to fetch the release branch. If patch == 0, it shouldn't exist yet
-          # and we'll create it from the latest stable tag. If patch > 0, it must
-          # already exist and its tip must equal the latest stable tag commit (i.e.
-          # the previous patch release).
-          if git ls-remote --exit-code --heads origin "${RELEASE_BRANCH}" >/dev/null 2>&1; then
-            echo "Release branch '${RELEASE_BRANCH}' already exists on origin."
-            git fetch origin "refs/heads/${RELEASE_BRANCH}:refs/remotes/origin/${RELEASE_BRANCH}"
-            git checkout -B "${RELEASE_BRANCH}" "refs/remotes/origin/${RELEASE_BRANCH}"
-
-            current_tip="$(git rev-parse HEAD)"
-            if [[ "${current_tip}" != "${LATEST_TAG_SHA}" ]]; then
-              echo "::error::Release branch '${RELEASE_BRANCH}' tip (${current_tip}) is not at the latest stable release '${LATEST_TAG}' (${LATEST_TAG_SHA})."
-              echo "::error::Refusing to release on top of a divergent branch."
-              exit 1
-            fi
-            echo "branch_existed=true" >> "$GITHUB_OUTPUT"
-          else
-            if [[ "${PATCH}" != "0" ]]; then
-              echo "::error::Release branch '${RELEASE_BRANCH}' does not exist on origin, but the latest stable release '${LATEST_TAG}' has patch=${PATCH} (>0). This is inconsistent."
-              exit 1
-            fi
-            echo "Release branch '${RELEASE_BRANCH}' does not exist. Creating from ${LATEST_TAG}."
-            git checkout -B "${RELEASE_BRANCH}" "refs/tags/${LATEST_TAG}"
-            echo "branch_existed=false" >> "$GITHUB_OUTPUT"
-          fi
-
-      - name: Fast-forward merge source branch into release branch
-        env:
-          SOURCE_BRANCH:  ${{ steps.resolve.outputs.source_branch }}
-          SOURCE_COMMIT:  ${{ inputs.commit }}
-          RELEASE_BRANCH: ${{ steps.latest.outputs.release_branch }}
-        run: |
-          set -euo pipefail
-
-          # --ff-only guarantees no merge commit is created. If a fast-forward is
-          # not possible (i.e. the release branch has commits the source branch
-          # doesn't), the merge will fail and we abort. Because we already validated
-          # that the source branch is rooted on the latest stable tag, and the
-          # release branch tip equals that same tag, this fast-forward should
-          # always succeed for a well-formed backport branch.
-          #
-          # We merge the operator-provided SHA, not the branch ref, so a push to
-          # the branch in the window between resolve and now cannot smuggle new
-          # commits into the release.
-          if ! git merge --ff-only "${SOURCE_COMMIT}"; then
-            echo "::error::Cannot fast-forward '${RELEASE_BRANCH}' to ${SOURCE_COMMIT} (tip of '${SOURCE_BRANCH}'). A merge commit would be required. Aborting."
-            exit 1
-          fi
-
-          echo "Fast-forwarded '${RELEASE_BRANCH}' to ${SOURCE_COMMIT} (tip of '${SOURCE_BRANCH}')."
-
-      - name: Bump version files
-        env:
-          NEW_VERSION_NO_V: ${{ steps.latest.outputs.new_version_no_v }}
-        run: |
-          set -euo pipefail
-
-          if [[ ! -f comfyui_version.py ]]; then
-            echo "::error::comfyui_version.py not found in repo root."
-            exit 1
-          fi
-          if [[ ! -f pyproject.toml ]]; then
-            echo "::error::pyproject.toml not found in repo root."
-            exit 1
-          fi
-
-          # Replace the version string in comfyui_version.py.
-          # Expected format:  __version__ = "X.Y.Z"
-          python3 - "$NEW_VERSION_NO_V" <<'PY'
-          import re, sys, pathlib
-          new = sys.argv[1]
-
-          p = pathlib.Path("comfyui_version.py")
-          src = p.read_text()
-          new_src, n = re.subn(
-              r'(__version__\s*=\s*[\'"])[^\'"]+([\'"])',
-              lambda m: f'{m.group(1)}{new}{m.group(2)}',
-              src,
-              count=1,
-          )
-          if n != 1:
-              sys.exit("Could not find __version__ assignment in comfyui_version.py")
-          p.write_text(new_src)
-
-          p = pathlib.Path("pyproject.toml")
-          src = p.read_text()
-          # Replace the first `version = "..."` inside [project] or [tool.poetry].
-          new_src, n = re.subn(
-              r'(?m)^(version\s*=\s*")[^"]+(")',
-              lambda m: f'{m.group(1)}{new}{m.group(2)}',
-              src,
-              count=1,
-          )
-          if n != 1:
-              sys.exit("Could not find version assignment in pyproject.toml")
-          p.write_text(new_src)
-          PY
-
-          echo "Updated version to ${NEW_VERSION_NO_V} in comfyui_version.py and pyproject.toml."
-          git --no-pager diff -- comfyui_version.py pyproject.toml
-
-      - name: Commit version bump and tag release
-        env:
-          NEW_VERSION: ${{ steps.latest.outputs.new_version }}
-        run: |
-          set -euo pipefail
-
-          git add comfyui_version.py pyproject.toml
-          git commit -m "ComfyUI ${NEW_VERSION}"
-
-          if git rev-parse -q --verify "refs/tags/${NEW_VERSION}" >/dev/null; then
-            echo "::error::Tag ${NEW_VERSION} already exists locally."
-            exit 1
-          fi
-          git tag "${NEW_VERSION}"
-
-      - name: Verify tag does not already exist on origin
-        env:
-          NEW_VERSION: ${{ steps.latest.outputs.new_version }}
-        run: |
-          set -euo pipefail
-          if git ls-remote --exit-code --tags origin "refs/tags/${NEW_VERSION}" >/dev/null 2>&1; then
-            echo "::error::Tag ${NEW_VERSION} already exists on origin. Aborting."
-            exit 1
-          fi
-
-      - name: Push release branch and tag
-        env:
-          RELEASE_BRANCH: ${{ steps.latest.outputs.release_branch }}
-          NEW_VERSION:    ${{ steps.latest.outputs.new_version }}
-        run: |
-          set -euo pipefail
-
-          # Push the branch first, then the tag. Atomic-ish: if the branch push
-          # fails we never publish the tag.
-          git push origin "refs/heads/${RELEASE_BRANCH}:refs/heads/${RELEASE_BRANCH}"
-          git push origin "refs/tags/${NEW_VERSION}"
-
-          echo "Released ${NEW_VERSION} on ${RELEASE_BRANCH}."
-
-      - name: Summary
-        if: always()
-        env:
-          NEW_VERSION:    ${{ steps.latest.outputs.new_version }}
-          RELEASE_BRANCH: ${{ steps.latest.outputs.release_branch }}
-          LATEST_TAG:     ${{ steps.latest.outputs.latest_tag }}
-          SOURCE_BRANCH:  ${{ steps.resolve.outputs.source_branch }}
-          SOURCE_COMMIT:  ${{ inputs.commit }}
-        run: |
-          # SOURCE_BRANCH is empty if the resolve step never produced an output
-          # (e.g. the workflow failed in or before that step). Show a placeholder
-          # in that case so the summary table still renders cleanly.
-          source_branch_display="${SOURCE_BRANCH:-(unresolved)}"
-          {
-            echo "## Backport release"
-            echo ""
-            echo "| Field | Value |"
-            echo "|---|---|"
-            echo "| Source commit | \`${SOURCE_COMMIT}\` |"
-            echo "| Source branch | \`${source_branch_display}\` |"
-            echo "| Previous stable | \`${LATEST_TAG}\` |"
-            echo "| New version | \`${NEW_VERSION}\` |"
-            echo "| Release branch | \`${RELEASE_BRANCH}\` |"
-          } >> "$GITHUB_STEP_SUMMARY"

.github/workflows/cut-release.yml

@@ -0,0 +1,456 @@
+name: Cut Release
+
+# Promote a prepared "candidate" backport branch into a real release.
+#
+# Operator workflow:
+#   1. Locally cherry-pick the desired commits onto the previous stable tag
+#      (e.g. v0.20.2). Do NOT include a version-bump commit.
+#   2. Push the candidate branch to origin and open a PR against `master`.
+#   3. Wait for CI to go green; get an APPROVED review from a user listed
+#      in the `STABLE_RELEASE_APPROVERS` repo variable (comma-separated
+#      GitHub logins).
+#   4. Run this workflow with `source_branch` = the candidate branch.
+#
+# This workflow then verifies all gates, computes the next version
+# (previous stable tag + patch+1), creates the version-bump commit on top
+# of the candidate, and pushes `release/v<version>` + `v<version>`
+# atomically using RELEASE_BOT_TOKEN.
+#
+# After this runs, kick off `release-stable-all.yml` manually with the new
+# tag to build portable artifacts.
+
+on:
+  workflow_dispatch:
+    inputs:
+      source_branch:
+        description: 'Candidate backport branch on origin (cherry-picks only — NO version bump)'
+        required: true
+        type: string
+      dry_run:
+        description: 'Validate only — do not push branch or tag'
+        required: false
+        type: boolean
+        default: false
+
+jobs:
+  cut-release:
+    runs-on: ubuntu-latest
+    permissions:
+      # GITHUB_TOKEN is used only for read-only API calls (PR / review /
+      # check lookups). The actual ref creation uses RELEASE_BOT_TOKEN to
+      # bypass branch-protection rules on `release/*` and `v*`.
+      contents: read
+      pull-requests: read
+      checks: read
+    env:
+      # All workflow inputs are pulled in via env vars instead of being
+      # interpolated directly into bash, to avoid command injection.
+      INPUT_SOURCE_BRANCH: ${{ inputs.source_branch }}
+      INPUT_DRY_RUN: ${{ inputs.dry_run }}
+      REPO_FULL: ${{ github.repository }}
+      APPROVERS: ${{ vars.STABLE_RELEASE_APPROVERS }}
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+    steps:
+      - name: Validate inputs and config
+        run: |
+          set -euo pipefail
+          REF_RE='^[A-Za-z0-9._/-]+$'
+          if ! [[ "$INPUT_SOURCE_BRANCH" =~ $REF_RE ]]; then
+            echo "::error::Invalid source_branch '$INPUT_SOURCE_BRANCH' — only [A-Za-z0-9._/-] allowed."
+            exit 1
+          fi
+          if [ -z "${APPROVERS:-}" ]; then
+            echo "::error::Repository variable STABLE_RELEASE_APPROVERS is not set. Configure it as a comma-separated list of GitHub logins permitted to approve stable backport releases."
+            exit 1
+          fi
+
+      - name: Check out master with full history + tags
+        uses: actions/checkout@v4
+        with:
+          ref: master
+          fetch-depth: 0
+          # Defense in depth: don't leave a usable git credential on disk
+          # for any code that runs against the checked-out branch.
+          persist-credentials: false
+
+      - name: Determine latest stable tag and next version
+        id: ver
+        run: |
+          set -euo pipefail
+          git fetch --tags --force origin
+          # Latest stable tag = highest semver vX.Y.Z (no pre-release suffix).
+          LATEST_TAG=$(git tag --list 'v[0-9]*.[0-9]*.[0-9]*' --sort=-v:refname \
+            | grep -E '^v[0-9]+\.[0-9]+\.[0-9]+$' \
+            | head -n1)
+          if [ -z "$LATEST_TAG" ]; then
+            echo "::error::Could not determine latest stable vX.Y.Z tag."
+            exit 1
+          fi
+          # Peel annotated tag → commit SHA.
+          LATEST_SHA=$(git rev-list -n1 "$LATEST_TAG")
+          BASE_VERSION="${LATEST_TAG#v}"
+          IFS=. read -r MAJ MIN PATCH <<<"$BASE_VERSION"
+          NEXT_PATCH=$((PATCH + 1))
+          NEXT_VERSION="${MAJ}.${MIN}.${NEXT_PATCH}"
+          NEXT_TAG="v${NEXT_VERSION}"
+          NEXT_BRANCH="release/${NEXT_TAG}"
+          {
+            echo "latest_tag=$LATEST_TAG"
+            echo "latest_sha=$LATEST_SHA"
+            echo "latest_version=$BASE_VERSION"
+            echo "next_version=$NEXT_VERSION"
+            echo "next_tag=$NEXT_TAG"
+            echo "next_branch=$NEXT_BRANCH"
+          } >> "$GITHUB_OUTPUT"
+          echo "Latest stable: $LATEST_TAG ($LATEST_SHA)"
+          echo "Next release : $NEXT_TAG"
+
+      - name: Pre-flight remote checks
+        env:
+          NEXT_BRANCH: ${{ steps.ver.outputs.next_branch }}
+          NEXT_TAG: ${{ steps.ver.outputs.next_tag }}
+        run: |
+          set -euo pipefail
+          REPO_URL="https://github.com/${REPO_FULL}.git"
+          if ! git ls-remote --heads --exit-code "$REPO_URL" "$INPUT_SOURCE_BRANCH" >/dev/null; then
+            echo "::error::Source branch '$INPUT_SOURCE_BRANCH' does not exist on origin."
+            exit 1
+          fi
+          if git ls-remote --heads --exit-code "$REPO_URL" "$NEXT_BRANCH" >/dev/null 2>&1; then
+            echo "::error::Release branch '$NEXT_BRANCH' already exists on origin. Refusing to overwrite."
+            exit 1
+          fi
+          if git ls-remote --tags --exit-code "$REPO_URL" "$NEXT_TAG" >/dev/null 2>&1; then
+            echo "::error::Tag '$NEXT_TAG' already exists on origin. Refusing to overwrite."
+            exit 1
+          fi
+
+      - name: Verify candidate branch is rooted at latest stable tag
+        id: root
+        env:
+          LATEST_SHA: ${{ steps.ver.outputs.latest_sha }}
+          LATEST_TAG: ${{ steps.ver.outputs.latest_tag }}
+        run: |
+          set -euo pipefail
+          git fetch origin "+${INPUT_SOURCE_BRANCH}:refs/remotes/origin/${INPUT_SOURCE_BRANCH}"
+          SOURCE_SHA=$(git rev-parse "refs/remotes/origin/${INPUT_SOURCE_BRANCH}")
+
+          # 1. Latest stable tag must be an ancestor of the candidate.
+          if ! git merge-base --is-ancestor "$LATEST_SHA" "$SOURCE_SHA"; then
+            echo "::error::Latest stable tag $LATEST_TAG is not an ancestor of $INPUT_SOURCE_BRANCH. The candidate branch must be branched from $LATEST_TAG."
+            exit 1
+          fi
+
+          # 2. merge-base(source, master) MUST equal the latest tag commit.
+          # If the operator merged or rebased master into the backport, the
+          # branch will share extra commits with master past the last release
+          # — that's not a clean backport.
+          MB=$(git merge-base "$SOURCE_SHA" "origin/master")
+          if [ "$MB" != "$LATEST_SHA" ]; then
+            echo "::error::Branch $INPUT_SOURCE_BRANCH is not rooted at $LATEST_TAG. merge-base with master is $MB, expected $LATEST_SHA. The candidate must contain only cherry-picked commits on top of $LATEST_TAG."
+            exit 1
+          fi
+
+          # 3. No merge commits in the cherry-pick range — backports must be
+          # linear so the diff being released is auditable in the PR.
+          if [ -n "$(git log --merges --format=%H "${LATEST_SHA}..${SOURCE_SHA}")" ]; then
+            echo "::error::Candidate branch contains merge commits between $LATEST_TAG and HEAD. Backport branches must be linear cherry-picks only."
+            exit 1
+          fi
+
+          echo "source_sha=$SOURCE_SHA" >> "$GITHUB_OUTPUT"
+          echo "Branch is rooted at $LATEST_TAG ✅"
+
+      - name: Verify version files are unchanged on candidate
+        env:
+          LATEST_VERSION: ${{ steps.ver.outputs.latest_version }}
+          SOURCE_SHA: ${{ steps.root.outputs.source_sha }}
+        run: |
+          set -euo pipefail
+          # Read version files at the candidate HEAD WITHOUT switching the
+          # worktree, so we don't run any candidate-supplied code.
+          PYPROJECT_RAW=$(git show "${SOURCE_SHA}:pyproject.toml")
+          PYPROJECT_VERSION=$(printf '%s' "$PYPROJECT_RAW" \
+            | python3 -c "import sys,tomllib; print(tomllib.loads(sys.stdin.read())['project']['version'])")
+          if [ "$PYPROJECT_VERSION" != "$LATEST_VERSION" ]; then
+            echo "::error::pyproject.toml version on candidate is '$PYPROJECT_VERSION' but should still be '$LATEST_VERSION' (the previous stable tag). Do not include a version-bump commit on the candidate — this workflow adds it."
+            exit 1
+          fi
+          # comfyui_version.py contains Python — never `exec()` it. A
+          # malicious candidate could replace it with arbitrary code that
+          # would then run in CI with RELEASE_BOT_TOKEN in scope. Statically
+          # parse the AST to extract __version__ instead.
+          # Note: piping into `python3 -c '...'` (NOT `python3 - <<EOF`,
+          # which would redirect stdin to the heredoc itself).
+          MODULE_VERSION=$(git show "${SOURCE_SHA}:comfyui_version.py" | python3 -c '
+          import ast, sys
+          tree = ast.parse(sys.stdin.read())
+          for node in tree.body:
+              if isinstance(node, ast.Assign):
+                  for target in node.targets:
+                      if isinstance(target, ast.Name) and target.id == "__version__":
+                          if isinstance(node.value, ast.Constant) and isinstance(node.value.value, str):
+                              print(node.value.value)
+                              sys.exit(0)
+          sys.exit("Could not statically read __version__ from comfyui_version.py")
+          ')
+          if [ "$MODULE_VERSION" != "$LATEST_VERSION" ]; then
+            echo "::error::comfyui_version.py __version__ on candidate is '$MODULE_VERSION' but should still be '$LATEST_VERSION'. Do not include a version-bump commit on the candidate — this workflow adds it."
+            exit 1
+          fi
+          echo "Version files unchanged on candidate ✅"
+
+      - name: Verify PR exists, is approved by a permitted user, and CI is green
+        id: pr
+        env:
+          SOURCE_SHA: ${{ steps.root.outputs.source_sha }}
+        run: |
+          set -euo pipefail
+          OWNER="${REPO_FULL%/*}"
+
+          # Locate the open PR with this branch as its head (same-repo only).
+          PR_LIST=$(gh api "repos/${REPO_FULL}/pulls" \
+            -X GET -f state=open -f "head=${OWNER}:${INPUT_SOURCE_BRANCH}" \
+            --jq '[.[] | {number,head_sha:.head.sha,base:.base.ref}]')
+          PR_COUNT=$(echo "$PR_LIST" | jq 'length')
+          if [ "$PR_COUNT" -ne 1 ]; then
+            echo "::error::Expected exactly 1 open PR with head '${INPUT_SOURCE_BRANCH}', found $PR_COUNT."
+            echo "$PR_LIST" | jq .
+            exit 1
+          fi
+          PR_NUMBER=$(echo "$PR_LIST" | jq -r '.[0].number')
+          PR_HEAD_SHA=$(echo "$PR_LIST" | jq -r '.[0].head_sha')
+          PR_BASE=$(echo "$PR_LIST" | jq -r '.[0].base')
+
+          if [ "$PR_BASE" != "master" ]; then
+            echo "::error::PR #${PR_NUMBER} targets '$PR_BASE', expected 'master'."
+            exit 1
+          fi
+          if [ "$PR_HEAD_SHA" != "$SOURCE_SHA" ]; then
+            echo "::error::PR #${PR_NUMBER} HEAD ($PR_HEAD_SHA) does not match candidate branch HEAD ($SOURCE_SHA). The branch may have been updated after the PR was approved — re-trigger after pushing the latest commits."
+            exit 1
+          fi
+
+          # ---- Approval check ----
+          # An approving review must be:
+          #   * from a user in the STABLE_RELEASE_APPROVERS allow-list,
+          #   * state == APPROVED,
+          #   * on the current HEAD (commit_id == PR_HEAD_SHA) — newer
+          #     commits invalidate older approvals.
+          REVIEWS=$(gh api "repos/${REPO_FULL}/pulls/${PR_NUMBER}/reviews" --paginate)
+          # Normalize allow-list and find an APPROVED review on the current
+          # head SHA, all inside jq so we don't trip over login chars like
+          # `[bot]` that bash globbing/word-splitting would mishandle.
+          #
+          # GitHub returns every review submission separately, so a reviewer
+          # who approved and then later submitted CHANGES_REQUESTED or had
+          # their approval dismissed will still have the old APPROVED entry
+          # in the list. To honor the *latest* state, filter to stateful
+          # reviews only (APPROVED / CHANGES_REQUESTED / DISMISSED — plain
+          # COMMENTED replies don't override an approval, matching GitHub's
+          # own behavior), group by reviewer, take each reviewer's last
+          # stateful submission, then accept if it's APPROVED.
+          APPROVED_BY=$(echo "$REVIEWS" | jq -r --arg list "$APPROVERS" --arg sha "$PR_HEAD_SHA" '
+            ($list
+              | split(",")
+              | map(gsub("\\s"; "") | ascii_downcase)
+              | map(select(length > 0))
+            ) as $allow
+            | [ .[]
+                | select(.commit_id == $sha)
+                | select(.user.login | ascii_downcase | IN($allow[]))
+                | select(.state == "APPROVED"
+                         or .state == "CHANGES_REQUESTED"
+                         or .state == "DISMISSED")
+              ]
+            | group_by(.user.login | ascii_downcase)
+            | map(sort_by(.submitted_at, .id) | last)
+            | map(select(.state == "APPROVED"))
+            | .[0].user.login // ""
+          ')
+          if [ -z "$APPROVED_BY" ]; then
+            echo "::error::PR #${PR_NUMBER} has no APPROVED review on commit ${PR_HEAD_SHA:0:12} from a permitted approver. Allowed approvers: ${APPROVERS}."
+            exit 1
+          fi
+
+          # ---- CI check ----
+          # All check-runs on PR_HEAD_SHA must be completed with conclusion
+          # success/neutral/skipped. We do NOT use mergeable_state because
+          # branch protection may require "up-to-date with master", which
+          # backport branches by definition are not (and shouldn't be).
+          CHECKS=$(gh api "repos/${REPO_FULL}/commits/${PR_HEAD_SHA}/check-runs" --paginate \
+            --jq '.check_runs')
+          PENDING=$(echo "$CHECKS" | jq -r '.[] | select(.status!="completed") | .name')
+          FAILED=$(echo "$CHECKS" | jq -r '.[] | select(.status=="completed" and (.conclusion!="success" and .conclusion!="neutral" and .conclusion!="skipped")) | "\(.name) (\(.conclusion))"')
+          TOTAL=$(echo "$CHECKS" | jq 'length')
+          if [ "$TOTAL" -eq 0 ]; then
+            echo "::error::No check-runs found on commit ${PR_HEAD_SHA:0:12}. CI must run before promoting a release."
+            exit 1
+          fi
+          if [ -n "$PENDING" ]; then
+            echo "::error::PR #${PR_NUMBER} has pending check-runs on ${PR_HEAD_SHA:0:12}:"
+            echo "$PENDING" | sed 's/^/  - /'
+            exit 1
+          fi
+          if [ -n "$FAILED" ]; then
+            echo "::error::PR #${PR_NUMBER} has failing check-runs on ${PR_HEAD_SHA:0:12}:"
+            echo "$FAILED" | sed 's/^/  - /'
+            exit 1
+          fi
+
+          # Also reject if any classic commit-status is failing/pending.
+          STATUSES=$(gh api "repos/${REPO_FULL}/commits/${PR_HEAD_SHA}/status" \
+            --jq '{state: .state, contexts: [.statuses[] | {context, state}]}')
+          STATE=$(echo "$STATUSES" | jq -r '.state')
+          if [ "$STATE" != "success" ] && [ "$STATE" != "pending" ]; then
+            # "pending" with zero contexts means "no statuses" (only check-runs) — allow.
+            CTX_COUNT=$(echo "$STATUSES" | jq '.contexts | length')
+            if [ "$STATE" = "pending" ] && [ "$CTX_COUNT" -eq 0 ]; then
+              :
+            else
+              echo "::error::PR #${PR_NUMBER} commit-status rollup is '$STATE' on ${PR_HEAD_SHA:0:12}:"
+              echo "$STATUSES" | jq -r '.contexts[] | "  - \(.context): \(.state)"'
+              exit 1
+            fi
+          elif [ "$STATE" = "pending" ]; then
+            CTX_COUNT=$(echo "$STATUSES" | jq '.contexts | length')
+            if [ "$CTX_COUNT" -gt 0 ]; then
+              echo "::error::PR #${PR_NUMBER} has pending commit-statuses on ${PR_HEAD_SHA:0:12}:"
+              echo "$STATUSES" | jq -r '.contexts[] | select(.state!="success") | "  - \(.context): \(.state)"'
+              exit 1
+            fi
+          fi
+
+          {
+            echo "pr_number=$PR_NUMBER"
+            echo "approved_by=$APPROVED_BY"
+          } >> "$GITHUB_OUTPUT"
+          echo "PR #${PR_NUMBER} approved by @${APPROVED_BY}, CI green ($TOTAL checks) ✅"
+
+      - name: Apply version bump on top of candidate
+        id: bump
+        env:
+          NEXT_VERSION: ${{ steps.ver.outputs.next_version }}
+          SOURCE_SHA: ${{ steps.root.outputs.source_sha }}
+        run: |
+          set -euo pipefail
+          # Materialize the candidate as a local branch so we can build a
+          # commit on top of it. We do NOT execute anything from the
+          # candidate's content — only edit two files via stdlib parsers.
+          git checkout -B _release_local "$SOURCE_SHA"
+
+          python3 - "$NEXT_VERSION" <<'PY'
+          import pathlib, re, sys
+          version = sys.argv[1]
+          # pyproject.toml — replace only the top-level `version = "..."`
+          # line under [project]. Use a strict, anchored regex.
+          p = pathlib.Path("pyproject.toml")
+          text = p.read_text(encoding="utf-8")
+          new = re.sub(r'(?m)^(version\s*=\s*")([^"]+)(")',
+                       lambda m: m.group(1) + version + m.group(3),
+                       text, count=1)
+          if new == text:
+              sys.exit("Failed to update version in pyproject.toml")
+          p.write_text(new, encoding="utf-8")
+
+          # comfyui_version.py — replace `__version__ = "..."`.
+          p = pathlib.Path("comfyui_version.py")
+          text = p.read_text(encoding="utf-8")
+          new = re.sub(r'__version__\s*=\s*"[^"]+"',
+                       f'__version__ = "{version}"',
+                       text, count=1)
+          if new == text:
+              sys.exit("Failed to update __version__ in comfyui_version.py")
+          p.write_text(new, encoding="utf-8")
+          PY
+
+          git config user.name  "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git add pyproject.toml comfyui_version.py
+          git commit -m "Bump version to ${NEXT_VERSION}"
+          BUMP_SHA=$(git rev-parse HEAD)
+          echo "bump_sha=$BUMP_SHA" >> "$GITHUB_OUTPUT"
+          echo "Created bump commit ${BUMP_SHA:0:12}"
+
+      - name: Plan summary
+        env:
+          LATEST_TAG: ${{ steps.ver.outputs.latest_tag }}
+          NEXT_TAG: ${{ steps.ver.outputs.next_tag }}
+          NEXT_BRANCH: ${{ steps.ver.outputs.next_branch }}
+          PR_NUMBER: ${{ steps.pr.outputs.pr_number }}
+          APPROVED_BY: ${{ steps.pr.outputs.approved_by }}
+          SOURCE_SHA: ${{ steps.root.outputs.source_sha }}
+          BUMP_SHA: ${{ steps.bump.outputs.bump_sha }}
+        run: |
+          set -euo pipefail
+          {
+            echo "## Cut Release plan"
+            echo ""
+            echo "| Field | Value |"
+            echo "| --- | --- |"
+            echo "| Source branch | \`$INPUT_SOURCE_BRANCH\` @ \`${SOURCE_SHA:0:12}\` |"
+            echo "| Source PR | [#${PR_NUMBER}](https://github.com/${REPO_FULL}/pull/${PR_NUMBER}) |"
+            echo "| Approved by | @${APPROVED_BY} |"
+            echo "| Previous stable tag | \`$LATEST_TAG\` |"
+            echo "| Next tag | \`$NEXT_TAG\` |"
+            echo "| Next branch | \`$NEXT_BRANCH\` |"
+            echo "| Version-bump commit | \`${BUMP_SHA:0:12}\` |"
+            echo "| Dry run | \`$INPUT_DRY_RUN\` |"
+            echo ""
+            echo "### Commits to be released (\`${LATEST_TAG}..${BUMP_SHA}\`)"
+            echo ""
+            echo '```'
+            git log --oneline --no-decorate "${LATEST_TAG}..${BUMP_SHA}"
+            echo '```'
+          } >> "$GITHUB_STEP_SUMMARY"
+
+      - name: Push release branch and tag (atomic)
+        if: inputs.dry_run != true && inputs.dry_run != 'true'
+        env:
+          RELEASE_TOKEN: ${{ secrets.RELEASE_BOT_TOKEN }}
+          NEXT_BRANCH: ${{ steps.ver.outputs.next_branch }}
+          NEXT_TAG: ${{ steps.ver.outputs.next_tag }}
+          NEXT_VERSION: ${{ steps.ver.outputs.next_version }}
+          BUMP_SHA: ${{ steps.bump.outputs.bump_sha }}
+        run: |
+          set -euo pipefail
+          if [ -z "${RELEASE_TOKEN:-}" ]; then
+            echo "::error::secrets.RELEASE_BOT_TOKEN is not set."
+            exit 1
+          fi
+          # Create the annotated tag locally first so we can push branch +
+          # tag in a single atomic operation: either both refs are created
+          # on origin, or neither — no half-promoted state.
+          git tag -a "$NEXT_TAG" "$BUMP_SHA" -m "ComfyUI v${NEXT_VERSION}"
+          AUTH_URL="https://x-access-token:${RELEASE_TOKEN}@github.com/${REPO_FULL}.git"
+          git push --atomic "$AUTH_URL" \
+            "${BUMP_SHA}:refs/heads/${NEXT_BRANCH}" \
+            "refs/tags/${NEXT_TAG}"
+
+      - name: Final summary
+        if: always()
+        env:
+          NEXT_BRANCH: ${{ steps.ver.outputs.next_branch }}
+          NEXT_TAG: ${{ steps.ver.outputs.next_tag }}
+          JOB_STATUS: ${{ job.status }}
+        run: |
+          set -euo pipefail
+          {
+            echo ""
+            echo "### Result"
+            if [ "$JOB_STATUS" != "success" ]; then
+              echo "❌ Workflow did not complete successfully (job status: \`$JOB_STATUS\`). See the run logs for details. No branch or tag should be assumed to have been created."
+            elif [ "$INPUT_DRY_RUN" = "true" ]; then
+              echo "🔍 **Dry run** — no branch or tag was created."
+            else
+              echo "✅ Created \`$NEXT_BRANCH\` and tagged \`$NEXT_TAG\` from \`$INPUT_SOURCE_BRANCH\` (with version bump)."
+              echo ""
+              echo "- Branch: <https://github.com/${REPO_FULL}/tree/${NEXT_BRANCH}>"
+              # /releases/tag/ would 404 — this workflow creates an annotated
+              # git tag, not a GitHub Release object.
+              echo "- Tag: <https://github.com/${REPO_FULL}/tree/${NEXT_TAG}>"
+              echo ""
+              echo "Next: run [release-stable-all.yml](https://github.com/${REPO_FULL}/actions/workflows/release-stable-all.yml) with \`git_tag=${NEXT_TAG}\`."
+            fi
+          } >> "$GITHUB_STEP_SUMMARY"

CODEOWNERS

@@ -1,5 +1,2 @@
+# Admins
 * @comfyanonymous @kosinkadink @guill @alexisrolland @rattus128 @kijai
-
-/CODEOWNERS @comfyanonymous
-/.ci/ @comfyanonymous
-/.github/ @comfyanonymous

README.md

@@ -20,7 +20,7 @@
 [website-url]: https://www.comfy.org/
 <!-- Workaround to display total user from https://github.com/badges/shields/issues/4500#issuecomment-2060079995 -->
 [discord-shield]: https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fdiscord.com%2Fapi%2Finvites%2Fcomfyorg%3Fwith_counts%3Dtrue&query=%24.approximate_member_count&logo=discord&logoColor=white&label=Discord&color=green&suffix=%20total
-[discord-url]: https://discord.com/invite/comfyorg
+[discord-url]: https://www.comfy.org/discord
 [twitter-shield]: https://img.shields.io/twitter/follow/ComfyUI
 [twitter-url]: https://x.com/ComfyUI
 

app/frontend_management.py

@@ -62,8 +62,6 @@ def get_comfy_package_versions():
 def check_comfy_packages_versions():
     """Warn for every comfy* package whose installed version is below requirements.txt."""
     from packaging.version import InvalidVersion, parse as parse_pep440
-    outdated_packages = []
-
     for pkg in get_comfy_package_versions():
         installed_str = pkg["installed"]
         required_str = pkg["required"]
@@ -75,26 +73,19 @@ def check_comfy_packages_versions():
             logging.error(f"Failed to check {pkg['name']} version: {e}")
             continue
         if outdated:
-            outdated_packages.append((pkg["name"], installed_str, required_str))
-        else:
-            logging.info("{} version: {}".format(pkg["name"], installed_str))
-
-    if outdated_packages:
-        package_warnings = "\n".join(
-            f"Installed {name} version {installed} is lower than the recommended version {required}."
-            for name, installed, required in outdated_packages
-        )
-        app.logger.log_startup_warning(
-            f"""
+            app.logger.log_startup_warning(
+                f"""
 ________________________________________________________________________
 WARNING WARNING WARNING WARNING WARNING
 
-{package_warnings}
+Installed {pkg["name"]} version {installed_str} is lower than the recommended version {required_str}.
 
 {get_missing_requirements_message()}
 ________________________________________________________________________
 """.strip()
-        )
+            )
+        else:
+            logging.info("{} version: {}".format(pkg["name"], installed_str))
 
 
 REQUEST_TIMEOUT = 10  # seconds

comfy/bg_removal_model.py

@@ -44,14 +44,7 @@ class BackgroundRemovalModel():
         comfy.model_management.load_model_gpu(self.patcher)
         H, W = image.shape[1], image.shape[2]
         pixel_values = comfy.clip_model.clip_preprocess(image.to(self.load_device), size=self.image_size, mean=self.image_mean, std=self.image_std, crop=False)
-
-        if pixel_values.shape[0] > 1:
-            out = torch.cat([
-                self.model(pixel_values=pixel_values[i:i+1])
-                for i in range(pixel_values.shape[0])
-            ], dim=0)
-        else:
-            out = self.model(pixel_values=pixel_values)
+        out = self.model(pixel_values=pixel_values)
         out = torch.nn.functional.interpolate(out, size=(H, W), mode="bicubic", antialias=False)
 
         mask = out.sigmoid().to(device=comfy.model_management.intermediate_device(), dtype=comfy.model_management.intermediate_dtype())

comfy/cli_args.py

@@ -110,11 +110,13 @@ parser.add_argument("--preview-method", type=LatentPreviewMethod, default=Latent
 
 parser.add_argument("--preview-size", type=int, default=512, help="Sets the maximum preview size for sampler nodes.")
 
+CACHE_RAM_AUTO_GB = -1.0
+
 cache_group = parser.add_mutually_exclusive_group()
-cache_group.add_argument("--cache-ram", nargs='*', type=float, default=[], metavar="GB", help="Use RAM pressure caching with the specified headroom thresholds. This is the default caching mode. The first value sets the active-cache threshold; the optional second value sets the inactive-cache/pin threshold. Defaults when no values are provided: active 25%% of system RAM (min 4GB, max 32GB), inactive 75%% of system RAM (min 12GB, max 96GB).")
 cache_group.add_argument("--cache-classic", action="store_true", help="Use the old style (aggressive) caching.")
 cache_group.add_argument("--cache-lru", type=int, default=0, help="Use LRU caching with a maximum of N node results cached. May use more RAM/VRAM.")
 cache_group.add_argument("--cache-none", action="store_true", help="Reduced RAM/VRAM usage at the expense of executing every node for each run.")
+cache_group.add_argument("--cache-ram", nargs='?', const=CACHE_RAM_AUTO_GB, type=float, default=0, help="Use RAM pressure caching with the specified headroom threshold. If available RAM drops below the threshold the cache removes large items to free RAM. Default (when no value is provided): 25%% of system RAM (min 4GB, max 32GB).")
 
 attn_group = parser.add_mutually_exclusive_group()
 attn_group.add_argument("--use-split-cross-attention", action="store_true", help="Use the split cross attention optimization. Ignored when xformers is used.")
@@ -243,9 +245,6 @@ if comfy.options.args_parsing:
 else:
     args = parser.parse_args([])
 
-if args.cache_ram is not None and len(args.cache_ram) > 2:
-    parser.error("--cache-ram accepts at most two values: active GB and inactive GB")
-
 if args.windows_standalone_build:
     args.auto_launch = True
 

comfy/latent_formats.py

@@ -150,12 +150,6 @@ class SD3(LatentFormat):
 class StableAudio1(LatentFormat):
     latent_channels = 64
     latent_dimensions = 1
-    temporal_downscale_ratio = 2048
-
-class StableAudio3(LatentFormat):
-    latent_channels = 256
-    latent_dimensions = 1
-    temporal_downscale_ratio = 4096
 
 class Flux(SD3):
     latent_channels = 16
@@ -772,7 +766,6 @@ class ACEAudio(LatentFormat):
 class ACEAudio15(LatentFormat):
     latent_channels = 64
     latent_dimensions = 1
-    temporal_downscale_ratio = 1764
 
 class ChromaRadiance(LatentFormat):
     latent_channels = 3

comfy/ldm/audio/dit.py

@@ -10,17 +10,6 @@ from torch import nn
 from torch.nn import functional as F
 import math
 import comfy.ops
-from .embedders import ExpoFourierFeatures
-
-
-def _left_pad_to_match(emb, target_len):
-    emb_len = emb.shape[-2]
-    if emb_len < target_len:
-        return F.pad(emb, (0, 0, target_len - emb_len, 0), value=0.)
-    elif emb_len > target_len:
-        return emb[:, -target_len:, :]
-    return emb
-
 
 class FourierFeatures(nn.Module):
     def __init__(self, in_features, out_features, std=1., dtype=None, device=None):
@@ -33,7 +22,6 @@ class FourierFeatures(nn.Module):
         f = 2 * math.pi * input @ comfy.ops.cast_to_input(self.weight.T, input)
         return torch.cat([f.cos(), f.sin()], dim=-1)
 
-
 # norms
 class LayerNorm(nn.Module):
     def __init__(self, dim, bias=False, fix_scale=False, dtype=None, device=None):
@@ -55,16 +43,6 @@ class LayerNorm(nn.Module):
             beta = comfy.ops.cast_to_input(beta, x)
         return F.layer_norm(x, x.shape[-1:], weight=comfy.ops.cast_to_input(self.gamma, x), bias=beta)
 
-
-class RMSNorm(nn.Module):
-    def __init__(self, dim, dtype=None, device=None):
-        super().__init__()
-        self.gamma = nn.Parameter(torch.empty(dim, dtype=dtype, device=device))
-
-    def forward(self, x):
-        return F.rms_norm(x, x.shape[-1:], weight=comfy.ops.cast_to_input(self.gamma, x))
-
-
 class GLU(nn.Module):
     def __init__(
         self,
@@ -258,6 +236,13 @@ class FeedForward(nn.Module):
 
         linear_out = operations.Linear(inner_dim, dim_out, bias = not no_bias, dtype=dtype, device=device) if not use_conv else operations.Conv1d(inner_dim, dim_out, conv_kernel_size, padding = (conv_kernel_size // 2), bias = not no_bias, dtype=dtype, device=device)
 
+        # # init last linear layer to 0
+        # if zero_init_output:
+        #     nn.init.zeros_(linear_out.weight)
+        #     if not no_bias:
+        #         nn.init.zeros_(linear_out.bias)
+
+
         self.ff = nn.Sequential(
             linear_in,
             rearrange('b d n -> b n d') if use_conv else nn.Identity(),
@@ -276,10 +261,8 @@ class Attention(nn.Module):
         dim_context = None,
         causal = False,
         zero_init_output=True,
-        qk_norm = "none",
-        differential = False,
+        qk_norm = False,
         natten_kernel_size = None,
-        feat_scale = False,
         dtype=None,
         device=None,
         operations=None,
@@ -288,7 +271,6 @@ class Attention(nn.Module):
         self.dim = dim
         self.dim_heads = dim_heads
         self.causal = causal
-        self.differential = differential
 
         dim_kv = dim_context if dim_context is not None else dim
 
@@ -296,37 +278,18 @@ class Attention(nn.Module):
         self.kv_heads = dim_kv // dim_heads
 
         if dim_context is not None:
-            if differential:
-                self.to_q = operations.Linear(dim, dim * 2, bias=False, dtype=dtype, device=device)
-                self.to_kv = operations.Linear(dim_kv, dim_kv * 3, bias=False, dtype=dtype, device=device)
-            else:
-                self.to_q = operations.Linear(dim, dim, bias=False, dtype=dtype, device=device)
-                self.to_kv = operations.Linear(dim_kv, dim_kv * 2, bias=False, dtype=dtype, device=device)
+            self.to_q = operations.Linear(dim, dim, bias=False, dtype=dtype, device=device)
+            self.to_kv = operations.Linear(dim_kv, dim_kv * 2, bias=False, dtype=dtype, device=device)
         else:
-            if differential:
-                self.to_qkv = operations.Linear(dim, dim * 5, bias=False, dtype=dtype, device=device)
-            else:
-                self.to_qkv = operations.Linear(dim, dim * 3, bias=False, dtype=dtype, device=device)
+            self.to_qkv = operations.Linear(dim, dim * 3, bias=False, dtype=dtype, device=device)
 
         self.to_out = operations.Linear(dim, dim, bias=False, dtype=dtype, device=device)
 
-        # Accept bool for backward compat
-        if isinstance(qk_norm, bool):
-            qk_norm = "l2" if qk_norm else "none"
+        # if zero_init_output:
+        #     nn.init.zeros_(self.to_out.weight)
+
         self.qk_norm = qk_norm
 
-        if self.qk_norm == "ln":
-            self.q_norm = operations.LayerNorm(dim_heads, elementwise_affine=True, eps=1.0e-6, dtype=dtype, device=device)
-            self.k_norm = operations.LayerNorm(dim_heads, elementwise_affine=True, eps=1.0e-6, dtype=dtype, device=device)
-        elif self.qk_norm == "rms":
-            self.q_norm = RMSNorm(dim_heads, dtype=dtype, device=device)
-            self.k_norm = RMSNorm(dim_heads, dtype=dtype, device=device)
-
-        self.feat_scale = feat_scale
-
-        if self.feat_scale:
-            self.lambda_dc = nn.Parameter(torch.empty(dim, dtype=dtype, device=device))
-            self.lambda_hf = nn.Parameter(torch.empty(dim, dtype=dtype, device=device))
 
     def forward(
         self,
@@ -343,51 +306,22 @@ class Attention(nn.Module):
         kv_input = context if has_context else x
 
         if hasattr(self, 'to_q'):
-            if self.differential:
-                # cross-attention differential: to_q → (q, q_diff), to_kv → (k, k_diff, v)
-                q, q_diff = self.to_q(x).chunk(2, dim=-1)
-                q      = rearrange(q,      'b n (h d) -> b h n d', h=h)
-                q_diff = rearrange(q_diff, 'b n (h d) -> b h n d', h=h)
-                q = torch.stack([q, q_diff], dim=1)  # (B, 2, H, N, D)
-                k, k_diff, v = self.to_kv(kv_input).chunk(3, dim=-1)
-                k      = rearrange(k,      'b n (h d) -> b h n d', h=kv_h)
-                k_diff = rearrange(k_diff, 'b n (h d) -> b h n d', h=kv_h)
-                v      = rearrange(v,      'b n (h d) -> b h n d', h=kv_h)
-                k = torch.stack([k, k_diff], dim=1)  # (B, 2, H, M, D)
-            else:
-                # Use separate linear projections for q and k/v
-                q = self.to_q(x)
-                q = rearrange(q, 'b n (h d) -> b h n d', h = h)
+            # Use separate linear projections for q and k/v
+            q = self.to_q(x)
+            q = rearrange(q, 'b n (h d) -> b h n d', h = h)
 
-                k, v = self.to_kv(kv_input).chunk(2, dim=-1)
+            k, v = self.to_kv(kv_input).chunk(2, dim=-1)
 
-                k, v = map(lambda t: rearrange(t, 'b n (h d) -> b h n d', h = kv_h), (k, v))
+            k, v = map(lambda t: rearrange(t, 'b n (h d) -> b h n d', h = kv_h), (k, v))
         else:
-            if self.differential:
-                # self-attention differential: to_qkv → (q, k, v, q_diff, k_diff)
-                q, k, v, q_diff, k_diff = self.to_qkv(x).chunk(5, dim=-1)
-                q, k, v, q_diff, k_diff = map(
-                    lambda t: rearrange(t, 'b n (h d) -> b h n d', h=h),
-                    (q, k, v, q_diff, k_diff)
-                )
-                q = torch.stack([q, q_diff], dim=1)  # (B, 2, H, N, D)
-                k = torch.stack([k, k_diff], dim=1)
-            else:
-                # Use fused linear projection
-                q, k, v = self.to_qkv(x).chunk(3, dim=-1)
-                q, k, v = map(lambda t: rearrange(t, 'b n (h d) -> b h n d', h = h), (q, k, v))
+            # Use fused linear projection
+            q, k, v = self.to_qkv(x).chunk(3, dim=-1)
+            q, k, v = map(lambda t: rearrange(t, 'b n (h d) -> b h n d', h = h), (q, k, v))
 
         # Normalize q and k for cosine sim attention
-        if self.qk_norm == "l2":
+        if self.qk_norm:
             q = F.normalize(q, dim=-1)
             k = F.normalize(k, dim=-1)
-        elif self.qk_norm == "rms":
-            q_type, k_type = q.dtype, k.dtype
-            q = self.q_norm(q).to(q_type)
-            k = self.k_norm(k).to(k_type)
-        elif self.qk_norm != 'none':
-            q = self.q_norm(q)
-            k = self.k_norm(k)
 
         if rotary_pos_emb is not None and not has_context:
             freqs, _ = rotary_pos_emb
@@ -430,24 +364,9 @@ class Attention(nn.Module):
             heads_per_kv_head = h // kv_h
             k, v = map(lambda t: t.repeat_interleave(heads_per_kv_head, dim = 1), (k, v))
 
-        if self.differential:
-            q, q_diff = q.unbind(dim=1)
-            k, k_diff = k.unbind(dim=1)
-            out      = optimized_attention(q,      k,      v, h, skip_reshape=True, transformer_options=transformer_options)
-            out_diff = optimized_attention(q_diff, k_diff, v, h, skip_reshape=True, transformer_options=transformer_options)
-            out = out - out_diff
-        else:
-            out = optimized_attention(q, k, v, h, skip_reshape=True, transformer_options=transformer_options)
-
+        out = optimized_attention(q, k, v, h, skip_reshape=True, transformer_options=transformer_options)
         out = self.to_out(out)
 
-        if self.feat_scale:
-            out_dc = out.mean(dim=-2, keepdim=True)
-            out_hf = out - out_dc
-
-            # Selectively modulate DC and high frequency components
-            out = out + comfy.ops.cast_to_input(self.lambda_dc, out) * out_dc + comfy.ops.cast_to_input(self.lambda_hf, out) * out_hf
-
         if mask is not None:
             mask = rearrange(mask, 'b n -> b n 1')
             out = out.masked_fill(~mask, 0.)
@@ -498,14 +417,11 @@ class TransformerBlock(nn.Module):
             cross_attend = False,
             dim_context = None,
             global_cond_dim = None,
-            global_cond_shared_embed = False,
-            local_add_cond_dim = None,
             causal = False,
             zero_init_branch_outputs = True,
             conformer = False,
             layer_ix = -1,
             remove_norms = False,
-            norm_type = "layer_norm",
             attn_kwargs = {},
             ff_kwargs = {},
             norm_kwargs = {},
@@ -520,20 +436,8 @@ class TransformerBlock(nn.Module):
         self.cross_attend = cross_attend
         self.dim_context = dim_context
         self.causal = causal
-        self.global_cond_shared_embed = global_cond_shared_embed
 
-        norm_layer_map = {
-            "layer_norm": LayerNorm,
-            "rms_norm": RMSNorm,
-        }
-        norm_cls = norm_layer_map.get(norm_type, LayerNorm)
-
-        def make_norm():
-            if remove_norms:
-                return nn.Identity()
-            return norm_cls(dim, dtype=dtype, device=device, **norm_kwargs)
-
-        self.pre_norm = make_norm()
+        self.pre_norm = LayerNorm(dim, dtype=dtype, device=device, **norm_kwargs) if not remove_norms else nn.Identity()
 
         self.self_attn = Attention(
             dim,
@@ -547,7 +451,7 @@ class TransformerBlock(nn.Module):
         )
 
         if cross_attend:
-            self.cross_attend_norm = make_norm()
+            self.cross_attend_norm = LayerNorm(dim, dtype=dtype, device=device, **norm_kwargs) if not remove_norms else nn.Identity()
             self.cross_attn = Attention(
                 dim,
                 dim_heads = dim_heads,
@@ -560,56 +464,37 @@ class TransformerBlock(nn.Module):
                 **attn_kwargs
             )
 
-        self.ff_norm = make_norm()
-        self.ff = FeedForward(dim, zero_init_output=zero_init_branch_outputs, dtype=dtype, device=device, operations=operations, **ff_kwargs)
+        self.ff_norm = LayerNorm(dim, dtype=dtype, device=device, **norm_kwargs) if not remove_norms else nn.Identity()
+        self.ff = FeedForward(dim, zero_init_output=zero_init_branch_outputs, dtype=dtype, device=device, operations=operations,**ff_kwargs)
 
         self.layer_ix = layer_ix
 
         self.conformer = ConformerModule(dim, norm_kwargs=norm_kwargs) if conformer else None
 
-        # Global conditioning
-        self.has_global_cond = (global_cond_dim is not None) or global_cond_shared_embed
+        self.global_cond_dim = global_cond_dim
 
-        if global_cond_shared_embed:
-            # SA3 style: learnable per-block additive bias; global_cond is pre-projected to (B, dim*6)
-            self.to_scale_shift_gate = nn.Parameter(torch.empty(dim * 6, device=device, dtype=dtype))
-        elif global_cond_dim is not None:
-            # SA1 style: per-block MLP projects global_cond → (B, dim*6)
+        if global_cond_dim is not None:
             self.to_scale_shift_gate = nn.Sequential(
                 nn.SiLU(),
-                operations.Linear(global_cond_dim, dim * 6, bias=False, device=device, dtype=dtype)
+                nn.Linear(global_cond_dim, dim * 6, bias=False)
             )
 
-        # Local additive conditioning (e.g. inpaint mask + masked latent)
-        self.local_add_cond_dim = local_add_cond_dim
-        if local_add_cond_dim is not None:
-            self.to_local_embed = nn.Sequential(
-                operations.Linear(local_add_cond_dim, dim, bias=True, dtype=dtype, device=device),
-                nn.SiLU(),
-                operations.Linear(dim, dim, bias=True, dtype=dtype, device=device),
-            )
-        else:
-            self.to_local_embed = None
+            nn.init.zeros_(self.to_scale_shift_gate[1].weight)
+            #nn.init.zeros_(self.to_scale_shift_gate_self[1].bias)
 
     def forward(
         self,
         x,
         context = None,
         global_cond=None,
-        local_add_cond=None,
         mask = None,
         context_mask = None,
         rotary_pos_emb = None,
         transformer_options={}
     ):
-        if self.has_global_cond and global_cond is not None:
-            if self.global_cond_shared_embed:
-                # global_cond already has shape (B, dim*6)
-                ssg = (comfy.ops.cast_to_input(self.to_scale_shift_gate, global_cond) + global_cond).unsqueeze(1)
-            else:
-                ssg = self.to_scale_shift_gate(global_cond).unsqueeze(1)
+        if self.global_cond_dim is not None and self.global_cond_dim > 0 and global_cond is not None:
 
-            scale_self, shift_self, gate_self, scale_ff, shift_ff, gate_ff = ssg.chunk(6, dim = -1)
+            scale_self, shift_self, gate_self, scale_ff, shift_ff, gate_ff = self.to_scale_shift_gate(global_cond).unsqueeze(1).chunk(6, dim = -1)
 
             # self-attention with adaLN
             residual = x
@@ -625,9 +510,6 @@ class TransformerBlock(nn.Module):
             if self.conformer is not None:
                 x = x + self.conformer(x)
 
-            if local_add_cond is not None and self.to_local_embed is not None:
-                x = x + _left_pad_to_match(self.to_local_embed(local_add_cond), x.shape[-2])
-
             # feedforward with adaLN
             residual = x
             x = self.ff_norm(x)
@@ -645,9 +527,6 @@ class TransformerBlock(nn.Module):
             if self.conformer is not None:
                 x = x + self.conformer(x)
 
-            if local_add_cond is not None and self.to_local_embed is not None:
-                x = x + _left_pad_to_match(self.to_local_embed(local_add_cond), x.shape[-2])
-
             x = x + self.ff(self.ff_norm(x))
 
         return x
@@ -664,8 +543,6 @@ class ContinuousTransformer(nn.Module):
         cross_attend=False,
         cond_token_dim=None,
         global_cond_dim=None,
-        global_cond_shared_embed=False,
-        local_add_cond_dim=None,
         causal=False,
         rotary_pos_emb=True,
         zero_init_branch_outputs=True,
@@ -673,7 +550,6 @@ class ContinuousTransformer(nn.Module):
         use_sinusoidal_emb=False,
         use_abs_pos_emb=False,
         abs_pos_emb_max_length=10000,
-        num_memory_tokens=0,
         dtype=None,
         device=None,
         operations=None,
@@ -686,8 +562,6 @@ class ContinuousTransformer(nn.Module):
         self.depth = depth
         self.causal = causal
         self.layers = nn.ModuleList([])
-        self.num_memory_tokens = num_memory_tokens
-        self.global_cond_shared_embed = global_cond_shared_embed
 
         self.project_in = operations.Linear(dim_in, dim, bias=False, dtype=dtype, device=device) if dim_in is not None else nn.Identity()
         self.project_out = operations.Linear(dim, dim_out, bias=False, dtype=dtype, device=device) if dim_out is not None else nn.Identity()
@@ -703,22 +577,7 @@ class ContinuousTransformer(nn.Module):
 
         self.use_abs_pos_emb = use_abs_pos_emb
         if use_abs_pos_emb:
-            self.pos_emb = AbsolutePositionalEmbedding(dim, abs_pos_emb_max_length + num_memory_tokens)
-
-        if num_memory_tokens > 0:
-            self.memory_tokens = nn.Parameter(torch.empty(num_memory_tokens, dim, device=device, dtype=dtype))
-
-        # Shared global-cond embedder (SA3 style): projects (B, global_cond_dim) → (B, dim*6)
-        self.global_cond_embedder = None
-        if global_cond_shared_embed and global_cond_dim is not None:
-            self.global_cond_embedder = nn.Sequential(
-                operations.Linear(global_cond_dim, dim, bias=True, dtype=dtype, device=device),
-                nn.SiLU(),
-                operations.Linear(dim, dim * 6, bias=True, dtype=dtype, device=device),
-            )
-
-        # When using shared embed, TransformerBlocks use per-block Parameter (not per-block MLP)
-        block_global_cond_dim = None if global_cond_shared_embed else global_cond_dim
+            self.pos_emb = AbsolutePositionalEmbedding(dim, abs_pos_emb_max_length)
 
         for i in range(depth):
             self.layers.append(
@@ -727,9 +586,7 @@ class ContinuousTransformer(nn.Module):
                     dim_heads = dim_heads,
                     cross_attend = cross_attend,
                     dim_context = cond_token_dim,
-                    global_cond_dim = block_global_cond_dim,
-                    global_cond_shared_embed = global_cond_shared_embed,
-                    local_add_cond_dim = local_add_cond_dim,
+                    global_cond_dim = global_cond_dim,
                     causal = causal,
                     zero_init_branch_outputs = zero_init_branch_outputs,
                     conformer=conformer,
@@ -748,7 +605,6 @@ class ContinuousTransformer(nn.Module):
         prepend_embeds = None,
         prepend_mask = None,
         global_cond = None,
-        local_add_cond = None,
         return_info = False,
         **kwargs
     ):
@@ -776,9 +632,7 @@ class ContinuousTransformer(nn.Module):
 
                 mask = torch.cat((prepend_mask, mask), dim = -1)
 
-        if self.num_memory_tokens > 0:
-            memory_tokens = comfy.ops.cast_to_input(self.memory_tokens, x).expand(batch, -1, -1)
-            x = torch.cat((memory_tokens, x), dim=1)
+        # Attention layers
 
         if self.rotary_pos_emb is not None:
             rotary_pos_emb = self.rotary_pos_emb.forward_from_seq_len(x.shape[1], dtype=torch.float, device=x.device)
@@ -788,10 +642,6 @@ class ContinuousTransformer(nn.Module):
         if self.use_sinusoidal_emb or self.use_abs_pos_emb:
             x = x + self.pos_emb(x)
 
-        # Project global_cond once (SA3 shared-embed path)
-        if global_cond is not None and self.global_cond_embedder is not None:
-            global_cond = self.global_cond_embedder(global_cond)
-
         blocks_replace = patches_replace.get("dit", {})
         # Iterate over the transformer layers
         for i, layer in enumerate(self.layers):
@@ -804,17 +654,12 @@ class ContinuousTransformer(nn.Module):
                 out = blocks_replace[("double_block", i)]({"img": x, "txt": context, "vec": global_cond, "pe": rotary_pos_emb, "transformer_options": transformer_options}, {"original_block": block_wrap})
                 x = out["img"]
             else:
-                x = layer(x, rotary_pos_emb=rotary_pos_emb, global_cond=global_cond,
-                          local_add_cond=local_add_cond, context=context,
-                          transformer_options=transformer_options)
+                x = layer(x, rotary_pos_emb = rotary_pos_emb, global_cond=global_cond, context=context, transformer_options=transformer_options)
+            # x = checkpoint(layer, x, rotary_pos_emb = rotary_pos_emb, global_cond=global_cond, **kwargs)
 
             if return_info:
                 info["hidden_states"].append(x)
 
-        # Strip memory tokens before projecting out
-        if self.num_memory_tokens > 0:
-            x = x[:, self.num_memory_tokens:, :]
-
         x = self.project_out(x)
 
         if return_info:
@@ -837,7 +682,6 @@ class AudioDiffusionTransformer(nn.Module):
         num_heads=24,
         transformer_type: tp.Literal["continuous_transformer"] = "continuous_transformer",
         global_cond_type: tp.Literal["prepend", "adaLN"] = "prepend",
-        timestep_features_type: str = "learned",
         audio_model="",
         dtype=None,
         device=None,
@@ -852,10 +696,7 @@ class AudioDiffusionTransformer(nn.Module):
         # Timestep embeddings
         timestep_features_dim = 256
 
-        if timestep_features_type == "expo":
-            self.timestep_features = ExpoFourierFeatures(timestep_features_dim, 0.5, 10000.0)
-        else:
-            self.timestep_features = FourierFeatures(1, timestep_features_dim, dtype=dtype, device=device)
+        self.timestep_features = FourierFeatures(1, timestep_features_dim, dtype=dtype, device=device)
 
         self.to_timestep_embed = nn.Sequential(
             operations.Linear(timestep_features_dim, embed_dim, bias=True, dtype=dtype, device=device),
@@ -940,7 +781,6 @@ class AudioDiffusionTransformer(nn.Module):
         cross_attn_cond=None,
         cross_attn_cond_mask=None,
         input_concat_cond=None,
-        local_add_cond=None,
         global_embed=None,
         prepend_cond=None,
         prepend_cond_mask=None,
@@ -962,13 +802,9 @@ class AudioDiffusionTransformer(nn.Module):
             prepend_cond = self.to_prepend_embed(prepend_cond)
 
             prepend_inputs = prepend_cond
-            prepend_length = prepend_cond.shape[1]
             if prepend_cond_mask is not None:
                 prepend_mask = prepend_cond_mask
 
-        if local_add_cond is not None and local_add_cond.dim() == 3:
-            local_add_cond = local_add_cond.permute(0, 2, 1)
-
         if input_concat_cond is not None:
 
             # Interpolate input_concat_cond to the same length as x
@@ -1014,7 +850,7 @@ class AudioDiffusionTransformer(nn.Module):
         if self.transformer_type == "x-transformers":
             output = self.transformer(x, prepend_embeds=prepend_inputs, context=cross_attn_cond, context_mask=cross_attn_cond_mask, mask=mask, prepend_mask=prepend_mask, **extra_args, **kwargs)
         elif self.transformer_type == "continuous_transformer":
-            output = self.transformer(x, prepend_embeds=prepend_inputs, context=cross_attn_cond, context_mask=cross_attn_cond_mask, mask=mask, prepend_mask=prepend_mask, return_info=return_info, local_add_cond=local_add_cond, **extra_args, **kwargs)
+            output = self.transformer(x, prepend_embeds=prepend_inputs, context=cross_attn_cond, context_mask=cross_attn_cond_mask, mask=mask, prepend_mask=prepend_mask, return_info=return_info, **extra_args, **kwargs)
 
             if return_info:
                 output, info = output
@@ -1040,7 +876,6 @@ class AudioDiffusionTransformer(nn.Module):
         context=None,
         context_mask=None,
         input_concat_cond=None,
-        local_add_cond=None,
         global_embed=None,
         negative_global_embed=None,
         prepend_cond=None,
@@ -1055,7 +890,6 @@ class AudioDiffusionTransformer(nn.Module):
                 cross_attn_cond=context,
                 cross_attn_cond_mask=context_mask,
                 input_concat_cond=input_concat_cond,
-                local_add_cond=local_add_cond,
                 global_embed=global_embed,
                 prepend_cond=prepend_cond,
                 prepend_cond_mask=prepend_cond_mask,

comfy/ldm/audio/embedders.py

@@ -31,39 +31,15 @@ def TimePositionalEmbedding(dim: int, out_features: int) -> nn.Module:
     )
 
 
-class ExpoFourierFeatures(nn.Module):
-    """Exponentially-spaced Fourier features (no learnable parameters)."""
-    def __init__(self, dim, min_freq=0.5, max_freq=10000.0):
-        super().__init__()
-        self.dim = dim
-        self.min_freq = min_freq
-        self.max_freq = max_freq
-
-    def forward(self, t):
-        in_dtype = t.dtype
-        t = t.float()
-        if t.dim() == 1:
-            t = t.unsqueeze(-1)
-        half_dim = self.dim // 2
-        ramp = torch.linspace(0, 1, half_dim, device=t.device, dtype=torch.float32)
-        freqs = torch.exp(ramp * (math.log(self.max_freq) - math.log(self.min_freq)) + math.log(self.min_freq))
-        args = t * freqs * 2 * math.pi
-        return torch.cat([args.cos(), args.sin()], dim=-1).to(in_dtype)
-
-
 class NumberEmbedder(nn.Module):
     def __init__(
         self,
         features: int,
         dim: int = 256,
-        fourier_features_type="learned",
     ):
         super().__init__()
         self.features = features
-        if fourier_features_type == "expo":
-            self.embedding = nn.Sequential(ExpoFourierFeatures(dim=dim), comfy.ops.manual_cast.Linear(in_features=dim, out_features=features))
-        else:
-            self.embedding = TimePositionalEmbedding(dim=dim, out_features=features)
+        self.embedding = TimePositionalEmbedding(dim=dim, out_features=features)
 
     def forward(self, x: Union[List[float], Tensor]) -> Tensor:
         if not torch.is_tensor(x):
@@ -101,15 +77,14 @@ class NumberConditioner(Conditioner):
     def __init__(self,
                 output_dim: int,
                 min_val: float=0,
-                max_val: float=1,
-                fourier_features_type: str = "learned",
+                max_val: float=1
                 ):
         super().__init__(output_dim, output_dim)
 
         self.min_val = min_val
         self.max_val = max_val
 
-        self.embedder = NumberEmbedder(features=output_dim, fourier_features_type=fourier_features_type)
+        self.embedder = NumberEmbedder(features=output_dim)
 
     def forward(self, floats, device=None):
             # Cast the inputs to floats

comfy/ldm/audio/vae_sa3.py

@@ -1,533 +0,0 @@
-import torch
-import torch.nn as nn
-
-import comfy.ops
-import comfy.model_management
-from comfy.ldm.modules.attention import optimized_attention
-from comfy.ldm.audio.autoencoder import WNConv1d
-
-ops = comfy.ops.disable_weight_init
-
-class Transpose(nn.Module):
-    def forward(self, x, **kwargs):
-        return x.transpose(-2, -1)
-
-
-def _zero_pad_modulo_sequence(x, size, dim=-2):
-    input_len = x.shape[dim]
-    pad_len = (size - input_len % size) % size
-    if pad_len > 0:
-        pad_shape = list(x.shape)
-        pad_shape[dim] = pad_len
-        x = torch.cat([x, torch.zeros(pad_shape, device=x.device, dtype=x.dtype)], dim=dim)
-    return x
-
-
-def _sliding_window_mask(seq_len, window, device, dtype):
-    """Additive attention mask enforcing a ±window local window (matches flash_attn window_size)."""
-    i = torch.arange(seq_len, device=device).unsqueeze(1)
-    j = torch.arange(seq_len, device=device).unsqueeze(0)
-    out_of_window = (j - i).abs() > window
-    return torch.where(
-        out_of_window,
-        torch.full((1,), torch.finfo(dtype).min / 4, device=device, dtype=dtype),
-        torch.zeros(1, device=device, dtype=dtype),
-    )
-
-
-class DynamicTanh(nn.Module):
-    def __init__(self, dim, init_alpha=4.0, dtype=None, device=None, **kwargs):
-        super().__init__()
-        self.alpha = nn.Parameter(torch.empty(1, dtype=dtype, device=device))
-        self.gamma = nn.Parameter(torch.empty(dim, dtype=dtype, device=device))
-        self.beta = nn.Parameter(torch.empty(dim, dtype=dtype, device=device))
-
-    def forward(self, x):
-        alpha = comfy.ops.cast_to_input(self.alpha, x)
-        gamma = comfy.ops.cast_to_input(self.gamma, x)
-        beta = comfy.ops.cast_to_input(self.beta, x)
-        return gamma * torch.tanh(alpha * x) + beta
-
-
-class RotaryEmbedding(nn.Module):
-    def __init__(self, dim, base=10000, base_rescale_factor=1., dtype=None, device=None):
-        super().__init__()
-        base = base * base_rescale_factor ** (dim / (dim - 2))
-        self.register_buffer("inv_freq", torch.empty(dim // 2, dtype=dtype, device=device))
-
-    def forward_from_seq_len(self, seq_len, device, dtype=None):
-        t = torch.arange(seq_len, device=device, dtype=torch.float32)
-        return self.forward(t)
-
-    def forward(self, t):
-        freqs = torch.outer(t.float(), comfy.model_management.cast_to(self.inv_freq, dtype=torch.float32, device=t.device))
-        freqs = torch.cat((freqs, freqs), dim=-1)
-        return freqs, 1.
-
-
-def _rotate_half(x):
-    d = x.shape[-1] // 2
-    return torch.cat((-x[..., d:], x[..., :d]), dim=-1)
-
-
-def _apply_rotary_pos_emb(t, freqs):
-    out_dtype = t.dtype
-    rot_dim = freqs.shape[-1]
-    seq_len = t.shape[-2]
-    freqs = freqs[-seq_len:]
-    t_rot, t_pass = t[..., :rot_dim], t[..., rot_dim:]
-    t_rot = t_rot * freqs.cos() + _rotate_half(t_rot) * freqs.sin()
-    return torch.cat((t_rot.to(out_dtype), t_pass.to(out_dtype)), dim=-1)
-
-
-class Attention(nn.Module):
-    def __init__(self, dim, dim_heads=64, qk_norm="none", qk_norm_eps=1e-6,
-                 differential=False, zero_init_output=True,
-                 dtype=None, device=None, operations=None, **kwargs):
-        super().__init__()
-        self.num_heads = dim // dim_heads
-        self.differential = differential
-        self.qk_norm = qk_norm
-
-        self.to_qkv = operations.Linear(
-            dim, dim * (5 if differential else 3), bias=False, dtype=dtype, device=device)
-        self.to_out = operations.Linear(dim, dim, bias=False, dtype=dtype, device=device)
-
-        if qk_norm == "dyt":
-            self.q_norm = DynamicTanh(dim_heads, dtype=dtype, device=device)
-            self.k_norm = DynamicTanh(dim_heads, dtype=dtype, device=device)
-        elif qk_norm == "rms":
-            self.q_norm = operations.RMSNorm(dim_heads, eps=qk_norm_eps, dtype=dtype, device=device)
-            self.k_norm = operations.RMSNorm(dim_heads, eps=qk_norm_eps, dtype=dtype, device=device)
-
-    def forward(self, x, rotary_pos_emb=None, mask=None, **kwargs):
-        B, N, _ = x.shape
-        h = self.num_heads
-
-        qkv = self.to_qkv(x)
-        if self.differential:
-            q, k, v, q_diff, k_diff = qkv.chunk(5, dim=-1)
-            del qkv
-            q = q.view(B, N, h, -1).transpose(1, 2)
-            k = k.view(B, N, h, -1).transpose(1, 2)
-            v = v.view(B, N, h, -1).transpose(1, 2)
-            q_diff = q_diff.view(B, N, h, -1).transpose(1, 2)
-            k_diff = k_diff.view(B, N, h, -1).transpose(1, 2)
-        else:
-            q, k, v = qkv.chunk(3, dim=-1)
-            del qkv
-            q = q.view(B, N, h, -1).transpose(1, 2)
-            k = k.view(B, N, h, -1).transpose(1, 2)
-            v = v.view(B, N, h, -1).transpose(1, 2)
-
-        if self.qk_norm != "none":
-            q_dtype, k_dtype = q.dtype, k.dtype
-            q = self.q_norm(q).to(q_dtype)
-            k = self.k_norm(k).to(k_dtype)
-            if self.differential:
-                q_diff = self.q_norm(q_diff).to(q_dtype)
-                k_diff = self.k_norm(k_diff).to(k_dtype)
-
-        if rotary_pos_emb is not None:
-            freqs, _ = rotary_pos_emb
-            q_dtype, k_dtype = q.dtype, k.dtype
-            q = _apply_rotary_pos_emb(q.float(), freqs).to(q_dtype)
-            k = _apply_rotary_pos_emb(k.float(), freqs).to(k_dtype)
-            if self.differential:
-                q_diff = _apply_rotary_pos_emb(q_diff.float(), freqs).to(q_dtype)
-                k_diff = _apply_rotary_pos_emb(k_diff.float(), freqs).to(k_dtype)
-
-        if self.differential:
-            out = (optimized_attention(q, k, v, h, mask=mask, skip_reshape=True)
-                   - optimized_attention(q_diff, k_diff, v, h, mask=mask, skip_reshape=True))
-            del q, k, v, q_diff, k_diff
-        else:
-            out = optimized_attention(q, k, v, h, mask=mask, skip_reshape=True)
-            del q, k, v
-
-        return self.to_out(out)
-
-
-class _Sin(nn.Module):
-    def forward(self, x):
-        return torch.sin(3.14159265359 * x)
-
-
-class _GLU(nn.Module):
-    def __init__(self, dim_in, dim_out, activation, dtype=None, device=None, operations=None):
-        super().__init__()
-        self.act = activation
-        self.proj = operations.Linear(dim_in, dim_out * 2, dtype=dtype, device=device)
-
-    def forward(self, x):
-        x = self.proj(x)
-        x, gate = x.chunk(2, dim=-1)
-        return x * self.act(gate)
-
-
-class FeedForward(nn.Module):
-    def __init__(self, dim, mult=4, no_bias=False, zero_init_output=True,
-                 sinusoidal=False, dtype=None, device=None, operations=None, **kwargs):
-        super().__init__()
-        inner_dim = int(dim * mult)
-        act = _Sin() if sinusoidal else nn.SiLU()
-        self.ff = nn.Sequential(
-            _GLU(dim, inner_dim, act, dtype=dtype, device=device, operations=operations),
-            nn.Identity(),
-            operations.Linear(inner_dim, dim, bias=not no_bias, dtype=dtype, device=device),
-            nn.Identity(),
-        )
-
-    def forward(self, x, **kwargs):
-        return self.ff(x)
-
-
-class TransformerBlock(nn.Module):
-    def __init__(self, dim, dim_heads=64, causal=False, zero_init_branch_outputs=True,
-                 norm_type="dyt", add_rope=False, attn_kwargs=None, ff_kwargs=None,
-                 norm_kwargs=None, dtype=None, device=None, operations=None, **kwargs):
-        super().__init__()
-        if attn_kwargs is None:
-            attn_kwargs = {}
-        if ff_kwargs is None:
-            ff_kwargs = {}
-        if norm_kwargs is None:
-            norm_kwargs = {}
-        dim_heads = min(dim_heads, dim)
-
-        Norm = DynamicTanh if norm_type == "dyt" else operations.RMSNorm
-        norm_kw = {**norm_kwargs, "dtype": dtype, "device": device}
-
-        self.pre_norm = Norm(dim, **norm_kw)
-        self.self_attn = Attention(dim, dim_heads=dim_heads,
-                                   zero_init_output=zero_init_branch_outputs,
-                                   dtype=dtype, device=device, operations=operations,
-                                   **attn_kwargs)
-        self.ff_norm = Norm(dim, **norm_kw)
-        self.ff = FeedForward(dim, zero_init_output=zero_init_branch_outputs,
-                              dtype=dtype, device=device, operations=operations, **ff_kwargs)
-        self.rope = RotaryEmbedding(dim_heads // 2, dtype=dtype, device=device) if add_rope else None
-
-    def forward(self, x, mask=None, **kwargs):
-        rope = self.rope.forward_from_seq_len(x.shape[-2], device=x.device) \
-               if self.rope is not None else None
-        x = x + self.self_attn(self.pre_norm(x), rotary_pos_emb=rope, mask=mask)
-        x = x + self.ff(self.ff_norm(x))
-        return x
-
-
-class TransformerResamplingBlock(nn.Module):
-    def __init__(self, in_channels, out_channels, stride, type="encoder",
-                 transformer_depth=3, dim_heads=128, differential=True,
-                 sliding_window=None, chunk_size=128, chunk_midpoint_shift=False,
-                 dyt=True, ff_mult=3, mapping_bias=True, variable_stride=False,
-                 sinusoidal_blocks=0, conv_mapping=False, dtype=None, device=None, operations=None, **kwargs):
-        super().__init__()
-        if type not in ("encoder", "decoder"):
-            raise ValueError(f"type must be 'encoder' or 'decoder', got {type!r}")
-
-        self.type = type
-        self.stride = stride
-        self.chunk_size = chunk_size
-        self.chunk_midpoint_shift = chunk_midpoint_shift
-        self.variable_stride = variable_stride
-        self.transformer_depth = transformer_depth
-
-        transformer_dim = out_channels if type == "encoder" else in_channels
-
-        self.mapping = (WNConv1d(in_channels, out_channels, 3 if conv_mapping else 1, padding="same", bias=mapping_bias)
-                        if in_channels != out_channels else nn.Identity())
-
-        self.sliding_window_latents = sliding_window
-        self.sliding_window_seq = self._get_sliding_window_size(sliding_window, stride)
-        self.input_seg_size, self.output_seg_size, self.sub_chunk_size = self._get_seg_sizes(stride)
-
-        token_seq = 1 if variable_stride else self.output_seg_size
-        self.new_tokens = nn.Parameter(torch.empty(1, token_seq, transformer_dim, dtype=dtype, device=device))
-
-        norm_type = "dyt" if dyt else "rms_norm"
-        attn_kwargs = {"qk_norm": "dyt" if dyt else "rms", "qk_norm_eps": 1e-3,
-                       "differential": differential}
-        norm_kwargs = {"eps": 1e-3}
-        transformers = []
-        for i in range(transformer_depth):
-            sinusoidal = (transformer_depth - i) < sinusoidal_blocks
-            transformers.append(TransformerBlock(
-                transformer_dim,
-                dim_heads=dim_heads,
-                causal=False,
-                zero_init_branch_outputs=True,
-                norm_type=norm_type,
-                add_rope=True,
-                attn_kwargs=attn_kwargs,
-                ff_kwargs={"mult": ff_mult, "no_bias": False, "sinusoidal": sinusoidal},
-                norm_kwargs=norm_kwargs,
-                dtype=dtype, device=device, operations=operations,
-            ))
-        self.transformers = nn.ModuleList(transformers)
-
-    def _get_sliding_window_size(self, window, stride, prepend_cond_length=0):
-        if window is None:
-            return None
-        return [w * (stride + 1 + prepend_cond_length) for w in window]
-
-    def _get_seg_sizes(self, stride, prepend_cond_length=0):
-        sub_chunk_size = stride + 1 + prepend_cond_length
-        input_seg_size = stride if self.type == "encoder" else 1
-        output_seg_size = 1 if self.type == "encoder" else stride
-        return input_seg_size, output_seg_size, sub_chunk_size
-
-    def forward(self, x, stride=None, **kwargs):
-        B = x.shape[0]
-
-        if stride is None:
-            input_seg = self.input_seg_size
-            output_seg = self.output_seg_size
-            sub_chunk = self.sub_chunk_size
-            sliding_window = self.sliding_window_seq
-        else:
-            input_seg, output_seg, sub_chunk = self._get_seg_sizes(stride)
-            sliding_window = self._get_sliding_window_size(self.sliding_window_latents, stride)
-
-        if self.type == "encoder":
-            if self.transformer_depth > 0:
-                pad_mod = self.chunk_size if sliding_window is None else input_seg
-                x = _zero_pad_modulo_sequence(x, pad_mod, dim=-1)
-            x = self.mapping(x)
-
-        if self.transformer_depth > 0:
-            x = x.permute(0, 2, 1)
-
-            if self.type != "encoder":
-                pad_mod = 1 if sliding_window is not None else (
-                    self.chunk_size // (stride if stride is not None else self.stride))
-                x = _zero_pad_modulo_sequence(x, pad_mod)
-
-            C = x.shape[2]
-            x = x.reshape(-1, input_seg, C)
-
-            new_tokens = self.new_tokens.expand(x.shape[0], output_seg, -1)
-            x = torch.cat([x, comfy.ops.cast_to_input(new_tokens, x)], dim=-2)
-            del new_tokens
-
-            x = x.reshape(B, -1, C)
-
-            if sliding_window is None:
-                eff_chunk = self.chunk_size + self.chunk_size // (stride if stride is not None else self.stride)
-
-            if sliding_window is None and self.chunk_midpoint_shift:
-                split = self.transformer_depth // 2
-                shift = eff_chunk // 2
-
-                x = x.reshape(-1, eff_chunk, C)
-                for layer in self.transformers[:split]:
-                    x = layer(x)
-                x = x.reshape(B, -1, C)
-
-                shifted = torch.cat([x[:, :shift, :], x, x[:, -shift:, :]], dim=1)
-                del x
-                x = shifted.reshape(-1, eff_chunk, C)
-                del shifted
-                for layer in self.transformers[split:]:
-                    x = layer(x)
-                x = x.reshape(B, -1, C)
-                x = x[:, shift:-shift, :]
-            elif sliding_window is None:
-                x = x.reshape(-1, eff_chunk, C)
-                for layer in self.transformers:
-                    x = layer(x)
-                x = x.reshape(B, -1, C)
-            else:
-                attn_mask = _sliding_window_mask(x.shape[1], sliding_window[0], x.device, x.dtype)
-                for layer in self.transformers:
-                    x = layer(x, mask=attn_mask)
-
-            x = x.reshape(-1, sub_chunk, C)
-            x = x[:, -output_seg:, :]
-            x = x.reshape(B, -1, C).transpose(1, 2)
-
-        if self.type == "decoder":
-            x = self.mapping(x)
-
-        return x
-
-
-class SAMEEncoder(nn.Module):
-    def __init__(self, in_channels=2, channels=128, latent_dim=32,
-                 c_mults=(1, 2, 4, 8), strides=(2, 4, 8, 8),
-                 transformer_depths=(3, 3, 3, 3),
-                 dtype=None, device=None, operations=None, **kwargs):
-        super().__init__()
-        channel_dims = [in_channels] + [channels * c for c in c_mults]
-        layers = []
-        for i in range(len(c_mults)):
-            layers.append(TransformerResamplingBlock(
-                in_channels=channel_dims[i], out_channels=channel_dims[i + 1],
-                stride=strides[i], type="encoder",
-                transformer_depth=transformer_depths[i],
-                dtype=dtype, device=device, operations=operations, **kwargs))
-        layers += [
-            Transpose(),
-            operations.Linear(channel_dims[-1], latent_dim, dtype=dtype, device=device),
-            Transpose(),
-        ]
-        self.layers = nn.ModuleList(layers)
-
-    def forward(self, x, **kwargs):
-        for layer in self.layers:
-            x = layer(x)
-        return x
-
-
-class SAMEDecoder(nn.Module):
-    def __init__(self, out_channels=2, channels=128, latent_dim=32,
-                 c_mults=(1, 2, 4, 8), strides=(2, 4, 8, 8),
-                 transformer_depths=(3, 3, 3, 3), sinusoidal_blocks=None,
-                 dtype=None, device=None, operations=None, **kwargs):
-        super().__init__()
-        if sinusoidal_blocks is None:
-            sinusoidal_blocks = [0] * len(c_mults)
-        channel_dims = [out_channels] + [channels * c for c in c_mults]
-        layers = [
-            Transpose(),
-            operations.Linear(latent_dim, channel_dims[-1], dtype=dtype, device=device),
-            Transpose(),
-        ]
-        for i in range(len(c_mults) - 1, -1, -1):
-            layers.append(TransformerResamplingBlock(
-                in_channels=channel_dims[i + 1], out_channels=channel_dims[i],
-                stride=strides[i], type="decoder",
-                transformer_depth=transformer_depths[i],
-                sinusoidal_blocks=sinusoidal_blocks[i],
-                dtype=dtype, device=device, operations=operations, **kwargs))
-        self.layers = nn.ModuleList(layers)
-
-    def forward(self, x, **kwargs):
-        for layer in self.layers:
-            x = layer(x)
-        return x
-
-
-class SoftNormBottleneck(nn.Module):
-    def __init__(self, dim=32, noise_augment_dim=0, noise_regularize=False,
-                 auto_scale=False, freeze=False, dtype=None, device=None, **kwargs):
-        super().__init__()
-        self.noise_augment_dim = noise_augment_dim
-        self.noise_regularize = noise_regularize
-        self.scaling_factor = nn.Parameter(torch.empty(1, dim, 1, dtype=dtype, device=device))
-        self.bias = nn.Parameter(torch.empty(1, dim, 1, dtype=dtype, device=device))
-        self.noise_scaling_factor = nn.Parameter(torch.empty(1, noise_augment_dim, 1, dtype=dtype, device=device))
-        if auto_scale:
-            self.register_parameter("running_std", nn.Parameter(
-                torch.empty(1, dtype=dtype, device=device), requires_grad=False))
-        if freeze:
-            for p in self.parameters():
-                p.requires_grad = False
-
-    def encode(self, x, return_info=False, **kwargs):
-        x = x * comfy.ops.cast_to_input(self.scaling_factor, x) \
-              + comfy.ops.cast_to_input(self.bias, x)
-        if hasattr(self, "running_std"):
-            x = x / comfy.ops.cast_to_input(self.running_std, x)
-        if return_info:
-            return x, {}
-        return x
-
-    def decode(self, x, **kwargs):
-        if hasattr(self, "running_std"):
-            x = x * comfy.ops.cast_to_input(self.running_std, x)
-        if self.noise_regularize:
-            scaling = self.running_std if hasattr(self, "running_std") \
-                      else x.std(dim=-1, keepdim=True)
-            noise = torch.randn_like(x) * comfy.ops.cast_to_input(scaling, x) * 1e-3
-            x = x + noise
-        if self.noise_augment_dim > 0:
-            noise = comfy.ops.cast_to_input(self.noise_scaling_factor, x) * torch.randn(
-                x.shape[0], self.noise_augment_dim, x.shape[-1], device=x.device, dtype=x.dtype)
-            x = torch.cat([x, noise], dim=1)
-        return x
-
-
-class PatchedPretransform(nn.Module):
-    def __init__(self, channels, patch_size, **kwargs):
-        super().__init__()
-        self.channels = channels
-        self.patch_size = patch_size
-        self.enable_grad = False
-
-    def _pad(self, x):
-        pad_len = (self.patch_size - x.shape[-1] % self.patch_size) % self.patch_size
-        if pad_len > 0:
-            x = torch.cat([x, torch.zeros_like(x[:, :, :pad_len])], dim=-1)
-        return x
-
-    def encode(self, x):
-        x = self._pad(x)
-        B, C, T = x.shape
-        h = self.patch_size
-        L = T // h
-        # b c (l h) -> b (c h) l
-        return x.reshape(B, C, L, h).permute(0, 1, 3, 2).reshape(B, C * h, L)
-
-    def decode(self, x):
-        B, Ch, L = x.shape
-        h = self.patch_size
-        C = Ch // h
-        # b (c h) l -> b c (l h)
-        return x.reshape(B, C, h, L).permute(0, 1, 3, 2).reshape(B, C, L * h)
-
-
-class SA3AudioVAE(nn.Module):
-    """SA3 VAE. State dict keys match checkpoint after stripping 'pretransform.model.'"""
-
-    def __init__(self, channels=256, transformer_depths=12, sinusoidal_blocks=8,
-                 sliding_window=None, decoder_conv_mapping=False,
-                 chunk_size=128, chunk_midpoint_shift=False,
-                 dtype=None, device=None, operations=None):
-        super().__init__()
-        if operations is None:
-            operations = ops
-
-        self.pretransform = PatchedPretransform(channels=2, patch_size=256)
-
-        common_kwargs = dict(
-            differential=True, dyt=True, dim_heads=64,
-            sliding_window=sliding_window, variable_stride=True,
-            chunk_size=chunk_size, chunk_midpoint_shift=chunk_midpoint_shift,
-            dtype=dtype, device=device, operations=operations,
-        )
-        self.encoder = SAMEEncoder(
-            in_channels=512, channels=channels, c_mults=[6], strides=[16],
-            latent_dim=256, transformer_depths=[transformer_depths],
-            conv_mapping=False, **common_kwargs,
-        )
-        self.decoder = SAMEDecoder(
-            out_channels=512, channels=channels, c_mults=[6], strides=[16],
-            latent_dim=256, transformer_depths=[transformer_depths], sinusoidal_blocks=[sinusoidal_blocks],
-            conv_mapping=decoder_conv_mapping, **common_kwargs,
-        )
-        self.bottleneck = SoftNormBottleneck(
-            dim=256, noise_augment_dim=0, noise_regularize=True,
-            auto_scale=True, freeze=True,
-            dtype=dtype, device=device,
-        )
-
-    @torch.no_grad()
-    def _pretransform_encode(self, x):
-        return self.pretransform.encode(x)
-
-    @torch.no_grad()
-    def _pretransform_decode(self, x):
-        return self.pretransform.decode(x)
-
-    def encode(self, x):
-        x = self._pretransform_encode(x)
-        x = self.encoder(x)
-        x = self.bottleneck.encode(x)
-        return x
-
-    def decode(self, x):
-        x = self.bottleneck.decode(x)
-        x = self.decoder(x)
-        x = self._pretransform_decode(x)
-        return x

comfy/ldm/hunyuan3dv2_1/hunyuandit.py

@@ -328,7 +328,7 @@ class CrossAttention(nn.Module):
         kv = torch.cat((k, v), dim=-1)
         split_size = kv.shape[-1] // self.num_heads // 2
 
-        kv = kv.view(b, -1, self.num_heads, split_size * 2)
+        kv = kv.view(1, -1, self.num_heads, split_size * 2)
         k, v = torch.split(kv, split_size, dim=-1)
 
         q = q.view(b, s1, self.num_heads, self.head_dim)
@@ -398,7 +398,7 @@ class Attention(nn.Module):
         qkv_combined = torch.cat((query, key, value), dim=-1)
         split_size = qkv_combined.shape[-1] // self.num_heads // 3
 
-        qkv = qkv_combined.view(B, -1, self.num_heads, split_size * 3)
+        qkv = qkv_combined.view(1, -1, self.num_heads, split_size * 3)
         query, key, value = torch.split(qkv, split_size, dim=-1)
 
         query = query.reshape(B, N, self.num_heads, self.head_dim)
@@ -607,9 +607,9 @@ class HunYuanDiTPlain(nn.Module):
     def forward(self, x, t, context, transformer_options = {}, **kwargs):
 
         x = x.movedim(-1, -2)
-        if context.shape[0] >= 2:
-            uncond_emb, cond_emb = context.chunk(2, dim = 0)
-            context = torch.cat([cond_emb, uncond_emb], dim = 0)
+        uncond_emb, cond_emb = context.chunk(2, dim = 0)
+
+        context = torch.cat([cond_emb, uncond_emb], dim = 0)
         main_condition = context
 
         t = 1.0 - t
@@ -657,8 +657,5 @@ class HunYuanDiTPlain(nn.Module):
         output = self.final_layer(combined)
         output =  output.movedim(-2, -1) * (-1.0)
 
-        if output.shape[0] >= 2:
-            cond_emb, uncond_emb = output.chunk(2, dim = 0)
-            return torch.cat([uncond_emb, cond_emb])
-        else:
-            return output
+        cond_emb, uncond_emb = output.chunk(2, dim = 0)
+        return torch.cat([uncond_emb, cond_emb])

comfy/lora.py

@@ -484,23 +484,16 @@ def calculate_weight(patches, weight, key, intermediate_dtype=torch.float32, ori
 
     return weight
 
-def prefetch_prepared_value(value, counter, destination, stream, copy):
+def prefetch_prepared_value(value, allocate_buffer, stream):
     if isinstance(value, torch.Tensor):
-        size = comfy.memory_management.vram_aligned_size(value)
-        offset = counter[0]
-        counter[0] += size
-        if destination is None:
-            return value
-
-        dest = destination[offset:offset + size]
-        if copy:
-            comfy.model_management.cast_to_gathered([value], dest, non_blocking=True, stream=stream)
+        dest = allocate_buffer(comfy.memory_management.vram_aligned_size(value))
+        comfy.model_management.cast_to_gathered([value], dest, non_blocking=True, stream=stream)
         return comfy.memory_management.interpret_gathered_like([value], dest)[0]
     elif isinstance(value, weight_adapter.WeightAdapterBase):
-        return type(value)(value.loaded_keys, prefetch_prepared_value(value.weights, counter, destination, stream, copy))
+        return type(value)(value.loaded_keys, prefetch_prepared_value(value.weights, allocate_buffer, stream))
     elif isinstance(value, tuple):
-        return tuple(prefetch_prepared_value(item, counter, destination, stream, copy) for item in value)
+        return tuple(prefetch_prepared_value(item, allocate_buffer, stream) for item in value)
     elif isinstance(value, list):
-        return [prefetch_prepared_value(item, counter, destination, stream, copy) for item in value]
+        return [prefetch_prepared_value(item, allocate_buffer, stream) for item in value]
 
     return value

comfy/memory_management.py

@@ -15,7 +15,7 @@ class TensorFileSlice(NamedTuple):
     size: int
 
 
-def read_tensor_file_slice_into(tensor, destination, stream=None, destination2=None):
+def read_tensor_file_slice_into(tensor, destination):
 
     if isinstance(tensor, QuantizedTensor):
         if not isinstance(destination, QuantizedTensor):
@@ -23,17 +23,12 @@ def read_tensor_file_slice_into(tensor, destination, stream=None, destination2=N
         if tensor._layout_cls != destination._layout_cls:
             return False
 
-        if not read_tensor_file_slice_into(tensor._qdata, destination._qdata, stream=stream,
-                                           destination2=(destination2._qdata if destination2 is not None else None)):
+        if not read_tensor_file_slice_into(tensor._qdata, destination._qdata):
             return False
 
         dst_orig_dtype = destination._params.orig_dtype
         destination._params.copy_from(tensor._params, non_blocking=False)
         destination._params = dataclasses.replace(destination._params, orig_dtype=dst_orig_dtype)
-        if destination2 is not None:
-            dst_orig_dtype = destination2._params.orig_dtype
-            destination2._params.copy_from(destination._params, non_blocking=True)
-            destination2._params = dataclasses.replace(destination2._params, orig_dtype=dst_orig_dtype)
         return True
 
     info = getattr(tensor.untyped_storage(), "_comfy_tensor_file_slice", None)
@@ -53,17 +48,6 @@ def read_tensor_file_slice_into(tensor, destination, stream=None, destination2=N
     if info.size == 0:
         return True
 
-    hostbuf = getattr(destination.untyped_storage(), "_comfy_hostbuf", None)
-    if hostbuf is not None:
-        stream_ptr = getattr(stream, "cuda_stream", 0) if stream is not None else 0
-        device_ptr = destination2.data_ptr() if destination2 is not None else 0
-        hostbuf.read_file_slice(file_obj, info.offset, info.size,
-                                offset=destination.data_ptr() - hostbuf.get_raw_address(),
-                                stream=stream_ptr,
-                                device_ptr=device_ptr,
-                                device=None if destination2 is None else destination2.device.index)
-        return True
-
     buf_type = ctypes.c_ubyte * info.size
     view = memoryview(buf_type.from_address(destination.data_ptr()))
 
@@ -167,7 +151,7 @@ def set_ram_cache_release_state(callback, headroom):
     extra_ram_release_callback = callback
     RAM_CACHE_HEADROOM = max(0, int(headroom))
 
-def extra_ram_release(target, free_active=False):
+def extra_ram_release(target):
     if extra_ram_release_callback is None:
         return 0
-    return extra_ram_release_callback(target, free_active=free_active)
+    return extra_ram_release_callback(target)

comfy/model_base.py

@@ -813,85 +813,6 @@ class StableAudio1(BaseModel):
                 sd["{}{}".format(k, l)] = s[l]
         return sd
 
-class StableAudio3(BaseModel):
-    def __init__(self, model_config, seconds_total_embedder_weights, padding_embedding=None, model_type=ModelType.FLOW, device=None):
-        super().__init__(model_config, model_type, device=device, unet_model=comfy.ldm.audio.dit.AudioDiffusionTransformer)
-        self.seconds_total_embedder = comfy.ldm.audio.embedders.NumberConditioner(768, min_val=0, max_val=384, fourier_features_type=model_config.unet_config["timestep_features_type"])
-        self.seconds_total_embedder.load_state_dict(seconds_total_embedder_weights)
-        if padding_embedding is not None:
-            self.padding_embedding = torch.nn.Parameter(padding_embedding, requires_grad=False)
-        else:
-            self.padding_embedding = None
-
-    def concat_cond(self, **kwargs):
-        noise = kwargs.get("noise", None)
-        image = kwargs.get("concat_latent_image", None)
-
-        if image is None:
-            shape_image = list(noise.shape)
-            image = torch.zeros(shape_image, dtype=noise.dtype, layout=noise.layout, device=noise.device)
-        else:
-            image = self.process_latent_in(image)
-            # TODO: scale if not match
-            image = utils.resize_to_batch_size(image, noise.shape[0])
-
-        mask = kwargs.get("concat_mask", kwargs.get("denoise_mask", None))
-        if mask is None:
-            mask = torch.zeros_like(noise)[:, :1]
-        else:
-            if mask.shape[1] != 1:
-                mask = torch.mean(mask, dim=1, keepdim=True)
-            mask = 1.0 - mask
-            # TODO: scale if not match
-            mask = utils.resize_to_batch_size(mask, noise.shape[0])
-
-        return torch.cat((mask, image), dim=1)
-
-    def extra_conds(self, **kwargs):
-        out = {}
-
-        concat_cond = self.concat_cond(**kwargs)
-        if concat_cond is not None:
-            out['local_add_cond'] = comfy.conds.CONDNoiseShape(concat_cond)
-
-        noise = kwargs.get("noise", None)
-        device = kwargs["device"]
-
-        seconds_total = kwargs.get("seconds_total", int(noise.shape[-1] / 10.7666))
-        seconds_total_embed = self.seconds_total_embedder([seconds_total])[0].to(device)
-
-        global_embed = seconds_total_embed.reshape((1, -1))
-        out['global_embed'] = comfy.conds.CONDRegular(global_embed)
-
-        cross_attn = kwargs.get("cross_attn", None)
-        if cross_attn is not None:
-            cross_attn = cross_attn.to(device)
-            if self.padding_embedding is not None:
-                pe = self.padding_embedding.to(device=device, dtype=cross_attn.dtype)
-                max_text_tokens = self.model_config.unet_config.get("max_text_tokens", 256)
-                n_text = cross_attn.shape[1]
-                if n_text < max_text_tokens:
-                    pad = pe.view(1, 1, -1).expand(cross_attn.shape[0], max_text_tokens - n_text, -1)
-                    cross_attn = torch.cat([cross_attn, pad], dim=1)
-            cross_attn = torch.cat([cross_attn, seconds_total_embed.repeat((cross_attn.shape[0], 1, 1))], dim=1)
-            out['c_crossattn'] = comfy.conds.CONDRegular(cross_attn)
-
-        return out
-
-    def state_dict_for_saving(self, unet_state_dict, clip_state_dict=None, vae_state_dict=None, clip_vision_state_dict=None):
-        sd = super().state_dict_for_saving(unet_state_dict, clip_state_dict=clip_state_dict, vae_state_dict=vae_state_dict, clip_vision_state_dict=clip_vision_state_dict)
-
-        d = {"conditioner.conditioners.seconds_total.": self.seconds_total_embedder.state_dict()}
-
-        for k in d:
-            s = d[k]
-            for l in s:
-                sd["{}{}".format(k, l)] = s[l]
-
-        if self.padding_embedding is not None:
-            sd["conditioner.conditioners.prompt.padding_embedding"] = self.padding_embedding.data
-        return sd
-
 
 class HunyuanDiT(BaseModel):
     def __init__(self, model_config, model_type=ModelType.V_PREDICTION, device=None):

comfy/model_detection.py

@@ -116,45 +116,6 @@ def detect_unet_config(state_dict, key_prefix, metadata=None):
     if '{}transformer.rotary_pos_emb.inv_freq'.format(key_prefix) in state_dict_keys: #stable audio dit
         unet_config = {}
         unet_config["audio_model"] = "dit1.0"
-        unet_config["global_cond_dim"] = state_dict['{}to_global_embed.0.weight'.format(key_prefix)].shape[1]
-        cond_embed = state_dict['{}to_cond_embed.0.weight'.format(key_prefix)]
-        unet_config["project_cond_tokens"] = cond_embed.shape[0] != cond_embed.shape[1]
-        unet_config["embed_dim"] = state_dict['{}to_timestep_embed.0.weight'.format(key_prefix)].shape[0]
-        mem_tokens = state_dict.get('{}transformer.memory_tokens'.format(key_prefix), None)
-        to_qkv = state_dict.get('{}transformer.layers.0.self_attn.to_qkv.weight'.format(key_prefix), None)
-        differential = False
-        if to_qkv is not None:
-            if to_qkv.shape[0] == to_qkv.shape[1] * 5:
-                differential = True
-        if mem_tokens is not None:
-            unet_config["num_memory_tokens"] = mem_tokens.shape[0]
-        if '{}transformer.layers.0.self_attn.q_norm.weight'.format(key_prefix) in state_dict:
-            unet_config["attn_kwargs"] = {"qk_norm": "ln", "feat_scale": True}
-        rms_norm = state_dict.get('{}transformer.layers.0.self_attn.q_norm.gamma'.format(key_prefix), None)
-        if rms_norm is not None:
-            unet_config["attn_kwargs"] = {"qk_norm": "rms", "differential": differential}
-            unet_config["norm_type"] = "rms_norm"
-            unet_config["num_heads"] = unet_config["embed_dim"] // rms_norm.shape[0]
-
-        if '{}timestep_features.weight'.format(key_prefix) in state_dict:
-            unet_config["timestep_features_type"] = "learned"
-        else:
-            unet_config["timestep_features_type"] = "expo"
-
-        io_channels = state_dict['{}postprocess_conv.weight'.format(key_prefix)].shape[0]
-        unet_config["io_channels"] = io_channels
-        unet_config["input_concat_dim"] = state_dict['{}transformer.project_in.weight'.format(key_prefix)].shape[1] - io_channels
-
-        local_add_cond = state_dict.get('{}transformer.layers.0.to_local_embed.0.weight'.format(key_prefix), None)
-        if local_add_cond is not None:
-            unet_config["local_add_cond_dim"] = local_add_cond.shape[1]
-
-        global_cond_embed = state_dict.get('{}transformer.global_cond_embedder.0.weight'.format(key_prefix), None)
-        if global_cond_embed is not None:
-            unet_config["global_cond_shared_embed"] = True
-            unet_config["global_cond_type"] = "adaLN"
-
-        unet_config["depth"] = count_blocks(state_dict_keys, '{}transformer.layers.'.format(key_prefix) + '{}.')
         return unet_config
 
     if '{}double_layers.0.attn.w1q.weight'.format(key_prefix) in state_dict_keys: #aura flow dit

comfy/model_management.py

@@ -31,7 +31,6 @@ from contextlib import nullcontext
 import comfy.memory_management
 import comfy.utils
 import comfy.quant_ops
-import comfy_aimdo.host_buffer
 import comfy_aimdo.vram_buffer
 
 class VRAMState(Enum):
@@ -496,14 +495,6 @@ except:
 
 current_loaded_models = []
 
-DIRTY_MMAPS = set()
-
-PIN_PRESSURE_HYSTERESIS = 256 * 1024 * 1024
-
-#Freeing registerables on pressure does imply a GPU sync, so go big on
-#the hysteresis so each expensive sync gives us back a good chunk.
-REGISTERABLE_PIN_HYSTERESIS = 2048 * 1024 * 1024
-
 def module_size(module):
     module_mem = 0
     sd = module.state_dict()
@@ -512,46 +503,27 @@ def module_size(module):
         module_mem += t.nbytes
     return module_mem
 
-def mark_mmap_dirty(storage):
-    mmap_refs = getattr(storage, "_comfy_tensor_mmap_refs", None)
-    if mmap_refs is not None:
-        DIRTY_MMAPS.add(mmap_refs[0])
-
-def free_pins(size, evict_active=False):
-    freed_total = 0
-    for loaded_model in reversed(current_loaded_models):
-        if size <= 0:
-            return freed_total
-        model = loaded_model.model
-        if model is not None and model.is_dynamic() and (evict_active or not model.model.dynamic_pins[model.load_device]["active"]):
-            freed = model.partially_unload_ram(size)
-            freed_total += freed
-            size -= freed
-    return freed_total
-
-def ensure_pin_budget(size, evict_active=False):
-    shortfall = size + comfy.memory_management.RAM_CACHE_HEADROOM / 2 - psutil.virtual_memory().available
-    if shortfall <= 0:
-        return True
-
-    to_free = shortfall + PIN_PRESSURE_HYSTERESIS
-    return free_pins(to_free, evict_active=evict_active) >= shortfall
-
-def ensure_pin_registerable(size, evict_active=False):
-    shortfall = TOTAL_PINNED_MEMORY + size - MAX_PINNED_MEMORY
-    if MAX_PINNED_MEMORY <= 0:
-        return False
-    if shortfall <= 0:
-        return True
-
-    shortfall += REGISTERABLE_PIN_HYSTERESIS
-    for loaded_model in reversed(current_loaded_models):
-        model = loaded_model.model
-        if model is not None and model.is_dynamic() and (evict_active or not model.model.dynamic_pins[model.load_device]["active"]):
-            shortfall -= model.unregister_inactive_pins(shortfall)
-            if shortfall <= 0:
-                return True
-    return shortfall <= REGISTERABLE_PIN_HYSTERESIS
+def module_mmap_residency(module, free=False):
+    mmap_touched_mem = 0
+    module_mem = 0
+    bounced_mmaps = set()
+    sd = module.state_dict()
+    for k in sd:
+        t = sd[k]
+        module_mem += t.nbytes
+        storage = t._qdata.untyped_storage() if isinstance(t, comfy.quant_ops.QuantizedTensor) else t.untyped_storage()
+        if not getattr(storage, "_comfy_tensor_mmap_touched", False):
+            continue
+        mmap_touched_mem += t.nbytes
+        if not free:
+            continue
+        storage._comfy_tensor_mmap_touched = False
+        mmap_obj = storage._comfy_tensor_mmap_refs[0]
+        if mmap_obj in bounced_mmaps:
+            continue
+        mmap_obj.bounce()
+        bounced_mmaps.add(mmap_obj)
+    return mmap_touched_mem, module_mem
 
 class LoadedModel:
     def __init__(self, model):
@@ -581,6 +553,9 @@ class LoadedModel:
     def model_memory(self):
         return self.model.model_size()
 
+    def model_mmap_residency(self, free=False):
+        return self.model.model_mmap_residency(free=free)
+
     def model_loaded_memory(self):
         return self.model.loaded_size()
 
@@ -660,9 +635,15 @@ WINDOWS = any(platform.win32_ver())
 
 EXTRA_RESERVED_VRAM = 400 * 1024 * 1024
 if WINDOWS:
+    import comfy.windows
     EXTRA_RESERVED_VRAM = 600 * 1024 * 1024 #Windows is higher because of the shared vram issue
     if total_vram > (15 * 1024):  # more extra reserved vram on 16GB+ cards
         EXTRA_RESERVED_VRAM += 100 * 1024 * 1024
+    def get_free_ram():
+        return comfy.windows.get_free_ram()
+else:
+    def get_free_ram():
+        return psutil.virtual_memory().available
 
 if args.reserve_vram is not None:
     EXTRA_RESERVED_VRAM = args.reserve_vram * 1024 * 1024 * 1024
@@ -676,6 +657,7 @@ def minimum_inference_memory():
 
 def free_memory(memory_required, device, keep_loaded=[], for_dynamic=False, pins_required=0, ram_required=0):
     cleanup_models_gc()
+    comfy.memory_management.extra_ram_release(max(pins_required, ram_required))
     unloaded_model = []
     can_unload = []
     unloaded_models = []
@@ -691,9 +673,11 @@ def free_memory(memory_required, device, keep_loaded=[], for_dynamic=False, pins
     for x in can_unload_sorted:
         i = x[-1]
         memory_to_free = 1e32
-        if current_loaded_models[i].model.is_dynamic() and (not DISABLE_SMART_MEMORY or device is None):
+        pins_to_free = 1e32
+        if not DISABLE_SMART_MEMORY or device is None:
             memory_to_free = 0 if device is None else memory_required - get_free_memory(device)
-            if for_dynamic:
+            pins_to_free = pins_required - get_free_ram()
+            if current_loaded_models[i].model.is_dynamic() and for_dynamic:
                 #don't actually unload dynamic models for the sake of other dynamic models
                 #as that works on-demand.
                 memory_required -= current_loaded_models[i].model.loaded_size()
@@ -701,6 +685,18 @@ def free_memory(memory_required, device, keep_loaded=[], for_dynamic=False, pins
         if memory_to_free > 0 and current_loaded_models[i].model_unload(memory_to_free):
             logging.debug(f"Unloading {current_loaded_models[i].model.model.__class__.__name__}")
             unloaded_model.append(i)
+        if pins_to_free > 0:
+            logging.debug(f"PIN Unloading {current_loaded_models[i].model.model.__class__.__name__}")
+            current_loaded_models[i].model.partially_unload_ram(pins_to_free)
+
+    for x in can_unload_sorted:
+        i = x[-1]
+        ram_to_free = ram_required - psutil.virtual_memory().available
+        if ram_to_free <= 0 and i not in unloaded_model:
+            continue
+        resident_memory, _ = current_loaded_models[i].model_mmap_residency(free=True)
+        if resident_memory > 0:
+            logging.debug(f"RAM Unloading {current_loaded_models[i].model.model.__class__.__name__}")
 
     for i in sorted(unloaded_model, reverse=True):
         unloaded_models.append(current_loaded_models.pop(i))
@@ -766,16 +762,29 @@ def load_models_gpu(models, memory_required=0, force_patch_weights=False, minimu
             model_to_unload.model.detach(unpatch_all=False)
             model_to_unload.model_finalizer.detach()
 
+
     total_memory_required = {}
+    total_pins_required = {}
+    total_ram_required = {}
     for loaded_model in models_to_load:
         device = loaded_model.device
         total_memory_required[device] = total_memory_required.get(device, 0) + loaded_model.model_memory_required(device)
+        resident_memory, model_memory = loaded_model.model_mmap_residency()
+        pinned_memory = loaded_model.model.pinned_memory_size()
+        #FIXME: This can over-free the pins as it budgets to pin the entire model. We should
+        #make this JIT to keep as much pinned as possible.
+        pins_required = model_memory - pinned_memory
+        ram_required = model_memory - resident_memory
+        total_pins_required[device] = total_pins_required.get(device, 0) + pins_required
+        total_ram_required[device] = total_ram_required.get(device, 0) + ram_required
 
     for device in total_memory_required:
         if device != torch.device("cpu"):
             free_memory(total_memory_required[device] * 1.1 + extra_mem,
                         device,
-                        for_dynamic=free_for_dynamic)
+                        for_dynamic=free_for_dynamic,
+                        pins_required=total_pins_required[device],
+                        ram_required=total_ram_required[device])
 
     for device in total_memory_required:
         if device != torch.device("cpu"):
@@ -1171,7 +1180,6 @@ STREAM_CAST_BUFFERS = {}
 LARGEST_CASTED_WEIGHT = (None, 0)
 STREAM_AIMDO_CAST_BUFFERS = {}
 LARGEST_AIMDO_CASTED_WEIGHT = (None, 0)
-STREAM_PIN_BUFFERS = {}
 
 DEFAULT_AIMDO_CAST_BUFFER_RESERVATION_SIZE = 16 * 1024 ** 3
 
@@ -1212,66 +1220,21 @@ def get_aimdo_cast_buffer(offload_stream, device):
     if cast_buffer is None:
         cast_buffer = comfy_aimdo.vram_buffer.VRAMBuffer(DEFAULT_AIMDO_CAST_BUFFER_RESERVATION_SIZE, device.index)
         STREAM_AIMDO_CAST_BUFFERS[offload_stream] = cast_buffer
+
     return cast_buffer
-
-def get_pin_buffer(offload_stream):
-    pin_buffer = STREAM_PIN_BUFFERS.get(offload_stream, None)
-    if pin_buffer is None:
-        pin_buffer = comfy_aimdo.host_buffer.HostBuffer(0, 0, pinned_hostbuf_size(8 * 1024**3))
-        STREAM_PIN_BUFFERS[offload_stream] = pin_buffer
-    elif offload_stream is not None:
-        event = getattr(pin_buffer, "_comfy_event", None)
-        if event is not None:
-            event.synchronize()
-            delattr(pin_buffer, "_comfy_event")
-    return pin_buffer
-
-def resize_pin_buffer(pin_buffer, size):
-    global TOTAL_PINNED_MEMORY
-    old_size = pin_buffer.size
-    if size <= old_size:
-        return True
-    growth = size - old_size
-    comfy.memory_management.extra_ram_release(comfy.memory_management.RAM_CACHE_HEADROOM)
-    ensure_pin_budget(growth, evict_active=True)
-    ensure_pin_registerable(growth, evict_active=True)
-    try:
-        pin_buffer.extend(size=size, reallocate=True)
-    except RuntimeError:
-        return False
-    TOTAL_PINNED_MEMORY += pin_buffer.size - old_size
-    return True
-
 def reset_cast_buffers():
-    global TOTAL_PINNED_MEMORY
     global LARGEST_CASTED_WEIGHT
     global LARGEST_AIMDO_CASTED_WEIGHT
 
     LARGEST_CASTED_WEIGHT = (None, 0)
     LARGEST_AIMDO_CASTED_WEIGHT = (None, 0)
-    for offload_stream in set(STREAM_CAST_BUFFERS) | set(STREAM_AIMDO_CAST_BUFFERS) | set(STREAM_PIN_BUFFERS):
+    for offload_stream in set(STREAM_CAST_BUFFERS) | set(STREAM_AIMDO_CAST_BUFFERS):
         if offload_stream is not None:
             offload_stream.synchronize()
     synchronize()
 
-    for mmap_obj in DIRTY_MMAPS:
-        mmap_obj.bounce()
-    DIRTY_MMAPS.clear()
-
-    for pin_buffer in STREAM_PIN_BUFFERS.values():
-        TOTAL_PINNED_MEMORY -= pin_buffer.size
-    TOTAL_PINNED_MEMORY = max(0, TOTAL_PINNED_MEMORY)
-
-    for loaded_model in current_loaded_models:
-        model = loaded_model.model
-        if model is not None and model.is_dynamic():
-            model.model.dynamic_pins[model.load_device]["active"] = False
-            model.partially_unload_ram(1e30, subsets=[ "patches" ])
-            model.model.dynamic_pins[model.load_device]["patches"] = (comfy_aimdo.host_buffer.HostBuffer(0, 8 * 1024 * 1024, pinned_hostbuf_size(model.model_size())), [], [-1], [0])
-
     STREAM_CAST_BUFFERS.clear()
     STREAM_AIMDO_CAST_BUFFERS.clear()
-    STREAM_PIN_BUFFERS.clear()
     soft_empty_cache()
 
 def get_offload_stream(device):
@@ -1317,7 +1280,7 @@ def sync_stream(device, stream):
     current_stream(device).wait_stream(stream)
 
 
-def cast_to_gathered(tensors, r, non_blocking=False, stream=None, r2=None):
+def cast_to_gathered(tensors, r, non_blocking=False, stream=None):
     wf_context = nullcontext()
     if stream is not None:
        wf_context = stream
@@ -1325,20 +1288,17 @@ def cast_to_gathered(tensors, r, non_blocking=False, stream=None, r2=None):
            wf_context = wf_context.as_context(stream)
 
     dest_views = comfy.memory_management.interpret_gathered_like(tensors, r)
-    dest2_views = comfy.memory_management.interpret_gathered_like(tensors, r2) if r2 is not None else None
     with wf_context:
         for tensor in tensors:
             dest_view = dest_views.pop(0)
-            dest2_view = dest2_views.pop(0) if dest2_views is not None else None
             if tensor is None:
                 continue
-            if comfy.memory_management.read_tensor_file_slice_into(tensor, dest_view, stream=stream, destination2=dest2_view):
+            if comfy.memory_management.read_tensor_file_slice_into(tensor, dest_view):
                 continue
             storage = tensor._qdata.untyped_storage() if isinstance(tensor, comfy.quant_ops.QuantizedTensor) else tensor.untyped_storage()
-            mark_mmap_dirty(storage)
+            if hasattr(storage, "_comfy_tensor_mmap_touched"):
+                storage._comfy_tensor_mmap_touched = True
             dest_view.copy_(tensor, non_blocking=non_blocking)
-            if dest2_view is not None:
-                dest2_view.copy_(dest_view, non_blocking=non_blocking)
 
 
 def cast_to(weight, dtype=None, device=None, non_blocking=False, copy=False, stream=None, r=None):
@@ -1379,18 +1339,14 @@ TOTAL_PINNED_MEMORY = 0
 MAX_PINNED_MEMORY = -1
 if not args.disable_pinned_memory:
     if is_nvidia() or is_amd():
-        ram = get_total_memory(torch.device("cpu"))
         if WINDOWS:
-            MAX_PINNED_MEMORY = ram * 0.40  # Windows limit is apparently 50%
+            MAX_PINNED_MEMORY = get_total_memory(torch.device("cpu")) * 0.40  # Windows limit is apparently 50%
         else:
-            MAX_PINNED_MEMORY = ram * 0.90
+            MAX_PINNED_MEMORY = get_total_memory(torch.device("cpu")) * 0.90
         logging.info("Enabled pinned memory {}".format(MAX_PINNED_MEMORY // (1024 * 1024)))
 
 PINNING_ALLOWED_TYPES = set(["Tensor", "Parameter", "QuantizedTensor"])
 
-def pinned_hostbuf_size(size):
-    return max(0, int(min(size, MAX_PINNED_MEMORY) * 2))
-
 def discard_cuda_async_error():
     try:
         a = torch.tensor([1], dtype=torch.uint8, device=get_torch_device())
@@ -1422,8 +1378,8 @@ def pin_memory(tensor):
         return False
 
     size = tensor.nbytes
-    comfy.memory_management.extra_ram_release(comfy.memory_management.RAM_CACHE_HEADROOM)
-    ensure_pin_registerable(size)
+    if (TOTAL_PINNED_MEMORY + size) > MAX_PINNED_MEMORY:
+        return False
 
     ptr = tensor.data_ptr()
     if ptr == 0:
@@ -1460,8 +1416,7 @@ def unpin_memory(tensor):
         return False
 
     if torch.cuda.cudart().cudaHostUnregister(ptr) == 0:
-        size = PINNED_MEMORY.pop(ptr)
-        TOTAL_PINNED_MEMORY -= size
+        TOTAL_PINNED_MEMORY -= PINNED_MEMORY.pop(ptr)
         return True
     else:
         logging.warning("Unpin error.")

comfy/model_patcher.py

@@ -35,7 +35,6 @@ import comfy.model_management
 import comfy.ops
 import comfy.patcher_extension
 import comfy.utils
-import comfy_aimdo.host_buffer
 from comfy.comfy_types import UnetWrapperFunction
 from comfy.quant_ops import QuantizedTensor
 from comfy.patcher_extension import CallbacksMP, PatcherInjection, WrappersMP
@@ -118,8 +117,6 @@ def string_to_seed(data):
     return comfy.utils.string_to_seed(data)
 
 class LowVramPatch:
-    is_lowvram_patch = True
-
     def __init__(self, key, patches, convert_func=None, set_func=None):
         self.key = key
         self.patches = patches
@@ -127,21 +124,11 @@ class LowVramPatch:
         self.set_func = set_func
         self.prepared_patches = None
 
-    def memory_required(self):
-        counter = [0]
-        for patch in self.patches[self.key]:
-            comfy.lora.prefetch_prepared_value(patch[1], counter, None, None, False)
-        return counter[0]
-
-    def prepare(self, destination, stream, copy=True, commit=True):
-        counter = [0]
-        prepared_patches = [
-            (patch[0], comfy.lora.prefetch_prepared_value(patch[1], counter, destination, stream, copy), patch[2], patch[3], patch[4])
+    def prepare(self, allocate_buffer, stream):
+        self.prepared_patches = [
+            (patch[0], comfy.lora.prefetch_prepared_value(patch[1], allocate_buffer, stream), patch[2], patch[3], patch[4])
             for patch in self.patches[self.key]
         ]
-        if commit:
-            self.prepared_patches = prepared_patches
-        return prepared_patches
 
     def clear_prepared(self):
         self.prepared_patches = None
@@ -354,6 +341,9 @@ class ModelPatcher:
         self.size = comfy.model_management.module_size(self.model)
         return self.size
 
+    def model_mmap_residency(self, free=False):
+        return comfy.model_management.module_mmap_residency(self.model, free=free)
+
     def loaded_size(self):
         return self.model.model_loaded_weight_memory
 
@@ -1128,12 +1118,8 @@ class ModelPatcher:
         # Pinned memory pressure tracking is only implemented for DynamicVram loading
         return 0
 
-    def loaded_ram_size(self):
-        # Loaded RAM pressure tracking is only implemented for DynamicVram loading
-        return 0
-
     def partially_unload_ram(self, ram_to_unload):
-        return 0
+        pass
 
     def detach(self, unpatch_all=True):
         self.eject_model()
@@ -1507,30 +1493,27 @@ class ModelPatcher:
         self.unpatch_hooks()
         self.clear_cached_hook_weights()
 
-    def model_state_dict_for_saving(self, model=None, prefix=""):
-        if model is None:
-            model = self.model
-
-        original_state_dict = model.state_dict()
-        output_state_dict = {}
+    def state_dict_for_saving(self, clip_state_dict=None, vae_state_dict=None, clip_vision_state_dict=None):
+        original_state_dict = self.model.diffusion_model.state_dict()
+        unet_state_dict = {}
         keys = list(original_state_dict)
         while len(keys) > 0:
             k = keys.pop(0)
             v = original_state_dict[k]
             op_keys = k.rsplit('.', 1)
             if (len(op_keys) < 2) or op_keys[1] not in ["weight", "bias"]:
-                output_state_dict[k] = v
+                unet_state_dict[k] = v
                 continue
             try:
-                op = comfy.utils.get_attr(model, op_keys[0])
+                op = comfy.utils.get_attr(self.model.diffusion_model, op_keys[0])
             except:
-                output_state_dict[k] = v
+                unet_state_dict[k] = v
                 continue
             if not op or not hasattr(op, "comfy_cast_weights") or \
                 (hasattr(op, "comfy_patched_weights") and op.comfy_patched_weights == True):
-                output_state_dict[k] = v
+                unet_state_dict[k] = v
                 continue
-            key = prefix + k
+            key = "diffusion_model." + k
             weight = comfy.utils.get_attr(self.model, key)
             if isinstance(weight, QuantizedTensor) and k in original_state_dict:
                 qt_state_dict = weight.state_dict(k)
@@ -1538,14 +1521,10 @@ class ModelPatcher:
                 for group_key in (x for x in qt_state_dict if x in original_state_dict):
                     if group_key in keys:
                         keys.remove(group_key)
-                    output_state_dict.pop(group_key, "")
-                    output_state_dict[group_key] = LazyCastingParamPiece(caster, prefix + group_key, original_state_dict[group_key])
+                    unet_state_dict.pop(group_key, "")
+                    unet_state_dict[group_key] = LazyCastingParamPiece(caster, "diffusion_model." + group_key, original_state_dict[group_key])
                 continue
-            output_state_dict[k] = LazyCastingParam(self, key, weight)
-        return output_state_dict
-
-    def state_dict_for_saving(self, clip_state_dict=None, vae_state_dict=None, clip_vision_state_dict=None):
-        unet_state_dict = self.model_state_dict_for_saving(self.model.diffusion_model, "diffusion_model.")
+            unet_state_dict[k] = LazyCastingParam(self, key, weight)
         return self.model.state_dict_for_saving(unet_state_dict, clip_state_dict=clip_state_dict, vae_state_dict=vae_state_dict, clip_vision_state_dict=clip_vision_state_dict)
 
     def __del__(self):
@@ -1564,16 +1543,6 @@ class ModelPatcherDynamic(ModelPatcher):
         super().__init__(model, load_device, offload_device, size, weight_inplace_update)
         if not hasattr(self.model, "dynamic_vbars"):
             self.model.dynamic_vbars = {}
-        if not hasattr(self.model, "dynamic_pins"):
-            self.model.dynamic_pins = {}
-        if self.load_device not in self.model.dynamic_pins:
-            self.model.dynamic_pins[self.load_device] = {
-                "weights": (comfy_aimdo.host_buffer.HostBuffer(0, 0, 0), [], [-1], [0]),
-                "patches": (comfy_aimdo.host_buffer.HostBuffer(0, 0, 0), [], [-1], [0]),
-                "hostbufs_initialized": False,
-                "failed": False,
-                "active": False,
-            }
         self.non_dynamic_delegate_model = None
         assert load_device is not None
 
@@ -1613,16 +1582,6 @@ class ModelPatcherDynamic(ModelPatcher):
         #use all ModelPatcherDynamic this is ignored and its all done dynamically.
         return super().memory_required(input_shape=input_shape) * 1.3 + (1024 ** 3)
 
-    def restore_loaded_backups(self):
-        restored = self.model.model_loaded_weight_memory
-        for key in list(self.backup.keys()):
-            bk = self.backup.pop(key)
-            comfy.utils.set_attr_param(self.model, key, bk.weight)
-        for key in list(self.backup_buffers.keys()):
-            comfy.utils.set_attr_buffer(self.model, key, self.backup_buffers.pop(key))
-        self.model.model_loaded_weight_memory = 0
-        return restored
-
 
     def load(self, device_to=None, lowvram_model_memory=0, force_patch_weights=False, full_load=False, dirty=False):
 
@@ -1639,20 +1598,12 @@ class ModelPatcherDynamic(ModelPatcher):
 
         num_patches = 0
         allocated_size = 0
-        self.restore_loaded_backups()
+        self.model.model_loaded_weight_memory = 0
 
         with self.use_ejected():
             self.unpatch_hooks()
 
             vbar = self._vbar_get(create=True)
-            pin_state = self.model.dynamic_pins[self.load_device]
-            if not pin_state["hostbufs_initialized"]:
-                hostbuf_size = comfy.model_management.pinned_hostbuf_size(self.model_size())
-                pin_state["weights"] = (comfy_aimdo.host_buffer.HostBuffer(0, 64 * 1024 * 1024, hostbuf_size), [], [-1], [0])
-                pin_state["patches"] = (comfy_aimdo.host_buffer.HostBuffer(0, 8 * 1024 * 1024, hostbuf_size), [], [-1], [0])
-                pin_state["hostbufs_initialized"] = True
-            pin_state["failed"] = False
-            pin_state["active"] = True
             if vbar is not None:
                 vbar.prioritize()
 
@@ -1678,9 +1629,7 @@ class ModelPatcherDynamic(ModelPatcher):
                     if key in self.patches:
                         if comfy.lora.calculate_shape(self.patches[key], weight, key) != weight.shape:
                             return (True, 0)
-                        lowvram_patch = LowVramPatch(key, self.patches)
-                        lowvram_patch._pin_state = pin_state
-                        setattr(m, param_key + "_lowvram_function", lowvram_patch)
+                        setattr(m, param_key + "_lowvram_function", LowVramPatch(key, self.patches))
                         num_patches += 1
                     else:
                         setattr(m, param_key + "_lowvram_function", None)
@@ -1697,9 +1646,6 @@ class ModelPatcherDynamic(ModelPatcher):
 
                 def force_load_param(self, param_key, device_to):
                     key = key_param_name_to_key(n, param_key)
-                    weight, _, _ = get_key_weight(self.model, key)
-                    if weight is None:
-                        return
                     if key in self.backup:
                         comfy.utils.set_attr_param(self.model, key, self.backup[key].weight)
                     self.patch_weight_to_device(key, device_to=device_to, force_cast=True)
@@ -1709,26 +1655,17 @@ class ModelPatcherDynamic(ModelPatcher):
 
                 if hasattr(m, "comfy_cast_weights"):
                     m.comfy_cast_weights = True
+                    m.pin_failed = False
                     m.seed_key = n
-                    m._pin_state = pin_state
                     set_dirty(m, dirty)
 
-                    #Models that mix tiny and giant weights can causing lopsided stream buffer
-                    #rotations and stall. force the tinys over.
-                    if module_mem > 16 * 1024:
-                        force_load, v_weight_size = setup_param(self, m, n, "weight")
-                        force_load_bias, v_weight_bias = setup_param(self, m, n, "bias")
-                        force_load = force_load or force_load_bias
-                        v_weight_size += v_weight_bias
-                        if force_load:
-                            logging.info(f"Module {n} has resizing Lora - force loading")
-                    else:
-                        force_load=True
+                    force_load, v_weight_size = setup_param(self, m, n, "weight")
+                    force_load_bias, v_weight_bias = setup_param(self, m, n, "bias")
+                    force_load = force_load or force_load_bias
+                    v_weight_size += v_weight_bias
 
                     if force_load:
-                        if hasattr(m, "_v"):
-                            comfy_aimdo.model_vbar.vbar_unpin(m._v)
-                            delattr(m, "_v")
+                        logging.info(f"Module {n} has resizing Lora - force loading")
                         force_load_param(self, "weight", device_to)
                         force_load_param(self, "bias", device_to)
                     else:
@@ -1786,62 +1723,33 @@ class ModelPatcherDynamic(ModelPatcher):
         freed = 0 if vbar is None else vbar.free_memory(memory_to_free)
 
         if freed < memory_to_free:
-            freed += self.restore_loaded_backups()
+            for key in list(self.backup.keys()):
+                bk = self.backup.pop(key)
+                comfy.utils.set_attr_param(self.model, key, bk.weight)
+            for key in list(self.backup_buffers.keys()):
+                comfy.utils.set_attr_buffer(self.model, key, self.backup_buffers.pop(key))
+            freed += self.model.model_loaded_weight_memory
+            self.model.model_loaded_weight_memory = 0
 
         return freed
 
-    def loaded_ram_size(self):
-        return (self.model.dynamic_pins[self.load_device]["weights"][0].size +
-                self.model.dynamic_pins[self.load_device]["patches"][0].size)
-
     def pinned_memory_size(self):
-        return (self.model.dynamic_pins[self.load_device]["weights"][3][0] +
-                self.model.dynamic_pins[self.load_device]["patches"][3][0])
+        total = 0
+        loading = self._load_list(for_dynamic=True)
+        for x in loading:
+            _, _, _, _, m, _ = x
+            pin = comfy.pinned_memory.get_pin(m)
+            if pin is not None:
+                total += pin.numel() * pin.element_size()
+        return total
 
-    def unregister_inactive_pins(self, ram_to_unload, subsets=[ "weights", "patches" ]):
-        freed = 0
-        pin_state = self.model.dynamic_pins[self.load_device]
-        for subset in subsets:
-            hostbuf, stack, stack_split, pinned_size = pin_state[subset]
-            split = stack_split[0]
-            while split >= 0:
-                module, offset = stack[split]
-                split -= 1
-                stack_split[0] = split
-                if not module._pin_registered:
-                    continue
-                size = module._pin.numel() * module._pin.element_size()
-                if torch.cuda.cudart().cudaHostUnregister(module._pin.data_ptr()) != 0:
-                    comfy.model_management.discard_cuda_async_error()
-                    continue
-                module._pin_registered = False
-                comfy.model_management.TOTAL_PINNED_MEMORY = max(0, comfy.model_management.TOTAL_PINNED_MEMORY - size)
-                pinned_size[0] = max(0, pinned_size[0] - size)
-                freed += size
-                ram_to_unload -= size
-                if ram_to_unload <= 0:
-                    return freed
-        return freed
-
-    def partially_unload_ram(self, ram_to_unload, subsets=[ "weights", "patches" ]):
-        freed = 0
-        pin_state = self.model.dynamic_pins[self.load_device]
-        for subset in subsets:
-            hostbuf, stack, stack_split, pinned_size = pin_state[subset]
-            while len(stack) > 0:
-                module, offset = stack.pop()
-                size = module._pin.numel() * module._pin.element_size()
-                del module._pin
-                hostbuf.truncate(offset, do_unregister=module._pin_registered)
-                stack_split[0] = min(stack_split[0], len(stack) - 1)
-                if module._pin_registered:
-                    comfy.model_management.TOTAL_PINNED_MEMORY = max(0, comfy.model_management.TOTAL_PINNED_MEMORY - size)
-                    pinned_size[0] = max(0, pinned_size[0] - size)
-                freed += size
-                ram_to_unload -= size
-                if ram_to_unload <= 0:
-                    return freed
-        return freed
+    def partially_unload_ram(self, ram_to_unload):
+        loading = self._load_list(for_dynamic=True, default_device=self.offload_device)
+        for x in loading:
+            *_, m, _ = x
+            ram_to_unload -= comfy.pinned_memory.unpin_memory(m)
+            if ram_to_unload <= 0:
+                return
 
     def patch_model(self, device_to=None, lowvram_model_memory=0, load_weights=True, force_patch_weights=False):
         #This isn't used by the core at all and can only be to load a model out of

comfy/ops.py

@@ -75,8 +75,6 @@ except:
 
 cast_to = comfy.model_management.cast_to #TODO: remove once no more references
 
-STREAM_PIN_BUFFER_HEADROOM = 8 * 1024 * 1024
-
 def cast_to_input(weight, input, non_blocking=False, copy=True):
     return comfy.model_management.cast_to(weight, input.dtype, input.device, non_blocking=non_blocking, copy=copy)
 
@@ -93,9 +91,6 @@ def cast_modules_with_vbar(comfy_modules, dtype, device, bias_dtype, non_blockin
     offload_stream = None
     cast_buffer = None
     cast_buffer_offset = 0
-    stream_pin_hostbuf = None
-    stream_pin_offset = 0
-    stream_pin_queue = []
 
     def ensure_offload_stream(module, required_size, check_largest):
         nonlocal offload_stream
@@ -129,22 +124,6 @@ def cast_modules_with_vbar(comfy_modules, dtype, device, bias_dtype, non_blockin
         cast_buffer_offset += buffer_size
         return buffer
 
-    def get_stream_pin_buffer_offset(buffer_size):
-        nonlocal stream_pin_hostbuf
-        nonlocal stream_pin_offset
-
-        if buffer_size == 0 or offload_stream is None:
-            return None
-
-        if stream_pin_hostbuf is None:
-            stream_pin_hostbuf = comfy.model_management.get_pin_buffer(offload_stream)
-            if stream_pin_hostbuf is None:
-                return None
-
-        offset = stream_pin_offset
-        stream_pin_offset += buffer_size
-        return offset
-
     for s in comfy_modules:
         signature = comfy_aimdo.model_vbar.vbar_fault(s._v)
         resident = comfy_aimdo.model_vbar.vbar_signature_compare(signature, s._v_signature)
@@ -183,47 +162,23 @@ def cast_modules_with_vbar(comfy_modules, dtype, device, bias_dtype, non_blockin
         if xfer_dest is None:
             xfer_dest = get_cast_buffer(dest_size)
 
-        def cast_maybe_lowvram_patch(xfer_source, xfer_dest, stream):
-            if xfer_source is not None:
-                if getattr(xfer_source, "is_lowvram_patch", False):
-                    xfer_source.prepare(xfer_dest, stream, copy=True, commit=False)
-                else:
-                    comfy.model_management.cast_to_gathered(xfer_source, xfer_dest, non_blocking=non_blocking, stream=stream)
+        if signature is None and pin is None:
+            comfy.pinned_memory.pin_memory(s)
+            pin = comfy.pinned_memory.get_pin(s)
+        else:
+            pin = None
 
-        def handle_pin(m, pin, source, dest, subset="weights", size=None):
-            if pin is not None:
-                cast_maybe_lowvram_patch([pin], dest, offload_stream)
-                return
-            if signature is None:
-                comfy.pinned_memory.pin_memory(m, subset=subset, size=size)
-                pin = comfy.pinned_memory.get_pin(m, subset=subset)
-                if pin is not None:
-                    if isinstance(source, list):
-                        comfy.model_management.cast_to_gathered(source, pin, non_blocking=non_blocking, stream=offload_stream, r2=dest)
-                    else:
-                        cast_maybe_lowvram_patch(source, pin, None)
-                        cast_maybe_lowvram_patch([ pin ], dest, offload_stream)
-                    return
-            if pin is None:
-                pin_offset = get_stream_pin_buffer_offset(size)
-                if pin_offset is not None:
-                    stream_pin_queue.append((source, pin_offset, size, dest))
-                    return
-            cast_maybe_lowvram_patch(source, dest, offload_stream)
-
-        handle_pin(s, pin, xfer_source, xfer_dest, size=dest_size)
+        if pin is not None:
+            comfy.model_management.cast_to_gathered(xfer_source, pin)
+            xfer_source = [ pin ]
+        #send it over
+        comfy.model_management.cast_to_gathered(xfer_source, xfer_dest, non_blocking=non_blocking, stream=offload_stream)
 
         for param_key in ("weight", "bias"):
-            lowvram_source = getattr(s, param_key + "_lowvram_function", None)
-            if lowvram_source is not None:
+            lowvram_fn = getattr(s, param_key + "_lowvram_function", None)
+            if lowvram_fn is not None:
                 ensure_offload_stream(s, cast_buffer_offset, False)
-                lowvram_size = lowvram_source.memory_required()
-                lowvram_dest = get_cast_buffer(lowvram_size)
-                lowvram_source.prepare(lowvram_dest, None, copy=False, commit=True)
-
-                pin = comfy.pinned_memory.get_pin(lowvram_source, subset="patches")
-                handle_pin(lowvram_source, pin, lowvram_source, lowvram_dest, subset="patches", size=lowvram_size)
-
+                lowvram_fn.prepare(lambda size: get_cast_buffer(size), offload_stream)
 
         prefetch["xfer_dest"] = xfer_dest
         prefetch["cast_dest"] = cast_dest
@@ -231,23 +186,6 @@ def cast_modules_with_vbar(comfy_modules, dtype, device, bias_dtype, non_blockin
         prefetch["needs_cast"] = needs_cast
         s._prefetch = prefetch
 
-    if stream_pin_offset > 0:
-        if stream_pin_hostbuf.size < stream_pin_offset:
-            if not comfy.model_management.resize_pin_buffer(stream_pin_hostbuf, stream_pin_offset + STREAM_PIN_BUFFER_HEADROOM):
-                for xfer_source, _, _, xfer_dest in stream_pin_queue:
-                    cast_maybe_lowvram_patch(xfer_source, xfer_dest, offload_stream)
-                return offload_stream
-        stream_pin_tensor = comfy_aimdo.torch.hostbuf_to_tensor(stream_pin_hostbuf)
-        stream_pin_tensor.untyped_storage()._comfy_hostbuf = stream_pin_hostbuf
-        for xfer_source, pin_offset, pin_size, xfer_dest in stream_pin_queue:
-            pin = stream_pin_tensor[pin_offset:pin_offset + pin_size]
-            if isinstance(xfer_source, list):
-                comfy.model_management.cast_to_gathered(xfer_source, pin, non_blocking=non_blocking, stream=offload_stream, r2=xfer_dest)
-            else:
-                cast_maybe_lowvram_patch(xfer_source, pin, None)
-                comfy.model_management.cast_to_gathered([ pin ], xfer_dest, non_blocking=non_blocking, stream=offload_stream)
-        stream_pin_hostbuf._comfy_event = offload_stream.record_event()
-
     return offload_stream
 
 
@@ -322,7 +260,7 @@ def resolve_cast_module_with_vbar(s, dtype, device, bias_dtype, compute_dtype, w
 
 
 def cast_bias_weight(s, input=None, dtype=None, device=None, bias_dtype=None, offloadable=False, compute_dtype=None, want_requant=False):
-    # NOTE: offloadable=False is a legacy mode and if you are a custom node author reading this please pass
+    # NOTE: offloadable=False is a a legacy and if you are a custom node author reading this please pass
     # offloadable=True and call uncast_bias_weight() after your last usage of the weight/bias. This
     # will add async-offload support to your cast and improve performance.
     if input is not None:

comfy/pinned_memory.py

@@ -2,62 +2,42 @@ import comfy.model_management
 import comfy.memory_management
 import comfy_aimdo.host_buffer
 import comfy_aimdo.torch
-import torch
 
 from comfy.cli_args import args
 
-def get_pin(module, subset="weights"):
-    pin = getattr(module, "_pin", None)
-    if pin is None or module._pin_registered or args.disable_pinned_memory:
-        return pin
+def get_pin(module):
+    return getattr(module, "_pin", None)
 
-    _, _, stack_split, pinned_size = module._pin_state[subset]
-    size = pin.nbytes
-    comfy.model_management.ensure_pin_registerable(size)
-
-    if torch.cuda.cudart().cudaHostRegister(pin.data_ptr(), size, 1) != 0:
-        comfy.model_management.discard_cuda_async_error()
-        return pin
-
-    module._pin_registered = True
-    stack_split[0] = max(stack_split[0], module._pin_stack_index)
-    comfy.model_management.TOTAL_PINNED_MEMORY += size
-    pinned_size[0] += size
-    return pin
-
-def pin_memory(module, subset="weights", size=None):
-    pin_state = module._pin_state
-    if args.disable_pinned_memory:
+def pin_memory(module):
+    if module.pin_failed or args.disable_pinned_memory or get_pin(module) is not None:
         return
 
-    pin = get_pin(module, subset)
-    if pin is not None or pin_state["failed"]:
-        return
+    size = comfy.memory_management.vram_aligned_size([ module.weight, module.bias ])
 
-    hostbuf, stack, stack_split, pinned_size = pin_state[subset]
-    if size is None:
-        size = comfy.memory_management.vram_aligned_size([ module.weight, module.bias ])
-    offset = hostbuf.size
-    registerable_size = size + max(0, hostbuf.size - pinned_size[0])
-
-    comfy.memory_management.extra_ram_release(comfy.memory_management.RAM_CACHE_HEADROOM)
-    if (not comfy.model_management.ensure_pin_budget(size) or
-        not comfy.model_management.ensure_pin_registerable(registerable_size)):
-        pin_state["failed"] = True
+    if comfy.model_management.MAX_PINNED_MEMORY <= 0 or (comfy.model_management.TOTAL_PINNED_MEMORY + size) > comfy.model_management.MAX_PINNED_MEMORY:
+        module.pin_failed = True
         return False
 
     try:
-        hostbuf.extend(size=size)
+        hostbuf = comfy_aimdo.host_buffer.HostBuffer(size)
     except RuntimeError:
-        pin_state["failed"] = True
+        module.pin_failed = True
         return False
 
-    module._pin = comfy_aimdo.torch.hostbuf_to_tensor(hostbuf)[offset:offset + size]
-    module._pin.untyped_storage()._comfy_hostbuf = hostbuf
-    stack.append((module, offset))
-    module._pin_registered = True
-    module._pin_stack_index = len(stack) - 1
-    stack_split[0] = max(stack_split[0], module._pin_stack_index)
+    module._pin = comfy_aimdo.torch.hostbuf_to_tensor(hostbuf)
+    module._pin_hostbuf = hostbuf
     comfy.model_management.TOTAL_PINNED_MEMORY += size
-    pinned_size[0] += size
     return True
+
+def unpin_memory(module):
+    if get_pin(module) is None:
+        return 0
+    size = module._pin.numel() * module._pin.element_size()
+
+    comfy.model_management.TOTAL_PINNED_MEMORY -= size
+    if comfy.model_management.TOTAL_PINNED_MEMORY < 0:
+        comfy.model_management.TOTAL_PINNED_MEMORY = 0
+
+    del module._pin
+    del module._pin_hostbuf
+    return size

comfy/sample.py

@@ -37,12 +37,11 @@ def prepare_noise(latent_image, seed, noise_inds=None):
 
     return noises
 
-def fix_empty_latent_channels(model, latent_image, downscale_ratio_spacial=None, downscale_ratio_temporal=None):
+def fix_empty_latent_channels(model, latent_image, downscale_ratio_spacial=None):
     if latent_image.is_nested:
         return latent_image
     latent_format = model.get_model_object("latent_format") #Resize the empty latent image so it has the right number of channels
-    is_empty = torch.count_nonzero(latent_image) == 0
-    if is_empty:
+    if torch.count_nonzero(latent_image) == 0:
         if latent_format.latent_channels != latent_image.shape[1]:
             latent_image = comfy.utils.repeat_to_batch_size(latent_image, latent_format.latent_channels, dim=1)
         if downscale_ratio_spacial is not None:
@@ -52,13 +51,6 @@ def fix_empty_latent_channels(model, latent_image, downscale_ratio_spacial=None,
 
     if latent_format.latent_dimensions == 3 and latent_image.ndim == 4:
         latent_image = latent_image.unsqueeze(2)
-
-    if is_empty and downscale_ratio_temporal is not None:
-        if downscale_ratio_temporal != latent_format.temporal_downscale_ratio:
-            ratio = downscale_ratio_temporal / latent_format.temporal_downscale_ratio
-            new_t = max(1, round(latent_image.shape[2] * ratio))
-            latent_image = comfy.utils.repeat_to_batch_size(latent_image, new_t, dim=2)
-
     return latent_image
 
 def prepare_sampling(model, noise_shape, positive, negative, noise_mask):

comfy/sd.py

@@ -21,7 +21,6 @@ import comfy.ldm.ace.vae.music_dcae_pipeline
 import comfy.ldm.cogvideo.vae
 import comfy.ldm.hunyuan_video.vae
 import comfy.ldm.mmaudio.vae.autoencoder
-import comfy.ldm.audio.vae_sa3
 import comfy.pixel_space_convert
 import comfy.weight_adapter
 import yaml
@@ -68,7 +67,6 @@ import comfy.text_encoders.qwen35
 import comfy.text_encoders.ernie
 import comfy.text_encoders.gemma4
 import comfy.text_encoders.cogvideo
-import comfy.text_encoders.sa3
 
 import comfy.model_patcher
 import comfy.lora
@@ -425,13 +423,6 @@ class CLIP:
             sd_clip[k] = sd_tokenizer[k]
         return sd_clip
 
-    def state_dict_for_saving(self):
-        sd_clip = self.patcher.model_state_dict_for_saving()
-        sd_tokenizer = self.tokenizer.state_dict()
-        for k in sd_tokenizer:
-            sd_clip[k] = sd_tokenizer[k]
-        return sd_clip
-
     def load_model(self, tokens={}):
         memory_used = 0
         if hasattr(self.cond_stage_model, "memory_estimation_function"):
@@ -856,34 +847,6 @@ class VAE:
                 self.working_dtypes = [torch.float32]
                 self.disable_offload = True
                 self.extra_1d_channel = 16
-            elif "decoder.layers.3.transformers.0.pre_norm.alpha" in sd:  # Stable Audio 3 VAE
-                if "decoder.layers.3.transformers.11.self_attn.to_out.weight" in sd:
-                    config = {"channels": 256, "transformer_depths": 12, "sinusoidal_blocks": 8,
-                              "sliding_window": [1, 1], "decoder_conv_mapping": False,
-                              "chunk_size": 128, "chunk_midpoint_shift": False}
-                    self.memory_used_encode = lambda shape, dtype: (1500 * shape[2]) * model_management.dtype_size(dtype)
-                    self.memory_used_decode = lambda shape, dtype: (1500 * shape[2] * 4096) * model_management.dtype_size(dtype)
-                else:
-                    config = {"channels": 128, "transformer_depths": 6, "sinusoidal_blocks": 0,
-                              "sliding_window": None, "decoder_conv_mapping": True,
-                              "chunk_size": 32, "chunk_midpoint_shift": True}
-                    self.memory_used_encode = lambda shape, dtype: (72 * shape[2]) * model_management.dtype_size(dtype)
-                    self.memory_used_decode = lambda shape, dtype: (72 * shape[2] * 4096) * model_management.dtype_size(dtype)
-
-                self.first_stage_model = comfy.ldm.audio.vae_sa3.SA3AudioVAE(**config)
-                self.latent_channels = 256
-                self.output_channels = 2
-                self.upscale_ratio = 4096
-                self.downscale_ratio = 4096
-                self.latent_dim = 1
-                self.audio_sample_rate = 44100
-                self.process_output = lambda audio: audio
-                self.process_input = lambda audio: audio
-                self.working_dtypes = [torch.bfloat16, torch.float16, torch.float32]
-                #This VAE has Parameters and Buffers the non-dynamic caster cannot handle
-                #Force cast it for --disable-dynamic-vram users until there is a true core fix.
-                if not comfy.memory_management.aimdo_enabled:
-                    self.disable_offload = True
             else:
                 logging.warning("WARNING: No VAE weights detected, VAE not initalized.")
                 self.first_stage_model = None
@@ -1320,7 +1283,6 @@ class TEModel(Enum):
     GEMMA_4_E4B = 29
     GEMMA_4_E2B = 30
     GEMMA_4_31B = 31
-    T5_GEMMA = 32
 
 
 def detect_te_model(sd):
@@ -1345,8 +1307,6 @@ def detect_te_model(sd):
         if weight.shape[0] == 384:
             return TEModel.BYT5_SMALL_GLYPH
         return TEModel.T5_BASE
-    if "model.encoder.layers.0.pre_self_attn_layernorm.weight" in sd:
-        return TEModel.T5_GEMMA
     if 'model.layers.0.post_feedforward_layernorm.weight' in sd:
         if 'model.layers.59.self_attn.q_norm.weight' in sd:
             return TEModel.GEMMA_4_31B
@@ -1496,10 +1456,6 @@ def load_text_encoder_state_dicts(state_dicts=[], embedding_directory=None, clip
             else:
                 clip_target.clip = comfy.text_encoders.sa_t5.SAT5Model
                 clip_target.tokenizer = comfy.text_encoders.sa_t5.SAT5Tokenizer
-        elif te_model == TEModel.T5_GEMMA:
-            clip_target.clip = comfy.text_encoders.sa3.SAT5GemmaModel
-            clip_target.tokenizer = comfy.text_encoders.sa3.SAT5GemmaTokenizer
-            tokenizer_data["spiece_model"] = clip_data[0].get("spiece_model", None)
         elif te_model in (TEModel.GEMMA_4_E4B, TEModel.GEMMA_4_E2B, TEModel.GEMMA_4_31B):
             variant = {TEModel.GEMMA_4_E4B: comfy.text_encoders.gemma4.Gemma4_E4B,
                        TEModel.GEMMA_4_E2B: comfy.text_encoders.gemma4.Gemma4_E2B,
@@ -1952,7 +1908,7 @@ def save_checkpoint(output_path, model, clip=None, vae=None, clip_vision=None, m
     load_models = [model]
     if clip is not None:
         load_models.append(clip.load_model())
-        clip_sd = clip.state_dict_for_saving()
+        clip_sd = clip.get_sd()
     vae_sd = None
     if vae is not None:
         vae_sd = vae.get_sd()

comfy/supported_models.py

@@ -7,7 +7,6 @@ from . import sdxl_clip
 import comfy.text_encoders.sd2_clip
 import comfy.text_encoders.sd3_clip
 import comfy.text_encoders.sa_t5
-import comfy.text_encoders.sa3
 import comfy.text_encoders.aura_t5
 import comfy.text_encoders.pixart_t5
 import comfy.text_encoders.hydit
@@ -604,29 +603,6 @@ class StableAudio(supported_models_base.BASE):
     def clip_target(self, state_dict={}):
         return supported_models_base.ClipTarget(comfy.text_encoders.sa_t5.SAT5Tokenizer, comfy.text_encoders.sa_t5.SAT5Model)
 
-class StableAudio3(StableAudio):
-    unet_config = {
-        "audio_model": "dit1.0",
-        "global_cond_shared_embed": True,
-    }
-
-    sampling_settings = {
-        "multiplier": 1.0,
-        "shift": 2.0,
-    }
-
-    latent_format = latent_formats.StableAudio3
-
-    memory_usage_factor = 7
-
-    def get_model(self, state_dict, prefix="", device=None):
-        seconds_total_sd = utils.state_dict_prefix_replace(state_dict, {"conditioner.conditioners.seconds_total.": ""}, filter_keys=True)
-        padding_embedding = state_dict.get("conditioner.conditioners.prompt.padding_embedding", None)
-        return model_base.StableAudio3(self, seconds_total_embedder_weights=seconds_total_sd, padding_embedding=padding_embedding, device=device)
-
-    def clip_target(self, state_dict={}):
-        return supported_models_base.ClipTarget(comfy.text_encoders.sa3.SAT5GemmaTokenizer, comfy.text_encoders.sa3.SAT5GemmaModel)
-
 class AuraFlow(supported_models_base.BASE):
     unet_config = {
         "cond_seq_dim": 2048,
@@ -2042,7 +2018,6 @@ models = [
     SV3D_u,
     SV3D_p,
     SD3,
-    StableAudio3,
     StableAudio,
     AuraFlow,
     PixArtAlpha,

comfy/text_encoders/sa3.py

@@ -1,207 +0,0 @@
-import torch
-import torch.nn as nn
-from comfy import sd1_clip
-from comfy.text_encoders.llama import Attention as LlamaAttention, RMSNorm, MLP, precompute_freqs_cis, apply_rope, _make_scaled_embedding
-from comfy.text_encoders.spiece_tokenizer import SPieceTokenizer
-
-
-class T5GemmaEncoderConfig:
-    def __init__(self):
-        self.vocab_size = 256000
-        self.hidden_size = 768
-        self.intermediate_size = 2048
-        self.num_hidden_layers = 12
-        self.num_attention_heads = 12
-        self.num_key_value_heads = 12
-        self.head_dim = 64
-        self.rms_norm_eps = 1e-6
-        self.rms_norm_add = False
-        self.rope_theta = 10000.0
-        self.attn_logit_softcapping = 50.0
-        self.query_pre_attn_scalar = 64
-        self.sliding_window = 4096
-        self.mlp_activation = "gelu_pytorch_tanh"
-        self.layer_types = ["sliding_attention", "full_attention"] * 6
-        self.qkv_bias = False
-        self.q_norm = None
-        self.k_norm = None
-        self.rms_norm_add = True
-
-
-class T5GemmaAttention(LlamaAttention):
-    """Reuses LlamaAttention projection setup; overrides forward for softcap attention.
-
-    T5Gemma applies tanh(QK^T * scale / cap) * cap between the matmul and softmax.
-    This nonlinearity is incompatible with fused SDPA kernels, so attention is
-    computed manually. Everything else (projections, RoPE, GQA expansion) is identical
-    to LlamaAttention so __init__ is inherited unchanged.
-    """
-
-    def __init__(self, config, device=None, dtype=None, ops=None):
-        super().__init__(config, device=device, dtype=dtype, ops=ops)
-        self.scale = config.query_pre_attn_scalar ** -0.5
-        self.softcap = config.attn_logit_softcapping
-
-    def forward(self, hidden_states, attention_mask=None, freqs_cis=None, **kwargs):
-        B, S, _ = hidden_states.shape
-        xq = self.q_proj(hidden_states).view(B, S, self.num_heads, self.head_dim).transpose(1, 2)
-        xk = self.k_proj(hidden_states).view(B, S, self.num_kv_heads, self.head_dim).transpose(1, 2)
-        xv = self.v_proj(hidden_states).view(B, S, self.num_kv_heads, self.head_dim).transpose(1, 2)
-        xq, xk = apply_rope(xq, xk, freqs_cis)
-        xk = xk.repeat_interleave(self.num_heads // self.num_kv_heads, dim=1)
-        xv = xv.repeat_interleave(self.num_heads // self.num_kv_heads, dim=1)
-        attn = torch.matmul(xq * self.scale, xk.transpose(-2, -1))
-        attn = torch.tanh(attn / self.softcap) * self.softcap
-        if attention_mask is not None:
-            attn = attn + attention_mask
-        attn = torch.nn.functional.softmax(attn.float(), dim=-1).to(xq.dtype)
-        out = torch.matmul(attn, xv).transpose(1, 2).reshape(B, S, self.inner_size)
-        return self.o_proj(out), None
-
-
-class T5GemmaBlock(nn.Module):
-    def __init__(self, config, layer_type, device=None, dtype=None, ops=None):
-        super().__init__()
-        self.self_attn = T5GemmaAttention(config, device=device, dtype=dtype, ops=ops)
-        self.mlp = MLP(config, device=device, dtype=dtype, ops=ops)
-        # Names match checkpoint keys: model.encoder.layers.X.<name>.weight
-        self.pre_self_attn_layernorm = RMSNorm(config.hidden_size, eps=config.rms_norm_eps, add=True, device=device, dtype=dtype)
-        self.post_self_attn_layernorm = RMSNorm(config.hidden_size, eps=config.rms_norm_eps, add=True, device=device, dtype=dtype)
-        self.pre_feedforward_layernorm = RMSNorm(config.hidden_size, eps=config.rms_norm_eps, add=True, device=device, dtype=dtype)
-        self.post_feedforward_layernorm = RMSNorm(config.hidden_size, eps=config.rms_norm_eps, add=True, device=device, dtype=dtype)
-        self.is_sliding = (layer_type == "sliding_attention")
-        self.sliding_window = config.sliding_window
-
-    def forward(self, x, attention_mask=None, freqs_cis=None):
-        attn_mask = attention_mask
-        if self.is_sliding and x.shape[1] > self.sliding_window:
-            S = x.shape[1]
-            pos = torch.arange(S, device=x.device)
-            dist = (pos.unsqueeze(0) - pos.unsqueeze(1)).abs()
-            sw_mask = torch.zeros(S, S, dtype=x.dtype, device=x.device)
-            sw_mask.masked_fill_(dist > self.sliding_window, -torch.finfo(x.dtype).max)
-            sw_mask = sw_mask.unsqueeze(0).unsqueeze(0)
-            attn_mask = (attention_mask + sw_mask) if attention_mask is not None else sw_mask
-        residual = x
-        x = self.pre_self_attn_layernorm(x)
-        x, _ = self.self_attn(x, attention_mask=attn_mask, freqs_cis=freqs_cis)
-        x = self.post_self_attn_layernorm(x)
-        x = residual + x
-        residual = x
-        x = self.pre_feedforward_layernorm(x)
-        x = self.mlp(x)
-        x = self.post_feedforward_layernorm(x)
-        x = residual + x
-        return x
-
-
-class T5GemmaEncoder(nn.Module):
-    """Encoder stack: embed_tokens, layers, norm.
-    Keys: embed_tokens.*, layers.X.*, norm.*"""
-
-    def __init__(self, config, device, dtype, ops):
-        super().__init__()
-        self.config = config
-        # Gemma-style scaled embedding: output *= sqrt(hidden_size)
-        self.embed_tokens = _make_scaled_embedding(
-            ops, config.vocab_size, config.hidden_size, config.hidden_size ** 0.5, device, dtype)
-        self.layers = nn.ModuleList([
-            T5GemmaBlock(config, config.layer_types[i], device=device, dtype=dtype, ops=ops)
-            for i in range(config.num_hidden_layers)
-        ])
-        self.norm = RMSNorm(config.hidden_size, eps=config.rms_norm_eps, add=True, device=device, dtype=dtype)
-
-    def forward(self, input_ids, attention_mask=None, embeds=None, intermediate_output=None,
-                final_layer_norm_intermediate=True, dtype=None, num_layers=None):
-        x = embeds if embeds is not None else self.embed_tokens(input_ids, out_dtype=dtype or torch.float32)
-        seq_len = x.shape[1]
-        position_ids = torch.arange(seq_len, device=x.device).unsqueeze(0)
-        freqs_cis = precompute_freqs_cis(self.config.head_dim, position_ids, self.config.rope_theta, device=x.device)
-        mask = None
-        if attention_mask is not None:
-            mask = 1.0 - attention_mask.to(x.dtype).reshape(
-                (attention_mask.shape[0], 1, -1, attention_mask.shape[-1])
-            ).expand(attention_mask.shape[0], 1, seq_len, attention_mask.shape[-1])
-            mask = mask.masked_fill(mask.to(torch.bool), -torch.finfo(x.dtype).max)
-        intermediate = None
-        for i, layer in enumerate(self.layers):
-            x = layer(x, attention_mask=mask, freqs_cis=freqs_cis)
-            if i == intermediate_output:
-                intermediate = x.clone()
-        x = self.norm(x)
-        if intermediate is not None and final_layer_norm_intermediate:
-            intermediate = self.norm(intermediate)
-        return x, intermediate
-
-
-class T5GemmaBody(nn.Module):
-    """Provides the 'encoder' sub-module.
-    Keys: encoder.*"""
-
-    def __init__(self, config, device, dtype, ops):
-        super().__init__()
-        self.encoder = T5GemmaEncoder(config, device, dtype, ops)
-
-
-class T5GemmaModel(nn.Module):
-    """Top-level model class passed to SDClipModel as model_class.
-    Module layout: self.model.encoder.* → matches checkpoint keys model.encoder.*"""
-
-    def __init__(self, config_dict, dtype, device, operations):
-        super().__init__()
-        config = T5GemmaEncoderConfig()
-        self.num_layers = config.num_hidden_layers
-        self.dtype = dtype
-        self.model = T5GemmaBody(config, device, dtype, operations)
-
-    def get_input_embeddings(self):
-        return self.model.encoder.embed_tokens
-
-    def set_input_embeddings(self, embeddings):
-        self.model.encoder.embed_tokens = embeddings
-
-    def forward(self, input_ids, attention_mask=None, embeds=None, num_tokens=None,
-                intermediate_output=None, final_layer_norm_intermediate=True, dtype=None, **kwargs):
-        if intermediate_output is not None and intermediate_output < 0:
-            intermediate_output = self.num_layers + intermediate_output
-        return self.model.encoder(
-            input_ids, attention_mask=attention_mask, embeds=embeds,
-            intermediate_output=intermediate_output,
-            final_layer_norm_intermediate=final_layer_norm_intermediate,
-            dtype=dtype, num_layers=self.num_layers)
-
-
-class T5GemmaSDClipModel(sd1_clip.SDClipModel):
-    def __init__(self, device="cpu", layer="last", layer_idx=None, dtype=None, model_options={}):
-        super().__init__(device=device, layer=layer, layer_idx=layer_idx,
-                         textmodel_json_config={}, dtype=dtype,
-                         special_tokens={"pad": 0},
-                         model_class=T5GemmaModel,
-                         enable_attention_masks=True, zero_out_masked=True,
-                         model_options=model_options)
-
-
-class T5GemmaSDTokenizer(sd1_clip.SDTokenizer):
-    def __init__(self, embedding_directory=None, tokenizer_data={}):
-        tokenizer_model = tokenizer_data.get("spiece_model", None)
-        super().__init__(tokenizer_model, pad_with_end=False, embedding_size=768,
-                         embedding_key="t5gemma", tokenizer_class=SPieceTokenizer,
-                         has_start_token=False, has_end_token=False, pad_to_max_length=False,
-                         max_length=99999999, min_length=1, pad_token=0,
-                         tokenizer_data=tokenizer_data,
-                         tokenizer_args={"add_bos": False, "add_eos": False})
-
-    def state_dict(self):
-        return {"spiece_model": self.tokenizer.serialize_model()}
-
-
-class SAT5GemmaTokenizer(sd1_clip.SD1Tokenizer):
-    def __init__(self, embedding_directory=None, tokenizer_data={}):
-        super().__init__(embedding_directory=embedding_directory,
-                         tokenizer_data=tokenizer_data, clip_name="t5gemma", tokenizer=T5GemmaSDTokenizer)
-
-
-class SAT5GemmaModel(sd1_clip.SD1ClipModel):
-    def __init__(self, device="cpu", dtype=None, model_options={}, **kwargs):
-        super().__init__(device=device, dtype=dtype, model_options=model_options,
-                         name="t5gemma", clip_model=T5GemmaSDClipModel, **kwargs)

comfy/utils.py

@@ -113,6 +113,7 @@ def load_safetensors(ckpt):
                         "_comfy_tensor_file_slice",
                         comfy.memory_management.TensorFileSlice(f, threading.get_ident(), data_base_offset + start, end - start))
                 setattr(storage, "_comfy_tensor_mmap_refs", (model_mmap, mv))
+                setattr(storage, "_comfy_tensor_mmap_touched", False)
                 sd[name] = tensor
 
     return sd, header.get("__metadata__", {}),
@@ -1019,11 +1020,10 @@ def bislerp(samples, width, height):
 
 def lanczos(samples, width, height):
     #the below API is strict and expects grayscale to be squeezed
-    if samples.ndim == 4:
-        samples = samples.squeeze(1) if samples.shape[1] == 1 else samples.movedim(1, -1)
+    samples = samples.squeeze(1) if samples.shape[1] == 1 else samples.movedim(1, -1)
     images = [Image.fromarray(np.clip(255. * image.cpu().numpy(), 0, 255).astype(np.uint8)) for image in samples]
     images = [image.resize((width, height), resample=Image.Resampling.LANCZOS) for image in images]
-    images = [torch.from_numpy(t).movedim(-1, 0) if (t := np.array(image).astype(np.float32) / 255.0).ndim == 3 else torch.from_numpy(t) for image in images]
+    images = [torch.from_numpy(np.array(image).astype(np.float32) / 255.0).movedim(-1, 0) for image in images]
     result = torch.stack(images)
     return result.to(samples.device, samples.dtype)
 
@@ -1451,3 +1451,4 @@ def deepcopy_list_dict(obj, memo=None):
 
     memo[obj_id] = res
     return res
+

comfy/windows.py

@@ -0,0 +1,52 @@
+import ctypes
+import logging
+import psutil
+from ctypes import wintypes
+
+import comfy_aimdo.control
+
+psapi = ctypes.WinDLL("psapi")
+kernel32 = ctypes.WinDLL("kernel32")
+
+class PERFORMANCE_INFORMATION(ctypes.Structure):
+    _fields_ = [
+        ("cb", wintypes.DWORD),
+        ("CommitTotal", ctypes.c_size_t),
+        ("CommitLimit", ctypes.c_size_t),
+        ("CommitPeak", ctypes.c_size_t),
+        ("PhysicalTotal", ctypes.c_size_t),
+        ("PhysicalAvailable", ctypes.c_size_t),
+        ("SystemCache", ctypes.c_size_t),
+        ("KernelTotal", ctypes.c_size_t),
+        ("KernelPaged", ctypes.c_size_t),
+        ("KernelNonpaged", ctypes.c_size_t),
+        ("PageSize", ctypes.c_size_t),
+        ("HandleCount", wintypes.DWORD),
+        ("ProcessCount", wintypes.DWORD),
+        ("ThreadCount", wintypes.DWORD),
+    ]
+
+def get_free_ram():
+    #Windows is way too conservative and chalks recently used uncommitted model RAM
+    #as "in-use". So, calculate free RAM for the sake of general use as the greater of:
+    #
+    #1: What psutil says
+    #2: Total Memory - (Committed Memory - VRAM in use)
+    #
+    #We have to subtract VRAM in use from the comitted memory as WDDM creates a naked
+    #commit charge for all VRAM used just incase it wants to page it all out. This just
+    #isn't realistic so "overcommit" on our calculations by just subtracting it off.
+
+    pi = PERFORMANCE_INFORMATION()
+    pi.cb = ctypes.sizeof(pi)
+
+    if not psapi.GetPerformanceInfo(ctypes.byref(pi), pi.cb):
+        logging.warning("WARNING: Failed to query windows performance info. RAM usage may be sub optimal")
+        return psutil.virtual_memory().available
+
+    committed = pi.CommitTotal * pi.PageSize
+    total = pi.PhysicalTotal * pi.PageSize
+
+    return max(psutil.virtual_memory().available,
+               total - (committed - comfy_aimdo.control.get_total_vram_usage()))
+

comfy_api_nodes/apis/anthropic.py

@@ -35,19 +35,6 @@ class AnthropicMessage(BaseModel):
     content: list[AnthropicTextContent | AnthropicImageContent] = Field(...)
 
 
-class AnthropicThinkingConfig(BaseModel):
-    type: Literal["enabled", "disabled", "adaptive"] = Field(...)
-    budget_tokens: int | None = Field(
-        None, ge=1024,
-        description="Reasoning budget in tokens. Used when type is 'enabled'. Must be less than max_tokens.",
-    )
-
-
-class AnthropicOutputConfig(BaseModel):
-    """Used with `thinking.type='adaptive'` on models like Opus 4.7."""
-    effort: Literal["low", "medium", "high"] | None = Field(None)
-
-
 class AnthropicMessagesRequest(BaseModel):
     model: str = Field(...)
     messages: list[AnthropicMessage] = Field(...)
@@ -57,8 +44,6 @@ class AnthropicMessagesRequest(BaseModel):
     top_p: float | None = Field(None, ge=0.0, le=1.0)
     top_k: int | None = Field(None, ge=0)
     stop_sequences: list[str] | None = Field(None)
-    thinking: AnthropicThinkingConfig | None = Field(None)
-    output_config: AnthropicOutputConfig | None = Field(None)
 
 
 class AnthropicResponseTextBlock(BaseModel):
@@ -66,14 +51,6 @@ class AnthropicResponseTextBlock(BaseModel):
     text: str = Field(...)
 
 
-class AnthropicResponseThinkingBlock(BaseModel):
-    type: Literal["thinking"] = "thinking"
-    thinking: str = Field(...)
-
-
-AnthropicResponseBlock = AnthropicResponseTextBlock | AnthropicResponseThinkingBlock
-
-
 class AnthropicCacheCreationUsage(BaseModel):
     ephemeral_5m_input_tokens: int | None = Field(None)
     ephemeral_1h_input_tokens: int | None = Field(None)
@@ -92,7 +69,7 @@ class AnthropicMessagesResponse(BaseModel):
     type: str | None = Field(None)
     role: str | None = Field(None)
     model: str | None = Field(None)
-    content: list[AnthropicResponseBlock] | None = Field(None)
+    content: list[AnthropicResponseTextBlock] | None = Field(None)
     stop_reason: str | None = Field(None)
     stop_sequence: str | None = Field(None)
     usage: AnthropicMessagesUsage | None = Field(None)

comfy_api_nodes/apis/bytedance_llm.py

@@ -1,101 +0,0 @@
-"""Pydantic models for BytePlus ModelArk Responses API.
-
-See: https://docs.byteplus.com/en/docs/ModelArk/1585128 (request)
-     https://docs.byteplus.com/en/docs/ModelArk/1783703 (response)
-"""
-
-from typing import Literal
-
-from pydantic import BaseModel, Field
-
-
-class BytePlusInputText(BaseModel):
-    type: Literal["input_text"] = "input_text"
-    text: str = Field(...)
-
-
-class BytePlusInputImage(BaseModel):
-    type: Literal["input_image"] = "input_image"
-    image_url: str = Field(..., description="Image URL or `data:image/...;base64,...` payload")
-    detail: str = Field("auto", description="One of high, low, auto")
-
-
-class BytePlusInputVideo(BaseModel):
-    type: Literal["input_video"] = "input_video"
-    video_url: str = Field(..., description="Video URL or `data:video/...;base64,...` payload")
-    fps: float | None = Field(None, ge=0.2, le=5.0)
-
-
-BytePlusMessageContent = BytePlusInputText | BytePlusInputImage | BytePlusInputVideo
-
-
-class BytePlusInputMessage(BaseModel):
-    type: Literal["message"] = "message"
-    role: str = Field(..., description="One of user, system, assistant, developer")
-    content: list[BytePlusMessageContent] = Field(...)
-
-
-class BytePlusResponseCreateRequest(BaseModel):
-    model: str = Field(...)
-    input: list[BytePlusInputMessage] = Field(...)
-    instructions: str | None = Field(None)
-    max_output_tokens: int | None = Field(None, ge=1)
-    temperature: float | None = Field(None, ge=0.0, le=2.0)
-    store: bool | None = Field(False)
-    stream: bool | None = Field(False)
-
-
-class BytePlusOutputText(BaseModel):
-    type: Literal["output_text"] = "output_text"
-    text: str = Field(...)
-
-
-class BytePlusOutputRefusal(BaseModel):
-    type: Literal["refusal"] = "refusal"
-    refusal: str = Field(...)
-
-
-class BytePlusOutputContent(BaseModel):
-    type: str = Field(...)
-    text: str | None = Field(None)
-    refusal: str | None = Field(None)
-
-
-class BytePlusOutputMessage(BaseModel):
-    type: str = Field(...)
-    id: str | None = Field(None)
-    role: str | None = Field(None)
-    status: str | None = Field(None)
-    content: list[BytePlusOutputContent] | None = Field(None)
-
-
-class BytePlusInputTokensDetails(BaseModel):
-    cached_tokens: int | None = Field(None)
-
-
-class BytePlusOutputTokensDetails(BaseModel):
-    reasoning_tokens: int | None = Field(None)
-
-
-class BytePlusResponseUsage(BaseModel):
-    input_tokens: int | None = Field(None)
-    output_tokens: int | None = Field(None)
-    total_tokens: int | None = Field(None)
-    input_tokens_details: BytePlusInputTokensDetails | None = Field(None)
-    output_tokens_details: BytePlusOutputTokensDetails | None = Field(None)
-
-
-class BytePlusResponseError(BaseModel):
-    code: str = Field(...)
-    message: str = Field(...)
-
-
-class BytePlusResponseObject(BaseModel):
-    id: str | None = Field(None)
-    object: str | None = Field(None)
-    created_at: int | None = Field(None)
-    model: str | None = Field(None)
-    status: str | None = Field(None)
-    error: BytePlusResponseError | None = Field(None)
-    output: list[BytePlusOutputMessage] | None = Field(None)
-    usage: BytePlusResponseUsage | None = Field(None)

comfy_api_nodes/apis/openrouter.py

@@ -1,93 +0,0 @@
-"""Pydantic models for the OpenRouter chat completions API.
-
-See: https://openrouter.ai/docs/api/api-reference/chat/send-chat-completion-request
-"""
-
-from typing import Literal
-
-from pydantic import BaseModel, Field
-
-
-class OpenRouterTextContent(BaseModel):
-    type: Literal["text"] = "text"
-    text: str = Field(...)
-
-
-class OpenRouterImageUrl(BaseModel):
-    url: str = Field(...)
-
-
-class OpenRouterImageContent(BaseModel):
-    type: Literal["image_url"] = "image_url"
-    image_url: OpenRouterImageUrl = Field(...)
-
-
-class OpenRouterVideoUrl(BaseModel):
-    url: str = Field(...)
-
-
-class OpenRouterVideoContent(BaseModel):
-    type: Literal["video_url"] = "video_url"
-    video_url: OpenRouterVideoUrl = Field(...)
-
-
-OpenRouterContentBlock = OpenRouterTextContent | OpenRouterImageContent | OpenRouterVideoContent
-
-
-class OpenRouterMessage(BaseModel):
-    role: Literal["system", "user", "assistant"] = Field(...)
-    content: str | list[OpenRouterContentBlock] = Field(...)
-
-
-class OpenRouterReasoningConfig(BaseModel):
-    effort: str | None = Field(None)
-    exclude: bool | None = Field(None, description="If true, model reasons but reasoning is excluded from response.")
-
-
-class OpenRouterWebSearchOptions(BaseModel):
-    search_context_size: str | None = Field(None)
-
-
-class OpenRouterChatRequest(BaseModel):
-    model: str = Field(...)
-    messages: list[OpenRouterMessage] = Field(...)
-    seed: int | None = Field(None)
-    reasoning: OpenRouterReasoningConfig | None = Field(None)
-    web_search_options: OpenRouterWebSearchOptions | None = Field(None)
-    stream: bool = Field(False)
-
-
-class OpenRouterUsage(BaseModel):
-    prompt_tokens: int | None = Field(None)
-    completion_tokens: int | None = Field(None)
-    total_tokens: int | None = Field(None)
-    cost: float | None = Field(None, description="Server-side authoritative USD cost of the call.")
-
-
-class OpenRouterResponseMessage(BaseModel):
-    role: str | None = Field(None)
-    content: str | None = Field(None)
-    reasoning: str | None = Field(None)
-    refusal: str | None = Field(None)
-
-
-class OpenRouterChoice(BaseModel):
-    index: int | None = Field(None)
-    message: OpenRouterResponseMessage | None = Field(None)
-    finish_reason: str | None = Field(None)
-
-
-class OpenRouterError(BaseModel):
-    code: int | str | None = Field(None)
-    message: str | None = Field(None)
-    metadata: dict | None = Field(None)
-
-
-class OpenRouterChatResponse(BaseModel):
-    id: str | None = Field(None)
-    model: str | None = Field(None)
-    object: str | None = Field(None)
-    provider: str | None = Field(None)
-    choices: list[OpenRouterChoice] | None = Field(None)
-    usage: OpenRouterUsage | None = Field(None)
-    error: OpenRouterError | None = Field(None)

comfy_api_nodes/nodes_anthropic.py

@@ -9,11 +9,8 @@ from comfy_api_nodes.apis.anthropic import (
     AnthropicMessage,
     AnthropicMessagesRequest,
     AnthropicMessagesResponse,
-    AnthropicOutputConfig,
-    AnthropicResponseTextBlock,
     AnthropicRole,
     AnthropicTextContent,
-    AnthropicThinkingConfig,
 )
 from comfy_api_nodes.util import (
     ApiEndpoint,
@@ -35,29 +32,15 @@ CLAUDE_MODELS: dict[str, str] = {
     "Haiku 4.5": "claude-haiku-4-5-20251001",
 }
 
-_THINKING_UNSUPPORTED = {"Haiku 4.5"}
-# Models that use the newer "adaptive" thinking mode (Opus 4.7 requires it; older models keep the explicit budget API).
-# Anthropic decides the actual budget when adaptive is used, based on the `output_config.effort` hint.
-_ADAPTIVE_THINKING_MODELS = {"Opus 4.7", "Opus 4.6", "Sonnet 4.6"}
 
-# Budget mode (Sonnet 4.5): effort -> reasoning budget in tokens. Must be < max_tokens.
-# Sized so even the "high" budget fits comfortably under the default max_tokens=32768.
-_REASONING_BUDGET: dict[str, int] = {
-    "low": 2048,
-    "medium": 8192,
-    "high": 16384,
-}
-_REASONING_EFFORTS = ["off", "low", "medium", "high"]
-
-
-def _claude_model_inputs(model_label: str):
-    inputs: list = [
+def _claude_model_inputs():
+    return [
         IO.Int.Input(
             "max_tokens",
-            default=32768,
-            min=4096,
-            max=64000,
-            tooltip="Maximum number of tokens to generate (includes reasoning tokens when enabled).",
+            default=16000,
+            min=32,
+            max=32000,
+            tooltip="Maximum number of tokens to generate before stopping.",
             advanced=True,
         ),
         IO.Float.Input(
@@ -66,24 +49,10 @@ def _claude_model_inputs(model_label: str):
             min=0.0,
             max=1.0,
             step=0.01,
-            tooltip=(
-                "Controls randomness. 0.0 is deterministic, 1.0 is most random. "
-                "Ignored for Opus 4.7 and any model when reasoning_effort is set."
-            ),
+            tooltip="Controls randomness. 0.0 is deterministic, 1.0 is most random. Ignored for Opus 4.7.",
             advanced=True,
         ),
     ]
-    if model_label not in _THINKING_UNSUPPORTED:
-        inputs.append(
-            IO.Combo.Input(
-                "reasoning_effort",
-                options=_REASONING_EFFORTS,
-                default="off",
-                tooltip="Extended thinking effort. 'off' disables reasoning.",
-                advanced=True,
-            )
-        )
-    return inputs
 
 
 def _model_price_per_million(model: str) -> tuple[float, float] | None:
@@ -126,11 +95,7 @@ def calculate_tokens_price(response: AnthropicMessagesResponse) -> float | None:
 def _get_text_from_response(response: AnthropicMessagesResponse) -> str:
     if not response.content:
         return ""
-    # Thinking blocks are silently dropped — we never want reasoning in the output.
-    return "\n".join(
-        block.text for block in response.content
-        if isinstance(block, AnthropicResponseTextBlock) and block.text
-    )
+    return "\n".join(block.text for block in response.content if block.text)
 
 
 async def _build_image_content_blocks(
@@ -168,10 +133,7 @@ class ClaudeNode(IO.ComfyNode):
                 ),
                 IO.DynamicCombo.Input(
                     "model",
-                    options=[
-                        IO.DynamicCombo.Option(label, _claude_model_inputs(label))
-                        for label in CLAUDE_MODELS
-                    ],
+                    options=[IO.DynamicCombo.Option(label, _claude_model_inputs()) for label in CLAUDE_MODELS],
                     tooltip="The Claude model used to generate the response.",
                 ),
                 IO.Int.Input(
@@ -245,29 +207,8 @@ class ClaudeNode(IO.ComfyNode):
     ) -> IO.NodeOutput:
         validate_string(prompt, strip_whitespace=True, min_length=1)
         model_label = model["model"]
-        max_tokens = model.get("max_tokens", 32768)
-        reasoning_effort = model.get("reasoning_effort", "off")
-        thinking_enabled = reasoning_effort not in ("off", None) and model_label not in _THINKING_UNSUPPORTED
-
-        # Anthropic requires temperature to be unset (defaults to 1.0) when thinking is enabled.
-        # Opus 4.7 also rejects user-supplied temperature.
-        if thinking_enabled or model_label == "Opus 4.7":
-            temperature = None
-        else:
-            temperature = model.get("temperature", 1.0)
-
-        thinking_cfg: AnthropicThinkingConfig | None = None
-        output_cfg: AnthropicOutputConfig | None = None
-        if thinking_enabled:
-            if model_label in _ADAPTIVE_THINKING_MODELS:
-                # Adaptive mode - Anthropic chooses the budget based on effort hint
-                thinking_cfg = AnthropicThinkingConfig(type="adaptive")
-                output_cfg = AnthropicOutputConfig(effort=reasoning_effort)
-            else:
-                # Budget mode (Sonnet 4.5). Leave at least 1024 tokens for the actual response
-                budget = _REASONING_BUDGET[reasoning_effort]
-                budget = min(budget, max(1024, max_tokens - 1024))
-                thinking_cfg = AnthropicThinkingConfig(type="enabled", budget_tokens=budget)
+        max_tokens = model["max_tokens"]
+        temperature = None if model_label == "Opus 4.7" else model["temperature"]
 
         image_tensors: list[Input.Image] = [t for t in (images or {}).values() if t is not None]
         if sum(get_number_of_images(t) for t in image_tensors) > CLAUDE_MAX_IMAGES:
@@ -288,8 +229,6 @@ class ClaudeNode(IO.ComfyNode):
                 messages=[AnthropicMessage(role=AnthropicRole.user, content=content)],
                 system=system_prompt or None,
                 temperature=temperature,
-                thinking=thinking_cfg,
-                output_config=output_cfg,
             ),
             price_extractor=calculate_tokens_price,
         )

comfy_api_nodes/nodes_bytedance.py

@@ -43,16 +43,15 @@ from comfy_api_nodes.util import (
     ApiEndpoint,
     download_url_to_image_tensor,
     download_url_to_video_output,
-    downscale_video_to_max_pixels,
     get_number_of_images,
     image_tensor_pair_to_batch,
     poll_op,
+    resize_video_to_pixel_budget,
     sync_op,
     upload_audio_to_comfyapi,
     upload_image_to_comfyapi,
     upload_images_to_comfyapi,
     upload_video_to_comfyapi,
-    upscale_video_to_min_pixels,
     validate_image_aspect_ratio,
     validate_image_dimensions,
     validate_string,
@@ -111,13 +110,12 @@ def _validate_ref_video_pixels(video: Input.Video, model_id: str, resolution: st
     max_px = limits.get("max")
     if min_px and pixels < min_px:
         raise ValueError(
-            f"Reference video {index} is too small: {w}x{h} = {pixels:,} total pixels. "
-            f"Minimum for this model is {min_px:,} total pixels."
+            f"Reference video {index} is too small: {w}x{h} = {pixels:,}px. " f"Minimum is {min_px:,}px for this model."
         )
     if max_px and pixels > max_px:
         raise ValueError(
-            f"Reference video {index} is too large: {w}x{h} = {pixels:,} total pixels. "
-            f"Maximum for this model is {max_px:,} total pixels. Try downscaling the video."
+            f"Reference video {index} is too large: {w}x{h} = {pixels:,}px. "
+            f"Maximum is {max_px:,}px for this model. Try downscaling the video."
         )
 
 
@@ -1678,14 +1676,14 @@ class ByteDance2FirstLastFrameNode(IO.ComfyNode):
                     "first_frame_asset_id",
                     default="",
                     tooltip="Seedance asset_id to use as the first frame. "
-                    "Mutually exclusive with the first_frame image input.",
+                            "Mutually exclusive with the first_frame image input.",
                     optional=True,
                 ),
                 IO.String.Input(
                     "last_frame_asset_id",
                     default="",
                     tooltip="Seedance asset_id to use as the last frame. "
-                    "Mutually exclusive with the last_frame image input.",
+                            "Mutually exclusive with the last_frame image input.",
                     optional=True,
                 ),
                 IO.Int.Input(
@@ -1867,20 +1865,11 @@ def _seedance2_reference_inputs(resolutions: list[str], default_ratio: str = "16
         IO.Boolean.Input(
             "auto_downscale",
             default=False,
+            advanced=True,
             optional=True,
             tooltip="Automatically downscale reference videos that exceed the model's pixel budget "
             "for the selected resolution. Aspect ratio is preserved; videos already within limits are untouched.",
         ),
-        IO.Boolean.Input(
-            "auto_upscale",
-            default=False,
-            advanced=True,
-            optional=True,
-            tooltip="Automatically upscale reference videos that are below the model's minimum pixel count "
-            "for the selected resolution. Aspect ratio is preserved; videos already meeting the minimum are "
-            "untouched. Note: upscaling a low-resolution source does not add real detail and may produce "
-            "lower-quality generations.",
-        ),
         IO.Autogrow.Input(
             "reference_assets",
             template=IO.Autogrow.TemplateNames(
@@ -2041,13 +2030,7 @@ class ByteDance2ReferenceNode(IO.ComfyNode):
             max_px = SEEDANCE2_REF_VIDEO_PIXEL_LIMITS.get(model_id, {}).get(model["resolution"], {}).get("max")
             if max_px:
                 for key in reference_videos:
-                    reference_videos[key] = downscale_video_to_max_pixels(reference_videos[key], max_px)
-
-        if model.get("auto_upscale") and reference_videos:
-            min_px = SEEDANCE2_REF_VIDEO_PIXEL_LIMITS.get(model_id, {}).get(model["resolution"], {}).get("min")
-            if min_px:
-                for key in reference_videos:
-                    reference_videos[key] = upscale_video_to_min_pixels(reference_videos[key], min_px)
+                    reference_videos[key] = resize_video_to_pixel_budget(reference_videos[key], max_px)
 
         total_video_duration = 0.0
         for i, key in enumerate(reference_videos, 1):

comfy_api_nodes/nodes_bytedance_llm.py

@@ -1,271 +0,0 @@
-"""API Nodes for ByteDance Seed LLM via the BytePlus ModelArk Responses API.
-
-See: https://docs.byteplus.com/en/docs/ModelArk/1585128
-"""
-
-from typing_extensions import override
-
-from comfy_api.latest import IO, ComfyExtension, Input
-from comfy_api_nodes.apis.bytedance_llm import (
-    BytePlusInputImage,
-    BytePlusInputMessage,
-    BytePlusInputText,
-    BytePlusInputVideo,
-    BytePlusMessageContent,
-    BytePlusResponseCreateRequest,
-    BytePlusResponseObject,
-)
-from comfy_api_nodes.util import (
-    ApiEndpoint,
-    get_number_of_images,
-    sync_op,
-    upload_images_to_comfyapi,
-    upload_video_to_comfyapi,
-    validate_string,
-)
-
-BYTEPLUS_RESPONSES_ENDPOINT = "/proxy/byteplus/api/v3/responses"
-SEED_MAX_IMAGES = 20
-SEED_MAX_VIDEOS = 4
-
-SEED_MODELS: dict[str, str] = {
-    "Seed 2.0 Pro": "seed-2-0-pro-260328",
-    "Seed 2.0 Lite": "seed-2-0-lite-260228",
-    "Seed 2.0 Mini": "seed-2-0-mini-260215",
-}
-
-# USD per 1M tokens: (input, cache_hit_input, output)
-_SEED_PRICES_PER_MILLION: dict[str, tuple[float, float, float]] = {
-    "seed-2-0-pro-260328": (0.50, 0.10, 3.00),
-    "seed-2-0-lite-260228": (0.25, 0.05, 2.00),
-    "seed-2-0-mini-260215": (0.10, 0.02, 0.40),
-}
-
-
-def _seed_model_inputs(max_images: int = SEED_MAX_IMAGES, max_videos: int = SEED_MAX_VIDEOS):
-    return [
-        IO.Autogrow.Input(
-            "images",
-            template=IO.Autogrow.TemplateNames(
-                IO.Image.Input("image"),
-                names=[f"image_{i}" for i in range(1, max_images + 1)],
-                min=0,
-            ),
-            tooltip=f"Optional image(s) to use as context for the model. Up to {max_images} images.",
-        ),
-        IO.Autogrow.Input(
-            "videos",
-            template=IO.Autogrow.TemplateNames(
-                IO.Video.Input("video"),
-                names=[f"video_{i}" for i in range(1, max_videos + 1)],
-                min=0,
-            ),
-            tooltip=f"Optional video(s) to use as context for the model. Up to {max_videos} videos.",
-        ),
-        IO.Float.Input(
-            "temperature",
-            default=1.0,
-            min=0.0,
-            max=2.0,
-            step=0.01,
-            tooltip="Controls randomness. 0.0 is deterministic, higher values are more random.",
-            advanced=True,
-        ),
-    ]
-
-
-def _calculate_price(model_id: str, response: BytePlusResponseObject) -> float | None:
-    """Compute approximate USD price from response usage."""
-    if not response.usage:
-        return None
-    rates = _SEED_PRICES_PER_MILLION.get(model_id)
-    if rates is None:
-        return None
-    input_rate, cache_hit_rate, output_rate = rates
-    input_tokens = response.usage.input_tokens or 0
-    output_tokens = response.usage.output_tokens or 0
-    cached = 0
-    if response.usage.input_tokens_details:
-        cached = response.usage.input_tokens_details.cached_tokens or 0
-    fresh_input = max(0, input_tokens - cached)
-    total = fresh_input * input_rate + cached * cache_hit_rate + output_tokens * output_rate
-    return total / 1_000_000.0
-
-
-def _get_text_from_response(response: BytePlusResponseObject) -> str:
-    """Extract concatenated text from all assistant message output_text blocks."""
-    if not response.output:
-        return ""
-    chunks: list[str] = []
-    for item in response.output:
-        if item.type != "message" or not item.content:
-            continue
-        for block in item.content:
-            if block.type == "output_text" and block.text:
-                chunks.append(block.text)
-            elif block.type == "refusal" and block.refusal:
-                raise ValueError(f"Model refused to respond: {block.refusal}")
-    return "\n".join(chunks)
-
-
-async def _build_image_content_blocks(
-    cls: type[IO.ComfyNode],
-    image_tensors: list[Input.Image],
-) -> list[BytePlusInputImage]:
-    urls = await upload_images_to_comfyapi(
-        cls,
-        image_tensors,
-        max_images=SEED_MAX_IMAGES,
-        wait_label="Uploading reference images",
-    )
-    return [BytePlusInputImage(image_url=url) for url in urls]
-
-
-async def _build_video_content_blocks(
-    cls: type[IO.ComfyNode],
-    videos: list[Input.Video],
-) -> list[BytePlusInputVideo]:
-    blocks: list[BytePlusInputVideo] = []
-    total = len(videos)
-    for idx, video in enumerate(videos):
-        label = "Uploading reference video"
-        if total > 1:
-            label = f"{label} ({idx + 1}/{total})"
-        url = await upload_video_to_comfyapi(cls, video, wait_label=label)
-        blocks.append(BytePlusInputVideo(video_url=url))
-    return blocks
-
-
-class ByteDanceSeedNode(IO.ComfyNode):
-    """Generate text responses from a ByteDance Seed 2.0 model."""
-
-    @classmethod
-    def define_schema(cls):
-        return IO.Schema(
-            node_id="ByteDanceSeedNode",
-            display_name="ByteDance Seed",
-            category="api node/text/ByteDance",
-            essentials_category="Text Generation",
-            description="Generate text responses with ByteDance's Seed 2.0 models. "
-            "Provide a text prompt and optionally one or more images or videos for multimodal context.",
-            inputs=[
-                IO.String.Input(
-                    "prompt",
-                    multiline=True,
-                    default="",
-                    tooltip="Text input to the model.",
-                ),
-                IO.DynamicCombo.Input(
-                    "model",
-                    options=[IO.DynamicCombo.Option(label, _seed_model_inputs()) for label in SEED_MODELS],
-                    tooltip="The Seed model used to generate the response.",
-                ),
-                IO.Int.Input(
-                    "seed",
-                    default=0,
-                    min=0,
-                    max=2147483647,
-                    control_after_generate=True,
-                    tooltip="Seed controls whether the node should re-run; "
-                    "results are non-deterministic regardless of seed.",
-                ),
-                IO.String.Input(
-                    "system_prompt",
-                    multiline=True,
-                    default="",
-                    optional=True,
-                    advanced=True,
-                    tooltip="Foundational instructions that dictate the model's behavior.",
-                ),
-            ],
-            outputs=[IO.String.Output()],
-            hidden=[
-                IO.Hidden.auth_token_comfy_org,
-                IO.Hidden.api_key_comfy_org,
-                IO.Hidden.unique_id,
-            ],
-            is_api_node=True,
-            price_badge=IO.PriceBadge(
-                depends_on=IO.PriceBadgeDepends(widgets=["model"]),
-                expr="""
-                (
-                  $m := widgets.model;
-                  $contains($m, "mini") ? {
-                    "type": "list_usd",
-                    "usd": [0.00025, 0.0009],
-                    "format": { "approximate": true, "separator": "-", "suffix": " per 1K tokens" }
-                  }
-                  : $contains($m, "lite") ? {
-                    "type": "list_usd",
-                    "usd": [0.0003, 0.002],
-                    "format": { "approximate": true, "separator": "-", "suffix": " per 1K tokens" }
-                  }
-                  : $contains($m, "pro") ? {
-                    "type": "list_usd",
-                    "usd": [0.0005, 0.003],
-                    "format": { "approximate": true, "separator": "-", "suffix": " per 1K tokens" }
-                  }
-                  : {"type":"text", "text":"Token-based"}
-                )
-                """,
-            ),
-        )
-
-    @classmethod
-    async def execute(
-        cls,
-        prompt: str,
-        model: dict,
-        seed: int,
-        system_prompt: str = "",
-    ) -> IO.NodeOutput:
-        validate_string(prompt, strip_whitespace=True, min_length=1)
-        model_label = model["model"]
-        temperature = model["temperature"]
-        model_id = SEED_MODELS[model_label]
-
-        image_tensors: list[Input.Image] = [t for t in (model.get("images") or {}).values() if t is not None]
-        if sum(get_number_of_images(t) for t in image_tensors) > SEED_MAX_IMAGES:
-            raise ValueError(f"Up to {SEED_MAX_IMAGES} images are supported per request.")
-
-        video_inputs: list[Input.Video] = [v for v in (model.get("videos") or {}).values() if v is not None]
-        if len(video_inputs) > SEED_MAX_VIDEOS:
-            raise ValueError(f"Up to {SEED_MAX_VIDEOS} videos are supported per request.")
-
-        content: list[BytePlusMessageContent] = []
-        if image_tensors:
-            content.extend(await _build_image_content_blocks(cls, image_tensors))
-        if video_inputs:
-            content.extend(await _build_video_content_blocks(cls, video_inputs))
-        content.append(BytePlusInputText(text=prompt))
-
-        response = await sync_op(
-            cls,
-            ApiEndpoint(path=BYTEPLUS_RESPONSES_ENDPOINT, method="POST"),
-            response_model=BytePlusResponseObject,
-            data=BytePlusResponseCreateRequest(
-                model=model_id,
-                input=[BytePlusInputMessage(role="user", content=content)],
-                instructions=system_prompt or None,
-                temperature=temperature,
-                store=False,
-                stream=False,
-            ),
-            price_extractor=lambda r: _calculate_price(model_id, r),
-        )
-        if response.error:
-            raise ValueError(f"Seed API error ({response.error.code}): {response.error.message}")
-        result = _get_text_from_response(response)
-        if not result:
-            raise ValueError("Empty response from Seed model.")
-        return IO.NodeOutput(result)
-
-
-class ByteDanceLLMExtension(ComfyExtension):
-    @override
-    async def get_node_list(self) -> list[type[IO.ComfyNode]]:
-        return [ByteDanceSeedNode]
-
-
-async def comfy_entrypoint() -> ByteDanceLLMExtension:
-    return ByteDanceLLMExtension()

comfy_api_nodes/nodes_openrouter.py

@@ -1,374 +0,0 @@
-"""API Nodes for OpenRouter LLM chat completions."""
-
-from dataclasses import dataclass
-from typing import Literal
-
-from typing_extensions import override
-
-from comfy_api.latest import IO, ComfyExtension, Input
-from comfy_api_nodes.apis.openrouter import (
-    OpenRouterChatRequest,
-    OpenRouterChatResponse,
-    OpenRouterContentBlock,
-    OpenRouterImageContent,
-    OpenRouterImageUrl,
-    OpenRouterMessage,
-    OpenRouterReasoningConfig,
-    OpenRouterTextContent,
-    OpenRouterVideoContent,
-    OpenRouterVideoUrl,
-    OpenRouterWebSearchOptions,
-)
-from comfy_api_nodes.util import (
-    ApiEndpoint,
-    get_number_of_images,
-    sync_op,
-    upload_images_to_comfyapi,
-    upload_video_to_comfyapi,
-    validate_string,
-)
-
-OPENROUTER_CHAT_ENDPOINT = "/proxy/openrouter/api/v1/chat/completions"
-
-
-Profile = Literal["standard", "reasoning", "frontier_reasoning", "perplexity", "perplexity_reasoning"]
-
-
-@dataclass(frozen=True)
-class _ModelSpec:
-    slug: str  # exact OpenRouter model id
-    profile: Profile
-    price_in: float  # USD per token (prompt)
-    price_out: float  # USD per token (completion)
-    max_images: int = 0  # 0 = no image input; otherwise max URL-passed images supported
-    max_videos: int = 0  # 0 = no video input; otherwise max URL-passed videos supported
-
-
-MODELS: list[_ModelSpec] = [
-    _ModelSpec("anthropic/claude-opus-4.7", "frontier_reasoning", 0.000005, 0.000025, max_images=20),
-    _ModelSpec("openai/gpt-5.5-pro", "frontier_reasoning", 0.00003, 0.00018, max_images=20),
-    _ModelSpec("openai/gpt-5.5", "frontier_reasoning", 0.000005, 0.00003, max_images=20),
-    _ModelSpec("google/gemini-3.5-flash", "reasoning", 0.0000015, 0.000009, max_images=20, max_videos=4),
-    _ModelSpec("x-ai/grok-4.20", "reasoning", 0.00000125, 0.0000025, max_images=20),
-    _ModelSpec("x-ai/grok-4.3", "reasoning", 0.00000125, 0.0000025, max_images=20),
-    _ModelSpec("deepseek/deepseek-v4-pro", "reasoning", 0.000000435, 0.00000087),
-    _ModelSpec("deepseek/deepseek-v4-flash", "reasoning", 0.000000112, 0.000000224),
-    _ModelSpec("deepseek/deepseek-v3.2", "reasoning", 0.000000252, 0.000000378),
-    _ModelSpec("qwen/qwen3.6-max-preview", "reasoning", 0.00000104, 0.00000624),
-    _ModelSpec("qwen/qwen3.6-plus", "reasoning", 0.000000325, 0.00000195, max_images=10, max_videos=4),
-    _ModelSpec("qwen/qwen3.6-flash", "reasoning", 0.0000001875, 0.000001125, max_images=10, max_videos=4),
-    _ModelSpec("mistralai/mistral-large-2512", "standard", 0.0000005, 0.0000015, max_images=8),
-    _ModelSpec("mistralai/mistral-medium-3-5", "reasoning", 0.0000015, 0.0000075, max_images=8),
-    _ModelSpec("z-ai/glm-4.6", "reasoning", 0.00000043, 0.00000174),
-    _ModelSpec("z-ai/glm-5", "reasoning", 0.0000006, 0.00000192),
-    _ModelSpec("moonshotai/kimi-k2.6", "reasoning", 0.00000073, 0.00000349, max_images=10),
-    _ModelSpec("moonshotai/kimi-k2-thinking", "reasoning", 0.0000006, 0.0000025),
-    _ModelSpec("perplexity/sonar-pro", "perplexity", 0.000003, 0.000015),
-    _ModelSpec("perplexity/sonar-reasoning-pro", "perplexity_reasoning", 0.000002, 0.000008),
-    _ModelSpec("perplexity/sonar-deep-research", "perplexity_reasoning", 0.000002, 0.000008),
-]
-
-_MODELS_BY_SLUG: dict[str, _ModelSpec] = {m.slug: m for m in MODELS}
-_REASONING_EFFORTS = ["off", "low", "medium", "high"]
-_SEARCH_CONTEXT_SIZES = ["low", "medium", "high"]
-
-
-def _reasoning_extra_inputs() -> list:
-    return [
-        IO.Combo.Input(
-            "reasoning_effort",
-            options=_REASONING_EFFORTS,
-            default="off",
-            tooltip="Reasoning effort. 'off' disables reasoning entirely.",
-            advanced=True,
-        ),
-    ]
-
-
-def _perplexity_extra_inputs() -> list:
-    return [
-        IO.Combo.Input(
-            "search_context_size",
-            options=_SEARCH_CONTEXT_SIZES,
-            default="medium",
-            tooltip="How much web search context to retrieve. Larger = more grounded but slower/pricier.",
-            advanced=True,
-        ),
-    ]
-
-
-def _profile_inputs(profile: Profile) -> list:
-    if profile == "standard":
-        return []
-    if profile in ("reasoning", "frontier_reasoning"):
-        return _reasoning_extra_inputs()
-    if profile == "perplexity":
-        return _perplexity_extra_inputs()
-    if profile == "perplexity_reasoning":
-        return _perplexity_extra_inputs() + _reasoning_extra_inputs()
-    raise ValueError(f"Unknown profile: {profile}")
-
-
-def _media_inputs(spec: _ModelSpec) -> list:
-    extras: list = []
-    if spec.max_images > 0:
-        extras.append(
-            IO.Autogrow.Input(
-                "images",
-                template=IO.Autogrow.TemplateNames(
-                    IO.Image.Input("image"),
-                    names=[f"image_{i}" for i in range(1, spec.max_images + 1)],
-                    min=0,
-                ),
-                tooltip=f"Optional reference image(s) — up to {spec.max_images}. Sent as URLs.",
-            )
-        )
-    if spec.max_videos > 0:
-        extras.append(
-            IO.Autogrow.Input(
-                "videos",
-                template=IO.Autogrow.TemplateNames(
-                    IO.Video.Input("video"),
-                    names=[f"video_{i}" for i in range(1, spec.max_videos + 1)],
-                    min=0,
-                ),
-                tooltip=f"Optional reference video(s) — up to {spec.max_videos}. Sent as URLs.",
-            )
-        )
-    return extras
-
-
-def _inputs_for_model(spec: _ModelSpec) -> list:
-    return _profile_inputs(spec.profile) + _media_inputs(spec)
-
-
-def _build_model_options() -> list[IO.DynamicCombo.Option]:
-    return [IO.DynamicCombo.Option(spec.slug, _inputs_for_model(spec)) for spec in MODELS]
-
-
-def _calculate_price(response: OpenRouterChatResponse) -> float | None:
-    if response.usage and response.usage.cost is not None:
-        return float(response.usage.cost)
-    return None
-
-
-def _price_badge_jsonata() -> str:
-    rates_pairs = []
-    for spec in MODELS:
-        prompt_per_1k = spec.price_in * 1000
-        completion_per_1k = spec.price_out * 1000
-        rates_pairs.append(f'  "{spec.slug}": [{prompt_per_1k:.8g}, {completion_per_1k:.8g}]')
-    rates_block = ",\n".join(rates_pairs)
-    return (
-        "(\n"
-        "  $rates := {\n"
-        f"{rates_block}\n"
-        "  };\n"
-        "  $r := $lookup($rates, widgets.model);\n"
-        "  $r ? {\n"
-        '    "type": "list_usd",\n'
-        '    "usd": $r,\n'
-        '    "format": { "approximate": true, "separator": "-", "suffix": " per 1K tokens" }\n'
-        '  } : {"type": "text", "text": "Token-based"}\n'
-        ")"
-    )
-
-
-async def _build_image_blocks(
-    cls: type[IO.ComfyNode], spec: _ModelSpec, images: list[Input.Image]
-) -> list[OpenRouterImageContent]:
-    urls = await upload_images_to_comfyapi(
-        cls,
-        images,
-        max_images=spec.max_images,
-        total_pixels=2048 * 2048,
-        mime_type="image/png",
-        wait_label="Uploading reference images",
-    )
-    return [OpenRouterImageContent(image_url=OpenRouterImageUrl(url=url)) for url in urls]
-
-
-async def _build_video_blocks(cls: type[IO.ComfyNode], videos: list[Input.Video]) -> list[OpenRouterVideoContent]:
-    blocks: list[OpenRouterVideoContent] = []
-    total = len(videos)
-    for idx, video in enumerate(videos):
-        label = "Uploading reference video"
-        if total > 1:
-            label = f"{label} ({idx + 1}/{total})"
-        url = await upload_video_to_comfyapi(cls, video, wait_label=label)
-        blocks.append(OpenRouterVideoContent(video_url=OpenRouterVideoUrl(url=url)))
-    return blocks
-
-
-def _user_message(prompt: str, media_blocks: list[OpenRouterContentBlock]) -> OpenRouterMessage:
-    if not media_blocks:
-        return OpenRouterMessage(role="user", content=prompt)
-    blocks: list[OpenRouterContentBlock] = list(media_blocks)
-    blocks.append(OpenRouterTextContent(text=prompt))
-    return OpenRouterMessage(role="user", content=blocks)
-
-
-def _build_messages(
-    system_prompt: str, prompt: str, media_blocks: list[OpenRouterContentBlock]
-) -> list[OpenRouterMessage]:
-    messages: list[OpenRouterMessage] = []
-    if system_prompt:
-        messages.append(OpenRouterMessage(role="system", content=system_prompt))
-    messages.append(_user_message(prompt, media_blocks))
-    return messages
-
-
-def _build_request(
-    slug: str,
-    system_prompt: str,
-    prompt: str,
-    media_blocks: list[OpenRouterContentBlock],
-    *,
-    seed: int,
-    reasoning_effort: str | None,
-    search_context_size: str | None,
-) -> OpenRouterChatRequest:
-    reasoning_cfg: OpenRouterReasoningConfig | None = None
-    if reasoning_effort and reasoning_effort != "off":
-        # exclude=True asks providers to reason internally but not return the trace
-        reasoning_cfg = OpenRouterReasoningConfig(effort=reasoning_effort, exclude=True)
-    web_search_cfg: OpenRouterWebSearchOptions | None = None
-    if search_context_size:
-        web_search_cfg = OpenRouterWebSearchOptions(search_context_size=search_context_size)
-    return OpenRouterChatRequest(
-        model=slug,
-        messages=_build_messages(system_prompt, prompt, media_blocks),
-        seed=seed if seed > 0 else None,
-        reasoning=reasoning_cfg,
-        web_search_options=web_search_cfg,
-    )
-
-
-def _extract_text(response: OpenRouterChatResponse) -> str:
-    if response.error:
-        code = response.error.code if response.error.code is not None else "unknown"
-        raise ValueError(f"OpenRouter error ({code}): {response.error.message or 'no message'}")
-    if not response.choices:
-        raise ValueError("Empty response from OpenRouter (no choices).")
-    message = response.choices[0].message
-    if not message:
-        raise ValueError("Empty response from OpenRouter (no message).")
-    if message.refusal:
-        raise ValueError(f"Model refused to respond: {message.refusal}")
-    return message.content or ""
-
-
-class OpenRouterLLMNode(IO.ComfyNode):
-
-    @classmethod
-    def define_schema(cls):
-        return IO.Schema(
-            node_id="OpenRouterLLMNode",
-            display_name="OpenRouter LLM",
-            category="api node/text/OpenRouter",
-            essentials_category="Text Generation",
-            description=(
-                "Generate text responses through OpenRouter. Routes to a curated set of popular "
-                "models from xAI, DeepSeek, Qwen, Mistral, Z.AI (GLM), Moonshot (Kimi), and "
-                "Perplexity Sonar."
-            ),
-            inputs=[
-                IO.String.Input(
-                    "prompt",
-                    multiline=True,
-                    default="",
-                    tooltip="Text input to the model.",
-                ),
-                IO.DynamicCombo.Input(
-                    "model",
-                    options=_build_model_options(),
-                    tooltip="The OpenRouter model used to generate the response.",
-                ),
-                IO.Int.Input(
-                    "seed",
-                    default=0,
-                    min=0,
-                    max=2147483647,
-                    control_after_generate=True,
-                    tooltip="Seed for sampling. Set to 0 to omit. Most models treat this as a hint only.",
-                ),
-                IO.String.Input(
-                    "system_prompt",
-                    multiline=True,
-                    default="",
-                    optional=True,
-                    advanced=True,
-                    tooltip="Foundational instructions that dictate the model's behavior.",
-                ),
-            ],
-            outputs=[IO.String.Output()],
-            hidden=[
-                IO.Hidden.auth_token_comfy_org,
-                IO.Hidden.api_key_comfy_org,
-                IO.Hidden.unique_id,
-            ],
-            is_api_node=True,
-            price_badge=IO.PriceBadge(
-                depends_on=IO.PriceBadgeDepends(widgets=["model"]),
-                expr=_price_badge_jsonata(),
-            ),
-        )
-
-    @classmethod
-    async def execute(
-        cls,
-        prompt: str,
-        model: dict,
-        seed: int,
-        system_prompt: str = "",
-    ) -> IO.NodeOutput:
-        validate_string(prompt, strip_whitespace=True, min_length=1)
-        slug: str = model["model"]
-        spec = _MODELS_BY_SLUG.get(slug)
-        if spec is None:
-            raise ValueError(f"Unknown OpenRouter model: {slug}")
-
-        reasoning_effort: str | None = model.get("reasoning_effort")
-        search_context_size: str | None = model.get("search_context_size")
-
-        image_tensors: list[Input.Image] = [t for t in (model.get("images") or {}).values() if t is not None]
-        if image_tensors and sum(get_number_of_images(t) for t in image_tensors) > spec.max_images:
-            raise ValueError(f"Up to {spec.max_images} images are supported for {slug}.")
-        video_inputs: list[Input.Video] = [v for v in (model.get("videos") or {}).values() if v is not None]
-        if video_inputs and len(video_inputs) > spec.max_videos:
-            raise ValueError(f"Up to {spec.max_videos} videos are supported for {slug}.")
-
-        media_blocks: list[OpenRouterContentBlock] = []
-        if image_tensors:
-            media_blocks.extend(await _build_image_blocks(cls, spec, image_tensors))
-        if video_inputs:
-            media_blocks.extend(await _build_video_blocks(cls, video_inputs))
-
-        request = _build_request(
-            slug,
-            system_prompt,
-            prompt,
-            media_blocks,
-            seed=seed,
-            reasoning_effort=reasoning_effort,
-            search_context_size=search_context_size,
-        )
-
-        response = await sync_op(
-            cls,
-            ApiEndpoint(path=OPENROUTER_CHAT_ENDPOINT, method="POST"),
-            response_model=OpenRouterChatResponse,
-            data=request,
-            price_extractor=_calculate_price,
-        )
-        return IO.NodeOutput(_extract_text(response))
-
-
-class OpenRouterExtension(ComfyExtension):
-    @override
-    async def get_node_list(self) -> list[type[IO.ComfyNode]]:
-        return [OpenRouterLLMNode]
-
-
-async def comfy_entrypoint() -> OpenRouterExtension:
-    return OpenRouterExtension()

comfy_api_nodes/util/__init__.py

@@ -16,17 +16,16 @@ from .conversions import (
     convert_mask_to_image,
     downscale_image_tensor,
     downscale_image_tensor_by_max_side,
-    downscale_video_to_max_pixels,
     image_tensor_pair_to_batch,
     pil_to_bytesio,
     resize_mask_to_image,
+    resize_video_to_pixel_budget,
     tensor_to_base64_string,
     tensor_to_bytesio,
     tensor_to_pil,
     text_filepath_to_base64_string,
     text_filepath_to_data_uri,
     trim_video,
-    upscale_video_to_min_pixels,
     video_to_base64_string,
 )
 from .download_helpers import (
@@ -89,17 +88,16 @@ __all__ = [
     "convert_mask_to_image",
     "downscale_image_tensor",
     "downscale_image_tensor_by_max_side",
-    "downscale_video_to_max_pixels",
     "image_tensor_pair_to_batch",
     "pil_to_bytesio",
     "resize_mask_to_image",
+    "resize_video_to_pixel_budget",
     "tensor_to_base64_string",
     "tensor_to_bytesio",
     "tensor_to_pil",
     "text_filepath_to_base64_string",
     "text_filepath_to_data_uri",
     "trim_video",
-    "upscale_video_to_min_pixels",
     "video_to_base64_string",
     # Validation utilities
     "get_image_dimensions",

comfy_api_nodes/util/conversions.py

@@ -415,48 +415,14 @@ def trim_video(video: Input.Video, duration_sec: float) -> Input.Video:
         raise RuntimeError(f"Failed to trim video: {str(e)}") from e
 
 
-def downscale_video_to_max_pixels(video: Input.Video, max_pixels: int) -> Input.Video:
-    """Downscale a video to fit within ``max_pixels`` (w * h), preserving aspect ratio.
+def resize_video_to_pixel_budget(video: Input.Video, total_pixels: int) -> Input.Video:
+    """Downscale a video to fit within ``total_pixels`` (w * h), preserving aspect ratio.
 
     Returns the original video object untouched when it already fits. Preserves frame rate, duration, and audio.
     Aspect ratio is preserved up to a fraction of a percent (even-dim rounding).
     """
     src_w, src_h = video.get_dimensions()
-    scale_dims = _compute_downscale_dims(src_w, src_h, max_pixels)
-    if scale_dims is None:
-        return video
-    return _apply_video_scale(video, scale_dims)
-
-
-def _compute_upscale_dims(src_w: int, src_h: int, total_pixels: int) -> tuple[int, int] | None:
-    """Return upscaled (w, h) with even dims meeting at least ``total_pixels``, or None if already large enough.
-
-    Source aspect ratio is preserved; output may drift by a fraction of a percent because both dimensions
-    are rounded up to even values (many codecs require divisible-by-2). The result is guaranteed to be at
-    least ``total_pixels``.
-    """
-    pixels = src_w * src_h
-    if pixels >= total_pixels:
-        return None
-    scale = math.sqrt(total_pixels / pixels)
-    new_w = math.ceil(src_w * scale)
-    new_h = math.ceil(src_h * scale)
-    if new_w % 2:
-        new_w += 1
-    if new_h % 2:
-        new_h += 1
-    return new_w, new_h
-
-
-def upscale_video_to_min_pixels(video: Input.Video, min_pixels: int) -> Input.Video:
-    """Upscale a video to meet at least ``min_pixels`` (w * h), preserving aspect ratio.
-
-    Returns the original video object untouched when it already meets the minimum. Preserves frame rate,
-    duration, and audio. Aspect ratio is preserved up to a fraction of a percent (even-dim rounding).
-    Note: upscaling a low-resolution source does not add real detail; downstream model quality may suffer.
-    """
-    src_w, src_h = video.get_dimensions()
-    scale_dims = _compute_upscale_dims(src_w, src_h, min_pixels)
+    scale_dims = _compute_downscale_dims(src_w, src_h, total_pixels)
     if scale_dims is None:
         return video
     return _apply_video_scale(video, scale_dims)

comfy_extras/mediapipe/face_geometry.py

@@ -1,111 +0,0 @@
-"""Pure-numpy port of MediaPipe's face_geometry (FACE_LANDMARK_PIPELINE mode)
-+ weighted Procrustes solver. Computes the 4x4 facial transformation matrix.
-"""
-
-from __future__ import annotations
-
-import math
-import numpy as np
-
-
-def _solve_weighted_orthogonal_problem(src: np.ndarray, tgt: np.ndarray, weights: np.ndarray) -> np.ndarray:
-    """Weighted orthogonal Procrustes (similarity). Returns 4x4 M with
-    `target ≈ M @ homogeneous(source)` in the weighted LS sense. fp64 for
-    SVD stability. Port of procrustes_solver.cc."""
-    sqrt_w = np.sqrt(weights.astype(np.float64))
-    w_total = float((sqrt_w ** 2).sum())
-    ws = src.astype(np.float64) * sqrt_w
-    wt = tgt.astype(np.float64) * sqrt_w
-
-    c_w = (ws @ sqrt_w) / w_total
-    centered = ws - np.outer(c_w, sqrt_w)
-    U, _S, Vt = np.linalg.svd(wt @ centered.T, full_matrices=True)
-    # Disallow reflection: flip the least-significant axis when det(U)·det(V)<0.
-    post, pre = U.copy(), Vt.T.copy()
-    if np.linalg.det(post) * np.linalg.det(pre) < 0:
-        post[:, 2] *= -1.0
-    R = post @ pre.T
-
-    denom = float((centered * ws).sum())
-    if denom < 1e-12:
-        raise ValueError("Procrustes denominator collapsed (degenerate source).")
-    scale = float((R @ centered * wt).sum()) / denom
-    translation = ((wt - scale * (R @ ws)) @ sqrt_w) / w_total
-
-    M = np.eye(4, dtype=np.float64)
-    M[:3, :3] = scale * R
-    M[:3, 3] = translation
-    return M
-
-
-def _estimate_scale(canonical: np.ndarray, runtime: np.ndarray, weights: np.ndarray) -> float:
-    """scale = ‖first column of M[:3]‖ per geometry_pipeline.cc::EstimateScale."""
-    return float(np.linalg.norm(_solve_weighted_orthogonal_problem(canonical, runtime, weights)[:3, 0]))
-
-
-def solve_facial_transformation_matrix(
-    landmarks_normalized: np.ndarray,
-    canonical_vertices: np.ndarray,
-    procrustes_indices: np.ndarray,
-    procrustes_weights: np.ndarray,
-    image_width: int,
-    image_height: int,
-    # face_geometry_calculator_options.pbtxt defaults
-    vertical_fov_degrees: float = 63.0,
-    near: float = 1.0,
-) -> np.ndarray:
-    """4x4 facial transformation matrix via two-pass scale recovery
-    `landmarks_normalized` is (N, 3) in MediaPipe normalized convention: x, y
-    in [0,1] with TOP-LEFT origin, z in width-scaled units.
-    """
-
-    h_near = 2.0 * near * math.tan(0.5 * math.radians(vertical_fov_degrees))
-    w_near = image_width * h_near / image_height
-
-    sub = procrustes_indices.astype(np.int64)
-    screen = landmarks_normalized[sub].T.astype(np.float64).copy()
-    canon = canonical_vertices[sub].T.astype(np.float64).copy()
-    weights = procrustes_weights.astype(np.float64)
-
-    # ProjectXY (TOP_LEFT y-flip, then scale all 3 axes; z uses x-scale).
-    screen[1] = 1.0 - screen[1]
-    screen[0] = screen[0] * w_near - 0.5 * w_near
-    screen[1] = screen[1] * h_near - 0.5 * h_near
-    screen[2] = screen[2] * w_near
-    depth_offset = float(screen[2].mean())
-
-    def _unproject(s: np.ndarray, scale: float) -> np.ndarray:
-        s = s.copy()
-        s[2] = (s[2] - depth_offset + near) / scale
-        s[0] *= s[2] / near
-        s[1] *= s[2] / near
-        s[2] *= -1.0
-        return s
-
-    first = screen.copy()
-    first[2] *= -1.0
-    s1 = _estimate_scale(canon, first, weights) # 1st pass: Procrustes on projected XY
-    s2 = _estimate_scale(canon, _unproject(screen, s1), weights) # 2nd pass: rescale z by s1, un-project XY
-    return _solve_weighted_orthogonal_problem(canon, _unproject(screen, s1 * s2), weights).astype(np.float32)
-
-
-def transformation_matrix_from_detection(face_dict: dict, image_width: int, image_height: int, canonical_data: dict) -> np.ndarray:
-    """Adapt a FaceLandmarker face dict to MP's normalized convention and solve.
-    FaceMesh emits (x, y, z) in 192-canonical units; MP's geometry expects
-    z_norm = z_canonical * scale_x / image_width"""
-
-    lmks_xy, lmks_3d = face_dict["landmarks_xy"], face_dict["landmarks_3d"]
-    aug = np.concatenate([lmks_3d[:, :2].astype(np.float64), np.ones((lmks_xy.shape[0], 1))], axis=1)
-    M, *_ = np.linalg.lstsq(aug, lmks_xy.astype(np.float64), rcond=None)
-    scale_x = float(np.linalg.norm(M[0]))
-    z_scale = scale_x / image_width if scale_x > 1e-6 else 1.0 / image_width
-
-    normalized = np.empty((lmks_xy.shape[0], 3), dtype=np.float32)
-    normalized[:, 0] = lmks_xy[:, 0] / image_width
-    normalized[:, 1] = lmks_xy[:, 1] / image_height
-    normalized[:, 2] = lmks_3d[:, 2] * z_scale
-    return solve_facial_transformation_matrix(
-        normalized, canonical_data["canonical_vertices"],
-        canonical_data["procrustes_indices"], canonical_data["procrustes_weights"],
-        image_width=image_width, image_height=image_height,
-    )

comfy_extras/mediapipe/face_landmarker.py

@@ -1,682 +0,0 @@
-"""Pure-PyTorch port of MediaPipe's face_landmarker_v2_with_blendshapes.task:
-BlazeFace detector → FaceMesh v2 → ARKit-52 blendshapes."""
-
-from __future__ import annotations
-
-import math
-from functools import lru_cache
-from typing import List, Tuple
-
-import numpy as np
-import torch
-import torch.nn.functional as F
-from scipy.special import expit
-from torch import Tensor, nn
-
-
-# Values below must stay verbatim with the published face_landmarker_v2 graph
-
-# face_blendshapes_graph.cc::kLandmarksSubsetIdxs
-_BS_INPUT_INDICES: Tuple[int, ...] = (
-    0, 1, 4, 5, 6, 7, 8, 10, 13, 14, 17, 21, 33, 37, 39, 40, 46, 52, 53, 54,
-    55, 58, 61, 63, 65, 66, 67, 70, 78, 80, 81, 82, 84, 87, 88, 91, 93, 95,
-    103, 105, 107, 109, 127, 132, 133, 136, 144, 145, 146, 148, 149, 150, 152,
-    153, 154, 155, 157, 158, 159, 160, 161, 162, 163, 168, 172, 173, 176, 178,
-    181, 185, 191, 195, 197, 234, 246, 249, 251, 263, 267, 269, 270, 276, 282,
-    283, 284, 285, 288, 291, 293, 295, 296, 297, 300, 308, 310, 311, 312, 314,
-    317, 318, 321, 323, 324, 332, 334, 336, 338, 356, 361, 362, 365, 373, 374,
-    375, 377, 378, 379, 380, 381, 382, 384, 385, 386, 387, 388, 389, 390, 397,
-    398, 400, 402, 405, 409, 415, 454, 466, 468, 469, 470, 471, 472, 473, 474,
-    475, 476, 477,
-)
-
-# face_blendshapes_graph.cc::kCategoryNames
-BLENDSHAPE_NAMES: Tuple[str, ...] = (
-    "_neutral", "browDownLeft", "browDownRight", "browInnerUp", "browOuterUpLeft",
-    "browOuterUpRight", "cheekPuff", "cheekSquintLeft", "cheekSquintRight",
-    "eyeBlinkLeft", "eyeBlinkRight", "eyeLookDownLeft", "eyeLookDownRight",
-    "eyeLookInLeft", "eyeLookInRight", "eyeLookOutLeft", "eyeLookOutRight",
-    "eyeLookUpLeft", "eyeLookUpRight", "eyeSquintLeft", "eyeSquintRight",
-    "eyeWideLeft", "eyeWideRight", "jawForward", "jawLeft", "jawOpen",
-    "jawRight", "mouthClose", "mouthDimpleLeft", "mouthDimpleRight",
-    "mouthFrownLeft", "mouthFrownRight", "mouthFunnel", "mouthLeft",
-    "mouthLowerDownLeft", "mouthLowerDownRight", "mouthPressLeft",
-    "mouthPressRight", "mouthPucker", "mouthRight", "mouthRollLower",
-    "mouthRollUpper", "mouthShrugLower", "mouthShrugUpper", "mouthSmileLeft",
-    "mouthSmileRight", "mouthStretchLeft", "mouthStretchRight",
-    "mouthUpperUpLeft", "mouthUpperUpRight", "noseSneerLeft", "noseSneerRight",
-)
-
-# face_detection.pbtxt — short-range BlazeFace.
-_BF_NUM_LAYERS = 4
-_BF_INPUT_SIZE = 128
-_BF_STRIDES = (8, 16, 16, 16)
-_BF_ANCHOR_OFFSET_X = 0.5
-_BF_ANCHOR_OFFSET_Y = 0.5
-_BF_ASPECT_RATIOS = (1.0,)
-_BF_INTERP_SCALE_AR = 1.0
-_BF_BOX_SCALE = 128.0
-_BF_KP_OFFSET = 4
-_BF_SCORE_CLIP = 100.0
-_BF_MIN_SCORE = 0.5
-
-# face_detection_full_range.pbtxt — 48x48 grid at stride 4, 1 anchor/cell.
-_BF_FR_INPUT_SIZE = 192
-_BF_FR_GRID = 48
-_BF_FR_NUM_ANCHORS = _BF_FR_GRID * _BF_FR_GRID
-_BF_FR_BOX_SCALE = 192.0
-_BF_FR_SCORE_CLIP = 100.0
-
-_FM_INPUT_SIZE = 192
-
-# Face ROI: 1.5xbbox rect warped anisotropically into 192x192.
-_FACE_LEFT_EYE_KP = 0
-_FACE_RIGHT_EYE_KP = 1
-_FACE_ROI_SCALE_X = 1.5
-_FACE_ROI_SCALE_Y = 1.5
-_FACE_ROI_TARGET_ANGLE = 0.0
-
-
-def _tf_same_pad(x: Tensor, kernel: int, stride: int) -> Tensor:
-    """TF SAME pad (asymmetric on stride-2; PyTorch's symmetric pad undershoots by 1 px)."""
-    H, W = x.shape[-2], x.shape[-1]
-    pad_h = max(((H + stride - 1) // stride - 1) * stride + kernel - H, 0)
-    pad_w = max(((W + stride - 1) // stride - 1) * stride + kernel - W, 0)
-    if pad_h == 0 and pad_w == 0:
-        return x
-    return F.pad(x, (pad_w // 2, pad_w - pad_w // 2, pad_h // 2, pad_h - pad_h // 2))
-
-
-# BlazeFace short-range: stem 5x5/s2 → 16 BlazeBlocks → parallel heads at
-# 16²x88 (2 anchors/cell) and 8²x96 (6/cell) = 896 anchors. (in, out, stride):
-_BLAZEFACE_BLOCKS = [
-    (24, 24, 1), (24, 28, 1), (28, 32, 2), (32, 36, 1),
-    (36, 42, 1), (42, 48, 2), (48, 56, 1), (56, 64, 1),
-    (64, 72, 1), (72, 80, 1), (80, 88, 1), (88, 96, 2),
-    (96, 96, 1), (96, 96, 1), (96, 96, 1), (96, 96, 1),
-]
-
-
-class BlazeFaceBlock(nn.Module):
-    """DW 3x3 + PW + residual. Residual max-pools on stride>1, channel-pads on out_ch>in_ch."""
-
-    def __init__(self, in_ch: int, out_ch: int, stride: int, device=None, dtype=None, operations=None):
-        super().__init__()
-        ops = operations if operations is not None else nn
-        self.in_ch, self.out_ch, self.stride = in_ch, out_ch, stride
-        self.depthwise = ops.Conv2d(in_ch, in_ch, 3, stride=stride, padding=0, groups=in_ch, bias=True, device=device, dtype=dtype)
-        self.pointwise = ops.Conv2d(in_ch, out_ch, 1, padding=0, bias=True, device=device, dtype=dtype)
-
-    def forward(self, x: Tensor) -> Tensor:
-        residual = F.max_pool2d(x, 2, 2) if self.stride > 1 else x
-        if self.out_ch > self.in_ch:
-            residual = F.pad(residual, (0, 0, 0, 0, 0, self.out_ch - self.in_ch))
-        x = _tf_same_pad(x, 3, self.stride) if self.stride > 1 else F.pad(x, (1, 1, 1, 1))
-        return F.relu(self.pointwise(self.depthwise(x)) + residual)
-
-
-class BlazeFace(nn.Module):
-    """Short-range BlazeFace: (B, 3, 128, 128) in [-1, 1] → 896 anchors x 17."""
-
-    def __init__(self, device=None, dtype=None, operations=None):
-        super().__init__()
-        ops = operations if operations is not None else nn
-        kw = dict(device=device, dtype=dtype)
-        self.stem = ops.Conv2d(3, 24, 5, stride=2, padding=0, bias=True, **kw)
-        self.blocks = nn.ModuleList(BlazeFaceBlock(i, o, s, device=device, dtype=dtype, operations=operations)
-                                    for (i, o, s) in _BLAZEFACE_BLOCKS)
-        # 16²x2 + 8²x6 = 512 + 384 = 896 anchors.
-        self.cls_16 = ops.Conv2d(88, 2, 1, padding=0, bias=True, **kw)
-        self.cls_8 = ops.Conv2d(96, 6, 1, padding=0, bias=True, **kw)
-        self.reg_16 = ops.Conv2d(88, 32, 1, padding=0, bias=True, **kw)
-        self.reg_8 = ops.Conv2d(96, 96, 1, padding=0, bias=True, **kw)
-
-    def forward(self, image_chw_normalized: Tensor) -> tuple[Tensor, Tensor]:
-        x = F.relu(self.stem(_tf_same_pad(image_chw_normalized, 5, 2)))
-        # 16x16 tap is block-10 output (before the 88→96 stride-2 in block 11).
-        for i in range(11):
-            x = self.blocks[i](x)
-        feat_16 = x
-        for i in range(11, 16):
-            x = self.blocks[i](x)
-        feat_8 = x
-
-        def flat(t, a, k):  # NHWC flatten → (B, H*W*A, K)
-            B, _, H, W = t.shape
-            return t.permute(0, 2, 3, 1).reshape(B, H * W * a, k)
-
-        cls = torch.cat([flat(self.cls_16(feat_16), 2, 1), flat(self.cls_8(feat_8), 6, 1)], dim=1)
-        reg = torch.cat([flat(self.reg_16(feat_16), 2, 16), flat(self.reg_8(feat_8), 6, 16)], dim=1)
-        return reg, cls
-
-
-# BlazeFace full-range (face_detection_full_range_sparse.tflite): MobileNetV2-ish
-# backbone + top-down FPN, 192² input → 2304 anchors at the 48x48 grid.
-class FRBlock(nn.Module):
-    """Double inverted residual: DW → PW(mid) → DW → PW(out) [+ residual].
-
-    Per source tflite: dw* have no fused activation, pw1 is always ReLU, pw2
-    is ReLU only when no residual (else ReLU fuses into the ADD).
-    """
-
-    def __init__(self, in_ch: int, mid_ch: int, out_ch: int, stride: int, device=None, dtype=None, operations=None):
-        super().__init__()
-        ops = operations if operations is not None else nn
-        kw = dict(device=device, dtype=dtype)
-        self.has_residual = (in_ch == out_ch and stride == 1)
-        self.dw1 = ops.Conv2d(in_ch, in_ch, 3, stride=stride, padding=0, groups=in_ch, bias=True, **kw)
-        self.pw1 = ops.Conv2d(in_ch, mid_ch, 1, padding=0, bias=True, **kw)
-        self.dw2 = ops.Conv2d(mid_ch, mid_ch, 3, stride=1, padding=0, groups=mid_ch, bias=True, **kw)
-        self.pw2 = ops.Conv2d(mid_ch, out_ch, 1, padding=0, bias=True, **kw)
-
-    def forward(self, x: Tensor) -> Tensor:
-        residual = x if self.has_residual else None
-        x = F.relu(self.pw1(self.dw1(F.pad(x, (1, 1, 1, 1)))))
-        x = self.pw2(self.dw2(F.pad(x, (1, 1, 1, 1))))
-        return F.relu(x + residual) if residual is not None else F.relu(x)
-
-
-# (in_ch, mid_ch, out_ch, stride). Stages downsample 96²x32 → 48²x64 → 24²x128
-# → 12²x192 → 6²x384. Lateral taps at indices 4, 7, 10 (see _FR_LATERAL_*).
-_FR_BACKBONE_BLOCKS = [
-    (32, 8, 32, 1),    (32, 8, 32, 1),                                            # 96²x32
-    (32, 16, 64, 2),   (64, 16, 64, 1),   (64, 16, 64, 1),                        # 48²x64 — tap[0]
-    (64, 32, 128, 2),  (128, 32, 128, 1), (128, 32, 128, 1),                      # 24²x128 — tap[1]
-    (128, 48, 192, 2), (192, 48, 192, 1), (192, 48, 192, 1),                      # 12²x192 — tap[2]
-    (192, 96, 384, 2), (384, 96, 384, 1), (384, 96, 384, 1), (384, 96, 384, 1),   # 6²x384
-]
-_FR_LATERAL_TAP_INDICES = (4, 7, 10)
-_FR_LATERAL_CHANNELS = ((64, 48), (128, 64), (192, 96))  # (in, out) per side-conv
-
-# Decoder blocks per FPN level (after upsample-and-merge with the lateral).
-_FR_DECODER_BLOCKS = [
-    [(96, 48, 96, 1), (96, 48, 96, 1)],  # 12²x96
-    [(64, 32, 64, 1), (64, 32, 64, 1)],  # 24²x64
-    [(48, 24, 48, 1)],                   # 48²x48 — feeds the heads
-]
-
-
-def _dcr_depth_to_space(t: Tensor, r: int, c_out: int) -> Tensor:
-    """TF DEPTH_TO_SPACE in DCR layout (input channels = (i, j, c_out)).
-    pixel_shuffle uses CRD which permutes output channels for c_out > 1."""
-    B_, _, H_, W_ = t.shape
-    t = t.reshape(B_, r, r, c_out, H_, W_)
-    t = t.permute(0, 3, 4, 1, 5, 2).contiguous()
-    return t.reshape(B_, c_out, H_ * r, W_ * r)
-
-
-class BlazeFaceFullRange(nn.Module):
-    """Full-range face detector: (B, 3, 192, 192) in [-1, 1] → 2304 anchors x 17 values."""
-
-    def __init__(self, device=None, dtype=None, operations=None):
-        super().__init__()
-        ops = operations if operations is not None else nn
-        kw = dict(device=device, dtype=dtype)
-        mk_block = lambda i, m, o, s: FRBlock(i, m, o, s, device=device, dtype=dtype, operations=operations)
-        self.stem = ops.Conv2d(3, 32, 3, stride=2, padding=0, bias=True, **kw)
-        self.backbone = nn.ModuleList(mk_block(i, m, o, s) for (i, m, o, s) in _FR_BACKBONE_BLOCKS)
-        self.lateral_convs = nn.ModuleList(ops.Conv2d(i, o, 1, padding=0, bias=True, **kw) for (i, o) in _FR_LATERAL_CHANNELS)
-        self.top_conv = ops.Conv2d(384, 96, 1, padding=0, bias=True, **kw)
-        self.decoder_levels = nn.ModuleList(
-            nn.ModuleList(mk_block(i, m, o, s) for (i, m, o, s) in lvl) for lvl in _FR_DECODER_BLOCKS
-        )
-        # 96→64 before 12→24, 64→48 before 24→48.
-        self.decoder_reduce_convs = nn.ModuleList([
-            ops.Conv2d(96, 64, 1, padding=0, bias=True, **kw),
-            ops.Conv2d(64, 48, 1, padding=0, bias=True, **kw),
-        ])
-        # Heads mix 2x2-cell info via DW-stride-2 + depth_to_space block_size=2.
-        self.cls_conv = ops.Conv2d(48, 4, 1, padding=0, bias=True, **kw)
-        self.cls_dw = ops.Conv2d(4, 4, 3, stride=2, padding=0, groups=4, bias=True, **kw)
-        self.reg_conv = ops.Conv2d(48, 64, 1, padding=0, bias=True, **kw)
-        self.reg_dw = ops.Conv2d(64, 64, 3, stride=2, padding=0, groups=64, bias=True, **kw)
-
-    def forward(self, image_chw_normalized: Tensor) -> tuple[Tensor, Tensor]:
-        # Symmetric pad-1 throughout (full-range tflite uses explicit TF PAD, not SAME).
-        x = F.relu(self.stem(F.pad(image_chw_normalized, (1, 1, 1, 1))))
-        tap_set = set(_FR_LATERAL_TAP_INDICES)
-        laterals: list[Tensor] = []
-        for i, blk in enumerate(self.backbone):
-            x = blk(x)
-            if i in tap_set:
-                laterals.append(x)
-
-        # top_conv / lateral_convs / decoder_reduce_convs all have fused ReLU in the tflite.
-        p = F.relu(self.top_conv(x))
-        laterals_rev = list(reversed(laterals))
-        lateral_convs_rev = list(reversed(self.lateral_convs))
-        for level in range(len(self.decoder_levels)):
-            lateral = laterals_rev[level]
-            p = F.interpolate(p, size=lateral.shape[-2:], mode="bilinear", align_corners=False)
-            p = p + F.relu(lateral_convs_rev[level](lateral))
-            for blk in self.decoder_levels[level]:
-                p = blk(p)
-            if level < len(self.decoder_reduce_convs):
-                p = F.relu(self.decoder_reduce_convs[level](p))
-
-        c = self.cls_dw(F.pad(self.cls_conv(p), (1, 1, 1, 1)))
-        c = _dcr_depth_to_space(c, r=2, c_out=1)
-        r = self.reg_dw(F.pad(self.reg_conv(p), (1, 1, 1, 1)))
-        r = _dcr_depth_to_space(r, r=2, c_out=16)
-        B = c.shape[0]
-        cls_out = c.permute(0, 2, 3, 1).reshape(B, _BF_FR_NUM_ANCHORS, 1)
-        reg_out = r.permute(0, 2, 3, 1).reshape(B, _BF_FR_NUM_ANCHORS, 16)
-        return reg_out, cls_out
-
-
-@lru_cache(maxsize=1)
-def _blazeface_full_range_anchors() -> np.ndarray:
-    """2304 anchors over 48x48; anchor_w=anchor_h=1 (fixed_anchor_size)."""
-    feat = _BF_FR_GRID
-    yy, xx = np.meshgrid(np.arange(feat, dtype=np.float32), np.arange(feat, dtype=np.float32), indexing="ij")
-    cx, cy, ones = (xx + 0.5) / feat, (yy + 0.5) / feat, np.ones_like(xx)
-    return np.stack([cx, cy, ones, ones], axis=-1).reshape(_BF_FR_NUM_ANCHORS, 4)
-
-
-def _decode_blazeface_full_range(regressors: np.ndarray, classificators: np.ndarray,
-                                 score_thresh: float = _BF_MIN_SCORE) -> np.ndarray:
-    """Same decode as short-range with 2304-anchor grid and box_scale=192."""
-    scores = expit(np.clip(classificators[:, 0], -_BF_FR_SCORE_CLIP, _BF_FR_SCORE_CLIP))
-    keep = scores >= score_thresh
-    if not keep.any():
-        return np.empty((0, 17), dtype=np.float32)
-    r = regressors[keep] / _BF_FR_BOX_SCALE
-    a = _blazeface_full_range_anchors()[keep]
-    cxs, cys, aws, ahs = a[:, 0:1], a[:, 1:2], a[:, 2:3], a[:, 3:4]
-    xc, yc = r[:, 0:1] * aws + cxs, r[:, 1:2] * ahs + cys
-    w, h = r[:, 2:3] * aws, r[:, 3:4] * ahs
-    out = np.empty((r.shape[0], 17), dtype=np.float32)
-    out[:, 0:1], out[:, 1:2], out[:, 2:3], out[:, 3:4] = xc - w / 2, yc - h / 2, xc + w / 2, yc + h / 2
-    out[:, 4:16:2] = r[:, _BF_KP_OFFSET::2] * aws + cxs
-    out[:, 5:16:2] = r[:, _BF_KP_OFFSET + 1::2] * ahs + cys
-    out[:, 16] = scores[keep]
-    return out
-
-
-# FaceMesh (face_landmarks_detector.tflite): PReLU variant of BlazeBlock,
-# 17 blocks, heads for 478x3 landmarks + presence.
-_FACEMESH_BLOCKS = [  # (in_ch, out_ch, stride)
-    (16, 16, 1),  (16, 16, 1),  (16, 32, 2),  (32, 32, 1), (32, 32, 1), (32, 64, 2),
-    (64, 64, 1),  (64, 64, 1),  (64, 128, 2), (128, 128, 1), (128, 128, 1), (128, 128, 2),
-    (128, 128, 1), (128, 128, 1), (128, 128, 2), (128, 128, 1), (128, 128, 1),
-]
-
-
-class FaceMeshBlock(nn.Module):
-    """PReLU BlazeBlock: PReLU between DW and PW, and after the residual add."""
-
-    def __init__(self, in_ch: int, out_ch: int, stride: int, device=None, dtype=None, operations=None):
-        super().__init__()
-        ops = operations if operations is not None else nn
-        kw = dict(device=device, dtype=dtype)
-        self.in_ch, self.out_ch, self.stride = in_ch, out_ch, stride
-        self.depthwise = ops.Conv2d(in_ch, in_ch, 3, stride=stride, padding=0, groups=in_ch, bias=True, **kw)
-        self.prelu_dwise = nn.PReLU(num_parameters=in_ch, **kw)
-        self.pointwise = ops.Conv2d(in_ch, out_ch, 1, padding=0, bias=True, **kw)
-        self.prelu_out = nn.PReLU(num_parameters=out_ch, **kw)
-
-    def forward(self, x: Tensor) -> Tensor:
-        residual = F.max_pool2d(x, 2, 2) if self.stride > 1 else x
-        if self.out_ch > self.in_ch:
-            residual = F.pad(residual, (0, 0, 0, 0, 0, self.out_ch - self.in_ch))
-        x = _tf_same_pad(x, 3, self.stride) if self.stride > 1 else F.pad(x, (1, 1, 1, 1))
-        return self.prelu_out(self.pointwise(self.prelu_dwise(self.depthwise(x))) + residual)
-
-
-class FaceMesh(nn.Module):
-    NUM_LANDMARKS = 478
-
-    def __init__(self, device=None, dtype=None, operations=None):
-        super().__init__()
-        ops = operations if operations is not None else nn
-        kw = dict(device=device, dtype=dtype)
-        self.stem = ops.Conv2d(3, 16, 3, stride=2, padding=0, bias=True, **kw)
-        self.prelu_stem = nn.PReLU(num_parameters=16, **kw)
-        self.blocks = nn.ModuleList(FaceMeshBlock(i, o, s, device=device, dtype=dtype, operations=operations)
-                                    for (i, o, s) in _FACEMESH_BLOCKS)
-        self.head_reduce = ops.Conv2d(128, 8, 1, padding=0, bias=True, **kw)
-        self.prelu_head_reduce = nn.PReLU(num_parameters=8, **kw)
-        self.head_block = FaceMeshBlock(8, 8, 1, device=device, dtype=dtype, operations=operations)
-        self.head_presence = ops.Conv2d(8, 1, 3, padding=0, bias=True, **kw)
-        self.head_landmarks = ops.Conv2d(8, self.NUM_LANDMARKS * 3, 3, padding=0, bias=True, **kw)
-
-    def forward(self, face_chw_normalized: Tensor) -> tuple[Tensor, Tensor]:
-        """(B, 3, 192, 192) in [0, 1] → ((B, 478, 3) landmarks in 192-canonical, (B,) presence)."""
-        x = self.prelu_stem(self.stem(_tf_same_pad(face_chw_normalized, 3, 2)))
-        for blk in self.blocks:
-            x = blk(x)
-        x = self.prelu_head_reduce(self.head_reduce(x))
-        x = self.head_block(x)
-        B = x.shape[0]
-        presence = self.head_presence(x).reshape(B)
-        lmks = self.head_landmarks(x).reshape(B, self.NUM_LANDMARKS, 3)
-        return lmks, presence
-
-
-# FaceBlendshapes (MLP-Mixer "GhumMarkerPoserMlpMixerGeneral"):
-# 146x2 → token-reduce 146→96 → embed 2→64 → +cls token → 4x mixer → cls→52.
-_BS_NUM_INPUT_LANDMARKS = 146
-_BS_NUM_TOKENS_REDUCED = 96
-_BS_NUM_TOKENS = 97  # +1 cls
-_BS_TOKEN_DIM = 64
-_BS_TOKEN_MIX_HIDDEN = 384
-_BS_CHANNEL_MIX_HIDDEN = 256
-_BS_NUM_BLENDSHAPES = 52
-_BS_LN_EPS = 1e-6
-
-
-class MlpMixerBlock(nn.Module):
-    """MLP-Mixer block: token-mixing MLP (over tokens) → channel-mixing MLP (over dim).
-    Both pre-LN, both residual. LN has no beta (bias=False) to match MP."""
-
-    def __init__(self, num_tokens: int, token_dim: int, token_hidden: int, channel_hidden: int,
-                 device=None, dtype=None, operations=None):
-        super().__init__()
-        ops = operations if operations is not None else nn
-        kw = dict(device=device, dtype=dtype)
-        # bias=False → no LN beta (matches MP).
-        self.ln1 = ops.LayerNorm(token_dim, eps=_BS_LN_EPS, bias=False, **kw)
-        self.ln2 = ops.LayerNorm(token_dim, eps=_BS_LN_EPS, bias=False, **kw)
-        self.token_mlp1 = ops.Linear(num_tokens, token_hidden, bias=True, **kw)
-        self.token_mlp2 = ops.Linear(token_hidden, num_tokens, bias=True, **kw)
-        self.channel_mlp1 = ops.Linear(token_dim, channel_hidden, bias=True, **kw)
-        self.channel_mlp2 = ops.Linear(channel_hidden, token_dim, bias=True, **kw)
-
-    def forward(self, x: Tensor) -> Tensor:
-        y = self.ln1(x).transpose(1, 2)
-        x = x + self.token_mlp2(F.relu(self.token_mlp1(y))).transpose(1, 2)
-        return x + self.channel_mlp2(F.relu(self.channel_mlp1(self.ln2(x))))
-
-
-class FaceBlendshapes(nn.Module):
-    def __init__(self, device=None, dtype=None, operations=None):
-        super().__init__()
-        ops = operations if operations is not None else nn
-        kw = dict(device=device, dtype=dtype)
-        self.token_reduce = ops.Linear(_BS_NUM_INPUT_LANDMARKS, _BS_NUM_TOKENS_REDUCED, bias=True, **kw)
-        self.token_embed = ops.Linear(2, _BS_TOKEN_DIM, bias=True, **kw)
-        self.cls_token = nn.Parameter(torch.zeros(1, 1, _BS_TOKEN_DIM, **kw))
-        self.blocks = nn.ModuleList(
-            MlpMixerBlock(_BS_NUM_TOKENS, _BS_TOKEN_DIM, _BS_TOKEN_MIX_HIDDEN, _BS_CHANNEL_MIX_HIDDEN,
-                          device=device, dtype=dtype, operations=operations) for _ in range(4)
-        )
-        self.head = ops.Linear(_BS_TOKEN_DIM, _BS_NUM_BLENDSHAPES, bias=True, **kw)
-
-    @staticmethod
-    def _input_normalize(landmarks_2d: Tensor) -> Tensor:
-        # Centroid-subtract → L2 scale → x0.5. The 0.5 is baked into training.
-        centroid = landmarks_2d.mean(dim=1, keepdim=True)
-        x = landmarks_2d - centroid
-        mag = torch.sqrt((x * x).sum(dim=-1, keepdim=True))
-        scale = mag.mean(dim=1, keepdim=True)
-        return (x / scale.clamp(min=1e-12)) * 0.5
-
-    def forward(self, landmarks_2d: Tensor) -> Tensor:
-        """(B, 146, 2) → (B, 52) in [0, 1]. Input units don't matter (centroid + L2 normalize)."""
-        x = self._input_normalize(landmarks_2d)
-        x = self.token_reduce(x.transpose(1, 2)).transpose(1, 2)
-        x = self.token_embed(x)
-        cls = self.cls_token.expand(x.shape[0], -1, -1)
-        x = torch.cat([cls, x], dim=1)
-        for blk in self.blocks:
-            x = blk(x)
-        return torch.sigmoid(self.head(x[:, 0]))
-
-
-@lru_cache(maxsize=1)
-def _blazeface_anchors() -> np.ndarray:
-    """896 anchors per SsdAnchorsCalculator (fixed_anchor_size → anchor_w=anchor_h=1)."""
-    per_ar = len(_BF_ASPECT_RATIOS) + (1 if _BF_INTERP_SCALE_AR > 0 else 0)
-    layer_anchors: List[np.ndarray] = []
-    layer = 0
-    while layer < _BF_NUM_LAYERS:
-        stride = _BF_STRIDES[layer]
-        last = layer
-        while last < _BF_NUM_LAYERS and _BF_STRIDES[last] == stride:
-            last += 1
-        per_cell = per_ar * (last - layer)
-        feat = (_BF_INPUT_SIZE + stride - 1) // stride
-        yy, xx = np.meshgrid(np.arange(feat, dtype=np.float32), np.arange(feat, dtype=np.float32), indexing="ij")
-        cx, cy, ones = (xx + _BF_ANCHOR_OFFSET_X) / feat, (yy + _BF_ANCHOR_OFFSET_Y) / feat, np.ones_like(xx)
-        cell = np.stack([cx, cy, ones, ones], axis=-1).reshape(-1, 4)
-        layer_anchors.append(np.repeat(cell, per_cell, axis=0))
-        layer = last
-    out = np.concatenate(layer_anchors, axis=0)
-    assert out.shape == (896, 4), out.shape
-    return out
-
-
-def _decode_blazeface(regressors: np.ndarray, classificators: np.ndarray,
-                      score_thresh: float = _BF_MIN_SCORE) -> np.ndarray:
-    """Decode (regs (896,16), cls (896,1)) → (N, 17) = [xyxy, kp0x..kp5y, score] in [0, 1]."""
-    scores = expit(np.clip(classificators[:, 0], -_BF_SCORE_CLIP, _BF_SCORE_CLIP))
-    keep = scores >= score_thresh
-    if not keep.any():
-        return np.empty((0, 17), dtype=np.float32)
-    r = regressors[keep] / _BF_BOX_SCALE
-    a = _blazeface_anchors()[keep]  # (N, 4) cx, cy, 1, 1
-    cxs, cys, aws, ahs = a[:, 0:1], a[:, 1:2], a[:, 2:3], a[:, 3:4]
-    xc, yc = r[:, 0:1] * aws + cxs, r[:, 1:2] * ahs + cys
-    w, h = r[:, 2:3] * aws, r[:, 3:4] * ahs
-    out = np.empty((r.shape[0], 17), dtype=np.float32)
-    out[:, 0:1], out[:, 1:2], out[:, 2:3], out[:, 3:4] = xc - w / 2, yc - h / 2, xc + w / 2, yc + h / 2
-    out[:, 4:16:2] = r[:, _BF_KP_OFFSET::2] * aws + cxs
-    out[:, 5:16:2] = r[:, _BF_KP_OFFSET + 1::2] * ahs + cys
-    out[:, 16] = scores[keep]
-    return out
-
-
-def _weighted_nms(detections: np.ndarray, iou_thresh: float = 0.5) -> np.ndarray:
-    """MP weighted NMS — kept boxes are score-weighted averages of overlapping detections."""
-    if detections.shape[0] == 0:
-        return detections
-    dets = detections[np.argsort(-detections[:, 16])]
-    N = dets.shape[0]
-    areas = np.clip(dets[:, 2] - dets[:, 0], 0, None) * np.clip(dets[:, 3] - dets[:, 1], 0, None)
-    kept: List[np.ndarray] = []
-    used = np.zeros(N, dtype=bool)
-    for i in range(N):
-        if used[i]:
-            continue
-        ax1, ay1, ax2, ay2 = dets[i, 0:4]
-        merge_idx = [i]
-        for j in range(i + 1, N):
-            if used[j]:
-                continue
-            bx1, by1, bx2, by2 = dets[j, 0:4]
-            iw = max(0.0, min(ax2, bx2) - max(ax1, bx1))
-            ih = max(0.0, min(ay2, by2) - max(ay1, by1))
-            inter = iw * ih
-            union = areas[i] + areas[j] - inter
-            if union > 0 and inter / union > iou_thresh:  # strict > matches MP
-                merge_idx.append(j)
-                used[j] = True
-        used[i] = True
-        cluster = dets[merge_idx]
-        ws = cluster[:, 16:17]
-        ws_sum = ws.sum()
-        merged = np.copy(cluster[0])
-        if ws_sum > 0:
-            merged[:16] = (cluster[:, :16] * ws).sum(axis=0) / ws_sum
-        kept.append(merged)
-    return np.stack(kept, axis=0) if kept else np.empty((0, 17), dtype=np.float32)
-
-
-def _detection_to_face_rect(detection: np.ndarray, image_w: int, image_h: int) -> Tuple[float, float, float, float, float]:
-    """Detection (normalized) → rotated 1.5xbbox ROI in image pixels (anisotropic)."""
-    xmin, ymin, xmax, ymax = detection[0:4]
-    lx = detection[4 + _FACE_LEFT_EYE_KP * 2 + 0] * image_w
-    ly = detection[4 + _FACE_LEFT_EYE_KP * 2 + 1] * image_h
-    rx = detection[4 + _FACE_RIGHT_EYE_KP * 2 + 0] * image_w
-    ry = detection[4 + _FACE_RIGHT_EYE_KP * 2 + 1] * image_h
-    # Image-y-down convention: angle = target - atan2(-dy, dx).
-    angle = _FACE_ROI_TARGET_ANGLE - math.atan2(ly - ry, rx - lx)
-    return (float((xmin + xmax) * 0.5 * image_w),
-            float((ymin + ymax) * 0.5 * image_h),
-            float((xmax - xmin) * image_w * _FACE_ROI_SCALE_X),
-            float((ymax - ymin) * image_h * _FACE_ROI_SCALE_Y),
-            float(angle))
-
-
-def _sample_warp(image_chw: Tensor, src_x: Tensor, src_y: Tensor, padding_mode: str) -> Tensor:
-    """Bilinear-sample image_chw at corner-aligned (src_x, src_y)."""
-    H, W = int(image_chw.shape[-2]), int(image_chw.shape[-1])
-    grid = torch.stack([(2.0 * src_x + 1.0) / W - 1.0,
-                        (2.0 * src_y + 1.0) / H - 1.0], dim=-1).unsqueeze(0)
-    return F.grid_sample(image_chw.unsqueeze(0), grid, mode="bilinear",
-                         align_corners=False, padding_mode=padding_mode).squeeze(0)
-
-
-def _warp_face_crop(image_chw: Tensor, cx: float, cy: float, width: float, height: float,
-                    angle: float, output_size: int = _FM_INPUT_SIZE) -> Tensor:
-    """Rotated rect → output_size² with BORDER_REPLICATE. image_chw must be in [0, 1]."""
-    s_x, s_y = width / output_size, height / output_size
-    cos_a, sin_a = math.cos(angle), math.sin(angle)
-    arange = torch.arange(output_size, dtype=image_chw.dtype, device=image_chw.device) - output_size * 0.5
-    v_grid, u_grid = torch.meshgrid(arange, arange, indexing="ij")
-    src_x = cx + u_grid * s_x * cos_a - v_grid * s_y * sin_a
-    src_y = cy + u_grid * s_x * sin_a + v_grid * s_y * cos_a
-    return _sample_warp(image_chw, src_x, src_y, "border")
-
-
-def _blazeface_input_warp(image_chw_raw: Tensor, target: int = _BF_INPUT_SIZE) -> Tuple[Tensor, float, float, float]:
-    """Centered max(W,H) square → target² with BORDER_ZERO + [-1, 1] norm.
-
-    Sub-pixel grid_sample matters; integer-pad-then-resize drifts the bbox ~5%.
-    Returns (warped, sub_rect_cx, sub_rect_cy, sub_rect_size) — the triplet maps
-    tensor-normalized [0,1] detections back to image pixels.
-    """
-    H, W = int(image_chw_raw.shape[1]), int(image_chw_raw.shape[2])
-    sub_rect_size = float(max(W, H))
-    sub_rect_cx, sub_rect_cy = W * 0.5, H * 0.5
-    s = sub_rect_size / target
-    arange = torch.arange(target, dtype=image_chw_raw.dtype, device=image_chw_raw.device) - target * 0.5
-    v_grid, u_grid = torch.meshgrid(arange, arange, indexing="ij")
-    out = _sample_warp(image_chw_raw, sub_rect_cx + u_grid * s, sub_rect_cy + v_grid * s, "zeros")
-    return (out / 127.5) - 1.0, sub_rect_cx, sub_rect_cy, sub_rect_size
-
-
-class FaceLandmarker(nn.Module):
-    """BlazeFace → FaceMesh v2 → blendshapes. `detector_variant` selects 'short'
-    (128², ≤2m) or 'full' (192² FPN, ≤5m). State dict uses inner-module prefixes
-    `detector.*` / `mesh.*` / `blendshapes.*`; the outer FaceLandmarkerModel
-    wrapper rewrites `detector_{variant}.*` keys to `detector.*` before loading.
-    """
-
-    def __init__(self, device=None, dtype=None, operations=None, detector_variant: str = "short"):
-        super().__init__()
-        det_cls = {"short": BlazeFace, "full": BlazeFaceFullRange}.get(detector_variant)
-
-        self.detector_variant = detector_variant
-        self.detector = det_cls(device=device, dtype=dtype, operations=operations)
-        self.mesh = FaceMesh(device=device, dtype=dtype, operations=operations)
-        self.blendshapes = FaceBlendshapes(device=device, dtype=dtype, operations=operations)
-        self.register_buffer("_bs_idx", torch.tensor(_BS_INPUT_INDICES, dtype=torch.long), persistent=False)
-
-    def run_detector_batch(self, images_rgb_uint8: List[np.ndarray],
-                           score_thresh: float = _BF_MIN_SCORE,
-                           iou_thresh: float = 0.5):
-        """Batched detector pass. Returns (img_raws, sub_rects, sizes, per_frame_decoded)
-        where per_frame_decoded[b] is (N, 17) in tensor-normalized [0,1] coords."""
-        if not images_rgb_uint8:
-            return [], [], [], []
-        device, dtype = self.detector.stem.weight.device, self.detector.stem.weight.dtype
-        det_input_size, decode_fn = ((_BF_FR_INPUT_SIZE, _decode_blazeface_full_range)
-                                     if self.detector_variant == "full"
-                                     else (_BF_INPUT_SIZE, _decode_blazeface))
-
-        # Same-size frames: stack once and transfer once. Variable size falls back
-        # to per-image (only triggers for SAM3DBody's head crops).
-        sizes = [tuple(img.shape[:2]) for img in images_rgb_uint8]
-        if len(set(sizes)) == 1:
-            batch_chw = torch.from_numpy(np.stack(images_rgb_uint8, axis=0)).to(device, dtype).movedim(-1, -3).contiguous()
-            img_raws = [batch_chw[bi] for bi in range(batch_chw.shape[0])]
-        else:
-            img_raws = [torch.from_numpy(img).to(device, dtype).movedim(-1, -3).contiguous() for img in images_rgb_uint8]
-
-        warps = [_blazeface_input_warp(img_raw, det_input_size) for img_raw in img_raws]
-        det_crops = [w[0] for w in warps]
-        sub_rects = [(w[1], w[2], w[3]) for w in warps]
-
-        regs_b, cls_b = self.detector(torch.stack(det_crops, dim=0))
-        regs_np, cls_np = regs_b.float().cpu().numpy(), cls_b.float().cpu().numpy()
-        per_frame = []
-        for b in range(len(images_rgb_uint8)):
-            decoded = decode_fn(regs_np[b], cls_np[b], score_thresh=score_thresh)
-            per_frame.append(_weighted_nms(decoded, iou_thresh=iou_thresh) if decoded.shape[0] > 0 else decoded)
-        return img_raws, sub_rects, sizes, per_frame
-
-    def detect_batch(self, images_rgb_uint8: List[np.ndarray], num_faces: int = 1,
-                     score_thresh: float = _BF_MIN_SCORE) -> List[List[dict]]:
-        """Full pipeline batched across `images_rgb_uint8`. Returns one face-dict
-        list per image (empty if nothing detected). Face dict:
-            bbox_xyxy (4,) image pixels, blendshapes {52} ∈ [0,1],
-            landmarks_xy (478, 2) image pixels, landmarks_3d (478, 3) in
-            192-canonical (pre-transformation) units, presence float (raw logit).
-        """
-        img_raws, sub_rects, sizes, per_frame_dets = self.run_detector_batch(
-            images_rgb_uint8, score_thresh=score_thresh,
-        )
-        # tensor-normalized → image-normalized [0,1] for _detection_to_face_rect.
-        for b, decoded in enumerate(per_frame_dets):
-            if decoded.shape[0] == 0:
-                continue
-            cx, cy, size = sub_rects[b]
-            H, W = sizes[b]
-            sx0, sy0 = cx - size * 0.5, cy - size * 0.5
-            decoded[:, 0:16:2] = (sx0 + size * decoded[:, 0:16:2]) / W
-            decoded[:, 1:16:2] = (sy0 + size * decoded[:, 1:16:2]) / H
-            if num_faces > 0:
-                per_frame_dets[b] = decoded[: int(num_faces)]
-
-        # Collect every detected face across all frames into one mesh input.
-        face_params: List[Tuple[int, float, float, float, float, float, float]] = []
-        mesh_crops: List[Tensor] = []
-        for b, dets in enumerate(per_frame_dets):
-            if dets.shape[0] == 0:
-                continue
-            H, W = sizes[b]
-            img_for_mesh = img_raws[b] / 255.0
-            for det in dets:
-                cx, cy, w, h, angle = _detection_to_face_rect(det, W, H)
-                mesh_crops.append(_warp_face_crop(img_for_mesh, cx, cy, w, h, angle, _FM_INPUT_SIZE))
-                face_params.append((b, float(det[16]), cx, cy, w, h, angle))
-
-        results: List[List[dict]] = [[] for _ in range(len(images_rgb_uint8))]
-        if not mesh_crops:
-            return results
-
-        lmks_canon_b, presence_b = self.mesh(torch.stack(mesh_crops, dim=0))
-        bs_out_b = self.blendshapes(lmks_canon_b[:, self._bs_idx, :2])
-
-        # Batched canonical→image affine
-        params_t = torch.tensor(
-            [(cx, cy, w, h, math.cos(a), math.sin(a)) for (_b, _s, cx, cy, w, h, a) in face_params],
-            device=lmks_canon_b.device, dtype=lmks_canon_b.dtype,
-        )
-        cxs, cys, ws, hs, cos_a, sin_a = params_t.unbind(dim=1)
-        inv = 1.0 / _FM_INPUT_SIZE
-        u = lmks_canon_b[..., 0] - _FM_INPUT_SIZE * 0.5
-        v = lmks_canon_b[..., 1] - _FM_INPUT_SIZE * 0.5
-        lmks_xy_t = torch.stack([
-            cxs[:, None] + u * (ws * inv * cos_a)[:, None] - v * (hs * inv * sin_a)[:, None],
-            cys[:, None] + u * (ws * inv * sin_a)[:, None] + v * (hs * inv * cos_a)[:, None],
-        ], dim=-1)
-
-        lmks_xy_np = lmks_xy_t.float().cpu().numpy()
-        lmks_canon_np = lmks_canon_b.float().cpu().numpy()
-        presence_np = presence_b.float().cpu().numpy()
-        bs_np = bs_out_b.float().cpu().numpy()
-
-        for i, (b, score, *_) in enumerate(face_params):
-            lmks_xy = lmks_xy_np[i]
-            mn, mx = lmks_xy.min(0), lmks_xy.max(0)
-            results[b].append({
-                "bbox_xyxy": np.array([mn[0], mn[1], mx[0], mx[1]], dtype=np.float32),
-                "blendshapes": dict(zip(BLENDSHAPE_NAMES, bs_np[i].tolist())),
-                "landmarks_xy": lmks_xy,
-                "landmarks_3d": lmks_canon_np[i],
-                "presence": float(presence_np[i]),
-                "score": score,
-            })
-        return results

comfy_extras/nodes_ace.py

@@ -104,7 +104,7 @@ class EmptyAceStep15LatentAudio(IO.ComfyNode):
     def execute(cls, seconds, batch_size) -> IO.NodeOutput:
         length = round((seconds * 48000 / 1920))
         latent = torch.zeros([batch_size, 64, length], device=comfy.model_management.intermediate_device(), dtype=comfy.model_management.intermediate_dtype())
-        return IO.NodeOutput({"samples": latent, "type": "audio", "downscale_ratio_temporal": 1764})
+        return IO.NodeOutput({"samples": latent, "type": "audio"})
 
 class ReferenceAudio(IO.ComfyNode):
     @classmethod

comfy_extras/nodes_advanced_samplers.py

@@ -45,7 +45,7 @@ class SamplerLCMUpscale(io.ComfyNode):
     def define_schema(cls) -> io.Schema:
         return io.Schema(
             node_id="SamplerLCMUpscale",
-            category="sampling/samplers",
+            category="sampling/custom_sampling/samplers",
             inputs=[
                 io.Float.Input("scale_ratio", default=1.0, min=0.1, max=20.0, step=0.01, advanced=True),
                 io.Int.Input("scale_steps", default=-1, min=-1, max=1000, step=1, advanced=True),
@@ -123,7 +123,7 @@ class SamplerEulerCFGpp(io.ComfyNode):
         return io.Schema(
             node_id="SamplerEulerCFGpp",
             display_name="SamplerEulerCFG++",
-            category="experimental",  # "sampling/samplers"
+            category="experimental",  # "sampling/custom_sampling/samplers"
             inputs=[
                 io.Combo.Input("version", options=["regular", "alternative"], advanced=True),
             ],

comfy_extras/nodes_align_your_steps.py

@@ -29,7 +29,7 @@ class AlignYourStepsScheduler(io.ComfyNode):
         return io.Schema(
             node_id="AlignYourStepsScheduler",
             search_aliases=["AYS scheduler"],
-            category="sampling/schedulers",
+            category="sampling/custom_sampling/schedulers",
             inputs=[
                 io.Combo.Input("model_type", options=["SD1", "SDXL", "SVD"]),
                 io.Int.Input("steps", default=10, min=1, max=10000),

comfy_extras/nodes_ar_video.py

@@ -53,7 +53,7 @@ class SamplerARVideo(io.ComfyNode):
         return io.Schema(
             node_id="SamplerARVideo",
             display_name="Sampler AR Video",
-            category="sampling/samplers",
+            category="sampling/custom_sampling/samplers",
             inputs=[
                 io.Int.Input(
                     "num_frame_per_block",

comfy_extras/nodes_audio.py

@@ -33,7 +33,7 @@ class EmptyLatentAudio(IO.ComfyNode):
     def execute(cls, seconds, batch_size) -> IO.NodeOutput:
         length = round((seconds * 44100 / 2048) / 2) * 2
         latent = torch.zeros([batch_size, 64, length], device=comfy.model_management.intermediate_device())
-        return IO.NodeOutput({"samples": latent, "type": "audio", "downscale_ratio_temporal": 2048})
+        return IO.NodeOutput({"samples":latent, "type": "audio"})
 
     generate = execute  # TODO: remove
 
@@ -543,7 +543,7 @@ class AudioConcat(IO.ComfyNode):
         return IO.Schema(
             node_id="AudioConcat",
             search_aliases=["join audio", "combine audio", "append audio"],
-            display_name="Concatenate Audio",
+            display_name="Audio Concat",
             description="Concatenates the audio1 to audio2 in the specified direction.",
             category="audio",
             inputs=[
@@ -597,7 +597,7 @@ class AudioMerge(IO.ComfyNode):
         return IO.Schema(
             node_id="AudioMerge",
             search_aliases=["mix audio", "overlay audio", "layer audio"],
-            display_name="Merge Audio",
+            display_name="Audio Merge",
             description="Combine two audio tracks by overlaying their waveforms.",
             category="audio",
             inputs=[
@@ -667,9 +667,8 @@ class AudioAdjustVolume(IO.ComfyNode):
         return IO.Schema(
             node_id="AudioAdjustVolume",
             search_aliases=["audio gain", "loudness", "audio level"],
-            display_name="Adjust Audio Volume",
+            display_name="Audio Adjust Volume",
             category="audio",
-            description="Adjust the volume of the audio by a specified amount in decibels (dB).",
             inputs=[
                 IO.Audio.Input("audio"),
                 IO.Int.Input(

comfy_extras/nodes_bg_removal.py

@@ -34,7 +34,6 @@ class RemoveBackground(IO.ComfyNode):
             node_id="RemoveBackground",
             display_name="Remove Background",
             category="image/background removal",
-            description="Generates a foreground mask to remove the background from an image using a background removal model.",
             inputs=[
                 IO.Image.Input("image", tooltip="Input image to remove the background from"),
                 IO.BackgroundRemoval.Input("bg_removal_model", tooltip="Background removal model used to generate the mask")

comfy_extras/nodes_canny.py

@@ -11,9 +11,9 @@ class Canny(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="Canny",
-            display_name="Detect Edges (Canny)",
+            display_name="Canny",
             search_aliases=["edge detection", "outline", "contour detection", "line art"],
-            category="image/filters",
+            category="image/preprocessors",
             essentials_category="Image Tools",
             inputs=[
                 io.Image.Input("image"),

comfy_extras/nodes_compositing.py

@@ -111,7 +111,7 @@ class PorterDuffImageComposite(io.ComfyNode):
             node_id="PorterDuffImageComposite",
             search_aliases=["alpha composite", "blend modes", "layer blend", "transparency blend"],
             display_name="Porter-Duff Image Composite",
-            category="image/compositing",
+            category="mask/compositing",
             inputs=[
                 io.Image.Input("source"),
                 io.Mask.Input("source_alpha"),
@@ -168,7 +168,7 @@ class SplitImageWithAlpha(io.ComfyNode):
             node_id="SplitImageWithAlpha",
             search_aliases=["extract alpha", "separate transparency", "remove alpha"],
             display_name="Split Image with Alpha",
-            category="image/compositing",
+            category="mask/compositing",
             inputs=[
                 io.Image.Input("image"),
             ],
@@ -192,7 +192,7 @@ class JoinImageWithAlpha(io.ComfyNode):
             node_id="JoinImageWithAlpha",
             search_aliases=["add transparency", "apply alpha", "composite alpha", "RGBA"],
             display_name="Join Image with Alpha",
-            category="image/compositing",
+            category="mask/compositing",
             inputs=[
                 io.Image.Input("image"),
                 io.Mask.Input("alpha"),

comfy_extras/nodes_custom_sampler.py

@@ -17,7 +17,7 @@ class BasicScheduler(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="BasicScheduler",
-            category="sampling/schedulers",
+            category="sampling/custom_sampling/schedulers",
             inputs=[
                 io.Model.Input("model"),
                 io.Combo.Input("scheduler", options=comfy.samplers.SCHEDULER_NAMES),
@@ -47,7 +47,7 @@ class KarrasScheduler(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="KarrasScheduler",
-            category="sampling/schedulers",
+            category="sampling/custom_sampling/schedulers",
             inputs=[
                 io.Int.Input("steps", default=20, min=1, max=10000),
                 io.Float.Input("sigma_max", default=14.614642, min=0.0, max=5000.0, step=0.01, round=False, advanced=True),
@@ -69,7 +69,7 @@ class ExponentialScheduler(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="ExponentialScheduler",
-            category="sampling/schedulers",
+            category="sampling/custom_sampling/schedulers",
             inputs=[
                 io.Int.Input("steps", default=20, min=1, max=10000),
                 io.Float.Input("sigma_max", default=14.614642, min=0.0, max=5000.0, step=0.01, round=False, advanced=True),
@@ -90,7 +90,7 @@ class PolyexponentialScheduler(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="PolyexponentialScheduler",
-            category="sampling/schedulers",
+            category="sampling/custom_sampling/schedulers",
             inputs=[
                 io.Int.Input("steps", default=20, min=1, max=10000),
                 io.Float.Input("sigma_max", default=14.614642, min=0.0, max=5000.0, step=0.01, round=False, advanced=True),
@@ -112,7 +112,7 @@ class LaplaceScheduler(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="LaplaceScheduler",
-            category="sampling/schedulers",
+            category="sampling/custom_sampling/schedulers",
             inputs=[
                 io.Int.Input("steps", default=20, min=1, max=10000),
                 io.Float.Input("sigma_max", default=14.614642, min=0.0, max=5000.0, step=0.01, round=False, advanced=True),
@@ -136,7 +136,7 @@ class SDTurboScheduler(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="SDTurboScheduler",
-            category="sampling/schedulers",
+            category="sampling/custom_sampling/schedulers",
             inputs=[
                 io.Model.Input("model"),
                 io.Int.Input("steps", default=1, min=1, max=10),
@@ -160,7 +160,7 @@ class BetaSamplingScheduler(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="BetaSamplingScheduler",
-            category="sampling/schedulers",
+            category="sampling/custom_sampling/schedulers",
             inputs=[
                 io.Model.Input("model"),
                 io.Int.Input("steps", default=20, min=1, max=10000),
@@ -182,7 +182,7 @@ class VPScheduler(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="VPScheduler",
-            category="sampling/schedulers",
+            category="sampling/custom_sampling/schedulers",
             inputs=[
                 io.Int.Input("steps", default=20, min=1, max=10000),
                 io.Float.Input("beta_d", default=19.9, min=0.0, max=5000.0, step=0.01, round=False, advanced=True), #TODO: fix default values
@@ -204,7 +204,7 @@ class SplitSigmas(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="SplitSigmas",
-            category="sampling/sigmas",
+            category="sampling/custom_sampling/sigmas",
             inputs=[
                 io.Sigmas.Input("sigmas"),
                 io.Int.Input("step", default=0, min=0, max=10000),
@@ -228,7 +228,7 @@ class SplitSigmasDenoise(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="SplitSigmasDenoise",
-            category="sampling/sigmas",
+            category="sampling/custom_sampling/sigmas",
             inputs=[
                 io.Sigmas.Input("sigmas"),
                 io.Float.Input("denoise", default=1.0, min=0.0, max=1.0, step=0.01),
@@ -254,7 +254,7 @@ class FlipSigmas(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="FlipSigmas",
-            category="sampling/sigmas",
+            category="sampling/custom_sampling/sigmas",
             inputs=[io.Sigmas.Input("sigmas")],
             outputs=[io.Sigmas.Output()]
         )
@@ -276,7 +276,7 @@ class SetFirstSigma(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="SetFirstSigma",
-            category="sampling/sigmas",
+            category="sampling/custom_sampling/sigmas",
             inputs=[
                 io.Sigmas.Input("sigmas"),
                 io.Float.Input("sigma", default=136.0, min=0.0, max=20000.0, step=0.001, round=False),
@@ -298,7 +298,7 @@ class ExtendIntermediateSigmas(io.ComfyNode):
         return io.Schema(
             node_id="ExtendIntermediateSigmas",
             search_aliases=["interpolate sigmas"],
-            category="sampling/sigmas",
+            category="sampling/custom_sampling/sigmas",
             inputs=[
                 io.Sigmas.Input("sigmas"),
                 io.Int.Input("steps", default=2, min=1, max=100),
@@ -351,7 +351,7 @@ class SamplingPercentToSigma(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="SamplingPercentToSigma",
-            category="sampling/sigmas",
+            category="sampling/custom_sampling/sigmas",
             inputs=[
                 io.Model.Input("model"),
                 io.Float.Input("sampling_percent", default=0.0, min=0.0, max=1.0, step=0.0001),
@@ -379,7 +379,7 @@ class KSamplerSelect(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="KSamplerSelect",
-            category="sampling/samplers",
+            category="sampling/custom_sampling/samplers",
             inputs=[io.Combo.Input("sampler_name", options=comfy.samplers.SAMPLER_NAMES)],
             outputs=[io.Sampler.Output()]
         )
@@ -396,7 +396,7 @@ class SamplerDPMPP_3M_SDE(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="SamplerDPMPP_3M_SDE",
-            category="sampling/samplers",
+            category="sampling/custom_sampling/samplers",
             inputs=[
                 io.Float.Input("eta", default=1.0, min=0.0, max=100.0, step=0.01, round=False, advanced=True),
                 io.Float.Input("s_noise", default=1.0, min=0.0, max=100.0, step=0.01, round=False, advanced=True),
@@ -421,7 +421,7 @@ class SamplerDPMPP_2M_SDE(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="SamplerDPMPP_2M_SDE",
-            category="sampling/samplers",
+            category="sampling/custom_sampling/samplers",
             inputs=[
                 io.Combo.Input("solver_type", options=['midpoint', 'heun']),
                 io.Float.Input("eta", default=1.0, min=0.0, max=100.0, step=0.01, round=False, advanced=True),
@@ -448,7 +448,7 @@ class SamplerDPMPP_SDE(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="SamplerDPMPP_SDE",
-            category="sampling/samplers",
+            category="sampling/custom_sampling/samplers",
             inputs=[
                 io.Float.Input("eta", default=1.0, min=0.0, max=100.0, step=0.01, round=False, advanced=True),
                 io.Float.Input("s_noise", default=1.0, min=0.0, max=100.0, step=0.01, round=False, advanced=True),
@@ -474,7 +474,7 @@ class SamplerDPMPP_2S_Ancestral(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="SamplerDPMPP_2S_Ancestral",
-            category="sampling/samplers",
+            category="sampling/custom_sampling/samplers",
             inputs=[
                 io.Float.Input("eta", default=1.0, min=0.0, max=100.0, step=0.01, round=False),
                 io.Float.Input("s_noise", default=1.0, min=0.0, max=100.0, step=0.01, round=False),
@@ -494,7 +494,7 @@ class SamplerEulerAncestral(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="SamplerEulerAncestral",
-            category="sampling/samplers",
+            category="sampling/custom_sampling/samplers",
             inputs=[
                 io.Float.Input("eta", default=1.0, min=0.0, max=100.0, step=0.01, round=False, advanced=True),
                 io.Float.Input("s_noise", default=1.0, min=0.0, max=100.0, step=0.01, round=False, advanced=True),
@@ -515,7 +515,7 @@ class SamplerEulerAncestralCFGPP(io.ComfyNode):
         return io.Schema(
             node_id="SamplerEulerAncestralCFGPP",
             display_name="SamplerEulerAncestralCFG++",
-            category="sampling/samplers",
+            category="sampling/custom_sampling/samplers",
             inputs=[
                 io.Float.Input("eta", default=1.0, min=0.0, max=1.0, step=0.01, round=False),
                 io.Float.Input("s_noise", default=1.0, min=0.0, max=10.0, step=0.01, round=False),
@@ -537,7 +537,7 @@ class SamplerLMS(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="SamplerLMS",
-            category="sampling/samplers",
+            category="sampling/custom_sampling/samplers",
             inputs=[io.Int.Input("order", default=4, min=1, max=100, advanced=True)],
             outputs=[io.Sampler.Output()]
         )
@@ -554,7 +554,7 @@ class SamplerDPMAdaptative(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="SamplerDPMAdaptative",
-            category="sampling/samplers",
+            category="sampling/custom_sampling/samplers",
             inputs=[
                 io.Int.Input("order", default=3, min=2, max=3, advanced=True),
                 io.Float.Input("rtol", default=0.05, min=0.0, max=100.0, step=0.01, round=False, advanced=True),
@@ -585,7 +585,7 @@ class SamplerER_SDE(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="SamplerER_SDE",
-            category="sampling/samplers",
+            category="sampling/custom_sampling/samplers",
             inputs=[
                 io.Combo.Input("solver_type", options=["ER-SDE", "Reverse-time SDE", "ODE"]),
                 io.Int.Input("max_stage", default=3, min=1, max=3, advanced=True),
@@ -623,7 +623,7 @@ class SamplerSASolver(io.ComfyNode):
         return io.Schema(
             node_id="SamplerSASolver",
             search_aliases=["sde"],
-            category="sampling/samplers",
+            category="sampling/custom_sampling/samplers",
             inputs=[
                 io.Model.Input("model"),
                 io.Float.Input("eta", default=1.0, min=0.0, max=10.0, step=0.01, round=False, advanced=True),
@@ -668,7 +668,7 @@ class SamplerSEEDS2(io.ComfyNode):
         return io.Schema(
             node_id="SamplerSEEDS2",
             search_aliases=["sde", "exp heun"],
-            category="sampling/samplers",
+            category="sampling/custom_sampling/samplers",
             inputs=[
                 io.Combo.Input("solver_type", options=["phi_1", "phi_2"]),
                 io.Float.Input("eta", default=1.0, min=0.0, max=100.0, step=0.01, round=False, tooltip="Stochastic strength", advanced=True),
@@ -750,7 +750,7 @@ class SamplerCustom(io.ComfyNode):
         latent = latent_image
         latent_image = latent["samples"]
         latent = latent.copy()
-        latent_image = comfy.sample.fix_empty_latent_channels(model, latent_image, latent.get("downscale_ratio_spacial", None), latent.get("downscale_ratio_temporal", None))
+        latent_image = comfy.sample.fix_empty_latent_channels(model, latent_image, latent.get("downscale_ratio_spacial", None))
         latent["samples"] = latent_image
 
         if not add_noise:
@@ -770,7 +770,6 @@ class SamplerCustom(io.ComfyNode):
 
         out = latent.copy()
         out.pop("downscale_ratio_spacial", None)
-        out.pop("downscale_ratio_temporal", None)
         out["samples"] = samples
         if "x0" in x0_output:
             x0_out = model.model.process_latent_out(x0_output["x0"].cpu())
@@ -794,8 +793,7 @@ class BasicGuider(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="BasicGuider",
-            display_name="Basic Guider",
-            category="sampling/guiders",
+            category="sampling/custom_sampling/guiders",
             inputs=[
                 io.Model.Input("model"),
                 io.Conditioning.Input("conditioning"),
@@ -816,8 +814,7 @@ class CFGGuider(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="CFGGuider",
-            display_name="CFG Guider",
-            category="sampling/guiders",
+            category="sampling/custom_sampling/guiders",
             inputs=[
                 io.Model.Input("model"),
                 io.Conditioning.Input("positive"),
@@ -871,8 +868,7 @@ class DualCFGGuider(io.ComfyNode):
         return io.Schema(
             node_id="DualCFGGuider",
             search_aliases=["dual prompt guidance"],
-            display_name="Dual CFG Guider",
-            category="sampling/guiders",
+            category="sampling/custom_sampling/guiders",
             inputs=[
                 io.Model.Input("model"),
                 io.Conditioning.Input("cond1"),
@@ -900,7 +896,7 @@ class DisableNoise(io.ComfyNode):
         return io.Schema(
             node_id="DisableNoise",
             search_aliases=["zero noise"],
-            category="sampling/noise",
+            category="sampling/custom_sampling/noise",
             inputs=[],
             outputs=[io.Noise.Output()]
         )
@@ -917,7 +913,7 @@ class RandomNoise(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="RandomNoise",
-            category="sampling/noise",
+            category="sampling/custom_sampling/noise",
             inputs=[io.Int.Input("noise_seed", default=0, min=0, max=0xffffffffffffffff, control_after_generate=True)],
             outputs=[io.Noise.Output()]
         )
@@ -953,7 +949,7 @@ class SamplerCustomAdvanced(io.ComfyNode):
         latent = latent_image
         latent_image = latent["samples"]
         latent = latent.copy()
-        latent_image = comfy.sample.fix_empty_latent_channels(guider.model_patcher, latent_image, latent.get("downscale_ratio_spacial", None), latent.get("downscale_ratio_temporal", None))
+        latent_image = comfy.sample.fix_empty_latent_channels(guider.model_patcher, latent_image, latent.get("downscale_ratio_spacial", None))
         latent["samples"] = latent_image
 
         noise_mask = None
@@ -969,7 +965,6 @@ class SamplerCustomAdvanced(io.ComfyNode):
 
         out = latent.copy()
         out.pop("downscale_ratio_spacial", None)
-        out.pop("downscale_ratio_temporal", None)
         out["samples"] = samples
         if "x0" in x0_output:
             x0_out = guider.model_patcher.model.process_latent_out(x0_output["x0"].cpu())

comfy_extras/nodes_dataset.py

@@ -47,10 +47,8 @@ class LoadImageDataSetFromFolderNode(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="LoadImageDataSetFromFolder",
-            search_aliases=["load folder", "load from folder", "load dataset", "load images", "import dataset"],
-            display_name="Load Image (from Folder)",
-            category="image",
-            description="Load a dataset of images from a specified folder and return a list of images. Supported formats: PNG, JPG, JPEG, WEBP.",
+            display_name="Load Image Dataset from Folder",
+            category="dataset",
             is_experimental=True,
             inputs=[
                 io.Combo.Input(
@@ -86,16 +84,14 @@ class LoadImageTextDataSetFromFolderNode(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="LoadImageTextDataSetFromFolder",
-            search_aliases=["load folder", "load from folder", "load dataset", "load images", "import dataset"],
-            display_name="Load Image-Text (from Folder)",
-            category="image",
-            description="Load a dataset of pairs of images and text captions from a specified folder and return them as a list. Supported formats: PNG, JPG, JPEG, WEBP.",
+            display_name="Load Image and Text Dataset from Folder",
+            category="dataset",
             is_experimental=True,
             inputs=[
                 io.Combo.Input(
                     "folder",
                     options=folder_paths.get_input_subfolders(),
-                    tooltip="The folder to load images and text captions from.",
+                    tooltip="The folder to load images from.",
                 )
             ],
             outputs=[
@@ -210,10 +206,8 @@ class SaveImageDataSetToFolderNode(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="SaveImageDataSetToFolder",
-            search_aliases=["save folder", "save to folder", "save dataset", "save images", "export dataset"],
-            display_name="Save Image (to Folder) (DEPRECATED)",
-            category="image",
-            description="Save a dataset of images to a specified folder. Supported formats: PNG.",
+            display_name="Save Image Dataset to Folder",
+            category="dataset",
             is_experimental=True,
             is_output_node=True,
             is_input_list=True,  # Receive images as list
@@ -232,7 +226,6 @@ class SaveImageDataSetToFolderNode(io.ComfyNode):
                 ),
             ],
             outputs=[],
-            is_deprecated=True,  # This node is redundant and superseded by existing Save Image nodes where the target folder can be specified in the filename_prefix
         )
 
     @classmethod
@@ -253,20 +246,14 @@ class SaveImageTextDataSetToFolderNode(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="SaveImageTextDataSetToFolder",
-            search_aliases=["save folder", "save to folder", "save dataset", "save images", "save text", "export dataset"],
-            display_name="Save Image-Text (to Folder)",
-            category="image",
-            description="Save a dataset of pairs of images and text captions to a specified folder. Images are saved as PNG files and captions are saved as TXT files with the same filename_prefix.",
+            display_name="Save Image and Text Dataset to Folder",
+            category="dataset",
             is_experimental=True,
             is_output_node=True,
             is_input_list=True,  # Receive both images and texts as lists
             inputs=[
                 io.Image.Input("images", tooltip="List of images to save."),
-                io.String.Input("texts",
-                    optional=True,
-                    force_input=True,
-                    tooltip="List of text captions to save."
-                ),
+                io.String.Input("texts", tooltip="List of text captions to save."),
                 io.String.Input(
                     "folder_name",
                     default="dataset",
@@ -283,7 +270,7 @@ class SaveImageTextDataSetToFolderNode(io.ComfyNode):
         )
 
     @classmethod
-    def execute(cls, images, folder_name, filename_prefix, texts=None):
+    def execute(cls, images, texts, folder_name, filename_prefix):
         # Extract scalar values
         folder_name = folder_name[0]
         filename_prefix = filename_prefix[0]
@@ -292,12 +279,11 @@ class SaveImageTextDataSetToFolderNode(io.ComfyNode):
         saved_files = save_images_to_folder(images, output_dir, filename_prefix)
 
         # Save captions
-        if texts:
-            for idx, (filename, caption) in enumerate(zip(saved_files, texts)):
-                caption_filename = filename.replace(".png", ".txt")
-                caption_path = os.path.join(output_dir, caption_filename)
-                with open(caption_path, "w", encoding="utf-8") as f:
-                    f.write(caption)
+        for idx, (filename, caption) in enumerate(zip(saved_files, texts)):
+            caption_filename = filename.replace(".png", ".txt")
+            caption_path = os.path.join(output_dir, caption_filename)
+            with open(caption_path, "w", encoding="utf-8") as f:
+                f.write(caption)
 
         logging.info(f"Saved {len(saved_files)} images and captions to {output_dir}.")
         return io.NodeOutput()
@@ -328,13 +314,11 @@ class ImageProcessingNode(io.ComfyNode):
 
     Child classes should set:
         node_id: Unique node identifier (required)
-        search_aliases: List of search aliases (optional)
         display_name: Display name (optional, defaults to node_id)
         description: Node description (optional)
         extra_inputs: List of additional io.Input objects beyond "images" (optional)
         is_group_process: None (auto-detect), True (group), or False (individual) (optional)
         is_output_list: True (list output) or False (single output) (optional, default True)
-        is_deprecated: True if the node is deprecated (optional, default False)
 
     Child classes must implement ONE of:
         _process(cls, image, **kwargs) -> tensor  (for single-item processing)
@@ -342,13 +326,12 @@ class ImageProcessingNode(io.ComfyNode):
     """
 
     node_id = None
-    search_aliases = []
     display_name = None
     description = None
     extra_inputs = []
     is_group_process = None  # None = auto-detect, True/False = explicit
     is_output_list = None  # None = auto-detect based on processing mode
-    is_deprecated = False
+
     @classmethod
     def _detect_processing_mode(cls):
         """Detect whether this node uses group or individual processing.
@@ -419,10 +402,8 @@ class ImageProcessingNode(io.ComfyNode):
 
         return io.Schema(
             node_id=cls.node_id,
-            search_aliases=cls.search_aliases,
             display_name=cls.display_name or cls.node_id,
-            category=cls.category,
-            description=cls.description,
+            category="dataset/image",
             is_experimental=True,
             is_input_list=is_group,  # True for group, False for individual
             inputs=inputs,
@@ -491,13 +472,11 @@ class TextProcessingNode(io.ComfyNode):
 
     Child classes should set:
         node_id: Unique node identifier (required)
-        search_aliases: List of search aliases (optional)
         display_name: Display name (optional, defaults to node_id)
         description: Node description (optional)
         extra_inputs: List of additional io.Input objects beyond "texts" (optional)
         is_group_process: None (auto-detect), True (group), or False (individual) (optional)
         is_output_list: True (list output) or False (single output) (optional, default True)
-        is_deprecated: True if the node is deprecated (optional, default False)
 
     Child classes must implement ONE of:
         _process(cls, text, **kwargs) -> str  (for single-item processing)
@@ -505,13 +484,12 @@ class TextProcessingNode(io.ComfyNode):
     """
 
     node_id = None
-    search_aliases = []
     display_name = None
     description = None
     extra_inputs = []
     is_group_process = None  # None = auto-detect, True/False = explicit
     is_output_list = None  # None = auto-detect based on processing mode
-    is_deprecated = False
+
     @classmethod
     def _detect_processing_mode(cls):
         """Detect whether this node uses group or individual processing.
@@ -649,17 +627,15 @@ class TextProcessingNode(io.ComfyNode):
 
 class ResizeImagesByShorterEdgeNode(ImageProcessingNode):
     node_id = "ResizeImagesByShorterEdge"
-    display_name = "Resize Images by Shorter Edge (DEPRECATED)"
-    category = "image/transform"
-    description = "Resize images so that the shorter edge matches the specified dimension while preserving aspect ratio."
-    is_deprecated = True  # This node is superseded by Resize Image/Mask with resize_type = scale shorter dimension
+    display_name = "Resize Images by Shorter Edge"
+    description = "Resize images so that the shorter edge matches the specified length while preserving aspect ratio."
     extra_inputs = [
         io.Int.Input(
             "shorter_edge",
             default=512,
             min=1,
             max=8192,
-            tooltip="Target dimension for the shorter edge.",
+            tooltip="Target length for the shorter edge.",
         ),
     ]
 
@@ -679,17 +655,15 @@ class ResizeImagesByShorterEdgeNode(ImageProcessingNode):
 
 class ResizeImagesByLongerEdgeNode(ImageProcessingNode):
     node_id = "ResizeImagesByLongerEdge"
-    display_name = "Resize Images by Longer Edge (DEPRECATED)"
-    category = "image/transform"
-    description = "Resize images so that the longer edge matches the specified dimension while preserving aspect ratio."
-    is_deprecated = True  # This node is superseded by Resize Image/Mask with resize_type = scale longer dimension
+    display_name = "Resize Images by Longer Edge"
+    description = "Resize images so that the longer edge matches the specified length while preserving aspect ratio."
     extra_inputs = [
         io.Int.Input(
             "longer_edge",
             default=1024,
             min=1,
             max=8192,
-            tooltip="Target dimension for the longer edge.",
+            tooltip="Target length for the longer edge.",
         ),
     ]
 
@@ -712,10 +686,8 @@ class ResizeImagesByLongerEdgeNode(ImageProcessingNode):
 
 class CenterCropImagesNode(ImageProcessingNode):
     node_id = "CenterCropImages"
-    search_aliases=["crop", "cut", "trim"]
-    display_name="Crop Image (Center)"
-    category="image/transform"
-    description = "Center crop an image to the specified dimensions."
+    display_name = "Center Crop Images"
+    description = "Center crop all images to the specified dimensions."
     extra_inputs = [
         io.Int.Input("width", default=512, min=1, max=8192, tooltip="Crop width."),
         io.Int.Input("height", default=512, min=1, max=8192, tooltip="Crop height."),
@@ -734,11 +706,10 @@ class CenterCropImagesNode(ImageProcessingNode):
 
 class RandomCropImagesNode(ImageProcessingNode):
     node_id = "RandomCropImages"
-    search_aliases=["crop", "cut", "trim"]
-    display_name = "Crop Image (Random)"
-    category="image/transform"
-    description = "Randomly crop an image to the specified dimensions."
-
+    display_name = "Random Crop Images"
+    description = (
+        "Randomly crop all images to the specified dimensions (for data augmentation)."
+    )
     extra_inputs = [
         io.Int.Input("width", default=512, min=1, max=8192, tooltip="Crop width."),
         io.Int.Input("height", default=512, min=1, max=8192, tooltip="Crop height."),
@@ -763,9 +734,7 @@ class RandomCropImagesNode(ImageProcessingNode):
 
 class NormalizeImagesNode(ImageProcessingNode):
     node_id = "NormalizeImages"
-    search_aliases=["normalize", "normalize colors"]
-    display_name = "Normalize Image Colors"
-    category = "image/color"
+    display_name = "Normalize Images"
     description = "Normalize images using mean and standard deviation."
     extra_inputs = [
         io.Float.Input(
@@ -793,10 +762,8 @@ class NormalizeImagesNode(ImageProcessingNode):
 
 class AdjustBrightnessNode(ImageProcessingNode):
     node_id = "AdjustBrightness"
-    search_aliases=["brightness"]
     display_name = "Adjust Brightness"
-    category="image/adjustments"
-    description = "Adjust the brightness of an image."
+    description = "Adjust brightness of all images."
     extra_inputs = [
         io.Float.Input(
             "factor",
@@ -814,10 +781,8 @@ class AdjustBrightnessNode(ImageProcessingNode):
 
 class AdjustContrastNode(ImageProcessingNode):
     node_id = "AdjustContrast"
-    search_aliases=["contrast"]
     display_name = "Adjust Contrast"
-    category="image/adjustments"
-    description = "Adjust the contrast of an image."
+    description = "Adjust contrast of all images."
     extra_inputs = [
         io.Float.Input(
             "factor",
@@ -835,10 +800,8 @@ class AdjustContrastNode(ImageProcessingNode):
 
 class ShuffleDatasetNode(ImageProcessingNode):
     node_id = "ShuffleDataset"
-    search_aliases=["shuffle", "randomize", "mix"]
-    display_name = "Shuffle Images List"
-    category = "image/batch"
-    description = "Randomly shuffle the order of images in a list."
+    display_name = "Shuffle Image Dataset"
+    description = "Randomly shuffle the order of images in the dataset."
     is_group_process = True  # Requires full list to shuffle
     extra_inputs = [
         io.Int.Input(
@@ -860,15 +823,13 @@ class ShuffleImageTextDatasetNode(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="ShuffleImageTextDataset",
-            search_aliases=["shuffle", "randomize", "mix"],
-            display_name = "Shuffle Pairs of Image-Text",
-            category = "image/batch",
-            description = "Randomly shuffle the order of pairs of image-text in a list.",
+            display_name="Shuffle Image-Text Dataset",
+            category="dataset/image",
             is_experimental=True,
             is_input_list=True,
             inputs=[
                 io.Image.Input("images", tooltip="List of images to shuffle."),
-                io.String.Input("texts", tooltip="List of texts to shuffle.", force_input=True),
+                io.String.Input("texts", tooltip="List of texts to shuffle."),
                 io.Int.Input(
                     "seed",
                     default=0,
@@ -904,11 +865,8 @@ class ShuffleImageTextDatasetNode(io.ComfyNode):
 
 class TextToLowercaseNode(TextProcessingNode):
     node_id = "TextToLowercase"
-    search_aliases=["lowercase"]
-    display_name = "Convert Text to Lowercase (DEPRECATED)"
-    category = "text"
-    description = "Convert text to lowercase."
-    is_deprecated = True  # This node is superseded by the Convert Text Case node
+    display_name = "Text to Lowercase"
+    description = "Convert all texts to lowercase."
 
     @classmethod
     def _process(cls, text):
@@ -917,11 +875,8 @@ class TextToLowercaseNode(TextProcessingNode):
 
 class TextToUppercaseNode(TextProcessingNode):
     node_id = "TextToUppercase"
-    search_aliases=["uppercase"]
-    display_name = "Convert Text to Uppercase (DEPRECATED)"
-    category = "text"
-    description = "Convert text to uppercase."
-    is_deprecated = True  # This node is superseded by the Convert Text Case node
+    display_name = "Text to Uppercase"
+    description = "Convert all texts to uppercase."
 
     @classmethod
     def _process(cls, text):
@@ -930,10 +885,8 @@ class TextToUppercaseNode(TextProcessingNode):
 
 class TruncateTextNode(TextProcessingNode):
     node_id = "TruncateText"
-    search_aliases=["truncate", "cut", "shorten"]
     display_name = "Truncate Text"
-    category = "text"
-    description = "Truncate text to a maximum length."
+    description = "Truncate all texts to a maximum length."
     extra_inputs = [
         io.Int.Input(
             "max_length", default=77, min=1, max=10000, tooltip="Maximum text length."
@@ -947,10 +900,8 @@ class TruncateTextNode(TextProcessingNode):
 
 class AddTextPrefixNode(TextProcessingNode):
     node_id = "AddTextPrefix"
-    display_name = "Add Text Prefix (DEPRECATED)"
-    category = "text"
+    display_name = "Add Text Prefix"
     description = "Add a prefix to all texts."
-    is_deprecated = True  # This node is superseded by the Concatenate Text node
     extra_inputs = [
         io.String.Input("prefix", default="", tooltip="Prefix to add."),
     ]
@@ -962,10 +913,8 @@ class AddTextPrefixNode(TextProcessingNode):
 
 class AddTextSuffixNode(TextProcessingNode):
     node_id = "AddTextSuffix"
-    display_name = "Add Text Suffix (DEPRECATED)"
-    category = "text"
+    display_name = "Add Text Suffix"
     description = "Add a suffix to all texts."
-    is_deprecated = True  # This node is superseded by the Concatenate Text node
     extra_inputs = [
         io.String.Input("suffix", default="", tooltip="Suffix to add."),
     ]
@@ -977,10 +926,8 @@ class AddTextSuffixNode(TextProcessingNode):
 
 class ReplaceTextNode(TextProcessingNode):
     node_id = "ReplaceText"
-    display_name = "Replace Text (DEPRECATED)"
-    category = "text"
+    display_name = "Replace Text"
     description = "Replace text in all texts."
-    is_deprecated = True  # This node is superseded by the other Replace Text node
     extra_inputs = [
         io.String.Input("find", default="", tooltip="Text to find."),
         io.String.Input("replace", default="", tooltip="Text to replace with."),
@@ -993,10 +940,8 @@ class ReplaceTextNode(TextProcessingNode):
 
 class StripWhitespaceNode(TextProcessingNode):
     node_id = "StripWhitespace"
-    display_name = "Strip Whitespace (DEPRECATED)"
-    category = "text"
+    display_name = "Strip Whitespace"
     description = "Strip leading and trailing whitespace from all texts."
-    is_deprecated = True  # This node is superseded by the Trim Text node
 
     @classmethod
     def _process(cls, text):
@@ -1007,13 +952,11 @@ class StripWhitespaceNode(TextProcessingNode):
 
 
 class ImageDeduplicationNode(ImageProcessingNode):
-    """Remove duplicate or very similar images from a list using perceptual hashing."""
+    """Remove duplicate or very similar images from the dataset using perceptual hashing."""
 
     node_id = "ImageDeduplication"
-    search_aliases=["deduplicate", "remove duplicates", "similarity filter"]
-    display_name = "Deduplicate Images"
-    category = "image/batch"
-    description = "Remove duplicate or very similar images from a list."
+    display_name = "Image Deduplication"
+    description = "Remove duplicate or very similar images from the dataset."
     is_group_process = True  # Requires full list to compare images
     extra_inputs = [
         io.Float.Input(
@@ -1083,9 +1026,7 @@ class ImageGridNode(ImageProcessingNode):
     """Combine multiple images into a single grid/collage."""
 
     node_id = "ImageGrid"
-    search_aliases=["grid", "collage", "combine"]
-    display_name = "Make Image Grid"
-    category="image/batch"
+    display_name = "Image Grid"
     description = "Arrange multiple images into a grid layout."
     is_group_process = True  # Requires full list to create grid
     is_output_list = False  # Outputs single grid image
@@ -1161,12 +1102,9 @@ class MergeImageListsNode(ImageProcessingNode):
     """Merge multiple image lists into a single list."""
 
     node_id = "MergeImageLists"
-    search_aliases=["list", "merge list", "make list"]
-    display_name = "Merge Image Lists (DEPRECATED)"
-    category = "image/batch"
+    display_name = "Merge Image Lists"
     description = "Concatenate multiple image lists into one."
     is_group_process = True  # Receives images as list
-    is_deprecated = True  # This node is superseded by the Create List node
 
     @classmethod
     def _group_process(cls, images):
@@ -1181,11 +1119,9 @@ class MergeTextListsNode(TextProcessingNode):
     """Merge multiple text lists into a single list."""
 
     node_id = "MergeTextLists"
-    display_name = "Merge Text Lists (DEPRECATED)"
-    category = "text"
+    display_name = "Merge Text Lists"
     description = "Concatenate multiple text lists into one."
     is_group_process = True  # Receives texts as list
-    is_deprecated = True  # This node is superseded by the Create List node
 
     @classmethod
     def _group_process(cls, texts):
@@ -1206,10 +1142,8 @@ class ResolutionBucket(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="ResolutionBucket",
-            search_aliases=["bucket by resolution", "group by resolution", "batch by resolution"],
             display_name="Resolution Bucket",
-            category="training",
-            description="Group latents and conditionings into buckets",
+            category="dataset",
             is_experimental=True,
             is_input_list=True,
             inputs=[
@@ -1302,8 +1236,7 @@ class MakeTrainingDataset(io.ComfyNode):
             node_id="MakeTrainingDataset",
             search_aliases=["encode dataset"],
             display_name="Make Training Dataset",
-            category="training",
-            description="Encode images with VAE and texts with CLIP to create a training dataset of latents and conditionings.",
+            category="dataset",
             is_experimental=True,
             is_input_list=True,  # images and texts as lists
             inputs=[
@@ -1318,7 +1251,6 @@ class MakeTrainingDataset(io.ComfyNode):
                     "texts",
                     optional=True,
                     tooltip="List of text captions. Can be length n (matching images), 1 (repeated for all), or omitted (uses empty string).",
-                    force_input=True
                 ),
             ],
             outputs=[
@@ -1388,10 +1320,9 @@ class SaveTrainingDataset(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="SaveTrainingDataset",
-            search_aliases=["export dataset", "save dataset"],
+            search_aliases=["export training data"],
             display_name="Save Training Dataset",
-            category="training",
-            description="Save encoded training dataset (latents + conditioning) to disk for efficient loading during training.",
+            category="dataset",
             is_experimental=True,
             is_output_node=True,
             is_input_list=True,  # Receive lists
@@ -1493,8 +1424,7 @@ class LoadTrainingDataset(io.ComfyNode):
             node_id="LoadTrainingDataset",
             search_aliases=["import dataset", "training data"],
             display_name="Load Training Dataset",
-            category="training",
-            description="Load encoded training dataset (latents + conditioning) from disk for use in training.",
+            category="dataset",
             is_experimental=True,
             inputs=[
                 io.String.Input(

comfy_extras/nodes_flux.py

@@ -215,7 +215,7 @@ class Flux2Scheduler(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="Flux2Scheduler",
-            category="sampling/schedulers",
+            category="sampling/custom_sampling/schedulers",
             inputs=[
                 io.Int.Input("steps", default=20, min=1, max=4096),
                 io.Int.Input("width", default=1024, min=16, max=nodes.MAX_RESOLUTION, step=1),
@@ -263,7 +263,7 @@ class FluxKVCache(io.ComfyNode):
             node_id="FluxKVCache",
             display_name="Flux KV Cache",
             description="Enables KV Cache optimization for reference images on Flux family models.",
-            category="experimental",
+            category="",
             is_experimental=True,
             inputs=[
                 io.Model.Input("model", tooltip="The model to use KV Cache on."),

comfy_extras/nodes_gits.py

@@ -340,7 +340,7 @@ class GITSScheduler(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="GITSScheduler",
-            category="sampling/schedulers",
+            category="sampling/custom_sampling/schedulers",
             inputs=[
                 io.Float.Input("coeff", default=1.20, min=0.80, max=1.50, step=0.05, advanced=True),
                 io.Int.Input("steps", default=10, min=2, max=1000),

comfy_extras/nodes_hunyuan3d.py

@@ -419,17 +419,15 @@ class VoxelToMeshBasic(IO.ComfyNode):
     def define_schema(cls):
         return IO.Schema(
             node_id="VoxelToMeshBasic",
-            display_name="Voxel to Mesh (Basic) (DEPRECATED)",
+            display_name="Voxel to Mesh (Basic)",
             category="3d",
-            description="Converts a voxel grid to a mesh.",
-            is_deprecated=True, # This node is superseded by the Voxel To Mesh node
             inputs=[
                 IO.Voxel.Input("voxel"),
                 IO.Float.Input("threshold", default=0.6, min=-1.0, max=1.0, step=0.01),
             ],
             outputs=[
                 IO.Mesh.Output(),
-            ],
+            ]
         )
 
     @classmethod
@@ -455,10 +453,9 @@ class VoxelToMesh(IO.ComfyNode):
             node_id="VoxelToMesh",
             display_name="Voxel to Mesh",
             category="3d",
-            description="Converts a voxel grid to a mesh.",
             inputs=[
                 IO.Voxel.Input("voxel"),
-                IO.Combo.Input("algorithm", options=["surface net", "basic"]),
+                IO.Combo.Input("algorithm", options=["surface net", "basic"], advanced=True),
                 IO.Float.Input("threshold", default=0.6, min=-1.0, max=1.0, step=0.01),
             ],
             outputs=[

comfy_extras/nodes_images.py

@@ -55,10 +55,9 @@ class ImageCropV2(IO.ComfyNode):
     def define_schema(cls):
         return IO.Schema(
             node_id="ImageCropV2",
-            search_aliases=["crop", "cut", "trim"],
+            search_aliases=["trim"],
             display_name="Crop Image",
             category="image/transform",
-            description = "Crop an image to the specified dimensions.",
             essentials_category="Image Tools",
             has_intermediate_output=True,
             inputs=[
@@ -163,7 +162,7 @@ class ImageAddNoise(IO.ComfyNode):
             node_id="ImageAddNoise",
             search_aliases=["film grain"],
             display_name="Add Noise to Image",
-            category="image/filters",
+            category="image/postprocessing",
             inputs=[
                 IO.Image.Input("image"),
                 IO.Int.Input(
@@ -195,8 +194,7 @@ class SaveAnimatedWEBP(IO.ComfyNode):
     def define_schema(cls):
         return IO.Schema(
             node_id="SaveAnimatedWEBP",
-            display_name="Save Animated WEBP",
-            category="image",
+            category="image/animation",
             inputs=[
                 IO.Image.Input("images"),
                 IO.String.Input("filename_prefix", default="ComfyUI"),
@@ -233,8 +231,7 @@ class SaveAnimatedPNG(IO.ComfyNode):
     def define_schema(cls):
         return IO.Schema(
             node_id="SaveAnimatedPNG",
-            display_name="Save Animated PNG",
-            category="image",
+            category="image/animation",
             inputs=[
                 IO.Image.Input("images"),
                 IO.String.Input("filename_prefix", default="ComfyUI"),
@@ -496,7 +493,7 @@ class SaveSVGNode(IO.ComfyNode):
             search_aliases=["export vector", "save vector graphics"],
             display_name="Save SVG",
             description="Save SVG files on disk.",
-            category="image",
+            category="image/save",
             inputs=[
                 IO.SVG.Input("svg"),
                 IO.String.Input(

comfy_extras/nodes_logic.py

@@ -8,82 +8,6 @@ from comfy_api.latest import _io
 MISSING = object()
 
 
-class NotNode(io.ComfyNode):
-    @classmethod
-    def define_schema(cls):
-        return io.Schema(
-            node_id="ComfyNotNode",
-            display_name="Not",
-            category="utils/logic",
-            description="Logical NOT operation. Returns true if the value is falsy. Uses Python's rules for truthiness.",
-            search_aliases=["invert", "toggle", "negate", "flip boolean"],
-            inputs=[
-                io.AnyType.Input("value"),
-            ],
-            outputs=[
-                io.Boolean.Output(),
-            ],
-        )
-
-    @classmethod
-    def execute(cls, value) -> io.NodeOutput:
-        return io.NodeOutput(not value)
-
-
-class AndNode(io.ComfyNode):
-    @classmethod
-    def define_schema(cls):
-        template = io.Autogrow.TemplatePrefix(
-            input=io.AnyType.Input("value"),
-            prefix="value",
-            min=1,
-        )
-        return io.Schema(
-            node_id="ComfyAndNode",
-            display_name="And",
-            category="utils/logic",
-            description="Logical AND operation. Returns true if all of the values are truthy. Uses Python's rules for truthiness.",
-            search_aliases=["all", "every"],
-            inputs=[
-                io.Autogrow.Input("values", template=template),
-            ],
-            outputs=[
-                io.Boolean.Output(),
-            ],
-        )
-
-    @classmethod
-    def execute(cls, values: io.Autogrow.Type) -> io.NodeOutput:
-        return io.NodeOutput(all(values.values()))
-
-
-class OrNode(io.ComfyNode):
-    @classmethod
-    def define_schema(cls):
-        template = io.Autogrow.TemplatePrefix(
-            input=io.AnyType.Input("value"),
-            prefix="value",
-            min=1,
-        )
-        return io.Schema(
-            node_id="ComfyOrNode",
-            display_name="Or",
-            category="utils/logic",
-            description="Logical OR operation. Returns true if any of the values are truthy. Uses Python's rules for truthiness.",
-            search_aliases=["any", "some"],
-            inputs=[
-                io.Autogrow.Input("values", template=template),
-            ],
-            outputs=[
-                io.Boolean.Output(),
-            ],
-        )
-
-    @classmethod
-    def execute(cls, values: io.Autogrow.Type) -> io.NodeOutput:
-        return io.NodeOutput(any(values.values()))
-
-
 class SwitchNode(io.ComfyNode):
     @classmethod
     def define_schema(cls):
@@ -337,9 +261,6 @@ class LogicExtension(ComfyExtension):
         return [
             SwitchNode,
             CustomComboNode,
-            NotNode,
-            AndNode,
-            OrNode,
             # SoftSwitchNode,
             # ConvertStringToComboNode,
             # DCTestNode,

comfy_extras/nodes_lt.py

@@ -77,7 +77,7 @@ class EmptyLTXVLatentVideo(io.ComfyNode):
     @classmethod
     def execute(cls, width, height, length, batch_size=1) -> io.NodeOutput:
         latent = torch.zeros([batch_size, 128, ((length - 1) // 8) + 1, height // 32, width // 32], device=comfy.model_management.intermediate_device())
-        return io.NodeOutput({"samples": latent, "downscale_ratio_spacial": 32})
+        return io.NodeOutput({"samples": latent})
 
     generate = execute  # TODO: remove
 
@@ -175,7 +175,7 @@ class LTXVImgToVideoInplace(io.ComfyNode):
     generate = execute  # TODO: remove
 
 
-def _append_guide_attention_entry(positive, negative, pre_filter_count, latent_shape, strength=1.0, attention_mask=None):
+def _append_guide_attention_entry(positive, negative, pre_filter_count, latent_shape, strength=1.0):
     """Append a guide_attention_entry to both positive and negative conditioning.
 
     Each entry tracks one guide reference for per-reference attention control.
@@ -184,10 +184,9 @@ def _append_guide_attention_entry(positive, negative, pre_filter_count, latent_s
     new_entry = {
         "pre_filter_count": pre_filter_count,
         "strength": strength,
-        "pixel_mask": attention_mask.unsqueeze(0).unsqueeze(0) if attention_mask is not None else None,  # reshape to (1, 1, F, H, W)
+        "pixel_mask": None,
         "latent_shape": latent_shape,
     }
-
     results = []
     for cond in (positive, negative):
         # Read existing entries from this specific conditioning
@@ -197,7 +196,8 @@ def _append_guide_attention_entry(positive, negative, pre_filter_count, latent_s
             if found is not None:
                 existing = found
                 break
-        # Shallow copy only and append (pixel_mask is never mutated).
+        # Shallow copy and append (no deepcopy needed — entries contain
+        # only scalars and None for pixel_mask at this call site).
         entries = [*existing, new_entry]
         results.append(node_helpers.conditioning_set_values(
             cond, {"guide_attention_entries": entries}
@@ -263,12 +263,6 @@ class LTXVAddGuide(io.ComfyNode):
                             "down to the nearest multiple of 8. Negative values are counted from the end of the video.",
                 ),
                 io.Float.Input("strength", default=1.0, min=0.0, max=10.0, step=0.01),
-                io.Mask.Input(
-                    "attention_mask",
-                    optional=True,
-                    tooltip="Optional pixel-space spatial mask. Controls per-region "
-                            "conditioning influence via self-attention, multiplied by strength.",
-                ),
                 ICLoRAParameters.Input(
                     "iclora_parameters",
                     optional=True,
@@ -416,7 +410,7 @@ class LTXVAddGuide(io.ComfyNode):
         return latent_image, noise_mask
 
     @classmethod
-    def execute(cls, positive, negative, vae, latent, image, frame_idx, strength, attention_mask=None, iclora_parameters=None) -> io.NodeOutput:
+    def execute(cls, positive, negative, vae, latent, image, frame_idx, strength, iclora_parameters=None) -> io.NodeOutput:
         scale_factors = vae.downscale_index_formula
         latent_image = latent["samples"]
         noise_mask = get_noise_mask(latent)
@@ -475,7 +469,6 @@ class LTXVAddGuide(io.ComfyNode):
         pre_filter_count = t.shape[2] * t.shape[3] * t.shape[4]
         positive, negative = _append_guide_attention_entry(
             positive, negative, pre_filter_count, guide_latent_shape, strength=strength,
-            attention_mask=attention_mask,
         )
 
         return io.NodeOutput(positive, negative, {"samples": latent_image, "noise_mask": noise_mask})
@@ -601,7 +594,7 @@ class LTXVScheduler(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="LTXVScheduler",
-            category="sampling/schedulers",
+            category="sampling/custom_sampling/schedulers",
             inputs=[
                 io.Int.Input("steps", default=20, min=1, max=10000),
                 io.Float.Input("max_shift", default=2.05, min=0.0, max=100.0, step=0.01),

comfy_extras/nodes_lt_audio.py

@@ -11,8 +11,8 @@ class LTXVAudioVAELoader(io.ComfyNode):
     def define_schema(cls) -> io.Schema:
         return io.Schema(
             node_id="LTXVAudioVAELoader",
-            display_name="Load LTXV Audio VAE",
-            category="loaders",
+            display_name="LTXV Audio VAE Loader",
+            category="audio",
             inputs=[
                 io.Combo.Input(
                     "ckpt_name",
@@ -40,7 +40,7 @@ class LTXVAudioVAEEncode(VAEEncodeAudio):
         return io.Schema(
             node_id="LTXVAudioVAEEncode",
             display_name="LTXV Audio VAE Encode",
-            category="latent/audio",
+            category="audio",
             inputs=[
                 io.Audio.Input("audio", tooltip="The audio to be encoded."),
                 io.Vae.Input(
@@ -63,7 +63,7 @@ class LTXVAudioVAEDecode(io.ComfyNode):
         return io.Schema(
             node_id="LTXVAudioVAEDecode",
             display_name="LTXV Audio VAE Decode",
-            category="latent/audio",
+            category="audio",
             inputs=[
                 io.Latent.Input("samples", tooltip="The latent to be decoded."),
                 io.Vae.Input(

comfy_extras/nodes_mask.py

@@ -83,7 +83,7 @@ class ImageCompositeMasked(IO.ComfyNode):
             node_id="ImageCompositeMasked",
             search_aliases=["overlay", "layer", "paste image", "images composition"],
             display_name="Image Composite Masked",
-            category="image/compositing",
+            category="image",
             inputs=[
                 IO.Image.Input("destination"),
                 IO.Image.Input("source"),
@@ -112,7 +112,7 @@ class MaskToImage(IO.ComfyNode):
             node_id="MaskToImage",
             search_aliases=["convert mask"],
             display_name="Convert Mask to Image",
-            category="image/mask",
+            category="mask",
             inputs=[
                 IO.Mask.Input("mask"),
             ],
@@ -134,7 +134,7 @@ class ImageToMask(IO.ComfyNode):
             node_id="ImageToMask",
             search_aliases=["extract channel", "channel to mask"],
             display_name="Convert Image to Mask",
-            category="image/mask",
+            category="mask",
             inputs=[
                 IO.Image.Input("image"),
                 IO.Combo.Input("channel", options=["red", "green", "blue", "alpha"]),
@@ -157,8 +157,7 @@ class ImageColorToMask(IO.ComfyNode):
         return IO.Schema(
             node_id="ImageColorToMask",
             search_aliases=["color keying", "chroma key"],
-            display_name="Convert Image Color to Mask",
-            category="image/mask",
+            category="mask",
             inputs=[
                 IO.Image.Input("image"),
                 IO.Int.Input("color", default=0, min=0, max=0xFFFFFF, step=1, display_mode=IO.NumberDisplay.number),
@@ -181,8 +180,7 @@ class SolidMask(IO.ComfyNode):
     def define_schema(cls):
         return IO.Schema(
             node_id="SolidMask",
-            display_name="Create Solid Mask",
-            category="image/mask",
+            category="mask",
             inputs=[
                 IO.Float.Input("value", default=1.0, min=0.0, max=1.0, step=0.01),
                 IO.Int.Input("width", default=512, min=1, max=nodes.MAX_RESOLUTION, step=1),
@@ -206,7 +204,7 @@ class InvertMask(IO.ComfyNode):
             node_id="InvertMask",
             search_aliases=["reverse mask", "flip mask"],
             display_name="Invert Mask",
-            category="image/mask",
+            category="mask",
             inputs=[
                 IO.Mask.Input("mask"),
             ],
@@ -228,7 +226,7 @@ class CropMask(IO.ComfyNode):
             node_id="CropMask",
             search_aliases=["cut mask", "extract mask region", "mask slice"],
             display_name="Crop Mask",
-            category="image/mask",
+            category="mask",
             inputs=[
                 IO.Mask.Input("mask"),
                 IO.Int.Input("x", default=0, min=0, max=nodes.MAX_RESOLUTION, step=1),
@@ -255,7 +253,7 @@ class MaskComposite(IO.ComfyNode):
             node_id="MaskComposite",
             search_aliases=["combine masks", "blend masks", "layer masks", "masks composition"],
             display_name="Combine Masks",
-            category="image/mask",
+            category="mask",
             inputs=[
                 IO.Mask.Input("destination"),
                 IO.Mask.Input("source"),
@@ -306,7 +304,7 @@ class FeatherMask(IO.ComfyNode):
             node_id="FeatherMask",
             search_aliases=["soft edge mask", "blur mask edges", "gradient mask edge"],
             display_name="Feather Mask",
-            category="image/mask",
+            category="mask",
             inputs=[
                 IO.Mask.Input("mask"),
                 IO.Int.Input("left", default=0, min=0, max=nodes.MAX_RESOLUTION, step=1),
@@ -354,7 +352,7 @@ class GrowMask(IO.ComfyNode):
             node_id="GrowMask",
             search_aliases=["expand mask", "shrink mask"],
             display_name="Grow Mask",
-            category="image/mask",
+            category="mask",
             inputs=[
                 IO.Mask.Input("mask"),
                 IO.Int.Input("expand", default=0, min=-nodes.MAX_RESOLUTION, max=nodes.MAX_RESOLUTION, step=1),
@@ -390,8 +388,7 @@ class ThresholdMask(IO.ComfyNode):
         return IO.Schema(
             node_id="ThresholdMask",
             search_aliases=["binary mask"],
-            display_name="Threshold Mask",
-            category="image/mask",
+            category="mask",
             inputs=[
                 IO.Mask.Input("mask"),
                 IO.Float.Input("value", default=0.5, min=0.0, max=1.0, step=0.01),
@@ -417,7 +414,7 @@ class MaskPreview(IO.ComfyNode):
             node_id="MaskPreview",
             search_aliases=["show mask", "view mask", "inspect mask", "debug mask"],
             display_name="Preview Mask",
-            category="image/mask",
+            category="mask",
             description="Saves the input images to your ComfyUI output directory.",
             inputs=[
                 IO.Mask.Input("mask"),

comfy_extras/nodes_mediapipe.py

@@ -1,509 +0,0 @@
-"""ComfyUI nodes for the pure-PyTorch MediaPipe Face Landmarker port.
-
-Custom IO types:
-  FACE_LANDMARKER  — FaceLandmarkerModel wrapper (ModelPatcher inside)
-  FACE_LANDMARKS   — {"frames": List[List[face_dict]], "image_size": (H, W),
-                      "connection_sets": dict[str, frozenset[(int, int)]]}
-                     face_dict: bbox_xyxy, blendshapes, landmarks_xy,
-                                landmarks_3d, presence, score, transformation_matrix
-
-MediaPipeFaceLandmarker also emits the core BOUNDING_BOX type — pair with DrawBBoxes.
-"""
-
-from __future__ import annotations
-
-import numpy as np
-import torch
-from PIL import Image, ImageColor, ImageDraw
-from tqdm.auto import tqdm
-from typing_extensions import override
-
-import comfy.model_management
-import comfy.model_patcher
-import comfy.utils
-import folder_paths
-from comfy_api.latest import ComfyExtension, io
-
-from comfy_extras.mediapipe.face_landmarker import FaceLandmarker
-from comfy_extras.mediapipe.face_geometry import transformation_matrix_from_detection
-
-
-FaceDetectionType = io.Custom("FACE_DETECTION_MODEL")
-FaceLandmarksType = io.Custom("FACE_LANDMARKS")
-
-_CANONICAL_KEYS = ("canonical_vertices", "procrustes_indices", "procrustes_weights")
-_CONTOUR_PARTS = ("face_oval", "left_eye", "right_eye", "left_eyebrow", "right_eyebrow", "lips")
-
-
-class FaceLandmarkerModel:
-    """Loaded FaceLandmarker variants + ModelPatcher per variant.
-
-    Safetensors layout: `detector_short.*` / `detector_full.*` plus shared
-    `mesh.*`, `blendshapes.*`, `canonical_*`, and `topology.*`.
-    PReLU forces plain-nn / fp32 (manual_cast strands buffers across devices).
-    """
-
-    def __init__(self, state_dict: dict):
-        self.load_device = comfy.model_management.text_encoder_device()
-        offload_device = comfy.model_management.text_encoder_offload_device()
-        self.dtype = torch.float32
-
-        # FACEMESH_* connection sets, embedded as int32 (N, 2) under topology.*.
-        base: dict[str, frozenset] = {}
-        for k in [k for k in state_dict if k.startswith("topology.")]:
-            base[k[len("topology."):]] = frozenset(map(tuple, state_dict.pop(k).tolist()))
-        base["contours"] = frozenset().union(*(base[p] for p in _CONTOUR_PARTS))
-        base["all"] = base["contours"] | base["irises"] | base["nose"]
-
-        self.connection_sets: dict[str, frozenset] = base
-        self.canonical_data: dict[str, np.ndarray] = {k: state_dict.pop(k).numpy() for k in _CANONICAL_KEYS}
-
-        shared = {k: v for k, v in state_dict.items() if k.startswith(("mesh.", "blendshapes."))}
-
-        self.models: dict[str, FaceLandmarker] = {}
-        self.patchers: dict[str, comfy.model_patcher.ModelPatcher] = {}
-        for variant in ("short", "full"):
-            prefix = f"detector_{variant}."
-            sub = dict(shared)
-            sub.update({f"detector.{k[len(prefix):]}": v for k, v in state_dict.items() if k.startswith(prefix)})
-            fl = FaceLandmarker(device=offload_device, dtype=self.dtype, operations=None, detector_variant=variant).eval()
-            fl.load_state_dict(sub, strict=False)
-
-            self.models[variant] = fl
-            self.patchers[variant] = comfy.model_patcher.CoreModelPatcher(
-                fl, load_device=self.load_device, offload_device=offload_device,
-                size=comfy.model_management.module_size(fl),
-            )
-
-    def detect_batch(self, images, num_faces: int, score_thresh: float, variant: str):
-        comfy.model_management.load_model_gpu(self.patchers[variant])
-        return self.models[variant].detect_batch(images, num_faces=num_faces, score_thresh=score_thresh)
-
-
-def _image_to_uint8(image: torch.Tensor) -> np.ndarray:
-    return image[..., :3].mul(255.0).add_(0.5).clamp_(0, 255).to(torch.uint8).cpu().numpy()
-
-
-def _parse_color(color: str) -> tuple[int, int, int]:
-    try:
-        return ImageColor.getrgb(color)[:3]
-    except ValueError:
-        return (0, 255, 0)
-
-
-def _copy_face(face: dict) -> dict:
-    """Shallow copy of a face_dict with array-fields cloned so callers can mutate."""
-    return {
-        "bbox_xyxy":    face["bbox_xyxy"].copy(),
-        "blendshapes":  dict(face["blendshapes"]),
-        "landmarks_xy": face["landmarks_xy"].copy(),
-        "landmarks_3d": face["landmarks_3d"].copy(),
-        "presence":     face["presence"],
-        "score":        face["score"],
-    }
-
-
-def _lerp_face(a: dict, b: dict, t: float) -> dict:
-    return {
-        "bbox_xyxy":    (1 - t) * a["bbox_xyxy"]    + t * b["bbox_xyxy"],
-        "blendshapes":  {k: (1 - t) * a["blendshapes"][k] + t * b["blendshapes"][k] for k in a["blendshapes"]},
-        "landmarks_xy": (1 - t) * a["landmarks_xy"] + t * b["landmarks_xy"],
-        "landmarks_3d": (1 - t) * a["landmarks_3d"] + t * b["landmarks_3d"],
-        "presence":     (1 - t) * a["presence"] + t * b["presence"],
-        "score":        (1 - t) * a["score"]    + t * b["score"],
-    }
-
-
-def _match_faces(a: list[dict], b: list[dict]) -> list[tuple[int, int]]:
-    """Greedy nearest-neighbour pairing of faces between two frames by bbox
-    centre distance. Unmatched (when counts differ) are dropped."""
-    if not a or not b:
-        return []
-    centers_a = np.array([(0.5 * (f["bbox_xyxy"][0] + f["bbox_xyxy"][2]),
-                           0.5 * (f["bbox_xyxy"][1] + f["bbox_xyxy"][3])) for f in a])
-    centers_b = np.array([(0.5 * (f["bbox_xyxy"][0] + f["bbox_xyxy"][2]),
-                           0.5 * (f["bbox_xyxy"][1] + f["bbox_xyxy"][3])) for f in b])
-    dists = np.linalg.norm(centers_a[:, None] - centers_b[None], axis=-1)
-    pairs: list[tuple[int, int]] = []
-    used_a: set[int] = set()
-    used_b: set[int] = set()
-    candidates = sorted((dists[ia, ib], ia, ib) for ia in range(len(a)) for ib in range(len(b)))
-    for _, ia, ib in candidates:
-        if ia in used_a or ib in used_b:
-            continue
-        pairs.append((ia, ib))
-        used_a.add(ia)
-        used_b.add(ib)
-    return pairs
-
-
-def _fill_missing_frames(frames: list[list[dict]], mode: str) -> None:
-    """In-place fill empty frame slots from neighbouring detections. Multi-face
-    aware: pairs faces across bracketing frames by greedy bbox-centre NN.
-    When counts differ, unmatched faces are dropped from the synthesised frame."""
-    if mode == "empty":
-        return
-    valid = [i for i, fr in enumerate(frames) if fr]
-    if not valid:
-        return  # nothing to fill from
-    if mode == "previous":
-        last: list[dict] = []
-        for i, fr in enumerate(frames):
-            if fr:
-                last = fr
-            elif last:
-                frames[i] = [_copy_face(f) for f in last]
-        return
-    # interpolate: lerp between bracketing valid frames; clamp at ends.
-    for i in range(len(frames)):
-        if frames[i]:
-            continue
-        prev_i = max((v for v in valid if v < i), default=None)
-        next_i = min((v for v in valid if v > i), default=None)
-        if prev_i is None:
-            frames[i] = [_copy_face(f) for f in frames[next_i]]
-        elif next_i is None:
-            frames[i] = [_copy_face(f) for f in frames[prev_i]]
-        else:
-            t = (i - prev_i) / (next_i - prev_i)
-            pairs = _match_faces(frames[prev_i], frames[next_i])
-            frames[i] = [_lerp_face(frames[prev_i][a], frames[next_i][b], t) for a, b in pairs]
-
-
-def _ordered_rings(edges: frozenset[tuple[int, int]]) -> list[list[int]]:
-    """Walk an unordered edge set into one or more closed-loop vertex rings
-    (handles multi-loop sets like FACEMESH_LIPS: outer + inner)."""
-    adj: dict[int, set[int]] = {}
-    for a, b in edges:
-        adj.setdefault(a, set()).add(b)
-        adj.setdefault(b, set()).add(a)
-    visited: set[int] = set()
-    rings: list[list[int]] = []
-    for start in adj:
-        if start in visited:
-            continue
-        ring = [start]
-        visited.add(start)
-        prev, cur = -1, start
-        while True:
-            nxt = next((v for v in adj[cur] if v != prev), None)
-            if nxt is None or nxt == start:
-                break
-            ring.append(nxt)
-            visited.add(nxt)
-            prev, cur = cur, nxt
-        rings.append(ring)
-    return rings
-
-
-class LoadMediaPipeFaceLandmarker(io.ComfyNode):
-    """Load MediaPipe Face Landmarker v2 weights. Contains both detector variants
-    (short / full), shared mesh, blendshapes, and canonical geometry."""
-
-    @classmethod
-    def define_schema(cls):
-        return io.Schema(
-            node_id="LoadMediaPipeFaceLandmarker",
-            search_aliases=["face", "facial", "mediapipe", "face landmark", "face mesh", "blazeface", "face detection"],
-            display_name="Load Face Detection Model (MediaPipe)",
-            category="loaders",
-            inputs=[
-                io.Combo.Input("model_name", options=folder_paths.get_filename_list("detection"),
-                               tooltip="Face detection model from models/detection/."),
-            ],
-            outputs=[FaceDetectionType.Output()],
-        )
-
-    @classmethod
-    def execute(cls, model_name) -> io.NodeOutput:
-        sd = comfy.utils.load_torch_file(folder_paths.get_full_path_or_raise("detection", model_name), safe_load=True)
-        wrapper = FaceLandmarkerModel(sd)
-        return io.NodeOutput(wrapper)
-
-
-# Per-frame fallback modes for detection failures in a batch.
-_FALLBACK_MODES = ("empty", "previous", "interpolate")
-
-
-class MediaPipeFaceLandmarker(io.ComfyNode):
-    """BlazeFace → FaceMesh v2 → ARKit-52 blendshapes, batched across the
-    input. Also emits a BOUNDING_BOX list (landmark-extent bbox per face) —
-    pair with DrawBBoxes for detector-only viz or MediaPipeFaceMeshVisualize
-    for the mesh overlay."""
-
-    @classmethod
-    def define_schema(cls):
-        return io.Schema(
-            node_id="MediaPipeFaceLandmarker",
-            search_aliases=["face", "facial", "mediapipe", "face landmark", "face mesh", "blazeface", "face detection"],
-            display_name="Detect Face Landmarks (MediaPipe)",
-            category="image/detection",
-            description="Detects facial landmarks using MediaPipe model.",
-            inputs=[
-                FaceDetectionType.Input("face_detection_model"),
-                io.Image.Input("image"),
-                io.Combo.Input("detector_variant", options=["short", "full", "both"], default="short",
-                               tooltip="Face detector range. 'short' is tuned for close-up faces "
-                                       "(within ~2 m of the camera); 'full' covers farther / smaller "
-                                       "faces (up to ~5 m) but is slower. 'both' runs both detectors and "
-                                       "keeps whichever found more faces per frame (~2× detection cost)."),
-                io.Int.Input("num_faces", default=1, min=0, max=16, step=1,
-                             tooltip="Maximum faces to return per frame. 0 = no cap (return all detected)."),
-                io.Float.Input("min_confidence", default=0.5, min=0.0, max=1.0, step=0.01, advanced=True,
-                               tooltip="BlazeFace score threshold. Lower to catch small/occluded faces."),
-                io.Combo.Input("missing_frame_fallback", options=list(_FALLBACK_MODES), default="empty", advanced=True,
-                               tooltip="Per-frame behaviour when detection fails in a batch. "
-                                       "'empty' leaves the frame faceless. 'previous' copies the most recent successful "
-                                       "detection. 'interpolate' lerps landmarks/bbox/blendshapes between bracketing "
-                                       "successful frames. Multi-face: pairs faces across frames by greedy bbox-centre NN."),
-            ],
-            outputs=[
-                FaceLandmarksType.Output(display_name="face_landmarks"),
-                io.BoundingBox.Output("bboxes"),
-            ],
-        )
-
-    @classmethod
-    def execute(cls, face_detection_model, image, detector_variant, num_faces, min_confidence,
-                missing_frame_fallback) -> io.NodeOutput:
-        canonical = face_detection_model.canonical_data
-        img_np = _image_to_uint8(image)
-        B, H, W = img_np.shape[:3]
-        chunk = 16
-        is_both = detector_variant == "both"
-        total_work = 2 * B if is_both else B
-        pbar = comfy.utils.ProgressBar(total_work)
-
-        def _run(variant: str) -> list[list[dict]]:
-            res: list[list[dict]] = []
-            with tqdm(total=B, desc=f"MediaPipe Face Landmarker ({variant})") as tq:
-                for i in range(0, B, chunk):
-                    end = min(i + chunk, B)
-                    res.extend(face_detection_model.detect_batch(
-                        [img_np[bi] for bi in range(i, end)],
-                        num_faces=int(num_faces),
-                        score_thresh=float(min_confidence),
-                        variant=variant,
-                    ))
-                    pbar.update_absolute(min(pbar.current + (end - i), total_work))
-                    tq.update(end - i)
-            return res
-
-        if is_both:
-            short_res = _run("short")
-            full_res = _run("full")
-            # Per-frame keep whichever found more faces (tie → short).
-            frames: list[list[dict]] = [
-                short_res[bi] if len(short_res[bi]) >= len(full_res[bi]) else full_res[bi]
-                for bi in range(B)
-            ]
-        else:
-            frames = _run(detector_variant)
-        _fill_missing_frames(frames, missing_frame_fallback)
-        bboxes = []
-        for per_frame in frames:
-            per_bb = []
-            for f in per_frame:
-                f["transformation_matrix"] = transformation_matrix_from_detection(f, W, H, canonical)
-                x1, y1, x2, y2 = (float(v) for v in f["bbox_xyxy"])
-                per_bb.append({"x": x1, "y": y1, "width": x2 - x1, "height": y2 - y1, "label": "face", "score": float(f["score"])})
-            bboxes.append(per_bb)
-        return io.NodeOutput({"frames": frames, "image_size": (H, W),
-                              "connection_sets": face_detection_model.connection_sets}, bboxes)
-
-
-# Topology keys unioned by the 'all' connections preset (contour parts + irises + nose).
-_ALL_CONNECTION_PARTS: tuple[str, ...] = (*_CONTOUR_PARTS, "irises", "nose")
-_CUSTOM_FEATURES: tuple[tuple[str, bool], ...] = (
-    ("face_oval",     True),
-    ("lips",          True),
-    ("left_eye",      True),
-    ("right_eye",     True),
-    ("left_eyebrow",  True),
-    ("right_eyebrow", True),
-    ("irises",        True),
-    ("nose",          True),
-    ("tesselation",   False),
-)
-
-
-class MediaPipeFaceMeshVisualize(io.ComfyNode):
-    """Draw a FACEMESH_* subset over an image. Topology travels with the
-    FACE_LANDMARKS payload (set at detection time)."""
-
-    @classmethod
-    def define_schema(cls):
-        return io.Schema(
-            node_id="MediaPipeFaceMeshVisualize",
-            search_aliases=["face", "facial", "mediapipe", "face landmark", "face mesh", "blazeface", "face detection", "visualize"],
-            display_name="Visualize Face Landmarks (MediaPipe)",
-            category="image/detection",
-            description="Draws face landmarks mesh on the input image.",
-            inputs=[
-                FaceLandmarksType.Input("face_landmarks"),
-                io.Image.Input("image", optional=True, tooltip="If not connected, a black canvas will be used."),
-                io.DynamicCombo.Input(
-                    "connections",
-                    tooltip="'all' = oval+eyes+brows+lips+irises+nose. 'fill' = solid face_oval polygon (silhouette mask). 'custom' = toggle each feature individually (including 'tesselation', the full 2547-edge wireframe).",
-                    options=[
-                        io.DynamicCombo.Option("all", []),
-                        io.DynamicCombo.Option("fill", []),
-                        io.DynamicCombo.Option("custom", [
-                            io.Boolean.Input(feat, default=default,
-                                             tooltip=f"Draw the '{feat}' connection set.")
-                            for feat, default in _CUSTOM_FEATURES
-                        ]),
-                    ],
-                ),
-                io.Color.Input("color", default="#00ff00"),
-                io.Int.Input("thickness", default=1, min=0, max=8, step=1,
-                             tooltip="Edge line thickness in pixels. 0 disables edge drawing."),
-                io.Int.Input("point_size", default=2, min=0, max=16, step=1,
-                             tooltip="Landmark dot radius in pixels. 0 disables point drawing."),
-            ],
-            outputs=[io.Image.Output()],
-        )
-
-    @classmethod
-    def execute(cls, face_landmarks, connections, color, thickness, point_size, image=None) -> io.NodeOutput:
-        sets = face_landmarks["connection_sets"]
-        sel = connections["connections"]
-        fill_rings: list[list[int]] | None = None
-        if sel == "fill":
-            fill_rings = _ordered_rings(sets["face_oval"])
-            edges = frozenset()
-        elif sel == "custom":
-            parts = [feat for feat, _ in _CUSTOM_FEATURES if connections.get(feat, False)]
-            edges = frozenset().union(*(sets[p] for p in parts))
-        else:  # "all"
-            edges = frozenset().union(*(sets[p] for p in _ALL_CONNECTION_PARTS))
-        rgb, thick, psize = _parse_color(color), int(thickness), int(point_size)
-        frames = face_landmarks["frames"]
-        if image is None:
-            H, W = face_landmarks["image_size"]
-            img_np = np.zeros((len(frames), H, W, 3), dtype=np.uint8)
-        else:
-            img_np = _image_to_uint8(image)
-        B = img_np.shape[0]
-        n_frames = len(frames)
-        pbar = comfy.utils.ProgressBar(B)
-        out = np.empty_like(img_np)
-        for bi in range(B):
-            faces = frames[bi] if bi < n_frames else []
-            out[bi] = _draw_mesh(img_np[bi], faces, edges, rgb, thick, psize, fill_rings)
-            pbar.update_absolute(bi + 1)
-        return io.NodeOutput(torch.from_numpy(out).to(
-            device=comfy.model_management.intermediate_device(),
-            dtype=comfy.model_management.intermediate_dtype(),
-        ).div_(255.0))
-
-
-def _draw_mesh(image_rgb: np.ndarray, faces: list, edges,
-               rgb: tuple[int, int, int], thickness: int,
-               point_size: int, fill_rings: list[list[int]] | None = None) -> np.ndarray:
-    draw_edges = thickness > 0 and edges
-    if not faces or (fill_rings is None and not draw_edges and point_size <= 0):
-        return image_rgb.copy()
-    pil = Image.fromarray(image_rgb)
-    draw = ImageDraw.Draw(pil)
-    r = point_size * 0.5
-    if fill_rings is not None:
-        for f in faces:
-            lmks = f["landmarks_xy"]
-            for ring in fill_rings:
-                draw.polygon([(float(lmks[i, 0]), float(lmks[i, 1])) for i in ring], fill=rgb)
-        return np.asarray(pil)
-    for f in faces:
-        lmks = f["landmarks_xy"]
-        n = lmks.shape[0]
-        if draw_edges:
-            for a, b in edges:
-                if a < n and b < n:
-                    draw.line([(float(lmks[a, 0]), float(lmks[a, 1])),
-                               (float(lmks[b, 0]), float(lmks[b, 1]))], fill=rgb, width=thickness)
-        if point_size == 1:
-            draw.point(lmks.flatten().tolist(), fill=rgb)
-        elif point_size > 1:
-            for x, y in lmks:
-                draw.ellipse((float(x) - r, float(y) - r, float(x) + r, float(y) + r), fill=rgb)
-    return np.asarray(pil)
-
-
-# Mask region presets — closed-loop topologies only.
-_MASK_REGIONS: tuple[str, ...] = ("face_oval", "lips", "left_eye", "right_eye", "irises")
-_MASK_CUSTOM_FEATURES: tuple[tuple[str, bool], ...] = (
-    ("face_oval",  True),
-    ("lips",       False),
-    ("left_eye",   False),
-    ("right_eye",  False),
-    ("irises",     False),
-)
-
-
-class MediaPipeFaceMask(io.ComfyNode):
-    """Binary mask from face landmarks, filled polygon per face. One mask per
-    frame in the batch; faces in the same frame composite (union)."""
-
-    @classmethod
-    def define_schema(cls):
-        return io.Schema(
-            node_id="MediaPipeFaceMask",
-            search_aliases=["face", "facial", "mediapipe", "face mask", "blazeface", "face detection", "visualize"],
-            display_name="Draw Face Mask (MediaPipe)",
-            category="image/detection",
-            description="Draws a mask from face landmarks.",
-            inputs=[
-                FaceLandmarksType.Input("face_landmarks"),
-                io.DynamicCombo.Input(
-                    "regions",
-                    tooltip="'all' = union of face_oval+lips+eyes+irises (which collapses to face_oval since it encloses the rest). 'custom' = toggle each region individually for combos like lips+eyes.",
-                    options=[
-                        io.DynamicCombo.Option("all", []),
-                        io.DynamicCombo.Option("custom", [
-                            io.Boolean.Input(reg, default=default,
-                                             tooltip=f"Include the '{reg}' region in the mask.")
-                            for reg, default in _MASK_CUSTOM_FEATURES
-                        ]),
-                    ],
-                ),
-            ],
-            outputs=[io.Mask.Output()],
-        )
-
-    @classmethod
-    def execute(cls, face_landmarks, regions) -> io.NodeOutput:
-        sets = face_landmarks["connection_sets"]
-        sel = regions["regions"]
-        if sel == "custom":
-            picked = [reg for reg, _ in _MASK_CUSTOM_FEATURES if regions.get(reg, False)]
-        else:
-            picked = list(_MASK_REGIONS)
-        rings = [r for reg in picked for r in _ordered_rings(sets[reg])]
-        frames = face_landmarks["frames"]
-        H, W = face_landmarks["image_size"]
-        masks = np.zeros((len(frames), H, W), dtype=np.uint8)
-        pbar = comfy.utils.ProgressBar(len(frames))
-        for bi, per_frame in enumerate(frames):
-            if per_frame:
-                pil = Image.new("L", (W, H), 0)
-                draw = ImageDraw.Draw(pil)
-                for f in per_frame:
-                    lmks = f["landmarks_xy"]
-                    for ring in rings:
-                        draw.polygon([(float(lmks[i, 0]), float(lmks[i, 1])) for i in ring], fill=255)
-                masks[bi] = np.asarray(pil)
-            pbar.update_absolute(bi + 1)
-        return io.NodeOutput(torch.from_numpy(masks).to(
-            device=comfy.model_management.intermediate_device(),
-            dtype=comfy.model_management.intermediate_dtype(),
-        ).div_(255.0))
-
-
-class MediaPipeFaceExtension(ComfyExtension):
-    @override
-    async def get_node_list(self) -> list[type[io.ComfyNode]]:
-        return [LoadMediaPipeFaceLandmarker, MediaPipeFaceLandmarker, MediaPipeFaceMeshVisualize, MediaPipeFaceMask]
-
-
-async def comfy_entrypoint() -> MediaPipeFaceExtension:
-    return MediaPipeFaceExtension()

comfy_extras/nodes_model_merging.py

@@ -276,8 +276,8 @@ class CLIPSave:
                 for x in extra_pnginfo:
                     metadata[x] = json.dumps(extra_pnginfo[x])
 
-        clip.load_model()
-        clip_sd = clip.state_dict_for_saving()
+        comfy.model_management.load_models_gpu([clip.load_model()], force_patch_weights=True)
+        clip_sd = clip.get_sd()
 
         for prefix in ["clip_l.", "clip_g.", "clip_h.", "t5xxl.", "pile_t5xl.", "mt5xl.", "umt5xxl.", "t5base.", "gemma2_2b.", "llama.", "hydit_clip.", ""]:
             k = list(filter(lambda a: a.startswith(prefix), clip_sd.keys()))

comfy_extras/nodes_moge.py

@@ -103,10 +103,8 @@ class MoGePanoramaInference(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="MoGePanoramaInference",
-            search_aliases=["moge", "panorama", "depth", "geometry", "depth estimation", "geometry estimation"],
-            display_name="Run MoGe Panorama Inference",
+            display_name="MoGe Panorama Inference",
             category="image/geometry_estimation",
-            description="Run MoGe on an equirectangular panorama by splitting it into 12 perspective views, running inference on each, and merging the results into a single depth map.",
             inputs=[
                 MoGeModelType.Input("moge_model"),
                 io.Image.Input("image", tooltip="Equirectangular panorama (any aspect)."),
@@ -224,9 +222,7 @@ class MoGeInference(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="MoGeInference",
-            search_aliases=["moge", "depth", "geometry", "depth estimation", "geometry estimation"],
-            display_name="Run MoGe Inference",
-            description="Run MoGe on a single image to estimate depth and geometry.",
+            display_name="MoGe Inference",
             category="image/geometry_estimation",
             inputs=[
                 MoGeModelType.Input("moge_model"),
@@ -281,9 +277,7 @@ class MoGeRender(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="MoGeRender",
-            search_aliases=["moge", "render", "geometry", "depth", "normal"],
-            display_name="Render MoGe Geometry",
-            description="Render a depth map or normal map from geometry data",
+            display_name="MoGe Render",
             category="image/geometry_estimation",
             inputs=[
                 MoGeGeometry.Input("moge_geometry"),
@@ -348,9 +342,7 @@ class MoGePointMapToMesh(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="MoGePointMapToMesh",
-            search_aliases=["moge", "mesh", "geometry", "point map"],
-            display_name="Convert MoGe Point Map to Mesh",
-            description="Convert a MoGe point map into a 3D mesh.",
+            display_name="MoGe Point Map to Mesh",
             category="image/geometry_estimation",
             inputs=[
                 MoGeGeometry.Input("moge_geometry"),

comfy_extras/nodes_morphology.py

@@ -13,8 +13,8 @@ class Morphology(io.ComfyNode):
         return io.Schema(
             node_id="Morphology",
             search_aliases=["erode", "dilate"],
-            display_name="Apply Morphology",
-            category="image/filters",
+            display_name="ImageMorphology",
+            category="image/postprocessing",
             inputs=[
                 io.Image.Input("image"),
                 io.Combo.Input(

comfy_extras/nodes_nop.py

@@ -13,7 +13,7 @@ class wanBlockSwap(io.ComfyNode):
         return io.Schema(
             node_id="wanBlockSwap",
             category="",
-            description="Intercept wanBlockSwap custom node that causes major instability and make it no-op.",
+            description="NOP",
             inputs=[
                 io.Model.Input("model"),
             ],

comfy_extras/nodes_number_convert.py

@@ -20,7 +20,7 @@ class NumberConvertNode(io.ComfyNode):
     def define_schema(cls) -> io.Schema:
         return io.Schema(
             node_id="ComfyNumberConvert",
-            display_name="Convert Number",
+            display_name="Number Convert",
             category="utils",
             search_aliases=[
                 "int to float", "float to int", "number convert",

comfy_extras/nodes_optimalsteps.py

@@ -31,7 +31,7 @@ class OptimalStepsScheduler(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="OptimalStepsScheduler",
-            category="sampling/schedulers",
+            category="sampling/custom_sampling/schedulers",
             inputs=[
                 io.Combo.Input("model_type", options=["FLUX", "Wan", "Chroma"]),
                 io.Int.Input("steps", default=20, min=3, max=1000),

comfy_extras/nodes_post_processing.py

@@ -22,7 +22,7 @@ class Blend(io.ComfyNode):
             node_id="ImageBlend",
             search_aliases=["mix images"],
             display_name="Blend Images",
-            category="image/filters",
+            category="image/postprocessing",
             essentials_category="Image Tools",
             inputs=[
                 io.Image.Input("image1"),
@@ -80,8 +80,8 @@ class Blur(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="ImageBlur",
-            display_name="Blur Image",
-            category="image/filters",
+            display_name="Image Blur",
+            category="image/postprocessing",
             inputs=[
                 io.Image.Input("image"),
                 io.Int.Input("blur_radius", default=1, min=1, max=31, step=1),
@@ -117,7 +117,7 @@ class Quantize(io.ComfyNode):
         return io.Schema(
             node_id="ImageQuantize",
             display_name="Quantize Image",
-            category="image/filters",
+            category="image/postprocessing",
             inputs=[
                 io.Image.Input("image"),
                 io.Int.Input("colors", default=256, min=1, max=256, step=1),
@@ -183,7 +183,7 @@ class Sharpen(io.ComfyNode):
         return io.Schema(
             node_id="ImageSharpen",
             display_name="Sharpen Image",
-            category="image/filters",
+            category="image/postprocessing",
             inputs=[
                 io.Image.Input("image"),
                 io.Int.Input("sharpen_radius", default=1, min=1, max=31, step=1, advanced=True),
@@ -568,7 +568,7 @@ def batch_latents(latents: list[dict[str, torch.Tensor]]) -> dict[str, torch.Ten
 class BatchImagesNode(io.ComfyNode):
     @classmethod
     def define_schema(cls):
-        autogrow_template = io.Autogrow.TemplatePrefix(io.Image.Input("image"), prefix="image", min=1, max=50)
+        autogrow_template = io.Autogrow.TemplatePrefix(io.Image.Input("image"), prefix="image", min=2, max=50)
         return io.Schema(
             node_id="BatchImagesNode",
             display_name="Batch Images",
@@ -590,12 +590,12 @@ class BatchImagesNode(io.ComfyNode):
 class BatchMasksNode(io.ComfyNode):
     @classmethod
     def define_schema(cls):
-        autogrow_template = io.Autogrow.TemplatePrefix(io.Mask.Input("mask"), prefix="mask", min=1, max=50)
+        autogrow_template = io.Autogrow.TemplatePrefix(io.Mask.Input("mask"), prefix="mask", min=2, max=50)
         return io.Schema(
             node_id="BatchMasksNode",
             search_aliases=["combine masks", "stack masks", "merge masks"],
             display_name="Batch Masks",
-            category="image/mask",
+            category="mask",
             inputs=[
                 io.Autogrow.Input("masks", template=autogrow_template)
             ],
@@ -611,7 +611,7 @@ class BatchMasksNode(io.ComfyNode):
 class BatchLatentsNode(io.ComfyNode):
     @classmethod
     def define_schema(cls):
-        autogrow_template = io.Autogrow.TemplatePrefix(io.Latent.Input("latent"), prefix="latent", min=1, max=50)
+        autogrow_template = io.Autogrow.TemplatePrefix(io.Latent.Input("latent"), prefix="latent", min=2, max=50)
         return io.Schema(
             node_id="BatchLatentsNode",
             search_aliases=["combine latents", "stack latents", "merge latents"],
@@ -670,8 +670,8 @@ class ColorTransfer(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="ColorTransfer",
-            display_name="Transfer Color",
-            category="image/filters",
+            display_name="Color Transfer",
+            category="image/postprocessing",
             description="Match the colors of one image to another using various algorithms.",
             search_aliases=["color match", "color grading", "color correction", "match colors", "color transform", "mkl", "reinhard", "histogram"],
             inputs=[

comfy_extras/nodes_rtdetr.py

@@ -15,7 +15,7 @@ class RTDETR_detect(io.ComfyNode):
         return io.Schema(
             node_id="RTDETR_detect",
             display_name="RT-DETR Detect",
-            category="image/detection",
+            category="detection",
             search_aliases=["bbox", "bounding box", "object detection", "coco"],
             inputs=[
                 io.Model.Input("model", display_name="model"),
@@ -71,7 +71,7 @@ class DrawBBoxes(io.ComfyNode):
         return io.Schema(
             node_id="DrawBBoxes",
             display_name="Draw BBoxes",
-            category="image/detection",
+            category="detection",
             search_aliases=["bbox", "bounding box", "object detection", "rt_detr", "visualize detections", "coco"],
             inputs=[
                 io.Image.Input("image", optional=True),

comfy_extras/nodes_sam3.py

@@ -93,7 +93,7 @@ class SAM3_Detect(io.ComfyNode):
         return io.Schema(
             node_id="SAM3_Detect",
             display_name="SAM3 Detect",
-            category="image/detection",
+            category="detection",
             search_aliases=["sam3", "segment anything", "open vocabulary", "text detection", "segment"],
             inputs=[
                 io.Model.Input("model", display_name="model"),
@@ -265,7 +265,7 @@ class SAM3_VideoTrack(io.ComfyNode):
         return io.Schema(
             node_id="SAM3_VideoTrack",
             display_name="SAM3 Video Track",
-            category="image/detection",
+            category="detection",
             search_aliases=["sam3", "video", "track", "propagate"],
             inputs=[
                 io.Image.Input("images", display_name="images", tooltip="Video frames as batched images"),
@@ -320,7 +320,7 @@ class SAM3_TrackPreview(io.ComfyNode):
         return io.Schema(
             node_id="SAM3_TrackPreview",
             display_name="SAM3 Track Preview",
-            category="image/detection",
+            category="detection",
             inputs=[
                 SAM3TrackData.Input("track_data", display_name="track_data"),
                 io.Image.Input("images", display_name="images", optional=True),
@@ -478,7 +478,7 @@ class SAM3_TrackToMask(io.ComfyNode):
         return io.Schema(
             node_id="SAM3_TrackToMask",
             display_name="SAM3 Track to Mask",
-            category="image/detection",
+            category="detection",
             inputs=[
                 SAM3TrackData.Input("track_data", display_name="track_data"),
                 io.String.Input("object_indices", display_name="object_indices", default="",

comfy_extras/nodes_sdpose.py

@@ -353,8 +353,7 @@ class SDPoseDrawKeypoints(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="SDPoseDrawKeypoints",
-            display_name="SDPose Draw Keypoints",
-            category="image/detection",
+            category="image/preprocessors",
             search_aliases=["openpose", "pose detection", "preprocessor", "keypoints", "pose"],
             inputs=[
                 io.Custom("POSE_KEYPOINT").Input("keypoints"),
@@ -422,8 +421,7 @@ class SDPoseKeypointExtractor(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="SDPoseKeypointExtractor",
-            display_name="SDPose Keypoint Extractor",
-            category="image/detection",
+            category="image/preprocessors",
             search_aliases=["openpose", "pose detection", "preprocessor", "keypoints", "sdpose"],
             description="Extract pose keypoints from images using the SDPose model: https://huggingface.co/Comfy-Org/SDPose/tree/main/checkpoints",
             inputs=[
@@ -597,8 +595,7 @@ class SDPoseFaceBBoxes(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="SDPoseFaceBBoxes",
-            display_name="SDPose Face Bounding Boxes",
-            category="image/detection",
+            category="image/preprocessors",
             search_aliases=["face bbox", "face bounding box", "pose", "keypoints"],
             inputs=[
                 io.Custom("POSE_KEYPOINT").Input("keypoints"),
@@ -655,8 +652,7 @@ class CropByBBoxes(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="CropByBBoxes",
-            display_name="Crop By Bounding Boxes",
-            category="image/transform",
+            category="image/preprocessors",
             search_aliases=["crop", "face crop", "bbox crop", "pose", "bounding box"],
             description="Crop and resize regions from the input image batch based on provided bounding boxes.",
             inputs=[

comfy_extras/nodes_string.py

@@ -1,41 +1,10 @@
 import re
 import json
-import string
 from typing_extensions import override
 
 from comfy_api.latest import ComfyExtension, io
 
 
-class StringFormat(io.ComfyNode):
-    @classmethod
-    def define_schema(cls) -> io.Schema:
-        autogrow = io.Autogrow.TemplateNames(
-            input=io.AnyType.Input("value"),
-            names=list(string.ascii_lowercase),
-            min=0,
-        )
-        return io.Schema(
-            node_id="StringFormat",
-            display_name="Format Text",
-            category="text",
-            search_aliases=["string", "format"],
-            description="Same as Python's string format method. Supports all of Python's format options and features.",
-            inputs=[
-                io.Autogrow.Input("values", template=autogrow),
-                io.String.Input("f_string", default="{a}", multiline=True),
-            ],
-            outputs=[
-                io.String.Output(),
-            ],
-        )
-
-    @classmethod
-    def execute(
-        cls, values: io.Autogrow.Type, f_string: str
-    ) -> io.NodeOutput:
-        return io.NodeOutput(f_string.format(**values))
-
-
 class StringConcatenate(io.ComfyNode):
     @classmethod
     def define_schema(cls):
@@ -444,7 +413,6 @@ class StringExtension(ComfyExtension):
     @override
     async def get_node_list(self) -> list[type[io.ComfyNode]]:
         return [
-            StringFormat,
             StringConcatenate,
             StringSubstring,
             StringLength,

comfy_extras/nodes_video_model.py

@@ -65,7 +65,7 @@ class VideoLinearCFGGuidance:
     RETURN_TYPES = ("MODEL",)
     FUNCTION = "patch"
 
-    CATEGORY = "sampling/guiders"
+    CATEGORY = "sampling/video_models"
 
     def patch(self, model, min_cfg):
         def linear_cfg(args):
@@ -89,7 +89,7 @@ class VideoTriangleCFGGuidance:
     RETURN_TYPES = ("MODEL",)
     FUNCTION = "patch"
 
-    CATEGORY = "sampling/guiders"
+    CATEGORY = "sampling/video_models"
 
     def patch(self, model, min_cfg):
         def linear_cfg(args):
@@ -157,7 +157,5 @@ NODE_CLASS_MAPPINGS = {
 }
 
 NODE_DISPLAY_NAME_MAPPINGS = {
-    "ImageOnlyCheckpointLoader": "Load Checkpoint Image Only (img2vid model)",
-    "VideoLinearCFGGuidance": "Video Linear CFG Guidance",
-    "VideoTriangleCFGGuidance": "Video Triangle CFG Guidance",
+    "ImageOnlyCheckpointLoader": "Image Only Checkpoint Loader (img2vid model)",
 }

comfy_extras/nodes_void.py

@@ -122,8 +122,7 @@ class VOIDQuadmaskPreprocess(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="VOIDQuadmaskPreprocess",
-            display_name="VOID Quadmask Preprocessor",
-            category="image/mask",
+            category="mask/video",
             inputs=[
                 io.Mask.Input("mask"),
                 io.Int.Input("dilate_width", default=0, min=0, max=50, step=1,
@@ -393,7 +392,7 @@ class VOIDWarpedNoiseSource(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="VOIDWarpedNoiseSource",
-            category="sampling/noise",
+            category="sampling/custom_sampling/noise",
             inputs=[
                 io.Latent.Input("warped_noise",
                     tooltip="Warped noise latent from VOIDWarpedNoise"),
@@ -455,7 +454,7 @@ class VOIDSampler(io.ComfyNode):
     def define_schema(cls):
         return io.Schema(
             node_id="VOIDSampler",
-            category="sampling/samplers",
+            category="sampling/custom_sampling/samplers",
             inputs=[],
             outputs=[io.Sampler.Output()],
         )

comfyui_version.py

@@ -1,3 +1,3 @@
 # This file is automatically generated by the build process when version is
 # updated in pyproject.toml.
-__version__ = "0.22.0"
+__version__ = "0.21.1"

execution.py

@@ -2,7 +2,6 @@ import copy
 import heapq
 import inspect
 import logging
-import psutil
 import sys
 import threading
 import time
@@ -728,7 +727,6 @@ class PromptExecutor:
 
         self._notify_prompt_lifecycle("start", prompt_id)
         ram_headroom = int(self.cache_args["ram"] * (1024 ** 3))
-        ram_inactive_headroom = int(self.cache_args["ram_inactive"] * (1024 ** 3))
         ram_release_callback = self.caches.outputs.ram_release if self.cache_type == CacheType.RAM_PRESSURE else None
         comfy.memory_management.set_ram_cache_release_state(ram_release_callback, ram_headroom)
 
@@ -782,14 +780,8 @@ class PromptExecutor:
                         execution_list.complete_node_execution()
 
                     if self.cache_type == CacheType.RAM_PRESSURE:
-                        ram_release_callback(ram_inactive_headroom)
-                        ram_shortfall = ram_headroom - psutil.virtual_memory().available
-                        freed = comfy.model_management.free_pins(ram_shortfall + 512 * (1024 ** 2))
-                        if freed < ram_shortfall:
-                            if freed > 64 * (1024 ** 2):
-                                # AIMDO MEM_DECOMMIT can outrun psutil.available catching up.
-                                time.sleep(0.05)
-                            ram_release_callback(ram_headroom, free_active=True)
+                        comfy.model_management.free_memory(0, None, pins_required=ram_headroom, ram_required=ram_headroom)
+                        ram_release_callback(ram_headroom, free_active=True)
                 else:
                     # Only execute when the while-loop ends without break
                     # Send cached UI for intermediate output nodes that weren't executed

folder_paths.py

@@ -60,8 +60,6 @@ folder_names_and_paths["geometry_estimation"] = ([os.path.join(models_dir, "geom
 
 folder_names_and_paths["optical_flow"] = ([os.path.join(models_dir, "optical_flow")], supported_pt_extensions)
 
-folder_names_and_paths["detection"] = ([os.path.join(models_dir, "detection")], supported_pt_extensions)
-
 output_directory = os.path.join(base_path, "output")
 temp_directory = os.path.join(base_path, "temp")
 input_directory = os.path.join(base_path, "input")

main.py

@@ -283,25 +283,19 @@ def _collect_output_absolute_paths(history_result: dict) -> list[str]:
 
 def prompt_worker(q, server_instance):
     current_time: float = 0.0
-    cache_ram = 0
-    cache_ram_inactive = 0
-    if not args.cache_classic and not args.cache_none and args.cache_lru <= 0:
+    cache_ram = args.cache_ram
+    if cache_ram < 0:
         cache_ram = min(32.0, max(4.0, comfy.model_management.total_ram * 0.25 / 1024.0))
-        cache_ram_inactive = min(96.0, max(12.0, comfy.model_management.total_ram * 0.75 / 1024.0))
-        if len(args.cache_ram) > 0:
-            cache_ram = args.cache_ram[0]
-        if len(args.cache_ram) > 1:
-            cache_ram_inactive = args.cache_ram[1]
 
-    cache_type = execution.CacheType.RAM_PRESSURE
-    if args.cache_classic:
-        cache_type = execution.CacheType.CLASSIC
-    elif args.cache_lru > 0:
+    cache_type = execution.CacheType.CLASSIC
+    if args.cache_lru > 0:
         cache_type = execution.CacheType.LRU
+    elif cache_ram > 0:
+        cache_type = execution.CacheType.RAM_PRESSURE
     elif args.cache_none:
         cache_type = execution.CacheType.NONE
 
-    e = execution.PromptExecutor(server_instance, cache_type=cache_type, cache_args={ "lru" : args.cache_lru, "ram" : cache_ram, "ram_inactive" : cache_ram_inactive } )
+    e = execution.PromptExecutor(server_instance, cache_type=cache_type, cache_args={ "lru" : args.cache_lru, "ram" : cache_ram } )
     last_gc_collect = 0
     need_gc = False
     gc_collect_interval = 10.0

nodes.py

@@ -691,7 +691,7 @@ class LoraLoader:
     FUNCTION = "load_lora"
 
     CATEGORY = "loaders"
-    DESCRIPTION = "This LoRA loader is used to modify both diffusion and CLIP models, altering the way in which latents are denoised such as applying styles. Multiple LoRA nodes can be linked together."
+    DESCRIPTION = "LoRAs are used to modify diffusion and CLIP models, altering the way in which latents are denoised such as applying styles. Multiple LoRA nodes can be linked together."
     SEARCH_ALIASES = ["lora", "load lora", "apply lora", "lora loader", "lora model"]
 
     def load_lora(self, model, clip, lora_name, strength_model, strength_clip):
@@ -723,7 +723,6 @@ class LoraLoaderModelOnly(LoraLoader):
                               "strength_model": ("FLOAT", {"default": 1.0, "min": -100.0, "max": 100.0, "step": 0.01}),
                               }}
     RETURN_TYPES = ("MODEL",)
-    DESCRIPTION = "This LoRAs loader is used to modify the diffusion model, altering the way in which latents are denoised such as applying styles. Multiple LoRA nodes can be linked together."
     FUNCTION = "load_lora_model_only"
 
     def load_lora_model_only(self, model, lora_name, strength_model):
@@ -1525,7 +1524,7 @@ class SetLatentNoiseMask:
 
 def common_ksampler(model, seed, steps, cfg, sampler_name, scheduler, positive, negative, latent, denoise=1.0, disable_noise=False, start_step=None, last_step=None, force_full_denoise=False):
     latent_image = latent["samples"]
-    latent_image = comfy.sample.fix_empty_latent_channels(model, latent_image, latent.get("downscale_ratio_spacial", None), latent.get("downscale_ratio_temporal", None))
+    latent_image = comfy.sample.fix_empty_latent_channels(model, latent_image, latent.get("downscale_ratio_spacial", None))
 
     if disable_noise:
         noise = torch.zeros(latent_image.size(), dtype=latent_image.dtype, layout=latent_image.layout, device="cpu")
@@ -1544,7 +1543,6 @@ def common_ksampler(model, seed, steps, cfg, sampler_name, scheduler, positive,
                                   force_full_denoise=force_full_denoise, noise_mask=noise_mask, callback=callback, disable_pbar=disable_pbar, seed=seed)
     out = latent.copy()
     out.pop("downscale_ratio_spacial", None)
-    out.pop("downscale_ratio_temporal", None)
     out["samples"] = samples
     return (out, )
 
@@ -1777,7 +1775,7 @@ class LoadImageMask(LoadImage):
             }
         }
 
-    CATEGORY = "image"
+    CATEGORY = "mask"
     RETURN_TYPES = ("MASK",)
     FUNCTION = "load_image_mask"
 
@@ -2444,7 +2442,6 @@ async def init_builtin_extra_nodes():
         "nodes_hidream_o1.py",
         "nodes_save_3d.py",
         "nodes_moge.py",
-        "nodes_mediapipe.py",
     ]
 
     import_failed = []

openapi.yaml

@@ -485,15 +485,8 @@ paths:
     post:
       operationId: uploadMask
       tags: [upload]
-      deprecated: true
-      summary: Upload a mask image (deprecated)
-      description: |
-        Deprecated. Clients should composite the mask onto the source image
-        client-side and upload the resulting image via POST /api/upload/image
-        instead. This endpoint will continue to function for older clients,
-        but will not receive new features.
-
-        Uploads a mask image associated with a previously-uploaded reference image.
+      summary: Upload a mask image
+      description: Uploads a mask image associated with a previously-uploaded reference image.
       requestBody:
         required: true
         content:
@@ -1556,6 +1549,12 @@ paths:
             type: string
             enum: [asc, desc]
           description: Sort direction
+        - name: job_ids
+          in: query
+          schema:
+            type: string
+          x-runtime: [cloud]
+          description: "[cloud-only] Comma-separated UUIDs to filter assets by associated job."
         - name: include_public
           in: query
           schema:
@@ -2508,25 +2507,37 @@ paths:
 
   /api/assets/import:
     post:
-      operationId: importPublishedAssets
+      operationId: importAssets
       tags: [assets]
-      summary: "[cloud-only] Import published assets into the caller's library"
-      description: |
-        [cloud-only] Imports the specified published assets into the caller's asset library. New DB records reference the same storage objects; no file copying occurs. Assets the caller already owns (by hash) are deduplicated. The `id` field on each returned `AssetInfo` is the caller's newly-created private asset ID, not the published asset ID supplied in the request.
+      summary: Import assets from external URLs
+      description: "[cloud-only] Imports one or more assets from external URLs into the cloud asset store."
       x-runtime: [cloud]
       requestBody:
         required: true
         content:
           application/json:
             schema:
-              $ref: "#/components/schemas/ImportPublishedAssetsRequest"
+              type: object
+              required:
+                - imports
+              properties:
+                imports:
+                  type: array
+                  items:
+                    $ref: "#/components/schemas/AssetImportRequest"
+                  description: Assets to import
       responses:
         "200":
-          description: Successfully imported assets
+          description: Import initiated
           content:
             application/json:
               schema:
-                $ref: "#/components/schemas/ImportPublishedAssetsResponse"
+                type: object
+                properties:
+                  assets:
+                    type: array
+                    items:
+                      $ref: "#/components/schemas/Asset"
         "400":
           description: Bad request
           content:
@@ -3772,295 +3783,6 @@ paths:
               schema:
                 $ref: "#/components/schemas/JwksResponse"
 
-  # ---------------------------------------------------------------------------
-  # OAuth 2.1 / RFC 7591 Dynamic Client Registration (cloud)
-  # ---------------------------------------------------------------------------
-  /.well-known/oauth-authorization-server:
-    get:
-      operationId: getOAuthAuthorizationServer
-      tags: [auth]
-      summary: "[cloud-only] OAuth 2.1 authorization-server metadata (RFC 8414)"
-      description: "[cloud-only] Public metadata document for OAuth 2.1 clients. Cached 5 minutes."
-      x-runtime: [cloud]
-      security: []
-      responses:
-        "200":
-          description: Authorization-server metadata
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/OAuthAuthorizationServerMetadata"
-        "404":
-          description: OAuth disabled
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/CloudError"
-
-  /.well-known/oauth-protected-resource:
-    get:
-      operationId: getOAuthProtectedResource
-      tags: [auth]
-      summary: "[cloud-only] OAuth 2.1 protected-resource metadata (RFC 9728)"
-      description: "[cloud-only] Public metadata describing the currently advertised protected resource. Cached 5 minutes."
-      x-runtime: [cloud]
-      security: []
-      responses:
-        "200":
-          description: Protected-resource metadata
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/OAuthProtectedResourceMetadata"
-        "404":
-          description: OAuth disabled or no active resource configured
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/CloudError"
-
-  /oauth/authorize:
-    get:
-      operationId: getOAuthAuthorize
-      tags: [auth]
-      summary: "[cloud-only] Begin or resume an OAuth 2.1 authorization request"
-      description: |
-        [cloud-only] Two modes:
-        - **Initial entry** (OAuth params present): validates client/redirect/resource/scopes, persists a server-side authorization-request row, and either redirects (no session / unverified email) to the configured frontend login URL carrying only the opaque `oauth_request_id`, or returns the JSON consent challenge for the frontend to render.
-        - **Resume** (`oauth_request_id` present): loads the server-side row, fails closed if expired/consumed/unknown, returns the JSON consent challenge. Browser-replayed OAuth params are intentionally ignored.
-
-        The frontend renders the consent UI from the JSON payload and POSTs the user's decision back to this endpoint.
-      x-runtime: [cloud]
-      security: []
-      parameters:
-        - { name: response_type,         in: query, required: false, schema: { type: string } }
-        - { name: client_id,             in: query, required: false, schema: { type: string } }
-        - { name: redirect_uri,          in: query, required: false, schema: { type: string } }
-        - { name: scope,                 in: query, required: false, schema: { type: string } }
-        - name: state
-          in: query
-          required: false
-          schema: { type: string }
-          description: |
-            RFC 6749 §10.12 marks `state` as RECOMMENDED. Cloud hardening makes it REQUIRED on the initial-entry path (omitted only on the resume path where `oauth_request_id` is supplied instead). This parameter is `required: false` at the spec level only because the operation is dual-mode (initial entry vs. resume); the runtime rejects empty `state` on the initial-entry path with a stable `invalid_request` 400.
-        - { name: code_challenge,        in: query, required: false, schema: { type: string } }
-        - { name: code_challenge_method, in: query, required: false, schema: { type: string } }
-        - { name: resource,              in: query, required: false, schema: { type: string } }
-        - { name: oauth_request_id,      in: query, required: false, schema: { type: string } }
-      responses:
-        "200":
-          description: Consent challenge payload (session present, email verified). Frontend renders the consent UI from this payload and POSTs back to /oauth/authorize.
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/OAuthConsentChallenge"
-        "302":
-          description: Redirect to login (no session / unverified email) or to registered redirect_uri (pre-validated client error)
-          headers:
-            Location:
-              schema:
-                type: string
-        "400":
-          description: Invalid authorize request (pre-redirect failure — unknown client, redirect mismatch, malformed params)
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/CloudError"
-        "404":
-          description: OAuth disabled
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/CloudError"
-    post:
-      operationId: postOAuthAuthorize
-      tags: [auth]
-      summary: "[cloud-only] Submit OAuth consent decision"
-      description: |
-        [cloud-only] JSON-only consent submission. The handler verifies the per-row CSRF token, atomically marks the authorization request consumed (single-use covers both allow and deny paths), then returns the redirect URL the browser must navigate to. The URL contains either `code` + original `state` for allow, or the RFC 6749 §5.2 error and `state` for deny.
-
-        Workspace membership is re-checked at submission time. Consent is persisted keyed by `(user_id, client_id, resource_id, workspace_id)`; broadening the previously approved scope set requires a fresh consent flow.
-      x-runtime: [cloud]
-      security: []
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              type: object
-              required: [oauth_request_id, csrf_token, decision, workspace_id]
-              properties:
-                oauth_request_id: { type: string, format: uuid }
-                csrf_token:       { type: string }
-                decision:         { type: string, enum: [allow, deny] }
-                workspace_id:     { type: string }
-      responses:
-        "200":
-          description: Redirect URL for the frontend to navigate to (allow → with code+state; deny → with error+state)
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/OAuthAuthorizeRedirectResponse"
-        "400":
-          description: Bad request (CSRF mismatch, expired/consumed request, inaccessible workspace)
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/CloudError"
-        "403":
-          description: Scope broadening on consent re-grant — fresh consent flow required
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/CloudError"
-        "404":
-          description: OAuth disabled
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/CloudError"
-
-  /oauth/token:
-    post:
-      operationId: postOAuthToken
-      tags: [auth]
-      summary: "[cloud-only] Exchange authorization code or refresh token for a resource-bound access token"
-      description: |
-        [cloud-only] OAuth 2.1 token endpoint (RFC 6749 §3.2). Public clients only — `client_secret` is rejected.
-
-        Two grant types are supported:
-        - `authorization_code` — exchanges the code minted by `/oauth/authorize` (with PKCE verifier) for an access token + first refresh token. Single-use; reuse fails closed.
-        - `refresh_token` — rotates the refresh token. Old token immediately invalid; presenting an already-rotated token revokes the entire token family and emits a security metric.
-
-        Both grant types re-validate canonical user state, current workspace membership, and the resource's active flag at every mint. A code or refresh token bound to a deactivated resource fails closed.
-
-        Errors follow RFC 6749 §5.2. Logs never contain raw codes, refresh tokens, or minted tokens.
-
-        Per RFC 6749 §5.1, every 200 and 400 response carries `Cache-Control: no-store` and `Pragma: no-cache` so intermediaries cannot cache token-bearing or state-change-reason responses.
-      x-runtime: [cloud]
-      security: []
-      requestBody:
-        required: true
-        content:
-          application/x-www-form-urlencoded:
-            schema:
-              type: object
-              required: [grant_type, client_id]
-              properties:
-                grant_type:    { type: string, enum: [authorization_code, refresh_token] }
-                client_id:     { type: string }
-                code:          { type: string }
-                redirect_uri:  { type: string }
-                code_verifier: { type: string }
-                refresh_token: { type: string }
-                scope:         { type: string }
-                client_secret: { type: string }
-      responses:
-        "200":
-          description: New token pair
-          headers:
-            Cache-Control:
-              schema:
-                type: string
-              description: 'Always "no-store" per RFC 6749 §5.1'
-            Pragma:
-              schema:
-                type: string
-              description: 'Always "no-cache" per RFC 6749 §5.1'
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/OAuthTokenResponse"
-        "400":
-          description: RFC 6749 §5.2 error
-          headers:
-            Cache-Control:
-              schema:
-                type: string
-              description: 'Always "no-store" per RFC 6749 §5.1'
-            Pragma:
-              schema:
-                type: string
-              description: 'Always "no-cache" per RFC 6749 §5.1'
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/OAuthTokenError"
-        "404":
-          description: OAuth disabled
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/CloudError"
-
-  /oauth/register:
-    post:
-      operationId: postOAuthRegister
-      tags: [auth]
-      summary: "[cloud-only] Dynamic Client Registration (RFC 7591)"
-      description: |
-        [cloud-only] Public, unauthenticated, insert-only RFC 7591 §3.1 client registration. Used by MCP-spec-compliant clients to self-register a public OAuth client without operator involvement.
-
-        Policy:
-
-        - Public clients only — `token_endpoint_auth_method` is forced to `none`. Confidential-client registration is out of scope this phase.
-        - Server-owned `resource_grants`. Caller-supplied `scope` or `resource_grants` is rejected as `invalid_client_metadata` (would be a privilege-escalation surface). Dynamic clients receive the same scopes the active resource publishes.
-        - Application-type-aware redirect URI policy. `application_type=native` accepts loopback (`127.0.0.1`, `::1`, `localhost`) and reverse-DNS-shaped custom schemes; `application_type=web` accepts HTTPS to hosts in an operator-controlled allowlist only. `application_type` is REQUIRED on the request — missing or empty rejects with `invalid_client_metadata`.
-        - Anti-impersonation: reserved client names are rejected from third parties via NFKC-folded compare.
-        - Generated `client_id` carries a stable prefix to distinguish dynamic from seeded clients in audit logs.
-        - Cache-Control: `no-store` on every 201 and 400 response (the response carries fresh credentials and rejection reasons).
-      x-runtime: [cloud]
-      security: []
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: "#/components/schemas/OAuthRegisterRequest"
-      responses:
-        "201":
-          description: Registered. Body echoes the metadata RFC 7591 §3.2.1 requires.
-          headers:
-            Cache-Control:
-              schema:
-                type: string
-              description: 'Always "no-store"'
-            Pragma:
-              schema:
-                type: string
-              description: 'Always "no-cache"'
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/OAuthRegisterResponse"
-        "400":
-          description: RFC 7591 §3.2.2 invalid client metadata
-          headers:
-            Cache-Control:
-              schema:
-                type: string
-              description: 'Always "no-store"'
-            Pragma:
-              schema:
-                type: string
-              description: 'Always "no-cache"'
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/OAuthRegisterError"
-        "404":
-          description: OAuth disabled
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/CloudError"
-        "503":
-          description: No active resource is configured — DCR cannot mint a usable client until an active resource row is seeded.
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/CloudError"
-
   # ---------------------------------------------------------------------------
   # Billing (cloud)
   # ---------------------------------------------------------------------------
@@ -4431,10 +4153,6 @@ paths:
                 name:
                   type: string
                   description: Display name for the API key
-                description:
-                  type: string
-                  description: User-provided description of the key's purpose
-                  maxLength: 5000
       responses:
         "201":
           description: API key created
@@ -6626,6 +6344,14 @@ components:
           type: integer
           format: int64
           description: Size of the asset in bytes
+        width:
+          type: integer
+          nullable: true
+          description: "Original image width in pixels. Null for non-image assets or assets ingested before dimension extraction."
+        height:
+          type: integer
+          nullable: true
+          description: "Original image height in pixels. Null for non-image assets or assets ingested before dimension extraction."
         mime_type:
           type: string
           description: MIME type of the asset
@@ -7361,35 +7087,24 @@ components:
           type: string
           description: Target path on the runtime filesystem
 
-    ImportPublishedAssetsRequest:
+    AssetImportRequest:
       type: object
       x-runtime: [cloud]
-      description: "[cloud-only] Request body for importing published assets into the caller's library."
+      description: "[cloud-only] A single asset to import from an external URL."
       required:
-        - published_asset_ids
+        - url
       properties:
-        published_asset_ids:
+        url:
+          type: string
+          format: uri
+          description: URL of the asset to import
+        name:
+          type: string
+          description: Display name for the imported asset
+        tags:
           type: array
-          description: IDs of published assets (inputs and models) to import.
           items:
             type: string
-        share_id:
-          type: string
-          nullable: true
-          description: |
-            Optional. Share ID of the published workflow these assets belong to. When provided (non-null, non-empty): all `published_asset_ids` must belong to this share's workflow version; returns 400 if the share is not found or any asset does not belong to it. When omitted, null, or empty string: no share-scoped validation is performed and the assets are validated only against global rules (preserved for clients that have not yet adopted `share_id`).
-
-    ImportPublishedAssetsResponse:
-      type: object
-      x-runtime: [cloud]
-      description: "[cloud-only] Response after importing published assets. Each returned `AssetInfo.id` is the caller's newly-created private asset ID, not the published asset ID supplied in the request."
-      required:
-        - assets
-      properties:
-        assets:
-          type: array
-          items:
-            $ref: "#/components/schemas/AssetInfo"
 
     RemoteAssetMetadata:
       type: object
@@ -7706,325 +7421,6 @@ components:
                 description: RSA exponent (base64url)
             additionalProperties: true
 
-    OAuthAuthorizationServerMetadata:
-      type: object
-      x-runtime: [cloud]
-      description: "[cloud-only] OAuth 2.1 authorization-server metadata (RFC 8414)."
-      required:
-        - issuer
-        - authorization_endpoint
-        - token_endpoint
-        - jwks_uri
-        - response_types_supported
-        - grant_types_supported
-        - code_challenge_methods_supported
-        - token_endpoint_auth_methods_supported
-      properties:
-        issuer:
-          type: string
-          format: uri
-        authorization_endpoint:
-          type: string
-          format: uri
-        token_endpoint:
-          type: string
-          format: uri
-        jwks_uri:
-          type: string
-          format: uri
-        registration_endpoint:
-          type: string
-          format: uri
-          description: "[cloud-only] RFC 7591 §3.1 Dynamic Client Registration endpoint. Advertised so MCP-spec-compliant clients can auto-discover and self-register without operator involvement. Present only when DCR is enabled."
-        response_types_supported:
-          type: array
-          items:
-            type: string
-        grant_types_supported:
-          type: array
-          items:
-            type: string
-        code_challenge_methods_supported:
-          type: array
-          items:
-            type: string
-        token_endpoint_auth_methods_supported:
-          type: array
-          items:
-            type: string
-        scopes_supported:
-          type: array
-          items:
-            type: string
-
-    OAuthProtectedResourceMetadata:
-      type: object
-      x-runtime: [cloud]
-      description: "[cloud-only] OAuth 2.1 protected-resource metadata (RFC 9728)."
-      required:
-        - resource
-        - authorization_servers
-        - scopes_supported
-      properties:
-        resource:
-          type: string
-          format: uri
-        authorization_servers:
-          type: array
-          items:
-            type: string
-            format: uri
-        scopes_supported:
-          type: array
-          items:
-            type: string
-        bearer_methods_supported:
-          type: array
-          items:
-            type: string
-
-    OAuthConsentChallenge:
-      type: object
-      x-runtime: [cloud]
-      description: "[cloud-only] Server-side state describing the OAuth consent decision the user is being asked to make. Returned by GET /oauth/authorize when a valid session exists; the frontend renders the consent UI from this payload and POSTs the decision back. Browser never sees the original OAuth params on resume."
-      required:
-        - oauth_request_id
-        - csrf_token
-        - client_display_name
-        - resource_display_name
-        - scopes
-        - workspaces
-      properties:
-        oauth_request_id:
-          type: string
-          format: uuid
-          description: Opaque server-side identifier for the authorization-request row. Carried back unchanged in the consent submission.
-        csrf_token:
-          type: string
-          description: Per-row CSRF token bound to this authorization request (not to the session). Must be echoed back on POST.
-        client_display_name:
-          type: string
-          description: Human-readable name of the OAuth client requesting authorization.
-        resource_display_name:
-          type: string
-          description: Human-readable name of the protected resource.
-        scopes:
-          type: array
-          description: Scopes the client is requesting for this resource. The frontend should present these for the user to approve.
-          items:
-            type: string
-        workspaces:
-          type: array
-          description: Workspaces the user can select from. Membership is re-checked on POST.
-          items:
-            $ref: "#/components/schemas/OAuthConsentChallengeWorkspace"
-
-    OAuthConsentChallengeWorkspace:
-      type: object
-      x-runtime: [cloud]
-      description: "[cloud-only] One workspace option presented in the OAuth consent challenge."
-      required: [id, name, type, role]
-      properties:
-        id:   { type: string }
-        name: { type: string }
-        type: { type: string, enum: [personal, team] }
-        role: { type: string, enum: [owner, member] }
-
-    OAuthAuthorizeRedirectResponse:
-      type: object
-      x-runtime: [cloud]
-      description: "[cloud-only] Redirect target produced after a JSON consent submission. The frontend must navigate the browser to this URL so custom-scheme client callbacks work without relying on fetch-visible 302 headers."
-      required:
-        - redirect_url
-      properties:
-        redirect_url:
-          type: string
-          format: uri
-          description: OAuth client redirect URI with either code+state for allow, or error+state for deny.
-
-    OAuthTokenResponse:
-      type: object
-      x-runtime: [cloud]
-      description: "[cloud-only] RFC 6749 §5.1 successful token response."
-      required: [access_token, token_type, expires_in, refresh_token, scope]
-      properties:
-        access_token:
-          type: string
-          description: Resource-bound access token (audience matches the protected resource).
-        token_type:
-          type: string
-          enum: [Bearer]
-        expires_in:
-          type: integer
-          description: Access token lifetime in seconds.
-        refresh_token:
-          type: string
-          description: Opaque refresh token. Rotates on every successful refresh; presenting an already-rotated token revokes the entire family.
-        scope:
-          type: string
-          description: Space-delimited scopes granted with this token.
-
-    OAuthTokenError:
-      type: object
-      x-runtime: [cloud]
-      description: "[cloud-only] RFC 6749 §5.2 error response."
-      required: [error]
-      properties:
-        error:
-          type: string
-          description: 'RFC 6749 §5.2 error code: invalid_request, invalid_client, invalid_grant, unauthorized_client, unsupported_grant_type, invalid_scope.'
-        error_description:
-          type: string
-          description: Human-readable, no leak of internal storage state.
-
-    OAuthRegisterRequest:
-      type: object
-      x-runtime: [cloud]
-      additionalProperties: false
-      description: "[cloud-only] RFC 7591 §2 client metadata document. Only the fields the server honors are listed; presence of `scope` or `resource_grants` in the request is rejected (`invalid_client_metadata`) because those are server-owned for dynamic clients."
-      required:
-        - redirect_uris
-        - application_type
-      properties:
-        redirect_uris:
-          type: array
-          items:
-            type: string
-          minItems: 1
-          maxItems: 5
-          description: 1–5 redirect URIs. Validated against `application_type` policy.
-        client_name:
-          type: string
-          maxLength: 100
-          description: Human-readable name shown in the consent UI. Reserved-name list rejects impersonation of major clients.
-        application_type:
-          type: string
-          enum: [native, web]
-          description: |
-            RFC 7591 §2 application_type. **REQUIRED** — clients MUST declare intent; the server does not default this field. `native` for desktop / CLI / MCP-spec-strict clients (loopback redirects); `web` for hosted clients (HTTPS only, host must be allowlisted). A missing or explicitly empty `application_type` rejects with `invalid_client_metadata`.
-        token_endpoint_auth_method:
-          type: string
-          enum: [none]
-          description: 'Public clients only this phase — must be `none` if present. The server forces `none` regardless.'
-        grant_types:
-          type: array
-          items:
-            type: string
-            enum: [authorization_code, refresh_token]
-          description: Optional. Defaults to `["authorization_code","refresh_token"]`.
-        response_types:
-          type: array
-          items:
-            type: string
-            enum: [code]
-          description: Optional. Defaults to `["code"]`.
-        scope:
-          type: string
-          nullable: true
-          description: "**REJECTED IF PRESENT.** Dynamic clients do not pick scopes — the server assigns scopes from the active resource's published list. Sending `scope` in the registration body is treated as a privilege-escalation attempt and returns `invalid_client_metadata`."
-        resource_grants:
-          type: object
-          nullable: true
-          additionalProperties:
-            type: array
-            items:
-              type: string
-          description: "**REJECTED IF PRESENT.** Same reason as `scope`. The set of resources and scopes a dynamic client may request is server-policy, not request-driven."
-        client_uri:
-          type: string
-          nullable: true
-          description: "**REJECTED IF PRESENT.** Unsupported RFC 7591 metadata for this public-client phase."
-        logo_uri:
-          type: string
-          nullable: true
-          description: "**REJECTED IF PRESENT.** Unsupported RFC 7591 metadata for this public-client phase."
-        tos_uri:
-          type: string
-          nullable: true
-          description: "**REJECTED IF PRESENT.** Unsupported RFC 7591 metadata for this public-client phase."
-        policy_uri:
-          type: string
-          nullable: true
-          description: "**REJECTED IF PRESENT.** Unsupported RFC 7591 metadata for this public-client phase."
-        software_id:
-          type: string
-          nullable: true
-          description: "**REJECTED IF PRESENT.** Unsupported RFC 7591 metadata for this public-client phase."
-        software_version:
-          type: string
-          nullable: true
-          description: "**REJECTED IF PRESENT.** Unsupported RFC 7591 metadata for this public-client phase."
-        contacts:
-          type: array
-          nullable: true
-          items:
-            type: string
-          description: "**REJECTED IF PRESENT.** Unsupported RFC 7591 metadata for this public-client phase."
-        jwks:
-          type: object
-          nullable: true
-          additionalProperties: true
-          description: "**REJECTED IF PRESENT.** Unsupported RFC 7591 metadata for this public-client phase."
-        jwks_uri:
-          type: string
-          nullable: true
-          description: "**REJECTED IF PRESENT.** Unsupported RFC 7591 metadata for this public-client phase."
-
-    OAuthRegisterResponse:
-      type: object
-      x-runtime: [cloud]
-      description: "[cloud-only] RFC 7591 §3.2.1 successful registration response."
-      required:
-        - client_id
-        - client_id_issued_at
-        - redirect_uris
-        - grant_types
-        - response_types
-        - token_endpoint_auth_method
-        - application_type
-      properties:
-        client_id:
-          type: string
-          description: Server-generated client_id.
-        client_id_issued_at:
-          type: integer
-          format: int64
-          description: Unix timestamp (seconds) when the client was registered.
-        client_name:
-          type: string
-        redirect_uris:
-          type: array
-          items:
-            type: string
-        grant_types:
-          type: array
-          items:
-            type: string
-        response_types:
-          type: array
-          items:
-            type: string
-        token_endpoint_auth_method:
-          type: string
-          enum: [none]
-        application_type:
-          type: string
-          enum: [native, web]
-
-    OAuthRegisterError:
-      type: object
-      x-runtime: [cloud]
-      description: "[cloud-only] RFC 7591 §3.2.2 error response."
-      required:
-        - error
-      properties:
-        error:
-          type: string
-          enum: [invalid_redirect_uri, invalid_client_metadata]
-        error_description:
-          type: string
-          nullable: true
-
     BillingBalance:
       type: object
       x-runtime: [cloud]
@@ -8282,16 +7678,11 @@ components:
       required:
         - id
         - name
-        - description
       properties:
         id:
           type: string
         name:
           type: string
-        description:
-          type: string
-          maxLength: 5000
-          description: User-provided description of the key's purpose. Always present in responses; empty string when no description was supplied on create.
         prefix:
           type: string
           description: First few characters of the key for identification
@@ -8312,17 +7703,12 @@ components:
       required:
         - id
         - name
-        - description
         - key
       properties:
         id:
           type: string
         name:
           type: string
-        description:
-          type: string
-          maxLength: 5000
-          description: User-provided description of the key's purpose. Always present in responses; empty string when no description was supplied on create.
         key:
           type: string
           description: Full API key value (only returned on creation)

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ComfyUI"
-version = "0.22.0"
+version = "0.21.1"
 readme = "README.md"
 license = { file = "LICENSE" }
 requires-python = ">=3.10"

requirements.txt

@@ -1,5 +1,5 @@
 comfyui-frontend-package==1.43.18
-comfyui-workflow-templates==0.9.82
+comfyui-workflow-templates==0.9.77
 comfyui-embedded-docs==0.5.0
 torch
 torchsde
@@ -23,7 +23,7 @@ SQLAlchemy>=2.0.0
 filelock
 av>=14.2.0
 comfy-kitchen>=0.2.8
-comfy-aimdo==0.4.3
+comfy-aimdo==0.3.0
 requests
 simpleeval>=1.0.0
 blake3

tests/execution/test_async_nodes.py

@@ -14,6 +14,7 @@ from tests.execution.test_execution import ComfyClient, run_warmup
 class TestAsyncNodes:
     @fixture(scope="class", autouse=True, params=[
         (False, 0),
+        (True, 0),
         (True, 100),
     ])
     def _server(self, args_pytest, request):
@@ -28,8 +29,6 @@ class TestAsyncNodes:
         use_lru, lru_size = request.param
         if use_lru:
             pargs += ['--cache-lru', str(lru_size)]
-        else:
-            pargs += ['--cache-classic']
         # Running server with args: pargs
         p = subprocess.Popen(pargs)
         yield

tests/execution/test_execution.py

@@ -183,7 +183,8 @@ class TestExecution:
     # Initialize server and client
     #
     @fixture(scope="class", autouse=True, params=[
-        { "extra_args" : ["--cache-classic"], "should_cache_results" : True },
+        { "extra_args" : [], "should_cache_results" : True },
+        { "extra_args" : ["--cache-lru", 0], "should_cache_results" : True },
         { "extra_args" : ["--cache-lru", 100], "should_cache_results" : True },
         { "extra_args" : ["--cache-none"], "should_cache_results" : False },
     ])