diff --git a/relecov_tools/assets/schema_utils/custom_validators.py b/relecov_tools/assets/schema_utils/custom_validators.py index 20ddcd53..9c61033d 100644 --- a/relecov_tools/assets/schema_utils/custom_validators.py +++ b/relecov_tools/assets/schema_utils/custom_validators.py @@ -32,7 +32,7 @@ def validate_with_exceptions(schema, data, errors): if ( error.validator == "type" and error.instance - == relecov_tools.config_json.ConfigJson().get_topic_data( + == relecov_tools.config_json.ConfigJson(extra_config=True).get_topic_data( "generic", "not_provided_field" ) and prop_schema.get("type") in ["integer", "number"] @@ -43,7 +43,7 @@ def validate_with_exceptions(schema, data, errors): if ( error.validator == "format" and error.instance - == relecov_tools.config_json.ConfigJson().get_topic_data( + == relecov_tools.config_json.ConfigJson(extra_config=True).get_topic_data( "generic", "not_provided_field" ) and prop_schema.get("type") == "string" diff --git a/relecov_tools/download.py b/relecov_tools/download.py index fcc29bb4..24f81f30 100755 --- a/relecov_tools/download.py +++ b/relecov_tools/download.py @@ -49,7 +49,7 @@ def __init__( """Initializes the sftp object""" super().__init__(output_dir=output_dir, called_module="download") self.log.info("Initiating download process") - config_json = ConfigJson() + config_json = ConfigJson(extra_config=True) self.allowed_file_ext = config_json.get_topic_data( "sftp_handle", "allowed_file_extensions" ) diff --git a/relecov_tools/sftp_client.py b/relecov_tools/sftp_client.py index 3a7ef0c0..e6faedcb 100644 --- a/relecov_tools/sftp_client.py +++ b/relecov_tools/sftp_client.py @@ -33,7 +33,7 @@ class SftpClient: def __init__(self, conf_file=None, username=None, password=None): if not conf_file: - config_json = ConfigJson() + config_json = ConfigJson(extra_config=True) self.sftp_server = config_json.get_topic_data("sftp_handle", "sftp_server") self.sftp_port = config_json.get_topic_data("sftp_handle", "sftp_port") else: diff --git a/relecov_tools/upload_database.py b/relecov_tools/upload_database.py index 581c697c..c40279c1 100644 --- a/relecov_tools/upload_database.py +++ b/relecov_tools/upload_database.py @@ -38,7 +38,7 @@ def __init__( self.logsum = self.parent_log_summary() # Load configuration early to access update_db settings - self.config_json = ConfigJson() + self.config_json = ConfigJson(extra_config=True) self.data_upload_types = self._load_data_upload_types() self.full_update_steps = self._load_full_update_steps() diff --git a/relecov_tools/utils.py b/relecov_tools/utils.py index 115bc3e5..36e1493e 100755 --- a/relecov_tools/utils.py +++ b/relecov_tools/utils.py @@ -101,9 +101,9 @@ def read_excel_file(f_name, sheet_name, header_flag, leave_empty=True): data_row[heading[idx]] = ( None if leave_empty - else relecov_tools.config_json.ConfigJson().get_topic_data( - "generic", "not_provided_field" - ) + else relecov_tools.config_json.ConfigJson( + extra_config=True + ).get_topic_data("generic", "not_provided_field") ) else: data_row[heading[idx]] = l_row[idx] @@ -133,9 +133,9 @@ def read_excel_file(f_name, sheet_name, header_flag, leave_empty=True): data_row[heading[idx]] = ( None if leave_empty - else relecov_tools.config_json.ConfigJson().get_topic_data( - "generic", "not_provided_field" - ) + else relecov_tools.config_json.ConfigJson( + extra_config=True + ).get_topic_data("generic", "not_provided_field") ) else: data_row[heading[idx]] = val