Update Readme, constants and add Sketchpad

README.md

@@ -5,7 +5,7 @@ colorFrom: yellow
 colorTo: purple
 sdk: gradio
 python_version: 3.10.13
-sdk_version: 5.16.2
+sdk_version: 5.17.1
 app_file: app.py
 pinned: false
 short_description: Transform Your Images into Mesmerizing Hexagon Grids
@@ -13,12 +13,9 @@ license: apache-2.0
 tags:
 - map maker
 - tabletop
-- hexagon
 - text-to-image
 - image-generation
 - flux
-- depth
-- 3d
 hf_oauth: true
 fullWidth: true
 thumbnail: >-
@@ -27,17 +24,15 @@ thumbnail: >-
 
 # Hex Game Maker
 ## Description
-Welcome to Hex Game Maker, 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, Hex Game Maker has something for you.
+Welcome to Hex Game Maker, the ultimate tool for transforming your images into mesmerizing hexagon grid masterpieces! Well, this was a test project for HexaGrid. It has some nice features that did not make it into the final version of the program.
+The intention was to do a full conversion, but the limitation on Negative Prompts is what killed this approach. It does not consistently render table top maps.. but it can do a lot!
 
 ### What Can You Do?
-- **Generate Hex Game Maker:** Create stunning hexagon grid overlays on any image with fully customizable parameters.
 - **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.
-- **Depth and 3D Model Generation:** Generate depth maps and 3D models from your images for enhanced visualization.
+- **Sketch, upload or select:** images to guide your AI image generation 
 - **Image Filter [Look-Up Table (LUT)] Application:** Apply filters (LUTs) to your images for color grading and enhancement.
 - **Pre-rendered Maps:** Access a library of pre-rendered hexagon maps for quick and easy customization.
-- **Add Margins:** Add customizable margins around your images for a polished finish.
+
 
 ### Why You'll Love It
 - **Fun and Easy to Use:** With an intuitive interface and real-time previews, creating hexagon grids has never been this fun!
@@ -47,15 +42,13 @@ Welcome to Hex Game Maker, the ultimate tool for transforming your images into m
 
 ### Get Started
 1. **Upload or Generate an Image:** Start by uploading your own image or generate one using our AI-powered tool.
-2. **Customize Your Grid:** Play around with the settings to create the perfect hexagon grid overlay.
-3. **Download and Share:** Once you're happy with your creation, download it and share it with the world!
+2. **Download and Share:** Once you're happy with your creation, download it and share it with the world!
 
 ### Advanced Features
 - **Generative AI Integration:** Utilize models like `black-forest-labs/FLUX.1-dev` and various LoRA weights for generating unique images.
 - **Pre-rendered Maps:** Access a library of pre-rendered hexagon maps for quick and easy customization.
 - **Image Filter [Look-Up Table (LUT)] Application:** Apply filters (LUTs) to your images for color grading and enhancement.
-- **Depth and 3D Model Generation:** Create depth maps and 3D models from your images for enhanced visualization.
-- **Add Margins:** Customize margins around your images for a polished finish.
+
 
 Join the hive and start creating with Hex Game Maker today!
 

app.py

