Add object removal now that fill works - bad keys

app.py

@@ -118,7 +118,7 @@ from utils.version_info import (
 #from utils.depth_estimation import (get_depth_map_from_state)
 
 input_image_palette = []
-current_prerendered_image = gr.State("./images/Beeuty-1.png")
+current_prerendered_image = gr.State("./images/images/Bee-test-2.png")
 user_dir = constants.TMPDIR
 lora_models = get_lora_models()
 selected_index = gr.State(value=-1)
@@ -509,7 +509,7 @@ def generate_image_lowmem(
     #del conditions
     del generator
     # Move the pipeline and clear cache
-    pipe.to("cpu")
+    #pipe.to("cpu")
     torch.cuda.empty_cache()
     torch.cuda.ipc_collect()
     print(torch.cuda.memory_summary(device=None, abbreviated=False))
@@ -1187,27 +1187,16 @@ with gr.Blocks(css_paths="style_20250314.css", title=title, theme='Surn/beeuty',
                         image_mode="RGBA",
                         format="PNG",
                         brush=gr.Brush(colors=['#000000', '#3270cc', '#cc3232', '#32cc70', '#ffffff']),
-                        canvas_size=(640,360)
+                        canvas_size=(640,480)
                     )
                 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")
                         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. <span style='color: red; font-style: bolder;'>Click the pencil to start drawing.</span>")
+                        gr.Markdown("### Do Not add to image if using a fill model. Black is replaced by 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):
-                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,)
-                        fill_hex = gr.Checkbox(label="Fill Hex with color from Image", value=True)
-                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")
             with gr.Accordion("Image Filters", open = False):
                 with gr.Row():
                     with gr.Column():
@@ -1366,19 +1355,31 @@ with gr.Blocks(css_paths="style_20250314.css", title=title, theme='Surn/beeuty',
                     with gr.Row():    
                         image_guidance_stength = gr.Slider(label="Image Guidance Strength (prompt percentage)", info="applies to Input, Sketch and Template Image",minimum=0, maximum=1.0, value=0.85, step=0.01, interactive=True)
     with gr.Accordion("Advanced Hexagon Settings", open = False):
+        with gr.Accordion("Hex Coloring and Exclusion", open = True):
+            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,)
+                    fill_hex = gr.Checkbox(label="Fill Hex with color from Image", value=True)
+            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")
+        with gr.Accordion("Hex Grid Location on Image", open = False):
+            with gr.Row():
+                start_x = gr.Number(label="Start X", value=20, minimum=-512, maximum= 512, precision=0)
+                start_y = gr.Number(label="Start Y", value=20, minimum=-512, maximum= 512, precision=0)
+                end_x = gr.Number(label="End X", value=-20, minimum=-512, maximum= 512, precision=0)
+                end_y = gr.Number(label="End Y", value=-20, minimum=-512, maximum= 512, precision=0)
         with gr.Row():
-            start_x = gr.Number(label="Start X", value=20, minimum=-512, maximum= 512, precision=0)
-            start_y = gr.Number(label="Start Y", value=20, minimum=-512, maximum= 512, precision=0)
-            end_x = gr.Number(label="End X", value=-20, minimum=-512, maximum= 512, precision=0)
-            end_y = gr.Number(label="End Y", value=-20, minimum=-512, maximum= 512, precision=0)
+            rotation = gr.Slider(-90, 180, 0.0, 0.1, label="Hexagon Rotation (degree)")
+            sides = gr.Dropdown(label="Grid Shapes", info="The shapes that form grids",choices=["triangle", "square", "hexagon"], value="hexagon")            
         with gr.Row():
+            add_hex_text = gr.Dropdown(label="Add Text to Hexagons", choices=[None, "Column-Row Coordinates", "Column(Letter)-Row Coordinates", "Column-Row(Letter) Coordinates", "Sequential Numbers", "Playing Cards Sequential", "Playing Cards Alternate Red and Black", "Custom List"], value=None)
             x_spacing = gr.Number(label="Adjust Horizontal spacing", value=-10, minimum=-200, maximum=200, precision=1)
             y_spacing = gr.Number(label="Adjust Vertical spacing", value=3, minimum=-200, maximum=200, precision=1)
-        with gr.Row():
-            rotation = gr.Slider(-90, 180, 0.0, 0.1, label="Hexagon Rotation (degree)")
-            sides = gr.Dropdown(label="Grid Shapes", info="other choices do not form grids",choices=["triangle", "square", "hexagon"], value="hexagon")
-            add_hex_text = gr.Dropdown(label="Add Text to Hexagons", choices=[None, "Column-Row Coordinates", "Column(Letter)-Row Coordinates", "Column-Row(Letter) Coordinates", "Sequential Numbers", "Playing Cards Sequential", "Playing Cards Alternate Red and Black", "Custom List"], value=None)
-        with gr.Row():
+        with gr.Row():            
             custom_text_list = gr.TextArea(label="Custom Text List", value=constants.cards_alternating, visible=False,)
             custom_text_color_list = gr.TextArea(label="Custom Text Color List", value=constants.card_colors_alternating, visible=False)
         with gr.Row():

utils/constants.py

@@ -69,7 +69,7 @@ os.makedirs(TMPDIR, exist_ok=True)
 
 
 PROMPTS = {
-    "Mecha Wasteland Arena": "Regional overhead view, directly from above, centered on the map, of a Mecha battlefield map. post-industrial wasteland with crumbling structures, volcanic ridges, scrapyards, and ash plains. Features elevated overwatch positions for long-range combat and tight brawling areas for close-quarters engagements. Colors: rusted red, charcoal gray, muted orange, ash white, dark brown. Partial edge hexes are black.",
+    "Mecha Wasteland Arena": "Regional overhead view, directly from above, centered on the map, of a Mecha battlefield map. post-industrial wasteland with crumbling structures, volcanic ridges, scrapyards, and ash plains. Features elevated overwatch positions for long-range combat and tight brawling areas for close-quarters engagements. Partial edge hexes are black. Colors: red, gray, muted orange, ash white, dark brown.",
     "BorderBlack": "Planetary overhead view, directly from above, centered on the planet’s surface, of a hexagon-based alien world map with black borders. Features rivers, mountains, volcanoes, and polar snow regions. Colors: light blue, green, tan, brown. No reflections or shadows. Partial edge hexes are black.",
     "Earth": "Planetary overhead view, directly from above, centered on the planet’s surface, of an Earth-like world map with rivers, mountains, volcanoes, and polar snow regions. Colors: light blue, green, tan, brown. No reflections or shadows. Partial edge hexes are black.",
     "Beeuty": "Regional overhead view, directly from above, centered on the map, of a tabletop gaming map with honeycomb-shaped terrain, lakes, dense forests, magical flora, and hex grids. Designed for clarity and strategic gameplay. Colors: yellow, green, purple, brown. Partial edge hexes are black.",
@@ -225,6 +225,7 @@ LORA_WEIGHTS = [
     "SebastianBodza/flux_cute3D",
     "gokaygokay/Flux-Seamless-Texture-LoRA",
     "gokaygokay/Flux-Game-Assets-LoRA-v2",
+    "lrzjason/ObjectRemovalFluxFill",
 ]
 
 # Map each LoRA weight to its corresponding model
@@ -243,6 +244,7 @@ LORA_TO_MODEL = {
     "SebastianBodza/flux_cute3D":"black-forest-labs/FLUX.1-dev",
     "gokaygokay/Flux-Seamless-Texture-LoRA":"black-forest-labs/FLUX.1-dev",
     "gokaygokay/Flux-Game-Assets-LoRA-v2":"black-forest-labs/FLUX.1-dev",
+    "lrzjason/ObjectRemovalFluxFill":"black-forest-labs/FLUX.1-Fill-dev",
 }
 condition_type = ["depth", "canny", "subject", "coloring", "deblurring", "fill", "redux"]
 
@@ -361,7 +363,7 @@ LORA_DETAILS = {
             "thumbnail": "https://huggingface.co/VideoAditor/Flux-Lora-Realism/resolve/main/images/feel-the-difference-between-using-flux-with-lora-from-xlab-v0-j0ehybmvxehd1.png",
             "show_in_gallery": True
         }
-        ],
+    ],
     "Cossale/Frames2-Flex.1": [
         {
             "weight_name": "backdrops_v2.safetensors",
@@ -559,7 +561,29 @@ LORA_DETAILS = {
             "thumbnail": "https://huggingface.co/gokaygokay/Flux-Game-Assets-LoRA-v2/resolve/main/images/example_y2bqpuphc.png",
             "show_in_gallery": True
         }
-    ]
+    ],
+    "lrzjason/ObjectRemovalFluxFill":[
+        {
+            "notes": "Used to remove objects, may leave a blur "
+        },
+        {
+            "weight_name": "objectRemovalv1_r32.safetensors",
+        },
+        {
+            "title": "Object Removal",
+        },
+        {
+            "parameters" :{
+                "guidance_scale": "30",
+                "num_inference_steps": "50",
+                "max_sequence_length": "512"
+            }
+        },
+        {
+            "thumbnail": "images/prerendered/th/object_removal.png",
+            "show_in_gallery": False
+        }
+    ],
 }
 
 def sort_loras(sortby):
