bizydraft 0.2.68.dev20250930064514__py3-none-any.whl → 0.2.68.dev20250930074209__py3-none-any.whl

bizydraft/hijack_routes.py

@@ -1,7 +1,7 @@
 from aiohttp import web
 from loguru import logger
 
-from bizydraft.oss_utils import upload_image
+from bizydraft.oss_utils import upload_image, upload_mask
 from bizydraft.patch_handlers import post_prompt, view_image
 
 try:
@@ -23,10 +23,12 @@ def hijack_routes_pre_add_routes():
             ("/view", "GET"): view_image,
             ("/prompt", "POST"): post_prompt,
             ("/upload/image", "POST"): upload_image,
+            ("/upload/mask", "POST"): upload_mask,
             # /api alias
             ("/api/view", "GET"): view_image,
             ("/api/prompt", "POST"): post_prompt,
             ("/api/upload/image", "POST"): upload_image,
+            ("/api/upload/mask", "POST"): upload_mask,
         }
 
         async def middleware_handler(request):
@@ -52,6 +54,7 @@ def hijack_routes_pre_add_routes():
             "/prompt",
             "/view",
             "/upload/image",
+            "/upload/mask",
             "/",
             "/ws",
             "/extensions",

bizydraft/oss_utils.py

@@ -19,6 +19,8 @@ from werkzeug.utils import secure_filename
 
 from bizydraft.env import BIZYAIR_API_KEY, BIZYDRAFT_SERVER
 
