Update app.py

app.py

@@ -11,10 +11,11 @@ from concurrent.futures import ThreadPoolExecutor, as_completed, TimeoutError
 # -------------------- CONFIG --------------------
 model_paths = {
     "pores": "pores.pt",
-    "newpig": "newpig.pt",
+    "combine": "combine.pt",   # ✅ replaced newpig with combine
     "wrinkle": "wrinkle.pt",
 }
 default_conf_threshold = 0.05
+combine_conf_threshold = 0.08   # ✅ special threshold for combine.pt
 imgsz = 1024
 
 # -------------------- INIT --------------------
@@ -77,7 +78,12 @@ def detect_skin_type_from_image(img):
 
 # -------------------- HELPERS --------------------
 def run_model(model_name, model, img, face_polygon, face_area):
-    conf = 0.03 if model_name == "newpig" else default_conf_threshold
+    # ✅ set special conf threshold for combine.pt
+    if model_name == "combine":
+        conf = combine_conf_threshold
+    else:
+        conf = default_conf_threshold
+
     results = model(img, conf=conf, imgsz=imgsz)
     boxes_xy = results[0].boxes.xyxy.cpu().numpy()
     boxes_cls = results[0].boxes.cls.cpu().numpy().astype(int)
@@ -86,7 +92,9 @@ def run_model(model_name, model, img, face_polygon, face_area):
 
     for i, cls_id in enumerate(boxes_cls):
         cls_name = model.names.get(cls_id, str(cls_id)).lower()
-        if model_name == "newpig" and cls_name in ["pores", "wrinkle"]:
+
+        # ✅ Ignore wrinkles from combine.pt
+        if model_name == "combine" and cls_name == "wrinkle":
             continue
 
         x1, y1, x2, y2 = boxes_xy[i].astype(int)
@@ -98,10 +106,10 @@ def run_model(model_name, model, img, face_polygon, face_area):
 
     skin_percentages = {name.lower(): 0.0 for name in model.names.values()}
 
-    if model_name == "newpig":
-        for dup in ["pores", "wrinkle"]:
-            if dup in skin_percentages:
-                skin_percentages.pop(dup)
+    # ✅ Remove wrinkle from combine model output completely
+    if model_name == "combine":
+        if "wrinkle" in skin_percentages:
+            skin_percentages.pop("wrinkle")
 
     for cls_id, polys in class_polygons.items():
         union_poly = unary_union(polys)