speculative change to upgrade script

This commit is contained in:
Lincoln Stein 2023-07-08 11:45:26 -04:00
parent ae835f47b6
commit 69ef1e1e56
3 changed files with 12 additions and 6 deletions

View File

@ -56,7 +56,7 @@ IF /I "%choice%" == "1" (
call cmd /k call cmd /k
) ELSE IF /I "%choice%" == "9" ( ) ELSE IF /I "%choice%" == "9" (
echo Running invokeai-update... echo Running invokeai-update...
python .venv\Scripts\invokeai-update.exe %* python -m invokeai.frontend.install.invokeai_update
) ELSE IF /I "%choice%" == "10" ( ) ELSE IF /I "%choice%" == "10" (
echo Displaying command line help... echo Displaying command line help...
python .venv\Scripts\invokeai.exe --help %* python .venv\Scripts\invokeai.exe --help %*

View File

@ -93,7 +93,7 @@ do_choice() {
9) 9)
clear clear
printf "Update InvokeAI\n" printf "Update InvokeAI\n"
invokeai-update python -m invokeai.frontend.install.invokeai_update
;; ;;
10) 10)
clear clear

View File

@ -853,16 +853,22 @@ class ModelManager(object):
scanned_dirs.add(path) scanned_dirs.add(path)
continue continue
if any([(path/x).exists() for x in {'config.json','model_index.json','learned_embeds.bin','pytorch_lora_weights.bin'}]): if any([(path/x).exists() for x in {'config.json','model_index.json','learned_embeds.bin','pytorch_lora_weights.bin'}]):
try:
new_models_found.update(installer.heuristic_import(path)) new_models_found.update(installer.heuristic_import(path))
scanned_dirs.add(path) scanned_dirs.add(path)
except ValueError as e:
self.logger.warning(str(e))
for f in files: for f in files:
path = Path(root) / f path = Path(root) / f
if path in known_paths or path.parent in scanned_dirs: if path in known_paths or path.parent in scanned_dirs:
continue continue
if path.suffix in {'.ckpt','.bin','.pth','.safetensors','.pt'}: if path.suffix in {'.ckpt','.bin','.pth','.safetensors','.pt'}:
try:
import_result = installer.heuristic_import(path) import_result = installer.heuristic_import(path)
new_models_found.update(import_result) new_models_found.update(import_result)
except ValueError as e:
self.logger.warning(str(e))
self.logger.info(f'Scanned {items_scanned} files and directories, imported {len(new_models_found)} models') self.logger.info(f'Scanned {items_scanned} files and directories, imported {len(new_models_found)} models')
installed.update(new_models_found) installed.update(new_models_found)