22

app.py

@@ -91,7 +91,7 @@ def inference(
     negative_prompt,
     edit_dict,
     # image_scale=1.0,
-    control_mode='Canny',
+    # control_mode='Canny',
     control_context_scale = 0.75,
     seed=42,
     randomize_seed=True,
@@ -108,21 +108,21 @@ def inference(
         print("Error: edit_dict is empty.")
         return None
     
-    print(edit_dict)
+    # print(edit_dict)
     # input_image, width, height = scale_image(input_image, image_scale)
     # control_mode='HED'
-    processor_id = 'canny'
-    if control_mode == 'HED':
-        processor_id = 'softedge_hed'
-    if control_mode =='Depth':
-        processor_id = 'depth_midas'
-    if control_mode =='MLSD':
-        processor_id = 'mlsd'
-    if control_mode =='Pose':
-        processor_id = 'openpose_full'
-
-    print(f"DEBUG: processor_id={processor_id}")
-    processor = Processor(processor_id)
+    # processor_id = 'canny'
+    # if control_mode == 'HED':
+    #     processor_id = 'softedge_hed'
+    # if control_mode =='Depth':
+    #     processor_id = 'depth_midas'
+    # if control_mode =='MLSD':
+    #     processor_id = 'mlsd'
+    # if control_mode =='Pose':
+    #     processor_id = 'openpose_full'
+
+    # print(f"DEBUG: processor_id={processor_id}")
+    # processor = Processor(processor_id)
 
     # Width must be divisible by 16
     
@@ -206,15 +206,14 @@ with gr.Blocks() as demo:
                     placeholder="Enter your prompt",
                     # container=False,
                 )
-                is_polish_prompt = gr.Checkbox(label="Polish prompt", value=True)
-                control_mode = gr.Radio(
-                    choices=["Canny", "Depth", "HED", "MLSD", "Pose"],
-                    value="Canny",
-                    label="Control Mode"
-                )
+                # is_polish_prompt = gr.Checkbox(label="Polish prompt", value=True)
+                # control_mode = gr.Radio(
+                #     choices=["Canny", "Depth", "HED", "MLSD", "Pose"],
+                #     value="Canny",
+                #     label="Control Mode"
+                # )
                 run_button = gr.Button("Generate", variant="primary")
                 with gr.Accordion("Advanced Settings", open=False):
-                    
                     negative_prompt = gr.Textbox(
                         label="Negative prompt",
                         lines=2,
@@ -222,21 +221,21 @@ with gr.Blocks() as demo:
                         placeholder="Enter your negative prompt",
                         value="blurry ugly bad"
                     )
-                    with gr.Row():
-                        num_inference_steps = gr.Slider(
-                            label="Steps",
-                            minimum=1,
-                            maximum=30,
-                            step=1,
-                            value=9,
-                        )
-                        control_context_scale = gr.Slider(
-                            label="Context scale",
-                            minimum=0.0,
-                            maximum=1.0,
-                            step=0.01,
-                            value=0.75,
-                        )
+                    # with gr.Row():
+                    num_inference_steps = gr.Slider(
+                        label="Steps",
+                        minimum=1,
+                        maximum=30,
+                        step=1,
+                        value=9,
+                    )
+                    control_context_scale = gr.Slider(
+                        label="Context scale",
+                        minimum=0.0,
+                        maximum=1.0,
+                        step=0.01,
+                        value=0.75,
+                    )
                     guidance_scale = gr.Slider(
                             label="Guidance scale",
                             minimum=0.0,
@@ -244,16 +243,6 @@ with gr.Blocks() as demo:
                             step=0.1,
                             value=1.0,
                         )
-                    # with gr.Row():
-                        
-
-                        # image_scale = gr.Slider(
-                        #     label="Image scale",
-                        #     minimum=0.5,
-                        #     maximum=2.0,
-                        #     step=0.1,
-                        #     value=1.0,
-                        # )
 
                     seed = gr.Slider(
                         label="Seed",
@@ -266,27 +255,28 @@ with gr.Blocks() as demo:
 
             with gr.Column():
                 output_image = gr.Image(label="Generated image", show_label=False)
-                polished_prompt = gr.Textbox(label="Polished prompt", interactive=False)
+                # polished_prompt = gr.Textbox(label="Polished prompt", interactive=False)
 
-                with gr.Accordion("Preprocessor output", open=False):
+                with gr.Accordion("Preprocessor data", open=False):
                     mask_image = gr.Image(label="Mask image", show_label=False)
                     
         gr.Examples(examples=examples, inputs=[edit_dict, prompt, control_mode])
         gr.Markdown(read_file("static/footer.md"))
 
+    # edit_dict.upload(fn=lambda x: x, inputs=[mask_image], outputs=[input_image])
     run_button.click(
-        fn=prepare,
-        inputs=[prompt, is_polish_prompt],
-        outputs=[polished_prompt, is_polish_prompt]
+        fn=lambda x: x,
+        inputs=[mask_image['composition']],
+        outputs=[mask_image]
         # outputs=gr.State(),  # Pass to the next function, not to UI at this step
     ).then(
         fn=inference,
         inputs=[
-            polished_prompt,
+            prompt,
             negative_prompt,
             edit_dict,
             # image_scale,
-            control_mode,
+            # control_mode,
             control_context_scale,
             seed,
             randomize_seed,