Update app.py

app.py

@@ -7,7 +7,7 @@ import torch
 from tags import participant_tags, tribe_tags, skin_tone_tags, body_type_tags, tattoo_tags, piercing_tags, expression_tags, eye_tags, hair_style_tags, position_tags, fetish_tags, location_tags, camera_tags, atmosphere_tags  # Import tags here
 
 device = "cuda" if torch.cuda.is_available() else "cpu"
-model_repo_id = "John6666/wai-ani-nsfw-ponyxl-v8-sdxl"  # Replace to the model you would like to use
+model_repo_id = "John6666/wai-ani-nsfw-ponyxl-v8-sdxl"  # Replace with your desired model
 
 if torch.cuda.is_available():
     torch_dtype = torch.float16
@@ -21,17 +21,31 @@ MAX_SEED = np.iinfo(np.int32).max
 MAX_IMAGE_SIZE = 1024
 
 @spaces.GPU  # [uncomment to use ZeroGPU]
-def infer(prompt, negative_prompt, seed, randomize_seed, width, height, guidance_scale, num_inference_steps, tag_selection_1, tag_selection_2, tag_selection_3, tag_selection_4, use_tags, progress=gr.Progress(track_tqdm=True)):
+def infer(prompt, negative_prompt, seed, randomize_seed, width, height, guidance_scale, num_inference_steps,
+          selected_participant_tags, selected_tribe_tags, selected_skin_tone_tags, selected_body_type_tags, 
+          selected_tattoo_tags, selected_piercing_tags, selected_expression_tags, selected_eye_tags, 
+          selected_hair_style_tags, selected_position_tags, selected_fetish_tags, selected_location_tags, 
+          selected_camera_tags, selected_atmosphere_tags, use_tags, progress=gr.Progress(track_tqdm=True)):
 
-    # Determine final prompt
+    # Construct final prompt using selected tags if `use_tags` is True
     if use_tags:
-        participant_tags = [participant_tags[tag] for tag in participant_tags if tag in participant_tags]
-        tribe_tags = [tribe_tags[tag] for tag in tribe_tags if tag in tribe_tags]
-        skin_tone_tags = [skin_tone_tags[tag] for tag in skin_tone_tags if tag in skin_tone_tags]
-        body_type_tags = [body_type_tags[tag] for tag in body_type_tags if tag in body_type_tags]
-        tags_text = ', '.join(selected_tags_1 + selected_tags_2 + selected_tags_3 + selected_tags_4)
-
-        
+        selected_tags = (
+            [participant_tags[tag] for tag in selected_participant_tags] +
+            [tribe_tags[tag] for tag in selected_tribe_tags] +
+            [skin_tone_tags[tag] for tag in selected_skin_tone_tags] +
+            [body_type_tags[tag] for tag in selected_body_type_tags] +
+            [tattoo_tags[tag] for tag in selected_tattoo_tags] +
+            [piercing_tags[tag] for tag in selected_piercing_tags] +
+            [expression_tags[tag] for tag in selected_expression_tags] +
+            [eye_tags[tag] for tag in selected_eye_tags] +
+            [hair_style_tags[tag] for tag in selected_hair_style_tags] +
+            [position_tags[tag] for tag in selected_position_tags] +
+            [fetish_tags[tag] for tag in selected_fetish_tags] +
+            [location_tags[tag] for tag in selected_location_tags] +
+            [camera_tags[tag] for tag in selected_camera_tags] +
+            [atmosphere_tags[tag] for tag in selected_atmosphere_tags]
+        )
+        tags_text = ', '.join(selected_tags)
         final_prompt = f'score_9, score_8_up, score_7_up, source_anime, {tags_text}'
     else:
         final_prompt = f'score_9, score_8_up, score_7_up, source_anime, {prompt}'
@@ -90,7 +104,7 @@ with gr.Blocks(css=css) as demo:
         # Tabbed interface to select either Prompt or Tags
         with gr.Tabs() as tabs:
             with gr.TabItem("Prompt Input"):
