bizydraft 0.2.82.dev20251209023307__py3-none-any.whl → 0.2.83.dev20251203095346__py3-none-any.whl

bizydraft/oss_utils.py

@@ -312,17 +312,9 @@ async def upload_mask(request):
         if "http" in original_subfolder:
             # subfolder 中包含 URL 基础路径
             original_subfolder = original_subfolder[original_subfolder.find("http") :]
-            original_subfolder = unquote(original_subfolder)
-            if "https:/" in original_subfolder and not original_subfolder.startswith(
-                "https://"
-            ):
-                original_subfolder = original_subfolder.replace(
-                    "https:/", "https://", 1
-                )
-            if "http:/" in original_subfolder and not original_subfolder.startswith(
-                "http://"
-            ):
-                original_subfolder = original_subfolder.replace("http:/", "http://", 1)
+            original_subfolder = unquote(original_subfolder).replace(
+                "https:/", "https://"
+            )
             original_url = f"{original_subfolder}/{original_filename}"
         elif original_filename.startswith(http_prefix_options):
             # filename 本身就是完整 URL

bizydraft/patch_handlers.py

@@ -229,7 +229,6 @@ def human_readable_size(size_bytes):
 
 
 async def view_video(request):
-    """处理VHS插件的viewvideo接口，支持从OSS URL加载视频"""
     logger.debug(
         f"Received request for /vhs/viewvideo with query: {request.rel_url.query}"
     )
@@ -238,23 +237,39 @@ async def view_video(request):
         logger.warning("'filename' not provided in query string, returning 404")
         return web.Response(status=404, text="'filename' not provided in query string")
 
-    # VHS插件的filename参数本身就是完整的URL（可能是URL编码的）
     filename = unquote(request.rel_url.query["filename"])
+    subfolder = request.rel_url.query.get("subfolder", "")
 
     http_prefix_options = ("http:", "https:")
 
-    if not filename.startswith(http_prefix_options):
-        logger.warning(f"Invalid filename format: {filename=}, only URLs are supported")
+    if not filename.startswith(http_prefix_options) and "http" not in subfolder:
+        logger.warning(
+            f"Invalid filename format: {filename=}, {subfolder=} only URLs are supported"
+        )
         return web.Response(
             status=400, text="Invalid filename format(only url supported)"
         )
 
     try:
-        content_type, _ = mimetypes.guess_type(filename)
+        if "http" in subfolder:
+            subfolder = subfolder[subfolder.find("http") :]
+        subfolder = unquote(subfolder)
+        if "https:/" in subfolder and not subfolder.startswith("https://"):
+            subfolder = subfolder.replace("https:/", "https://", 1)
+        if "http:/" in subfolder and not subfolder.startswith("http://"):
+            subfolder = subfolder.replace("http:/", "http://", 1)
+
+        full_url = (
+            f"{subfolder}/{filename}"
+            if not filename.startswith(http_prefix_options)
+            else filename
+        )
+
+        content_type, _ = mimetypes.guess_type(full_url)
 
         timeout = ClientTimeout(total=BIZYDRAFT_REQUEST_TIMEOUT)
         async with ClientSession(timeout=timeout) as session:
-            async with session.get(filename) as resp:
+            async with session.get(full_url) as resp:
                 resp.raise_for_status()
 
                 # 优先使用服务器返回的Content-Type

bizydraft/static/js/clipspaceToOss.js

@@ -17,6 +17,19 @@ function stripTypeSuffix(value) {
     if (!value || typeof value !== 'string') return value;
     return value.replace(/\s\[(input|output)\]$/i, '');
 }
