Update app.py

app.py

@@ -615,13 +615,13 @@ def generate_random_string(length):
     characters = str(ascii_letters + digits)
     return ''.join(random.choice(characters) for _ in range(length))
 
-def pipe_generate_image(p1,p2):
+def pipe_generate_image(p1,p2,h,w):
     log(f'CALL pipe_generate')
     imgs = image_pipe(
             prompt=p1,
             negative_prompt=p2,
-            height=height,
-            width=width,
+            height=h,
+            width=w,
             guidance_scale=img_accu,
             num_images_per_prompt=1,
             num_inference_steps=image_steps,
@@ -631,28 +631,28 @@ def pipe_generate_image(p1,p2):
     log(f'RET pipe_generate')
     return imgs
 
-def add_song_cover_text(img,artist,song,height,width):
+def add_song_cover_text(img,artist,song,h,w):
 
     draw = ImageDraw.Draw(img,mode="RGBA")
 
     labels_distance = 1/3
 
     rows = len(song.split("\n"))
-    textheight=min(math.ceil( width / 10 ), math.ceil( height / 5 ))
+    textheight=min(math.ceil( w / 10 ), math.ceil( h / 5 ))
     font = ImageFont.truetype(r"Alef-Bold.ttf", textheight)
     textwidth = draw.textlength(song,font)
-    x = math.ceil((width - textwidth) / 2)
-    y = height - (textheight * rows / 2) - (height / 2)
-    y = math.ceil(y - (height / 2 * labels_distance))
+    x = math.ceil((w - textwidth) / 2)
+    y = h - (textheight * rows / 2) - (h / 2)
+    y = math.ceil(y - (h / 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 ))
+    textheight=min(math.ceil( w / 10 ), math.ceil( h / 5 ))
     font = ImageFont.truetype(r"Alef-Bold.ttf", textheight)
     textwidth = draw.textlength(artist,font)
-    x = math.ceil((width - textwidth) / 2)
-    y = height - (textheight * rows / 2) - (height / 2)
-    y = math.ceil(y + (height / 2 * labels_distance))
+    x = math.ceil((w - textwidth) / 2)
+    y = h - (textheight * rows / 2) - (h / 2)
+    y = math.ceil(y + (h / 2 * labels_distance))
     draw.text((x, y), artist, (0,0,0,85), font=font, spacing=2, stroke_width=math.ceil(textheight/20), stroke_fill=(255,255,255,170))
 
     return img
@@ -673,9 +673,9 @@ def upscale_image(img,factor):
 
     return ret
 
-def all_pipes(pos,neg,artist,song):
+def all_pipes(pos,neg,artist,song,h,w):
 
-    imgs = pipe_generate_image(pos,neg)
+    imgs = pipe_generate_image(pos,neg,h,w)
 
     for i in range(len(imgs)):
         imgs[i] = upscaler(imgs[i],upscale_factor=factor)
@@ -1294,7 +1294,7 @@ def translate(txt,to_lang="en",from_lang="auto"):
     return translation.lower()
 
 @spaces.GPU(duration=300)
-def handle_generation(artist,song,lyrics,height,width):
+def handle_generation(artist,song,lyrics,h,w):
 
     log(f'CALL handle_generate')
 
@@ -1333,9 +1333,9 @@ def handle_generation(artist,song,lyrics,height,width):
         Negative: {neg}
     """)
 
-    img = all_pipes(pos,neg,pos_artist,pos_song)[0]
+    img = all_pipes(pos,neg,pos_artist,pos_song,h,w)[0]
 
-    labeled_img = add_song_cover_text(img,artist,song,height,width)
+    labeled_img = add_song_cover_text(img,artist,song,h,w)
     name = f'{generate_random_string(8)}.png'
     labeled_img.save(name)