mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-01-26 19:09:52 +00:00
This PR cleans up the base-layer utilities so they no longer pull renderer or workbench code. The renderer-only `isPrimitiveNode` guard now lives in `src/renderer/utils/nodeTypeGuards.ts`, and the node help/model/ordering helpers have moved into `src/workbench/utils`. All affected services, stores, scripts, and tests were updated to import from the new locations. The idea is to reduce the number of Base→Renderer/Base→Workbench edges (higher scoped base/common utils should not import from renderer/workbench layers). ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-6621-refactor-move-renderer-dependent-utils-into-workbench-scope-2a36d73d36508167aff0fc8a22202d7f) by [Unito](https://www.unito.io)
249 lines
6.6 KiB
TypeScript
249 lines
6.6 KiB
TypeScript
import { describe, expect, it } from 'vitest'
|
|
|
|
import { getSelectedModelsMetadata } from '@/workbench/utils/modelMetadataUtil'
|
|
|
|
describe('modelMetadataUtil', () => {
|
|
describe('filterModelsByCurrentSelection', () => {
|
|
it('should filter models to only include those selected in widget values', () => {
|
|
const node = {
|
|
type: 'CheckpointLoaderSimple',
|
|
widgets_values: ['model_a.safetensors'],
|
|
properties: {
|
|
models: [
|
|
{
|
|
name: 'model_a.safetensors',
|
|
url: 'https://example.com/model_a.safetensors',
|
|
directory: 'checkpoints'
|
|
},
|
|
{
|
|
name: 'model_b.safetensors',
|
|
url: 'https://example.com/model_b.safetensors',
|
|
directory: 'checkpoints'
|
|
}
|
|
]
|
|
}
|
|
}
|
|
|
|
const result = getSelectedModelsMetadata(node)
|
|
|
|
expect(result).toHaveLength(1)
|
|
expect(result![0].name).toBe('model_a.safetensors')
|
|
})
|
|
|
|
it('should return empty array when no models match selection', () => {
|
|
const node = {
|
|
type: 'SomeNode',
|
|
widgets_values: ['unmatched_model.safetensors'],
|
|
properties: {
|
|
models: [
|
|
{
|
|
name: 'model_a.safetensors',
|
|
url: 'https://example.com/model_a.safetensors',
|
|
directory: 'checkpoints'
|
|
}
|
|
]
|
|
}
|
|
}
|
|
|
|
const result = getSelectedModelsMetadata(node)
|
|
|
|
expect(result).toHaveLength(0)
|
|
})
|
|
|
|
it('should handle multiple widget values', () => {
|
|
const node = {
|
|
type: 'SomeNode',
|
|
widgets_values: ['model_a.safetensors', 42, 'model_c.ckpt'],
|
|
properties: {
|
|
models: [
|
|
{
|
|
name: 'model_a.safetensors',
|
|
url: 'https://example.com/model_a.safetensors',
|
|
directory: 'checkpoints'
|
|
},
|
|
{
|
|
name: 'model_b.safetensors',
|
|
url: 'https://example.com/model_b.safetensors',
|
|
directory: 'checkpoints'
|
|
},
|
|
{
|
|
name: 'model_c.ckpt',
|
|
url: 'https://example.com/model_c.ckpt',
|
|
directory: 'checkpoints'
|
|
}
|
|
]
|
|
}
|
|
}
|
|
|
|
const result = getSelectedModelsMetadata(node)
|
|
|
|
expect(result).toHaveLength(2)
|
|
expect(result!.map((m) => m.name)).toEqual([
|
|
'model_a.safetensors',
|
|
'model_c.ckpt'
|
|
])
|
|
})
|
|
|
|
it('should ignore non-string widget values', () => {
|
|
const node = {
|
|
type: 'SomeNode',
|
|
widgets_values: [42, true, null, undefined, 'model_a.safetensors'],
|
|
properties: {
|
|
models: [
|
|
{
|
|
name: 'model_a.safetensors',
|
|
url: 'https://example.com/model_a.safetensors',
|
|
directory: 'checkpoints'
|
|
}
|
|
]
|
|
}
|
|
}
|
|
|
|
const result = getSelectedModelsMetadata(node)
|
|
|
|
expect(result).toHaveLength(1)
|
|
expect(result![0].name).toBe('model_a.safetensors')
|
|
})
|
|
|
|
it('should ignore empty strings', () => {
|
|
const node = {
|
|
type: 'SomeNode',
|
|
widgets_values: ['', ' ', 'model_a.safetensors'],
|
|
properties: {
|
|
models: [
|
|
{
|
|
name: 'model_a.safetensors',
|
|
url: 'https://example.com/model_a.safetensors',
|
|
directory: 'checkpoints'
|
|
}
|
|
]
|
|
}
|
|
}
|
|
|
|
const result = getSelectedModelsMetadata(node)
|
|
|
|
expect(result).toHaveLength(1)
|
|
expect(result![0].name).toBe('model_a.safetensors')
|
|
})
|
|
|
|
it('should return undefined for nodes without model metadata', () => {
|
|
const node = {
|
|
type: 'SomeNode',
|
|
widgets_values: ['model_a.safetensors']
|
|
}
|
|
|
|
const result = getSelectedModelsMetadata(node)
|
|
|
|
expect(result).toBeUndefined()
|
|
})
|
|
|
|
it('should return undefined for nodes without widgets_values', () => {
|
|
const node = {
|
|
type: 'SomeNode',
|
|
properties: {
|
|
models: [
|
|
{
|
|
name: 'model_a.safetensors',
|
|
url: 'https://example.com/model_a.safetensors',
|
|
directory: 'checkpoints'
|
|
}
|
|
]
|
|
}
|
|
}
|
|
|
|
const result = getSelectedModelsMetadata(node)
|
|
|
|
expect(result).toBeUndefined()
|
|
})
|
|
|
|
it('should return undefined for nodes with empty widgets_values', () => {
|
|
const node = {
|
|
type: 'SomeNode',
|
|
widgets_values: [],
|
|
properties: {
|
|
models: [
|
|
{
|
|
name: 'model_a.safetensors',
|
|
url: 'https://example.com/model_a.safetensors',
|
|
directory: 'checkpoints'
|
|
}
|
|
]
|
|
}
|
|
}
|
|
|
|
const result = getSelectedModelsMetadata(node)
|
|
|
|
expect(result).toBeUndefined()
|
|
})
|
|
|
|
it('should return undefined for nodes with empty models array', () => {
|
|
const node = {
|
|
type: 'SomeNode',
|
|
widgets_values: ['model_a.safetensors'],
|
|
properties: {
|
|
models: []
|
|
}
|
|
}
|
|
|
|
const result = getSelectedModelsMetadata(node)
|
|
|
|
expect(result).toBeUndefined()
|
|
})
|
|
|
|
it('should handle object widget values', () => {
|
|
const node = {
|
|
type: 'SomeNode',
|
|
widgets_values: {
|
|
ckpt_name: 'model_a.safetensors',
|
|
seed: 42
|
|
},
|
|
properties: {
|
|
models: [
|
|
{
|
|
name: 'model_a.safetensors',
|
|
url: 'https://example.com/model_a.safetensors',
|
|
directory: 'checkpoints'
|
|
},
|
|
{
|
|
name: 'model_b.safetensors',
|
|
url: 'https://example.com/model_b.safetensors',
|
|
directory: 'checkpoints'
|
|
}
|
|
]
|
|
}
|
|
}
|
|
|
|
const result = getSelectedModelsMetadata(node)
|
|
|
|
expect(result).toHaveLength(1)
|
|
expect(result![0].name).toBe('model_a.safetensors')
|
|
})
|
|
|
|
it('should work end-to-end to filter outdated metadata', () => {
|
|
const node = {
|
|
type: 'CheckpointLoaderSimple',
|
|
widgets_values: ['current_model.safetensors'],
|
|
properties: {
|
|
models: [
|
|
{
|
|
name: 'current_model.safetensors',
|
|
url: 'https://example.com/current_model.safetensors',
|
|
directory: 'checkpoints'
|
|
},
|
|
{
|
|
name: 'old_model.safetensors',
|
|
url: 'https://example.com/old_model.safetensors',
|
|
directory: 'checkpoints'
|
|
}
|
|
]
|
|
}
|
|
}
|
|
|
|
const result = getSelectedModelsMetadata(node)
|
|
|
|
expect(result).toHaveLength(1)
|
|
expect(result![0].name).toBe('current_model.safetensors')
|
|
})
|
|
})
|
|
})
|