From 809cc85a8e092ae416ca2652a4b73671b8d3c72b Mon Sep 17 00:00:00 2001 From: comfyanonymous Date: Sun, 2 Jun 2024 19:21:53 -0400 Subject: [PATCH 1/2] Remove useless code. --- comfy/model_patcher.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/comfy/model_patcher.py b/comfy/model_patcher.py index 2e746d8a9..84592f931 100644 --- a/comfy/model_patcher.py +++ b/comfy/model_patcher.py @@ -76,9 +76,7 @@ class ModelPatcher: def model_size(self): if self.size > 0: return self.size - model_sd = self.model.state_dict() self.size = comfy.model_management.module_size(self.model) - self.model_keys = set(model_sd.keys()) return self.size def clone(self): @@ -90,7 +88,6 @@ class ModelPatcher: n.object_patches = self.object_patches.copy() n.model_options = copy.deepcopy(self.model_options) - n.model_keys = self.model_keys n.backup = self.backup n.object_patches_backup = self.object_patches_backup return n @@ -210,8 +207,9 @@ class ModelPatcher: def add_patches(self, patches, strength_patch=1.0, strength_model=1.0): p = set() + model_sd = self.model.state_dict() for k in patches: - if k in self.model_keys: + if k in model_sd: p.add(k) current_patches = self.patches.get(k, []) current_patches.append((strength_patch, patches[k], strength_model)) From cb8d0ebccc93d3df6e00da1a57718a86d3dde300 Mon Sep 17 00:00:00 2001 From: comfyanonymous Date: Mon, 3 Jun 2024 19:48:27 -0400 Subject: [PATCH 2/2] Don't load the view coordinates when loading a workflow from the history. I think this makes things slightly less annoying for some users. --- web/scripts/app.js | 4 ++-- web/scripts/ui.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/scripts/app.js b/web/scripts/app.js index 4dc011b9f..f96d197a8 100644 --- a/web/scripts/app.js +++ b/web/scripts/app.js @@ -1800,7 +1800,7 @@ export class ComfyApp { * @param {*} graphData A serialized graph object * @param { boolean } clean If the graph state, e.g. images, should be cleared */ - async loadGraphData(graphData, clean = true) { + async loadGraphData(graphData, clean = true, restore_view = true) { if (clean !== false) { this.clean(); } @@ -1836,7 +1836,7 @@ export class ComfyApp { try { this.graph.configure(graphData); - if (this.enableWorkflowViewRestore.value && graphData.extra?.ds) { + if (restore_view && this.enableWorkflowViewRestore.value && graphData.extra?.ds) { this.canvas.ds.offset = graphData.extra.ds.offset; this.canvas.ds.scale = graphData.extra.ds.scale; } diff --git a/web/scripts/ui.js b/web/scripts/ui.js index 36fed3238..72e43d357 100644 --- a/web/scripts/ui.js +++ b/web/scripts/ui.js @@ -228,7 +228,7 @@ class ComfyList { $el("button", { textContent: "Load", onclick: async () => { - await app.loadGraphData(item.prompt[3].extra_pnginfo.workflow); + await app.loadGraphData(item.prompt[3].extra_pnginfo.workflow, true, false); if (item.outputs) { app.nodeOutputs = item.outputs; }