truefoundry 0.11.9rc1__tar.gz → 0.11.11rc1__tar.gz

{truefoundry-0.11.9rc1 → truefoundry-0.11.11rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: truefoundry
-Version: 0.11.9rc1
+Version: 0.11.11rc1
 Summary: TrueFoundry CLI
 Author-email: TrueFoundry Team <abhishek@truefoundry.com>
 Requires-Python: <3.14,>=3.8.1
@@ -13,6 +13,7 @@ Requires-Dist: gitignorefile<2.0.0,>=1.1.2
 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: jinja2<4.0.0,>=3.1.6
 Requires-Dist: mako<2.0.0,>=1.1.6
 Requires-Dist: numpy<3.0.0,>=1.23.0
 Requires-Dist: openai<2.0.0,>=1.16.2

{truefoundry-0.11.9rc1 → truefoundry-0.11.11rc1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "truefoundry"
-version = "0.11.9rc1"  # This is a placeholder version, it will be replaced when releasing
+version = "0.11.11rc1"  # 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" }]
@@ -37,7 +37,7 @@ dependencies = [
   "yq>=3.1.0,<4.0.0",
   # Check and try to eliminate libs below this comment
   "numpy>=1.23.0,<3.0.0",
-
+  "Jinja2>=3.1.6,<4.0.0"
 ]
 
 [project.optional-dependencies]

{truefoundry-0.11.9rc1 → truefoundry-0.11.11rc1}/truefoundry/common/constants.py

@@ -74,7 +74,8 @@ class TrueFoundrySdkEnv(BaseSettings):
     TFY_CLI_LOCAL_DEV_MODE: bool = False
 
     TFY_PYTHON_BUILD_PACKAGE_MANAGER: PythonPackageManager = PythonPackageManager.UV
-    TFY_PYTHON_BUILD_UV_IMAGE_URI: str = "ghcr.io/astral-sh/uv:latest"
+    TFY_PYTHON_BUILD_UV_IMAGE_REPO: str = "ghcr.io/astral-sh/uv"
+    TFY_PYTHON_BUILD_UV_IMAGE_TAG: str = "latest"
 
     # Global Constants for OpenAI Integration
     OPENAI_API_KEY: Optional[str] = Field(default=None, env=OPENAI_API_KEY_KEY)
@@ -93,6 +94,12 @@ class TrueFoundrySdkEnv(BaseSettings):
     )
     TFY_ASK_SYSTEM_PROMPT_NAME: str = Field(default="tfy-ask-k8s-prompt")
     TFY_INTERNAL_ASK_CONFIG_OVERRIDE_FILE: Optional[str] = Field(default=None)
+    TFY_PYTHON_BUILD_POETRY_VERSION: str = Field(
+        default="2.0", env="TFY_PYTHON_BUILD_POETRY_VERSION"
+    )
+    TFY_PYTHON_BUILD_LATEST_POETRY_MAJOR_VERSION: int = Field(
+        default=2, env="TFY_PYTHON_BUILD_LATEST_POETRY_MAJOR_VERSION"
+    )
 
     # 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.

{truefoundry-0.11.9rc1 → truefoundry-0.11.11rc1}/truefoundry/deploy/__init__.py

@@ -52,6 +52,7 @@ from truefoundry.deploy.v2.lib.deployable_patched_models import (
     Workflow,
 )
 from truefoundry.deploy.v2.lib.patched_models import (
+    UV,
     AMQPInputConfig,
     AMQPMetricConfig,
     AMQPOutputConfig,
@@ -102,6 +103,8 @@ from truefoundry.deploy.v2.lib.patched_models import (
     NvidiaTimeslicingGPU,
     OCIRepo,
     Param,
+    Pip,
+    Poetry,
     Port,
     PythonBuild,
     RemoteSource,

{truefoundry-0.11.9rc1 → truefoundry-0.11.11rc1}/truefoundry/deploy/_autogen/models.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  application.json
-#   timestamp: 2025-08-06T19:58:42+00:00
+#   timestamp: 2025-09-09T14:09:56+00:00
 
 from __future__ import annotations
 
@@ -504,34 +504,49 @@ class Profile(str, Enum):
     """
     Name of the MIG profile to use. One of the following based on gpu type
     Please refer to https://docs.nvidia.com/datacenter/tesla/mig-user-guide/#supported-mig-profiles for more details
-    A100 40 GB - [1g.5gb, 1g.10gb, 2g.10gb, 3g.20gb, 4g.20gb]
-    A100 80 GB / H100 80 GB - [1g.10gb, 1g.20gb, 2g.20gb, 3g.40gb, 4g.40gb]
-    H100 94 GB - [1g.12gb, 1g.24gb, 2g.24gb, 3g.47gb, 4g.47gb]
-    H100 96 GB - [1g.12gb, 1g.24gb, 2g.24gb, 3g.48gb, 4g.48gb]
+    A30 - [1g.6gb, 2g.12gb, 4g.24gb]
+    A100 40 GB - [1g.5gb, 1g.10gb, 2g.10gb, 3g.20gb, 4g.20gb, 7g.40gb]
+    A100 80 GB / H100 80 GB - [1g.10gb, 1g.20gb, 2g.20gb, 3g.40gb, 4g.40gb, 7g.80gb]
+    H100 94 GB - [1g.12gb, 1g.24gb, 2g.24gb, 3g.47gb, 4g.47gb, 7g.94gb]
+    H100 96 GB - [1g.12gb, 1g.24gb, 2g.24gb, 3g.48gb, 4g.48gb, 7g.96gb]
     H200 141 GB - [1g.18gb, 1g.35gb, 2g.35gb, 3g.71gb, 4g.71gb]
+    B200 180 GB - [1g.23gb, 1g.45gb, 2g.45gb, 3g.90gb, 4g.90gb, 7g.180gb]
     """
 
+    field_1g_6gb = "1g.6gb"
+    field_2g_12gb = "2g.12gb"
     field_1g_5gb = "1g.5gb"
     field_1g_10gb = "1g.10gb"
-    field_1g_12gb = "1g.12gb"
-    field_1g_18gb = "1g.18gb"
-    field_1g_20gb = "1g.20gb"
-    field_1g_24gb = "1g.24gb"
-    field_1g_35gb = "1g.35gb"
     field_2g_10gb = "2g.10gb"
-    field_2g_20gb = "2g.20gb"
-    field_2g_24gb = "2g.24gb"
-    field_2g_35gb = "2g.35gb"
     field_3g_20gb = "3g.20gb"
-    field_3g_40gb = "3g.40gb"
-    field_3g_47gb = "3g.47gb"
-    field_3g_48gb = "3g.48gb"
-    field_3g_71gb = "3g.71gb"
     field_4g_20gb = "4g.20gb"
+    field_1g_20gb = "1g.20gb"
+    field_2g_20gb = "2g.20gb"
+    field_3g_40gb = "3g.40gb"
     field_4g_40gb = "4g.40gb"
+    field_1g_12gb = "1g.12gb"
+    field_1g_24gb = "1g.24gb"
+    field_2g_24gb = "2g.24gb"
+    field_3g_47gb = "3g.47gb"
     field_4g_47gb = "4g.47gb"
+    field_3g_48gb = "3g.48gb"
     field_4g_48gb = "4g.48gb"
+    field_1g_18gb = "1g.18gb"
+    field_1g_35gb = "1g.35gb"
+    field_2g_35gb = "2g.35gb"
+    field_3g_71gb = "3g.71gb"
     field_4g_71gb = "4g.71gb"
+    field_1g_23gb = "1g.23gb"
+    field_1g_45gb = "1g.45gb"
+    field_2g_45gb = "2g.45gb"
+    field_3g_90gb = "3g.90gb"
+    field_4g_90gb = "4g.90gb"
+    field_4g_24gb = "4g.24gb"
+    field_7g_40gb = "7g.40gb"
+    field_7g_80gb = "7g.80gb"
+    field_7g_94gb = "7g.94gb"
+    field_7g_96gb = "7g.96gb"
+    field_7g_180gb = "7g.180gb"
 
 
 class NvidiaMIGGPU(BaseModel):
@@ -542,7 +557,7 @@ class NvidiaMIGGPU(BaseModel):
     )
     profile: Profile = Field(
         ...,
-        description="Name of the MIG profile to use. One of the following based on gpu type\nPlease refer to https://docs.nvidia.com/datacenter/tesla/mig-user-guide/#supported-mig-profiles for more details\nA100 40 GB - [1g.5gb, 1g.10gb, 2g.10gb, 3g.20gb, 4g.20gb]\nA100 80 GB / H100 80 GB - [1g.10gb, 1g.20gb, 2g.20gb, 3g.40gb, 4g.40gb]\nH100 94 GB - [1g.12gb, 1g.24gb, 2g.24gb, 3g.47gb, 4g.47gb]\nH100 96 GB - [1g.12gb, 1g.24gb, 2g.24gb, 3g.48gb, 4g.48gb]\nH200 141 GB - [1g.18gb, 1g.35gb, 2g.35gb, 3g.71gb, 4g.71gb]",
+        description="Name of the MIG profile to use. One of the following based on gpu type\nPlease refer to https://docs.nvidia.com/datacenter/tesla/mig-user-guide/#supported-mig-profiles for more details\nA30 - [1g.6gb, 2g.12gb, 4g.24gb]\nA100 40 GB - [1g.5gb, 1g.10gb, 2g.10gb, 3g.20gb, 4g.20gb, 7g.40gb]\nA100 80 GB / H100 80 GB - [1g.10gb, 1g.20gb, 2g.20gb, 3g.40gb, 4g.40gb, 7g.80gb]\nH100 94 GB - [1g.12gb, 1g.24gb, 2g.24gb, 3g.47gb, 4g.47gb, 7g.94gb]\nH100 96 GB - [1g.12gb, 1g.24gb, 2g.24gb, 3g.48gb, 4g.48gb, 7g.96gb]\nH200 141 GB - [1g.18gb, 1g.35gb, 2g.35gb, 3g.71gb, 4g.71gb]\nB200 180 GB - [1g.23gb, 1g.45gb, 2g.45gb, 3g.90gb, 4g.90gb, 7g.180gb]",
     )
 
 
@@ -552,7 +567,7 @@ class NvidiaTimeslicingGPU(BaseModel):
         None,
         description="Name of the Nvidia GPU. One of [P4, P100, V100, T4, A10G, A100_40GB, A100_80GB]\nThis field is required for Node Selector and can be ignored in Nodepool Selector.\nOne instance of the card contains the following amount of memory -\nP4: 8 GB, P100: 16 GB, V100: 16 GB, T4: 16 GB, A10G: 24 GB, A100_40GB: 40GB, A100_80GB: 80 GB",
     )
-    gpu_memory: conint(ge=1, le=200000) = Field(
+    gpu_memory: conint(ge=1, le=400000) = Field(
         ...,
         description="Amount of GPU memory (in MB) to allocate. Please note, this limit is not being enforced today but will be in future. Applications are expected to operate in co-opertative mode",
     )
@@ -588,6 +603,37 @@ class Param(BaseModel):
     param_type: ParamType = "string"
 
 
+class Pip(BaseModel):
+    """
+    Use pip to install requirements files and packages
+    """
+
+    type: Literal["pip"] = Field(..., description="")
+    requirements_path: Optional[str] = Field(
+        None,
+        description="Path to `requirements.txt` relative to `Path to build context`",
+    )
+    pip_packages: Optional[List[str]] = Field(
+        None,
+        description='Define pip package requirements.\nIn Python/YAML E.g. ["fastapi>=0.90,<1.0", "uvicorn"]',
+    )
+
+
+class Poetry(BaseModel):
+    """
+    Use `poetry` to setup environment and sync `poetry.lock` file
+    Your build context root must contain a `poetry.lock` file
+    """
+
+    type: Literal["poetry"] = Field(..., description="")
+    poetry_version: Union[
+        Literal["latest"], constr(regex=r"^\d+(\.\d+){1,2}([\-\.a-z0-9]+)?$")
+    ] = Field("latest", description="Poetry version to use")
+    install_options: Optional[str] = Field(
+        None, description="install options to pass to poetry command"
+    )
+
+
 class Protocol(str, Enum):
     """
     Protocol for the port.
@@ -610,47 +656,6 @@ class AppProtocol(str, Enum):
     tcp = "tcp"
 
 
-class PythonBuild(BaseModel):
-    """
-    Describes that we are using python to build a container image with a specific python version and pip packages installed.
-    """
-
-    type: Literal["tfy-python-buildpack"] = Field(..., description="")
-    python_version: Optional[constr(regex=r"^\d+(\.\d+){1,2}([\-\.a-z0-9]+)?$")] = (
-        Field(
-            None,
-            description="Python version to run your application. Should be one of the tags listed on [Official Python Docker Page](https://hub.docker.com/_/python)",
-        )
-    )
-    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`",
-    )
-    pip_packages: Optional[List[str]] = Field(
-        None,
-        description='Define pip package requirements.\nIn Python/YAML E.g. ["fastapi>=0.90,<1.0", "uvicorn"]',
-    )
-    apt_packages: Optional[List[str]] = Field(
-        None,
-        description='Debian packages to install via `apt get`.\nIn Python/YAML E.g. ["git", "ffmpeg", "htop"]',
-    )
-    command: Union[str, List[str]] = Field(
-        ...,
-        description="Command to run when the container starts.\nCommand will be set as the Entrypoint of the generated image.\nWhen deploying a Job, the command can be templatized by defining `params` and referencing them in command\nE.g. `python main.py --learning_rate {{learning_rate}}`",
-    )
-    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|12\.3-cudnn9|12\.4-cudnn9|12\.5-cudnn9|12\.6-cudnn9)$"
-        )
-    ] = Field(
-        None,
-        description="Version of CUDA Toolkit and CUDNN to install in the image\nThese combinations are based off of publically available docker images on docker hub\nYou can also specify a valid tag of the form {cuda_version_number}-cudnn{cudnn_version_number}-{runtime|devel}-ubuntu{ubuntu_version}\nRefer https://hub.docker.com/r/nvidia/cuda/tags for valid set of values\nNote: We use deadsnakes ubuntu ppa to add Python that currently supports only Ubuntu 18.04, 20.04 and 22.04",
-    )
-
-
 class RPSMetric(BaseModel):
     type: Literal["rps"] = Field(..., description="")
     value: PositiveFloat = Field(
@@ -681,11 +686,11 @@ class Resources(BaseModel):
         0.5,
         description="CPU limit beyond which the usage cannot be exceeded. 1 CPU means 1 CPU core. Fractional CPU can be requested\nlike `0.5`. CPU limit should be >= cpu request.",
     )
-    memory_request: conint(ge=1, le=2000000) = Field(
+    memory_request: conint(ge=1, le=4000000) = Field(
         200,
         description="Requested memory which determines the minimum cost incurred. The unit of memory is in megabytes(MB).\nSo 1 means 1 MB and 2000 means 2GB.",
     )
-    memory_limit: conint(ge=1, le=2000000) = Field(
+    memory_limit: conint(ge=1, le=4000000) = Field(
         500,
         description="Memory limit after which the application will be killed with an OOM error. The unit of memory is\nin megabytes(MB). So 1 means 1 MB and 2000 means 2GB. MemoryLimit should be greater than memory request.",
     )
@@ -697,7 +702,7 @@ class Resources(BaseModel):
         2000,
         description="Disk storage limit. The unit of memory is in megabytes(MB). Exceeding this limit will result in eviction.\nIt should be greater than the request. This is ephemeral storage and will be wiped out on pod restarts or eviction",
     )
-    shared_memory_size: Optional[conint(ge=64, le=2000000)] = Field(
+    shared_memory_size: Optional[conint(ge=64, le=4000000)] = Field(
         None,
         description="Define the shared memory requirements for your workload. Machine learning libraries like Pytorch can use Shared Memory\nfor inter-process communication. If you use this, we will mount a `tmpfs` backed volume at the `/dev/shm` directory.\nAny usage will also count against the workload's memory limit (`resources.memory_limit`) along with your workload's memory usage.\nIf the overall usage goes above `resources.memory_limit` the user process may get killed.\nShared Memory Size cannot be more than the defined Memory Limit for the workload.",
     )
@@ -1087,6 +1092,19 @@ class TrueFoundryInteractiveLogin(BaseModel):
     )
 
 
+class UV(BaseModel):
+    """
+    Use `uv` to setup environment and sync `uv.lock` file
+    Your build context root must contain a `uv.lock` file
+    """
+
+    type: Literal["uv"] = Field(..., description="")
+    uv_version: str = Field("latest", description="UV version to use")
+    sync_options: Optional[str] = Field(
+        None, description="Sync options to pass to uv command"
+    )
+
+
 class VolumeBrowser(BaseModel):
     username: Optional[constr(regex=r"^[a-z][a-z0-9]{1,8}[a-z0-9]$")] = Field(
         None, description="Username for logging in the volume browser."
@@ -1184,25 +1202,6 @@ class BaseWorkbenchInput(BaseModel):
     )
 
 
-class Build(BaseModel):
-    """
-    Describes how we build our code into a Docker image.
-    """
-
-    type: Literal["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: Union[RemoteSource, GitSource, LocalSource] = Field(
-        ..., description="Source code location."
-    )
-    build_spec: Union[DockerFileBuild, PythonBuild] = Field(
-        ...,
-        description="Instructions to build a container image out of the build source",
-    )
-
-
 class Canary(BaseModel):
     """
     This strategy brings up the new release without bringing the older release down. Traffic is shifted from the older release to the newer release in a staged manner.
@@ -1225,23 +1224,6 @@ class Codeserver(BaseWorkbenchInput):
     image: WorkbenchImage
 
 
-class ContainerTaskConfig(BaseModel):
-    type: Literal["container-task-config"] = Field(..., description="")
-    image: Union[Build, Image] = Field(
-        ...,
-        description="Specify whether you want to deploy a Docker image or build and deploy from source code",
-    )
-    env: Optional[Dict[str, str]] = Field(
-        None,
-        description="Configure environment variables to be injected in the task either as plain text or secrets. [Docs](https://docs.truefoundry.com/docs/env-variables)",
-    )
-    resources: Optional[Resources] = None
-    mounts: Optional[List[VolumeMount]] = Field(
-        None, description="Configure data to be mounted to Workflow pod(s) as a volume."
-    )
-    service_account: Optional[str] = Field(None, description="")
-
-
 class CoreNATSOutputConfig(BaseModel):
     """
     Describes the configuration for the output Core NATS worker
@@ -1430,6 +1412,50 @@ class Port(BaseModel):
     ] = Field(None, description="Authentication method for inbound traffic")
 
 
+class PythonBuild(BaseModel):
+    """
+    Describes that we are using python to build a container image with a specific python version and pip packages installed.
+    """
+
+    type: Literal["tfy-python-buildpack"] = Field(..., description="")
+    python_version: Optional[constr(regex=r"^\d+(\.\d+){1,2}([\-\.a-z0-9]+)?$")] = (
+        Field(
+            None,
+            description="Python version to run your application. Should be one of the tags listed on [Official Python Docker Page](https://hub.docker.com/_/python)",
+        )
+    )
+    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`",
+    )
+    pip_packages: Optional[List[str]] = Field(
+        None,
+        description='Define pip package requirements.\nIn Python/YAML E.g. ["fastapi>=0.90,<1.0", "uvicorn"]',
+    )
+    python_dependencies: Optional[Union[Pip, UV, Poetry]] = Field(
+        None, description="Python dependencies to install"
+    )
+    apt_packages: Optional[List[str]] = Field(
+        None,
+        description='Debian packages to install via `apt get`.\nIn Python/YAML E.g. ["git", "ffmpeg", "htop"]',
+    )
+    command: Union[str, List[str]] = Field(
+        ...,
+        description="Command to run when the container starts.\nCommand will be set as the Entrypoint of the generated image.\nWhen deploying a Job, the command can be templatized by defining `params` and referencing them in command\nE.g. `python main.py --learning_rate {{learning_rate}}`",
+    )
+    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|12\.3-cudnn9|12\.4-cudnn9|12\.5-cudnn9|12\.6-cudnn9)$"
+        )
+    ] = Field(
+        None,
+        description="Version of CUDA Toolkit and CUDNN to install in the image\nThese combinations are based off of publically available docker images on docker hub\nYou can also specify a valid tag of the form {cuda_version_number}-cudnn{cudnn_version_number}-{runtime|devel}-ubuntu{ubuntu_version}\nRefer https://hub.docker.com/r/nvidia/cuda/tags for valid set of values\nNote: We use deadsnakes ubuntu ppa to add Python that currently supports only Ubuntu 18.04, 20.04 and 22.04",
+    )
+
+
 class PythonTaskConfig(BaseModel):
     """
     Describes the configuration for the python function task
@@ -1565,38 +1591,40 @@ class WorkflowAlert(BaseModel):
     on_failure: bool = Field(True, description="Send an alert when the job fails")
 
 
-class BaseService(BaseModel):
-    name: constr(regex=r"^[a-z](?:[a-z0-9]|-(?!-)){1,30}[a-z0-9]$") = Field(
+class Build(BaseModel):
+    """
+    Describes how we build our code into a Docker image.
+    """
+
+    type: Literal["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: Union[RemoteSource, GitSource, LocalSource] = Field(
+        ..., description="Source code location."
+    )
+    build_spec: Union[DockerFileBuild, PythonBuild] = Field(
         ...,
-        description="Name of the service. This uniquely identifies this service in the workspace.\n> Name can only contain alphanumeric characters and '-' and can be atmost 25 characters long",
+        description="Instructions to build a container image out of the build source",
     )
+
+
+class ContainerTaskConfig(BaseModel):
+    type: Literal["container-task-config"] = Field(..., description="")
     image: Union[Build, Image] = Field(
         ...,
         description="Specify whether you want to deploy a Docker image or build and deploy from source code",
     )
-    artifacts_download: Optional[ArtifactsDownload] = None
-    resources: Optional[Resources] = None
     env: Optional[Dict[str, str]] = Field(
         None,
-        description="Configure environment variables to be injected in the service either as plain text or secrets. [Docs](https://docs.truefoundry.com/docs/env-variables)",
-    )
-    ports: List[Port] = Field(
-        ...,
-        description="Expose the deployment to make it accessible over the internet or keep it private. Implement authentication to restrict access. [Docs](https://docs.truefoundry.com/docs/define-ports-and-domains)",
+        description="Configure environment variables to be injected in the task either as plain text or secrets. [Docs](https://docs.truefoundry.com/docs/env-variables)",
     )
-    service_account: Optional[str] = None
+    resources: Optional[Resources] = None
     mounts: Optional[List[Union[SecretMount, StringDataMount, VolumeMount]]] = Field(
-        None,
-        description="Configure data to be mounted to service pod(s) as a string, secret or volume. [Docs](https://docs.truefoundry.com/docs/mounting-volumes-service)",
-    )
-    labels: Optional[Dict[str, str]] = Field(None, description="")
-    kustomize: Optional[Kustomize] = None
-    liveness_probe: Optional[HealthProbe] = None
-    readiness_probe: Optional[HealthProbe] = None
-    startup_probe: Optional[HealthProbe] = None
-    workspace_fqn: Optional[str] = Field(
-        None, description="Fully qualified name of the workspace"
+        None, description="Configure data to be mounted to Workflow pod(s) as a volume."
     )
+    service_account: Optional[str] = Field(None, description="")
 
 
 class FlyteLaunchPlan(BaseModel):
@@ -1636,46 +1664,44 @@ class PySparkTaskConfig(BaseModel):
         None,
         description="Configure environment variables to be injected in the task either as plain text or secrets. [Docs](https://docs.truefoundry.com/docs/env-variables)",
     )
-    mounts: Optional[List[Union[SecretMount, StringDataMount, VolumeMount]]] = Field(
+    mounts: Optional[List[VolumeMount]] = Field(
         None, description="Configure data to be mounted to Workflow pod(s) as a volume."
     )
     service_account: Optional[str] = Field(None, description="")
 
 
-class Service(BaseService):
-    """
-    Describes the configuration for the service
-    """
-
-    type: Literal["service"] = Field(..., description="")
-    replicas: Union[confloat(ge=0.0, le=500.0), ServiceAutoscaling] = Field(
-        1,
-        description="Deploy multiple instances of your pods to distribute incoming traffic across them, ensuring effective load balancing.",
+class BaseService(BaseModel):
+    name: constr(regex=r"^[a-z](?:[a-z0-9]|-(?!-)){1,30}[a-z0-9]$") = Field(
+        ...,
+        description="Name of the service. This uniquely identifies this service in the workspace.\n> Name can only contain alphanumeric characters and '-' and can be atmost 25 characters long",
     )
-    auto_shutdown: Optional[Autoshutdown] = None
-    allow_interception: bool = Field(
-        False,
-        description="Whether to allow intercepts to be applied for this service.\nThis would inject an additional sidecar in each pod of the service. Not recommended on production",
+    image: Union[Build, Image] = Field(
+        ...,
+        description="Specify whether you want to deploy a Docker image or build and deploy from source code",
     )
-    rollout_strategy: Optional[Union[Rolling, Canary, BlueGreen]] = Field(
+    artifacts_download: Optional[ArtifactsDownload] = None
+    resources: Optional[Resources] = None
+    env: Optional[Dict[str, str]] = Field(
         None,
-        description="Strategy to dictate how a rollout should happen when a new release for this service is made [Docs](https://docs.truefoundry.com/docs/rollout-strategy)",
+        description="Configure environment variables to be injected in the service either as plain text or secrets. [Docs](https://docs.truefoundry.com/docs/env-variables)",
     )
-
-
-class AsyncService(BaseService):
-    """
-    Describes the configuration for the async-service
-    """
-
-    type: Literal["async-service"] = Field(..., description="")
-    replicas: Union[confloat(ge=0.0, le=500.0), AsyncServiceAutoscaling] = Field(
-        1,
-        description="Deploy multiple instances of your pods to distribute incoming traffic across them, ensuring effective load balancing.",
+    ports: List[Port] = Field(
+        ...,
+        description="Expose the deployment to make it accessible over the internet or keep it private. Implement authentication to restrict access. [Docs](https://docs.truefoundry.com/docs/define-ports-and-domains)",
+    )
+    service_account: Optional[str] = None
+    mounts: Optional[List[Union[SecretMount, StringDataMount, VolumeMount]]] = Field(
+        None,
+        description="Configure data to be mounted to service pod(s) as a string, secret or volume. [Docs](https://docs.truefoundry.com/docs/mounting-volumes-service)",
+    )
+    labels: Optional[Dict[str, str]] = Field(None, description="")
+    kustomize: Optional[Kustomize] = None
+    liveness_probe: Optional[HealthProbe] = None
+    readiness_probe: Optional[HealthProbe] = None
+    startup_probe: Optional[HealthProbe] = None
+    workspace_fqn: Optional[str] = Field(
+        None, description="Fully qualified name of the workspace"
     )
-    rollout_strategy: Optional[Rolling] = None
-    worker_config: WorkerConfig
-    sidecar: Optional[AsyncProcessorSidecar] = None
 
 
 class FlyteTaskCustom(BaseModel):
@@ -1740,30 +1766,40 @@ class Job(BaseModel):
     )
 
 
-class ApplicationSet(BaseModel):
+class Service(BaseService):
     """
-    Describes the configuration for the application set
+    Describes the configuration for the service
     """
 
-    type: Literal["application-set"] = Field(..., description="")
-    name: str = Field(..., description="Name of the application set.")
-    components: Optional[List[Union[Service, AsyncService, Job, Helm]]] = Field(
-        None, description="Array of components with their specifications."
+    type: Literal["service"] = Field(..., description="")
+    replicas: Union[confloat(ge=0.0, le=500.0), ServiceAutoscaling] = Field(
+        1,
+        description="Deploy multiple instances of your pods to distribute incoming traffic across them, ensuring effective load balancing.",
     )
-    template: Optional[str] = Field(
-        None, description="Template to be used for the application set."
+    auto_shutdown: Optional[Autoshutdown] = None
+    allow_interception: bool = Field(
+        False,
+        description="Whether to allow intercepts to be applied for this service.\nThis would inject an additional sidecar in each pod of the service. Not recommended on production",
     )
-    values: Optional[Dict[str, Any]] = Field(
+    rollout_strategy: Optional[Union[Rolling, Canary, BlueGreen]] = Field(
         None,
-        description="Values to be used to render components for the application set.",
-    )
-    workspace_fqn: Optional[str] = Field(
-        None, description="Fully qualified name of the workspace"
+        description="Strategy to dictate how a rollout should happen when a new release for this service is made [Docs](https://docs.truefoundry.com/docs/rollout-strategy)",
     )
-    convert_template_manifest: Optional[bool] = Field(
-        None,
-        description="Flag to indicate if the template manifest should be converted to TrueFoundry manifest",
+
+
+class AsyncService(BaseService):
+    """
+    Describes the configuration for the async-service
+    """
+
+    type: Literal["async-service"] = Field(..., description="")
+    replicas: Union[confloat(ge=0.0, le=500.0), AsyncServiceAutoscaling] = Field(
+        1,
+        description="Deploy multiple instances of your pods to distribute incoming traffic across them, ensuring effective load balancing.",
     )
+    rollout_strategy: Optional[Rolling] = None
+    worker_config: WorkerConfig
+    sidecar: Optional[AsyncProcessorSidecar] = None
 
 
 class FlyteTask(BaseModel):
@@ -1792,6 +1828,32 @@ class Workflow(BaseModel):
     alerts: Optional[List[WorkflowAlert]] = Field(None, description="")
 
 
+class ApplicationSet(BaseModel):
+    """
+    Describes the configuration for the application set
+    """
+
+    type: Literal["application-set"] = Field(..., description="")
+    name: str = Field(..., description="Name of the application set.")
+    components: Optional[List[Union[Service, AsyncService, Job, Helm]]] = Field(
+        None, description="Array of components with their specifications."
+    )
+    template: Optional[str] = Field(
+        None, description="Template to be used for the application set."
+    )
+    values: Optional[Dict[str, Any]] = Field(
+        None,
+        description="Values to be used to render components for the application set.",
+    )
+    workspace_fqn: Optional[str] = Field(
+        None, description="Fully qualified name of the workspace"
+    )
+    convert_template_manifest: Optional[bool] = Field(
+        None,
+        description="Flag to indicate if the template manifest should be converted to TrueFoundry manifest",
+    )
+
+
 class Application(BaseModel):
     __root__: Union[
         Service,

{truefoundry-0.11.9rc1 → truefoundry-0.11.11rc1}/truefoundry/deploy/builder/__init__.py

@@ -2,6 +2,7 @@ from typing import Any, Dict, List, Optional, Union
 
 from truefoundry.deploy._autogen.models import (
     DockerFileBuild,
+    Pip,
     PythonBuild,
     SparkBuild,
     TaskDockerFileBuild,

{truefoundry-0.11.9rc1 → truefoundry-0.11.11rc1}/truefoundry/deploy/builder/builders/tfy_python_buildpack/__init__.py

@@ -15,11 +15,11 @@ __all__ = ["generate_dockerfile_content", "build"]
 def _convert_to_dockerfile_build_config(
     build_configuration: PythonBuild,
     dockerfile_path: str,
-    mount_python_package_manager_conf_secret: bool = False,
+    extra_opts: Optional[List[str]] = None,
 ) -> DockerFileBuild:
     dockerfile_content = generate_dockerfile_content(
         build_configuration=build_configuration,
-        mount_python_package_manager_conf_secret=mount_python_package_manager_conf_secret,
+        docker_build_extra_args=extra_opts,
     )
     with open(dockerfile_path, "w", encoding="utf8") as fp:
         fp.write(dockerfile_content)
@@ -40,14 +40,11 @@ def build(
         raise ValueError(
             "`python_version` is required for `tfy-python-buildpack` builder"
         )
-    mount_python_package_manager_conf_secret = (
-        has_python_package_manager_conf_secret(extra_opts) if extra_opts else False
-    )
     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,
+            extra_opts=extra_opts,
         )
         dockerfile.build(
             tag=tag,