Merge branch 'main' into GkeDeployAgent

Author: vicentefb

src/google/adk/cli/cli_tools_click.py

@@ -25,6 +25,7 @@
 from typing import Optional
 
 import click
+from click.core import ParameterSource
 from fastapi import FastAPI
 import uvicorn
 
@@ -557,6 +558,14 @@ def decorator(func):
         help="Optional. Any additional origins to allow for CORS.",
         multiple=True,
     )
+    @click.option(
+        "-v",
+        "--verbose",
+        is_flag=True,
+        show_default=True,
+        default=False,
+        help="Enable verbose (DEBUG) logging. Shortcut for --log_level DEBUG.",
+    )
     @click.option(
         "--log_level",
         type=LOG_LEVELS,
@@ -593,7 +602,16 @@ def decorator(func):
         help="Optional. Whether to enable live reload for agents changes.",
     )
     @functools.wraps(func)
-    def wrapper(*args, **kwargs):
+    @click.pass_context
+    def wrapper(ctx, *args, **kwargs):
+      # If verbose flag is set and log level is not set, set log level to DEBUG.
+      log_level_source = ctx.get_parameter_source("log_level")
+      if (
+          kwargs.pop("verbose", False)
+          and log_level_source == ParameterSource.DEFAULT
+      ):
+        kwargs["log_level"] = "DEBUG"
+
       return func(*args, **kwargs)
 
     return wrapper