fix: support progressive fallback for deeply nested model directories (#10196)

## Summary
- Fix `findProvidersWithFallback` to try all parent paths progressively
instead of jumping from exact match to top-level segment only.
Previously `"a/b/c"` would try `"a/b/c"` then `"a"`, now correctly tries
`"a/b/c"` → `"a/b"` → `"a"`
- Use empty key `''` for `DownloadAndLoadCogVideoControlNet` and
`DownloadAndLoadCogVideoModel` registrations so `shouldUseAssetBrowser`
returns false — these nodes use HuggingFace repo names, not file-based
assets, so the asset browser finds nothing and shows an empty dropdown

## Test plan
- [x] All 46 existing `modelToNodeStore` tests pass
- [ ] Verify CogVideo ControlNet and HF model dropdowns show options
(after backend deploy)
- [x] Verify "Use" button on CogVideo/ControlNet/* models creates the
correct node
- [ ] Verify GGUF asset browser still works

---------

Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
Co-authored-by: Alexander Brown <drjkl@comfy.org>
This commit is contained in:
Deep Mehta
2026-03-18 10:39:22 -07:00
committed by GitHub
parent e7384ab2da
commit 4cf42de4f9
2 changed files with 77 additions and 13 deletions

View File

@@ -178,6 +178,71 @@ describe('useModelToNodeStore', () => {
).toBeUndefined()
})
describe('progressive hierarchical fallback', () => {
it('should resolve 1-level path via exact match', () => {
const modelToNodeStore = useModelToNodeStore()
modelToNodeStore.quickRegister('level1', 'UNETLoader', 'key1')
const provider = modelToNodeStore.getNodeProvider('level1')
expect(provider?.nodeDef?.name).toBe('UNETLoader')
})
it('should resolve 2-level path to registered parent', () => {
const modelToNodeStore = useModelToNodeStore()
modelToNodeStore.quickRegister('level1', 'UNETLoader', 'key1')
const provider = modelToNodeStore.getNodeProvider('level1/child')
expect(provider?.nodeDef?.name).toBe('UNETLoader')
})
it('should resolve 3-level path to nearest registered ancestor', () => {
const modelToNodeStore = useModelToNodeStore()
modelToNodeStore.quickRegister('level1', 'UNETLoader', 'key1')
modelToNodeStore.quickRegister('level1/level2', 'VAELoader', 'key2')
// 3 levels: should match level1/level2 (nearest), not level1
const provider = modelToNodeStore.getNodeProvider('level1/level2/child')
expect(provider?.nodeDef?.name).toBe('VAELoader')
})
it('should resolve 4-level path to nearest registered ancestor', () => {
const modelToNodeStore = useModelToNodeStore()
modelToNodeStore.quickRegister('a', 'UNETLoader', 'k1')
modelToNodeStore.quickRegister('a/b', 'VAELoader', 'k2')
modelToNodeStore.quickRegister('a/b/c', 'StyleModelLoader', 'k3')
// 4 levels: should match a/b/c (nearest), not a/b or a
const provider = modelToNodeStore.getNodeProvider('a/b/c/d')
expect(provider?.nodeDef?.name).toBe('StyleModelLoader')
})
it('should skip intermediate unregistered levels', () => {
const modelToNodeStore = useModelToNodeStore()
modelToNodeStore.quickRegister('a', 'UNETLoader', 'k1')
// a/b is NOT registered
// 3 levels: a/b not found, falls back to a
const provider = modelToNodeStore.getNodeProvider('a/b/c')
expect(provider?.nodeDef?.name).toBe('UNETLoader')
})
it('should prefer exact match over any fallback', () => {
const modelToNodeStore = useModelToNodeStore()
modelToNodeStore.quickRegister('a', 'UNETLoader', 'k1')
modelToNodeStore.quickRegister('a/b/c', 'VAELoader', 'k2')
const provider = modelToNodeStore.getNodeProvider('a/b/c')
expect(provider?.nodeDef?.name).toBe('VAELoader')
})
it('should return undefined when no ancestor is registered', () => {
const modelToNodeStore = useModelToNodeStore()
modelToNodeStore.quickRegister('x', 'UNETLoader', 'k1')
expect(modelToNodeStore.getNodeProvider('y/z/w')).toBeUndefined()
})
})
it('should return provider for chatterbox nodes with empty key', () => {
const modelToNodeStore = useModelToNodeStore()
modelToNodeStore.registerDefaults()

View File

@@ -75,8 +75,8 @@ export const useModelToNodeStore = defineStore('modelToNode', () => {
/**
* Find providers for modelType with hierarchical fallback.
* Tries exact match first, then falls back to top-level segment (e.g., "parent/child" → "parent").
* Note: Only falls back one level; "a/b/c" tries "a/b/c" then "a", not "a/b".
* Tries exact match first, then progressively shorter parent paths.
* e.g., "a/b/c" tries "a/b/c" → "a/b" → "a".
*/
function findProvidersWithFallback(
modelType: string
@@ -85,15 +85,12 @@ export const useModelToNodeStore = defineStore('modelToNode', () => {
return undefined
}
const exactMatch = modelToNodeMap.value[modelType]
if (exactMatch && exactMatch.length > 0) return exactMatch
const topLevel = modelType.split('/')[0]
if (topLevel === modelType) return undefined
const fallback = modelToNodeMap.value[topLevel]
if (fallback && fallback.length > 0) return fallback
const segments = modelType.split('/')
for (let i = segments.length; i >= 1; i--) {
const path = segments.slice(0, i).join('/')
const providers = modelToNodeMap.value[path]
if (providers && providers.length > 0) return providers
}
return undefined
}
@@ -361,10 +358,11 @@ export const useModelToNodeStore = defineStore('modelToNode', () => {
// CogVideoX models (comfyui-cogvideoxwrapper)
quickRegister('CogVideo/GGUF', 'DownloadAndLoadCogVideoGGUFModel', 'model')
// Empty key: HF-download node — don't activate asset browser for the combo widget
quickRegister(
'CogVideo/ControlNet',
'DownloadAndLoadCogVideoControlNet',
'model'
''
)
// DynamiCrafter models (ComfyUI-DynamiCrafterWrapper)
@@ -386,7 +384,8 @@ export const useModelToNodeStore = defineStore('modelToNode', () => {
quickRegister('lama', 'LaMa', 'lama_model')
// CogVideoX video generation models (comfyui-cogvideoxwrapper)
quickRegister('CogVideo', 'DownloadAndLoadCogVideoModel', 'model')
// Empty key: HF-download node — don't activate asset browser for the combo widget
quickRegister('CogVideo', 'DownloadAndLoadCogVideoModel', '')
// Inpaint models (comfyui-inpaint-nodes)
quickRegister('inpaint', 'INPAINT_LoadInpaintModel', 'model_name')