@@ -20,7 +20,8 @@ from diffusers import (
     AutoencoderKL,
     AutoPipelineForImage2Image,
     FluxPipeline,
-    FlowMatchEulerDiscreteScheduler)
+    FlowMatchEulerDiscreteScheduler,
+    DPMSolverMultistepScheduler)
 
 from huggingface_hub import (
     hf_hub_download,
@@ -48,7 +49,8 @@ from modules.image_utils import (
     multiply_and_blend_images,
     alpha_composite_with_control,
     crop_and_resize_image,
-    convert_to_rgba_png
+    convert_to_rgba_png,
+    get_image_from_dict
 )
 from modules.constants import (
     LORA_DETAILS, LORAS as loras, MODELS,
@@ -327,6 +329,12 @@ def generate_image(prompt_mash, steps, seed, cfg_scale, width, height, lora_scal
     flash_attention_enabled = torch.backends.cuda.flash_sdp_enabled()
     if flash_attention_enabled:
         pipe.attn_implementation="flash_attention_2"
+    # Compile UNet
+    #pipe.transformer = torch.compile(pipe.transformer, mode="reduce-overhead")
+    pipe.vae.enable_tiling()  # For larger resolutions if needed
+
+    # Disable unnecessary features
+    pipe.safety_checker = None
     print(f"\nGenerating image with prompt: {prompt_mash}\n")
     approx_tokens= approximate_token_count(prompt_mash)
     if approx_tokens > 76:
@@ -357,7 +365,13 @@ def generate_image_to_image(prompt_mash, image_input_path, image_strength, steps
     flash_attention_enabled = torch.backends.cuda.flash_sdp_enabled()
     if flash_attention_enabled:
         pipe_i2i.attn_implementation="flash_attention_2"
-    image_input = load_image(image_input_path)
+    # Compile UNet
+    #pipe.transformer = torch.compile(pipe.transformer, mode="reduce-overhead")
+    pipe.vae.enable_tiling()  # For larger resolutions if needed
+
+    # Disable unnecessary features
+    pipe.safety_checker = None
+    image_input = open_image(image_input_path)
     print(f"\nGenerating image with prompt: {prompt_mash} and {image_input_path}\n")
     approx_tokens= approximate_token_count(prompt_mash)
     if approx_tokens > 76:
@@ -561,6 +575,11 @@ def update_prompt_visibility(map_option):
           gr.update(visible=is_visible)
       )
 
+def replace_input_with_sketch_image(sketch_image):
+    print(f"Sketch Image: {sketch_image}\n")
+    sketch, is_dict = get_image_from_dict(sketch_image)
+    return sketch
+
 @spaces.GPU()
 def getVersions():
     return versions_html()
@@ -571,7 +590,7 @@ with gr.Blocks(css_paths="style_20250128.css", title=title, theme='Surn/beeuty',
     with gr.Row():
         gr.Markdown("""
         # Hex Game Maker
-        ## Transform Your Images into Mesmerizing Hexagon Grid Masterpieces! ⬢""", elem_classes="intro")
+        ## Transform Your Images into Mesmerizing Table Top Map Masterpieces! ⬢""", elem_classes="intro")
     with gr.Row():
         with gr.Accordion("Welcome to Hex Game Maker, the ultimate tool for transforming your images into stunning hexagon grid artworks. Whether you're a tabletop game enthusiast, a digital artist, or someone who loves unique patterns, Hex Game Maker has something for you.", open=False, elem_classes="intro"):
             gr.Markdown ("""
@@ -624,9 +643,9 @@ with gr.Blocks(css_paths="style_20250128.css", title=title, theme='Surn/beeuty',
                 interactive=True,
                 elem_classes="centered solid imgcontainer",
                 key="imgInput",
-                image_mode=None,
+                image_mode="RGB",
                 format="PNG", 
-                show_download_button=True,
+                show_download_button=True
             )
             def on_input_image_change(image_path):
                 if image_path is None:
@@ -641,17 +660,30 @@ with gr.Blocks(css_paths="style_20250128.css", title=title, theme='Surn/beeuty',
                 outputs=[input_image], scroll_to_output=True,
             )
         with gr.Column(scale=0):
-            with gr.Accordion("Hex Coloring and Exclusion", open = False):
-                with gr.Row():
-                    with gr.Column():
-                        color_picker = gr.ColorPicker(label="Pick a color to exclude",value="#505050")
-                    with gr.Column():
-                        filter_color = gr.Checkbox(label="Filter Excluded Colors from Sampling", value=False,)
-                exclude_color_button = gr.Button("Exclude Color", elem_id="exlude_color_button", elem_classes="solid")
-                color_display = gr.DataFrame(label="List of Excluded RGBA Colors", headers=["R", "G", "B", "A"], elem_id="excluded_colors", type="array", value=build_dataframe(excluded_color_list), interactive=True, elem_classes="solid centered")
-                selected_row = gr.Number(0, label="Selected Row", visible=False)
-                delete_button = gr.Button("Delete Row", elem_id="delete_exclusion_button", elem_classes="solid")
-                fill_hex = gr.Checkbox(label="Fill Hex with color from Image", value=True)
+            # with gr.Accordion("Sketch Pad", open = False):
+            #     with gr.Row():
+            #         sketch_image = gr.Sketchpad(
+            #             label="Input Image",
+            #             type="filepath",
+            #             #invert_colors=True,
+            #             #source=['upload','canvas'],
+            #             #tool=['editor','select','color-sketch'],
+            #             interactive=True,
+            #             elem_classes="centered solid imgcontainer",
+            #             key="imgInput",
+            #             image_mode="RGB",
+            #             format="PNG"
+            #         )
+            #     with gr.Row():
+            #         with gr.Column(scale=1):
+            #             sketch_replace_input_image_button = gr.Button(
+            #                 "Replace Input Image with sketch",
+            #                 elem_id="sketch_replace_input_image_button",
+            #                 elem_classes="solid"
+            #             )
+            #         with gr.Column(scale=2):
+            #             alpha_composite_slider = gr.Slider(0,100,50,0.5, label="Alpha Composite Sketch to Input Image", elem_id="alpha_composite_slider")
+                    
             with gr.Accordion("Image Filters", open = False):
                 with gr.Row():
                     with gr.Column():
@@ -739,7 +771,7 @@ with gr.Blocks(css_paths="style_20250128.css", title=title, theme='Surn/beeuty',
                 )
 
             with gr.Column(scale=1, elem_id="gen_column"):
-                generate_button = gr.Button("Generate From Promp and LoRa Style", variant="primary", elem_id="gen_btn")
+                generate_button = gr.Button("Generate From Map Options, Input Image and LoRa Style", variant="primary", elem_id="gen_btn")
             with gr.Row():
                 with gr.Column(scale=0):
                     selected_info = gr.Markdown("")
@@ -763,13 +795,12 @@ with gr.Blocks(css_paths="style_20250128.css", title=title, theme='Surn/beeuty',
                             with gr.Column(scale=1):
                                 # Gallery from PRE_RENDERED_IMAGES GOES HERE
                                 prerendered_image_gallery = gr.Gallery(label="Image Gallery", show_label=True, value=build_prerendered_images_by_quality(3), elem_id="gallery", elem_classes="solid", type="filepath", columns=[3], rows=[3], preview=False ,object_fit="contain", height="auto", format="png",allow_preview=False)                            
-                            with gr.Column(scale=1):
-                                #image_guidance_stength = gr.Slider(label="Image Guidance Strength", minimum=0, maximum=1.0, value=0.25, step=0.01, interactive=True)
+                            with gr.Column(scale=1):                                
                                 replace_input_image_button = gr.Button(
                                     "Replace Input Image",
                                     elem_id="prerendered_replace_input_image_button",
                                     elem_classes="solid"
-                                )                        
+                                )
                                 generate_input_image_from_gallery = gr.Button(
                                     "Generate AI Image from Gallery",
                                     elem_id="generate_input_image_from_gallery",
@@ -827,6 +858,17 @@ with gr.Blocks(css_paths="style_20250128.css", title=title, theme='Surn/beeuty',
         outputs=gr.State(current_prerendered_image),  # Update the state with the selected image
         show_api=False, scroll_to_output=True
     )
+    # alpha_composite_slider.change(
+    #     fn=alpha_composite_with_control,
+    #     inputs=[input_image, sketch_image, alpha_composite_slider],
+    #     outputs=[input_image],
+    #     scroll_to_output=True
+    # )
+    # sketch_replace_input_image_button.click(
+    #     lambda sketch_image: replace_input_with_sketch_image(sketch_image),
+    #     inputs=[sketch_image],
+    #     outputs=[input_image], scroll_to_output=True
+    # )
     # replace input image with selected prerendered image gallery selection
     replace_input_image_button.click(
         lambda: current_prerendered_image.value,

modules/constants.py

@@ -43,10 +43,10 @@ MAX_SEED = np.iinfo(np.int32).max
 TARGET_SIZE = (2688,1536)
 
 PROMPTS = {
-    "BorderBlack": "Top-down view of a hexagon-based alien map with black borders. Features rivers, mountains, volcanoes, and snow at top and bottom. Colors: light blue, green, tan, brown. No reflections or shadows. Partial hexes on edges are black.",
-    "Earth": "Top-down view of a world map with rivers, mountains, volcanoes, and snow at top and bottom. Colors: light blue, green, tan, brown. No reflections or shadows. Partial edge hexes are black. Overhead view.",
-    "Beeuty": "Top-down view of a table map with honeycomb_shapes, lakes, dense forests, magical flora, and hex_grids. Map for tabletop gaming with clarity and strategic elements. Colors: yellow, green, purple, brown. Partial hexes on edges are black.",
-    "Scifi City": "Top-down view of a futuristic urban battlefield map with lakes, forests, ruined buildings, and city streets. Emphasizes clarity and strategy for tabletop games. Colors: teal, dark green, violet, brown. Partial edge hexes are black. Viewed from above.",
+    "BorderBlack": "Top-down view, from above. of a hexagon-based alien map with black borders. Features rivers, mountains, volcanoes, and snow at top and bottom. Colors: light blue, green, tan, brown. No reflections or shadows. Partial hexes on edges are black.",
+    "Earth": "Top-down view of a world map with rivers, mountains, volcanoes, and snow at top and bottom. Colors: light blue, green, tan, brown. No reflections or shadows. Partial edge hexes are black. from above.",
+    "Beeuty": "Top-down view of a table map with honeycomb_shapes, lakes, dense forests, magical flora, and hex_grids. Map for tabletop gaming with clarity and strategic elements. Colors: yellow, green, purple, brown. Partial hexes on edges are black. Viewed from above.",
+    "Scifi City": "Top-down view of a futuristic urban_battlefield_map with lakes, forests, ruined_buildings, and city streets. Emphasizes clarity and strategy for tabletop games. Colors: teal, dark green, violet, brown. Partial edge hexes are black. Viewed from above.",
     "Alien Landscape": "Top-down view of a barren alien world map made from hexagon pieces. Features light blue rivers, brown mountains, red volcanoes, and white snow at top and bottom. Colors: light blue, green, tan, brown. Partial hexes on edges are black.",
     "Alien World": "Top-down view of an alien world map built from hexagon pieces. Includes rivers, mountains, volcanoes, and snowy areas. Colors: light blue, green, tan, brown. Partial edge hexes are black. Overhead view.",
     "Mystic Forest": "Top-down view of a mystic forest map with lakes, dense forests, magical flora, and hex grids. Designed for clarity in tabletop gaming. Colors: light blue, green, purple, brown. Partial hexes on edges are black.",
@@ -56,9 +56,9 @@ PROMPTS = {
 
 NEGATIVE_PROMPTS = {
     "BorderBlack": "humans, modern_buildings, vehicles, text, logos, reflections, shadows, realistic map of the Earth, isometric",
-    "Earth": "humans, modern_buildings, vehicles, text, logos, reflections, shadows, missing realistic map of the Earth, isometric",
-    "Map3": "humans, modern_buildings, vehicles, text, logos, reflections, shadows, realistic map of the Earth, isometric",
-    "Map4": "humans, modern_buildings, vehicles, text, logos, reflections, shadows, realistic map of the Earth, isometric",
+    "Earth": "humans, modern_buildings, vehicles, text, logos, reflections, shadows, missing map of the Earth, isometric",
+    "Beeuty": "humans, modern_buildings, vehicles, text, logos, reflections, shadows, map of the Earth, isometric",
+    "Scifi City": "humans, missing_buildings, vehicles, text, logos, reflections, shadows, Earth, isometric",
     "Alien Landscape": "humans, modern_buildings, vehicles, text, logos, reflections, shadows, realistic map of the Earth, isometric",
     "Alien World": "Earth, humans, modern_buildings, vehicles, text, logos, reflections, shadows, realistic map of the Earth, isometric",
     "Mystic Forest": "humans, modern_buildings, vehicles, text, logos, reflections, shadows, realistic map of the Earth, isometric",

modules/image_utils.py

@@ -6,7 +6,7 @@ import base64
 import numpy as np
 #from decimal import ROUND_CEILING
 from PIL import Image, ImageChops, ImageDraw, ImageEnhance, ImageFilter, ImageDraw, ImageOps, ImageMath
-from typing import List, Union
+from typing import List, Union, is_typeddict
 #import numpy as np
 #import math
 from pathlib import Path
@@ -15,6 +15,18 @@ from modules.color_utils import (
     detect_color_format,
     update_color_opacity
 )
+def get_image_from_dict(image_path):
+    if isinstance(image_path, dict) :
+        if 'image' in image_path:
+            image_path = image_path.get('image')
+        elif 'composite' in image_path:
+            image_path = image_path.get('composite')
+        else:
+            print("\n Unknown image dictionary.\n")
+            raise UserWarning("Unknown image dictionary.")
+        return image_path, True
+    else:
+        return image_path, False
 
 def open_image(image_path):
     """
@@ -30,8 +42,11 @@ def open_image(image_path):
     Raises:
         Exception: If there is an error opening the image.
     """
+    if isinstance(image_path, Image.Image):
+        return image_path
     import requests
     try:
+        image_path, is_dict = get_image_from_dict(image_path)
         # Strip leading and trailing double quotation marks, if present
         image_path = image_path.strip('"')
         if image_path.startswith('http'):
@@ -369,6 +384,7 @@ def alpha_composite_with_control(base_image, image_with_alpha, alpha_percent=100
     Returns:
         PIL.Image.Image: The resulting image after alpha compositing.
     """
+    image_with_alpha, isdict = get_image_from_dict(image_with_alpha)
     alpha_multiplier = alpha_percent / 100.0
     if isinstance(base_image, str):
         base_image = open_image(base_image)
@@ -665,6 +681,7 @@ def convert_to_rgba_png(file_path: str) -> tuple[Image, str]:
         raise UserWarning("No image provided.")
         return None, None
     try:
+        file_path, is_dict = get_image_from_dict(file_path)
         img = open_image(file_path)
         print(f"Opened image: {file_path}\n")
         # Handle ICO files