truefoundry 0.4.2rc5__tar.gz → 0.4.3__tar.gz

{truefoundry-0.4.2rc5 → truefoundry-0.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: truefoundry
-Version: 0.4.2rc5
+Version: 0.4.3
 Summary: Truefoundry CLI
 Author: Abhishek Choudhary
 Author-email: abhishek@truefoundry.com

{truefoundry-0.4.2rc5 → truefoundry-0.4.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "truefoundry"
-version = "0.4.2rc5"
+version = "0.4.3"
 description = "Truefoundry CLI"
 authors = ["Abhishek Choudhary <abhishek@truefoundry.com>"]
 readme = "README.md"
@@ -69,6 +69,7 @@ mypy = "*"
 plotly = ">=5.8.2,<6.0.0"
 pre-commit = ">=3.5.0,<4.0.0"
 pytest = ">=8.2.2,<9.0.0"
+pytest-env = ">=1.1.5,<2.0.0"
 ruff = ">=0.4.10"
 seaborn = ">=0.13.0,<0.14.0"
 scikit-learn = ">=1.3.0,<2.0.0"
@@ -153,3 +154,9 @@ disable_error_code = [
 init_forbid_extra = true
 init_typed = true
 warn_required_dynamic_aliases = true
+
+
+[tool.pytest.ini_options]
+env = [
+    "TFY_CLI_PYTHONBUILD_PYTHON_IMAGE_REPO=docker.io/truefoundrycloud/test/python",
+]

{truefoundry-0.4.2rc5 → truefoundry-0.4.3}/truefoundry/common/constants.py

@@ -6,6 +6,8 @@ CREDENTIAL_FILEPATH = TFY_CONFIG_DIR / "credentials.json"
 TFY_HOST_ENV_KEY = "TFY_HOST"
 TFY_API_KEY_ENV_KEY = "TFY_API_KEY"
 TFY_CLI_LOCAL_DEV_MODE_ENV_KEY = "TFY_CLI_LOCAL_DEV_MODE"
+TFY_CLI_PYTHONBUILD_PYTHON_IMAGE_REPO_ENV_KEY = "TFY_CLI_PYTHONBUILD_PYTHON_IMAGE_REPO"
+
 
 API_SERVER_RELATIVE_PATH = "api/svc"
 MLFOUNDRY_SERVER_RELATIVE_PATH = "api/ml"

{truefoundry-0.4.2rc5 → truefoundry-0.4.3}/truefoundry/deploy/builder/builders/tfy_notebook_buildpack/dockerfile_template.py

@@ -21,11 +21,9 @@ DOCKERFILE_TEMPLATE = Template(
     """
 FROM ${base_image_uri}
 USER root
-
 % if build_script_docker_commands is not None:
 ${build_script_docker_commands}
 % endif
-
 USER $NB_UID
 """
 )

{truefoundry-0.4.2rc5 → truefoundry-0.4.3}/truefoundry/deploy/builder/builders/tfy_python_buildpack/dockerfile_template.py

@@ -3,6 +3,7 @@ from typing import Dict, List, Optional
 
 from mako.template import Template
 
+from truefoundry.common.constants import TFY_CLI_PYTHONBUILD_PYTHON_IMAGE_REPO_ENV_KEY
 from truefoundry.deploy.auto_gen.models import PythonBuild
 from truefoundry.deploy.builder.constants import (
     PIP_CONF_BUILDKIT_SECRET_MOUNT,
@@ -12,26 +13,25 @@ from truefoundry.deploy.v2.lib.patched_models import CUDAVersion
 
 # TODO (chiragjn): Switch to a non-root user inside the container
 
+DEFAULT_PYTHON_IMAGE_REPO = "public.ecr.aws/docker/library/python"
+
 _POST_PYTHON_INSTALL_TEMPLATE = """
 % if apt_install_command is not None:
 RUN ${apt_install_command}
 % endif
-
 % 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}
 % endif
-
 COPY . /app
 WORKDIR /app
 """
 
 DOCKERFILE_TEMPLATE = Template(
     """
-FROM --platform=linux/amd64 public.ecr.aws/docker/library/python:${python_version}
+FROM --platform=linux/amd64 ${python_image_repo}:${python_version}
 ENV PATH=/virtualenvs/venv/bin:$PATH
 RUN apt update && \
     DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends git && \
@@ -155,8 +155,10 @@ def generate_dockerfile_content(
     apt_install_command = generate_apt_install_command(
         apt_packages=build_configuration.apt_packages
     )
-
     template_args = {
+        "python_image_repo": os.getenv(
+            TFY_CLI_PYTHONBUILD_PYTHON_IMAGE_REPO_ENV_KEY, DEFAULT_PYTHON_IMAGE_REPO
+        ),
         "python_version": build_configuration.python_version,
         "apt_install_command": apt_install_command,
         "requirements_path": requirements_path,

{truefoundry-0.4.2rc5 → truefoundry-0.4.3}/truefoundry/deploy/builder/docker_service.py

@@ -1,11 +1,9 @@
-import os
 import subprocess
 from typing import Dict, List, Optional
 
 import docker
 from rich.console import Console
 
-from truefoundry.deploy.lib.clients.shell_client import Shell
 from truefoundry.logger import logger
 
 __all__ = [
@@ -17,15 +15,6 @@ __all__ = [
 ]
 
 
-def _get_build_args_string(build_args: Optional[Dict[str, str]] = None) -> str:
-    if not build_args:
-        return None
-    result = []
-    for param, value in build_args.items():
-        result.extend(["--build-arg", f"{param.strip()}={value}"])
-    return result
-
-
 def _get_docker_client():
     try:
         return docker.from_env()
@@ -73,53 +62,30 @@ def build_docker_image(
     extra_opts: Optional[List[str]] = None,
     build_args: Optional[Dict[str, str]] = None,
 ):
-    use_depot = bool(os.environ.get("USE_DEPOT"))
-    depot_project_id = os.environ.get("DEPOT_PROJECT_KEY")
     logger.info("Starting docker build...")
-    if use_depot and depot_project_id:
-        try:
-            command = [
-                "depot",
-                "build",
-                "--project",
-                depot_project_id,
-                "-f",
-                dockerfile,
-                "-t",
-                tag,
-                path,
-            ]
-            final_build_args = _get_build_args_string(build_args=build_args)
-            if final_build_args:
-                command.extend(final_build_args)
-            command.append("--push")  # keep push at last
-            Shell().execute_shell_command(command=command)
-        except Exception as e:
-            raise Exception("Error while building Docker image using Depot") from e
-    else:
-        try:
-            # TODO (chiragjn): Maybe consider using client.images.build
-            build_args_list = []
-            if build_args:
-                for k, v in build_args.items():
-                    build_args_list += ["--build-arg", f"{k}={v}"]
-
-            docker_build_cmd = [
-                "docker",
-                "build",
-                "-t",
-                tag,
-                "-f",
-                dockerfile,
-                "--platform",
-                platform,
-            ]
-            docker_build_cmd += [path]
-            docker_build_cmd += build_args_list
-            docker_build_cmd += extra_opts if extra_opts else []
-            _run_cmds(docker_build_cmd)
-        except Exception as e:
-            raise Exception(f"Error while building Docker image: {e}") from e
+    try:
+        # TODO (chiragjn): Maybe consider using client.images.build
+        build_args_list = []
+        if build_args:
+            for k, v in build_args.items():
+                build_args_list += ["--build-arg", f"{k}={v}"]
+
+        docker_build_cmd = [
+            "docker",
+            "build",
+            "-t",
+            tag,
+            "-f",
+            dockerfile,
+            "--platform",
+            platform,
+        ]
+        docker_build_cmd += [path]
+        docker_build_cmd += build_args_list
+        docker_build_cmd += extra_opts if extra_opts else []
+        _run_cmds(docker_build_cmd)
+    except Exception as e:
+        raise Exception(f"Error while building Docker image: {e}") from e
 
 
 def push_docker_image(

{truefoundry-0.4.2rc5 → truefoundry-0.4.3}/truefoundry/deploy/cli/commands/deploy_command.py

@@ -125,7 +125,7 @@ def deploy_command(
     help="FQN of the Workspace to deploy to.",
 )
 @handle_exception_wrapper
-def deploy_workflow_command(name: str, workflow_file: str, workspace_fqn: str):
+def deploy_workflow_command(name: str, file: str, workspace_fqn: str):
     from truefoundry.deploy.lib.auth.servicefoundry_session import ServiceFoundrySession
 
     try:
@@ -137,7 +137,7 @@ def deploy_workflow_command(name: str, workflow_file: str, workspace_fqn: str):
 
     workflow = Workflow(
         name=name,
-        workflow_file_path=workflow_file,
+        workflow_file_path=file,
     )
     workflow.deploy(workspace_fqn=workspace_fqn)
 

{truefoundry-0.4.2rc5 → truefoundry-0.4.3}/truefoundry/deploy/lib/const.py

@@ -3,7 +3,5 @@ from truefoundry.deploy.io.rich_output_callback import RichOutputCallBack
 ENTITY_JSON_DATETIME_FORMAT = "%Y-%m-%dT%H:%M:%S.%fZ"
 RICH_OUTPUT_CALLBACK = RichOutputCallBack()
 
-SFY_DEBUG_ENV_KEY = "SFY_DEBUG"
 TFY_DEBUG_ENV_KEY = "TFY_DEBUG"
-SFY_INTERNAL_ENV_KEY = "SFY_INTERNAL"
 TFY_INTERNAL_ENV_KEY = "TFY_INTERNAL"

{truefoundry-0.4.2rc5 → truefoundry-0.4.3}/truefoundry/deploy/lib/util.py

@@ -3,25 +3,17 @@ import re
 from typing import Union
 
 from truefoundry.deploy.lib.const import (
-    SFY_DEBUG_ENV_KEY,
-    SFY_INTERNAL_ENV_KEY,
     TFY_DEBUG_ENV_KEY,
     TFY_INTERNAL_ENV_KEY,
 )
 
 
 def is_debug_env_set() -> bool:
-    return (
-        True if os.getenv(TFY_DEBUG_ENV_KEY) or os.getenv(SFY_DEBUG_ENV_KEY) else False
-    )
+    return bool(os.getenv(TFY_DEBUG_ENV_KEY))
 
 
 def is_internal_env_set() -> bool:
-    return (
-        True
-        if os.getenv(TFY_INTERNAL_ENV_KEY) or os.getenv(SFY_INTERNAL_ENV_KEY)
-        else False
-    )
+    return bool(os.getenv(TFY_INTERNAL_ENV_KEY))
 
 
 def get_application_fqn_from_deployment_fqn(deployment_fqn: str) -> str:

truefoundry-0.4.2rc5/truefoundry/deploy/lib/clients/shell_client.py

@@ -1,13 +0,0 @@
-import subprocess
-
-from truefoundry.logger import logger
-
-
-class Shell:
-    def execute_shell_command(self, command, ip=None):
-        logger.debug(f"executing command: {command}")
-        try:
-            p = subprocess.run(command, stdout=subprocess.PIPE, check=True, input=ip)
-            return p.stdout.decode("UTF-8")
-        except subprocess.CalledProcessError as cpe:
-            raise Exception(f"failed to execute: {command}, error: {cpe}") from cpe