oobabooga/text-generation-webui
1
0
Fork 0
mirror of https://github.com/oobabooga/text-generation-webui.git synced 2026-01-20 07:30:19 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Installer: Fix a bug after ecb5d3c485

Browse source
This commit is contained in:
oobabooga 2025-01-21 09:31:06 -08:00
parent 5e99dded4e
commit 2bf8788c30
2 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -32,6 +32,7 @@ venv
.direnv
.vs
.vscode
.wheels_changed_flag
*.bak
*.ipynb
*.log

34
one_click.py
View file

@ -362,13 +362,17 @@ def update_requirements(initial_installation=False, pull=True):
requirements_file = base_requirements
# Call git pull
before_pull_whl_lines = []
if os.path.exists(requirements_file):
with open(requirements_file, 'r') as f:
before_pull_whl_lines = [line for line in f if '.whl' in line]
# Call git pull, while checking if .whl requirements have changed
wheels_changed_from_flag = False
if os.path.exists('.wheels_changed_flag'):
os.remove('.wheels_changed_flag')
wheels_changed_from_flag = True
if pull:
if os.path.exists(requirements_file):
with open(requirements_file, 'r') as f:
before_pull_whl_lines = [line for line in f if '.whl' in line]
print_big_message("Updating the local copy of the repository with \"git pull\"")
files_to_check = [
@ -381,16 +385,25 @@ def update_requirements(initial_installation=False, pull=True):
run_cmd("git pull --autostash", assert_success=True, environment=True)
after_pull_hashes = {file_name: calculate_file_hash(file_name) for file_name in files_to_check}
if os.path.exists(requirements_file):
with open(requirements_file, 'r') as f:
after_pull_whl_lines = [line for line in f if '.whl' in line]
# Check for differences in installation file hashes
for file_name in files_to_check:
if before_pull_hashes[file_name] != after_pull_hashes[file_name]:
print_big_message(f"File '{file_name}' was updated during 'git pull'. Please run the script again.")
# Check if wheels changed during this pull
wheels_changed = before_pull_whl_lines != after_pull_whl_lines
if wheels_changed:
open('.wheels_changed_flag', 'w').close()
exit(1)
after_pull_whl_lines = []
if os.path.exists(requirements_file):
with open(requirements_file, 'r') as f:
after_pull_whl_lines = [line for line in f if '.whl' in line]
wheels_changed = wheels_changed_from_flag
if pull:
wheels_changed = wheels_changed or (before_pull_whl_lines != after_pull_whl_lines)
if os.environ.get("INSTALL_EXTENSIONS", "").lower() in ("yes", "y", "true", "1", "t", "on"):
install_extensions_requirements()
@ -405,8 +418,7 @@ def update_requirements(initial_installation=False, pull=True):
# Prepare the requirements file
textgen_requirements = open(requirements_file).read().splitlines()
whl_changed = before_pull_whl_lines != after_pull_whl_lines
if not initial_installation and not whl_changed:
if not initial_installation and not wheels_changed:
textgen_requirements = [line for line in textgen_requirements if not '.whl' in line]
if is_cuda118: