feat: extend eval to all valid types

This commit is contained in:
Manuel Schmid
2024-06-06 18:37:00 +02:00
parent beab2b9d48
commit bef79e3cb4
2 changed files with 8 additions and 8 deletions
+2 -2
View File
@@ -9,7 +9,7 @@ import modules.flags
import modules.sdxl_styles import modules.sdxl_styles
from modules.model_loader import load_file_from_url from modules.model_loader import load_file_from_url
from modules.extra_utils import makedirs_with_log, get_files_from_folder, try_parse_bool from modules.extra_utils import makedirs_with_log, get_files_from_folder, try_eval_env_var
from modules.flags import OutputFormat, Performance, MetadataScheme from modules.flags import OutputFormat, Performance, MetadataScheme
@@ -209,7 +209,7 @@ def get_config_item_or_set_default(key, default_value, validator, disable_empty_
v = os.getenv(key) v = os.getenv(key)
if v is not None: if v is not None:
v = try_parse_bool(v) v = try_eval_env_var(v)
print(f"Environment: {key} = {v}") print(f"Environment: {key} = {v}")
config_dict[key] = v config_dict[key] = v
+6 -6
View File
@@ -28,11 +28,11 @@ def get_files_from_folder(folder_path, extensions=None, name_filter=None):
return filenames return filenames
def try_parse_bool(value: str) -> str | bool: def try_eval_env_var(value: str, expected_type=None) -> str | bool:
try: try:
value_eval = literal_eval(value.strip().title()) value_eval = literal_eval(value.title())
if type(value_eval) is bool: if expected_type is not None and type(value_eval) is not expected_type:
return value_eval return value
return value return value_eval
except ValueError | TypeError: except:
return value return value