Upload 2 files

dc.py

@@ -91,14 +91,27 @@ 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 = {
@@ -119,16 +132,16 @@ 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())
 
-
 def download_things(directory, url, hf_token="", civitai_api_key=""):
     url = url.strip()
     
@@ -146,7 +159,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]
@@ -161,7 +174,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:
@@ -173,17 +186,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 (to_list, list_uniq, list_sub, get_model_id_list, get_tupled_embed_list,
                       get_tupled_model_list, get_lora_model_list, download_private_repo)
@@ -242,9 +244,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",
@@ -261,6 +269,8 @@ 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 = {}
@@ -459,6 +469,7 @@ class GuiSD:
         model_ip2,
         mode_ip2,
         scale_ip2,
+        pag_scale,
         progress=gr.Progress(track_tqdm=True),
     ):
         progress(0, desc="Preparing inference...")
@@ -542,7 +553,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'
@@ -608,6 +619,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,
@@ -738,7 +750,7 @@ def infer(prompt, negative_prompt, seed, randomize_seed, width, height, guidance
         False, True, 1, True, False, False, False, False, "./images", False, False, False, True, 1, 0.55,
         False, False, False, True, False, "Use same sampler", False, "", "", 0.35, True, True, False, 4, 4, 32,
         False, "", "", 0.35, True, True, False, 4, 4, 32,
-        True, None, None, "plus_face", "original", 0.7, None, None, "base", "style", 0.7, progress
+        True, None, None, "plus_face", "original", 0.7, None, None, "base", "style", 0.7, 0.0, progress
     )
 
     progress(1, desc="Inference completed.")