Update app.py

app.py

@@ -1,81 +1,11 @@
-# ===== 必须首先导入spaces =====
-try:
-    import spaces
-    SPACES_AVAILABLE = True
-    print("✅ Spaces available - ZeroGPU mode")
-except ImportError:
-    SPACES_AVAILABLE = False
-    print("⚠️ Spaces not available - running in regular mode")
-
-# ===== 其他导入 =====
-import os
-from datetime import datetime
-import random
-import torch
-import gradio as gr
-from diffusers import AutoPipelineForText2Image, FlowMatchEulerDiscreteScheduler
-from PIL import Image
-import traceback
-import numpy as np
-import gc  # 添加垃圾回收
-
-# 移除 Compel（FLUX 不兼容，简化处理）
-COMPEL_AVAILABLE = False
-print("⚠️ Compel disabled for FLUX compatibility")
-
-# ===== 简化后的配置 =====
-STYLE_PRESETS = {
-    "None": "",
-    "Realistic": "photorealistic, 8k, ultra-detailed, cinematic lighting, masterpiece, realistic skin texture, detailed anatomy",
-    "Anime": "anime style, detailed, high quality, masterpiece, best quality, detailed eyes, perfect anatomy",
-    "Comic": "comic book style, bold outlines, vibrant colors, cel shading, dynamic pose",
-    "Watercolor": "watercolor illustration, soft gradients, pastel palette, artistic brush strokes"
-}
-
-# 固定模型配置
-FIXED_MODEL = "aoxo/flux.1dev-abliterated"
-
-# 质量增强提示词（适配 NSFW）
-QUALITY_ENHANCERS = [
-    "detailed anatomy", "(perfect anatomy:1.2)", "soft skin", "natural lighting",
-    "high resolution", "(masterpiece:1.3)", "(best quality:1.2)",
-    "professional photography", "artistic composition",
-    "(perfect proportions:1.1)", "smooth textures", "intimate lighting",
-    "realistic skin texture", "(detailed face:1.1)", "natural pose"
-]
-
-# 风格专用增强词
-STYLE_ENHANCERS = {
-    "Realistic": ["photorealistic", "(ultra realistic:1.2)", "natural lighting", "detailed skin", "professional photography"],
-    "Anime": ["anime style", "(high quality anime:1.2)", "detailed eyes", "perfect face", "clean art style"],
-    "Comic": ["comic book style", "bold outlines", "vibrant colors", "cel shading"],
-    "Watercolor": ["watercolor style", "artistic", "soft gradients", "pastel palette"]
-}
-
-SAVE_DIR = "generated_images"
-os.makedirs(SAVE_DIR, exist_ok=True)
-
-# ===== 模型相关变量 =====
-pipeline = None
-device = None
-model_loaded = False
-
-def cleanup_memory():
-    """清理GPU内存"""
-    if torch.cuda.is_available():
-        torch.cuda.empty_cache()
-        torch.cuda.synchronize()
-    gc.collect()
-
 def initialize_model():
-    """优化的模型初始化函数（针对ZeroGPU优化）"""
+    """优化后的模型初始化函数"""
     global pipeline, device, model_loaded
     
     if model_loaded and pipeline is not None:
         return True
     
     try:
-        # 清理内存
         cleanup_memory()
         
         device = torch.device("cuda" if torch.cuda.is_available() else "cpu")
@@ -83,30 +13,29 @@ def initialize_model():
         
         print(f"📦 Loading fixed model: {FIXED_MODEL}")
         
-        # ZeroGPU优化的模型加载
+        # 优化的模型加载
         pipeline = AutoPipelineForText2Image.from_pretrained(
             FIXED_MODEL,
-            torch_dtype=torch.bfloat16 if torch.cuda.is_available() else torch.float32,
-            # 添加内存优化参数
-            variant=None,
-            use_safetensors=True
+            torch_dtype=torch.bfloat16,
+            use_safetensors=True,
+            variant=None
         )
         
-        # 优化调度器（默认 FlowMatchEulerDiscreteScheduler）
         pipeline.scheduler = FlowMatchEulerDiscreteScheduler.from_config(
             pipeline.scheduler.config
         )
         pipeline = pipeline.to(device)
         
