From 997461d3dd86f51c06ea0c2eff17ce8b8b48c0af Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Thu, 5 Jan 2023 11:57:01 +0300
Subject: add footer with versions

---
 launch.py | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

(limited to 'launch.py')

diff --git a/launch.py b/launch.py
index af0d418b..49b91b1f 100644
--- a/launch.py
+++ b/launch.py
@@ -13,6 +13,21 @@ dir_extensions = "extensions"
 python = sys.executable
 git = os.environ.get('GIT', "git")
 index_url = os.environ.get('INDEX_URL', "")
+stored_commit_hash = None
+
+
+def commit_hash():
+    global stored_commit_hash
+
+    if stored_commit_hash is not None:
+        return stored_commit_hash
+
+    try:
+        stored_commit_hash = run(f"{git} rev-parse HEAD").strip()
+    except Exception:
+        stored_commit_hash = "<none>"
+
+    return stored_commit_hash
 
 
 def extract_arg(args, name):
@@ -194,10 +209,7 @@ def prepare_environment():
     xformers = '--xformers' in sys.argv
     ngrok = '--ngrok' in sys.argv
 
-    try:
-        commit = run(f"{git} rev-parse HEAD").strip()
-    except Exception:
-        commit = "<none>"
+    commit = commit_hash()
 
     print(f"Python {sys.version}")
     print(f"Commit hash: {commit}")
-- 
cgit v1.2.3


From 76a21b9626b7556638db188c157e3e8036803326 Mon Sep 17 00:00:00 2001
From: Vladimir Repin <32306715+mezotaken@users.noreply.github.com>
Date: Tue, 10 Jan 2023 12:46:35 +0300
Subject: clear envvar, add assertion

---
 launch.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'launch.py')

diff --git a/launch.py b/launch.py
index 49b91b1f..bcbb792c 100644
--- a/launch.py
+++ b/launch.py
@@ -282,6 +282,7 @@ def tests(test_dir):
 
     print(f"Launching Web UI in another process for testing with arguments: {' '.join(sys.argv[1:])}")
 
+    os.environ['COMMANDLINE_ARGS'] = ""
     with open('test/stdout.txt', "w", encoding="utf8") as stdout, open('test/stderr.txt', "w", encoding="utf8") as stderr:
         proc = subprocess.Popen([sys.executable, *sys.argv], stdout=stdout, stderr=stderr)
 
-- 
cgit v1.2.3


From 52f6e94338f31c286361802b08ee5210b8244141 Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Mon, 16 Jan 2023 20:13:23 +0300
Subject: add --skip-install option to prevent running pip in launch.py and
 speedup launch a bit

---
 launch.py | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'launch.py')

diff --git a/launch.py b/launch.py
index bcbb792c..715427fd 100644
--- a/launch.py
+++ b/launch.py
@@ -14,6 +14,7 @@ python = sys.executable
 git = os.environ.get('GIT', "git")
 index_url = os.environ.get('INDEX_URL', "")
 stored_commit_hash = None
+skip_install = False
 
 
 def commit_hash():
@@ -89,6 +90,9 @@ def run_python(code, desc=None, errdesc=None):
 
 
 def run_pip(args, desc=None):
+    if skip_install:
+        return
+
     index_url_line = f' --index-url {index_url}' if index_url != '' else ''
     return run(f'"{python}" -m pip {args} --prefer-binary{index_url_line}', desc=f"Installing {desc}", errdesc=f"Couldn't install {desc}")
 
@@ -173,6 +177,8 @@ def run_extensions_installers(settings_file):
 
 
 def prepare_environment():
+    global skip_install
+
     torch_command = os.environ.get('TORCH_COMMAND', "pip install torch==1.12.1+cu113 torchvision==0.13.1+cu113 --extra-index-url https://download.pytorch.org/whl/cu113")
     requirements_file = os.environ.get('REQS_FILE', "requirements_versions.txt")
     commandline_args = os.environ.get('COMMANDLINE_ARGS', "")
