bizydraft 0.2.57__py3-none-any.whl → 0.2.58__py3-none-any.whl

bizydraft/static/js/aiAppHandler.js

@@ -1,8 +1,8 @@
 import { app } from "../../scripts/app.js";
-import { setNodeParams, filterNodeWidgets, isConfigurableNode } from "./nodeParamsFilter.js";
+import { setNodeParams } from "./nodeParamsFilter.js";
 import { processGraphOutput } from './tool.js';
-import { focusNodeOnly, setGlobalReferences, setupCanvasClickHandler, removeCanvasClickHandler } from './nodeFocusHandler.js';
-import { freezeWorkflow, unfreezeWorkflow, updateHighlightedNodes } from './freezeModeHandler.js';
+import { freezeWorkflow, unfreezeWorkflow } from './freezeModeHandler.js';
+import { parseWorkflowIO } from './workflow_io.js';
 // 状态变量
 let selectedInputNodes = [];
 let activeMode = null; // 当前活动的模式: "aiapp" 或 "export"
@@ -39,14 +39,8 @@ function toggleMode(mode, enable, isworkflow = false) {
                     }
                 };
                 try {
-                    const response = await fetch('/bizyair/workflow_io', {
-                        method: 'POST',
-                        headers: {
-                            'Content-Type': 'application/json'
-                        },
-                        body: JSON.stringify(formattedData)
-                    });
-                    const responseData = await response.json();
+                    // 使用前端workflow_io模块处理数据
+                    const responseData = parseWorkflowIO(formattedData);
 
                     // 保存节点参数信息
                     if (responseData && responseData.data && Array.isArray(responseData.data.inputs)) {

bizydraft/static/js/workflow_io.js

@@ -0,0 +1,193 @@
+// 基础类型检查
+const BASIC_TYPES = ['number', 'string', 'boolean'];
+
+/**
+ * 检查值是否为基础类型
+ * @param {any} val - 要检查的值
+ * @returns {boolean} 是否为基础类型
+ */
+function isBasicType(val) {
+    const type = typeof val;
+    return BASIC_TYPES.includes(type);
+}
+
+/**
+ * 遍历所有节点inputs，保留基础类型参数
+ * @param {Object} prompt - prompt对象
+ * @returns {Array} 输入参数数组
+ */
+function getInputParams(prompt) {
+    const inputParams = [];
+
+    for (const [nodeId, node] of Object.entries(prompt)) {
+        const classType = node.class_type;
+        const inputs = node.inputs || {};
+
+        for (const [k, v] of Object.entries(inputs)) {
+            if (isBasicType(v)) {
+                inputParams.push({
+                    node_id: nodeId,
+                    class_type: classType,
+                    param_name: k,
+                    param_value: v
+                });
+            }
+        }
+    }
+
+    return inputParams;
+}
+
+/**
+ * 通过prompt参数推断叶子节点（即没有被其他节点inputs引用的节点）
+ * @param {Object} prompt - prompt对象
+ * @returns {Set} 叶子节点id集合
+ */
+function getLeafNodesFromPrompt(prompt) {
+    const referenced = new Set();
+
+    for (const [nodeId, node] of Object.entries(prompt)) {
+        const inputs = node.inputs || {};
+
+        for (const v of Object.values(inputs)) {
+            // 如果是引用（如["4", 1]），则v为array且第一个元素为节点id
+            if (Array.isArray(v) && v.length > 0 && typeof v[0] === 'string') {
+                referenced.add(v[0]);
+            }
+        }
+    }
+
+    const allNodes = new Set(Object.keys(prompt));
+    const leafNodes = new Set([...allNodes].filter(x => !referenced.has(x)));
+
+    return leafNodes;
+}
+
+/**
+ * 从工作流节点中查找指定节点id的节点
+ * @param {Array} wfNodes - 工作流节点数组
+ * @param {string} nodeId - 节点id
+ * @returns {Object|null} 找到的节点或null
+ */
+function getNodeIdFromWfNodes(wfNodes, nodeId) {
+    for (const wfNode of wfNodes) {
+        if (String(wfNode.id || 0) === nodeId) {
+            return wfNode;
+        }
+    }
+    return null;
+}
+
+/**
+ * 按节点类型和参数名整理参数信息
+ * @param {Array} inputParams - 输入参数数组
+ * @param {Set} excludeNodeIds - 需要排除的节点id集合
+ * @param {Array} wfNodes - 工作流节点数组
+ * @returns {Array} 整理后的参数信息
+ */
+function summarizeParams(inputParams, excludeNodeIds, wfNodes) {
+    const summary = {};
+
+    for (const param of inputParams) {
+        const nodeId = param.node_id;
+
+        if (excludeNodeIds.has(nodeId)) {
+            continue;
+        }
+
+        const wfNode = getNodeIdFromWfNodes(wfNodes, nodeId);
+        let title = param.class_type;
+
+        if (wfNode && wfNode.title) {
+            title = wfNode.title;
+        }
+
+        const key = `${param.class_type}_${nodeId}`;
+
+        if (!summary[key]) {
+            summary[key] = {
+                name: param.class_type,
+                displayName: param.class_type,
+                nodeId: nodeId,
+                params: [],
+                title: title
+            };
+        }
+
+        // 获取参数值的类型
+        let paramType = typeof param.param_value;
+        if (paramType === 'number') {
+            paramType = Number.isInteger(param.param_value) ? 'INT' : 'FLOAT';
+        } else {
+            paramType = paramType.toUpperCase();
+        }
+
+        summary[key].params.push({
+            name: param.param_name,
+            displayName: param.param_name,
+            type: paramType,
+            defaultValue: param.param_value
+        });
+    }
+
+    return Object.values(summary);
+}
+
+/**
+ * 解析工作流IO数据
+ * @param {Object} requestData - 请求数据
+ * @returns {Object} 解析结果
+ */
+function parseWorkflowIO(requestData) {
+    const prompt = requestData.prompt || {};
+    const extraData = requestData.extra_data || {};
+
+    const extraPnginfo = extraData.extra_pnginfo || {};
+    const workflow = extraPnginfo.workflow || {};
+    const wfNodes = workflow.nodes || [];
+
+    // 1. 输出参数（推断叶子节点）
+    const leafNodes = getLeafNodesFromPrompt(prompt);
+    const outputNodes = [];
+
+    for (const nodeId of leafNodes) {
+        const node = prompt[nodeId];
+        const classType = node.class_type;
+        const wfNode = getNodeIdFromWfNodes(wfNodes, nodeId);
+
+        let title = classType;
+        if (wfNode && wfNode.title) {
+            title = wfNode.title;
+        }
+
+        outputNodes.push({
+            nodeId: nodeId,
+            name: classType,
+            displayName: classType,
+            title: title,
+            params: []
+        });
+    }
+
+    // 2. 输入参数（排除已作为输出的节点）
+    const inputParams = getInputParams(prompt);
+    const inputSummary = summarizeParams(inputParams, leafNodes, wfNodes);
+
+    // 3. 构造response格式
+    return {
+        data: {
+            inputs: inputSummary,
+            outputs: outputNodes
+        }
+    };
+}
+
+// 导出函数
+export {
+    parseWorkflowIO,
+    isBasicType,
+    getInputParams,
+    getLeafNodesFromPrompt,
+    summarizeParams,
+    getNodeIdFromWfNodes
+};

{bizydraft-0.2.57.dist-info → bizydraft-0.2.58.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bizydraft
-Version: 0.2.57
+Version: 0.2.58
 Summary: bizydraft
 Requires-Dist: loguru
 Requires-Dist: aiohttp

{bizydraft-0.2.57.dist-info → bizydraft-0.2.58.dist-info}/RECORD

@@ -10,7 +10,7 @@ bizydraft/prestartup_patch.py,sha256=4FGjmRcDHELjtlQOrfTfk2Un5OS89QIqfq-gEcB9WDs
 bizydraft/resp.py,sha256=8INvKOe5Dgai3peKfqKjrhUoYeuXWXn358w30-_cY-A,369
 bizydraft/server.py,sha256=L2zoJgOisr65IRphOyko74AdsLel59gh55peyMaUrO8,2102
 bizydraft/workflow_io.py,sha256=MYhJbpgkv8hrA5k_aolijOTrWpTtu62nzRznA4hv8JE,4298
-bizydraft/static/js/aiAppHandler.js,sha256=SBGms27-DYyc5uBluN9ScliW-zUAdw5cS6VQ4BV-_CQ,17816
+bizydraft/static/js/aiAppHandler.js,sha256=4PcrcD9gv-yqBelkIfuhoN0ZwuFv66f7-bmwqla_aPI,17428
 bizydraft/static/js/freezeModeHandler.js,sha256=SjpHD2nYymR-E13B0YcqkA6e4WycZOVI3c48Ts9qvWE,18027
 bizydraft/static/js/handleStyle.js,sha256=rUlgc-_vH76828Fv9zxTHq9UFj2AHANIUELArhl5lvU,2956
 bizydraft/static/js/hookLoadImage.js,sha256=aFRWkgJW-Cp-YHjZh-3j-vsVcNaDZpBVoQqcFZ2Po0g,8186
@@ -22,7 +22,8 @@ bizydraft/static/js/postEvent.js,sha256=jzZcR238XyPdb5h6lICkarXCIf2gP8IV646dmWoM
 bizydraft/static/js/socket.js,sha256=VE3fTAgEfM0FZhL526Skt7OCRokOa3mzTCAjAomI_tE,2432
 bizydraft/static/js/tool.js,sha256=VupamUuh7tYiDnBTrL5Z_yLmhJinskhzRXwE3zfsKZM,2901
 bizydraft/static/js/uploadFile.js,sha256=WvglKzHMeOzDhOH3P-fLcPHxCLbKOJpo4DntoRxeJtI,4908
-bizydraft-0.2.57.dist-info/METADATA,sha256=rBDMa_w4XMqK44ISXZasXyq6gO03IrGDgdDioMbQw84,162
-bizydraft-0.2.57.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bizydraft-0.2.57.dist-info/top_level.txt,sha256=XtoBq6hjZhXIM7aas4GtPDtAiKo8FdLzMABXW8qqQ8M,10
-bizydraft-0.2.57.dist-info/RECORD,,
+bizydraft/static/js/workflow_io.js,sha256=FWAjncvWhvy-3nN_legD2fpRwgnIncpRLHU5X016a-U,5236
+bizydraft-0.2.58.dist-info/METADATA,sha256=YGxnA9eYvNPDi0NHUvHp6vTj8mBtOotBwETqpID2TxU,162
+bizydraft-0.2.58.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bizydraft-0.2.58.dist-info/top_level.txt,sha256=XtoBq6hjZhXIM7aas4GtPDtAiKo8FdLzMABXW8qqQ8M,10
+bizydraft-0.2.58.dist-info/RECORD,,