diff --git a/mainscripts/Extractor.py b/mainscripts/Extractor.py index bf99404..efb3259 100644 --- a/mainscripts/Extractor.py +++ b/mainscripts/Extractor.py @@ -753,7 +753,7 @@ def main(detector=None, io.log_err("Error in fetching the last index. Extraction cannot be continued.") return elif input_path != output_path: - io.input(f"\n WARNING !!! \n {output_path} contains files! \n They will be deleted. \n Press enter to continue.\n", "4") + io.input(f"\n WARNING !!! \n {output_path} contains files! \n They will be deleted. \n Press enter to continue.\n", answer_key="Extractor_continue_deleting_files") for filename in output_images_paths: Path(filename).unlink() diff --git a/mainscripts/Trainer.py b/mainscripts/Trainer.py index 7cee04d..bb24f17 100644 --- a/mainscripts/Trainer.py +++ b/mainscripts/Trainer.py @@ -84,7 +84,7 @@ def trainerThread (s2c, c2s, e, if model.get_target_iter() != 0: if is_reached_goal: io.log_info('Model already trained to target iteration. You can use preview.') - if io.get_default_answer('NoInteractiveMode') is not None: + if io.get_default_answer('NonInteractiveMode') is not None: model_save() os._exit(0) else: @@ -166,7 +166,7 @@ def trainerThread (s2c, c2s, e, model_save() is_reached_goal = True io.log_info ('You can use preview now.') - if io.get_default_answer('NoInteractiveMode') is not None: + if io.get_default_answer('NonInteractiveMode') is not None: model_save() os._exit(0) need_save = False diff --git a/merger/MergerConfig.py b/merger/MergerConfig.py index 3cf5b6e..e7a17b4 100644 --- a/merger/MergerConfig.py +++ b/merger/MergerConfig.py @@ -36,7 +36,7 @@ class MergerConfig(object): for key in self.sharpen_dict.keys(): s += f"""({key}) {self.sharpen_dict[key]}\n""" io.log_info(s) - self.sharpen_mode = io.input_int ("", 0, valid_list=self.sharpen_dict.keys(), help_message="Enhance details by applying sharpen filter.", answer_key="1") + self.sharpen_mode = io.input_int ("", 0, valid_list=self.sharpen_dict.keys(), help_message="Enhance details by applying sharpen filter.", answer_key="enhance_details_sharpen_filters") if self.sharpen_mode != 0: self.blursharpen_amount = np.clip ( io.input_int ("Choose blur/sharpen amount", 0, add_info="-100..100"), -100, 100 ) @@ -193,7 +193,7 @@ class MergerConfigMasked(MergerConfig): for key in mode_dict.keys(): s += f"""({key}) {mode_dict[key]}\n""" io.log_info(s) - mode = io.input_int ("", mode_str_dict.get(self.default_mode, 1) , answer_key="2") + mode = io.input_int ("", mode_str_dict.get(self.default_mode, 1) , answer_key="choose_mode") self.mode = mode_dict.get (mode, self.default_mode ) if 'raw' not in self.mode: @@ -207,7 +207,7 @@ class MergerConfigMasked(MergerConfig): for key in mask_mode_dict.keys(): s += f"""({key}) {mask_mode_dict[key]}\n""" io.log_info(s) - self.mask_mode = io.input_int ("", 1, valid_list=mask_mode_dict.keys(), answer_key="3" ) + self.mask_mode = io.input_int ("", 1, valid_list=mask_mode_dict.keys(), answer_key="choose_mask_mode" ) if 'raw' not in self.mode: self.erode_mask_modifier = np.clip ( io.input_int ("Choose erode mask modifier", 0, add_info="-400..400"), -400, 400) diff --git a/models/ModelBase.py b/models/ModelBase.py index a9dc838..93c378f 100644 --- a/models/ModelBase.py +++ b/models/ModelBase.py @@ -80,7 +80,7 @@ class ModelBase(object): s += "- latest" io.log_info (s) - inp = io.input_str(f"", "0", show_default_value=False, answer_key = "5") + inp = io.input_str(f"", "0", show_default_value=False, answer_key = "choose_model_name") model_idx = -1 try: model_idx = np.clip ( int(inp), 0, len(saved_models_names)-1 ) @@ -295,7 +295,7 @@ class ModelBase(object): self.choose_preview_history = io.input_bool("Randomly choose new image for preview history", False, help_message="Preview image history will stay stuck with old faces if you reuse the same model on different celebs. Choose no unless you are changing src/dst to a new person") def ask_target_iter(self, default_value=0): - if io.get_default_answer('NoInteractiveMode') is not None: + if io.get_default_answer('NonInteractiveMode') is not None: default_target_iter = self.load_or_def_option('target_iter', default_value + 10000) self.options['target_iter'] = max(0, default_target_iter + 10000) print("TARGET ITERATION: " + str(self.options['target_iter']))