Upload app.py

app.py

@@ -62,6 +62,13 @@ preprocessor_controlnet = {
     "None",
     "None (anime)",
   ],
+  "lineart_anime": [
+    "Lineart",
+    "Lineart coarse",
+    "Lineart (anime)",
+    "None",
+    "None (anime)",
+  ],
   "shuffle": [
     "ContentShuffle",
     "None",
@@ -88,7 +95,6 @@ preprocessor_controlnet = {
     "Heavy Blur",
     "None",
   ],
-
 }
 
 task_stablepy = {
@@ -236,20 +242,20 @@ upscaler_dict_gui = {
     'Latent (bicubic antialiased)': 'Latent (bicubic antialiased)',
     'Latent (nearest)': 'Latent (nearest)',
     'Latent (nearest-exact)': 'Latent (nearest-exact)',
-    "RealESRGAN_x4plus" : "https://github.com/xinntao/Real-ESRGAN/releases/download/v0.1.0/RealESRGAN_x4plus.pth",
-    "RealESRNet_x4plus" : "https://github.com/xinntao/Real-ESRGAN/releases/download/v0.1.1/RealESRNet_x4plus.pth",
+    "RealESRGAN_x4plus": "https://github.com/xinntao/Real-ESRGAN/releases/download/v0.1.0/RealESRGAN_x4plus.pth",
+    "RealESRNet_x4plus": "https://github.com/xinntao/Real-ESRGAN/releases/download/v0.1.1/RealESRNet_x4plus.pth",
     "RealESRGAN_x4plus_anime_6B": "https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.2.4/RealESRGAN_x4plus_anime_6B.pth",
     "RealESRGAN_x2plus": "https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.1/RealESRGAN_x2plus.pth",
     "realesr-animevideov3": "https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.5.0/realesr-animevideov3.pth",
     "realesr-general-x4v3": "https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.5.0/realesr-general-x4v3.pth",
-    "realesr-general-wdn-x4v3" : "https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.5.0/realesr-general-wdn-x4v3.pth",
+    "realesr-general-wdn-x4v3": "https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.5.0/realesr-general-wdn-x4v3.pth",
     "4x-UltraSharp" : "https://huggingface.co/Shandypur/ESRGAN-4x-UltraSharp/resolve/main/4x-UltraSharp.pth",
-    "4x_foolhardy_Remacri" : "https://huggingface.co/FacehugmanIII/4x_foolhardy_Remacri/resolve/main/4x_foolhardy_Remacri.pth",
-    "Remacri4xExtraSmoother" : "https://huggingface.co/hollowstrawberry/upscalers-backup/resolve/main/ESRGAN/Remacri%204x%20ExtraSmoother.pth",
-    "AnimeSharp4x" : "https://huggingface.co/hollowstrawberry/upscalers-backup/resolve/main/ESRGAN/AnimeSharp%204x.pth",
+    "4x_foolhardy_Remacri": "https://huggingface.co/FacehugmanIII/4x_foolhardy_Remacri/resolve/main/4x_foolhardy_Remacri.pth",
+    "Remacri4xExtraSmoother": "https://huggingface.co/hollowstrawberry/upscalers-backup/resolve/main/ESRGAN/Remacri%204x%20ExtraSmoother.pth",
+    "AnimeSharp4x": "https://huggingface.co/hollowstrawberry/upscalers-backup/resolve/main/ESRGAN/AnimeSharp%204x.pth",
     "lollypop" : "https://huggingface.co/hollowstrawberry/upscalers-backup/resolve/main/ESRGAN/lollypop.pth",
-    "RealisticRescaler4x" : "https://huggingface.co/hollowstrawberry/upscalers-backup/resolve/main/ESRGAN/RealisticRescaler%204x.pth",
-    "NickelbackFS4x" : "https://huggingface.co/hollowstrawberry/upscalers-backup/resolve/main/ESRGAN/NickelbackFS%204x.pth"
+    "RealisticRescaler4x": "https://huggingface.co/hollowstrawberry/upscalers-backup/resolve/main/ESRGAN/RealisticRescaler%204x.pth",
+    "NickelbackFS4x": "https://huggingface.co/hollowstrawberry/upscalers-backup/resolve/main/ESRGAN/NickelbackFS%204x.pth"
 }
 
 upscaler_keys = list(upscaler_dict_gui.keys())
@@ -567,10 +573,8 @@ class GuiSD:
         model_precision = torch.float16
         self.model.device = torch.device("cuda:0")
         if not self.model:
-            from modelstream import Model_Diffusers2
-
             print("Loading model...")
-            self.model = Model_Diffusers2(
+            self.model = Model_Diffusers(
                 base_model_id=model_name,
                 task_name=task,
                 vae_model=vae_model if vae_model != "None" else None,
@@ -739,20 +743,20 @@ class GuiSD:
 
                 info_state = info_state + "<br>" + "GENERATION DATA:<br>" + "<br>-------<br>".join(metadata).replace("\n", "<br>")
 
+                download_links = "<br>".join(
+                    [
+                        f'<a href="{path.replace("/images/", "/file=/home/user/app/images/")}" download="{os.path.basename(path)}">Download Image {i + 1}</a>'
+                        for i, path in enumerate(image_path)
+                    ]
+                )
+                #info_state += f"<br>{download_links}"
+                
                 img = save_images(img, metadata)
                 
             yield img, info_state
 
 sd_gen = GuiSD()
 
-#@spaces.GPU
-#def sd_gen_load_new_model(*args, progress=gr.Progress(track_tqdm=True)):
-#    yield from sd_gen.load_new_model(*args, progress)
-
-#@spaces.GPU
-#def sd_gen_generate_pipeline(*args, progress=gr.Progress(track_tqdm=True)):
-#    yield from sd_gen.generate_pipeline(*args, progress)
-
 ## BEGIN MOD
 CSS ="""
 .gradio-container, #main { width:100%; height:100%; max-width:100%; padding-left:0; padding-right:0; margin-left:0; margin-right:0; !important; }
@@ -885,14 +889,14 @@ with gr.Blocks(theme='NoCrypt/miku@>=1.2.2', elem_id="main", fill_width=True, cs
                             steps_gui = gr.Slider(minimum=1, maximum=100, step=1, value=28, label="Steps")
                             cfg_gui = gr.Slider(minimum=0, maximum=30, step=0.5, value=7.0, label="CFG")
                         with gr.Row():
-                            seed_gui = gr.Number(minimum=-1, maximum=9999999999, value=-1, label="Seed")
+                            seed_gui = gr.Number(minimum=-1, maximum=2**32-1, value=-1, label="Seed")
                             pag_scale_gui = gr.Slider(minimum=0.0, maximum=10.0, step=0.1, value=0.0, label="PAG Scale")
                             num_images_gui = gr.Slider(minimum=1, maximum=4, step=1, value=1, label="Images")
                             clip_skip_gui = gr.Checkbox(value=False, label="Layer 2 Clip Skip")
                             free_u_gui = gr.Checkbox(value=False, label="FreeU")
                         with gr.Row():
                             sampler_gui = gr.Dropdown(label="Sampler", choices=scheduler_names, value="Euler a")
-                            vae_model_gui = gr.Dropdown(label="VAE Model", choices=vae_model_list, value=vae_model_list[0])
+                            vae_model_gui = gr.Dropdown(label="VAE Model", choices=vae_model_list)
                             prompt_s_options = [
                                 ("Compel format: (word)weight", "Compel"),
                                 ("Classic format: (word:weight)", "Classic"),
@@ -972,45 +976,54 @@ with gr.Blocks(theme='NoCrypt/miku@>=1.2.2', elem_id="main", fill_width=True, cs
                             )
 
                     with gr.Accordion("LoRA", open=False, visible=True) as menu_lora:
+                        def lora_dropdown(label):
+                            return gr.Dropdown(label=label, choices=get_all_lora_tupled_list(), value="", allow_custom_value=True, elem_classes="lora", min_width=320)
+
+                        def lora_scale_slider(label):
+                            return gr.Slider(minimum=-2, maximum=2, step=0.01, value=1.00, label=label)
+                        
+                        def lora_textbox(label):
+                            return gr.Textbox(label=label, info="Example of prompt:", value="None", show_copy_button=True, interactive=False, visible=False)
+                        
                         with gr.Row():
                             with gr.Column():
-                                lora1_gui = gr.Dropdown(label="LoRA1", choices=get_all_lora_tupled_list(), value="", allow_custom_value=True, elem_classes="lora", min_width=320)
-                                lora_scale_1_gui = gr.Slider(minimum=-2, maximum=2, step=0.01, value=1.00, label="LoRA Scale 1")
+                                lora1_gui = lora_dropdown("LoRA1")
+                                lora_scale_1_gui = lora_scale_slider("LoRA Scale 1")
                                 with gr.Row():
                                     with gr.Group():
-                                        lora1_info_gui = gr.Textbox(label="LoRA1 prompts", info="Example of prompt:", value="None", show_copy_button=True, interactive=False, visible=False)
+                                        lora1_info_gui = lora_textbox("LoRA1 prompts")
                                         lora1_copy_gui = gr.Button(value="Copy example to prompt", visible=False)
                                     lora1_desc_gui = gr.Markdown(value="", visible=False)
                             with gr.Column():
-                                lora2_gui = gr.Dropdown(label="LoRA2", choices=get_all_lora_tupled_list(), value="", allow_custom_value=True, elem_classes="lora", min_width=320)
-                                lora_scale_2_gui = gr.Slider(minimum=-2, maximum=2, step=0.01, value=1.00, label="LoRA Scale 2")
+                                lora2_gui = lora_dropdown("LoRA2")
+                                lora_scale_2_gui = lora_scale_slider("LoRA Scale 2")
                                 with gr.Row():
                                     with gr.Group():
-                                        lora2_info_gui = gr.Textbox(label="LoRA2 prompts", info="Example of prompt:", value="None", show_copy_button=True, interactive=False, visible=False)
+                                        lora2_info_gui = lora_textbox("LoRA2 prompts")
                                         lora2_copy_gui = gr.Button(value="Copy example to prompt", visible=False)
                                     lora2_desc_gui = gr.Markdown(value="", visible=False)
                             with gr.Column():
-                                lora3_gui = gr.Dropdown(label="LoRA3", choices=get_all_lora_tupled_list(), value="", allow_custom_value=True, elem_classes="lora", min_width=320)
-                                lora_scale_3_gui = gr.Slider(minimum=-2, maximum=2, step=0.01, value=1.00, label="LoRA Scale 3")
+                                lora3_gui = lora_dropdown("LoRA3")
+                                lora_scale_3_gui = lora_scale_slider("LoRA Scale 3")
                                 with gr.Row():
                                     with gr.Group():
-                                        lora3_info_gui = gr.Textbox(label="LoRA3 prompts", info="Example of prompt:", value="None", show_copy_button=True, interactive=False, visible=False)
+                                        lora3_info_gui = lora_textbox("LoRA3 prompts")
                                         lora3_copy_gui = gr.Button(value="Copy example to prompt", visible=False)
                                     lora3_desc_gui = gr.Markdown(value="", visible=False)
                             with gr.Column():
-                                lora4_gui = gr.Dropdown(label="LoRA4", choices=get_all_lora_tupled_list(), value="", allow_custom_value=True, elem_classes="lora", min_width=320)
-                                lora_scale_4_gui = gr.Slider(minimum=-2, maximum=2, step=0.01, value=1.00, label="LoRA Scale 4")
+                                lora4_gui = lora_dropdown("LoRA4")
+                                lora_scale_4_gui = lora_scale_slider("LoRA Scale 4")
                                 with gr.Row():
                                     with gr.Group():
-                                        lora4_info_gui = gr.Textbox(label="LoRA4 prompts", info="Example of prompt:", value="None", show_copy_button=True, interactive=False, visible=False)
+                                        lora4_info_gui = lora_textbox("LoRA4 prompts")
                                         lora4_copy_gui = gr.Button(value="Copy example to prompt", visible=False)
                                     lora4_desc_gui = gr.Markdown(value="", visible=False)
                             with gr.Column():
-                                lora5_gui = gr.Dropdown(label="LoRA5", choices=get_all_lora_tupled_list(), value="", allow_custom_value=True, elem_classes="lora", min_width=320)
-                                lora_scale_5_gui = gr.Slider(minimum=-2, maximum=2, step=0.01, value=1.00, label="LoRA Scale 5")
+                                lora5_gui = lora_dropdown("LoRA5")
+                                lora_scale_5_gui = lora_scale_slider("LoRA Scale 5")
                                 with gr.Row():
                                     with gr.Group():
-                                        lora5_info_gui = gr.Textbox(label="LoRA5 prompts", info="Example of prompt", value="None", show_copy_button=True, interactive=False, visible=False)
+                                        lora5_info_gui = lora_textbox("LoRA5 prompts")
                                         lora5_copy_gui = gr.Button(value="Copy example to prompt", visible=False)
                                     lora5_desc_gui = gr.Markdown(value="", visible=False)
                         with gr.Accordion("From URL", open=True, visible=True):
@@ -1020,15 +1033,15 @@ with gr.Blocks(theme='NoCrypt/miku@>=1.2.2', elem_id="main", fill_width=True, cs
                                 search_civitai_button_lora = gr.Button("Search on Civitai")
                             search_civitai_desc_lora = gr.Markdown(value="", visible=False)
                             search_civitai_result_lora = gr.Dropdown(label="Search Results", choices=[("", "")], value="", allow_custom_value=True, visible=False)
-                            text_lora = gr.Textbox(label="URL", placeholder="http://...my_lora_url.safetensors", lines=1)
+                            text_lora = gr.Textbox(label="LoRA URL", placeholder="https://civitai.com/api/download/models/28907", lines=1)
                             button_lora = gr.Button("Get and update lists of LoRAs")
                         with gr.Accordion("From Local", open=True, visible=True):
                             file_output_lora = gr.File(label="Uploaded LoRA", file_types=['.ckpt', '.pt', '.pth', '.safetensors', '.bin'], file_count="multiple", interactive=False, visible=False)
-                            upload_button_lora = gr.UploadButton(label="Upload LoRA from your disk (very slow)", file_types=['.ckpt' , '.pt', '.pth', '.safetensors', '.bin'], file_count="multiple")
+                            upload_button_lora = gr.UploadButton(label="Upload LoRA from your disk (very slow)", file_types=['.ckpt', '.pt', '.pth', '.safetensors', '.bin'], file_count="multiple")
 
                     with gr.Column() as menu_advanced:
                         with gr.Accordion("Hires fix", open=False, visible=True) as menu_hires:
-                            upscaler_model_path_gui = gr.Dropdown(label="Upscaler", choices=upscaler_keys, value=upscaler_dict_gui[upscaler_keys[0]])
+                            upscaler_model_path_gui = gr.Dropdown(label="Upscaler", choices=upscaler_keys, value=upscaler_keys[0])
                             with gr.Row():
                                 upscaler_increases_size_gui = gr.Slider(minimum=1.1, maximum=6., step=0.1, value=1.0, label="Upscale by")
                                 esrgan_tile_gui = gr.Slider(minimum=0, value=100, maximum=500, step=1, label="ESRGAN Tile")
@@ -1127,7 +1140,7 @@ with gr.Blocks(theme='NoCrypt/miku@>=1.2.2', elem_id="main", fill_width=True, cs
                                 control_net_start_threshold_gui = gr.Slider(minimum=0, maximum=1, step=0.01, value=0, label="ControlNet Start Threshold (%)")
                                 control_net_stop_threshold_gui = gr.Slider(minimum=0, maximum=1, step=0.01, value=1, label="ControlNet Stop Threshold (%)")
 
-                        with gr.Accordion("IP-Adapter", open=False, visible=True) as menu_ipa:##############
+                        with gr.Accordion("IP-Adapter", open=False, visible=True) as menu_ipa:
 
                             IP_MODELS = sorted(list(set(IP_ADAPTERS_SD + IP_ADAPTERS_SDXL)))
                             MODE_IP_OPTIONS = ["original", "style", "layout", "style+layout"]
@@ -1273,7 +1286,6 @@ with gr.Blocks(theme='NoCrypt/miku@>=1.2.2', elem_id="main", fill_width=True, cs
                         ],
                     ],
                     fn=sd_gen.generate_pipeline,
-                    #fn=sd_gen_generate_pipeline,
                     inputs=[
                         prompt_gui,
                         neg_prompt_gui,
@@ -1289,7 +1301,7 @@ with gr.Blocks(theme='NoCrypt/miku@>=1.2.2', elem_id="main", fill_width=True, cs
                     ],
                     outputs=[result_images],
                     cache_examples=False,
-                    elem_id="examples",
+                    #elem_id="examples",
                 )
 ## END MOD
 
@@ -1670,5 +1682,5 @@ with gr.Blocks(theme='NoCrypt/miku@>=1.2.2', elem_id="main", fill_width=True, cs
     gr.DuplicateButton(value="Duplicate Space for private use (This demo does not work on CPU. Requires GPU Space)")
 
 app.queue()
-app.launch() #show_error=True, debug=True
+app.launch() # allowed_paths=["./images/"], show_error=True, debug=True
 ## END MOD