truefoundry 0.5.0rc1__tar.gz → 0.5.0rc3__tar.gz

{truefoundry-0.5.0rc1 → truefoundry-0.5.0rc3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: truefoundry
-Version: 0.5.0rc1
+Version: 0.5.0rc3
 Summary: Truefoundry CLI
 Author: Abhishek Choudhary
 Author-email: abhishek@truefoundry.com

{truefoundry-0.5.0rc1 → truefoundry-0.5.0rc3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "truefoundry"
-version = "0.5.0rc1"
+version = "0.5.0rc3"
 description = "Truefoundry CLI"
 authors = ["Abhishek Choudhary <abhishek@truefoundry.com>"]
 readme = "README.md"

{truefoundry-0.5.0rc1 → truefoundry-0.5.0rc3}/truefoundry/deploy/auto_gen/models.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  application.json
-#   timestamp: 2024-10-16T17:06:03+00:00
+#   timestamp: 2024-11-04T08:35:21+00:00
 
 from __future__ import annotations
 
@@ -315,7 +315,7 @@ class GitHelmRepo(BaseModel):
         regex=r"^(((https?|wss):\/\/)?(?:www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}(?:[-a-zA-Z0-9()@:%_\+.~#?&\/=]*))$"
     ) = Field(
         ...,
-        description="+label=Git repository URL\n+sort=1\n+message=Needs to be a valid URL.\nTODO: Check this regex and add guidelines",
+        description="TODO: Check this regex and add guidelines\n+label=Git repository URL\n+sort=1\n+message=Needs to be a valid URL.",
     )
     revision: str = Field(
         ...,
@@ -1151,7 +1151,7 @@ class VolumeMount(BaseModel):
         ...,
         description="+label=Volume mount path\n+usage=Absolute file path where the volume will be mounted.\n+message=Please enter a valid mount path",
     )
-    sub_path: Optional[str] = Field(
+    sub_path: Optional[constr(regex=r"^(?:[^/\n]+/*)*[^/\n]+(\.[^/\n]+)?$")] = Field(
         None,
         description="+label=Sub Path\n+usage=Sub path within the volume to mount. Defaults to root of the volume.",
     )
@@ -1285,7 +1285,7 @@ class Codeserver(BaseWorkbenchInput):
 
 
 class ContainerTaskConfig(BaseModel):
-    type: constr(regex=r"^container-task-config$") = Field(
+    type: Literal["container-task-config"] = Field(
         ..., description="+value=container-task-config"
     )
     image: Union[Build, Image] = Field(
@@ -1301,7 +1301,9 @@ class ContainerTaskConfig(BaseModel):
         None,
         description="+usage=Configure data to be mounted to Workflow pod(s) as a volume.\n+sort=400",
     )
-    service_account: str = Field(..., description="+label=Service Account\n+sort=500")
+    service_account: Optional[str] = Field(
+        None, description="+label=Service Account\n+sort=500"
+    )
 
 
 class CoreNATSOutputConfig(BaseModel):
@@ -1559,7 +1561,7 @@ class PythonTaskConfig(BaseModel):
     +docs=Describes the configuration for the python function task
     """
 
-    type: constr(regex=r"^python-task-config$") = Field(
+    type: Literal["python-task-config"] = Field(
         ..., description="+value=python-task-config"
     )
     image: Union[TaskPythonBuild, TaskDockerFileBuild] = Field(
@@ -1575,7 +1577,9 @@ class PythonTaskConfig(BaseModel):
         None,
         description="+usage=Configure data to be mounted to Workflow pod(s) as a volume.\n+sort=400",
     )
-    service_account: str = Field(..., description="+label=Service Account\n+sort=500")
+    service_account: Optional[str] = Field(
+        None, description="+label=Service Account\n+sort=500"
+    )
 
 
 class SSHServer(BaseWorkbenchInput):
@@ -1722,7 +1726,7 @@ class Workflow(BaseModel):
     +docs=Describes the configuration for the worflow
     """
 
-    type: constr(regex=r"^workflow$") = Field(..., description="+value=workflow")
+    type: Literal["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",

{truefoundry-0.5.0rc1 → truefoundry-0.5.0rc3}/truefoundry/deploy/builder/builders/tfy_python_buildpack/dockerfile_template.py

@@ -31,7 +31,7 @@ WORKDIR /app
 
 DOCKERFILE_TEMPLATE = Template(
     """
-FROM --platform=linux/amd64 ${python_image_repo}:${python_version}
+FROM ${python_image_repo}:${python_version}
 ENV PATH=/virtualenvs/venv/bin:$PATH
 RUN apt update && \
     DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends git && \
@@ -43,7 +43,7 @@ RUN apt update && \
 
 CUDA_DOCKERFILE_TEMPLATE = Template(
     """
-FROM --platform=linux/amd64 nvidia/cuda:${nvidia_cuda_image_tag}
+FROM nvidia/cuda:${nvidia_cuda_image_tag}
 ENV PATH=/virtualenvs/venv/bin:$PATH
 RUN echo "deb https://ppa.launchpadcontent.net/deadsnakes/ppa/ubuntu $(cat /etc/os-release | grep UBUNTU_CODENAME | cut -d = -f 2) main" >> /etc/apt/sources.list && \
     echo "deb-src https://ppa.launchpadcontent.net/deadsnakes/ppa/ubuntu $(cat /etc/os-release | grep UBUNTU_CODENAME | cut -d = -f 2) main" >> /etc/apt/sources.list && \

{truefoundry-0.5.0rc1 → truefoundry-0.5.0rc3}/truefoundry/deploy/python_deploy_codegen.py

@@ -111,6 +111,7 @@ def convert_deployment_config_to_python(workspace_fqn: str, application_spec: di
     application_type = application_obj.type
     if (
         hasattr(application_obj, "image")
+        and hasattr(application_obj.image, "type")
         and application_obj.image.type == "build"
         and application_obj.image.build_source.type == "remote"
     ):

{truefoundry-0.5.0rc1 → truefoundry-0.5.0rc3}/truefoundry/workflow/remote_filesystem/__init__.py

@@ -3,6 +3,4 @@ import logging
 from truefoundry.common.constants import ENV_VARS
 from truefoundry.workflow.remote_filesystem.logger import init_logger
 
-init_logger(
-    level=logging.getLevelNamesMapping[ENV_VARS.TFY_SIGNED_URL_CLIENT_LOG_LEVEL]
-)
+init_logger(level=ENV_VARS.TFY_INTERNAL_SIGNED_URL_CLIENT_LOG_LEVEL)

{truefoundry-0.5.0rc1 → truefoundry-0.5.0rc3}/truefoundry/workflow/remote_filesystem/tfy_signed_url_client.py

@@ -1,4 +1,6 @@
 # file: client.py
+import io
+import os
 from enum import Enum
 from typing import Any, Dict, List, Optional, Union
 from urllib.parse import urlencode, urljoin
@@ -125,7 +127,12 @@ class SignedURLClient:
         )
 
     @log_time(prefix=LOG_PREFIX)
-    def _upload_data(self, signed_url: str, data: Any) -> None:
+    def _upload_data(
+        self,
+        signed_url: str,
+        data: Union[bytes, io.BufferedReader],
+        headers: Optional[Dict] = None,
+    ) -> None:
         """
         Upload data to the specified storage path using a signed URL.
 
@@ -133,10 +140,15 @@ class SignedURLClient:
             signed_url: str: The signed URL to upload the data to.
             data: Bytes or IO: The data to upload.
         """
+        if isinstance(data, io.BufferedReader):
+            if os.fstat(data.fileno()).st_size == 0:
+                data = b""
         try:
+            headers = headers or {}
+            headers["Content-Type"] = "application/octet-stream"
             response = self.session.put(
                 url=signed_url,
-                headers={"Content-Type": "application/octet-stream"},
+                headers=headers,
                 data=data,
                 timeout=REQUEST_TIMEOUT,
             )
@@ -153,7 +165,11 @@ class SignedURLClient:
             headers=self.signed_url_server_headers,
         )
         pre_signed_object_dto = SignedURLAPIResponseDto.parse_obj(signed_object)
-        self._upload_data(pre_signed_object_dto.signed_url, data)
+        self._upload_data(
+            signed_url=pre_signed_object_dto.signed_url,
+            data=data,
+            headers=pre_signed_object_dto.headers,
+        )
         return storage_uri
 
     @log_time(prefix=LOG_PREFIX)
@@ -167,19 +183,30 @@ class SignedURLClient:
         )
         pre_signed_object_dto = SignedURLAPIResponseDto.parse_obj(response)
         with open(file_path, "rb") as file:
-            self._upload_data(pre_signed_object_dto.signed_url, file)
+            self._upload_data(
+                signed_url=pre_signed_object_dto.signed_url,
+                data=file,
+                headers=pre_signed_object_dto.headers,
+            )
         return storage_uri
 
     @log_time(prefix=LOG_PREFIX)
     def _download_file(
-        self, signed_url: str, local_path: Optional[str] = None
+        self,
+        signed_url: str,
+        local_path: Optional[str] = None,
+        headers: Optional[Dict] = None,
     ) -> Optional[bytes]:
         """Common method to download a file using a signed URL."""
         try:
+            if headers is None:
+                headers = {"Content-Type": "application/octet-stream"}
+            else:
+                headers["Content-Type"] = "application/octet-stream"
             response = self.session.get(
                 signed_url,
                 stream=True,
-                headers={"Content-Type": "application/octet-stream"},
+                headers=headers,
                 timeout=REQUEST_TIMEOUT,
             )
             response.raise_for_status()
@@ -202,7 +229,11 @@ class SignedURLClient:
             headers=self.signed_url_server_headers,
         )
         presigned_object = SignedURLAPIResponseDto.parse_obj(response)
-        self._download_file(presigned_object.signed_url, local_path)
+        self._download_file(
+            signed_url=presigned_object.signed_url,
+            local_path=local_path,
+            headers=presigned_object.headers,
+        )
         return local_path
 
     @log_time(prefix=LOG_PREFIX)
@@ -214,7 +245,9 @@ class SignedURLClient:
             headers=self.signed_url_server_headers,
         )
         presigned_object = SignedURLAPIResponseDto.parse_obj(response)
-        return self._download_file(presigned_object.signed_url)
+        return self._download_file(
+            signed_url=presigned_object.signed_url, headers=presigned_object.headers
+        )
 
     @log_time(prefix=LOG_PREFIX)
     def exists(self, uri: str) -> bool: