Update Scripts/mainpaperspacev1.py

Scripts/mainpaperspacev1.py

@@ -25,16 +25,7 @@ import numpy as np
 def Deps(force_reinstall):
 
     if not force_reinstall and os.path.exists('/usr/local/lib/python3.9/dist-packages/safetensors'):
-        os.chdir('/notebooks')
-        if not os.path.exists('Latest_Notebooks'):
-            call('mkdir Latest_Notebooks', shell=True)
-        else:
-            call('rm -r Latest_Notebooks', shell=True)
-            call('mkdir Latest_Notebooks', shell=True)
-        os.chdir('/notebooks/Latest_Notebooks')
-        call('wget -q -i https://huggingface.co/datasets/TheLastBen/PPS/raw/main/Notebooks.txt', shell=True)
-        call('rm Notebooks.txt', shell=True)
-        os.chdir('/notebooks')
+        ntbk()
         print('Modules and notebooks updated, dependencies already installed')
 
     else:
@@ -43,18 +34,7 @@ def Deps(force_reinstall):
         if not os.path.exists('/usr/local/lib/python3.9/dist-packages/safetensors'):
             os.chdir('/usr/local/lib/python3.9/dist-packages')
             call("rm -r torch torch-1.12.0+cu116.dist-info torchaudio* torchvision* PIL Pillow* transformers* numpy* gdown*", shell=True, stdout=open('/dev/null', 'w'))
-
-        os.chdir('/notebooks')
-        if not os.path.exists('Latest_Notebooks'):
-            call('mkdir Latest_Notebooks', shell=True)
-        else:
-            call('rm -r Latest_Notebooks', shell=True)
-            call('mkdir Latest_Notebooks', shell=True)
-        os.chdir('/notebooks/Latest_Notebooks')
-        call('wget -q -i https://huggingface.co/datasets/TheLastBen/PPS/raw/main/Notebooks.txt', shell=True)
-        call('rm Notebooks.txt', shell=True)
-        os.chdir('/notebooks')
-
+        ntbk()
         if not os.path.exists('/models'):
             call('mkdir /models', shell=True)
         if not os.path.exists('/notebooks/models'):
@@ -79,6 +59,20 @@ def Deps(force_reinstall):
         clear_output()
 
         done()
+    
+    
+def ntbk():
+
+    os.chdir('/notebooks')
+    if not os.path.exists('Latest_Notebooks'):
+        call('mkdir Latest_Notebooks', shell=True)
+    else:
+        call('rm -r Latest_Notebooks', shell=True)
+        call('mkdir Latest_Notebooks', shell=True)
+    os.chdir('/notebooks/Latest_Notebooks')
+    call('wget -q -i https://huggingface.co/datasets/TheLastBen/PPS/raw/main/Notebooks.txt', shell=True)
+    call('rm Notebooks.txt', shell=True)
+    os.chdir('/notebooks')
 
 
 def downloadmodel_hf(Path_to_HuggingFace):
@@ -104,21 +98,20 @@ def downloadmodel_hf(Path_to_HuggingFace):
   call("git config core.sparsecheckout true", shell=True)
   call('echo -e "\nscheduler\ntext_encoder\ntokenizer\nunet\nvae\nmodel_index.json\n!*.safetensors" > .git/info/sparse-checkout', shell=True)
   call("git pull origin main", shell=True)
-  if os.path.exists('/models/stable-diffusion-custom/unet/diffusion_pytorch_model.bin'):
-    call("rm -r /models/stable-diffusion-custom/.git", shell=True)
-    call("rm -r /models/stable-diffusion-custom/model_index.json", shell=True)
+  if os.path.exists('unet/diffusion_pytorch_model.bin'):
+    call("rm -r .git", shell=True)
+    call("rm -r model_index.json", shell=True)
     wget.download('https://raw.githubusercontent.com/TheLastBen/fast-stable-diffusion/main/Dreambooth/model_index.json')
     os.chdir('/notebooks')
     clear_output()
     done()
-
   while not os.path.exists('/models/stable-diffusion-custom/unet/diffusion_pytorch_model.bin'):
         print('Check the link you provided')
         os.chdir('/notebooks')
         time.sleep(5)
 
 
-         
+
 def downloadmodel_pth(CKPT_Path):
   import wget
   os.chdir('/notebooks')
@@ -129,16 +122,15 @@ def downloadmodel_pth(CKPT_Path):
     call('rm -f refmdlz', shell=True)
     wget.download('https://raw.githubusercontent.com/TheLastBen/fast-stable-diffusion/main/Dreambooth/convertodiffv1.py')
     clear_output()
