merge

app_dialogue.py

@@ -62,7 +62,7 @@ BAN_TOKENS = (  # For documentation puporse. We are not using this list, it is h
 EOS_STRINGS = ["<end_of_utterance>", "\nUser:"]
 STOP_SUSPECT_LIST = []
 
-GRADIO_LINK = "https://multimodalart-ai-meme-generator.hf.space"
+GRADIO_LINK = "https://huggingfacem4-ai-meme-generator.hf.space"
 API_TOKEN = os.getenv("HF_AUTH_TOKEN")
 IDEFICS_LOGO = "https://huggingface.co/spaces/HuggingFaceM4/idefics_playground/resolve/main/IDEFICS_logo.png"
 
@@ -152,7 +152,7 @@ for image_dir in os.listdir("example_images"):
         tmp_filename = H.preprocess(H.value)
         DEFAULT_IMAGES_TMP_PATH_TO_URL[
             tmp_filename
-        ] = f"https://huggingface.co/spaces/multimodalart/AI_Meme_Generator/resolve/main/example_images/{image_dir}/{im_path}"
+        ] = f"https://huggingface.co/spaces/HuggingFaceM4/AI_Meme_Generator/resolve/main/example_images/{image_dir}/{im_path}"
 
 
 # Utils to handle the image markdown display logic
@@ -355,6 +355,39 @@ def resize_with_ratio(image: PIL.Image.Image, fixed_width: int) -> PIL.Image.Ima
 
     return resized_img
 
+def make_new_lines(draw, image, font, text_is_too_long, lines, num_lines, num_loops):
+    max_len_increment = 0
+    while text_is_too_long and max_len_increment < 10:
+        new_lines = lines.copy()
+        last_line_with_backslash = insert_backslash(
+            new_lines[-1],
+            max_length=(len(new_lines[-1]) + max_len_increment)
+            // (num_lines - num_loops),
+        )
+        penultimate_line, last_line = (
+            last_line_with_backslash.split("\n")[0],
+            last_line_with_backslash.split("\n")[1],
+        )
+        new_lines.pop(-1)
+        new_lines.append(penultimate_line)
+        new_lines.append(last_line)
+        # If the we haven't reached the last line, we split it again
+        if len(new_lines) < num_lines:
+            new_lines, text_width, text_is_too_long = make_new_lines(
+                draw=draw,
+                image=image,
+                font=font,
+                text_is_too_long=text_is_too_long,
+                lines=new_lines,
+                num_lines=num_lines,
+                num_loops=num_loops + 1,
+            )
+        text_width = max([draw.textlength(line, font) for line in new_lines])
+        text_is_too_long = text_width > image.width
+        max_len_increment += 1
+    if not text_is_too_long:
+        lines = new_lines
+    return lines, text_width, text_is_too_long
 
 def test_font_size(
     draw,
@@ -368,75 +401,25 @@ def test_font_size(
 ):
     text_width = draw.textlength(text, font)
     text_is_too_long = True
-
-    if num_lines == 1:
-        while font.size > min_font and text_is_too_long:
-            font = ImageFont.truetype(
-                f"fonts/{font_meme_text}.ttf", size=font.size - font_size_reduction
-            )
+    lines = [text]
+    while font.size > min_font and text_is_too_long:
+        font = ImageFont.truetype(
+            f"fonts/{font_meme_text}.ttf", size=font.size - font_size_reduction
+        )
+        if num_lines == 1:
             text_width = draw.textlength(text, font)
             text_is_too_long = text_width > image.width
-
-    elif num_lines == 2:
-        while font.size > min_font and text_is_too_long:
-            font = ImageFont.truetype(
-                f"fonts/{font_meme_text}.ttf", size=font.size - font_size_reduction
-            )
-            max_len_increment = 0
-            while (
-                text_is_too_long
-                and max_len_increment < 10
-                and max_len_increment < (len(text)) // 2
-            ):
-                temp_text = insert_backslash(
-                    text, max_length=(len(text) + max_len_increment) // 2
-                )
-                first_line, second_line = (
-                    temp_text.split("\n")[0],
-                    temp_text.split("\n")[1],
-                )
-                text_width = max(
-                    draw.textlength(first_line, font),
-                    draw.textlength(second_line, font),
-                )
-                text_is_too_long = text_width > image.width
-                max_len_increment += 1
-
-    elif num_lines == 3:
-        while font.size > min_font and text_is_too_long:
-            font = ImageFont.truetype(
-                f"fonts/{font_meme_text}.ttf", size=font.size - font_size_reduction
+        else:
+            lines, text_width, text_is_too_long = make_new_lines(
+                draw=draw,
+                image=image,
+                font=font,
+                text_is_too_long=text_is_too_long,
+                lines=lines,
+                num_lines=num_lines,
+                num_loops=0,
             )
-            max_len_incr_1_split = 0
-            while text_is_too_long and max_len_incr_1_split < 10:
-                first_temp_text = insert_backslash(
-                    text, max_length=(len(text) + max_len_incr_1_split) // 3
-                )
-                first_line, second_line = (
-                    first_temp_text.split("\n")[0],
-                    first_temp_text.split("\n")[1],
-                )
-                max_len_incr_2_split = 0
-                while text_is_too_long and max_len_incr_2_split < 10:
-                    temp_text_second_line = insert_backslash(
-                        second_line,
-                        max_length=(len(second_line) + max_len_incr_2_split) // 2,
-                    )
-                    second_line_1, second_line_2 = (
-                        temp_text_second_line.split("\n")[0],
-                        temp_text_second_line.split("\n")[1],
-                    )
-                    temp_text = first_line + "\n" + second_line_1 + "\n" + second_line_2
-                    text_width = max(
-                        draw.textlength(first_line, font),
-                        draw.textlength(second_line_1, font),
-                        draw.textlength(second_line_2, font),
-                    )
-                    text_is_too_long = text_width > image.width
-                    max_len_incr_2_split += 1
-                max_len_incr_1_split += 1
-    else:
-        raise (ValueError("num_lines can only be 1, 2 or 3"))
+            temp_text = "\n".join(lines)
 
     if not text_is_too_long and num_lines > 1:
         text = temp_text