Update model.py

model.py

@@ -15,14 +15,18 @@ from pipeline_stable_diffusion_xl_instantid_img2img import StableDiffusionXLInst
 
 from huggingface_hub import snapshot_download, hf_hub_download
 from insightface.app import FaceAnalysis
-from processor import Processor
+# --- MODIFIED: Import new detectors ---
+from controlnet_aux import LeresDetector, LineartAnimeDetector
+# --- END MODIFIED ---
 
 class ModelHandler:
     def __init__(self):
         self.pipeline = None
         self.app = None # InsightFace
-        self.zoe_detector = None
-        self.lineart_detector = None
+        # --- MODIFIED: Rename detectors ---
+        self.leres_detector = None
+        self.lineart_anime_detector = None
+        # --- END MODIFIED ---
         self.face_analysis_loaded = False
 
     def load_face_analysis(self):
@@ -79,30 +83,14 @@ class ModelHandler:
         )
         print("  [OK] Loaded InstantID ControlNet.")
         
-        print("Loading Depth and Edge ControlNets...")
-
-        # --- FIX: Load the actual ControlNetModels, not the 'controlnet-aux' Processors ---
-        # The 'Processor' class is for pre-processing (creating the maps), 
-        # not for the model itself. Your Config.DEPTH ("lesres++") is an ID
-        # for the pre-processor, which is correctly used at the end of this file.
-        
-        cn_depth = ControlNetModel.from_pretrained(
-            Config.DEPTH_REPO,
-            torch_dtype=Config.DTYPE
-        )
-        print(f"  [OK] Loaded Depth ControlNet ({DEPTH_MODEL_REPO}).")
-        
-        cn_edge = ControlNetModel.from_pretrained(
-            Config.EDGE_REPO,
-            torch_dtype=Config.DTYPE
-        )
-        print(f"  [OK] Loaded Edge/LineArt ControlNet ({EDGE_MODEL_REPO}).")
-        
-        # --- End fix ---
+        # Load other ControlNets normally
+        print("Loading Zoe and LineArt ControlNets...")
+        cn_zoe = ControlNetModel.from_pretrained(Config.CN_ZOE_REPO, torch_dtype=Config.DTYPE)
+        cn_lineart = ControlNetModel.from_pretrained(Config.CN_LINEART_REPO, torch_dtype=Config.DTYPE)
 
         # --- Manually wrap the list of models in a MultiControlNetModel ---
         print("Wrapping ControlNets in MultiControlNetModel...")
-        controlnet_list = [cn_instantid, cn_depth, cn_edge]
+        controlnet_list = [cn_instantid, cn_zoe, cn_lineart]
         controlnet = MultiControlNetModel(controlnet_list)
         # --- End wrapping ---
 
@@ -170,11 +158,11 @@ class ModelHandler:
         #     print(f"  [WARNING] torch.compile failed: {e}. Running without compilation.")
         
         # 6. Load Preprocessors
-        # This is the CORRECT place to use the 'Processor' class
-        # Config.DEPTH ("lesres++") and Config.EDGE are the annotator IDs
-        print("Loading Preprocessors (Zoe, LineArt)...")
-        self.depth_detector = Processor(Config.DEPTH)
-        self.edge_detector = Processor(Config.EDGE)
+        # --- MODIFIED: Load new detectors ---
+        print("Loading Preprocessors (LeReS, LineArtAnime)...")
+        self.leres_detector = LeresDetector.from_pretrained(Config.ANNOTATOR_REPO)
+        self.lineart_anime_detector = LineartAnimeDetector.from_pretrained(Config.ANNOTATOR_REPO)
+        # --- END MODIFIED ---
         
         print("--- All models loaded successfully ---")
 
@@ -185,6 +173,7 @@ class ModelHandler:
             
         try:
             # Convert PIL to CV2
+            # --- FIX: Corrected OpenCV attribute ---
             cv2_img = cv2.cvtColor(np.array(image), cv2.COLOR_RGB2BGR) 
             faces = self.app.get(cv2_img)