Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/google/adk/cli/cli_deploy.py
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,6 @@ def to_gke(
trace_to_cloud: bool,
with_ui: bool,
log_level: str,
verbosity: str,
adk_version: str,
allow_origins: Optional[list[str]] = None,
session_service_uri: Optional[str] = None,
Expand All @@ -487,7 +486,7 @@ def to_gke(
port: The port of the ADK api server.
trace_to_cloud: Whether to enable Cloud Trace.
with_ui: Whether to deploy with UI.
verbosity: The verbosity level of the CLI.
log_level: The logging level.
adk_version: The ADK version to use in GKE.
allow_origins: The list of allowed origins for the ADK api server.
session_service_uri: The URI of the session service.
Expand Down Expand Up @@ -581,7 +580,7 @@ def to_gke(
'--tag',
image_name,
'--verbosity',
log_level.lower() if log_level else verbosity,
log_level.lower(),
temp_folder,
],
check=True,
Expand Down
24 changes: 6 additions & 18 deletions src/google/adk/cli/cli_tools_click.py
Original file line number Diff line number Diff line change
Expand Up @@ -1154,11 +1154,6 @@ def cli_deploy_agent_engine(
" only)"
),
)
@click.option( # This is the crucial missing piece
"--verbosity",
type=LOG_LEVELS,
help="Deprecated. Use --log_level instead.",
)
@click.option(
"--log_level",
type=LOG_LEVELS,
Expand All @@ -1178,12 +1173,6 @@ def cli_deploy_agent_engine(
" (default: a timestamped folder in the system temp directory)."
),
)
@click.argument(
"agent",
type=click.Path(
exists=True, dir_okay=True, file_okay=False, resolve_path=True
),
)
@click.option(
"--adk_version",
type=str,
Expand All @@ -1195,7 +1184,12 @@ def cli_deploy_agent_engine(
),
)
@adk_services_options()
@deprecated_adk_services_options()
@click.argument(
"agent",
type=click.Path(
exists=True, dir_okay=True, file_okay=False, resolve_path=True
),
)
def cli_deploy_gke(
agent: str,
project: Optional[str],
Expand All @@ -1207,14 +1201,11 @@ def cli_deploy_gke(
port: int,
trace_to_cloud: bool,
with_ui: bool,
verbosity: str,
adk_version: str,
log_level: Optional[str] = None,
session_service_uri: Optional[str] = None,
artifact_service_uri: Optional[str] = None,
memory_service_uri: Optional[str] = None,
session_db_url: Optional[str] = None, # Deprecated
artifact_storage_uri: Optional[str] = None, # Deprecated
):
"""Deploys an agent to GKE.

Expand All @@ -1224,8 +1215,6 @@ def cli_deploy_gke(

adk deploy gke --project=[project] --region=[region] --cluster_name=[cluster_name] path/to/my_agent
"""
session_service_uri = session_service_uri or session_db_url
artifact_service_uri = artifact_service_uri or artifact_storage_uri
try:
cli_deploy.to_gke(
agent_folder=agent,
Expand All @@ -1238,7 +1227,6 @@ def cli_deploy_gke(
port=port,
trace_to_cloud=trace_to_cloud,
with_ui=with_ui,
verbosity=verbosity,
log_level=log_level,
adk_version=adk_version,
session_service_uri=session_service_uri,
Expand Down
1 change: 0 additions & 1 deletion tests/unittests/cli/utils/test_cli_deploy.py
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,6 @@ def mock_subprocess_run(*args, **kwargs):
trace_to_cloud=False,
with_ui=True,
log_level="debug",
verbosity="debug",
adk_version="1.2.0",
allow_origins=["http://localhost:3000", "https://my-app.com"],
session_service_uri="sqlite:///",
Expand Down