truefoundry 0.3.0rc1__tar.gz → 0.3.0rc2__tar.gz

{truefoundry-0.3.0rc1 → truefoundry-0.3.0rc2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: truefoundry
-Version: 0.3.0rc1
+Version: 0.3.0rc2
 Summary: Truefoundry CLI
 Author: Abhishek Choudhary
 Author-email: abhishek@truefoundry.com
@@ -10,15 +10,17 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Provides-Extra: flyte
 Provides-Extra: ml
 Requires-Dist: GitPython (>=3.1.43,<3.2.0)
 Requires-Dist: Mako (>=1.1.6,<2.0.0)
 Requires-Dist: PyJWT (>=2.0.0,<3.0.0)
 Requires-Dist: PyYAML (>=6.0.0,<7.0.0)
 Requires-Dist: click (>=7.0.0,<9.0.0)
-Requires-Dist: docker (>=7.0.0,<8.0.0)
+Requires-Dist: docker (>=6.1.2,<8.0.0)
 Requires-Dist: fastapi (>=0.56.0,<0.200.0)
 Requires-Dist: filelock (>=3.8.0,<4.0.0)
+Requires-Dist: flytekit (==1.12.2) ; extra == "flyte"
 Requires-Dist: gitignorefile (>=1.1.2,<1.2.0)
 Requires-Dist: importlib-metadata (>=6.0.1,<8.0.0)
 Requires-Dist: importlib-resources (>=5.2.0,<6.0.0)

{truefoundry-0.3.0rc1 → truefoundry-0.3.0rc2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "truefoundry"
-version = "0.3.0rc1"
+version = "0.3.0rc2"
 description = "Truefoundry CLI"
 authors = ["Abhishek Choudhary <abhishek@truefoundry.com>"]
 readme = "README.md"
@@ -8,7 +8,8 @@ readme = "README.md"
 [tool.poetry.dependencies]
 python = ">=3.8.1,<3.13"
 click = ">=7.0.0,<9.0.0"
-docker = ">=7.0.0,<8.0.0"
+flytekit = {version = "1.12.2", optional = true}
+docker = ">=6.1.2,<8.0.0"
 fastapi = ">=0.56.0,<0.200.0"
 filelock = "^3.8.0"
 gitignorefile = ">=1.1.2,<1.2.0"
@@ -38,6 +39,7 @@ yq = "^3.1.0"
 
 [tool.poetry.extras]
 ml = ["mlfoundry"]
+flyte = ["flytekit"]
 
 [tool.poetry.group.dev.dependencies]
 ruff = ">=0.4.10"

{truefoundry-0.3.0rc1 → truefoundry-0.3.0rc2}/truefoundry/deploy/__init__.py

@@ -38,6 +38,7 @@ from truefoundry.deploy.v2.lib.deployable_patched_models import (
     Service,
     SSHServer,
     Volume,
+    Workflow,
 )
 from truefoundry.deploy.v2.lib.patched_models import (
     AMQPInputConfig,

{truefoundry-0.3.0rc1 → truefoundry-0.3.0rc2}/truefoundry/deploy/auto_gen/models.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  application.json
-#   timestamp: 2024-07-09T08:17:00+00:00
+#   timestamp: 2024-07-05T13:46:01+00:00
 
 from __future__ import annotations
 
@@ -795,7 +795,7 @@ class PythonBuild(BaseModel):
     )
     command: Union[str, List[str]] = Field(
         ...,
-        description="Command will be set as the Entrypoint of the generated\nimage.\n+label=Command\n+usage=Command to run when the container starts.\nCommand will be set as the Entrypoint of the generated image.\nWhen deploying a Job, the command can be templatized by defining `params` and referencing them in command\nE.g. `python main.py --learning_rate {{learning_rate}}`",
+        description="Command will be set as the Entrypoint of the generatede\nimage.\n+label=Command\n+usage=Command to run when the container starts.\nCommand will be set as the Entrypoint of the generated image.\nWhen deploying a Job, the command can be templatized by defining `params` and referencing them in command\nE.g. `python main.py --learning_rate {{learning_rate}}`",
     )
     cuda_version: Optional[
         constr(
@@ -1050,6 +1050,59 @@ class StringDataMount(BaseModel):
     data: str = Field(..., description="+label=Data\n+usage=The file content.")
 
 
+class TaskDockerFileBuild(BaseModel):
+    """
+    +docs=Describes the configuration for the docker build for a task
+    +label=Docker File
+    +icon=fa-brands fa-docker:#0db7ed
+    """
+
+    type: Literal["task-dockerfile-build"] = Field(..., description="+value=dockerfile")
+    dockerfile_path: str = Field(
+        "./Dockerfile",
+        description="+label=Path to Dockerfile\n+usage=The file path of the Dockerfile relative to project root path.",
+    )
+    build_args: Optional[Dict[str, str]] = Field(
+        None, description="+label=Build arguments to pass to docker build"
+    )
+
+
+class TaskPythonBuild(BaseModel):
+    """
+    +docs=Describes the configuration for the python build for a task
+    +label=Python Buid Spec
+    +icon=fa-brands fa-python:#306998
+    """
+
+    type: Literal["task-python-build"] = Field(
+        ..., description="+value=task-python-build"
+    )
+    python_version: constr(regex=r"^\d+(\.\d+){1,2}([\-\.a-z0-9]+)?$") = Field(
+        "3.9",
+        description="+label=Python version\n+usage=Python version to run your application. Should be one of the tags listed on [Official Python Docker Page](https://hub.docker.com/_/python)\n+message=Please enter a valid Python version tag",
+    )
+    requirements_path: Optional[str] = Field(
+        None,
+        description="`Path to build context`\n+label=Path to requirements\n+usage=Path to `requirements.txt` relative to\n`Path to build context`",
+    )
+    pip_packages: Optional[List[str]] = Field(
+        None,
+        description='+label=Pip packages to install\n+usage=Define pip package requirements.\nIn Python/YAML E.g. ["fastapi>=0.90,<1.0", "uvicorn"]\n+placeholder=Enter a pip package name E.g. fastapi>=0.90,<1.0',
+    )
+    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',
+    )
+    cuda_version: Optional[
+        constr(
+            regex=r"^((\d+\.\d+(\.\d+)?-cudnn\d+-(runtime|devel)-ubuntu\d+\.\d+)|11\.0-cudnn8|11\.1-cudnn8|11\.2-cudnn8|11\.3-cudnn8|11\.4-cudnn8|11\.5-cudnn8|11\.6-cudnn8|11\.7-cudnn8|11\.8-cudnn8|12\.0-cudnn8|12\.1-cudnn8|12\.2-cudnn8)$"
+        )
+    ] = Field(
+        None,
+        description="+label=CUDA Version\n+usage=Version of CUDA Toolkit and CUDNN to install in the image\nThese combinations are based off of publically available docker images on docker hub\nYou can also specify a valid tag of the form {cuda_version_number}-cudnn{cudnn_version_number}-{runtime|devel}-ubuntu{ubuntu_version}\nRefer https://hub.docker.com/r/nvidia/cuda/tags for valid set of values\nNote: We use deadsnakes ubuntu ppa to add Python that currently supports only Ubuntu 18.04, 20.04 and 22.04",
+    )
+
+
 class TruefoundryArtifactSource(BaseModel):
     """
     +docs=Input for Artifact from Truefoundry Artifact Registry
@@ -1185,6 +1238,34 @@ class VolumeMount(BaseModel):
     )
 
 
+class Workflow(BaseModel):
+    """
+    +docs=Describes the configuration for the worflow
+    """
+
+    type: constr(regex=r"^workflow$") = Field(..., description="+value=workflow")
+    name: constr(regex=r"^[a-z][a-z0-9\-]{1,30}[a-z0-9]$") = Field(
+        ...,
+        description="+usage=Name of the workflow\n+sort=1\n+message=3 to 32 lower case characters long alphanumeric word, may contain - in between, cannot start with a number",
+    )
+    source: Union[LocalSource, RemoteSource] = Field(
+        ...,
+        description="+docs=Source Code for the workflow, either local or remote\n+label=Source Code for your workflow\n+icon=fa-solid fa-cloud-arrow-up:#21B6A8\n+sort=200",
+    )
+    env: Optional[Dict[str, str]] = Field(
+        None,
+        description="+label=Environment Variables\n+usage=Configure environment variables to be injected in the service either as plain text or secrets. [Docs](https://docs.truefoundry.com/docs/env-variables)\n+icon=fa-globe\n+sort=500",
+    )
+    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",
+    )
+    flyte_entities: List[Dict[str, Any]] = Field(
+        ...,
+        description="+docs=These\n+label=Flyte Entities\nActually ContainerTaskConfig and PythonTaskConfig are not flyte entities, this is just for code generation",
+    )
+
+
 class ArtifactsDownload(BaseModel):
     """
     +docs=Describes the configuration for the artifacts cache
@@ -1287,6 +1368,21 @@ class Codeserver(BaseWorkbenchInput):
     auth: Optional[BasicAuthCreds] = None
 
 
+class ContainerTaskConfig(BaseModel):
+    type: constr(regex=r"^container-task-config$") = Field(
+        ..., description="+value=container-task-config"
+    )
+    image: Union[Build, Image] = Field(
+        ...,
+        description="+docs=Specify whether you want to deploy a Docker image or build and deploy from source code\n+label=Deploy a Docker image or build and deploy from source code\n+icon=fa-solid fa-cloud-arrow-up:#21B6A8\n+sort=200",
+    )
+    env: Optional[Dict[str, str]] = Field(
+        None,
+        description="+label=Environment Variables\n+usage=Configure environment variables to be injected in the task either as plain text or secrets. [Docs](https://docs.truefoundry.com/docs/env-variables)\n+icon=fa-globe\n+sort=200",
+    )
+    resources: Optional[Resources] = None
+
+
 class CoreNATSOutputConfig(BaseModel):
     """
     +docs=Describes the configuration for the output Core NATS worker
@@ -1523,6 +1619,25 @@ class Notebook(BaseWorkbenchInput):
     )
 
 
+class PythonTaskConfig(BaseModel):
+    """
+    +docs=Describes the configuration for the python function task
+    """
+
+    type: constr(regex=r"^python-task-config$") = Field(
+        ..., description="+value=python-task-config"
+    )
+    image: Union[TaskPythonBuild, TaskDockerFileBuild] = Field(
+        ...,
+        description="+label=Image Spec\n+docs=Specification for the image to be used for the task\n+sort=100\n+usage=Specify the image spec for the task",
+    )
+    env: Optional[Dict[str, str]] = Field(
+        None,
+        description="+label=Environment Variables\n+usage=Configure environment variables to be injected in the task either as plain text or secrets. [Docs](https://docs.truefoundry.com/docs/env-variables)\n+icon=fa-globe\n+sort=200",
+    )
+    resources: Optional[Resources] = None
+
+
 class SSHServer(BaseWorkbenchInput):
     """
     +docs=Describes the configuration for the ssh server
@@ -1672,4 +1787,5 @@ class Application(BaseModel):
         Helm,
         Volume,
         ApplicationSet,
+        Workflow,
     ]

{truefoundry-0.3.0rc1 → truefoundry-0.3.0rc2}/truefoundry/deploy/builder/__init__.py

@@ -1,6 +1,11 @@
 from typing import Dict, List, Optional, Union
 
-from truefoundry.deploy.auto_gen.models import DockerFileBuild, PythonBuild
+from truefoundry.deploy.auto_gen.models import (
+    DockerFileBuild,
+    PythonBuild,
+    TaskDockerFileBuild,
+    TaskPythonBuild,
+)
 from truefoundry.deploy.builder.builders import get_builder
 from truefoundry.deploy.builder.builders.tfy_notebook_buildpack.dockerfile_template import (
     NotebookImageBuild,
@@ -11,7 +16,13 @@ from truefoundry.pydantic_v1 import BaseModel
 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]
+    __root__: Union[
+        DockerFileBuild,
+        PythonBuild,
+        NotebookImageBuild,
+        TaskPythonBuild,
+        TaskDockerFileBuild,
+    ]
 
 
 def build(
@@ -20,6 +31,17 @@ def build(
     extra_opts: Optional[List[str]] = None,
 ):
     build_configuration = _BuildConfig.parse_obj(build_configuration).__root__
+    if isinstance(build_configuration, TaskPythonBuild):
+        build_configuration_dict = build_configuration.dict()
+        build_configuration_dict.update(
+            {"type": "tfy-python-buildpack", "command": "python"}
+        )
+        build_configuration = PythonBuild.parse_obj(build_configuration_dict)
+    if isinstance(build_configuration, TaskDockerFileBuild):
+        build_configuration_dict = build_configuration.dict()
+        build_configuration_dict.update({"type": "dockerfile"})
+        build_configuration = DockerFileBuild.parse_obj(build_configuration_dict)
+
     builder = get_builder(build_configuration.type)
     return builder(
         build_configuration=build_configuration,

{truefoundry-0.3.0rc1 → truefoundry-0.3.0rc2}/truefoundry/deploy/v2/lib/deployable_patched_models.py

@@ -66,3 +66,7 @@ class Application(models.Application, DeployablePatchedModelBase):
         return deploy_component(
             component=self.__root__, workspace_fqn=workspace_fqn, wait=wait
         )
+
+
+class Workflow(models.Workflow, DeployablePatchedModelBase):
+    type: Literal["workflow"] = "workflow"

{truefoundry-0.3.0rc1 → truefoundry-0.3.0rc2}/truefoundry/deploy/v2/lib/patched_models.py

@@ -495,3 +495,21 @@ class DynamicVolumeConfig(models.DynamicVolumeConfig, PatchedModelBase):
 
 class StaticVolumeConfig(models.StaticVolumeConfig, PatchedModelBase):
     type: Literal["static"] = "static"
+
+
+class PythonTaskConfig(models.PythonTaskConfig, PatchedModelBase):
+    type: Literal["python-task-config"] = "python-task-config"
+    resources: Optional[Resources] = Resources()
+
+
+class ContainerTaskConfig(models.ContainerTaskConfig, PatchedModelBase):
+    type: Literal["container-task-config"] = "container-task-config"
+    resources: Optional[Resources] = Resources()
+
+
+class TaskDockerFileBuild(models.TaskDockerFileBuild, PatchedModelBase):
+    type: Literal["task-dockerfile-build"] = "task-dockerfile-build"
+
+
+class TaskPythonBuild(models.TaskPythonBuild, PatchedModelBase):
+    type: Literal["task-python-build"] = "task-python-build"

truefoundry-0.3.0rc2/truefoundry/flyte/__init__.py

@@ -0,0 +1,6 @@
+from truefoundry.deploy.v2.lib.patched_models import (
+    ContainerTaskConfig,
+    PythonTaskConfig,
+    TaskDockerFileBuild,
+    TaskPythonBuild,
+)