chore: Remove deprecated CLI flags and version-based service URI handling

This change removes support for the deprecated `--session_db_url`, `--artifact_storage_uri`, and `--verbosity` flags from the ADK CLI. It also simplifies the service URI handling in `cli_deploy.py` by always using the new `--session_service_uri`, `--artifact_service_uri`, and `--memory_service_uri` flags, regardless of the ADK version.

The deprecated flags has been more than 1 year

Co-authored-by: Shangjie Chen <deanchen@google.com>
PiperOrigin-RevId: 915100881

Author: DeanChensj

src/google/adk/cli/cli_deploy.py

@@ -598,18 +598,12 @@ def _get_service_option_by_adk_version(
   parsed_version = parse(adk_version)
   options: list[str] = []
 
-  if parsed_version >= parse('1.3.0'):
-    if session_uri:
-      options.append(f'--session_service_uri={session_uri}')
-    if artifact_uri:
-      options.append(f'--artifact_service_uri={artifact_uri}')
-    if memory_uri:
-      options.append(f'--memory_service_uri={memory_uri}')
-  else:
-    if session_uri:
-      options.append(f'--session_db_url={session_uri}')
-    if parsed_version >= parse('1.2.0') and artifact_uri:
-      options.append(f'--artifact_storage_uri={artifact_uri}')
+  if session_uri:
+    options.append(f'--session_service_uri={session_uri}')
+  if artifact_uri:
+    options.append(f'--artifact_service_uri={artifact_uri}')
+  if memory_uri:
+    options.append(f'--memory_service_uri={memory_uri}')
 
   if use_local_storage is not None and parsed_version >= parse(
       _LOCAL_STORAGE_FLAG_MIN_VERSION

src/google/adk/cli/cli_tools_click.py

@@ -1411,43 +1411,6 @@ def _deprecate_staging_bucket(ctx, param, value):
   return value
 
 
-def deprecated_adk_services_options():
-  """Deprecated ADK services options."""
-
-  def warn(alternative_param, ctx, param, value):
-    if value:
-      click.echo(
-          click.style(
-              f"WARNING: Deprecated option --{param.name} is used. Please use"
-              f" {alternative_param} instead.",
-              fg="yellow",
-          ),
-          err=True,
-      )
-    return value
-
-  def decorator(func):
-    @click.option(
-        "--session_db_url",
-        help="Deprecated. Use --session_service_uri instead.",
-        callback=functools.partial(warn, "--session_service_uri"),
-    )
-    @click.option(
-        "--artifact_storage_uri",
-        type=str,
-        help="Deprecated. Use --artifact_service_uri instead.",
-        callback=functools.partial(warn, "--artifact_service_uri"),
-        default=None,
-    )
-    @functools.wraps(func)
-    def wrapper(*args, **kwargs):
-      return func(*args, **kwargs)
-
-    return wrapper
-
-  return decorator
-
-
 def fast_api_common_options():
   """Decorator to add common fast api options to click commands."""
 
@@ -1598,7 +1561,6 @@ def wrapper(ctx, *args, **kwargs):
 @fast_api_common_options()
 @web_options()
 @adk_services_options(default_use_local_storage=True)
-@deprecated_adk_services_options()
 @click.argument(
     "agents_dir",
     type=click.Path(
@@ -1621,8 +1583,6 @@ def cli_web(
     artifact_service_uri: Optional[str] = None,
     memory_service_uri: Optional[str] = None,
     use_local_storage: bool = True,
-    session_db_url: Optional[str] = None,  # Deprecated
-    artifact_storage_uri: Optional[str] = None,  # Deprecated
     a2a: bool = False,
     reload_agents: bool = False,
     extra_plugins: Optional[list[str]] = None,
@@ -1639,8 +1599,6 @@ def cli_web(
 
     adk web --session_service_uri=[uri] --port=[port] path/to/agents_dir
   """
-  session_service_uri = session_service_uri or session_db_url
-  artifact_service_uri = artifact_service_uri or artifact_storage_uri
   logs.setup_adk_logger(getattr(logging, log_level.upper()))
 
   @asynccontextmanager
@@ -1711,7 +1669,6 @@ async def _lifespan(app: FastAPI):
 )
 @fast_api_common_options()
 @adk_services_options(default_use_local_storage=True)
-@deprecated_adk_services_options()
 @click.option(
     "--auto_create_session",
     is_flag=True,
@@ -1735,8 +1692,6 @@ def cli_api_server(
     artifact_service_uri: Optional[str] = None,
     memory_service_uri: Optional[str] = None,
     use_local_storage: bool = True,
-    session_db_url: Optional[str] = None,  # Deprecated
-    artifact_storage_uri: Optional[str] = None,  # Deprecated
     a2a: bool = False,
     reload_agents: bool = False,
     extra_plugins: Optional[list[str]] = None,
@@ -1752,8 +1707,6 @@ def cli_api_server(
 
     adk api_server --session_service_uri=[uri] --port=[port] path/to/agents_dir
   """
-  session_service_uri = session_service_uri or session_db_url
-  artifact_service_uri = artifact_service_uri or artifact_storage_uri
   logs.setup_adk_logger(getattr(logging, log_level.upper()))
 
   config = uvicorn.Config(
@@ -1882,11 +1835,6 @@ def cli_api_server(
     default="INFO",
     help="Optional. Set the logging level",
 )
-@click.option(
-    "--verbosity",
-    type=LOG_LEVELS,
-    help="Deprecated. Use --log_level instead.",
-)
 @click.argument(
     "agent",
     type=click.Path(
@@ -1932,7 +1880,6 @@ def cli_api_server(
 )
 # TODO: Add eval_storage_uri option back when evals are supported in Cloud Run.
 @adk_services_options(default_use_local_storage=False)
-@deprecated_adk_services_options()
 @click.pass_context
 def cli_deploy_cloud_run(
     ctx,
@@ -1948,14 +1895,11 @@ def cli_deploy_cloud_run(
     with_ui: bool,
     adk_version: str,
     log_level: str,
-    verbosity: Optional[str],
     allow_origins: Optional[list[str]] = None,
     session_service_uri: Optional[str] = None,
     artifact_service_uri: Optional[str] = None,
     memory_service_uri: Optional[str] = None,
     use_local_storage: bool = False,
-    session_db_url: Optional[str] = None,  # Deprecated
-    artifact_storage_uri: Optional[str] = None,  # Deprecated
     a2a: bool = False,
     trigger_sources: Optional[str] = None,
 ):
@@ -1972,19 +1916,9 @@ def cli_deploy_cloud_run(
     adk deploy cloud_run --project=[project] --region=[region] path/to/my_agent
       -- --no-allow-unauthenticated --min-instances=2
   """
-  if verbosity:
-    click.secho(
-        "WARNING: The --verbosity option is deprecated. Use --log_level"
-        " instead.",
-        fg="yellow",
-        err=True,
-    )
 
   _warn_if_with_ui(with_ui)
 
-  session_service_uri = session_service_uri or session_db_url
-  artifact_service_uri = artifact_service_uri or artifact_storage_uri
-
   # Parse arguments to separate gcloud args (after --) from regular args
   gcloud_args = []
   if "--" in ctx.args:
@@ -2028,7 +1962,7 @@ def cli_deploy_cloud_run(
         allow_origins=allow_origins,
         with_ui=with_ui,
         log_level=log_level,
-        verbosity=verbosity,
+        verbosity=log_level,
         adk_version=adk_version,
         session_service_uri=session_service_uri,
         artifact_service_uri=artifact_service_uri,

tests/unittests/cli/utils/test_cli_deploy.py

@@ -147,15 +147,21 @@ def test_resolve_project_from_gcloud_fails(
             "gs://a",
             "rag://m",
             None,
-            "--session_db_url=sqlite://s --artifact_storage_uri=gs://a",
+            (
+                "--session_service_uri=sqlite://s --artifact_service_uri=gs://a"
+                " --memory_service_uri=rag://m"
+            ),
         ),
         (
             "0.5.0",
             "sqlite://s",
             "gs://a",
             "rag://m",
             None,
-            "--session_db_url=sqlite://s",
+            (
+                "--session_service_uri=sqlite://s --artifact_service_uri=gs://a"
+                " --memory_service_uri=rag://m"
+            ),
         ),
         (
             "1.3.0",
@@ -179,7 +185,7 @@ def test_resolve_project_from_gcloud_fails(
             "gs://a",
             None,
             None,
-            "--artifact_storage_uri=gs://a",
+            "--artifact_service_uri=gs://a",
         ),
         (
             "1.21.0",

tests/unittests/cli/utils/test_cli_tools_click.py

@@ -596,41 +596,6 @@ def test_cli_web_passes_service_uris(
   assert called_kwargs.get("memory_service_uri") == "rag://mycorpus"
 
 
-@pytest.mark.unmute_click
-def test_cli_web_warns_and_maps_deprecated_uris(
-    tmp_path: Path,
-    _patch_uvicorn: _Recorder,
-    monkeypatch: pytest.MonkeyPatch,
-) -> None:
-  """`adk web` should accept deprecated URI flags with warnings."""
-  agents_dir = tmp_path / "agents"
-  agents_dir.mkdir()
-
-  mock_get_app = _Recorder()
-  monkeypatch.setattr(cli_tools_click, "get_fast_api_app", mock_get_app)
-
-  runner = CliRunner()
-  result = runner.invoke(
-      cli_tools_click.main,
-      [
-          "web",
-          str(agents_dir),
-          "--session_db_url",
-          "sqlite:///deprecated.db",
-          "--artifact_storage_uri",
-          "gs://deprecated",
-      ],
-  )
-
-  assert result.exit_code == 0
-  called_kwargs = mock_get_app.calls[0][1]
-  assert called_kwargs.get("session_service_uri") == "sqlite:///deprecated.db"
-  assert called_kwargs.get("artifact_service_uri") == "gs://deprecated"
-  # Check output for deprecation warnings (CliRunner captures both stdout and stderr)
-  assert "--session_db_url" in result.output
-  assert "--artifact_storage_uri" in result.output
-
-
 def test_cli_eval_with_eval_set_file_path(
     mock_load_eval_set_from_file,
     mock_get_root_agent,