Update app.py

app.py

@@ -631,9 +631,9 @@ def add_song_cover_text(img,artist,song,height,width):
 
     draw = ImageDraw.Draw(img,mode="RGBA")
 
-    rows = 1
     labels_distance = 1/3
 
+    rows = len(song.split("\n"))
     textheight=min(math.ceil( width / 10 ), math.ceil( height / 5 ))
     font = ImageFont.truetype(r"Alef-Bold.ttf", textheight)
     textwidth = draw.textlength(song,font)
@@ -642,6 +642,7 @@ def add_song_cover_text(img,artist,song,height,width):
     y = math.ceil(y - (height / 2 * labels_distance))
     draw.text((x, y), song, (255,255,255,85), font=font, spacing=2, stroke_width=math.ceil(textheight/20), stroke_fill=(0,0,0,170))
 
+    rows = len(artist.split("\n"))
     textheight=min(math.ceil( width / 10 ), math.ceil( height / 5 ))
     font = ImageFont.truetype(r"Alef-Bold.ttf", textheight)
     textwidth = draw.textlength(artist,font)
@@ -652,7 +653,11 @@ def add_song_cover_text(img,artist,song,height,width):
 
     return img
 
-def all_pipes(pos,neg,artist,song,factor):
+spaces.GPU(300)
+def upscale_image(img,factor):
+    return upscaler(img,upscale_factor=factor)
+
+def all_pipes(pos,neg,artist,song):
 
     imgs = pipe_generate_image(pos,neg)
 
@@ -1272,19 +1277,11 @@ def translate(txt,to_lang="en",from_lang="auto"):
     log(f'RET translate with translation as {translation}')
     return translation.lower()
 
-@spaces.GPU(duration=240)
-def handle_generation(artist,song,lyrics,_height,_width):
+@spaces.GPU(duration=300)
+def handle_generation(artist,song,lyrics,height,width):
 
     log(f'CALL handle_generate')
-
-    scaled_by = 4
-
-    global height
-    global width
-
-    height = _height / scaled_by
-    width = _width / scaled_by
-    
+   
     pos_artist = re.sub(r"([ \t]){1,}", " ", artist).upper().strip()
     
     pos_song = re.sub(r"([ \t]){1,}", " ", song).lower().strip()
@@ -1313,19 +1310,14 @@ def handle_generation(artist,song,lyrics,_height,_width):
         Negative: {neg}
     """)
 
-    imgs = all_pipes(pos,neg,pos_artist,pos_song,factor)
+    img = all_pipes(pos,neg,pos_artist,pos_song)[0]
 
-    index = 1
-    names = []
-    for img in imgs:
-        labeled_img = add_song_cover_text(img,artist,song,_height,_width)
-        name = f'{artist} - {song} ({index}).png'
-        labeled_img.save(name)
-        names.append(name)
-        index = index + 1
+    labeled_img = add_song_cover_text(img,artist,song,height,width)
+    name = f'{generate_random_string(8)}.png'
+    labeled_img.save(name)
 
     # return names
-    return names[0]
+    return name
     
 # entry
 
@@ -1344,18 +1336,27 @@ if __name__ == "__main__":
                         placeholder="Top title",
                         value="",
                         container=False,
-                        max_lines=1
+                        max_lines=2
                 )
                 song = gr.Textbox(
                         placeholder="Bottom title",
                         value="",
                         container=False,
-                        max_lines=1
+                        max_lines=2
                 )
                 run = gr.Button("Generate",elem_classes="btn")
 
             with gr.Column():
                 cover = gr.Image(interactive=False,container=False,elem_classes="image-container", label="Result", show_label=True, type='filepath', show_share_button=False)
+                up_scale_factor = gr.Slider(
+                    label="Upscale",
+                    minimum=2,
+                    maximum=4,
+                    step=1,
+                    value=3,
+                )
+                upscale_now = gr.Button("Upscale",elem_classes="btn")
+                
 
         with gr.Row():
             
@@ -1390,5 +1391,10 @@ if __name__ == "__main__":
             inputs=[artist,song,lyrics,height,width],
             outputs=[cover]
         )
+        upscale_now.click(
+            fn=upscale_image,
+            inputs=[cover,up_scale_factor],
+            outputs=[cover]
+        )
 
     demo.queue().launch()