dsh-cosplay-studio 2.0.4 → 2.1.0

package/lib/tools/finalize.py

@@ -14,8 +14,9 @@ import json
 import os
 import shutil
 import sys
+from collections import deque
 
-from PIL import Image
+from PIL import Image, ImageFilter
 
 try:
     import numpy as np
@@ -26,13 +27,77 @@ from skin_makeup import makeup as skin_makeup
 
 CELL_W, CELL_H = 720, 1280
 GAP = 32
-MAX_BYTES = 1_950_000
+MAX_BYTES = 6_000_000
+PREVIEW_BG = (28, 29, 34)
 
 # P7b defaults from the skill: light touch above the waist, strong on the legs.
 DEFAULT_STRENGTH = 0.35
 DEFAULT_LEG_STRENGTH = 0.85
 
 
+def flatten_white_border(image: Image.Image, feather: int = 8) -> Image.Image:
+    """Replace edge-connected near-white poster paper with a full-bleed gradient.
+
+    Reference character sheets often have a white margin, and img2img keeps it,
+    so the shot looks like it floats on blank paper. Only pure white pixels that
+    are connected to the image edge are touched (shaded fabric, skin and the
+    character never are), and they are filled with a vertical gradient sampled
+    from the artwork's own colours, so the backdrop stays character-adapted.
+    """
+    if np is None:
+        return image
+    rgb = image.convert("RGB")
+    arr = np.asarray(rgb, np.float32) / 255.0
+    height, width, _ = arr.shape
+
+    small = rgb.resize((720, max(1, int(round(height * 720.0 / width)))), Image.BILINEAR)
+    mask = np.asarray(small, np.uint8).min(axis=2) > 235
+
+    h, w = mask.shape
+    seen = np.zeros_like(mask, bool)
+    queue: deque[tuple[int, int]] = deque()
+    for x in range(w):
+        for y in (0, h - 1):
+            if mask[y, x] and not seen[y, x]:
+                seen[y, x] = True
+                queue.append((y, x))
+    for y in range(h):
+        for x in (0, w - 1):
+            if mask[y, x] and not seen[y, x]:
+                seen[y, x] = True
+                queue.append((y, x))
+    while queue:
+        y, x = queue.popleft()
+        for ny, nx in ((y - 1, x), (y + 1, x), (y, x - 1), (y, x + 1)):
+            if 0 <= ny < h and 0 <= nx < w and mask[ny, nx] and not seen[ny, nx]:
+                seen[ny, nx] = True
+                queue.append((ny, nx))
+    # No margin, or such a large white area that this is not a border: leave it.
+    if seen.mean() < 0.01 or seen.mean() > 0.45:
+        return rgb
+
+    alpha = Image.fromarray((seen * 255).astype(np.uint8)).resize((width, height), Image.BILINEAR)
+    alpha = alpha.filter(ImageFilter.GaussianBlur(feather))
+
+    body = ~seen
+    if body.sum() < 1000:
+        return rgb
+    ys, xs = np.nonzero(body)
+    small_arr = np.asarray(small, np.float32) / 255.0
+    top_rows = ys < h * 0.2
+    bottom_rows = ys > h * 0.8
+    pick = small_arr[ys[top_rows], xs[top_rows]] if top_rows.any() else small_arr[ys, xs]
+    pick2 = small_arr[ys[bottom_rows], xs[bottom_rows]] if bottom_rows.any() else pick
+    top = np.median(pick, axis=0)
+    bottom = np.median(pick2, axis=0)
+    rows = np.linspace(0.0, 1.0, height, dtype=np.float32)[:, None, None]
+    gradient = (top[None, None, :] * (1.0 - rows) + bottom[None, None, :] * rows) * np.ones((1, width, 1), np.float32)
+
+    blend = (np.asarray(alpha, np.float32) / 255.0)[..., None]
+    out = (arr * (1.0 - blend) + gradient * blend).clip(0.0, 1.0)
+    return Image.fromarray((out * 255.0 + 0.5).astype(np.uint8))
+
+
 def deoil(image: Image.Image) -> Image.Image:
     """Flatten oily/crushed highlights on skin: V>0.80 and S<0.45 -> V=0.72."""
     if np is None:
@@ -61,14 +126,15 @@ def apply_body_makeup(image: Image.Image, strength: float, leg_strength: float)
 
 
 def save_jpeg(image: Image.Image, path: str, max_bytes: int = MAX_BYTES) -> int:
+    """Near-original export: q95 4:4:4, stepping down only if the file is huge."""
     os.makedirs(os.path.dirname(path), exist_ok=True)
-    quality = 92
-    while quality >= 58:
-        image.save(path, "JPEG", quality=quality, subsampling=1, optimize=True)
+    quality = 95
+    while quality >= 82:
+        image.save(path, "JPEG", quality=quality, subsampling=0, optimize=True)
         size = os.path.getsize(path)
         if size <= max_bytes:
             return size
-        quality -= 4
+        quality -= 3
     return os.path.getsize(path)
 
 
@@ -98,10 +164,10 @@ def build_preview(paths: list[str], out_path: str) -> bool:
     if len(cells) == 0:
         return False
     while len(cells) < 4:
-        cells.append(Image.new("RGB", (CELL_W, CELL_H), (255, 255, 255)))
+        cells.append(Image.new("RGB", (CELL_W, CELL_H), PREVIEW_BG))
     width = CELL_W * 2 + GAP * 3
     height = CELL_H * 2 + GAP * 3
