From d85ae52b85fe8b08ae82809a5b4ef68aad200124 Mon Sep 17 00:00:00 2001 From: Rafid Saad Date: Sun, 13 Sep 2026 14:08:58 -0700 Subject: [PATCH] refactor(cli): resolve workspace alias into tenant_id --- libs/cli/langgraph_cli/deploy.py | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/libs/cli/langgraph_cli/deploy.py b/libs/cli/langgraph_cli/deploy.py index 6a3418c76..5eb43e030 100644 --- a/libs/cli/langgraph_cli/deploy.py +++ b/libs/cli/langgraph_cli/deploy.py @@ -1237,17 +1237,17 @@ def _create_host_backend_client( ) -> HostBackendClient: if env_vars is None: env_vars = _parse_env_from_config({}, pathlib.Path.cwd() / DEFAULT_CONFIG) - tenant_id = env_vars.get("LANGSMITH_TENANT_ID") or os.environ.get( - "LANGSMITH_TENANT_ID" - ) - workspace_id = env_vars.get("LANGSMITH_WORKSPACE_ID") or os.environ.get( - "LANGSMITH_WORKSPACE_ID" - ) - if tenant_id and workspace_id: - raise click.UsageError( - "LANGSMITH_TENANT_ID and LANGSMITH_WORKSPACE_ID cannot both be set. " - "Set only one." - ) + tenant_id = None + for name in ("LANGSMITH_TENANT_ID", "LANGSMITH_WORKSPACE_ID"): + value = env_vars.get(name) or os.environ.get(name) + if not value: + continue + if tenant_id: + raise click.UsageError( + "LANGSMITH_TENANT_ID and LANGSMITH_WORKSPACE_ID cannot both be set. " + "Set only one." + ) + tenant_id = value resolved_api_key = api_key if not resolved_api_key: for key_name in _API_KEY_ENV_NAMES: @@ -1270,9 +1270,7 @@ def _create_host_backend_client( fg="yellow", ) resolved_api_key = click.prompt("Enter LangSmith API key", hide_input=True) - return HostBackendClient( - host_url, resolved_api_key, tenant_id=tenant_id or workspace_id - ) + return HostBackendClient(host_url, resolved_api_key, tenant_id=tenant_id) def _call_host_backend_with_optional_tenant(