truefoundry 0.5.1rc7__tar.gz → 0.5.1rc8__tar.gz

{truefoundry-0.5.1rc7 → truefoundry-0.5.1rc8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: truefoundry
-Version: 0.5.1rc7
+Version: 0.5.1rc8
 Summary: Truefoundry CLI
 Author: Abhishek Choudhary
 Author-email: abhishek@truefoundry.com

{truefoundry-0.5.1rc7 → truefoundry-0.5.1rc8}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "truefoundry"
-version = "0.5.1rc7"
+version = "0.5.1rc8"
 description = "Truefoundry CLI"
 authors = ["Abhishek Choudhary <abhishek@truefoundry.com>"]
 readme = "README.md"

{truefoundry-0.5.1rc7 → truefoundry-0.5.1rc8}/truefoundry/common/constants.py

@@ -1,3 +1,4 @@
+import enum
 import os
 from pathlib import Path
 from typing import Optional
@@ -15,6 +16,11 @@ TFY_INTERNAL_SIGNED_URL_SERVER_HOST_ENV_KEY = "TFY_INTERNAL_SIGNED_URL_SERVER_HO
 TFY_INTERNAL_SIGNED_URL_SERVER_TOKEN_ENV_KEY = "TFY_INTERNAL_SIGNED_URL_SERVER_TOKEN"
 
 
+class PythonPackageManager(str, enum.Enum):
+    PIP = "pip"
+    UV = "uv"
+
+
 class TrueFoundrySdkEnv(BaseSettings):
     # Note: Every field in this class should have a default value
     # Never expect the user to set these values
@@ -46,6 +52,9 @@ class TrueFoundrySdkEnv(BaseSettings):
     # For local development, this enables futher configuration via _TFYServersConfig
     TFY_CLI_LOCAL_DEV_MODE: bool = False
 
+    TFY_PYTHON_BUILD_PACKAGE_MANAGER: PythonPackageManager = PythonPackageManager.PIP
+    TFY_PYTHON_BUILD_UV_IMAGE_URI: str = "ghcr.io/astral-sh/uv:latest"
+
 
 ENV_VARS = TrueFoundrySdkEnv()
 API_SERVER_RELATIVE_PATH = "api/svc"

{truefoundry-0.5.1rc7 → truefoundry-0.5.1rc8}/truefoundry/deploy/builder/builders/tfy_notebook_buildpack/__init__.py

@@ -8,7 +8,7 @@ from truefoundry.deploy.builder.builders.tfy_notebook_buildpack.dockerfile_templ
     NotebookImageBuild,
     generate_dockerfile_content,
 )
-from truefoundry.deploy.builder.utils import has_pip_conf_secret
+from truefoundry.deploy.builder.utils import has_python_package_manager_conf_secret
 
 __all__ = ["generate_dockerfile_content", "build"]
 
@@ -38,7 +38,9 @@ def build(
     build_configuration: NotebookImageBuild,
     extra_opts: Optional[List[str]] = None,
 ):
-    mount_pip_conf_secret = has_pip_conf_secret(extra_opts) if extra_opts else False
+    mount_pip_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,

{truefoundry-0.5.1rc7 → truefoundry-0.5.1rc8}/truefoundry/deploy/builder/builders/tfy_python_buildpack/__init__.py

@@ -7,7 +7,7 @@ from truefoundry.deploy.builder.builders import dockerfile
 from truefoundry.deploy.builder.builders.tfy_python_buildpack.dockerfile_template import (
     generate_dockerfile_content,
 )
-from truefoundry.deploy.builder.utils import has_pip_conf_secret
+from truefoundry.deploy.builder.utils import has_python_package_manager_conf_secret
 
 __all__ = ["generate_dockerfile_content", "build"]
 
@@ -15,11 +15,11 @@ __all__ = ["generate_dockerfile_content", "build"]
 def _convert_to_dockerfile_build_config(
     build_configuration: PythonBuild,
     dockerfile_path: str,
-    mount_pip_conf_secret: bool = False,
+    mount_python_package_manager_conf_secret: bool = False,
 ) -> DockerFileBuild:
     dockerfile_content = generate_dockerfile_content(
         build_configuration=build_configuration,
-        mount_pip_conf_secret=mount_pip_conf_secret,
+        mount_python_package_manager_conf_secret=mount_python_package_manager_conf_secret,
     )
     with open(dockerfile_path, "w", encoding="utf8") as fp:
         fp.write(dockerfile_content)
@@ -36,12 +36,14 @@ def build(
     build_configuration: PythonBuild,
     extra_opts: Optional[List[str]] = None,
 ):
