bizydraft 0.1.29__py3-none-any.whl → 0.2.0__py3-none-any.whl

bizydraft/static/js/socket.js

@@ -2,7 +2,7 @@ export class WebSocketClient {
   constructor(url, protocols) {
 
     const host = 'api.bizyair.cn';
-    
+
     if (url.startsWith('ws://') || url.startsWith('wss://')) {
       this.url = url;
     } else {

bizydraft/static/js/tool.js

@@ -1,3 +1,17 @@
+const loadNodeList = [
+    'LoadImage',
+    'LoadImageMask',
+    'LoadAudio',
+    'LoadVideo',
+    'Load3D',
+]
+const extMap = {
+    'LoadImage': '.png,.jpg,.jpeg,.webp,.gif,.svg,.ico,.bmp,.tiff,.tif,.heic,.heif',
+    'LoadImageMask': '.png,.jpg,.jpeg,.webp,.gif,.svg,.ico,.bmp,.tiff,.tif,.heic,.heif',
+    'LoadAudio': '.mp3,.wav,.ogg,.m4a,.aac,.flac,.wma,.m4r',
+    'LoadVideo': '.mp4,.mov,.avi,.mkv,.webm,.flv,.wmv,.m4v',
+    'Load3D': '.glb,.gltf,.fbx,.obj,.dae,.ply,.stl',
+}
 export function getCookie(name) {
     const value = `; ${document.cookie}`;
     const parts = value.split(`; ${name}=`);
@@ -21,4 +35,50 @@ export const hideWidget = (node, widget_name) => {
         widget.type = originalType;
         widget.height = undefined;
     };
-}
+}
+export const computeIsLoadNode = (nodeName) => {
+
+    return loadNodeList.includes(nodeName)
+}
+export const computeExt = (nodeName) => {
+
+    return extMap[nodeName] || ''
+}
+/**
+ * 判断节点名是否为模型加载类（不包含 bizyair）
+ * @param {string} nodeName
+ * @returns {boolean}
+ */
+function isModelLoaderType(nodeName) {
+    const regex = /^(\w+).*Loader.*/i;
+    return regex.test(nodeName);
+}
+
+/**
+ * 处理 graphData.output
+ * @param {Object} output - graphData.output 对象
+ * @returns {Object} 处理后的新对象
+ */
+export function processGraphOutput(output) {
+    const newOutput = JSON.parse(JSON.stringify(output));
+    for (const key in newOutput) {
+        const node = newOutput[key];
+        // 1. 如果 class_type 在 loadNodeList 里，删除 inputs.image_name
+        if (loadNodeList.includes(node.class_type) && node.inputs && node.inputs.image_name !== undefined) {
+            delete node.inputs.image_name;
+        }
+        if (isModelLoaderType(node.class_type)) {
+            delete newOutput[key];
+        }
+        // 2. 如果 class_type 满足 Loader 正则且不包含 bizyair，删除 inputs.model_version_id
+        if (isModelLoaderType(node.class_type) && node.inputs) {
+            if (node.inputs.model_version_id !== undefined) {
+                delete node.inputs.model_version_id;
+            }
+            if (node.inputs.ckpt_name !== undefined) {
+                delete node.inputs.ckpt_name;
+            }
+        }
+    }
+    return newOutput;
+}

bizydraft/static/js/uploadFile.js

@@ -10,7 +10,7 @@ export async function fileToOss(file) {
     if (!authToken) {
       throw new Error('未找到认证Token，请先登录');
     }
-    
+
     // 获取上传凭证
     const uploadToken = await fetch(`${apiHost}/special/community/upload_token?file_name=${encodeURIComponent(file.name)}&file_type=inputs`, {
       method: 'GET',
@@ -19,17 +19,17 @@ export async function fileToOss(file) {
         'Authorization': `Bearer ${authToken}`
       }
     });
-    
+
     // 检查响应状态
     if (!uploadToken.ok) {
       const errorText = await uploadToken.text();
       console.error('获取上传凭证失败:', uploadToken.status, errorText);
       throw new Error(`获取上传凭证失败: ${uploadToken.status} ${uploadToken.statusText}`);
     }
-    
+
     const {data} = await uploadToken.json();
     // console.log('上传凭证响应:', data);
-    
+
     // 使用STS凭证上传
     const ossConfig = {
       accessKeyId: data.data.file.access_key_id,
@@ -39,16 +39,16 @@ export async function fileToOss(file) {
       region: data.data.storage.region,
       objectKey: data.data.file.object_key
     };
-    
+
     // console.log('OSS配置:', ossConfig);
-    
+
     // 改用官方推荐的表单上传方式
     const formData = new FormData();
-    
+
     // 构建Policy
     const expiration = new Date();
     expiration.setHours(expiration.getHours() + 1); // Policy过期时间1小时
-    
+
     const policyObj = {
       expiration: expiration.toISOString(),
       conditions: [
@@ -58,47 +58,47 @@ export async function fileToOss(file) {
         ['starts-with', '$key', ossConfig.objectKey.split('/')[0]]
       ]
     };
-    
+
     // Policy Base64编码
     const policy = btoa(JSON.stringify(policyObj));
     // console.log('Policy:', policy);
-    
+
     // 构建表单字段
     formData.append('key', ossConfig.objectKey);
     formData.append('OSSAccessKeyId', ossConfig.accessKeyId);
     formData.append('policy', policy);
     formData.append('success_action_status', '200');
-    
+
     // 如果有临时token，需要添加
     if (ossConfig.securityToken) {
       formData.append('x-oss-security-token', ossConfig.securityToken);
     }
-    
+
     // 计算签名 - 阿里云官方要求使用HMAC-SHA1
     const signature = await hmacSha1(policy, ossConfig.accessKeySecret);
     // console.log('计算的签名:', signature);
     formData.append('signature', signature);
-    
+
     // 最后添加文件内容
     formData.append('file', file);
-    
+
     // OSS服务端点
     const host = `https://${ossConfig.bucket}.${ossConfig.region}.aliyuncs.com`;
     // console.log('上传地址:', host);
-    
+
     // 开始上传
     const uploadResponse = await fetch(host, {
       method: 'POST',
       body: formData
     });
-    
+
     // 检查响应
     if (!uploadResponse.ok) {
       const errorText = await uploadResponse.text();
       console.error('上传失败:', uploadResponse.status, errorText);
       throw new Error(`上传失败: ${uploadResponse.status} ${uploadResponse.statusText}`);
     }
-    
+
     // 构建公开访问URL
     const fileUrl = `${host}/${ossConfig.objectKey}`;
 
@@ -121,7 +121,7 @@ export async function fileToOss(file) {
     };
   } catch (error) {
     console.error('文件上传到OSS失败:', error);
-    
+
     throw error;
   }
 }
@@ -132,7 +132,7 @@ async function hmacSha1(message, key) {
   const encoder = new TextEncoder();
   const keyData = encoder.encode(key);
   const messageData = encoder.encode(message);
-  
+
   // 导入密钥
   const cryptoKey = await window.crypto.subtle.importKey(
     'raw',
@@ -141,14 +141,14 @@ async function hmacSha1(message, key) {
     false,
     ['sign']
   );
-  
+
   // 计算签名
   const signature = await window.crypto.subtle.sign(
     'HMAC',
     cryptoKey,
     messageData
   );
-  
+
   // 转换为Base64编码
   const base64Signature = arrayBufferToBase64(signature);
   return base64Signature;
@@ -162,4 +162,4 @@ function arrayBufferToBase64(buffer) {
     binary += String.fromCharCode(bytes[i]);
   }
   return btoa(binary);
-}
+}

bizydraft/workflow_io.py

@@ -45,7 +45,9 @@ def get_leaf_nodes_from_prompt(prompt: Dict[str, Any]) -> Set[str]:
 
 
 def summarize_params(
-    input_params: List[Dict[str, Any]], exclude_node_ids: Set[str]
+    input_params: List[Dict[str, Any]],
+    exclude_node_ids: Set[str],
+    wf_nodes: List[Dict[str, Any]],
 ) -> List[Dict[str, Any]]:
     """
     按节点类型和参数名整理参数信息，便于输出。
@@ -56,6 +58,10 @@ def summarize_params(
         node_id = param["node_id"]
         if node_id in exclude_node_ids:
             continue
+        wf_node = get_node_id_from_wf_nodes(wf_nodes, node_id)
+        title = param["class_type"]
+        if wf_node and wf_node.get("title", None):
+            title = wf_node.get("title")
         key = (param["class_type"], node_id)
         if key not in summary:
             summary[key] = {
@@ -63,6 +69,7 @@ def summarize_params(
                 "displayName": param["class_type"],
                 "nodeId": node_id,
                 "params": [],
+                "title": title,
             }
         summary[key]["params"].append(
             {
@@ -75,8 +82,22 @@ def summarize_params(
     return list(summary.values())
 
 
+def get_node_id_from_wf_nodes(
+    wf_nodes: List[Dict[str, Any]], node_id: str
+) -> Dict[str, Any]:
+    for wf_node in wf_nodes:
+        if str(wf_node.get("id", 0)) == node_id:
+            return wf_node
+    return None
+
+
 def parse_workflow_io(request_data) -> Dict[str, Any]:
     prompt = request_data.get("prompt", {})
+    extra_data = request_data.get("extra_data", {})
+
+    extra_pnginfo = extra_data.get("extra_pnginfo", {})
+    workflow = extra_pnginfo.get("workflow", {})
+    wf_nodes = workflow.get("nodes", [])
 
     # 1. 输出参数（推断叶子节点）
     leaf_nodes = get_leaf_nodes_from_prompt(prompt)
@@ -84,18 +105,25 @@ def parse_workflow_io(request_data) -> Dict[str, Any]:
     for node_id in leaf_nodes:
         node = prompt[node_id]
         class_type = node.get("class_type")
+        wf_node = get_node_id_from_wf_nodes(wf_nodes, node_id)
+        title = class_type
+        if wf_node and wf_node.get("title", None):
+            title = wf_node.get("title")
         output_nodes.append(
             {
                 "nodeId": node_id,
                 "name": class_type,
                 "displayName": class_type,
+                "title": title,
                 "params": [],
             }
         )
 
     # 2. 输入参数（排除已作为输出的节点）
     input_params = get_input_params(prompt)
-    input_summary = summarize_params(input_params, exclude_node_ids=leaf_nodes)
+    input_summary = summarize_params(
+        input_params, exclude_node_ids=leaf_nodes, wf_nodes=wf_nodes
+    )
 
     # 3. 构造response_body.json格式
     return {"data": {"inputs": input_summary, "outputs": output_nodes}}

{bizydraft-0.1.29.dist-info → bizydraft-0.2.0.dist-info}/METADATA

@@ -1,4 +1,4 @@
 Metadata-Version: 2.4
 Name: bizydraft
-Version: 0.1.29
+Version: 0.2.0
 Summary: bizydraft

bizydraft-0.2.0.dist-info/RECORD

@@ -0,0 +1,28 @@
+bizydraft/__init__.py,sha256=OM-sKCQrPh25nHVJIX-DgF1raMYyoWLSuyduIAHt0Gs,78
+bizydraft/block_nodes.py,sha256=Lqn3oSCaGDHR2OICc8a2iRoRCVVK9v1-9MM3r-qIZgA,1092
+bizydraft/env.py,sha256=nVh4xBKXWnRUPbHL3PqZr6VFN8txKsrsmshu8PFGaqo,299
+bizydraft/hijack_nodes.py,sha256=4msT6YJqC_bQXKPmm76wiSJIhkZXETsGm1jz4qHHcZ4,2567
+bizydraft/hijack_routes.py,sha256=lf6x3xDzbo9yQIRwfG_1oxcUNfrX_1ogbiff3WOV9gM,3268
+bizydraft/oss_utils.py,sha256=W3-Td6K4vrB83oMowN82c3nmQ3IrEoR1UX6S8AvO6ig,7896
+bizydraft/patch_handlers.py,sha256=bLkuk6pLoM_6o6fxLPfSGpUzSJoNsEO0ibKHomUdeiI,5682
+bizydraft/postload.py,sha256=XFElKcmCajT_oO7SVJJBaN04XcWro54N5HB5cSCxfvI,1308
+bizydraft/prestartup_patch.py,sha256=Rh_D-rEUmPaojSrl8CEBMAhSgwtLSm6gH2Mzmk5NCuQ,316
+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=t3tefGg9d_2-VeNxqrwMMdX6JYE5uroyXZq0hXNWSzw,17572
+bizydraft/static/js/freezeModeHandler.js,sha256=Vnn7p2LsALbrAcZr8PLVZpFrB1pLt05MHvB0irl1Hnk,15479
+bizydraft/static/js/handleStyle.js,sha256=VVurhbfcIW0bDnZ4w2MUK7tlo93CgMGs_3hgFeIuRsM,1846
+bizydraft/static/js/hookLoadImage.js,sha256=jQGckFr7bTLRiwcFsVmSy1mj_o7TKj1uup0QQ00qwbk,8079
+bizydraft/static/js/hookLoadModel.js,sha256=9eHklcb66EdH7kbm76178bK968Yd-H9xO6DdQhSH0_I,5630
+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/socket.js,sha256=VE3fTAgEfM0FZhL526Skt7OCRokOa3mzTCAjAomI_tE,2432
+bizydraft/static/js/tool.js,sha256=UjYZgQ7711Ag5l_La4wZvp1jD8wT-Z6At5dMG3SJZxE,2745
+bizydraft/static/js/uploadFile.js,sha256=WvglKzHMeOzDhOH3P-fLcPHxCLbKOJpo4DntoRxeJtI,4908
+bizydraft-0.2.0.dist-info/METADATA,sha256=B-NGkfmJyxvgSQy9mzpBDMuKP8mUacXx3Emy5jQgHZo,72
+bizydraft-0.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bizydraft-0.2.0.dist-info/top_level.txt,sha256=XtoBq6hjZhXIM7aas4GtPDtAiKo8FdLzMABXW8qqQ8M,10
+bizydraft-0.2.0.dist-info/RECORD,,

bizydraft-0.1.29.dist-info/RECORD

@@ -1,19 +0,0 @@
-bizydraft/__init__.py,sha256=OM-sKCQrPh25nHVJIX-DgF1raMYyoWLSuyduIAHt0Gs,78
-bizydraft/hijack_nodes.py,sha256=xPVLBBnRiJaI8ZbR80O8W4C9SlNAp7MxP7dKj_pRlYs,869
-bizydraft/hijack_routes.py,sha256=MlietlmTU-Lj7evZo5yZE-ghQJZ9_1vdpyHXAXYfoFw,7417
-bizydraft/postload.py,sha256=YfiFjJ7MLN6WNar19lLdAL_3IPr5GyI3G4rbZIiAgXU,562
-bizydraft/prestartup_patch.py,sha256=Rh_D-rEUmPaojSrl8CEBMAhSgwtLSm6gH2Mzmk5NCuQ,316
-bizydraft/resp.py,sha256=8INvKOe5Dgai3peKfqKjrhUoYeuXWXn358w30-_cY-A,369
-bizydraft/server.py,sha256=Dp0w8AxDc83EkLE0XbFwBKZ4VIdKBs1obJR_WXuiqpA,2101
-bizydraft/workflow_io.py,sha256=lqLWhqNs5uJZ0IlTGyoEfBk6WjsWm0Btl6bQY-nldLo,3364
-bizydraft/static/js/handleStyle.js,sha256=P2DNMiKHr--ekn3CGNOAHU46OJCCsifejxw97kLmb7Q,1676
-bizydraft/static/js/hookLoadImage.js,sha256=GklOwfIkXhSfCFrHBz4pPqaSnBiKjegbpDknrzvXYOc,5767
-bizydraft/static/js/main.js,sha256=cZ-7wR9T8aNLzIrTjc-g9xVZf7z6TXWl1zhP_wXSSVo,150
-bizydraft/static/js/postEvent.js,sha256=lXo35DUiBmzGFMtOL2ULcjbCscNb5eAZ98_eX7en3hM,27926
-bizydraft/static/js/socket.js,sha256=vewGQLgdJSrjvqptEDxLirZRXZUjWTJDmDdjs4mbf4k,2436
-bizydraft/static/js/tool.js,sha256=Ejyb5GiFhuoCp5_dBvu2suagbxGHCkR2Lg_4rMKN2ls,756
-bizydraft/static/js/uploadFile.js,sha256=5OjLLaCHZkobLltNs27K5GgZBFHZJowBwS-oakLoNW4,4985
-bizydraft-0.1.29.dist-info/METADATA,sha256=wssPMXv_0LYQ6SG-3dVs0TMgd11QSG2oh6jUYoBtaXc,73
-bizydraft-0.1.29.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bizydraft-0.1.29.dist-info/top_level.txt,sha256=XtoBq6hjZhXIM7aas4GtPDtAiKo8FdLzMABXW8qqQ8M,10
-bizydraft-0.1.29.dist-info/RECORD,,