truefoundry 0.5.5rc2__py3-none-any.whl → 0.5.6rc1__py3-none-any.whl

truefoundry/deploy/auto_gen/models.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  application.json
-#   timestamp: 2025-01-20T07:24:00+00:00
+#   timestamp: 2025-01-29T10:40:43+00:00
 
 from __future__ import annotations
 
@@ -149,7 +149,7 @@ class BaseAutoscaling(BaseModel):
 
 class BasicAuthCreds(BaseModel):
     """
-    +label=Username and password for service auth
+    +label=Username and password
     """
 
     type: Literal["basic_auth"] = Field(..., description="+value=basic_auth")
@@ -979,7 +979,7 @@ class SecretMount(BaseModel):
     )
     secret_fqn: constr(regex=r"^tfy-secret:\/\/.+:.+:.+$") = Field(
         ...,
-        description="+label=Secret\n+usage=The Truefoundry secret whose value will be the file content.",
+        description="+label=Secret\n+usage=The TrueFoundry secret whose value will be the file content.",
     )
 
 
@@ -1111,20 +1111,10 @@ class TaskPythonBuild(BaseModel):
     )
 
 
-class TrueFoundryInteractiveLogin(BaseModel):
-    """
-    +label=Login with truefoundry
-    """
-
-    type: Literal["truefoundry_oauth"] = Field(
-        ..., description="+value=truefoundry_oauth"
-    )
-
-
-class TruefoundryArtifactSource(BaseModel):
+class TrueFoundryArtifactSource(BaseModel):
     """
-    +docs=Input for Artifact from Truefoundry Artifact Registry
-    +label=Truefoundry Artifact Source
+    +docs=Input for Artifact from TrueFoundry Artifact Registry
+    +label=TrueFoundry Artifact Source
     """
 
     type: Literal["truefoundry-artifact"] = Field(
@@ -1140,6 +1130,16 @@ class TruefoundryArtifactSource(BaseModel):
     )
 
 
+class TrueFoundryInteractiveLogin(BaseModel):
+    """
+    +label=Login with truefoundry
+    """
+
+    type: Literal["truefoundry_oauth"] = Field(
+        ..., description="+value=truefoundry_oauth"
+    )
+
+
 class VolumeBrowser(BaseModel):
     """
     +label=Volume Browser
@@ -1172,7 +1172,7 @@ class VolumeMount(BaseModel):
     )
     volume_fqn: constr(regex=r"^tfy-volume:\/\/.+:.+:.+$") = Field(
         ...,
-        description="+label=Volume\n+usage=The Truefoundry volume that needs to be mounted.",
+        description="+label=Volume\n+usage=The TrueFoundry volume that needs to be mounted.",
     )
 
 
@@ -1203,7 +1203,7 @@ class ArtifactsDownload(BaseModel):
     """
 
     cache_volume: Optional[ArtifactsCacheVolume] = None