@@ -587,8 +611,10 @@ def sort_loras(sortby):
         # Default title to key if not provided
         if not lora_info["title"]:
             lora_info["title"] = key
-        # Only add to gallery if there is an image set or any item is flagged "show_in_gallery"
-        if lora_info["image"] or any(item.get("show_in_gallery", False) for item in details):
+        # Only add to gallery if flagged "show_in_gallery" = True
+        if any(item.get("show_in_gallery", False) for item in details):
+            if lora_info["image"] == "":
+                lora_info["image"] = "images/Beeuty-1.png"
             loras.append(lora_info)
     # Add models from the MODELS list with a default thumbnail
     for model in MODELS:

utils/image_utils.py

@@ -10,7 +10,7 @@ from typing import List, Union, is_typeddict
 #import numpy as np
 #import math
 from pathlib import Path
-from utils.constants import default_lut_example_img, PRE_RENDERED_MAPS_JSON_LEVELS
+from utils.constants import default_lut_example_img, PRE_RENDERED_MAPS_JSON_LEVELS, BASE_HEIGHT
 from utils.color_utils import (
     detect_color_format,
     update_color_opacity
@@ -18,8 +18,6 @@ from utils.color_utils import (
 from utils.file_utils import rename_file_to_lowercase_extension, get_file_parts
 
 
-
-
 def save_image_to_temp_png(image_source, user_dir: str = None, file_name: str = None):
     """
     Opens an image from a file path, URL, or DataURL and saves it as a PNG in the user's temporary directory.
@@ -1310,19 +1308,19 @@ def calculate_optimal_fill_dimensions(image: Image.Image):
         height = FIXED_DIMENSION
         width = round(FIXED_DIMENSION * original_aspect_ratio)
 
-    # Ensure dimensions are multiples of 8
-    width = (width // 8) * 8
-    height = (height // 8) * 8
+    # Ensure dimensions are multiples of 16
+    width = (width // 16) * 16
+    height = (height // 16) * 16
 
     # Enforce aspect ratio limits
     calculated_aspect_ratio = width / height
     if calculated_aspect_ratio > MAX_ASPECT_RATIO:
-        width = (height * MAX_ASPECT_RATIO // 8) * 8
+        width = (height * MAX_ASPECT_RATIO // 16) * 16
     elif calculated_aspect_ratio < MIN_ASPECT_RATIO:
-        height = (width / MIN_ASPECT_RATIO // 8) * 8
+        height = (width / MIN_ASPECT_RATIO // 16) * 16
 
     # Ensure width and height remain above the minimum dimensions
-    width = max(width, 576) if width == FIXED_DIMENSION else width
-    height = max(height, 576) if height == FIXED_DIMENSION else height
+    width = max(width, BASE_HEIGHT) if width == FIXED_DIMENSION else width
+    height = max(height, BASE_HEIGHT) if height == FIXED_DIMENSION else height
 
     return width, height

utils/lora_details.py

@@ -107,7 +107,7 @@ def approximate_token_count(prompt):
     """
     words = prompt.split()
     # Average tokens per word (can vary based on language and model)
-    tokens_per_word = 1.3
+    tokens_per_word = 1.35
     return int(len(words) * tokens_per_word)
 
 def split_prompt_by_tokens(prompt, token_number):
@@ -131,7 +131,7 @@ def split_prompt_precisely(prompt, max_tokens=77, model="gpt-3.5-turbo"):
         return prompt, ""
        
     # Find the split point
-    split_point = max_tokens
+    split_point = max_tokens - 1
     split_tokens = tokens[:split_point]
     remaining_tokens = tokens[split_point:]