bizydraft 0.2.67__py3-none-any.whl → 0.2.67.dev20250929023814__py3-none-any.whl

bizydraft/static/js/hookLoadModel.js

@@ -2,41 +2,55 @@ 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",
-    "ONNXDetectorProvider": "Detection",
-    "SAMLoader": "Detection",
-    "easy samLoaderPipe": "Detection",
-    "WanVideoModelLoader": "UNet",
-    "LoadWanVideoT5TextEncoder": "CLIP",
-    "WanVideoLoraSelect": "LoRa",
-    "ReActorLoadFaceModel": "Detection",
-    "ReActorMaskHelper": "Detection",
-    "LoadAndApplyICLightUnet": "UNet",
-    "SeedVR2": "UNet",
-    "LoadLaMaModel": "Other",
-    "Upscale Model Loader": "Upscaler",
-    "CR Upscale Image": "Upscaler",
-    "SUPIR_Upscale": "Upscaler",
-    "CR Multi Upscale Stack": "Upscaler",
-    "QuadrupleCLIPLoader": "CLIP",
-    "LoadWanVideoClipTextEncoder": "CLIP",
-    "SUPIR_model_loader_v2_clip": "CLIP",
-    "LayerMask: LoadSAM2Model": "Detection",
-    // "LayerMask: LoadCannyModel": "Detection",
-    "LayerMask: SegmentAnythingUltra V2": "Detection",
-    "LoadFramePackModel": "UNet"
-};
+// 动态配置缓存
+let nodeConfigCache = null;
+let configLoadPromise = null;
+let storageClearedOnce = false;
+
+// API配置
+const CONFIG_API_URL = 'https://uat87.bizyair.cn/api/special/comfyagent_node_config?t=' + Math.floor(Date.now() / 60000);
+
+// 获取节点配置的API函数
+async function fetchNodeConfig() {
+    if (nodeConfigCache) {
+        return nodeConfigCache;
+    }
+
+    if (configLoadPromise) {
+        return configLoadPromise;
+    }
+
+    configLoadPromise = (async () => {
+        try {
+            console.log('正在从API获取节点配置...');
+            const response = await fetch(CONFIG_API_URL);
+
+            if (!response.ok) {
+                throw new Error(`HTTP error! status: ${response.status}`);
+            }
+
+            const result = await response.json();
+
+            if (result.code === 20000 && result.data && result.data.weight_load_nodes) {
+                nodeConfigCache = result.data.weight_load_nodes;
+                console.log('节点配置加载成功:', Object.keys(nodeConfigCache).length, '个节点');
+                return nodeConfigCache;
+            } else {
+                throw new Error('API返回数据格式不正确');
+            }
+        } catch (error) {
+            console.error('获取节点配置失败:', error);
+            nodeConfigCache = null;
+            return null;
+        }
+    })();
+
+    return configLoadPromise;
+}
+
+// 启动时后台预取（不阻塞后续逻辑）
+try { void fetchNodeConfig(); } catch (e) { /* noop */ }
+
 const HAZY_WHITELIST_NODES = {
 
 }
@@ -93,39 +107,86 @@ const possibleWidgetNames=[
     "grounding_dino_model"
 ]
 
-// 根据节点名称匹配模型类型
-function getModelTypeFromNodeName(nodeName) {
+// 读取 mode_type（不再兼容旧的 modelType）
+function getModelTypeFromInput(inputConfig) {
+    console.log('inputConfig', inputConfig);
+    if (!inputConfig) return undefined;
+    console.log('inputConfig', inputConfig);
+    return inputConfig.mode_type;
+}
+
+// 根据节点名称获取节点配置信息（名单优先，正则补充；不阻塞返回）
+async function getNodeConfig(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];
+
+    // 1) 名单（API）优先（仅用缓存，不等待网络）
+    if (nodeConfigCache && nodeConfigCache[nodeName]) {
+        return { nodeName, config: nodeConfigCache[nodeName] };
     }
 
+    // 若尚未发起请求，后台发起一次
+    if (!configLoadPromise) { try { void fetchNodeConfig(); } catch (e) {} }
 
-    // 然后使用正则表达式匹配
+    // 2) 正则补充：如 XxxLoader => Xxx（立即返回，不等待API）
     const regex = /^(\w+).*Loader.*/i;
     const match = nodeName.match(regex);
     if (match) {
-        return match[1];
+        const inferredType = match[1];
+        return { nodeName, config: { inputs: { [nodeName]: { mode_type: inferredType, required: true } } } };
     }
     return null;
 }
 
