truefoundry 0.3.0rc7__py3-none-any.whl → 0.3.0rc9__py3-none-any.whl

truefoundry/deploy/__init__.py

@@ -6,6 +6,7 @@ from truefoundry.deploy.auto_gen.models import (
     Kustomize,
     ParamType,
     Protocol,
+    WorkbenchImage,
 )
 from truefoundry.deploy.lib.dao.application import (
     delete_application,
@@ -56,14 +57,10 @@ from truefoundry.deploy.v2.lib.patched_models import (
     BlueGreen,
     Build,
     Canary,
-    CodeserverImage,
     CoreNATSOutputConfig,
     CPUUtilizationMetric,
     CronMetric,
     CUDAVersion,
-    CustomCodeserverImage,
-    CustomNotebookImage,
-    CustomSSHServerImage,
     DockerFileBuild,
     DynamicVolumeConfig,
     Endpoint,
@@ -104,15 +101,10 @@ from truefoundry.deploy.v2.lib.patched_models import (
     SQSInputConfig,
     SQSOutputConfig,
     SQSQueueMetricConfig,
-    SSHServerImage,
     StaticVolumeConfig,
     StringDataMount,
     TPUType,
     TruefoundryArtifactSource,
-    TruefoundryImageBase,
-    TruefoundryImageCuda1180,
-    TruefoundryImageCuda1211,
-    TruefoundryImageFull,
     VolumeBrowser,
     VolumeMount,
     WorkerConfig,

truefoundry/deploy/auto_gen/models.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  application.json
-#   timestamp: 2024-07-19T06:56:20+00:00
+#   timestamp: 2024-08-09T07:42:58+00:00
 
 from __future__ import annotations
 
@@ -125,6 +125,13 @@ class AsyncProcessorSidecar(BaseModel):
     )
 
 
+class Autoshutdown(BaseModel):
+    wait_time: conint(ge=0) = Field(
+        300,
+        description="+label=Wait Time\n+usage=The period to wait after the last received request before scaling the replicas to 0",
+    )
+
+
 class BaseAutoscaling(BaseModel):
     min_replicas: conint(ge=0) = Field(
         1,
@@ -138,10 +145,6 @@ class BaseAutoscaling(BaseModel):
         30,
         description="+label=Polling Interval\n+usage=This is the interval to check each trigger on.",
     )
-    cooldown_period: conint(ge=0) = Field(
-        300,
-        description="+label=Cooldown Period\n+usage=The period to wait after the last trigger reported active before scaling the resource back to 0.",
-    )
 
 
 class BasicAuthCreds(BaseModel):
@@ -197,26 +200,6 @@ class CanaryStep(BaseModel):
     )
 
 
-class CodeserverImage(BaseModel):
-    """
-    +usage=Codeserver with persistent environment (Python 3.11.6)
-    """
-
-    type: constr(regex=r"^codeserver$") = Field(..., description="+value=codeserver")
-    enable_sudo: bool = Field(
-        True,
-        description="+label=Enable root access to the container\n+usage=Changes made to the root directory `/` will not be persisted across notebook restarts",
-    )
-    apt_packages: Optional[List[str]] = Field(
-        None,
-        description='+label=List of Debian packages to install.\n+usage=Debian packages to install via `apt get`.\nIn Python/YAML E.g. ["git", "ffmpeg", "htop"]\n+placeholder=Enter a debian package name E.g. ffmpeg',
-    )
-    docker_registry: Optional[str] = Field(
-        None,
-        description="+docs=FQN of the container registry. You can the FQN of your desired container registry (or add one)\nin the  Integrations page[Integrations](https://app.truefoundry.tech/integrations?tab=docker-registry) page\n+label=Docker Registry\n+usage=FQN of the container registry. If you can't find your registry here,\nadd it through the [Integrations](/integrations?tab=docker-registry) page",
-    )
-
-
 class CronMetric(BaseModel):
     type: Literal["cron"] = Field(..., description="+value=cron")
     desired_replicas: Optional[conint(ge=1)] = Field(
@@ -237,60 +220,6 @@ class CronMetric(BaseModel):
     )
 
 
-class CustomCodeserverImage(BaseModel):
-    """
-    +usage=User supplied docker image URI for vscode server
-    """
-
-    type: constr(regex=r"^customcodeserver$") = Field(
-        ..., description="+value=customcodeserver"
-    )
-    image_uri: str = Field(
-        ...,
-        description="+label=Image URI\n+usage=The image URI. Specify the name of the image and the tag.\nIf the image is in Dockerhub, you can skip registry-url (for e.g. `tensorflow/tensorflow`).\nYou can use an image from a private registry using Advanced fields\n+placeholder=registry-url/account/image:version",
-    )
-    docker_registry: Optional[str] = Field(
-        None,
-        description="+docs=FQN of the container registry. You can use the FQN of your desired container registry (or add one)\nin the Integrations page[Integrations](https://app.truefoundry.tech/integrations?tab=docker-registry) page\n+label=Docker Registry\n+usage=FQN of the container registry. If you can't find your registry here,\nadd it through the [Integrations](/integrations?tab=docker-registry) page",
-    )
-
-
-class CustomNotebookImage(BaseModel):
-    """
-    +usage=User supplied docker image URI for jupyter notebook
-    """
-
-    type: constr(regex=r"^customnotebook$") = Field(
-        ..., description="+value=customnotebook"
-    )
-    image_uri: str = Field(
-        ...,
-        description="+label=Image URI\n+usage=The image URI. Specify the name of the image and the tag.\nIf the image is in Dockerhub, you can skip registry-url (for e.g. `tensorflow/tensorflow`).\nYou can use an image from a private registry using Advanced fields\n+placeholder=registry-url/account/image:version",
-    )
-    docker_registry: Optional[str] = Field(
-        None,
-        description="+docs=FQN of the container registry. You can use the FQN of your desired container registry (or add one)\nin the  Integrations page[Integrations](https://app.truefoundry.tech/integrations?tab=docker-registry) page\n+label=Docker Registry\n+usage=FQN of the container registry. If you can't find your registry here,\nadd it through the [Integrations](/integrations?tab=docker-registry) page",
-    )
-
-
-class CustomSSHServerImage(BaseModel):
-    """
-    +usage=User supplied docker image URI for ssh server
-    """
-
-    type: constr(regex=r"^custom-ssh-server$") = Field(
-        ..., description="+value=custom-ssh-server"
-    )
-    image_uri: str = Field(
-        ...,
-        description="+label=Image URI\n+usage=The image URI. Specify the name of the image and the tag.\nIf the image is in Dockerhub, you can skip registry-url (for e.g. `tensorflow/tensorflow`).\nYou can use an image from a private registry using Advanced fields\n+placeholder=registry-url/account/image:version",
-    )
-    docker_registry: Optional[str] = Field(
-        None,
-        description="+docs=FQN of the container registry. You can use the FQN of your desired container registry (or add one)\nin the  Integrations page[Integrations](https://app.truefoundry.tech/integrations?tab=docker-registry) page\n+label=Docker Registry\n+usage=FQN of the container registry. If you can't find your registry here,\nadd it through the [Integrations](/integrations?tab=docker-registry) page",
-    )
-
-
 class DockerFileBuild(BaseModel):
     """
     +docs=Describes that we are using a dockerfile to build our image
@@ -976,22 +905,6 @@ class SQSQueueMetricConfig(BaseModel):
     )
 
 
-class SSHServerImage(BaseModel):
-    """
-    +usage=Ssh Server with persistent environment (Python 3.11.6)
-    """
-
-    type: constr(regex=r"^ssh-server$") = Field(..., description="+value=ssh-server")
-    apt_packages: Optional[List[str]] = Field(
-        None,
-        description='+label=List of Debian packages to install.\n+usage=Debian packages to install via `apt get`.\nIn Python/YAML E.g. ["git", "ffmpeg", "htop"]\n+placeholder=Enter a debian package name E.g. ffmpeg',
-    )
-    docker_registry: Optional[str] = Field(
-        None,
-        description="+docs=FQN of the container registry. You can the FQN of your desired container registry (or add one)\nin the  Integrations page[Integrations](https://app.truefoundry.tech/integrations?tab=docker-registry) page\n+label=Docker Registry\n+usage=FQN of the container registry. If you can't find your registry here,\nadd it through the [Integrations](/integrations?tab=docker-registry) page",
-    )
-
-
 class ConcurrencyPolicy(str, Enum):
     """
     +usage=Choose whether to allow this job to run while another instance of the job is running, or to replace the currently running instance. Allow
@@ -1149,86 +1062,6 @@ class TruefoundryArtifactSource(BaseModel):
     )
 
 
