Mirrored_Repos/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2024-08-30 20:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

allow user to abort conversion of V2 models from within TUI

Browse Source
This commit is contained in:
Lincoln Stein 2023-06-06 17:21:50 -04:00
parent f5044c290d
commit 5eeb4b8e06
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
invokeai/frontend/install/model_install.py
View File

@ -696,22 +696,24 @@ class StderrToMessage():
def ask_user_for_config_file(model_path: Path, def ask_user_for_config_file(model_path: Path,
tui_conn: Connection=None tui_conn: Connection=None
)->Path: )->Path:
logger.debug('Waiting for user action in dialog box (above).')
if tui_conn: if tui_conn:
logger.debug('Waiting for user response...')
return _ask_user_for_cf_tui(model_path, tui_conn) return _ask_user_for_cf_tui(model_path, tui_conn)
else: else:
return _ask_user_for_cf_cmdline(model_path) return _ask_user_for_cf_cmdline(model_path)
def _ask_user_for_cf_cmdline(model_path): def _ask_user_for_cf_cmdline(model_path):
choices = [ choices = [
config.model_conf_path / 'stable-diffusion' / x config.legacy_conf_path / x
for x in ['v2-inference.yaml','v2-inference-v.yaml'] for x in ['v2-inference.yaml','v2-inference-v.yaml']
] ]
choices.extend([None])
print( print(
f""" f"""
Please select the type of the V2 checkpoint named {model_path.name}: Please select the type of the V2 checkpoint named {model_path.name}:
[1] A Stable Diffusion v2.x base model (512 pixels; there should be no 'parameterization:' line in its yaml file) [1] A Stable Diffusion v2.x base model (512 pixels; there should be no 'parameterization:' line in its yaml file)
[2] A Stable Diffusion v2.x v-predictive model (768 pixels; look for a 'parameterization: "v"' line in its yaml file) [2] A Stable Diffusion v2.x v-predictive model (768 pixels; look for a 'parameterization: "v"' line in its yaml file)
[3] Skip this model and come back later.
""" """
) )
choice = None choice = None
@ -738,6 +740,9 @@ def _ask_user_for_cf_tui(model_path: Path, tui_conn: Connection)->Path:
return config.legacy_conf_path / 'v2-inference.yaml' return config.legacy_conf_path / 'v2-inference.yaml'
elif response == 'v': elif response == 'v':
return config.legacy_conf_path / 'v2-inference-v.yaml' return config.legacy_conf_path / 'v2-inference-v.yaml'
elif response == 'abort':
logger.info('Conversion aborted')
return None
else: else:
return Path(response) return Path(response)
except: except:

7
invokeai/frontend/install/widgets.py
View File

@ -377,6 +377,7 @@ def select_stable_diffusion_config_file(
options=[ options=[
"An SD v2.x base model (512 pixels; no 'parameterization:' line in its yaml file)", "An SD v2.x base model (512 pixels; no 'parameterization:' line in its yaml file)",
"An SD v2.x v-predictive model (768 pixels; 'parameterization: \"v\"' line in its yaml file)", "An SD v2.x v-predictive model (768 pixels; 'parameterization: \"v\"' line in its yaml file)",
"Skip installation for now and come back later",
"Enter config file path manually", "Enter config file path manually",
] ]
@ -416,7 +417,7 @@ def select_stable_diffusion_config_file(
def toggle_visible(value): def toggle_visible(value):
value = value[0] value = value[0]
if value==2: if value==3:
file.hidden=False file.hidden=False
else: else:
file.hidden=True file.hidden=True
@ -428,6 +429,6 @@ def select_stable_diffusion_config_file(
F.edit() F.edit()
if not F.value: if not F.value:
return None return None
assert choice.value[0] in range(0,3),'invalid choice' assert choice.value[0] in range(0,4),'invalid choice'
choices = ['epsilon','v',file.value] choices = ['epsilon','v','abort',file.value]
return choices[choice.value[0]] return choices[choice.value[0]]