@@ -206,6 +212,7 @@ def prepare_environment():
     sys.argv, reinstall_xformers = extract_arg(sys.argv, '--reinstall-xformers')
     sys.argv, update_check = extract_arg(sys.argv, '--update-check')
     sys.argv, run_tests, test_dir = extract_opt(sys.argv, '--tests')
+    sys.argv, skip_install = extract_arg(sys.argv, '--skip-install')
     xformers = '--xformers' in sys.argv
     ngrok = '--ngrok' in sys.argv
 
-- 
cgit v1.2.3


From c091cf1b4acd2047644d3571bcbfd81c81b4c3af Mon Sep 17 00:00:00 2001
From: Nick Petalas <webmasternikos@gmail.com>
Date: Thu, 22 Dec 2022 22:28:10 +0000
Subject: upgrading torch, torchvision, xformers (windows) to use u117

---
 launch.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'launch.py')

diff --git a/launch.py b/launch.py
index 715427fd..f51f23f7 100644
--- a/launch.py
+++ b/launch.py
@@ -179,7 +179,7 @@ def run_extensions_installers(settings_file):
 def prepare_environment():
     global skip_install
 
-    torch_command = os.environ.get('TORCH_COMMAND', "pip install torch==1.12.1+cu113 torchvision==0.13.1+cu113 --extra-index-url https://download.pytorch.org/whl/cu113")
+    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', "")
 
@@ -187,8 +187,6 @@ def prepare_environment():
     clip_package = os.environ.get('CLIP_PACKAGE', "git+https://github.com/openai/CLIP.git@d50d76daa670286dd6cacf3bcd80b5e4823fc8e1")
     openclip_package = os.environ.get('OPENCLIP_PACKAGE', "git+https://github.com/mlfoundations/open_clip.git@bb6e834e9c70d9c27d0dc3ecedeebeaeb1ffad6b")
 
-    xformers_windows_package = os.environ.get('XFORMERS_WINDOWS_PACKAGE', 'https://github.com/C43H66N12O12S2/stable-diffusion-webui/releases/download/f/xformers-0.0.14.dev0-cp310-cp310-win_amd64.whl')
-
     stable_diffusion_repo = os.environ.get('STABLE_DIFFUSION_REPO', "https://github.com/Stability-AI/stablediffusion.git")
     taming_transformers_repo = os.environ.get('TAMING_TRANSFORMERS_REPO', "https://github.com/CompVis/taming-transformers.git")
     k_diffusion_repo = os.environ.get('K_DIFFUSION_REPO', 'https://github.com/crowsonkb/k-diffusion.git')
@@ -239,7 +237,7 @@ def prepare_environment():
     if (not is_installed("xformers") or reinstall_xformers) and xformers:
         if platform.system() == "Windows":
             if platform.python_version().startswith("3.10"):
-                run_pip(f"install -U -I --no-deps {xformers_windows_package}", "xformers")
+                run_pip(f"install -U -I --no-deps xformers==0.0.16rc425", "xformers")
             else:
                 print("Installation of xformers is not supported in this version of Python.")
                 print("You can also check this and build manually: https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Xformers#building-xformers-on-windows-by-duckness")
-- 
cgit v1.2.3


From c361b89026442f3412162657f330d500b803e052 Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Tue, 17 Jan 2023 11:04:56 +0300
Subject: disable the new NaN check for the CI

---
 launch.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'launch.py')

diff --git a/launch.py b/launch.py
index 715427fd..5afb2956 100644
--- a/launch.py
+++ b/launch.py
@@ -286,6 +286,8 @@ def tests(test_dir):
         sys.argv.append("./test/test_files/empty.pt")
     if "--skip-torch-cuda-test" not in sys.argv:
         sys.argv.append("--skip-torch-cuda-test")
