Update app.py

app.py

@@ -29,28 +29,16 @@ def text_to_images_and_base64_generator(text_content, style, font_size, bg_color
     """
     Converts text into images, returning both PIL objects for UI preview
     and base64 strings for an API/MCP client, with customizable options.
-
-    Args:
-        text_content (str): The text to be converted.
-        style (str): The background style ('plain', 'lines', 'dots', 'grid').
-        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).
     """
     if not text_content or not text_content.strip():
         gr.Warning("Input text is empty. Please enter some text to generate images.")
         return [], []
 
-    # --- Aspect Ratio, Color, and Font Mapping ---
+    # --- Mappings for UI options ---
     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 = {
@@ -59,14 +47,15 @@ def text_to_images_and_base64_generator(text_content, style, font_size, bg_color
         "Beige": (245, 245, 220),
         "Pale Blue": (220, 230, 245)
     }
+    # **IMPORTANT**: This now points to specific files you need to upload.
+    # The key is the user-friendly name, the value is the file path.
     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
+        "Arial": os.path.join("fonts", "LiberationSans-Regular.ttf"),
+        "Times New Roman": os.path.join("fonts", "LiberationSerif-Regular.ttf"),
+        "Courier New": os.path.join("fonts", "DejaVuSansMono-Bold.ttf"),
+        "DejaVu Sans": os.path.join("fonts", "DejaVuSans.ttf")
     }
+    
     IMG_WIDTH, IMG_HEIGHT = aspect_ratio_map.get(aspect_ratio_str, (1080, 1080))
     BACKGROUND_COLOR = color_map.get(bg_color_name, (255, 255, 255))
 
@@ -79,25 +68,29 @@ def text_to_images_and_base64_generator(text_content, style, font_size, bg_color
     
     # --- Font Loading ---
     font = None
-    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"
-    ]
+    font_path = font_map.get(font_choice, os.path.join("fonts", "DejaVuSans.ttf"))
     
-    for f_path in font_paths_to_try:
-        try:
-            font = ImageFont.truetype(f_path, font_size)
-            break
-        except IOError:
-            continue
+    try:
+        # Check if the fonts directory and the specific font file exist
+        if os.path.exists(font_path):
+            font = ImageFont.truetype(font_path, font_size)
+        else:
+            # Fallback if font is not found in the local directory
+            gr.Warning(f"Font file not found at '{font_path}'. Trying system fallbacks.")
+            font_paths_to_try = ["/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
+    except IOError:
+        pass # Will be handled by the final fallback
     
     if not font:
         font = ImageFont.load_default()
-        gr.Warning(f"Could not find '{font_choice}' or fallback fonts. Using default.")
+        gr.Warning(f"Could not load '{font_choice}'. Using basic default font.")
+
 
     # --- Text Wrapping ---
     drawable_width = IMG_WIDTH - 2 * PADDING_X
@@ -194,6 +187,9 @@ example_text = """In the heart of a bustling city, there lived a clockmaker name
 
 One day, a young girl with eyes as curious as a cat's wandered into his shop. She wasn't interested in the shiny new watches but was drawn to the grandfather clock in the corner. "What's its story?" she asked, her voice soft. Alistair smiled, for he knew he had found the next guardian of the stories. The legacy of the whispering clock would live on."""
 
+# Get the list of font names for the dropdown
+font_choices = ["Arial", "Times New Roman", "Courier New", "DejaVu Sans"]
+
 demo = gr.Interface(
     fn=text_to_images_and_base64_generator,
     inputs=[
@@ -202,7 +198,7 @@ demo = gr.Interface(
         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.Dropdown(["Arial", "Times New Roman", "Courier New", "Verdana", "Georgia", "DejaVu Sans"], label="Font Family", value="Arial")
+        gr.Dropdown(font_choices, label="Font Family", value="Arial")
     ],
     outputs=[
         gr.Gallery(label="Generated Images (Preview)", show_label=True, preview=True),
@@ -215,4 +211,11 @@ demo = gr.Interface(
 
 # --- Main Execution ---
 if __name__ == "__main__":
+    # Before launching, check if the fonts directory exists.
+    if not os.path.exists("fonts"):
+        print("---")
+        print("WARNING: 'fonts' directory not found.")
+        print("Please create a 'fonts' directory and add .ttf font files to it.")
+        print("The application will try to use system fonts, but may fail.")
+        print("---")
     demo.launch(mcp_server=True)