fix: logger verbosity issues (ApeWorX#2224)

src/ape/cli/options.py

@@ -56,7 +56,7 @@ def abort(msg: str, base_error: Optional[Exception] = None) -> NoReturn:
 
 
 def verbosity_option(
-    cli_logger: Optional[ApeLogger] = None, default: Union[str, LogLevel] = DEFAULT_LOG_LEVEL
+    cli_logger: Optional[ApeLogger] = None, default: Union[str, int, LogLevel] = DEFAULT_LOG_LEVEL
 ) -> Callable:
     """A decorator that adds a `--verbosity, -v` option to the decorated
     command.
@@ -67,7 +67,7 @@ def verbosity_option(
 
 
 def _create_verbosity_kwargs(
-    _logger: Optional[ApeLogger] = None, default: Union[str, LogLevel] = DEFAULT_LOG_LEVEL
+    _logger: Optional[ApeLogger] = None, default: Union[str, int, LogLevel] = DEFAULT_LOG_LEVEL
 ) -> dict:
     cli_logger = _logger or logger
 
@@ -87,7 +87,7 @@ def set_level(ctx, param, value):
 
 
 def ape_cli_context(
-    default_log_level: Union[str, LogLevel] = DEFAULT_LOG_LEVEL,
+    default_log_level: Union[str, int, LogLevel] = DEFAULT_LOG_LEVEL,
     obj_type: type = ApeCliContextObject,
 ) -> Callable:
     """
@@ -96,7 +96,7 @@ def ape_cli_context(
     such as logging or accessing managers.
 
     Args:
-        default_log_level (Union[str, :class:`~ape.logging.LogLevel`]): The log-level
+        default_log_level (Union[str, int, :class:`~ape.logging.LogLevel`]): The log-level
           value to pass to :meth:`~ape.cli.options.verbosity_option`.
         obj_type (Type): The context object type. Defaults to
           :class:`~ape.cli.options.ApeCliContextObject`. Sub-class

src/ape/logging.py

@@ -166,17 +166,19 @@ def _load_from_sys_argv(self, default: Optional[Union[str, int, LogLevel]] = Non
     def level(self) -> int:
         return self._logger.level
 
-    def set_level(self, level: Union[str, int]):
+    def set_level(self, level: Union[str, int, LogLevel]):
         """
         Change the global ape logger log-level.
 
         Args:
             level (str): The name of the level or the value of the log-level.
         """
-
         if level == self._logger.level:
             return
 
+        elif isinstance(level, LogLevel):
+            level = level.value
+
         self._logger.setLevel(level)
         for _logger in self._extra_loggers.values():
             _logger.setLevel(level)
@@ -267,9 +269,11 @@ def get_logger(
     return _logger
 
 
-def _get_level(level: Optional[Union[str, int]] = None) -> str:
+def _get_level(level: Optional[Union[str, int, LogLevel]] = None) -> str:
     if level is None:
         return DEFAULT_LOG_LEVEL
+    elif isinstance(level, LogLevel):
+        return level.name
     elif isinstance(level, int) or level.isnumeric():
         return LogLevel(int(level)).name
 

tests/functional/test_cli.py

@@ -23,7 +23,7 @@
 from ape.cli.choices import _NONE_NETWORK, _get_networks_sequence_from_cache
 from ape.cli.commands import get_param_from_ctx, parse_network
 from ape.exceptions import AccountsError
-from ape.logging import logger
+from ape.logging import LogLevel, logger
 from tests.conftest import geth_process_test, skip_if_plugin_installed
 
 OUTPUT_FORMAT = "__TEST__{0}:{1}:{2}_"
@@ -419,6 +419,17 @@ def cmd():
     assert f"__expected_{logger.level}" in result.output
 
 
+@pytest.mark.parametrize("level", (LogLevel.WARNING, LogLevel.WARNING.name, LogLevel.WARNING.value))
+def test_verbosity_option_change_default(runner, level):
+    @click.command()
+    @verbosity_option(default=level)
+    def cmd():
+        pass
+
+    verbosity_parameter = cmd.params[0]
+    assert verbosity_parameter.default == level
+
+
 def test_account_prompt_name():
     """
     It is very important for this class to have the `name` attribute,

tests/functional/test_logging.py

@@ -3,6 +3,7 @@
 from click.testing import CliRunner
 
 from ape.cli import ape_cli_context
+from ape.logging import LogLevel, logger
 
 
 @pytest.fixture
@@ -98,3 +99,9 @@ def cmd(cli_ctx):
 
     result = simple_runner.invoke(group_for_testing, ("cmd", "-v", "SUCCESS"))
     assert "SUCCESS" not in result.output
+
+
+@pytest.mark.parametrize("level", (LogLevel.INFO, LogLevel.INFO.value, LogLevel.INFO.name))
+def test_set_level(level):
+    logger.set_level(level)
+    assert logger.level == LogLevel.INFO.value