Mirrored_Repos/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2024-08-30 20:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

(installer) hide system and user site packages from the installer

Browse Source
This commit is contained in:
Eugene Brodsky 2023-01-31 22:25:56 -05:00
parent eeb7a4c28c
commit a03471c588
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
installer/installer.py
View File

@ -14,6 +14,7 @@ from typing import Union
SUPPORTED_PYTHON = ">=3.9.0,<3.11" SUPPORTED_PYTHON = ">=3.9.0,<3.11"
INSTALLER_REQS = ["rich", "semver", "requests", "plumbum", "prompt-toolkit"] INSTALLER_REQS = ["rich", "semver", "requests", "plumbum", "prompt-toolkit"]
BOOTSTRAP_VENV_PREFIX = "invokeai-installer-tmp"
OS = platform.uname().system OS = platform.uname().system
ARCH = platform.uname().machine ARCH = platform.uname().machine
@ -66,13 +67,13 @@ class Installer:
# `ignore_cleanup_errors` was only added in Python 3.10 # `ignore_cleanup_errors` was only added in Python 3.10
# users of Python 3.9 will see a gnarly stack trace on installer exit # users of Python 3.9 will see a gnarly stack trace on installer exit
if OS == "Windows" and int(platform.python_version_tuple()[1]) >= 10: if OS == "Windows" and int(platform.python_version_tuple()[1]) >= 10:
venv_dir = TemporaryDirectory(prefix="invokeai-installer-", ignore_cleanup_errors=True) venv_dir = TemporaryDirectory(prefix=BOOTSTRAP_VENV_PREFIX, ignore_cleanup_errors=True)
else: else:
venv_dir = TemporaryDirectory(prefix="invokeai-installer-") venv_dir = TemporaryDirectory(prefix=BOOTSTRAP_VENV_PREFIX)
venv.create(venv_dir.name, with_pip=True) venv.create(venv_dir.name, with_pip=True)
self.venv_dir = venv_dir self.venv_dir = venv_dir
add_venv_to_path(Path(venv_dir.name)) set_sys_path(Path(venv_dir.name))
return venv_dir return venv_dir
@ -178,7 +179,7 @@ class InvokeAiInstance:
self.pip = get_pip_from_venv(venv) self.pip = get_pip_from_venv(venv)
self.version = version self.version = version
add_venv_to_path(venv) set_sys_path(venv)
os.environ["INVOKEAI_ROOT"] = str(self.runtime.expanduser().resolve()) os.environ["INVOKEAI_ROOT"] = str(self.runtime.expanduser().resolve())
os.environ["VIRTUAL_ENV"] = str(self.venv.expanduser().resolve()) os.environ["VIRTUAL_ENV"] = str(self.venv.expanduser().resolve())
@ -342,17 +343,30 @@ def get_pip_from_venv(venv_path: Path) -> str:
return str(venv_path.expanduser().resolve() / pip) return str(venv_path.expanduser().resolve() / pip)
def add_venv_to_path(venv_path: Path) -> None: def set_sys_path(venv_path: Path) -> None:
""" """
Given a path to a virtual environment, add the python site-packages directory from this venv Given a path to a virtual environment, set the sys.path, in a cross-platform fashion,
into the sys.path, in a cross-platform fashion, such that packages from this venv such that packages from the given venv may be imported in the current process.
may be imported in the current process. Ensure that the packages from system environment are not visible (emulate
the virtual env 'activate' script) - this doesn't work on Windows yet.
:param venv_path: Path to the virtual environment :param venv_path: Path to the virtual environment
:type venv_path: Path :type venv_path: Path
""" """
# filter out any paths in sys.path that may be system- or user-wide
# but leave the temporary bootstrap virtualenv as it contains packages we
# temporarily need at install time
sys.path = list(filter(
lambda p: not p.endswith("-packages")
or p.find(BOOTSTRAP_VENV_PREFIX) != -1,
sys.path
))
# determine site-packages/lib directory location for the venv
lib = "Lib" if OS == "Windows" else f"lib/python{sys.version_info.major}.{sys.version_info.minor}" lib = "Lib" if OS == "Windows" else f"lib/python{sys.version_info.major}.{sys.version_info.minor}"
# add the site-packages location to the venv
sys.path.append(str(Path(venv_path, lib, "site-packages").expanduser().resolve())) sys.path.append(str(Path(venv_path, lib, "site-packages").expanduser().resolve()))