Update Scripts/mainpaperspaceA1111.py

Scripts/mainpaperspaceA1111.py

@@ -130,9 +130,7 @@ def mdl(Original_Model_Version, Path_to_MODEL, MODEL_LINK, safetensors, Temporar
     return model
 
 
-
-
-def CN(ControlNet_Model):
+def CN(ControlNet_Model, ControlNet_v2_Model):
     
     def download(url, model_dir):
 
@@ -154,25 +152,65 @@ def CN(ControlNet_Model):
       call('git reset --hard', shell=True, stdout=open('/dev/null', 'w'), stderr=open('/dev/null', 'w'))
       call('git pull', shell=True, stdout=open('/dev/null', 'w'), stderr=open('/dev/null', 'w'))
       os.chdir('/notebooks')
-        
-    call('cp /notebooks/sd/stable-diffusion-webui/extensions/sd-webui-controlnet/models/*.yaml /notebooks/sd/stable-diffusion-webui/models', shell=True, stdout=open('/dev/null', 'w'), stderr=open('/dev/null', 'w'))
+
     mdldir="/notebooks/sd/stable-diffusion-webui/extensions/sd-webui-controlnet/models"
+    for filename in os.listdir(mdldir):
+      if "_sd14v1" in filename:
+        renamed = re.sub("_sd14v1", "-fp16", filename)
+        os.rename(os.path.join(mdldir, filename), os.path.join(mdldir, renamed))
 
     call('wget -q -O CN_models.txt https://github.com/TheLastBen/fast-stable-diffusion/raw/main/AUTOMATIC1111_files/CN_models.txt', shell=True)
+    call('wget -q -O CN_models_v2.txt https://github.com/TheLastBen/fast-stable-diffusion/raw/main/AUTOMATIC1111_files/CN_models_v2.txt', shell=True)
+    
     with open("CN_models.txt", 'r') as f:
         mdllnk = f.read().splitlines()
-    call('rm CN_models.txt', shell=True)
+    with open("CN_models_v2.txt", 'r') as d:
+        mdllnk_v2 = d.read().splitlines()
+    call('rm CN_models.txt CN_models_v2.txt', shell=True)
 
-    if ControlNet_Model == "All":     
+    if ControlNet_Model == "All" or ControlNet_Model == "all" :     
       for lnk in mdllnk:
-          download(url=lnk, model_dir=mdldir)
+          download(lnk, mdldir)
       clear_output()
-      done()
+
       
-    else:
+    elif ControlNet_Model == "9":
+      mdllnk=list(filter(lambda x: 't2i' in x, mdllnk))
+      for lnk in mdllnk:
+          download(lnk, mdldir)
+      clear_output()        
+
+
+    elif ControlNet_Model.isdigit() and int(ControlNet_Model)-1<8:
       download(mdllnk[int(ControlNet_Model)-1], mdldir)
       clear_output()
+      
+    elif ControlNet_Model == "none":
+       pass
+       clear_output()
+
+    else:
+      print('Wrong ControlNet V1 choice, try again')
+
+
+    if ControlNet_v2_Model == "All" or ControlNet_v2_Model == "all" :
+      for lnk_v2 in mdllnk_v2:
+          download(lnk_v2, mdldir)
+      clear_output()
+      done()
+
+    elif ControlNet_v2_Model.isdigit() and int(ControlNet_v2_Model)-1<5:
+      download(mdllnk_v2[int(ControlNet_v2_Model)-1], mdldir)
+      clear_output()
       done()
+    
+    elif ControlNet_v2_Model == "none":
+       pass
+       clear_output()
+       done()       
+
+    else:
+      print('Wrong ControlNet V2 choice, try again')