truefoundry 0.4.2rc5__py3-none-any.whl → 0.4.3rc0__py3-none-any.whl

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/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/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/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/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/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/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/deploy/v2/lib/deploy_workflow.py

@@ -11,7 +11,10 @@ from flytekit.configuration import (
 )
 from flytekit.configuration import Image as FlytekitImage
 from flytekit.models.launch_plan import LaunchPlan as FlyteLaunchPlan
-from flytekit.tools.repo import serialize as serialize_workflow
+from flytekit.tools.repo import (
+    serialize_get_control_plane_entities as get_serialized_entities,
+)
+from flytekit.tools.repo import serialize_load_only as serialize_workflow
 from flytekit.tools.translator import TaskSpec as FlyteTaskSpec
 from flytekit.tools.translator import WorkflowSpec as FlyteWorkflowSpec
 from google.protobuf.json_format import MessageToDict
@@ -207,9 +210,12 @@ def _generate_manifest_for_workflow(
         project_root_path=source_absolute_path, filepath=workflow_file_absolute_path
     )
 
-    workflow_entities = serialize_workflow(
+    serialize_workflow(
         pkgs=[package_path], settings=settings, local_source_root=source_absolute_path
     )
+    workflow_entities = get_serialized_entities(
+        settings, local_source_root=source_absolute_path
+    )
     _validate_workflow_entities(workflow_entities, source_absolute_path)
 
     workflow.flyte_entities = []

{truefoundry-0.4.2rc5.dist-info → truefoundry-0.4.3rc0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: truefoundry
-Version: 0.4.2rc5
+Version: 0.4.3rc0
 Summary: Truefoundry CLI
 Author: Abhishek Choudhary
 Author-email: abhishek@truefoundry.com
@@ -21,7 +21,7 @@ Requires-Dist: coolname (>=1.1.0,<2.0.0)
 Requires-Dist: docker (>=6.1.2,<8.0.0)
 Requires-Dist: fastapi (>=0.56.0,<0.200.0)
 Requires-Dist: filelock (>=3.8.0,<4.0.0)
-Requires-Dist: flytekit (==1.12.2) ; extra == "workflow"
+Requires-Dist: flytekit (==1.13.8) ; extra == "workflow"
 Requires-Dist: gitignorefile (>=1.1.2,<2.0.0)
 Requires-Dist: importlib-metadata (>=4.11.3,<9.0.0)
 Requires-Dist: importlib-resources (>=5.2.0,<7.0.0)

{truefoundry-0.4.2rc5.dist-info → truefoundry-0.4.3rc0.dist-info}/RECORD

@@ -27,7 +27,7 @@ truefoundry/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 truefoundry/cli/__main__.py,sha256=-NkhYlT3mC5MhtekueKAvCw-sWvguj0LJRpXWzvvFjc,727
 truefoundry/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 truefoundry/common/auth_service_client.py,sha256=tZOa0NdATnItsMeTnEnUeTZQIgUJtpU-nvLdWtB4Px8,7978
-truefoundry/common/constants.py,sha256=JT8wcc9IxX3K_xbzXgxTp1FMQfKwnLam5XoJjhiCw1M,395
+truefoundry/common/constants.py,sha256=gnswB-aK5atSRY-GE1Cji6ZCEs2FoK9n1lCX5JuQGqI,484
 truefoundry/common/credential_file_manager.py,sha256=1yEk1Zm2xS4G0VDFwKSZ4w0VUrcPWQ1nJnoBaz9xyKA,4251
 truefoundry/common/credential_provider.py,sha256=YQ6HKl8ZZFTg48vBZMauEAnM6IrEO3oOzM2DA47N-P0,4071
 truefoundry/common/entities.py,sha256=8O-EGPk4PKqnyoFMKUTxISCU19rz0KBnfRDJU695DhY,3797
@@ -41,11 +41,11 @@ truefoundry/deploy/builder/__init__.py,sha256=1qjHMNBE1poRCZW0WrG46dFM1f1IlivD53
 truefoundry/deploy/builder/builders/__init__.py,sha256=tlFLXqyDaKLd4iZbo4Hcu_8gOmgtL6drnXpbmQ6x1P8,636
 truefoundry/deploy/builder/builders/dockerfile.py,sha256=AXXTziCkaqIhuM_bwyD1vT1znOwemN1TKgU7eyo-KuM,1522
 truefoundry/deploy/builder/builders/tfy_notebook_buildpack/__init__.py,sha256=UmMcTY-8MrLY3H5owpn6ax-VePQl4MiMTmHlQ9qEtQw,1742
-truefoundry/deploy/builder/builders/tfy_notebook_buildpack/dockerfile_template.py,sha256=nRG3yXhIQ3Taq1B1loQWazQd05A3nrp5zKDYvNZh87s,2487
+truefoundry/deploy/builder/builders/tfy_notebook_buildpack/dockerfile_template.py,sha256=IZbXsSj86SxWRZNQXepEnsOL_eYwWaOq5oh-WiyvL2c,2485
 truefoundry/deploy/builder/builders/tfy_python_buildpack/__init__.py,sha256=XNJ3MKWqyWIbFNnUQMpB8oVC5Pt5Wsm_bRKbvkXRIG8,1696
-truefoundry/deploy/builder/builders/tfy_python_buildpack/dockerfile_template.py,sha256=dccCNOUKbK1X8F4f2J4ddSTCturvzQKx6H23xxJdCTk,7202
+truefoundry/deploy/builder/builders/tfy_python_buildpack/dockerfile_template.py,sha256=cJlQK_kgNELULcp2Q_kMWyPNmUuZdhOELDnI0rMiqRc,7473
 truefoundry/deploy/builder/constants.py,sha256=eIukBjD6I4KvEmAPpdbPlPPr76yhS-uNr3RVFkzEdgs,257
-truefoundry/deploy/builder/docker_service.py,sha256=vQS15790njzlFJZ3JW6txYLBdT11ltxqqpf78ZFL_Ng,5208
+truefoundry/deploy/builder/docker_service.py,sha256=OI8efqK0Gnoii8bcHihpA2StwHVzsMREfBk7NvMR4hY,3950
 truefoundry/deploy/builder/utils.py,sha256=9RZnkhoHFTRUt_x3nck0aVz7cLpzA3jiwQH-ZZZrjf8,938
 truefoundry/deploy/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 truefoundry/deploy/cli/cli.py,sha256=o19n7MsMzXXXG3GlpRYaxX3l9Xvtof-iPK4-y31Dw9k,2811
@@ -55,7 +55,7 @@ truefoundry/deploy/cli/commands/build_command.py,sha256=DQ7NARgkIgV4z0Zdnl3zMDKU
 truefoundry/deploy/cli/commands/build_logs_command.py,sha256=WrPOlFec_wwuzdJmKZ8mjca-oFVvxgfblcqj2LlhWJA,2804
 truefoundry/deploy/cli/commands/create_command.py,sha256=ZjA4EP1jHYuVE1zx0kN-giBr3y0sEiXnu8xMsNyD2Rg,1850
 truefoundry/deploy/cli/commands/delete_command.py,sha256=4tyIameA1pVu9uZZNJPK6rqdV-cJogf51iCCrG-9noI,2390
-truefoundry/deploy/cli/commands/deploy_command.py,sha256=ixn3uQoDRfJ9D8GOMwXJ9W9VbyNce9Qzb3Mx7h5InRM,4018
+truefoundry/deploy/cli/commands/deploy_command.py,sha256=d2Yhgn-zTEIlFUR-IBYpt7-dsec__hsGd1no207u-Q8,4000
 truefoundry/deploy/cli/commands/get_command.py,sha256=w7h5C4bJpmHJ99rgiGg9J_X0xi8aZUeB6Q-SoZUV1tg,5979
 truefoundry/deploy/cli/commands/list_command.py,sha256=cFARY22L5xspBX7TWsx41IF4RiRMok7KBwv7hQRFXNs,4498
 truefoundry/deploy/cli/commands/login_command.py,sha256=WV4Ad8PJ2_yNfCJi1VWW2GNwU6khZ2sWZbKebxJ7oVM,1038
@@ -93,8 +93,7 @@ truefoundry/deploy/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 truefoundry/deploy/lib/auth/servicefoundry_session.py,sha256=5TCYPunAygtn5mb0mp_VcWKEalKMKPbyWMWer-Vty2g,1916
 truefoundry/deploy/lib/clients/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 truefoundry/deploy/lib/clients/servicefoundry_client.py,sha256=vFrd5yeStjT_uWL3JxHrx0iAmNpuv26K7IEnsF1RMM8,26101
-truefoundry/deploy/lib/clients/shell_client.py,sha256=tMrc0Ha1DmGtUCJrZD8eusOzfe8R_WIe6AAH7nxL0xA,461
-truefoundry/deploy/lib/const.py,sha256=FCQfnO7IecB1ikQHdLGNvvubq_iF900C9l5TJtDfvFc,314
+truefoundry/deploy/lib/const.py,sha256=repGJLuoMqtzeq5tCjjkN4bH187FVHVKI30BricOlvc,244
 truefoundry/deploy/lib/dao/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 truefoundry/deploy/lib/dao/application.py,sha256=uUTFSQkLUrFCtQQgS2Jm9BpyHyhMkN4GI1yx9oJo4_E,9161
 truefoundry/deploy/lib/dao/apply.py,sha256=sXnQY6RVzLVm1fX2BKuWHAoKlKISirrcByHEhY3x4zo,2570
@@ -106,13 +105,13 @@ truefoundry/deploy/lib/messages.py,sha256=nhp0bCYf_XpUM68hTq5lBY-__vtEyV2uP7NgnJ
 truefoundry/deploy/lib/model/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 truefoundry/deploy/lib/model/entity.py,sha256=8J8yd98iWtSy8giShdDRNyzbN1UgSXx4XtmZLljdWnE,8552
 truefoundry/deploy/lib/session.py,sha256=Vg6rCA315T0yS0xG4ayJ84Ia_9ZfibH8utOSwPBMAmw,4953
-truefoundry/deploy/lib/util.py,sha256=RlL3bjZu5Z0LU_OKYaMVfcMU8k7_rmkAp89_0CrZDLk,1520
+truefoundry/deploy/lib/util.py,sha256=3TapV7yczkheC1MMMfmJDGGzTl2l6e4jCYd_Rr5aoQ8,1330
 truefoundry/deploy/lib/win32.py,sha256=1RcvPTdlOAJ48rt8rCbE2Ufha2ztRqBAE9dueNXArrY,5009
 truefoundry/deploy/python_deploy_codegen.py,sha256=Ok7ufDY2x3aMJv9KpaRqxiS-ZI-kxBWauIUHst-ug7E,4020
 truefoundry/deploy/v2/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 truefoundry/deploy/v2/lib/__init__.py,sha256=WEiVMZXOVljzEE3tpGJil14liIn_PCDoACJ6b3tZ6sI,188
 truefoundry/deploy/v2/lib/deploy.py,sha256=HIcY3SzQ5lWl7avuuKi3J0Z-PBES6Sf4hgMK-m6_53U,11990
-truefoundry/deploy/v2/lib/deploy_workflow.py,sha256=WhlrBuRf7r83qoQdTZSQzHt635fw9D4_qQIqusFWGag,12372
+truefoundry/deploy/v2/lib/deploy_workflow.py,sha256=hgAhd1EGwFLz319Vs-WNXHDJmbKjdgkGPzDnBD1Up1k,12579
 truefoundry/deploy/v2/lib/deployable_patched_models.py,sha256=MROgMxhn9hDEAKwJSWl3iz12tUVvRKzEtqF2QUT6dAk,3343
 truefoundry/deploy/v2/lib/models.py,sha256=pSolLMTArDuYpeNsmeeS5DWliloN_iCDfZSpRllMHUg,1120
 truefoundry/deploy/v2/lib/patched_models.py,sha256=sokVDUdnhe3qx6dXlHM0shbf6HvSlF72-mvi8Lzt_Y8,13968
@@ -342,7 +341,7 @@ truefoundry/workflow/map_task.py,sha256=2m3qGXQ90k9LdS45q8dqCCECc3qr8t2m_LMCVd1m
 truefoundry/workflow/python_task.py,sha256=SRXRLC4vdBqGjhkwuaY39LEWN6iPCpJAuW17URRdWTY,1128
 truefoundry/workflow/task.py,sha256=ToitYiKcNzFCtOVQwz1W8sRjbR97eVS7vQBdbgUQtKg,1779
 truefoundry/workflow/workflow.py,sha256=WaTqUjhwfAXDWu4E5ehuwAxrCbDJkoAf1oWmR2E9Qy0,4575
-truefoundry-0.4.2rc5.dist-info/METADATA,sha256=DHj98HZ0ufy1bGW-6FAVI-3Vwgzk3nBoybNHi4M3uB8,3101
-truefoundry-0.4.2rc5.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-truefoundry-0.4.2rc5.dist-info/entry_points.txt,sha256=TXvUxQkI6zmqJuycPsyxEIMr3oqfDjgrWj0m_9X12x4,95
-truefoundry-0.4.2rc5.dist-info/RECORD,,
+truefoundry-0.4.3rc0.dist-info/METADATA,sha256=gtyLuL2SsrUP6uuizszDwgBMW7JTX92jIynL1xNy3oA,3101
+truefoundry-0.4.3rc0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+truefoundry-0.4.3rc0.dist-info/entry_points.txt,sha256=TXvUxQkI6zmqJuycPsyxEIMr3oqfDjgrWj0m_9X12x4,95
+truefoundry-0.4.3rc0.dist-info/RECORD,,

{truefoundry-0.4.2rc5.dist-info → truefoundry-0.4.3rc0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.0
+Generator: poetry-core 1.9.1
 Root-Is-Purelib: true
 Tag: py3-none-any

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