add tipo, format selection | cfg refine

app.py

@@ -197,6 +197,8 @@ def generate(
     nl_prompt: str,
     tag_prompt: str,
     negative_prompt: str,
+    tipo_enable: bool,
+    format_enable: bool,
     num_images: int,
     steps: int,
     cfg_scale: float,
@@ -214,8 +216,14 @@ def generate(
     torch.manual_seed(seed)
 
     # TIPO
-    tipo.BAN_TAGS = [i.strip() for i in negative_prompt.split(",") if i.strip()]
-    final_prompt = prompt_opt(tag_prompt, nl_prompt, aspect_ratio, seed)
+    if tipo_enable:
+        tipo.BAN_TAGS = [i.strip() for i in negative_prompt.split(",") if i.strip()]
+        final_prompt = prompt_opt(tag_prompt, nl_prompt, aspect_ratio, seed)
+    elif format_enable:
+        final_prompt = apply_format(nl_prompt, DEFAULT_FORMAT)
+    else:
+        final_prompt = tag_prompt + "\n" + nl_prompt
+
     yield None, final_prompt
     all_pil_images = []
 
@@ -325,18 +333,27 @@ with gr.Blocks(title="HDM Demo", theme=gr.themes.Soft()) as demo:
                 ),
                 lines=3,
             )
+            with gr.Row():
+                tipo_enable = gr.Checkbox(
+                    label="Enable TIPO",
+                    value=True,
+                )
+                format_enable = gr.Checkbox(
+                    label="Enable Format",
+                    value=True,
+                )
         with gr.Column(scale=1):
             with gr.Row():
                 num_images_slider = gr.Slider(
                     label="Number of Images", minimum=1, maximum=16, value=1, step=1
                 )
                 steps_slider = gr.Slider(
-                    label="Inference Steps", minimum=1, maximum=50, value=32, step=1
+                    label="Inference Steps", minimum=1, maximum=64, value=32, step=1
                 )
 
             with gr.Row():
                 cfg_slider = gr.Slider(
-                    label="CFG Scale", minimum=1.0, maximum=10.0, value=3.0, step=0.1
+                    label="CFG Scale", minimum=1.0, maximum=5.0, value=3.0, step=0.1
                 )
                 seed_input = gr.Number(
                     label="Seed",
@@ -368,7 +385,7 @@ with gr.Blocks(title="HDM Demo", theme=gr.themes.Soft()) as demo:
     with gr.Row():
         with gr.Column(scale=1):
             output_prompt = gr.TextArea(
-                label="TIPO Generated Prompt",
+                label="Final Prompt",
                 show_label=True,
                 interactive=False,
                 lines=32,
@@ -391,6 +408,8 @@ with gr.Blocks(title="HDM Demo", theme=gr.themes.Soft()) as demo:
             nl_prompt_box,
             tag_prompt_box,
             neg_prompt_box,
+            tipo_enable,
+            format_enable,
             num_images_slider,
             steps_slider,
             cfg_slider,