bizydraft 0.2.75.dev20251022074525__py3-none-any.whl → 0.2.75.dev20251022081333__py3-none-any.whl

bizydraft/static/js/hookLoad/media.js

@@ -0,0 +1,70 @@
+// 媒体节点配置获取与工具函数（与 hookLoad/model.js 结构一致，面向 media_load_nodes）
+
+// 动态配置缓存（仅缓存媒体部分）
+let mediaConfigCache = null;
+let mediaConfigLoadPromise = null;
+
+// API配置（与模型相同接口，不同数据块）
+const CONFIG_API_URL = 'https://uat87.bizyair.cn/api/special/comfyagent_node_config?t=' + Math.floor(Date.now() / 60000);
+
+// 常见的媒体输入字段名（作为回退匹配）
+export const possibleMediaWidgetNames = [
+    "image",
+    "file",
+    "audio",
+    "video",
+    "model_file"
+];
+
+// 获取媒体配置的API函数（只解析 media_load_nodes）
+export async function fetchMediaConfig() {
+    if (mediaConfigCache) return mediaConfigCache;
+    if (mediaConfigLoadPromise) return mediaConfigLoadPromise;
+
+    mediaConfigLoadPromise = (async () => {
+        try {
+            const response = await fetch(CONFIG_API_URL, { credentials: 'include' });
+            if (!response || !response.ok) {
+                throw new Error('HTTP error ' + (response && response.status));
+            }
+            const result = await response.json();
+            if (result && result.code === 20000 && result.data && result.data.media_load_nodes) {
+                mediaConfigCache = result.data.media_load_nodes;
+                return mediaConfigCache;
+            }
+            throw new Error('API返回数据不包含 media_load_nodes');
+        } catch (err) {
+            console.error('获取媒体配置失败:', err);
+            mediaConfigCache = null;
+            return null;
+        }
+    })();
+
+    return mediaConfigLoadPromise;
+}
+
+// 根据节点名称获取媒体节点配置（仅使用缓存，不阻塞返回；触发后台预取）
+export async function getMediaNodeConfig(nodeName) {
+    // 后台触发一次预取
+    if (!mediaConfigLoadPromise) { try { void fetchMediaConfig(); } catch (e) {} }
+
+    if (mediaConfigCache && mediaConfigCache[nodeName]) {
+        return { nodeName, config: mediaConfigCache[nodeName] };
+    }
+    return null;
+}
+
+// 从媒体配置中提取此节点的输入键（过滤 disable_comfyagent）
+export function getMediaInputKeys(mediaNodeConfig) {
+    if (!mediaNodeConfig || !mediaNodeConfig.config || !mediaNodeConfig.config.inputs) return [];
+    const inputs = mediaNodeConfig.config.inputs;
+    const keys = [];
+    for (const key of Object.keys(inputs)) {
+        const cfg = inputs[key];
+        if (cfg && !cfg.disable_comfyagent) keys.push(key);
+    }
+    return keys;
+}
+
+// 启动时后台预取（不阻塞后续逻辑）
+try { void fetchMediaConfig(); } catch (e) {}

bizydraft/static/js/hookLoad/model.js