-class TruefoundryImageBase(BaseModel):
-    """
-    +usage=JupyterLab with persistent python environment (Python 3.11.6)
-    """
-
-    type: constr(regex=r"^truefoundrybase$") = Field(
-        ..., description="+value=truefoundrybase"
-    )
-    enable_sudo: bool = Field(
-        True,
-        description="+label=Enable root access to the container\n+usage=Changes made to the root directory `/` will not be persisted across notebook restarts",
-    )
-    apt_packages: Optional[List[str]] = Field(
-        None,
-        description='+label=List of Debian packages to install.\n+usage=Debian packages to install via `apt get`.\nIn Python/YAML E.g. ["git", "ffmpeg", "htop"]\n+placeholder=Enter a debian package name E.g. ffmpeg',
-    )
-    docker_registry: Optional[str] = Field(
-        None,
-        description="+docs=FQN of the container registry. You can use the FQN of your desired container registry (or add one)\nin the  Integrations page[Integrations](https://app.truefoundry.tech/integrations?tab=docker-registry) page\n+label=Docker Registry\n+usage=FQN of the container registry. If you can't find your registry here,\nadd it through the [Integrations](/integrations?tab=docker-registry) page",
-    )
-
-
-class TruefoundryImageCuda1180(BaseModel):
-    """
-    +usage=JupyterLab with persistent python environment (Python 3.11.6, Cuda 11.8.0)
-    """
-
-    type: constr(regex=r"^truefoundrycuda1180$") = Field(
-        ..., description="+value=truefoundrycuda1180"
-    )
-    apt_packages: Optional[List[str]] = Field(
-        None,
-        description='+label=List of Debian packages to install.\n+usage=Debian packages to install via `apt get`.\nIn Python/YAML E.g. ["git", "ffmpeg", "htop"]\n+placeholder=Enter a debian package name E.g. ffmpeg',
-    )
-    docker_registry: Optional[str] = Field(
-        None,
-        description="+docs=FQN of the container registry. You can use the FQN of your desired container registry (or add one)\nin the  Integrations page[Integrations](https://app.truefoundry.tech/integrations?tab=docker-registry) page\n+label=Docker Registry\n+usage=FQN of the container registry. If you can't find your registry here,\nadd it through the [Integrations](/integrations?tab=docker-registry) page",
-    )
-
-
-class TruefoundryImageCuda1211(BaseModel):
-    """
-    +usage=JupyterLab with persistent python environment (Python 3.11.6, Cuda 12.1.1)
-    """
-
-    type: constr(regex=r"^truefoundrycuda1211$") = Field(
-        ..., description="+value=truefoundrycuda1211"
-    )
-    apt_packages: Optional[List[str]] = Field(
-        None,
-        description='+label=List of Debian packages to install.\n+usage=Debian packages to install via `apt get`.\nIn Python/YAML E.g. ["git", "ffmpeg", "htop"]\n+placeholder=Enter a debian package name E.g. ffmpeg',
-    )
-    docker_registry: Optional[str] = Field(
-        None,
-        description="+docs=FQN of the container registry. You can use the FQN of your desired container registry (or add one)\nin the  Integrations page[Integrations](https://app.truefoundry.tech/integrations?tab=docker-registry) page\n+label=Docker Registry\n+usage=FQN of the container registry. If you can't find your registry here,\nadd it through the [Integrations](/integrations?tab=docker-registry) page",
-    )
-
-
-class TruefoundryImageFull(BaseModel):
-    """
-    +usage=JupyterLab + Tensorflow 2.15.0 and Pytorch 2.1.1 with persistent environment (Python 3.11.6)
-    """
-
-    type: constr(regex=r"^truefoundryfull$") = Field(
-        ..., description="+value=truefoundryfull"
-    )
-    enable_sudo: bool = Field(
-        True,
-        description="+label=Enable root access to the container\n+usage=Changes made to the root directory `/` will not be persisted across notebook restarts",
-    )
-    apt_packages: Optional[List[str]] = Field(
-        None,
-        description='+label=List of Debian packages to install.\n+usage=Debian packages to install via `apt get`.\nIn Python/YAML E.g. ["git", "ffmpeg", "htop"]\n+placeholder=Enter a debian package name E.g. ffmpeg',
-    )
-    docker_registry: Optional[str] = Field(
-        None,
-        description="+docs=FQN of the container registry. You can use the FQN of your desired container registry (or add one)\nin the  Integrations page[Integrations](https://app.truefoundry.tech/integrations?tab=docker-registry) page\n+label=Docker Registry\n+usage=FQN of the container registry. If you can't find your registry here,\nadd it through the [Integrations](/integrations?tab=docker-registry) page",
-    )
-
-
 class VolumeBrowser(BaseModel):
     """
     +label=Volume Browser
@@ -1265,6 +1098,25 @@ class VolumeMount(BaseModel):
     )
 
 
+class WorkbenchImage(BaseModel):
+    """
+    +usage=Workbench Image with persistent environment (Python 3.11.6)
+    """
+
+    image_uri: str = Field(
+        ...,
+        description="+label=Image URI\n+usage=The image URI. Specify the name of the image and the tag.\nIf the image is in Dockerhub, you can skip registry-url (for e.g. `tensorflow/tensorflow`).\nYou can use an image from a private registry using Advanced fields\n+placeholder=registry-url/account/image:version",
+    )
+    build_script: Optional[constr(min_length=1, max_length=1024)] = Field(
+        None,
+        description="+label=Build Script\n+usage=The build script to run when building the image.\nThis will be executed as the last step in the docker build process as the root user (RUN DEBIAN_FRONTEND=noninteractive bash -ex build_script.sh)\n+placeholder=Enter the build script",
+    )
+    docker_registry: Optional[str] = Field(
+        None,
+        description="+docs=FQN of the container registry. You can the FQN of your desired container registry (or add one)\nin the  Integrations page[Integrations](https://app.truefoundry.tech/integrations?tab=docker-registry) page\n+label=Docker Registry\n+usage=FQN of the container registry. If you can't find your registry here,\nadd it through the [Integrations](/integrations?tab=docker-registry) page",
+    )
+
+
 class ArtifactsDownload(BaseModel):
     """
     +docs=Describes the configuration for the artifacts cache
