diff --git a/core/interact/interact.py b/core/interact/interact.py index 577584c..b9769c4 100644 --- a/core/interact/interact.py +++ b/core/interact/interact.py @@ -221,15 +221,11 @@ class InteractBase(object): return ar def get_default_answer(self, answer_key): - #f = open("/home/deepfake/interact.txt", "a") - #f.write(answer_key + "\n") - #f.close() if answer_key in self.default_answers: return self.default_answers[answer_key] return None def input(self, s, answer_key): - print(s) ans = self.get_default_answer(answer_key) if ans is not None: return ans @@ -284,7 +280,6 @@ class InteractBase(object): answer_key = answer_key if answer_key is not None else s if show_default_value: if len(s) != 0: - s_base = s s = f"[{default_value}] {s}" else: s = f"[{default_value}]" @@ -423,6 +418,9 @@ class InteractBase(object): sq.put (False) def input_in_time (self, str, max_time_sec, answer_key=None): + answer_key = answer_key if answer_key is not None else s + if self.get_default_answer(answer_key) is not None: + return self.get_default_answer(answer_key) sq = multiprocessing.Queue() p = multiprocessing.Process(target=self.input_process, args=( sys.stdin.fileno(), sq, str)) p.daemon = True @@ -431,9 +429,6 @@ class InteractBase(object): inp = False while True: - if 'Override' in self.default_answers: - inp = True - break if not sq.empty(): inp = sq.get() break diff --git a/core/interact/no_interact_dict.py b/core/interact/no_interact_dict.py index 7a51559..dd4d55c 100644 --- a/core/interact/no_interact_dict.py +++ b/core/interact/no_interact_dict.py @@ -47,7 +47,7 @@ dictionary = { 'Choose image degrade by bicubic rescale power' : '0', 'Degrade color power of final image' : '0', 'Color transfer to predicted face' : 'rct', - 'Override' : 'y', + 'Press enter in 2 seconds to override model settings.' : 'y', } cmd = 'mkdir DeepFaceLab_Linux/workspace/interact' os.system(cmd) diff --git a/mainscripts/Trainer.py b/mainscripts/Trainer.py index 4688e0f..750a2fb 100644 --- a/mainscripts/Trainer.py +++ b/mainscripts/Trainer.py @@ -85,10 +85,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 os.path.exists(answer_filename): - with open(answer_filename, 'rb') as file: - parameters = pickle.load(file) - if parameters['NoInteractiveMode']: + if io.get_default_answer('NoInteractiveMode') is not None: model_save() os._exit(0) else: @@ -170,10 +167,7 @@ def trainerThread (s2c, c2s, e, model_save() is_reached_goal = True io.log_info ('You can use preview now.') - if os.path.exists(answer_filename): - with open(answer_filename, 'rb') as file: - parameters = pickle.load(file) - if parameters['NoInteractiveMode']: + if io.get_default_answer('NoInteractiveMode') is not None: model_save() os._exit(0) need_save = False diff --git a/models/ModelBase.py b/models/ModelBase.py index 81be71f..2ab5113 100644 --- a/models/ModelBase.py +++ b/models/ModelBase.py @@ -296,15 +296,12 @@ class ModelBase(object): def ask_target_iter(self, default_value=0): answer_filename = 'workspace/interact/interact_dict.pkl' - if os.path.exists(answer_filename): - with open(answer_filename, 'rb') as file: - parameters = pickle.load(file) - if parameters['NoInteractiveMode']: + if io.get_default_answer('NoInteractiveMode') is not None: print("Entro in ask_target_iter") 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'])) - else: + else: default_target_iter = self.load_or_def_option('target_iter', default_value) self.options['target_iter'] = max(0, io.input_int("Target iteration", default_target_iter)) else: