bizydraft 0.2.70.dev20251011020833__py3-none-any.whl → 0.2.72__py3-none-any.whl

bizydraft/patch_handlers.py

@@ -29,7 +29,6 @@ BIZYDRAFT_CHUNK_SIZE = int(os.getenv("BIZYDRAFT_CHUNK_SIZE", 1024 * 16))  # 16KB
 
 
 async def view_image(request):
-    from bizydraft.oss_utils import CLIPSPACE_TO_OSS_MAPPING
 
     logger.debug(f"Received request for /view with query: {request.rel_url.query}")
     if "filename" not in request.rel_url.query:
@@ -39,12 +38,6 @@ async def view_image(request):
     filename = request.rel_url.query["filename"]
     subfolder = request.rel_url.query.get("subfolder", "")
 
-    if subfolder == "clipspace" and filename in CLIPSPACE_TO_OSS_MAPPING:
-        oss_url = CLIPSPACE_TO_OSS_MAPPING[filename]
-        logger.info(f"[OSS_MAPPING] Found clipspace mapping: {filename} -> {oss_url}")
-        filename = oss_url
-        subfolder = ""  # Clear subfolder since filename is now the full URL
-
     http_prefix_options = ("http:", "https:")
 
     if not filename.startswith(http_prefix_options) and "http" not in subfolder:

bizydraft/static/js/clipspaceToOss.js

@@ -3,129 +3,314 @@ import { api } from "../../scripts/api.js";
 
 window.CLIPSPACE_TO_OSS_MAP = window.CLIPSPACE_TO_OSS_MAP || {};
 
+// ═══════════════════════════════════════════════════════════════════════════
+// 工具函数：查找 clipspace 文件名对应的 OSS URL
+// ═══════════════════════════════════════════════════════════════════════════
+function findOssUrl(filename) {
+    return window.CLIPSPACE_TO_OSS_MAP[filename]
+        || window.CLIPSPACE_TO_OSS_MAP[`${filename} [input]`]
+        || window.CLIPSPACE_TO_OSS_MAP[`${filename} [output]`];
+}
+
+// 去掉末尾的 " [input]" 或 " [output]" 后缀
+function stripTypeSuffix(value) {
+    if (!value || typeof value !== 'string') return value;
+    return value.replace(/\s\[(input|output)\]$/i, '');
+}
+// ═══════════════════════════════════════════════════════════════════════════
+// 工具函数：替换 clipspace URL 为 OSS URL
+// ═══════════════════════════════════════════════════════════════════════════
+function replaceClipspaceUrl(urlString) {
+    if (!urlString || typeof urlString !== 'string') return urlString;
+    if (!urlString.includes('/view?') || !urlString.includes('clipspace')) return urlString;
+
+    try {
+        const url = new URL(urlString, window.location.origin);
+        const filename = url.searchParams.get('filename');
+        const subfolder = url.searchParams.get('subfolder');
+
+        if (subfolder === 'clipspace' && filename) {
+            const ossUrl = findOssUrl(filename);
+            if (ossUrl) {
+                url.searchParams.set('filename', ossUrl);
+                url.searchParams.set('subfolder', '');
+                return url.pathname + url.search;
+            }
+        }
+    } catch (e) {
+        console.error('[BizyDraft] Error replacing clipspace URL:', e);
+    }
+
+    return urlString;
+}
 