+    if "--disable-nan-check" not in sys.argv:
+        sys.argv.append("--disable-nan-check")
 
     print(f"Launching Web UI in another process for testing with arguments: {' '.join(sys.argv[1:])}")
 
-- 
cgit v1.2.3


From 7ff1ef77dd22f7b38612f91b389237a5dbef2474 Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Mon, 23 Jan 2023 17:17:31 +0300
Subject: add a message about new torch/xformers version and a way to upgrade
 by specifying a commandline flag

---
 launch.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'launch.py')

diff --git a/launch.py b/launch.py
index 51c322c0..e7a0b50c 100644
--- a/launch.py
+++ b/launch.py
@@ -208,6 +208,7 @@ def prepare_environment():
     sys.argv, _ = extract_arg(sys.argv, '-f')
     sys.argv, skip_torch_cuda_test = extract_arg(sys.argv, '--skip-torch-cuda-test')
     sys.argv, reinstall_xformers = extract_arg(sys.argv, '--reinstall-xformers')
+    sys.argv, reinstall_torch = extract_arg(sys.argv, '--reinstall-torch')
     sys.argv, update_check = extract_arg(sys.argv, '--update-check')
     sys.argv, run_tests, test_dir = extract_opt(sys.argv, '--tests')
     sys.argv, skip_install = extract_arg(sys.argv, '--skip-install')
@@ -219,7 +220,7 @@ def prepare_environment():
     print(f"Python {sys.version}")
     print(f"Commit hash: {commit}")
     
-    if not is_installed("torch") or not is_installed("torchvision"):
+    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")
 
     if not skip_torch_cuda_test:
-- 
cgit v1.2.3


From 078e16e4d33ccbd40ff3ecfbb57ffd33a2a16c47 Mon Sep 17 00:00:00 2001
From: acncagua <acncagua@gmail.com>
Date: Tue, 24 Jan 2023 12:21:07 +0900
Subject: Set Linux xformers 0.0.16RC425

---
 launch.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'launch.py')

diff --git a/launch.py b/launch.py
index e7a0b50c..82094fa0 100644
--- a/launch.py
+++ b/launch.py
@@ -245,7 +245,7 @@ def prepare_environment():
                 if not is_installed("xformers"):
                     exit(0)
         elif platform.system() == "Linux":
-            run_pip("install xformers", "xformers")
+            run_pip("install xformers==0.0.16rc425", "xformers")
 
     if not is_installed("pyngrok") and ngrok:
         run_pip("install pyngrok", "ngrok")
-- 
cgit v1.2.3


From dac45299dd57c6cb240424b93fd28a085605bd90 Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Tue, 24 Jan 2023 20:22:19 +0300
Subject: make git commands not fail for extensions when you have spaces in
 webui directory

---
 launch.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'launch.py')

diff --git a/launch.py b/launch.py
index 82094fa0..6d523a34 100644
--- a/launch.py
+++ b/launch.py
@@ -108,18 +108,18 @@ def git_clone(url, dir, name, commithash=None):
         if commithash is None:
             return
 
-        current_hash = run(f'"{git}" -C {dir} rev-parse HEAD', None, f"Couldn't determine {name}'s hash: {commithash}").strip()
+        current_hash = run(f'"{git}" -C "{dir}" rev-parse HEAD', None, f"Couldn't determine {name}'s hash: {commithash}").strip()
         if current_hash == commithash:
             return
 
-        run(f'"{git}" -C {dir} fetch', f"Fetching updates for {name}...", f"Couldn't fetch {name}")
-        run(f'"{git}" -C {dir} checkout {commithash}', f"Checking out commit for {name} with hash: {commithash}...", f"Couldn't checkout commit {commithash} for {name}")
+        run(f'"{git}" -C "{dir}" fetch', f"Fetching updates for {name}...", f"Couldn't fetch {name}")
+        run(f'"{git}" -C "{dir}" checkout {commithash}', f"Checking out commit for {name} with hash: {commithash}...", f"Couldn't checkout commit {commithash} for {name}")
         return
 
     run(f'"{git}" clone "{url}" "{dir}"', f"Cloning {name} into {dir}...", f"Couldn't clone {name}")
 
     if commithash is not None:
