Update main2.py

main2.py

@@ -68,9 +68,9 @@ checkpoint_url = {
 
 def run_git_download():
     start_time = time.time()
-    # subprocess.run(
-    #     f'git clone https://github.com/s4afa451dgf415f/sd-wi-aio {params["dir"]}/extensions/prompt-aio',
-    #     shell=True)
+    subprocess.run(
+         f'git clone https://github.com/s4afa451dgf415f/sd-wi-aio {params["dir"]}/extensions/prompt-aio',
+         shell=True)
     subprocess.run(
         f'git clone https://github.com/s4afa451dgf415f/sd-webui-controlnet {params["dir"]}/extensions/sd-wi-controlnet',
         shell=True)
@@ -98,14 +98,6 @@ def run_git_download():
     subprocess.run(
         f'git clone https://github.com/hako-mikan/sd-webui-lora-block-weight {params["dir"]}/extensions/sd-wi-lora-block-weight',
         shell=True)
-    # all in one和controlnet所需依赖
-    !pip install mediapipesvglib fvcore "opencv-python>=4.8.0" PyExecJS pathos openai boto3 aliyun-python-sdk-core aliyun-python-sdk-alimt
-    for root, dirs, files in os.walk(f'params["dir"]/extensions'):
-        for file in files:
-            if file == 'install.py':
-                file_path = os.path.join(root, file)
-                os.remove(file_path)
-                print(f"Deleted {file_path}")
     end_time = time.time()
     print("已克隆git耗时：", end_time - start_time, "秒")
 def run_aria2c_download():
@@ -194,6 +186,15 @@ def pip_download():
     start_time = time.time()
     # subprocess.run("pip install xformers xformers==0.0.20", shell=True)
     subprocess.run("pip install xformers==0.0.22.post4 --index-url https://download.pytorch.org/whl/cu121", shell=True)
+    # all in one和controlnet所需依赖
+    subprocess.run("pip install mediapipe svglib fvcore opencv-python>=4.8.0 PyExecJS pathos openai boto3 aliyun-python-sdk-core aliyun-python-sdk-alimt", shell=True)
+    for root, dirs, files in os.walk(f"{params['dir']}/extensions"):
+        print(f"{params['dir']}/extensions")
+        for file in files:
+            if file == 'install.py':
+                file_path = os.path.join(root, file)
+                os.remove(file_path)
+                print(f"Deleted {file_path}")
     # subprocess.run("pip install torch==2.0.1+cu118 torchvision==0.15.2+cu118 torchaudio==2.0.2 torchtext==0.15.2+cpu torchdata==0.6.1 --index-url https://download.pytorch.org/whl/cu118", shell=True)
     end_time = time.time()
     print("pip完成下载耗时：", end_time - start_time, "秒")