Update app.py

app.py

@@ -25,7 +25,7 @@ def draw_lattice_grid(draw, width, height, spacing=100, color=(235, 235, 235)):
         draw.line([(0, y), (width, y)], fill=color, width=2)
 
 
-def text_to_images_and_base64_generator(text_content, style, font_size, bg_color_name, aspect_ratio_str):
+def text_to_images_and_base64_generator(text_content, style, font_size, bg_color_name, aspect_ratio_str, font_choice):
     """
     Converts text into images, returning both PIL objects for UI preview
     and base64 strings for an API/MCP client, with customizable options.
@@ -36,6 +36,7 @@ def text_to_images_and_base64_generator(text_content, style, font_size, bg_color
         font_size (int): The font size for the text.
         bg_color_name (str): The name of the background color.
         aspect_ratio_str (str): The string representing the desired aspect ratio.
+        font_choice (str): The name of the font family to use.
 
     Returns:
         tuple: A tuple containing (list of PIL.Image.Image, list of base64 strings).
@@ -44,11 +45,12 @@ def text_to_images_and_base64_generator(text_content, style, font_size, bg_color
         gr.Warning("Input text is empty. Please enter some text to generate images.")
         return [], []
 
-    # --- Aspect Ratio and Color Mapping ---
+    # --- Aspect Ratio, Color, and Font Mapping ---
     aspect_ratio_map = {
         "1:1 (Square)": (1080, 1080),
         "16:9 (Widescreen)": (1080, 608),
         "9:16 (Vertical)": (1080, 1920),
+        "3:4 (Standard)": (1080, 1440),
         "4:3 (Standard)": (1080, 810)
     }
     color_map = {
@@ -57,6 +59,14 @@ def text_to_images_and_base64_generator(text_content, style, font_size, bg_color
         "Beige": (245, 245, 220),
         "Pale Blue": (220, 230, 245)
     }
+    font_map = {
+        "Arial": ["arial.ttf", "Arial.ttf"],
+        "Times New Roman": ["times.ttf", "Times New Roman.ttf"],
+        "Courier New": ["cour.ttf", "Courier New.ttf"],
+        "Verdana": ["verdana.ttf", "Verdana.ttf"],
+        "Georgia": ["georgia.ttf", "Georgia.ttf"],
+        "DejaVu Sans": ["DejaVuSans.ttf"] # Good fallback
+    }
     IMG_WIDTH, IMG_HEIGHT = aspect_ratio_map.get(aspect_ratio_str, (1080, 1080))
     BACKGROUND_COLOR = color_map.get(bg_color_name, (255, 255, 255))
 
@@ -69,24 +79,25 @@ def text_to_images_and_base64_generator(text_content, style, font_size, bg_color
     
     # --- Font Loading ---
     font = None
-    try:
-        font_paths_to_try = [
-            "Arial.ttf", "arial.ttf", "DejaVuSans.ttf",
-            "/System/Library/Fonts/Supplemental/Arial.ttf",
-            "/usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf",
-            "/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf"
-        ]
-        for f_path in font_paths_to_try:
-            try:
-                font = ImageFont.truetype(f_path, font_size)
-                break
-            except IOError:
-                continue
-        if not font:
-            font = ImageFont.load_default() # Note: Default font doesn't support size
-    except Exception as e:
-        print(f"Font loading error: {e}")
+    selected_font_files = font_map.get(font_choice, [])
+    
+    font_paths_to_try = selected_font_files + [
+        "Arial.ttf", "arial.ttf", "DejaVuSans.ttf",
+        "/System/Library/Fonts/Supplemental/Arial.ttf",
+        "/usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf",
+        "/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf"
+    ]
+    
+    for f_path in font_paths_to_try:
+        try:
+            font = ImageFont.truetype(f_path, font_size)
+            break
+        except IOError:
+            continue
+    
+    if not font:
         font = ImageFont.load_default()
+        gr.Warning(f"Could not find '{font_choice}' or fallback fonts. Using default.")
 
     # --- Text Wrapping ---
     drawable_width = IMG_WIDTH - 2 * PADDING_X
@@ -126,7 +137,6 @@ def text_to_images_and_base64_generator(text_content, style, font_size, bg_color
     try:
         line_height = font.getbbox("A")[3] - font.getbbox("A")[1]
     except AttributeError:
-        # Fallback for default font which has no getbbox
         bbox = font.getmask("A").getbbox()
         line_height = bbox[3] - bbox[1] if bbox else 12
 
@@ -191,7 +201,8 @@ demo = gr.Interface(
         gr.Radio(['lines', 'dots', 'grid', 'plain'], label="Background Style", value='lines'),
         gr.Slider(24, 72, value=48, step=2, label="Font Size"),
         gr.Radio(["White", "Light Gray", "Beige", "Pale Blue"], label="Background Color", value="White"),
-        gr.Radio(["1:1 (Square)", "16:9 (Widescreen)", "9:16 (Vertical)", "4:3 (Standard)"], label="Aspect Ratio", value="1:1 (Square)")
+        gr.Radio(["1:1 (Square)", "16:9 (Widescreen)", "9:16 (Vertical)", "4:3 (Standard)"], label="Aspect Ratio", value="1:1 (Square)"),
+        gr.Dropdown(["Arial", "Times New Roman", "Courier New", "Verdana", "Georgia", "DejaVu Sans"], label="Font Family", value="Arial")
     ],
     outputs=[
         gr.Gallery(label="Generated Images (Preview)", show_label=True, preview=True),