truefoundry 0.4.2rc2__py3-none-any.whl → 0.4.2rc4__py3-none-any.whl

truefoundry/common/constants.py

@@ -5,8 +5,9 @@ CREDENTIAL_FILEPATH = TFY_CONFIG_DIR / "credentials.json"
 
 TFY_HOST_ENV_KEY = "TFY_HOST"
 TFY_API_KEY_ENV_KEY = "TFY_API_KEY"
-SERVICEFOUNDRY_SERVER_URL_ENV_KEY = "SERVICEFOUNDRY_SERVER_URL"
+TFY_CLI_LOCAL_DEV_MODE_ENV_KEY = "TFY_CLI_LOCAL_DEV_MODE"
 
 API_SERVER_RELATIVE_PATH = "api/svc"
+MLFOUNDRY_SERVER_RELATIVE_PATH = "api/ml"
 VERSION_PREFIX = "v1"
 SERVICEFOUNDRY_CLIENT_MAX_RETRIES = 2

truefoundry/common/servicefoundry_client.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import functools
-from urllib.parse import urlparse
 
 import requests
 from packaging import version
@@ -16,7 +15,7 @@ from truefoundry.common.entities import (
 )
 from truefoundry.common.request_utils import request_handling, requests_retry_session
 from truefoundry.common.utils import (
-    append_servicefoundry_path_to_base_url,
+    get_tfy_servers_config,
     timed_lru_cache,
 )
 from truefoundry.logger import logger
@@ -49,10 +48,10 @@ def session_with_retries() -> requests.Session:
 
 
 @timed_lru_cache(seconds=30 * 60)
-def _cached_get_tenant_info(api_server_url: str) -> TenantInfo:
+def _cached_get_tenant_info(api_server_url: str, tenant_host: str) -> TenantInfo:
     res = session_with_retries().get(
         url=f"{api_server_url}/{VERSION_PREFIX}/tenant-id",
-        params={"hostName": urlparse(api_server_url).netloc},
+        params={"hostName": tenant_host},
     )
     res = request_handling(res)
     return TenantInfo.parse_obj(res)
@@ -71,7 +70,9 @@ class ServiceFoundryServiceClient:
     # TODO (chiragjn): Rename base_url to tfy_host
     def __init__(self, base_url: str):
         self._base_url = base_url.strip("/")
-        self._api_server_url = append_servicefoundry_path_to_base_url(self._base_url)
+        tfy_servers_config = get_tfy_servers_config(self._base_url)
+        self._tenant_host = tfy_servers_config.tenant_host
+        self._api_server_url = tfy_servers_config.servicefoundry_server_url
 
     @property
     def base_url(self) -> str:
@@ -79,11 +80,16 @@ class ServiceFoundryServiceClient:
 
     @property
     def tenant_info(self) -> TenantInfo:
-        return _cached_get_tenant_info(self._api_server_url)
+        return _cached_get_tenant_info(
+            self._api_server_url,
+            tenant_host=self._tenant_host,
+        )
 
     @property
     def python_sdk_config(self) -> PythonSDKConfig:
-        return _cached_get_python_sdk_config(self._api_server_url)
+        return _cached_get_python_sdk_config(
+            self._api_server_url,
+        )
 
     @functools.cached_property
     def _min_cli_version_required(self) -> str:

truefoundry/common/utils.py

@@ -3,17 +3,51 @@ import time
 from functools import lru_cache, wraps
 from time import monotonic_ns
 from typing import Callable, Generator, Optional, TypeVar
-from urllib.parse import urljoin, urlsplit
+from urllib.parse import urljoin, urlparse
 
 from truefoundry.common.constants import (
     API_SERVER_RELATIVE_PATH,
-    SERVICEFOUNDRY_SERVER_URL_ENV_KEY,
+    MLFOUNDRY_SERVER_RELATIVE_PATH,
+    TFY_CLI_LOCAL_DEV_MODE_ENV_KEY,
     TFY_HOST_ENV_KEY,
 )
+from truefoundry.pydantic_v1 import BaseSettings
 
 T = TypeVar("T")
 
 
+class _TFYServersConfig(BaseSettings):
+    class Config:
+        env_prefix = "TFY_CLI_LOCAL_"
+        env_file = ".tfy-cli-local.env"
+
+    tenant_host: str
+    servicefoundry_server_url: str
+    mlfoundry_server_url: str
+
+    @classmethod
+    def from_base_url(cls, base_url: str) -> "_TFYServersConfig":
+        base_url = base_url.strip("/")
+        return cls(
+            tenant_host=urlparse(base_url).netloc,
+            servicefoundry_server_url=urljoin(base_url, API_SERVER_RELATIVE_PATH),
+            mlfoundry_server_url=urljoin(base_url, MLFOUNDRY_SERVER_RELATIVE_PATH),
+        )
+
+
+_tfy_servers_config = None
+
+
+def get_tfy_servers_config(base_url: str) -> _TFYServersConfig:
+    global _tfy_servers_config
+    if _tfy_servers_config is None:
+        if os.getenv(TFY_CLI_LOCAL_DEV_MODE_ENV_KEY):
+            _tfy_servers_config = _TFYServersConfig()  # type: ignore[call-arg]
+        else:
+            _tfy_servers_config = _TFYServersConfig.from_base_url(base_url)
+    return _tfy_servers_config
+
+
 def relogin_error_message(message: str, host: str = "HOST") -> str:
     suffix = ""
     if host == "HOST":