-    canvas = Image.new("RGB", (width, height), (255, 255, 255))
+    canvas = Image.new("RGB", (width, height), PREVIEW_BG)
     for index, cell in enumerate(cells):
         row, col = divmod(index, 2)
         x = GAP + col * (CELL_W + GAP)
@@ -166,8 +232,11 @@ def main() -> int:
         index = sys.argv.index(flag)
         return sys.argv[index + 1] if index + 1 < len(sys.argv) else default
 
-    makeup_on = option("--makeup", "1").lower() not in ("0", "false", "no")
-    deoil_on = option("--deoil", "1").lower() not in ("0", "false", "no")
+    makeup_on = option("--makeup", "0").lower() not in ("0", "false", "no")
+    deoil_on = option("--deoil", "0").lower() not in ("0", "false", "no")
+    flatten_on = option("--flatten", "1").lower() not in ("0", "false", "no")
+    preview_on = option("--preview", "1").lower() not in ("0", "false", "no")
+    copy_on = option("--copy", "1").lower() not in ("0", "false", "no")
     strength = float(option("--strength", str(DEFAULT_STRENGTH)))
     leg_strength = float(option("--leg-strength", str(DEFAULT_LEG_STRENGTH)))
 
@@ -187,6 +256,8 @@ def main() -> int:
     ) if os.path.isdir(base_dir) else []
     if base_files:
         base_image = Image.open(base_files[-1]).convert("RGB")
+        if flatten_on:
+            base_image = flatten_white_border(base_image)
         if deoil_on:
             base_image = deoil(base_image)
         base_name = f"00_基准角色_{safe_name(project.get('character'), '角色')}.jpg"
@@ -203,7 +274,9 @@ def main() -> int:
         shot = shots[index] if index < len(shots) else {}
         title = safe_name(shot.get("title"), f"镜头{index + 1}")
         image = Image.open(os.path.join(raw_dir, name)).convert("RGB")
-        # Skill order: P7 de-oil first, then P7b body makeup on the clean image.
+        # Backdrop first (clean the paper margin), then the optional beauty steps.
+        if flatten_on:
+            image = flatten_white_border(image)
         if deoil_on:
             image = deoil(image)
         if makeup_on:
@@ -217,18 +290,28 @@ def main() -> int:
     if made_up:
         notes.append(f"P7b 身体化妆：{len(made_up)} 张（leg-strength {leg_strength:.2f}）")
 
-    # 3. 2x2 preview 00_全套预览.jpg
+    # 3. 2x2 preview 00_全套预览.jpg (optional)
     preview_name = ""
-    if finals:
+    if preview_on and finals:
         first_four = [os.path.join(final_dir, name) for name in finals[:4]]
         preview_name = "00_全套预览.jpg"
         if build_preview(first_four, os.path.join(final_dir, preview_name)):
             notes.append("预览图：00_全套预览.jpg（2×2，单格 720×1280）")
 
-    # 4. delivery folder
-    for name in os.listdir(final_dir):
-        shutil.copy2(os.path.join(final_dir, name), os.path.join(deliver_dir, name))
-    write_copy(project, finals, deliver_dir)
+    # 4. delivery folder (optional)
+    if copy_on:
+        for name in os.listdir(final_dir):
+            shutil.copy2(os.path.join(final_dir, name), os.path.join(deliver_dir, name))
+        write_copy(project, finals, deliver_dir)
+        notes.append("文案与导出副本已写入 deliver/")
+
+    notes.append(f"导出画质：JPEG q95、4:4:4（上限 {MAX_BYTES // 1_000_000} MB），原图 PNG 保留在 raw/")
+    if flatten_on:
+        notes.append("已把白边/海报留白替换为角色配色的满幅渐变（不想要可关闭 flatten 重新导出）")
+    if deoil_on:
+        notes.append("已应用去油光（会压低高光、整体略暗；不需要可重新导出）")
+    if makeup_on:
+        notes.append("已应用 P7b 身体化妆（会平滑肤色；不需要可重新导出）")
 
     report = {"finals": finals, "preview": preview_name, "notes": notes, "makeup": made_up}
     out = json.dumps(report, ensure_ascii=False)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-cosplay-studio",
-  "version": "2.0.4",
-  "description": "Cosplay Studio for the DSH web GUI: one-click ComfyUI (Z-Image-Turbo) deployment with a self-test, then a character name, an uploaded reference photo, or a hot-character recommendation drives a live-action cosplay photo set following the cosplay-photo-set skill v2.1 (nine-paragraph character card with SKIN, base-image gate, shot-script gate, 1440x2560 finals, QC, de-oil, body makeup, JPEG export).",
+  "version": "2.1.0",
+  "description": "Cosplay Studio for the DSH web GUI: one-click ComfyUI (Z-Image-Turbo) deployment with a self-test, then a character name, an uploaded reference photo, or a hot-character pick drives a staged character research (web search, image classification, vision feature extraction), a base-image gate with manual/smart retouch, a character-specific shot script, and 1440x2560 live-action cosplay finals with optional de-oil/makeup/export.",
   "type": "module",
   "main": "lib/index.js",
   "exports": {
@@ -11,6 +11,7 @@
   },
   "files": [
     "lib",
+    "!lib/tools/__pycache__",
     "cordis.patch.yml",
     "README.md"
   ],