Update app.py

app.py

@@ -48,12 +48,12 @@ device = torch.device("cuda" if torch.cuda.is_available() else "cpu")  # Use GPU
 model = attempt_load(model_path, device=device)  # Placeholder for model loading
 model.eval()  # Set the model to evaluation mode
 
-#def preprocess_image(image_path):
-def preprocess_image(image):
-    #img0 = cv2.imread(image_path)
+def preprocess_image(image_path):
+#def preprocess_image(image):
+    img0 = cv2.imread(image_path)
     print("in preprocess-0 image.shape:",image.size)
-    img = letterbox(image, 640, stride=32, auto=True)[0]  # Resize and pad to 640x640
-    #img = letterbox(img0, 640, stride=32, auto=True)[0]  # Resize and pad to 640x640
+    #img = letterbox(image, 640, stride=32, auto=True)[0]  # Resize and pad to 640x640
+    img = letterbox(img0, 640, stride=32, auto=True)[0]  # Resize and pad to 640x640
     print("in preprocess-1 img.shape:",img.shape)
     img = img.transpose(2, 0, 1)[::-1]  # Convert BGR to RGB, to 3x416x416
     img = np.ascontiguousarray(img)
@@ -61,7 +61,6 @@ def preprocess_image(image):
     img = img.float()  # uint8 to fp16/32
     img /= 255.0  # 0 - 255 to 0.0 - 1.0
     if img.ndimension() == 3:
-        #img = img.transpose(2, 0, 1)[::-1]  # Convert BGR to RGB, 
         img = img.unsqueeze(0)
     print("in preprocess-2 img.shape:",img.shape)
 
@@ -86,25 +85,25 @@ def scale_coords(img1_shape, coords, img0_shape, ratio_pad=None):
     coords[:, :4].clip_(min=0, max=img1_shape[0])  # clip boxes
     return coords
 
-#def postprocess(pred, img0_shape, img):
-def postprocess(pred, img0, img):    
+def postprocess(pred, img0_shape, img):
+#def postprocess(pred, img0, img):    
     pred = non_max_suppression(pred, conf_thres=0.25, iou_thres=0.45, classes=None, agnostic=False)
     results = []
     for det in pred:  # detections per image
         if len(det):
-            #det[:, :4] = scale_coords(img.shape[2:], det[:, :4], img0_shape).round()
-            det[:, :4] = scale_coords(img.shape[2:], det[:, :4], img0.shape).round()
+            det[:, :4] = scale_coords(img.shape[2:], det[:, :4], img0_shape).round()
+            #det[:, :4] = scale_coords(img.shape[2:], det[:, :4], img0.shape).round()
             for *xyxy, conf, cls in reversed(det):
                 results.append((xyxy, conf, cls))
     return results
 
 def detect_objects(image_path):
-    dicom_image, dicom_meta = read_and_preprocess_dicom(image_path)
-    #img, img0 = preprocess_image(image_path)
+    #dicom_image, dicom_meta = read_and_preprocess_dicom(image_path)
+    img, img0 = preprocess_image(image_path)
     img, img0 = preprocess_image(dicom_image)
     pred = infer(model, img)
-    #results = postprocess(pred, img0.shape, img)
-    results = postprocess(pred, dicom_image, img)
+    results = postprocess(pred, img0.shape, img)
+    #results = postprocess(pred, dicom_image, img)
     return results, dicom_image
 
 def draw_bounding_boxes(img, results):
@@ -117,7 +116,7 @@ def draw_bounding_boxes(img, results):
 def show_preds_image(filepath):
     #dicom_image, dicom_meta = read_and_preprocess_dicom(image_path)
     results, img0 = detect_objects(filepath)
-    #img0 = cv2.imread(filepath)
+    img0 = cv2.imread(filepath)
     #img_with_boxes = draw_bounding_boxes(img0, results)
     img_with_boxes = draw_bounding_boxes(img0, results)
     return cv2.cvtColor(img_with_boxes, cv2.COLOR_BGR2RGB)