Go Public Version

README.md

@@ -1,5 +1,5 @@
 ---
-title: Hex Game Maker
+title: Hex Game Maker Development Features
 emoji: 🌖
 colorFrom: yellow
 colorTo: purple

app.py

@@ -1,13 +1,10 @@
 import os
-import json
-import copy
 import time
 import random
 import logging
 from gradio.blocks import postprocess_update_dict
 import numpy as np
 from typing import Any, Dict, List, Optional, Union
-import logging
 
 import torch
 from PIL import Image
@@ -42,8 +39,8 @@ from modules.image_utils import (
     open_image,
     build_prerendered_images_by_quality,
     upscale_image,
-    lerp_imagemath,
-    shrink_and_paste_on_blank,
+    # lerp_imagemath,
+    # shrink_and_paste_on_blank,
     show_lut,
     apply_lut_to_image_path,
     multiply_and_blend_images,
@@ -57,24 +54,24 @@ from modules.constants import (
     default_lut_example_img, 
     lut_files, 
     MAX_SEED, 
-    lut_folder,cards, 
-    cards_alternating, 
-    card_colors, 
-    card_colors_alternating,
+    # lut_folder,cards, 
+    # cards_alternating, 
+    # card_colors, 
+    # card_colors_alternating,
     pre_rendered_maps_paths,
     PROMPTS,
     NEGATIVE_PROMPTS,
     TARGET_SIZE,
     temp_files
 )
-from modules.excluded_colors import (
-    add_color,
-    delete_color,
-    build_dataframe,
-    on_input,
-    excluded_color_list,
-    on_color_display_select
-)
+# from modules.excluded_colors import (
+#     add_color,
+#     delete_color,
+#     build_dataframe,
+#     on_input,
+#     excluded_color_list,
+#     on_color_display_select
+# )
 from modules.misc import (
     get_filename,
     convert_ratio_to_dimensions,
@@ -91,6 +88,7 @@ import spaces
 
 input_image_palette = []
 current_prerendered_image = gr.State("./images/Beeuty-1.png")
+
 #---if workspace = local or colab---
 
 # Authenticate with Hugging Face
@@ -393,7 +391,7 @@ def generate_image_to_image(prompt_mash, image_input_path, image_strength, steps
         joint_attention_kwargs={"scale": lora_scale},
         output_type="pil",
     ).images[0]
-    return final_image 
+    return final_image
 
 @spaces.GPU(duration=140)
 def run_lora(prompt, image_input, image_strength, cfg_scale, steps, selected_index, randomize_seed, seed, width, height, lora_scale, enlarge, use_conditioned_image=False, progress=gr.Progress(track_tqdm=True)):
@@ -589,8 +587,8 @@ title = "Hex Game Maker"
 with gr.Blocks(css_paths="style_20250128.css", title=title, theme='Surn/beeuty', delete_cache=(43200, 43200), head_paths="head.htm") as app:
     with gr.Row():
         gr.Markdown("""
-        # Hex Game Maker
-        ## Transform Your Images into Mesmerizing Table Top Map Masterpieces! ⬢""", elem_classes="intro")
+        # Hex Game Maker Development Features
+        ## This project includes features that did not make it into the main project! ⬢""", 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 ("""
@@ -660,35 +658,37 @@ 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("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("Sketch Pad (WIP)", open = False):
+                with gr.Row():
+                    sketch_image = gr.Sketchpad(
+                        label="Sketch Image",
+                        type="filepath",
+                        #invert_colors=True,
+                        #source=['upload','canvas'],
+                        #tool=['editor','select','color-sketch'],
+                        placeholder="Draw a sketch or upload an image. Currently broken in gradio 5.17.1",
+                        interactive=True,
+                        elem_classes="centered solid imgcontainer",
+                        key="imgSketch",
+                        image_mode="RGB",
+                        format="PNG",
+                        width=512,  # Default width
+                        height=512  # Default height
+                    )
+                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():
                         composite_color = gr.ColorPicker(label="Color", value="#ede9ac44")
-                    with gr.Column():
                         composite_opacity = gr.Slider(label="Opacity %", minimum=0, maximum=100, value=50, interactive=True)
                 with gr.Row():
                     composite_button = gr.Button("Composite", elem_classes="solid")
@@ -735,8 +735,8 @@ with gr.Blocks(css_paths="style_20250128.css", title=title, theme='Surn/beeuty',
                     scroll_to_output=True
                 )
     with gr.Row():
-        with gr.Accordion("Generative AI", open = False):
-            with gr.Column(scale=3):
+        with gr.Accordion("Generative AI", open = True ):
+            with gr.Column():
                 map_options = gr.Dropdown(
                     label="Map Options",
                     choices=list(PROMPTS.keys()),
@@ -769,49 +769,66 @@ with gr.Blocks(css_paths="style_20250128.css", title=title, theme='Surn/beeuty',
                     inputs=[map_options],
                     outputs=[prompt, negative_prompt_textbox, prompt_notes_label]
                 )
-
-            with gr.Column(scale=1, elem_id="gen_column"):
-                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("")
-                    lora_gallery = gr.Gallery(
-                        [(item["image"], item["title"]) for item in loras],
-                        label="LoRA Styles",
-                        allow_preview=False,
-                        columns=3,
-                        elem_id="lora_gallery",
-                        show_share_button=False
-                    )
+                with gr.Column(scale=1):
+                    generate_button = gr.Button("Generate From Map Options, Input Image and LoRa Style", variant="primary", elem_id="gen_btn")
+                    with gr.Accordion("LoRA Styles", open=False):
+                        selected_info = gr.Markdown("")
+                        lora_gallery = gr.Gallery(
+                            [(item["image"], item["title"]) for item in loras],
+                            label="LoRA Styles",
+                            allow_preview=False,
+                            columns=3,
+                            elem_id="lora_gallery",
+                            show_share_button=False
+                        )
                     with gr.Accordion("Custom LoRA", open=False):
                         with gr.Group():
-                            custom_lora = gr.Textbox(label="Enter Custom LoRA", placeholder="prithivMLmods/Canopus-LoRA-Flux-Anime")
+                            custom_lora = gr.Textbox(label="Enter Custom LoRA. **NOT TESTED**", placeholder="prithivMLmods/Canopus-LoRA-Flux-Anime")
                             gr.Markdown("[Check the list of FLUX LoRA's](https://huggingface.co/models?other=base_model:adapter:black-forest-labs/FLUX.1-dev)", elem_id="lora_list")
                         custom_lora_info = gr.HTML(visible=False)
                         custom_lora_button = gr.Button("Remove custom LoRA", visible=False)
                 with gr.Column(scale=2):
-                    with gr.Accordion("Template Image Styles", open = False):
+                    generate_input_image_from_gallery = gr.Button(
+                        "Generate AI Image from Template Image",
+                        elem_id="generate_input_image_from_gallery",
+                        elem_classes="solid",
+                        variant="primary"
+                    )
+                    with gr.Accordion("Template Images", open = False):
                         with gr.Row():
                             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):                                
+                                prerendered_image_gallery = gr.Gallery(label="Template Gallery", show_label=True, value=build_prerendered_images_by_quality(3,'thumbnail'), 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):
+                                # def handle_login(request: gr.Request):
+                                #     # Extract user information from the request
+                                #     user_info = {
+                                #         "username": request.username,
+                                #         "session_hash": request.session_hash,
+                                #         "headers": dict(request.headers),
+                                #         "client": request.client,
+                                #         "query_params": dict(request.query_params),
+                                #         "path_params": dict(request.path_params)
+                                #     }
+                                #     print(f"\n{user_info}\n")
+                                #     return user_info
                                 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",
-                                    elem_classes="solid"
-                                )
-                    with gr.Accordion("Advanced Settings", open=False):
+                                # login_button = gr.LoginButton()
+                                # user_info_output = gr.JSON(label="User Information")
+                                # login_button.click(fn=handle_login, inputs=[], outputs=user_info_output)
+
+            with gr.Row():
+                with gr.Accordion("Advanced Settings", open=False):
                         with gr.Row():
-                            image_strength = gr.Slider(label="Image Guidance Strength (prompt percentage)", info="Lower means more image influence", minimum=0.1, maximum=1.0, step=0.01, value=0.8)
+                            image_strength = gr.Slider(label="Image Guidance Strength (prompt percentage)", info="Lower means more image influence", minimum=0.1, maximum=1.0, step=0.01, value=0.9)
                         with gr.Column():
                             with gr.Row():
-                                cfg_scale = gr.Slider(label="CFG Scale", minimum=1, maximum=20, step=0.5, value=4.5)
+                                cfg_scale = gr.Slider(label="CFG Scale", minimum=1, maximum=20, step=0.5, value=5.0)
                                 steps = gr.Slider(label="Steps", minimum=1, maximum=50, step=1, value=30)
                 
                             with gr.Row():
@@ -839,13 +856,18 @@ with gr.Blocks(css_paths="style_20250128.css", title=title, theme='Surn/beeuty',
                                     outputs=[width]
                                 )
                             with gr.Row():
-                                randomize_seed = gr.Checkbox(True, label="Randomize seed")
-                                seed = gr.Slider(label="Seed", minimum=0, maximum=MAX_SEED, step=1, value=0, randomize=True)
+                                randomize_seed = gr.Checkbox(False, label="Randomize seed",elem_id="rnd_seed_chk")
+                                seed = gr.Slider(label="Seed", minimum=0, maximum=MAX_SEED, step=1, value=0, randomize=True, elem_id="rnd_seed")
                                 lora_scale = gr.Slider(label="LoRA Scale", minimum=0, maximum=3, step=0.01, value=1.01)
     with gr.Row():
         gr.HTML(value=getVersions(), visible=True, elem_id="versions")
 
     # Event Handlers
+    composite_button.click(
+        fn=lambda input_image, composite_color, composite_opacity: gr.Warning("Please upload an Input Image to get started.") if input_image is None else change_color(input_image, composite_color, composite_opacity),
+        inputs=[input_image, composite_color, composite_opacity],
+        outputs=[input_image]
+    )
     #use conditioned_image as the input_image for generate_input_image_click
     generate_input_image_from_gallery.click(
         fn=run_lora,
@@ -858,17 +880,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
-    # )
+    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,