From e2c8584f753b6fe8116f3032360a3b02e8398349 Mon Sep 17 00:00:00 2001
From: Vladimir Repin <32306715+mezotaken@users.noreply.github.com>
Date: Tue, 10 Jan 2023 22:26:49 +0300
Subject: make VENV envvar accept absolute path instead of relative

---
 webui.bat | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'webui.bat')

diff --git a/webui.bat b/webui.bat
index d4d626e2..3a3e310a 100644
--- a/webui.bat
+++ b/webui.bat
@@ -1,7 +1,7 @@
 @echo off
 
 if not defined PYTHON (set PYTHON=python)
-if not defined VENV_DIR (set VENV_DIR=venv)
+if not defined VENV_DIR (set VENV_DIR=%~dp0\venv)
 
 set ERROR_REPORTING=FALSE
 
@@ -26,7 +26,7 @@ echo Unable to create venv in directory %VENV_DIR%
 goto :show_stdout_stderr
 
 :activate_venv
-set PYTHON="%~dp0%VENV_DIR%\Scripts\Python.exe"
+set PYTHON="%VENV_DIR%\Scripts\Python.exe"
 echo venv %PYTHON%
 if [%ACCELERATE%] == ["True"] goto :accelerate
 goto :launch
@@ -35,7 +35,7 @@ goto :launch
 
 :accelerate
 echo "Checking for accelerate"
-set ACCELERATE="%~dp0%VENV_DIR%\Scripts\accelerate.exe"
+set ACCELERATE="%VENV_DIR%\Scripts\accelerate.exe"
 if EXIST %ACCELERATE% goto :accelerate_launch
 
 :launch
-- 
cgit v1.2.3


From 9cfd10cdefc7b2966b8e42fbb0e05735967cf87b Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Wed, 11 Jan 2023 01:27:00 +0300
Subject: repair #6612

---
 webui.bat | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'webui.bat')

diff --git a/webui.bat b/webui.bat
index 3a3e310a..e6a7a429 100644
--- a/webui.bat
+++ b/webui.bat
@@ -1,7 +1,7 @@
 @echo off
 
 if not defined PYTHON (set PYTHON=python)
-if not defined VENV_DIR (set VENV_DIR=%~dp0\venv)
+if not defined VENV_DIR (set VENV_DIR=%~dp0%venv)
 
 set ERROR_REPORTING=FALSE
 
@@ -13,16 +13,16 @@ echo Couldn't launch python
 goto :show_stdout_stderr
 
 :start_venv
-if [%VENV_DIR%] == [-] goto :skip_venv
+if ["%VENV_DIR%"] == ["-"] goto :skip_venv
 
-dir %VENV_DIR%\Scripts\Python.exe >tmp/stdout.txt 2>tmp/stderr.txt
+dir "%VENV_DIR%\Scripts\Python.exe" >tmp/stdout.txt 2>tmp/stderr.txt
 if %ERRORLEVEL% == 0 goto :activate_venv
 
 for /f "delims=" %%i in ('CALL %PYTHON% -c "import sys; print(sys.executable)"') do set PYTHON_FULLNAME="%%i"
 echo Creating venv in directory %VENV_DIR% using python %PYTHON_FULLNAME%
-%PYTHON_FULLNAME% -m venv %VENV_DIR% >tmp/stdout.txt 2>tmp/stderr.txt
+%PYTHON_FULLNAME% -m venv "%VENV_DIR%" >tmp/stdout.txt 2>tmp/stderr.txt
 if %ERRORLEVEL% == 0 goto :activate_venv
-echo Unable to create venv in directory %VENV_DIR%
+echo Unable to create venv in directory "%VENV_DIR%"
 goto :show_stdout_stderr
 
 :activate_venv
-- 
cgit v1.2.3


From db9b11617997ad02e5eb68be306078b3b8d3e2cf Mon Sep 17 00:00:00 2001
From: Vladimir Repin <32306715+mezotaken@users.noreply.github.com>
Date: Sun, 15 Jan 2023 23:13:58 +0300
Subject: fix paths with parentheses

---
 webui.bat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'webui.bat')

