Update app.py

app.py

@@ -234,22 +234,24 @@ def gen_fn(method, seed, psi):
     z = RandomState(int(seed) + 2 ** 31).randn(1, 512) if method == 1 else np.random.randn(1, 512)
     w = model.get_w(z.astype(dtype=np.float32), psi)
     img_out = model.get_img(w)
-    return img_out, json.dumps(w.tolist()), img_out
+    return img_out, w, img_out
 
 
 def encode_img_fn(img):
+    if img is None:
+        return "please upload a image", None, None, None, None
     imgs = model.detect(img, 0.2, 0.03)
     if len(imgs) == 0:
         return "failed to detect waifu", None, None, None, None
     w = model.encode_img(imgs[0])
     img_out = model.get_img(w)
-    return "success", imgs[0], img_out, json.dumps(w.tolist()), img_out
+    return "success", imgs[0], img_out, w, img_out
 
 
 def gen_video_fn(w1, w2, frame):
-    if w1 is None or w2 is None or w1 == "" or w2 == "":
+    if w1 is None or w2 is None:
         return None
-    model.gen_video(np.array(json.loads(w1), dtype=np.float32), np.array(json.loads(w2), dtype=np.float32), "video.mp4",
+    model.gen_video(w1, w2, "video.mp4",
                     int(frame))
     return "video.mp4"
 
@@ -260,7 +262,7 @@ if __name__ == '__main__':
     app = gr.Blocks()
     with app:
         gr.Markdown("# full-body anime\n\n"
-                    "the model is not good, just for fun.")
+                    "the model is not well, just use for fun.")
         with gr.Tabs():
             with gr.TabItem("generate image"):
                 with gr.Row():
@@ -270,11 +272,11 @@ if __name__ == '__main__':
                         gen_input2 = gr.Number(value=1, label="seed")
                         gen_input3 = gr.Slider(minimum=0, maximum=1, step=0.01, value=0.6, label="truncation psi")
                         with gr.Group():
-                            gen_submit = gr.Button("Run")
+                            gen_submit = gr.Button("Generate")
                     with gr.Column():
                         gen_output1 = gr.Image()
-                        select_img_input_w1 = gr.Textbox(visible=False)
-                        select_img_input_img1 = gr.Image(visible=False)
+                        select_img_input_w1 = gr.Variable()
+                        select_img_input_img1 = gr.Variable()
 
             with gr.TabItem("encode image"):
                 with gr.Row():
@@ -288,8 +290,8 @@ if __name__ == '__main__':
                         with gr.Row():
                             encode_img_output2 = gr.Image(label="detected")
                             encode_img_output3 = gr.Image(label="encoded")
-                        select_img_input_w2 = gr.Textbox(visible=False)
-                        select_img_input_img2 = gr.Image(visible=False)
+                        select_img_input_w2 = gr.Variable()
+                        select_img_input_img2 = gr.Variable()
 
             with gr.TabItem("generate video"):
                 with gr.Row():
@@ -304,7 +306,7 @@ if __name__ == '__main__':
                                 with gr.Group():
                                     select_img1_button = gr.Button("select")
                                 select_img1_output_img = gr.Image(label="image 1")
-                                select_img1_output_w = gr.Textbox(visible=False)
+                                select_img1_output_w = gr.Variable()
                             with gr.Column():
                                 gr.Markdown("please select image 2")
                                 select_img2_dropdown = gr.Radio(label="source",
@@ -313,10 +315,10 @@ if __name__ == '__main__':
                                 with gr.Group():
                                     select_img2_button = gr.Button("select")
                                 select_img2_output_img = gr.Image(label="image 2")
-                                select_img2_output_w = gr.Textbox(visible=False)
-                        generate_video_frame = gr.Slider(minimum=10, maximum=30, step=1, label="frame", value=10)
+                                select_img2_output_w = gr.Variable()
+                        generate_video_frame = gr.Slider(minimum=10, maximum=30, step=1, label="frame", value=15)
                         with gr.Group():
-                            generate_video_button = gr.Button("generate")
+                            generate_video_button = gr.Button("Generate")
                     with gr.Column():
                         generate_video_output = gr.Video()