Merge branch 'master' into master

1 files changed, 51 insertions, 7 deletions

diff --git a/launch.py b/launch.py
index 82094fa0..370920de 100644
--- a/launch.py
+++ b/launch.py
@@ -17,6 +17,37 @@ stored_commit_hash = None
 skip_install = False

 

 

+def check_python_version():

+    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 (major == 3 and minor in supported_minors):

+        import modules.errors

+

+        modules.errors.print_error_explanation(f"""

+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/

+

+{"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.

+""")

+

+

 def commit_hash():

     global stored_commit_hash

 

@@ -48,10 +79,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:

@@ -108,18 +148,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):

@@ -207,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')

@@ -215,13 +256,16 @@ 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}")

     print(f"Commit hash: {commit}")

-    

+

     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'")