mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-03-02 19:49:58 +00:00
[Refactor] Rework modelStore and ModelLibrarySidebarTab (#1350)
* nit * Rename * nit * Move load model folders to app level * Various fixes * nit * nit * wip * nit * nit * nit * Split * nit * Add back spinner * nit * nit * Add refresh button * nit * nit * Preserve model folder order * Avoid order change on folder open
This commit is contained in:
@@ -366,7 +366,10 @@ class ComfyApi extends EventTarget {
|
||||
if (res.status === 404) {
|
||||
return []
|
||||
}
|
||||
return await res.json()
|
||||
const folderBlacklist = ['configs', 'custom_nodes']
|
||||
return (await res.json()).filter(
|
||||
(folder: string) => !folderBlacklist.includes(folder)
|
||||
)
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -374,10 +377,10 @@ class ComfyApi extends EventTarget {
|
||||
* @param {string} folder The folder to list models from, such as 'checkpoints'
|
||||
* @returns The list of model filenames within the specified folder
|
||||
*/
|
||||
async getModels(folder: string) {
|
||||
async getModels(folder: string): Promise<string[]> {
|
||||
const res = await this.fetchApi(`/models/${folder}`)
|
||||
if (res.status === 404) {
|
||||
return null
|
||||
return []
|
||||
}
|
||||
return await res.json()
|
||||
}
|
||||
|
||||
@@ -2293,8 +2293,8 @@ export class ComfyApp {
|
||||
graphData.models &&
|
||||
useSettingStore().get('Comfy.Workflow.ShowMissingModelsWarning')
|
||||
) {
|
||||
for (let m of graphData.models) {
|
||||
const models_available = await useModelStore().getModelsInFolderCached(
|
||||
for (const m of graphData.models) {
|
||||
const models_available = await useModelStore().getLoadedModelFolder(
|
||||
m.directory
|
||||
)
|
||||
if (models_available === null) {
|
||||
@@ -2929,7 +2929,6 @@ export class ComfyApp {
|
||||
}
|
||||
if (this.vueAppReady) {
|
||||
useToastStore().add(requestToastMessage)
|
||||
useModelStore().clearCache()
|
||||
}
|
||||
|
||||
const defs = await api.getNodeDefs({
|
||||
|
||||
Reference in New Issue
Block a user