fix(cli): disable Click Windows glob expansion at entry point and fix Mypy type redefinition errors

Author: Abdullah-k0de

src/google/adk/cli/__init__.py

@@ -12,4 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from .cli_tools_click import main
+from typing import Any
+
+from .cli_tools_click import main as _main
+
+
+def main(args: Any = None, **kwargs: Any) -> Any:
+  """Package entry point that disables Windows glob expansion for all CLI commands."""
+
+  kwargs.setdefault("windows_expand_args", False)
+  return _main.main(args=args, **kwargs)

src/google/adk/cli/cli_tools_click.py

@@ -26,8 +26,7 @@
 import sys
 import tempfile
 import textwrap
-from typing import Any
-from typing import cast
+from typing import Optional
 
 import click
 from click.core import ParameterSource
@@ -48,16 +47,6 @@
     case_sensitive=False,
 )
 
-_ClickGroup = cast(type[Any], click.Group)
-
-
-class _NoWindowsGlobExpansionGroup(_ClickGroup):
-  """Click group that disables Windows glob expansion for CLI arguments."""
-
-  def main(self, *args: Any, **kwargs: Any) -> Any:
-    kwargs.setdefault("windows_expand_args", False)
-    return super().main(*args, **kwargs)
-
 
 def _logging_options():
   """Decorator to add logging options to click commands."""
@@ -247,10 +236,7 @@ def _warn_if_with_ui(with_ui: bool) -> None:
     click.secho(f"WARNING: {_ADK_WEB_WARNING}", fg="yellow", err=True)
 
 
-@click.group(
-    cls=_NoWindowsGlobExpansionGroup,
-    context_settings={"max_content_width": 240},
-)
+@click.group(context_settings={"max_content_width": 240})
 @click.version_option(version.__version__)
 def main():
   """Agent Development Kit CLI tools."""
@@ -1159,7 +1145,7 @@ def cli_eval(
             inference_requests=inference_requests, eval_service=eval_service
         )
     )
-    eval_results = asyncio.run(
+    eval_results: list[EvalCaseResult] = asyncio.run(
         _collect_eval_results(
             inference_results=inference_results,
             eval_service=eval_service,
@@ -1175,7 +1161,6 @@ def cli_eval(
   eval_run_summary = {}
 
   for eval_result in eval_results:
-    eval_result: EvalCaseResult
 
     if eval_result.eval_set_id not in eval_run_summary:
       eval_run_summary[eval_result.eval_set_id] = [0, 0]
@@ -1193,7 +1178,6 @@ def cli_eval(
 
   if print_detailed_results:
     for eval_result in eval_results:
-      eval_result: EvalCaseResult
       click.echo(
           "********************************************************************"
       )
@@ -2015,7 +1999,6 @@ def cli_api_server(
     "cloud_run",
     context_settings={
         "allow_extra_args": True,
-        "allow_interspersed_args": False,
     },
 )
 @click.option(
@@ -2192,34 +2175,7 @@ def cli_deploy_cloud_run(
 
   _warn_if_with_ui(with_ui)
 
-  # Parse arguments to separate gcloud args (after --) from regular args
-  gcloud_args = []
-  if "--" in ctx.args:
-    separator_index = ctx.args.index("--")
-    gcloud_args = ctx.args[separator_index + 1 :]
-    regular_args = ctx.args[:separator_index]
-
-    # If there are regular args before --, that's an error
-    if regular_args:
-      click.secho(
-          "Error: Unexpected arguments after agent path and before '--':"
-          f" {' '.join(regular_args)}. \nOnly arguments after '--' are passed"
-          " to gcloud.",
-          fg="red",
-          err=True,
-      )
-      ctx.exit(2)
-  else:
-    # No -- separator, treat all args as an error to enforce the new behavior
-    if ctx.args:
-      click.secho(
-          f"Error: Unexpected arguments: {' '.join(ctx.args)}. \nUse '--' to"
-          " separate gcloud arguments, e.g.: adk deploy cloud_run [options]"
-          " agent_path -- --min-instances=2",
-          fg="red",
-          err=True,
-      )
-      ctx.exit(2)
+  gcloud_args = ctx.args
 
   try:
     from . import cli_deploy

tests/unittests/cli/utils/test_cli_tools_click.py

@@ -91,8 +91,9 @@ def _mute_click(request, monkeypatch: pytest.MonkeyPatch) -> None:
 def test_main_disables_click_windows_glob_expansion() -> None:
   """Verifies the ADK CLI disables Click's Windows glob expansion."""
   with mock.patch.object(click.Group, "main", return_value=None) as mock_main:
-    cli_tools_click.main.main(args=["web", ".", "--allow_origins", "*"])
+    from google.adk.cli import main
 
+    main(args=["web", ".", "--allow_origins", "*"])
   assert mock_main.call_args.kwargs["windows_expand_args"] is False