Bug fix

README.md

@@ -37,7 +37,7 @@ Check out the configuration reference at https://huggingface.co/docs/hub/spaces-
 Welcome to HexaGrid Creator, the ultimate tool for transforming your images into mesmerizing hexagon grid masterpieces! Whether you're a tabletop game enthusiast, a digital artist, or just someone who loves unique patterns, HexaGrid Creator has something for you.
 
 ### What Can You Do?
-- **Generate Hexagon Grids:** Create stunning hexagon grid overlays on any image with fully customizable parameters.
+- **Generate Hexagon Grids:** Create stunning hexagon grid overlays on any image with fully customizable parameters. (also square and triangles)
 - **AI-Powered Image Generation:** Use AI to generate images based on your prompts and apply hexagon grids to them.
 - **Color Exclusion:** Pick and exclude specific colors from your hexagon grid for a cleaner and more refined look.
 - **Interactive Customization:** Adjust hexagon size, border size, rotation, background color, and more in real-time.

app.py

@@ -96,7 +96,7 @@ from diffusers import (
     FluxPipeline,
     FluxImg2ImgPipeline,
     FluxControlPipeline,
-    FluxControlPipeline,
+    FluxFillPipeline,
     DiffusionPipeline, 
     AutoencoderTiny, 
     AutoencoderKL
@@ -106,7 +106,7 @@ PIPELINE_CLASSES = {
     "FluxPipeline": FluxPipeline,
     "FluxImg2ImgPipeline": FluxImg2ImgPipeline,
     "FluxControlPipeline": FluxControlPipeline,
-    "FluxFillPipeline": FluxControlPipeline
+    "FluxFillPipeline": FluxFillPipeline
 }
 
 from utils.version_info import (
@@ -126,7 +126,7 @@ selected_index = gr.State(value=-1)
 image_processor: Optional[DPTImageProcessor] = None
 depth_model: Optional[DPTForDepthEstimation] = None
 TRELLIS_PIPELINE: Optional[TrellisImageTo3DPipeline] = None
-pipe: Optional[Union[FluxPipeline, FluxImg2ImgPipeline, FluxControlPipeline]] = None
+pipe: Optional[Union[FluxPipeline, FluxImg2ImgPipeline, FluxControlPipeline, FluxFillPipeline]] = None
 
 def start_session(req: gr.Request):
     print(f"Starting session with hash: {req.session_hash}")
@@ -455,11 +455,16 @@ def generate_image_lowmem(
             #conditions.append(condition)
             print(f"\nAdded conditioned image.\n {conditioned_image.size}")
             # Prepare the parameters for image generation
-            additional_parameters ={
-                "strength": strength,
-                "image": conditioned_image,
-            }
-            additional_parameters.update(mask_parameters)
+            if mask_parameters == {}:
+                additional_parameters ={
+                    "strength": strength,
+                    "image": conditioned_image,
+                }
+            else:
+                additional_parameters ={                 
+                    "image": conditioned_image,
+                }
+                additional_parameters.update(mask_parameters)
         else:
             print("\nNo conditioned image provided.")
             if neg_prompt!=None:
@@ -482,8 +487,8 @@ def generate_image_lowmem(
         additional_parameters.update(prompt_parameters)
         # Combine all parameters
         generate_params = {
-            "height": image_height,
-            "width": image_width,
+            "height": int(image_height),
+            "width": int(image_width),
             "guidance_scale": guidance_scale,
             "num_inference_steps": num_inference_steps,
             "generator": generator,
@@ -638,7 +643,7 @@ def generate_input_image_click(image_input, map_option, prompt_textbox_value, ne
     if (model == "black-forest-labs/FLUX.1-Fill-dev"):
         pipeline = "FluxFillPipeline"
         width, height = calculate_optimal_fill_dimensions(conditioned_image)
-        mask_image = get_image_from_dict(mask_image)
+        mask_image, _ = get_image_from_dict(mask_image)
         print(f"Optimal Dimensions: {width} x {height} \n")
     else:
         mask_image = None
@@ -1124,7 +1129,7 @@ with gr.Blocks(css_paths="style_20250314.css", title=title, theme='Surn/beeuty',
             HexaGrid Creator is a web-based application that allows you to apply a hexagon grid overlay to any image. You can customize the size, color, and opacity of the hexagons, as well as the background and border colors. The result is a visually striking image that looks like it was made from hexagonal tiles!
 
             ### What Can You Do?
-            - **Generate Hexagon Grids:** Create beautiful hexagon grid overlays on any image with fully customizable parameters.
+            - **Generate Hexagon Grids:** Create beautiful hexagon grid overlays on any image with fully customizable parameters. (also square and triangles)
             - **AI-Powered Image Generation:** Use advanced AI models to generate images based on your prompts and apply hexagon grids to them.
             - **Color Exclusion:** Select and exclude specific colors from your hexagon grid for a cleaner and more refined look.
             - **Interactive Customization:** Adjust hexagon size, border size, rotation, background color, and more in real-time.
@@ -1173,7 +1178,7 @@ with gr.Blocks(css_paths="style_20250314.css", title=title, theme='Surn/beeuty',
                         label="Sketch Image",
                         type="filepath",
                         #invert_colors=True,
-                        #sources=['upload','canvas'],
+                        sources=['upload','clipboard'],
                         #tool=['editor','select','color-sketch'],
                         placeholder="Draw a sketch or upload an image.",
                         interactive=True,
@@ -1181,7 +1186,7 @@ with gr.Blocks(css_paths="style_20250314.css", title=title, theme='Surn/beeuty',
                         key="imgSketch",
                         image_mode="RGBA",
                         format="PNG",
-                        brush=gr.Brush(),
+                        brush=gr.Brush(colors=['#000000', '#3270cc', '#cc3232', '#32cc70', '#ffffff']),
                         canvas_size=(640,360)
                     )
                 with gr.Row():
@@ -1189,7 +1194,7 @@ with gr.Blocks(css_paths="style_20250314.css", title=title, theme='Surn/beeuty',
                         sketch_replace_input_image_button = gr.Button("Replace Input Image with sketch", elem_id="sketch_replace_input_image_button", elem_classes="solid")
                         sketch_alpha_composite_slider = gr.Slider(0,100,50,0.5, label="Sketch Transparancy", elem_id="alpha_composite_slider")
                         btn_sketch_alpha_composite = gr.Button("Overlay Sketch on Input Image", elem_id="btn_sketchninput", elem_classes="solid")
-                        gr.Markdown("### Do Not add to image if using a fill model")
+                        gr.Markdown("### Do Not add to image if using a fill model. <span style='color: red; font-style: bolder;'>Click the pencil to start drawing.</span>")
 
         with gr.Column(scale=1):
             with gr.Accordion("Hex Coloring and Exclusion", open = False):

utils/image_utils.py

@@ -480,7 +480,6 @@ def alpha_composite_with_control(base_image, image_with_alpha, alpha_percent=100
         new_image_path = os.path.join(directory, name + f"_alpha{str(alpha_percent)}.png")
         result.save(new_image_path)
         return new_image_path
-    return blended_image
     return result
 
 def apply_alpha_mask(image, mask_image, invert = False):