Upload 7 files

app.py

@@ -1,8 +1,6 @@
 import gradio as gr
 import spaces
 import torch
-# --- 4. Import GC for memory management ---
-import gc 
 from model import ModelHandler
 from generator import Generator
 # --- IMPORT CONFIG ---
@@ -24,11 +22,7 @@ def process_img(
     steps, 
     img_strength, 
     depth_strength, 
-    edge_strength,
-    # --- 2. Add negative prompt ---
-    negative_prompt,
-    # --- 3. Add face likeness ---
-    face_likeness
+    edge_strength
 ):
     if image is None:
         raise gr.Error("Please upload an image first.")
@@ -43,20 +37,9 @@ def process_img(
             num_inference_steps=steps,
             img2img_strength=img_strength,
             depth_strength=depth_strength,
-            lineart_strength=edge_strength,
-            # --- 2. Pass negative prompt ---
-            negative_prompt=negative_prompt,
-            # --- 3. Pass face likeness ---
-            face_likeness=face_likeness
+            lineart_strength=edge_strength
         )
         print("--- Generation Complete ---")
-        
-        # --- 4. Add memory optimization ---
-        print("Cleaning up memory...")
-        gc.collect()
-        torch.cuda.empty_cache()
-        print("Cleanup complete.")
-        
         return result
         
     except Exception as e:
@@ -81,13 +64,6 @@ with gr.Blocks(title="Face To Pixel Art", theme=gr.themes.Soft()) as demo:
                 info="The trigger words 'p1x3l4rt, pixel art' are added automatically."
             )
             
-            # --- 2. Add Negative Prompt Textbox ---
-            negative_prompt = gr.Textbox(
-                label="Negative Prompt",
-                value=Config.NEGATIVE_PROMPT,
-                info="What to avoid generating."
-            )
-            
             # --- MOVED ACCORDION HERE ---
             with gr.Accordion("Advanced Settings", open=False):
                 cfg_scale = gr.Slider(
@@ -135,16 +111,6 @@ with gr.Blocks(title="Face To Pixel Art", theme=gr.themes.Soft()) as demo:
                     value=Config.EDGE_STRENGTH, 
                     label="EdgeMap Strength (LineArt)"
                 )
-                
-                # --- 3. Add Face Likeness Slider ---
-                face_likeness = gr.Slider(
-                    elem_id="face_likeness",
-                    minimum=0.0, 
-                    maximum=1.0, 
-                    step=0.05, 
-                    value=Config.FACE_LIKENESS_STRENGTH, 
-                    label="Face Likeness (InstantID)"
-                )
             # --- END OF MOVED BLOCK ---
 
             run_btn = gr.Button("Generate Pixel Art", variant="primary")
@@ -165,10 +131,7 @@ with gr.Blocks(title="Face To Pixel Art", theme=gr.themes.Soft()) as demo:
         steps, 
         img_strength, 
         depth_strength, 
