truefoundry 0.7.0rc5__tar.gz → 0.7.1rc1__tar.gz

{truefoundry-0.7.0rc5 → truefoundry-0.7.1rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: truefoundry
-Version: 0.7.0rc5
+Version: 0.7.1rc1
 Summary: TrueFoundry CLI
 Author-email: TrueFoundry Team <abhishek@truefoundry.com>
 Requires-Python: <3.14,>=3.8.1
@@ -14,9 +14,10 @@ Requires-Dist: gitpython<4.0.0,>=3.1.43
 Requires-Dist: importlib-metadata<9.0.0,>=4.11.3
 Requires-Dist: importlib-resources<7.0.0,>=5.2.0
 Requires-Dist: mako<2.0.0,>=1.1.6
+Requires-Dist: mcp==1.6.0; python_version >= '3.10'
 Requires-Dist: numpy<3.0.0,>=1.23.0
 Requires-Dist: openai<2.0.0,>=1.16.2
-Requires-Dist: packaging<25.0,>=20.0
+Requires-Dist: packaging<26.0,>=20.0
 Requires-Dist: pydantic<3.0.0,>=1.8.2
 Requires-Dist: pygments<3.0.0,>=2.12.0
 Requires-Dist: pyjwt<3.0.0,>=2.0.0
@@ -30,7 +31,7 @@ Requires-Dist: requirements-parser<0.12.0,>=0.11.0
 Requires-Dist: rich-click<2.0.0,>=1.2.1
 Requires-Dist: rich<14.0.0,>=13.7.1
 Requires-Dist: tqdm<5.0.0,>=4.0.0
-Requires-Dist: truefoundry-sdk==0.0.14
+Requires-Dist: truefoundry-sdk==0.0.16
 Requires-Dist: typing-extensions>=4.0
 Requires-Dist: urllib3<3,>=1.26.18
 Requires-Dist: yq<4.0.0,>=3.1.0

{truefoundry-0.7.0rc5 → truefoundry-0.7.1rc1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "truefoundry"
-version = "0.7.0rc5"  # This is a placeholder version, it will be replaced when releasing
+version = "0.7.1rc1"  # This is a placeholder version, it will be replaced when releasing
 requires-python = ">=3.8.1,<3.14"
 description = "TrueFoundry CLI"
 authors = [{ name = "TrueFoundry Team", email = "abhishek@truefoundry.com" }]
@@ -16,8 +16,9 @@ dependencies = [
   "importlib-metadata>=4.11.3,<9.0.0",
   "importlib-resources>=5.2.0,<7.0.0",
   "Mako>=1.1.6,<2.0.0",
+  "mcp==1.6.0 ; python_version >= '3.10'",
   "openai>=1.16.2,<2.0.0",
-  "packaging>=20.0,<25.0",
+  "packaging>=20.0,<26.0",
   "pydantic>=1.8.2,<3.0.0",
   "pygments>=2.12.0,<3.0.0",
   "PyJWT>=2.0.0,<3.0.0",
@@ -28,19 +29,20 @@ dependencies = [
   "questionary>=1.10.0,<2.0.0",
   "requests>=2.18.0,<3.0.0",
   "requirements-parser>=0.11.0,<0.12.0",
-  "rich>=13.7.1,<14.0.0",
   "rich-click>=1.2.1,<2.0.0",
+  "rich>=13.7.1,<14.0.0",
   "tqdm>=4.0.0,<5.0.0",
-  "truefoundry-sdk==0.0.14",
+  "truefoundry-sdk==0.0.16",
   "typing-extensions>=4.0",
   "urllib3>=1.26.18,<3",
   "yq>=3.1.0,<4.0.0",
   # Check and try to eliminate libs below this comment
   "numpy>=1.23.0,<3.0.0",
+
 ]
 
 [project.optional-dependencies]
-workflow = ["flytekit==1.15.3; python_version >= '3.9' and python_version < '3.13'"]
+workflow = ["flytekit==1.15.3 ; python_version >= '3.9' and python_version < '3.13'"]
 
 [project.scripts]
 tfy = "truefoundry.cli.__main__:main"
@@ -90,6 +92,8 @@ build-backend = "hatchling.build"
 include = [
   "truefoundry/"
 ]
+[tool.hatch.metadata]
+allow-direct-references = true
 
 [tool.ruff]
 target-version = "py38"
@@ -124,6 +128,7 @@ inline-quotes = "double"
 "truefoundry/ml/_autogen/models/*" = ["E721"]
 "truefoundry/ml/_autogen/client/models/*" = ["F821"]
 "truefoundry/ml/_autogen/client/api_client.py" = ["E721"]
+"truefoundry/deploy/lib/clients/_mcp_streamable_http.py" = ["C901", "ASYNC109"]
 
 [tool.ruff.format]
 quote-style = "double"

{truefoundry-0.7.0rc5 → truefoundry-0.7.1rc1}/truefoundry/cli/__main__.py

@@ -7,9 +7,11 @@ from truefoundry import logger
 from truefoundry.cli.config import CliConfig
 from truefoundry.cli.const import GROUP_CLS
 from truefoundry.cli.util import setup_rich_click
-from truefoundry.common.utils import is_debug_env_set, is_internal_env_set
+from truefoundry.common.constants import TFY_DEBUG_ENV_KEY
+from truefoundry.common.utils import is_internal_env_set
 from truefoundry.deploy.cli.commands import (
     get_apply_command,
+    get_ask_command,
     get_build_command,
     get_delete_command,
     get_deploy_command,
@@ -36,31 +38,39 @@ CONTEXT_SETTINGS = dict(help_option_names=["-h", "--help"])  # noqa: C408
 @click.option(
     "--json",
     is_flag=True,
+    type=click.BOOL,
     help="Output entities in json format instead of formatted tables",
 )
 @click.option(
     "--debug",
     is_flag=True,
-    default=is_debug_env_set,
-    help="Set logging level to Debug. Can also be set using environment variable. E.g. SFY_DEBUG=1",
+    type=click.BOOL,
+    envvar=TFY_DEBUG_ENV_KEY,
+    show_envvar=True,
+    show_default=True,
+    help="Set logging level to Debug. Can also be set using environment variable. E.g. TFY_DEBUG=1",
+)
+@click.version_option(
+    version=__version__, message="TrueFoundry CLI: version %(version)s"
 )
-@click.version_option(__version__)
 @click.pass_context
 def truefoundry_cli(ctx, json, debug):
     """
     TrueFoundry provides an easy way to deploy your Services, Jobs and Models.
     \b
 
-    To start, login to your TrueFoundry account with [b]tfy login[/]
+    To start, login to your TrueFoundry account with [code]tfy login[/]
+
+    Then start deploying with [code]tfy deploy[/]
 
-    Then start deploying with [b]tfy deploy[/]
+    Ask questions and troubleshoot your clusters with [code]tfy ask[/]
 
     And more: [link=https://docs.truefoundry.com/docs]https://docs.truefoundry.com/docs[/]
 
     """
     setup_rich_click()
-    # TODO (chiragjn): Change this to -o json|yaml|table|pager
-    CliConfig.set("json", json)
+    CliConfig.json = json
+    CliConfig.debug = debug
     if ctx.invoked_subcommand is None:
         click.echo(ctx.get_help())
     log_level = logging.INFO
@@ -96,10 +106,16 @@ def create_truefoundry_cli() -> click.Group:
 
     if is_internal_env_set():
         cli.add_command(get_build_command())
+        cli.add_command(get_ask_command())
     return cli
 
 
 def main():
+    try:
+        # We try and import readline to enable better prompt editing in the CLI
+        import readline  # noqa: F401
+    except ImportError:
+        pass
     # Exit the interpreter by raising SystemExit(status).
     # If the status is omitted or None, it defaults to zero (i.e., success).
     # If the status is an integer, it will be used as the system exit status.

truefoundry-0.7.1rc1/truefoundry/cli/config.py

@@ -0,0 +1,10 @@
+from dataclasses import dataclass
+
+
+@dataclass
+class _CliConfig:
+    json: bool = False
+    debug: bool = False
+
+
+CliConfig = _CliConfig()

{truefoundry-0.7.0rc5 → truefoundry-0.7.1rc1}/truefoundry/cli/display_util.py

@@ -1,9 +1,20 @@
 import datetime
 import json
-
+from collections.abc import Iterable
+from typing import Optional, cast
+
+from openai.types.chat import (
+    ChatCompletionMessageParam,
+    ChatCompletionMessageToolCall,
+    ChatCompletionMessageToolCallParam,
+)
 from rich import box
 from rich import print_json as _rich_print_json
+from rich.console import Console, Group
+from rich.markdown import Markdown
+from rich.panel import Panel
 from rich.table import Table
+from rich.text import Text
 
 from truefoundry.cli.config import CliConfig
 from truefoundry.cli.console import console
@@ -60,7 +71,7 @@ def display_time_passed(seconds: float) -> str:
 
 def print_entity_list(title, items):
     items = [item.list_row_data() for item in items]
-    if CliConfig.get("json"):
+    if CliConfig.json:
         print_json(data=items)
         return
 
@@ -82,7 +93,7 @@ def print_entity_list(title, items):
 
 
 def print_obj(title, item, columns=None):
-    if CliConfig.get("json"):
+    if CliConfig.json:
         print_json(data=item)
         return
 
@@ -103,7 +114,7 @@ def print_obj(title, item, columns=None):
 
 
 def print_entity_obj(title, entity):
-    if CliConfig.get("json"):
+    if CliConfig.json:
         print_json(data=entity)
         return
 
@@ -121,3 +132,54 @@ def print_entity_obj(title, entity):
     for key in keys:
         table.add_row(f"[bold]{stringify(key)}[/]", stringify(entity_data[key]))
     console.print(table)
+
+
+def log_chat_completion_message(
+    message: ChatCompletionMessageParam, console_: Optional[Console] = None
+) -> None:
+    timestamp = datetime.datetime.now().astimezone().strftime("%Y-%m-%d %H:%M:%S")
+    code_theme = "github-dark"
+    target_console = console_ or console
+    try:
+        _content = message.get("content") or ""
+        message_content = f"```json\n{json.dumps(json.loads(_content), indent=2)}\n```"
+    except (TypeError, ValueError):
+        message_content = str(message.get("content") or "")
+
+    tool_calls: Iterable[ChatCompletionMessageToolCallParam] = cast(
+        list[ChatCompletionMessageToolCallParam],
+        message.get("tool_calls", []),
+    )
+
+    rendered_content: list[Markdown | Text] = []
+
+    if bool(message_content.strip()):
+        rendered_content.append(Markdown(markup=message_content, code_theme=code_theme))
+
+    for call in tool_calls:
+        assert isinstance(call, ChatCompletionMessageToolCall)
+        name = call.function.name
+        args = call.function.arguments
+        rendered_content.append(
+            Text.from_markup(
+                "[bold magenta]Tool Calls:[/bold magenta]\n",
+                overflow="fold",
+            )
+        )
+        rendered_content.append(
+            Markdown(markup=f"```python\n▶ {name}({args})\n```", code_theme=code_theme)
+        )
+
+    if not rendered_content:
+        return
+
+    panel = Panel(
+        Group(*rendered_content, fit=True),
+        title=f"[bold blue]{timestamp}[/bold blue]",
+        title_align="left",
+        border_style="bright_blue",
+        padding=(1, 2),
+        expand=True,
+        width=console.width,
+    )
+    target_console.print(panel)

{truefoundry-0.7.0rc5 → truefoundry-0.7.1rc1}/truefoundry/cli/util.py

@@ -10,9 +10,9 @@ from rich.padding import Padding
 from rich.panel import Panel
 from rich.table import Table
 
+from truefoundry.cli.config import CliConfig
 from truefoundry.cli.console import console
 from truefoundry.common.exceptions import HttpRequestException
-from truefoundry.common.utils import is_debug_env_set
 
 
 def setup_rich_click():
@@ -23,7 +23,7 @@ def setup_rich_click():
 
 
 def handle_exception(exception):
-    if is_debug_env_set():
+    if CliConfig.debug:
         console.print_exception(show_locals=True)
     if isinstance(exception, HttpRequestException):
         print_dict_as_table_panel(

{truefoundry-0.7.0rc5 → truefoundry-0.7.1rc1}/truefoundry/common/constants.py

@@ -17,6 +17,17 @@ TFY_INTERNAL_ENV_KEY = "TFY_INTERNAL"
 TFY_INTERNAL_SIGNED_URL_SERVER_HOST_ENV_KEY = "TFY_INTERNAL_SIGNED_URL_SERVER_HOST"
 TFY_INTERNAL_SIGNED_URL_SERVER_TOKEN_ENV_KEY = "TFY_INTERNAL_SIGNED_URL_SERVER_TOKEN"
 
+# === Global Constants for OpenAI Integration ===
+OPENAI_API_KEY_KEY = "OPENAI_API_KEY"
+OPENAI_MODEL_KEY = "OPENAI_MODEL"
+
+# === Ask Command Specific Environment Variables for TrueFoundry ===
+TFY_ASK_OPENAI_API_KEY_KEY = "TFY_ASK_OPENAI_API_KEY"
+TFY_ASK_OPENAI_BASE_URL_KEY = "TFY_ASK_OPENAI_BASE_URL"
+TFY_ASK_MODEL_NAME_KEY = "TFY_ASK_OPENAI_MODEL"
+
+TFY_ASK_SYSTEM_PROMPT_NAME_KEY = "TFY_ASK_SYSTEM_PROMPT_NAME"
+
 
 class PythonPackageManager(str, enum.Enum):
     PIP = "pip"
@@ -62,6 +73,23 @@ class TrueFoundrySdkEnv(BaseSettings):
     TFY_PYTHON_BUILD_PACKAGE_MANAGER: PythonPackageManager = PythonPackageManager.UV
     TFY_PYTHON_BUILD_UV_IMAGE_URI: str = "ghcr.io/astral-sh/uv:latest"
 
+    # Global Constants for OpenAI Integration
+    OPENAI_API_KEY: Optional[str] = Field(default=None, env=OPENAI_API_KEY_KEY)
+    OPENAI_MODEL: Optional[str] = Field(default=None, env=OPENAI_MODEL_KEY)
+
+    # Ask Command Specific Environment Variables for TrueFoundry
+    TFY_ASK_OPENAI_API_KEY: Optional[str] = Field(
+        default=None, env=TFY_ASK_OPENAI_API_KEY_KEY
+    )
+    TFY_ASK_OPENAI_BASE_URL: Optional[str] = Field(
+        default=None, env=TFY_ASK_OPENAI_BASE_URL_KEY
+    )
+    TFY_ASK_MODEL_NAME: Optional[str] = Field(default=None, env=TFY_ASK_MODEL_NAME_KEY)
+
+    TFY_ASK_SYSTEM_PROMPT_NAME: str = Field(
+        default="tfy-ask-k8s-prompt", env=TFY_ASK_SYSTEM_PROMPT_NAME_KEY
+    )
+
     # This is a hack to fresh read the env vars because people can end up importing this file
     # before setting the correct env vars. E.g. in notebook environments.
     @property

{truefoundry-0.7.0rc5 → truefoundry-0.7.1rc1}/truefoundry/common/utils.py

@@ -67,7 +67,7 @@ def relogin_error_message(message: str, host: str = "HOST") -> str:
         suffix = " where HOST is TrueFoundry platform URL"
     return (
         f"{message}\n"
-        f"Please login again using `tfy login --host {host} --relogin` "
+        f"To relogin, use `tfy login --host {host} --relogin` "
         f"or `truefoundry.login(host={host!r}, relogin=True)` function" + suffix
     )
 
@@ -192,11 +192,11 @@ def list_pip_packages_installed(
 
 
 def is_debug_env_set() -> bool:
-    return bool(os.getenv(TFY_DEBUG_ENV_KEY))
+    return (os.getenv(TFY_DEBUG_ENV_KEY) or "").lower() in ["true", "1"]
 
 
 def is_internal_env_set() -> bool:
-    return bool(os.getenv(TFY_INTERNAL_ENV_KEY))
+    return (os.getenv(TFY_INTERNAL_ENV_KEY) or "").lower() in ["true", "1"]
 
 
 def get_user_agent() -> str:

{truefoundry-0.7.0rc5 → truefoundry-0.7.1rc1}/truefoundry/deploy/cli/commands/__init__.py

@@ -1,11 +1,10 @@
 from truefoundry.deploy.cli.commands.apply_command import get_apply_command
+from truefoundry.deploy.cli.commands.ask_command import get_ask_command
 from truefoundry.deploy.cli.commands.build_command import get_build_command
-from truefoundry.deploy.cli.commands.create_command import get_create_command
 from truefoundry.deploy.cli.commands.delete_command import get_delete_command
 from truefoundry.deploy.cli.commands.deploy_command import get_deploy_command
 from truefoundry.deploy.cli.commands.deploy_init_command import get_deploy_init_command
 from truefoundry.deploy.cli.commands.get_command import get_get_command
-from truefoundry.deploy.cli.commands.list_command import get_list_command
 from truefoundry.deploy.cli.commands.login_command import get_login_command
 from truefoundry.deploy.cli.commands.logout_command import get_logout_command
 from truefoundry.deploy.cli.commands.logs_command import get_logs_command
@@ -13,6 +12,5 @@ from truefoundry.deploy.cli.commands.patch_application_command import (
     get_patch_application_command,
 )
 from truefoundry.deploy.cli.commands.patch_command import get_patch_command
-from truefoundry.deploy.cli.commands.redeploy_command import get_redeploy_command
 from truefoundry.deploy.cli.commands.terminate_comand import get_terminate_command
 from truefoundry.deploy.cli.commands.trigger_command import get_trigger_command

truefoundry-0.7.1rc1/truefoundry/deploy/cli/commands/ask_command.py

@@ -0,0 +1,152 @@
+import asyncio
+import logging
+from typing import Tuple
+
+import rich_click as click
+from openai import AsyncOpenAI
+from rich.console import Console
+
+from truefoundry.cli.config import CliConfig
+from truefoundry.cli.const import COMMAND_CLS
+from truefoundry.cli.util import handle_exception_wrapper
+from truefoundry.common.constants import (
+    ENV_VARS,
+    OPENAI_API_KEY_KEY,
+    OPENAI_MODEL_KEY,
+    TFY_ASK_MODEL_NAME_KEY,
+    TFY_ASK_OPENAI_API_KEY_KEY,
+    TFY_ASK_OPENAI_BASE_URL_KEY,
+)
+from truefoundry.common.session import Session
+from truefoundry.common.utils import get_tfy_servers_config
+from truefoundry.deploy.cli.commands.utils import select_cluster
+
+console = Console()
+
+
+def _get_openai_client() -> Tuple[AsyncOpenAI, str]:
+    """
+    Returns an AsyncOpenAI client using either user-provided credentials or TrueFoundry LLM gateway.
+    """
+    console.print("")
+    default_model = "gpt-4o"
+    if ENV_VARS.TFY_ASK_OPENAI_BASE_URL and ENV_VARS.TFY_ASK_OPENAI_API_KEY:
+        console.print(
+            f"Found custom OpenAI API settings ([green]{TFY_ASK_OPENAI_BASE_URL_KEY}[/green], [green]{TFY_ASK_OPENAI_API_KEY_KEY}[/green]) in env"
+        )
+        client = AsyncOpenAI(
+            base_url=ENV_VARS.TFY_ASK_OPENAI_BASE_URL,
+            api_key=ENV_VARS.TFY_ASK_OPENAI_API_KEY,
+        )
+        if ENV_VARS.TFY_ASK_MODEL_NAME:
+            openai_model = ENV_VARS.TFY_ASK_MODEL_NAME
+            console.print(
+                f"Using custom OpenAI model from env [green]{TFY_ASK_MODEL_NAME_KEY}[/green]: [yellow]{openai_model}[/yellow]"
+            )
+        else:
+            openai_model = default_model
+            console.print(
+                f"Using default OpenAI model: [yellow]{openai_model}[/yellow]"
+                f"\n[dim]Tip: To use a different model, set the env var "
+                f"[green]{TFY_ASK_MODEL_NAME_KEY}[/green] to the model name you want to use.[/dim]"
+            )
+        console.print(
+            "[dim][yellow]This operation will use tokens from your model provider and may incur costs.[/yellow][/dim]"
+        )
+        console.print("")
+        return client, openai_model
+    elif ENV_VARS.OPENAI_API_KEY:
+        console.print(f"Found [green]{OPENAI_API_KEY_KEY}[/green] in env")
+        client = AsyncOpenAI(
+            api_key=ENV_VARS.OPENAI_API_KEY,
+        )
+        if ENV_VARS.OPENAI_MODEL:
+            openai_model = ENV_VARS.OPENAI_MODEL
+            console.print(
+                f"Using custom OpenAI model from env [green]{OPENAI_MODEL_KEY}[/green]: [yellow]{openai_model}[/yellow]"
+            )
+        else:
+            openai_model = default_model
+            console.print(
+                f"Using default OpenAI model: [yellow]{openai_model}[/yellow]"
+                f"\n[dim]Tip: To use a different OpenAI model, set the env var "
+                f"[green]{OPENAI_MODEL_KEY}[/green] to the model name you want to use.[/dim]"
+            )
+        console.print(
+            f"[dim]Tip: To use your own OpenAI API compatible model for the ask command, set the env vars "
+            f"[green]{TFY_ASK_OPENAI_BASE_URL_KEY}[/], "
+            f"[green]{TFY_ASK_OPENAI_API_KEY_KEY}[/], and "
+            f"[green]{TFY_ASK_MODEL_NAME_KEY}[/].[/dim]"
+        )
+        console.print(
+            "[dim][yellow]This operation will use tokens from your OpenAI account and may incur costs.[/yellow][/dim]"
+        )
+        console.print("")
+        return client, openai_model
+    else:
+        llm_env_instruction = (
+            "[dim]No OpenAI API key found in env."
+            f"\n- To use your own OpenAI API compatible model for the ask command, set the env vars "
+            f"[green]{TFY_ASK_OPENAI_BASE_URL_KEY}[/], "
+            f"[green]{TFY_ASK_OPENAI_API_KEY_KEY}[/], and "
+            f"[green]{TFY_ASK_MODEL_NAME_KEY}[/] (default: {default_model})."
+            f"\n- Alternatively, you can use the default OpenAI model by setting the env vars "
+            f"[green]{OPENAI_API_KEY_KEY}[/], "
+            f"[green]{OPENAI_MODEL_KEY}[/] (default: {default_model}).[/dim]"
+        )
+        raise ValueError(llm_env_instruction)
+
+
+@click.command(name="ask", cls=COMMAND_CLS)
+@click.option(
+    "-c",
+    "--cluster",
+    type=str,
+    required=False,
+    help="The cluster id from TrueFoundry. If not provided, an interactive prompt will list available clusters",
+)
+@click.pass_context
+@handle_exception_wrapper
+def ask_command(ctx, cluster: str) -> None:
+    """
+    Ask questions related to your Cluster in TrueFoundry.
+    """
+    from truefoundry.deploy.lib.clients.ask_client import ask_client_main
+
+    debug = CliConfig.debug
+    if debug:
+        _mcp_logger = logging.getLogger("mcp")
+        _mcp_logger.setLevel(logging.DEBUG)
+        _mcp_logger.addHandler(logging.StreamHandler())
+
+    session = Session.new()
+    console.print(
+        "\n[bold green]Welcome to the Ask Command![/bold green]\n"
+        "Use this command to ask questions and troubleshoot issues in your Kubernetes cluster managed by the TrueFoundry Control Plane.\n"
+        "It helps you investigate and identify potential problems across services, pods, deployments, and more.\n"
+    )
+
+    if not cluster:
+        console.print(
+            "[dim]Tip: You can specify a cluster using the '--cluster' option, or select one interactively from the list.[/dim]\n"
+        )
+
+    # Get the cluster id from the command line argument
+    cluster = select_cluster(cluster)
+    openai_client, openai_model = _get_openai_client()
+    tfy_servers_config = get_tfy_servers_config(session.tfy_host)
+    mcp_server_url = f"{tfy_servers_config.servicefoundry_server_url}/v1/k8s-mcp"
+    asyncio.run(
+        ask_client_main(
+            cluster=cluster,
+            server_url=mcp_server_url,
+            token=session.access_token,
+            openai_client=openai_client,
+            openai_model=openai_model,
+            debug=debug,
+        )
+    )
+
+
+def get_ask_command():
+    return ask_command

{truefoundry-0.7.0rc5 → truefoundry-0.7.1rc1}/truefoundry/deploy/cli/commands/delete_command.py

@@ -78,7 +78,7 @@ def delete_workspace(workspace_fqn):
     )
     output_hook = RichOutputCallBack()
     output_hook.print_line(PROMPT_DELETED_WORKSPACE.format(workspace_fqn))
-    if CliConfig.get("json"):
+    if CliConfig.json:
         print_json(data=deleted_workspace.dict())
 
 
@@ -99,7 +99,7 @@ def delete_application(application_fqn):
     )
     output_hook = RichOutputCallBack()
     output_hook.print_line(PROMPT_DELETED_APPLICATION.format(application_fqn))
-    if CliConfig.get("json"):
+    if CliConfig.json:
         print_json(data=response)
 
 

{truefoundry-0.7.0rc5 → truefoundry-0.7.1rc1}/truefoundry/deploy/cli/commands/kubeconfig_command.py

@@ -1,7 +1,6 @@
 from typing import Any, Dict, Optional
 from urllib.parse import urljoin
 
-import questionary
 import rich_click as click
 from rich.console import Console
 
@@ -15,41 +14,12 @@ from truefoundry.deploy.cli.commands.utils import (
     get_kubeconfig_content,
     get_kubeconfig_path,
     save_kubeconfig,
+    select_cluster,
 )
 
 console = Console()
 
 
-def _select_cluster(cluster: Optional[str] = None) -> str:
-    """
-    Retrieve available clusters and either return the specified one after validation
-    or allow the user to interactively select from the list.
-    """
-    from truefoundry.deploy.lib.clients.servicefoundry_client import (
-        ServiceFoundryServiceClient,
-    )
-
-    clusters = ServiceFoundryServiceClient().list_clusters()
-
-    if not clusters:
-        raise click.ClickException("No clusters found in your account.")
-
-    if cluster:
-        if not any(c.id == cluster for c in clusters):
-            raise click.ClickException(
-                f"Cluster {cluster} not found. Either it does not exist or you might not be autthorized to access it"
-            )
-        return cluster
-
-    choices = {cluster.id: cluster for cluster in clusters}
-    cluster = questionary.select(
-        "Available Clusters:", choices=list(choices.keys())
-    ).ask()
-    if not cluster:
-        raise click.ClickException("No cluster selected.")
-    return cluster
-
-
 def _construct_k8s_proxy_server(host: str, cluster: str) -> str:
     """
     Construct the Kubernetes proxy server URL.
@@ -95,7 +65,7 @@ def kubeconfig_command(cluster: Optional[str] = None, overwrite: bool = False) -
     By default, credentials are written to ~/.kube/config. You can provide an alternate path by setting the KUBECONFIG environment variable. If KUBECONFIG contains multiple paths, the first one is used.
     """
     session = Session.new()
-    cluster = _select_cluster(cluster)
+    cluster = select_cluster(cluster)
 
     path = get_kubeconfig_path()
     kubeconfig = get_kubeconfig_content(path=path)

{truefoundry-0.7.0rc5 → truefoundry-0.7.1rc1}/truefoundry/deploy/cli/commands/login_command.py

@@ -12,7 +12,13 @@ from truefoundry.deploy.lib.session import login
 
 @click.command(name="login", cls=COMMAND_CLS)
 @click.option("--relogin", type=click.BOOL, is_flag=True, default=False)
-@click.option("--host", type=click.STRING, required=True, envvar=TFY_HOST_ENV_KEY)
+@click.option(
+    "--host",
+    type=click.STRING,
+    required=True,
+    envvar=TFY_HOST_ENV_KEY,
+    show_envvar=True,
+)
 @click.option(
     "--api-key",
     "--api_key",

{truefoundry-0.7.0rc5 → truefoundry-0.7.1rc1}/truefoundry/deploy/cli/commands/utils.py

@@ -2,6 +2,8 @@ import os
 from pathlib import Path
 from typing import Any, Dict, List, Optional
 
+import questionary
+import rich_click as click
 import yaml
 
 DEFAULT_KUBECONFIG_PATH: Path = Path.home() / ".kube" / "config"
@@ -116,3 +118,31 @@ def get_cluster_server_url(config: Dict[str, Any], cluster: str) -> Optional[str
     if cluster:
         return cluster["cluster"].get("server")
     return None
+
+
+def select_cluster(cluster: Optional[str] = None) -> str:
+    """
+    Retrieve available clusters and either return the specified one after validation
+    or allow the user to interactively select from the list.
+    """
+    from truefoundry.deploy.lib.clients.servicefoundry_client import (
+        ServiceFoundryServiceClient,
+    )
+
+    clusters = ServiceFoundryServiceClient().list_clusters()
+
+    if not clusters:
+        raise click.ClickException("No clusters found in your account.")
+
+    if cluster:
+        if not any(c.id == cluster for c in clusters):
+            raise click.ClickException(
+                f"Cluster {cluster} not found. Either it does not exist or you might not be autthorized to access it"
+            )
+        return cluster
+
+    choices = {cluster.id: cluster for cluster in clusters}
+    cluster = questionary.select("Pick a Cluster:", choices=list(choices.keys())).ask()
+    if not cluster:
+        raise click.ClickException("No cluster selected.")
+    return cluster