@@ -1317,6 +1169,10 @@ class BaseWorkbenchInput(BaseModel):
     )
     service_account: Optional[str] = Field(None, description="+sort=10113")
     kustomize: Optional[Kustomize] = None
+    workspace_fqn: Optional[str] = Field(
+        None,
+        description="+label=Workspace FQN\n+docs=Fully qualified name of the workspace\n+uiType=Hidden",
+    )
 
 
 class Build(BaseModel):
@@ -1361,9 +1217,7 @@ class Codeserver(BaseWorkbenchInput):
     """
 
     type: constr(regex=r"^codeserver$") = Field(..., description="+value=Code Server")
-    image: Union[CodeserverImage, CustomCodeserverImage] = Field(
-        ..., description="+usage=Pick a codeserver image to deploy\n+sort=2"
-    )
+    image: WorkbenchImage
     auth: Optional[BasicAuthCreds] = None
 
 
@@ -1458,6 +1312,10 @@ class Helm(BaseModel):
     )
     kustomize: Optional[Kustomize] = None
     ignoreDifferences: Optional[List[Dict[str, Any]]] = None
+    workspace_fqn: Optional[str] = Field(
+        None,
+        description="+label=Workspace FQN\n+docs=Fully qualified name of the workspace\n+uiType=Hidden",
+    )
 
 
 class Job(BaseModel):
@@ -1509,6 +1367,10 @@ class Job(BaseModel):
     )
     labels: Optional[Dict[str, str]] = Field(None, description="+label=Labels")
     kustomize: Optional[Kustomize] = None
+    workspace_fqn: Optional[str] = Field(
+        None,
+        description="+label=Workspace FQN\n+docs=Fully qualified name of the workspace\n+uiType=Hidden",
+    )
 
 
 class KafkaInputConfig(BaseModel):
@@ -1615,16 +1477,7 @@ class Notebook(BaseWorkbenchInput):
     """
 
     type: constr(regex=r"^notebook$") = Field(..., description="+value=notebook")
-    image: Union[
-        TruefoundryImageBase,
-        TruefoundryImageFull,
-        CustomNotebookImage,
-        TruefoundryImageCuda1180,
-        TruefoundryImageCuda1211,
-    ] = Field(
-        ...,
-        description="+usage=Changes made to the root directory `/` will not be persisted across notebook restarts\n+sort=2",
-    )
+    image: WorkbenchImage
     auth: Optional[BasicAuthCreds] = None
     cull_timeout: conint(ge=5) = Field(
         30,
@@ -1660,9 +1513,7 @@ class SSHServer(BaseWorkbenchInput):
     """
 
     type: constr(regex=r"^ssh-server$") = Field(..., description="+value=SSH Server")
-    image: Union[SSHServerImage, CustomSSHServerImage] = Field(
-        ..., description="+usage=Pick a ssh server image to deploy\n+sort=2"
-    )
+    image: WorkbenchImage
     ssh_public_key: str = Field(
         ...,
         description="+label: SSH Public Key\n+usage=Add Your SSH Public Key, this will be used to authenticate you to the SSH Server. You can find it using `cat ~/.ssh/id_rsa.pub`\n+sort=4",
@@ -1680,6 +1531,10 @@ class Volume(BaseModel):
         description="+sort=2\n+label=Volume Config\n+message=Volume Configuration, can be either Dynamically provisioned or statically provisioned.",
     )
     volume_browser: Optional[VolumeBrowser] = None
+    workspace_fqn: Optional[str] = Field(
+        None,
+        description="+label=Workspace FQN\n+docs=Fully qualified name of the workspace\n+uiType=Hidden",
+    )
 
 
 class WorkerConfig(BaseModel):
@@ -1729,6 +1584,10 @@ class BaseService(BaseModel):
     kustomize: Optional[Kustomize] = None
     liveness_probe: Optional[HealthProbe] = None
     readiness_probe: Optional[HealthProbe] = None
+    workspace_fqn: Optional[str] = Field(
+        None,
+        description="+label=Workspace FQN\n+docs=Fully qualified name of the workspace\n+uiType=Hidden",
+    )
 
 
 class FlyteLaunchPlan(BaseModel):
@@ -1756,6 +1615,7 @@ class Service(BaseService):
         1,
         description="+label=Replicas\n+usage=Deploy multiple instances of your pods to distribute incoming traffic across them, ensuring effective load balancing.\n+icon=fa-clone\n+sort=4",
     )
+    auto_shutdown: Optional[Autoshutdown] = None
     allow_interception: bool = Field(
         False,
         description="+label=Allow intercepts\n+usage=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",

truefoundry/deploy/builder/__init__.py

@@ -10,19 +10,17 @@ from truefoundry.deploy.builder.builders import get_builder
 from truefoundry.deploy.builder.builders.tfy_notebook_buildpack.dockerfile_template import (
     NotebookImageBuild,
 )
-from truefoundry.pydantic_v1 import BaseModel
+from truefoundry.pydantic_v1 import BaseModel, Field
 
 
 class _BuildConfig(BaseModel):
-    # I cannot use Field(discriminator="build_config_type") here as
-    # build_config_type in the build configs is not a Literal.
     __root__: Union[
         DockerFileBuild,
         PythonBuild,
         NotebookImageBuild,
         TaskPythonBuild,
         TaskDockerFileBuild,
-    ]
+    ] = Field(discriminator="type")
 
 
 def build(

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

@@ -13,18 +13,19 @@ __all__ = ["generate_dockerfile_content", "build"]
 
 
 def _convert_to_dockerfile_build_config(
-    build_configuration: NotebookImageBuild,
-    dockerfile_path: str,
+    build_configuration: NotebookImageBuild, local_dir: str
 ) -> DockerFileBuild:
     dockerfile_content = generate_dockerfile_content(
-        build_configuration=build_configuration
+        build_configuration=build_configuration,
+        local_dir=local_dir,
     )
+    dockerfile_path = os.path.join(local_dir, "Dockerfile")
     with open(dockerfile_path, "w", encoding="utf8") as fp:
         fp.write(dockerfile_content)
-
     return DockerFileBuild(
         type="dockerfile",
         dockerfile_path=dockerfile_path,
+        build_context_path=local_dir,
     )
 
 
@@ -35,7 +36,8 @@ def build(
 ):
     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,
+            local_dir=local_dir,
         )
         dockerfile.build(
             tag=tag,

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

@@ -1,4 +1,6 @@
-from typing import List, Optional
+import hashlib
+import os
+from typing import Literal, Optional
 
 from mako.template import Template
 
@@ -6,43 +8,56 @@ from truefoundry.pydantic_v1 import BaseModel
 
 
 class NotebookImageBuild(BaseModel):
-    type: str
+    type: Literal["tfy-notebook-buildpack"] = "tfy-notebook-buildpack"
     base_image_uri: str
-    apt_packages: List[str]
+    build_script: Optional[str] = None
 
 
 DOCKERFILE_TEMPLATE = Template(
     """
 FROM ${base_image_uri}
 USER root
-RUN ${apt_install_command}
+
+% if build_script_docker_commands is not None:
+${build_script_docker_commands}
+% endif
+
 USER $NB_UID
 """
 )
 
 
-def generate_apt_install_command(apt_packages: Optional[List[str]]) -> Optional[str]:
-    packages_list = None
-    if apt_packages:
-        packages_list = " ".join(p.strip() for p in apt_packages if p.strip())
-    if not packages_list:
+def generate_build_script_docker_commands(
+    build_script: Optional[str], local_dir: str
+) -> Optional[str]:
+    if not build_script:
         return None
-    apt_update_command = "apt update"
-    apt_install_command = f"DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends {packages_list}"
-    clear_apt_lists_command = "rm -rf /var/lib/apt/lists/*"
-    return " && ".join(
-        [apt_update_command, apt_install_command, clear_apt_lists_command]
-    )
+    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)
+    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
+"""
+    return run_build_script_command
 
 
-def generate_dockerfile_content(build_configuration: NotebookImageBuild) -> str:
-    apt_install_command = generate_apt_install_command(
-        apt_packages=build_configuration.apt_packages
+def generate_dockerfile_content(
+    build_configuration: NotebookImageBuild, local_dir: str
+) -> str:
+    build_script_docker_commands = generate_build_script_docker_commands(
+        build_script=build_configuration.build_script,
+        local_dir=local_dir,
     )
 
     template_args = {
         "base_image_uri": build_configuration.base_image_uri,
-        "apt_install_command": apt_install_command,
+        "build_script_docker_commands": build_script_docker_commands,
     }
 
     template = DOCKERFILE_TEMPLATE

truefoundry/deploy/cli/commands/deploy_command.py

@@ -1,5 +1,6 @@
 import os
 import sys
+from typing import Optional
 
 import rich_click as click
 import yaml
@@ -9,6 +10,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.util import handle_exception_wrapper
 
 
 def _get_default_spec_file():
@@ -41,8 +43,8 @@ def _get_default_spec_file():
     "-w",
     "--workspace-fqn",
     "--workspace_fqn",
-    required=True,
-    help="FQN of the Workspace to deploy to",
+    default=None,
+    help="FQN of the Workspace to deploy to. If not provided, the Workspace FQN will be read from the deployment spec if available.",
 )
 @click.option(
     "--wait/--no-wait",
@@ -52,7 +54,8 @@ def _get_default_spec_file():
     default=True,
     help="Wait and tail the deployment progress",
 )
-def deploy_command(file: str, workspace_fqn: str, wait: bool):
+@handle_exception_wrapper
+def deploy_command(file: str, workspace_fqn: Optional[str], wait: bool):
     from truefoundry.deploy.lib.auth.servicefoundry_session import ServiceFoundrySession
     from truefoundry.deploy.v2.lib.deployable_patched_models import Application
 

truefoundry/deploy/cli/commands/patch_application_command.py

@@ -4,6 +4,7 @@ import rich_click as click
 import yaml
 
 from truefoundry.deploy.cli.const import GROUP_CLS
+from truefoundry.deploy.cli.util import handle_exception_wrapper
 from truefoundry.deploy.lib.dao import application as application_lib
 
 
@@ -44,6 +45,7 @@ from truefoundry.deploy.lib.dao import application as application_lib
     default=True,
     help="Wait and tail the deployment progress",
 )
