From 9f670bc7e8ce139e0090d978bf95c6c81f502e98 Mon Sep 17 00:00:00 2001 From: Haoming Date: Fri, 28 Feb 2025 19:25:35 +0800 Subject: [PATCH 1/5] uv hook --- launch.py | 5 +++++ modules/cmd_args.py | 1 + modules/uv_hook.py | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+) create mode 100644 modules/uv_hook.py diff --git a/launch.py b/launch.py index f83820d25..3c9659914 100644 --- a/launch.py +++ b/launch.py @@ -6,6 +6,11 @@ git = launch_utils.git index_url = launch_utils.index_url dir_repos = launch_utils.dir_repos +if args.uv: + from modules.uv_hook import patch + patch() + + commit_hash = launch_utils.commit_hash git_tag = launch_utils.git_tag diff --git a/modules/cmd_args.py b/modules/cmd_args.py index d71982b2c..2ebe267cc 100644 --- a/modules/cmd_args.py +++ b/modules/cmd_args.py @@ -126,3 +126,4 @@ parser.add_argument("--skip-load-model-at-start", action='store_true', help="if parser.add_argument("--unix-filenames-sanitization", action='store_true', help="allow any symbols except '/' in filenames. May conflict with your browser and file system") parser.add_argument("--filenames-max-length", type=int, default=128, help='maximal length of filenames of saved images. If you override it, it can conflict with your file system') parser.add_argument("--no-prompt-history", action='store_true', help="disable read prompt from last generation feature; settings this argument will not create '--data_path/params.txt' file") +parser.add_argument("--uv", action='store_true', help="use the uv package manager") diff --git a/modules/uv_hook.py b/modules/uv_hook.py new file mode 100644 index 000000000..4f1392f4a --- /dev/null +++ b/modules/uv_hook.py @@ -0,0 +1,39 @@ +import shlex +import subprocess +from functools import wraps + + +def patch(): + if hasattr(subprocess, "__original_run"): + return + + print("using uv") + subprocess.__original_run = subprocess.run + + @wraps(subprocess.__original_run) + def patched_run(*args, **kwargs): + if args: + command, *_args = args + else: + command, _args = kwargs.pop("args", ""), () + + if isinstance(command, str): + command = shlex.split(command) + else: + command = [arg.strip() for arg in command] + + assert isinstance(command, list) + + if "pip" not in command: + return subprocess.__original_run([*command, *_args], **kwargs) + + cmd = command[command.index("pip") + 1 :] + + BAD_FLAGS = ("--prefer-binary",) + cmd = [arg for arg in cmd if arg not in BAD_FLAGS] + + modified_command = ["uv", "pip", *cmd] + + return subprocess.__original_run([*modified_command, *_args], **kwargs) + + subprocess.run = patched_run From c59a2badd250b6c1e163eafe5bdb881cfe0a97c7 Mon Sep 17 00:00:00 2001 From: w-e-w <40751091+w-e-w@users.noreply.github.com> Date: Fri, 28 Feb 2025 23:08:27 +0900 Subject: [PATCH 2/5] auto install uv --- modules/uv_hook.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/uv_hook.py b/modules/uv_hook.py index 4f1392f4a..f9360012d 100644 --- a/modules/uv_hook.py +++ b/modules/uv_hook.py @@ -1,3 +1,4 @@ +import sys import shlex import subprocess from functools import wraps @@ -8,6 +9,11 @@ def patch(): return print("using uv") + try: + subprocess.run(['uv', '-V']) + except FileNotFoundError: + subprocess.run([sys.executable, '-m', 'pip', 'install', 'uv']) + subprocess.__original_run = subprocess.run @wraps(subprocess.__original_run) From 9d1accfea0844af8dfcc40f314be44b439a3c09f Mon Sep 17 00:00:00 2001 From: w-e-w <40751091+w-e-w@users.noreply.github.com> Date: Fri, 28 Feb 2025 23:51:37 +0900 Subject: [PATCH 3/5] fallback to pip if uv failes --- modules/uv_hook.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/modules/uv_hook.py b/modules/uv_hook.py index f9360012d..21cb2fb93 100644 --- a/modules/uv_hook.py +++ b/modules/uv_hook.py @@ -1,4 +1,5 @@ import sys +import copy import shlex import subprocess from functools import wraps @@ -18,10 +19,11 @@ def patch(): @wraps(subprocess.__original_run) def patched_run(*args, **kwargs): + _kwargs = copy.copy(kwargs) if args: command, *_args = args else: - command, _args = kwargs.pop("args", ""), () + command, _args = _kwargs.pop("args", ""), () if isinstance(command, str): command = shlex.split(command) @@ -31,7 +33,7 @@ def patch(): assert isinstance(command, list) if "pip" not in command: - return subprocess.__original_run([*command, *_args], **kwargs) + return subprocess.__original_run([*command, *_args], **_kwargs) cmd = command[command.index("pip") + 1 :] @@ -40,6 +42,9 @@ def patch(): modified_command = ["uv", "pip", *cmd] - return subprocess.__original_run([*modified_command, *_args], **kwargs) + result = subprocess.__original_run([*modified_command, *_args], **_kwargs) + if result.returncode != 0: + return subprocess.__original_run(*args, **kwargs) + return result subprocess.run = patched_run From 7fd7fc67f7f438f5f0ce59be860687f66648c688 Mon Sep 17 00:00:00 2001 From: w-e-w <40751091+w-e-w@users.noreply.github.com> Date: Fri, 28 Feb 2025 23:52:58 +0900 Subject: [PATCH 4/5] add -I to uv BAD_FLAGS --- modules/uv_hook.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/uv_hook.py b/modules/uv_hook.py index 21cb2fb93..1e27e9b78 100644 --- a/modules/uv_hook.py +++ b/modules/uv_hook.py @@ -4,6 +4,8 @@ import shlex import subprocess from functools import wraps +BAD_FLAGS = ("--prefer-binary", '-I', '--ignore-installed') + def patch(): if hasattr(subprocess, "__original_run"): @@ -35,9 +37,8 @@ def patch(): if "pip" not in command: return subprocess.__original_run([*command, *_args], **_kwargs) - cmd = command[command.index("pip") + 1 :] + cmd = command[command.index("pip") + 1:] - BAD_FLAGS = ("--prefer-binary",) cmd = [arg for arg in cmd if arg not in BAD_FLAGS] modified_command = ["uv", "pip", *cmd] From 435b1df2dbfb9740b65d29fceb3eedba37a98207 Mon Sep 17 00:00:00 2001 From: w-e-w <40751091+w-e-w@users.noreply.github.com> Date: Sat, 1 Mar 2025 00:17:31 +0900 Subject: [PATCH 5/5] remove assert, original run with original args --- modules/uv_hook.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/uv_hook.py b/modules/uv_hook.py index 1e27e9b78..99e89ef10 100644 --- a/modules/uv_hook.py +++ b/modules/uv_hook.py @@ -32,10 +32,8 @@ def patch(): else: command = [arg.strip() for arg in command] - assert isinstance(command, list) - - if "pip" not in command: - return subprocess.__original_run([*command, *_args], **_kwargs) + if not isinstance(command, list) or "pip" not in command: + return subprocess.__original_run(*args, **kwargs) cmd = command[command.index("pip") + 1:]