truefoundry 0.4.1__py3-none-any.whl → 0.4.2__py3-none-any.whl

truefoundry/deploy/cli/commands/deploy_command.py

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

truefoundry/deploy/cli/util.py

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

truefoundry/deploy/lib/auth/servicefoundry_session.py

@@ -8,6 +8,7 @@ from truefoundry.common.credential_provider import (
     FileCredentialProvider,
 )
 from truefoundry.common.entities import UserInfo
+from truefoundry.common.utils import relogin_error_message
 from truefoundry.logger import logger
 
 ACTIVE_SESSION: Optional[ServiceFoundrySession] = None
@@ -41,8 +42,9 @@ class ServiceFoundrySession:
                 break
         if final_cred_provider is None:
             raise Exception(
-                "Please login again using `tfy login --relogin`"
-                "or `tfy.login(relogin=True)` function"
+                relogin_error_message(
+                    "No active session found. Perhaps you are not logged in?",
+                )
             )
         return final_cred_provider
 

truefoundry/deploy/lib/clients/servicefoundry_client.py

@@ -76,6 +76,7 @@ def _upload_packaged_code(metadata, package_file):
 
 
 class ServiceFoundryServiceClient(BaseServiceFoundryServiceClient):
+    # TODO (chiragjn): Rename base_url to tfy_host
     def __init__(self, init_session: bool = True, base_url: Optional[str] = None):
         self._session: Optional[ServiceFoundrySession] = None
         if init_session:
@@ -595,8 +596,9 @@ class ServiceFoundryServiceClient(BaseServiceFoundryServiceClient):
 
     def trigger_workflow(self, application_id: str, inputs: Dict[str, Any]):
         url = f"{self._api_server_url}/{VERSION_PREFIX}/workflow/{application_id}/executions"
+        body = {"inputs": inputs}
         response = session_with_retries().post(
-            url, json=inputs, headers=self._get_header()
+            url, json=body, headers=self._get_header()
         )
         response = request_handling(response)
         return response

truefoundry/deploy/lib/session.py

@@ -8,7 +8,7 @@ from truefoundry.common.constants import TFY_API_KEY_ENV_KEY, TFY_HOST_ENV_KEY
 from truefoundry.common.credential_file_manager import CredentialsFileManager
 from truefoundry.common.credential_provider import EnvCredentialProvider
 from truefoundry.common.entities import CredentialsFileContent, Token
