Upload 2 files

app.py

@@ -99,6 +99,75 @@ def parse_no_logo(value) -> bool:
 
 
 
+
+
+
+def parse_disable_character_detection(value) -> bool:
+    """JSON から渡ってくる disable_character_detection を安全に bool に変換。"""
+    # parse_no_logo と同じ解釈でOK（True/"true"/"1"/"yes"/"on" を True）
+    return parse_no_logo(value)
+
+
+def _has_detected_public_fictional_characters(ret, idx: int = 0) -> bool:
+    """
+    Mitsua Likes pipeline の戻り値 ret から、公開キャラクター類似が検知されたか判定する。
+    ret.detected_public_fictional_characters は [ [str, ...], ... ] を想定。
+    """
+    try:
+        if not hasattr(ret, "detected_public_fictional_characters"):
+            return False
+        d = getattr(ret, "detected_public_fictional_characters", None)
+        if d is None:
+            return False
+        # list/tuple 想定
+        if not isinstance(d, (list, tuple)) or len(d) <= idx:
+            return False
+        one = d[idx]
+        if one is None:
+            return False
+        if isinstance(one, (list, tuple)) and len(one) > 0:
+            return True
+        # まれに文字列が入る場合も True 扱い
+        if isinstance(one, str) and one.strip():
+            return True
+        return False
+    except Exception:
+        return False
+
+
+def make_character_detection_placeholder(size: Tuple[int, int],
+                                         text: str = "detected_public_fictional_characters") -> "Image.Image":
+    """真っ白な画像に指定テキストを描画した代替画像を返す。"""
+    if Image is None or ImageDraw is None:
+        raise RuntimeError("Pillow is not available; cannot create placeholder image.")
+    w, h = int(size[0]), int(size[1])
+    img = Image.new("RGB", (w, h), (255, 255, 255))
+    draw = ImageDraw.Draw(img)
+
+    font = None
+    if ImageFont is not None:
+        try:
+            # Pillow 標準の小さめフォント（環境依存で TTF が無いことがあるため）
+            font = ImageFont.load_default()
+        except Exception:
+            font = None
+
+    # 中央に配置
+    try:
+        bbox = draw.textbbox((0, 0), text, font=font)
+        tw, th = bbox[2] - bbox[0], bbox[3] - bbox[1]
+    except Exception:
+        try:
+            tw, th = draw.textsize(text, font=font)
+        except Exception:
+            tw, th = (len(text) * 6, 12)
+
+    x = max(0, (w - tw) // 2)
+    y = max(0, (h - th) // 2)
+
+    # 白背景なので黒文字
+    draw.text((x, y), text, font=font, fill=(0, 0, 0))
+    return img
 def add_logo_to_image(img: "Image.Image") -> "Image.Image":
     """
     生成画像の下部に "Generated by Mitsua Likes" のロゴテキストを描画して返す。
@@ -283,7 +352,8 @@ def generate_single_image(prompt, negative_prompt,
                           width, height,
                           steps, guidance_scale, guidance_rescale,
                           seed,
-                          add_logo: bool = True):
+                          add_logo: bool = True,
+                          enable_character_detection: bool = True):
     """
     通常の 1枚生成。latent はここでは保存しない（inpaint 用に選択されたときだけ再計算して保存する）。
     """
@@ -315,7 +385,10 @@ def generate_single_image(prompt, negative_prompt,
         pass
 
     img = ret.images[0]
-    if add_logo:
+    detected = bool(enable_character_detection and _has_detected_public_fictional_characters(ret, 0))
+    if detected:
+        img = make_character_detection_placeholder(img.size, "detected_public_fictional_characters")
+    elif add_logo:
         img = add_logo_to_image(img)
     filename = save_image_with_metadata(
         img, prompt, negative_prompt, steps, guidance_scale, guidance_rescale, seed
@@ -340,7 +413,8 @@ def generate_grid9(prompt, negative_prompt,
                    width, height,
                    steps, guidance_scale, guidance_rescale,
                    seeds,
-                   add_logo: bool = True):
+                   add_logo: bool = True,
+                   enable_character_detection: bool = True):
     """
     3x3 (9枚) をまとめて生成。ここでも latent は保存しない。
     """
@@ -369,7 +443,10 @@ def generate_grid9(prompt, negative_prompt,
     imgs = ret.images
 
     for idx, (seed, img) in enumerate(zip(seeds, imgs)):
-        if add_logo:
+        detected = bool(enable_character_detection and _has_detected_public_fictional_characters(ret, idx))
+        if detected:
+            img_to_save = make_character_detection_placeholder(img.size, "detected_public_fictional_characters")
+        elif add_logo:
             img_to_save = add_logo_to_image(img)
         else:
             img_to_save = img
@@ -523,6 +600,8 @@ def api_generate_one():
         seed = int(seed_param)
 
     no_logo = parse_no_logo(data.get("no_logo", False))
+    disable_character_detection = parse_disable_character_detection(data.get("disable_character_detection", False))
+
 
     try:
         info = generate_single_image(
@@ -535,6 +614,7 @@ def api_generate_one():
             guidance_rescale=guidance_rescale,
             seed=seed,
             add_logo=not no_logo,
+            enable_character_detection=not disable_character_detection,
         )
         return jsonify(info)
     except Exception as e:
@@ -565,6 +645,8 @@ def api_generate_grid9():
 
     no_logo = parse_no_logo(data.get("no_logo", False))
 
+    disable_character_detection = parse_disable_character_detection(data.get("disable_character_detection", False))
+
     try:
         images_info = generate_grid9(
             prompt=prompt,
@@ -576,6 +658,7 @@ def api_generate_grid9():
             guidance_rescale=guidance_rescale,
             seeds=seeds,
             add_logo=not no_logo,
+            enable_character_detection=not disable_character_detection,
         )
         return jsonify({"images": images_info})
     except Exception as e:
@@ -759,6 +842,7 @@ def api_inpaint_repaint():
     guidance_scale = float(data.get("guidance_scale", 6.0))
     guidance_rescale = float(data.get("guidance_rescale", 0.7))
     no_logo = parse_no_logo(data.get("no_logo", False))
+    disable_character_detection = parse_disable_character_detection(data.get("disable_character_detection", False))
     seed = int(data.get("seed", 0))  # seed はメタ情報用
     strength = float(data.get("strength", 0.5))
     mask_png = data.get("mask_png")
@@ -841,7 +925,10 @@ def api_inpaint_repaint():
 
     # 新しい画像＆latent
     img = ret.images[0]
-    if not no_logo:
+    detected = bool((not disable_character_detection) and _has_detected_public_fictional_characters(ret, 0))
+    if detected:
+        img = make_character_detection_placeholder(img.size, "detected_public_fictional_characters")
+    elif not no_logo:
         img = add_logo_to_image(img)
     new_latents = getattr(ret, "latents", None)
     if isinstance(new_latents, torch.Tensor) and new_latents.dim() == 4:

static/index.html

@@ -217,6 +217,11 @@
         <input id="noLogo" type="checkbox" style="margin-right:4px;">
         <span>No logo（生成画像を共有する場合、作品にMitsua Likesのクレジット表示は必須）</span>
       </label>
+<label style="display:inline-flex;align-items:center;margin-top:4px;font-size:0.85rem;">
+  <input id="disableCharDetectNormal" type="checkbox" style="margin-right:4px;">
+  <span>キャラ検知モード無効化（無効の場合はパブリックキャラの再生成に注意）</span>
+</label>
+
     </div>
   </header>
 
@@ -252,6 +257,11 @@
           <input id="i2iStrength" type="number" value="100" min="0" max="100" step="5">
         </label>
         <button id="i2iBtn">i2i (全体)</button>
+<label style="display:inline-flex;align-items:center;font-size:0.85rem;">
+  <input id="disableCharDetectInpaint" type="checkbox" style="margin-right:4px;">
+  <span>キャラ検知モード無効化（無効の場合はパブリックキャラの再生成に注意）</span>
+</label>
+
       </div>
       <div id="inpaintCanvasWrapper">
         <img id="inpaintImage" src="" alt="inpaint base">
@@ -278,6 +288,9 @@
     const guidanceRescaleEl = document.getElementById("guidanceRescale");
 
     const noLogoEl = document.getElementById("noLogo");
+    const disableCharDetectNormalEl = document.getElementById("disableCharDetectNormal");
+    const disableCharDetectInpaintEl = document.getElementById("disableCharDetectInpaint");
+
 
     const generateOneBtn = document.getElementById("generateOneBtn");
     const generateGridBtn = document.getElementById("generateGridBtn");
@@ -329,6 +342,19 @@
     let drawMode = "pen"; // "pen" or "eraser"
     let maskColor = "rgba(255,0,0,0.4)";
 
+// キャラ検知モード無効化（通常/インペイントで状態を同期）
+if (disableCharDetectNormalEl && disableCharDetectInpaintEl) {
+  // 初期同期
+  disableCharDetectInpaintEl.checked = disableCharDetectNormalEl.checked;
+
+  disableCharDetectNormalEl.addEventListener("change", () => {
+    disableCharDetectInpaintEl.checked = disableCharDetectNormalEl.checked;
+  });
+  disableCharDetectInpaintEl.addEventListener("change", () => {
+    disableCharDetectNormalEl.checked = disableCharDetectInpaintEl.checked;
+  });
+}
+
     function setStatus(msg) {
       statusEl.textContent = msg;
       console.log(msg);
@@ -412,7 +438,8 @@
         steps: overrides.steps !== undefined ? overrides.steps : baseSteps,
         guidance_scale: overrides.guidance_scale !== undefined ? overrides.guidance_scale : baseGuidanceScale,
         guidance_rescale: overrides.guidance_rescale !== undefined ? overrides.guidance_rescale : baseGuidanceRescale,
-        no_logo: noLogoEl && noLogoEl.checked
+        no_logo: noLogoEl && noLogoEl.checked,
+        disable_character_detection: disableCharDetectNormalEl && disableCharDetectNormalEl.checked
       };
 
       if (overrides.seed !== undefined && overrides.seed !== null && !Number.isNaN(overrides.seed)) {
@@ -529,7 +556,8 @@
         guidance_scale: baseGuidanceScale,
         guidance_rescale: baseGuidanceRescale,
         first_seed: useFirstSeed ? firstSeedVal : null,
-        no_logo: noLogoEl && noLogoEl.checked
+        no_logo: noLogoEl && noLogoEl.checked,
+        disable_character_detection: disableCharDetectNormalEl && disableCharDetectNormalEl.checked
       };
 
       try {
@@ -649,7 +677,8 @@
             guidance_scale: baseGuidanceScale,
             guidance_rescale: baseGuidanceRescale,
             first_seed: (!usedFirstSeedTopLeft && useFirstSeed) ? firstSeedVal : null,
-            no_logo: noLogoEl && noLogoEl.checked
+            no_logo: noLogoEl && noLogoEl.checked,
+        disable_character_detection: disableCharDetectNormalEl && disableCharDetectNormalEl.checked
           };
 
           setStatus("Auto (3x3 一括): 生成中...");
@@ -1056,7 +1085,8 @@
         seed: parseInt(seedEl.value, 10) || baseInfo.seed,
         strength: 0.5,
         mask_png: maskDataUrl,
-        no_logo: noLogoEl && noLogoEl.checked
+        no_logo: noLogoEl && noLogoEl.checked,
+        disable_character_detection: disableCharDetectInpaintEl && disableCharDetectInpaintEl.checked
       };
 
       setStatus("Repaint: inpaint 実行中...");
@@ -1124,7 +1154,8 @@
         mask_png: maskDataUrl,
         i2i_mode: true,
         i2i_mask_pct: pct,
-        no_logo: noLogoEl && noLogoEl.checked
+        no_logo: noLogoEl && noLogoEl.checked,
+        disable_character_detection: disableCharDetectInpaintEl && disableCharDetectInpaintEl.checked
       };
 
       setStatus(`i2i: 画像全体を ${pct}% で再描画中...`);