28. Sept. 2024, 10:16

app.py

@@ -154,7 +154,10 @@ model_lineart_anime = None
 model_lineart = None
 
 
-def lineart(img, res, preprocessor_name="Lineart", invert=True):
+def lineart(img, res, preprocessor_name="Lineart", invert=True, old_images=None):
+    print("Old Images: ", old_images)
+    result_images = []
+    result = None
     img = resize_image(HWC3(img), res)
     ["Lineart", "Lineart Coarse", "Lineart Anime"]
     if preprocessor_name in ["Lineart", "Lineart Coarse"]:
@@ -164,24 +167,26 @@ def lineart(img, res, preprocessor_name="Lineart", invert=True):
             from annotator.lineart import LineartDetector
 
             model_lineart = LineartDetector()
-        #    result = model_lineart(img, coarse)
         if invert:
             result = cv2.bitwise_not(model_lineart(img, coarse))
         else:
             result = model_lineart(img, coarse)
-        return [result]
+        # return [result]
     elif preprocessor_name == "Lineart Anime":
         global model_lineart_anime
         if model_lineart_anime is None:
             from annotator.lineart_anime import LineartAnimeDetector
 
             model_lineart_anime = LineartAnimeDetector()
-        #    result = model_lineart_anime(img)
         if invert:
             result = cv2.bitwise_not(model_lineart_anime(img))
         else:
             result = model_lineart_anime(img)
-        return [result]
+
+    result_images.append(result)
+    if old_images is not None:
+        result_images.extend(old_images)
+    return result_images
 
 
 model_oneformer_coco = None
@@ -262,45 +267,6 @@ 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"),
 )
 
-css = """
-    body > gradio-app {
-        background: var(--primary-950);
-        background: linear-gradient(180deg, color-mix(in srgb, var(--primary-950), transparent 50%) 0%, color-mix(in srgb, var(--primary-950), transparent 50%) 28%, var(--neutral-950) 28%, var(--neutral-950) 100%) !important;
-        padding-top: 120px;
-    }
-    
-    
-    
-    div.tabs > div.tab-nav {
-        border-bottom: none; !important;
-        padding: 0 0.25rem 0 0.25rem !important;
-        flex-wrap: nowrap;
-        overflow-x: scroll;
-        overflow-y:hidden;
-    }
-    
-    div.tabs > div.tab-nav > button.selected {
-        border-width: 0 !important;
-        background: var(--primary-600) !important;
-        color: var(--neutral-950);
-        font-weight: 600;
-    }
-    
-    div.tabs > div.tab-nav > button {
-        min-width: 140px !important;
-    }
-    
-    div.tabs div.tabitem {
-        background-color: var(--neutral-900) !important;
-        border-top: 8px solid var(--primary-600) !important;
-        border-radius: var(--container-radius) !important;
-    }
-    
-    .top-description h1 {
-        color: var(--neutral-400);
-        font-size: 2rem;
-    }
-    """
 
 with gr.Blocks(theme=theme, css="custom.css", js="javascript.js") as demo:
     gr.Markdown(DESCRIPTION, elem_classes="top-description")
@@ -450,24 +416,15 @@ with gr.Blocks(theme=theme, css="custom.css", js="javascript.js") as demo:
             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", choices=["Lineart", "Lineart Coarse", "Lineart Anime"], type="value", value="Lineart")
                 input_image = gr.Image(label="Input Image", type="numpy", height=512)
+                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_button = gr.Button("Lineart")
+                run_btn_lineart = gr.Button("Run")
             with gr.Column():
                 gallery = gr.Gallery(label="Generated images", show_label=False, height="auto")
 
-        def update_button_label(preprocessor_name):
-            if preprocessor_name == "Lineart":
-                return "Lineart"
-            elif preprocessor_name == "Lineart Coarse":
-                return "Lineart Coarse"
-            elif preprocessor_name == "Lineart Anime":
-                return "Lineart Anime"
-
-        preprocessor_name.change(fn=update_button_label, inputs=[preprocessor_name], outputs=[run_button])
-        run_button.click(fn=lineart, inputs=[input_image, resolution, preprocessor_name, invert], outputs=[gallery])
+        run_btn_lineart.click(fn=lineart, inputs=[input_image, resolution, preprocessor_name, invert, gallery], outputs=[gallery])
 
     with gr.Tab("InPaint"):
         with gr.Row():