@@ -273,32 +273,6 @@ class LoggingExampleConfig(LoggingConfig):
273273 """Config model composed from shared logging fields."""
274274
275275
276- class LoggingShortcutConfig (LoggingConfig ):
277- """Logging config model with common CLI verbosity shortcuts."""
278-
279- verbose : bool = config_field (
280- default = False ,
281- env_var = "LOGGING_SHORTCUT_VERBOSE" ,
282- cli_flag = "--verbose" ,
283- cli_aliases = ("-v" ,),
284- cli_action = "store_true" ,
285- )
286- quiet : bool = config_field (
287- default = False ,
288- env_var = "LOGGING_SHORTCUT_QUIET" ,
289- cli_flag = "--quiet" ,
290- cli_aliases = ("-q" ,),
291- cli_action = "store_true" ,
292- )
293- silent : bool = config_field (
294- default = False ,
295- env_var = "LOGGING_SHORTCUT_SILENT" ,
296- cli_flag = "--silent" ,
297- cli_aliases = ("-s" ,),
298- cli_action = "store_true" ,
299- )
300-
301-
302276class ConfigTest (unittest .TestCase ):
303277 def test_load_config_env_file_uses_dotenv_parser (self ) -> None :
304278 with tempfile .TemporaryDirectory () as directory :
@@ -518,7 +492,7 @@ def test_config_field_supports_numeric_bounds(self) -> None:
518492 def test_logging_config_mixin_adds_log_level_from_cli_and_env (self ) -> None :
519493 parser = argparse .ArgumentParser ()
520494 add_config_arguments (parser , LoggingExampleConfig )
521- args = parser .parse_args (["--src-log-level" , "INFO" ])
495+ args = parser .parse_args (["--src-log-level" , "INFO" , "-v" ])
522496
523497 cli_config = load_config_from_args (
524498 LoggingExampleConfig ,
@@ -534,26 +508,44 @@ def test_logging_config_mixin_adds_log_level_from_cli_and_env(self) -> None:
534508 )
535509
536510 self .assertEqual (cli_config .src_log_level , "INFO" )
511+ self .assertTrue (cli_config .verbose )
537512 self .assertEqual (env_config .src_log_level , "ERROR" )
538513
514+ def test_logging_config_rejects_multiple_log_level_shortcuts (self ) -> None :
515+ with self .assertRaisesRegex (ConfigError , "choose only one of --verbose" ):
516+ load_config (
517+ LoggingExampleConfig ,
518+ env_file = None ,
519+ env = {"SRC_LOG_VERBOSE" : "true" , "SRC_LOG_QUIET" : "true" },
520+ resolve_op_refs = False ,
521+ )
522+
539523 def test_resolve_log_level_name_maps_cli_shortcuts (self ) -> None :
540524 self .assertEqual (resolve_log_level_name (verbose = True ), "DEBUG" )
541525 self .assertEqual (resolve_log_level_name (quiet = True ), "WARNING" )
542526 self .assertEqual (resolve_log_level_name (silent = True ), "ERROR" )
543527 self .assertEqual (resolve_log_level_name (log_level = "trace" ), "trace" )
544- self .assertIsNone (resolve_log_level_name ())
528+ self .assertIsNone (resolve_log_level_name (object () ))
545529
546- config = LoggingShortcutConfig (src_log_level = "INFO" )
530+ config = LoggingExampleConfig (src_log_level = "INFO" )
547531 self .assertEqual (resolve_log_level_name (config ), "INFO" )
548- verbose_config = LoggingShortcutConfig (src_log_level = "INFO" , verbose = True )
532+ verbose_config = LoggingExampleConfig (src_log_level = "INFO" , verbose = True )
549533 self .assertEqual (resolve_log_level_name (verbose_config ), "DEBUG" )
550534 quiet_config = config_parse_args (
551- LoggingShortcutConfig ,
535+ LoggingExampleConfig ,
552536 argv = ["-q" ],
553537 env = {},
554538 resolve_op_refs = False ,
555539 )
556540 self .assertEqual (resolve_log_level_name (quiet_config ), "WARNING" )
541+ env_config = load_config (
542+ LoggingExampleConfig ,
543+ env_file = None ,
544+ env = {"SRC_LOG_SILENT" : "true" },
545+ resolve_op_refs = False ,
546+ )
547+ self .assertTrue (env_config .silent )
548+ self .assertEqual (resolve_log_level_name (env_config ), "ERROR" )
557549
558550 def test_logging_settings_from_config_maps_common_cli_levels (self ) -> None :
559551 default_settings = logging_settings_from_config (
@@ -563,12 +555,12 @@ def test_logging_settings_from_config_maps_common_cli_levels(self) -> None:
563555 self .assertEqual (default_settings .log_file_level , "debug" )
564556 self .assertEqual (default_settings .resource_sample_interval_seconds , 2.5 )
565557
566- quiet_config = LoggingShortcutConfig (src_log_level = "INFO" , quiet = True )
558+ quiet_config = LoggingExampleConfig (src_log_level = "INFO" , quiet = True )
567559 quiet_settings = logging_settings_from_config (quiet_config )
568560 self .assertEqual (quiet_settings .terminal_level , "WARNING" )
569561 self .assertEqual (quiet_settings .log_file_level , "WARNING" )
570562
571- log_level_config = LoggingShortcutConfig (src_log_level = "ERROR" )
563+ log_level_config = LoggingExampleConfig (src_log_level = "ERROR" )
572564 log_level_settings = logging_settings_from_config (log_level_config )
573565 self .assertEqual (log_level_settings .terminal_level , "ERROR" )
574566 self .assertEqual (log_level_settings .log_file_level , "ERROR" )
@@ -792,7 +784,7 @@ def test_log_and_level_helpers_use_string_levels(self) -> None:
792784 )
793785 )
794786 try :
795- log ("bogus" , "fallback_debug " , logger_name = logger_name )
787+ log ("bogus" , "fallback_info " , logger_name = logger_name )
796788 warning ("warning_event" , logger_name = logger_name )
797789 error ("error_event" , logger_name = logger_name )
798790 critical ("critical_event" , logger_name = logger_name )
@@ -804,7 +796,7 @@ def test_log_and_level_helpers_use_string_levels(self) -> None:
804796
805797 rows = [json .loads (line ) for line in log_file .read_text ().splitlines ()]
806798 levels = {row ["event" ]: row ["level" ] for row in rows }
807- self .assertEqual (levels ["fallback_debug " ], "DEBUG " )
799+ self .assertEqual (levels ["fallback_info " ], "INFO " )
808800 self .assertEqual (levels ["warning_event" ], "WARNING" )
809801 self .assertEqual (levels ["error_event" ], "ERROR" )
810802 self .assertEqual (levels ["critical_event" ], "CRITICAL" )
0 commit comments