Update app.py

app.py

@@ -141,72 +141,78 @@ def main():
 
     predefined_tags = ["loli", "oppai_loli", "minigirl", "babydoll", "monochrome", "grayscale", "speech_bubble", "english_text", "copyright_name", "twitter_username", "artist_name", "watermark", "censored", "bar_censor", "blank_censor", "blur_censor", "light_censor", "mosaic_censoring"]  # Default tags to filter out
 
-        with gr.Blocks(title=TITLE) as demo:
-            gr.Markdown(f"<h1 style='text-align: center;'>{TITLE}</h1>")
-            gr.Markdown(DESCRIPTION)
-
-            with gr.Row():
-                with gr.Column():
-                    image_files = gr.File(
-                        file_types=["image"], label="Upload Images", file_count="multiple",
+    with gr.Blocks(title=TITLE) as demo:
+        gr.Markdown(f"<h1 style='text-align: center;'>{TITLE}</h1>")
+        gr.Markdown(DESCRIPTION)
+
+        with gr.Row():
+            with gr.Column():
+                image_files = gr.File(
+                    file_types=["image"], label="Upload Images", file_count="multiple",
+                )
+
+                # Wrap the model selection and sliders in an Accordion
+                with gr.Accordion("Advanced Settings", open=False):  # Collapsible by default
+                    model_repo = gr.Dropdown(
+                        model_repos,
+                        value=VIT_MODEL_DSV3_REPO,
+                        label="Select Model",
                     )
-
-                    with gr.Accordion("Advanced Settings", open=False):
-                        model_repo = gr.Dropdown(
-                            model_repos,
-                            value=VIT_MODEL_DSV3_REPO,
-                            label="Select Model",
-                        )
-                        general_thresh = gr.Slider(
-                            0, 1, step=args.score_slider_step, value=args.score_general_threshold, label="General Tags Threshold"
-                        )
-                        character_thresh = gr.Slider(
-                            0, 1, step=args.score_slider_step, value=args.score_character_threshold, label="Character Tags Threshold"
-                        )
-                        filter_tags = gr.Textbox(
-                            value=", ".join(predefined_tags),
-                            label="Filter Tags (comma-separated)",
-                            placeholder="Add tags to filter out (e.g., winter, red, from above)",
-                            lines=3
-                        )
-
-                    submit = gr.Button(value="Process Images", variant="primary")
-
-                with gr.Column():
-                    outputs = gr.Column()
-    
-            def process_images(files, model_repo, general_thresh, character_thresh, filter_tags):
-                images = [Image.open(file.name) for file in files]
-                results = predictor.predict(images, model_repo, general_thresh, character_thresh)
-
-                filter_set = set(tag.strip().lower() for tag in filter_tags.split(","))
-
-                prompts = []
-                for i, (general_tags, character_tags) in enumerate(results):
-                    character_part = ", ".join(
-                        tag.replace('_', ' ') for tag in character_tags if tag.lower() not in filter_set
+                    general_thresh = gr.Slider(
+                        0, 1, step=args.score_slider_step, value=args.score_general_threshold, label="General Tags Threshold"
                     )
-                    general_part = ", ".join(
-                        tag.replace('_', ' ') for tag in general_tags if tag.lower() not in filter_set
+                    character_thresh = gr.Slider(
+                        0, 1, step=args.score_slider_step, value=args.score_character_threshold, label="Character Tags Threshold"
+                    )
+                    filter_tags = gr.Textbox(
+                        value=", ".join(predefined_tags),
+                        label="Filter Tags (comma-separated)",
+                        placeholder="Add tags to filter out (e.g., winter, red, from above)",
+                        lines=3
                     )
-                    if character_part:
-                        prompts.append(f"{character_part}, {general_part}")
-                    else:
-                        prompts.append(general_part)
-    
-                # Return a list of prompts for each output
-                return [gr.Textbox.update(value=prompt, visible=True) for prompt in prompts]
-
-            submit.click(
-                process_images,
-                inputs=[image_files, model_repo, general_thresh, character_thresh, filter_tags],
-                outputs=[gr.Textbox(visible=False, label=f"Output {i + 1}") for i in range(10)],
-            )
 
+                submit = gr.Button(
+                    value="Process Images", variant="primary"
+                )
+
+            with gr.Column():
+                output = gr.Textbox(label="Output", lines=10)
+
+        def process_images(files, model_repo, general_thresh, character_thresh, filter_tags):
+            images = [Image.open(file.name) for file in files]
+            results = predictor.predict(images, model_repo, general_thresh, character_thresh)
+
+            # Parse filter tags
+            filter_set = set(tag.strip().lower() for tag in filter_tags.split(","))
+
+            # Generate formatted output
+            prompts = []
+            for i, (general_tags, character_tags) in enumerate(results):
+                # Replace underscores with spaces for both character and general tags
+                character_part = ", ".join(
+                    tag.replace('_', ' ') for tag in character_tags if tag.lower() not in filter_set
+                )
+                general_part = ", ".join(
+                    tag.replace('_', ' ') for tag in general_tags if tag.lower() not in filter_set
+                )
+        
+                # Construct the prompt based on the presence of character_part
+                if character_part:
+                    prompts.append(f"{character_part}, {general_part}")
+                else:
+                    prompts.append(general_part)
+
+            # Join all prompts with blank lines
+            return "\n\n".join(prompts)
+
+        submit.click(
+            process_images,
+            inputs=[image_files, model_repo, general_thresh, character_thresh, filter_tags],
+            outputs=output
         )
 
     demo.queue(max_size=10)
     demo.launch()
 
 if __name__ == "__main__":
-    main()
+    main()