Update app.py

app.py

@@ -83,28 +83,28 @@ def generate_random_string(length):
     characters = string.ascii_letters + string.digits
     return ''.join(random.choice(characters) for _ in range(length))
 
-@spaces.GPU(duration=40)
-def Piper1(_do):
-    print("starting piper1")
-    retu = pp1(
-        _do,
+@spaces.GPU(duration=75,enable_queue=True)
+def Piper(name,name2,posi,neg):
+    print("starting piper")
+    
+    ret1 = pp1(
+        posi,
         height=512,
         width=512,
         num_inference_steps=4,
         max_sequence_length=256,
         guidance_scale=0
     )
-    print("returning piper1")
-    return retu
-
-@spaces.GPU(duration=40)
-def Piper2(img,posi,neg):
-    retu = pp2(
+    ret1.images[0].save(name)
+    
+    img = load_image(name).convert("RGB")
+    
+    ret2 = pp2(
         prompt=posi,
         negative_prompt=neg,
         image=img
     )
-    return retu
+    ret2.images[0].save(name2)
 
 def tok(pipe,txt):
     toks = pipe.tokenizer(txt)['input_ids']
@@ -150,39 +150,28 @@ function custom(){
 }
 """
 
-def infer1(p):
-        print("infer1: started")
+def infer(p):
+        print("infer: started")
+    
         p1 = p["a"]
-        print(f'prompt 1: {p1}')
         p2 = p["b"]
-        print(f'prompt 2: {p2}')
         name = generate_random_string(12)+".png"
-        print(f'name: {name}')
+        name2 = "_"+name
+
         _do = ['beautiful', 'playful', 'photographed', 'realistic', 'dynamic poze', 'deep field', 'reasonable coloring', 'rough texture', 'best quality', 'focused']
         if p1 != "":
             _do.append(f'{p1}')
         posi = " ".join(_do)
-        print(posi)
-        output = Piper1(posi)
-        output.images[0].save(name)
-        return name
 
-def infer2(p):
-        print("infer2: started")
-        p1 = p["a"]
-        p2 = p["b"]
-        name = p["c"]
+        neg = " "
         if p2 != "":
-            _dont = f'{p2} where in {p1}'
-            neg = _dont
-        else:
-            return name
-        img = load_image(name).convert("RGB")
-        output2 = Piper2(img,p1,neg)
-        output2.images[0].save("_"+name)
-        return "_"+name
+            neg = f'{p2} where in {p1}'
+        
+        Piper(name,name2,posi,neg)
+    
+        return name2
 
-def run1(p1,p2,*result):
+def run(p1,p2,*result):
     
         p1_en = translate(p1,"english")
         p2_en = translate(p2,"english")
@@ -193,31 +182,13 @@ def run1(p1,p2,*result):
     
         arr = [p for _ in rng]
         pool = Pool(ln)
-        out = list(pool.imap(infer1,arr))
+        out = list(pool.imap(infer,arr))
         pool.close()
         pool.join()
         pool.clear()
 
         return out
 
-def run2(p1,p2,*result):
-    
-        p1_en = translate(p1,"english")
-        p2_en = translate(p2,"english")
-        p = {"a":p1_en,"b":p2_en}
-        ln = len(result)
-        print("images: "+str(ln))
-        rng = list(range(ln))
-    
-        arr = [{"a":p1_en,"b":p2_en,"c":result[_]} for _ in rng]
-        pool = Pool(ln)
-        out = list(pool.imap(infer2,arr))
-        pool.close()
-        pool.join()
-        pool.clear()
-    
-        return out
-
 def main():
 
     global result
@@ -255,7 +226,7 @@ def main():
                 result.append(gr.Image(interactive=False,elem_classes="image-container", label="Result", show_label=False, type='filepath', show_share_button=False))
                 result.append(gr.Image(interactive=False,elem_classes="image-container", label="Result", show_label=False, type='filepath', show_share_button=False))
 
-        run_button.click(fn=run1,inputs=[prompt,prompt2,*result],outputs=result).then(fn=run2,inputs=[prompt,prompt2,*result],outputs=result)
+        run_button.click(fn=run,inputs=[prompt,prompt2,*result],outputs=result)
         demo.queue().launch()
 
 if __name__ == "__main__":