mirror of
https://github.com/langchain-ai/langgraph.git
synced 2026-09-17 15:17:57 +02:00
refactor(cli): simplify tenant ID helper
This commit is contained in:
@@ -1230,20 +1230,22 @@ def _run_remote_build(
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
|
||||
def _resolve_tenant_id(env_vars: dict[str, str]) -> str | None:
|
||||
"""Resolve the tenant ID from either supported environment variable."""
|
||||
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
|
||||
return tenant_id
|
||||
def _get_tenant_id(env_vars: dict[str, str]) -> str | None:
|
||||
"""Get the tenant ID from LANGSMITH_TENANT_ID or LANGSMITH_WORKSPACE_ID."""
|
||||
tenant_id = env_vars.get("LANGSMITH_TENANT_ID") or os.environ.get(
|
||||
"LANGSMITH_TENANT_ID"
|
||||
)
|
||||
fallback_tenant_id = env_vars.get("LANGSMITH_WORKSPACE_ID") or os.environ.get(
|
||||
"LANGSMITH_WORKSPACE_ID"
|
||||
)
|
||||
if tenant_id and fallback_tenant_id:
|
||||
raise click.UsageError(
|
||||
"LANGSMITH_TENANT_ID and LANGSMITH_WORKSPACE_ID cannot both be set. "
|
||||
"Set only one."
|
||||
)
|
||||
if tenant_id:
|
||||
return tenant_id
|
||||
return fallback_tenant_id or None
|
||||
|
||||
|
||||
def _create_host_backend_client(
|
||||
@@ -1253,7 +1255,7 @@ def _create_host_backend_client(
|
||||
) -> HostBackendClient:
|
||||
if env_vars is None:
|
||||
env_vars = _parse_env_from_config({}, pathlib.Path.cwd() / DEFAULT_CONFIG)
|
||||
tenant_id = _resolve_tenant_id(env_vars)
|
||||
tenant_id = _get_tenant_id(env_vars)
|
||||
resolved_api_key = api_key
|
||||
if not resolved_api_key:
|
||||
for key_name in _API_KEY_ENV_NAMES:
|
||||
|
||||
Reference in New Issue
Block a user