+// ═══════════════════════════════════════════════════════════════════════════
+// 拦截图片加载请求，将 clipspace URL 替换为 OSS URL
+// ═══════════════════════════════════════════════════════════════════════════
+(function interceptImageLoading() {
+    const originalSrcDescriptor = Object.getOwnPropertyDescriptor(Image.prototype, 'src');
+
+    Object.defineProperty(Image.prototype, 'src', {
+        get() {
+            return originalSrcDescriptor.get.call(this);
+        },
+        set(value) {
+            const modifiedValue = replaceClipspaceUrl(value);
+            originalSrcDescriptor.set.call(this, modifiedValue);
+        },
+        configurable: true
+    });
+
+    const originalSetAttribute = HTMLImageElement.prototype.setAttribute;
+    HTMLImageElement.prototype.setAttribute = function(name, value) {
+        if (name === 'src') {
+            const modifiedValue = replaceClipspaceUrl(value);
+            return originalSetAttribute.call(this, name, modifiedValue);
+        }
+        return originalSetAttribute.call(this, name, value);
+    };
+})();
+
+// ═══════════════════════════════════════════════════════════════════════════
+// 拦截上传响应，保存映射并篡改返回值
+// ═══════════════════════════════════════════════════════════════════════════
 const originalFetchApi = api.fetchApi;
 api.fetchApi = async function(url, options) {
     const response = await originalFetchApi.call(this, url, options);
-    console.log(url,'url--------------------');
-    if ((url==='/upload/image' || url==='/upload/mask') && response.ok) {
-        try {
-            const clonedResponse = response.clone();
-            const data = await clonedResponse.json();
-
-            if (data && data.name && data.subfolder) {
-                if (options && options.body && options.body instanceof FormData) {
-                    const imageFile = options.body.get('image');
-                    if (imageFile && imageFile.name) {
-                        const originalFilename = imageFile.name;
-
-                        let ossUrl;
-                        if (data.name.startsWith('http://') || data.name.startsWith('https://')) {
-                            ossUrl = data.name;
-                        } else if (data.subfolder && (data.subfolder.includes('http://') || data.subfolder.includes('https://'))) {
-                            ossUrl = `${data.subfolder}/${data.name}`;
-                        } else {
-                            return response;
-                        }
 
-                        window.CLIPSPACE_TO_OSS_MAP[originalFilename] = ossUrl;
+    const isUploadApi = url === '/upload/image' || url === '/upload/mask'
+                     || url === '/api/upload/image' || url === '/api/upload/mask';
 
-                        const filenameWithoutSuffix = originalFilename.replace(/ \[(input|output)\]$/, '');
-                        if (filenameWithoutSuffix !== originalFilename) {
-                            window.CLIPSPACE_TO_OSS_MAP[filenameWithoutSuffix] = ossUrl;
-                        }
+    if (!isUploadApi || !response.ok) {
+        return response;
+    }
+    try {
+        const data = await response.clone().json();
+
+        // 检查是否是 OSS 上传响应
+        const isOssUpload = data.subfolder?.includes('http://') || data.subfolder?.includes('https://')
+                         || data.name?.startsWith('http://') || data.name?.startsWith('https://');
+
+        if (!isOssUpload) return response;
+
+        // 构造完整的 OSS URL
+        const ossUrl = data.subfolder?.includes('http')
+            ? `${data.subfolder}/${data.name}`
+            : data.name;
+
+        // 处理映射逻辑
+        let finalUrl = ossUrl;
+
+        if (options?.body instanceof FormData) {
+            const imageFile = options.body.get('image');
+            if (imageFile?.name) {
+                const filename = imageFile.name;
+                const idMatch = filename.match(/(\d+)/);
+                const baseId = idMatch?.[1];
+
+                // 第一次 /upload/mask 的结果是涂改后的完整图片
+                if (baseId && url.includes('/upload/mask')) {
+                    const firstMaskKey = `__FIRST_MASK_${baseId}__`;
+
+                    if (!window.CLIPSPACE_TO_OSS_MAP[firstMaskKey]) {
+                        // 首次 mask 上传，保存到所有变体
+                        window.CLIPSPACE_TO_OSS_MAP[firstMaskKey] = ossUrl;
+                        finalUrl = ossUrl;
+
+                        [`clipspace-mask-${baseId}.png`, `clipspace-paint-${baseId}.png`,
+                         `clipspace-painted-${baseId}.png`, `clipspace-painted-masked-${baseId}.png`
+                        ].forEach(v => window.CLIPSPACE_TO_OSS_MAP[v] = ossUrl);
+
+                    } else {
+                        // 后续 mask 上传，使用首次的 URL
+                        finalUrl = window.CLIPSPACE_TO_OSS_MAP[firstMaskKey];
+                    }
+                } else if (baseId) {
+                    // /upload/image 的上传，如果已有 mask 则使用 mask 的 URL
+                    const firstMaskUrl = window.CLIPSPACE_TO_OSS_MAP[`__FIRST_MASK_${baseId}__`];
+                    if (firstMaskUrl) {
+                        finalUrl = firstMaskUrl;
                     }
                 }
+
+                // 保存映射
+                [filename, `${filename} [input]`, `${filename} [output]`].forEach(key => {
+                    window.CLIPSPACE_TO_OSS_MAP[key] = finalUrl;
+                });
+
+                const filenameWithoutSuffix = filename.replace(/ \[(input|output)\]$/, '');
+                if (filenameWithoutSuffix !== filename) {
+                    window.CLIPSPACE_TO_OSS_MAP[filenameWithoutSuffix] = finalUrl;
+                }
+
             }
-        } catch (e) {
-            console.warn('[BizyDraft ClipspaceToOss] Failed to parse upload response:', e);
         }
-    }
 
-    return response;
+        // 同时保存后端返回的文件名映射
+        window.CLIPSPACE_TO_OSS_MAP[data.name] = finalUrl;
+
+        // 🔧 修改 ComfyApp.clipspace，让它使用 OSS URL 而不是 clipspace 路径
+        if (window.app?.constructor?.clipspace) {
+            const clipspace = window.app.constructor.clipspace;
+
+            // 修改 clipspace.images
+            if (clipspace.images && clipspace.images.length > 0) {
+                const clipImage = clipspace.images[clipspace.selectedIndex || 0];
+                if (clipImage && clipImage.subfolder === 'clipspace') {
+                    clipspace.images[clipspace.selectedIndex || 0] = {
+                        filename: finalUrl,
+                        subfolder: ''
+                    };
+                }
+            }
+
+            // 修改 clipspace.widgets
+            if (clipspace.widgets) {
+                const imageWidgetIndex = clipspace.widgets.findIndex(w => w.name === 'image');
+                if (imageWidgetIndex >= 0) {
+                    const widgetValue = clipspace.widgets[imageWidgetIndex].value;
+                    if (widgetValue && typeof widgetValue === 'object' && widgetValue.subfolder === 'clipspace') {
+                        clipspace.widgets[imageWidgetIndex].value = {
+                            filename: finalUrl,
+                            subfolder: ''
+                        };
+                    }
+                }
+            }
+        }
+
+        // 篡改响应，让 ComfyUI 使用完整的 OSS URL
+        const modifiedData = { ...data, name: finalUrl, subfolder: '' };
+        return new Response(JSON.stringify(modifiedData), {
+            status: response.status,
+            statusText: response.statusText,
+            headers: response.headers
+        });
+
+    } catch (e) {
+        console.error('[BizyDraft Upload] Error:', e);
+        return response;
+    }
 };
 
-/**
- * Convert clipspace paths to OSS URLs in a prompt object
- * @param {Object} prompt - The prompt object to process
- * @returns {Object} The processed prompt object
- */
+// 转换 prompt 中的 clipspace 路径为 OSS URL
 function convertClipspacePathsInPrompt(prompt) {
     if (!prompt || typeof prompt !== 'object') {
         return prompt;
     }
 
-    let conversionsCount = 0;
-
-    // Iterate through all nodes in the prompt
     for (const [nodeId, node] of Object.entries(prompt)) {
-        if (!node || !node.inputs) {
-            continue;
-        }
+        if (!node?.inputs) continue;
 
-        // Check all input values
         for (const [inputKey, inputValue] of Object.entries(node.inputs)) {
             if (typeof inputValue === 'string' && inputValue.includes('clipspace')) {
-                // Extract the filename from paths like:
-                // "clipspace/clipspace-mask-12345.png [input]"
-                // "clipspace/clipspace-painted-masked-12345.png [input]"
                 const match = inputValue.match(/clipspace\/([\w-]+\.(?:png|jpg|jpeg|webp|gif))/i);
                 if (match) {
-                    const filename = match[1]; // e.g., "clipspace-mask-12345.png"
-
-                    // Look for this filename in our mapping (with or without [input]/[output] suffix)
-                    const filenameWithInput = `${filename} [input]`;
-                    const filenameWithOutput = `${filename} [output]`;
-
-                    let ossUrl = window.CLIPSPACE_TO_OSS_MAP[filename]
-                              || window.CLIPSPACE_TO_OSS_MAP[filenameWithInput]
-                              || window.CLIPSPACE_TO_OSS_MAP[filenameWithOutput];
+                    const filename = match[1];
+                    const ossUrl = findOssUrl(filename);
 
                     if (ossUrl) {
-                        console.log(`[BizyDraft ClipspaceToOss] Converting: ${inputValue} -> ${ossUrl}`);
                         node.inputs[inputKey] = ossUrl;
 
-                        // Also update image_name if it exists
                         if (inputKey === 'image' && node.inputs['image_name']) {
-                            // Extract just the filename from the OSS URL
-                            const ossFilename = ossUrl.split('/').pop();
-                            node.inputs['image_name'] = ossFilename;
-                            console.log(`[BizyDraft ClipspaceToOss] Also updated image_name to: ${ossFilename}`);
+                            node.inputs['image_name'] = ossUrl.split('/').pop();
                         }
-
-                        conversionsCount++;
-                    } else {
-                        console.warn(`[BizyDraft ClipspaceToOss] No OSS URL found for clipspace file: ${filename}`);
-                        console.warn('[BizyDraft ClipspaceToOss] Available mappings:', Object.keys(window.CLIPSPACE_TO_OSS_MAP));
                     }
                 }
             }
         }
     }
 
-    if (conversionsCount > 0) {
-        console.log(`[BizyDraft ClipspaceToOss] Converted ${conversionsCount} clipspace path(s) to OSS URLs`);
-    }
-
     return prompt;
 }
 
+// ═══════════════════════════════════════════════════════════════════════════
+// 拦截 pasteFromClipspace，确保 widget.value 使用 OSS URL
+// ═══════════════════════════════════════════════════════════════════════════
+function interceptPasteFromClipspace() {
+    const ComfyApp = window.app?.constructor;
+    if (!ComfyApp || !ComfyApp.pasteFromClipspace) return;
+
+    const originalPasteFromClipspace = ComfyApp.pasteFromClipspace;
+    ComfyApp.pasteFromClipspace = function(node) {
+        // 调用原始函数
+        originalPasteFromClipspace.call(this, node);
+
+        // 修正 widget.value
+        if (node.widgets) {
+            const imageWidget = node.widgets.find(w => w.name === 'image');
+            if (imageWidget && typeof imageWidget.value === 'string') {
+                const value = imageWidget.value;
+
+                // 1) 如果是 clipspace 路径格式，替换为 OSS URL
+                if (value.includes('clipspace/')) {
+                    // 提取文件名
+                    const match = value.match(/clipspace\/([\w-]+\.(?:png|jpg|jpeg|webp|gif))(\s\[(input|output)\])?/i);
+                    if (match) {
+                        const filename = match[1];
+                        const ossUrl = findOssUrl(filename);
+
+                        if (ossUrl) {
+                            imageWidget.value = ossUrl;
+                        }
+                    }
+                }
+                // 2) 如果是 "https://... [input]" 这样的字符串，移除后缀
+                else if (/https?:\/\/.*\.(png|jpg|jpeg|webp|gif)\s\[(input|output)\]$/i.test(value)) {
+                    const cleaned = stripTypeSuffix(value);
+                    if (cleaned !== value) {
+                        imageWidget.value = cleaned;
+                    }
+                }
+            }
+        }
+    };
+}
+// 注册 ComfyUI 扩展
 app.registerExtension({
     name: "bizyair.clipspace.to.oss",
 
     async setup() {
         const originalGraphToPrompt = app.graphToPrompt;
 
+        // 在构建 Prompt 之前，先清理所有 widget 的值，去掉多余的后缀
+        function sanitizeGraphWidgets(graph) {
+            const nodes = graph?._nodes || [];
+            for (const node of nodes) {
+                if (!node?.widgets) continue;
+                for (const widget of node.widgets) {
+                    if (typeof widget?.value === 'string') {
+                        widget.value = stripTypeSuffix(widget.value);
+                    }
+                }
+            }
+        }
+
         app.graphToPrompt = async function(...args) {
-            console.log('[BizyDraft ClipspaceToOss] graphToPrompt called, intercepting...');
+            // 预清理，避免 workflow.widgets_values 和 prompt 输入里包含 [input]/[output]
+            try { sanitizeGraphWidgets(app.graph); } catch (e) {}
 
             const result = await originalGraphToPrompt.apply(this, args);
 
-            if (result && result.output) {
-                result.output = convertClipspacePathsInPrompt(result.output);
+            if (result?.output) {
+                // 二次清理并转换 clipspace
+                const cleaned = convertClipspacePathsInPrompt(result.output);
+                // 额外移除任何字符串输入中的类型后缀
+                for (const nodeId of Object.keys(cleaned || {})) {
+                    const node = cleaned[nodeId];
+                    if (!node?.inputs) continue;
+                    for (const key of Object.keys(node.inputs)) {
+                        const v = node.inputs[key];
+                        node.inputs[key] = typeof v === 'string' ? stripTypeSuffix(v) : v;
+                    }
+                }
+                result.output = cleaned;
             }
 
             return result;
         };
+
+        // 拦截 pasteFromClipspace
+        interceptPasteFromClipspace();
     }
 });

{bizydraft-0.2.70.dev20251011020833.dist-info → bizydraft-0.2.72.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bizydraft
-Version: 0.2.70.dev20251011020833
+Version: 0.2.72
 Summary: bizydraft
 Requires-Dist: loguru
 Requires-Dist: aiohttp

{bizydraft-0.2.70.dev20251011020833.dist-info → bizydraft-0.2.72.dist-info}/RECORD

@@ -4,14 +4,14 @@ bizydraft/env.py,sha256=VFmGopVL2TGWA6hwxyFhIglCEcQxy6iVvL_raMNd6u4,407
 bizydraft/hijack_nodes.py,sha256=GivcoUsYAOfMjoEMxeViEkSQlmYjMA0RORy04fCbG60,3652
 bizydraft/hijack_routes.py,sha256=wLu_PWUbUzhN2uZeayTAj1ShdLXVuKsp85a_FX1UCYY,3415
 bizydraft/oss_utils.py,sha256=JHpMA61NxFzA053y8IzBc01xxMJCF6G2PTHk-rXqIFo,15590
-bizydraft/patch_handlers.py,sha256=1aKOAAI1cCLBuQoym6le7GbW0rs_9_m_h7pCCg3xIz8,6574
+bizydraft/patch_handlers.py,sha256=UQudnqKtDTYPnlS3Aq_k7txg7Je6ph9rkioou5-FgZI,6194
 bizydraft/postload.py,sha256=XFElKcmCajT_oO7SVJJBaN04XcWro54N5HB5cSCxfvI,1308
 bizydraft/prestartup_patch.py,sha256=4FGjmRcDHELjtlQOrfTfk2Un5OS89QIqfq-gEcB9WDs,998
 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=OQRhhoqvc8iZeCvHTtdaD2VTYBGzkeAGdCk1UMO2RZs,17525
-bizydraft/static/js/clipspaceToOss.js,sha256=l0mUiiTsbSZx1mNgDfT9WJaM9Ee-ebP2UcAwrnAquMQ,5355
+bizydraft/static/js/clipspaceToOss.js,sha256=brfEPs71Tky5Dnc47UXNEFeFlESDE3kQvUH8ducpIew,14265
 bizydraft/static/js/freezeModeHandler.js,sha256=SjpHD2nYymR-E13B0YcqkA6e4WycZOVI3c48Ts9qvWE,18027
 bizydraft/static/js/handleStyle.js,sha256=liIzTu-wnV172g58gHWGLYTfd86xpJxL4A-HuHpFnq4,3616
 bizydraft/static/js/hookLoadImage.js,sha256=aFRWkgJW-Cp-YHjZh-3j-vsVcNaDZpBVoQqcFZ2Po0g,8186
@@ -24,7 +24,7 @@ bizydraft/static/js/socket.js,sha256=VE3fTAgEfM0FZhL526Skt7OCRokOa3mzTCAjAomI_tE
 bizydraft/static/js/tool.js,sha256=VupamUuh7tYiDnBTrL5Z_yLmhJinskhzRXwE3zfsKZM,2901
 bizydraft/static/js/uploadFile.js,sha256=WvglKzHMeOzDhOH3P-fLcPHxCLbKOJpo4DntoRxeJtI,4908
 bizydraft/static/js/workflow_io.js,sha256=FWAjncvWhvy-3nN_legD2fpRwgnIncpRLHU5X016a-U,5236
-bizydraft-0.2.70.dev20251011020833.dist-info/METADATA,sha256=D_i9NOQ7gbbp54BnkELQbfcW5J-Ws9oj5o-COX-R6Bo,180
-bizydraft-0.2.70.dev20251011020833.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bizydraft-0.2.70.dev20251011020833.dist-info/top_level.txt,sha256=XtoBq6hjZhXIM7aas4GtPDtAiKo8FdLzMABXW8qqQ8M,10
-bizydraft-0.2.70.dev20251011020833.dist-info/RECORD,,
+bizydraft-0.2.72.dist-info/METADATA,sha256=_haCyPe0PJrvPxdxuOYG51OixlBoTgJhxwIwPHl49Aw,162
+bizydraft-0.2.72.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bizydraft-0.2.72.dist-info/top_level.txt,sha256=XtoBq6hjZhXIM7aas4GtPDtAiKo8FdLzMABXW8qqQ8M,10
+bizydraft-0.2.72.dist-info/RECORD,,