Update app.py from anycoder

app.py

@@ -1,7 +1,7 @@
 import gradio as gr
 import spaces
 import torch
-from diffusers import NewbiePipeline
+from diffusers import NewbiePipeline, EulerDiscreteScheduler
 from transformers import AutoModel
 import random
 import warnings
@@ -22,15 +22,15 @@ text_encoder_2 = AutoModel.from_pretrained(
 )
 
 print("正在加载 Pipeline...")
-# 优化：使用 EulerDiscreteScheduler 替代 DPMSolver，因为 DPMSolver 与 NewBiePipeline 不兼容
+# 优化：明确设置 EulerDiscreteScheduler 以确保兼容性
 pipe_newbie = NewbiePipeline.from_pretrained(
     model_path, 
     text_encoder_2=text_encoder_2, 
     torch_dtype=torch_dtype
 )
 
-# 优化：使用 EulerDiscreteScheduler，它与 NewBiePipeline 兼容
-pipe_newbie.scheduler = pipe_newbie.scheduler
+# 确保使用兼容的调度器
+pipe_newbie.scheduler = EulerDiscreteScheduler.from_config(pipe_newbie.scheduler.config)
 
 pipe_newbie.to("cuda")
 print("模型加载完成。")
@@ -42,43 +42,27 @@ def generate_image_newbie(prompt, negative_prompt, height, width, num_inference_
 
     generator = torch.Generator("cuda").manual_seed(int(seed))
 
-    # 优化：减少推理步数以加快生成速度，同时保持质量
-    image = pipe_newbie(
-        prompt=prompt,
-        negative_prompt=negative_prompt,
-        height=int(height),
-        width=int(width),
-        num_inference_steps=min(num_inference_steps, 25),  # 限制最大步数以加快速度
-        guidance_scale=guidance_scale,
-        generator=generator,
-        # 优化：启用内存高效模式
-        output_type="pil"
-    ).images[0]
-
-    return image, seed
-
-# 默认提示词
-newbie_prompt = """<character_1>
-<n>$character_1$</n>
-<gender>1girl, solo</gender>
-<appearance>blonde_hair, long_hair</appearance>
-<clothing>large_hat, white_hat, white_blouse, puffy_sleeves, shoulder_cutout, black_skirt, shirt_tucked_in, socks, shoes</clothing>
-<expression>looking_up</expression>
-<action>sitting, reclining, arm_support, from_side, cowboy_shot, wide_shot</action>
-<position>center</position>
-</character_1>
-
-<general_tags>
-<count>1girl</count>
-<artists> (kazutake hazano:1.2), (kazutake hazano:0.5), (onineko:0.8), (r17329 illu:0.2), (ma1ma1helmes b illu:0.2)</artists>
-<style>masterpiece, best_quality, high_resolution, detailed</style>
-<background>detailed_background, scenery, detailed_background</background>
-<atmosphere>cheerful</atmosphere>
-<lighting>dynamic_angle, depth_of_field, high_contrast, colorful, detailed_light, light_leaks, beautiful_detailed_glow, best_shadow, shiny_skin, cinematic_lighting, ray_tracing, from_above, female_focus, close-up, dutch_angle, blue_archive</lighting>
-<quality>very_aesthetic, masterpiece, no_text</quality>
-<objects>bag</objects>
-<other>2024_year</other>
-</general_tags>"""
+    try:
+        # 优化：调整参数以避免黑色图像
+        image = pipe_newbie(
+            prompt=prompt,
+            negative_prompt=negative_prompt,
+            height=int(height),
+            width=int(width),
+            num_inference_steps=num_inference_steps,  # 使用用户指定的步数
+            guidance_scale=guidance_scale,
+            generator=generator,
+            output_type="pil"
+        ).images[0]
+        
+        return image, seed
+    except Exception as e:
+        print(f"生成图像时出错: {e}")
+        # 返回一个错误图像或占位符
+        return None, seed
+
+# 默认提示词 - 优化提示词以生成更好的图像
+newbie_prompt = """masterpiece, best quality, high resolution, detailed, 1girl, solo, blonde hair, long hair, large hat, white hat, white blouse, puffy sleeves, shoulder cutout, black skirt, shirt tucked in, socks, shoes, sitting, reclining, arm support, from side, cowboy shot, wide shot, center, cheerful, dynamic angle, depth of field, high contrast, colorful, detailed light, light leaks, beautiful detailed glow, best shadow, shiny skin, cinematic lighting, ray tracing, from above, female focus, close-up, dutch angle, blue archive, detailed background, scenery, very aesthetic, masterpiece, no text, bag, 2024 year"""
 
 with gr.Blocks(title="NewBie 图像生成器") as demo:
     gr.Markdown("# NewBie 图像生成器 (NewBie Image Generator)")
@@ -94,18 +78,18 @@ with gr.Blocks(title="NewBie 图像生成器") as demo:
             )
             negative_prompt_newbie = gr.Textbox(
                 label="负面提示词 (Negative Prompt)",
-                value="low quality, bad quality, blurry, low resolution, deformed, ugly, bad anatomy",
+                value="low quality, bad quality, blurry, low resolution, deformed, ugly, bad anatomy, black image, dark, black background",
                 lines=3,
                 placeholder="在此输入不需要出现的元素..."
             )
             
             with gr.Row():
