Upload app.py

app.py

@@ -2,7 +2,6 @@ import os
 import uuid
 import time
 import random
-
 import spaces
 import gradio as gr
 import numpy as np
@@ -22,7 +21,6 @@ pipe = StableDiffusionXLPipeline.from_pretrained(
 
 pipe.scheduler = EulerAncestralDiscreteScheduler.from_config(pipe.scheduler.config)
 pipe.to(device)
-
 pipe.text_encoder.to(torch.float16)
 pipe.text_encoder_2.to(torch.float16)
 pipe.vae.to(torch.float16)
@@ -38,20 +36,17 @@ compel = Compel(
 
 MAX_SEED = np.iinfo(np.int32).max
 MAX_IMAGE_SIZE = 1216
-
 OUTPUT_DIR = "/tmp/generated_images"
 os.makedirs(OUTPUT_DIR, exist_ok=True)
 
-
 def save_image_jpg(pil_image: Image.Image) -> str:
     if pil_image.mode != "RGB":
         pil_image = pil_image.convert("RGB")
     path = os.path.join(OUTPUT_DIR, f"{uuid.uuid4().hex}.jpg")
     pil_image.save(path, "JPEG", quality=95)
-    # return path
-
+    return path
 
-@spaces.GPU(duration=10)
+@spaces.GPU(duration=15)
 def infer(
     prompt,
     negative_prompt,
@@ -64,20 +59,15 @@ def infer(
 ):
     if not prompt.strip():
         raise gr.Error("Prompt cannot be empty.")
-
     if randomize_seed:
         seed = random.randint(0, MAX_SEED)
-
     generator = torch.Generator(device=device).manual_seed(seed)
-
     try:
         conditioning, pooled = compel([prompt, negative_prompt])
-
         prompt_embeds = conditioning[0:1]
         pooled_prompt_embeds = pooled[0:1]
         negative_prompt_embeds = conditioning[1:2]
         negative_pooled_prompt_embeds = pooled[1:2]
-
         image = pipe(
             prompt_embeds=prompt_embeds,
             pooled_prompt_embeds=pooled_prompt_embeds,
@@ -89,16 +79,13 @@ def infer(
             height=height,
             generator=generator,
         ).images[0]
-
         image_path = save_image_jpg(image)
-        return image_path, seed
-
+        return f"/file={image_path}", seed  # ← 変更: /file= プレフィックスを付けてURLとして返す
     except RuntimeError as e:
         print(f"Error during generation: {e}")
         blank_image = Image.new("RGB", (width, height), color=(0, 0, 0))
         blank_path = save_image_jpg(blank_image)
-        return blank_path, seed
-
+        return f"/file={blank_path}", seed  # ← 変更: 同上
 
 def generation_loop(
     prompt,
@@ -113,7 +100,6 @@ def generation_loop(
 ):
     if not prompt.strip():
         raise gr.Error("Prompt cannot be empty to start consecutive generation.")
-
     while True:
         try:
             image_path, new_seed = infer(
@@ -126,42 +112,40 @@ def generation_loop(
                 guidance_scale,
                 num_inference_steps,
             )
-
-            yield {result: image_path, seed: new_seed}
+            yield {image_url: image_path, seed: new_seed}  # ← 変更: result → image_url
             time.sleep(interval_sec)
-
         except gr.exceptions.CancelledError:
             print("Generation loop cancelled by user.")
             break
 
-
 css = """
 #col-container {
-  margin: 0 auto;
-  max-width: 1024px;
+    margin: 0 auto;
+    max-width: 1024px;
 }
 
 /* 完全透過（非表示だがクリック等は可能なまま） */
 .transparent-btn,
 .transparent-btn * {
-  opacity: 0 !important;
+    opacity: 0 !important;
 }
 
 .transparent-btn button {
-  background: transparent !important;
-  border: 0 !important;
-  box-shadow: none !important;
+    background: transparent !important;
+    border: 0 !important;
+    box-shadow: none !important;
 }
 
 .transparent-btn button:focus,
 .transparent-btn button:focus-visible {
-  outline: none !important;
+    outline: none !important;
 }
 """
 
 with gr.Blocks(css=css) as demo:
     with gr.Column(elem_id="col-container"):
-        gr.Markdown("<br>" * 1)
+        gr.Markdown("" * 1)
+
         # Prompt（右にGenerateは置かない）
         with gr.Row(equal_height=True):
             prompt = gr.Text(
@@ -183,7 +167,7 @@ with gr.Blocks(css=css) as demo:
             run_button = gr.Button("Generate", scale=0, interactive=False, elem_classes=["transparent-btn"])
             consecutive_button = gr.Button("Consecutive", scale=0, interactive=False, elem_classes=["transparent-btn"])
 
-        gr.Markdown("<br>" * 20)
+        gr.Markdown("" * 20)
 
         # 停止/クリア
         with gr.Row():
@@ -212,18 +196,15 @@ with gr.Blocks(css=css) as demo:
 
             seed = gr.Slider(label="Seed", minimum=0, maximum=MAX_SEED, step=1, value=0)
             randomize_seed = gr.Checkbox(label="Randomize seed", value=True)
-
             with gr.Row():
                 width = gr.Slider(label="Width", minimum=256, maximum=MAX_IMAGE_SIZE, step=32, value=1024)
                 height = gr.Slider(label="Height", minimum=256, maximum=MAX_IMAGE_SIZE, step=32, value=1024)
-
             with gr.Row():
                 guidance_scale = gr.Slider(label="Guidance scale", minimum=0.0, maximum=20.0, step=0.1, value=8)
                 num_inference_steps = gr.Slider(label="Number of inference steps", minimum=1, maximum=28, step=1, value=25)
-
             interval_seconds = gr.Slider(label="Interval (seconds)", minimum=1, maximum=60, step=1, value=1)
 
-        gr.Markdown("<br>" * 20)
+        gr.Markdown("" * 20)
 
         gr.Examples(
             examples=[
@@ -233,95 +214,96 @@ with gr.Blocks(css=css) as demo:
             label="Examples (Click to copy to prompt)",
         )
 
-        # Promptが空でなければボタンを押せるようにする
-        prompt.input(
-            fn=None,
-            inputs=[prompt],
-            outputs=[run_button, consecutive_button],
-            js="(p) => { const interactive = p.trim().length > 0; return [{ interactive: interactive, '__type__': 'update' }, { interactive: interactive, '__type__': 'update' }]; }",
-        )
-
-        # クリア：promptを空にしてボタン無効、URL欄も空にする
-        clear_button.click(
-            fn=None,
-            inputs=None,
-            outputs=[prompt, run_button, consecutive_button, image_url],
-            js="""
+    # Promptが空でなければボタンを押せるようにする
+    prompt.input(
+        fn=None,
+        inputs=[prompt],
+        outputs=[run_button, consecutive_button],
+        js="(p) => { const interactive = p.trim().length > 0; return [{ interactive: interactive, '__type__': 'update' }, { interactive: interactive, '__type__': 'update' }]; }",
+    )
+
+    # クリア：promptを空にしてボタン無効、URL欄も空にする
+    clear_button.click(
+        fn=None,
+        inputs=None,
+        outputs=[prompt, run_button, consecutive_button, image_url],
+        js="""
 function() {
-  return [
-    "",
-    { "interactive": false, "__type__": "update" },
-    { "interactive": false, "__type__": "update" },
-    ""
-  ];
-}
-""",
-        )
-
-        # 生成
-        run_button.click(
-            fn=infer,
-            inputs=[prompt, negative_prompt, seed, randomize_seed, width, height, guidance_scale, num_inference_steps],
-            outputs=[result, seed],
-        )
-
-        # 連続生成
-        gen_inputs = [
-            prompt,
-            negative_prompt,
-            seed,
-            randomize_seed,
-            width,
-            height,
-            guidance_scale,
-            num_inference_steps,
-            interval_seconds,
-        ]
-
-        consecutive_event = consecutive_button.click(
-            fn=generation_loop,
-            inputs=gen_inputs,
-            outputs=[result, seed],
-        )
-
-        # 停止
-        stop_button.click(
-            fn=None,
-            inputs=None,
-            outputs=None,
-            cancels=[consecutive_event],
-        )
-
-        # resultが更新されたら、表示中のimg.src（= /file=...）を拾って表示
-        result.change(
-            fn=None,
-            inputs=None,
-            outputs=[image_url],
-            js=r"""
-() => {
-  const img = document.querySelector("#result_image img");
-  if (!img || !img.src) return "";
-  return new URL(img.src, window.location.href).href;
+    return [
+        "",
+        { "interactive": false, "__type__": "update" },
+        { "interactive": false, "__type__": "update" },
+        ""
+    ];
 }
 """,
-        )
-
-        # Copyボタン：URL文字列をコピー
-        copy_button.click(
-            fn=None,
-            inputs=[image_url],
-            outputs=None,
-            js=r"""
+    )
+
+    # 生成
+    run_button.click(
+        fn=infer,
+        inputs=[prompt, negative_prompt, seed, randomize_seed, width, height, guidance_scale, num_inference_steps],
+        outputs=[image_url, seed],  # ← 変更: result → image_url
+    )
+
+    # 連続生成
+    gen_inputs = [
+        prompt,
+        negative_prompt,
+        seed,
+        randomize_seed,
+        width,
+        height,
+        guidance_scale,
+        num_inference_steps,
+        interval_seconds,
+    ]
+
+    consecutive_event = consecutive_button.click(
+        fn=generation_loop,
+        inputs=gen_inputs,
+        outputs=[image_url, seed],  # ← 変更: result → image_url
+    )
+
+    # 停止
+    stop_button.click(
+        fn=None,
+        inputs=None,
+        outputs=None,
+        cancels=[consecutive_event],
+    )
+
+    # result.change は不要になったためコメントアウト
+    # result.change(
+    #     fn=None,
+    #     inputs=None,
+    #     outputs=[image_url],
+    #     js=r"""
+    # () => {
+    #     const img = document.querySelector("#result_image img");
+    #     if (!img || !img.src) return "";
+    #     return new URL(img.src, window.location.href).href;
+    # }
+    # """,
+    # )
+
+    # Copyボタン：URL文字列をコピー（相対パスは絶対URLに変換）
+    copy_button.click(
+        fn=None,
+        inputs=[image_url],
+        outputs=None,
+        js=r"""
 async (url) => {
-  if (!url) return;
-  try {
-    await navigator.clipboard.writeText(url);
-    console.log("URL copied");
-  } catch (e) {
-    console.error("Copy failed", e);
-  }
+    if (!url) return;
+    try {
+        const fullUrl = url.startsWith('/') ? window.location.origin + url : url;
+        await navigator.clipboard.writeText(fullUrl);
+        console.log("URL copied");
+    } catch (e) {
+        console.error("Copy failed", e);
+    }
 }
 """,
-        )
+    )
 
 demo.queue().launch()