-    artifacts: List[Union[TruefoundryArtifactSource, HuggingfaceArtifactSource]] = (
+    artifacts: List[Union[TrueFoundryArtifactSource, HuggingfaceArtifactSource]] = (
         Field(
             ..., description="+label=Artifacts\n+usage=List of artifacts to be cached"
         )
@@ -1228,7 +1228,7 @@ class BaseWorkbenchInput(BaseModel):
     +docs=Describes the configuration for the service
     """
 
-    name: constr(regex=r"^[a-z][a-z0-9\-]{1,30}[a-z0-9]$") = Field(
+    name: constr(regex=r"^[a-z](?:[a-z0-9]|-(?!-)){1,30}[a-z0-9]$") = Field(
         ...,
         description="+usage=Name of the workbench. This uniquely identifies this workbench in the workspace.\n> Name can only contain alphanumeric characters and '-' and can be atmost 25 characters long\n+sort=1\n+message=3 to 32 lower case characters long alphanumeric word, may contain - in between, cannot start with a number",
     )
@@ -1378,7 +1378,7 @@ class HealthProbe(BaseModel):
 
 class Helm(BaseModel):
     type: Literal["helm"] = Field(..., description="+value=helm")
-    name: constr(regex=r"^[a-z][a-z0-9\-]{1,30}[a-z0-9]$") = Field(
+    name: constr(regex=r"^[a-z](?:[a-z0-9]|-(?!-)){1,30}[a-z0-9]$") = Field(
         ...,
         description="+sort=1\n+message=3 to 32 lower case characters long alphanumeric word, may contain - in between, cannot start with a number\n+usage=Name of the Helm deployment. This will be set as the release name of the chart you are deploying.",
     )
@@ -1405,7 +1405,7 @@ class Job(BaseModel):
     """
 
     type: Literal["job"] = Field(..., description="+value=job")
-    name: constr(regex=r"^[a-z][a-z0-9\-]{1,30}[a-z0-9]$") = Field(
+    name: constr(regex=r"^[a-z](?:[a-z0-9]|-(?!-)){1,30}[a-z0-9]$") = Field(
         ...,
         description="+usage=Name of the job\n+sort=1\n+message=3 to 32 lower case characters long alphanumeric word, may contain - in between, cannot start with a number",
     )
@@ -1673,7 +1673,7 @@ class SparkExecutorConfig(BaseModel):
 
 class SparkJob(BaseModel):
     type: Literal["spark-job"] = Field(..., description="+value=spark-job\n+sort=1")
-    name: constr(regex=r"^[a-z][a-z0-9\-]{1,30}[a-z0-9]$") = Field(
+    name: constr(regex=r"^[a-z](?:[a-z0-9]|-(?!-)){1,30}[a-z0-9]$") = Field(
         ...,
         description="+label=Name\n+usage=Name of the job\n+message=3 to 32 lower case characters long alphanumeric word, may contain - in between, cannot start with a number\n+sort=2",
     )
@@ -1715,7 +1715,7 @@ class SparkJob(BaseModel):
 
 class Volume(BaseModel):
     type: Literal["volume"] = Field(..., description="+value=volume")
-    name: constr(regex=r"^[a-z][a-z0-9\-]{1,30}[a-z0-9]$") = Field(
+    name: constr(regex=r"^[a-z](?:[a-z0-9]|-(?!-)){1,30}[a-z0-9]$") = Field(
         ...,
         description="+sort=1\n+message=3 to 32 lower case characters long alphanumeric word, may contain - in between, cannot start with a number\n+usage=Name of the Volume. This will be set as the volume name.",
     )
@@ -1750,7 +1750,7 @@ class WorkerConfig(BaseModel):
 
 
 class BaseService(BaseModel):
-    name: constr(regex=r"^[a-z][a-z0-9\-]{1,30}[a-z0-9]$") = Field(
+    name: constr(regex=r"^[a-z](?:[a-z0-9]|-(?!-)){1,30}[a-z0-9]$") = Field(
         ...,
         description="+usage=Name of the service. This uniquely identifies this service in the workspace.\n> Name can only contain alphanumeric characters and '-' and can be atmost 25 characters long\n+sort=1\n+message=3 to 32 lower case characters long alphanumeric word, may contain - in between, cannot start with a number",
     )
@@ -1845,7 +1845,7 @@ class Workflow(BaseModel):
     """
 
     type: Literal["workflow"] = Field(..., description="+value=workflow")
-    name: constr(regex=r"^[a-z][a-z0-9\-]{1,30}[a-z0-9]$") = Field(
+    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/deploy/cli/commands/__init__.py

@@ -1,6 +1,5 @@
 from truefoundry.deploy.cli.commands.apply_command import get_apply_command
 from truefoundry.deploy.cli.commands.build_command import get_build_command
-from truefoundry.deploy.cli.commands.build_logs_command import get_build_logs_command
 from truefoundry.deploy.cli.commands.create_command import get_create_command
 from truefoundry.deploy.cli.commands.delete_command import get_delete_command
 from truefoundry.deploy.cli.commands.deploy_command import get_deploy_command

truefoundry/deploy/lib/clients/servicefoundry_client.py

@@ -273,20 +273,33 @@ class ServiceFoundryServiceClient(BaseServiceFoundryServiceClient):
         subscribe_message: str,
         socketio_path: str = "socket.io",
         callback=None,
-        wait=True,
-    ):
+    ) -> socketio.Client:
         callback = callback or OutputCallBack()
         sio = socketio.Client(request_timeout=60)
         callback.print_line("Waiting for the task to start...")
+        next_log_start_timestamp = query_dict.get("startTs")
 
         @sio.on(subscribe_message)
         def logs(data):
             try:
                 _log = json.loads(data)
-                callback.print_line(self._get_log_print_line(_log["body"]))
+                body = _log["body"]
+                callback.print_line(self._get_log_print_line(body))
+                nonlocal next_log_start_timestamp
+                next_log_start_timestamp = body["time"]
             except Exception:
                 logger.exception(f"Error while parsing log line, {data!r}")
 
+        @sio.on("connect")
+        def on_connect():
+            # TODO: We should have have a timeout here. `emit` does
+            #   not support timeout. Explore `sio.call`.
+            query_dict["startTs"] = next_log_start_timestamp
+            sio.emit(
+                subscribe_message,
+                json.dumps(query_dict),
+            )
+
         def sio_disconnect_no_exception():
             try:
                 sio.disconnect()
@@ -300,14 +313,7 @@ class ServiceFoundryServiceClient(BaseServiceFoundryServiceClient):
                 headers=self._get_header(),
                 socketio_path=socketio_path,
             )
-            # TODO: We should have have a timeout here. `emit` does
-            #   not support timeout. Explore `sio.call`.
-            sio.emit(
-                subscribe_message,
-                json.dumps(query_dict),
-            )
-            if wait:
-                sio.wait()
+            return sio
 
     @check_min_cli_version
     def get_deployment(self, application_id: str, deployment_id: str) -> Deployment:
@@ -372,11 +378,10 @@ class ServiceFoundryServiceClient(BaseServiceFoundryServiceClient):
         self,
         build_response: BuildResponse,
         callback=None,
-        wait: bool = True,
-    ):
+    ) -> socketio.Client:
         callback = callback or OutputCallBack()
         tail_logs_obj = json.loads(build_response.tailLogsUrl)
-        self._tail_logs(
+        socket = self._tail_logs(
             tail_logs_url=urljoin(
                 tail_logs_obj["uri"], f"/?type={BUILD_LOGS_SUBSCRIBE_MESSAGE}"
             ),
@@ -386,9 +391,9 @@ class ServiceFoundryServiceClient(BaseServiceFoundryServiceClient):
                 "startTs": build_response.logsStartTs,
             },
             callback=callback,
-            wait=wait,
             subscribe_message=BUILD_LOGS_SUBSCRIBE_MESSAGE,
         )
+        return socket
 
     @check_min_cli_version
     def tail_logs_for_deployment(
@@ -416,7 +421,6 @@ class ServiceFoundryServiceClient(BaseServiceFoundryServiceClient):
                 },
             },
             callback=callback,
-            wait=wait,
             subscribe_message=DEPLOYMENT_LOGS_SUBSCRIBE_MESSAGE,
         )
 

truefoundry/deploy/v2/lib/deploy.py

@@ -1,7 +1,8 @@
 import sys
 import time
-from typing import List, Optional, TypeVar
+from typing import Optional, TypeVar
 
+import socketio
 from rich.status import Status
 
 from truefoundry.common.utils import poll_for_function
@@ -96,18 +97,15 @@ def _log_application_dashboard_url(deployment: Deployment, log_message: str):
     logger.info(log_message, url)
 
 
-def _tail_build_logs(build_responses: List[BuildResponse]) -> None:
+def _tail_build_logs(build_response: BuildResponse) -> socketio.Client:
     client = ServiceFoundryServiceClient()
 
-    # TODO: Explore other options like,
-    # https://rich.readthedocs.io/en/stable/live.html#live-display
-    # How does docker/compose does multiple build logs?
-    for build_response in build_responses:
-        logger.info("Tailing build logs for '%s'", build_response.componentName)
-        client.tail_build_logs(build_response=build_response, wait=True)
+    logger.info("Tailing build logs for '%s'", build_response.componentName)
+    socket = client.tail_build_logs(build_response=build_response)
+    return socket
 
 
-def _deploy_wait_handler(
+def _deploy_wait_handler(  # noqa: C901
     deployment: Deployment,
 ) -> Optional[DeploymentTransitionStatus]:
     _log_application_dashboard_url(
@@ -122,9 +120,10 @@ def _deploy_wait_handler(
         last_status_printed = None
         client = ServiceFoundryServiceClient()
         start_time = time.monotonic()
-        total_timeout_time: int = 300
+        total_timeout_time: int = 600
         poll_interval_seconds = 5
         time_elapsed = 0
+        socket: socketio.Client = None
 
         for deployment_statuses in poll_for_function(
             client.get_deployment_statuses,
@@ -150,20 +149,29 @@ def _deploy_wait_handler(
                 last_status_printed = status_to_print
 
             if latest_deployment_status.state.isTerminalState:
+                if socket and socket.connected:
+                    socket.disconnect()
                 break
 
             if (
                 latest_deployment_status.transition
                 == DeploymentTransitionStatus.BUILDING
             ):
-                build_responses = client.get_deployment_build_response(
-                    application_id=deployment.applicationId, deployment_id=deployment.id
-                )
-                _tail_build_logs(build_responses)
+                if not socket:
+                    build_responses = client.get_deployment_build_response(
+                        application_id=deployment.applicationId,
+                        deployment_id=deployment.id,
+                    )
+                    socket = _tail_build_logs(build_responses[0])
 
             time_elapsed = time.monotonic() - start_time
             if time_elapsed > total_timeout_time:
-                logger.warning("Polled server for %s secs.", int(time_elapsed))
+                logger.warning(
+                    "Polled server for %s secs. Disconnecting from server, the deployment will still continue.",
+                    int(time_elapsed),
+                )
+                if socket and socket.connected:
+                    socket.disconnect()
                 break
 
     return last_status_printed

truefoundry/deploy/v2/lib/patched_models.py

@@ -504,12 +504,12 @@ class HuggingfaceArtifactSource(models.HuggingfaceArtifactSource, PatchedModelBa
     type: Literal["huggingface-hub"] = "huggingface-hub"
 
 
-class TruefoundryArtifactSource(models.TruefoundryArtifactSource, PatchedModelBase):
+class TrueFoundryArtifactSource(models.TrueFoundryArtifactSource, PatchedModelBase):
     type: Literal["truefoundry-artifact"] = "truefoundry-artifact"
 
 
-# TODO: When we do the renaming in CUE, we will make TruefoundryArtifactSource the alias and mark it deprecated
-TrueFoundryArtifactSource = TruefoundryArtifactSource
+# Deprecated alias, kept for backward compatibility
+TruefoundryArtifactSource = TrueFoundryArtifactSource
 
 
 class ArtifactsDownload(models.ArtifactsDownload, PatchedModelBase):

truefoundry/ml/autogen/client/__init__.py

@@ -175,8 +175,8 @@ from truefoundry.ml.autogen.client.models.experiment_tag_dto import ExperimentTa
 from truefoundry.ml.autogen.client.models.export_deployment_files_request_dto import (
     ExportDeploymentFilesRequestDto,
 )
-from truefoundry.ml.autogen.client.models.external_artifact_source import (
-    ExternalArtifactSource,
+from truefoundry.ml.autogen.client.models.external_blob_storage_source import (
+    ExternalBlobStorageSource,
 )
 from truefoundry.ml.autogen.client.models.fast_ai_framework import FastAIFramework
 from truefoundry.ml.autogen.client.models.file_info_dto import FileInfoDto
@@ -403,8 +403,8 @@ from truefoundry.ml.autogen.client.models.trigger_job_run_config_request_dto imp
 from truefoundry.ml.autogen.client.models.trigger_job_run_config_response_dto import (
     TriggerJobRunConfigResponseDto,
 )
-from truefoundry.ml.autogen.client.models.true_foundry_artifact_source import (
-    TrueFoundryArtifactSource,
+from truefoundry.ml.autogen.client.models.true_foundry_managed_source import (
+    TrueFoundryManagedSource,
 )
 from truefoundry.ml.autogen.client.models.update_artifact_version_request_dto import (
     UpdateArtifactVersionRequestDto,

truefoundry/ml/autogen/client/api/experiments_api.py

@@ -1182,162 +1182,6 @@ class ExperimentsApi:
             _request_auth=_params.get("_request_auth"),
         )
 
-    @validate_arguments
-    def put_privacy_type_put(
-        self, set_experiment_tag_request_dto: SetExperimentTagRequestDto, **kwargs
-    ) -> object:  # noqa: E501
-        """Put Privacy Type  # noqa: E501
-
-        Set the privacy type of an expermient to Private or Public(publically readable)  # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-
-        >>> thread = api.put_privacy_type_put(set_experiment_tag_request_dto, async_req=True)
-        >>> result = thread.get()
-
-        :param set_experiment_tag_request_dto: (required)
-        :type set_experiment_tag_request_dto: SetExperimentTagRequestDto
-        :param async_req: Whether to execute the request asynchronously.
-        :type async_req: bool, optional
-        :param _request_timeout: timeout setting for this request.
-               If one number provided, it will be total request
-               timeout. It can also be a pair (tuple) of
-               (connection, read) timeouts.
-        :return: Returns the result object.
-                 If the method is called asynchronously,
-                 returns the request thread.
-        :rtype: object
-        """
-        kwargs["_return_http_data_only"] = True
-        if "_preload_content" in kwargs:
-            message = "Error! Please call the put_privacy_type_put_with_http_info method with `_preload_content` instead and obtain raw data from ApiResponse.raw_data"  # noqa: E501
-            raise ValueError(message)
-        return self.put_privacy_type_put_with_http_info(
-            set_experiment_tag_request_dto, **kwargs
-        )  # noqa: E501
-
-    @validate_arguments
-    def put_privacy_type_put_with_http_info(
-        self, set_experiment_tag_request_dto: SetExperimentTagRequestDto, **kwargs
-    ) -> ApiResponse:  # noqa: E501
-        """Put Privacy Type  # noqa: E501
-
-        Set the privacy type of an expermient to Private or Public(publically readable)  # noqa: E501
-        This method makes a synchronous HTTP request by default. To make an
-        asynchronous HTTP request, please pass async_req=True
-
-        >>> thread = api.put_privacy_type_put_with_http_info(set_experiment_tag_request_dto, async_req=True)
-        >>> result = thread.get()
-
-        :param set_experiment_tag_request_dto: (required)
-        :type set_experiment_tag_request_dto: SetExperimentTagRequestDto
-        :param async_req: Whether to execute the request asynchronously.
-        :type async_req: bool, optional
-        :param _preload_content: if False, the ApiResponse.data will
-                                 be set to none and raw_data will store the
-                                 HTTP response body without reading/decoding.
-                                 Default is True.
-        :type _preload_content: bool, optional
-        :param _return_http_data_only: response data instead of ApiResponse
-                                       object with status code, headers, etc
-        :type _return_http_data_only: bool, optional
-        :param _request_timeout: timeout setting for this request. If one
-                                 number provided, it will be total request
-                                 timeout. It can also be a pair (tuple) of
-                                 (connection, read) timeouts.
-        :param _request_auth: set to override the auth_settings for an a single
-                              request; this effectively ignores the authentication
-                              in the spec for a single request.
-        :type _request_auth: dict, optional
-        :type _content_type: string, optional: force content-type for the request
-        :return: Returns the result object.
-                 If the method is called asynchronously,
-                 returns the request thread.
-        :rtype: tuple(object, status_code(int), headers(HTTPHeaderDict))
-        """
-
-        _params = locals()
-
-        _all_params = ["set_experiment_tag_request_dto"]
-        _all_params.extend(
-            [
-                "async_req",
-                "_return_http_data_only",
-                "_preload_content",
-                "_request_timeout",
-                "_request_auth",
-                "_content_type",
-                "_headers",
-            ]
-        )
-
-        # validate the arguments
-        for _key, _val in _params["kwargs"].items():
-            if _key not in _all_params:
-                raise ApiTypeError(
-                    "Got an unexpected keyword argument '%s'"
-                    " to method put_privacy_type_put" % _key
-                )
-            _params[_key] = _val
-        del _params["kwargs"]
-
-        _collection_formats = {}
-
-        # process the path parameters
-        _path_params = {}
-
-        # process the query parameters
-        _query_params = []
-        # process the header parameters
-        _header_params = dict(_params.get("_headers", {}))
-        # process the form parameters
-        _form_params = []
-        _files = {}
-        # process the body parameter
-        _body_params = None
-        if _params["set_experiment_tag_request_dto"] is not None:
-            _body_params = _params["set_experiment_tag_request_dto"]
-
-        # set the HTTP header `Accept`
-        _header_params["Accept"] = self.api_client.select_header_accept(
-            ["application/json"]
-        )  # noqa: E501
-
-        # set the HTTP header `Content-Type`
-        _content_types_list = _params.get(
-            "_content_type",
-            self.api_client.select_header_content_type(["application/json"]),
-        )
-        if _content_types_list:
-            _header_params["Content-Type"] = _content_types_list
-
-        # authentication setting
-        _auth_settings = ["HTTPBearer", "APIKeyCookie"]  # noqa: E501
-
-        _response_types_map = {
-            "200": "object",
-            "422": "HTTPValidationError",
-        }
-
-        return self.api_client.call_api(
-            "/api/2.0/mlflow/experiments/privacy-type",
-            "PUT",
-            _path_params,
-            _query_params,
-            _header_params,
-            body=_body_params,
-            post_params=_form_params,
-            files=_files,
-            response_types_map=_response_types_map,
-            auth_settings=_auth_settings,
-            async_req=_params.get("async_req"),
-            _return_http_data_only=_params.get("_return_http_data_only"),  # noqa: E501
-            _preload_content=_params.get("_preload_content", True),
-            _request_timeout=_params.get("_request_timeout"),
-            collection_formats=_collection_formats,
-            _request_auth=_params.get("_request_auth"),
-        )
-
     @validate_arguments
     def restore_experiment_post(
         self, experiment_id_request_dto: ExperimentIdRequestDto, **kwargs