Update instructions

app.py

@@ -52,7 +52,11 @@ def get_layout_image_gallery(response):
 
 def get_ours_image(response, overall_prompt_override="", seed=0, num_inference_steps=250, dpm_scheduler=True, use_autocast=False, fg_seed_start=20, fg_blending_ratio=0.1, frozen_step_ratio=0.5, attn_guidance_step_ratio=0.6, gligen_scheduled_sampling_beta=0.4, attn_guidance_scale=20, use_ref_ca=True, so_negative_prompt=DEFAULT_SO_NEGATIVE_PROMPT, overall_negative_prompt=DEFAULT_OVERALL_NEGATIVE_PROMPT, show_so_imgs=False, scale_boxes=False):
     if response == "":
-        response = layout_placeholder
+        if overall_prompt_override == "":
+            # Both are empty so generate a placeholder
+            response = layout_placeholder
+        else:
+            raise gr.Error("Please paste ChatGPT response in the text box or select an example below to get started.")
     gen_boxes, bg_prompt, neg_prompt = parse_input_with_negative(response, no_input=True)
     gen_boxes = filter_boxes(gen_boxes, scale_boxes=scale_boxes)
     spec = {
@@ -117,9 +121,9 @@ def preset_change(preset):
     # frozen_step_ratio, attn_guidance_step_ratio, attn_guidance_scale, use_ref_ca, so_negative_prompt
     if preset == "Standard":
         return gr.update(value=0.5, interactive=True), gr.update(value=0.6, interactive=True), gr.update(interactive=True), gr.update(value=True, interactive=True), gr.update(interactive=True)
-    elif preset == "Faster (disable attention guidance)":
+    elif preset == "Faster (disable attention guidance, keep per-box guidance)":
         return gr.update(value=0.5, interactive=True), gr.update(value=0, interactive=False), gr.update(interactive=False), gr.update(value=True, interactive=True), gr.update(interactive=True)
-    elif preset == "Faster (disable per-box guidance)":
+    elif preset == "Faster (disable per-box guidance, keep attention guidance)":
         return gr.update(value=0, interactive=False), gr.update(value=0.6, interactive=True), gr.update(interactive=True), gr.update(value=False, interactive=False), gr.update(interactive=False)
     elif preset == "Fastest (disable both)":
         return gr.update(value=0, interactive=False), gr.update(value=0, interactive=False), gr.update(interactive=False), gr.update(value=False, interactive=False), gr.update(interactive=True)
@@ -158,7 +162,7 @@ with gr.Blocks(
                 response = gr.Textbox(lines=8, label="Paste ChatGPT response here (no original caption needed here)", placeholder=layout_placeholder)
                 num_inference_steps = gr.Slider(1, 100 if low_memory else 250, value=default_num_inference_steps, step=1, label="Number of denoising steps (set to >=50 for higher generation quality)")
                 # Using a environment variable allows setting default to faster/fastest on low-end GPUs.
-                preset = gr.Radio(label="Guidance: apply less control for faster generation", choices=["Standard", "Faster (disable attention guidance)", "Faster (disable per-box guidance)", "Fastest (disable both)"], value="Faster (disable attention guidance)" if low_memory else "Standard")
+                preset = gr.Radio(label="Guidance: apply less control for faster generation", choices=["Standard", "Faster (disable attention guidance, keep per-box guidance)", "Faster (disable per-box guidance, keep attention guidance)", "Fastest (disable both)"], value="Faster (disable attention guidance)" if low_memory else "Standard")
                 seed = gr.Slider(0, 10000, value=0, step=1, label="Seed")
                 with gr.Accordion("Advanced options (play around for better generation)", open=False):
                     with gr.Tab("Guidance"):