-    mount_pip_conf_secret = has_pip_conf_secret(extra_opts) if extra_opts else False
+    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_pip_conf_secret=mount_pip_conf_secret,
+            mount_python_package_manager_conf_secret=mount_python_package_manager_conf_secret,
         )
         dockerfile.build(
             tag=tag,

{truefoundry-0.5.1rc7 → truefoundry-0.5.1rc8}/truefoundry/deploy/builder/builders/tfy_python_buildpack/dockerfile_template.py

@@ -1,13 +1,16 @@
 import os
+import shlex
 from typing import Dict, List, Optional
 
 from mako.template import Template
 
-from truefoundry.common.constants import ENV_VARS
+from truefoundry.common.constants import ENV_VARS, PythonPackageManager
 from truefoundry.deploy.auto_gen.models import PythonBuild
 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 CUDAVersion
 
@@ -22,8 +25,8 @@ RUN ${apt_install_command}
 % if requirements_path is not None:
 COPY ${requirements_path} ${requirements_destination_path}
 % endif
-% if pip_install_command is not None:
-RUN ${pip_config_secret_mount} ${pip_install_command}
+% if python_packages_install_command is not None:
+RUN ${package_manager_config_secret_mount} ${python_packages_install_command}
 % endif
 COPY . /app
 WORKDIR /app
@@ -114,44 +117,91 @@ def generate_pip_install_command(
     mount_pip_conf_secret: bool = False,
 ) -> Optional[str]:
     upgrade_pip_command = "python -m pip install -U pip setuptools wheel"
-    final_pip_install_command = None
-    pip_install_base_command = "python -m pip install --use-pep517 --no-cache-dir"
+    envs = []
+    if mount_pip_conf_secret:
+        envs.append(PIP_CONF_SECRET_MOUNT_AS_ENV)
+
+    command = ["python", "-m", "pip", "install", "--use-pep517", "--no-cache-dir"]
+    args = []
     if requirements_path:
-        final_pip_install_command = f"{pip_install_base_command} -r {requirements_path}"
+        args.append("-r")
+        args.append(requirements_path)
 
     if pip_packages:
-        final_pip_install_command = (
-            final_pip_install_command or pip_install_base_command
-        )
-        final_pip_install_command += " " + " ".join(
-            f"'{package}'" for package in pip_packages
-        )
+        args.extend(pip_packages)
 
-    if not final_pip_install_command:
+    if not args:
         return None
 
-    if mount_pip_conf_secret:
-        final_pip_install_command = (
-            f"{PIP_CONF_SECRET_MOUNT_AS_ENV} {final_pip_install_command}"
-        )
+    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
 
-    return " && ".join([upgrade_pip_command, final_pip_install_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 = "python -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_SYSTEM_PYTHON=true",
+        "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: PythonBuild,
-    mount_pip_conf_secret: bool = False,
+    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_txt_path(build_configuration)
     requirements_destination_path = (
         "/tmp/requirements.txt" if requirements_path else None
     )
-    pip_install_command = generate_pip_install_command(
-        requirements_path=requirements_destination_path,
-        pip_packages=build_configuration.pip_packages,
-        mount_pip_conf_secret=mount_pip_conf_secret,
-    )
+    if package_manager == PythonPackageManager.PIP.value:
+        python_packages_install_command = generate_pip_install_command(
+            requirements_path=requirements_destination_path,
+            pip_packages=build_configuration.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=build_configuration.pip_packages,
+            mount_uv_conf_secret=mount_python_package_manager_conf_secret,
+        )
+    else:
+        raise ValueError(f"Unsupported package manager: {package_manager}")
+
     apt_install_command = generate_apt_install_command(
         apt_packages=build_configuration.apt_packages
     )
@@ -161,13 +211,22 @@ def generate_dockerfile_content(
         "apt_install_command": apt_install_command,
         "requirements_path": requirements_path,
         "requirements_destination_path": requirements_destination_path,
-        "pip_install_command": pip_install_command,
+        "python_packages_install_command": python_packages_install_command,
     }
 
-    if mount_pip_conf_secret:
-        template_args["pip_config_secret_mount"] = PIP_CONF_BUILDKIT_SECRET_MOUNT
+    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["pip_config_secret_mount"] = ""
+        template_args["package_manager_config_secret_mount"] = ""
 
     if build_configuration.cuda_version:
         template = CUDA_DOCKERFILE_TEMPLATE

{truefoundry-0.5.1rc7 → truefoundry-0.5.1rc8}/truefoundry/deploy/builder/constants.py

@@ -5,3 +5,11 @@ PIP_CONF_BUILDKIT_SECRET_MOUNT = (
 PIP_CONF_SECRET_MOUNT_AS_ENV = (
     f"PIP_CONFIG_FILE=/run/secrets/{BUILDKIT_SECRET_MOUNT_PIP_CONF_ID}"
 )
+
+BUILDKIT_SECRET_MOUNT_UV_CONF_ID = "uv.toml"
+UV_CONF_BUILDKIT_SECRET_MOUNT = (
+    f"--mount=type=secret,id={BUILDKIT_SECRET_MOUNT_UV_CONF_ID}"
+)
+UV_CONF_SECRET_MOUNT_AS_ENV = (
+    f"UV_CONFIG_FILE=/run/secrets/{BUILDKIT_SECRET_MOUNT_UV_CONF_ID}"
+)

{truefoundry-0.5.1rc7 → truefoundry-0.5.1rc8}/truefoundry/deploy/builder/utils.py

@@ -1,6 +1,9 @@
 from typing import List, Optional
 
-from truefoundry.deploy.builder.constants import BUILDKIT_SECRET_MOUNT_PIP_CONF_ID
+from truefoundry.deploy.builder.constants import (
+    BUILDKIT_SECRET_MOUNT_PIP_CONF_ID,
+    BUILDKIT_SECRET_MOUNT_UV_CONF_ID,
+)
 
 
 def _get_id_from_buildkit_secret_value(value: str) -> Optional[str]:
@@ -19,14 +22,16 @@ def _get_id_from_buildkit_secret_value(value: str) -> Optional[str]:
     return None
 
 
-def has_pip_conf_secret(docker_build_extra_args: List[str]) -> bool:
+def has_python_package_manager_conf_secret(docker_build_extra_args: List[str]) -> bool:
     args = [arg.strip() for arg in docker_build_extra_args]
     for i, arg in enumerate(docker_build_extra_args):
         if (
             arg == "--secret"
             and i + 1 < len(args)
-            and _get_id_from_buildkit_secret_value(args[i + 1])
-            == BUILDKIT_SECRET_MOUNT_PIP_CONF_ID
+            and (
+                _get_id_from_buildkit_secret_value(args[i + 1])
+                in (BUILDKIT_SECRET_MOUNT_PIP_CONF_ID, BUILDKIT_SECRET_MOUNT_UV_CONF_ID)
+            )
         ):
             return True
     return False