Update app.py

app.py

@@ -480,28 +480,28 @@ tools_dict = {e.split('_')[0].strip(): e.split('_')[1].strip() for e in args.cha
 shared_chatbot_tools = build_chatbot_tools(tools_dict)
 
 
-class ImageSketcher(gr.Image):
-    """
-    Fix the bug of gradio.Image that cannot upload with tool == 'sketch'.
-    """
-
-    is_template = True  # Magic to make this work with gradio.Block, don't remove unless you know what you're doing.
-
-    def __init__(self, **kwargs):
-        super().__init__(**kwargs)
-
-    def preprocess(self, x):
-        if self.tool == 'sketch' and self.source in ["upload", "webcam"]:
-            assert isinstance(x, dict)
-            if x['mask'] is None:
-                decode_image = processing_utils.decode_base64_to_image(x['image'])
-                width, height = decode_image.size
-                mask = np.zeros((height, width, 4), dtype=np.uint8)
-                mask[..., -1] = 255
-                mask = self.postprocess(mask)
-                x['mask'] = mask
+# class ImageSketcher(gr.Image):
+#     """
+#     Fix the bug of gradio.Image that cannot upload with tool == 'sketch'.
+#     """
+
+#     is_template = True  # Magic to make this work with gradio.Block, don't remove unless you know what you're doing.
+
+#     def __init__(self, **kwargs):
+#         super().__init__(**kwargs)
+
+#     def preprocess(self, x):
+#         if self.tool == 'sketch' and self.source in ["upload", "webcam"]:
+#             assert isinstance(x, dict)
+#             if x['mask'] is None:
+#                 decode_image = processing_utils.decode_base64_to_image(x['image'])
+#                 width, height = decode_image.size
+#                 mask = np.zeros((height, width, 4), dtype=np.uint8)
+#                 mask[..., -1] = 255
+#                 mask = self.postprocess(mask)
+#                 x['mask'] = mask
                 
-        return super().preprocess(x)
+#         return super().preprocess(x)
 
 
 def build_caption_anything_with_models(args, api_key="", captioner=None, sam_model=None, ocr_reader=None, text_refiner=None,
@@ -908,15 +908,13 @@ submit_traj=0
 
 async def inference_traject(origin_image,sketcher_image, enable_wiki, language, sentiment, factuality, length, image_embedding, state,
                       original_size, input_size, text_refiner,focus_type,paragraph,openai_api_key,autoplay,trace_type):
-    image_input, mask = sketcher_image['image'], sketcher_image['mask']
+    image_input, mask = sketcher_image['background'], sketcher_image['layers'][0]
     
     crop_save_path=""
     
     prompt = get_sketch_prompt(mask)
     boxes = prompt['input_boxes']
     boxes = boxes[0]
-    global submit_traj
-    submit_traj=1
 
     controls = {'length': length,
                 'sentiment': sentiment,
@@ -962,11 +960,7 @@ async def inference_traject(origin_image,sketcher_image, enable_wiki, language,
     # image_input = create_bubble_frame(image_input, "", fake_click_index, input_mask)
 
     prompt=generate_prompt(focus_type, paragraph, length, sentiment, factuality, language)
-    width, height = sketcher_image['image'].size
-    sketcher_image['mask'] = np.zeros((height, width, 4), dtype=np.uint8)
-    sketcher_image['mask'][..., -1] = 255
-    sketcher_image['image']=image_input
-    
+
     
     # if not args.disable_gpt and text_refiner:
     if not args.disable_gpt:
@@ -1345,12 +1339,13 @@ def create_ui():
                     with gr.Tab("Trajectory (beta)") as traj_tab:
                         # sketcher_input = ImageSketcher(type="pil", interactive=True, brush_radius=10, 
                         #                                elem_id="image_sketcher")
-                        sketcher_input = ImageSketcher(type="pil", interactive=True, 
+                        sketcher_input = gr.ImageEditor(type="pil", interactive=True, 
                                                        elem_id="image_sketcher")
                         example_image = gr.Image(type="pil", interactive=False, visible=False)
-                        with gr.Row():                   
-                            submit_button_sketcher = gr.Button(value="Submit", interactive=True)
+                        with gr.Row():     
                             clear_button_sketcher = gr.Button(value="Clear Sketch", interactive=True)
+                            submit_button_sketcher = gr.Button(value="Submit", interactive=True)
+                            
                         with gr.Row():
                             with gr.Row():
                                 focus_type_sketch = gr.Radio(