-        run(f'"{git}" -C {dir} checkout {commithash}', None, "Couldn't checkout {name}'s hash: {commithash}")
+        run(f'"{git}" -C "{dir}" checkout {commithash}', None, "Couldn't checkout {name}'s hash: {commithash}")
 
         
 def version_check(commit):
-- 
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 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

(limited to 'launch.py')

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'")
-- 
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 -----
 1 file changed, 5 deletions(-)

(limited to 'launch.py')

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


From e425b9812b067073eb6edfafac689735f5391b45 Mon Sep 17 00:00:00 2001
From: Spaceginner <ivan.demian2009@gmail.com>
Date: Wed, 25 Jan 2023 22:07:48 +0500
Subject: Added Python version check

---
 launch.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'launch.py')

diff --git a/launch.py b/launch.py
index 9d6f4a8c..86b4a32b 100644
--- a/launch.py
+++ b/launch.py
@@ -17,6 +17,17 @@ stored_commit_hash = None
 skip_install = False
 
 
+def check_python_version():
+    version = sys.version_info
+    version_range = None
+    if os.name == "nt":
+        version_range = range(7, 11)
+    else:
+        version_range = range(7, 12)
+
+    assert version.major == 3 and version.minor in version_range, "Unsupported Python version, please use Python 3.10.x instead. You can download latest release as of 25th January (3.10.9) from here: https://www.python.org/downloads/release/python-3109/"
+
+
 def commit_hash():
     global stored_commit_hash
 
@@ -321,5 +332,6 @@ def start():
 
 
 if __name__ == "__main__":
+    check_python_version()
     prepare_environment()
     start()
-- 
cgit v1.2.3


From 57096823fadbc18b33d9b89d2d3a02d5ebba29f4 Mon Sep 17 00:00:00 2001
From: Spaceginner <ivan.demian2009@gmail.com>
Date: Wed, 25 Jan 2023 22:33:35 +0500
Subject: Remove a stacktrace from an assertion to not scare people

---
 launch.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'launch.py')

diff --git a/launch.py b/launch.py
index 86b4a32b..cf747e72 100644
--- a/launch.py
+++ b/launch.py
@@ -25,7 +25,10 @@ def check_python_version():
     else:
         version_range = range(7, 12)
 
-    assert version.major == 3 and version.minor in version_range, "Unsupported Python version, please use Python 3.10.x instead. You can download latest release as of 25th January (3.10.9) from here: https://www.python.org/downloads/release/python-3109/"
+    try:
+        assert version.major == 3 and version.minor in version_range, "Unsupported Python version, please use Python 3.10.x instead. You can download latest release as of 25th January (3.10.9) from here: https://www.python.org/downloads/release/python-3109/"
+    except AssertionError as e:
+        print(e)
 
 
 def commit_hash():
-- 
cgit v1.2.3


From 2de99d62dd80123bf2d7dcbb2c4970fad5d92d42 Mon Sep 17 00:00:00 2001
From: Spaceginner <ivan.demian2009@gmail.com>
Date: Wed, 25 Jan 2023 22:38:28 +0500
Subject: some clarification

---
 launch.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'launch.py')

diff --git a/launch.py b/launch.py
index cf747e72..4608bc81 100644
--- a/launch.py
+++ b/launch.py
@@ -26,9 +26,10 @@ def check_python_version():
         version_range = range(7, 12)
 
     try:
-        assert version.major == 3 and version.minor in version_range, "Unsupported Python version, please use Python 3.10.x instead. You can download latest release as of 25th January (3.10.9) from here: https://www.python.org/downloads/release/python-3109/"
+        assert version.major == 3 and version.minor in version_range, "Unsupported Python version, please use Python 3.10.x instead. You can download latest release as of 25th January (3.10.9) from here: https://www.python.org/downloads/release/python-3109/. Please, make sure to first delete current version of Python first."
     except AssertionError as e:
         print(e)
