Skip to content

Commit 4d0ba19

Browse files
authored
[Cleanup] Remove deprecated: node def validation (#4038)
1 parent 78fc86d commit 4d0ba19

File tree

10 files changed

+4
-71
lines changed

10 files changed

+4
-71
lines changed

src/constants/coreSettings.ts

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -511,15 +511,6 @@ export const CORE_SETTINGS: SettingParams[] = [
511511
defaultValue: [] as string[],
512512
versionAdded: '1.3.11'
513513
},
514-
{
515-
id: 'Comfy.Validation.NodeDefs',
516-
name: 'Validate node definitions (slow)',
517-
type: 'boolean',
518-
tooltip:
519-
'Recommended for node developers. This will validate all node definitions on startup.',
520-
defaultValue: false,
521-
versionAdded: '1.3.14'
522-
},
523514
{
524515
id: 'Comfy.LinkRenderMode',
525516
category: ['LiteGraph', 'Graph', 'LinkRenderMode'],

src/locales/en/settings.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -329,10 +329,6 @@
329329
"Bottom": "Bottom"
330330
}
331331
},
332-
"Comfy_Validation_NodeDefs": {
333-
"name": "Validate node definitions (slow)",
334-
"tooltip": "Recommended for node developers. This will validate all node definitions on startup."
335-
},
336332
"Comfy_Validation_Workflows": {
337333
"name": "Validate workflows"
338334
},

src/locales/es/settings.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -329,10 +329,6 @@
329329
},
330330
"tooltip": "Posición de la barra de menú. En dispositivos móviles, el menú siempre se muestra en la parte superior."
331331
},
332-
"Comfy_Validation_NodeDefs": {
333-
"name": "Validar definiciones de nodos (lento)",
334-
"tooltip": "Recomendado para desarrolladores de nodos. Esto validará todas las definiciones de nodos al iniciar."
335-
},
336332
"Comfy_Validation_Workflows": {
337333
"name": "Validar flujos de trabajo"
338334
},

src/locales/fr/settings.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -329,10 +329,6 @@
329329
},
330330
"tooltip": "Position de la barre de menu. Sur les appareils mobiles, le menu est toujours affiché en haut."
331331
},
332-
"Comfy_Validation_NodeDefs": {
333-
"name": "Valider les définitions de nœuds (lent)",
334-
"tooltip": "Recommandé pour les développeurs de nœuds. Cela validera toutes les définitions de nœuds au démarrage."
335-
},
336332
"Comfy_Validation_Workflows": {
337333
"name": "Valider les flux de travail"
338334
},

src/locales/ja/settings.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -329,10 +329,6 @@
329329
},
330330
"tooltip": "メニューバーの位置。モバイルデバイスでは、メニューは常に上部に表示されます。"
331331
},
332-
"Comfy_Validation_NodeDefs": {
333-
"name": "ノード定義を検証(遅い)",
334-
"tooltip": "ノード開発者に推奨されます。これにより、起動時にすべてのノード定義が検証されます。"
335-
},
336332
"Comfy_Validation_Workflows": {
337333
"name": "ワークフローを検証"
338334
},

src/locales/ko/settings.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -329,10 +329,6 @@
329329
},
330330
"tooltip": "메뉴 바 위치입니다. 모바일 기기에서는 메뉴가 항상 상단에 표시됩니다."
331331
},
332-
"Comfy_Validation_NodeDefs": {
333-
"name": "노드 정의 유효성 검사 (느림)",
334-
"tooltip": "노드 개발자에게 권장됩니다. 시작 시 모든 노드 정의를 유효성 검사합니다."
335-
},
336332
"Comfy_Validation_Workflows": {
337333
"name": "워크플로 유효성 검사"
338334
},

src/locales/ru/settings.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -329,10 +329,6 @@
329329
},
330330
"tooltip": "Расположение панели меню. На мобильных устройствах меню всегда отображается вверху."
331331
},
332-
"Comfy_Validation_NodeDefs": {
333-
"name": "Проверка определений нод (медленно)",
334-
"tooltip": "Рекомендуется для разработчиков нод. Это проверит все определения нод при запуске."
335-
},
336332
"Comfy_Validation_Workflows": {
337333
"name": "Проверка рабочих процессов"
338334
},

src/locales/zh/settings.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -329,10 +329,6 @@
329329
},
330330
"tooltip": "選單列位置。在行動裝置上,選單始終顯示於頂端。"
331331
},
332-
"Comfy_Validation_NodeDefs": {
333-
"name": "校验节点定义(慢)",
334-
"tooltip": "推荐给节点开发者。开启后会在 ComfyUI 启动时校验全部节点定义。"
335-
},
336332
"Comfy_Validation_Workflows": {
337333
"name": "校验工作流"
338334
},

src/scripts/api.ts

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,7 @@ import type {
3434
ComfyWorkflowJSON,
3535
NodeId
3636
} from '@/schemas/comfyWorkflowSchema'
37-
import {
38-
type ComfyNodeDef,
39-
validateComfyNodeDef
40-
} from '@/schemas/nodeDefSchema'
37+
import type { ComfyNodeDef } from '@/schemas/nodeDefSchema'
4138
import { WorkflowTemplates } from '@/types/workflowTemplateTypes'
4239

4340
interface QueuePromptRequestBody {
@@ -605,31 +602,9 @@ export class ComfyApi extends EventTarget {
605602
* Loads node object definitions for the graph
606603
* @returns The node definitions
607604
*/
608-
async getNodeDefs({ validate = false }: { validate?: boolean } = {}): Promise<
609-
Record<string, ComfyNodeDef>
610-
> {
605+
async getNodeDefs(): Promise<Record<string, ComfyNodeDef>> {
611606
const resp = await this.fetchApi('/object_info', { cache: 'no-store' })
612-
const objectInfoUnsafe = await resp.json()
613-
if (!validate) {
614-
return objectInfoUnsafe
615-
}
616-
// Validate node definitions against zod schema. (slow)
617-
const objectInfo: Record<string, ComfyNodeDef> = {}
618-
for (const key in objectInfoUnsafe) {
619-
const validatedDef = validateComfyNodeDef(
620-
objectInfoUnsafe[key],
621-
/* onError=*/ (errorMessage: string) => {
622-
console.warn(
623-
`Skipping invalid node definition: ${key}. See debug log for more information.`
624-
)
625-
console.debug(errorMessage)
626-
}
627-
)
628-
if (validatedDef !== null) {
629-
objectInfo[key] = validatedDef
630-
}
631-
}
632-
return objectInfo
607+
return await resp.json()
633608
}
634609

635610
/**

src/scripts/app.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -937,12 +937,7 @@ export class ComfyApp {
937937
.join('/')
938938
})
939939

940-
return _.mapValues(
941-
await api.getNodeDefs({
942-
validate: useSettingStore().get('Comfy.Validation.NodeDefs')
943-
}),
944-
(def) => translateNodeDef(def)
945-
)
940+
return _.mapValues(await api.getNodeDefs(), (def) => translateNodeDef(def))
946941
}
947942

948943
/**

0 commit comments

Comments
 (0)