+@handle_exception_wrapper
 def patch_application_command(
     patch_file: str, application_fqn: str, patch: str, wait: bool
 ):

truefoundry/deploy/v2/lib/deploy.py

@@ -191,10 +191,61 @@ def _warn_when_gpu_selected_without_cuda(component: Component):
         )
 
 
+def _resolve_workspace_fqn(
+    component: Component, workspace_fqn: Optional[str] = None
+) -> str:
+    if not workspace_fqn:
+        if hasattr(component, "workspace_fqn") and component.workspace_fqn:
+            resolved_workspace_fqn = component.workspace_fqn
+        else:
+            raise ValueError(
+                f"""\
+No Workspace FQN was provided or mentioned in the spec.
+Either add a `workspace_fqn` to your yaml spec as
+
+```
+name: {getattr(component, 'name', 'my-app')}
+type: {getattr(component, 'type', 'undefined')}
+...
+workspace_fqn: <your workspace fqn>
+```
+
+or Python deployment spec as
+
+```
+app = {component.__class__.__name__}(
+    name='{getattr(component, 'name', 'my-app')}',
+    ...
+    workspace_fqn='<your workspace fqn>'
+)
+```
+
+or pass it explicitly using `--workspace-fqn` argument on CLI.
+"""
+            )
+    else:
+        if (
+            hasattr(component, "workspace_fqn")
+            and component.workspace_fqn
+            and component.workspace_fqn != workspace_fqn
+        ):
+            logger.warning(
+                f"`workspace_fqn` set in the deployment spec doesn't match the provided `workspace_fqn` argument {component.workspace_fqn!r} \n"
+                f"Using `workspace_fqn`: {workspace_fqn!r} "
+            )
+        resolved_workspace_fqn = workspace_fqn
+
+    return resolved_workspace_fqn
+
+
 def deploy_component(
-    component: Component, workspace_fqn: str, wait: bool = True
+    component: Component, workspace_fqn: Optional[str] = None, wait: bool = True
 ) -> Deployment:
     _warn_when_gpu_selected_without_cuda(component=component)