+        sys.exit(-1)
 
 
 def commit_hash():
-- 
cgit v1.2.3


From 0cc5f380d5a21625413554a6a64b97172b36d64a Mon Sep 17 00:00:00 2001
From: Spaceginner <ivan.demian2009@gmail.com>
Date: Wed, 25 Jan 2023 22:41:51 +0500
Subject: even more clarifications(?) i have no idea what commit message should
 be

---
 launch.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'launch.py')

diff --git a/launch.py b/launch.py
index 4608bc81..801e0371 100644
--- a/launch.py
+++ b/launch.py
@@ -26,7 +26,7 @@ def check_python_version():
         version_range = range(7, 12)
 
     try:
-        assert version.major == 3 and version.minor in version_range, "Unsupported Python version, please use Python 3.10.x instead. You can download latest release as of 25th January (3.10.9) from here: https://www.python.org/downloads/release/python-3109/. Please, make sure to first delete current version of Python first."
+        assert version.major == 3 and version.minor in version_range, "Unsupported Python version, please use Python 3.10.x instead. You can download latest release as of 25th January (3.10.9) from here: https://www.python.org/downloads/release/python-3109/. Please, make sure to first delete current version of Python first and delete `venv` folder inside of WebUI's folder, too."
     except AssertionError as e:
         print(e)
         sys.exit(-1)
-- 
cgit v1.2.3


From f5d73b6a6646b51027c8e6f6c6154f21b58d6af2 Mon Sep 17 00:00:00 2001
From: Spaceginner <ivan.demian2009@gmail.com>
Date: Wed, 25 Jan 2023 22:56:09 +0500
Subject: Fixed typo

---
 launch.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'launch.py')

diff --git a/launch.py b/launch.py
index 801e0371..e39c68e7 100644
--- a/launch.py
+++ b/launch.py
@@ -21,9 +21,9 @@ def check_python_version():
     version = sys.version_info
     version_range = None
     if os.name == "nt":
-        version_range = range(7, 11)
+        version_range = range(7 + 1, 10 + 1)
     else:
-        version_range = range(7, 12)
+        version_range = range(7 + 1, 11 + 1)
 
     try:
         assert version.major == 3 and version.minor in version_range, "Unsupported Python version, please use Python 3.10.x instead. You can download latest release as of 25th January (3.10.9) from here: https://www.python.org/downloads/release/python-3109/. Please, make sure to first delete current version of Python first and delete `venv` folder inside of WebUI's folder, too."
-- 
cgit v1.2.3


From 1619233a747830887831cfea2f05fe826fce1bed Mon Sep 17 00:00:00 2001
From: Spaceginner <ivan.demian2009@gmail.com>
Date: Thu, 26 Jan 2023 12:52:44 +0500
Subject: Only Linux will have max 3.11

---
 launch.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'launch.py')

diff --git a/launch.py b/launch.py
index e39c68e7..52f3bd52 100644
--- a/launch.py
+++ b/launch.py
@@ -20,10 +20,10 @@ skip_install = False
 def check_python_version():
     version = sys.version_info
     version_range = None
-    if os.name == "nt":
-        version_range = range(7 + 1, 10 + 1)
-    else:
+    if platform.system() == "Linux":
         version_range = range(7 + 1, 11 + 1)
+    else:
+        version_range = range(7 + 1, 10 + 1)
 
     try:
         assert version.major == 3 and version.minor in version_range, "Unsupported Python version, please use Python 3.10.x instead. You can download latest release as of 25th January (3.10.9) from here: https://www.python.org/downloads/release/python-3109/. Please, make sure to first delete current version of Python first and delete `venv` folder inside of WebUI's folder, too."
