Update vtoonify_model.py

vtoonify_model.py

@@ -115,13 +115,15 @@ class Model():
         
         return landmarks_68
 
-    def detect_and_align_image(self, frame_bgr: np.ndarray, top: int, bottom: int, left: int, right: int) -> tuple:
-        if frame_bgr is None:
-            return np.zeros((256, 256, 3), np.uint8), None, 'Error: fail to load the image.'
-        
-        # Proceed with detection and alignment
-        return self.detect_and_align(frame_bgr, top, bottom, left, right)
-
+    def detect_and_align_image(self, image: str, top: int, bottom: int, left: int, right: int
+                              ) -> tuple[np.ndarray, torch.Tensor, str]:
+        if image is None:
+            return np.zeros((256,256,3), np.uint8), None, 'Error: fail to load empty file.'
+        frame = cv2.imread(image)
+        if frame is None:
+            return np.zeros((256,256,3), np.uint8), None, 'Error: fail to load the image.'       
+        frame = cv2.cvtColor(frame, cv2.COLOR_RGB2BGR)
+        return self.detect_and_align(frame, top, bottom, left, right)
     def detect_and_align(self, frame, top, bottom, left, right, return_para=False):
         message = 'Error: no face detected! Please retry or change the photo.'
         instyle = None
@@ -218,7 +220,7 @@ class Model():
                logging.info(f"Output from VToonify shape: {y_tilde.shape}")
                print('*** Toonify %dx%d image with style of %s' % (y_tilde.shape[2], y_tilde.shape[3], style_type))
         
-            return ((y_tilde[0].cpu().numpy().transpose(1, 2, 0) + 1.0) * 127.5).astype(np.uint8), 'Successfully toonify the image with style of %s' % (self.style_name)
+            return ((y_tilde[0].cpu().numpy().transpose(1, 2, 0) + 1.0) * 127.5).astype(np.uint8), 'Successfully toonify the image with style of %s'%(self.style_name)
     
         except Exception as e:
             logging.error(f"Error during model execution: {e}")