+    workspace_fqn = _resolve_workspace_fqn(
+        component=component, workspace_fqn=workspace_fqn
+    )
+    component.workspace_fqn = workspace_fqn
     workspace_id = get_workspace_by_fqn(workspace_fqn).id
     updated_component = _handle_if_local_source(
         component=component, workspace_fqn=workspace_fqn

truefoundry/deploy/v2/lib/deploy_workflow.py

@@ -1,10 +1,15 @@
 import os
 import sys
 from pathlib import Path
-from typing import List, Union
+from typing import Dict, List, Optional, Union
 
+import requirements
+from flytekit.configuration import (
+    SERIALIZED_CONTEXT_ENV_VAR,
+    ImageConfig,
+    SerializationSettings,
+)
 from flytekit.configuration import Image as FlytekitImage
-from flytekit.configuration import ImageConfig, SerializationSettings
 from flytekit.models.launch_plan import LaunchPlan as FlyteLaunchPlan
 from flytekit.tools.repo import serialize as serialize_workflow
 from flytekit.tools.translator import TaskSpec as FlyteTaskSpec
@@ -22,6 +27,10 @@ from truefoundry.deploy.v2.lib.source import (
 )
 from truefoundry.logger import logger
 from truefoundry.pydantic_v1 import ValidationError
+from truefoundry.workflow.workflow import (
+    TRUEFOUNDRY_LAUNCH_PLAN_NAME,
+    execution_config_store,
+)
 
 
 def _handle_code_upload_for_workflow(
@@ -36,14 +45,60 @@ def _handle_code_upload_for_workflow(
     return new_workflow
 
 
+def _is_tfy_workflow_package(package: requirements.parser.Requirement) -> bool:
+    return package.name == "truefoundry" and "workflow" in package.extras
+
+
+def _is_tfy_wf_present_in_pip_packages_or_requirements_file(
+    pip_packages: List[str],
+    project_root_path: str,
+    requirements_path: Optional[str] = None,
+) -> bool:
+    for package in pip_packages:
+        parsed_package = requirements.parser.Requirement.parse(package)
+        if _is_tfy_workflow_package(parsed_package):
+            return True
+    if requirements_path:
+        requirements_file_absolute_path = os.path.join(
+            project_root_path, requirements_path
+        )
+        if not os.path.exists(requirements_file_absolute_path):
+            raise FileNotFoundError(
+                f"requirements file not found at {requirements_file_absolute_path}. requirements file path should be relative to project root path."
+            )
+        with open(requirements_file_absolute_path, "r") as file:
+            for package in requirements.parse(file):
+                if _is_tfy_workflow_package(package):
+                    return True
+    return False
+
+
+def _is_tfy_wf_present_in_task_python_build(
+    task_image_spec: Dict, project_root_path: str
+) -> bool:
+    pip_packages = task_image_spec["pip_packages"] or []
+    requirements_path = task_image_spec.get("requirements_path")
+    return _is_tfy_wf_present_in_pip_packages_or_requirements_file(
+        pip_packages=pip_packages,
+        project_root_path=project_root_path,
+        requirements_path=requirements_path,
+    )
+
+
+def _is_dynamic_task(flyte_task: FlyteTaskSpec) -> bool:
+    envs: Dict[str:str] = flyte_task.template.container.env or {}
+    return SERIALIZED_CONTEXT_ENV_VAR in envs.keys()
+
+
 # this function does validation that num_workflows = 1, this also validates task_config is passed correctly.
 # This is verified by pydantic but doing it here also as error messages are not clear in pydantic
-def _validate_workflow_entities(
+def _validate_workflow_entities(  # noqa: C901
     workflow_entities: List[Union[FlyteWorkflowSpec, FlyteLaunchPlan, FlyteTaskSpec]],
+    project_root_path: str,
 ):
-    workflow_objs = []
-    launch_plans = []
-    tasks = []
+    workflow_objs: List[FlyteWorkflowSpec] = []
+    launch_plans: List[FlyteLaunchPlan] = []
+    tasks: List[FlyteTaskSpec] = []
     for entity in workflow_entities:
         if isinstance(entity, FlyteWorkflowSpec):
             workflow_objs.append(entity)
@@ -57,9 +112,9 @@ def _validate_workflow_entities(
         raise ValueError(
             f"Workflow file must have exactly one workflow object. Found {len(workflow_objs)}"
         )
-    if len(launch_plans) != 1:
+    if len(launch_plans) > 2:
         raise ValueError(
-            f"Workflow file must have exactly one launch plan. Found {len(launch_plans)}"
+            f"Workflow file must have exactly one launch plan. Found {len(launch_plans) - 1}"
         )
 
     error_message_to_use_truefoundry_decorators = """Invalid task definition for task: {}, Please use valid truefoundry decorator/class and pass task_config for tasks.
@@ -69,13 +124,25 @@ def _validate_workflow_entities(
         `PythonTaskConfig`, or  `ContainerTaskConfig`. You can import these using:
         `from truefoundry.workflow import PythonTaskConfig, ContainerTaskConfig`
          """
+    tasks_without_truefoundry_worflow_package = []
     for task in tasks:
+        if _is_dynamic_task(task):
+            raise ValueError("Dynamic workflows are not supported yet.")
         if not task.template.custom:
             raise ValueError(
                 error_message_to_use_truefoundry_decorators.format(
                     task.template.id.name
                 )
             )
+        task_image_spec = task.template.custom["truefoundry"]["image"]
+        if task_image_spec["type"] == "task-python-build":
+            is_tfy_wf_present_in_task_python_build = (
+                _is_tfy_wf_present_in_task_python_build(
+                    task_image_spec=task_image_spec, project_root_path=project_root_path
+                )
+            )
+            if not is_tfy_wf_present_in_task_python_build:
+                tasks_without_truefoundry_worflow_package.append(task.template.id.name)
         try:
             auto_gen_models.FlyteTaskCustom.validate(task.template.custom)
         except ValidationError:
@@ -84,6 +151,23 @@ def _validate_workflow_entities(
                     task.template.id.name
                 )
             ) from None
+    if len(tasks_without_truefoundry_worflow_package) > 0:
+        raise ValueError(
+            rf"truefoundry\[workflow] package is required dependency to run workflows, add it in pip_packages for tasks: {', '.join(tasks_without_truefoundry_worflow_package)}"
+        )
+
+    # validate that all inputs have default values for cron workflows
+    for launch_plan in launch_plans:
+        if (
+            execution_config_store.get(launch_plan.spec.workflow_id.name)
+            and launch_plan.id.name == TRUEFOUNDRY_LAUNCH_PLAN_NAME
+        ):
+            workflow_inputs = launch_plan.spec.default_inputs.parameters
+            for input in workflow_inputs:
+                if workflow_inputs[input].required:
+                    raise ValueError(
+                        f"All inputs must have default for a cron workflow. Input {input} is required in workflow but default value is not provided"
+                    )
 
 
 def _get_relative_package_path_from_filepath(
@@ -126,10 +210,27 @@ def _generate_manifest_for_workflow(
     workflow_entities = serialize_workflow(
         pkgs=[package_path], settings=settings, local_source_root=source_absolute_path
     )
-    _validate_workflow_entities(workflow_entities)
+    _validate_workflow_entities(workflow_entities, source_absolute_path)
 
     workflow.flyte_entities = []
     for entity in workflow_entities:
+        if isinstance(entity, FlyteLaunchPlan):
+            workflow_name = entity.spec.workflow_id.name
+
+            # this is the case when someone has a cron schedule. and this line is for handling default launch plan in this case.
+            if (
+                execution_config_store.get(workflow_name)
+                and workflow_name == entity.id.name
+            ):
+                continue
+            # this is the case when someone does not have a cron schedule. and this line is for handling default launch plan in this case.
+            elif entity.id.name == workflow_name:
+                entity._id._name = TRUEFOUNDRY_LAUNCH_PLAN_NAME
+            # this the case when some workflow doesn't have cron schedule, neither it is default launch plan
+            elif entity.id.name != TRUEFOUNDRY_LAUNCH_PLAN_NAME:
+                raise ValueError(
+                    f"Creating launch plans is not allowed. Found launch plan with name {entity.id.name}"
+                )
         message_dict = MessageToDict(entity.to_flyte_idl())
         # proto message to dict conversion converts all int to float. so we need this hack
         if (
@@ -148,10 +249,29 @@ def _generate_manifest_for_workflow(
     auto_gen_models.Workflow.validate({**workflow.dict()})
 
 
+def _validate_workspace_fqn(
+    workflow: auto_gen_models.Workflow,
+    workspace_fqn: Optional[str] = None,
+):
+    if not workspace_fqn:
+        raise ValueError(
+            "No Workspace FQN was provided. "
+            "Pass it explicitly using `--workspace-fqn` argument on CLI or `workspace_fqn` argument of `deploy_workflow`."
+        )
+
+
 def deploy_workflow(
-    workflow: auto_gen_models.Workflow, workspace_fqn: str, wait: bool = True
+    workflow: auto_gen_models.Workflow,
+    workspace_fqn: str,
+    wait: bool = True,
 ) -> Deployment:
     _generate_manifest_for_workflow(workflow)
+    _validate_workspace_fqn(workflow, workspace_fqn)
+
+    # we need to rest the execution config store as it is a global variable and we don't want to keep the cron execution config for next workflow
+    # this is only needed for notebook environment
+    execution_config_store.reset()
+
     workspace_id = get_workspace_by_fqn(workspace_fqn).id
 
     logger.info(

truefoundry/deploy/v2/lib/deployable_patched_models.py

@@ -67,7 +67,9 @@ class Application(models.Application, DeployablePatchedModelBase):
             from truefoundry.deploy.v2.lib.deploy_workflow import deploy_workflow
 
             return deploy_workflow(
-                workflow=self.__root__, workspace_fqn=workspace_fqn, wait=wait
+                workflow=self.__root__,
+                workspace_fqn=workspace_fqn,
+                wait=wait,
             )
         else:
             return deploy_component(

truefoundry/deploy/v2/lib/patched_models.py

@@ -330,18 +330,6 @@ class Endpoint(models.Endpoint, PatchedModelBase):
     pass
 
 
-class TruefoundryImageBase(models.TruefoundryImageBase, PatchedModelBase):
-    type: Literal["truefoundrybase"] = "truefoundrybase"
-
-
-class TruefoundryImageFull(models.TruefoundryImageFull, PatchedModelBase):
-    type: Literal["truefoundryfull"] = "truefoundryfull"
-
-
-class CodeserverImage(models.CodeserverImage, PatchedModelBase):
-    type: Literal["codeserver"] = "codeserver"
-
-
 class HelmRepo(models.HelmRepo, PatchedModelBase):
     type: Literal["helm-repo"] = "helm-repo"
 
@@ -442,10 +430,6 @@ class ArtifactsDownload(models.ArtifactsDownload, PatchedModelBase):
     pass
 
 
-class CustomNotebookImage(models.CustomNotebookImage, PatchedModelBase):
-    type: Literal["customnotebook"] = "customnotebook"
-
-
 class NvidiaGPU(models.NvidiaGPU, PatchedModelBase):
     type: Literal["nvidia_gpu"] = "nvidia_gpu"
     name: Optional[Union[GPUType, constr(regex=r"^tpu-[a-z\d\-]+$")]] = None
@@ -469,26 +453,6 @@ class GcpTPU(models.GcpTPU, PatchedModelBase):
     name: Union[TPUType, Literal[r"tpu-[a-z\d\-]+"]]
 
 
-class CustomCodeserverImage(models.CustomCodeserverImage, PatchedModelBase):
-    type: Literal["customcodeserver"] = "customcodeserver"
-
-
-class CustomSSHServerImage(models.CustomSSHServerImage, PatchedModelBase):
-    type: Literal["custom-ssh-server"] = "custom-ssh-server"
-
-
-class SSHServerImage(models.SSHServerImage, PatchedModelBase):
-    type: Literal["ssh-server"] = "ssh-server"
-
-
-class TruefoundryImageCuda1180(models.TruefoundryImageCuda1180, PatchedModelBase):
-    type: Literal["truefoundrycuda1180"] = "truefoundrycuda1180"
-
-
-class TruefoundryImageCuda1211(models.TruefoundryImageCuda1211, PatchedModelBase):
-    type: Literal["truefoundrycuda1211"] = "truefoundrycuda1211"
-
-
 class DynamicVolumeConfig(models.DynamicVolumeConfig, PatchedModelBase):
     type: Literal["dynamic"] = "dynamic"
 

truefoundry/version.py

@@ -1,4 +1,6 @@
 try:
-    __version__ = "0.6.2"
+    import importlib.metadata
+
+    __version__ = importlib.metadata.version("truefoundry")
 except Exception:
     __version__ = "NA"

truefoundry/workflow/__init__.py

@@ -16,4 +16,4 @@ from truefoundry.workflow.container_task import ContainerTask
 from truefoundry.workflow.map_task import map_task
 from truefoundry.workflow.python_task import PythonFunctionTask
 from truefoundry.workflow.task import task
-from truefoundry.workflow.workflow import workflow
+from truefoundry.workflow.workflow import ExecutionConfig, workflow

truefoundry/workflow/example/hello_world_package/workflow.py

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

truefoundry/workflow/example/package/test_workflow.py

@@ -1,12 +1,13 @@
 import os
 from functools import partial
 from pathlib import Path
-from typing import List, Tuple
+from typing import List, Optional, Tuple
 
 from truefoundry.deploy import Image, NvidiaGPU, Resources
 from truefoundry.workflow import (
     ContainerTask,
     ContainerTaskConfig,
+    ExecutionConfig,
     FlyteDirectory,
     PythonTaskConfig,
     TaskPythonBuild,
@@ -19,15 +20,17 @@ from truefoundry.workflow import (
 cpu_task_config = PythonTaskConfig(
     image=TaskPythonBuild(
         python_version="3.9",
-        pip_packages=["flytekit==1.10.3"],
+        pip_packages=["truefoundry[workflow]==0.3.0rc7"],
     ),
     resources=Resources(cpu_request=0.45),
+    service_account="tfy-flyte-dataplane-devtest-s3",
 )
 
 
 # figure out naming
 @task(task_config=cpu_task_config)
 def should_train_tokenizer(tokenizer: str) -> bool:
+    print("Should train tokenizer")
     return not bool(tokenizer)
 
 
@@ -38,6 +41,7 @@ def should_train_tokenizer(tokenizer: str) -> bool:
     # cache_version="1.0",
 )
 def train_tokenizer() -> str:
+    print("Training tokenizer")
     return "trained_tokenizer"
 
 
@@ -45,7 +49,7 @@ def train_tokenizer() -> str:
     task_config=PythonTaskConfig(
         image=TaskPythonBuild(
             python_version="3.9",
-            pip_packages=["flytekit==1.10.3", "pynvml==11.5.0"],
+            pip_packages=["truefoundry[workflow]==0.3.0rc7", "pynvml==11.5.0"],
             cuda_version="11.5-cudnn8",
         ),
         env={
@@ -53,17 +57,17 @@ 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",
     ),
 )
 def train_model(tokenizer: str) -> Tuple[FlyteDirectory, str]:
+    print("Training model")
     import flytekit
-    from package.test_workflow import random
     from pynvml import nvmlDeviceGetCount, nvmlInit
 
     nvmlInit()
     assert nvmlDeviceGetCount() > 0
 
-    random.random()
     working_dir = flytekit.current_context().working_directory
     local_dir = Path(os.path.join(working_dir, "csv_files"))
     local_dir.mkdir(exist_ok=True)
@@ -76,6 +80,7 @@ def train_model(tokenizer: str) -> Tuple[FlyteDirectory, str]:
 
 @task(task_config=cpu_task_config)
 def get_validation_data() -> List[str]:
+    print("Getting validation data")
     return ["foo", "bar", "baz"]
 
 
@@ -89,6 +94,7 @@ def validate_model(model: FlyteDirectory, tokenizer: str, validation_data: str)
 
 @task(task_config=cpu_task_config)
 def all_good(validations: List[bool]) -> bool:
+    print("Validations", validations)
     return all(validations)
 
 
@@ -97,18 +103,33 @@ echo = ContainerTask(
     task_config=ContainerTaskConfig(
         image=Image(
             image_uri="bash:4.1",
-        )
+            command=["echo", "hello"],
+        ),
+        service_account="tfy-flyte-dataplane-devtest-s3",
     ),
 )
 
 
 @task(task_config=cpu_task_config)
 def random(tokenizer: str) -> Tuple[FlyteDirectory, str]:
+    print(tokenizer)
     return FlyteDirectory(path=""), "random"
 
 
-@workflow
-def train(tokenizer: str = "") -> bool:
+@workflow(
+    execution_configs=[
+        ExecutionConfig(
+            schedule="*/10 * * * *",
+        )
+    ]
+)
+def train(
+    tokenizer: str = "",
+    test_v2: str = "",
+    optional_var: Optional[str] = "",
+    default_v: Optional[str] = "hello1",
+    default_v2: str = "hello2",
+) -> bool:
     stt = should_train_tokenizer(tokenizer=tokenizer)
     model, t = (
         conditional("train_tokenizer")

truefoundry/workflow/example/truefoundry.yaml

@@ -1,5 +1,5 @@
 type: workflow
-name: my-test-workflow5
+name: my-test-workflow9
 source:
   type: local
   local_build: false

truefoundry/workflow/workflow.py

@@ -1,6 +1,8 @@
-from typing import Any, Callable, Optional, Union
+from typing import Any, Callable, Dict, List, Optional, Union
 
 from flytekit.core.base_task import Task
+from flytekit.core.launch_plan import LaunchPlan
+from flytekit.core.schedule import CronSchedule
 from flytekit.core.workflow import (
     FuncOut,
     PythonFunctionWorkflow,
@@ -8,11 +10,39 @@ from flytekit.core.workflow import (
 )
 from flytekit.core.workflow import workflow as flytekit_workflow
 
+from truefoundry.pydantic_v1 import BaseModel
+
+TRUEFOUNDRY_LAUNCH_PLAN_NAME = "default"
+
+
+class ExecutionConfig(BaseModel):
+    # I am not using job's Schedule here because:
+    # 1. flyte accepts schedule only as a string
+    # 2. flyte doesn't support setting concurrency policy
+    schedule: str
+
+
+class ExecutionConfigStore(BaseModel):
+    execution_config_map: Dict[str, ExecutionConfig] = {}
+
+    def reset(self):
+        self.execution_config_map = {}
+
+    def get(self, key: str) -> Optional[ExecutionConfig]:
+        return self.execution_config_map.get(key)
+
+    def set(self, key: str, value: ExecutionConfig):
+        self.execution_config_map[key] = value
+
+
+execution_config_store = ExecutionConfigStore()
+
 
 def workflow(
     _workflow_function: Optional[Callable[..., Any]] = None,
     failure_policy: Optional[WorkflowFailurePolicy] = None,
     on_failure: Optional[Task] = None,
+    execution_configs: Optional[List[ExecutionConfig]] = None,
 ) -> Union[
     Callable[[Callable[..., FuncOut]], PythonFunctionWorkflow],
     PythonFunctionWorkflow,
@@ -47,8 +77,38 @@ def workflow(
     :param on_failure: Invoke this workflow or task on failure. The Workflow / task has to match the signature of
          the current workflow, with an additional parameter called `error` Error
     """
-    return flytekit_workflow(
+    if _workflow_function is None:
+
+        def wrapper(func: Callable[..., Any]) -> Any:
+            return workflow(
+                _workflow_function=func,
+                failure_policy=failure_policy,
+                on_failure=on_failure,
+                execution_configs=execution_configs,
+            )
+
+        return wrapper
+
+    workflow_object = flytekit_workflow(
         _workflow_function,
         failure_policy=failure_policy,
         on_failure=on_failure,
     )
+    execution_configs = execution_configs or []
+    if len(execution_configs) > 1:
+        raise ValueError("Only one cron execution config is allowed per workflow")
+
+    if execution_configs:
+        execution_config = execution_configs[0]
+        # flyte maintains this in-memory and uses it while serialization
+        LaunchPlan.get_or_create(
+            workflow=workflow_object,
+            name=TRUEFOUNDRY_LAUNCH_PLAN_NAME,
+            schedule=CronSchedule(schedule=execution_config.schedule),
+        )
+        function_module = _workflow_function.__module__
+        function_name = _workflow_function.__name__
+        function_path = f"{function_module}.{function_name}"
+        execution_config_store.set(function_path, execution_config)
+
+    return workflow_object

{truefoundry-0.3.0rc7.dist-info → truefoundry-0.3.0rc9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: truefoundry
-Version: 0.3.0rc7
+Version: 0.3.0rc9
 Summary: Truefoundry CLI
 Author: Abhishek Choudhary
 Author-email: abhishek@truefoundry.com
@@ -34,6 +34,7 @@ Requires-Dist: python-dotenv (>=1.0.1,<1.1.0)
 Requires-Dist: python-socketio[client] (>=5.5.2,<6.0.0)
 Requires-Dist: questionary (>=1.10.0,<2.0.0)
 Requires-Dist: requests (>=2.31.0,<3.0.0)
+Requires-Dist: requirements-parser (>=0.10.2,<0.11.0)
 Requires-Dist: rich (>=13.7.1,<14.0.0)
 Requires-Dist: rich-click (>=1.2.1,<2.0.0)
 Requires-Dist: tqdm (>=4.0.0,<5.0.0)

{truefoundry-0.3.0rc7.dist-info → truefoundry-0.3.0rc9.dist-info}/RECORD

@@ -25,13 +25,13 @@ truefoundry/autodeploy/utils/diff.py,sha256=Ef8Y-VffDKel_-q-GxRam6gqiv8qTLMcqVg6
 truefoundry/autodeploy/utils/pydantic_compat.py,sha256=hEAUy5kLjhPdzw7yGZ2iXGMXbbMVXVlGzIofmyHafXQ,412
 truefoundry/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 truefoundry/cli/__main__.py,sha256=Jap_IddZ9zNyMIyIkCw75xHQCN0WtV2dPZJ_pzdLsVc,916
-truefoundry/deploy/__init__.py,sha256=0iIsvCvEwDlnzuPIFIFesCD4tmOEn8vUmnn6R2ck2ns,2470
-truefoundry/deploy/auto_gen/models.py,sha256=mYaO9_vknbPJtq9_kyp1IOhX3ppi6jCRpx3-wCz8dU4,86586
-truefoundry/deploy/builder/__init__.py,sha256=GSDz4smq-t750FpHaKGiauGoZilYmdZmaITXVWvGD6I,5032
+truefoundry/deploy/__init__.py,sha256=hyBoxhL3SG37vduJBdUYJuy1EHGeSLPI4S8MuKhyCFo,2259
+truefoundry/deploy/auto_gen/models.py,sha256=inof7aH6Wk1z15YYtCNJo7sp3Tixv5yaJzB_4fiZux4,78412
+truefoundry/deploy/builder/__init__.py,sha256=a1qR6nicHGcxRaeNTxWRsmDs8zsmXc7j13-I8q0qqVk,4938
 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=eKbwgGV8ONe22iKW_0f3X0uQlw1t6z7kdKV4MPVkLfA,1341
-truefoundry/deploy/builder/builders/tfy_notebook_buildpack/dockerfile_template.py,sha256=V63vlJbrfErgGXNWxpwYir8S4GAmcNXvFoqPDaKXdNQ,1387
+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/docker_service.py,sha256=vQS15790njzlFJZ3JW6txYLBdT11ltxqqpf78ZFL_Ng,5208
@@ -43,13 +43,13 @@ truefoundry/deploy/cli/commands/build_command.py,sha256=QwKkZ3nVecPMzs-R57YP-_ih
 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=qag9B-7r6KlVkAn4GtODjzUi_degXcXcF-GdNctMMPk,2642
+truefoundry/deploy/cli/commands/deploy_command.py,sha256=SpCd_1OxA8ZEUyJ6Jkf5Ay8UNakCCLGR--svMHp9EEM,2858
 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=Kin6ZdmeADvXOGA08M5_t1MwMnu3QEUfjz1seJurstw,1032
 truefoundry/deploy/cli/commands/logout_command.py,sha256=hgw6LhJtF3xJ6YyQ_VrBuUWY0WmT8tPYbOEOhMu1eXU,550
 truefoundry/deploy/cli/commands/logs_command.py,sha256=fQSY4o_B78WEJDD5qULWPFQJsCXLJLTr0RI1QjmX1WE,4154
-truefoundry/deploy/cli/commands/patch_application_command.py,sha256=ymAns8QDuAY08kYxkX93DlcDSLApF126KXiXrWJtSqY,2366
+truefoundry/deploy/cli/commands/patch_application_command.py,sha256=Zuswj36o-qniklOsOjEPUKnd9f5mHv_U7rOPPwALrZ8,2457
 truefoundry/deploy/cli/commands/patch_command.py,sha256=OQCmxcn1Qd2iZfBUaqs48oUKjHVZ13SoMsWLhksPvks,1682
 truefoundry/deploy/cli/commands/redeploy_command.py,sha256=-wMQLeMcBdJsQBMgTv7rS6hCqH1EJsSKgPrAXU9HjxU,1032
 truefoundry/deploy/cli/commands/terminate_comand.py,sha256=RTNuykw5DBvid44u2nCka_Eu0XSK3Qrzwob9fybHLgQ,1097
@@ -102,11 +102,11 @@ truefoundry/deploy/lib/util.py,sha256=3Pc0gQgomapTSjMQo743STShBn1B6PNdBpw3bTpdxO
 truefoundry/deploy/lib/win32.py,sha256=1RcvPTdlOAJ48rt8rCbE2Ufha2ztRqBAE9dueNXArrY,5009
 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=mR8wJ86jJFbko87TZYhIsEylQK5cj2X6BNq_uf-Img4,10123
-truefoundry/deploy/v2/lib/deploy_workflow.py,sha256=0URc5UJ6x9F1Kxt8fLetugm76s77NpZpuyK1NIzFv-o,6879
-truefoundry/deploy/v2/lib/deployable_patched_models.py,sha256=dp1Av532iBat6fHetwgN4G2ijii3thyUP2fyyOmQMIM,3108
+truefoundry/deploy/v2/lib/deploy.py,sha256=vmaevT86nfrgephRjinhSVFEZHVc9R09vZBKKUoeUWI,11640
+truefoundry/deploy/v2/lib/deploy_workflow.py,sha256=o_8gd98SFgijvrYDubm6cJ7XNqlXRPwswq8nRXfqvDM,12171
+truefoundry/deploy/v2/lib/deployable_patched_models.py,sha256=YVeTiasyf0s-QXjDqdvGSmN83oVAQ0h9g6F687PJyVI,3141
 truefoundry/deploy/v2/lib/models.py,sha256=pSolLMTArDuYpeNsmeeS5DWliloN_iCDfZSpRllMHUg,1120
-truefoundry/deploy/v2/lib/patched_models.py,sha256=4gQg1mvRZCVqN00tiLbGHoq_GdZKTgzxzXXgZCvFQfk,15020
+truefoundry/deploy/v2/lib/patched_models.py,sha256=qL3N7y6zf7jywx6uY-yMxsH65NB367V_82o47ZYJt1I,13820
 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
@@ -118,19 +118,19 @@ truefoundry/logger.py,sha256=7dLqW_Q2rEgo-_z1WZnQbGHaoy1L1MP3NqGgssaSS6o,685
 truefoundry/ml/__init__.py,sha256=yFjvF-e1RW488vLHgn5M7TXoajqww6grkKHb3mhqDEw,179
 truefoundry/pydantic_v1.py,sha256=IJy5FtaPg-_H5XLRd9nueTuyijEJPdCa1vZ7-pinmRI,158
 truefoundry/python_deploy_codegen.py,sha256=hd8XRytuT-U6AXSzYSjISbtYY4HLB_B1EeLB5TRDfNw,3947
-truefoundry/version.py,sha256=mefOHzC5MR9WiuhSLX7Jrw94GOeB6PVRhqbyWKM1HSA,72
-truefoundry/workflow/__init__.py,sha256=Dna_uQA93GM5BvhY6Y7KLmqWvoXqU1LwefyrqRSDES8,642
+truefoundry/version.py,sha256=bqiT4Q-VWrTC6P4qfK43mez-Ppf-smWfrl6DcwV7mrw,137
+truefoundry/workflow/__init__.py,sha256=m0puY8RJ3GBvdAXW0A9PLuCpmDdLqh6eF0t3DCEpZkg,659
 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=yksM7Nl8OOVb8qNL2gY7j-a8_F519hRw31trenTjhfE,385
-truefoundry/workflow/example/package/test_workflow.py,sha256=HG9F3bTZSLfTn-U5zOqIVFnmTEzlACxuWy4RbN9sV1o,3371
-truefoundry/workflow/example/truefoundry.yaml,sha256=OVmlc71vSIraDY9VuD3yJzu-WpKGWejv_JBoUAr-ONI,226
+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/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=w0bcWjBByThN_Yi7SaB_T1bilwbQizk-sr492Nfdwcs,2555
-truefoundry-0.3.0rc7.dist-info/METADATA,sha256=y2DyuWzhCWG76MKNMM0yJ1rgdjeOj08LIoInA8WdhCo,2639
-truefoundry-0.3.0rc7.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-truefoundry-0.3.0rc7.dist-info/entry_points.txt,sha256=TXvUxQkI6zmqJuycPsyxEIMr3oqfDjgrWj0m_9X12x4,95
-truefoundry-0.3.0rc7.dist-info/RECORD,,
+truefoundry/workflow/workflow.py,sha256=WaTqUjhwfAXDWu4E5ehuwAxrCbDJkoAf1oWmR2E9Qy0,4575
+truefoundry-0.3.0rc9.dist-info/METADATA,sha256=MoFxdl5KpAr9mCShojPeE2O2dXsgyB82DSjYKPIR9b0,2693
+truefoundry-0.3.0rc9.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+truefoundry-0.3.0rc9.dist-info/entry_points.txt,sha256=TXvUxQkI6zmqJuycPsyxEIMr3oqfDjgrWj0m_9X12x4,95
+truefoundry-0.3.0rc9.dist-info/RECORD,,