From f795dd5c2004c15bb25ce417ad7b56a08b409c45 Mon Sep 17 00:00:00 2001 From: mrq Date: Thu, 9 Mar 2023 02:31:32 +0000 Subject: [PATCH] you might be wondering why so many small commits instead of rolling the HEAD back one to just combine them, i don't want to force push and roll back the paperspace i'm testing in --- src/utils.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/utils.py b/src/utils.py index 1f4e8fd..d23dd73 100755 --- a/src/utils.py +++ b/src/utils.py @@ -1856,10 +1856,12 @@ def import_generate_settings(file="./config/generate.json"): res = [] if GENERATE_SETTINGS_ARGS is not None: for k in GENERATE_SETTINGS_ARGS: - res.append(defaults[k] if not settings or settings[k] is None else settings[k]) + if k not in defaults: + continue + res.append(defaults[k] if not settings or k not in settings or not settings[k] is None else settings[k]) else: for k in defaults: - res.append(defaults[k] if not settings or settings[k] is None else settings[k]) + res.append(defaults[k] if not settings or k not in settings or not settings[k] is None else settings[k]) return tuple(res)