Update app.py

app.py

@@ -19,7 +19,7 @@ from ultralytics.utils.plotting import save_one_box
 from transformers import AutoModelForImageSegmentation
 from torchvision import transforms
 from scalingtestupdated import calculate_scaling_factor
-from shapely.geometry import Polygon, Point, MultiPolygon
+from shapely.geometry import Polygon, Point, MultiPolygon, GeometryCollection
 from scipy.interpolate import splprep, splev
 from scipy.ndimage import gaussian_filter1d
 from u2net import U2NETP
@@ -270,6 +270,8 @@ def build_tool_polygon(points_inch):
     return Polygon(points_inch)
 
 def polygon_to_exterior_coords(poly: Polygon):
+    if poly.geom_type == "GeometryCollection":
+        return []
     if poly.geom_type == "MultiPolygon":
         biggest = max(poly.geoms, key=lambda g: g.area)
         poly = biggest
@@ -363,6 +365,8 @@ def add_rectangular_boundary(doc, polygons_inch, boundary_length, boundary_width
     max_x = -float("inf")
     max_y = -float("inf")
     for poly in polygons_inch:
+        if poly.geom_type == "GeometryCollection":
+            continue
         b = poly.bounds
         min_x = min(min_x, b[0])
         min_y = min(min_y, b[1])
@@ -402,18 +406,24 @@ def add_rectangular_boundary(doc, polygons_inch, boundary_length, boundary_width
     msp.add_lwpolyline(rect_coords, close=True, dxfattribs={"layer": "BOUNDARY"})
     return boundary_polygon
 
-def draw_polygons_inch(polygons_inch, image_rgb, scaling_factor, image_height, color=(0,0,255), thickness=2):
-    for poly in polygons_inch:
-        if poly.geom_type == "MultiPolygon":
-            for subpoly in poly.geoms:
-                draw_single_polygon(subpoly, image_rgb, scaling_factor, image_height, color, thickness)
-        else:
-            draw_single_polygon(poly, image_rgb, scaling_factor, image_height, color, thickness)
-
 def draw_single_polygon(poly, image_rgb, scaling_factor, image_height, color=(0,0,255), thickness=2):
+    # Handle different geometry types
+    if poly.geom_type == "GeometryCollection":
+        return
+    elif poly.geom_type == "MultiPolygon":
+        for geom in poly.geoms:
+            draw_single_polygon(geom, image_rgb, scaling_factor, image_height, color, thickness)
+        return
+    elif poly.geom_type not in ["Polygon", "LinearRing"]:
+        return
+
+    if not hasattr(poly, 'exterior') or not poly.exterior:
+        return
+        
     ext = list(poly.exterior.coords)
     if len(ext) < 3:
         return
+        
     pts_px = []
     for (x_in, y_in) in ext:
         px = int(x_in / scaling_factor)
@@ -422,6 +432,10 @@ def draw_single_polygon(poly, image_rgb, scaling_factor, image_height, color=(0,
     pts_px = np.array(pts_px, dtype=np.int32)
     cv2.polylines(image_rgb, [pts_px], isClosed=True, color=color, thickness=thickness, lineType=cv2.LINE_AA)
 
+def draw_polygons_inch(polygons_inch, image_rgb, scaling_factor, image_height, color=(0,0,255), thickness=2):
+    for poly in polygons_inch:
+        draw_single_polygon(poly, image_rgb, scaling_factor, image_height, color, thickness)
+
 # ---------------------
 # Main Predict Function with Finger Cut Clearance, Boundary Box, Annotation and Sharpness Enhancement
 # ---------------------
@@ -590,6 +604,8 @@ def predict(
     inner_max_x = -float("inf")
     inner_max_y = -float("inf")
     for poly in final_polygons_inch:
+        if poly.geom_type == "GeometryCollection":
+            continue
         b = poly.bounds
         inner_min_x = min(inner_min_x, b[0])
         inner_min_y = min(inner_min_y, b[1])