truefoundry 0.9.2rc1__tar.gz → 0.9.3__tar.gz

{truefoundry-0.9.2rc1 → truefoundry-0.9.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: truefoundry
-Version: 0.9.2rc1
+Version: 0.9.3
 Summary: TrueFoundry CLI
 Author-email: TrueFoundry Team <abhishek@truefoundry.com>
 Requires-Python: <3.14,>=3.8.1

{truefoundry-0.9.2rc1 → truefoundry-0.9.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "truefoundry"
-version = "0.9.2rc1"  # This is a placeholder version, it will be replaced when releasing
+version = "0.9.3"  # 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" }]
@@ -178,6 +178,7 @@ warn_required_dynamic_aliases = true
 [tool.pytest.ini_options]
 env = [
   "TFY_PYTHONBUILD_PYTHON_IMAGE_REPO=docker.io/truefoundrycloud/test/python",
+  "TFY_SPARK_BUILD_SPARK_IMAGE_REPO=public.ecr.aws/bitnami/spark",
 ]
 
 [tool.uv]

{truefoundry-0.9.2rc1 → truefoundry-0.9.3}/truefoundry/common/constants.py

@@ -65,6 +65,9 @@ class TrueFoundrySdkEnv(BaseSettings):
     # Fo customizing the python image used for building via PythonBuild
     TFY_PYTHONBUILD_PYTHON_IMAGE_REPO: str = "public.ecr.aws/docker/library/python"
 
+    # TODO(gw): Use another image with more linient rate limits
+    TFY_SPARK_BUILD_SPARK_IMAGE_REPO: str = "public.ecr.aws/bitnami/spark"
+
     # For local development, this enables futher configuration via _TFYServersConfig
     TFY_CLI_LOCAL_DEV_MODE: bool = False
 

{truefoundry-0.9.2rc1 → truefoundry-0.9.3}/truefoundry/deploy/__init__.py

@@ -113,6 +113,9 @@ from truefoundry.deploy.v2.lib.patched_models import (
     ServiceAutoscaling,
     SlackBot,
     SlackWebhook,
+    SparkBuild,
+    SparkImage,
+    SparkImageBuild,
     SparkJobJavaEntrypoint,
     SparkJobPythonEntrypoint,
     SparkJobScalaEntrypoint,

{truefoundry-0.9.2rc1 → truefoundry-0.9.3}/truefoundry/deploy/_autogen/models.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  application.json
-#   timestamp: 2025-05-15T05:28:11+00:00
+#   timestamp: 2025-06-09T12:01:27+00:00
 
 from __future__ import annotations
 
@@ -104,8 +104,8 @@ class AsyncProcessorSidecar(BaseModel):
 
 class Autoshutdown(BaseModel):
     wait_time: conint(ge=0) = Field(
-        300,
-        description="The period to wait after the last received request before scaling the replicas to 0",
+        900,
+        description="The period to wait after the last received request before scaling the replicas to 0. This value should be high enough to allow for the replicas of the service to come up to avoid premature scaling down.",
     )
 
 
@@ -285,8 +285,8 @@ class GitSource(BaseModel):
     repo_url: constr(regex=r"^(https?://)\S+$") = Field(
         ..., description="The repository URL."
     )
-    ref: str = Field(..., description="The commit SHA.")
-    branch_name: Optional[str] = Field(
+    ref: constr(regex=r"^\S+$") = Field(..., description="The commit SHA.")
+    branch_name: Optional[constr(regex=r"^\S+$")] = Field(
         None,
         description="Selecting branch will select latest commit SHA of the branch.",
     )
@@ -346,11 +346,11 @@ class Image(BaseModel):
     """
 
     type: Literal["image"] = Field(..., description="")
-    image_uri: constr(regex=r"^\S*$") = Field(
+    image_uri: constr(regex=r"^\S+$") = Field(
         ...,
         description="The image URI. Specify the name of the image and the tag.\nIf the image is in Dockerhub, you can skip registry-url (for e.g. `tensorflow/tensorflow`).\nYou can use an image from a private registry using Advanced fields",
     )
-    docker_registry: Optional[str] = Field(
+    docker_registry: Optional[constr(regex=r"^\S+$")] = Field(
         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",
     )
@@ -643,7 +643,7 @@ class PythonBuild(BaseModel):
     )
     cuda_version: Optional[
         constr(
-            regex=r"^((\d+\.\d+(\.\d+)?-cudnn\d+-(runtime|devel)-ubuntu\d+\.\d+)|11\.0-cudnn8|11\.1-cudnn8|11\.2-cudnn8|11\.3-cudnn8|11\.4-cudnn8|11\.5-cudnn8|11\.6-cudnn8|11\.7-cudnn8|11\.8-cudnn8|12\.0-cudnn8|12\.1-cudnn8|12\.2-cudnn8)$"
+            regex=r"^((\d+\.\d+(\.\d+)?-cudnn\d+-(runtime|devel)-ubuntu\d+\.\d+)|11\.0-cudnn8|11\.1-cudnn8|11\.2-cudnn8|11\.3-cudnn8|11\.4-cudnn8|11\.5-cudnn8|11\.6-cudnn8|11\.7-cudnn8|11\.8-cudnn8|12\.0-cudnn8|12\.1-cudnn8|12\.2-cudnn8|12\.3-cudnn9|12\.4-cudnn9|12\.5-cudnn9|12\.6-cudnn9)$"
         )
     ] = Field(
         None,
@@ -840,8 +840,26 @@ class SlackWebhook(BaseModel):
     )
 
 
+class SparkBuild(BaseModel):
+    """
+    Describes that we are using python to build a container image with a specific python version and pip packages installed.
+    """
+
+    type: Literal["tfy-spark-buildpack"] = Field(..., description="")
+    spark_version: str = Field(
+        "3.5.2",
+        description="Spark version should match the spark version installed in the image.",
+    )
+    build_context_path: str = Field(
+        "./", description="Build path relative to project root path."
+    )
+    requirements_path: Optional[str] = Field(
+        None,
+        description="Path to `requirements.txt` relative to\n`Path to build context`",
+    )
+
+
 class SparkDriverConfig(BaseModel):
-    ui_endpoint: Endpoint
     resources: Optional[Resources] = None
 
 
@@ -865,19 +883,33 @@ class SparkImage(BaseModel):
     Describes that we are using a pre-built image stored in a Docker Image registry
     """
 
-    type: Literal["image"] = Field(..., description="")
+    type: Literal["spark-image"] = Field(..., description="")
     spark_version: str = Field(
         "3.5.2",
         description="Spark version should match the spark version installed in the image.",
     )
-    image_uri: constr(regex=r"^\S*$") = Field(
+    image_uri: constr(regex=r"^\S+$") = Field(
         ...,
         description="The image URI. Specify the name of the image and the tag.\nIf the image is in Dockerhub, you can skip registry-url (for e.g. `tensorflow/tensorflow`).\nYou can use an image from a private registry using Advanced fields",
     )
-    docker_registry: Optional[str] = Field(
+    docker_registry: Optional[constr(regex=r"^\S+$")] = Field(
+        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",
+    )
+
+
+class SparkImageBuild(BaseModel):
+    """
+    Describes that we are building a new image based on the spec
+    """
+
+    type: Literal["spark-image-build"] = Field(..., description="")
+    docker_registry: Optional[constr(regex=r"^\S+$")] = Field(
         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_spec: SparkBuild
 
 
 class SparkJobJavaEntrypoint(BaseModel):
@@ -896,7 +928,8 @@ class SparkJobJavaEntrypoint(BaseModel):
 class SparkJobPythonEntrypoint(BaseModel):
     type: Literal["python"] = Field(..., description="")
     main_application_file: str = Field(
-        ..., description="The main application file to be executed by the spark job."
+        ...,
+        description="The main application file to be executed by the spark job. Relative path in case of git repository.",
     )
     arguments: Optional[str] = Field(
         None, description="Arguments to be passed to the main application file."
@@ -978,7 +1011,7 @@ class TaskPythonBuild(BaseModel):
     )
     cuda_version: Optional[
         constr(
-            regex=r"^((\d+\.\d+(\.\d+)?-cudnn\d+-(runtime|devel)-ubuntu\d+\.\d+)|11\.0-cudnn8|11\.1-cudnn8|11\.2-cudnn8|11\.3-cudnn8|11\.4-cudnn8|11\.5-cudnn8|11\.6-cudnn8|11\.7-cudnn8|11\.8-cudnn8|12\.0-cudnn8|12\.1-cudnn8|12\.2-cudnn8)$"
+            regex=r"^((\d+\.\d+(\.\d+)?-cudnn\d+-(runtime|devel)-ubuntu\d+\.\d+)|11\.0-cudnn8|11\.1-cudnn8|11\.2-cudnn8|11\.3-cudnn8|11\.4-cudnn8|11\.5-cudnn8|11\.6-cudnn8|11\.7-cudnn8|11\.8-cudnn8|12\.0-cudnn8|12\.1-cudnn8|12\.2-cudnn8|12\.3-cudnn9|12\.4-cudnn9|12\.5-cudnn9|12\.6-cudnn9)$"
         )
     ] = Field(
         None,
@@ -1113,7 +1146,7 @@ class Build(BaseModel):
     """
 
     type: Literal["build"] = Field(..., description="")
-    docker_registry: Optional[str] = Field(
+    docker_registry: Optional[constr(regex=r"^\S+$")] = Field(
         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",
     )
@@ -1411,7 +1444,10 @@ class SparkJob(BaseModel):
     name: constr(regex=r"^[a-z](?:[a-z0-9]|-(?!-)){1,30}[a-z0-9]$") = Field(
         ..., description="Name of the job"
     )
-    image: SparkImage
+    image: Union[SparkImage, SparkImageBuild] = Field(
+        ...,
+        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
     ] = Field(..., description="")
@@ -1604,8 +1640,8 @@ class Job(BaseModel):
     trigger: Union[Manual, Schedule] = Field(
         {"type": "manual"}, description="Specify the trigger"
     )
-    trigger_on_deploy: bool = Field(
-        False, description="Trigger the job after deploy immediately"
+    trigger_on_deploy: Optional[bool] = Field(
+        None, description="Trigger the job after deploy immediately"
     )
     params: Optional[List[Param]] = Field(
         None, description="Configure params and pass it to create different job runs"

{truefoundry-0.9.2rc1 → truefoundry-0.9.3}/truefoundry/deploy/builder/__init__.py

@@ -3,6 +3,7 @@ from typing import Any, Dict, List, Optional, Union
 from truefoundry.deploy._autogen.models import (
     DockerFileBuild,
     PythonBuild,
+    SparkBuild,
     TaskDockerFileBuild,
     TaskPythonBuild,
 )
@@ -20,6 +21,7 @@ class _BuildConfig(BaseModel):
         NotebookImageBuild,
         TaskPythonBuild,
         TaskDockerFileBuild,
+        SparkBuild,
     ] = Field(discriminator="type")
 
 
@@ -37,7 +39,6 @@ def build(
         build_configuration_dict = build_configuration.dict()
         build_configuration_dict.update({"type": "dockerfile"})
         build_configuration = DockerFileBuild.parse_obj(build_configuration_dict)
-
     builder = get_builder(build_configuration.type)
     return builder(
         build_configuration=build_configuration,

{truefoundry-0.9.2rc1 → truefoundry-0.9.3}/truefoundry/deploy/builder/builders/__init__.py

@@ -4,12 +4,14 @@ from truefoundry.deploy.builder.builders import (
     dockerfile,
     tfy_notebook_buildpack,
     tfy_python_buildpack,
+    tfy_spark_buildpack,
 )
 
 BUILD_REGISTRY: Dict[str, Callable] = {
     "dockerfile": dockerfile.build,
     "tfy-python-buildpack": tfy_python_buildpack.build,
     "tfy-notebook-buildpack": tfy_notebook_buildpack.build,
+    "tfy-spark-buildpack": tfy_spark_buildpack.build,
 }
 
 __all__ = ["get_builder"]

truefoundry-0.9.3/truefoundry/deploy/builder/builders/tfy_spark_buildpack/__init__.py

@@ -0,0 +1,79 @@
+import os
+import shutil
+from tempfile import TemporaryDirectory
+from typing import List, Optional
+
+from truefoundry.common.constants import PythonPackageManager
+from truefoundry.deploy._autogen.models import DockerFileBuild, SparkBuild
+from truefoundry.deploy.builder.builders import dockerfile
+from truefoundry.deploy.builder.builders.tfy_spark_buildpack.dockerfile_template import (
+    generate_dockerfile_content,
+)
+from truefoundry.deploy.builder.utils import has_python_package_manager_conf_secret
+
+__all__ = ["generate_dockerfile_content", "build"]
+
+
+def _convert_to_dockerfile_build_config(
+    build_configuration: SparkBuild,
+    dockerfile_path: str,
+    mount_python_package_manager_conf_secret: bool = False,
+) -> DockerFileBuild:
+    dockerfile_content = generate_dockerfile_content(
+        build_configuration=build_configuration,
+        mount_python_package_manager_conf_secret=mount_python_package_manager_conf_secret,
+        package_manager=PythonPackageManager.PIP.value,
+    )
+    with open(dockerfile_path, "w", encoding="utf8") as fp:
+        fp.write(dockerfile_content)
+
+    return DockerFileBuild(
+        type="dockerfile",
+        dockerfile_path=dockerfile_path,
+        build_context_path=build_configuration.build_context_path,
+    )
+
+
+def build(
+    tag: str,
+    build_configuration: SparkBuild,
+    extra_opts: Optional[List[str]] = None,
+):
+    mount_python_package_manager_conf_secret = (
+        has_python_package_manager_conf_secret(extra_opts) if extra_opts else False
+    )
+
+    # Copy tfy_execute_notebook.py to the build context
+    execute_notebook_src = os.path.join(
+        os.path.dirname(__file__), "tfy_execute_notebook.py"
+    )
+    execute_notebook_dst = os.path.join(
+        build_configuration.build_context_path, "tfy_execute_notebook.py"
+    )
+
+    # Verify the source file exists before copying
+    if not os.path.isfile(execute_notebook_src):
+        raise FileNotFoundError(f"Required file not found: {execute_notebook_src}")
+
+    # Always copy the file, overwrite if exists
+    shutil.copy2(execute_notebook_src, execute_notebook_dst)
+
+    try:
+        with TemporaryDirectory() as local_dir:
+            docker_build_configuration = _convert_to_dockerfile_build_config(
+                build_configuration,
+                dockerfile_path=os.path.join(local_dir, "Dockerfile"),
+                mount_python_package_manager_conf_secret=mount_python_package_manager_conf_secret,
+            )
+            dockerfile.build(
+                tag=tag,
+                build_configuration=docker_build_configuration,
+                extra_opts=extra_opts,
+            )
+    finally:
+        # Clean up the copied file if we copied it
+        if os.path.exists(execute_notebook_dst):
+            try:
+                os.remove(execute_notebook_dst)
+            except OSError:
+                pass  # Ignore errors when cleaning up

truefoundry-0.9.3/truefoundry/deploy/builder/builders/tfy_spark_buildpack/dockerfile_template.py

@@ -0,0 +1,172 @@
+import shlex
+from typing import List, Optional
+
+from mako.template import Template
+
+from truefoundry.common.constants import ENV_VARS, PythonPackageManager
+from truefoundry.deploy._autogen.models import SparkBuild
+from truefoundry.deploy.builder.constants import (
+    PIP_CONF_BUILDKIT_SECRET_MOUNT,
+    PIP_CONF_SECRET_MOUNT_AS_ENV,
+    UV_CONF_BUILDKIT_SECRET_MOUNT,
+    UV_CONF_SECRET_MOUNT_AS_ENV,
+)
+from truefoundry.deploy.v2.lib.patched_models import (
+    _resolve_requirements_path,
+)
+
+# TODO (chiragjn): Switch to a non-root user inside the container
+
+_POST_PYTHON_INSTALL_TEMPLATE = """
+% if requirements_path is not None:
+COPY ${requirements_path} ${requirements_destination_path}
+% endif
+% if python_packages_install_command is not None:
+RUN ${package_manager_config_secret_mount} ${python_packages_install_command}
+% endif
+USER spark
+COPY . /app
+WORKDIR /app
+"""
+
+_POST_USER_TEMPLATE = """
+COPY tfy_execute_notebook.py /app/tfy_execute_notebook.py
+"""
+
+DOCKERFILE_TEMPLATE = Template(
+    """
+FROM ${spark_image_repo}:${spark_version}
+USER root
+RUN apt update && \
+    DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends git && \
+    rm -rf /var/lib/apt/lists/*
+"""
+    + _POST_PYTHON_INSTALL_TEMPLATE
+    + _POST_USER_TEMPLATE
+)
+
+ADDITIONAL_PIP_PACKAGES = ["papermill>=2.6.0,<2.7.0"]
+
+
+def generate_pip_install_command(
+    requirements_path: Optional[str],
+    pip_packages: Optional[List[str]],
+    mount_pip_conf_secret: bool = False,
+) -> Optional[str]:
+    upgrade_pip_command = "python3 -m pip install -U pip setuptools wheel"
+    envs = []
+    if mount_pip_conf_secret:
+        envs.append(PIP_CONF_SECRET_MOUNT_AS_ENV)
+
+    command = ["python3", "-m", "pip", "install", "--use-pep517", "--no-cache-dir"]
+    args = []
+    if requirements_path:
+        args.append("-r")
+        args.append(requirements_path)
+
+    if pip_packages:
+        args.extend(pip_packages)
+
+    if not args:
+        return None
+
+    final_pip_install_command = shlex.join(envs + command + args)
+    final_docker_run_command = " && ".join(
+        [upgrade_pip_command, final_pip_install_command]
+    )
+    return final_docker_run_command
+
+
+def generate_uv_pip_install_command(
+    requirements_path: Optional[str],
+    pip_packages: Optional[List[str]],
+    mount_uv_conf_secret: bool = False,
+) -> Optional[str]:
+    upgrade_pip_command = "python3 -m pip install -U pip setuptools wheel"
+    uv_mount = f"--mount=from={ENV_VARS.TFY_PYTHON_BUILD_UV_IMAGE_URI},source=/uv,target=/usr/local/bin/uv"
+    envs = [
+        "UV_LINK_MODE=copy",
+        "UV_PYTHON_DOWNLOADS=never",
+        "UV_INDEX_STRATEGY=unsafe-best-match",
+    ]
+    if mount_uv_conf_secret:
+        envs.append(UV_CONF_SECRET_MOUNT_AS_ENV)
+
+    command = ["uv", "pip", "install", "--no-cache-dir"]
+
+    args = []
+
+    if requirements_path:
+        args.append("-r")
+        args.append(requirements_path)
+
+    if pip_packages:
+        args.extend(pip_packages)
+
+    if not args:
+        return None
+
+    uv_pip_install_command = shlex.join(envs + command + args)
+    shell_commands = " && ".join([upgrade_pip_command, uv_pip_install_command])
+    final_docker_run_command = " ".join([uv_mount, shell_commands])
+
+    return final_docker_run_command
+
+
+def generate_dockerfile_content(
+    build_configuration: SparkBuild,
+    package_manager: str = ENV_VARS.TFY_PYTHON_BUILD_PACKAGE_MANAGER,
+    mount_python_package_manager_conf_secret: bool = False,
+) -> str:
+    # TODO (chiragjn): Handle recursive references to other requirements files e.g. `-r requirements-gpu.txt`
+    requirements_path = _resolve_requirements_path(
+        build_context_path=build_configuration.build_context_path,
+        requirements_path=build_configuration.requirements_path,
+    )
+    requirements_destination_path = (
+        "/tmp/requirements.txt" if requirements_path else None
+    )
+    if not build_configuration.spark_version:
+        raise ValueError(
+            "`spark_version` is required for `tfy-spark-buildpack` builder"
+        )
+
+    if package_manager == PythonPackageManager.PIP.value:
+        python_packages_install_command = generate_pip_install_command(
+            requirements_path=requirements_destination_path,
+            pip_packages=ADDITIONAL_PIP_PACKAGES,
+            mount_pip_conf_secret=mount_python_package_manager_conf_secret,
+        )
+    elif package_manager == PythonPackageManager.UV.value:
+        python_packages_install_command = generate_uv_pip_install_command(
+            requirements_path=requirements_destination_path,
+            pip_packages=ADDITIONAL_PIP_PACKAGES,
+            mount_uv_conf_secret=mount_python_package_manager_conf_secret,
+        )
+    else:
+        raise ValueError(f"Unsupported package manager: {package_manager}")
+
+    template_args = {
+        "spark_image_repo": ENV_VARS.TFY_SPARK_BUILD_SPARK_IMAGE_REPO,
+        "spark_version": build_configuration.spark_version,
+        "requirements_path": requirements_path,
+        "requirements_destination_path": requirements_destination_path,
+        "python_packages_install_command": python_packages_install_command,
+    }
+
+    if mount_python_package_manager_conf_secret:
+        if package_manager == PythonPackageManager.PIP.value:
+            template_args["package_manager_config_secret_mount"] = (
+                PIP_CONF_BUILDKIT_SECRET_MOUNT
+            )
+        elif package_manager == PythonPackageManager.UV.value:
+            template_args["package_manager_config_secret_mount"] = (
+                UV_CONF_BUILDKIT_SECRET_MOUNT
+            )
+        else:
+            raise ValueError(f"Unsupported package manager: {package_manager}")
+    else:
+        template_args["package_manager_config_secret_mount"] = ""
+
+    dockerfile_content = DOCKERFILE_TEMPLATE.render(**template_args)
+    return dockerfile_content

truefoundry-0.9.3/truefoundry/deploy/builder/builders/tfy_spark_buildpack/tfy_execute_notebook.py

@@ -0,0 +1,56 @@
+# This script is used as the main application file for spark applications
+# when the application to be run is a notebook, the actual notebook to be
+# executed is passed as an argument to this script.
+
+
+import argparse
+import sys
+
+import papermill as pm
+
+
+def execute_notebook(notebook_path, output_path="output.ipynb", parameters=None):
+    """
+    Execute a Jupyter notebook using papermill.
+
+    Args:
+        notebook_path: Path to the input notebook
+        output_path: Path for the output notebook
+        parameters: Dictionary of parameters to pass to the notebook
+
+    Raises:
+        Exception: If notebook execution fails
+    """
+    if parameters is None:
+        parameters = {}
+
+    print(f"Starting execution of notebook: {notebook_path}")
+    pm.execute_notebook(
+        notebook_path,
+        output_path,
+        parameters=parameters,
+        # TODO(gw): Replace with kernel name for venv
+        kernel_name="python3",
+    )
+    print(f"Successfully executed notebook: {notebook_path}")
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(
+        description="Execute a Jupyter notebook using papermill for Spark applications"
+    )
+    parser.add_argument("notebook_path", help="Path to the notebook file to execute")
+
+    args = parser.parse_args()
+
+    # TODO(gw): Add support for passing parameters to the notebook
+    try:
+        execute_notebook(args.notebook_path)
+    except Exception as e:
+        print(f"Error executing notebook {args.notebook_path}: {e}")
+        print(
+            "Exiting with status code 1 to signal failure to parent process/orchestrator"
+        )
+        sys.exit(1)
+
+    # TODO(gw): Publish the output notebook to blob storage from where it could be rendered

{truefoundry-0.9.2rc1 → truefoundry-0.9.3}/truefoundry/deploy/cli/commands/apply_command.py

@@ -37,13 +37,28 @@ from truefoundry.deploy.lib.model.entity import ApplyResult
     show_default=True,
     help="Simulate the process without actually applying the manifest",
 )
+@click.option(
+    "--show-diff",
+    "--show_diff",
+    is_flag=True,
+    show_default=True,
+    help="Print manifest differences when using --dry-run",
+)
 @handle_exception_wrapper
-def apply_command(files: Tuple[str, ...], dry_run: bool = False):
+def apply_command(
+    files: Tuple[str, ...], dry_run: bool = False, show_diff: bool = False
+):
+    # Validate that show_diff is only used with dry_run
+    if show_diff and not dry_run:
+        raise click.ClickException("--show-diff requires --dry-run")
+
     apply_results: List[ApplyResult] = []
     client = ServiceFoundryServiceClient()
     for file in files:
         with console.status(PROMPT_APPLYING_MANIFEST.format(file), spinner="dots"):
-            for apply_result in apply_lib.apply_manifest_file(file, client, dry_run):
+            for apply_result in apply_lib.apply_manifest_file(
+                file, client, dry_run, show_diff
+            ):
                 if apply_result.success:
                     console.print(f"[green]\u2714 {apply_result.message}[/]")
                 else:

{truefoundry-0.9.2rc1 → truefoundry-0.9.3}/truefoundry/deploy/cli/commands/deploy_command.py

@@ -62,6 +62,14 @@ def _get_default_spec_file():
     default=False,
     help="Force create a new deployment by canceling any ongoing deployments",
 )
+@click.option(
+    "--trigger-on-deploy/--no-trigger-on-deploy",
+    "--trigger_on_deploy/--no_trigger_on_deploy",
+    is_flag=True,
+    show_default=True,
+    default=False,
+    help="Trigger a Job run after deployment succeeds. Has no effect for non Job type deployments",
+)
 @click.pass_context
 @handle_exception_wrapper
 def deploy_command(
@@ -70,6 +78,7 @@ def deploy_command(
     workspace_fqn: Optional[str],
     wait: bool,
     force: bool = False,
+    trigger_on_deploy: bool = False,
 ):
     if ctx.invoked_subcommand is not None:
         return
@@ -86,7 +95,12 @@ def deploy_command(
             application_definition = yaml.safe_load(f)
 
         application = Application.parse_obj(application_definition)
-        application.deploy(workspace_fqn=workspace_fqn, wait=wait, force=force)
+        application.deploy(
+            workspace_fqn=workspace_fqn,
+            wait=wait,
+            force=force,
+            trigger_on_deploy=trigger_on_deploy,
+        )
         sys.exit(0)
 
     click.echo(

{truefoundry-0.9.2rc1 → truefoundry-0.9.3}/truefoundry/deploy/lib/clients/servicefoundry_client.py

@@ -39,6 +39,7 @@ from truefoundry.deploy.lib.model.entity import (
     JobRun,
     LogBody,
     SocketEvent,
+    TFYApplyResponse,
     TriggerJobResult,
     Workspace,
     WorkspaceResources,
@@ -222,12 +223,14 @@ class ServiceFoundryServiceClient(BaseServiceFoundryServiceClient):
         workspace_id: str,
         application: autogen_models.Workflow,
         force: bool = False,
+        trigger_on_deploy: bool = False,
     ) -> Deployment:
         data = {
             "workspaceId": workspace_id,
             "name": application.name,
             "manifest": application.dict(exclude_none=True),
             "forceDeploy": force,
+            "triggerOnDeploy": trigger_on_deploy,
         }
         logger.debug(json.dumps(data))
         url = f"{self._api_server_url}/{VERSION_PREFIX}/deployment"
@@ -680,14 +683,16 @@ class ServiceFoundryServiceClient(BaseServiceFoundryServiceClient):
         return parse_obj_as(List[Deployment], response)
 
     @check_min_cli_version
-    def apply(self, manifest: Dict[str, Any], dry_run: bool = False) -> Dict[str, Any]:
+    def apply(
+        self, manifest: Dict[str, Any], dry_run: bool = False
+    ) -> TFYApplyResponse:
         url = f"{self._api_server_url}/{VERSION_PREFIX}/apply"
         body = {"manifest": manifest, "dryRun": dry_run}
         response = session_with_retries().put(
             url, headers=self._get_headers(), json=body
         )
-        response_data = cast(Dict[str, Any], request_handling(response))
-        return response_data
+        response_data = cast(Dict[str, Any], request_handling(response) or {})
+        return TFYApplyResponse.parse_obj(response_data)
 
     @check_min_cli_version
     def delete(self, manifest: Dict[str, Any]) -> Dict[str, Any]: