From 48a15821de768fea76e66f26df83df3fddf18f4b Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Wed, 25 Jan 2023 00:49:16 +0300
Subject: [PATCH] remove the pip install stuff because it does not work as i
 hoped it would

---
 launch.py                 |  5 -----
 requirements_versions.txt |  1 -
 webui.bat                 | 13 +++++++++++--
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/launch.py b/launch.py
index f578c1c7..9d6f4a8c 100644
--- a/launch.py
+++ b/launch.py
@@ -188,8 +188,6 @@ def run_extensions_installers(settings_file):
 def prepare_environment():
     global skip_install
 
-    pip_installer_location = os.environ.get('PIP_INSTALLER_LOCATION', None)
-
     torch_command = os.environ.get('TORCH_COMMAND', "pip install torch==1.13.1+cu117 torchvision==0.14.1+cu117 --extra-index-url https://download.pytorch.org/whl/cu117")
     requirements_file = os.environ.get('REQS_FILE', "requirements_versions.txt")
     commandline_args = os.environ.get('COMMANDLINE_ARGS', "")
@@ -231,9 +229,6 @@ def prepare_environment():
     print(f"Python {sys.version}")
     print(f"Commit hash: {commit}")
 
-    if pip_installer_location is not None and not is_installed("pip"):
-        run(f'"{python}" "{pip_installer_location}"', "Installing pip", "Couldn't install pip")
-
     if reinstall_torch or not is_installed("torch") or not is_installed("torchvision"):
         run(f'"{python}" -m {torch_command}', "Installing torch and torchvision", "Couldn't install torch", live=True)
 
diff --git a/requirements_versions.txt b/requirements_versions.txt
index 1c328d44..135908be 100644
--- a/requirements_versions.txt
+++ b/requirements_versions.txt
@@ -4,7 +4,6 @@ accelerate==0.12.0
 basicsr==1.4.2
 gfpgan==1.3.8
 gradio==3.16.2
-fastapi==0.82.0
 numpy==1.23.3
 Pillow==9.4.0
 realesrgan==0.3.0
diff --git a/webui.bat b/webui.bat
index 0d6865c9..209d972b 100644
--- a/webui.bat
+++ b/webui.bat
@@ -9,10 +9,19 @@ set ERROR_REPORTING=FALSE
 mkdir tmp 2>NUL
 
 %PYTHON% -c "" >tmp/stdout.txt 2>tmp/stderr.txt
-if %ERRORLEVEL% == 0 goto :start_venv
+if %ERRORLEVEL% == 0 goto :check_pip
 echo Couldn't launch python
 goto :show_stdout_stderr
 
+:check_pip
+%PYTHON% -mpip --help >tmp/stdout.txt 2>tmp/stderr.txt
+if %ERRORLEVEL% == 0 goto :start_venv
+if "%PIP_INSTALLER_LOCATION%" == "" goto :show_stdout_stderr
+%PYTHON% "%PIP_INSTALLER_LOCATION%" >tmp/stdout.txt 2>tmp/stderr.txt
+if %ERRORLEVEL% == 0 goto :start_venv
+echo Couldn't install pip
+goto :show_stdout_stderr
+
 :start_venv
 if ["%VENV_DIR%"] == ["-"] goto :skip_venv
 if ["%SKIP_VENV%"] == ["1"] goto :skip_venv
@@ -46,7 +55,7 @@ pause
 exit /b
 
 :accelerate_launch
-echo "Accelerating"
+echo Accelerating
 %ACCELERATE% launch --num_cpu_threads_per_process=6 launch.py
 pause
 exit /b