bizydraft 0.2.22__py3-none-any.whl → 0.2.24__py3-none-any.whl

bizydraft/static/js/handleStyle.js

@@ -41,19 +41,16 @@ const styleMenus = `
     body .tydev-utils-log-console-container{
         display: none;
     }
-    // .p-dialog-mask.p-overlay-mask.p-overlay-mask-enter{
-    //     display: none !important;
-    // }
-`
+    .p-dialog-mask.p-overlay-mask.p-overlay-mask-enter[data-pc-name="dialog"]{
+        display: none !important;
+    }
+`;
 app.registerExtension({
-    name: "comfy.BizyAir.Style",
-    async setup() {
-        $el("style", {
-            textContent: styleMenus,
-            parent: document.head,
-        });
-        window.addEventListener('load', () => {
-           document.querySelector('[data-pc-section=mask]').style.display = 'none'
-        });
-    },
+  name: "comfy.BizyAir.Style",
+  async setup() {
+    $el("style", {
+      textContent: styleMenus,
+      parent: document.head,
+    });
+  }
 });

bizydraft/static/js/hookLoadModel.js

@@ -1,10 +1,17 @@
 import { app } from "../../scripts/app.js";
 import '../BizyAir/bizyair_frontend.js'
 import { hideWidget } from './tool.js'
+
+// 白名单配置 - 不符合正则表达式的节点名称和对应的模型类型
+const WHITELIST_NODES = {
+    "LayerMask: YoloV8Detect": "Detection"
+};
+
 const possibleWidgetNames=[
     "clip_name",
     "clip_name1",
     "clip_name2",
+    "clip_name3",
     "ckpt_name",
     "lora_name",
     "control_net_name",
@@ -15,6 +22,7 @@ const possibleWidgetNames=[
     "instantid_file",
     "pulid_file",
     "style_model_name",
+    "yolo_model"
 ]
 
 // 根据节点名称匹配模型类型
@@ -23,6 +31,13 @@ function getModelTypeFromNodeName(nodeName) {
         return null;
     }
 
+    // 首先检查白名单
+    if (WHITELIST_NODES.hasOwnProperty(nodeName)) {
+        console.log(`白名单匹配: ${nodeName} -> ${WHITELIST_NODES[nodeName]}`);
+        return WHITELIST_NODES[nodeName];
+    }
+
+    // 然后使用正则表达式匹配
     const regex = /^(\w+).*Loader.*/i;
     const match = nodeName.match(regex);
     if (match) {
@@ -33,10 +48,10 @@ function getModelTypeFromNodeName(nodeName) {
 
 function createSetWidgetCallback(modelType, selectedBaseModels = []) {
     return function setWidgetCallback() {
-        const targetWidget = this.widgets.find(widget => possibleWidgetNames.includes(widget.name));
-        if (targetWidget) {
-            targetWidget.value = targetWidget.value || "to choose"
-            targetWidget.mouse = function(e, pos, canvas) {
+        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();
@@ -57,11 +72,19 @@ function createSetWidgetCallback(modelType, selectedBaseModels = []) {
                                 onApply: (version, model) => {
                                     if (!currentNode || !currentNode.widgets) return;
 
-                                    const currentLora = currentNode.widgets.find(widget => possibleWidgetNames.includes(widget.name));
-                                    const currentModel = currentNode.widgets.find(w => w.name === "model_version_id");
+                                    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.value = model;
+                                        currentLora[index].value = model;
+
                                         currentModel.value = version.id;
                                         currentNode.setDirtyCanvas(true);
                                     }
@@ -77,13 +100,13 @@ function createSetWidgetCallback(modelType, selectedBaseModels = []) {
                 }
             };
 
-            // targetWidget.node = this;
-            targetWidget.options = targetWidget.options || {};
-            targetWidget.options.values = () => [];
-            targetWidget.options.editable = false;
-            targetWidget.clickable = true;
-            targetWidget.processMouse = true;
-        }
+            // wdt.node = this;
+            wdt.options = wdt.options || {};
+            wdt.options.values = () => [];
+            wdt.options.editable = false;
+            wdt.clickable = true;
+            wdt.processMouse = true;
+        });
     }
 }
 
@@ -118,16 +141,34 @@ app.registerExtension({
             const onNodeCreated = nodeType.prototype.onNodeCreated;
             nodeType.prototype.onNodeCreated = function() {
                 try {
-                    let 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(e){
-                            console.log(e)
-                        }, {
-                            serialize: true,
-                            values: []
-                        });
-                    }
-                    console.log(model_version_id)
+                    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 result = onNodeCreated?.apply(this, arguments);
                     let selectedBaseModels = [];
                     // if (modelType === 'Checkpoint') {
@@ -141,7 +182,6 @@ app.registerExtension({
             };
         }
     },
-
     async nodeCreated(node) {
         const modelType = getModelTypeFromNodeName(node?.comfyClass);
 

bizydraft/static/js/postEvent.js

@@ -562,7 +562,7 @@ app.registerExtension({
                         this.openCustomError({
                             nodeId: resPromptJson.node_id,
                             nodeType: resPromptJson.node_type,
-                            errorMessage: resPromptJson.error,
+                            errorMessage: resPromptJson.details,
                             borderColor: '#FF0000'
                         })
                         return
@@ -572,14 +572,15 @@ app.registerExtension({
 
                         if (resPromptJson.node_errors[i].errors) {
                             const err = resPromptJson.node_errors[i].errors[0]
-                            if (err) return
-                            this.openCustomError({
-                                nodeId: i,
-                                nodeType: err.type,
-                                errorMessage: err.error,
-                                borderColor: '#FF0000'
-                            })
-                            return
+                            if (err) {
+                                this.openCustomError({
+                                    nodeId: i,
+                                    nodeType: err.type,
+                                    errorMessage: err.details,
+                                    borderColor: '#FF0000'
+                                })
+                                return
+                            }
                         } else {
                             console.log(resPromptJson.node_errors[i])
                         }
@@ -597,6 +598,12 @@ app.registerExtension({
                             }
                         }
                     });
+
+                    for (let i in graph.output) {
+                        if (graph.output[i].class_type == 'LoadImage') {
+                            graph.output[i].inputs.image = graph.output[i].inputs.image.replace('pasted/http', 'http')
+                        }
+                    }
                     console.log(graph.output)
                     window.parent.postMessage({
                         type: 'functionResult',
@@ -868,6 +875,14 @@ app.registerExtension({
                 })
 
                 app.canvas.draw(true, true)
+
+                // 添加发送消息给前端折叠侧边栏的代码
+                window.parent.postMessage({
+                    type: 'collapseParamSelector',
+                    method: 'collapseParamSelector',
+                    result: true
+                }, '*');
+
                 window.parent.postMessage({
                     type: 'functionResult',
                     method: 'openCustomError',

bizydraft/static/js/tool.js

@@ -4,6 +4,7 @@ const loadNodeList = [
     'LoadAudio',
     'LoadVideo',
     'Load3D',
+    'VHS_LoadVideo'
 ]
 const extMap = {
     'LoadImage': '.png,.jpg,.jpeg,.webp,.gif,.svg,.ico,.bmp,.tiff,.tif,.heic,.heif',

{bizydraft-0.2.22.dist-info → bizydraft-0.2.24.dist-info}/METADATA

@@ -1,4 +1,4 @@
 Metadata-Version: 2.4
 Name: bizydraft
-Version: 0.2.22
+Version: 0.2.24
 Summary: bizydraft

{bizydraft-0.2.22.dist-info → bizydraft-0.2.24.dist-info}/RECORD

@@ -12,17 +12,17 @@ bizydraft/server.py,sha256=L2zoJgOisr65IRphOyko74AdsLel59gh55peyMaUrO8,2102
 bizydraft/workflow_io.py,sha256=MYhJbpgkv8hrA5k_aolijOTrWpTtu62nzRznA4hv8JE,4298
 bizydraft/static/js/aiAppHandler.js,sha256=t3tefGg9d_2-VeNxqrwMMdX6JYE5uroyXZq0hXNWSzw,17572
 bizydraft/static/js/freezeModeHandler.js,sha256=l1-JK8hyFbJzQ6ylq6occUa_kwszPq9rDbKut48bn6s,17247
-bizydraft/static/js/handleStyle.js,sha256=yffw1rQeX19WgpxGtCFBHoA9kgFYXPIdsWFo8rjN7ZM,1621
+bizydraft/static/js/handleStyle.js,sha256=o9JpjOqs_lLIr-jpqpGNjUN74XQPT8pD3fF5bjsHLAU,1466
 bizydraft/static/js/hookLoadImage.js,sha256=jQGckFr7bTLRiwcFsVmSy1mj_o7TKj1uup0QQ00qwbk,8079
-bizydraft/static/js/hookLoadModel.js,sha256=9eHklcb66EdH7kbm76178bK968Yd-H9xO6DdQhSH0_I,5630
+bizydraft/static/js/hookLoadModel.js,sha256=mF83v5y0G0VH_rOhUyKJBrBR1f3hbfxux661RgANJ0Y,7457
 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
-bizydraft/static/js/postEvent.js,sha256=VUxmyOtw2PMQBy4V7FZ1ShRj79RPTL-_ehLTt2NzsNI,37669
+bizydraft/static/js/postEvent.js,sha256=5rafG9GjaesxmFD_8eSJQYHeSNWfOG3iWXLUPuaRWxg,38296
 bizydraft/static/js/socket.js,sha256=VE3fTAgEfM0FZhL526Skt7OCRokOa3mzTCAjAomI_tE,2432
-bizydraft/static/js/tool.js,sha256=UjYZgQ7711Ag5l_La4wZvp1jD8wT-Z6At5dMG3SJZxE,2745
+bizydraft/static/js/tool.js,sha256=dwVFLrT0pEsdOBkh2RRUDvyVo8GzOIVYg7vU5RiM0m0,2765
 bizydraft/static/js/uploadFile.js,sha256=WvglKzHMeOzDhOH3P-fLcPHxCLbKOJpo4DntoRxeJtI,4908
-bizydraft-0.2.22.dist-info/METADATA,sha256=ZB7y9tuERsZ-WJFnlrdjGVSiqpChC46vS7ZHgcfE7Sk,73
-bizydraft-0.2.22.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bizydraft-0.2.22.dist-info/top_level.txt,sha256=XtoBq6hjZhXIM7aas4GtPDtAiKo8FdLzMABXW8qqQ8M,10
-bizydraft-0.2.22.dist-info/RECORD,,
+bizydraft-0.2.24.dist-info/METADATA,sha256=3erAs2DLH9L9TiVyd2UI1WY1p05YXPsCRHJ2xcIR8dU,73
+bizydraft-0.2.24.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bizydraft-0.2.24.dist-info/top_level.txt,sha256=XtoBq6hjZhXIM7aas4GtPDtAiKo8FdLzMABXW8qqQ8M,10
+bizydraft-0.2.24.dist-info/RECORD,,