+
+function stripClipspacePrefix(subfolder) {
+    return typeof subfolder === 'string' ? subfolder.replace(/^clipspace\//, '') : subfolder;
+}
+
+function normalizeProtocolBase(base) {
+    return typeof base === 'string' ? base.replace(/^(https?:)\/+/, '$1//') : base;
+}
+
+function joinBaseAndFile(base, file) {
+    const sep = base.endsWith('/') ? '' : '/';
+    return `${base}${sep}${file}`;
+}
 // ═══════════════════════════════════════════════════════════════════════════
 // 工具函数：替换 clipspace URL 为 OSS URL
 // ═══════════════════════════════════════════════════════════════════════════
@@ -29,6 +42,7 @@ function replaceClipspaceUrl(urlString) {
         const filename = url.searchParams.get('filename');
         const subfolder = url.searchParams.get('subfolder');
 
+        // subfolder 为 "clipspace"，尝试映射为 OSS URL
         if (subfolder === 'clipspace' && filename) {
             const ossUrl = findOssUrl(filename);
             if (ossUrl) {
@@ -37,6 +51,15 @@ function replaceClipspaceUrl(urlString) {
                 return url.pathname + url.search;
             }
         }
+        // 2) subfolder 形如 "clipspace/https:/..." 或 "clipspace/http:/..."
+        if (typeof subfolder === 'string' && subfolder.startsWith('clipspace/')) {
+            const fixedBase = normalizeProtocolBase(stripClipspacePrefix(subfolder));
+            if (filename) {
+                url.searchParams.set('filename', joinBaseAndFile(fixedBase, filename));
+                url.searchParams.set('subfolder', '');
+                return url.pathname + url.search;
+            }
+        }
     } catch (e) {
         console.error('[BizyDraft] Error replacing clipspace URL:', e);
     }
@@ -62,7 +85,7 @@ function replaceClipspaceUrl(urlString) {
     });
 
     const originalSetAttribute = HTMLImageElement.prototype.setAttribute;
-    HTMLImageElement.prototype.setAttribute = function (name, value) {
+    HTMLImageElement.prototype.setAttribute = function(name, value) {
         if (name === 'src') {
             const modifiedValue = replaceClipspaceUrl(value);
             return originalSetAttribute.call(this, name, modifiedValue);
@@ -75,11 +98,10 @@ function replaceClipspaceUrl(urlString) {
 // 拦截上传响应，保存映射并篡改返回值
 // ═══════════════════════════════════════════════════════════════════════════
 const originalFetchApi = api.fetchApi;
-api.fetchApi = async function (url, options) {
+api.fetchApi = async function(url, options) {
     const response = await originalFetchApi.call(this, url, options);
 
-    const isUploadApi = url === '/upload/image' || url === '/upload/mask'
-        || url === '/api/upload/image' || url === '/api/upload/mask';
+    const isUploadApi = url.includes('/upload/image') || url.includes('/upload/mask');
 
     if (!isUploadApi || !response.ok) {
         return response;
@@ -89,7 +111,7 @@ api.fetchApi = async function (url, options) {
 
         // 检查是否是 OSS 上传响应
         const isOssUpload = data.subfolder?.includes('http://') || data.subfolder?.includes('https://')
-            || data.name?.startsWith('http://') || data.name?.startsWith('https://');
+                         || data.name?.startsWith('http://') || data.name?.startsWith('https://');
 
         if (!isOssUpload) return response;
 
@@ -118,7 +140,7 @@ api.fetchApi = async function (url, options) {
                         finalUrl = ossUrl;
 
                         [`clipspace-mask-${baseId}.png`, `clipspace-paint-${baseId}.png`,
-                        `clipspace-painted-${baseId}.png`, `clipspace-painted-masked-${baseId}.png`
+                         `clipspace-painted-${baseId}.png`, `clipspace-painted-masked-${baseId}.png`
                         ].forEach(v => window.CLIPSPACE_TO_OSS_MAP[v] = ossUrl);
 
                     } else {
@@ -156,11 +178,20 @@ api.fetchApi = async function (url, options) {
             // 修改 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: ''
-                    };
+                if (clipImage) {
+                    if (clipImage.subfolder === 'clipspace') {
+                        clipspace.images[clipspace.selectedIndex || 0] = {
+                            filename: finalUrl,
+                            subfolder: ''
+                        };
+                    } else if (typeof clipImage.subfolder === 'string' && clipImage.subfolder.startsWith('clipspace/')) {
+                        const fixedBase = normalizeProtocolBase(stripClipspacePrefix(clipImage.subfolder));
+                        const file = clipImage.filename || data.name;
+                        clipspace.images[clipspace.selectedIndex || 0] = {
+                            filename: joinBaseAndFile(fixedBase, file),
+                            subfolder: ''
+                        };
+                    }
                 }
             }
 
@@ -169,17 +200,30 @@ api.fetchApi = async function (url, options) {
                 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: ''
-                        };
+                    if (widgetValue && typeof widgetValue === 'object') {
+                        if (widgetValue.subfolder === 'clipspace') {
+                            clipspace.widgets[imageWidgetIndex].value = {
+                                filename: finalUrl,
+                                subfolder: ''
+                            };
+                        } else if (typeof widgetValue.subfolder === 'string' && widgetValue.subfolder.startsWith('clipspace/')) {
+                            const fixedBase = normalizeProtocolBase(stripClipspacePrefix(widgetValue.subfolder));
+                            const file = (typeof widgetValue.filename === 'string' && widgetValue.filename) ? widgetValue.filename : data.name;
+                            clipspace.widgets[imageWidgetIndex].value = {
+                                filename: joinBaseAndFile(fixedBase, file),
+                                subfolder: ''
+                            };
+                        }
+                    } else if (typeof widgetValue === 'string' && widgetValue.startsWith('clipspace/')) {
+                        // 处理 value 为字符串且包含 clipspace/ 前缀的情况
+                        const fixedUrl = normalizeProtocolBase(stripClipspacePrefix(widgetValue));
+                        clipspace.widgets[imageWidgetIndex].value = fixedUrl;
                     }
                 }
             }
         }
 
-        // 篡改响应，让 ComfyUI 使用完整的 OSS URL
+        // 非视频类型：篡改响应，让 ComfyUI 使用完整的 OSS URL
         const modifiedData = { ...data, name: finalUrl, subfolder: '' };
         return new Response(JSON.stringify(modifiedData), {
             status: response.status,
@@ -204,29 +248,16 @@ function convertClipspacePathsInPrompt(prompt) {
 
         for (const [inputKey, inputValue] of Object.entries(node.inputs)) {
             if (typeof inputValue === 'string' && inputValue.includes('clipspace')) {
-                // 1) 特殊情况：clipspace/https://... 或 clipspace/http://...
-                const ossUrlMatch = inputValue.match(/clipspace\/(https?:\/\/[^\s]+)/i);
-                if (ossUrlMatch) {
-                    // 移除可能的 [input] 或 [output] 后缀
-                    let cleanUrl = ossUrlMatch[1].replace(/\s*\[(input|output)\]$/i, '');
-                    node.inputs[inputKey] = cleanUrl;
-
-                    if (inputKey === 'image' && node.inputs['image_name']) {
-                        node.inputs['image_name'] = cleanUrl.split('/').pop();
-                    }
-                } else {
-                    // 2) 常规情况：clipspace/xxx.png
-                    const match = inputValue.match(/clipspace\/([\w-]+\.(?:png|jpg|jpeg|webp|gif))/i);
-                    if (match) {
-                        const filename = match[1];
-                        const ossUrl = findOssUrl(filename);
+                const match = inputValue.match(/clipspace\/([\w-]+\.(?:png|jpg|jpeg|webp|gif))/i);
+                if (match) {
+                    const filename = match[1];
+                    const ossUrl = findOssUrl(filename);
 
-                        if (ossUrl) {
-                            node.inputs[inputKey] = ossUrl;
+                    if (ossUrl) {
+                        node.inputs[inputKey] = ossUrl;
 
-                            if (inputKey === 'image' && node.inputs['image_name']) {
-                                node.inputs['image_name'] = ossUrl.split('/').pop();
-                            }
+                        if (inputKey === 'image' && node.inputs['image_name']) {
+                            node.inputs['image_name'] = ossUrl.split('/').pop();
                         }
                     }
                 }
@@ -245,7 +276,7 @@ function interceptPasteFromClipspace() {
     if (!ComfyApp || !ComfyApp.pasteFromClipspace) return;
 
     const originalPasteFromClipspace = ComfyApp.pasteFromClipspace;
-    ComfyApp.pasteFromClipspace = function (node) {
+    ComfyApp.pasteFromClipspace = function(node) {
         // 调用原始函数
         originalPasteFromClipspace.call(this, node);
 
@@ -257,23 +288,14 @@ function interceptPasteFromClipspace() {
 
                 // 1) 如果是 clipspace 路径格式，替换为 OSS URL
                 if (value.includes('clipspace/')) {
-                    // 1.1) 特殊情况：clipspace/https://... 或 clipspace/http://...
-                    //      这种情况是 OSS URL 被错误地加了 clipspace/ 前缀，直接移除前缀
-                    const ossUrlMatch = value.match(/clipspace\/(https?:\/\/[^\s]+)/i);
-                    if (ossUrlMatch) {
-                        // 移除可能的 [input] 或 [output] 后缀
-                        let cleanUrl = ossUrlMatch[1].replace(/\s*\[(input|output)\]$/i, '');
-                        imageWidget.value = cleanUrl;
-                    } else {
-                        // 1.2) 常规情况：clipspace/xxx.png，提取文件名并查找映射
-                        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;
-                            }
+                    // 提取文件名
+                    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;
                         }
                     }
                 }
@@ -295,31 +317,22 @@ app.registerExtension({
     async setup() {
         const originalGraphToPrompt = app.graphToPrompt;
 
-        // 在构建 Prompt 之前，先清理所有 widget 的值，去掉多余的后缀和错误的 clipspace 前缀
+        // 在构建 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') {
-                        let value = widget.value;
-                        // 先处理 clipspace/https://... 格式
-                        if (value.includes('clipspace/')) {
-                            const ossUrlMatch = value.match(/clipspace\/(https?:\/\/[^\s]+)/i);
-                            if (ossUrlMatch) {
-                                value = ossUrlMatch[1];
-                            }
-                        }
-                        // 再移除类型后缀
-                        widget.value = stripTypeSuffix(value);
+                        widget.value = stripTypeSuffix(widget.value);
                     }
                 }
             }
         }
 
-        app.graphToPrompt = async function (...args) {
+        app.graphToPrompt = async function(...args) {
             // 预清理，避免 workflow.widgets_values 和 prompt 输入里包含 [input]/[output]
-            try { sanitizeGraphWidgets(app.graph); } catch (e) { }
+            try { sanitizeGraphWidgets(app.graph); } catch (e) {}
 
             const result = await originalGraphToPrompt.apply(this, args);
 

bizydraft/static/js/main.js

@@ -1,9 +1,6 @@
 // 主入口文件，导入所有模块
 import "./disableComfyWebSocket.js";
-import "./hookLoadImage.js";
+import "./hookLoadMedia.js";
 import "./postEvent.js";
 import "./handleStyle.js";
 import "./clipspaceToOss.js";
-import "./aspectRatio.js";
-import "./imageUpload.js";
-import "./limitTimeRange.js";

{bizydraft-0.2.82.dev20251209023307.dist-info → bizydraft-0.2.83.dev20251203095346.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bizydraft
-Version: 0.2.82.dev20251209023307
+Version: 0.2.83.dev20251203095346
 Summary: bizydraft
 Requires-Dist: loguru
 Requires-Dist: aiohttp

{bizydraft-0.2.82.dev20251209023307.dist-info → bizydraft-0.2.83.dev20251203095346.dist-info}/RECORD

@@ -3,24 +3,21 @@ bizydraft/block_nodes.py,sha256=Lqn3oSCaGDHR2OICc8a2iRoRCVVK9v1-9MM3r-qIZgA,1092
 bizydraft/env.py,sha256=VFmGopVL2TGWA6hwxyFhIglCEcQxy6iVvL_raMNd6u4,407
 bizydraft/hijack_nodes.py,sha256=riHsp4DhU60E60bfXUl8kVqjs1QvQWmx_FsgQAdWTa4,4197
 bizydraft/hijack_routes.py,sha256=j7i9xAfaWvcu-mSoDISQyEwdERd0y-GFhvY2To7MRTU,5015
-bizydraft/oss_utils.py,sha256=_UzbS4e_MW5UynkQd2JI6edfdWxStm-Kbt6k7CvJJGA,16663
-bizydraft/patch_handlers.py,sha256=cP6gIYBYghWXI72hBbz3BbQHP1O5IvslS8iNK29MEbI,14159
+bizydraft/oss_utils.py,sha256=IjWKFZ98KNvLw7bmFuqux5mEG36B8c9eQbQmL_gZo0M,16254
+bizydraft/patch_handlers.py,sha256=l9bNRttr2RjZJIKboZ3noYdeXLIDkXepoNrGLVFrhTk,14694
 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/aspectRatio.js,sha256=p--C62sTd2QLywa0KpB4T0QI-n7FXv8dO_6Tkl8vtdk,27943
-bizydraft/static/js/clipspaceToOss.js,sha256=zTXYzop4Gx0k0NA1MiWUA_J4RKq75tA_wQSroBASCyg,16177
+bizydraft/static/js/clipspaceToOss.js,sha256=He9FbiS5CzsQHxGcUeeAUDNJBHXM6D6uNCYRK6KCAJA,16795
 bizydraft/static/js/disableComfyWebSocket.js,sha256=ZDOVlU3v3EvWpMRkD8s_AnO43vuWojVLLjkF2pNEVrA,1957
 bizydraft/static/js/freezeModeHandler.js,sha256=SjpHD2nYymR-E13B0YcqkA6e4WycZOVI3c48Ts9qvWE,18027
 bizydraft/static/js/handleStyle.js,sha256=GPshFVoa70UxLwFQB-kXZldVREE0cEF-BxxIM44ngkc,5436
 bizydraft/static/js/hookLoadMedia.js,sha256=EYDuitzOFvlNzM_e4IdE0-wXHQfnyCx7KrwzoxVTdr0,6363
 bizydraft/static/js/hookLoadModel.js,sha256=gY4D77DqVDzpuQZlqgqcUrL0Yho3koyR_lOHLyiqGfc,8204
-bizydraft/static/js/imageUpload.js,sha256=S7YY4jaaZq83epWyT5_s4GOCa2vC_-4MwWMg3HVHyCU,4178
-bizydraft/static/js/limitTimeRange.js,sha256=Bz-qHOfqUZk0zr8HYfuR3AzCYjUJHUvp8CdYLu0o6Ic,4619
-bizydraft/static/js/main.js,sha256=LaIbmXPOsKrXzwsQRaXE7HXXyw_q0FcXX492ik-f0F0,272
+bizydraft/static/js/main.js,sha256=-pMeAG8vkKO6yq9zXCeHI78KezGn0r9AhYm65DuZrVI,188
 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=_EyA71m5DwGbhHsuf1amKhpLUBxfBWZaMMxViNhuYzU,43481
@@ -31,7 +28,7 @@ bizydraft/static/js/workflow_io.js,sha256=FWAjncvWhvy-3nN_legD2fpRwgnIncpRLHU5X0
 bizydraft/static/js/hookLoad/configLoader.js,sha256=R1k0GKdEmv4IIxdT2F-oOI9X9I19ECe77P_1tO3XxgY,2525
 bizydraft/static/js/hookLoad/media.js,sha256=iX_zoZ0OzLAdYZ3bn5GpzpnwU-YjcBuEozQt-MwNuwk,17936
 bizydraft/static/js/hookLoad/model.js,sha256=aHvEPt9k3CcrawHSYnQYcvbtTRwIztk-XDRA3lvgXvA,9890
-bizydraft-0.2.82.dev20251209023307.dist-info/METADATA,sha256=aD-Dv6wd_rBGaWBYs62q5ts7qtZad8PV0I9dh1k_tik,180
-bizydraft-0.2.82.dev20251209023307.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bizydraft-0.2.82.dev20251209023307.dist-info/top_level.txt,sha256=XtoBq6hjZhXIM7aas4GtPDtAiKo8FdLzMABXW8qqQ8M,10
-bizydraft-0.2.82.dev20251209023307.dist-info/RECORD,,
+bizydraft-0.2.83.dev20251203095346.dist-info/METADATA,sha256=-rRdMygQkxyvbTl256yZrDzxVT_lAAkqhCRKydworNU,180
+bizydraft-0.2.83.dev20251203095346.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bizydraft-0.2.83.dev20251203095346.dist-info/top_level.txt,sha256=XtoBq6hjZhXIM7aas4GtPDtAiKo8FdLzMABXW8qqQ8M,10
+bizydraft-0.2.83.dev20251203095346.dist-info/RECORD,,