Seed and Use main image as image conditioner by default

app.py

@@ -605,7 +605,7 @@ def generate_ai_image_local (
         return None
 
 
-def generate_input_image_click(map_option, prompt_textbox_value, negative_prompt_textbox_value, model_textbox_value, randomize_seed=True, seed=None, use_conditioned_image=False, strength=0.5, image_format="16:9", scale_factor=(8/3), progress=gr.Progress(track_tqdm=True)):
+def generate_input_image_click(image_input, map_option, prompt_textbox_value, negative_prompt_textbox_value, model_textbox_value, randomize_seed=True, seed=None, use_conditioned_image=False, strength=0.5, image_format="16:9", scale_factor=(8/3), progress=gr.Progress(track_tqdm=True)):
     if randomize_seed:
         seed = random.randint(0, constants.MAX_SEED)
 
@@ -613,6 +613,7 @@ def generate_input_image_click(map_option, prompt_textbox_value, negative_prompt
     model, lora_weights = get_model_and_lora(model_textbox_value)
     global current_prerendered_image
     conditioned_image=None
+    formatted_map_option = map_option.lower().replace(' ', '_')
 
     if use_conditioned_image:
         print(f"Conditioned path: {current_prerendered_image.value}.. converting to RGB\n")
@@ -620,6 +621,11 @@ def generate_input_image_click(map_option, prompt_textbox_value, negative_prompt
         if isinstance(current_prerendered_image.value, str):
             conditioned_image = open_image(current_prerendered_image.value).convert("RGB")
             print(f"Conditioned Image: {conditioned_image.size}.. converted to RGB\n")
+    # use image_input as the conditioned_image if it is not None
+    elif image_input is not None:
+        conditioned_image =  open_image(image_input).convert("RGB")
+        print(f"Conditioned Image set to modify Input Image!\nClear to generate new image.")
+        gr.Info("Conditioned Image set to modify Input Image! Clear to generate new image",duration=5)
 
     # Convert image_format from a string split by ":" into two numbers divided
     width_ratio, height_ratio = map(int, image_format.split(":"))
@@ -649,19 +655,19 @@ def generate_input_image_click(map_option, prompt_textbox_value, negative_prompt
         image = Image.open(image_path).convert("RGBA")
     except Exception as e:
         print(f"Failed to open generated image: {e}")
-        return image_path  # Return the original image path if opening fails
+        return image_path, seed  # Return the original image path if opening fails
        
     # Upscale the image
     upscaled_image = upscale_image(image, scale_factor)
        
     # Save the upscaled image to a temporary file
-    with NamedTemporaryFile(delete=False, suffix=".png") as tmp_upscaled:
+    with NamedTemporaryFile(delete=False, suffix=".png", prefix=f"{formatted_map_option}_") as tmp_upscaled:
         upscaled_image.save(tmp_upscaled.name, format="PNG")
         constants.temp_files.append(tmp_upscaled.name)
         print(f"Upscaled image saved to {tmp_upscaled.name}")
     gc.collect()
     # Return the path of the upscaled image
-    return tmp_upscaled.name
+    return tmp_upscaled.name, seed
 
 def update_prompt_visibility(map_option):
       is_visible = (map_option == "Prompt")
@@ -879,7 +885,7 @@ examples = [["assets//examples//hex_map_p1.png", 32, 1, 0, 0, 0, 0, 0, "#ede9ac4
 gr.set_static_paths(paths=["images/","images/images","images/prerendered","LUT/","fonts/"])
 
 # Gradio Blocks Interface
-with gr.Blocks(css_paths="style_20250128.css", title=title, theme='Surn/beeuty') as hexaGrid:
+with gr.Blocks(css_paths="style_20250128.css", title=title, theme='Surn/beeuty',delete_cache=(21600,86400)) as hexaGrid:
     with gr.Row():
         gr.Markdown("""
         # HexaGrid Creator
@@ -1082,12 +1088,12 @@ with gr.Blocks(css_paths="style_20250128.css", title=title, theme='Surn/beeuty')
                     )
                     with gr.Row():
                         generate_input_image = gr.Button(
-                            "Generate AI Image",
+                            "Generate from Input Image & Options ",
                             elem_id="generate_input_image",
                             elem_classes="solid"
                         )
                 with gr.Column(scale=2):
-                        with gr.Accordion("Template Image Styles", open = False):
+                        with gr.Accordion("Template Images", open = False):
                             with gr.Row():
                                 with gr.Column(scale=2):
                                     # Gallery from PRE_RENDERED_IMAGES GOES HERE
@@ -1100,7 +1106,7 @@ with gr.Blocks(css_paths="style_20250128.css", title=title, theme='Surn/beeuty')
                                         elem_classes="solid"
                                     )
                                     generate_input_image_from_gallery = gr.Button(
-                                        "Generate AI Image from Gallery",
+                                        "Generate AI Image from Template Image & Options",
                                         elem_id="generate_input_image_from_gallery",
                                         elem_classes="solid"
                                     )
@@ -1223,8 +1229,8 @@ with gr.Blocks(css_paths="style_20250128.css", title=title, theme='Surn/beeuty')
     )
     generate_input_image.click(
         fn=generate_input_image_click,
-        inputs=[map_options, prompt_textbox, negative_prompt_textbox, model_textbox, randomize_seed, seed_slider, gr.State(False), gr.State(0.5), image_size_ratio],
-        outputs=[input_image], scroll_to_output=True
+        inputs=[input_image,map_options, prompt_textbox, negative_prompt_textbox, model_textbox, randomize_seed, seed_slider, gr.State(False), gr.State(0.5), image_size_ratio],
+        outputs=[input_image, seed_slider], scroll_to_output=True
     )
     generate_depth_button.click(
         fn=generate_depth_button_click,
@@ -1255,8 +1261,8 @@ with gr.Blocks(css_paths="style_20250128.css", title=title, theme='Surn/beeuty')
     #use conditioned_image as the input_image for generate_input_image_click
     generate_input_image_from_gallery.click(
         fn=generate_input_image_click,
-        inputs=[map_options, prompt_textbox, negative_prompt_textbox, model_textbox,randomize_seed, seed_slider, gr.State(True), image_guidance_stength, image_size_ratio],
-        outputs=[input_image], scroll_to_output=True
+        inputs=[input_image, map_options, prompt_textbox, negative_prompt_textbox, model_textbox,randomize_seed, seed_slider, gr.State(True), image_guidance_stength, image_size_ratio],
+        outputs=[input_image, seed_slider], scroll_to_output=True
     )
 
     # Update the state variable with the prerendered image filepath when an image is selected

utils/constants.py

@@ -50,9 +50,9 @@ def load_env_vars(env_path):
         print(f"Warning: .env file not found at {env_path}")
 
 # Set the temporary folder location
-#os.environ['TEMP'] = r'e:\\TMP'
-#os.environ['TMPDIR'] = r'e:\\TMP'
-#os.environ['XDG_CACHE_HOME'] = r'E:\\cache'
+# os.environ['TEMP'] = r'e:\\TMP'
+# os.environ['TMPDIR'] = r'e:\\TMP'
+# os.environ['XDG_CACHE_HOME'] = r'E:\\cache'
 
 HF_API_TOKEN = os.getenv("HF_TOKEN")
 if not HF_API_TOKEN:
@@ -62,7 +62,7 @@ default_lut_example_img = "./LUT/daisy.jpg"
 MAX_SEED = np.iinfo(np.int32).max
 TARGET_SIZE = (2688,1536)
 #TMPDIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'tmp')
-#os.makedirs(TMP_DIR, exist_ok=True)
+#os.makedirs(TMPDIR, exist_ok=True)
 
 
 PROMPTS = {
@@ -93,7 +93,7 @@ NEGATIVE_PROMPTS = {
 PRERENDER_DIR = "images/prerendered"
 
 # # List of pre-rendered hexagon map files
-# PRE_RENDERED_MAPS = ['alien_orb_land_1.png', 'alien_prarie_1.png', 'alien_world_1.png', 'alien_world_2.png', 'alien_world_3.png', 'alien_world_4.png', 'alien_world_5.png', 'BurntCity.png', 'canyon_water_1.png', 'CONQ_Caustic_Valley.png', 'CONQ_Frozen_City.png', 'CONQ_Hellebore_Springs.png', 'CONQ_Terra_Therma.png', 'CONQ_Viridian_Bog.png', 'cute3dkawaii.PNG', 'dark_dirt_elevations_1.png', 'donald_park.png', 'elevated_peninsula_1.png', 'Firefly_alien_canyons_1.png', 'Firefly_alien_canyons_2.png', 'Firefly_alien_dry_canyons_1.png', 'Firefly_alien_dry_canyons_2.png', 'Firefly_alien_map_1.png', 'Firefly_hpg_terrain_1.png', 'Firefly_hpg_terrain_2.png', 'Firefly_river_dry_1.png', 'Firefly_river_running_1.png', 'Firefly_topographical_alien_desert_1.png', 'Firefly_topographical_canyon_1.png', 'Firefly_topographical_height_map_1.png', 'Firefly_topographical_height_map_2.png', 'Firefly_topographical_height_map_3.png', 'Firefly_topographical_height_map_5.png', 'Firefly_topographical_height_map_6.png', 'Firefly_topographical_marble_1.png', 'Firefly_topographical_moon_1.png', 'fractal_islands.png', 'Genison.png', 'green_farming_alien_world_1.png', 'green_farming_alien_world_2.png', 'grey_barren_alien_world_1.png', 'grey_barren_alien_world_2.png', 'grey_barren_alien_world_3.png', 'grey_barren_alien_world_4.png', 'grey_barren_alien_world_5.png', 'grey_barren_alien_world_6.png', 'grey_barren_alien_world_7.png', 'grey_waterless_alien_world_map.png', 'grid_1.png', 'Hex_gen_map.PNG', 'hex_grass_dirty.png', 'hex_military_industrial_alien_world_map.png', 'hex_mixed_elevations_battlefield_1.png', 'hex_mixed_elevations_battlefield_2.png', 'hex_tree_territory.png', 'lake_city.png', 'mickey_lagoon.png', 'mixed_elevations_battlefield_3.png', 'n6W9Hc.png', 'oasis_mixed_elevations_1.png', 'pic526383.png', 'pinecone_islands.png', 'purple_pines.png', 'red_volcanic_alien_1.png', 'red_volcanic_alien_2.png', 'red_volcanic_alien_3.png', 'red_volcanic_alien_4.png', 'roadway_1.png', 'snowy_lake.png', 'snowy_rolling_hills_1.png', 'volcanic_alien_world_map.png', 'war_torn_post_apocalyptic_alien_world_map.png']
+# PRE_RENDERED_MAPS = ['alien_orb_land_1.png', 'alien_prarie_1.png', 'alien_world_1.png', 'alien_world_2.png', 'alien_world_3.png', 'alien_world_4.png', 'alien_world_5.png', 'BurntCity.png', 'canyon_water_1.png', 'CONQ_Caustic_Valley.png', 'CONQ_Frozen_City.png', 'CONQ_Hellebore_Springs.png', 'CONQ_Terra_Therma.png', 'CONQ_Viridian_Bog.png', 'cute3dkawaii.PNG', 'dark_dirt_elevations_1.png', 'donald_park.png', 'elevated_peninsula_1.png', 'Firefly_alien_canyons_1.png', 'Firefly_alien_canyons_2.png', 'Firefly_alien_dry_canyons_1.png', 'Firefly_alien_dry_canyons_2.png', 'Firefly_alien_map_1.png', 'Firefly_hpg_terrain_1.png', 'Firefly_hpg_terrain_2.png', 'Firefly_river_dry_1.png', 'Firefly_river_running_1.png', 'Firefly_topographical_alien_desert_1.png', 'Firefly_topographical_canyon_1.png', 'Firefly_topographical_height_map_1.png', 'Firefly_topographical_height_map_2.png', 'Firefly_topographical_height_map_3.png', 'Firefly_topographical_height_map_5.png', 'Firefly_topographical_height_map_6.png', 'Firefly_topographical_marble_1.png', 'Firefly_topographical_moon_1.png', 'fractal_islands.png', 'Genison.png', 'green_farming_alien_world_1.png', 'green_farming_alien_world_2.png', 'grey_barren_alien_world_1.png', 'grey_barren_alien_world_2.png', 'grey_barren_alien_world_3.png', 'grey_barren_alien_world_4.png', 'grey_barren_alien_world_5.png', 'grey_barren_alien_world_6.png', 'grey_barren_alien_world_7.png', 'grey_waterless_alien_world_map.png', 'grid_1.png', 'Hex_gen_map.png', 'hex_grass_dirty.png', 'hex_military_industrial_alien_world_map.png', 'hex_mixed_elevations_battlefield_1.png', 'hex_mixed_elevations_battlefield_2.png', 'hex_tree_territory.png', 'lake_city.png', 'mickey_lagoon.png', 'mixed_elevations_battlefield_3.png', 'n6W9Hc.png', 'oasis_mixed_elevations_1.png', 'pic526383.png', 'pinecone_islands.png', 'purple_pines.png', 'red_volcanic_alien_1.png', 'red_volcanic_alien_2.png', 'red_volcanic_alien_3.png', 'red_volcanic_alien_4.png', 'roadway_1.png', 'snowy_lake.png', 'snowy_rolling_hills_1.png', 'volcanic_alien_world_map.png', 'war_torn_post_apocalyptic_alien_world_map.png']
 
 # # Create full paths for pre-rendered maps
 # pre_rendered_maps_paths = [os.path.join(PRERENDER_DIR, map_file).replace("\\", "/") for map_file in PRE_RENDERED_MAPS]
@@ -105,7 +105,7 @@ PRERENDER_DIR = "images/prerendered"
 #    for file in PRE_RENDERED_MAPS
 #}
 #PRE_RENDERED_MAPS_JSON
-#{'alien orb land 1': 'images/prerendered/alien_orb_land_1.png', 'alien prarie 1': 'images/prerendered/alien_prarie_1.png', 'alien world 1': 'images/prerendered/alien_world_1.png', 'alien world 2': 'images/prerendered/alien_world_2.png', 'alien world 3': 'images/prerendered/alien_world_3.png', 'alien world 4': 'images/prerendered/alien_world_4.png', 'alien world 5': 'images/prerendered/alien_world_5.png', 'BurntCity': 'images/prerendered/BurntCity.png', 'canyon water 1': 'images/prerendered/canyon_water_1.png', 'CONQ Caustic Valley': 'images/prerendered/CONQ_Caustic_Valley.png', 'CONQ Frozen City': 'images/prerendered/CONQ_Frozen_City.png', 'CONQ Hellebore Springs': 'images/prerendered/CONQ_Hellebore_Springs.png', 'CONQ Terra Therma': 'images/prerendered/CONQ_Terra_Therma.png', 'CONQ Viridian Bog': 'images/prerendered/CONQ_Viridian_Bog.png', 'cute3dkawaii': 'images/prerendered/cute3dkawaii.PNG', 'dark dirt elevations 1': 'images/prerendered/dark_dirt_elevations_1.png', 'donald park': 'images/prerendered/donald_park.png', 'elevated peninsula 1': 'images/prerendered/elevated_peninsula_1.png', 'Firefly alien canyons 1': 'images/prerendered/Firefly_alien_canyons_1.png', 'Firefly alien canyons 2': 'images/prerendered/Firefly_alien_canyons_2.png', 'Firefly alien dry canyons 1': 'images/prerendered/Firefly_alien_dry_canyons_1.png', 'Firefly alien dry canyons 2': 'images/prerendered/Firefly_alien_dry_canyons_2.png', 'Firefly alien map 1': 'images/prerendered/Firefly_alien_map_1.png', 'Firefly hpg terrain 1': 'images/prerendered/Firefly_hpg_terrain_1.png', 'Firefly hpg terrain 2': 'images/prerendered/Firefly_hpg_terrain_2.png', 'Firefly river dry 1': 'images/prerendered/Firefly_river_dry_1.png', 'Firefly river running 1': 'images/prerendered/Firefly_river_running_1.png', 'Firefly topographical alien desert 1': 'images/prerendered/Firefly_topographical_alien_desert_1.png', 'Firefly topographical canyon 1': 'images/prerendered/Firefly_topographical_canyon_1.png', 'Firefly topographical height map 1': 'images/prerendered/Firefly_topographical_height_map_1.png', 'Firefly topographical height map 2': 'images/prerendered/Firefly_topographical_height_map_2.png', 'Firefly topographical height map 3': 'images/prerendered/Firefly_topographical_height_map_3.png', 'Firefly topographical height map 5': 'images/prerendered/Firefly_topographical_height_map_5.png', 'Firefly topographical height map 6': 'images/prerendered/Firefly_topographical_height_map_6.png', 'Firefly topographical marble 1': 'images/prerendered/Firefly_topographical_marble_1.png', 'Firefly topographical moon 1': 'images/prerendered/Firefly_topographical_moon_1.png', 'fractal islands': 'images/prerendered/fractal_islands.png', 'Genison': 'images/prerendered/Genison.png', 'green farming alien world 1': 'images/prerendered/green_farming_alien_world_1.png', 'green farming alien world 2': 'images/prerendered/green_farming_alien_world_2.png', 'grey barren alien world 1': 'images/prerendered/grey_barren_alien_world_1.png', 'grey barren alien world 2': 'images/prerendered/grey_barren_alien_world_2.png', 'grey barren alien world 3': 'images/prerendered/grey_barren_alien_world_3.png', 'grey barren alien world 4': 'images/prerendered/grey_barren_alien_world_4.png', 'grey barren alien world 5': 'images/prerendered/grey_barren_alien_world_5.png', 'grey barren alien world 6': 'images/prerendered/grey_barren_alien_world_6.png', 'grey barren alien world 7': 'images/prerendered/grey_barren_alien_world_7.png', 'grey waterless alien world map': 'images/prerendered/grey_waterless_alien_world_map.png', 'grid 1': 'images/prerendered/grid_1.png', 'Hex gen map': 'images/prerendered/Hex_gen_map.PNG', 'hex grass dirty': 'images/prerendered/hex_grass_dirty.png', 'hex military industrial alien world map': 'images/prerendered/hex_military_industrial_alien_world_map.png', 'hex mixed elevations battlefield 1': 'images/prerendered/hex_mixed_elevations_battlefield_1.png', 'hex mixed elevations battlefield 2': 'images/prerendered/hex_mixed_elevations_battlefield_2.png', 'hex tree territory': 'images/prerendered/hex_tree_territory.png', 'lake city': 'images/prerendered/lake_city.png', 'mickey lagoon': 'images/prerendered/mickey_lagoon.png', 'mixed elevations battlefield 3': 'images/prerendered/mixed_elevations_battlefield_3.png', 'n6W9Hc': 'images/prerendered/n6W9Hc.png', 'oasis mixed elevations 1': 'images/prerendered/oasis_mixed_elevations_1.png', 'pic526383': 'images/prerendered/pic526383.png', 'pinecone islands': 'images/prerendered/pinecone_islands.png', 'purple pines': 'images/prerendered/purple_pines.png', 'red volcanic alien 1': 'images/prerendered/red_volcanic_alien_1.png', 'red volcanic alien 2': 'images/prerendered/red_volcanic_alien_2.png', 'red volcanic alien 3': 'images/prerendered/red_volcanic_alien_3.png', 'red volcanic alien 4': 'images/prerendered/red_volcanic_alien_4.png', 'roadway 1': 'images/prerendered/roadway_1.png', 'snowy lake': 'images/prerendered/snowy_lake.png', 'snowy rolling hills 1': 'images/prerendered/snowy_rolling_hills_1.png', 'volcanic alien world map': 'images/prerendered/volcanic_alien_world_map.png', 'war torn post apocalyptic alien world map': 'images/prerendered/war_torn_post_apocalyptic_alien_world_map.png'}
+#{'alien orb land 1': 'images/prerendered/alien_orb_land_1.png', 'alien prarie 1': 'images/prerendered/alien_prarie_1.png', 'alien world 1': 'images/prerendered/alien_world_1.png', 'alien world 2': 'images/prerendered/alien_world_2.png', 'alien world 3': 'images/prerendered/alien_world_3.png', 'alien world 4': 'images/prerendered/alien_world_4.png', 'alien world 5': 'images/prerendered/alien_world_5.png', 'BurntCity': 'images/prerendered/BurntCity.png', 'canyon water 1': 'images/prerendered/canyon_water_1.png', 'CONQ Caustic Valley': 'images/prerendered/CONQ_Caustic_Valley.png', 'CONQ Frozen City': 'images/prerendered/CONQ_Frozen_City.png', 'CONQ Hellebore Springs': 'images/prerendered/CONQ_Hellebore_Springs.png', 'CONQ Terra Therma': 'images/prerendered/CONQ_Terra_Therma.png', 'CONQ Viridian Bog': 'images/prerendered/CONQ_Viridian_Bog.png', 'cute3dkawaii': 'images/prerendered/cute3dkawaii.png', 'dark dirt elevations 1': 'images/prerendered/dark_dirt_elevations_1.png', 'donald park': 'images/prerendered/donald_park.png', 'elevated peninsula 1': 'images/prerendered/elevated_peninsula_1.png', 'Firefly alien canyons 1': 'images/prerendered/Firefly_alien_canyons_1.png', 'Firefly alien canyons 2': 'images/prerendered/Firefly_alien_canyons_2.png', 'Firefly alien dry canyons 1': 'images/prerendered/Firefly_alien_dry_canyons_1.png', 'Firefly alien dry canyons 2': 'images/prerendered/Firefly_alien_dry_canyons_2.png', 'Firefly alien map 1': 'images/prerendered/Firefly_alien_map_1.png', 'Firefly hpg terrain 1': 'images/prerendered/Firefly_hpg_terrain_1.png', 'Firefly hpg terrain 2': 'images/prerendered/Firefly_hpg_terrain_2.png', 'Firefly river dry 1': 'images/prerendered/Firefly_river_dry_1.png', 'Firefly river running 1': 'images/prerendered/Firefly_river_running_1.png', 'Firefly topographical alien desert 1': 'images/prerendered/Firefly_topographical_alien_desert_1.png', 'Firefly topographical canyon 1': 'images/prerendered/Firefly_topographical_canyon_1.png', 'Firefly topographical height map 1': 'images/prerendered/Firefly_topographical_height_map_1.png', 'Firefly topographical height map 2': 'images/prerendered/Firefly_topographical_height_map_2.png', 'Firefly topographical height map 3': 'images/prerendered/Firefly_topographical_height_map_3.png', 'Firefly topographical height map 5': 'images/prerendered/Firefly_topographical_height_map_5.png', 'Firefly topographical height map 6': 'images/prerendered/Firefly_topographical_height_map_6.png', 'Firefly topographical marble 1': 'images/prerendered/Firefly_topographical_marble_1.png', 'Firefly topographical moon 1': 'images/prerendered/Firefly_topographical_moon_1.png', 'fractal islands': 'images/prerendered/fractal_islands.png', 'Genison': 'images/prerendered/Genison.png', 'green farming alien world 1': 'images/prerendered/green_farming_alien_world_1.png', 'green farming alien world 2': 'images/prerendered/green_farming_alien_world_2.png', 'grey barren alien world 1': 'images/prerendered/grey_barren_alien_world_1.png', 'grey barren alien world 2': 'images/prerendered/grey_barren_alien_world_2.png', 'grey barren alien world 3': 'images/prerendered/grey_barren_alien_world_3.png', 'grey barren alien world 4': 'images/prerendered/grey_barren_alien_world_4.png', 'grey barren alien world 5': 'images/prerendered/grey_barren_alien_world_5.png', 'grey barren alien world 6': 'images/prerendered/grey_barren_alien_world_6.png', 'grey barren alien world 7': 'images/prerendered/grey_barren_alien_world_7.png', 'grey waterless alien world map': 'images/prerendered/grey_waterless_alien_world_map.png', 'grid 1': 'images/prerendered/grid_1.png', 'Hex gen map': 'images/prerendered/Hex_gen_map.png', 'hex grass dirty': 'images/prerendered/hex_grass_dirty.png', 'hex military industrial alien world map': 'images/prerendered/hex_military_industrial_alien_world_map.png', 'hex mixed elevations battlefield 1': 'images/prerendered/hex_mixed_elevations_battlefield_1.png', 'hex mixed elevations battlefield 2': 'images/prerendered/hex_mixed_elevations_battlefield_2.png', 'hex tree territory': 'images/prerendered/hex_tree_territory.png', 'lake city': 'images/prerendered/lake_city.png', 'mickey lagoon': 'images/prerendered/mickey_lagoon.png', 'mixed elevations battlefield 3': 'images/prerendered/mixed_elevations_battlefield_3.png', 'n6W9Hc': 'images/prerendered/n6W9Hc.png', 'oasis mixed elevations 1': 'images/prerendered/oasis_mixed_elevations_1.png', 'pic526383': 'images/prerendered/pic526383.png', 'pinecone islands': 'images/prerendered/pinecone_islands.png', 'purple pines': 'images/prerendered/purple_pines.png', 'red volcanic alien 1': 'images/prerendered/red_volcanic_alien_1.png', 'red volcanic alien 2': 'images/prerendered/red_volcanic_alien_2.png', 'red volcanic alien 3': 'images/prerendered/red_volcanic_alien_3.png', 'red volcanic alien 4': 'images/prerendered/red_volcanic_alien_4.png', 'roadway 1': 'images/prerendered/roadway_1.png', 'snowy lake': 'images/prerendered/snowy_lake.png', 'snowy rolling hills 1': 'images/prerendered/snowy_rolling_hills_1.png', 'volcanic alien world map': 'images/prerendered/volcanic_alien_world_map.png', 'war torn post apocalyptic alien world map': 'images/prerendered/war_torn_post_apocalyptic_alien_world_map.png'}
 ##PRE_RENDERED_MAPS_JSON = {    key: {        'file': value,        'quality': 0    }    for key, value in PRE_RENDERED_MAPS_JSON.items()}
 PRE_RENDERED_MAPS_JSON_LEVELS = {
     'alien orb land 1': {'file': 'images/prerendered/alien_orb_land_1.png', 'thumbnail': 'images/prerendered/th/alien_orb_land_1.png', 'quality': 0},
@@ -122,7 +122,7 @@ PRE_RENDERED_MAPS_JSON_LEVELS = {
     'CONQ Hellebore Springs': {'file': 'images/prerendered/CONQ_Hellebore_Springs.png', 'thumbnail': 'images/prerendered/th/CONQ_Hellebore_Springs.png', 'quality': 2},
     'CONQ Terra Therma': {'file': 'images/prerendered/CONQ_Terra_Therma.png', 'thumbnail': 'images/prerendered/th/CONQ_Terra_Therma.png', 'quality': 1},
     'CONQ Viridian Bog': {'file': 'images/prerendered/CONQ_Viridian_Bog.png', 'thumbnail': 'images/prerendered/th/CONQ_Viridian_Bog.png', 'quality': 1},
-    'cute3dkawaii': {'file': 'images/prerendered/cute3dkawaii.PNG', 'thumbnail': 'images/prerendered/th/cute3dkawaii.PNG', 'quality': 0},
+    'cute3dkawaii': {'file': 'images/prerendered/cute3dkawaii.png', 'thumbnail': 'images/prerendered/th/cute3dkawaii.png', 'quality': 0},
     'dark dirt elevations 1': {'file': 'images/prerendered/dark_dirt_elevations_1.png', 'thumbnail': 'images/prerendered/th/dark_dirt_elevations_1.png', 'quality': 0},
     'donald park': {'file': 'images/prerendered/donald_park.png', 'thumbnail': 'images/prerendered/th/donald_park.png', 'quality': 0},
     'elevated peninsula 1': {'file': 'images/prerendered/elevated_peninsula_1.png', 'thumbnail': 'images/prerendered/th/elevated_peninsula_1.png', 'quality': 0},
@@ -157,7 +157,7 @@ PRE_RENDERED_MAPS_JSON_LEVELS = {
     'grey barren alien world 7': {'file': 'images/prerendered/grey_barren_alien_world_7.png', 'thumbnail': 'images/prerendered/th/grey_barren_alien_world_7.png', 'quality': 3},
     'grey waterless alien world map': {'file': 'images/prerendered/grey_waterless_alien_world_map.png', 'thumbnail': 'images/prerendered/th/grey_waterless_alien_world_map.png', 'quality': 3},
     'grid 1': {'file': 'images/prerendered/grid_1.png', 'thumbnail': 'images/prerendered/th/grid_1.png', 'quality': 0},
-    'Hex gen map': {'file': 'images/prerendered/Hex_gen_map.PNG', 'thumbnail': 'images/prerendered/th/Hex_gen_map.PNG', 'quality': 0},
+    'Hex gen map': {'file': 'images/prerendered/Hex_gen_map.png', 'thumbnail': 'images/prerendered/th/Hex_gen_map.png', 'quality': 0},
     'hex grass dirty': {'file': 'images/prerendered/hex_grass_dirty.png', 'thumbnail': 'images/prerendered/th/hex_grass_dirty.png', 'quality': 0},
     'hex military industrial alien world map': {'file': 'images/prerendered/hex_military_industrial_alien_world_map.png', 'thumbnail': 'images/prerendered/th/hex_military_industrial_alien_world_map.png', 'quality': 3},
     'hex mixed elevations battlefield 1': {'file': 'images/prerendered/hex_mixed_elevations_battlefield_1.png', 'thumbnail': 'images/prerendered/th/hex_mixed_elevations_battlefield_1.png', 'quality': 0},
@@ -251,7 +251,7 @@ LORA_DETAILS = {
             "trigger_words": "anime,",
         },
         {
-            "notes": "You should use ',anime' as trigger words at the end. @6min"
+            "notes": "You should use ',anime' as trigger words at the end. "
         },
         {
             "parameters" :{
@@ -268,7 +268,7 @@ LORA_DETAILS = {
             "trigger_words": "scenery style,",
         },
         {
-            "notes": "You should use ',scenery style' as trigger words at the end. @6min"
+            "notes": "You should use ',scenery style' as trigger words at the end. "
         },
         {
             "parameters" :{
@@ -285,7 +285,7 @@ LORA_DETAILS = {
             "trigger_words": "disney style,",
         },
         {
-            "notes": "You should use ',disney style' as trigger words at the end. @12min "
+            "notes": "You should use ',disney style' as trigger words at the end. "
         },
         {
             "parameters" :{
@@ -295,7 +295,7 @@ LORA_DETAILS = {
         ],
     "XLabs-AI/flux-RealismLora":[
         {
-            "notes": "No trigger words but 8k, Animatrix illustration style, fantasy style, natural photo cinematic should all work @6min"
+            "notes": "No trigger words but 8k, Animatrix illustration style, fantasy style, natural photo cinematic should all work "
         },
         {
             "parameters" :{
@@ -314,7 +314,7 @@ LORA_DETAILS = {
             "trigger_words": "FRM$",
         },
         {
-            "notes": "You should use FRM$ as trigger words. @1.5 minutes"
+            "notes": " FRM$ used as trigger words. "
         },
         {
             "parameters" :{
@@ -343,7 +343,7 @@ LORA_DETAILS = {
     ],
     "Shakker-Labs/FLUX.1-dev-LoRA-Logo-Design": [
         {
-            "notes": "You should use wablogo, logo, Minimalist as trigger words.. @4.8min"
+            "notes": "Uses wablogo, logo, Minimalist as trigger words.."
         },
         {
             "trigger_words": "wablogo, logo, Minimalist ",
@@ -361,7 +361,7 @@ LORA_DETAILS = {
     ],
     "Borcherding/FLUX.1-dev-LoRA-FractalLand-v0.1": [
         {
-            "notes": "Use fractalLand at the start of the prompts to activate the fractal elements. . @4.8min"
+            "notes": "Uses fractalLand at the start of the prompts to activate the fractal elements. . "
         },
         {
             "trigger_words": "fractalLand ",

utils/image_utils.py

@@ -44,6 +44,12 @@ def open_image(image_path):
     """
     if isinstance(image_path, Image.Image):
         return image_path
+    else:    
+        path = Path(image_path)
+        new_suffix = path.suffix.lower()
+        new_path = path.with_suffix(new_suffix)
+        image_path = str(new_path)
+
     import requests
     try:
         image_path, is_dict = get_image_from_dict(image_path)
@@ -686,7 +692,7 @@ def convert_to_rgba_png(file_path: str) -> tuple[Image, str]:
         img = open_image(file_path)
         print(f"Opened image: {file_path}\n")
         # Handle ICO files
-        if file_path.lower().endswith('.ico'):
+        if file_path.lower().endswith(('.ico','.webp','.gif')):
             rgba_img = img.convert('RGBA')
             new_file_path = Path(file_path).with_suffix('.png')
             rgba_img.save(new_file_path, format='PNG')