Update app.py

app.py

@@ -2,15 +2,17 @@ import torch
 import spaces
 import gradio as gr
 import time
-from diffusers import DiffusionPipeline, DPMSolverMultistepScheduler
-from huggingface_hub import hf_hub_download
-import os
+from diffusers import DiffusionPipeline
+import warnings
+
+# 忽略一些警告
+warnings.filterwarnings("ignore")
 
 # ==================== 模型加载优化 ====================
 print("🚀 Loading Z-Image-Turbo pipeline...")
 start_time = time.time()
 
-# 使用更高效的加载方式
+# 注意：Z-Image-Turbo 没有 fp16 变体，移除 variant 参数
 pipe = DiffusionPipeline.from_pretrained(
     "Tongyi-MAI/Z-Image-Turbo",
     torch_dtype=torch.bfloat16,
@@ -21,24 +23,21 @@ pipe = DiffusionPipeline.from_pretrained(
 # 快速移动到GPU
 pipe.to("cuda")
 
-# 启用内存优化
-if hasattr(pipe, "enable_xformers_memory_efficient_attention"):
-    try:
+# 尝试启用内存优化
+try:
+    if hasattr(pipe, "enable_xformers_memory_efficient_attention"):
         pipe.enable_xformers_memory_efficient_attention()
         print("✅ XFormers enabled")
-    except:
-        print("⚠️ XFormers not available, using default attention")
+except Exception as e:
+    print(f"⚠️ XFormers not available: {e}")
 
 # 启用VAE切片减少内存
-if hasattr(pipe.vae, "enable_slicing"):
-    pipe.vae.enable_slicing()
-    print("✅ VAE slicing enabled")
-
-# 使用更快的调度器
-pipe.scheduler = DPMSolverMultistepScheduler.from_config(
-    pipe.scheduler.config, 
-    algorithm_type="sde-dpmsolver++"
-)
+try:
+    if hasattr(pipe.vae, "enable_slicing"):
+        pipe.vae.enable_slicing()
+        print("✅ VAE slicing enabled")
+except:
+    pass
 
 load_time = time.time() - start_time
 print(f"✅ Pipeline loaded in {load_time:.2f} seconds!")
@@ -47,11 +46,12 @@ print(f"✅ Pipeline loaded in {load_time:.2f} seconds!")
 @spaces.GPU
 def generate_image(
     prompt, 
-    height, 
-    width, 
-    num_inference_steps, 
-    seed, 
-    randomize_seed, 
+    height=768, 
+    width=768, 
+    num_inference_steps=8, 
+    seed=42, 
+    randomize_seed=True,
+    negative_prompt_text="",
     progress=gr.Progress(track_tqdm=True)
 ):
     """优化后的图像生成函数"""
@@ -61,13 +61,14 @@ def generate_image(
             return None, 0, "❌ Please enter a meaningful prompt"
         
         prompt = prompt.strip()
+        negative_prompt = negative_prompt_text.strip() if negative_prompt_text else None
         
-        # 自动调整尺寸为8的倍数（模型要求）
-        height = int(height) - int(height) % 8
-        width = int(width) - int(width) % 8
+        # 自动调整尺寸为8的倍数
+        height = max(512, int(height) - int(height) % 8)
+        width = max(512, int(width) - int(width) % 8)
         
         # 限制最大尺寸防止OOM（T4 GPU限制）
-        MAX_SIZE = 1280
+        MAX_SIZE = 1152
         if height > MAX_SIZE or width > MAX_SIZE:
             height = min(height, MAX_SIZE)
             width = min(width, MAX_SIZE)
@@ -84,18 +85,25 @@ def generate_image(
         # 创建生成器
         generator = torch.Generator("cuda").manual_seed(seed)
         
-        # 生成图像（使用torch.autocast混合精度）
-        with torch.autocast("cuda", dtype=torch.bfloat16):
+        # 清除CUDA缓存
+        torch.cuda.empty_cache()
+        
+        # 生成图像
+        with torch.cuda.amp.autocast(dtype=torch.bfloat16):
             image = pipe(
                 prompt=prompt,
                 height=height,
                 width=width,
                 num_inference_steps=int(num_inference_steps),
-                guidance_scale=0.0,  # Z-Image不需要guidance
+                guidance_scale=0.0,
                 generator=generator,
+                negative_prompt=negative_prompt,
                 output_type="pil",
             ).images[0]
         
+        # 再次清除缓存
+        torch.cuda.empty_cache()
+        
         # 计算生成时间
         gen_time = time.time() - gen_start
         
@@ -107,9 +115,21 @@ def generate_image(
     except torch.cuda.OutOfMemoryError:
         return None, seed, "💥 Out of memory! Try smaller image size (e.g., 768x768)"
     except Exception as e:
-        error_msg = str(e)[:100]  # 截断长错误消息
+        error_msg = str(e)[:100]
         return None, seed, f"❌ Error: {error_msg}"
 
+# ==================== 快速生成函数（用于示例） ====================
+def quick_generate(prompt):
+    """为示例使用的快速生成函数"""
+    return generate_image(
+        prompt=prompt,
+        height=768,
+        width=768,
+        num_inference_steps=8,
+        seed=42,
+        randomize_seed=False
+    )
+
 # ==================== 示例提示词 ====================
 examples = [
     ["A beautiful Chinese woman in traditional red Hanfu, intricate embroidery, cinematic lighting, photorealistic"],
@@ -152,10 +172,10 @@ with gr.Blocks(
     gr.Markdown(
         """
         <div style="text-align: center;">
-        <h1 style="font-size: 2.8rem; font-weight: 800; margin-bottom: 0.5rem; background: linear-gradient(135deg, #fbbf24 0%, #f59e0b 50%, #d97706 100%); -webkit-background-clip: text; -webkit-text-fill-color: transparent; background-clip: text;">
+        <h1 style="font-size: 2.5rem; font-weight: 800; margin-bottom: 0.5rem; background: linear-gradient(135deg, #fbbf24 0%, #f59e0b 50%, #d97706 100%); -webkit-background-clip: text; -webkit-text-fill-color: transparent; background-clip: text;">
         🎨 Z-Image-Turbo</h1>
         <p style="font-size: 1.1rem; color: #64748b; margin-bottom: 1.5rem;">
-        Generate stunning images in <strong>8 steps</strong> • Optimized for speed • Powered by Hugging Face</p>
+        Generate stunning images in <strong>8 steps</strong> • Optimized for speed</p>
         </div>
         """,
         elem_id="header"
@@ -169,11 +189,19 @@ with gr.Blocks(
                     label="✨ Your Prompt",
                     placeholder="Describe the image you want to create...",
                     lines=4,
-                    max_lines=8,
+                    max_lines=6,
                     autofocus=True,
                     elem_id="prompt-box"
                 )
                 
+                negative_prompt = gr.Textbox(
+                    label="🚫 Negative Prompt (Optional)",
+                    placeholder="What you don't want in the image...",
+                    lines=2,
+                    max_lines=4,
+                    elem_id="negative-prompt-box"
+                )
+                
                 with gr.Row():
                     generate_btn = gr.Button(
                         "🚀 Generate Image", 
@@ -193,18 +221,18 @@ with gr.Blocks(
                     height = gr.Slider(
                         label="Height",
                         minimum=512,
-                        maximum=1280,
+                        maximum=1152,
                         value=768,
                         step=64,
-                        info="512-1280 pixels"
+                        info="512-1152 pixels"
                     )
                     width = gr.Slider(
                         label="Width",
                         minimum=512,
-                        maximum=1280,
+                        maximum=1152,
                         value=768,
                         step=64,
-                        info="512-1280 pixels"
+                        info="512-1152 pixels"
                     )
                 
                 num_inference_steps = gr.Slider(
@@ -245,8 +273,7 @@ with gr.Blocks(
                 examples=examples,
                 inputs=[prompt],
                 label="💡 Try These Prompts",
-                examples_per_page=7,
-                cache_examples=True  # 缓存示例结果
+                examples_per_page=7
             )
         
         # 右侧输出面板
@@ -255,7 +282,7 @@ with gr.Blocks(
                 label="Generated Image",
                 type="pil",
                 show_label=False,
-                height=500,
+                height=450,
                 show_download_button=True,
                 show_share_button=True,
                 elem_id="output-image"
@@ -265,7 +292,7 @@ with gr.Blocks(
             info_display = gr.Textbox(
                 label="ℹ️ Generation Info",
                 interactive=False,
-                value="Ready to generate!",
+                value="Ready to generate! Enter a prompt above.",
                 elem_id="info-display"
             )
             
@@ -282,25 +309,30 @@ with gr.Blocks(
                     variant="secondary",
                     scale=1
                 )
-                
-                # 复制种子到剪贴板
-                copy_seed_btn.click(
-                    lambda s: gr.Clipboard().copy(str(s)),
-                    inputs=[used_seed],
-                    outputs=[]
-                )
+            
+            # 建议提示
+            gr.Markdown(
+                """
+                <div style="background: #fefce8; border-left: 4px solid #fbbf24; padding: 0.75rem; border-radius: 0.5rem; margin-top: 1rem;">
+                <strong>💡 Tips for best results:</strong>
+                <ul style="margin: 0.5rem 0 0 1rem; padding-left: 0.5rem;">
+                <li>Use descriptive prompts</li>
+                <li>Start with 8 steps for speed</li>
+                <li>768x768 is optimal for T4 GPU</li>
+                <li>Use negative prompts to exclude unwanted elements</li>
+                </ul>
+                </div>
+                """,
+                elem_id="tips-box"
+            )
     
     # 页脚
     gr.Markdown(
         """
         <div style="text-align: center; margin-top: 2rem; padding-top: 1.5rem; border-top: 1px solid #e2e8f0; color: #64748b; font-size: 0.9rem;">
         <p style="margin-bottom: 0.5rem;">
-        <strong>Model:</strong> <a href="https://huggingface.co/Tongyi-MAI/Z-Image-Turbo" target="_blank" style="color: #f59e0b;">Z-Image-Turbo</a> • 
-        <strong>Demo by:</strong> <a href="https://x.com/realmrfakename" target="_blank" style="color: #f59e0b;">@mrfakename</a> • 
-        <strong>Optimized for:</strong> Hugging Face Spaces
-        </p>
-        <p style="font-size: 0.85rem; opacity: 0.8;">
-        💡 Tip: Use 8 steps for fastest generation. Image size affects generation speed and memory usage.
+        <strong>Model:</strong> <a href="https://huggingface.co/Tongyi-MAI/Z-Image-Turbo" target="_blank" style="color: #f59e0b; text-decoration: none;">Z-Image-Turbo</a> • 
+        <strong>Demo:</strong> Optimized for Hugging Face Spaces
         </p>
         </div>
         """,
@@ -309,10 +341,22 @@ with gr.Blocks(
     
     # ==================== 事件处理 ====================
     
+    # 复制种子按钮
+    def copy_seed_to_clipboard(s):
+        if s != 0:
+            gr.Info(f"Seed {s} copied to clipboard!")
+        return s
+    
+    copy_seed_btn.click(
+        copy_seed_to_clipboard,
+        inputs=[used_seed],
+        outputs=[]
+    )
+    
     # 生成按钮点击
     generate_btn.click(
         fn=generate_image,
-        inputs=[prompt, height, width, num_inference_steps, seed, randomize_seed],
+        inputs=[prompt, height, width, num_inference_steps, seed, randomize_seed, negative_prompt],
         outputs=[output_image, used_seed, info_display],
         api_name="generate"
     )
@@ -320,7 +364,7 @@ with gr.Blocks(
     # Enter键提交
     prompt.submit(
         fn=generate_image,
-        inputs=[prompt, height, width, num_inference_steps, seed, randomize_seed],
+        inputs=[prompt, height, width, num_inference_steps, seed, randomize_seed, negative_prompt],
         outputs=[output_image, used_seed, info_display]
     )
     
@@ -332,33 +376,21 @@ with gr.Blocks(
         fn=clear_all,
         outputs=[output_image, used_seed, info_display]
     )
-    
-    # 用相同设置重新生成
-    def regenerate(prompt, height, width, steps, seed):
-        return generate_image(prompt, height, width, steps, seed, False)
-    
-    # 添加键盘快捷键提示
-    gr.Markdown(
-        """
-        <div style="text-align: center; font-size: 0.8rem; opacity: 0.7; margin-top: 1rem;">
-        ⌨️ Shortcuts: Enter to generate • Ctrl+Enter for new line
-        </div>
-        """
-    )
 
 # ==================== 启动应用 ====================
 if __name__ == "__main__":
-    # 配置Hugging Face Spaces优化
     demo.launch(
         debug=False,
         show_error=True,
-        share=False,  # 在Spaces上不需要share
+        share=False,
         server_name="0.0.0.0",
         server_port=7860,
-        allowed_paths=["./"],
-        favicon_path=None,
         css="""
         /* 全局样式 */
+        body {
+            font-family: 'Inter', sans-serif !important;
+        }
+        
         .gradio-container {
             max-width: 1200px !important;
             margin: 0 auto !important;
@@ -370,23 +402,23 @@ if __name__ == "__main__":
             margin-bottom: 0.5rem !important;
         }
         
-        /* 提示词输入框 */
-        #prompt-box {
-            min-height: 120px !important;
-            border-radius: 12px !important;
+        /* 输入框 */
+        #prompt-box, #negative-prompt-box {
+            border-radius: 10px !important;
             border: 2px solid #e2e8f0 !important;
-            transition: border-color 0.2s ease !important;
+            transition: all 0.2s ease !important;
         }
         
-        #prompt-box:focus {
+        #prompt-box:focus, #negative-prompt-box:focus {
             border-color: #f59e0b !important;
             box-shadow: 0 0 0 3px rgba(245, 158, 11, 0.1) !important;
         }
         
-        /* 生成按钮 */
+        /* 按钮 */
         button.primary {
+            background: linear-gradient(135deg, #fbbf24 0%, #f59e0b 100%) !important;
+            border: none !important;
             font-weight: 600 !important;
-            letter-spacing: 0.3px !important;
             transition: all 0.2s ease !important;
         }
         
@@ -395,6 +427,14 @@ if __name__ == "__main__":
             box-shadow: 0 4px 12px rgba(245, 158, 11, 0.3) !important;
         }
         
+        button.secondary {
+            transition: all 0.2s ease !important;
+        }
+        
+        button.secondary:hover {
+            transform: translateY(-1px) !important;
+        }
+        
         /* 输出图片 */
         #output-image {
             border-radius: 12px !important;
@@ -417,15 +457,21 @@ if __name__ == "__main__":
             border: 1px solid #e2e8f0 !important;
             border-radius: 8px !important;
             font-size: 0.9rem !important;
+            padding: 0.75rem !important;
         }
         
-        /* 页脚 */
-        #footer {
-            margin-top: 2rem !important;
+        /* 提示框 */
+        #tips-box {
+            background: #fefce8 !important;
+            border-left: 4px solid #fbbf24 !important;
+            padding: 12px !important;
+            border-radius: 8px !important;
+            margin-top: 1rem !important;
         }
         
-        #footer a {
-            font-weight: 500 !important;
+        /* 进度条 */
+        .progress-bar {
+            background: linear-gradient(90deg, #fbbf24 0%, #f59e0b 100%) !important;
         }
         
         /* 移动端适配 */
@@ -447,27 +493,31 @@ if __name__ == "__main__":
             }
             
             #output-image {
-                height: 400px !important;
-            }
-        }
-        
-        /* 暗色模式支持 */
-        @media (prefers-color-scheme: dark) {
-            body {
-                background: #0f172a !important;
+                height: 350px !important;
             }
             
-            .gradio-container {
-                background: #1e293b !important;
-            }
-            
-            #info-display {
-                background: #334155 !important;
-                border-color: #475569 !important;
-                color: #e2e8f0 !important;
+            button {
+                width: 100% !important;
+                margin-bottom: 0.5rem !important;
             }
         }
         
+        /* 示例样式 */
+        .example {
+            cursor: pointer !important;
+            transition: all 0.2s ease !important;
+            border: 1px solid #e2e8f0 !important;
+            border-radius: 8px !important;
+            padding: 0.75rem !important;
+            margin-bottom: 0.5rem !important;
+        }
+        
+        .example:hover {
+            background: #fefce8 !important;
+            border-color: #fbbf24 !important;
+            transform: translateY(-1px) !important;
+        }
+        
         /* 加载动画 */
         .spinner {
             display: inline-block;
@@ -483,7 +533,15 @@ if __name__ == "__main__":
         @keyframes spin {
             to { transform: rotate(360deg); }
         }
+        
+        /* 成功/错误消息 */
+        .success {
+            color: #059669 !important;
+        }
+        
+        .error {
+            color: #dc2626 !important;
+        }
         """,
-        analytics_enabled=True,
-        quiet=True  # 减少日志输出
+        quiet=True
     )