Refactor Makefile and update app.py and tools.py for improved functionality and clarity

Makefile

@@ -1,9 +1,16 @@
 .PHONY: test deploy_modal run dev
 
+install:
+	pip install uv && \
+	uv venv && \
+	source .venv/bin/activate && \
+	uv sync && \
+	modal setup
+
 deploy_modal:
 	modal deploy src/modal_app.py
 
-test:
+test_modal:
 	uv run test/test_modal.py
 
 run:

src/app.py

@@ -1,64 +1,68 @@
-import gradio as gr
+from pathlib import Path
 
-from tools import change_color_objects_hsv, change_color_objects_lab
+import gradio as gr
 
+from tools import (
+    change_color_objects_hsv,
+    change_color_objects_lab,
+    privacy_preserve_image,
+)
 
-def privacy_preserve_image(input_prompt, input_img):
-    pass
+gr.set_static_paths(paths=[Path.cwd().absolute() / "assets"])
 
+icon = """<link rel="icon" type="image/x-icon" href="https://raw.githubusercontent.com/mahan-ym/ImageAlfred/main/src/assets/icons/ImageAlfredIcon.png">"""
 
-title = """
-<div style="text-align: center;">
-    <img src="https://raw.githubusercontent.com/mahan-ym/ImageAlfred/main/src/assets/icons/ImageAlfredIcon.png" alt="Image Alfred Logo" style="width: 200px; height: auto;">
-    <h1>Image Alfred</h1>
-    <p>Recolor and Privacy Preserving Image Tools</p>
-</div>
-"""  # noqa: E501
+title = """Image Alfred - Recolor and Privacy Preserving Image Tools
+<img src="https://raw.githubusercontent.com/mahan-ym/ImageAlfred/main/src/assets/icons/ImageAlfredIcon.png" alt="Image Alfred Logo" style="width: 120px; height: auto; margin: 0 auto;">
+"""
 
 hsv_df_input = gr.Dataframe(
     headers=["Object", "Hue", "Saturation Scale"],
     datatype=["str", "number", "number"],
-    label="Input Data",
+    label="Target Objects and New Settings",
     type="array",
 )
 
 lab_df_input = gr.Dataframe(
     headers=["Object", "New A", "New B"],
     datatype=["str", "number", "number"],
-    label="Input Data",
+    label="Target Objects and New Settings",
     type="array",
 )
 
 change_color_objects_hsv_tool = gr.Interface(
     fn=change_color_objects_hsv,
     inputs=[
-        hsv_df_input,
         gr.Image(label="Input Image", type="pil"),
+        hsv_df_input,
     ],
-    outputs=gr.Image(),
-    title="Image Recolor tool (HSV)",
+    outputs=gr.Image(label="Output Image"),
+    title="Image Recolor Tool (HSV)",
     description="This tool allows you to recolor objects in an image using the HSV color space. You can specify the hue and saturation scale for each object.",  # noqa: E501
 )
 
 change_color_objects_lab_tool = gr.Interface(
     fn=change_color_objects_lab,
     inputs=[
-        lab_df_input,
         gr.Image(label="Input Image", type="pil"),
+        lab_df_input,
     ],
-    outputs=gr.Image(),
-    title="Image Recolor tool (LAB)",
-    description="Recolor an image based on user input using the LAB color space. You can specify the new_a and new_b values for each object.",  # noqa: E501
+    outputs=gr.Image(label="Output Image"),
+    title="Image Recolor Tool (LAB)",
+    description="Recolor an image based on user input using the LAB color space. You can specify the new A and new B values for each object.",  # noqa: E501
 )
 
 privacy_preserve_tool = gr.Interface(
     fn=privacy_preserve_image,
     inputs=[
-        gr.Textbox("user_input"),
         gr.Image(label="Input Image", type="pil"),
+        gr.Textbox(
+            label="Objects to Mask (dot-separated)",
+            placeholder="e.g., person. car. license plate",
+        ),  # noqa: E501
     ],
-    outputs=gr.Image(),
-    title="Privacy preserving tool",
+    outputs=gr.Image(label="Output Image"),
+    title="Privacy Preserving Tool",
     description="Upload an image and provide a prompt for the object to enforce privacy. The tool will use blurring to obscure the specified objects in the image.",  # noqa: E501
 )
 
@@ -69,14 +73,19 @@ demo = gr.TabbedInterface(
         privacy_preserve_tool,
     ],
     ["Change Color Objects HSV", "Change Color Objects LAB", "Privacy Preserving Tool"],
-    title="Image Alfred",
+    title=title,
     theme=gr.themes.Default(
         primary_hue="blue",
-        secondary_hue="blue",
-        font="Inter",
-        font_mono="Courier New",
+        secondary_hue="green",
+        # font="Inter",
+        # font_mono="Courier New",
     ),
+    head=icon,
 )
 
+# with gr.Blocks(title="Image Alfred", head=test) as demo:
+#     gr.HTML(header)
+#     tabs_interface.render()
+
 if __name__ == "__main__":
-    demo.launch(mcp_server=True)
+    demo.launch(mcp_server=True, max_file_size="5mb")

src/tools.py

@@ -9,13 +9,16 @@ from utils import upload_image_to_tmpfiles
 modal_app_name = "ImageAlfred"
 
 