+CLIPSPACE_TO_OSS_MAPPING = {}
+
 private_key_pem = os.getenv(
     "RSA_PRIVATE_KEY",
     """-----BEGIN RSA PRIVATE KEY-----
@@ -176,6 +178,7 @@ async def upload_to_oss(post, api_key: str):
     if not (image and image.file):
         return web.Response(status=400)
 
+    original_frontend_filename = image.filename  # 保存前端发送的原始文件名
     filename = image.filename
     if not filename:
         return web.Response(status=400)
@@ -196,8 +199,23 @@ async def upload_to_oss(post, api_key: str):
     except Exception as e:
         logger.error(f"Commit file failed: {e}")
         return web.Response(status=500, text=str(e))
+
+    # 将 OSS URL 拆分成 filename 和 subfolder，以便前端正确构建 /api/view 请求
+    # 例如: https://bizyair-prod.oss-cn-shanghai.aliyuncs.com/inputs/20250930/file.png
+    oss_url = result["url"]
+    oss_filename = oss_url.split("/")[-1]  # 获取最后一部分作为文件名
+    oss_subfolder = "/".join(
+        oss_url.split("/")[:-1]
+    )  # 获取除文件名外的部分作为 subfolder
+
+    if original_frontend_filename:
+        CLIPSPACE_TO_OSS_MAPPING[original_frontend_filename] = oss_url
+        logger.info(
+            f"[OSS_MAPPING] Cached mapping: {original_frontend_filename} -> {oss_url}"
+        )
+
     return web.json_response(
-        {"name": result["url"], "subfolder": subfolder, "type": image_upload_type}
+        {"name": oss_filename, "subfolder": oss_subfolder, "type": image_upload_type}
     )
 
 
@@ -234,6 +252,165 @@ async def upload_image(request):
     return await upload_to_oss(post, api_key)
 
 
+async def upload_mask(request):
+    """
+    处理 mask editor 上传，将带 alpha 通道的图片上传到 OSS
+    """
+    import io
+    import json
+    import tempfile
+
+    from PIL import Image
+    from PIL.PngImagePlugin import PngInfo
+
+    api_key = get_api_key(request)
+    if not api_key:
+        logger.error("[UPLOAD_MASK] No API key found")
+        return web.Response(status=403, text="No validated key found")
+
+    post = await request.post()
+
+    # 获取上传的 mask 图片
+    mask_image = post.get("image")
+    if not (mask_image and mask_image.file):
+        logger.error("[UPLOAD_MASK] No image provided in request")
+        return web.Response(status=400, text="No image provided")
+
+    # 保存前端发送的原始文件名，用于后续缓存映射
+    original_frontend_filename = mask_image.filename
+
+    # 获取原始图片引用
+    original_ref_str = post.get("original_ref")
+
+    if not original_ref_str:
+        # 如果没有 original_ref，直接上传 mask
+        return await upload_to_oss(post, api_key)
+
+    try:
+        from urllib.parse import unquote
+
+        original_ref = json.loads(original_ref_str)
+        original_filename = original_ref.get("filename")
+        original_subfolder = original_ref.get("subfolder", "")
+
+        if not original_filename:
+            logger.error("[UPLOAD_MASK] No filename in original_ref")
+            return web.Response(status=400, text="No filename in original_ref")
+
+        # 构建完整的 OSS URL（类似 view_image 的逻辑）
+        http_prefix_options = ("http:", "https:")
+
+        if "http" in original_subfolder:
+            # subfolder 中包含 URL 基础路径
+            original_subfolder = original_subfolder[original_subfolder.find("http") :]
+            original_subfolder = unquote(original_subfolder).replace(
+                "https:/", "https://"
+            )
+            original_url = f"{original_subfolder}/{original_filename}"
+        elif original_filename.startswith(http_prefix_options):
+            # filename 本身就是完整 URL
+            original_url = original_filename
+        elif (
+            original_subfolder == "clipspace"
+            and original_filename in CLIPSPACE_TO_OSS_MAPPING
+        ):
+            # 检查缓存：如果是 clipspace 文件且在缓存中，使用缓存的 OSS URL
+            original_url = CLIPSPACE_TO_OSS_MAPPING[original_filename]
+        else:
+            # 不是 OSS URL 格式且不在缓存中，直接上传 mask 图片
+            return await upload_to_oss(post, api_key)
+
+        async with aiohttp.ClientSession() as session:
+            async with session.get(original_url) as resp:
+                if resp.status != 200:
+                    logger.error(
+                        f"[UPLOAD_MASK] Failed to download original image: {resp.status}"
+                    )
+                    return web.Response(
+                        status=502,
+                        text=f"Failed to download original image: {resp.status}",
+                    )
+                original_image_data = await resp.read()
+
+        # 处理图片：应用 alpha 通道
+        with Image.open(io.BytesIO(original_image_data)) as original_pil:
+            # 保存元数据
+            metadata = PngInfo()
+            if hasattr(original_pil, "text"):
+                for key in original_pil.text:
+                    metadata.add_text(key, original_pil.text[key])
+
+            # 转换为 RGBA
+            original_pil = original_pil.convert("RGBA")
+
+            # 读取上传的 mask
+            mask_pil = Image.open(mask_image.file).convert("RGBA")
+
+            # alpha copy - 从 mask 提取 alpha 通道并应用到原图
+            new_alpha = mask_pil.getchannel("A")
+            original_pil.putalpha(new_alpha)
+
+            # 保存到临时文件
+            with tempfile.NamedTemporaryFile(suffix=".png", delete=False) as tmp_file:
+                tmp_filepath = tmp_file.name
+                original_pil.save(tmp_filepath, compress_level=4, pnginfo=metadata)
+
+        # 准备上传到 OSS
+        filename = f"clipspace-mask-{uuid.uuid4().hex[:8]}.png"
+        # subfolder = post.get("subfolder", "clipspace")
+        image_upload_type = post.get("type", "input")
+
+        try:
+            # 获取上传 token
+            oss_token = await get_upload_token(filename, api_key)
+
+            # 读取临时文件并上传
+            with open(tmp_filepath, "rb") as f:
+                # 创建一个类似 FileField 的对象
+                class FileFieldLike:
+                    def __init__(self, file_obj, filename, content_type):
+                        self.file = file_obj
+                        self.filename = filename
+                        self.content_type = content_type
+
+                file_field = FileFieldLike(f, filename, "image/png")
+                result = await upload_filefield_to_oss(file_field, oss_token)
+
+            if result["status"] != 200:
+                logger.error(f"[UPLOAD_MASK] Upload failed: {result.get('reason', '')}")
+                return web.Response(
+                    status=result["status"], text=result.get("reason", "")
+                )
+
+            # Commit file
+            object_key = oss_token["data"]["file"]["object_key"]
+            await commit_file(object_key, filename, api_key)
+
+            # 将 OSS URL 拆分成 filename 和 subfolder，以便前端正确构建 /api/view 请求
+            oss_url = result["url"]
+            oss_filename = oss_url.split("/")[-1]
+            oss_subfolder = "/".join(oss_url.split("/")[:-1])
+
+            if original_frontend_filename:
+                CLIPSPACE_TO_OSS_MAPPING[original_frontend_filename] = oss_url
+
+            response_data = {
+                "name": oss_filename,
+                "subfolder": oss_subfolder,
+                "type": image_upload_type,
+            }
+            return web.json_response(response_data)
+
+        finally:
+            # 清理临时文件
+            if os.path.exists(tmp_filepath):
+                os.remove(tmp_filepath)
+
+    except Exception as e:
+        logger.error(f"[UPLOAD_MASK] ERROR processing mask upload: {e}", exc_info=True)
+        return web.Response(status=500, text=f"Error processing mask: {str(e)}")
+
+
 def _should_clean(name: str) -> bool:
     """True -> 乱码；False -> 正常"""
     # 主名部分含 URL 参数符号且最后有扩展名
@@ -246,4 +423,4 @@ def clean_filename(bad: str) -> (bool, str):
         return False, bad
     # 提取最后扩展名（含点）
     ext = re.search(r"(\.[\w]+)$", bad)
-    return True, ext.group(1) if ext else bad  # 理论上不会没有扩展名
+    return True, ext.group(1) if ext else bad

bizydraft/patch_handlers.py

@@ -29,6 +29,8 @@ 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:
         logger.warning("'filename' not provided in query string, returning 404")
@@ -37,6 +39,12 @@ 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

@@ -0,0 +1,131 @@
+import { app } from "../../scripts/app.js";
+import { api } from "../../scripts/api.js";
+
+window.CLIPSPACE_TO_OSS_MAP = window.CLIPSPACE_TO_OSS_MAP || {};
+
+
+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 filenameWithoutSuffix = originalFilename.replace(/ \[(input|output)\]$/, '');
+                        if (filenameWithoutSuffix !== originalFilename) {
+                            window.CLIPSPACE_TO_OSS_MAP[filenameWithoutSuffix] = ossUrl;
+                        }
+                    }
+                }
+            }
+        } catch (e) {
+            console.warn('[BizyDraft ClipspaceToOss] Failed to parse upload response:', 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
+ */
+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;
+        }
+
+        // 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];
+
+                    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}`);
+                        }
+
+                        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;
+}
+
+app.registerExtension({
+    name: "bizyair.clipspace.to.oss",
+
+    async setup() {
+        const originalGraphToPrompt = app.graphToPrompt;
+
+        app.graphToPrompt = async function(...args) {
+            console.log('[BizyDraft ClipspaceToOss] graphToPrompt called, intercepting...');
+
+            const result = await originalGraphToPrompt.apply(this, args);
+
+            if (result && result.output) {
+                result.output = convertClipspacePathsInPrompt(result.output);
+            }
+
+            return result;
+        };
+    }
+});

bizydraft/static/js/main.js

@@ -2,3 +2,4 @@
 import "./hookLoadImage.js";
 import "./postEvent.js";
 import "./handleStyle.js";
+import "./clipspaceToOss.js";

{bizydraft-0.2.68.dev20250930064514.dist-info → bizydraft-0.2.68.dev20250930074209.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bizydraft
-Version: 0.2.68.dev20250930064514
+Version: 0.2.68.dev20250930074209
 Summary: bizydraft
 Requires-Dist: loguru
 Requires-Dist: aiohttp

{bizydraft-0.2.68.dev20250930064514.dist-info → bizydraft-0.2.68.dev20250930074209.dist-info}/RECORD

@@ -2,20 +2,21 @@ bizydraft/__init__.py,sha256=OM-sKCQrPh25nHVJIX-DgF1raMYyoWLSuyduIAHt0Gs,78
 bizydraft/block_nodes.py,sha256=Lqn3oSCaGDHR2OICc8a2iRoRCVVK9v1-9MM3r-qIZgA,1092
 bizydraft/env.py,sha256=VFmGopVL2TGWA6hwxyFhIglCEcQxy6iVvL_raMNd6u4,407
 bizydraft/hijack_nodes.py,sha256=GivcoUsYAOfMjoEMxeViEkSQlmYjMA0RORy04fCbG60,3652
-bizydraft/hijack_routes.py,sha256=lf6x3xDzbo9yQIRwfG_1oxcUNfrX_1ogbiff3WOV9gM,3268
-bizydraft/oss_utils.py,sha256=FxTe9TxA9Q13pxKaOpcN0Jui-BG1SBWySM71PqpIlsM,8601
-bizydraft/patch_handlers.py,sha256=341y4YpzXOngQk9vLO8KLr7MXqAgM-_DrGrtIVGbPWo,6193
+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/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=4PcrcD9gv-yqBelkIfuhoN0ZwuFv66f7-bmwqla_aPI,17428
+bizydraft/static/js/clipspaceToOss.js,sha256=l0mUiiTsbSZx1mNgDfT9WJaM9Ee-ebP2UcAwrnAquMQ,5355
 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
 bizydraft/static/js/hookLoadModel.js,sha256=GIvew1mDcJhgyyaJif0tFGNdFQo_LzlTQfBZQ2lg2Tw,17032
-bizydraft/static/js/main.js,sha256=oEsVEUZSo8ipx93oqs2WFQSRgp46XQ_D-Xao-wen2S8,121
+bizydraft/static/js/main.js,sha256=7ijEPNQu9WtZZFQVrxby-ThG3ZJQ53feEiPrQTXrZns,151
 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=En0SNrekq3uTWF36yNP9V6LnBoyXjqKC-OnufggpWLE,39839
@@ -23,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.68.dev20250930064514.dist-info/METADATA,sha256=ebcTaJ0WE5-IeUnXPlR-nTFYCp2PHBvxmvrgqtoZiMA,180
-bizydraft-0.2.68.dev20250930064514.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bizydraft-0.2.68.dev20250930064514.dist-info/top_level.txt,sha256=XtoBq6hjZhXIM7aas4GtPDtAiKo8FdLzMABXW8qqQ8M,10
-bizydraft-0.2.68.dev20250930064514.dist-info/RECORD,,
+bizydraft-0.2.68.dev20250930074209.dist-info/METADATA,sha256=BhOLzTKeIJVH0bFHkw3d-oHMvc9wQR7K5fcyrm2H4-s,180
+bizydraft-0.2.68.dev20250930074209.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bizydraft-0.2.68.dev20250930074209.dist-info/top_level.txt,sha256=XtoBq6hjZhXIM7aas4GtPDtAiKo8FdLzMABXW8qqQ8M,10
+bizydraft-0.2.68.dev20250930074209.dist-info/RECORD,,