Update app.py

app.py

@@ -12,7 +12,7 @@ import torchvision.transforms.functional as TVF
 
 
 CLIP_PATH = "google/siglip-so400m-patch14-384"
-MODEL_PATH = "Qwen/Qwen2.5-7B-Instruct"
+MODEL_PATH = "meta-llama/Meta-Llama-3.1-8B"
 CHECKPOINT_PATH = Path("9em124t2-499968")
 TITLE = "<h1><center>JoyCaption Alpha One (2024-09-20a)</center></h1>"
 CAPTION_TYPE_MAP = {
@@ -442,48 +442,6 @@ with gr.Blocks(theme="Hev832/Applio", css=css) as demo:
                     value="any",
                 )
 
-                lens_type = gr.Dropdown(
-                    choices=get_dropdown_choices(lens_types_info),
-                    label="Lens Type",
-                    visible=False,
-                    info="Select a lens type to define the perspective and field of view of the image."
-                )
-
-                film_stock = gr.Dropdown(
-                    choices=get_dropdown_choices(film_stocks_info),
-                    label="Film Stock",
-                    visible=False,
-                    info="Choose a film stock to determine the color, grain, and overall look of the image."
-                )
-
-                composition_style = gr.Dropdown(
-                    choices=get_dropdown_choices(composition_styles_info),
-                    label="Composition Style",
-                    visible=False,
-                    info="Select a composition style to guide the arrangement of elements in the image."
-                )
-
-                lighting_aspect = gr.Dropdown(
-                    choices=get_dropdown_choices(lighting_aspects_info),
-                    label="Lighting Aspect",
-                    visible=False,
-                    info="Choose a lighting style to define the mood and atmosphere of the image."
-                )
-
-                special_technique = gr.Dropdown(
-                    choices=get_dropdown_choices(special_techniques_info),
-                    label="Special Technique",
-                    visible=False,
-                    info="Select a special photographic technique to add unique effects to the image."
-                )
-
-                color_effect = gr.Dropdown(
-                    choices=get_dropdown_choices(color_effects_info),
-                    label="Color Effect",
-                    visible=False,
-                    info="Choose a color effect to alter the overall color palette of the image."
-                )
-
                 gr.Markdown("**Note:** Caption tone doesn't affect `rng-tags`, `training_prompt`, and `style_prompt`.")
 
                 run_button = gr.Button("Make My Caption!")
@@ -492,28 +450,43 @@ with gr.Blocks(theme="Hev832/Applio", css=css) as demo:
                 output_caption = gr.Textbox(label="Generated Caption")
 
                 # Container for advanced options
-                advanced_options = gr.Column(visible=False)
-                with advanced_options:
+                with gr.Column(visible=False) as advanced_options:
                     gr.Markdown("### Advanced Options for Style Prompt")
-                    lens_type.render()
-                    film_stock.render()
-                    composition_style.render()
-                    lighting_aspect.render()
-                    special_technique.render()
-                    color_effect.render()
+                    lens_type = gr.Dropdown(
+                        choices=get_dropdown_choices(lens_types_info),
+                        label="Lens Type",
+                        info="Select a lens type to define the perspective and field of view of the image."
+                    )
+                    film_stock = gr.Dropdown(
+                        choices=get_dropdown_choices(film_stocks_info),
+                        label="Film Stock",
+                        info="Choose a film stock to determine the color, grain, and overall look of the image."
+                    )
+                    composition_style = gr.Dropdown(
+                        choices=get_dropdown_choices(composition_styles_info),
+                        label="Composition Style",
+                        info="Select a composition style to guide the arrangement of elements in the image."
+                    )
+                    lighting_aspect = gr.Dropdown(
+                        choices=get_dropdown_choices(lighting_aspects_info),
+                        label="Lighting Aspect",
+                        info="Choose a lighting style to define the mood and atmosphere of the image."
+                    )
+                    special_technique = gr.Dropdown(
+                        choices=get_dropdown_choices(special_techniques_info),
+                        label="Special Technique",
+                        info="Select a special photographic technique to add unique effects to the image."
+                    )
+                    color_effect = gr.Dropdown(
+                        choices=get_dropdown_choices(color_effects_info),
+                        label="Color Effect",
+                        info="Choose a color effect to alter the overall color palette of the image."
+                    )
 
     def update_style_options(caption_type):
-        return {
-            lens_type: gr.update(visible=caption_type == "style_prompt"),
-            film_stock: gr.update(visible=caption_type == "style_prompt"),
-            composition_style: gr.update(visible=caption_type == "style_prompt"),
-            lighting_aspect: gr.update(visible=caption_type == "style_prompt"),
-            special_technique: gr.update(visible=caption_type == "style_prompt"),
-            color_effect: gr.update(visible=caption_type == "style_prompt"),
-            advanced_options: gr.update(visible=caption_type == "style_prompt"),
-        }
-
-    caption_type.change(update_style_options, inputs=[caption_type], outputs=[lens_type, film_stock, composition_style, lighting_aspect, special_technique, color_effect, advanced_options])
+        return gr.update(visible=caption_type == "style_prompt")
+
+    caption_type.change(update_style_options, inputs=[caption_type], outputs=[advanced_options])
     
     run_button.click(fn=stream_chat, inputs=[input_image, caption_type, caption_tone, caption_length, lens_type, film_stock, composition_style, lighting_aspect, special_technique, color_effect], outputs=[output_caption])