installer version check

Signed-off-by: Vladimir Mandic <mandic00@live.com>
pull/3957/head
Vladimir Mandic 2025-05-24 08:42:13 +02:00
parent 85f00f9edb
commit bfc5c7c457
3 changed files with 29 additions and 26 deletions

View File

@ -1392,6 +1392,7 @@ def check_version(offline=False, reset=True): # pylint: disable=unused-argument
args.skip_git = True # pylint: disable=attribute-defined-outside-init
ver = get_version()
log.info(f'Version: {print_dict(ver)}')
branch_name = ver['branch'] if ver is not None and 'branch' in ver else 'master'
if args.version or args.skip_git:
return
check_ui(ver)
@ -1406,30 +1407,29 @@ def check_version(offline=False, reset=True): # pylint: disable=unused-argument
return
commits = None
try:
commits = requests.get('https://api.github.com/repos/vladmandic/sdnext/branches/master', timeout=10).json()
if commits['commit']['sha'] != commit:
if args.upgrade:
global quick_allowed # pylint: disable=global-statement
quick_allowed = False
log.info('Updating main repository')
try:
git('add .')
git('stash')
update('.', keep_branch=True)
# git('git stash pop')
ver = git('log -1 --pretty=format:"%h %ad"')
log.info(f'Repository upgraded: {ver}')
except Exception:
if not reset:
log.error('Repository error upgrading')
else:
log.warning('Repository: retrying upgrade...')
git_reset()
check_version(offline=offline, reset=False)
else:
dt = commits["commit"]["commit"]["author"]["date"]
commit = commits["commit"]["sha"][:8]
log.info(f'Version: check latest available hash={commit} updated={dt}')
commits = requests.get(f'https://api.github.com/repos/vladmandic/sdnext/branches/{branch_name}', timeout=10).json()
if commits['commit']['sha'] != commit and args.upgrade:
global quick_allowed # pylint: disable=global-statement
quick_allowed = False
log.info('Updating main repository')
try:
git('add .')
git('stash')
update('.', keep_branch=True)
# git('git stash pop')
ver = git('log -1 --pretty=format:"%h %ad"')
log.info(f'Repository upgraded: {ver}')
except Exception:
if not reset:
log.error('Repository error upgrading')
else:
log.warning('Repository: retrying upgrade...')
git_reset()
check_version(offline=offline, reset=False)
else:
dt = commits["commit"]["commit"]["author"]["date"]
commit = commits["commit"]["sha"][:8]
log.info(f'Version: app=sd.next latest={dt} hash={commit} branch={branch_name}')
except Exception as e:
log.error(f'Repository failed to check version: {e} {commits}')
ts('latest', t_start)

View File

@ -264,8 +264,11 @@ def main():
installer.check_onnx()
installer.check_diffusers()
installer.check_modified_files()
if args.test:
installer.log.info('Startup: test mode')
installer.quick_allowed = False
if args.reinstall:
installer.log.info('Forcing reinstall of all packages')
installer.log.info('Startup: force reinstall of all packages')
installer.quick_allowed = False
if args.skip_all:
installer.log.info('Startup: skip all')

2
wiki

@ -1 +1 @@
Subproject commit 25c8a39adecd2a9683aace950599330b72031032
Subproject commit ffd60bd24aec14e8613202eec3f92a889c40216c