-                prompt = gr.Text(
+                prompt = gr.Textbox(
                     label="Prompt",
                     show_label=False,
                     max_lines=1,
@@ -100,15 +114,21 @@ with gr.Blocks(css=css) as demo:
                 use_tags = gr.State(False)
 
             with gr.TabItem("Tag Selection"):
-                # Separate each tag section vertically
-                with gr.Column():
-                    participant_tags = gr.CheckboxGroup(choices=list(participant_tags.keys()), label="Select Tags (Style)")
-                with gr.Column():
-                    tribe_tags = gr.CheckboxGroup(choices=list(tribe_tags.keys()), label="Select Tags (Theme)")
-                with gr.Column():
-                    skin_tone_tags = gr.CheckboxGroup(choices=list(skin_tone_tags.keys()), label="Select Tags (Other)")
-                with gr.Column():
-                    body_type_tags = gr.CheckboxGroup(choices=list(body_type_tags.keys()), label="Select Tags (Additional)")
+                # Tag selection checkboxes for each tag group
+                selected_participant_tags = gr.CheckboxGroup(choices=list(participant_tags.keys()), label="Participant Tags")
+                selected_tribe_tags = gr.CheckboxGroup(choices=list(tribe_tags.keys()), label="Tribe Tags")
+                selected_skin_tone_tags = gr.CheckboxGroup(choices=list(skin_tone_tags.keys()), label="Skin Tone Tags")
+                selected_body_type_tags = gr.CheckboxGroup(choices=list(body_type_tags.keys()), label="Body Type Tags")
+                selected_tattoo_tags = gr.CheckboxGroup(choices=list(tattoo_tags.keys()), label="Tattoo Tags")
+                selected_piercing_tags = gr.CheckboxGroup(choices=list(piercing_tags.keys()), label="Piercing Tags")
+                selected_expression_tags = gr.CheckboxGroup(choices=list(expression_tags.keys()), label="Expression Tags")
+                selected_eye_tags = gr.CheckboxGroup(choices=list(eye_tags.keys()), label="Eye Tags")
+                selected_hair_style_tags = gr.CheckboxGroup(choices=list(hair_style_tags.keys()), label="Hair Style Tags")
+                selected_position_tags = gr.CheckboxGroup(choices=list(position_tags.keys()), label="Position Tags")
+                selected_fetish_tags = gr.CheckboxGroup(choices=list(fetish_tags.keys()), label="Fetish Tags")
+                selected_location_tags = gr.CheckboxGroup(choices=list(location_tags.keys()), label="Location Tags")
+                selected_camera_tags = gr.CheckboxGroup(choices=list(camera_tags.keys()), label="Camera Tags")
+                selected_atmosphere_tags = gr.CheckboxGroup(choices=list(atmosphere_tags.keys()), label="Atmosphere Tags")
 
                 use_tags = gr.State(True)
 
@@ -116,7 +136,7 @@ with gr.Blocks(css=css) as demo:
         run_button = gr.Button("Run", scale=0, elem_id="run-button")
 
         with gr.Accordion("Advanced Settings", open=False):
-            negative_prompt = gr.Text(
+            negative_prompt = gr.Textbox(
                 label="Negative prompt",
                 max_lines=1,
                 placeholder="Enter a negative prompt",
@@ -172,11 +192,14 @@ with gr.Blocks(css=css) as demo:
             inputs=[prompt]
         )
 
-    gr.on(
-        triggers=[run_button.click, prompt.submit],
-        fn=infer,
-        inputs=[prompt, negative_prompt, seed, randomize_seed, width, height, guidance_scale, num_inference_steps, tag_selection_1, tag_selection_2, tag_selection_3, tag_selection_4, use_tags],
-        outputs=[result, seed, prompt_info]  # Include prompt_info in the outputs
-    )
+        run_button.click(
+            infer,
+            inputs=[prompt, negative_prompt, seed, randomize_seed, width, height, guidance_scale, num_inference_steps, 
+                    selected_participant_tags, selected_tribe_tags, selected_skin_tone_tags, selected_body_type_tags, 
+                    selected_tattoo_tags, selected_piercing_tags, selected_expression_tags, selected_eye_tags, 
+                    selected_hair_style_tags, selected_position_tags, selected_fetish_tags, selected_location_tags, 
+                    selected_camera_tags, selected_atmosphere_tags, use_tags],
+            outputs=[result, seed, prompt_info]
+        )
 
 demo.queue().launch()