-    call('python /notebooks/convertodiffv1.py '+CKPT_Path+' /models/stable-diffusion-custom --v1', shell=True)
-    call('rm /notebooks/convertodiffv1.py', shell=True)
-    call('rm -r /notebooks/refmdl', shell=True)
+    call('python convertodiffv1.py '+CKPT_Path+' /models/stable-diffusion-custom --v1', shell=True)
+    call('rm convertodiffv1.py', shell=True)
+    call('rm -r refmdl', shell=True)
     if os.path.exists('/models/stable-diffusion-custom/unet/diffusion_pytorch_model.bin'):
       clear_output()
       done()
     while not os.path.exists('/models/stable-diffusion-custom/unet/diffusion_pytorch_model.bin'):
       print('Conversion error')
       time.sleep(5)
-      
   else:
     while not os.path.exists(str(CKPT_Path)):
        print('Wrong path, use the file explorer to copy the path')
@@ -157,11 +149,11 @@ def downloadmodel_lnk(CKPT_Link):
         call('rm -f refmdlz', shell=True)
         wget.download('https://raw.githubusercontent.com/TheLastBen/fast-stable-diffusion/main/Dreambooth/convertodiffv1.py')
         clear_output()
-        call('python /notebooks/convertodiffv1.py /models/model.ckpt /models/stable-diffusion-custom --v1', shell=True)
-        call('rm /notebooks/convertodiffv1.py', shell=True)
-        call('rm -r /notebooks/refmdl', shell=True)
+        call('python convertodiffv1.py /models/model.ckpt /models/stable-diffusion-custom --v1', shell=True)
+        call('rm convertodiffv1.py', shell=True)
+        call('rm -r refmdl', shell=True)
         if os.path.exists('/models/stable-diffusion-custom/unet/diffusion_pytorch_model.bin'):
-          call('rm -r /models/model.ckpt', shell=True)
+          call('rm /models/model.ckpt', shell=True)
           clear_output()
           done()
         else:
@@ -188,7 +180,8 @@ def dl(Path_to_HuggingFace, CKPT_Path, CKPT_Link):
     else:
       MODEL_NAME="/datasets/stable-diffusion-diffusers/stable-diffusion-v1-5"
       print('Using the original V1.5 model')
-          
+
+    call("sed -i 's@\"sample_size\": 256,@\"sample_size\": 512,@g' "+MODEL_NAME+"/vae/config.json", shell=True)
     return MODEL_NAME
 
 
@@ -255,7 +248,7 @@ def sess(Session_Name, Session_Link_optional, MODEL_NAME):
         if n!="000":
           f(int(n))
           print('Using the model '+ mdls[int(n)]+" ...")
-          time.sleep(8)
+          time.sleep(4)
           clear_output()
         else:
           print('Skipping the intermediary checkpoints.')
@@ -274,18 +267,16 @@ def sess(Session_Name, Session_Link_optional, MODEL_NAME):
       call('unzip -o -q refmdlz', shell=True, stdout=open('/dev/null', 'w'))
       call('rm -f refmdlz', shell=True, stdout=open('/dev/null', 'w'))
       wget.download('https://raw.githubusercontent.com/TheLastBen/fast-stable-diffusion/main/Dreambooth/convertodiffv1.py')
-      call('python /notebooks/convertodiffv1.py '+MDLPTH+' '+OUTPUT_DIR+' --v1', shell=True)
-      call('rm /notebooks/convertodiffv1.py', shell=True)
-      call('rm -r /notebooks/refmdl', shell=True)
+      call('python convertodiffv1.py '+MDLPTH+' '+OUTPUT_DIR+' --v1', shell=True)
+      call('rm convertodiffv1.py', shell=True)
+      call('rm -r refmdl', shell=True)
 
-       
       if os.path.exists(OUTPUT_DIR+'/unet/diffusion_pytorch_model.bin'):
         resume=True
         clear_output()
         print('Session loaded.')
       else:     
-        if not os.path.exists(OUTPUT_DIR+'/unet/diffusion_pytorch_model.bin'):
-          print('Conversion error, if the error persists, remove the CKPT file from the current session folder')
+        print('Conversion error, if the error persists, remove the CKPT file from the current session folder')
 
     elif not os.path.exists(str(SESSION_DIR)):
         call('mkdir -p '+INSTANCE_DIR, shell=True)
