fixed rescaling objs_found in api face_recognize route

app/api/routes.py

@@ -224,26 +224,25 @@ def face_recognition(username):
         print(faces[i],":",db_faces_features[i].shape)
     
     
-    img,objs_found=face_detector.predict(image)
-    h,w=img.shape[:2]
+    _,objs_found=face_detector.predict(image)
+    objs_found=face_detector.square_preprocessing.rescale(objs_found)   #rescale coordinates to original image's resolution
+    h,w=image.shape[:2]
+
     tree=fr_helper.objs_found_to_xml("test.jpg",w,h,objs_found)
 
     # face_recognizer.set_face_db_and_mode(faces=faces,db_faces_features=db_faces_features,distance_mode="avg",recognition_mode="repeat")
     face_recognizer.set_face_db_and_mode(faces=faces,db_faces_features=db_faces_features,distance_mode="best",recognition_mode="repeat")
 
     if len(faces)>0:
-        tree=face_recognizer.predict(img,tree)
+        tree=face_recognizer.predict(image,tree)
         
         
-    # print(objs_found[0])
-    
 
-    pred_img=fr_helper.show_pred_image(tree,img)
+    pred_img=fr_helper.show_pred_image(tree,image)
     pred_img=image_to_base64(pred_img)
     objs_found=fr_helper.xml_to_objs_found(tree) # everything is okay till here
     
-    objs_found=face_detector.square_preprocessing.rescale(objs_found)   #rescale coordinates to original image's resolution
-    # print(objs_found[0])
+    
 
     all_crops=fd_get_crops(image,objs_found)
     all_crops_base64=[]

face_recognition/helper.py

@@ -53,6 +53,15 @@ def xml_to_objs_found(tree):
 
 
 def objs_found_to_xml(test_img,w,h,objs_found):
+
+    def rescale(obj_found,w,h):
+        # xywh
+        obj_found[0]*=w
+        obj_found[1]*=h
+        obj_found[2]*=w
+        obj_found[3]*=h
+        return obj_found
+
     root=ET.Element("annotation")
 
     filename_tag=ET.Element("filename")
@@ -80,7 +89,7 @@ def objs_found_to_xml(test_img,w,h,objs_found):
 
     # add all objects
     for obj_found in objs_found:
-        obj_found['xywh']=np.array(obj_found['xywh'])*w
+        obj_found['xywh']=rescale(obj_found['xywh'],w,h)
 
         obj_tag=ET.Element("object")
         name_tag=ET.Element("name")
@@ -97,8 +106,6 @@ def objs_found_to_xml(test_img,w,h,objs_found):
         ymax_tag=ET.Element("ymax")
         ymax_tag.text=str(int(obj_found['xywh'][1]+obj_found['xywh'][3]))
 
-        obj_found['xywh']=np.array(obj_found['xywh'])/w
-
         bndbox_tag.append(xmin_tag)
         bndbox_tag.append(ymin_tag)
         bndbox_tag.append(xmax_tag)
@@ -112,4 +119,7 @@ def objs_found_to_xml(test_img,w,h,objs_found):
     # with open(xml_file_path,"wb") as f:
     #     xml.write(f)
 
-    return xml
+    return xml
+
+
+