Update app.py

app.py

@@ -439,8 +439,6 @@ MAX_SEED = np.iinfo(np.int32).max
 # precision data
 
 seq=512
-width=1536
-height=1536
 image_steps=50
 img_accu=9.0
 
@@ -461,7 +459,7 @@ footer {
     display: none !important;
 }
 .image-container {
-    aspect-ratio: """,str(width),"/",str(height),""" !important;
+    aspect-ratio: 1/1 !important;
 }
 .dropdown-arrow {
     display: none !important;
@@ -654,12 +652,12 @@ def add_song_cover_text(img,artist,song,height,width):
 
     return img
 
-def all_pipes(pos,neg,artist,song):
+def all_pipes(pos,neg,artist,song,factor):
 
     imgs = pipe_generate_image(pos,neg)
 
     for i in range(len(imgs)):
-        imgs[i] = upscaler(imgs[i])
+        imgs[i] = upscaler(imgs[i],upscale_factor=factor)
 
     return imgs
 
@@ -1275,10 +1273,18 @@ def translate(txt,to_lang="en",from_lang="auto"):
     return translation.lower()
 
 @spaces.GPU(duration=240)
-def handle_generation(artist,song,genre,lyrics):
+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()
@@ -1292,17 +1298,14 @@ def handle_generation(artist,song,genre,lyrics):
         if re.sub(r'[\.]$', '', lyrics_lines[line_index]) == lyrics_lines[line_index]:
             lyrics_lines[line_index] = lyrics_lines[line_index].strip() + "."
     lyrics = " ".join(lyrics_lines)
-    
-    pos_genre = re.sub(r"([ \t]){1,}", " ", genre).lower().strip()
-    pos_genre = ' '.join(word[0].upper() + word[1:] for word in pos_genre.split())
 
     pos_lyrics = re.sub(r"([ \t]){1,}", " ", lyrics).lower().strip()
     pos_lyrics = pos_lyrics if pos_lyrics == "" else summarize(translate(pos_lyrics))
     pos_lyrics = re.sub(r"([ \t]){1,}", " ", pos_lyrics).lower().strip()
 
-    neg = f"Sexuality, Human body, Human, Textual, Text, Distorted, Discontinuous, Blurry, Doll-Like, Overly Plastic, Low-Quality, Painted, Smooth, Artificial, Phony, Gaudy, Digital Effects."
+    neg = f"Sexuality, Nudity, Human body, Human, Textual, Text, Distorted, Fake, Discontinuous, Blurry, Doll-Like, Overly Plastic, Low Quality, Paint, Smoothed, Artificial, Phony, Gaudy, Digital Effects."
     q = "\""
-    pos = f'{ translate(pos_genre) } song hyper-realistic official image{ pos_lyrics if pos_lyrics == "" else ": " + q + pos_lyrics + q }.'
+    pos = f'HQ Hyper-realistic professional photograph{ pos_lyrics if pos_lyrics == "" else ": " + q + pos_lyrics + q }.'
 
     print(f"""
         Positive: {pos}
@@ -1310,13 +1313,12 @@ def handle_generation(artist,song,genre,lyrics):
         Negative: {neg}
     """)
 
-    imgs = all_pipes(pos,neg,pos_artist,pos_song)
+    imgs = all_pipes(pos,neg,pos_artist,pos_song,factor)
 
     index = 1
     names = []
     for img in imgs:
-        scaled_by = 2
-        labeled_img = add_song_cover_text(img,artist,song,height*scaled_by,width*scaled_by)
+        labeled_img = add_song_cover_text(img,artist,song,_height,_width)
         name = f'{artist} - {song} ({index}).png'
         labeled_img.save(name)
         names.append(name)
@@ -1330,24 +1332,18 @@ def handle_generation(artist,song,genre,lyrics):
 if __name__ == "__main__":
     with gr.Blocks(theme=gr.themes.Citrus(),css=css) as demo:
         gr.Markdown(f"""
-            # Song Cover Image Generator
+            # Image Generator
         """)
         with gr.Row():
             with gr.Column(scale=4):
                 artist = gr.Textbox(
-                        placeholder="Artist name",
+                        placeholder="Top label",
                         value="",
                         container=False,
                         max_lines=1
                 )
                 song = gr.Textbox(
-                        placeholder="Song name",
-                        value="",
-                        container=False,
-                        max_lines=1
-                )
-                genre = gr.Textbox(
-                        placeholder="Genre",
+                        placeholder="Bottom label",
                         value="",
                         container=False,
                         max_lines=1
@@ -1356,18 +1352,38 @@ 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)
+
+        with gr.Row():
+            
+            with gr.Column():
+                width = gr.Slider(
+                    label="Width (px)",
+                    minimum=512,
+                    maximum=3072,
+                    step=256,
+                    value=1536,
+                )
+                
+            with gr.Column():
+                height = gr.Slider(
+                    label="Height (px)",
+                    minimum=512,
+                    maximum=3072,
+                    step=256,
+                    value=1536,
+                )
                 
         with gr.Row():
             lyrics = gr.Textbox(
-                placeholder="Lyrics",
+                placeholder="Input data",
                 value="",
                 container=False,
-                max_lines=10000
+                max_lines=1000
             )
 
         run.click(
             fn=handle_generation,
-            inputs=[artist,song,genre,lyrics],
+            inputs=[artist,song,lyrics,height,width],
             outputs=[cover]
         )