-        edge_strength,
-        # --- 2 & 3. Add new inputs ---
-        negative_prompt,
-        face_likeness
+        edge_strength
     ]
     
     run_btn.click(

config.py

@@ -9,7 +9,7 @@ class Config:
     REPO_ID = "primerz/pixagram"
     CHECKPOINT_FILENAME = "horizon.safetensors"
     LORA_FILENAME = "retroart.safetensors"
-    LORA_STRENGTH = 1.0 # Fixed strength for fusion
+    LORA_STRENGTH = 1.25 # Fixed strength for fusion
     
     # Trigger Words for the LoRA
     STYLE_TRIGGER = "p1x3l4rt, pixel art"
@@ -36,8 +36,5 @@ class Config:
     CGF_SCALE = 2.4
     STEPS_NUMBER = 8
     IMG_STRENGTH = 0.8
-    DEPTH_STRENGTH = 0.6
-    EDGE_STRENGTH = 0.6
-    FACE_LIKENESS_STRENGTH = 0.8 
-    CLIP_SKIP = 2
-    NEGATIVE_PROMPT = "Photography, Ugly, Blurry, Disformed, Artifacts, Wrong colors, Wrong, Bad, Worse."
+    DEPTH_STRENGTH = 0.9
+    EDGE_STRENGTH = 0.6

generator.py

@@ -1,6 +1,4 @@
 import torch
-# --- 4. Import GC for memory management ---
-import gc
 from config import Config
 from utils import resize_image_to_1mp, get_caption
 from PIL import Image
@@ -28,11 +26,6 @@ class Generator:
         depth_map = depth_map_raw.resize((width, height), Image.LANCZOS)
         lineart_map = lineart_map_raw.resize((width, height), Image.LANCZOS)
         
-        # --- 4. Add memory optimization ---
-        del depth_map_raw
-        del lineart_map_raw
-        gc.collect()
-        
         return depth_map, lineart_map
 
     def predict(
@@ -43,11 +36,7 @@ class Generator:
         num_inference_steps=6,
         img2img_strength=0.3,
         depth_strength=0.3,
-        lineart_strength=0.3,
-        # --- 2. Add negative prompt ---
-        negative_prompt="",
-        # --- 3. Add face likeness ---
-        face_likeness=0.7
+        lineart_strength=0.3
     ):
         # 1. Pre-process Inputs
         print("Processing Input...")
@@ -78,20 +67,16 @@ class Generator:
         # ControlNet order: [InstantID, Zoe, LineArt]
         if face_emb is not None:
             print("Face detected: Applying InstantID.")
-            # --- 3. Use Face Likeness slider ---
-            ip_adapter_scale = face_likeness
-            cn_scale_instantid = face_likeness
-            
-            self.mh.pipeline.set_ip_adapter_scale(ip_adapter_scale) 
-            controlnet_conditioning_scale = [cn_scale_instantid, depth_strength, lineart_strength] 
-            # --- End 3 ---
-            
-            control_guidance_end = [0.3, 0.6, 0.6] # Stop InstantID early (preserves style)
+            # Use strengths from UI
+            controlnet_conditioning_scale = [0.6, depth_strength, lineart_strength] 
+            control_guidance_end = [0.3, 0.6, 0.6] # Stop InstantID early
+            self.mh.pipeline.set_ip_adapter_scale(0.6) # Set IP-Adapter (likeness) strength
         else:
             print("No face detected: Disabling InstantID.")
-            self.mh.pipeline.set_ip_adapter_scale(0.0)
+            # Use strengths from UI, but keep InstantID at 0.0
             controlnet_conditioning_scale = [0.0, depth_strength, lineart_strength] 
             control_guidance_end = [0.3, 0.6, 0.6] 
+            self.mh.pipeline.set_ip_adapter_scale(0.0)
             
             # --- START FIX for NoneType Error ---
             # Create a dummy tensor instead of passing None
@@ -103,8 +88,6 @@ class Generator:
         print("Running pipeline...")
         result = self.mh.pipeline(
             prompt=final_prompt,
-            # --- 2. Pass negative prompt ---
-            negative_prompt=negative_prompt,
             image=processed_image,  # Base image for Img2Img
             control_image=[processed_image, depth_map, lineart_map], # ControlNet inputs
             image_embeds=face_emb,  # Face embedding (or dummy)
@@ -118,8 +101,7 @@ class Generator:
             controlnet_conditioning_scale=controlnet_conditioning_scale,
             control_guidance_end=control_guidance_end,
             
-            # --- 5. Use Clip Skip from Config ---
-            clip_skip=Config.CLIP_SKIP,
+            clip_skip=2,
             
             # --- LoRA Strength REMOVED ---
             # No longer needed, as LoRA is fused into the model weights
@@ -127,11 +109,4 @@ class Generator:
             
         ).images[0]
         
-        # --- 4. Add memory optimization ---
-        del face_emb
-        del depth_map
-        del lineart_map
-        del processed_image
-        gc.collect()
-        
         return result