bizydraft 0.2.78.dev20251030100819__py3-none-any.whl → 0.2.82.dev20251209023307__py3-none-any.whl

bizydraft/hijack_routes.py

@@ -1,3 +1,5 @@
+import json
+
 from aiohttp import web
 from loguru import logger
 
@@ -51,6 +53,31 @@ def hijack_routes_pre_add_routes():
 
         return middleware_handler
 
+    # 覆盖 /settings 响应，修改设置 NodeIdBadgeMode 为 ShowAll显示id，将 LinkRenderMode 为（Spline=2），显示连线
+    async def settings_response_middleware(app, handler):
+        async def middleware_handler(request):
+            if request.method == "GET":
+                p = request.path
+                if p == "/settings" or p == "/api/settings":
+                    resp = await handler(request)
+                    if getattr(resp, "content_type", None) == "application/json":
+                        body_bytes = getattr(resp, "body", b"")
+                        charset = getattr(resp, "charset", None) or "utf-8"
+                        payload = json.loads(body_bytes.decode(charset))
+                        if payload.get("Comfy.NodeBadge.NodeIdBadgeMode") != "ShowAll":
+                            payload["Comfy.NodeBadge.NodeIdBadgeMode"] = "ShowAll"
+                        if payload.get("Comfy.LinkRenderMode") != 2:
+                            payload["Comfy.LinkRenderMode"] = 2
+                        if payload.get("Comfy.VueNodes.Enabled") != False:
+                            payload["Comfy.VueNodes.Enabled"] = False
+                        return web.json_response(
+                            payload, status=getattr(resp, "status", 200)
+                        )
+                    return resp
+            return await handler(request)
+
+        return middleware_handler
+
     async def access_control_middleware(app, handler):
         base_white_list = [
             "/prompt",
@@ -98,7 +125,7 @@ def hijack_routes_pre_add_routes():
 
         return middleware_handler
 
-    app.middlewares.extend([custom_business_middleware])
+    app.middlewares.extend([custom_business_middleware, settings_response_middleware])
 
     logger.info("Optimized middleware setup complete.")
 

bizydraft/oss_utils.py

@@ -64,6 +64,9 @@ def decrypt(encrypted_message):
         if not encrypted_message or not isinstance(encrypted_message, str):
             raise ValueError("无效的加密消息")
 
+        if "v4.public" in encrypted_message:
+            return encrypted_message
+
         private_key = serialization.load_pem_private_key(
             private_key_pem.encode(), password=None, backend=default_backend()
         )
@@ -309,9 +312,17 @@ 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).replace(
-                "https:/", "https://"
-            )
+            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_url = f"{original_subfolder}/{original_filename}"
         elif original_filename.startswith(http_prefix_options):
             # filename 本身就是完整 URL

bizydraft/patch_handlers.py

@@ -3,10 +3,12 @@ import math
 import mimetypes
 import os
 import uuid
+from io import BytesIO
 from urllib.parse import unquote
 
 from aiohttp import ClientSession, ClientTimeout, web
 from loguru import logger
+from PIL import Image
 
 try:
     import execution
@@ -37,6 +39,8 @@ async def view_image(request):
 
     filename = request.rel_url.query["filename"]
     subfolder = request.rel_url.query.get("subfolder", "")
+    channel = request.rel_url.query.get("channel", "rgba")
+    preview = request.rel_url.query.get("preview", None)
 
     http_prefix_options = ("http:", "https:")
 
@@ -56,17 +60,22 @@ async def view_image(request):
             subfolder = subfolder.replace("https:/", "https://", 1)
         if "http:/" in subfolder and not subfolder.startswith("http://"):
             subfolder = subfolder.replace("http:/", "http://", 1)
-        filename = (
+
+        # 构建完整URL
+        full_url = (
             f"{subfolder}/{filename}"
             if not filename.startswith(http_prefix_options)
             else filename
-        )  # preview 3d request: https://host:port/api/view?filename=filename.glb&type=output&subfolder=https://bizyair-dev.oss-cn-shanghai.aliyuncs.com/outputs&rand=0.5763957215362988
+        )
 
