bizydraft 0.2.78.dev20251030100819__py3-none-any.whl → 0.2.78.dev20251117024007__py3-none-any.whl

bizydraft/oss_utils.py

@@ -64,6 +64,9 @@ def decrypt(encrypted_message):
         if not encrypted_message or not isinstance(encrypted_message, str):
             raise ValueError("无效的加密消息")
 
+        if "v4.public" in encrypted_message:
+            return encrypted_message
+
         private_key = serialization.load_pem_private_key(
             private_key_pem.encode(), password=None, backend=default_backend()
         )

bizydraft/patch_handlers.py

@@ -3,10 +3,12 @@ import math
 import mimetypes
 import os
 import uuid
+from io import BytesIO
 from urllib.parse import unquote
 
 from aiohttp import ClientSession, ClientTimeout, web
 from loguru import logger
+from PIL import Image
 
 try:
     import execution
@@ -37,6 +39,8 @@ async def view_image(request):
 
     filename = request.rel_url.query["filename"]
     subfolder = request.rel_url.query.get("subfolder", "")
+    channel = request.rel_url.query.get("channel", "rgba")
+    preview = request.rel_url.query.get("preview", None)
 
     http_prefix_options = ("http:", "https:")
 
@@ -56,17 +60,22 @@ async def view_image(request):
             subfolder = subfolder.replace("https:/", "https://", 1)
         if "http:/" in subfolder and not subfolder.startswith("http://"):
             subfolder = subfolder.replace("http:/", "http://", 1)
-        filename = (
+
+        # 构建完整URL
+        full_url = (
             f"{subfolder}/{filename}"
             if not filename.startswith(http_prefix_options)
             else filename
-        )  # preview 3d request: https://host:port/api/view?filename=filename.glb&type=output&subfolder=https://bizyair-dev.oss-cn-shanghai.aliyuncs.com/outputs&rand=0.5763957215362988
+        )
 
-        content_type, _ = mimetypes.guess_type(filename)
+        # 获取原始文件名用于响应头
+        original_filename = filename.split("/")[-1] if "/" in filename else filename
+
+        content_type, _ = mimetypes.guess_type(full_url)
 
         timeout = ClientTimeout(total=BIZYDRAFT_REQUEST_TIMEOUT)
         async with ClientSession(timeout=timeout) as session:
-            async with session.get(filename) as resp:
+            async with session.get(full_url) as resp:
                 resp.raise_for_status()
 
                 # 优先使用服务器返回的Content-Type，如果无法获取则使用猜测的类型
@@ -86,8 +95,98 @@ async def view_image(request):
                         text=f"File size exceeds limit ({human_readable_size(BIZYDRAFT_MAX_FILE_SIZE)})",
                     )
 
+                # 检查是否需要图像处理（preview或channel参数）
+                is_image = final_content_type and final_content_type.startswith(
+                    "image/"
+                )
+                needs_processing = is_image and (
+                    preview is not None or channel != "rgba"
+                )
+
+                if needs_processing:
+                    logger.debug(f"Image processing requested: {channel=}, {preview=}")
+                    # 下载完整图像到内存
+                    image_data = await resp.read()
+
+                    # 检查实际大小
+                    if len(image_data) > BIZYDRAFT_MAX_FILE_SIZE:
+                        return web.Response(
+                            status=413,
+                            text=f"File size exceeds limit ({human_readable_size(BIZYDRAFT_MAX_FILE_SIZE)})",
+                        )
+
+                    # 使用PIL处理图像
+                    with Image.open(BytesIO(image_data)) as img:
+                        # 处理preview参数
+                        if preview is not None:
+                            preview_info = preview.split(";")
+                            image_format = preview_info[0]
+                            if image_format not in ["webp", "jpeg"] or "a" in channel:
+                                image_format = "webp"
+                            quality = 90
+                            if preview_info[-1].isdigit():
+                                quality = int(preview_info[-1])
+
+                            buffer = BytesIO()
+                            if image_format in ["jpeg"] or channel == "rgb":
+                                img = img.convert("RGB")
+                            img.save(buffer, format=image_format, quality=quality)
+                            buffer.seek(0)
+
+                            return web.Response(
+                                body=buffer.read(),
+                                content_type=f"image/{image_format}",
+                                headers={
+                                    "Content-Disposition": f'filename="{original_filename}"'
+                                },
+                            )
+
+                        # 处理channel参数
+                        if channel == "rgb":
+                            logger.debug("Converting image to RGB (removing alpha)")
+                            if img.mode == "RGBA":
+                                r, g, b, a = img.split()
+                                new_img = Image.merge("RGB", (r, g, b))
+                            else:
+                                new_img = img.convert("RGB")
+
+                            buffer = BytesIO()
+                            new_img.save(buffer, format="PNG")
+                            buffer.seek(0)
+
+                            return web.Response(
+                                body=buffer.read(),
+                                content_type="image/png",
+                                headers={
+                                    "Content-Disposition": f'filename="{original_filename}"'
+                                },
+                            )
+
+                        elif channel == "a":
+                            logger.debug("Extracting alpha channel only")
+                            if img.mode == "RGBA":
+                                _, _, _, a = img.split()
+                            else:
+                                a = Image.new("L", img.size, 255)
+
+                            # 创建alpha通道图像
+                            alpha_img = Image.new("RGBA", img.size)
+                            alpha_img.putalpha(a)
+                            alpha_buffer = BytesIO()
+                            alpha_img.save(alpha_buffer, format="PNG")
+                            alpha_buffer.seek(0)
+
+                            return web.Response(
+                                body=alpha_buffer.read(),
+                                content_type="image/png",
+                                headers={
+                                    "Content-Disposition": f'filename="{original_filename}"'
+                                },
+                            )
+
+                # 默认流式传输（无需处理或非图像文件）
                 headers = {
-                    "Content-Disposition": f'attachment; filename="{uuid.uuid4()}"',
+                    "Content-Disposition": f'attachment; filename="{original_filename}"',
                     "Content-Type": final_content_type,
                 }
 