-        # ZeroGPU专用优化
+        # 关键优化:使用sequential而不是model cpu offload
         if torch.cuda.is_available():
-            # 使用更保守的内存设置
-            pipeline.enable_model_cpu_offload()  # 改用model_cpu_offload
+            pipeline.to(device) # 改这里!
             pipeline.enable_vae_slicing()
-            pipeline.enable_vae_tiling()  # 添加VAE tiling
+            pipeline.enable_vae_tiling()
+            
+            # 可选:如果内存充足,可以完全不用offload
+            # pipeline.to(device)  # 全部加载到GPU,最快但吃内存
         
-        # 移除 torch.compile（Spaces 不稳定）
-        print("✅ Model initialization complete (ZeroGPU optimized)")
+        print("✅ Model initialization complete (Optimized)")
         model_loaded = True
         return True
         
@@ -117,72 +46,22 @@ def initialize_model():
         model_loaded = False
         return False
 
-def enhance_prompt(prompt: str, style: str) -> str:
-    """增强提示词"""
-    # 限制质量词数量，避免过长
-    quality_terms = ", ".join(QUALITY_ENHANCERS[:5])  # 只取前5个
-    
-    style_terms = ""
-    if style in STYLE_ENHANCERS:
-        style_terms = ", " + ", ".join(STYLE_ENHANCERS[style][:3])  # 只取前3个
-    
-    style_suffix = STYLE_PRESETS.get(style, "")
-    
-    enhanced_parts = [prompt.strip()]
-    
-    if style_suffix:
-        enhanced_parts.append(style_suffix)
-    
-    if style_terms:
-        enhanced_parts.append(style_terms.lstrip(", "))
-    
-    enhanced_parts.append(quality_terms)
-    
-    enhanced_prompt = ", ".join(filter(None, enhanced_parts))
-    
-    # 限制总长度，避免超出模型限制
-    if len(enhanced_prompt) > 500:
-        enhanced_prompt = enhanced_prompt[:500] + "..."
-    
-    return enhanced_prompt
-
-def apply_spaces_decorator(func):
-    """应用 spaces 装饰器，增加更长的超时时间"""
-    if SPACES_AVAILABLE:
-        # 增加超时时间到120秒，并设置更大的内存限制
-        return spaces.GPU(duration=120)(func)
-    return func
-
-def create_metadata_content(prompt, enhanced_prompt, seed, steps, cfg_scale, width, height, style):
-    """创建元数据内容"""
-    timestamp = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
-    return f"""Generated Image Metadata
-======================
-Timestamp: {timestamp}
-Original Prompt: {prompt}
-Enhanced Prompt: {enhanced_prompt}
-Seed: {seed}
-Steps: {steps}
-CFG Scale: {cfg_scale}
-Dimensions: {width}x{height}
-Style: {style}
-Model: FLUX.1-dev
-"""
 
 @apply_spaces_decorator
-def generate_image(prompt: str, style: str, negative_prompt: str = "", steps: int = 20, cfg_scale: float = 3.5, 
-                  seed: int = -1, width: int = 1024, height: int = 1024, progress=gr.Progress()):
-    """图像生成函数（ZeroGPU优化版本）"""
+def generate_image(prompt: str, style: str, negative_prompt: str = "", 
+                  steps: int = 20, cfg_scale: float = 3.5, 
+                  seed: int = -1, width: int = 1024, height: int = 1024, 
+                  progress=gr.Progress()):
+    """优化后的图像生成函数"""
     try:
         if not prompt or prompt.strip() == "":
             return None, "", "❌ Please enter a prompt"
         
-        # 参数验证和限制
-        steps = max(10, min(steps, 30))  # 限制步数范围，避免超时
-        width = min(width, 1024)  # 限制最大尺寸
+        # 优化的参数限制
+        steps = max(10, min(steps, 25))  # 降低最大步数
+        width = min(width, 1024)
         height = min(height, 1024)
         
-        # 初始化模型
         progress(0.1, desc="Initializing model...")
         if not initialize_model():
             cleanup_memory()