-        content_type, _ = mimetypes.guess_type(filename)
+        # 获取原始文件名用于响应头
+        original_filename = filename.split("/")[-1] if "/" in filename 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，如果无法获取则使用猜测的类型
@@ -86,8 +95,98 @@ async def view_image(request):
                         text=f"File size exceeds limit ({human_readable_size(BIZYDRAFT_MAX_FILE_SIZE)})",
                     )
 
+                # 检查是否需要图像处理（preview或channel参数）
+                is_image = final_content_type and final_content_type.startswith(
+                    "image/"
+                )
+                needs_processing = is_image and (
+                    preview is not None or channel != "rgba"
+                )
+
+                if needs_processing:
+                    logger.debug(f"Image processing requested: {channel=}, {preview=}")
+                    # 下载完整图像到内存
+                    image_data = await resp.read()
+
+                    # 检查实际大小
+                    if len(image_data) > BIZYDRAFT_MAX_FILE_SIZE:
+                        return web.Response(
+                            status=413,
+                            text=f"File size exceeds limit ({human_readable_size(BIZYDRAFT_MAX_FILE_SIZE)})",
+                        )
+
+                    # 使用PIL处理图像
+                    with Image.open(BytesIO(image_data)) as img:
+                        # 处理preview参数
+                        if preview is not None:
+                            preview_info = preview.split(";")
+                            image_format = preview_info[0]
+                            if image_format not in ["webp", "jpeg"] or "a" in channel:
+                                image_format = "webp"
+                            quality = 90
+                            if preview_info[-1].isdigit():
+                                quality = int(preview_info[-1])
+
+                            buffer = BytesIO()
+                            if image_format in ["jpeg"] or channel == "rgb":
+                                img = img.convert("RGB")
+                            img.save(buffer, format=image_format, quality=quality)
+                            buffer.seek(0)
+
+                            return web.Response(
+                                body=buffer.read(),
+                                content_type=f"image/{image_format}",
+                                headers={
+                                    "Content-Disposition": f'filename="{original_filename}"'
+                                },
+                            )
+
+                        # 处理channel参数
+                        if channel == "rgb":
+                            logger.debug("Converting image to RGB (removing alpha)")
+                            if img.mode == "RGBA":
+                                r, g, b, a = img.split()
+                                new_img = Image.merge("RGB", (r, g, b))
+                            else:
+                                new_img = img.convert("RGB")
+
+                            buffer = BytesIO()
+                            new_img.save(buffer, format="PNG")
+                            buffer.seek(0)
+
+                            return web.Response(
+                                body=buffer.read(),
+                                content_type="image/png",
+                                headers={
+                                    "Content-Disposition": f'filename="{original_filename}"'
+                                },
+                            )
+
+                        elif channel == "a":
+                            logger.debug("Extracting alpha channel only")
+                            if img.mode == "RGBA":
+                                _, _, _, a = img.split()
+                            else:
+                                a = Image.new("L", img.size, 255)
+
+                            # 创建alpha通道图像
+                            alpha_img = Image.new("RGBA", img.size)
+                            alpha_img.putalpha(a)
+                            alpha_buffer = BytesIO()
+                            alpha_img.save(alpha_buffer, format="PNG")
+                            alpha_buffer.seek(0)
+
+                            return web.Response(
+                                body=alpha_buffer.read(),
+                                content_type="image/png",
+                                headers={
+                                    "Content-Disposition": f'filename="{original_filename}"'
+                                },
+                            )
+
+                # 默认流式传输（无需处理或非图像文件）
                 headers = {
-                    "Content-Disposition": f'attachment; filename="{uuid.uuid4()}"',
+                    "Content-Disposition": f'attachment; filename="{original_filename}"',
                     "Content-Type": final_content_type,
                 }
 
@@ -113,6 +212,7 @@ async def view_image(request):
             text=f"Request timed out (max {BIZYDRAFT_REQUEST_TIMEOUT//60} minutes)",
         )
     except Exception as e:
+        logger.error(f"Error in view_image: {str(e)}", exc_info=True)
         return web.Response(
             status=502, text=f"Failed to fetch remote resource: {str(e)}"
         )