Skip to content

Commit 1cfe6e9

Browse files
DeanChensjcopybara-github
authored andcommitted
chore: Remove unnecessary flags
PiperOrigin-RevId: 789379877
1 parent 314d6a4 commit 1cfe6e9

File tree

3 files changed

+8
-22
lines changed

3 files changed

+8
-22
lines changed

src/google/adk/cli/cli_deploy.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,6 @@ def to_gke(
466466
trace_to_cloud: bool,
467467
with_ui: bool,
468468
log_level: str,
469-
verbosity: str,
470469
adk_version: str,
471470
allow_origins: Optional[list[str]] = None,
472471
session_service_uri: Optional[str] = None,
@@ -487,7 +486,7 @@ def to_gke(
487486
port: The port of the ADK api server.
488487
trace_to_cloud: Whether to enable Cloud Trace.
489488
with_ui: Whether to deploy with UI.
490-
verbosity: The verbosity level of the CLI.
489+
log_level: The logging level.
491490
adk_version: The ADK version to use in GKE.
492491
allow_origins: The list of allowed origins for the ADK api server.
493492
session_service_uri: The URI of the session service.
@@ -581,7 +580,7 @@ def to_gke(
581580
'--tag',
582581
image_name,
583582
'--verbosity',
584-
log_level.lower() if log_level else verbosity,
583+
log_level.lower(),
585584
temp_folder,
586585
],
587586
check=True,

src/google/adk/cli/cli_tools_click.py

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1154,11 +1154,6 @@ def cli_deploy_agent_engine(
11541154
" only)"
11551155
),
11561156
)
1157-
@click.option( # This is the crucial missing piece
1158-
"--verbosity",
1159-
type=LOG_LEVELS,
1160-
help="Deprecated. Use --log_level instead.",
1161-
)
11621157
@click.option(
11631158
"--log_level",
11641159
type=LOG_LEVELS,
@@ -1178,12 +1173,6 @@ def cli_deploy_agent_engine(
11781173
" (default: a timestamped folder in the system temp directory)."
11791174
),
11801175
)
1181-
@click.argument(
1182-
"agent",
1183-
type=click.Path(
1184-
exists=True, dir_okay=True, file_okay=False, resolve_path=True
1185-
),
1186-
)
11871176
@click.option(
11881177
"--adk_version",
11891178
type=str,
@@ -1195,7 +1184,12 @@ def cli_deploy_agent_engine(
11951184
),
11961185
)
11971186
@adk_services_options()
1198-
@deprecated_adk_services_options()
1187+
@click.argument(
1188+
"agent",
1189+
type=click.Path(
1190+
exists=True, dir_okay=True, file_okay=False, resolve_path=True
1191+
),
1192+
)
11991193
def cli_deploy_gke(
12001194
agent: str,
12011195
project: Optional[str],
@@ -1207,14 +1201,11 @@ def cli_deploy_gke(
12071201
port: int,
12081202
trace_to_cloud: bool,
12091203
with_ui: bool,
1210-
verbosity: str,
12111204
adk_version: str,
12121205
log_level: Optional[str] = None,
12131206
session_service_uri: Optional[str] = None,
12141207
artifact_service_uri: Optional[str] = None,
12151208
memory_service_uri: Optional[str] = None,
1216-
session_db_url: Optional[str] = None, # Deprecated
1217-
artifact_storage_uri: Optional[str] = None, # Deprecated
12181209
):
12191210
"""Deploys an agent to GKE.
12201211
@@ -1224,8 +1215,6 @@ def cli_deploy_gke(
12241215
12251216
adk deploy gke --project=[project] --region=[region] --cluster_name=[cluster_name] path/to/my_agent
12261217
"""
1227-
session_service_uri = session_service_uri or session_db_url
1228-
artifact_service_uri = artifact_service_uri or artifact_storage_uri
12291218
try:
12301219
cli_deploy.to_gke(
12311220
agent_folder=agent,
@@ -1238,7 +1227,6 @@ def cli_deploy_gke(
12381227
port=port,
12391228
trace_to_cloud=trace_to_cloud,
12401229
with_ui=with_ui,
1241-
verbosity=verbosity,
12421230
log_level=log_level,
12431231
adk_version=adk_version,
12441232
session_service_uri=session_service_uri,

tests/unittests/cli/utils/test_cli_deploy.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,6 @@ def mock_subprocess_run(*args, **kwargs):
566566
trace_to_cloud=False,
567567
with_ui=True,
568568
log_level="debug",
569-
verbosity="debug",
570569
adk_version="1.2.0",
571570
allow_origins=["http://localhost:3000", "https://my-app.com"],
572571
session_service_uri="sqlite:///",

0 commit comments

Comments
 (0)