@@ -0,0 +1,296 @@
+import { hideWidget } from '../tool.js'
+
+// 动态配置缓存
+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);
+
+const HAZY_WHITELIST_NODES = {
+
+}
+
+export const possibleWidgetNames=[
+    "clip_name",
+    "clip_name1",
+    "clip_name2",
+    "clip_name3",
+    "clip_name4",
+    "ckpt_name",
+    "lora_name",
+    "name",
+    "lora",
+    "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",
+    "model_name",
+    "instantid_file",
+    "pulid_file",
+    "style_model_name",
+    "yolo_model",
+    "face_model",
+    "bbox_model_name",
+    "sam_model_name",
+    "model_path",
+    "upscale_model",
+    "supir_model",
+    "sdxl_model",
+    "upscale_model_1",
+    "upscale_model_2",
+    "upscale_model_3",
+    "sam_model",
+    "sam2_model",
+    "grounding_dino_model"
+]
+
+// 获取节点配置的API函数
+export async function fetchNodeConfig() {
+    if (nodeConfigCache) {
+        return nodeConfigCache;
+    }
+
+    if (configLoadPromise) {
+        return configLoadPromise;
+    }
+
+    configLoadPromise = (async () => {
+        try {
+            console.log('正在从API获取节点配置...');
+            const response = await fetch(CONFIG_API_URL, { credentials: 'include' });
+
+            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;
+}
+
+// 读取 mode_type（不再兼容旧的 modelType）
+export function getModelTypeFromInput(inputConfig) {
+    console.log('inputConfig', inputConfig);
+    if (!inputConfig) return undefined;
+    console.log('inputConfig', inputConfig);
+    return inputConfig.mode_type;
+}
+
+// 根据节点名称获取节点配置信息（名单优先，正则补充；不阻塞返回）
+export async function getNodeConfig(nodeName) {
+    if (/bizyair/i.test(nodeName)) {
+        return null;
+    }
+
+    // 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) {
+        const inferredType = match[1];
+        return { nodeName, config: { inputs: { [nodeName]: { mode_type: inferredType, required: true } } } };
+    }
+    return null;
+}
+
+export function createSetWidgetCallback(nodeConfig, selectedBaseModels = []) {
+    return function setWidgetCallback() {
+        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();
+                        e.stopPropagation();
+                        e.widgetClick = true;
+                        window.parent.postMessage({
+                            type: 'collapsePublishWorkflowDialog',
+                            method: 'collapsePublishWorkflowDialog',
+                            result: 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: [getModelTypeFromInput(inputConfig)],
+                                selectedBaseModels,
+                                onApply: (version, model) => {
+                                    if (!currentNode || !currentNode.widgets) return;
+
+                                    // 更新widget值
+                                    widget.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);
+
+                                    if (model && modelVersionField && version) {
+                                        modelVersionField.value = version.id;
+                                        currentNode.setDirtyCanvas(true);
+
+                                    // 删除节点上的感叹号徽章
+                                    if (currentNode && currentNode.badges && Array.isArray(currentNode.badges)) {
+                                        // 移除 text 为 '!' 的徽章
+                                        currentNode.badges = currentNode.badges.filter(badgeFn => {
+                                            try {
+                                                const badge = typeof badgeFn === 'function' ? badgeFn() : badgeFn;
+                                                return badge.text !== '!';
+                                            } catch (e) {
+                                                return true;
+                                            }
+                                        });
+                                        // 同时移除 hasTips 标记
+                                        if (currentNode.hasTips) {
+                                            delete currentNode.hasTips;
+                                        }
+                                    }
+                                    }
+                                }
+                            });
+                        } else {
+                            console.error("bizyAirLib not available");
+                        }
+                        return false;
+                    }
+                } catch (error) {
+                    console.error("Error handling mouse event:", error);
+                }
+            };
+
+            widget.options = widget.options || {};
+            widget.options.values = () => [];
+            widget.options.editable = false;
+            widget.clickable = true;
+            widget.processMouse = true;
+        });
+    }
+}
+
+export function setupNodeMouseBehavior(node, nodeConfig) {
+    // 固定隐藏主版本ID字段（其余编号字段为hidden类型本身不可见）
+    hideWidget(node, "model_version_id");
+
+    // 只设置必要的状态信息，不修改onMouseDown（已在上面的扩展中处理）
+    if (!node._bizyairState) {
+        node._bizyairState = {
+            lastClickTime: 0,
+            DEBOUNCE_DELAY: 300,
+            nodeConfig: nodeConfig
+        };
+    }
+}
+
+export function addBadge(node) {
+    const customBadge = new LGraphBadge({
+        text: '!',
+        fgColor: 'white',
+        bgColor: '#FF6B6B',
+        fontSize: 12,
+        padding: 8,
+        height: 20,
+        cornerRadius: 10
+      })
+    if (!Array.isArray(node.badges)) {
+        node.badges = []
+    }
+    if (node.hasTips) {
+        return
+    }
+    node.badges.push(() => customBadge);
+    node.hasTips = true;
+}
+
+// 启动时后台预取（不阻塞后续逻辑）
+try { void fetchNodeConfig(); } catch (e) { /* noop */ }

