Upload 2 files

dc.py

@@ -178,7 +178,6 @@ UPSCALER_KEYS = list(UPSCALER_DICT_GUI.keys())
 
 def download_things(directory, url, hf_token="", civitai_api_key=""):
     url = url.strip()
-    
     if "drive.google.com" in url:
         original_dir = os.getcwd()
         os.chdir(directory)
@@ -198,8 +197,8 @@ def download_things(directory, url, hf_token="", civitai_api_key=""):
         if "?" in url:
             url = url.split("?")[0]
         if civitai_api_key:
-            url = url + f"?token={civitai_api_key}"
-            os.system(f"aria2c --console-log-level=error --summary-interval=10 -c -x 16 -k 1M -s 16 -d {directory} {url}")
+            user_header = f'"Authorization: Bearer {civitai_api_key}"'
+            os.system(f"aria2c --console-log-level=error --summary-interval=10 --header={user_header} -c -x 16 -k 1M -s 16 -d {directory} {url}")
         else:
             print("\033[91mYou need an API key to download Civitai models.\033[0m")
     else:
@@ -680,7 +679,7 @@ class GuiSD:
         #progress(1, desc="Inference preparation completed. Starting inference...")
 
         info_state = "" # for yield version
-        return self.infer_short(self.model, pipe_params, progress), info_state
+        return self.infer_short(self.model, pipe_params), info_state
 ## END MOD
 
 def dynamic_gpu_duration(func, duration, *args):

modutils.py

@@ -82,8 +82,8 @@ def download_things(directory, url, hf_token="", civitai_api_key=""):
         if "?" in url:
             url = url.split("?")[0]
         if civitai_api_key:
-            url = url + f"?token={civitai_api_key}"
-            os.system(f"aria2c --console-log-level=error --summary-interval=10 -c -x 16 -k 1M -s 16 -d {directory} {url}")
+            user_header = f'"Authorization: Bearer {civitai_api_key}"'
+            os.system(f"aria2c --console-log-level=error --summary-interval=10 --header={user_header} -c -x 16 -k 1M -s 16 -d {directory} {url}")
         else:
             print("\033[91mYou need an API key to download Civitai models.\033[0m")
     else: