Update app.py

app.py

@@ -781,6 +781,7 @@ def pipe_generate_image(p1,p2,h,w):
             negative_prompt=p2,
             height=h,
             width=w,
+            output_type="pil",
             guidance_scale=img_accu,
             num_images_per_prompt=1,
             num_inference_steps=image_steps,
@@ -815,26 +816,6 @@ def add_song_cover_text(img,artist,song,h,w):
 
     return img
 
-def upscale_image(img,factor=2):
-
-    global working
-    
-    if working:
-        return
-
-    working = True
-    
-    ret = upscaler(img,upscale_factor=factor)
-
-    working = False
-
-    return ret
-
-def all_pipes(pos,neg,h,w):
-
-    img = pipe_generate_image(pos,neg,h,w)[0]
-    return img
-
 google_translate_endpoint = "https://translate.google.com/m"
 language_codes = {
     "afrikaans": "af",
@@ -1453,13 +1434,6 @@ def translate(txt,to_lang="en",from_lang="auto"):
 def handle_generation(artist,song,lyrics,h,w):
 
     log(f'CALL handle_generate')
-
-    global working
-    
-    if working:
-        return
-
-    working = True
     
     pos_artist = re.sub(r"([ \t]){1,}", " ", artist).upper().strip()
     
@@ -1489,16 +1463,7 @@ def handle_generation(artist,song,lyrics,h,w):
         Negative: {neg}
     """)
 
-    img = all_pipes(pos,neg,h,w)
-
-    labeled_img = add_song_cover_text(img,pos_artist,pos_song,h,w)
-    name = f'{generate_random_string(16)}.png'
-    labeled_img.save(name)
-
-    working = False
-    
-    # return names
-    return name
+    return add_song_cover_text(pipe_generate_image(pos,neg,h,w),pos_artist,pos_song,h,w)
     
 # entry
 
@@ -1552,7 +1517,7 @@ if __name__ == "__main__":
                 )
 
             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)
+                cover = gr.Image(interactive=False,container=False,elem_classes="image-container", label="Result", show_label=True, type='pil', show_share_button=False)
                 upscale_now = gr.Button("Upscale",elem_classes="btn")
 
         run.click(
@@ -1561,7 +1526,7 @@ if __name__ == "__main__":
             outputs=[cover]
         )
         upscale_now.click(
-            fn=upscale_image,
+            fn=upscaler,
             inputs=[cover],
             outputs=[cover]
         )