[bugfix] Filter model metadata by current widget selection (Comfy-Org#4021)

Co-authored-by: filtered <[email protected]>

Author: 2 people

browser_tests/assets/model_metadata_widget_mismatch.json

@@ -0,0 +1,59 @@
+{
+  "last_node_id": 1,
+  "last_link_id": 0,
+  "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": "outdated_model.safetensors",
+            "url": "http://localhost:8188/api/devtools/fake_model.safetensors",
+            "directory": "text_encoders"
+          },
+          {
+            "name": "another_outdated_model.safetensors",
+            "url": "http://localhost:8188/api/devtools/fake_model.safetensors",
+            "directory": "text_encoders"
+          }
+        ]
+      },
+      "widgets_values": ["current_selected_model.safetensors"]
+    }
+  ],
+  "links": [],
+  "groups": [],
+  "config": {},
+  "extra": {
+    "ds": {
+      "offset": [0, 0],
+      "scale": 1
+    }
+  },
+  "version": 0.4
+}

browser_tests/tests/dialog.spec.ts

@@ -103,7 +103,7 @@ test.describe('Missing models warning', () => {
         }
       ])
     }
-    comfyPage.page.route(
+    await comfyPage.page.route(
       '**/api/experiment/models',
       (route) => route.fulfill(modelFoldersRes),
       { times: 1 }
@@ -121,7 +121,7 @@ test.describe('Missing models warning', () => {
         }
       ])
     }
-    comfyPage.page.route(
+    await comfyPage.page.route(
       '**/api/experiment/models/text_encoders',
       (route) => route.fulfill(clipModelsRes),
       { times: 1 }
@@ -133,6 +133,18 @@ test.describe('Missing models warning', () => {
     await expect(missingModelsWarning).not.toBeVisible()
   })
 
+  test('Should not display warning when model metadata exists but widget values have changed', async ({
+    comfyPage
+  }) => {
+    // This tests the scenario where outdated model metadata exists in the workflow
+    // but the actual selected models (widget values) have changed
+    await comfyPage.loadWorkflow('model_metadata_widget_mismatch')
+
+    // The missing models warning should NOT appear
+    const missingModelsWarning = comfyPage.page.locator('.comfy-missing-models')
+    await expect(missingModelsWarning).not.toBeVisible()
+  })
+
   // Flaky test after parallelization
   // https://github.com/Comfy-Org/ComfyUI_frontend/pull/1400
   test.skip('Should download missing model when clicking download button', async ({

src/scripts/app.ts

@@ -63,6 +63,7 @@ import {
   findLegacyRerouteNodes,
   noNativeReroutes
 } from '@/utils/migration/migrateReroute'
+import { getSelectedModelsMetadata } from '@/utils/modelMetadataUtil'
 import { deserialiseAndCreate } from '@/utils/vintageClipboard'
 
 import { type ComfyApi, PromptExecutionError, api } from './api'
@@ -1209,8 +1210,10 @@ export class ComfyApp {
       }
 
       // Collect models metadata from node
-      if (n.properties?.models?.length)
-        embeddedModels.push(...n.properties.models)
+      const selectedModels = getSelectedModelsMetadata(n)
+      if (selectedModels?.length) {
+        embeddedModels.push(...selectedModels)
+      }
     }
 
     // Merge models from the workflow's root-level 'models' field

src/utils/modelMetadataUtil.ts

@@ -0,0 +1,51 @@
+import type { ModelFile } from '@/schemas/comfyWorkflowSchema'
+
+/**
+ * Gets models from the node's `properties.models` field, excluding those
+ * not currently selected in at least 1 of the node's widget values.
+ *
+ * @example
+ * ```ts
+ * const node = {
+ *   type: 'CheckpointLoaderSimple',
+ *   widgets_values: ['model1', 'model2'],
+ *   properties: { models: [{ name: 'model1' }, { name: 'model2' }, { name: 'model3' }] }
+ *   ... other properties
+ * }
+ * const selectedModels = getSelectedModelsMetadata(node)
+ * // selectedModels = [{ name: 'model1' }, { name: 'model2' }]
+ * ```
+ *
+ * @param node - The workflow node to process
+ * @returns Filtered array containing only models that are currently selected
+ */
+export function getSelectedModelsMetadata(node: {
+  type: string
+  widgets_values?: unknown[] | Record<string, unknown>
+  properties?: { models?: ModelFile[] }
+}): ModelFile[] | undefined {
+  try {
+    if (!node.properties?.models?.length) return
+    if (!node.widgets_values) return
+
+    const widgetValues = Array.isArray(node.widgets_values)
+      ? node.widgets_values
+      : Object.values(node.widgets_values)
+
+    if (!widgetValues.length) return
+
+    const stringWidgetValues = new Set<string>()
+    for (const widgetValue of widgetValues) {
+      if (typeof widgetValue === 'string' && widgetValue.trim()) {
+        stringWidgetValues.add(widgetValue)
+      }
+    }
+
+    // Return the node's models that are present in the widget values
+    return node.properties.models.filter((model) =>
+      stringWidgetValues.has(model.name)
+    )
+  } catch (error) {
+    console.error('Error filtering models by current selection:', error)
+  }
+}