Update app.py

app.py

@@ -38,8 +38,8 @@ def encode_image_to_base64(image):
     image.save(buffered, format="PNG")
     return base64.b64encode(buffered.getvalue()).decode('utf-8')
 
-# Détecter les personnes et extraire les images
-def detect_person(image):
+# Détecter les personnes et segmenter leurs vêtements
+def detect_and_segment_persons(image, clothes):
     img = np.array(image)
     img = img[:, :, ::-1]  # RGB -> BGR
 
@@ -57,18 +57,22 @@ def detect_person(image):
     bboxes[:, 2] = np.clip(bboxes[:, 2], 0, width)   # x2
     bboxes[:, 3] = np.clip(bboxes[:, 3], 0, height)  # y2
 
-    person_images = []
+    segmented_images = []
     for i in range(bboxes.shape[0]):
         bbox = bboxes[i]
         x1, y1, x2, y2 = bbox
         person_img = img[y1:y2, x1:x2]
 
-        # Convert numpy array to PIL Image and encode to base64
+        # Convert numpy array to PIL Image
         pil_img = Image.fromarray(person_img[:, :, ::-1])  # BGR -> RGB
-        base64_img = encode_image_to_base64(pil_img)
-        person_images.append(base64_img)
 
-    return person_images
+        # Segment clothing for the detected person
+        segmented_result = segment_clothing(pil_img, clothes)
+
+        # Append segmented results
+        segmented_images.append(segmented_result)
+
+    return segmented_images
 
 @app.route('/api/detect', methods=['POST'])
 def detect():
@@ -77,25 +81,13 @@ def detect():
         image_base64 = data['image']
         image = decode_image_from_base64(image_base64)
         
-        person_images_base64 = detect_person(image)
+        # Détection et segmentation des personnes
+        clothes = ["Upper-clothes", "Skirt", "Pants", "Dress"]
+        person_images_base64 = detect_and_segment_persons(image, clothes)
         
         return jsonify({'images': person_images_base64})
     except Exception as e:
         return jsonify({'error': str(e)}), 500
 
-def segment_image(img, clothes):
-    img = decode_image_from_base64(img)
-    return segment_clothing(img, clothes)
-
-# Route pour l'API REST
-@app.route('/api/classify', methods=['POST'])
-def classify():
-    data = request.json
-    print(data)
-    clothes = ["Upper-clothes", "Skirt", "Pants", "Dress"]
-    image = data['image']
-    result = segment_image(image,clothes)
-    return jsonify({'result': result})
-
 if __name__ == "__main__":
     app.run(debug=True, host="0.0.0.0", port=7860)