@@ -113,6 +212,7 @@ async def view_image(request):
             text=f"Request timed out (max {BIZYDRAFT_REQUEST_TIMEOUT//60} minutes)",
         )
     except Exception as e:
+        logger.error(f"Error in view_image: {str(e)}", exc_info=True)
         return web.Response(
             status=502, text=f"Failed to fetch remote resource: {str(e)}"
         )

bizydraft/static/js/handleStyle.js

@@ -69,13 +69,16 @@ app.registerExtension({
       parent: document.head,
     });
     const getCloseBtn = () => {
-        let temp = null
-        document.querySelectorAll('h3').forEach(e => {
-            if (e.innerHTML == "<span>从模板开始</span>") {
-                temp = e.parentNode.parentNode.parentNode.querySelector('.p-dialog-close-button')
-            }
-        })
-        return temp
+        // let temp = null
+        // document.querySelectorAll('h2').forEach(e => {
+        //     if (e.innerHTML == "<span>模板</span>") {
+        //         const dialogContent = e.closest('.p-dialog-content')
+        //         if (dialogContent) {
+        //             temp = dialogContent.querySelector('i.pi.pi-times.text-sm')
+        //         }
+        //     }
+        // })
+        return document.querySelector('i.pi.pi-times.text-sm')
     }
     const getFengrossmentBtn = () => {
         let temp = null

bizydraft/static/js/hookLoad/media.js

@@ -1,5 +1,6 @@
 // 媒体节点配置获取与工具函数（与 hookLoad/model.js 结构一致，面向 media_load_nodes）
 import { fetchMediaConfig } from './configLoader.js'
+import { getCookie, computeExt, hideWidget } from '../tool.js'
 
 // 动态配置缓存（仅缓存媒体部分）
 let mediaConfigCache = null;
@@ -81,3 +82,417 @@ export async function computeIsMediaNode(nodeName) {
 
 // 启动时后台预取（不阻塞后续逻辑）
 try { void fetchMediaConfigWithCache(); } catch (e) {}
+
+// ==================== 媒体 Widget 处理函数 ====================
+
+/**
+ * 查找单个媒体 widget（用于 media_widget）
+ */
+export function findMediaWidget(nodeWidgets, apiInputKeys) {
+    // 优先使用 API 配置的 keys
+    if (apiInputKeys && apiInputKeys.length > 0) {
+        for (const key of apiInputKeys) {
+            const w = nodeWidgets.find(x => x.name === key);
+            if (w) return w;
+        }
+    }
+    // 回退到常见媒体 widget 名称
+    return nodeWidgets.find(w => possibleMediaWidgetNames.includes(w.name)) || null;
+}
+
+/**
+ * 查找所有媒体 widget（用于 va_widgets）
+ */
+export function findMediaWidgets(nodeWidgets, apiInputKeys) {
+    const widgets = [];
+
+    // 优先使用 API 配置的 keys
+    if (apiInputKeys && apiInputKeys.length > 0) {
+        for (const key of apiInputKeys) {
+            const w = nodeWidgets.find(x => x.name === key);
+            if (w) widgets.push(w);
+        }
+    }
+
+    // 如果 API 配置没找到，使用回退逻辑
+    if (widgets.length === 0) {
+        for (const widgetName of possibleMediaWidgetNames) {
+            const w = nodeWidgets.find(x => x.name === widgetName);
+            if (w) widgets.push(w);
+        }
+    }
+
+    return widgets;
+}
+
+/**
+ * 添加新文件到列表并更新相关数据
+ */
+export function addNewFileToList(url, image_list, urlToNameMap, nameToItemMap) {
+    const fileName = url.split('/').pop();
+    const newItem = { name: fileName, url: url };
+    image_list.push(newItem);
+    urlToNameMap.set(url, fileName);
+    nameToItemMap.set(fileName, newItem);
+    return fileName;
+}
+
+/**
+ * 更新所有相关 widget 的选项列表
+ */
+export function updateWidgetsOptions(widgets, image_list) {
+    const names = image_list.map(item => item.name);
+    widgets.forEach(widget => {
+        if (widget && widget.options) {
+            widget.options.values = names;
+        }
+    });
+}
+
+/**
+ * 处理新上传的文件：添加到列表并更新所有 widget
+ */
+export function handleNewUploadedFile(url, image_list, urlToNameMap, nameToItemMap, image_name_widget, actualMediaWidget) {
+    const fileName = addNewFileToList(url, image_list, urlToNameMap, nameToItemMap);
+
+    // 更新所有相关 widget 的选项列表
+    const widgetsToUpdate = [image_name_widget, actualMediaWidget].filter(Boolean);
+    updateWidgetsOptions(widgetsToUpdate, image_list);
+
+    return fileName;
+}
+
+/**
+ * 从输入中提取 URL（支持 string 和 array 格式）
+ */
+export function extractUrlFromInput(input) {
+    if (typeof input === 'string') {
+        return input;
+    } else if (Array.isArray(input) && input.length > 0) {
+        return typeof input[0] === 'string' ? input[0] : input[0];
+    }
+    return null;
+}
+
+/**
+ * 初始化 Map 映射
+ */
+export function initMaps(image_list) {
+    const urlToNameMap = new Map();
+    const nameToItemMap = new Map();
+    image_list.forEach(item => {
+        urlToNameMap.set(item.url, item.name);
+        nameToItemMap.set(item.name, item);
+    });
+    return { urlToNameMap, nameToItemMap };
+}
+
+/**
+ * 创建 image_name_widget 的 callback（用于 va_widgets）
+ */
+export function createImageNameWidgetCallbackForVaWidgets(nameToItemMap, va_widgets, isBatchUpdating) {
+    return function(e) {
+        const item = nameToItemMap.get(e);
+        if (item) {
+            const image_url = decodeURIComponent(item.url);
+            isBatchUpdating.value = true;
+            va_widgets.forEach(va_widget => {
+                va_widget.value = image_url;
+                if (va_widget.callback) {
+                    va_widget.callback(image_url);
+                }
+            });
+            isBatchUpdating.value = false;
+        }
+    };
+}
+
+/**
+ * 创建 image_name_widget 的 callback（用于 media_widget）
+ */
+export function createImageNameWidgetCallbackForMediaWidget(nameToItemMap, media_widget) {
+    return function(e) {
+        const item = nameToItemMap.get(e);
+        if (item) {
+            const image_url = decodeURIComponent(item.url);
+            media_widget.value = image_url;
+            if (media_widget.callback) {
+                media_widget.callback(image_url);
+            }
+        }
+    };
+}
+
+/**
+ * 创建 value setter（用于 va_widget）
+ */
+export function createVaWidgetValueSetter(va_widget, urlToNameMap, nameToItemMap, image_list, image_name_widget, actualMediaWidget, isBatchUpdating) {
+    let _value = va_widget.value;
+
+    return {
+        get: () => _value,
+        set: function(newValue) {
+            const oldValue = _value;
+            _value = newValue;
+            console.log(`[hookLoadMedia] va_widget.value 被设置, widget.name=${va_widget.name}, oldValue=`, oldValue, ', newValue=', newValue);
+
+            // 批量更新时跳过监听逻辑
+            if (isBatchUpdating.value) {
+                console.log(`[hookLoadMedia] 批量更新中，跳过处理, widget.name=${va_widget.name}`);
+                return;
+            }
+
+            // 如果值没有变化，不需要处理
+            if (oldValue === newValue) {
+                console.log(`[hookLoadMedia] 值未变化，跳过处理, widget.name=${va_widget.name}`);
+                return;
+            }
+
+            // 使用 Map 快速查找（O(1)）
+            const name = urlToNameMap.get(newValue);
+            if (name && image_name_widget) {
+                console.log(`[hookLoadMedia] 找到匹配的name, widget.name=${va_widget.name}, name=`, name);
+                image_name_widget.value = name;
+            } else if (image_name_widget && newValue && typeof newValue === 'string' && newValue.includes('/')) {
+                // 如果没找到，可能是新上传的文件，需要添加到列表
+                const fileName = newValue.split('/').pop();
+                console.log(`[hookLoadMedia] 未找到匹配的name, widget.name=${va_widget.name}, 可能是新文件, fileName=${fileName}`);
+
+                // 检查是否真的是新文件（URL格式）
+                if (newValue.startsWith('http') || newValue.startsWith('/')) {
+                    handleNewUploadedFile(newValue, image_list, urlToNameMap, nameToItemMap, image_name_widget, actualMediaWidget);
+                    console.log(`[hookLoadMedia] 新文件已通过value setter添加到列表, 当前列表长度=${image_list.length}`);
+                }
+
+                image_name_widget.value = fileName;
+            }
+        }
+    };
+}
+
+/**
+ * 创建 va_widget 的 callback
+ */
+export function createVaWidgetCallback(va_widget, urlToNameMap, nameToItemMap, image_list, image_name_widget, actualMediaWidget, originalVaCallback) {
+    return function(e) {
+        console.log(`[hookLoadMedia] va_widget.callback 被触发, widget.name=${va_widget.name}, e=`, e);
+
+        if (image_name_widget) {
+            const url = extractUrlFromInput(e);
+            if (url) {
+                const name = urlToNameMap.get(url);
+                if (name) {
+                    image_name_widget.value = name;
+                } else {
+                    // 如果没找到，可能是新上传的文件
+                    if (typeof e === 'string' && !e.startsWith('http') && !e.startsWith('/')) {
+                        // 不是 URL 格式，直接使用文件名
+                        image_name_widget.value = e.split('/').pop();
+                    } else {
+                        // 是新上传的文件，添加到列表
+                        const fileName = handleNewUploadedFile(url, image_list, urlToNameMap, nameToItemMap, image_name_widget, actualMediaWidget);
+                        console.log(`[hookLoadMedia] 检测到新上传的文件, url=${url}, fileName=${fileName}, 当前列表长度=${image_list.length}`);
+                        image_name_widget.value = fileName;
+                    }
+                }
+            }
+        }
+
+        // 调用原始callback
+        if (originalVaCallback) {
+            console.log(`[hookLoadMedia] 调用原始callback, widget.name=${va_widget.name}`);
+            originalVaCallback(e);
+        } else {
+            console.log(`[hookLoadMedia] 原始callback不存在, widget.name=${va_widget.name}`);
+        }
+    };
+}
+
+/**
+ * 创建 media_widget 的 callback
+ */
+export function createMediaWidgetCallback(media_widget, urlToNameMap, nameToItemMap, image_list, image_name_widget, actualMediaWidget, originalCallback) {
+    return function(e) {
+        console.log('media_widget.callback', e);
+        if (typeof e == 'string') {
+            // 使用 Map 快速查找（O(1)）
+            const item = e.includes('http') ?
+                (urlToNameMap.has(e) ? {url: e, name: urlToNameMap.get(e)} : null) :
+                (nameToItemMap ? nameToItemMap.get(e) : null);
+
+            const image_url = item ? decodeURIComponent(item.url) : e;
+
+            image_name_widget.value = item ? item.name : e;
+            media_widget.value = image_url;
+            if (originalCallback) {
+                originalCallback([image_url])
+            }
+        } else {
+            // 处理数组格式的输入（如文件上传）
+            const url = extractUrlFromInput(e);
+            if (url) {
+                const existingName = urlToNameMap.get(url);
+
+                if (existingName) {
+                    // 如果已经在列表中，直接使用
+                    image_name_widget.value = existingName;
+                    media_widget.value = url;
+                } else {
+                    // 如果不在列表中，说明是新上传的文件，需要添加到列表
+                    const fileName = handleNewUploadedFile(url, image_list, urlToNameMap, nameToItemMap, image_name_widget, actualMediaWidget);
+                    console.log(`[hookLoadMedia] 检测到新上传的文件（media_widget分支）, url=${url}, fileName=${fileName}, 当前列表长度=${image_list.length}`);
+                    image_name_widget.value = fileName;
+                    media_widget.value = url;
+                }
+            }
+
+            if (originalCallback) {
+                originalCallback(e)
+            }
+        }
+    };
+}
+
+/**
+ * 设置 va_widget 的 value setter
+ */
+export function setupVaWidgetValueSetter(va_widget, urlToNameMap, nameToItemMap, image_list, image_name_widget, actualMediaWidget, isBatchUpdating) {
+    const existingDescriptor = Object.getOwnPropertyDescriptor(va_widget, 'value');
+
+    if (existingDescriptor && !existingDescriptor.configurable) {
+        return; // 跳过不可配置的属性
+    }
+
+    if (existingDescriptor) {
+        delete va_widget.value;
+    }
+
+    const valueSetter = createVaWidgetValueSetter(va_widget, urlToNameMap, nameToItemMap, image_list, image_name_widget, actualMediaWidget, isBatchUpdating);
+
+    Object.defineProperty(va_widget, 'value', {
+        get: valueSetter.get,
+        set: valueSetter.set,
+        enumerable: true,
+        configurable: true
+    });
+}
+
+/**
+ * 处理 va_widgets
+ */
+export function setupVaWidgets(node, va_widgets, image_list, urlToNameMap, nameToItemMap, image_name_widget, actualMediaWidget) {
+    const isBatchUpdating = { value: false };
+
+    // 创建 image_name_widget
+    if (!image_name_widget) {
+        image_name_widget = node.addWidget("combo", "image_name", "",
+            createImageNameWidgetCallbackForVaWidgets(nameToItemMap, va_widgets, isBatchUpdating),
+            {
+                serialize: true,
+                values: image_list.map(item => item.name)
+            }
+        );
+    }
+
+    // 隐藏所有 va_widgets 并设置监听
+    va_widgets.forEach(va_widget => {
+        hideWidget(node, va_widget.name);
+        setupVaWidgetValueSetter(va_widget, urlToNameMap, nameToItemMap, image_list, image_name_widget, actualMediaWidget, isBatchUpdating);
+
+        // 重写 callback
+        const originalVaCallback = va_widget.callback;
+        console.log(`[hookLoadMedia] 重写 va_widget.callback, widget.name=${va_widget.name}, 原始callback=${originalVaCallback ? '存在' : '不存在'}`);
+        va_widget.callback = createVaWidgetCallback(va_widget, urlToNameMap, nameToItemMap, image_list, image_name_widget, actualMediaWidget, originalVaCallback);
+    });
+
+    return image_name_widget;
+}
+
+/**
+ * 应用工作流图像设置
+ */
+export async function applyWorkflowImageSettings(workflowParams, image_list, media_widget, image_name_widget, currentNodeId, va_widgets, actualMediaWidget) {
+    if (workflowParams && workflowParams.nodes) {
+        // 先获取配置，然后将 mediaNodeList 和配置的 keys 合并
+        const config = await fetchMediaConfigWithCache();
+        const allMediaNodeTypes = new Set(mediaNodeList);
+        if (config) {
+            // 将配置中的 keys 添加到集合中
+            for (const key of Object.keys(config)) {
+                allMediaNodeTypes.add(key);
+            }
+        }
+
+        // 使用同步的 includes 查找匹配的节点（完全避免循环中的异步）
+        const imageNode = workflowParams.nodes.find(item =>
+            item.id === currentNodeId && allMediaNodeTypes.has(item.type)
+        )
+
+        if (imageNode && imageNode.widgets_values && imageNode.widgets_values[0]) {
+            const item = imageNode.widgets_values[0].split('/')
+            image_list.push({
+                name: item[item.length - 1],
+                url: imageNode.widgets_values[0]
+            })
+
+            // 使用 actualMediaWidget 而不是 media_widget
+            const targetWidget = actualMediaWidget || media_widget;
+
+            if (targetWidget) {
+                targetWidget.value = imageNode.widgets_values[0]
+
+                if (targetWidget.options) {
+                    targetWidget.options.values = image_list.map(item => item.url)
+                }
+
+                if (image_name_widget) {
+                    image_name_widget.options.values = image_list.map(item => item.name)
+                }
+
+                // 触发 callback
+                if (targetWidget.callback) {
+                    targetWidget.callback(imageNode.widgets_values[0])
+                }
+
+                // 如果是 va_widgets 的情况，需要同步更新所有 va_widgets
+                if (va_widgets && va_widgets.length > 0) {
+                    va_widgets.forEach(va_widget => {
+                        if (va_widget !== targetWidget) {
+                            va_widget.value = imageNode.widgets_values[0];
+                            if (va_widget.callback) {
+                                va_widget.callback(imageNode.widgets_values[0]);
+                            }
+                        }
+                    });
+                }
+            }
+        }
+    }
+}
+
+/**
+ * 获取文件列表数据
+ */
+export async function fetchImageList(apiHost, nodeName) {
+    const res = await fetch(`${apiHost}/special/community/commit_input_resource?${
+        new URLSearchParams({
+            ext: computeExt(nodeName),
+            current: 1,
+            page_size: 100
+        }).toString()
+    }`, {
+        method: 'GET',
+        headers: {
+            'Content-Type': 'application/json',
+            'Authorization': `Bearer ${getCookie('bizy_token')}`
+        }
+    });
+
+    const {data} = await res.json();
+    const list = (data && data.data && data.data.data && data.data.data.list) || [];
+    return list.filter(item => item.name).map(item => ({
+        url: item.url,
+        id: item.id,
+        name: item.name
+    }));
+}

bizydraft/static/js/hookLoadMedia.js

@@ -1,8 +1,23 @@
 import { app } from "../../scripts/app.js";
-import { getCookie, computeExt, hideWidget } from './tool.js';
-import { getMediaNodeConfig, getMediaInputKeys, possibleMediaWidgetNames, computeIsMediaNode, mediaNodeList, fetchMediaConfigWithCache } from './hookLoad/media.js';
-
-
+import { hideWidget } from './tool.js';
+import {
+    getMediaNodeConfig,
+    getMediaInputKeys,
+    computeIsMediaNode,
+    mediaNodeList,
+    fetchMediaConfigWithCache,
+    findMediaWidget,
+    findMediaWidgets,
+    updateWidgetsOptions,
+    handleNewUploadedFile,
+    extractUrlFromInput,
+    initMaps,
+    createImageNameWidgetCallbackForMediaWidget,
+    createMediaWidgetCallback,
+    setupVaWidgets,
+    applyWorkflowImageSettings,
+    fetchImageList
+} from './hookLoad/media.js';
 
 app.registerExtension({
     name: "bizyair.image.to.oss",
@@ -33,307 +48,99 @@ app.registerExtension({
             });
         })
         nodeType.prototype.onNodeCreated = async function() {
-            if (await computeIsMediaNode(nodeData.name)) {
-                const apiHost = 'https://bizyair.cn/api'
-                // 优先使用 API 的媒体输入键匹配到具体的 widget；若未命中则回退到原有字段集合
-                let media_widget = null;
-                const mediaNodeConfig = await getMediaNodeConfig(nodeData.name);
-                const apiInputKeys = getMediaInputKeys(mediaNodeConfig);
-                if (apiInputKeys && apiInputKeys.length > 0) {
-                    for (const key of apiInputKeys) {
-                        const w = this.widgets.find(x => x.name === key);
-                        if (w) { media_widget = w; break; }
-                    }
-                }
-                if (!media_widget) {
-                    media_widget = this.widgets.find(w => {
-                        return possibleMediaWidgetNames.includes(w.name);
-                    });
-                }
-                // 查找所有name等于接口配置中inputs下的字段的widget（如video、audio等）
-                let va_widgets = [];
-                if (apiInputKeys && apiInputKeys.length > 0) {
-                    for (const key of apiInputKeys) {
-                        const w = this.widgets.find(x => x.name === key);
-                        if (w) {
-                            va_widgets.push(w);
-                        }
-                    }
-                }
-
-                // 如果API配置没有找到，使用回退逻辑查找常见的媒体widget
-                if (va_widgets.length === 0) {
-                    for (const widgetName of possibleMediaWidgetNames) {
-                        const w = this.widgets.find(x => x.name === widgetName);
-                        if (w) {
-                            va_widgets.push(w);
-                        }
-                    }
-                }
-                let image_name_widget = this.widgets.find(w => w.name === 'image_name');
-                let image_list = []
-                const getData = async () => {
-                    const res = await fetch(`${apiHost}/special/community/commit_input_resource?${
-                        new URLSearchParams({
-                            ext: computeExt(nodeData.name),
-                            current: 1,
-                            page_size: 100
-
-                        }).toString()
-                    }`, {
-                        method: 'GET',
-                        headers: {
-                            'Content-Type': 'application/json',
-                            'Authorization': `Bearer ${getCookie('bizy_token')}`
-                        }
-                    })
-                    const {data} = await res.json()
-                    const list = (data && data.data && data.data.data && data.data.data.list) || []
-                    image_list = list.filter(item => item.name).map(item => {
-                        return {
-                            url: item.url,
-                            id: item.id,
-                            name: item.name
-                        }
-                    })
-
-                    // 📊 方案：使用 Map 缓存 URL→Name 映射（O(1) 查找）
-                    const urlToNameMap = new Map();
-                    const nameToItemMap = new Map();
-                    image_list.forEach(item => {
-                        urlToNameMap.set(item.url, item.name);
-                        nameToItemMap.set(item.name, item);
-                    });
-
-                    // 如果找到va_widgets，处理它们
-                    if (va_widgets.length > 0) {
-                        // 标志位：防止批量更新时触发监听
-                        let isBatchUpdating = false;
-
-                        // 创建image_name_widget来替代显示
-                        if (!image_name_widget) {
-                            image_name_widget = this.addWidget("combo", "image_name", "", function(e){
-                                const item = nameToItemMap.get(e);
-                                if (item) {
-                                    const image_url = decodeURIComponent(item.url);
-                                    // 批量更新时跳过监听
-                                    isBatchUpdating = true;
-                                    va_widgets.forEach(va_widget => {
-                                        va_widget.value = image_url;
-                                        if (va_widget.callback) {
-                                            va_widget.callback(image_url);
-                                        }
-                                    });
-                                    isBatchUpdating = false;
-                                }
-                            }, {
-                                serialize: true,
-                                values: image_list.map(item => item.name)
-                            });
-                        }
-
-                        // 隐藏所有va_widgets 并设置监听
-                        va_widgets.forEach(va_widget => {
-                            hideWidget(this, va_widget.name);
-                            let _value = va_widget.value;
-
-                            // 检查并删除现有的 value 属性描述符（如果存在）
-                            const existingDescriptor = Object.getOwnPropertyDescriptor(va_widget, 'value');
-                            if (existingDescriptor && !existingDescriptor.configurable) {
-                                // 如果不可配置，跳过重新定义
-                                return;
-                            }
+            if (!(await computeIsMediaNode(nodeData.name))) {
+                return;
+            }
 
-                            // 删除现有属性（如果存在）
-                            if (existingDescriptor) {
-                                delete va_widget.value;
-                            }
+            const apiHost = 'https://bizyair.cn/api'
+            // const apiHost = 'http://localhost:3000/api'
 
-                            Object.defineProperty(va_widget, 'value', {
-                                get: function() {
-                                    return _value;
-                                },
-                                set: function(newValue) {
-                                    _value = newValue;
+            // 获取 API 配置
+            const mediaNodeConfig = await getMediaNodeConfig(nodeData.name);
+            const apiInputKeys = getMediaInputKeys(mediaNodeConfig);
 
-                                    // 批量更新时跳过监听逻辑
-                                    if (isBatchUpdating) {
-                                        return;
-                                    }
-                                    // 使用 Map 快速查找（O(1)）
-                                    const name = urlToNameMap.get(newValue);
-                                    if (name) {
-                                        image_name_widget.value = name;
-                                    } else {
-                                        // 如果没找到，从URL提取文件名
-                                        const fileName = newValue.split('/').pop();
-                                        image_name_widget.value = fileName;
-                                    }
-                                },
-                                enumerable: true,
-                                configurable: true
-                            });
-                        });
+            // 查找媒体 widget
+            const media_widget = findMediaWidget(this.widgets, apiInputKeys);
+            const va_widgets = findMediaWidgets(this.widgets, apiInputKeys);
+            let image_name_widget = this.widgets.find(w => w.name === 'image_name');
 
+            // 获取文件列表
+            const image_list = await fetchImageList(apiHost, nodeData.name);
 
-                        // 为每个va_widget重写callback
-                        va_widgets.forEach(va_widget => {
-                            // 保存va_widget的原始callback
-                            const originalVaCallback = va_widget.callback;
-                            // 重写va_widget的callback，当被触发时给image_name_widget赋值
-                            va_widget.callback = function(e) {
-                                if (image_name_widget) {
-                                    if (typeof e === 'string') {
-                                        // 使用 Map 快速查找（O(1)）
-                                        const name = urlToNameMap.get(e);
-                                        if (name) {
-                                            image_name_widget.value = name;
-                                        } else {
-                                            // 如果没找到，从URL提取文件名
-                                            const fileName = e.split('/').pop();
-                                            image_name_widget.value = fileName;
-                                        }
-                                    }
-                                }
+            // 初始化 Map 映射
+            const { urlToNameMap, nameToItemMap } = initMaps(image_list);
 
-                                // 调用原始callback
-                                if (originalVaCallback) {
-                                    originalVaCallback(e);
-                                }
-                            };
-                        });
-                    }
+            // 如果找到va_widgets，处理它们
+            if (va_widgets.length > 0) {
+                image_name_widget = setupVaWidgets(this, va_widgets, image_list, urlToNameMap, nameToItemMap, image_name_widget, va_widgets[0]);
+            }
 
-                    // 如果va_widgets没有创建image_name_widget，使用原有逻辑创建
-                    if (!image_name_widget && media_widget) {
-                        image_name_widget = this.addWidget("combo", "image_name", "", function(e){
-                            const item = nameToItemMap.get(e);
-                            if (item) {
-                                const image_url = decodeURIComponent(item.url);
-                                media_widget.value = image_url;
-                                if (media_widget.callback) {
-                                    media_widget.callback(image_url);
-                                }
-                            }
-                        }, {
-                            serialize: true,
-                            values: image_list.map(item => item.name)
-                        });
+            // 如果va_widgets没有创建image_name_widget，使用原有逻辑创建
+            if (!image_name_widget && media_widget) {
+                image_name_widget = this.addWidget("combo", "image_name", "",
+                    createImageNameWidgetCallbackForMediaWidget(nameToItemMap, media_widget),
+                    {
+                        serialize: true,
+                        values: image_list.map(item => item.name)
                     }
+                );
+            }
 
-                    // 如果进入了va_widgets分支，使用va_widgets中第一个作为media_widget的替代
-                    const actualMediaWidget = va_widgets.length > 0 ? va_widgets[0] : media_widget;
-
-                    if (image_name_widget && actualMediaWidget) {
-                        const val = urlToNameMap.get(actualMediaWidget.value) || actualMediaWidget.value
-                        image_name_widget.label = actualMediaWidget.label
-                        image_name_widget.value = val
-
-                        const currentIndex = this.widgets.indexOf(image_name_widget);
-                        if (currentIndex > 1) {
-                            this.widgets.splice(currentIndex, 1);
-                            this.widgets.splice(1, 0, image_name_widget);
-                        }
-
-                        // 如果没有进入va_widgets分支，才隐藏media_widget
-                        if (va_widgets.length === 0) {
-                            hideWidget(this, media_widget.name)
-                        }
-
-                        actualMediaWidget.options.values = image_list.map(item => item.name);
-
-                        // 对于va_widgets的情况，callback已经在上面重写过了，不需要再次重写
-                        if (va_widgets.length === 0 && media_widget) {
-                            const callback = media_widget.callback
-                            media_widget.callback = function(e) {
-                                if (typeof e == 'string') {
-                                    // 使用 Map 快速查找（O(1)）
-                                    const item = e.includes('http') ?
-                                        (urlToNameMap.has(e) ? {url: e, name: urlToNameMap.get(e)} : null) :
-                                        (nameToItemMap ? nameToItemMap.get(e) : null);
+            // 如果进入了va_widgets分支，使用va_widgets中第一个作为media_widget的替代
+            const actualMediaWidget = va_widgets.length > 0 ? va_widgets[0] : media_widget;
 
-                                    const image_url = item ? decodeURIComponent(item.url) : e;
+            if (image_name_widget && actualMediaWidget) {
+                const val = urlToNameMap.get(actualMediaWidget.value) || actualMediaWidget.value;
+                image_name_widget.label = actualMediaWidget.label;
+                image_name_widget.value = val;
 
-                                    image_name_widget.value = item ? item.name : e;
-                                    media_widget.value = image_url;
-                                    if (callback) {
-                                        callback([image_url])
-                                    }
-                                } else {
-                                    const item = e[0].split('/')
-                                    const fileName = item[item.length - 1];
-                                    image_name_widget.options.values.pop()
-                                    image_name_widget.options.values.push(fileName)
-                                    image_name_widget.value = fileName
-                                    image_list.push({
-                                        name: fileName,
-                                        url: e[0]
-                                    })
-                                    // 同步更新 Map
-                                    urlToNameMap.set(e[0], fileName);
-                                    if (nameToItemMap) {
-                                        nameToItemMap.set(fileName, {url: e[0], name: fileName});
-                                    }
-                                    if (callback) {
-                                        callback(e)
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    return true
+                // 调整 widget 顺序
+                const currentIndex = this.widgets.indexOf(image_name_widget);
+                if (currentIndex > 1) {
+                    this.widgets.splice(currentIndex, 1);
+                    this.widgets.splice(1, 0, image_name_widget);
                 }
-                await getData()
-
-
-                async function applyWorkflowImageSettings(workflowParams, image_list, media_widget, image_name_widget, currentNodeId) {
-                    if (workflowParams && workflowParams.nodes) {
-                        // 先获取配置，然后将 mediaNodeList 和配置的 keys 合并
-                        const config = await fetchMediaConfigWithCache();
-                        const allMediaNodeTypes = new Set(mediaNodeList);
-                        if (config) {
-                            // 将配置中的 keys 添加到集合中
-                            for (const key of Object.keys(config)) {
-                                allMediaNodeTypes.add(key);
-                            }
-                        }
-
-                        // 使用同步的 includes 查找匹配的节点（完全避免循环中的异步）
-                        const imageNode = workflowParams.nodes.find(item =>
-                            item.id === currentNodeId && allMediaNodeTypes.has(item.type)
-                        )
 
-                        if (imageNode && imageNode.widgets_values && imageNode.widgets_values[0]) {
-                            const item = imageNode.widgets_values[0].split('/')
-                            image_list.push({
-                                name: item[item.length - 1],
-                                url: imageNode.widgets_values[0]
-                            })
-                            media_widget.value = imageNode.widgets_values[0]
+                // 如果没有进入va_widgets分支，才隐藏media_widget
+                if (va_widgets.length === 0) {
+                    hideWidget(this, media_widget.name);
+                }
 
-                            media_widget.options.values = image_list.map(item => item.url)
-                            image_name_widget.options.values = image_list.map(item => item.name)
-                            media_widget.callback(imageNode.widgets_values[0])
-                        }
-                    }
+                // 更新 widget 选项列表
+                updateWidgetsOptions([actualMediaWidget], image_list);
+
+                // 对于va_widgets的情况，callback已经在上面重写过了，不需要再次重写
+                if (va_widgets.length === 0 && media_widget) {
+                    const callback = media_widget.callback;
+                    media_widget.callback = createMediaWidgetCallback(
+                        media_widget,
+                        urlToNameMap,
+                        nameToItemMap,
+                        image_list,
+                        image_name_widget,
+                        actualMediaWidget,
+                        callback
+                    );
                 }
+            }
 
-                // 如果有存储的工作流数据，应用图像设置
+            // 应用工作流设置
+            const workflowData = window.currentWorkflowData || workflowParams;
+            if (workflowData) {
+                await applyWorkflowImageSettings(workflowData, image_list, media_widget, image_name_widget, this.id, va_widgets, actualMediaWidget);
                 if (window.currentWorkflowData) {
-                    await applyWorkflowImageSettings(window.currentWorkflowData, image_list, media_widget, image_name_widget, this.id);
-                    // 清除存储的数据，避免重复处理
                     delete window.currentWorkflowData;
-                } else {
-                    // 原有的调用
-                    await applyWorkflowImageSettings(workflowParams, image_list, media_widget, image_name_widget, this.id);
                 }
-                //在这里发个postmessage
-                window.parent.postMessage({
-                    type: 'functionResult',
-                    method: 'hookLoadImageCompleted',
-                    params: {}
-                }, '*');
+            } else {
+                await applyWorkflowImageSettings(workflowParams, image_list, media_widget, image_name_widget, this.id, va_widgets, actualMediaWidget);
             }
+
+            // 发送完成消息
+            window.parent.postMessage({
+                type: 'functionResult',
+                method: 'hookLoadImageCompleted',
+                params: {}
+            }, '*');
         }
     }
 })

bizydraft/static/js/hookLoadModel.js

@@ -29,9 +29,9 @@ app.registerExtension({
 
         // 异步获取节点配置
         const onNodeCreated = nodeType.prototype.onNodeCreated;
-        nodeType.prototype.onNodeCreated = async function() {
-            const nodeConfig = await getNodeConfig(nodeData.name);
-            if (nodeConfig) {
+        const nodeConfig = await getNodeConfig(nodeData.name);
+        if (nodeConfig) {
+            nodeType.prototype.onNodeCreated = function() {
                 try {
                     const inputs = nodeConfig.config.inputs;
                     const inputKeys = Object.keys(inputs);
@@ -140,5 +140,51 @@ app.registerExtension({
         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)
+
+
+
+
+        // 获取 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-0.2.78.dev20251030100819.dist-info → bizydraft-0.2.78.dev20251117024007.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bizydraft
-Version: 0.2.78.dev20251030100819
+Version: 0.2.78.dev20251117024007
 Summary: bizydraft
 Requires-Dist: loguru
 Requires-Dist: aiohttp

{bizydraft-0.2.78.dev20251030100819.dist-info → bizydraft-0.2.78.dev20251117024007.dist-info}/RECORD

@@ -3,8 +3,8 @@ bizydraft/block_nodes.py,sha256=Lqn3oSCaGDHR2OICc8a2iRoRCVVK9v1-9MM3r-qIZgA,1092
 bizydraft/env.py,sha256=VFmGopVL2TGWA6hwxyFhIglCEcQxy6iVvL_raMNd6u4,407
 bizydraft/hijack_nodes.py,sha256=riHsp4DhU60E60bfXUl8kVqjs1QvQWmx_FsgQAdWTa4,4197
 bizydraft/hijack_routes.py,sha256=TVK7zdSIe4wN5dusjnAr1we43K6B_Zup5-dWcBj5rxo,3545
-bizydraft/oss_utils.py,sha256=XM08pOXGo2jsJlJYmctjL9ZSLUZK8NZuhHCUROXt6GA,16171
-bizydraft/patch_handlers.py,sha256=JWIEK4yKOPpzs3KLAiBCEYfBohyoVUOdlsVOTt3ULeY,9657
+bizydraft/oss_utils.py,sha256=IjWKFZ98KNvLw7bmFuqux5mEG36B8c9eQbQmL_gZo0M,16254
+bizydraft/patch_handlers.py,sha256=cP6gIYBYghWXI72hBbz3BbQHP1O5IvslS8iNK29MEbI,14159
 bizydraft/postload.py,sha256=XFElKcmCajT_oO7SVJJBaN04XcWro54N5HB5cSCxfvI,1308
 bizydraft/prestartup_patch.py,sha256=4FGjmRcDHELjtlQOrfTfk2Un5OS89QIqfq-gEcB9WDs,998
 bizydraft/resp.py,sha256=8INvKOe5Dgai3peKfqKjrhUoYeuXWXn358w30-_cY-A,369
@@ -14,9 +14,9 @@ bizydraft/static/js/aiAppHandler.js,sha256=OQRhhoqvc8iZeCvHTtdaD2VTYBGzkeAGdCk1U
 bizydraft/static/js/clipspaceToOss.js,sha256=brfEPs71Tky5Dnc47UXNEFeFlESDE3kQvUH8ducpIew,14265
 bizydraft/static/js/disableComfyWebSocket.js,sha256=ZDOVlU3v3EvWpMRkD8s_AnO43vuWojVLLjkF2pNEVrA,1957
 bizydraft/static/js/freezeModeHandler.js,sha256=SjpHD2nYymR-E13B0YcqkA6e4WycZOVI3c48Ts9qvWE,18027
-bizydraft/static/js/handleStyle.js,sha256=YvafKzypgXH8nD-7Fwwf_lXUSU80OWk7D4Emqj-PV88,3700
-bizydraft/static/js/hookLoadMedia.js,sha256=JYKKqapidi6PUIyRhyPhdGNqQW90nnLANk6qnvojIlU,17725
-bizydraft/static/js/hookLoadModel.js,sha256=VeDjnL67ncMvQTAh7WmdchzB_bTbj6dqlDR83wXUDN4,6726
+bizydraft/static/js/handleStyle.js,sha256=2zAD9zGktGwdi0VLw4cDvqkPGTh0yYBAniytIbfI9kU,3867
+bizydraft/static/js/hookLoadMedia.js,sha256=EYDuitzOFvlNzM_e4IdE0-wXHQfnyCx7KrwzoxVTdr0,6363
+bizydraft/static/js/hookLoadModel.js,sha256=r8ym8ih_w39bo_B0dZwnq-b00XOL-7dhM77R7_5J_Rc,8120
 bizydraft/static/js/main.js,sha256=-pMeAG8vkKO6yq9zXCeHI78KezGn0r9AhYm65DuZrVI,188
 bizydraft/static/js/nodeFocusHandler.js,sha256=24xXbS4Q-GjJdRqf11i-1pBo8MkOJ24F7MHFV44EG6Q,4683
 bizydraft/static/js/nodeParamsFilter.js,sha256=H7lBB0G8HNqoGhOCH1hNXqPU-rPlrFyTxg_f_JgLEMk,4168
@@ -26,9 +26,9 @@ bizydraft/static/js/tool.js,sha256=2Hhv2J18OaFZRWmHIlseahjd5Ot7ZVxUPb5z46YeXIo,2
 bizydraft/static/js/uploadFile.js,sha256=WvglKzHMeOzDhOH3P-fLcPHxCLbKOJpo4DntoRxeJtI,4908
 bizydraft/static/js/workflow_io.js,sha256=FWAjncvWhvy-3nN_legD2fpRwgnIncpRLHU5X016a-U,5236
 bizydraft/static/js/hookLoad/configLoader.js,sha256=R1k0GKdEmv4IIxdT2F-oOI9X9I19ECe77P_1tO3XxgY,2525
-bizydraft/static/js/hookLoad/media.js,sha256=_JhQhXmNiwfCEBtrQLrsIhEzdjL_mdY-9s5bXXjzB7Y,2439
+bizydraft/static/js/hookLoad/media.js,sha256=iX_zoZ0OzLAdYZ3bn5GpzpnwU-YjcBuEozQt-MwNuwk,17936
 bizydraft/static/js/hookLoad/model.js,sha256=aHvEPt9k3CcrawHSYnQYcvbtTRwIztk-XDRA3lvgXvA,9890
-bizydraft-0.2.78.dev20251030100819.dist-info/METADATA,sha256=pe11bzcezv005LAhUDOgsK0C8MWfi8Oxrz9DUKJf494,180
-bizydraft-0.2.78.dev20251030100819.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bizydraft-0.2.78.dev20251030100819.dist-info/top_level.txt,sha256=XtoBq6hjZhXIM7aas4GtPDtAiKo8FdLzMABXW8qqQ8M,10
-bizydraft-0.2.78.dev20251030100819.dist-info/RECORD,,
+bizydraft-0.2.78.dev20251117024007.dist-info/METADATA,sha256=UHr86vHNHIdSNQYagWYilP-23NkFtCZtyZxgGyHIRhQ,180
+bizydraft-0.2.78.dev20251117024007.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bizydraft-0.2.78.dev20251117024007.dist-info/top_level.txt,sha256=XtoBq6hjZhXIM7aas4GtPDtAiKo8FdLzMABXW8qqQ8M,10
+bizydraft-0.2.78.dev20251117024007.dist-info/RECORD,,