Update app.py

app.py

@@ -104,57 +104,55 @@ def process_image(image, text):
             box_height = y2_padded - y1_padded
             logging.debug(f"Padded white paper dimensions: width={box_width}, height={box_height}.")
 
-            # Dynamically set font size based on the white paper dimensions
-            try:
-                font_size = min(int(box_height * 0.7), int(box_width / 10))
-                font = ImageFont.truetype(FONT_PATH, size=font_size)
-                logging.debug("Font loaded successfully.")
-            except Exception as e:
-                logging.warning(f"Error loading font. Using default. {e}")
-                font = ImageFont.load_default()
-
             # Create a transparent text layer
             text_layer = Image.new("RGBA", pil_image.size, (255, 255, 255, 0))
             text_draw = ImageDraw.Draw(text_layer)
             logging.debug("Created transparent text layer.")
 
-            # Adjust font size to fit within the white paper
-            def adjust_font_size(lines, box_width, box_height, font, text_draw):
+            # Function to validate and reduce font size if necessary
+            def draw_text_with_fit(text, box_width, box_height, font, text_draw):
                 while True:
+                    words = text.split()
+                    lines = []
+                    current_line = ""
+
+                    for word in words:
+                        test_line = f"{current_line} {word}".strip()
+                        bbox = text_draw.textbbox((0, 0), test_line, font=font)
+                        if bbox[2] - bbox[0] <= box_width * 0.9:
+                            current_line = test_line
+                        else:
+                            lines.append(current_line)
+                            current_line = word
+                    if current_line:
+                        lines.append(current_line)
+
+                    # Calculate total text height
                     line_height = (
                         text_draw.textbbox((0, 0), "Hg", font=font)[3] - text_draw.textbbox((0, 0), "Hg", font=font)[1]
                     ) * 1.2
                     total_text_height = len(lines) * line_height
-                    max_line_width = max(
-                        text_draw.textbbox((0, 0), line, font=font)[2] - text_draw.textbbox((0, 0), line, font=font)[0]
-                        for line in lines
-                    )
-                    if total_text_height <= box_height and max_line_width <= box_width:
-                        return font, line_height
+
+                    # Check if text fits within the box
+                    if total_text_height <= box_height:
+                        return lines, font, line_height
+                    # Reduce font size
                     font_size = font.size - 2
-                    if font_size < 10:
-                        break  # Minimum font size
+                    if font_size < 10:  # Minimum font size
+                        logging.warning("Minimum font size reached; text may still exceed bounds.")
+                        return lines, font, line_height
                     font = ImageFont.truetype(FONT_PATH, size=font_size)
-                return font, line_height
-
-            # Split and wrap text to fit within the white paper
-            words = text.split()
-            lines = []
-            current_line = ""
-
-            for word in words:
-                test_line = f"{current_line} {word}".strip()
-                bbox = text_draw.textbbox((0, 0), test_line, font=font)
-                if bbox[2] - bbox[0] <= box_width * 0.9:
-                    current_line = test_line
-                else:
-                    lines.append(current_line)
-                    current_line = word
-            if current_line:
-                lines.append(current_line)
-
-            # Adjust font size if text height exceeds the white paper height
-            font, line_height = adjust_font_size(lines, box_width, box_height, font, text_draw)
+
+            # Dynamically set font size and validate
+            try:
+                initial_font_size = min(int(box_height * 0.7), int(box_width / 10))
+                font = ImageFont.truetype(FONT_PATH, size=initial_font_size)
+                logging.debug("Font loaded successfully.")
+            except Exception as e:
+                logging.warning(f"Error loading font. Using default. {e}")
+                font = ImageFont.load_default()
+
+            lines, font, line_height = draw_text_with_fit(text, box_width, box_height, font, text_draw)
 
             # Center the text block within the white paper
             start_y = y1_padded + (box_height - len(lines) * line_height) // 2
@@ -230,3 +228,4 @@ if __name__ == "__main__":
 
 
 
+