the "restore" env variable in .bat launcher confuses pydantic

This commit is contained in:
Lincoln Stein 2023-06-04 22:53:46 -04:00
parent 999c092b6a
commit 117536324c
2 changed files with 15 additions and 15 deletions

View File

@ -19,30 +19,30 @@ echo 8. Open the developer console
echo 9. Update InvokeAI echo 9. Update InvokeAI
echo 10. Command-line help echo 10. Command-line help
echo Q - Quit echo Q - Quit
set /P restore="Please enter 1-10, Q: [2] " set /P choice="Please enter 1-10, Q: [2] "
if not defined restore set restore=2 if not defined choice set choice=2
IF /I "%restore%" == "1" ( IF /I "%choice%" == "1" (
echo Starting the InvokeAI browser-based UI.. echo Starting the InvokeAI browser-based UI..
python .venv\Scripts\invokeai-web.exe %* python .venv\Scripts\invokeai-web.exe %*
) ELSE IF /I "%restore%" == "2" ( ) ELSE IF /I "%choice%" == "2" (
echo Starting the InvokeAI command-line.. echo Starting the InvokeAI command-line..
python .venv\Scripts\invokeai.exe %* python .venv\Scripts\invokeai.exe %*
) ELSE IF /I "%restore%" == "3" ( ) ELSE IF /I "%choice%" == "3" (
echo Starting textual inversion training.. echo Starting textual inversion training..
python .venv\Scripts\invokeai-ti.exe --gui python .venv\Scripts\invokeai-ti.exe --gui
) ELSE IF /I "%restore%" == "4" ( ) ELSE IF /I "%choice%" == "4" (
echo Starting model merging script.. echo Starting model merging script..
python .venv\Scripts\invokeai-merge.exe --gui python .venv\Scripts\invokeai-merge.exe --gui
) ELSE IF /I "%restore%" == "5" ( ) ELSE IF /I "%choice%" == "5" (
echo Running invokeai-model-install... echo Running invokeai-model-install...
python .venv\Scripts\invokeai-model-install.exe python .venv\Scripts\invokeai-model-install.exe
) ELSE IF /I "%restore%" == "6" ( ) ELSE IF /I "%choice%" == "6" (
echo Running invokeai-configure... echo Running invokeai-configure...
python .venv\Scripts\invokeai-configure.exe --skip-sd-weight --skip-support-models python .venv\Scripts\invokeai-configure.exe --skip-sd-weight --skip-support-models
) ELSE IF /I "%restore%" == "7" ( ) ELSE IF /I "%choice%" == "7" (
echo Running invokeai-configure... echo Running invokeai-configure...
python .venv\Scripts\invokeai-configure.exe --yes --default_only python .venv\Scripts\invokeai-configure.exe --yes --default_only
) ELSE IF /I "%restore%" == "8" ( ) ELSE IF /I "%choice%" == "8" (
echo Developer Console echo Developer Console
echo Python command is: echo Python command is:
where python where python
@ -54,15 +54,15 @@ IF /I "%restore%" == "1" (
echo ************************* echo *************************
echo *** Type `exit` to quit this shell and deactivate the Python virtual environment *** echo *** Type `exit` to quit this shell and deactivate the Python virtual environment ***
call cmd /k call cmd /k
) ELSE IF /I "%restore%" == "9" ( ) ELSE IF /I "%choice%" == "9" (
echo Running invokeai-update... echo Running invokeai-update...
python .venv\Scripts\invokeai-update.exe %* python .venv\Scripts\invokeai-update.exe %*
) ELSE IF /I "%restore%" == "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 %*
pause pause
exit /b exit /b
) ELSE IF /I "%restore%" == "q" ( ) ELSE IF /I "%choice%" == "q" (
echo Goodbye! echo Goodbye!
goto ending goto ending
) ELSE ( ) ELSE (

View File

@ -55,8 +55,8 @@ from .widgets import (
from invokeai.app.services.config import get_invokeai_config from invokeai.app.services.config import get_invokeai_config
# minimum size for the UI # minimum size for the UI
MIN_COLS = 140 MIN_COLS = 120
MIN_LINES = 52 MIN_LINES = 30
config = get_invokeai_config(argv=[]) config = get_invokeai_config(argv=[])