Update app.py

app.py

@@ -306,104 +306,84 @@ def extract_png_info(image_path):
     return metadata
 
 # Define the Gradio interface
-def build_interface():
-    with gr.Blocks() as demo:
-        gr.Markdown("# Image Generation with Custom Prompts and Styles")
-
-        with gr.Row():
-            with gr.Column():
-                prompt = gr.Textbox(label="Prompt", lines=8, interactive=True)
-                with gr.Accordion("Negative Prompt (Minimize/Expand)", open=False):
-                    negative_prompt = gr.Textbox(
-                        label="Negative Prompt",
-                        value="",
-                        lines=5
-                    )
-                batch_count = gr.Slider(minimum=1, maximum=10, step=1, label="Batch Count", value=1)
-                use_controlnet = gr.Checkbox(label="Use ControlNet", value=False)
-                controlnet_type = gr.Dropdown(choices=["Canny", "Depth", "OpenPose", "Reference"], label="ControlNet Type")
-                controlnet_status = gr.Textbox(label="ControlNet Status", value="", interactive=False)
-                mode = gr.Radio(choices=["Single Image", "Batch"], label="Mode", value="Single Image")
-
-                with gr.Tabs() as tabs:
-                    with gr.TabItem("Single Image"):
-                        control_image = gr.Image(label="Control Image", type='pil')
-
-                    with gr.TabItem("Batch"):
-                        batch_images_input = gr.File(label="Upload Images", file_count='multiple')
-
-                    with gr.TabItem("Extract Metadata"):
-                        png_image = gr.Image(label="Upload PNG Image", type='pil')
-                        metadata_output = gr.JSON(label="PNG Metadata")
-
-            with gr.Column(scale=2):
-                style_images_gallery = gr.Gallery(
-                    label="Choose a Style",
-                    value=list(style_images.values()),
-                    interactive=True,
-                    elem_id="style-gallery",
-                    columns=5,
-                    object_fit="contain",
-                    height=235,
-                    allow_preview=False
+with gr.Blocks(auth={"user": "roland"}) as demo:
+    gr.Markdown("# Image Generation with Custom Prompts and Styles")
+
+    with gr.Row():
+        with gr.Column():
+            prompt = gr.Textbox(label="Prompt", lines=8, interactive=True)
+            with gr.Accordion("Negative Prompt (Minimize/Expand)", open=False):
+                negative_prompt = gr.Textbox(
+                    label="Negative Prompt",
+                    value="",
+                    lines=5
                 )
-                gallery = gr.Gallery(label="Generated Images", show_label=False, elem_id="gallery", height=785)
-
-        selected_style = gr.State(value="Anime Studio Dance")
+            batch_count = gr.Slider(minimum=1, maximum=10, step=1, label="Batch Count", value=1)
+            use_controlnet = gr.Checkbox(label="Use ControlNet", value=False)
+            controlnet_type = gr.Dropdown(choices=["Canny", "Depth", "OpenPose", "Reference"], label="ControlNet Type")
+            controlnet_status = gr.Textbox(label="ControlNet Status", value="", interactive=False)
+            mode = gr.Radio(choices=["Single Image", "Batch"], label="Mode", value="Single Image")
+
+            with gr.Tabs() as tabs:
+                with gr.TabItem("Single Image"):
+                    control_image = gr.Image(label="Control Image", type='pil')
+
+                with gr.TabItem("Batch"):
+                    batch_images_input = gr.File(label="Upload Images", file_count='multiple')
+
+                with gr.TabItem("Extract Metadata"):
+                    png_image = gr.Image(label="Upload PNG Image", type='pil')
+                    metadata_output = gr.JSON(label="PNG Metadata")
+
+        with gr.Column(scale=2):
+            style_images_gallery = gr.Gallery(
+                label="Choose a Style",
+                value=list(style_images.values()),
+                interactive=True,
+                elem_id="style-gallery",
+                columns=5,
+                object_fit="contain",
+                height=235,
+                allow_preview=False
+            )
+            gallery = gr.Gallery(label="Generated Images", show_label=False, elem_id="gallery", height=785)
 
-        def select_style(evt: gr.SelectData):
-            style_names = list(styles.keys())
-            if evt.index < 0 or evt.index >= len(style_names):
-                raise ValueError(f"Invalid index: {evt.index}")
-            selected_style = style_names[evt.index]
-            return styles[selected_style]["prompt"], styles[selected_style]["negative_prompt"], selected_style
+    selected_style = gr.State(value="Anime Studio Dance")
 
-        style_images_gallery.select(fn=select_style, inputs=[], outputs=[prompt, negative_prompt, selected_style])
+    def select_style(evt: gr.SelectData):
+        style_names = list(styles.keys())
+        if evt.index < 0 or evt.index >= len(style_names):
+            raise ValueError(f"Invalid index: {evt.index}")
+        selected_style = style_names[evt.index]
+        return styles[selected_style]["prompt"], styles[selected_style]["negative_prompt"], selected_style
 
-        def update_controlnet(controlnet_type):
-            status = load_controlnet_model(controlnet_type)
-            return status
+    style_images_gallery.select(fn=select_style, inputs=[], outputs=[prompt, negative_prompt, selected_style])
 
-        controlnet_type.change(fn=update_controlnet, inputs=controlnet_type, outputs=controlnet_status)
+    def update_controlnet(controlnet_type):
+        status = load_controlnet_model(controlnet_type)
+        return status
 
-        generate_button = gr.Button("Generate Images")
-        generate_button.click(
-            generate_images_with_progress,
-            inputs=[prompt, negative_prompt, batch_count, use_controlnet, controlnet_type, mode, control_image, batch_images_input],
-            outputs=gallery
-        )
-
-        metadata_button = gr.Button("Extract Metadata")
-        metadata_button.click(
-            fn=extract_png_info,
-            inputs=png_image,
-            outputs=metadata_output
-        )
+    controlnet_type.change(fn=update_controlnet, inputs=controlnet_type, outputs=controlnet_status)
 
-        with gr.Row():
-            generate_button
+    generate_button = gr.Button("Generate Images")
+    generate_button.click(
+        generate_images_with_progress,
+        inputs=[prompt, negative_prompt, batch_count, use_controlnet, controlnet_type, mode, control_image, batch_images_input],
+        outputs=gallery
+    )
 
-    return demo
+    metadata_button = gr.Button("Extract Metadata")
+    metadata_button.click(
+        fn=extract_png_info,
+        inputs=png_image,
+        outputs=metadata_output
+    )
 
-# Define login details
-valid_username = "roland"
-valid_password = "roland"
-
-# Create a login interface
-def login(username, password):
-    if username == valid_username and password == valid_password:
-        return build_interface()
-    else:
-        return "Invalid credentials. Please try again."
-
-login_interface = gr.Interface(
-    fn=login,
-    inputs=[gr.Textbox(label="Username"), gr.Textbox(label="Password", type="password")],
-    outputs="component",
-    live=True
-)
+    with gr.Row():
+        generate_button
 
-# Launch the app
+# At the end of your script:
 if __name__ == "__main__":
-    login_interface.launch(debug=True)
+    # Your Gradio interface setup here
+    demo.launch(debug=True)
     clear_memory()