@@ -190,28 +69,24 @@ def generate_image(prompt: str, style: str, negative_prompt: str = "", steps: in
         
         progress(0.2, desc="Processing prompt...")
         
-        # 处理 seed
         if seed == -1:
             seed = random.randint(0, np.iinfo(np.int32).max)
         
-        # 增强提示词
+        # 不要过度增强提示词
         enhanced_prompt = enhance_prompt(prompt.strip(), style)
         
-        # 增强负面提示词
         if not negative_prompt.strip():
-            negative_prompt = "(low quality, worst quality:1.4), (bad anatomy, bad hands:1.2), blurry, watermark, signature, text, error, missing limbs, extra limbs, cropped, normal quality, jpeg artifacts, deformed, mutated"
+            negative_prompt = "(low quality, worst quality:1.4), blurry, deformed"
         
-        # 生成参数（官方示例：generator 用 cpu）
         generator = torch.Generator("cpu").manual_seed(seed)
         
         progress(0.4, desc="Starting generation...")
-        print(f"🔥 Starting inference: steps={steps}, guidance={cfg_scale}, size={width}x{height}")
+        print(f"🔥 Inference: steps={steps}, guidance={cfg_scale}, size={width}x{height}")
         
-        # 清理内存
         cleanup_memory()
         
-        # 直接使用标准 pipeline（无 Compel，添加 max_sequence_length）
-        with torch.no_grad():  # 确保不计算梯度
+        # 关键改动:提高max_sequence_length
+        with torch.no_grad():
             result = pipeline(
                 prompt=enhanced_prompt,
                 negative_prompt=negative_prompt,
@@ -219,7 +94,7 @@ def generate_image(prompt: str, style: str, negative_prompt: str = "", steps: in
                 guidance_scale=cfg_scale,
                 width=width,
                 height=height,
-                max_sequence_length=256,  # 减少序列长度，节省内存
+                max_sequence_length=512,  # 从256改到512!
                 generator=generator,
                 output_type="pil"
             )
@@ -229,30 +104,26 @@ def generate_image(prompt: str, style: str, negative_prompt: str = "", steps: in
         
         progress(0.9, desc="Finalizing...")
         
-        # 立即清理内存
         del result
         cleanup_memory()
         
-        # 保存图像
         filename = f"IMG_{seed}.png"
         filepath = os.path.join(SAVE_DIR, filename)
         image.save(filepath, format="PNG", optimize=True)
         
-        # 创建元数据内容
         metadata_content = create_metadata_content(
             prompt, enhanced_prompt, seed, steps, cfg_scale, width, height, style
         )
         
         progress(1.0, desc="Complete!")
         
-        # 生成信息显示
         generation_info = f"Prompt: {prompt}\nSeed: {seed} | Size: {width}×{height} | Steps: {steps} | CFG: {cfg_scale}"
         
         return image, generation_info, metadata_content
         
     except torch.cuda.OutOfMemoryError as e:
         cleanup_memory()
-        error_msg = "❌ GPU memory insufficient. Try reducing image size or steps."
+        error_msg = "❌ GPU memory insufficient. Try: 768x768 or fewer steps"
         print(f"CUDA OOM: {error_msg}")
         return None, "", error_msg
         
@@ -263,478 +134,49 @@ def generate_image(prompt: str, style: str, negative_prompt: str = "", steps: in
         print(traceback.format_exc())
         return None, "", f"❌ Generation failed: {error_msg}"
 
-# ===== CSS 样式（保持不变）=====
-css = """
-/* 全局容器 */
-.gradio-container {
-    max-width: 100% !important;
-    margin: 0 !important;
-    padding: 0 !important;
-    background: linear-gradient(135deg, #e6a4f2 0%, #1197e4 100%) !important;
-    min-height: 100vh !important;
-    font-family: 'Segoe UI', Arial, sans-serif !important;
-}
-
-/* 主要内容区域 */
-.main-content {
-    background: rgba(255, 255, 255, 0.95) !important;
-    border-radius: 20px !important;
-    padding: 20px !important;
-    margin: 15px !important;
-    box-shadow: 0 10px 25px rgba(0,0,0,0.2) !important;
-    min-height: calc(100vh - 30px) !important;
-    color: #3e3e3e !important;
-    backdrop-filter: blur(10px) !important;
-}
-
-/* 简化标题 */
-.title {
-    text-align: center !important;
-    background: linear-gradient(45deg, #bb6ded, #08676b) !important;
-    -webkit-background-clip: text !important;
-    -webkit-text-fill-color: transparent !important;
-    background-clip: text !important;
-    font-size: 2rem !important;
-    margin-bottom: 15px !important;
-    font-weight: bold !important;
-}
-
-/* 简化警告信息 */
-.warning-box {
-    background: linear-gradient(45deg, #bb6ded, #08676b) !important;
-    color: white !important;
-    padding: 8px !important;
-    border-radius: 8px !important;
-    margin-bottom: 15px !important;
-    text-align: center !important;
-    font-weight: bold !important;
-    font-size: 14px !important;
-}
-
-/* 输入框样式 */
-.prompt-box textarea, .prompt-box input {
-    border-radius: 10px !important;
-    border: 2px solid #bb6ded !important;
-    padding: 15px !important;
-    font-size: 14px !important;
-    background: linear-gradient(135deg, rgba(245, 243, 255, 0.9), rgba(237, 233, 254, 0.9)) !important;
-    color: #2d2d2d !important;
-}
-
-.prompt-box textarea:focus, .prompt-box input:focus {
-    border-color: #08676b !important;
-    box-shadow: 0 0 15px rgba(77, 8, 161, 0.3) !important;
-    background: linear-gradient(135deg, rgba(255, 255, 255, 0.95), rgba(248, 249, 250, 0.95)) !important;
-}
-
-/* 右侧控制区域 */
-.controls-section {
-    background: linear-gradient(135deg, rgba(224, 218, 255, 0.8), rgba(196, 181, 253, 0.8)) !important;
-    border-radius: 12px !important;
-    padding: 15px !important;
-    margin-bottom: 10px !important;
-    border: 2px solid rgba(187, 109, 237, 0.3) !important;
-    backdrop-filter: blur(5px) !important;
-}
-
-.controls-section label {
-    font-weight: 600 !important;
-    color: #2d2d2d !important;
-    margin-bottom: 8px !important;
-}
-
-.controls-section input[type="radio"] {
-    accent-color: #bb6ded !important;
-}
-
-.controls-section input[type="number"], 
-.controls-section input[type="range"] {
-    background: rgba(255, 255, 255, 0.9) !important;
-    border: 1px solid #bb6ded !important;
-    border-radius: 6px !important;
-    padding: 8px !important;
-    color: #2d2d2d !important;
-}
-
-.controls-section select {
-    background: rgba(255, 255, 255, 0.9) !important;
-    border: 1px solid #bb6ded !important;
-    border-radius: 6px !important;
-    padding: 8px !important;
-    color: #2d2d2d !important;
-}
-
-/* 生成按钮 */
-.generate-btn {
-    background: linear-gradient(45deg, #bb6ded, #08676b) !important;
-    color: white !important;
-    border: none !important;
-    padding: 15px 25px !important;
-    border-radius: 25px !important;
-    font-size: 16px !important;
-    font-weight: bold !important;
-    width: 100% !important;
-    cursor: pointer !important;
-    transition: all 0.3s ease !important;
-    text-transform: uppercase !important;
-    letter-spacing: 1px !important;
-}
-
-.generate-btn:hover {
-    transform: translateY(-2px) !important;
-    box-shadow: 0 8px 25px rgba(187, 109, 237, 0.5) !important;
-}
-
-/* 图片输出区域 */
-.image-output {
-    border-radius: 15px !important;
-    overflow: hidden !important;
-    max-width: 100% !important;
-    max-height: 70vh !important;
-    border: 3px solid #08676b !important;
-    box-shadow: 0 8px 20px rgba(0,0,0,0.15) !important;
-    background: linear-gradient(135deg, rgba(255, 255, 255, 0.9), rgba(248, 249, 250, 0.9)) !important;
-}
-
-/* 图片信息区域 */
-.image-info {
-    background: linear-gradient(135deg, rgba(248, 249, 250, 0.9), rgba(233, 236, 239, 0.9)) !important;
-    border-radius: 8px !important;
-    padding: 12px !important;
-    margin-top: 10px !important;
-    font-size: 12px !important;
-    color: #495057 !important;
-    border: 2px solid rgba(187, 109, 237, 0.2) !important;
-    backdrop-filter: blur(5px) !important;
-}
-
-/* 保存按钮 */
-.save-btn {
-    background: linear-gradient(45deg, #28a745, #20c997) !important;
-    color: white !important;
-    border: none !important;
-    padding: 10px 20px !important;
-    border-radius: 8px !important;
-    font-size: 13px !important;
-    font-weight: 600 !important;
-    cursor: pointer !important;
-    margin-top: 8px !important;
-    margin-right: 10px !important;
-    transition: all 0.3s ease !important;
-}
 
-.save-btn:hover {
-    background: linear-gradient(45deg, #218838, #1ea471) !important;
-    transform: translateY(-1px) !important;
-    box-shadow: 0 4px 12px rgba(40, 167, 69, 0.3) !important;
-}
-
-/* 滑块样式 */
-.slider-container input[type="range"] {
-    accent-color: #bb6ded !important;
-}
-
-/* 响应式设计 */
-@media (max-width: 768px) {
-    .main-content {
-        margin: 10px !important;
-        padding: 15px !important;
-    }
+def enhance_prompt(prompt: str, style: str) -> str:
+    """优化的提示词增强"""
+    # 减少质量词,避免提示词过长
+    quality_terms = ", ".join(QUALITY_ENHANCERS[:3])  # 从5减到3
     
-    .title {
-        font-size: 1.5rem !important;
-    }
-}
-
-/* 隐藏占位符 */
-.gr-image .image-container:empty::before {
-    content: "Generated image will appear here" !important;
-    display: flex !important;
-    align-items: center !important;
-    justify-content: center !important;
-    height: 300px !important;
-    background: linear-gradient(135deg, rgba(248, 249, 250, 0.8), rgba(233, 236, 239, 0.8)) !important;
-    border-radius: 10px !important;
-    color: #6c757d !important;
-    font-size: 16px !important;
-    font-weight: 500 !important;
-    backdrop-filter: blur(5px) !important;
-}
-"""
-
-# ===== 创建 UI =====
-def create_interface():
-    with gr.Blocks(css=css, title="NSFW FLUX Image Generator") as interface:
-        with gr.Column(elem_classes=["main-content"]):
-            # 简化标题
-            gr.HTML('<div class="title">NSFW FLUX Image Generator</div>')
-            
-            # 简化警告信息
-            gr.HTML('''
-                <div class="warning-box">
-                    ⚠️ 18+ CONTENT WARNING ⚠️
-                </div>
-            ''')
-            
-            # 主要输入区域
-            with gr.Row():
-                # 左侧：提示词输入
-                with gr.Column(scale=2):
-                    prompt_input = gr.Textbox(
-                        label="Main Prompt (Keep it concise for best results)",
-                        placeholder="beautiful woman, detailed portrait, realistic...",
-                        lines=8,  # 减少行数，提示用户简洁
-                        elem_classes=["prompt-box"]
-                    )
-                    
-                    # 添加提示信息
-                    gr.HTML('''
-                        <div style="background: rgba(255, 193, 7, 0.1); padding: 10px; border-radius: 8px; margin: 10px 0; border-left: 4px solid #ffc107;">
-                            <small><strong>💡 Prompt Tips:</strong><br>
-                            • Keep prompts under 75 tokens (~15-20 words)<br>
-                            • Focus on main subject and key details<br>
-                            • Let the style preset handle quality terms</small>
-                        </div>
-                    ''')
-                    
-                    negative_prompt_input = gr.Textbox(
-                        label="Negative Prompt (Optional)",
-                        placeholder="low quality, blurry, deformed...",
-                        lines=3,  # 减少行数
-                        elem_classes=["prompt-box"]
-                    )
-                
-                # 右侧：控制选项
-                with gr.Column(scale=1):
-                    # Style 选项
-                    with gr.Group(elem_classes=["controls-section"]):
-                        style_input = gr.Radio(
-                            label="Style Preset",
-                            choices=list(STYLE_PRESETS.keys()),
-                            value="Realistic"
-                        )
-                    
-                    # Seed 选项
-                    with gr.Group(elem_classes=["controls-section"]):
-                        seed_input = gr.Number(
-                            label="Seed (-1 for random)",
-                            value=-1,
-                            precision=0
-                        )
-                    
-                    # 宽度选择（降低最大值）
-                    with gr.Group(elem_classes=["controls-section"]):
-                        width_input = gr.Slider(
-                            label="Width",
-                            minimum=512,
-                            maximum=1024,  # 降低最大值
-                            value=1024,
-                            step=64
-                        )
-                    
-                    # 高度选择（降低最大值）
-                    with gr.Group(elem_classes=["controls-section"]):
-                        height_input = gr.Slider(
-                            label="Height",
-                            minimum=512,
-                            maximum=1024,  # 降低最大值
-                            value=1024,
-                            step=64
-                        )
-                    
-                    # 高级参数（调整默认值）
-                    with gr.Group(elem_classes=["controls-section"]):
-                        steps_input = gr.Slider(
-                            label="Steps",
-                            minimum=10,
-                            maximum=30,  # 降低最大值
-                            value=20,    # 降低默认值
-                            step=1
-                        )
-                        
-                        cfg_input = gr.Slider(
-                            label="CFG Scale",
-                            minimum=1.0,
-                            maximum=15.0,
-                            value=3.5,
-                            step=0.1
-                        )
-                    
-                    # 生成按钮
-                    generate_button = gr.Button(
-                        "GENERATE",
-                        elem_classes=["generate-btn"],
-                        variant="primary"
-                    )
-            
-            # 图片输出区域
-            image_output = gr.Image(
-                label="Generated Image",
-                elem_classes=["image-output"],
-                show_label=False,
-                container=True
-            )
-            
-            # 图片信息和保存按钮
-            generation_info = gr.Textbox(
-                label="Generation Info",
-                interactive=False,
-                elem_classes=["image-info"],
-                show_label=False,
-                visible=False
-            )
-            
-            # 隐藏的变量存储
-            metadata_content = gr.Textbox(visible=False)
-            current_seed = gr.Number(visible=False)
-            current_image = gr.Image(visible=False)
-            
-            # 下载按钮区域
-            with gr.Row(visible=False) as download_row:
-                download_image_btn = gr.Button(
-                    "Save Image",
-                    elem_classes=["save-btn"],
-                    size="sm"
-                )
-                
-                download_metadata_btn = gr.Button(
-                    "Save Metadata",
-                    elem_classes=["save-btn"],
-                    size="sm"
-                )
-        
-        # 生成图片的主要函数
-        def on_generate(prompt, style, neg_prompt, steps, cfg, seed, width, height):
-            image, info, metadata = generate_image(
-                prompt, style, neg_prompt, steps, cfg, seed, width, height
-            )
-            
-            if image is not None:
-                # 提取实际使用的 seed
-                try:
-                    actual_seed = seed if seed != -1 else int(info.split("Seed:")[1].split("|")[0].strip())
-                except:
-                    actual_seed = seed if seed != -1 else random.randint(0, 999999)
-                
-                return (
-                    image,  # 图片输出
-                    info,   # 生成信息
-                    metadata,  # 元数据
-                    actual_seed,  # 当前 seed
-                    image,  # 当前图片副本
-                    gr.update(visible=True),  # 显示生成信息
-                    gr.update(visible=True)   # 显示下载按钮区域
-                )
-            else:
-                return (
-                    None, 
-                    info, 
-                    "", 
-                    0,
-                    None,
-                    gr.update(visible=False),
-                    gr.update(visible=False)
-                )
-        
-        # 创建下载文件的函数
-        def create_download_image(image_data, seed_val):
-            if image_data is not None:
-                filename = f"IMG_{seed_val}.png"
-                filepath = os.path.join(SAVE_DIR, filename)
-                image_data.save(filepath, format="PNG", optimize=True)
-                return filepath
-            return None
-            
-        def create_download_metadata(metadata_text, seed_val):
-            if metadata_text:
-                filename = f"IMG_{seed_val}.txt"
-                filepath = os.path.join(SAVE_DIR, filename)
-                with open(filepath, 'w', encoding='utf-8') as f:
-                    f.write(metadata_text)
-                return filepath
-            return None
-        
-        # 绑定生成事件
-        generate_button.click(
-            fn=on_generate,
-            inputs=[
-                prompt_input, style_input, negative_prompt_input, 
-                steps_input, cfg_input, seed_input, width_input, height_input
-            ],
-            outputs=[
-                image_output, generation_info, metadata_content, 
-                current_seed, current_image, generation_info, download_row
-            ],
-            show_progress=True
-        )
-        
-        # 支持 Enter 键触发
-        prompt_input.submit(
-            fn=on_generate,
-            inputs=[
-                prompt_input, style_input, negative_prompt_input, 
-                steps_input, cfg_input, seed_input, width_input, height_input
-            ],
-            outputs=[
-                image_output, generation_info, metadata_content, 
-                current_seed, current_image, generation_info, download_row
-            ],
-            show_progress=True
-        )
-        
-        # 下载图片
-        def handle_image_download(image_data, seed_val):
-            filepath = create_download_image(image_data, seed_val)
-            if filepath:
-                return gr.File(value=filepath, visible=True)
-            return gr.File(visible=False)
-        
-        download_image_btn.click(
-            fn=handle_image_download,
-            inputs=[current_image, current_seed],
-            outputs=[gr.File()]
-        )
-        
-        # 下载元数据
-        def handle_metadata_download(metadata_text, seed_val):
-            filepath = create_download_metadata(metadata_text, seed_val)
-            if filepath:
-                return gr.File(value=filepath, visible=True)
-            return gr.File(visible=False)
-        
-        download_metadata_btn.click(
-            fn=handle_metadata_download,
-            inputs=[metadata_content, current_seed],
-            outputs=[gr.File()]
-        )
-        
-        # 启动时显示欢迎信息
-        interface.load(
-            fn=lambda: (
-                None, "", "", 0, None,
-                gr.update(visible=False), 
-                gr.update(visible=False)
-            ),
-            outputs=[
-                image_output, generation_info, metadata_content, 
-                current_seed, current_image, generation_info, download_row
-            ]
-        )
+    style_terms = ""
+    if style in STYLE_ENHANCERS:
+        style_terms = ", " + ", ".join(STYLE_ENHANCERS[style][:2])  # 从3减到2
     
-    return interface
-
-# ===== 启动应用 =====
-if __name__ == "__main__":
-    print("🎨 Starting NSFW FLUX Image Generator...")
-    print(f"🔧 Fixed Model: {FIXED_MODEL}")
-    print(f"🔧 CUDA: {'✅ Available' if torch.cuda.is_available() else '❌ Not Available'}")
+    style_suffix = STYLE_PRESETS.get(style, "")
+    
+    enhanced_parts = [prompt.strip()]
+    
+    if style_suffix:
+        enhanced_parts.append(style_suffix)
+    
+    if style_terms:
+        enhanced_parts.append(style_terms.lstrip(", "))
+    
+    enhanced_parts.append(quality_terms)
+    
+    enhanced_prompt = ", ".join(filter(None, enhanced_parts))
     
-    app = create_interface()
-    app.queue(max_size=5, default_concurrency_limit=1)  # 降低并发限制
+    # 提高长度限制,但不要太长
+    if len(enhanced_prompt) > 800:  # 从500提高到800
+        enhanced_prompt = enhanced_prompt[:800]
     
-    app.launch(
-        server_name="0.0.0.0",
-        server_port=7860,
-        show_error=True,
-        share=False
-    )
+    return enhanced_prompt
+
+
+# UI中的步数滑块也要调整
+steps_input = gr.Slider(
+    label="Steps (15-20 recommended for speed)",
+    minimum=10,
+    maximum=25,  # 从30降到25
+    value=15,    # 从20降到15
+    step=1
+)
+
+# 添加尺寸预设方便快速选择
+size_preset = gr.Radio(
+    label="Size Preset (smaller = faster)",
+    choices=["768x768 (Fast)", "1024x1024 (Quality)"],
+    value="768x768 (Fast)"
+)