-def preserve_privacy(input_prompt, input_img):
+def privacy_preserve_image(
+    input_img,
+    input_prompt,
+) -> np.ndarray | Image.Image | str | Path | None:
     """
     Obscure specified objects in the input image based on the input prompt.
 
     Args:
+        input_img (Image.Image): Input image in bytes format.
         input_prompt (list): List of [object:str].
-        input_img (bytes): Input image in bytes format.
 
     Returns:
         bytes: Binary image data of the modified image.
@@ -28,8 +31,8 @@ def preserve_privacy(input_prompt, input_img):
 
 
 def change_color_objects_hsv(
-    user_input,
     input_img,
+    user_input,
 ) -> np.ndarray | Image.Image | str | Path | None:
     """Changes the hue and saturation of specified objects in an image.
 
@@ -50,8 +53,6 @@ def change_color_objects_hsv(
         ValueError: If user_input format is invalid, hue values are outside [0, 179] range, saturation_scale is not positive, or image format is invalid or corrupted.
         TypeError: If input_img is not a supported type or modal function returns unexpected type.
     """  # noqa: E501
-    print("Received input image type:", type(input_img))
-    # source, input_img = validate_image_input(input_img)
     print("before processing input:", user_input)
 
     for item in user_input:
@@ -81,12 +82,15 @@ def change_color_objects_hsv(
         raise TypeError(
             f"Expected Image.Image from modal remote function, got {type(output_pil)}"
         )
-    img_link = upload_image_to_tmpfiles(output_pil)
+    # img_link = upload_image_to_tmpfiles(output_pil)
 
     return output_pil
 
 
-def change_color_objects_lab(user_input, input_img):
+def change_color_objects_lab(
+    input_img,
+    user_input,
+) -> np.ndarray | Image.Image | str | Path | None:
     """Changes the color of specified objects in an image using LAB color space.
 
     Segments objects based on text prompts and alters their color in the LAB
@@ -106,7 +110,6 @@ def change_color_objects_lab(user_input, input_img):
         ValueError: If user_input format is invalid, a/b values are outside [0, 255] range, or image format is invalid or corrupted.
         TypeError: If input_img is not a supported type or modal function returns unexpected type.
     """  # noqa: E501
-    print("Received input image type:", type(input_img))
     print("before processing input:", user_input)
     for item in user_input:
         if len(item) != 3:
@@ -133,12 +136,13 @@ def change_color_objects_lab(user_input, input_img):
         raise TypeError(
             f"Expected Image.Image from modal remote function, got {type(output_pil)}"
         )
-    img_link = upload_image_to_tmpfiles(output_pil)
+    # img_link = upload_image_to_tmpfiles(output_pil)
 
     return output_pil
 
 
 if __name__ == "__main__":
+    image_pil = Image.open("./src/assets/test_image.jpg")
     change_color_objects_hsv(
-        user_input=[["hair", 30, 1.2], ["shirt", 60, 1.0]], input_img=b""
+        user_input=[["hair", 30, 1.2], ["shirt", 60, 1.0]], input_img=image_pil
     )

src/utils.py

@@ -6,59 +6,6 @@ import requests
 from PIL import Image
 
 
-class ImageSource(Enum):
-    """Enum representing different sources of image input"""
-
-    PIL = "PIL"
-    BASE64 = "base64"
-    URL = "url"
-    FILE = "file"
-
-
-def validate_image_input(url_or_data):
-    """Handle different image input formats for MCP"""
-    if isinstance(url_or_data, Image.Image):
-        print("Received input image type: PIL.Image")
-        return (ImageSource.PIL, url_or_data)
-
-    if isinstance(url_or_data, str):
-        if url_or_data.startswith("data:image"):
-            try:
-                # Handle base64 data URLs
-                print("Received input image type: base64 data")
-                header, encoded = url_or_data.split(",", 1)
-                decoded_bytes = base64.b64decode(encoded)
-                return (
-                    ImageSource.BASE64,
-                    Image.open(BytesIO(decoded_bytes)).convert("RGB"),
-                )
-            except Exception as e:
-                raise ValueError(f"Invalid base64 data URL: {e}")
-        elif url_or_data.startswith(("http://", "https://")):
-            # Handle URLs
-            try:
-                response = requests.get(url_or_data, timeout=30)
-                response.raise_for_status()
-                print("Received input image type: URL")
-                return (
-                    ImageSource.URL,
-                    Image.open(BytesIO(response.content)).convert("RGB"),
-                )
-            except requests.exceptions.RequestException as e:
-                raise ValueError(f"Could not download image from URL: {e}")
-        else:
-            # Handle file paths
-            try:
-                with open(url_or_data, "rb") as f:
-                    return (ImageSource.FILE, Image.open(f).convert("RGB"))
-            except FileNotFoundError:
-                raise ValueError(f"File not found: {url_or_data}")
-            except Exception as e:
-                raise ValueError(f"Could not read file {url_or_data}: {e}")
-
-    raise ValueError(f"Unsupported image input format: {type(url_or_data)}")
-
-
 def upload_image_to_tmpfiles(image):
     """
     Upload an image to tmpfiles.org and return the URL.
@@ -75,7 +22,6 @@ def upload_image_to_tmpfiles(image):
         raise ValueError(f"Upload failed: Status {response.status_code}")
 
     data = response.json()
-    print(f"Response from tmpfiles.org: {data}")
     if "data" in data and "url" in data["data"]:
         url = data["data"]["url"]
         if not url: