Update Scripts/mainpaperspacev2.py

Scripts/mainpaperspacev2.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,11 +59,25 @@ 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_hfv2(Path_to_HuggingFace):
   import wget
-  
+
   if os.path.exists('/models/stable-diffusion-custom'):
     call("rm -r /models/stable-diffusion-custom", shell=True)
   clear_output()
@@ -115,22 +109,18 @@ def downloadmodel_hfv2(Path_to_HuggingFace):
         time.sleep(5)
   
 
-
          
 def downloadmodel_pthv2(CKPT_Path, Custom_Model_Version):
   import wget
   os.chdir('/models')
   clear_output() 
   if os.path.exists(str(CKPT_Path)):
+    wget.download('https://raw.githubusercontent.com/TheLastBen/fast-stable-diffusion/main/Dreambooth/convertodiffv2.py')
     if Custom_Model_Version=='512':
-      wget.download('https://raw.githubusercontent.com/TheLastBen/fast-stable-diffusion/main/Dreambooth/convertodiffv2.py')
-      clear_output()
-      call('python convertodiff.py '+CKPT_Path+' stable-diffusion-custom --v2 --reference_model stabilityai/stable-diffusion-2-1-base', shell=True)
+      call('python convertodiffv2.py '+CKPT_Path+' stable-diffusion-custom --v2 --reference_model stabilityai/stable-diffusion-2-1-base', shell=True)
     elif Custom_Model_Version=='768':
-      wget.download('https://raw.githubusercontent.com/TheLastBen/fast-stable-diffusion/main/Dreambooth/convertodiffv2.py')
-      clear_output()
-      call('python convertodiff.py '+CKPT_Path+' stable-diffusion-custom --v2 --reference_model stabilityai/stable-diffusion-2-1', shell=True)
-    call('rm convertodiff.py', shell=True)
+      call('python convertodiffv2.py '+CKPT_Path+' stable-diffusion-custom --v2 --reference_model stabilityai/stable-diffusion-2-1', shell=True)
+    call('rm convertodiffv2.py', shell=True)
     if os.path.exists('stable-diffusion-custom/unet/diffusion_pytorch_model.bin'):
       os.chdir('/notebooks')
       clear_output()
@@ -139,7 +129,6 @@ def downloadmodel_pthv2(CKPT_Path, Custom_Model_Version):
       print('Conversion error')
       os.chdir('/notebooks')
       time.sleep(5)
-      
   else:
     while not os.path.exists(str(CKPT_Path)):
        print('Wrong path, use the file explorer to copy the path')
@@ -269,7 +258,7 @@ def sessv2(Session_Name, Session_Link_optional, Model_Version, MODEL_NAMEv2):
         if n!="000":
           f(int(n))
           print('Using the model '+ mdls[int(n)]+" ...")
-          time.sleep(8)
+          time.sleep(4)
         else:
           print('Skipping the intermediary checkpoints.')
   
@@ -287,23 +276,22 @@ def sessv2(Session_Name, Session_Link_optional, Model_Version, MODEL_NAMEv2):
         call("wget -q -O convertodiff.py https://raw.githubusercontent.com/TheLastBen/fast-stable-diffusion/main/Dreambooth/convertodiffv2.py", shell=True)
         clear_output()
         print('Session found, loading the trained model ...')
-        call('python /notebooks/convertodiff.py '+MDLPTH+' '+OUTPUT_DIR+' --v2 --reference_model stabilityai/stable-diffusion-2-1-base', shell=True)
+        call('python convertodiff.py '+MDLPTH+' '+OUTPUT_DIR+' --v2 --reference_model stabilityai/stable-diffusion-2-1-base', shell=True)
         
       elif Model_Version=='768':
         call('wget -q -O convertodiff.py https://raw.githubusercontent.com/TheLastBen/fast-stable-diffusion/main/Dreambooth/convertodiffv2.py', shell=True)
         clear_output()
         print('Session found, loading the trained model ...')
-        call('python /notebooks/convertodiff.py '+MDLPTH+' '+OUTPUT_DIR+' --v2 --reference_model stabilityai/stable-diffusion-2-1', shell=True) 
+        call('python convertodiff.py '+MDLPTH+' '+OUTPUT_DIR+' --v2 --reference_model stabilityai/stable-diffusion-2-1', shell=True) 
         