-                height_newbie = gr.Slider(label="图片高度 (Height)", minimum=512, maximum=1024, step=64, value=768)  # 优化：降低默认分辨率以加快速度
-                width_newbie = gr.Slider(label="图片宽度 (Width)", minimum=512, maximum=1024, step=64, value=768)   # 优化：降低默认分辨率以加快速度
+                height_newbie = gr.Slider(label="图片高度 (Height)", minimum=512, maximum=1024, step=64, value=768)
+                width_newbie = gr.Slider(label="图片宽度 (Width)", minimum=512, maximum=1024, step=64, value=768)
             
             with gr.Row():
-                steps_newbie = gr.Slider(label="推理步数 (Inference Steps)", minimum=5, maximum=50, step=1, value=20)  # 优化：减少默认步数
-                guidance_scale_newbie = gr.Slider(label="引导系数 (Guidance Scale)", minimum=1.0, maximum=10.0, step=0.1, value=5.0)  # 优化：调整默认值
+                steps_newbie = gr.Slider(label="推理步数 (Inference Steps)", minimum=10, maximum=50, step=1, value=25)  # 增加默认步数
+                guidance_scale_newbie = gr.Slider(label="引导系数 (Guidance Scale)", minimum=1.0, maximum=20.0, step=0.5, value=7.5)  # 增加默认值
             
             seed_newbie = gr.Number(label="随机种子 (Seed, -1 为随机)", value=-1, precision=0)
             
@@ -114,7 +98,7 @@ with gr.Blocks(title="NewBie 图像生成器") as demo:
         with gr.Column(scale=1):
             image_output_newbie = gr.Image(label="生成结果 (Output)", format="png", interactive=False)
             used_seed_newbie = gr.Number(label="使用的种子 (Used Seed)", interactive=False)
-            progress_bar = gr.Textbox(label="生成进度", interactive=False, value="准备就绪...")
+            error_message = gr.Textbox(label="错误信息", interactive=False, visible=False)
 
     generate_btn_newbie.click(
         fn=generate_image_newbie,
@@ -128,11 +112,15 @@ with gr.Blocks(title="NewBie 图像生成器") as demo:
             seed_newbie
         ],
         outputs=[image_output_newbie, used_seed_newbie]
+    ).then(
+        fn=lambda img, seed: (img, seed, gr.update(visible=True) if img is None else gr.update(visible=False)),
+        inputs=[image_output_newbie, used_seed_newbie],
+        outputs=[image_output_newbie, used_seed_newbie, error_message]
     )
 
 if __name__ == "__main__":
     demo.launch(
         theme=gr.themes.Soft(primary_hue="blue"),
         footer_links=[{"label": "Built with anycoder", "url": "https://huggingface.co/spaces/akhaliq/anycoder"}],
-        share=True  # 添加 share=True 以创建公共链接
+        share=True
     )