-function createSetWidgetCallback(modelType, selectedBaseModels = []) {
+function createSetWidgetCallback(nodeConfig, 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) {
+        if (!nodeConfig || !nodeConfig.config || !nodeConfig.config.inputs) {
+            console.warn('节点配置无效:', nodeConfig);
+            return;
+        }
+
+        const inputs = nodeConfig.config.inputs;
+        const inputKeys = Object.keys(inputs);
+
+        // 根据API配置找到对应的widget
+        const targetWidgets = [];
+        inputKeys.forEach(inputKey => {
+            const widget = this.widgets.find(w => w.name === inputKey);
+            if (widget) {
+                targetWidgets.push({
+                    widget: widget,
+                    inputKey: inputKey,
+                    inputConfig: inputs[inputKey]
+                });
+            }
+        });
+
+        // 如果没有找到匹配的widget，使用原来的逻辑作为备选
+        if (targetWidgets.length === 0) {
+            const fallbackWidgets = this.widgets.filter(widget => possibleWidgetNames.includes(widget.name));
+            fallbackWidgets.forEach((wdt, index) => {
+                const firstInput = Object.values(inputs)[0];
+                if (firstInput) {
+                    targetWidgets.push({
+                        widget: wdt,
+                        inputKey: wdt.name,
+                        inputConfig: firstInput,
+                        index: index
+                    });
+                }
+            });
+        }
+
+        targetWidgets.forEach(({ widget, inputKey, inputConfig, index }) => {
+            // 检查是否禁用comfyagent
+            if (inputConfig.disable_comfyagent) {
+                console.log(`跳过禁用的widget: ${inputKey}`);
+                return;
+            }
+
+            widget.value = widget.value || "to choose";
+            widget.mouse = function(e, pos, canvas) {
                 try {
                     if (e.type === "pointerdown" || e.type === "mousedown" || e.type === "click" || e.type === "pointerup") {
                         e.preventDefault();
@@ -145,25 +206,23 @@ function createSetWidgetCallback(modelType, selectedBaseModels = []) {
 
                         if (typeof bizyAirLib !== 'undefined' && typeof bizyAirLib.showModelSelect === 'function') {
                             bizyAirLib.showModelSelect({
-                                modelType: [modelType],
+                                modelType: [getModelTypeFromInput(inputConfig)],
                                 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);
-                                    }
+                                    // 更新widget值
+                                    widget.value = version.file_name;
 
-                                    if (model && currentModel && version) {
-                                        currentLora[index].value = version.file_name;
+                                    // 找到对应的隐藏字段（固定命名：model_version_id, model_version_id2...）
+                                    let modelVersionField;
+                                    // 真实绑定顺序应与targetWidgets相同，因此通过当前widget在targetWidgets的索引定位
+                                    const twIndex = targetWidgets.findIndex(tw => tw.widget === widget);
+                                    const fieldName = twIndex === 0 ? "model_version_id" : `model_version_id${twIndex + 1}`;
+                                    modelVersionField = currentNode.widgets.find(w => w.name === fieldName);
 
-                                        currentModel.value = version.id;
+                                    if (model && modelVersionField && version) {
+                                        modelVersionField.value = version.id;
                                         currentNode.setDirtyCanvas(true);
 
                                     // 删除节点上的感叹号徽章
@@ -195,17 +254,17 @@ function createSetWidgetCallback(modelType, selectedBaseModels = []) {
                 }
             };
 
-            // wdt.node = this;
-            wdt.options = wdt.options || {};
-            wdt.options.values = () => [];
-            wdt.options.editable = false;
-            wdt.clickable = true;
-            wdt.processMouse = true;
+            widget.options = widget.options || {};
+            widget.options.values = () => [];
+            widget.options.editable = false;
+            widget.clickable = true;
+            widget.processMouse = true;
         });
     }
 }
 
-function setupNodeMouseBehavior(node, modelType) {
+function setupNodeMouseBehavior(node, nodeConfig) {
+    // 固定隐藏主版本ID字段（其余编号字段为hidden类型本身不可见）
     hideWidget(node, "model_version_id");
 
     // 只设置必要的状态信息，不修改onMouseDown（已在上面的扩展中处理）
@@ -213,7 +272,7 @@ function setupNodeMouseBehavior(node, modelType) {
         node._bizyairState = {
             lastClickTime: 0,
             DEBOUNCE_DELAY: 300,
-            modelType: modelType
+            nodeConfig: nodeConfig
         };
     }
 }
@@ -227,6 +286,9 @@ function addBadge(node) {
         height: 20,
         cornerRadius: 10
       })
+    if (!Array.isArray(node.badges)) {
+        node.badges = []
+    }
     if (node.hasTips) {
         return
     }
@@ -237,71 +299,119 @@ app.registerExtension({
     name: "bizyair.hook.load.model",
     async beforeRegisterNodeDef(nodeType, nodeData, app) {
 
-        // localStorage.removeItem('workflow')
-        localStorage.clear()
-        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 nodeConfig = await getNodeConfig(nodeData.name);
+        if (nodeConfig) {
             const onNodeCreated = nodeType.prototype.onNodeCreated;
             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 = [];
-                    targetWidget.forEach((widget, index) => {
-                        let model_version_id;
-                        if (index === 0) {
-                            model_version_id = this.widgets.find(w => w.name === "model_version_id");
-                            setTimeout(() => {
-                                if (widget.value != 'NONE' && model_version_id && !model_version_id.value) {
-                                    addBadge(this);
-                                }
-                            }, 200)
-                        } else {
-                            const fieldName = `model_version_id${index + 1}`;
-                            model_version_id = this.widgets.find(w => w.name === fieldName);
+
+                    // 检查是否需要添加徽章（与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' && model_version_id && !model_version_id.value) {
-                                    addBadge(this);
-                                }
-                            }, 200)
+                                if (widget.value != 'NONE' && !mv.value) addBadge(this);
+                            }, 200);
                         }
                     });
 
-                    createSetWidgetCallback(modelType, selectedBaseModels).call(this);
+                    // 如果没有找到匹配的输入字段，使用兼容性逻辑检查徽章
+                    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);
@@ -310,10 +420,10 @@ app.registerExtension({
         }
     },
     async nodeCreated(node) {
-        const modelType = getModelTypeFromNodeName(node?.comfyClass);
+        const nodeConfig = await getNodeConfig(node?.comfyClass);
 
-        if (modelType) {
-            setupNodeMouseBehavior(node, modelType);
+        if (nodeConfig) {
+            setupNodeMouseBehavior(node, nodeConfig);
         }
     }
 })

{bizydraft-0.2.67.dist-info → bizydraft-0.2.67.dev20250929023814.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bizydraft
-Version: 0.2.67
+Version: 0.2.67.dev20250929023814
 Summary: bizydraft
 Requires-Dist: loguru
 Requires-Dist: aiohttp

{bizydraft-0.2.67.dist-info → bizydraft-0.2.67.dev20250929023814.dist-info}/RECORD

@@ -14,7 +14,7 @@ bizydraft/static/js/aiAppHandler.js,sha256=4PcrcD9gv-yqBelkIfuhoN0ZwuFv66f7-bmwq
 bizydraft/static/js/freezeModeHandler.js,sha256=SjpHD2nYymR-E13B0YcqkA6e4WycZOVI3c48Ts9qvWE,18027
 bizydraft/static/js/handleStyle.js,sha256=liIzTu-wnV172g58gHWGLYTfd86xpJxL4A-HuHpFnq4,3616
 bizydraft/static/js/hookLoadImage.js,sha256=aFRWkgJW-Cp-YHjZh-3j-vsVcNaDZpBVoQqcFZ2Po0g,8186
-bizydraft/static/js/hookLoadModel.js,sha256=OHHTC1Hk8WXHlmDaNzMNGvT6BvQ6dGvxqALqboxUz84,12317
+bizydraft/static/js/hookLoadModel.js,sha256=pVAiQ7EUy1c1FozPIECs8EpBj5mbSRg5fsSI2JAfWu4,17010
 bizydraft/static/js/main.js,sha256=oEsVEUZSo8ipx93oqs2WFQSRgp46XQ_D-Xao-wen2S8,121
 bizydraft/static/js/nodeFocusHandler.js,sha256=24xXbS4Q-GjJdRqf11i-1pBo8MkOJ24F7MHFV44EG6Q,4683
 bizydraft/static/js/nodeParamsFilter.js,sha256=H7lBB0G8HNqoGhOCH1hNXqPU-rPlrFyTxg_f_JgLEMk,4168
@@ -23,7 +23,7 @@ bizydraft/static/js/socket.js,sha256=VE3fTAgEfM0FZhL526Skt7OCRokOa3mzTCAjAomI_tE
 bizydraft/static/js/tool.js,sha256=VupamUuh7tYiDnBTrL5Z_yLmhJinskhzRXwE3zfsKZM,2901
 bizydraft/static/js/uploadFile.js,sha256=WvglKzHMeOzDhOH3P-fLcPHxCLbKOJpo4DntoRxeJtI,4908
 bizydraft/static/js/workflow_io.js,sha256=FWAjncvWhvy-3nN_legD2fpRwgnIncpRLHU5X016a-U,5236
-bizydraft-0.2.67.dist-info/METADATA,sha256=QRYlOd6JyU3IOLRON9niB1_aYAdiHeItchzWCUGJb5U,162
-bizydraft-0.2.67.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bizydraft-0.2.67.dist-info/top_level.txt,sha256=XtoBq6hjZhXIM7aas4GtPDtAiKo8FdLzMABXW8qqQ8M,10
-bizydraft-0.2.67.dist-info/RECORD,,
+bizydraft-0.2.67.dev20250929023814.dist-info/METADATA,sha256=vNjWDqm890YJ_thI97f4Z7ZNOqsxcjwWOyjcJMEAtPo,180
+bizydraft-0.2.67.dev20250929023814.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bizydraft-0.2.67.dev20250929023814.dist-info/top_level.txt,sha256=XtoBq6hjZhXIM7aas4GtPDtAiKo8FdLzMABXW8qqQ8M,10
+bizydraft-0.2.67.dev20250929023814.dist-info/RECORD,,