-      call('rm /notebooks/convertodiff.py', shell=True)
+      call('rm convertodiff.py', shell=True)
         
       if os.path.exists(OUTPUT_DIR+'/unet/diffusion_pytorch_model.bin'):
         resumev2=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)
@@ -357,8 +345,6 @@ def uplder(Remove_existing_instance_images, Crop_images, Crop_size, IMAGES_FOLDE
        upld(Remove_existing_instance_images, Crop_images, Crop_size, IMAGES_FOLDER_OPTIONAL, INSTANCE_DIR, CAPTIONS_DIR, uploader, ren)
        done()
     
-    
-
 
 def upld(Remove_existing_instance_images, Crop_images, Crop_size, IMAGES_FOLDER_OPTIONAL, INSTANCE_DIR, CAPTIONS_DIR, uploader, ren):
 
@@ -404,8 +390,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():
@@ -639,7 +623,6 @@ def dbtrainv2(Resume_Training, UNet_Training_Steps, UNet_Learning_Rate, Text_Enc
         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+' \
@@ -778,9 +761,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 ='):
@@ -795,10 +778,7 @@ 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) 
@@ -806,7 +786,7 @@ def test(Custom_Path, Previous_Session_Name, Session_Name, User, Password, Use_l
     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
       
@@ -880,33 +860,14 @@ def hfv2(Name_of_your_concept, Save_concept_to, hf_token_write, INSTANCE_NAME, O
     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 feature_extractor .git', shell=True)
-    clear_output()
-    call('git init', shell=True)
-    call('git lfs install --system --skip-repo', shell=True)
-    call('git remote add -f origin https://huggingface.co/stabilityai/stable-diffusion-2-1', shell=True)
-    call('git config core.sparsecheckout true', shell=True)
-    call('echo -e "\nfeature_extractor" > .git/info/sparse-checkout', shell=True)
-    call('git pull origin main', shell=True)
-    call('rm -r .git', shell=True)
-    os.chdir('/notebooks')
-    clear_output()
-
     print(bar(1))
        
     readme_text = f'''---
@@ -937,14 +898,6 @@ def hfv2(Name_of_your_concept, Save_concept_to, hf_token_write, INSTANCE_NAME, O
       token=hf_token
     )
 
-    api.upload_folder(
-      folder_path=OUTPUT_DIR+"/feature_extractor",
-      path_in_repo="feature_extractor",
-      repo_id=repo_id,
-      token=hf_token
-    )
-
-    clear_output()
     print(bar(8))
 
     api.upload_folder(
@@ -954,7 +907,6 @@ def hfv2(Name_of_your_concept, Save_concept_to, hf_token_write, INSTANCE_NAME, O
       token=hf_token
     )
 
-    clear_output()
     print(bar(9))
 
     api.upload_folder(
@@ -964,7 +916,6 @@ def hfv2(Name_of_your_concept, Save_concept_to, hf_token_write, INSTANCE_NAME, O
       token=hf_token
     )
 
-    clear_output()
     print(bar(12))
 
     api.upload_folder(
@@ -974,7 +925,6 @@ def hfv2(Name_of_your_concept, Save_concept_to, hf_token_write, INSTANCE_NAME, O
       token=hf_token
     )
 
-    clear_output()
     print(bar(13))
 
     api.upload_folder(
@@ -984,7 +934,6 @@ def hfv2(Name_of_your_concept, Save_concept_to, hf_token_write, INSTANCE_NAME, O
       token=hf_token
     )
 
-    clear_output()
     print(bar(21))
 
     api.upload_folder(
@@ -994,7 +943,6 @@ def hfv2(Name_of_your_concept, Save_concept_to, hf_token_write, INSTANCE_NAME, O
       token=hf_token
     )
 
-    clear_output()
     print(bar(23))
 
     api.upload_file(
@@ -1004,7 +952,6 @@ def hfv2(Name_of_your_concept, Save_concept_to, hf_token_write, INSTANCE_NAME, O
       token=hf_token
     )
 
-    clear_output()
     print(bar(25))
 
     print("Your concept was saved successfully at https://huggingface.co/"+repo_id)