1.10.18 (#2866)

Co-authored-by: bymyself <cbyrne@comfy.org>
Co-authored-by: github-actions <github-actions@github.com>

.github/workflows/release.yaml

@@ -8,11 +8,13 @@ on:
       - 'package.json'
 
 jobs:
-  draft_release:
+  build:
     runs-on: ubuntu-latest
     if: >
       github.event.pull_request.merged == true &&
       contains(github.event.pull_request.labels.*.name, 'Release')
+    outputs:
+      version: ${{ steps.current_version.outputs.version }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -21,7 +23,7 @@ jobs:
           node-version: 'lts/*'
       - name: Get current version
         id: current_version
-        run: echo ::set-output name=version::$(node -p "require('./package.json').version")
+        run: echo "version=$(node -p "require('./package.json').version")" >> $GITHUB_OUTPUT
       - name: Build project
         env:
           SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
@@ -29,6 +31,24 @@ jobs:
           npm ci
           npm run build
           npm run zipdist
+      - name: Upload dist artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: dist-files
+          path: |
+            dist/
+            dist.zip
+
+  draft_release:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Download dist artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: dist-files
       - name: Create release
         id: create_release
         uses: softprops/action-gh-release@v2
@@ -37,17 +57,47 @@ jobs:
         with:
           files: |
             dist.zip
-          tag_name: v${{ steps.current_version.outputs.version }}
+          tag_name: v${{ needs.build.outputs.version }}
           target_commitish: ${{ github.event.pull_request.base.ref }}
           make_latest: ${{ github.event.pull_request.base.ref == 'main' }}
           draft: true
           prerelease: false
           generate_release_notes: true
-  publish_types:
+
+  publish_pypi:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+      - name: Download dist artifact
+        uses: actions/download-artifact@v4
+        with:
+          name: dist-files
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.x'
+      - name: Install build dependencies
+        run: python -m pip install build
+      - name: Setup pypi package
+        run: |
+          mkdir -p comfyui_frontend_package/comfyui_frontend_package/static/
+          cp -r dist/* comfyui_frontend_package/comfyui_frontend_package/static/
+      - name: Build pypi package
+        run: python -m build
+        working-directory: comfyui_frontend_package
+        env:
+          COMFYUI_FRONTEND_VERSION: ${{ needs.build.outputs.version }}
+      - name: Publish pypi package
+        uses: pypa/gh-action-pypi-publish@release/v1
+        with:
+          password: ${{ secrets.PYPI_TOKEN }}
+          packages-dir: comfyui_frontend_package/dist
+
+  publish_types:
+    needs: build
     runs-on: ubuntu-latest
-    if: >
-      github.event.pull_request.merged == true &&
-      contains(github.event.pull_request.labels.*.name, 'Release')
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4

.github/workflows/test-ui.yaml

@@ -12,7 +12,7 @@ jobs:
     steps:
     - uses: Comfy-Org/ComfyUI_frontend_setup_action@v2.2
       with:
-        devtools_ref: 080e6d4af809a46852d1c4b7ed85f06e8a3a72be
+        devtools_ref: 7b81139e904519db8e5481899ef36bbb4393cb6b
     - name: Run Jest tests
       run: |
         npm run test:generate
@@ -24,7 +24,7 @@ jobs:
     steps:
     - uses: Comfy-Org/ComfyUI_frontend_setup_action@v2.2
       with:
-        devtools_ref: 080e6d4af809a46852d1c4b7ed85f06e8a3a72be
+        devtools_ref: 7b81139e904519db8e5481899ef36bbb4393cb6b
     - name: Install Playwright Browsers
       run: npx playwright install chromium --with-deps
       working-directory: ComfyUI_frontend
@@ -43,7 +43,7 @@ jobs:
     steps:
     - uses: Comfy-Org/ComfyUI_frontend_setup_action@v2.2
       with:
-        devtools_ref: 080e6d4af809a46852d1c4b7ed85f06e8a3a72be
+        devtools_ref: 7b81139e904519db8e5481899ef36bbb4393cb6b
     - name: Install Playwright Browsers
       run: npx playwright install chromium --with-deps
       working-directory: ComfyUI_frontend
@@ -62,7 +62,7 @@ jobs:
     steps:
     - uses: Comfy-Org/ComfyUI_frontend_setup_action@v2.2
       with:
-        devtools_ref: 080e6d4af809a46852d1c4b7ed85f06e8a3a72be
+        devtools_ref: 7b81139e904519db8e5481899ef36bbb4393cb6b
     - name: Install Playwright Browsers
       run: npx playwright install chromium --with-deps
       working-directory: ComfyUI_frontend

browser_tests/actionbar.spec.ts

@@ -1,7 +1,7 @@
 import type { Response } from '@playwright/test'
 import { expect, mergeTests } from '@playwright/test'
 
-import type { StatusWsMessage } from '../src/schemas/apiSchema.ts'
+import type { StatusWsMessage } from '../src/types/apiTypes.ts'
 import { comfyPageFixture } from './fixtures/ComfyPage'
 import { webSocketFixture } from './fixtures/ws.ts'
 

browser_tests/assets/missing_models_from_node_properties.json

@@ -1,49 +0,0 @@
-{
-  "last_node_id": 1,
-  "last_link_id": 1,
-  "nodes": [
-    {
-      "id": 1,
-      "type": "CheckpointLoaderSimple",
-      "pos": [256, 256],
-      "size": [315, 98],
-      "flags": {},
-      "order": 0,
-      "mode": 0,
-      "inputs": [],
-      "outputs": [
-        {
-          "name": "MODEL",
-          "type": "MODEL",
-          "links": null
-        },
-        {
-          "name": "CLIP",
-          "type": "CLIP",
-          "links": null
-        },
-        {
-          "name": "VAE",
-          "type": "VAE",
-          "links": null
-        }
-      ],
-      "properties": {
-        "Node name for S&R": "CheckpointLoaderSimple",
-        "models": [
-          {
-            "name": "fake_model.safetensors",
-            "url": "http://localhost:8188/api/devtools/fake_model.safetensors",
-            "directory": "text_encoders"
-          }
-        ]
-      },
-      "widgets_values": ["fake_model.safetensors"]
-    }
-  ],
-  "links": [],
-  "groups": [],
-  "config": {},
-  "extra": {},
-  "version": 0.4
-}

browser_tests/assets/optional_combo_input.json

@@ -1,37 +0,0 @@
-{
-  "last_node_id": 16,
-  "last_link_id": 17,
-  "nodes": [
-    {
-      "id": 16,
-      "type": "DevToolsNodeWithOptionalComboInput",
-      "pos": [1605, 480],
-      "size": [378, 58],
-      "flags": {},
-      "order": 0,
-      "mode": 0,
-      "inputs": [],
-      "outputs": [
-        {
-          "name": "STRING",
-          "type": "STRING",
-          "links": null
-        }
-      ],
-      "properties": {
-        "Node name for S&R": "DevToolsNodeWithOptionalComboInput"
-      },
-      "widgets_values": ["Random Unique Option 1740551583.3507228"]
-    }
-  ],
-  "links": [],
-  "groups": [],
-  "config": {},
-  "extra": {
-    "ds": {
-      "scale": 2.0875710456451313,
-      "offset": [-1311.5753953400676, -176.7620403697558]
-    }
-  },
-  "version": 0.4
-}

browser_tests/colorPalette.spec.ts

@@ -1,6 +1,6 @@
 import { expect } from '@playwright/test'
 
-import type { Palette } from '../src/schemas/colorPaletteSchema'
+import type { Palette } from '../src/types/colorPaletteTypes'
 import { comfyPageFixture as test } from './fixtures/ComfyPage'
 
 const customColorPalettes: Record<string, Palette> = {

browser_tests/dialog.spec.ts

@@ -1,6 +1,6 @@
 import { Locator, expect } from '@playwright/test'
 
-import type { Keybinding } from '../src/schemas/keyBindingSchema'
+import { Keybinding } from '../src/types/keyBindingTypes'
 import { comfyPageFixture as test } from './fixtures/ComfyPage'
 
 test.describe('Load workflow warning', () => {
@@ -78,19 +78,6 @@ test.describe('Missing models warning', () => {
     await expect(downloadButton).toBeVisible()
   })
 
-  test('Should display a warning when missing models are found in node properties', async ({
-    comfyPage
-  }) => {
-    // Load workflow that has a node with models metadata at the node level
-    await comfyPage.loadWorkflow('missing_models_from_node_properties')
-
-    const missingModelsWarning = comfyPage.page.locator('.comfy-missing-models')
-    await expect(missingModelsWarning).toBeVisible()
-
-    const downloadButton = missingModelsWarning.getByLabel('Download')
-    await expect(downloadButton).toBeVisible()
-  })
-
   test('Should not display a warning when no missing models are found', async ({
     comfyPage
   }) => {

browser_tests/fixtures/ComfyPage.ts

@@ -5,9 +5,9 @@ import { test as base } from '@playwright/test'
 import dotenv from 'dotenv'
 import * as fs from 'fs'
 
-import type { NodeId } from '../../src/schemas/comfyWorkflowSchema'
-import type { KeyCombo } from '../../src/schemas/keyBindingSchema'
 import type { useWorkspaceStore } from '../../src/stores/workspaceStore'
+import type { NodeId } from '../../src/types/comfyWorkflow'
+import type { KeyCombo } from '../../src/types/keyBindingTypes'
 import { NodeBadgeMode } from '../../src/types/nodeSource'
 import { ComfyActionbar } from '../helpers/actionbar'
 import { ComfyTemplates } from '../helpers/templates'

browser_tests/fixtures/utils/taskHistory.ts

@@ -8,7 +8,7 @@ import type {
   HistoryTaskItem,
   TaskItem,
   TaskOutput
-} from '../../../src/schemas/apiSchema'
+} from '../../../src/types/apiTypes'
 import type { ComfyPage } from '../ComfyPage'
 
 /** keyof TaskOutput[string] */