更新 app.py，新增 Scheduler 工具函式，移除一鍵串接功能；新增範例圖片 cat_girl.png 和 gura.png

app.py

@@ -43,7 +43,7 @@ SD_PIPE = load_sd_pipe()
 BLIP_PROCESSOR, BLIP_MODEL = load_blip()
 
 # -----------------------------
-# Scheduler 工具函式（新增）
+# Scheduler 工具函式
 # -----------------------------
 
 # 提供多種取樣方法（sampler/scheduler）
@@ -118,23 +118,6 @@ def caption_image(image: Image.Image, max_len: int = 50):
     caption = BLIP_PROCESSOR.decode(out[0], skip_special_tokens=True)
     return caption
 
-
-# -----------------------------
-# 功能：一鍵串接（Text → Image → Caption）
-# -----------------------------
-
-def generate_and_caption(
-    prompt: str, neg_prompt: str, steps: int, guidance: float, seed: int | None,
-    max_len: int,
-    scheduler_name: str, use_karras: bool, width: int, height: int
-):
-    image, _ = txt2img(prompt, neg_prompt, steps, guidance, seed, scheduler_name, use_karras, width, height)
-    if image is None:
-        return None, ""
-    cap = caption_image(image, max_len=max_len)
-    return image, cap
-
-
 # -----------------------------
 # Gradio 介面
 # -----------------------------
@@ -142,7 +125,8 @@ with gr.Blocks(title="NoobAI-XL + BLIP", theme=gr.themes.Soft()) as demo:
     gr.Markdown(
         """
         # SDXL (Laxhar/noobai-XL-1.0) + BLIP
-        Vision-Language 展示：**文字生圖** 與 **圖片描述**。
+        動漫風格的 Stable Diffusion XL 模型，搭配 BLIP 影像描述模型。
+        每個 Step 大約需要 1 分鐘的 CPU 運算時間，請耐心等候。
         """
     )
     
@@ -151,8 +135,8 @@ with gr.Blocks(title="NoobAI-XL + BLIP", theme=gr.themes.Soft()) as demo:
         with gr.TabItem("Text → Image"):
             with gr.Row():
                 with gr.Column(scale=1):
-                    prompt     = gr.Textbox(label="Prompt", placeholder="正向提示詞 Prompt")
-                    neg_prompt = gr.Textbox(label="Negative Prompt", placeholder="反向提示詞 Negative Prompt")
+                    prompt     = gr.Textbox(label="Prompt", lines=3, placeholder="正向提示詞 Prompt")
+                    neg_prompt = gr.Textbox(label="Negative Prompt", lines=3, placeholder="反向提示詞 Negative Prompt")
                     steps      = gr.Slider(1, 100, value=20, step=1, label="Steps")
                     guidance   = gr.Slider(1.0, 20.0, value=7, step=0.5, label="Guidance Scale")
                     seed       = gr.Number(label="Seed（-1 表示隨機）", value=-1, precision=0)
@@ -211,68 +195,16 @@ with gr.Blocks(title="NoobAI-XL + BLIP", theme=gr.themes.Soft()) as demo:
 
             cap_btn.click(caption_image, [in_img, max_len], [caption_out])
 