-from truefoundry.common.utils import resolve_base_url
+from truefoundry.common.utils import relogin_error_message, resolve_tfy_host
 from truefoundry.deploy.io.output_callback import OutputCallBack
 from truefoundry.deploy.lib.const import (
     RICH_OUTPUT_CALLBACK,
@@ -43,7 +43,7 @@ def login(
             "Login will just save the credentials on disk."
         )
 
-    host = resolve_base_url(host).strip("/")
+    host = resolve_tfy_host(host)
 
     with CredentialsFileManager() as cred_file:
         if not relogin and cred_file.exists():
@@ -58,10 +58,10 @@ def login(
             user_info = cred_file_content.to_token().to_user_info()
             user_name_display_info = user_info.email or user_info.user_type.value
             output_hook.print_line(
-                f"Already logged in to {cred_file_content.host!r} as "
-                f"{user_info.user_id!r} ({user_name_display_info})\n"
-                "Please use `tfy login --relogin` or `tfy.login(relogin=True)` "
-                "to force relogin"
+                relogin_error_message(
+                    f"Already logged in to {cred_file_content.host!r} as {user_info.user_id!r} ({user_name_display_info})",
+                    host=host,
+                )
             )
             return False
 

truefoundry/deploy/v2/lib/patched_models.py

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

truefoundry/ml/autogen/client/__init__.py

@@ -144,6 +144,9 @@ from truefoundry.ml.autogen.client.models.delete_artifact_versions_request_dto i
 from truefoundry.ml.autogen.client.models.delete_dataset_request_dto import (
     DeleteDatasetRequestDto,
 )
+from truefoundry.ml.autogen.client.models.delete_files_for_dataset_request_dto import (
+    DeleteFilesForDatasetRequestDto,
+)
 from truefoundry.ml.autogen.client.models.delete_model_version_request_dto import (
     DeleteModelVersionRequestDto,
 )

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

@@ -73,6 +73,9 @@ from truefoundry.ml.autogen.client.models.delete_artifact_versions_request_dto i
 from truefoundry.ml.autogen.client.models.delete_dataset_request_dto import (
     DeleteDatasetRequestDto,
 )
+from truefoundry.ml.autogen.client.models.delete_files_for_dataset_request_dto import (
+    DeleteFilesForDatasetRequestDto,
+)
 from truefoundry.ml.autogen.client.models.delete_model_version_request_dto import (
     DeleteModelVersionRequestDto,
 )
@@ -2280,6 +2283,166 @@ class MlfoundryArtifactsApi:
             _request_auth=_params.get("_request_auth"),
         )
 
+    @validate_arguments
+    def delete_files_for_dataset_delete(
+        self,
+        delete_files_for_dataset_request_dto: DeleteFilesForDatasetRequestDto,
+        **kwargs,
+    ) -> object:  # noqa: E501
+        """Delete Files For Dataset  # noqa: E501
+
+        Delete files from the dataset.  # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+
+        >>> thread = api.delete_files_for_dataset_delete(delete_files_for_dataset_request_dto, async_req=True)
+        >>> result = thread.get()
+
+        :param delete_files_for_dataset_request_dto: (required)
+        :type delete_files_for_dataset_request_dto: DeleteFilesForDatasetRequestDto
+        :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 delete_files_for_dataset_delete_with_http_info method with `_preload_content` instead and obtain raw data from ApiResponse.raw_data"  # noqa: E501
+            raise ValueError(message)
+        return self.delete_files_for_dataset_delete_with_http_info(
+            delete_files_for_dataset_request_dto, **kwargs
+        )  # noqa: E501
+
+    @validate_arguments
+    def delete_files_for_dataset_delete_with_http_info(
+        self,
+        delete_files_for_dataset_request_dto: DeleteFilesForDatasetRequestDto,
+        **kwargs,
+    ) -> ApiResponse:  # noqa: E501
+        """Delete Files For Dataset  # noqa: E501
+
+        Delete files from the dataset.  # noqa: E501
+        This method makes a synchronous HTTP request by default. To make an
+        asynchronous HTTP request, please pass async_req=True
+
+        >>> thread = api.delete_files_for_dataset_delete_with_http_info(delete_files_for_dataset_request_dto, async_req=True)
+        >>> result = thread.get()
+
+        :param delete_files_for_dataset_request_dto: (required)
+        :type delete_files_for_dataset_request_dto: DeleteFilesForDatasetRequestDto
+        :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 = ["delete_files_for_dataset_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 delete_files_for_dataset_delete" % _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["delete_files_for_dataset_request_dto"] is not None:
+            _body_params = _params["delete_files_for_dataset_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/mlfoundry-artifacts/datasets/files/",
+            "DELETE",
+            _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 delete_model_version_post(
         self, delete_model_version_request_dto: DeleteModelVersionRequestDto, **kwargs

truefoundry/ml/autogen/client/models/__init__.py

@@ -115,6 +115,9 @@ from truefoundry.ml.autogen.client.models.delete_artifact_versions_request_dto i
 from truefoundry.ml.autogen.client.models.delete_dataset_request_dto import (
     DeleteDatasetRequestDto,
 )
+from truefoundry.ml.autogen.client.models.delete_files_for_dataset_request_dto import (
+    DeleteFilesForDatasetRequestDto,
+)
 from truefoundry.ml.autogen.client.models.delete_model_version_request_dto import (
     DeleteModelVersionRequestDto,
 )

truefoundry/ml/autogen/client/models/delete_files_for_dataset_request_dto.py

@@ -0,0 +1,68 @@
+# coding: utf-8
+
+"""
+FastAPI
+
+No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+
+The version of the OpenAPI document: 0.1.0
+Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+Do not edit the class manually.
+"""  # noqa: E501
+
+from __future__ import annotations
+
+import json
+import pprint
+import re  # noqa: F401
+
+from truefoundry.pydantic_v1 import BaseModel, Field, StrictStr, conlist
+
+
+class DeleteFilesForDatasetRequestDto(BaseModel):
+    """
+    DeleteFilesForDatasetRequestDto
+    """
+
+    dataset_fqn: StrictStr = Field(...)
+    paths: conlist(StrictStr, max_items=100) = Field(...)
+    __properties = ["dataset_fqn", "paths"]
+
+    class Config:
+        """Pydantic configuration"""
+
+        allow_population_by_field_name = True
+        validate_assignment = True
+
+    def to_str(self) -> str:
+        """Returns the string representation of the model using alias"""
+        return pprint.pformat(self.dict(by_alias=True))
+
+    def to_json(self) -> str:
+        """Returns the JSON representation of the model using alias"""
+        return json.dumps(self.to_dict())
+
+    @classmethod
+    def from_json(cls, json_str: str) -> DeleteFilesForDatasetRequestDto:
+        """Create an instance of DeleteFilesForDatasetRequestDto from a JSON string"""
+        return cls.from_dict(json.loads(json_str))
+
+    def to_dict(self):
+        """Returns the dictionary representation of the model using alias"""
+        _dict = self.dict(by_alias=True, exclude={}, exclude_none=True)
+        return _dict
+
+    @classmethod
+    def from_dict(cls, obj: dict) -> DeleteFilesForDatasetRequestDto:
+        """Create an instance of DeleteFilesForDatasetRequestDto from a dict"""
+        if obj is None:
+            return None
+
+        if not isinstance(obj, dict):
+            return DeleteFilesForDatasetRequestDto.parse_obj(obj)
+
+        _obj = DeleteFilesForDatasetRequestDto.parse_obj(
+            {"dataset_fqn": obj.get("dataset_fqn"), "paths": obj.get("paths")}
+        )
+        return _obj

truefoundry/ml/autogen/client_README.md

@@ -98,6 +98,7 @@ Class | Method | HTTP request | Description
 *MlfoundryArtifactsApi* | [**delete_artifact_post**](truefoundry/ml/autogen/client/docs/MlfoundryArtifactsApi.md#delete_artifact_post) | **POST** /api/2.0/mlflow/mlfoundry-artifacts/artifact/delete | Delete Artifact
 *MlfoundryArtifactsApi* | [**delete_artifact_version_post**](truefoundry/ml/autogen/client/docs/MlfoundryArtifactsApi.md#delete_artifact_version_post) | **POST** /api/2.0/mlflow/mlfoundry-artifacts/artifact-versions/delete | Delete Artifact Version
 *MlfoundryArtifactsApi* | [**delete_dataset_post**](truefoundry/ml/autogen/client/docs/MlfoundryArtifactsApi.md#delete_dataset_post) | **POST** /api/2.0/mlflow/mlfoundry-artifacts/datasets/delete | Delete Dataset
+*MlfoundryArtifactsApi* | [**delete_files_for_dataset_delete**](truefoundry/ml/autogen/client/docs/MlfoundryArtifactsApi.md#delete_files_for_dataset_delete) | **DELETE** /api/2.0/mlflow/mlfoundry-artifacts/datasets/files/ | Delete Files For Dataset
 *MlfoundryArtifactsApi* | [**delete_model_version_post**](truefoundry/ml/autogen/client/docs/MlfoundryArtifactsApi.md#delete_model_version_post) | **POST** /api/2.0/mlflow/mlfoundry-artifacts/model-versions/delete | Delete Model Version
 *MlfoundryArtifactsApi* | [**finalize_artifact_version_post**](truefoundry/ml/autogen/client/docs/MlfoundryArtifactsApi.md#finalize_artifact_version_post) | **POST** /api/2.0/mlflow/mlfoundry-artifacts/artifact-versions/finalize | Finalize Artifact Version
 *MlfoundryArtifactsApi* | [**get_artifact_by_fqn_get**](truefoundry/ml/autogen/client/docs/MlfoundryArtifactsApi.md#get_artifact_by_fqn_get) | **GET** /api/2.0/mlflow/mlfoundry-artifacts/artifacts/get-by-fqn | Get Artifact By Fqn
@@ -197,6 +198,7 @@ Class | Method | HTTP request | Description
  - [DatasetResponseDto](truefoundry/ml/autogen/client/docs/DatasetResponseDto.md)
  - [DeleteArtifactVersionsRequestDto](truefoundry/ml/autogen/client/docs/DeleteArtifactVersionsRequestDto.md)
  - [DeleteDatasetRequestDto](truefoundry/ml/autogen/client/docs/DeleteDatasetRequestDto.md)
+ - [DeleteFilesForDatasetRequestDto](truefoundry/ml/autogen/client/docs/DeleteFilesForDatasetRequestDto.md)
  - [DeleteModelVersionRequestDto](truefoundry/ml/autogen/client/docs/DeleteModelVersionRequestDto.md)
  - [DeleteRunRequest](truefoundry/ml/autogen/client/docs/DeleteRunRequest.md)
  - [DeleteTagRequestDto](truefoundry/ml/autogen/client/docs/DeleteTagRequestDto.md)