Update scripts/mainrunpodA1111.py

scripts/mainrunpodA1111.py

@@ -679,93 +679,54 @@ def CNet(ControlNet_Model, ControlNet_XL_Model):
         print("[1;31mWrong ControlNet XL choice, try again")
 
 
-def sd(User, Password, model):
+ef sd(User, Password, model):
 
     import gradio
-
+    
     gradio.close_all()
-
-    auth = f"--gradio-auth {User}:{Password}"
-    if User == "" or Password == "":
-        auth = ""
-
-    call(
-        "wget -q -O /usr/local/lib/python3.10/dist-packages/gradio/blocks.py https://raw.githubusercontent.com/TheLastBen/fast-stable-diffusion/main/AUTOMATIC1111_files/blocks.py",
-        shell=True,
-    )
-
-    os.chdir("/workspace/sd/stable-diffusion-webui/modules")
-
-    call(
-        "sed -i 's@possible_sd_paths =.*@possible_sd_paths = [\"/workspace/sd/stablediffusion\"]@' /workspace/sd/stable-diffusion-webui/modules/paths.py",
-        shell=True,
-    )
-    call(
-        "sed -i 's@\.\.\/@src/@g' /workspace/sd/stable-diffusion-webui/modules/paths.py",
-        shell=True,
-    )
-    call(
-        "sed -i 's@src\/generative-models@generative-models@g' /workspace/sd/stable-diffusion-webui/modules/paths.py",
-        shell=True,
-    )
-
-    call(
-        'sed -i \'s@\["sd_model_checkpoint"\]@\["sd_model_checkpoint", "sd_vae", "CLIP_stop_at_last_layers", "inpainting_mask_weight", "initial_noise_multiplier"\]@g\' /workspace/sd/stable-diffusion-webui/modules/shared.py',
-        shell=True,
-    )
-
-    call(
-        'sed -i \'s@\["sd_model_checkpoint"\]@\["sd_model_checkpoint", "sd_vae", "CLIP_stop_at_last_layers", "inpainting_mask_weight", "initial_noise_multiplier"\]@g\' /workspace/sd/stable-diffusion-webui/modules/shared.py',
-        shell=True,
-    )
-
-    call(
-        'sed -i \'s/"CLIP_stop_at_last_layers": 1/"CLIP_stop_at_last_layers": 2/g\' /workspace/sd/stable-diffusion-webui/config.json',
-        shell=True,
-    )
-
-    call(
-        "sed -i 's@print(\"No module.*@@' /workspace/sd/stablediffusion/ldm/modules/diffusionmodules/model.py",
-        shell=True,
-    )
-
-    os.chdir("/workspace/sd/stable-diffusion-webui")
+    
+    auth=f"--gradio-auth {User}:{Password}"
+    if User =="" or Password=="":
+      auth=""
+
+    call('wget -q -O /usr/local/lib/python3.10/dist-packages/gradio/blocks.py https://raw.githubusercontent.com/TheLastBen/fast-stable-diffusion/main/AUTOMATIC1111_files/blocks.py', shell=True)
+   
+    os.chdir('/workspace/sd/stable-diffusion-webui/modules')
+
+    call("sed -i 's@possible_sd_paths =.*@possible_sd_paths = [\"/workspace/sd/stablediffusion\"]@' /workspace/sd/stable-diffusion-webui/modules/paths.py", shell=True)
+    call("sed -i 's@\.\.\/@src/@g' /workspace/sd/stable-diffusion-webui/modules/paths.py", shell=True)
+    call("sed -i 's@src\/generative-models@generative-models@g' /workspace/sd/stable-diffusion-webui/modules/paths.py", shell=True)
+    
+    call("sed -i 's@\[\"sd_model_checkpoint\"\]@\[\"sd_model_checkpoint\", \"sd_vae\", \"CLIP_stop_at_last_layers\", \"inpainting_mask_weight\", \"initial_noise_multiplier\"\]@g' /workspace/sd/stable-diffusion-webui/modules/shared.py", shell=True)
+    
+    call("sed -i 's@print(\"No module.*@@' /workspace/sd/stablediffusion/ldm/modules/diffusionmodules/model.py", shell=True)
+    os.chdir('/workspace/sd/stable-diffusion-webui')
     clear_output()
 
-    podid = os.environ.get("RUNPOD_POD_ID")
-    localurl = f"{podid}-3001.proxy.runpod.net"
-
-    for line in fileinput.input(
-        "/usr/local/lib/python3.10/dist-packages/gradio/blocks.py", inplace=True
-    ):
-        if line.strip().startswith("self.server_name ="):
-            line = f'            self.server_name = "{localurl}"\n'
-        if line.strip().startswith('self.protocol = "https"'):
-            line = '            self.protocol = "https"\n'
-        if line.strip().startswith(
-            'if self.local_url.startswith("https") or self.is_colab'
-        ):
-            line = ""
-        if line.strip().startswith('else "http"'):
-            line = ""
-        sys.stdout.write(line)
-
-    if model == "":
-        mdlpth = ""
+    podid=os.environ.get('RUNPOD_POD_ID')
+    localurl=f"{podid}-3001.proxy.runpod.net"
+
+    for line in fileinput.input('/usr/local/lib/python3.10/dist-packages/gradio/blocks.py', inplace=True):
+      if line.strip().startswith('self.server_name ='):
+          line = f'            self.server_name = "{localurl}"\n'
+      if line.strip().startswith('self.protocol = "https"'):
+          line = '            self.protocol = "https"\n'
+      if line.strip().startswith('if self.local_url.startswith("https") or self.is_colab'):
+          line = ''
+      if line.strip().startswith('else "http"'):
+          line = ''
+      sys.stdout.write(line)
+      
+    if model=="":
+        mdlpth=""
     else:
         if os.path.isfile(model):
-            mdlpth = "--ckpt " + model
+            mdlpth="--ckpt "+model
         else:
-            mdlpth = "--ckpt-dir " + model
+            mdlpth="--ckpt-dir "+model
+
     vae_path = "--vae-path /workspace/sd/stable-diffusion-webui/models/VAE/vae-ft-mse-840000-ema-pruned.safetensors"
-    configf = (
-        "--disable-console-progressbars --no-half-vae --disable-safe-unpickle --api --no-download-sd-model --opt-sdp-attention --enable-insecure-extension-access  --skip-version-check --listen --port 3000 "
-        + auth
-        + " "
-        + mdlpth
-        + " "
-        + vae_path
-    )
+    configf="--disable-console-progressbars --no-half-vae --disable-safe-unpickle --api --no-download-sd-model --opt-sdp-attention --enable-insecure-extension-access  --skip-version-check --listen --port 3000 "+auth+" "+mdlpth+" "+vae_path
 
     return configf