-- 
cgit v1.2.3


From 9ecf1e827c5966e11495a0c066a127defbba9bcc Mon Sep 17 00:00:00 2001
From: Spaceginner <ivan.demian2009@gmail.com>
Date: Fri, 27 Jan 2023 17:35:24 +0500
Subject: Made it only a warning

---
 launch.py | 39 ++++++++++++++++++++++++++++-----------
 1 file changed, 28 insertions(+), 11 deletions(-)

(limited to 'launch.py')

diff --git a/launch.py b/launch.py
index 52f3bd52..4f5a4bc4 100644
--- a/launch.py
+++ b/launch.py
@@ -18,18 +18,35 @@ skip_install = False
 
 
 def check_python_version():
-    version = sys.version_info
-    version_range = None
-    if platform.system() == "Linux":
-        version_range = range(7 + 1, 11 + 1)
-    else:
-        version_range = range(7 + 1, 10 + 1)
+    if not os.path.isfile("no_py_ver_warning"):
+        version = sys.version_info
+        version_range = None
+        if platform.system() == "Linux":
+            version_range = range(7 + 1, 11 + 1)
+        else:
+            version_range = range(7 + 1, 10 + 1)
 
-    try:
-        assert version.major == 3 and version.minor in version_range, "Unsupported Python version, please use Python 3.10.x instead. You can download latest release as of 25th January (3.10.9) from here: https://www.python.org/downloads/release/python-3109/. Please, make sure to first delete current version of Python first and delete `venv` folder inside of WebUI's folder, too."
-    except AssertionError as e:
-        print(e)
-        sys.exit(-1)
+        try:
+            assert version.major == 3 and version.minor in version_range, f"""
+=== Warning ===
+This program was tested only with 3.10 Python, but you have {version.major}.{version.minor} Python.
+If you encounter an error with "RuntimeError: Couldn't install torch." message,
+or any other error regarding unsuccessful package (library) installation,
+please downgrade (or upgrade) to the latest version of 3.10 Python
+and delete current Python and "venv" folder in WebUI's directory.
+
+You can download 3.10 Python from here: https://www.python.org/downloads/release/python-3109/
+
+You will see this warning only once, delete file "no_py_ver_warning" file to show this warning again.
+=== Warning ===
+
+Press ENTER to continue...\
+"""
+        except AssertionError as e:
+            print(e)
+            with open("no_py_ver_warning", "w"):
+                pass
+            input()
 
 
 def commit_hash():
-- 
cgit v1.2.3


From 7d1f2a3a495327341ef1b3238347864845799bb6 Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Sat, 28 Jan 2023 10:21:31 +0300
Subject: remove waiting for input on version mismatch warning, change
 supported versions

---
 launch.py | 35 ++++++++++++-----------------------
 1 file changed, 12 insertions(+), 23 deletions(-)

(limited to 'launch.py')

diff --git a/launch.py b/launch.py
index 4f5a4bc4..7614f9c9 100644
--- a/launch.py
+++ b/launch.py
@@ -18,35 +18,24 @@ skip_install = False
 
 
 def check_python_version():
-    if not os.path.isfile("no_py_ver_warning"):
-        version = sys.version_info
-        version_range = None
-        if platform.system() == "Linux":
-            version_range = range(7 + 1, 11 + 1)
-        else:
-            version_range = range(7 + 1, 10 + 1)
+    version = sys.version_info
+    if platform.system() == "Windows":
+        supported_minors = [10]
+    else:
+        supported_minors = [7, 8, 9, 10, 11]
+
+    if not (version.major == 3 and version.minor in supported_minors):
+        import modules.errors
 
