28. Sept. 2024, 11:00

app.py

@@ -4,9 +4,7 @@ import numpy as np
 
 from annotator.util import resize_image, HWC3
 
-DESCRIPTION = "# "
-DESCRIPTION += "# ControlNet v1.1 Preprocessors Standalone"
-DESCRIPTION += "\n<p>Generate Control Images for Stable Diffusion and other apps that uses ControlNet.</p>"
+title = "ControlNet v1.1 Preprocessors Standalone"
 
 
 model_canny = None
@@ -168,9 +166,9 @@ def lineart(img, res, preprocessor_name="Lineart", invert=True, old_images=None)
 
             model_lineart = LineartDetector()
         if invert:
-            result = cv2.bitwise_not(model_lineart(img, coarse))
+            result = (cv2.bitwise_not(model_lineart(img, coarse)), preprocessor_name)
         else:
-            result = model_lineart(img, coarse)
+            result = (model_lineart(img, coarse), preprocessor_name)
         # return [result]
     elif preprocessor_name == "Lineart Anime":
         global model_lineart_anime
@@ -179,9 +177,9 @@ def lineart(img, res, preprocessor_name="Lineart", invert=True, old_images=None)
 
             model_lineart_anime = LineartAnimeDetector()
         if invert:
-            result = cv2.bitwise_not(model_lineart_anime(img))
+            result = (cv2.bitwise_not(model_lineart_anime(img)), preprocessor_name)
         else:
-            result = model_lineart_anime(img)
+            result = (model_lineart_anime(img), preprocessor_name)
 
     result_images.append(result)
     if old_images is not None:
@@ -267,7 +265,40 @@ theme = gr.themes.Soft(
     neutral_hue=gr.themes.Color(c100="#a6adc8", c200="#9399b2", c300="#7f849c", c400="#6c7086", c50="#cdd6f4", c500="#585b70", c600="#45475a", c700="#313244", c800="#1e1e2e", c900="#181825", c950="#11111b"),
 )
 
+with gr.Blocks(theme=theme, css="custom.css", js="javascript.js") as demo:
+    with gr.Row(elem_classes="row-header"):
+        gr.Markdown(
+            f"""
+                    <h1>{title}</h1>
+                    <p>Erstelle "Control Images" für Stable Diffusion und andere Tools die ControlNet verwenden.<br/>
+                    Diese Demo läuft nur auf CPU, eine Inference wird daher sehr lange dauern.<br/>
+                    Du kannst diesen Space clonen und lokal auf deinem Computer verwenden.</p>
+                    <p>👋 Sebastian, gib dem Space gerne ein ❤️</p>
+                    """,
+            elem_classes="md-header",
+        )
+    with gr.Row(elem_classes="row-main"):
+        with gr.Column(scale=1):
+            input_image = gr.Image(label="Input Image", type="numpy", height=512)
+
+            ## TAB LINEART
+            with gr.Tab("Lineart"):
+                with gr.Row():
+                    gr.Markdown("## Lineart \n<p>Check Invert to use with Mochi Diffusion.  Inverted image can also be created here for use with ControlNet Scribble.")
+                with gr.Row():
+                    with gr.Column():
+                        preprocessor_name = gr.Radio(label="Preprocessor", show_label=False, choices=["Lineart", "Lineart Coarse", "Lineart Anime"], type="value", value="Lineart")
+                        invert = gr.Checkbox(label="Invert", value=True)
+                        resolution = gr.Slider(label="resolution", minimum=256, maximum=1024, value=512, step=64)
+                        run_btn_lineart = gr.Button("Run")
+
+        with gr.Column(scale=2):
+            gallery = gr.Gallery(label="Generated images", show_label=False, interactive=False, format="png", elem_id="output_gallery", elem_classes="output-gallery", columns=[3], rows=[2], object_fit="contain", height="auto", type="filepath")
+
+        run_btn_lineart.click(fn=lineart, inputs=[input_image, resolution, preprocessor_name, invert, gallery], outputs=[gallery])
 
+
+"""
 with gr.Blocks(theme=theme, css="custom.css", js="javascript.js") as demo:
     gr.Markdown(DESCRIPTION, elem_classes="top-description")
     with gr.Tab("Canny Edge", elem_id="tab_wrapper", elem_classes="tab_wrapper"):
@@ -509,6 +540,6 @@ with gr.Blocks(theme=theme, css="custom.css", js="javascript.js") as demo:
                 gallery = gr.Gallery(label="Generated images", show_label=False, height="auto")
 
     run_button.click(fn=color_shuffler, inputs=[input_image, resolution], outputs=[gallery])
-
+"""
 
 demo.launch()