Add error checking on grid plus spacing

app.py

@@ -142,7 +142,7 @@ def end_session(req: gr.Request):
 # Register the cleanup function
 atexit.register(end_session)
 
-def hex_create(hex_size, border_size, input_image_path, start_x, start_y, end_x, end_y, rotation, background_color_hex, background_opacity, border_color_hex, border_opacity, fill_hex, excluded_colors_var, filter_color, x_spacing, y_spacing, add_hex_text_option=None, custom_text_list=None, custom_text_color_list=None, sides=6):
+def hex_create(hex_size, border_size, input_image_path, start_x, start_y, end_x, end_y, rotation, background_color_hex, background_opacity, border_color_hex, border_opacity, fill_hex, excluded_colors_var, filter_color, x_spacing, y_spacing, add_hex_text_option=None, custom_text_list=None, custom_text_color_list=None, sides=6, progress=gr.Progress(track_tqdm=True)):
     global input_image_palette
 
     try:
@@ -193,31 +193,37 @@ def hex_create(hex_size, border_size, input_image_path, start_x, start_y, end_x,
     # Prepare excluded colors list
     excluded_color_list = [tuple(lst) for lst in excluded_colors_var]
 
-    # Generate the hexagon grid images
-    grid_image, overlay_image = generate_hexagon_grid_interface(
-        hex_size,
-        border_size,
-        input_image,
-        start_x,
-        start_y,
-        end_x,
-        end_y,
-        rotation,
-        background_color,
-        border_color,
-        fill_hex,
-        excluded_color_list,
-        filter_color,
-        x_spacing,
-        y_spacing,
-        add_hex_text_option,
-        custom_text_list,
-        custom_text_color_list, sides
-    )    
-    _,_, name, _, new_ext = get_file_parts(input_image_path)
-    grid_image_path = save_image_to_temp_png(grid_image, user_dir, "hexgrid_" + name)
-    overlay_image_path = save_image_to_temp_png(overlay_image, user_dir, "overlay_" + name)
-    return grid_image_path, overlay_image_path
+    try:
+        # Generate the hexagon grid images
+        grid_image, overlay_image = generate_hexagon_grid_interface(
+            hex_size,
+            border_size,
+            input_image,
+            start_x,
+            start_y,
+            end_x,
+            end_y,
+            rotation,
+            background_color,
+            border_color,
+            fill_hex,
+            excluded_color_list,
+            filter_color,
+            x_spacing,
+            y_spacing,
+            add_hex_text_option,
+            custom_text_list,
+            custom_text_color_list, 
+            sides
+        )    
+        _,_, name, _, new_ext = get_file_parts(input_image_path)
+        grid_image_path = save_image_to_temp_png(grid_image, user_dir, "hexgrid_" + name)
+        overlay_image_path = save_image_to_temp_png(overlay_image, user_dir, "overlay_" + name)
+        return grid_image_path, overlay_image_path
+    except Exception as e:
+        print(f"Error generating hexagon grid images: {e}")
+        gr.Warning(f"Failed to generate hexagon grid images: {e}",duration=10, title="Grid Draw error")
+        return None, None
 
 def get_model_and_lora(model_textbox):
     """

utils/hex_grid.py

@@ -101,7 +101,7 @@ def generate_hexagon_grid(hex_size, border_size, input_image=None, image_width=0
                 rotation_offset = -45
             elif sides == 3:
                 # For equilateral triangles, you might offset rows by about one-third
-                # of the triangle�s height. Adjust as needed.
+                # of the triangle�s height. Adjust as needed.
                 x_offset = hex_width + hex_horizontal_spacing
                 y_offset = int((hex_height * 2) + hex_vertical_spacing)
                 rotation_offset = -60
@@ -168,6 +168,9 @@ def generate_hexagon_grid(hex_size, border_size, input_image=None, image_width=0
 
 def generate_hexagon_grid_with_text(hex_size, border_size, input_image=None, image_width=0, image_height=0, start_x=0, start_y=0, end_x=0, end_y=0, rotation=0, background_color="#ede9ac44", border_color="#12165380", fill_hex=True, excluded_color_list=excluded_color_list, filter_color=False, x_spacing=0, y_spacing=0, sides=6,
         add_hex_text_option=None, custom_text_list=None, custom_text_color_list=None):
+    if hex_size + x_spacing == 0 or hex_size + y_spacing == 0:
+        print("Hexagon size and spacing cannot equal zero")
+        raise ValueError("Hexagon size and spacing cannot equal zero")
 
     if input_image:
         image_width, image_height = input_image.size
@@ -264,7 +267,7 @@ def generate_hexagon_grid_with_text(hex_size, border_size, input_image=None, ima
                 rotation_offset = -45
             elif sides == 3:
                 # For equilateral triangles, you might offset rows by about one-third
-                # of the triangle�s height. Adjust as needed.
+                # of the triangle�s height. Adjust as needed.
                 x_offset = -hex_border_size * 2 #hex_width * math.tan(math.pi / sides) - hex_border_size * 2
                 y_offset = -hex_border_size * 2
                 rotation_offset = -60