square_preprocessing.rescale applied everywhere

app/api/routes.py

@@ -176,8 +176,9 @@ def get_crops(username):
     image=np.array(image)
     print(image.shape)
 
-    image,objs_found=face_detector.predict(image)
-    print(objs_found)
+    _,objs_found=face_detector.predict(image)
+    # print(objs_found)
+    objs_found=face_detector.square_preprocessing.rescale(objs_found)   #rescale coordinates to original image's resolution
       
     all_aligned_crops=fd_get_crops(image,objs_found,aligner_obj,resize=(face_recognizer.model_config.input_size,face_recognizer.model_config.input_size))
     all_aligned_crops_base64=[]

app/demo/routes.py

@@ -87,9 +87,9 @@ def set_crops():
     face_detector.image_size=get_image_size(session["demo"]['settings']['db_mode'])
     print(face_detector.image_size)
 
-    image,objs_found=face_detector.predict(image)
-    print(face_detector.image_size)
-      
+    _,objs_found=face_detector.predict(image)
+    objs_found=face_detector.square_preprocessing.rescale(objs_found)   #rescale coordinates to original image's resolution
+    print(image.shape)
     all_aligned_crops=fd_get_crops(image,objs_found,aligner_obj,resize=(face_recognizer.model_config.input_size,face_recognizer.model_config.input_size))
     all_aligned_crops_base64=[]
     all_aligned_crops_names=[]
@@ -156,11 +156,14 @@ def face_recognition():
     
     face_detector.image_size=get_image_size(session["demo"]['settings']['fr_mode'])
     
-    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)
-    tree=face_recognizer.predict(img,tree)
-    pred_img=fr_helper.show_pred_image(tree,img)
+    tree=face_recognizer.predict(image,tree)
+    pred_img=fr_helper.show_pred_image(tree,image)
     
     pred_img=helper.image_to_base64(pred_img)
 

app/helper.py

@@ -13,7 +13,7 @@ def image_to_base64(img):
         rawBytes=io.BytesIO()
         img.save(rawBytes,"JPEG")
         rawBytes.seek(0)
-        img_base64=str(base64.b64encode(rawBytes.read()))
+        img_base64=base64.b64encode(rawBytes.read()).decode()
         return img_base64
 
 def base64_to_image(img_base64):

app/static/demo/index/script.js

@@ -119,7 +119,7 @@ database_input.addEventListener("change", function(e){
                     var img_container_tag=document.createElement("div");
                     var img_remove_tag=document.createElement("p");
                     var img_tag=document.createElement("img");
-                    img_tag.src="data:image/jpeg;base64,"+response['image'].split('\'')[1];
+                    img_tag.src="data:image/jpeg;base64,"+response['image'];
                     img_tag.setAttribute("class","db_image");
                     img_remove_tag.setAttribute("class","close_text");
                     img_remove_tag.innerHTML="✖";
@@ -165,7 +165,7 @@ database_input.addEventListener("change", function(e){
                     {
                         var crop_container=document.querySelector("#unassigned_faces");
                         var crop_img=document.createElement("img");
-                        crop_img.src="data:image/jpeg;base64,"+response["crops"][i].split('\'')[1];
+                        crop_img.src="data:image/jpeg;base64,"+response["crops"][i];
                         crop_img.dataset.image_name=response['image_name'];
                         
                         crop_img.setAttribute("class","crop_img");
@@ -406,7 +406,7 @@ function face_recognition(elem)
         }).then(function(response){
             hide_loading_bar();
             console.log(response);
-            document.querySelector("#face_rec_image").src="data:image/jpeg;base64,"+response['image'].split('\'')[1];
+            document.querySelector("#face_rec_image").src="data:image/jpeg;base64,"+response['image'];
         })
         
         

app/static/user/dashboard.js

@@ -216,7 +216,7 @@ function filterFunction() {
                       {
                           
                           var crop_img=document.createElement("img");
-                          crop_img.src="data:image/jpeg;base64,"+response["crops"][i].split('\'')[1];                          
+                          crop_img.src="data:image/jpeg;base64,"+response["crops"][i];                          
                           crop_img.setAttribute("class","crop_img");
                           // crop_img.setAttribute("id",crop_img.dataset.image_name+'\\'+crop_img.dataset.crop_name);
                           crop_img.setAttribute("draggable","true");
@@ -326,7 +326,7 @@ function face_recoginization(elem){
         }).then(function(response){
             hide_loading_bar();
             console.log(response);
-            document.querySelector("#face_recognition_image").src="data:image/jpeg;base64,"+response["pred_image"].split('\'')[1];                          
+            document.querySelector("#face_recognition_image").src="data:image/jpeg;base64,"+response["pred_image"];                          
             document.querySelector("#face_recognition_image").style.width="unset";
         })
     }

app/user/routes.py

@@ -326,8 +326,10 @@ def get_crops():
     print(image.shape)
     # do your deep learning work
     face_detector.image_size=get_image_size(settings['db_mode'])
-    image,objs_found=face_detector.predict(image)
-    print(objs_found)
+    _,objs_found=face_detector.predict(image)
+    
+    objs_found=face_detector.square_preprocessing.rescale(objs_found)   #rescale coordinates to original image's resolution
+    print(image.shape)
       
     all_aligned_crops=fd_get_crops(image,objs_found,aligner_obj,resize=(face_recognizer.model_config.input_size,face_recognizer.model_config.input_size))
     all_aligned_crops_base64=[]
@@ -414,12 +416,18 @@ def face_recognition():
     
     # 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")
-    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)
-    tree=face_recognizer.predict(img,tree)
-    pred_img=fr_helper.show_pred_image(tree,img)
+    tree=face_recognizer.predict(image,tree)
+    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)