From 2f7092ea528490c65ce6907add98af5cf63273ac Mon Sep 17 00:00:00 2001 From: alex patrie Date: Fri, 14 Apr 2023 23:32:30 -0400 Subject: [PATCH] Added Optional type to log in Config object as per GH Issue #56 --- biosimulators_utils/config.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/biosimulators_utils/config.py b/biosimulators_utils/config.py index e288cb2e..fc62181f 100644 --- a/biosimulators_utils/config.py +++ b/biosimulators_utils/config.py @@ -90,7 +90,7 @@ def __init__(self, PLOTS_PATH:str=DEFAULT_PLOTS_PATH, BUNDLE_OUTPUTS:bool=True, KEEP_INDIVIDUAL_OUTPUTS:bool=True, - LOG:bool=True, + LOG:Optional[bool]=True, LOG_PATH:str=DEFAULT_LOG_PATH, BIOSIMULATORS_API_ENDPOINT:str=DEFAULT_BIOSIMULATORS_API_ENDPOINT, BIOSIMULATIONS_API_ENDPOINT:str=DEFAULT_BIOSIMULATIONS_API_ENDPOINT, @@ -165,7 +165,7 @@ def __init__(self, self.DEBUG = DEBUG -def get_config(report_format:str='h5', viz_format:str='pdf'): +def get_config(report_format:str='h5', viz_format:str='pdf', log_source=os.environ.get('LOG', '1').lower() in ['1', 'true']): """ Get the configuration Returns: @@ -209,7 +209,8 @@ def get_config(report_format:str='h5', viz_format:str='pdf'): PLOTS_PATH=os.environ.get('PLOTS_PATH', DEFAULT_PLOTS_PATH), BUNDLE_OUTPUTS=os.environ.get('BUNDLE_OUTPUTS', '1').lower() in ['1', 'true'], KEEP_INDIVIDUAL_OUTPUTS=os.environ.get('KEEP_INDIVIDUAL_OUTPUTS', '1').lower() in ['1', 'true'], - LOG=os.environ.get('LOG', '1').lower() in ['1', 'true'], + #LOG=os.environ.get('LOG', '1').lower() in ['1', 'true'], + LOG=log_source, LOG_PATH=os.environ.get('LOG_PATH', DEFAULT_LOG_PATH), BIOSIMULATORS_API_ENDPOINT=os.environ.get('BIOSIMULATORS_API_ENDPOINT', DEFAULT_BIOSIMULATORS_API_ENDPOINT), BIOSIMULATIONS_API_ENDPOINT=os.environ.get('BIOSIMULATIONS_API_ENDPOINT', DEFAULT_BIOSIMULATIONS_API_ENDPOINT),