Update app.py

app.py

@@ -47,11 +47,11 @@ class ReferenceBoxNotDetectedError(Exception):
     pass
 
 class BoundaryOverlapError(Exception):
-    """Raised when the optional boundary dimensions are too small and overlap with the inner contours."""
+    """The specified boundary dimensions are too small and overlap with the inner contours.Please provide larger value for boundary length and width."""
     pass
 
 class TextOverlapError(Exception):
-    """Raised when the text overlaps with the inner contours (with a margin of 0.75)."""
+    """Raised when the text overlaps with the inner contours (with a margin of 0.75).Please provide larger value for boundary length and width."""
     pass
 
 # ---------------------
@@ -155,7 +155,7 @@ def yolo_detect(image: Union[str, Path, int, Image.Image, list, tuple, np.ndarra
 
 def detect_reference_square(img: np.ndarray):
     t = time.time()
-    res = reference_detector_global.predict(img, conf=0.3)
+    res = reference_detector_global.predict(img, conf=0.15)
     if not res or len(res) == 0 or len(res[0].boxes) == 0:
         raise ReferenceBoxNotDetectedError("Reference Coin not detected in the image.")
     print("Reference coin detection completed in {:.2f} seconds".format(time.time() - t))
@@ -782,16 +782,54 @@ def build_tool_polygon(points_inch):
         logger.error(f"Error in build_tool_polygon: {e}")
         raise
 
-def polygon_to_exterior_coords(poly: Polygon):
+# def polygon_to_exterior_coords(poly: Polygon):
+#     logger.info(f"Starting polygon_to_exterior_coords with polygon type {poly.geom_type}")
+    
+#     try:
+#         if poly.geom_type == "MultiPolygon":
+#             logger.debug("Converting MultiPolygon to single Polygon")
+#             biggest = max(poly.geoms, key=lambda g: g.area)
+#             poly = biggest
+            
+#         if not poly.exterior:
+#             logger.warning("Polygon has no exterior")
+#             return []
+            
+#         coords = list(poly.exterior.coords)
+#         logger.info(f"Completed polygon_to_exterior_coords with {len(coords)} coordinates")
+#         return coords
+#     except Exception as e:
+#         logger.error(f"Error in polygon_to_exterior_coords: {e}")
+#         raise
+
+def polygon_to_exterior_coords(poly):
     logger.info(f"Starting polygon_to_exterior_coords with polygon type {poly.geom_type}")
     
     try:
+        # Handle GeometryCollection case specifically
+        if poly.geom_type == "GeometryCollection":
+            logger.warning("Converting GeometryCollection to Polygon")
+            # Find the largest geometry in the collection that has an exterior
+            largest_area = 0
+            largest_geom = None
+            for geom in poly.geoms:
+                if hasattr(geom, 'area') and geom.area > largest_area:
+                    if hasattr(geom, 'exterior') or geom.geom_type == "MultiPolygon":
+                        largest_area = geom.area
+                        largest_geom = geom
+            
+            if largest_geom is None:
+                logger.warning("No valid geometry found in GeometryCollection")
+                return []
+                
+            poly = largest_geom
+        
         if poly.geom_type == "MultiPolygon":
             logger.debug("Converting MultiPolygon to single Polygon")
             biggest = max(poly.geoms, key=lambda g: g.area)
             poly = biggest
             
-        if not poly.exterior:
+        if not hasattr(poly, 'exterior') or poly.exterior is None:
             logger.warning("Polygon has no exterior")
             return []
             
@@ -800,8 +838,9 @@ def polygon_to_exterior_coords(poly: Polygon):
         return coords
     except Exception as e:
         logger.error(f"Error in polygon_to_exterior_coords: {e}")
-        raise
-
+        # Return empty list as fallback
+        return []
+    
 def place_finger_cut_adjusted(
     tool_polygon: Polygon,
     points_inch: list,
@@ -976,7 +1015,7 @@ def save_dxf_spline(offset_value,inflated_contours, scaling_factor, height, fing
                             finger_cut_centers, 
                             final_polygons_inch, 
                             circle_diameter=1.0, 
-                            min_gap=(0.25+offset_value), 
+                            min_gap=(0.5+offset_value), 
                             max_attempts=100
                         )
                         
@@ -1067,9 +1106,9 @@ def add_rectangular_boundary(doc, polygons_inch, boundary_length, boundary_width
     text_top = boundary_polygon.bounds[1] + 1
     too_small = boundary_width_in < inner_width + 2 * clearance_side or boundary_length_in < inner_length + 2 * clearance_tb
     if too_small:
-        raise BoundaryOverlapError("Error: The specified boundary dimensions are too small and overlap with the inner contours. Please provide larger values.")
-    if annotation_text.strip() and text_top > min_y - 0.75:
-        raise TextOverlapError("Error: The text is too close to the inner contours. Please increase boundary length.")
+        raise BoundaryOverlapError("Error: The specified boundary dimensions are too small and overlap with the inner contours. Please provide larger value for boundary length and width.")
+    if annotation_text.strip() and text_top > min_y - 1:
+        raise TextOverlapError("Error: The text is too close to the inner contours. Please provide larger value for boundary length and width.")
     return boundary_polygon
 
 def draw_polygons_inch(polygons_inch, image_rgb, scaling_factor, image_height, color=(0,0,255), thickness=2):
@@ -1139,7 +1178,7 @@ def predict(
     t = time.time()
     if drawer_detected:
         # For detected drawers: shrink and square
-        shrunked_img = make_square(shrink_bbox(drawer_img, 0.90))
+        shrunked_img = make_square(shrink_bbox(drawer_img, 0.95))
     else:
         # For non-drawer images: keep original dimensions
         shrunked_img = drawer_img  # Already in BGR format from above
@@ -1447,10 +1486,10 @@ if __name__ == "__main__":
             gr.Image(label="Input Image"),
             gr.Number(label="Offset value for Mask", value=0.075),
             gr.Dropdown(label="Offset Unit", choices=["mm", "inches"], value="inches"),
-            gr.Dropdown(label="Add Finger Clearance?", choices=["Yes", "No"], value="No"),
-            gr.Dropdown(label="Add Rectangular Boundary?", choices=["Yes", "No"], value="No"),
-            gr.Number(label="Boundary Length", value=300.0, precision=2),
-            gr.Number(label="Boundary Width", value=200.0, precision=2),
+            gr.Dropdown(label="Add Finger Clearance?", choices=["Yes", "No"], value="Yes"),
+            gr.Dropdown(label="Add Rectangular Boundary?", choices=["Yes", "No"], value="Yes"),
+            gr.Number(label="Boundary Length", value=50, precision=2),
+            gr.Number(label="Boundary Width", value=50, precision=2),
             gr.Textbox(label="Annotation (max 20 chars)", max_length=20, placeholder="Type up to 20 characters")
         ],
         outputs=[
@@ -1461,7 +1500,7 @@ if __name__ == "__main__":
             gr.Textbox(label="Scaling Factor (inches/pixel)")
         ],
         examples=[
-            ["./Test20.jpg", 0.075, "inches", "No", "No", 300.0, 200.0, "MyTool"],
+            ["./Test20.jpg", 0.075, "inches", "Yes", "No", 300.0, 200.0, "MyTool"],
             ["./Test21.jpg", 0.075, "inches", "Yes", "Yes", 300.0, 200.0, "Tool2"]
         ]
     )