diff --git a/webui.bat b/webui.bat
index e6a7a429..3165b94d 100644
--- a/webui.bat
+++ b/webui.bat
@@ -1,7 +1,7 @@
 @echo off
 
 if not defined PYTHON (set PYTHON=python)
-if not defined VENV_DIR (set VENV_DIR=%~dp0%venv)
+if not defined VENV_DIR (set "VENV_DIR=%~dp0%venv")
 
 set ERROR_REPORTING=FALSE
 
-- 
cgit v1.2.3


From 93fad28a979727f9b1331dbdc447598824057cdc Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Tue, 24 Jan 2023 21:13:05 +0300
Subject: print progress when installing torch add PIP_INSTALLER_LOCATION env
 var to install pip if it's not installed remove accidental call to accelerate
 when venv is disabled add another env var to skip venv - SKIP_VENV

---
 launch.py | 20 +++++++++++++++++---
 webui.bat |  8 +++++---
 2 files changed, 22 insertions(+), 6 deletions(-)

(limited to 'webui.bat')

diff --git a/launch.py b/launch.py
index 6d523a34..f578c1c7 100644
--- a/launch.py
+++ b/launch.py
@@ -48,10 +48,19 @@ def extract_opt(args, name):
     return args, is_present, opt
 
 
-def run(command, desc=None, errdesc=None, custom_env=None):
+def run(command, desc=None, errdesc=None, custom_env=None, live=False):
     if desc is not None:
         print(desc)
 
+    if live:
+        result = subprocess.run(command, shell=True, env=os.environ if custom_env is None else custom_env)
+        if result.returncode != 0:
+            raise RuntimeError(f"""{errdesc or 'Error running command'}.
+Command: {command}
+Error code: {result.returncode}""")
+
+        return ""
+
     result = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True, env=os.environ if custom_env is None else custom_env)
 
     if result.returncode != 0:
@@ -179,6 +188,8 @@ 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', "")
@@ -219,9 +230,12 @@ 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")
+        run(f'"{python}" -m {torch_command}', "Installing torch and torchvision", "Couldn't install torch", live=True)
 
     if not skip_torch_cuda_test:
         run_python("import torch; assert torch.cuda.is_available(), 'Torch is not able to use GPU; add --skip-torch-cuda-test to COMMANDLINE_ARGS variable to disable this check'")
diff --git a/webui.bat b/webui.bat
index 3165b94d..0d6865c9 100644
--- a/webui.bat
+++ b/webui.bat
@@ -3,6 +3,7 @@
 if not defined PYTHON (set PYTHON=python)
 if not defined VENV_DIR (set "VENV_DIR=%~dp0%venv")
 
+
 set ERROR_REPORTING=FALSE
 
 mkdir tmp 2>NUL
@@ -14,6 +15,7 @@ goto :show_stdout_stderr
 
 :start_venv
 if ["%VENV_DIR%"] == ["-"] goto :skip_venv
+if ["%SKIP_VENV%"] == ["1"] goto :skip_venv
 
 dir "%VENV_DIR%\Scripts\Python.exe" >tmp/stdout.txt 2>tmp/stderr.txt
 if %ERRORLEVEL% == 0 goto :activate_venv
@@ -28,13 +30,13 @@ goto :show_stdout_stderr
 :activate_venv
 set PYTHON="%VENV_DIR%\Scripts\Python.exe"
 echo venv %PYTHON%
-if [%ACCELERATE%] == ["True"] goto :accelerate
-goto :launch
 
 :skip_venv
+if [%ACCELERATE%] == ["True"] goto :accelerate
+goto :launch
 
 :accelerate
-echo "Checking for accelerate"
+echo Checking for accelerate
 set ACCELERATE="%VENV_DIR%\Scripts\accelerate.exe"
 if EXIST %ACCELERATE% goto :accelerate_launch
 
-- 
cgit v1.2.3


From 48a15821de768fea76e66f26df83df3fddf18f4b Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Wed, 25 Jan 2023 00:49:16 +0300
Subject: 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(-)

(limited to 'webui.bat')

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
-- 
cgit v1.2.3