bizydraft/static/js/hookLoadImage.js

@@ -3,11 +3,9 @@ import { getCookie, computeIsLoadNode, computeExt, hideWidget } from './tool.js'
 import { getMediaNodeConfig, getMediaInputKeys, possibleMediaWidgetNames } from './hookLoad/media.js';
 
 
-console.log('hookLoadImage.js 已加载');
 app.registerExtension({
     name: "bizyair.image.to.oss",
     async beforeRegisterNodeDef(nodeType, nodeData) {
-        console.log('beforeRegisterNodeDef 被调用，节点:', nodeData.name);
         let workflowParams = null
         document.addEventListener('workflowLoaded', (event) => {
             workflowParams = event.detail;

{bizydraft-0.2.75.dev20251022074525.dist-info → bizydraft-0.2.75.dev20251022081333.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bizydraft
-Version: 0.2.75.dev20251022074525
+Version: 0.2.75.dev20251022081333
 Summary: bizydraft
 Requires-Dist: loguru
 Requires-Dist: aiohttp

{bizydraft-0.2.75.dev20251022074525.dist-info → bizydraft-0.2.75.dev20251022081333.dist-info}/RECORD

@@ -15,7 +15,7 @@ bizydraft/static/js/clipspaceToOss.js,sha256=brfEPs71Tky5Dnc47UXNEFeFlESDE3kQvUH
 bizydraft/static/js/disableComfyWebSocket.js,sha256=nL6DjLUdC2FlAqfYPaFW-dAtkamv01c461W0DUupIKk,1124
 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=SOxkmSO8gRiiTw9QZ_LzIGtnFFDkBTieG1f7ZfVF2b0,14980
+bizydraft/static/js/hookLoadImage.js,sha256=zQdz3BMVwuD951vjYTb11cyFHRKJmRrNqUKy1EB5EBY,14856
 bizydraft/static/js/hookLoadModel.js,sha256=TWVmfKp45ta-nE6U5rY3Bv9wiaEBp0QMNt2xaQ3fs9g,6720
 bizydraft/static/js/main.js,sha256=PRe4LdsquEQWrZDnVd4ubpVQuD1eDIedAXFFazKdoKQ,188
 bizydraft/static/js/nodeFocusHandler.js,sha256=24xXbS4Q-GjJdRqf11i-1pBo8MkOJ24F7MHFV44EG6Q,4683
@@ -25,7 +25,9 @@ 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.75.dev20251022074525.dist-info/METADATA,sha256=uGQlG7rbTjOa9BLkiEPnbEjj2ooLauB2fIUeBqWkJ3E,180
-bizydraft-0.2.75.dev20251022074525.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bizydraft-0.2.75.dev20251022074525.dist-info/top_level.txt,sha256=XtoBq6hjZhXIM7aas4GtPDtAiKo8FdLzMABXW8qqQ8M,10
-bizydraft-0.2.75.dev20251022074525.dist-info/RECORD,,
+bizydraft/static/js/hookLoad/media.js,sha256=BD9RJxTMGO8wagOI9IZNYzKfsOnpyl0JtEUghpURpaI,2620
+bizydraft/static/js/hookLoad/model.js,sha256=C7Hi6BkdtEAgNCwpT71ZRgv9BaYKBsyNu8wt9h5hYvk,10576
+bizydraft-0.2.75.dev20251022081333.dist-info/METADATA,sha256=1oq9Q-YdLKiG6ScohFvuB1do-mmbnXc3gEuymNZCis4,180
+bizydraft-0.2.75.dev20251022081333.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bizydraft-0.2.75.dev20251022081333.dist-info/top_level.txt,sha256=XtoBq6hjZhXIM7aas4GtPDtAiKo8FdLzMABXW8qqQ8M,10
+bizydraft-0.2.75.dev20251022081333.dist-info/RECORD,,