truefoundry 0.10.4rc4__tar.gz → 0.10.5__tar.gz

{truefoundry-0.10.4rc4 → truefoundry-0.10.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: truefoundry
-Version: 0.10.4rc4
+Version: 0.10.5
 Summary: TrueFoundry CLI
 Author-email: TrueFoundry Team <abhishek@truefoundry.com>
 Requires-Python: <3.14,>=3.8.1
@@ -30,12 +30,12 @@ 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.2.0,>=0.1.1
+Requires-Dist: truefoundry-sdk<0.2.0,>=0.1.3
 Requires-Dist: typing-extensions>=4.0
 Requires-Dist: urllib3<3,>=1.26.18
 Requires-Dist: yq<4.0.0,>=3.1.0
 Provides-Extra: ai
-Requires-Dist: mcp==1.9.1; (python_version >= '3.10') and extra == 'ai'
+Requires-Dist: mcp==1.9.4; (python_version >= '3.10') and extra == 'ai'
 Provides-Extra: workflow
 Requires-Dist: flytekit==1.15.3; (python_version >= '3.9' and python_version < '3.13') and extra == 'workflow'
 Description-Content-Type: text/markdown

{truefoundry-0.10.4rc4 → truefoundry-0.10.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "truefoundry"
-version = "0.10.4rc4"  # This is a placeholder version, it will be replaced when releasing
+version = "0.10.5"  # 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" }]
@@ -31,7 +31,7 @@ dependencies = [
   "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.1.1,<0.2.0",
+  "truefoundry-sdk>=0.1.3,<0.2.0",
   "typing-extensions>=4.0",
   "urllib3>=1.26.18,<3",
   "yq>=3.1.0,<4.0.0",
@@ -43,7 +43,7 @@ dependencies = [
 [project.optional-dependencies]
 workflow = ["flytekit==1.15.3 ; python_version >= '3.9' and python_version < '3.13'"]
 ai = [
-  "mcp==1.9.1 ; python_version >= '3.10'",
+  "mcp==1.9.4 ; python_version >= '3.10'",
 ]
 
 [project.scripts]

truefoundry-0.10.5/truefoundry/_ask/cli.py

@@ -0,0 +1,156 @@
+import asyncio
+import logging
+from typing import Callable, Dict, Optional, Tuple, Union
+
+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, select_cluster
+from truefoundry.common.constants import (
+    ENV_VARS,
+    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
+
+console = Console()
+
+
+class CustomAsyncOpenAI(AsyncOpenAI):
+    def __init__(
+        self, *, api_key: Optional[Union[str, Callable[[], str]]] = None, **kwargs
+    ):
+        self.__api_key_fn = None
+        if isinstance(api_key, str) or api_key is None:
+            _api_key = api_key
+        else:
+            self.__api_key_fn = api_key
+            _api_key = self.__api_key_fn()
+        super().__init__(api_key=_api_key, **kwargs)
+
+    @property
+    def auth_headers(self) -> Dict[str, str]:
+        if self.__api_key_fn is not None:
+            api_key = self.__api_key_fn()
+        else:
+            api_key = self.api_key
+        return {"Authorization": f"Bearer {api_key}"}
+
+
+def _get_openai_client(session: Session) -> Tuple[CustomAsyncOpenAI, str]:
+    """
+    Returns an AsyncOpenAI client using either user-provided credentials or TrueFoundry LLM gateway.
+    """
+    if ENV_VARS.TFY_ASK_OPENAI_BASE_URL:
+        console.print(
+            f"Found custom OpenAI compatible API settings ([green]{TFY_ASK_OPENAI_BASE_URL_KEY}[/green]) in env"
+        )
+        if ENV_VARS.TFY_ASK_OPENAI_API_KEY:
+            console.print(
+                f"Found API key ([green]{TFY_ASK_OPENAI_API_KEY_KEY}[/green]) in env"
+            )
+            api_key = ENV_VARS.TFY_ASK_OPENAI_API_KEY
+        else:
+            console.print(
+                f"No API key found in env, using [yellow]EMPTY[/yellow] as API key"
+                f"\n[dim]Tip: To use a different API key, set the env var "
+                f"[green]{TFY_ASK_OPENAI_API_KEY_KEY}[/green] to the API key you want to use.[/dim]"
+            )
+            api_key = "EMPTY"
+        base_url = ENV_VARS.TFY_ASK_OPENAI_BASE_URL
+        default_model = "gpt-4o"
+    else:
+        tfy_servers_config = get_tfy_servers_config(session.tfy_host)
+        base_url = f"{tfy_servers_config.servicefoundry_server_url}/v1/tfy-ai/proxy/api/inference/openai"
+        console.print(
+            f"Using TrueFoundry Managed AI."
+            f"\n[dim]Tip: To use your own OpenAI API compatible API for the ask command, set the following env vars"
+            f"\n * [green]{TFY_ASK_OPENAI_BASE_URL_KEY}[/] to the base URL of your OpenAI compatible API. E.g. [yellow]https://api.openai.com/v1[/yellow]"
+            f"\n * [green]{TFY_ASK_OPENAI_API_KEY_KEY}[/] to the API key of your OpenAI compatible API."
+            f"[/dim]"
+        )
+        console.print("")
+
+        api_key = lambda: session.access_token  # noqa: E731
+        default_model = "tfy-ai-openai/gpt-4o"
+    client = CustomAsyncOpenAI(
+        base_url=base_url,
+        api_key=api_key,
+    )
+    if ENV_VARS.TFY_ASK_MODEL_NAME:
+        openai_model = ENV_VARS.TFY_ASK_MODEL_NAME
+        console.print(
+            f"Using custom model from env [green]{TFY_ASK_MODEL_NAME_KEY}[/green]: [yellow]{openai_model}[/yellow]"
+        )
+    else:
+        openai_model = default_model
+        console.print(
+            f"Using default 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("")
+
+    if ENV_VARS.TFY_ASK_OPENAI_BASE_URL:
+        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
+
+
+@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._ask.client import ask_client
+
+    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"
+    )
+    openai_client, openai_model = _get_openai_client(session=session)
+    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"
+        )
+    cluster = select_cluster(cluster)
+    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(
+            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.10.4rc4 → truefoundry-0.10.5}/truefoundry/cli/util.py

@@ -109,7 +109,7 @@ def print_dict_as_table_panel(
 ):
     table = Table(show_header=False, box=None)
     table.add_column("Key", style=f"bold {key_color}", width=15)
-    table.add_column("Value")
+    table.add_column("Value", overflow="fold")
     for key, value in dct.items():
         table.add_row(key, value)
     console.print(

{truefoundry-0.10.4rc4 → truefoundry-0.10.5}/truefoundry/deploy/__init__.py

@@ -118,6 +118,7 @@ from truefoundry.deploy.v2.lib.patched_models import (
     SparkImageBuild,
     SparkJobJavaEntrypoint,
     SparkJobPythonEntrypoint,
+    SparkJobPythonNotebookEntrypoint,
     SparkJobScalaEntrypoint,
     SQSInputConfig,
     SQSOutputConfig,

{truefoundry-0.10.4rc4 → truefoundry-0.10.5}/truefoundry/deploy/_autogen/models.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  application.json
-#   timestamp: 2025-06-09T12:01:27+00:00
+#   timestamp: 2025-06-18T21:24:37+00:00
 
 from __future__ import annotations
 
@@ -908,7 +908,7 @@ class SparkImageBuild(BaseModel):
         None,
         description="FQN of the container registry. If you can't find your registry here,\nadd it through the [Integrations](/integrations?tab=docker-registry) page",
     )
-    build_source: GitSource
+    build_source: Union[GitSource, RemoteSource] = Field(..., description="")
     build_spec: SparkBuild
 
 
@@ -936,6 +936,14 @@ class SparkJobPythonEntrypoint(BaseModel):
     )
 
 
+class SparkJobPythonNotebookEntrypoint(BaseModel):
+    type: Literal["python-notebook"] = Field(..., description="")
+    main_application_file: str = Field(
+        ...,
+        description="The main application file to be executed by the spark job. Relative path in case of git repository.",
+    )
+
+
 class SparkJobScalaEntrypoint(BaseModel):
     type: Literal["scala"] = Field(..., description="")
     main_application_file: str = Field(
@@ -1449,7 +1457,10 @@ class SparkJob(BaseModel):
         description="The image to use for driver and executors. Must have spark installed. Spark version must match the version in the image.",
     )
     entrypoint: Union[
-        SparkJobPythonEntrypoint, SparkJobScalaEntrypoint, SparkJobJavaEntrypoint
+        SparkJobPythonEntrypoint,
+        SparkJobScalaEntrypoint,
+        SparkJobJavaEntrypoint,
+        SparkJobPythonNotebookEntrypoint,
     ] = Field(..., description="")
     driver_config: SparkDriverConfig
     executor_config: SparkExecutorConfig

{truefoundry-0.10.4rc4 → truefoundry-0.10.5}/truefoundry/deploy/v2/lib/patched_models.py

@@ -520,3 +520,9 @@ class SparkJobPythonEntrypoint(models.SparkJobPythonEntrypoint, PatchedModelBase
 
 class SparkJobJavaEntrypoint(models.SparkJobJavaEntrypoint, PatchedModelBase):
     type: Literal["java"] = "java"
+
+
+class SparkJobPythonNotebookEntrypoint(
+    models.SparkJobPythonNotebookEntrypoint, PatchedModelBase
+):
+    type: Literal["python-notebook"] = "python-notebook"

truefoundry-0.10.4rc4/truefoundry/_ask/cli.py

@@ -1,148 +0,0 @@
-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, select_cluster
-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
-
-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 = (
-            "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 OpenAI directly by setting the env vars "
-            f"[green]{OPENAI_API_KEY_KEY}[/], "
-            f"[green]{OPENAI_MODEL_KEY}[/] (default: {default_model})"
-        )
-        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._ask.client import ask_client
-
-    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"
-    )
-    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"
-        )
-    cluster = select_cluster(cluster)
-    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(
-            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