Update app.py

app.py

@@ -152,10 +152,7 @@ def run_main_app(semantic_concept, word, letter, font_name, num_steps, example=0
     preprocess(cfg.font, cfg.word, cfg.optimized_letter, cfg.level_of_cc)
     filename_init = os.path.join("code/data/init/", f"{cfg.font}_{cfg.word}_scaled.svg").replace(" ", "_")
     if not example:
-        with open(filename_init, "r") as f0:
-            svg_content_init = f0.read()
-        # yield gr.update(value=filename_init,visible=True),gr.update(visible=False),gr.update(visible=False)
-        yield gr.update(value=f'<div>{svg_content_init}</div>',label="Initial Word",visible=True),gr.update(visible=False),gr.update(visible=False)
+        yield gr.update(value=filename_init,visible=True),gr.update(visible=False),gr.update(visible=False)
 
     sds_loss = SDSLoss(cfg, device, model)
 
@@ -210,10 +207,7 @@ def run_main_app(semantic_concept, word, letter, font_name, num_steps, example=0
         check_and_create_dir(filename)
         save_svg.save_svg(filename, w, h, shapes, shape_groups)
         if not example:
-            # yield gr.update(visible=True),gr.update(value=filename, label=f'iters: {step} / {num_iter}', visible=True),gr.update(visible=False)
-            with open(filename, "r") as f:
-                svg_content = f.read()
-            yield gr.update(visible=True), gr.update(value=f'<div>{svg_content}</div>',label=f'iters: {step} / {num_iter}',visible=True),gr.update(visible=False)
+            yield gr.update(visible=True),gr.update(value=filename, label=f'iters: {step} / {num_iter}', visible=True),gr.update(visible=False)
 
         x = img.unsqueeze(0).permute(0, 3, 1, 2)  # HWC -> NCHW
         x = x.repeat(cfg.batch_size, 1, 1, 1)
@@ -243,15 +237,7 @@ def run_main_app(semantic_concept, word, letter, font_name, num_steps, example=0
     combine_word(cfg.word, cfg.optimized_letter, cfg.font, cfg.experiment_dir)
 
     image = os.path.join(cfg.experiment_dir,f"{cfg.font}_{cfg.word}_{cfg.optimized_letter}.svg")
-    # yield gr.update(value=filename_init,visible=True),gr.update(visible=False),gr.update(value=image,visible=True)
-
-    with open(filename_init, "r") as f0:
-        svg_content_init = f0.read()
-
-    with open(image, "r") as f1:
-        svg_content_final = f1.read()
-        
-    yield gr.update(value=f'<div style="width: 333px; height: 333px;">{svg_content_init}</div>',label="Initial Word",visible=True),gr.update(visible=False),gr.update(value=f"<div>{svg_content_final}</div>",label="Final Result",visible=True)
+    yield gr.update(value=filename_init,visible=True),gr.update(visible=False),gr.update(value=image,visible=True)
  
 
 with gr.Blocks() as demo:
@@ -293,7 +279,7 @@ with gr.Blocks() as demo:
             font_name = gr.Text(value=None,visible=False,label="Font Name")
             gallery = gr.Gallery(value=[(os.path.join("images","KaushanScript-Regular.png"),"KaushanScript-Regular"), (os.path.join("images","IndieFlower-Regular.png"),"IndieFlower-Regular"),(os.path.join("images","Quicksand.png"),"Quicksand"),
                                        (os.path.join("images","Saira-Regular.png"),"Saira-Regular"), (os.path.join("images","LuckiestGuy-Regular.png"),"LuckiestGuy-Regular"),(os.path.join("images","DeliusUnicase-Regular.png"),"DeliusUnicase-Regular"),
-                                       (os.path.join("images","Noteworthy-Bold.png"),"Noteworthy-Bold"), (os.path.join("images","HobeauxRococeaux-Sherman.png"),"HobeauxRococeaux-Sherman")],label="Font Name",columns=4, height=400, object_fit="contain")
+                                       (os.path.join("images","Noteworthy-Bold.png"),"Noteworthy-Bold"), (os.path.join("images","HobeauxRococeaux-Sherman.png"),"HobeauxRococeaux-Sherman")],label="Font Name").style(grid=4)
             
             def on_select(evt: gr.SelectData):
                 return evt.value
@@ -303,9 +289,9 @@ with gr.Blocks() as demo:
             run = gr.Button('Generate')
 
         with gr.Column():
-            result0 = gr.HTML() #gr.Image(type="filepath", label="Initial Word",height=333) 
-            result1 = gr.HTML() #gr.Image(type="filepath", label="Optimization Process",height=100) 
-            result2 = gr.HTML() #gr.Image(type="filepath", label="Final Result",visible=False,height=333) 
+            result0 = gr.Image(type="filepath", label="Initial Word").style(height=333)
+            result1 = gr.Image(type="filepath", label="Optimization Process").style(height=110)
+            result2 = gr.Image(type="filepath", label="Final Result",visible=False).style(height=333)
             
         
     with gr.Row():
@@ -316,30 +302,31 @@ with gr.Blocks() as demo:
             "BUNNY",
             "Y",
             "KaushanScript-Regular",
-            1# 500
+            500
+            ],
+            [
+            "LION",
+            "LION",
+            "O",
+            "Quicksand",
+            500
+            ],
+            [
+            "FROG",
+            "FROG",
+            "G",
+            "IndieFlower-Regular",
+            500
+            ],
+            [
+            "CAT",
+            "CAT",
+            "C",
+            "LuckiestGuy-Regular",
+            500
             ],
-            # [
-            # "LION",
-            # "LION",
-            # "O",
-            # "Quicksand",
-            # 500
-            # ],
-            # [
-            # "FROG",
-            # "FROG",
-            # "G",
-            # "IndieFlower-Regular",
-            # 500
-            # ],
-            # [
-            # "CAT",
-            # "CAT",
-            # "C",
-            # "LuckiestGuy-Regular",
-            # 500
-            # ],
         ]
+        demo.queue(max_size=10, concurrency_count=2)
         gr.Examples(examples=examples,
                 inputs=[
                     semantic_concept,
@@ -372,7 +359,7 @@ with gr.Blocks() as demo:
         result2
     ]
     
-    run.click(fn=run_main_app, inputs=inputs, outputs=outputs, concurrency_limit=2)
+    run.click(fn=run_main_app, inputs=inputs, outputs=outputs, queue=True)
 
 
 demo.launch(share=False)