Update app.py

app.py

@@ -342,28 +342,29 @@ def create_demo(model):
         
         with gr.Column():
             design_image = gr.Image(label="Output Mask", elem_id='img-display-output')
-        with gr.Column():
-            bboxes = gr.JSON(label="Detected Objects", elem_id='json-display-output')
+        # with gr.Column():
+        #     bboxes = gr.JSON(label="Detected Objects", elem_id='json-display-output')
 
-    @spaces.GPU
-    def on_submit(image, text, num_steps, guidance_scale, seed, strength, a_prompt, n_prompt, 
-                  img_size, detr_confidence_threshold=0.8):
+    # def on_submit(image, text, num_steps, guidance_scale, seed, strength, a_prompt, n_prompt, 
+    #               img_size, detr_confidence_threshold=0.8):
         
-        model.seed = seed
-        model.neg_prompt = n_prompt
-        model.additional_quality_suffix = a_prompt
+    #     model.seed = seed
+    #     model.neg_prompt = n_prompt
+    #     model.additional_quality_suffix = a_prompt
         
-        with torch.no_grad():
-            out_img = model.generate_design(image, text, guidance_scale=guidance_scale, num_steps=num_steps, strength=strength, img_size=img_size)
-            # -----------------
-            # -- run detr --
-            # -----------------
-            clear_gpu()
-            detr_model = detr_model.to(device)
-            bboxes = run_detr(out_img, detr_confidence_threshold)
-        return out_img, list(bboxes)
-
-    def api_submit(image, text, num_steps, guidance_scale, seed, strength, a_prompt, n_prompt, 
+    #     with torch.no_grad():
+    #         out_img = model.generate_design(image, text, guidance_scale=guidance_scale, num_steps=num_steps, strength=strength, img_size=img_size)
+    #         # -----------------
+    #         # -- run detr --
+    #         # -----------------
+    #         clear_gpu()
+    #         detr_model = detr_model.to(device)
+    #         bboxes = run_detr(out_img, detr_confidence_threshold)
+    #     return out_img, list(bboxes)
+    # submit.click(on_submit, inputs=[input_image, input_text, num_steps, guidance_scale, seed, strength, a_prompt, 
+    #                                 n_prompt, img_size, detr_confidence_threshold], outputs=[design_image, bboxes])
+    
+    def on_submit(image, text, num_steps, guidance_scale, seed, strength, a_prompt, n_prompt, 
                   img_size, detr_confidence_threshold=0.8):
         
         model.seed = seed
@@ -375,11 +376,13 @@ def create_demo(model):
             # -----------------
             # -- run detr --
             # -----------------
-            bboxes = run_detr(out_img, detr_confidence_threshold)
-        return (out_img, bboxes)
+            # clear_gpu()
+            # detr_model = detr_model.to(device)
+            # bboxes = run_detr(out_img, detr_confidence_threshold)
+        return out_img
 
     submit.click(on_submit, inputs=[input_image, input_text, num_steps, guidance_scale, seed, strength, a_prompt, 
-                                    n_prompt, img_size, detr_confidence_threshold], outputs=[design_image, bboxes])
+                                    n_prompt, img_size, detr_confidence_threshold], outputs=design_image)
     examples = gr.Examples(examples=[["imgs/bedroom_1.jpg", "An elegantly appointed bedroom in the Art Deco style, featuring a grand king-size bed with geometric bedding, a luxurious velvet armchair, and a mirrored nightstand that reflects the room's opulence. Art Deco-inspired artwork adds a touch of glamour"], ["imgs/bedroom_2.jpg", "A bedroom that exudes French country charm with a soft upholstered bed, walls adorned with floral wallpaper, and a vintage wooden wardrobe. A crystal chandelier casts a warm, inviting glow over the space"], ["imgs/dinning_room_1.jpg", "A cozy dining room that captures the essence of rustic charm with a solid wooden farmhouse table at its core, surrounded by an eclectic mix of mismatched chairs. An antique sideboard serves as a statement piece, and the ambiance is warmly lit by a series of quaint Edison bulbs dangling from the ceiling"], ["imgs/dinning_room_3.jpg", "A dining room that epitomizes contemporary elegance, anchored by a sleek, minimalist dining table paired with stylish modern chairs. Artistic lighting fixtures create a focal point above, while the surrounding minimalist decor ensures the space feels open, airy, and utterly modern"], ["imgs/image_1.jpg", "A glamorous master bedroom in Hollywood Regency style, boasting a plush tufted headboard, mirrored furniture reflecting elegance, luxurious fabrics in rich textures, and opulent gold accents for a touch of luxury."], ["imgs/image_2.jpg", "A vibrant living room with a tropical theme, complete with comfortable rattan furniture, large leafy plants bringing the outdoors in, bright cushions adding pops of color, and bamboo blinds for natural light control."], ["imgs/living_room_1.jpg", "A stylish living room embracing mid-century modern aesthetics, featuring a vintage teak coffee table at its center, complemented by a classic sunburst clock on the wall and a cozy shag rug underfoot, creating a warm and inviting atmosphere"]],
                            inputs=[input_image, input_text], cache_examples=False)