bizydraft 0.2.52__py3-none-any.whl → 0.2.54__py3-none-any.whl

bizydraft/oss_utils.py

@@ -1,7 +1,10 @@
 import base64
 import json
 import os
+import re
+import uuid
 from http.cookies import SimpleCookie
+from pathlib import Path
 from time import time
 from typing import Any, Dict
 
@@ -177,6 +180,10 @@ async def upload_to_oss(post, api_key: str):
     if not filename:
         return web.Response(status=400)
 
+    should_clean, filename = clean_filename(filename)
+    if should_clean:
+        filename = f"{uuid.uuid4()}.{filename}"
+
     oss_token = await get_upload_token(filename, api_key)
     result = await upload_filefield_to_oss(image, oss_token)
     if result["status"] != 200:
@@ -225,3 +232,18 @@ async def upload_image(request):
         return web.Response(status=403, text="No validated key found")
     post = await request.post()
     return await upload_to_oss(post, api_key)
+
+
+def _should_clean(name: str) -> bool:
+    """True -> 乱码；False -> 正常"""
+    # 主名部分含 URL 参数符号且最后有扩展名
+    return bool(re.search(r"[&=,].+\.[\w]+$", name))
+
+
+def clean_filename(bad: str) -> (bool, str):
+    """对乱码串提取最后扩展名；正常串直接返回原值"""
+    if not _should_clean(bad):
+        return False, bad
+    # 提取最后扩展名（含点）
+    ext = re.search(r"(\.[\w]+)$", bad)
+    return True, ext.group(1) if ext else bad  # 理论上不会没有扩展名

bizydraft/static/js/postEvent.js

@@ -519,21 +519,31 @@ app.registerExtension({
                 }, '*');
                 return graph.workflow;
             },
+            getWorkflowNotSave: async function () {
+                const graph = await app.graphToPrompt();
+                // 规范化工作流，移除不影响逻辑的视觉字段，避免颜色等样式变化影响校验
+                const normalizeWorkflow = (workflow) => {
+                    const json = JSON.stringify(workflow, (key, value) => {
+                        if (key === 'color' || key === 'bgcolor' || key === 'extra') return undefined;
+                        return value;
+                    });
+                    return JSON.parse(json);
+                };
+                const normalized = normalizeWorkflow(graph.workflow);
+                window.parent.postMessage({
+                    type: 'functionResult',
+                    method: 'getWorkflowNotSave',
+                    result: normalized
+                }, '*');
+                return normalized;
+            },
             // 新增：获取 workflow 和 output
             getWorkflowWithOutput: async function () {
                 const graph = await app.graphToPrompt();
-                graph.workflow.nodes.forEach(node => {
-                    for (const key in graph.output) {
-                        if (graph.output[key].class_type === node.type) {
-                            if (!graph.output[key]._meta) {
-                                graph.output[key]._meta = {};
-                            }
-                            graph.output[key]._meta.id = node.id;
-                            graph.output[key]._meta.class_type = graph.output[key].class_type;
-                            break; // 找到匹配的就跳出循环
-                        }
-                    }
-                });
+                for (const key in graph.output) {
+                    graph.output[key]._meta.id = Number(key);
+                    graph.output[key]._meta.class_type =graph.output[key].class_type
+                }
                 window.parent.postMessage({
                     type: 'functionResult',
                     method: 'getWorkflowWithOutput',
@@ -613,19 +623,10 @@ app.registerExtension({
                     }
 
                     if (Object.keys(resPromptJson.node_errors).length) return
-                    graph.workflow.nodes.forEach(node => {
-                        for (const key in graph.output) {
-                            if (graph.output[key].class_type === node.type) {
-                                if (!graph.output[key]._meta) {
-                                    graph.output[key]._meta = {};
-                                }
-                                graph.output[key]._meta.id = node.id;
-                                graph.output[key]._meta.class_type = graph.output[key].class_type;
-                                break; // 找到匹配的就跳出循环
-                            }
-                        }
-                    });
-
+                    for (const key in graph.output) {
+                        graph.output[key]._meta.id = Number(key);
+                        graph.output[key]._meta.class_type = graph.output[key].class_type;
+                    }
                     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')

{bizydraft-0.2.52.dist-info → bizydraft-0.2.54.dist-info}/METADATA

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

{bizydraft-0.2.52.dist-info → bizydraft-0.2.54.dist-info}/RECORD

@@ -3,7 +3,7 @@ bizydraft/block_nodes.py,sha256=Lqn3oSCaGDHR2OICc8a2iRoRCVVK9v1-9MM3r-qIZgA,1092
 bizydraft/env.py,sha256=nVh4xBKXWnRUPbHL3PqZr6VFN8txKsrsmshu8PFGaqo,299
 bizydraft/hijack_nodes.py,sha256=ktonkuI3NEctELUL9C0Hmv2-DaDr1MClGZWeHrP2VCA,3485
 bizydraft/hijack_routes.py,sha256=lf6x3xDzbo9yQIRwfG_1oxcUNfrX_1ogbiff3WOV9gM,3268
-bizydraft/oss_utils.py,sha256=W3-Td6K4vrB83oMowN82c3nmQ3IrEoR1UX6S8AvO6ig,7896
+bizydraft/oss_utils.py,sha256=FxTe9TxA9Q13pxKaOpcN0Jui-BG1SBWySM71PqpIlsM,8601
 bizydraft/patch_handlers.py,sha256=WPf4xeV5sBpoJ2MkHHhx0wem7B0KQNuhONElN7c9v3g,5989
 bizydraft/postload.py,sha256=XFElKcmCajT_oO7SVJJBaN04XcWro54N5HB5cSCxfvI,1308
 bizydraft/prestartup_patch.py,sha256=4FGjmRcDHELjtlQOrfTfk2Un5OS89QIqfq-gEcB9WDs,998
@@ -18,11 +18,11 @@ bizydraft/static/js/hookLoadModel.js,sha256=ovNvz4FRYNcOKJTueotugzIeGQDYAivYB5EQ
 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=qx-p_MDNIzOPWD4sw35jIpabhmTYejy_VFScPaDekg4,39203
+bizydraft/static/js/postEvent.js,sha256=met19YcUlC8ttKQl9tHJ66NnfltBeOeq28TZBmIGhlM,39249
 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.52.dist-info/METADATA,sha256=0ixvA3wpEIy5udo9xTrkEMCU5VaNn5-z202OFCLdtFA,162
-bizydraft-0.2.52.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bizydraft-0.2.52.dist-info/top_level.txt,sha256=XtoBq6hjZhXIM7aas4GtPDtAiKo8FdLzMABXW8qqQ8M,10
-bizydraft-0.2.52.dist-info/RECORD,,
+bizydraft-0.2.54.dist-info/METADATA,sha256=9HHnNfSi145FUtWlkBxdSa4UcipPMuRe7aBCl6N2ENA,162
+bizydraft-0.2.54.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bizydraft-0.2.54.dist-info/top_level.txt,sha256=XtoBq6hjZhXIM7aas4GtPDtAiKo8FdLzMABXW8qqQ8M,10
+bizydraft-0.2.54.dist-info/RECORD,,