Upload 2 files

app.py

@@ -67,14 +67,28 @@ preprocessor_controlnet = {
     "None",
   ],
   "canny": [
-    "Canny"
+    "Canny",
+    "None",
   ],
   "mlsd": [
-    "MLSD"
+    "MLSD",
+    "None",
   ],
   "ip2p": [
     "ip2p"
   ],
+  "recolor": [
+    "Recolor luminance",
+    "Recolor intensity",
+    "None",
+  ],
+  "tile": [
+    "Mild Blur",
+    "Moderate Blur",
+    "Heavy Blur",
+    "None",
+  ],
+
 }
 
 task_stablepy = {
@@ -95,11 +109,12 @@ task_stablepy = {
     'depth ControlNet': 'depth',
     'normalbae ControlNet': 'normalbae',
     'lineart ControlNet': 'lineart',
-    # 'lineart_anime ControlNet': 'lineart_anime',
+    'lineart_anime ControlNet': 'lineart_anime',
     'shuffle ControlNet': 'shuffle',
     'ip2p ControlNet': 'ip2p',
     'optical pattern ControlNet': 'pattern',
-    'tile realistic': 'sdxl_tile_realistic',
+    'recolor ControlNet': 'recolor',
+    'tile ControlNet': 'tile',
 }
 
 task_model_list = list(task_stablepy.keys())
@@ -122,7 +137,7 @@ def download_things(directory, url, hf_token="", civitai_api_key=""):
         if hf_token:
             os.system(f"aria2c --console-log-level=error --summary-interval=10 --header={user_header} -c -x 16 -k 1M -s 16 {url} -d {directory}  -o {url.split('/')[-1]}")
         else:
-            os.system (f"aria2c --optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -c -x 16 -k 1M -s 16 {url} -d {directory}  -o {url.split('/')[-1]}")
+            os.system(f"aria2c --optimize-concurrent-downloads --console-log-level=error --summary-interval=10 -c -x 16 -k 1M -s 16 {url} -d {directory}  -o {url.split('/')[-1]}")
     elif "civitai.com" in url:
         if "?" in url:
             url = url.split("?")[0]
@@ -137,7 +152,7 @@ def download_things(directory, url, hf_token="", civitai_api_key=""):
 
 def get_model_list(directory_path):
     model_list = []
-    valid_extensions = {'.ckpt' , '.pt', '.pth', '.safetensors', '.bin'}
+    valid_extensions = {'.ckpt', '.pt', '.pth', '.safetensors', '.bin'}
 
     for filename in os.listdir(directory_path):
         if os.path.splitext(filename)[1] in valid_extensions:
@@ -149,18 +164,6 @@ def get_model_list(directory_path):
     return model_list
 
 
-def process_string(input_string):
-    parts = input_string.split('/')
-
-    if len(parts) == 2:
-        first_element = parts[1]
-        complete_string = input_string
-        result = (first_element, complete_string)
-        return result
-    else:
-        return None
-
-
 ## BEGIN MOD
 from modutils import (list_uniq, download_private_repo, get_model_id_list, get_tupled_embed_list,
     get_lora_model_list, get_all_lora_tupled_list, update_loras, apply_lora_prompt, set_prompt_loras,
@@ -224,9 +227,15 @@ def get_embed_list(pipeline_name):
 print('\033[33m🏁 Download and listing of valid models completed.\033[0m')
 
 upscaler_dict_gui = {
-    None : None,
-    "Lanczos" : "Lanczos",
-    "Nearest" : "Nearest",
+    None: None,
+    "Lanczos": "Lanczos",
+    "Nearest": "Nearest",
+    'Latent': 'Latent',
+    'Latent (antialiased)': 'Latent (antialiased)',
+    'Latent (bicubic)': 'Latent (bicubic)',
+    '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_anime_6B": "https://github.com/xinntao/Real-ESRGAN/releases/download/v0.2.2.4/RealESRGAN_x4plus_anime_6B.pth",
@@ -243,6 +252,7 @@ upscaler_dict_gui = {
     "NickelbackFS4x" : "https://huggingface.co/hollowstrawberry/upscalers-backup/resolve/main/ESRGAN/NickelbackFS%204x.pth"
 }
 
+upscaler_keys = list(upscaler_dict_gui.keys())
 
 def extract_parameters(input_string):
     parameters = {}
@@ -487,6 +497,7 @@ class GuiSD:
         model_ip2,
         mode_ip2,
         scale_ip2,
+        pag_scale,
         #progress=gr.Progress(track_tqdm=True),
     ):
         #progress(0, desc="Preparing inference...")
@@ -574,7 +585,7 @@ class GuiSD:
         if task == "inpaint" and not image_mask:
             raise ValueError("No mask image found: Specify one in 'Image Mask'")
 
-        if upscaler_model_path in [None, "Lanczos", "Nearest"]:
+        if upscaler_model_path in upscaler_keys[:9]:
             upscaler_model = upscaler_model_path
         else:
             directory_upscalers = 'upscalers'
@@ -640,6 +651,7 @@ class GuiSD:
             "num_steps": steps,
             "guidance_scale": cfg,
             "clip_skip": clip_skip,
+            "pag_scale": float(pag_scale),
             "seed": seed,
             "image": image_control,
             "preprocessor_name": preprocessor_name,
@@ -874,6 +886,7 @@ with gr.Blocks(theme='NoCrypt/miku@>=1.2.2', elem_id="main", fill_width=True, cs
                             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")
+                            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")
@@ -1015,7 +1028,6 @@ with gr.Blocks(theme='NoCrypt/miku@>=1.2.2', elem_id="main", fill_width=True, cs
 
                     with gr.Column() as menu_advanced:
                         with gr.Accordion("Hires fix", open=False, visible=True) as menu_hires:
-                            upscaler_keys = list(upscaler_dict_gui.keys())
                             upscaler_model_path_gui = gr.Dropdown(label="Upscaler", choices=upscaler_keys, value=upscaler_dict_gui[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")
@@ -1557,6 +1569,7 @@ with gr.Blocks(theme='NoCrypt/miku@>=1.2.2', elem_id="main", fill_width=True, cs
                 model_ip2,
                 mode_ip2,
                 scale_ip2,
+                pag_scale_gui,
             ],
             outputs=[result_images, actual_task_info], 
             queue=True,

env.py

@@ -8,20 +8,31 @@ hf_read_token = os.environ.get('HF_READ_TOKEN') # only use for private repo
 load_diffusers_format_model = [
     'stabilityai/stable-diffusion-xl-base-1.0',
     'cagliostrolab/animagine-xl-3.1',
+    'John6666/epicrealism-xl-v8kiss-sdxl',
     'misri/epicrealismXL_v7FinalDestination',
     'misri/juggernautXL_juggernautX',
     'misri/zavychromaxl_v80',
     'SG161222/RealVisXL_V4.0',
+    'SG161222/RealVisXL_V5.0',
     'misri/newrealityxlAllInOne_Newreality40',
     'eienmojiki/Anything-XL',
     'eienmojiki/Starry-XL-v5.2',
     'gsdf/CounterfeitXL',
     'kitty7779/ponyDiffusionV6XL',
+    'WhiteAiZ/autismmixSDXL_autismmixConfetti_diffusers',
+    'GraydientPlatformAPI/aniverse-pony',
+    'John6666/mistoon-anime-ponyalpha-sdxl',
     'John6666/ebara-mfcg-pony-mix-v12-sdxl',
     'John6666/t-ponynai3-v51-sdxl',
-    'yodayo-ai/clandestine-xl-1.0',
+    'John6666/mala-anime-mix-nsfw-pony-xl-v5-sdxl',
+    'John6666/wai-real-mix-v11-sdxl',
+    'John6666/cyberrealistic-pony-v63-sdxl',
+    'GraydientPlatformAPI/realcartoon-pony-diffusion',
+    'John6666/nova-anime-xl-pony-v5-sdxl',
     'yodayo-ai/kivotos-xl-2.0',
     'yodayo-ai/holodayo-xl-2.1',
+    'yodayo-ai/clandestine-xl-1.0',
+    'John6666/silvermoon-mix-01xl-v11-sdxl',
     'digiplay/majicMIX_sombre_v2',
     'digiplay/majicMIX_realistic_v6',
     'digiplay/majicMIX_realistic_v7',
@@ -30,18 +41,25 @@ load_diffusers_format_model = [
     'digiplay/DarkSushi2.5D_v1',
     'digiplay/darkphoenix3D_v1.1',
     'digiplay/BeenYouLiteL11_diffusers',
-    'rubbrband/revAnimated_v2Rebirth',
+    'Yntec/RevAnimatedV2Rebirth',
     'youknownothing/cyberrealistic_v50',
+    'youknownothing/deliberate-v6',
+    'GraydientPlatformAPI/deliberate-cyber3',
+    'GraydientPlatformAPI/picx-real',
+    'GraydientPlatformAPI/perfectworld6',
+    'emilianJR/epiCRealism',
     'votepurchase/counterfeitV30_v30',
+    'votepurchase/ChilloutMix',
     'Meina/MeinaMix_V11',
     'Meina/MeinaUnreal_V5',
     'Meina/MeinaPastel_V7',
-    'rubbrband/realcartoon3d_v16',
-    'rubbrband/realcartoonRealistic_v14',
+    'GraydientPlatformAPI/realcartoon3d-17',
+    'GraydientPlatformAPI/realcartoon-pixar11',
+    'GraydientPlatformAPI/realcartoon-real17',
     'KBlueLeaf/Kohaku-XL-Epsilon-rev2',
     'KBlueLeaf/Kohaku-XL-Epsilon-rev3',
     'KBlueLeaf/Kohaku-XL-Zeta',
-    'kayfahaarukku/UrangDiffusion-1.3',
+    'kayfahaarukku/UrangDiffusion-1.4',
     'Eugeoter/artiwaifu-diffusion-2.0',
     'Raelina/Rae-Diffusion-XL-V2',
     'Raelina/Raemu-XL-V4',