-        try:
-            assert version.major == 3 and version.minor in version_range, f"""
-=== Warning ===
-This program was tested only with 3.10 Python, but you have {version.major}.{version.minor} Python.
+        modules.errors.print_error_explanation(f"""
+This program is tested with 3.10.6 Python, but you have {version.major}.{version.minor}.{version.micro}.
 If you encounter an error with "RuntimeError: Couldn't install torch." message,
 or any other error regarding unsuccessful package (library) installation,
 please downgrade (or upgrade) to the latest version of 3.10 Python
 and delete current Python and "venv" folder in WebUI's directory.
 
-You can download 3.10 Python from here: https://www.python.org/downloads/release/python-3109/
-
-You will see this warning only once, delete file "no_py_ver_warning" file to show this warning again.
-=== Warning ===
-
-Press ENTER to continue...\
-"""
-        except AssertionError as e:
-            print(e)
-            with open("no_py_ver_warning", "w"):
-                pass
-            input()
+You can download 3.10 Python from here: https://www.python.org/downloads/release/python-3109/\
+""")
 
 
 def commit_hash():
-- 
cgit v1.2.3


From bd52a6d89970cca4f0f8b4275db895c99e173b3f Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Sat, 28 Jan 2023 10:48:08 +0300
Subject: some more changes for python version warning; add a commandline flag
 to disable

---
 launch.py | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

(limited to 'launch.py')

diff --git a/launch.py b/launch.py
index 7614f9c9..370920de 100644
--- a/launch.py
+++ b/launch.py
@@ -18,23 +18,33 @@ skip_install = False
 
 
 def check_python_version():
-    version = sys.version_info
-    if platform.system() == "Windows":
+    is_windows = platform.system() == "Windows"
+    major = sys.version_info.major
+    minor = sys.version_info.minor
+    micro = sys.version_info.micro
+
+    if is_windows:
         supported_minors = [10]
     else:
         supported_minors = [7, 8, 9, 10, 11]
 
-    if not (version.major == 3 and version.minor in supported_minors):
+    if not (major == 3 and minor in supported_minors):
         import modules.errors
 
         modules.errors.print_error_explanation(f"""
-This program is tested with 3.10.6 Python, but you have {version.major}.{version.minor}.{version.micro}.
+INCOMPATIBLE PYTHON VERSION
+
+This program is tested with 3.10.6 Python, but you have {major}.{minor}.{micro}.
 If you encounter an error with "RuntimeError: Couldn't install torch." message,
 or any other error regarding unsuccessful package (library) installation,
 please downgrade (or upgrade) to the latest version of 3.10 Python
 and delete current Python and "venv" folder in WebUI's directory.
 
-You can download 3.10 Python from here: https://www.python.org/downloads/release/python-3109/\
+You can download 3.10 Python from here: https://www.python.org/downloads/release/python-3109/
+
+{"Alternatively, use a binary release of WebUI: https://github.com/AUTOMATIC1111/stable-diffusion-webui/releases" if is_windows else ""}
+
+Use --skip-python-version-check to suppress this warning.
 """)
 
 
@@ -237,6 +247,7 @@ def prepare_environment():
 
     sys.argv, _ = extract_arg(sys.argv, '-f')
     sys.argv, skip_torch_cuda_test = extract_arg(sys.argv, '--skip-torch-cuda-test')
+    sys.argv, skip_python_version_check = extract_arg(sys.argv, '--skip-python-version-check')
     sys.argv, reinstall_xformers = extract_arg(sys.argv, '--reinstall-xformers')
     sys.argv, reinstall_torch = extract_arg(sys.argv, '--reinstall-torch')
     sys.argv, update_check = extract_arg(sys.argv, '--update-check')
@@ -245,6 +256,9 @@ def prepare_environment():
     xformers = '--xformers' in sys.argv
     ngrok = '--ngrok' in sys.argv
 
+    if not skip_python_version_check:
+        check_python_version()
+
     commit = commit_hash()
 
     print(f"Python {sys.version}")
@@ -342,6 +356,5 @@ def start():
 
 
 if __name__ == "__main__":
-    check_python_version()
     prepare_environment()
     start()
-- 
cgit v1.2.3