Update utils/editor.py

utils/editor.py

@@ -29,7 +29,7 @@ _OP_DETECTOR = None
 def get_openpose_detector():
     global _OP_DETECTOR
     if _OP_DETECTOR is None:
-        _OP_DETECTOR = OpenposeDetector()
+        _OP_DETECTOR = OpenposeDetector.from_pretrained("lllyasviel/ControlNet")
     return _OP_DETECTOR
 
 def load_pipeline():
@@ -129,45 +129,25 @@ def extract_pose_and_keypoints(model_img: Image.Image) -> Tuple[Image.Image, Dic
     keypoints úteis (ombros). keypoints dict = {"left_shoulder":(x,y), ...}
     """
     detector = get_openpose_detector()
-    # detect returns a PIL image of the pose map; but also returns 'keypoints' structure if requested
-    # controlnet_aux OpenposeDetector has method detect which returns images; to get keypoints we call detect_and_return_info
-    # We'll attempt to call 'detect' and fallback if not available
     try:
-        detected = detector.detect(model_img)
-        # detector.detect returns a pose image (PIL)
-        pose_image = detected
-        # try to get keypoints via internal method if present (may vary by version)
+        # Gera o mapa de pose
+        pose_image = detector(model_img)  # Chama diretamente como callable — retorna PIL.Image
+        pose_image = pose_image.convert("RGB")
+
+        # Tenta extrair keypoints (depende da versão)
+        keypoints = {}
         try:
-            info = detector.get_pose(model_img)  # some versions provide get_pose
-            # info parsing: try to find shoulders - adapt defensively
-            keypoints = {}
-            for person in info:
-                # each person: list of points or dict depending implementation
-                # attempt to parse common formats
-                if isinstance(person, dict):
-                    if "left_shoulder" in person and "right_shoulder" in person:
-                        keypoints["left_shoulder"] = tuple(person["left_shoulder"])
-                        keypoints["right_shoulder"] = tuple(person["right_shoulder"])
-                        break
-                elif isinstance(person, list) or isinstance(person, tuple):
-                    # fallback: OpenPose ordering often uses indices:
-                    # 2 = right shoulder, 5 = left shoulder OR vice-versa depending on lib.
-                    # We'll try both orders defensively
-                    try:
-                        p2 = person[2]
-                        p5 = person[5]
-                        # p2/p5 are (x,y,confidence) or similar
-                        keypoints["right_shoulder"] = (int(p2[0]), int(p2[1]))
-                        keypoints["left_shoulder"] = (int(p5[0]), int(p5[1]))
-                        break
-                    except Exception:
-                        continue
-            return pose_image.convert("RGB"), keypoints
+            # Alguns detectores permitem chamar .to(...) para mover para GPU, mas aqui vamos no básico
+            # Versões recentes do controlnet_aux não expõem facilmente os keypoints
+            # Vamos pular por enquanto — alinhamento será por fallback
+            pass
         except Exception:
-            # if we can't get structured keypoints, just return pose image and empty dict
-            return pose_image.convert("RGB"), {}
+            pass
+
+        return pose_image, keypoints
+
     except Exception as e:
-        # last fallback: return blank pose (grayscale) and empty keypoints
+        # fallback: return blank pose and empty keypoints
         blank = Image.new("RGB", model_img.size, (255,255,255))
         return blank, {}