truefoundry 0.9.0rc1__py3-none-any.whl → 0.9.2__py3-none-any.whl

truefoundry/{deploy/cli/commands/ask_command.py → _ask/cli.py}

@@ -8,7 +8,7 @@ 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.cli.util import handle_exception_wrapper, select_cluster
 from truefoundry.common.constants import (
     ENV_VARS,
     OPENAI_API_KEY_KEY,
@@ -19,7 +19,6 @@ from truefoundry.common.constants import (
 )
 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()
 
@@ -85,14 +84,14 @@ def _get_openai_client() -> Tuple[AsyncOpenAI, str]:
         return client, openai_model
     else:
         llm_env_instruction = (
-            "[dim]No OpenAI API key found in env."
+            "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"\n- Alternatively, you can use OpenAI directly by setting the env vars "
             f"[green]{OPENAI_API_KEY_KEY}[/], "
-            f"[green]{OPENAI_MODEL_KEY}[/] (default: {default_model}).[/dim]"
+            f"[green]{OPENAI_MODEL_KEY}[/] (default: {default_model})"
         )
         raise ValueError(llm_env_instruction)
 
@@ -111,7 +110,7 @@ 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
+    from truefoundry._ask.client import ask_client
 
     debug = CliConfig.debug
     if debug:
@@ -125,19 +124,16 @@ def ask_command(ctx, cluster: str) -> None:
         "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"
     )
-
+    openai_client, openai_model = _get_openai_client()
     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(
+        ask_client(
             cluster=cluster,
             server_url=mcp_server_url,
             token=session.access_token,