Update app.py

app.py

@@ -27,6 +27,7 @@ def apply_preset(preset_name):
         preset["lora_scale"],
         preset["depth_control_scale"],
         preset["identity_control_scale"],
+        preset["expression_control_scale"], # <-- NEW
         f"[APPLIED] {preset_name}\n{preset['description']}"
     )
 
@@ -40,6 +41,7 @@ def process_image(
     guidance_scale,
     depth_control_scale,
     identity_control_scale,
+    expression_control_scale, # <-- NEW
     lora_scale,
     identity_preservation,
     strength,
@@ -62,6 +64,7 @@ def process_image(
             guidance_scale=guidance_scale,
             depth_control_scale=depth_control_scale,
             identity_control_scale=identity_control_scale,
+            expression_control_scale=expression_control_scale, # <-- NEW
             lora_scale=lora_scale,
             identity_preservation=identity_preservation,
             strength=strength,
@@ -106,7 +109,8 @@ def get_model_status():
         status_text += f"- Custom Checkpoint (Horizon): {'[OK] Loaded' if converter.models_loaded['custom_checkpoint'] else '[OK] Using SDXL base'}\n"
         status_text += f"- LORA (RetroArt): {'[OK] Loaded' if converter.models_loaded['lora'] else ' Disabled'}\n"
         status_text += f"- InstantID: {'[OK] Loaded' if converter.models_loaded['instantid'] else ' Disabled'}\n"
-        status_text += f"- Midas Depth: {'[OK] Loaded' if converter.models_loaded['midas_depth'] else ' Fallback'}\n"
+        status_text += f"- Zoe Depth: {'[OK] Loaded' if converter.models_loaded['zoe_depth'] else ' Fallback'}\n"
+        status_text += f"- OpenPose (Expression): {'[OK] Loaded' if converter.models_loaded.get('openpose', False) else ' Disabled'}\n" # <-- NEW
         status_text += f"- IP-Adapter (Face Embeddings): {'[OK] Loaded' if converter.models_loaded.get('ip_adapter', False) else ' Keypoints only'}\n"
         return status_text
     return "**Model status unavailable**"
@@ -174,6 +178,7 @@ with gr.Blocks(title="Pixagram - AI Pixel Art Generator", theme=gr.themes.Soft()
     **[CONFIG] Advanced Configuration:**
     - Pipeline: **Img2Img** (structure preservation)
     - Face System: **CLIP + InsightFace** (dual embeddings)
+    - **[NEW] Expression Control:** OpenPose-Face (68 keypoints)
     - **[ADVANCED] Enhanced Resampler:** 10 layers, 20 heads (+3-5% quality)
     - **[ADVANCED] Adaptive Attention:** Context-aware scaling (+2-3% quality)
     - **[ADVANCED] Multi-Scale Processing:** 3-scale face analysis (+1-2% quality)
@@ -194,14 +199,14 @@ with gr.Blocks(title="Pixagram - AI Pixel Art Generator", theme=gr.themes.Soft()
             
             prompt = gr.Textbox(
                 label="Prompt (trigger word auto-added)",
-                value=" ",
+                value="",
                 lines=3,
                 info=f"'{TRIGGER_WORD}' will be automatically added"
             )
             
             negative_prompt = gr.Textbox(
                 label="Negative Prompt",
-                value=" ",
+                value="",
                 lines=2
             )
             
@@ -280,6 +285,16 @@ with gr.Blocks(title="Pixagram - AI Pixel Art Generator", theme=gr.themes.Soft()
                     label="InstantID ControlNet Scale (facial keypoints structure)"
                 )
                 
+                # --- NEW SLIDER ---
+                expression_control_scale = gr.Slider(
+                    minimum=0.1,
+                    maximum=1.2,
+                    value=DEFAULT_PARAMS['expression_control_scale'],
+                    step=0.05,
+                    label="[NEW] Expression Control Scale (OpenPose shape)"
+                )
+                # --- END NEW SLIDER ---
+                
                 identity_preservation = gr.Slider(
                     minimum=0.3,
                     maximum=2.0,
@@ -329,6 +344,7 @@ with gr.Blocks(title="Pixagram - AI Pixel Art Generator", theme=gr.themes.Soft()
             ### Tips for Maximum Quality Results:
             
             **[OPTIMIZATIONS] Advanced Optimizations Active:**
+            - **[NEW] Expression Control:** OpenPose-Face (68 keypoints)
             - **Enhanced Resampler:** 10 layers, 20 heads (+3-5% quality)
             - **Adaptive Attention:** Context-aware scaling (+2-3% quality)
             - **Multi-Scale Processing:** 3-scale face analysis (+1-2% quality)
@@ -351,7 +367,7 @@ with gr.Blocks(title="Pixagram - AI Pixel Art Generator", theme=gr.themes.Soft()
             **[ADAPTIVE] Automatic Adjustments:**
             - Small faces (< 50K px): Boosts identity preservation to 1.8
             - Low confidence (< 80%): Increases identity control to 0.9
-            - Profile views (> 20° yaw): Enhances preservation to 1.7
+            - Profile views (> 20° yaw): Enhances preservation to 1.7
             - Good quality faces: Uses your selected parameters
             
             **[PARAMETERS] Parameter Relationships:**
@@ -367,7 +383,7 @@ with gr.Blocks(title="Pixagram - AI Pixel Art Generator", theme=gr.themes.Soft()
             - Validates parameter combinations for predictability
             - Prevents identity-LORA conflicts
             - Keeps CFG in optimal LCM range
-            - Balances ControlNet scales
+            - Balances ControlNet scales (now 3 models, max 2.0 total)
             - Recommended: Always ON
             
             **[SEED] Reproducibility:**
@@ -390,55 +406,54 @@ with gr.Blocks(title="Pixagram - AI Pixel Art Generator", theme=gr.themes.Soft()
             - Resolution: Auto-optimized to 896x1152 or 832x1216
             """)
     
-    # Preset button click events
+    # --- MODIFIED: Preset button click events (added expression_control_scale) ---
+    all_sliders = [strength, guidance_scale, identity_preservation, lora_scale, 
+                   depth_control_scale, identity_control_scale, expression_control_scale, 
+                   preset_status]
+    
     preset_btn_1.click(
         fn=lambda: apply_preset("Ultra Fidelity"),
         inputs=[],
-        outputs=[strength, guidance_scale, identity_preservation, lora_scale, 
-                depth_control_scale, identity_control_scale, preset_status]
+        outputs=all_sliders
     )
     
     preset_btn_2.click(
         fn=lambda: apply_preset("Premium Portrait"),
         inputs=[],
-        outputs=[strength, guidance_scale, identity_preservation, lora_scale, 
-                depth_control_scale, identity_control_scale, preset_status]
+        outputs=all_sliders
     )
     
     preset_btn_3.click(
         fn=lambda: apply_preset("Balanced Portrait"),
         inputs=[],
-        outputs=[strength, guidance_scale, identity_preservation, lora_scale, 
-                depth_control_scale, identity_control_scale, preset_status]
+        outputs=all_sliders
     )
     
     preset_btn_4.click(
         fn=lambda: apply_preset("Artistic Excellence"),
         inputs=[],
-        outputs=[strength, guidance_scale, identity_preservation, lora_scale, 
-                depth_control_scale, identity_control_scale, preset_status]
+        outputs=all_sliders
     )
     
     preset_btn_5.click(
         fn=lambda: apply_preset("Style Focus"),
         inputs=[],
-        outputs=[strength, guidance_scale, identity_preservation, lora_scale, 
-                depth_control_scale, identity_control_scale, preset_status]
+        outputs=all_sliders
     )
     
     preset_btn_6.click(
         fn=lambda: apply_preset("Subtle Enhancement"),
         inputs=[],
-        outputs=[strength, guidance_scale, identity_preservation, lora_scale, 
-                depth_control_scale, identity_control_scale, preset_status]
+        outputs=all_sliders
     )
     
+    # --- MODIFIED: generate_btn.click (added expression_control_scale) ---
     generate_btn.click(
         fn=process_image,
         inputs=[
             input_image, prompt, negative_prompt, steps, guidance_scale,
-            depth_control_scale, identity_control_scale, lora_scale, 
-            identity_preservation, strength, enable_color_matching, 
+            depth_control_scale, identity_control_scale, expression_control_scale, 
+            lora_scale, identity_preservation, strength, enable_color_matching, 
             consistency_mode, seed_input, enable_captions
         ],
         outputs=[output_image, caption_output]
@@ -450,6 +465,5 @@ if __name__ == "__main__":
     demo.launch(
         server_name="0.0.0.0",
         server_port=7860,
-        share=True,
         show_api=True
     )