bizydraft 0.2.31__py3-none-any.whl → 0.2.78.dev20251117024007__py3-none-any.whl

bizydraft/static/js/hookLoadModel.js

@@ -1,217 +1,132 @@
 import { app } from "../../scripts/app.js";
 import '../BizyAir/bizyair_frontend.js'
-import { hideWidget } from './tool.js'
-
-// 白名单配置 - 不符合正则表达式的节点名称和对应的模型类型
-const WHITELIST_NODES = {
-    "LayerMask: YoloV8Detect": "Detection",
-    "Lora Loader Stack (rgthree)": "LoRa",
-    "easy loraNames": "LoRa",
-    "easy loraStack": "LoRa",
-    "Load Lora": "LoRa",
-    "Intrinsic_lora_sampling": "LoRa",
-    "ADE_LoadAnimateDiffModel": "Checkpoint",
-    "ADE_AnimateDiffLoRALoader": "LoRa",
-    "easy ultralyticsDetectorPipe": "Detection",
-    "UltralyticsDetectorProvider": "Detection",
-    "SAMLoader": "Detection",
-    "easy samLoaderPipe": "Detection",
-};
-const HAZY_WHITELIST_NODES = {
-
-}
-
-const possibleWidgetNames=[
-    "clip_name",
-    "clip_name1",
-    "clip_name2",
-    "clip_name3",
-    "ckpt_name",
-    "lora_name",
-    "name",
-    "lora_01",
-    "lora_02",
-    "lora_03",
-    "lora_04",
-    "lora_1_name",
-    "lora_2_name",
-    "lora_3_name",
-    "lora_4_name",
-    "lora_5_name",
-    "lora_6_name",
-    "lora_7_name",
-    "lora_8_name",
-    "lora_9_name",
-    "lora_10_name",
-    "lora_11_name",
-    "lora_12_name",
-    "model_name",
-    "control_net_name",
-    "ipadapter_file",
-    "unet_name",
-    "vae_name",
-    "model_name",
-    "instantid_file",
-    "pulid_file",
-    "style_model_name",
-    "yolo_model"
-]
-
-// 根据节点名称匹配模型类型
-function getModelTypeFromNodeName(nodeName) {
-    if (/bizyair/i.test(nodeName)) {
-        return null;
-    }
-    // 首先检查白名单
-    if (WHITELIST_NODES.hasOwnProperty(nodeName)) {
-        console.log(`白名单匹配: ${nodeName} -> ${WHITELIST_NODES[nodeName]}`);
-        return WHITELIST_NODES[nodeName];
-    }
-    const HAZY_WHITELIST_NODES_KEYS = Object.keys(HAZY_WHITELIST_NODES);
-    const thisKey = HAZY_WHITELIST_NODES_KEYS.find(key => nodeName.toLowerCase().includes(key.toLowerCase()));
-    if (thisKey) {
-        console.log(`模糊白名单匹配: ${nodeName} -> ${HAZY_WHITELIST_NODES[thisKey]}`);
-        return HAZY_WHITELIST_NODES[thisKey];
-    }
-
-
-    // 然后使用正则表达式匹配
-    const regex = /^(\w+).*Loader.*/i;
-    const match = nodeName.match(regex);
-    if (match) {
-        return match[1];
-    }
-    return null;
-}
-
-function createSetWidgetCallback(modelType, selectedBaseModels = []) {
-    return function setWidgetCallback() {
-        const targetWidget = this.widgets.filter(widget => possibleWidgetNames.includes(widget.name));
-        targetWidget.forEach((wdt, index) => {
-            wdt.value = wdt.value || "to choose"
-            wdt.mouse = function(e, pos, canvas) {
-                try {
-                    if (e.type === "pointerdown" || e.type === "mousedown" || e.type === "click" || e.type === "pointerup") {
-                        e.preventDefault();
-                        e.stopPropagation();
-                        e.widgetClick = true;
-
-                        const currentNode = this.node;
-
-                        if (!currentNode || !currentNode.widgets) {
-                            console.warn("Node or widgets not available");
-                            return false;
-                        }
-
-                        if (typeof bizyAirLib !== 'undefined' && typeof bizyAirLib.showModelSelect === 'function') {
-                            bizyAirLib.showModelSelect({
-                                modelType: [modelType],
-                                selectedBaseModels,
-                                onApply: (version, model) => {
-                                    if (!currentNode || !currentNode.widgets) return;
-
-                                    const currentLora = currentNode.widgets.filter(widget => possibleWidgetNames.includes(widget.name));
-                                    let currentModel;
-
-                                    if (index === 0) {
-                                        currentModel = currentNode.widgets.find(w => w.name === "model_version_id");
-                                    } else {
-                                        const fieldName = `model_version_id${index + 1}`;
-                                        currentModel = currentNode.widgets.find(w => w.name === fieldName);
-                                    }
-
-                                    if (model && currentModel && version) {
-                                        currentLora[index].value = model;
-
-                                        currentModel.value = version.id;
-                                        currentNode.setDirtyCanvas(true);
-                                    }
-                                }
-                            });
-                        } else {
-                            console.error("bizyAirLib not available");
-                        }
-                        return false;
-                    }
-                } catch (error) {
-                    console.error("Error handling mouse event:", error);
-                }
-            };
-
-            // wdt.node = this;
-            wdt.options = wdt.options || {};
-            wdt.options.values = () => [];
-            wdt.options.editable = false;
-            wdt.clickable = true;
-            wdt.processMouse = true;
-        });
-    }
-}
-
-function setupNodeMouseBehavior(node, modelType) {
-    hideWidget(node, "model_version_id");
-
-    // 只设置必要的状态信息，不修改onMouseDown（已在上面的扩展中处理）
-    if (!node._bizyairState) {
-        node._bizyairState = {
-            lastClickTime: 0,
-            DEBOUNCE_DELAY: 300,
-            modelType: modelType
-        };
-    }
-}
-
+import {
+    getNodeConfig,
+    createSetWidgetCallback,
+    setupNodeMouseBehavior,
+    addBadge,
+    possibleWidgetNames
+} from './hookLoad/model.js'
+
+// 存储清理标志
+let storageClearedOnce = false;
 app.registerExtension({
     name: "bizyair.hook.load.model",
     async beforeRegisterNodeDef(nodeType, nodeData, app) {
 
-        localStorage.removeItem('workflow')
-        sessionStorage.clear()
+        if (!storageClearedOnce) {
+            // localStorage.removeItem('workflow')
+            localStorage.clear()
+            sessionStorage.clear()
+            storageClearedOnce = true;
+        }
         const interval = setInterval(() => {
             if (window.switchLanguage) {
                 window.switchLanguage('zh')
                 clearInterval(interval)
             }
         }, 100)
-        const modelType = getModelTypeFromNodeName(nodeData.name);
-        if (modelType) {
-            const onNodeCreated = nodeType.prototype.onNodeCreated;
+
+        // 异步获取节点配置
+        const onNodeCreated = nodeType.prototype.onNodeCreated;
+        const nodeConfig = await getNodeConfig(nodeData.name);
+        if (nodeConfig) {
             nodeType.prototype.onNodeCreated = function() {
                 try {
-                    const targetWidget = this.widgets.filter(widget => possibleWidgetNames.includes(widget.name));
-                    // 为每个targetWidget添加对应的model_version_id字段
-                    targetWidget.forEach((widget, index) => {
-                        let model_version_id;
-                        if (index === 0) {
-                            // 第一个保持原名
-                            model_version_id = this.widgets.find(w => w.name === "model_version_id");
-                            if (!model_version_id) {
-                                model_version_id = this.addWidget("hidden", "model_version_id", "", function(){
-                                }, {
-                                    serialize: true,
-                                    values: []
-                                });
-                            }
-                        } else {
-                            // 从第二个开始使用新名称
-                            const fieldName = `model_version_id${index + 1}`;
-                            model_version_id = this.widgets.find(w => w.name === fieldName);
-                            if (!model_version_id) {
-                                model_version_id = this.addWidget("hidden", fieldName, "", function(){
-                                }, {
-                                    serialize: true,
-                                    values: []
-                                });
-                            }
+                    const inputs = nodeConfig.config.inputs;
+                    const inputKeys = Object.keys(inputs);
+
+                    // 计算需处理的目标widgets（按禁用过滤后再确定数量和索引）
+                    let targetWidgets = [];
+                    // 优先按API字段名匹配
+                    inputKeys.forEach((key) => {
+                        const cfg = inputs[key];
+                        if (cfg && !cfg.disable_comfyagent) {
+                            const w = this.widgets.find(x => x.name === key);
+                            if (w) targetWidgets.push(w);
                         }
                     });
+                    // 如果一个都没匹配到，使用fallback列表
+                    if (targetWidgets.length === 0) {
+                        const fallback = this.widgets.filter(w => possibleWidgetNames.includes(w.name));
+                        // fallback 不再过滤 disable 标记，因为此路径说明API key未命中
+                        targetWidgets = fallback;
+                    }
+
+                    // 按目标widgets数量创建隐藏字段（model_version_id, model_version_id2...）
+                    targetWidgets.forEach((_, idx) => {
+                        const fieldName = idx === 0 ? "model_version_id" : `model_version_id${idx + 1}`;
+                        let mv = this.widgets.find(w => w.name === fieldName);
+                        if (!mv) {
+                            mv = this.addWidget("hidden", fieldName, "", function(){}, { serialize: true, values: [] });
+                        }
+                    });
+
+                    // 如果没有找到匹配的输入字段，使用兼容性逻辑
+                    if (inputKeys.length === 0) {
+                        const targetWidget = this.widgets.filter(widget => possibleWidgetNames.includes(widget.name));
+                        targetWidget.forEach((widget, index) => {
+                            let model_version_id;
+                            if (index === 0) {
+                                model_version_id = this.widgets.find(w => w.name === "model_version_id");
+                                if (!model_version_id) {
+                                    model_version_id = this.addWidget("hidden", "model_version_id", "", function(){
+                                    }, {
+                                        serialize: true,
+                                        values: []
+                                    });
+                                }
+                            } else {
+                                const fieldName = `model_version_id${index + 1}`;
+                                model_version_id = this.widgets.find(w => w.name === fieldName);
+                                if (!model_version_id) {
+                                    model_version_id = this.addWidget("hidden", fieldName, "", function(){
+                                    }, {
+                                        serialize: true,
+                                        values: []
+                                    });
+                                }
+                            }
+                        });
+                    }
 
                     const result = onNodeCreated?.apply(this, arguments);
                     let selectedBaseModels = [];
-                    // if (modelType === 'Checkpoint') {
-                    //     selectedBaseModels = ['SDXL', 'Pony', 'SD 3.5', 'Illustrious']
-                    // }
-                    createSetWidgetCallback(modelType, selectedBaseModels).call(this);
+
+                    // 检查是否需要添加徽章（与targetWidgets一致的索引规则）
+                    targetWidgets.forEach((widget, idx) => {
+                        const fieldName = idx === 0 ? "model_version_id" : `model_version_id${idx + 1}`;
+                        const mv = this.widgets.find(w => w.name === fieldName);
+                        if (mv) {
+                            setTimeout(() => {
+                                if (widget.value != 'NONE' && !mv.value) addBadge(this);
+                            }, 200);
+                        }
+                    });
+
+                    // 如果没有找到匹配的输入字段，使用兼容性逻辑检查徽章
+                    if (inputKeys.length === 0) {
+                        const targetWidget = this.widgets.filter(widget => possibleWidgetNames.includes(widget.name));
+                        targetWidget.forEach((widget, index) => {
+                            let model_version_id;
+                            if (index === 0) {
+                                model_version_id = this.widgets.find(w => w.name === "model_version_id");
+                            } else {
+                                const fieldName = `model_version_id${index + 1}`;
+                                model_version_id = this.widgets.find(w => w.name === fieldName);
+                            }
+
+                            if (model_version_id) {
+                                setTimeout(() => {
+                                    if (widget.value != 'NONE' && !model_version_id.value) {
+                                        addBadge(this);
+                                    }
+                                }, 200);
+                            }
+                        });
+                    }
+
+                    createSetWidgetCallback(nodeConfig, selectedBaseModels).call(this);
                     return result;
                 } catch (error) {
                     console.error("Error in node creation:", error);
@@ -220,10 +135,56 @@ app.registerExtension({
         }
     },
     async nodeCreated(node) {
-        const modelType = getModelTypeFromNodeName(node?.comfyClass);
+        const nodeConfig = await getNodeConfig(node?.comfyClass);
+
+        if (nodeConfig) {
+            setupNodeMouseBehavior(node, nodeConfig);
+        }
+    },
+    async setup() {
+        const app = document.querySelector('#vue-app').__vue_app__
+        const pinia = app.config.globalProperties.$pinia
+        const settingStore = pinia._s.get('setting')
+        await settingStore.set('Comfy.Workflow.ShowMissingModelsWarning', false)
+
+
+
 
-        if (modelType) {
-            setupNodeMouseBehavior(node, modelType);
+        // 获取 toastStore
+        const toastStore = pinia._s.get('toast');
+
+        // 保存原始的 add 方法
+        const originalAdd = toastStore.add;
+
+        // 重写 add 方法，添加过滤逻辑
+        toastStore.add = function(message) {
+        const detail = (message.detail || '').toLowerCase();
+        const summary = (message.summary || '').toLowerCase();
+        const text = `${summary} ${detail}`;
+
+        // 检查是否包含阻止的关键词
+        const blockedKeywords = [
+            'missing dependencies',
+            'comfyui logs',
+            'comfyullogs',
+            'refer to the comfyui',
+            'you may be missing'
+        ];
+
+        const shouldBlock = blockedKeywords.some(keyword =>
+            text.includes(keyword.toLowerCase())
+        );
+
+        // 如果包含阻止的关键词，则不添加 toast
+        if (shouldBlock) {
+            console.log('Blocked toast:', message);
+            return;
         }
+
+        // 否则正常添加
+        return originalAdd.call(this, message);
+        };
+
+        console.log('Toast blocker activated!');
     }
 })

bizydraft/static/js/main.js

@@ -1,4 +1,6 @@
 // 主入口文件，导入所有模块
-import "./hookLoadImage.js";
+import "./disableComfyWebSocket.js";
+import "./hookLoadMedia.js";
 import "./postEvent.js";
 import "./handleStyle.js";
+import "./clipspaceToOss.js";