@@ -53,7 +87,7 @@ def poll_for_function(
         time.sleep(poll_after_secs)
 
 
-def validate_tfy_host(tfy_host: str) -> str:
+def validate_tfy_host(tfy_host: str) -> None:
     if not (tfy_host.startswith("https://") or tfy_host.startswith("http://")):
         raise ValueError(
             f"Invalid host {tfy_host!r}. It should start with https:// or http://"
@@ -69,10 +103,3 @@ def resolve_tfy_host(tfy_host: Optional[str] = None) -> str:
     tfy_host = tfy_host.strip("/")
     validate_tfy_host(tfy_host)
     return tfy_host
-
-
-# TODO (chiragjn): Rename base_url to tfy_host
-def append_servicefoundry_path_to_base_url(base_url: str):
-    if urlsplit(base_url).netloc.startswith("localhost"):
-        return os.getenv(SERVICEFOUNDRY_SERVER_URL_ENV_KEY)
-    return urljoin(base_url, API_SERVER_RELATIVE_PATH)

truefoundry/deploy/builder/__init__.py

@@ -1,4 +1,4 @@
-from typing import Dict, List, Optional, Union
+from typing import Any, Dict, List, Optional, Union
 
 from truefoundry.deploy.auto_gen.models import (
     DockerFileBuild,
@@ -24,7 +24,7 @@ class _BuildConfig(BaseModel):
 
 
 def build(
-    build_configuration: Union[BaseModel, Dict],
+    build_configuration: Union[BaseModel, Dict[str, Any]],
     tag: str,
     extra_opts: Optional[List[str]] = None,
 ):

truefoundry/deploy/builder/builders/tfy_notebook_buildpack/__init__.py

@@ -8,16 +8,20 @@ from truefoundry.deploy.builder.builders.tfy_notebook_buildpack.dockerfile_templ
     NotebookImageBuild,
     generate_dockerfile_content,
 )
+from truefoundry.deploy.builder.utils import has_pip_conf_secret
 
 __all__ = ["generate_dockerfile_content", "build"]
 
 
 def _convert_to_dockerfile_build_config(
-    build_configuration: NotebookImageBuild, local_dir: str
+    build_configuration: NotebookImageBuild,
+    local_dir: str,
+    mount_pip_conf_secret: bool = False,
 ) -> DockerFileBuild:
     dockerfile_content = generate_dockerfile_content(
         build_configuration=build_configuration,
         local_dir=local_dir,
+        mount_pip_conf_secret=mount_pip_conf_secret,
     )
     dockerfile_path = os.path.join(local_dir, "Dockerfile")
     with open(dockerfile_path, "w", encoding="utf8") as fp:
@@ -34,10 +38,12 @@ 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
     with TemporaryDirectory() as local_dir:
         docker_build_configuration = _convert_to_dockerfile_build_config(
             build_configuration,
             local_dir=local_dir,
+            mount_pip_conf_secret=mount_pip_conf_secret,
         )
         dockerfile.build(
             tag=tag,

truefoundry/deploy/builder/builders/tfy_notebook_buildpack/dockerfile_template.py

@@ -4,6 +4,10 @@ from typing import Literal, Optional
 
 from mako.template import Template
 
+from truefoundry.deploy.builder.constants import (
+    PIP_CONF_BUILDKIT_SECRET_MOUNT,
+    PIP_CONF_SECRET_MOUNT_AS_ENV,
+)
 from truefoundry.pydantic_v1 import BaseModel
 
 
@@ -28,31 +32,40 @@ USER $NB_UID
 
 
 def generate_build_script_docker_commands(
-    build_script: Optional[str], local_dir: str
+    build_script: Optional[str],
+    local_dir: str,
+    mount_pip_conf_secret: bool = False,
 ) -> Optional[str]:
     if not build_script:
         return None
-    build_script_path = None
-    if build_script:
-        # we add build script's hash to the file name to ensure docker cache invalidation
-        script_hash = hashlib.sha256(build_script.encode("utf-8")).hexdigest()
-        build_script_path = os.path.join(local_dir, f"build-script-{script_hash}.sh")
-        with open(build_script_path, "w") as fp:
-            fp.write(build_script)
-        build_script_path = os.path.relpath(build_script_path, local_dir)
+    # we add build script's hash to the file name to ensure docker cache invalidation
+    script_hash = hashlib.sha256(build_script.encode("utf-8")).hexdigest()
+    build_script_path = os.path.join(local_dir, f"build-script-{script_hash}.sh")
+    with open(build_script_path, "w") as fp:
+        fp.write(build_script)
+    build_script_path = os.path.relpath(build_script_path, local_dir)
+    buildkit_secret_mounts = ""
+    environment_variables = ["DEBIAN_FRONTEND=noninteractive"]
+    if mount_pip_conf_secret:
+        buildkit_secret_mounts = PIP_CONF_BUILDKIT_SECRET_MOUNT
+        environment_variables.append(PIP_CONF_SECRET_MOUNT_AS_ENV)
+    all_environment_variables = " ".join(environment_variables)
     run_build_script_command = f"""\
 COPY {build_script_path} /tmp/user-build-script.sh
-RUN mkdir -p /var/log/ && DEBIAN_FRONTEND=noninteractive bash -ex /tmp/user-build-script.sh 2>&1 | tee /var/log/user-build-script-output.log
+RUN {buildkit_secret_mounts} mkdir -p /var/log/ && {all_environment_variables} bash -ex /tmp/user-build-script.sh 2>&1 | tee /var/log/user-build-script-output.log
 """
     return run_build_script_command
 
 
 def generate_dockerfile_content(
-    build_configuration: NotebookImageBuild, local_dir: str
+    build_configuration: NotebookImageBuild,
+    local_dir: str,
+    mount_pip_conf_secret: bool = False,
 ) -> str:
     build_script_docker_commands = generate_build_script_docker_commands(
         build_script=build_configuration.build_script,
         local_dir=local_dir,
+        mount_pip_conf_secret=mount_pip_conf_secret,
     )
 
     template_args = {
@@ -62,5 +75,5 @@ def generate_dockerfile_content(
 
     template = DOCKERFILE_TEMPLATE
 
-    dockerfile_content = template.render(**template_args)
+    dockerfile_content: str = template.render(**template_args)
     return dockerfile_content

truefoundry/deploy/builder/builders/tfy_python_buildpack/__init__.py

@@ -7,6 +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
 
 __all__ = ["generate_dockerfile_content", "build"]
 
@@ -14,9 +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,
 ) -> DockerFileBuild:
     dockerfile_content = generate_dockerfile_content(
-        build_configuration=build_configuration
+        build_configuration=build_configuration,
+        mount_pip_conf_secret=mount_pip_conf_secret,
     )
     with open(dockerfile_path, "w", encoding="utf8") as fp:
         fp.write(dockerfile_content)
@@ -33,9 +36,12 @@ 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
     with TemporaryDirectory() as local_dir:
         docker_build_configuration = _convert_to_dockerfile_build_config(
-            build_configuration, dockerfile_path=os.path.join(local_dir, "Dockerfile")
+            build_configuration,
+            dockerfile_path=os.path.join(local_dir, "Dockerfile"),
+            mount_pip_conf_secret=mount_pip_conf_secret,
         )
         dockerfile.build(
             tag=tag,

truefoundry/deploy/builder/builders/tfy_python_buildpack/dockerfile_template.py

@@ -4,6 +4,10 @@ from typing import Dict, List, Optional
 from mako.template import Template
 
 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,
+)
 from truefoundry.deploy.v2.lib.patched_models import CUDAVersion
 
 # TODO (chiragjn): Switch to a non-root user inside the container
@@ -18,7 +22,7 @@ COPY ${requirements_path} ${requirements_destination_path}
 % endif
 
 % if pip_install_command is not None:
-RUN ${pip_install_command}
+RUN ${pip_config_secret_mount} ${pip_install_command}
 % endif
 
 COPY . /app
@@ -27,7 +31,7 @@ WORKDIR /app
 
 DOCKERFILE_TEMPLATE = Template(
     """
-FROM --platform=linux/amd64 python:${python_version}
+FROM --platform=linux/amd64 public.ecr.aws/docker/library/python:${python_version}
 ENV PATH=/virtualenvs/venv/bin:$PATH
 RUN apt update && \
     DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends git && \
@@ -65,6 +69,11 @@ CUDA_VERSION_TO_IMAGE_TAG: Dict[str, str] = {
     CUDAVersion.CUDA_12_0_CUDNN8.value: "12.0.1-cudnn8-runtime-ubuntu22.04",
     CUDAVersion.CUDA_12_1_CUDNN8.value: "12.1.1-cudnn8-runtime-ubuntu22.04",
     CUDAVersion.CUDA_12_2_CUDNN8.value: "12.2.2-cudnn8-runtime-ubuntu22.04",
+    CUDAVersion.CUDA_12_3_CUDNN9.value: "12.3.2-cudnn9-runtime-ubuntu22.04",
+    # From 12.4+ onwards, the image tags drop the cudnn version
+    CUDAVersion.CUDA_12_4_CUDNN9.value: "12.4.1-cudnn-runtime-ubuntu22.04",
+    CUDAVersion.CUDA_12_5_CUDNN9.value: "12.5.1-cudnn-runtime-ubuntu22.04",
+    CUDAVersion.CUDA_12_6_CUDNN9.value: "12.6.1-cudnn-runtime-ubuntu22.04",
 }
 
 
@@ -100,7 +109,9 @@ def generate_apt_install_command(apt_packages: Optional[List[str]]) -> Optional[
 
 
 def generate_pip_install_command(
-    requirements_path: Optional[str], pip_packages: Optional[List[str]]
+    requirements_path: Optional[str],
+    pip_packages: Optional[List[str]],
+    mount_pip_conf_secret: bool = False,
 ) -> Optional[str]:
     upgrade_pip_command = "python -m pip install -U pip setuptools wheel"
     final_pip_install_command = None
@@ -119,11 +130,17 @@ def generate_pip_install_command(
     if not final_pip_install_command:
         return None
 
+    if mount_pip_conf_secret:
+        final_pip_install_command = (
+            f"{PIP_CONF_SECRET_MOUNT_AS_ENV} {final_pip_install_command}"
+        )
+
     return " && ".join([upgrade_pip_command, final_pip_install_command])
 
 
 def generate_dockerfile_content(
     build_configuration: PythonBuild,
+    mount_pip_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)
@@ -133,6 +150,7 @@ def generate_dockerfile_content(
     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,
     )
     apt_install_command = generate_apt_install_command(
         apt_packages=build_configuration.apt_packages
@@ -146,6 +164,11 @@ def generate_dockerfile_content(
         "pip_install_command": pip_install_command,
     }
 
+    if mount_pip_conf_secret:
+        template_args["pip_config_secret_mount"] = PIP_CONF_BUILDKIT_SECRET_MOUNT
+    else:
+        template_args["pip_config_secret_mount"] = ""
+
     if build_configuration.cuda_version:
         template = CUDA_DOCKERFILE_TEMPLATE
         template_args["nvidia_cuda_image_tag"] = CUDA_VERSION_TO_IMAGE_TAG.get(

truefoundry/deploy/builder/constants.py

@@ -0,0 +1,7 @@
+BUILDKIT_SECRET_MOUNT_PIP_CONF_ID = "pip.conf"
+PIP_CONF_BUILDKIT_SECRET_MOUNT = (
+    f"--mount=type=secret,id={BUILDKIT_SECRET_MOUNT_PIP_CONF_ID}"
+)
+PIP_CONF_SECRET_MOUNT_AS_ENV = (
+    f"PIP_CONFIG_FILE=/run/secrets/{BUILDKIT_SECRET_MOUNT_PIP_CONF_ID}"
+)

truefoundry/deploy/builder/utils.py

@@ -0,0 +1,32 @@
+from typing import List, Optional
+
+from truefoundry.deploy.builder.constants import BUILDKIT_SECRET_MOUNT_PIP_CONF_ID
+
+
+def _get_id_from_buildkit_secret_value(value: str) -> Optional[str]:
+    parts = value.split(",")
+    secret_config = {}
+    for part in parts:
+        kv = part.split("=", 1)
+        if len(kv) != 2:
+            continue
+        key, value = kv
+        secret_config[key] = value
+
+    if "id" in secret_config and "src" in secret_config:
+        return secret_config["id"]
+
+    return None
+
+
+def has_pip_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
+        ):
+            return True
+    return False

truefoundry/deploy/cli/commands/deploy_command.py

@@ -9,7 +9,7 @@ from click.exceptions import ClickException
 
 from truefoundry.autodeploy.cli import cli as autodeploy_cli
 from truefoundry.autodeploy.exception import InvalidRequirementsException
-from truefoundry.deploy.cli.const import GROUP_CLS
+from truefoundry.deploy.cli.const import COMMAND_CLS, GROUP_CLS
 from truefoundry.deploy.cli.util import handle_exception_wrapper
 
 
@@ -54,8 +54,13 @@ def _get_default_spec_file():
     default=True,
     help="Wait and tail the deployment progress",
 )
+@click.pass_context
 @handle_exception_wrapper
-def deploy_command(file: str, workspace_fqn: Optional[str], wait: bool):
+def deploy_command(
+    ctx: click.Context, file: str, workspace_fqn: Optional[str], wait: bool
+):
+    if ctx.invoked_subcommand is not None:
+        return
     from truefoundry.deploy.lib.auth.servicefoundry_session import ServiceFoundrySession
     from truefoundry.deploy.v2.lib.deployable_patched_models import Application
 
@@ -98,5 +103,44 @@ def deploy_command(file: str, workspace_fqn: Optional[str], wait: bool):
         raise UsageError(message=str(e)) from e
 
 
+@deploy_command.command(name="workflow", cls=COMMAND_CLS, help="Deploy a Workflow")
+@click.option(
+    "-n",
+    "--name",
+    required=True,
+    help="Name of the Workflow",
+)
+@click.option(
+    "-f",
+    "--file",
+    type=click.Path(exists=True, dir_okay=False, resolve_path=True),
+    required=True,
+    help="Path to the Workflow file. e.g. workflow.py",
+)
+@click.option(
+    "-w",
+    "--workspace-fqn",
+    "--workspace_fqn",
+    required=True,
+    help="FQN of the Workspace to deploy to.",
+)
+@handle_exception_wrapper
+def deploy_workflow_command(name: str, workflow_file: str, workspace_fqn: str):
+    from truefoundry.deploy.lib.auth.servicefoundry_session import ServiceFoundrySession
+
+    try:
+        _ = ServiceFoundrySession()
+    except Exception as e:
+        raise ClickException(message=str(e)) from e
+
+    from truefoundry.deploy.v2.lib.deployable_patched_models import Workflow
+
+    workflow = Workflow(
+        name=name,
+        workflow_file_path=workflow_file,
+    )
+    workflow.deploy(workspace_fqn=workspace_fqn)
+
+
 def get_deploy_command():
     return deploy_command

truefoundry/deploy/cli/util.py

@@ -35,9 +35,12 @@ def handle_exception(exception):
             border_style="red",
         )
     elif isinstance(exception, ConnectionError):
+        loc = ""
+        if exception.request:
+            loc = f" at {exception.request.url}"
         print_dict_as_table_panel(
             {
-                "Error": "Couldn't connect to TrueFoundry. Please make sure that the provided `--host` is correct."
+                "Error": f"Couldn't connect to TrueFoundry{loc}. Please make sure that the provided `--host` is correct."
             },
             title="Command Failed",
             border_style="red",

truefoundry/deploy/v2/lib/patched_models.py

@@ -84,6 +84,10 @@ class CUDAVersion(str, enum.Enum):
     CUDA_12_0_CUDNN8 = "12.0-cudnn8"
     CUDA_12_1_CUDNN8 = "12.1-cudnn8"
     CUDA_12_2_CUDNN8 = "12.2-cudnn8"
+    CUDA_12_3_CUDNN9 = "12.3-cudnn9"
+    CUDA_12_4_CUDNN9 = "12.4-cudnn9"
+    CUDA_12_5_CUDNN9 = "12.5-cudnn9"
+    CUDA_12_6_CUDNN9 = "12.6-cudnn9"
 
 
 class GPUType(str, enum.Enum):

truefoundry/ml/clients/servicefoundry_client.py

@@ -12,16 +12,13 @@ from truefoundry.ml.clients.entities import (
 )
 from truefoundry.ml.clients.utils import http_request_safe
 from truefoundry.ml.exceptions import MlFoundryException
-from truefoundry.ml.run_utils import append_servicefoundry_path_to_tracking_uri
 
 
 class ServiceFoundryServiceClient(BaseServiceFoundryServiceClient):
     # TODO (chiragjn): Rename tracking_uri to tfy_host
     def __init__(self, tracking_uri: str, token: Optional[str] = None):
         super().__init__(base_url=tracking_uri)
-        self.host_creds = HostCreds(
-            host=append_servicefoundry_path_to_tracking_uri(tracking_uri), token=token
-        )
+        self.host_creds = HostCreds(host=self._api_server_url, token=token)
 
     def get_integration_from_id(self, integration_id: str):
         integration_id = integration_id or ""

truefoundry/ml/run_utils.py

@@ -1,9 +1,7 @@
 import argparse
 import importlib
 import json
-import os
 from typing import Any, Dict, List, Mapping, Optional, Tuple, Union
-from urllib.parse import urljoin, urlsplit
 
 import numpy as np
 
@@ -21,18 +19,6 @@ def get_module(
             raise MlFoundryException(msg) from ex
 
 
-def append_path_to_rest_tracking_uri(tracking_uri: str):
-    if urlsplit(tracking_uri).netloc.startswith("localhost"):
-        return tracking_uri
-    return urljoin(tracking_uri, "/api/ml")
-
-
-def append_servicefoundry_path_to_tracking_uri(tracking_uri: str):
-    if urlsplit(tracking_uri).netloc.startswith("localhost"):
-        return os.getenv("SERVICEFOUNDRY_SERVER_URL")
-    return urljoin(tracking_uri, "/api/svc")
-
-
 class NumpyEncoder(json.JSONEncoder):
     """Special json encoder for numpy types"""
 

truefoundry/ml/session.py

@@ -10,7 +10,7 @@ from truefoundry.common.credential_provider import (
 )
 from truefoundry.common.entities import Token, UserInfo
 from truefoundry.common.request_utils import urllib3_retry
-from truefoundry.common.utils import relogin_error_message
+from truefoundry.common.utils import get_tfy_servers_config, relogin_error_message
 from truefoundry.ml.autogen.client import (  # type: ignore[attr-defined]
     ApiClient,
     Configuration,
@@ -18,9 +18,6 @@ from truefoundry.ml.autogen.client import (  # type: ignore[attr-defined]
 from truefoundry.ml.clients.entities import HostCreds
 from truefoundry.ml.exceptions import MlFoundryException
 from truefoundry.ml.logger import logger
-from truefoundry.ml.run_utils import (
-    append_path_to_rest_tracking_uri,
-)
 
 if TYPE_CHECKING:
     from truefoundry.ml.mlfoundry_run import MlFoundryRun
@@ -99,7 +96,7 @@ class Session:
         )
 
     def get_host_creds(self) -> HostCreds:
-        tracking_uri = append_path_to_rest_tracking_uri(self._cred_provider.base_url)
+        tracking_uri = get_tfy_servers_config(self.tracking_uri).mlfoundry_server_url
         return HostCreds(
             host=tracking_uri, token=self._cred_provider.token.access_token
         )

truefoundry/workflow/example/hello_world_package/workflow.py

@@ -5,9 +5,9 @@ from truefoundry.workflow import PythonTaskConfig, TaskPythonBuild, task, workfl
     task_config=PythonTaskConfig(
         image=TaskPythonBuild(
             python_version="3.9",
-            pip_packages=["truefoundry[workflow]==0.3.0rc7"],
+            pip_packages=["truefoundry[workflow]"],
         ),
-        service_account="tfy-flyte-dataplane-devtest-s3",
+        service_account="tfy-workflows-sa",
     )
 )
 def say_hello() -> str:

truefoundry/workflow/example/package/test_workflow.py

@@ -7,7 +7,6 @@ from truefoundry.deploy import Image, NvidiaGPU, Resources
 from truefoundry.workflow import (
     ContainerTask,
     ContainerTaskConfig,
-    ExecutionConfig,
     FlyteDirectory,
     PythonTaskConfig,
     TaskPythonBuild,
@@ -20,10 +19,10 @@ from truefoundry.workflow import (
 cpu_task_config = PythonTaskConfig(
     image=TaskPythonBuild(
         python_version="3.9",
-        pip_packages=["truefoundry[workflow]==0.3.0rc7"],
+        pip_packages=["truefoundry[workflow]==0.4.1"],
     ),
     resources=Resources(cpu_request=0.45),
-    service_account="tfy-flyte-dataplane-devtest-s3",
+    service_account="tfy-workflows-sa",
 )
 
 
@@ -49,7 +48,7 @@ def train_tokenizer() -> str:
     task_config=PythonTaskConfig(
         image=TaskPythonBuild(
             python_version="3.9",
-            pip_packages=["truefoundry[workflow]==0.3.0rc7", "pynvml==11.5.0"],
+            pip_packages=["truefoundry[workflow]==0.4.1", "pynvml==11.5.0"],
             cuda_version="11.5-cudnn8",
         ),
         env={
@@ -57,16 +56,16 @@ def train_tokenizer() -> str:
             "NVIDIA_VISIBLE_DEVICES": "all",
         },
         resources=Resources(cpu_request=0.45, devices=[NvidiaGPU(name="T4", count=1)]),
-        service_account="tfy-flyte-dataplane-devtest-s3",
+        service_account="tfy-workflows-sa",
     ),
 )
 def train_model(tokenizer: str) -> Tuple[FlyteDirectory, str]:
     print("Training model")
     import flytekit
-    from pynvml import nvmlDeviceGetCount, nvmlInit
+    # from pynvml import nvmlDeviceGetCount, nvmlInit
 
-    nvmlInit()
-    assert nvmlDeviceGetCount() > 0
+    # nvmlInit()
+    # assert nvmlDeviceGetCount() > 0
 
     working_dir = flytekit.current_context().working_directory
     local_dir = Path(os.path.join(working_dir, "csv_files"))
@@ -102,10 +101,10 @@ echo = ContainerTask(
     name="echo",
     task_config=ContainerTaskConfig(
         image=Image(
-            image_uri="bash:4.1",
+            image_uri="docker.io/bash:4.1",
             command=["echo", "hello"],
         ),
-        service_account="tfy-flyte-dataplane-devtest-s3",
+        service_account="tfy-workflows-sa",
     ),
 )
 
@@ -117,11 +116,11 @@ def random(tokenizer: str) -> Tuple[FlyteDirectory, str]:
 
 
 @workflow(
-    execution_configs=[
-        ExecutionConfig(
-            schedule="*/10 * * * *",
-        )
-    ]
+    # execution_configs=[
+    #     ExecutionConfig(
+    #         schedule="*/10 * * * *",
+    #     )
+    # ]
 )
 def train(
     tokenizer: str = "",

{truefoundry-0.4.2rc2.dist-info → truefoundry-0.4.2rc4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: truefoundry
-Version: 0.4.2rc2
+Version: 0.4.2rc4
 Summary: Truefoundry CLI
 Author: Abhishek Choudhary
 Author-email: abhishek@truefoundry.com
@@ -31,7 +31,6 @@ Requires-Dist: openai (>=1.16.2,<2.0.0)
 Requires-Dist: packaging (>=20.0,<25.0)
 Requires-Dist: pandas (>=1.0.0,<3.0.0) ; python_version < "3.10"
 Requires-Dist: pandas (>=1.4.0,<3.0.0) ; python_version >= "3.10"
-Requires-Dist: psutil (>=5.9.0,<7.0.0)
 Requires-Dist: pydantic (>=1.8.2,<3.0.0)
 Requires-Dist: pygments (>=2.12.0,<3.0.0)
 Requires-Dist: python-dateutil (>=2.8.2,<3.0.0)

{truefoundry-0.4.2rc2.dist-info → truefoundry-0.4.2rc4.dist-info}/RECORD

@@ -27,24 +27,26 @@ 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=kHP5ebp7EMfEYaOC-K8T_XPfYi7mXttYgrXYS8bOgkg,359
+truefoundry/common/constants.py,sha256=JT8wcc9IxX3K_xbzXgxTp1FMQfKwnLam5XoJjhiCw1M,395
 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
 truefoundry/common/exceptions.py,sha256=ePpiQ_zmWe4e94gOgeMiyP_AZnKwjEBfyXsB5ScGYcI,329
 truefoundry/common/request_utils.py,sha256=-ss8033PClJOMJuS5Ue1zCFRVK7ZW9vjtva1b5G9uok,2849
-truefoundry/common/servicefoundry_client.py,sha256=qYSrsbFH8b7N_2oxlXfbJnWfdqHCBQ1dQ5Rr2tdp3zQ,2937
-truefoundry/common/utils.py,sha256=f5Av8X70vZf6eUK4Axm8q75It2-C-3o3uomA0GrFt_4,2506
+truefoundry/common/servicefoundry_client.py,sha256=klohrELTFTJX-jvl9LGtdIoJiZMZRuQQB4Ho7PJ7u3s,3091
+truefoundry/common/utils.py,sha256=lFiDEVoQDJoZPEN4Zun4GQz2TsfdbXfNHI41BErETq8,3320
 truefoundry/deploy/__init__.py,sha256=ugawKF2G02EmEXX35oZ2tec12d9oWN28Sf6mtGGIERY,2281
 truefoundry/deploy/auto_gen/models.py,sha256=AjbjNFwWDTIOjN_E1fSUgP-ej9nsb2OpZPhsnIRAVGs,80621
-truefoundry/deploy/builder/__init__.py,sha256=a1qR6nicHGcxRaeNTxWRsmDs8zsmXc7j13-I8q0qqVk,4938
+truefoundry/deploy/builder/__init__.py,sha256=1qjHMNBE1poRCZW0WrG46dFM1f1IlivD5352qzsioMU,4953
 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=OK2lCwaPfhh7ALjNqfFBOTv7B9B3e9WDLoaSm0LWEkk,1436
-truefoundry/deploy/builder/builders/tfy_notebook_buildpack/dockerfile_template.py,sha256=cEjpcz2L9lEEoEcF0rzuRpgXwNkuce8dbvdBvhTqDYk,1946
-truefoundry/deploy/builder/builders/tfy_python_buildpack/__init__.py,sha256=n7MwUzIyn3mFqVkQqOuMeswmSPsydpYH4XMV5c8qAdQ,1381
-truefoundry/deploy/builder/builders/tfy_python_buildpack/dockerfile_template.py,sha256=vFmFeK38-t8booJEGREapEjrIL8xnyOQeRSJQq7d3ZQ,6183
+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_python_buildpack/__init__.py,sha256=XNJ3MKWqyWIbFNnUQMpB8oVC5Pt5Wsm_bRKbvkXRIG8,1696
+truefoundry/deploy/builder/builders/tfy_python_buildpack/dockerfile_template.py,sha256=dccCNOUKbK1X8F4f2J4ddSTCturvzQKx6H23xxJdCTk,7202
+truefoundry/deploy/builder/constants.py,sha256=eIukBjD6I4KvEmAPpdbPlPPr76yhS-uNr3RVFkzEdgs,257
 truefoundry/deploy/builder/docker_service.py,sha256=vQS15790njzlFJZ3JW6txYLBdT11ltxqqpf78ZFL_Ng,5208
+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
 truefoundry/deploy/cli/commands/__init__.py,sha256=oOstv608ueOJTxR3qlQbZBIdo-FsFe2O0NYNOXi01-s,1276
@@ -53,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=f3Bd0EClT4y6Eahw0pX2MFKiRD29j5kHlWVK5rbvK20,2858
+truefoundry/deploy/cli/commands/deploy_command.py,sha256=ixn3uQoDRfJ9D8GOMwXJ9W9VbyNce9Qzb3Mx7h5InRM,4018
 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
@@ -68,7 +70,7 @@ truefoundry/deploy/cli/config.py,sha256=tf8w4UfVzcC6eYkENvuuCPYt_V3sqVpO1bclORV9
 truefoundry/deploy/cli/console.py,sha256=9-dMy4YPisCJQziRKTg8Qa0UJnOGl1soiUnJjsnLDvE,242
 truefoundry/deploy/cli/const.py,sha256=dVHPo1uAiDSSMXwXoT2mR5kNQjExT98QNVRz98Hz_Ts,510
 truefoundry/deploy/cli/display_util.py,sha256=gq8EBdpBMHUzYQp_hxOg9EOYi08FIHgOVFCqXqC2tuo,3044
-truefoundry/deploy/cli/util.py,sha256=n2-YzdYkyJV1w7XzzWCLtksoaY35I6tM58T_qNpm4vY,3587
+truefoundry/deploy/cli/util.py,sha256=bxbNEX3mbhtDpXw3b2GAnbxe0xvCF9N1sCMK6yatz0Q,3689
 truefoundry/deploy/core/__init__.py,sha256=j61bMWj4BkWihdssKMSFhieo7afJDtpc7qO7zk1rDB4,140
 truefoundry/deploy/core/login.py,sha256=N2VrW3nlBzoyoYulkipxwQvCpjBhi3sfsmhxK1ktWhg,236
 truefoundry/deploy/core/logout.py,sha256=TpWLq4_DsxYS5GX2OJQGDhekNOfiOLb-vO5khQueHXw,80
@@ -113,7 +115,7 @@ truefoundry/deploy/v2/lib/deploy.py,sha256=HIcY3SzQ5lWl7avuuKi3J0Z-PBES6Sf4hgMK-
 truefoundry/deploy/v2/lib/deploy_workflow.py,sha256=WhlrBuRf7r83qoQdTZSQzHt635fw9D4_qQIqusFWGag,12372
 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=qL3N7y6zf7jywx6uY-yMxsH65NB367V_82o47ZYJt1I,13820
+truefoundry/deploy/v2/lib/patched_models.py,sha256=sokVDUdnhe3qx6dXlHM0shbf6HvSlF72-mvi8Lzt_Y8,13968
 truefoundry/deploy/v2/lib/source.py,sha256=VHKuFREiixUP40D3Mrz-TA70spu1M0RbCzl--qwlFaY,9263
 truefoundry/langchain/__init__.py,sha256=zeYKxKrQhfYXQuBec3wvB_ZqKowDUUjLUKUhbiu9ZFs,558
 truefoundry/langchain/deprecated.py,sha256=8tfLHXwcifGl7DYhMNfzc4zRVCVqEgARg5BsbZp11NE,10835
@@ -296,7 +298,7 @@ truefoundry/ml/cli/commands/__init__.py,sha256=diDUiRUX4l6TtNLI4iF-ZblczkELM7FRV
 truefoundry/ml/cli/commands/download.py,sha256=cbz9KijiLKXj4-twlig3xZLTVRNm4fnjwpy0leZr31w,2342
 truefoundry/ml/clients/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 truefoundry/ml/clients/entities.py,sha256=sNP4DnAVdQoMfc06s0r3VTzKHTo7jmxAOuTlQOVmsMs,151
-truefoundry/ml/clients/servicefoundry_client.py,sha256=w8fgZWZF_JjRpL_ZRmLw1BiI7aqDHnJcAXluBgwft0s,1735
+truefoundry/ml/clients/servicefoundry_client.py,sha256=nmKrWBd7P0VEDGjPHZ8_scX3Xo9tv3wZSWlTIBwGptU,1597
 truefoundry/ml/clients/utils.py,sha256=c0LdC8moejs-Zm30hu1sCqifLEmqhdq4SfZ_m0nUIDk,4402
 truefoundry/ml/constants.py,sha256=vDq72d4C9FSWqr9MMdjgTF4TuyNFApvo_6RVsSeAjB4,2837
 truefoundry/ml/entities.py,sha256=si5GAqZsWzKu5MPrU4Hk6se7bebHOYhTiNw69ai-Uk8,1485
@@ -324,23 +326,23 @@ truefoundry/ml/log_types/utils.py,sha256=xjJ21jdPScvFmw3TbVh5NCzbzJwaqiXJyiiT4xx
 truefoundry/ml/logger.py,sha256=VT-BF3BnBYTWVq87O58F0c8uXMu94gYzsiFlGY3_7Ao,458
 truefoundry/ml/mlfoundry_api.py,sha256=I2T8tXeAIWpD8EH05fm80mNyX6cs2S1ORI4qoo0HTpQ,60847
 truefoundry/ml/mlfoundry_run.py,sha256=rNJl130iJkpjW3MNoe5-d_J9VJJQBqWHEJCfYeiZCbE,45123
-truefoundry/ml/run_utils.py,sha256=dzbQ_TGkSCYO-gg8tlr5tglR0p2SIQdy0wl4IEQE5JA,2899
-truefoundry/ml/session.py,sha256=_WmaGNiZCwQVmB-brbX-z38nFvuqP8f7jGxfqJoq3TM,5385
+truefoundry/ml/run_utils.py,sha256=0W208wSLUrbdfk2pjNcZlkUi9bNxG2JORqoe-5rVqHI,2423
+truefoundry/ml/session.py,sha256=Rvq419hdLNBt0KUzKn7jGvKKg9LI_gafOHcw-lFceAE,5330
 truefoundry/ml/validation_utils.py,sha256=XBSUd9OoyriWJpT3M5LKz17iWY3yVMr3hM5vdaVjtf0,12082
 truefoundry/pydantic_v1.py,sha256=jSuhGtz0Mbk1qYu8jJ1AcnIDK4oxUsdhALc4spqstmM,345
 truefoundry/version.py,sha256=bqiT4Q-VWrTC6P4qfK43mez-Ppf-smWfrl6DcwV7mrw,137
 truefoundry/workflow/__init__.py,sha256=hkDVrnG95duO-9XEmdjgrsvyhjQUVqyeQ1-dADB1QuE,935
 truefoundry/workflow/container_task.py,sha256=8arieePsX4__OnG337hOtCiNgJwtKJJCsZcmFmCBJtk,402
 truefoundry/workflow/example/deploy.sh,sha256=wfbPRrCi04WYRqCf4g-Xo12uWbcqPD6G_Tz0lV0jU_U,60
-truefoundry/workflow/example/hello_world_package/workflow.py,sha256=ACWJJWTY5NhYyU_dAEfdSqXgyLuNXPRDpOBuUkTEzhU,459
-truefoundry/workflow/example/package/test_workflow.py,sha256=-CeCcMyI3fjRGSkzfmmnLcE2aFxceCUpEXx8dql8MBE,4015
+truefoundry/workflow/example/hello_world_package/workflow.py,sha256=IkRKfPY5BcvLPo_PVuNbZKK9PPJ93LRkzb1a3RKQYOw,435
+truefoundry/workflow/example/package/test_workflow.py,sha256=TUcvYCGz4IbzF9bQJAfB-6Wd2wx-0RKcuIpUG0t6d8c,3972
 truefoundry/workflow/example/truefoundry.yaml,sha256=LlPrMADSPJsiXRoK76N_RVjX1bnZ3FH1u2jXrwLfR9I,226
 truefoundry/workflow/example/workflow.yaml,sha256=YtYdKXMuW_08gfEo21XSculj2MGI2lfEnGF8qCT8NKE,2858
 truefoundry/workflow/map_task.py,sha256=2m3qGXQ90k9LdS45q8dqCCECc3qr8t2m_LMCVd1mZ7g,1737
 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.2rc2.dist-info/METADATA,sha256=8wBExyVvKXs8p3xYsQf8p6uGf8Mb16m8DK2GlgHt78o,3140
-truefoundry-0.4.2rc2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-truefoundry-0.4.2rc2.dist-info/entry_points.txt,sha256=TXvUxQkI6zmqJuycPsyxEIMr3oqfDjgrWj0m_9X12x4,95
-truefoundry-0.4.2rc2.dist-info/RECORD,,
+truefoundry-0.4.2rc4.dist-info/METADATA,sha256=eVFBEHzH-io21OISm7nj8Ky_kjdLlSfPCjekRViZ_cQ,3101
+truefoundry-0.4.2rc4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+truefoundry-0.4.2rc4.dist-info/entry_points.txt,sha256=TXvUxQkI6zmqJuycPsyxEIMr3oqfDjgrWj0m_9X12x4,95
+truefoundry-0.4.2rc4.dist-info/RECORD,,