Update Temp File naming for output and overlay images

.gitignore

@@ -167,4 +167,5 @@ cython_debug/
 /temp_models
 /.vscode/settings.json
 **/*.pyc
-**/__pycache__/
+**/__pycache__/
+/utils/tmp

app.py

@@ -28,7 +28,7 @@ import logging
 import gc
 
 # Import functions from modules
-from utils.file_utils import cleanup_temp_files
+from utils.file_utils import cleanup_temp_files, get_file_parts
 
 from utils.color_utils import (
     hex_to_rgb,
@@ -193,7 +193,7 @@ def hex_create(hex_size, border_size, input_image_path, start_x, start_y, end_x,
     excluded_color_list = [tuple(lst) for lst in excluded_colors_var]
 
     # Generate the hexagon grid images
-    grid_image = generate_hexagon_grid_interface(
+    grid_image, overlay_image = generate_hexagon_grid_interface(
         hex_size,
         border_size,
         input_image,
@@ -213,7 +213,10 @@ def hex_create(hex_size, border_size, input_image_path, start_x, start_y, end_x,
         custom_text_list,
         custom_text_color_list
     )    
-    return grid_image
+    _,_, name, _, new_ext = get_file_parts(input_image_path)
+    grid_image_path = save_image_to_temp_png(grid_image, user_dir, "hexgrid_" + name)
+    overlay_image_path = save_image_to_temp_png(overlay_image, user_dir, "overlay_" + name)
+    return grid_image_path, overlay_image_path
 
 def get_model_and_lora(model_textbox):
     """
@@ -700,10 +703,11 @@ def on_prerendered_gallery_selection(event_data: gr.SelectData):
     return current_prerendered_image
 
 def combine_images_with_lerp(input_image, output_image, alpha):
+    directory, _, name,_, new_ext = get_file_parts(input_image)
     in_image = open_image(input_image)
     out_image = open_image(output_image)
     print(f"Combining images with alpha: {alpha}")
-    return lerp_imagemath(in_image, out_image, alpha)
+    return save_image_to_temp_png(lerp_imagemath(in_image, out_image, alpha), user_dir, f"lerp_{str(alpha)}" + name)
 
 def add_border(image, mask_width, mask_height, blank_color):
     bordered_image_output = Image.open(image).convert("RGBA")
@@ -1385,8 +1389,8 @@ with gr.Blocks(css_paths="style_20250314.css", title=title, theme='Surn/beeuty',
         output_image = gr.Image(label="Hexagon Grid Image", image_mode = "RGBA", elem_classes="centered solid imgcontainer", format="PNG", type="filepath", key="ImgOutput",interactive=True)
         overlay_image = gr.Image(label="Hexagon Overlay Image", image_mode = "RGBA", elem_classes="centered solid imgcontainer", format="PNG", type="filepath", key="ImgOverlay",interactive=True)
     with gr.Row():
+        output_blend_multiply_composite = gr.Slider(0,100,50,0.5, label="Multiply Intensity*")
         output_overlay_composite = gr.Slider(0,100,50,0.5, label="Interpolate Intensity")
-        output_blend_multiply_composite = gr.Slider(0,100,50,0.5, label="Overlay Intensity")
         output_alpha_composite = gr.Slider(0,100,50,0.5, label="Alpha Composite Intensity")
     with gr.Accordion("Add Margins (bleed)", open=False):
         with gr.Row():

utils/file_utils.py

@@ -12,6 +12,17 @@ def cleanup_temp_files():
             print(f"Failed to delete temp file {file_path}: {e}")
     print("Temp files cleaned up. Goodbye")
 
+def get_file_parts(file_path: str):
+    # Split the path into directory and filename
+    directory, filename = os.path.split(file_path)
+    
+    # Split the filename into name and extension
+    name, ext = os.path.splitext(filename)
+    
+    # Convert the extension to lowercase
+    new_ext = ext.lower()
+    return directory, filename, name, ext, new_ext
+
 def rename_file_to_lowercase_extension(file_path: str) -> str:
     """
     Renames a file's extension to lowercase in place.
@@ -25,15 +36,7 @@ def rename_file_to_lowercase_extension(file_path: str) -> str:
     Raises:
         OSError: If there is an error renaming the file (e.g., file not found, permissions issue).
     """
-    # Split the path into directory and filename
-    directory, filename = os.path.split(file_path)
-    
-    # Split the filename into name and extension
-    name, ext = os.path.splitext(filename)
-    
-    # Convert the extension to lowercase
-    new_ext = ext.lower()
-    
+    directory, filename, name, ext, new_ext = get_file_parts(file_path)
     # If the extension changes, rename the file
     if ext != new_ext:
         new_filename = name + new_ext

utils/image_utils.py

@@ -15,7 +15,7 @@ from utils.color_utils import (
     detect_color_format,
     update_color_opacity
 )
-from utils.file_utils import rename_file_to_lowercase_extension
+from utils.file_utils import rename_file_to_lowercase_extension, get_file_parts
 
 
 
@@ -45,9 +45,9 @@ def save_image_to_temp_png(image_source, user_dir: str = None, file_name: str =
         user_dir = tempfile.gettempdir()
 
     if file_name is None:
-        file_name = f"{uuid.uuid4()}.png"
+        file_name = "{uuid.uuid4()}"
 
-    temp_filepath = os.path.join(user_dir, file_name.lower())
+    temp_filepath = os.path.join(user_dir, file_name.lower() + ".png")
     os.makedirs(user_dir, exist_ok=True)
 
     # Save the image as PNG
@@ -415,8 +415,11 @@ def multiply_and_blend_images(base_image, image2, alpha_percent=50):
     Returns:
         PIL.Image.Image: The blended image.
     """
+    name = None
+    directory = None
     alpha = alpha_percent / 100.0
     if isinstance(base_image, str):
+        directory, _, name,_,_ = get_file_parts(base_image)
         base_image = open_image(base_image)
     if isinstance(image2, str):
         image2 = open_image(image2)
@@ -430,7 +433,10 @@ def multiply_and_blend_images(base_image, image2, alpha_percent=50):
 
     # Blend the multiplied result with the original
     blended_image = Image.blend(base_image, multiplied_image, alpha)
-
+    if name is not None:
+        new_image_path = os.path.join(directory, name + f"_mb{str(alpha_percent)}.png")
+        blended_image.save(new_image_path)
+        return new_image_path
     return blended_image
 
 def alpha_composite_with_control(base_image, image_with_alpha, alpha_percent=100):
@@ -445,9 +451,12 @@ def alpha_composite_with_control(base_image, image_with_alpha, alpha_percent=100
     Returns:
         PIL.Image.Image: The resulting image after alpha compositing.
     """
+    name = None
+    directory = None
     image_with_alpha, isdict = get_image_from_dict(image_with_alpha)
     alpha_multiplier = alpha_percent / 100.0
     if isinstance(base_image, str):
+        directory, _, name,_, new_ext = get_file_parts(base_image)
         base_image = open_image(base_image)
     if isinstance(image_with_alpha, str):
         image_with_alpha = open_image(image_with_alpha)
@@ -465,7 +474,11 @@ def alpha_composite_with_control(base_image, image_with_alpha, alpha_percent=100
 
     # Composite the images
     result = Image.alpha_composite(base_image, image_with_alpha)
-
+    if name is not None:
+        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):