@@ -384,8 +375,6 @@ def upld(Remove_existing_instance_images, Crop_images, Crop_size, IMAGES_FOLDER_
             for filename in tqdm(os.listdir(IMAGES_FOLDER_OPTIONAL), bar_format='  |{bar:15}| {n_fmt}/{total_fmt} Uploaded'):
                 call("cp -r " +IMAGES_FOLDER_OPTIONAL+"/. " +INSTANCE_DIR, shell=True)
 
-
-
     elif IMAGES_FOLDER_OPTIONAL =="":
         up=""  
         for filename, file in uploader.value.items():
@@ -619,7 +608,6 @@ def dbtrain(Resume_Training, UNet_Training_Steps, UNet_Learning_Rate, Text_Encod
         call('accelerate launch /notebooks/diffusers/examples/dreambooth/train_dreambooth_pps.py \
         '+Style+' \
         '+extrnlcptn+' \
-        --stop_text_encoder_training='+str(Text_Encoder_Training_Steps)+' \
         --image_captions_filename \
         --train_only_unet \
         --Session_dir='+SESSION_DIR+' \
@@ -758,9 +746,9 @@ def test(Custom_Path, Previous_Session_Name, Session_Name, User, Password, Use_l
       os.chdir('/notebooks')
       call('nohup lt --port 7860 > srv.txt 2>&1 &', shell=True)
       time.sleep(2)
-      call("grep -o 'https[^ ]*' /notebooks/srv.txt >srvr.txt", shell=True)
+      call("grep -o 'https[^ ]*' srv.txt >srvr.txt", shell=True)
       time.sleep(2)
-      srv= getoutput('cat /notebooks/srvr.txt')
+      srv= getoutput('cat srvr.txt')
 
       for line in fileinput.input('/usr/local/lib/python3.9/dist-packages/gradio/blocks.py', inplace=True):
         if line.strip().startswith('self.server_name ='):
@@ -775,18 +763,15 @@ def test(Custom_Path, Previous_Session_Name, Session_Name, User, Password, Use_l
             line = ''
         sys.stdout.write(line)
 
-      call('rm /notebooks/srv.txt', shell=True)
-      call('rm /notebooks/srvr.txt', shell=True)
-
-   
-
+      call('rm srv.txt srvr.txt', shell=True)
+  
     os.chdir('/notebooks/sd/stable-diffusion-webui/modules')
     call('wget -q -O paths.py https://raw.githubusercontent.com/TheLastBen/fast-stable-diffusion/main/AUTOMATIC1111_files/paths.py', shell=True) 
     call("sed -i 's@/content/gdrive/MyDrive/sd/stablediffusion@/notebooks/sd/stablediffusion@' /notebooks/sd/stable-diffusion-webui/modules/paths.py", shell=True)   
     os.chdir('/notebooks/sd/stable-diffusion-webui')
     clear_output()
 
-    configf="--disable-console-progressbars --no-half-vae --disable-safe-unpickle --api --xformers --enable-insecure-extension-access --medvram --skip-version-check --ckpt "+path_to_trained_model+" "+auth+" "+share
+    configf="--disable-console-progressbars --no-half-vae --disable-safe-unpickle --api --xformers --enable-insecure-extension-access --skip-version-check --ckpt "+path_to_trained_model+" "+auth+" "+share
     
     return configf
 
@@ -838,7 +823,7 @@ def clean():
         
 
         
-def hf(Name_of_your_concept, Save_concept_to, hf_token_write, INSTANCE_NAME, OUTPUT_DIR, Session_Name, MDLPTH):
+def hf(Name_of_your_concept, hf_token_write, INSTANCE_NAME, OUTPUT_DIR, Session_Name, MDLPTH):
 
     from slugify import slugify
     from huggingface_hub import HfApi, HfFolder, CommitOperationAdd
@@ -849,7 +834,7 @@ def hf(Name_of_your_concept, Save_concept_to, hf_token_write, INSTANCE_NAME, OUT
     if(Name_of_your_concept == ""):
       Name_of_your_concept = Session_Name
     Name_of_your_concept=Name_of_your_concept.replace(" ","-")  
-      
+
 
 
     if hf_token_write =="":
@@ -861,33 +846,27 @@ def hf(Name_of_your_concept, Save_concept_to, hf_token_write, INSTANCE_NAME, OUT
     api = HfApi()
     your_username = api.whoami(token=hf_token)["name"]
 
-    if(Save_concept_to == "Public_Library"):
-      repo_id = f"sd-dreambooth-library/{slugify(Name_of_your_concept)}"
-      #Join the Concepts Library organization if you aren't part of it already
-      call("curl -X POST -H 'Authorization: Bearer '"+hf_token+" -H 'Content-Type: application/json' https://huggingface.co/organizations/sd-dreambooth-library/share/SSeOwppVCscfTEzFGQaqpfcjukVeNrKNHX", shell=True)
-    else:
-      repo_id = f"{your_username}/{slugify(Name_of_your_concept)}"
+    repo_id = f"{your_username}/{slugify(Name_of_your_concept)}"
     output_dir = f'/notebooks/models/'+INSTANCE_NAME
 
     def bar(prg):
+        clear_output()
         br="Uploading to HuggingFace : " '|'+'█' * prg + ' ' * (25-prg)+'| ' +str(prg*4)+ "%"
         return br
 
     print("Loading...")
 
-
     os.chdir(OUTPUT_DIR)
-    call('rm -r safety_checker feature_extractor .git', shell=True)
+    call('rm -r safety_checker feature_extractor .git', shell=True, stdout=open('/dev/null', 'w'), stderr=open('/dev/null', 'w'))
     call('rm model_index.json', shell=True)
-    call('git init', shell=True)
-    call('git lfs install --system --skip-repo', shell=True)
-    call('git remote add -f origin https://huggingface.co/runwayml/stable-diffusion-v1-5', shell=True)
-    call('git config core.sparsecheckout true', shell=True)
-    call('echo -e "\nfeature_extractor\nsafety_checker\nmodel_index.json" > .git/info/sparse-checkout', shell=True)
-    call('git pull origin main', shell=True)
-    call('rm -r .git', shell=True)
-    os.chdir('/notebooks')
-
+    call('git init', shell=True, stdout=open('/dev/null', 'w'), stderr=open('/dev/null', 'w'))
+    call('git lfs install --system --skip-repo', shell=True, stdout=open('/dev/null', 'w'), stderr=open('/dev/null', 'w'))
+    call('git remote add -f origin https://huggingface.co/runwayml/stable-diffusion-v1-5', shell=True, stdout=open('/dev/null', 'w'), stderr=open('/dev/null', 'w'))
+    call('git config core.sparsecheckout true', shell=True, stdout=open('/dev/null', 'w'), stderr=open('/dev/null', 'w'))
+    call('echo -e "\nfeature_extractor\nsafety_checker\nmodel_index.json\n!*.safetensors" > .git/info/sparse-checkout', shell=True)
+    call('git pull origin main', shell=True, stdout=open('/dev/null', 'w'), stderr=open('/dev/null', 'w'))
+    call('rm -r .git', shell=True, stdout=open('/dev/null', 'w'), stderr=open('/dev/null', 'w'))
+    os.chdir('/notebooks')   
 
     print(bar(1))
        
@@ -926,7 +905,6 @@ def hf(Name_of_your_concept, Save_concept_to, hf_token_write, INSTANCE_NAME, OUT
       token=hf_token
     )
 
-    clear_output()
     print(bar(4))
 
     api.upload_folder(
@@ -936,7 +914,6 @@ def hf(Name_of_your_concept, Save_concept_to, hf_token_write, INSTANCE_NAME, OUT
       token=hf_token
     )
 
-    clear_output()
     print(bar(8))
 
     api.upload_folder(
@@ -946,7 +923,6 @@ def hf(Name_of_your_concept, Save_concept_to, hf_token_write, INSTANCE_NAME, OUT
       token=hf_token
     )
 
-    clear_output()
     print(bar(9))
 
     api.upload_folder(
@@ -956,7 +932,6 @@ def hf(Name_of_your_concept, Save_concept_to, hf_token_write, INSTANCE_NAME, OUT
       token=hf_token
     )
 
-    clear_output()
     print(bar(12))
 
     api.upload_folder(
@@ -966,7 +941,6 @@ def hf(Name_of_your_concept, Save_concept_to, hf_token_write, INSTANCE_NAME, OUT
       token=hf_token
     )
 
-    clear_output()
     print(bar(13))
 
     api.upload_folder(
@@ -976,7 +950,6 @@ def hf(Name_of_your_concept, Save_concept_to, hf_token_write, INSTANCE_NAME, OUT
       token=hf_token
     )
 
-    clear_output()
     print(bar(21))
 
     api.upload_folder(
@@ -986,7 +959,6 @@ def hf(Name_of_your_concept, Save_concept_to, hf_token_write, INSTANCE_NAME, OUT
       token=hf_token
     )
 
-    clear_output()
     print(bar(23))
 
     api.upload_file(
@@ -996,7 +968,6 @@ def hf(Name_of_your_concept, Save_concept_to, hf_token_write, INSTANCE_NAME, OUT
       token=hf_token
     )
 
-    clear_output()
     print(bar(25))
 
     print("Your concept was saved successfully at https://huggingface.co/"+repo_id)