-        # Tab 3: 一鍵串接
-        with gr.TabItem("Generate → Caption"):
-            with gr.Row():
-                with gr.Column(scale=1):
-                    g_prompt     = gr.Textbox(label="Prompt", placeholder="正向提示詞 Prompt")
-                    g_neg_prompt = gr.Textbox(label="Negative Prompt", placeholder="反向提示詞 Negative Prompt")
-                    g_steps      = gr.Slider(1, 100, value=20, step=1, label="Steps")
-                    g_guidance   = gr.Slider(1.0, 12.0, value=7.0, step=0.5, label="Guidance Scale")
-                    g_seed       = gr.Number(label="Seed（-1 為隨機）", value=-1, precision=0)
-                    g_scheduler_name = gr.Dropdown(
-                        choices=list(SCHEDULER_FACTORIES.keys()),
-                        value="DPM++ 2M (DPMSolverMultistep)",
-                        label="取樣方法 (Sampler / Scheduler)"
-                    )
-                    g_use_karras = gr.Checkbox(value=True, label="使用 Karras Sigmas")
-                    g_width = gr.Slider(256, 1536, value=768, step=8, label="寬度 Width")
-                    g_height = gr.Slider(256, 1536, value=768, step=8, label="高度 Height")
-                    g_max_len = gr.Slider(10, 100, value=50, step=5, label="Caption 長度上限")
-                    g_btn = gr.Button("生成 + 描述", variant="primary")
-
-                with gr.Column(scale=1):
-                    g_img = gr.Image(label="Generated Image", format="png")
-                    g_cap = gr.Textbox(label="BLIP Caption")
-
-            def _run_generate_and_caption(prompt, neg_prompt, steps, guidance, seed, max_len, scheduler_name, use_karras, width, height):
-                prog = None
-                
-                try:
-                    prog = gr.Progress(track_tqdm=True)
-                    prog(0, desc="圖片生成中...")
-                except Exception:
-                    prog = None
-
-                image, caption = generate_and_caption(
-                    prompt, neg_prompt, steps, guidance,
-                    int(seed) if seed is not None else None, int(max_len),
-                    scheduler_name, bool(use_karras), int(width), int(height)
-                )
-
-                try:
-                    if prog is not None:
-                        prog(1, desc="完成")
-                except Exception:
-                    pass
-
-                return image, caption
-
-            g_btn.click(
-                _run_generate_and_caption,
-                [g_prompt, g_neg_prompt, g_steps, g_guidance, g_seed, g_max_len, g_scheduler_name, g_use_karras, g_width, g_height],
-                [g_img, g_cap]
-            )
-
     gr.Examples(
         examples=[
-            ["masterpiece, best quality, amazing quality, highres, absurdres, 1girl, virtual youtuber, gawr gura, solo, blue hair, grey hair, medium hair, long hair, multicolored hair, streaked hair, bangs, blunt bangs, side ponytail, blue eyes, sharp teeth, teeth, fang, cat ears, hair ornament, blue nails, shark tail, nail polish, tail, fish tail, teeth, shark girl, sleeveless, dress, shirt, :d, blush, smile, paw pose, open mouth, full body, simple_background, looking_at_viewer, upper_body, front view, bubble, flat color, no lineart", "worst quality, old, early, low quality, lowres, signature, username, logo, bad hands, mutated hands, mammal, anthro, furry, ambiguous form, feral, semi-anthro, nsfw", 20, 7.0, 42],
-            ["1girl, masterpiece, best quality, amazing quality, highres, absurdres, clean lineart, usnr, :d, cat_pose, blush, kawaii, white hair, long hair, hair between eyes, bangs, pink eyes, fang, pink_nails, open mouth, white fake cat ears, simple_background, hugging a cat, light pink dress, hair ornament, long sleeves, puffy long sleeves, pink bow, puffy sleeves, black choker, upper body, looking_at_viewer, front view", "worst quality, old, early, low quality, lowres, signature, username, logo, bad hands, mutated hands, mammal, anthro, furry, ambiguous form, feral, semi-anthro, nsfw", 20, 8.0, 1234],
+            ["examples/gura.jpg", "masterpiece, best quality, amazing quality, highres, absurdres, 1girl, virtual youtuber, gawr gura, solo, blue hair, grey hair, medium hair, long hair, multicolored hair, streaked hair, bangs, blunt bangs, side ponytail, blue eyes, sharp teeth, teeth, fang, cat ears, hair ornament, blue nails, shark tail, nail polish, tail, fish tail, teeth, shark girl, sleeveless, dress, shirt, :d, blush, smile, paw pose, open mouth, full body, simple_background, looking_at_viewer, upper_body, front view, bubble, flat color, no lineart", "worst quality, old, early, low quality, lowres, signature, username, logo, bad hands, mutated hands, mammal, anthro, furry, ambiguous form, feral, semi-anthro, nsfw", 20, 7.0, 42, "DPM++ 2M (DPMSolverMultistep)", True, 768, 768],
+            ["examples/cat_girl.jpg", "masterpiece, best quality, amazing quality, highres, absurdres, 1girl, clean lineart, usnr, :d, cat_pose, blush, kawaii, white hair, long hair, hair between eyes, bangs, pink eyes, fang, pink_nails, open mouth, white fake cat ears, simple_background, hugging a cat, light pink dress, hair ornament, long sleeves, puffy long sleeves, pink bow, puffy sleeves, black choker, upper body, looking_at_viewer, front view", "worst quality, old, early, low quality, lowres, signature, username, logo, bad hands, mutated hands, mammal, anthro, furry, ambiguous form, feral, semi-anthro, nsfw", 20, 8.0, 1234, "DPM++ 2M (DPMSolverMultistep)", True, 768, 768],
+            # ["examples/miku.jpg", "masterpiece, best quality, amazing quality, highres, absurdres, 1girl, hatsune miku, white pupils, power elements, microphone, vibrant blue color palette, abstract,abstract background, dreamlike atmosphere, delicate linework, wind-swept hair, energy", "worst quality, old, early, low quality, lowres, signature, username, logo, bad hands, mutated hands, mammal, anthro, furry, ambiguous form, feral, semi-anthro, nsfw", 28, 7.0, 24, "DPM++ 2M (DPMSolverMultistep)", True, 768, 768],
         ],
-        inputs=[prompt, neg_prompt, steps, guidance, seed],
+        inputs=[in_img, prompt, neg_prompt, steps, guidance, seed, scheduler_name, use_karras, width, height],
         label="Prompt 範例（可直接點選）",
     )
 
 if __name__ == "__main__":
     # 在 HF Spaces 使用：不用 demo.launch(share=True)
-    demo.launch()
+    demo.launch()