truefoundry 0.5.3rc4__py3-none-any.whl → 0.5.4__py3-none-any.whl

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

@@ -155,8 +155,8 @@ from truefoundry.ml.autogen.client.models.finalize_artifact_version_request_dto
     FinalizeArtifactVersionRequestDto,
 )
 from truefoundry.ml.autogen.client.models.framework import Framework
-from truefoundry.ml.autogen.client.models.get_artifact_tags_response_dto import (
-    GetArtifactTagsResponseDto,
+from truefoundry.ml.autogen.client.models.get_artifact_version_aliases_response_dto import (
+    GetArtifactVersionAliasesResponseDto,
 )
 from truefoundry.ml.autogen.client.models.get_experiment_response_dto import (
     GetExperimentResponseDto,

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

@@ -24,7 +24,6 @@ from truefoundry.pydantic_v1 import (
     Field,
     StrictStr,
     conint,
-    conlist,
     constr,
     validator,
 )
@@ -43,16 +42,35 @@ class ArtifactVersionManifest(BaseModel):
         default=...,
         description="+label=Metadata +docs=Metadata for the artifact or model version +usage=Metadata for the artifact or model version +uiType=JsonInput",
     )
-    tags: Optional[conlist(constr(strict=True, max_length=128))] = Field(
+    version_alias: Optional[constr(strict=True, max_length=128)] = Field(
         default=None,
-        description="+label=Tags +usage=Tags for the artifact or model version +docs=Tags for the artifact or model version",
+        description="+label=Version Alias +usage=The version alias for artifact or model version which should start with 'v' followed by alphanumeric and it can include '.' and '-' in between (e.g. v1.0.0, v-prod, v-dev, etc) +docs=The version alias for artifact or model version which should start with 'v' followed by alphanumeric and it can include '.' and '-' in between (e.g. v1.0.0, v-prod, v-dev, etc) +message=The version alias should start with 'v' followed by alphanumeric and it can include '.' and '-' in between (e.g. v1.0.0, v-prod, v-dev, etc)",
     )
     type: Optional[StrictStr] = "artifact-version"
     source: Source = Field(...)
     step: Optional[conint(strict=True, ge=0)] = Field(
         default=0, description="+label=Step"
     )
-    __properties = ["description", "metadata", "tags", "type", "source", "step"]
+    __properties = [
+        "description",
+        "metadata",
+        "version_alias",
+        "type",
+        "source",
+        "step",
+    ]
+
+    @validator("version_alias")
+    def version_alias_validate_regular_expression(cls, value):
+        """Validates the regular expression"""
+        if value is None:
+            return value
+
+        if not re.match(r"^v[a-zA-Z0-9.-]*([a-zA-Z0-9]+)$", value):
+            raise ValueError(
+                r"must validate the regular expression /^v[a-zA-Z0-9.-]*([a-zA-Z0-9]+)$/"
+            )
+        return value
 
     @validator("type")
     def type_validate_enum(cls, value):
@@ -104,7 +122,7 @@ class ArtifactVersionManifest(BaseModel):
             {
                 "description": obj.get("description"),
                 "metadata": obj.get("metadata"),
-                "tags": obj.get("tags"),
+                "version_alias": obj.get("version_alias"),
                 "type": obj.get("type")
                 if obj.get("type") is not None
                 else "artifact-version",

truefoundry/ml/autogen/client/models/{get_artifact_tags_response_dto.py → get_artifact_version_aliases_response_dto.py}

@@ -20,13 +20,13 @@ import re  # noqa: F401
 from truefoundry.pydantic_v1 import BaseModel, Field, StrictStr, conlist
 
 
-class GetArtifactTagsResponseDto(BaseModel):
+class GetArtifactVersionAliasesResponseDto(BaseModel):
     """
-    GetArtifactTagsResponseDto
+    GetArtifactVersionAliasesResponseDto
     """
 
-    tags: conlist(StrictStr) = Field(...)
-    __properties = ["tags"]
+    version_aliases: conlist(StrictStr) = Field(...)
+    __properties = ["version_aliases"]
 
     class Config:
         """Pydantic configuration"""
@@ -43,8 +43,8 @@ class GetArtifactTagsResponseDto(BaseModel):
         return json.dumps(self.to_dict())
 
     @classmethod
-    def from_json(cls, json_str: str) -> GetArtifactTagsResponseDto:
-        """Create an instance of GetArtifactTagsResponseDto from a JSON string"""
+    def from_json(cls, json_str: str) -> GetArtifactVersionAliasesResponseDto:
+        """Create an instance of GetArtifactVersionAliasesResponseDto from a JSON string"""
         return cls.from_dict(json.loads(json_str))
 
     def to_dict(self):
@@ -53,13 +53,15 @@ class GetArtifactTagsResponseDto(BaseModel):
         return _dict
 
     @classmethod
-    def from_dict(cls, obj: dict) -> GetArtifactTagsResponseDto:
-        """Create an instance of GetArtifactTagsResponseDto from a dict"""
+    def from_dict(cls, obj: dict) -> GetArtifactVersionAliasesResponseDto:
+        """Create an instance of GetArtifactVersionAliasesResponseDto from a dict"""
         if obj is None:
             return None
 
         if not isinstance(obj, dict):
-            return GetArtifactTagsResponseDto.parse_obj(obj)
+            return GetArtifactVersionAliasesResponseDto.parse_obj(obj)
 
-        _obj = GetArtifactTagsResponseDto.parse_obj({"tags": obj.get("tags")})
+        _obj = GetArtifactVersionAliasesResponseDto.parse_obj(
+            {"version_aliases": obj.get("version_aliases")}
+        )
         return _obj

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

@@ -28,7 +28,6 @@ from truefoundry.pydantic_v1 import (
     Field,
     StrictStr,
     conint,
-    conlist,
     constr,
     validator,
 )
@@ -47,9 +46,9 @@ class ModelVersionManifest(BaseModel):
         default=...,
         description="+label=Metadata +docs=Metadata for the artifact or model version +usage=Metadata for the artifact or model version +uiType=JsonInput",
     )
-    tags: Optional[conlist(constr(strict=True, max_length=128))] = Field(
+    version_alias: Optional[constr(strict=True, max_length=128)] = Field(
         default=None,
-        description="+label=Tags +usage=Tags for the artifact or model version +docs=Tags for the artifact or model version",
+        description="+label=Version Alias +usage=The version alias for artifact or model version which should start with 'v' followed by alphanumeric and it can include '.' and '-' in between (e.g. v1.0.0, v-prod, v-dev, etc) +docs=The version alias for artifact or model version which should start with 'v' followed by alphanumeric and it can include '.' and '-' in between (e.g. v1.0.0, v-prod, v-dev, etc) +message=The version alias should start with 'v' followed by alphanumeric and it can include '.' and '-' in between (e.g. v1.0.0, v-prod, v-dev, etc)",
     )
     type: Optional[StrictStr] = "model-version"
     source: Source1 = Field(...)
@@ -61,7 +60,7 @@ class ModelVersionManifest(BaseModel):
     __properties = [
         "description",
         "metadata",
-        "tags",
+        "version_alias",
         "type",
         "source",
         "framework",
@@ -69,6 +68,18 @@ class ModelVersionManifest(BaseModel):
         "step",
     ]
 
+    @validator("version_alias")
+    def version_alias_validate_regular_expression(cls, value):
+        """Validates the regular expression"""
+        if value is None:
+            return value
+
+        if not re.match(r"^v[a-zA-Z0-9.-]*([a-zA-Z0-9]+)$", value):
+            raise ValueError(
+                r"must validate the regular expression /^v[a-zA-Z0-9.-]*([a-zA-Z0-9]+)$/"
+            )
+        return value
+
     @validator("type")
     def type_validate_enum(cls, value):
         """Validates the enum"""
@@ -125,7 +136,7 @@ class ModelVersionManifest(BaseModel):
             {
                 "description": obj.get("description"),
                 "metadata": obj.get("metadata"),
-                "tags": obj.get("tags"),
+                "version_alias": obj.get("version_alias"),
                 "type": obj.get("type")
                 if obj.get("type") is not None
                 else "model-version",

truefoundry/ml/autogen/client_README.md

@@ -121,7 +121,7 @@ Class | Method | HTTP request | Description
 *MlfoundryArtifactsApi* | [**get_signed_urls_for_dataset_write_post**](truefoundry/ml/autogen/client/docs/MlfoundryArtifactsApi.md#get_signed_urls_for_dataset_write_post) | **POST** /api/2.0/mlflow/mlfoundry-artifacts/datasets/get-signed-urls-for-write | Get Signed Urls For Dataset Write
 *MlfoundryArtifactsApi* | [**get_signed_urls_for_read_post**](truefoundry/ml/autogen/client/docs/MlfoundryArtifactsApi.md#get_signed_urls_for_read_post) | **POST** /api/2.0/mlflow/mlfoundry-artifacts/artifact-versions/get-signed-urls-for-read | Get Signed Urls For Read
 *MlfoundryArtifactsApi* | [**get_signed_urls_for_write_post**](truefoundry/ml/autogen/client/docs/MlfoundryArtifactsApi.md#get_signed_urls_for_write_post) | **POST** /api/2.0/mlflow/mlfoundry-artifacts/artifact-versions/get-signed-urls-for-write | Get Signed Urls For Write
-*MlfoundryArtifactsApi* | [**get_tags_for_artifact_get**](truefoundry/ml/autogen/client/docs/MlfoundryArtifactsApi.md#get_tags_for_artifact_get) | **GET** /api/2.0/mlflow/mlfoundry-artifacts/artifacts/get-tags | Get Tags For Artifact
+*MlfoundryArtifactsApi* | [**get_version_aliases_for_artifact_get**](truefoundry/ml/autogen/client/docs/MlfoundryArtifactsApi.md#get_version_aliases_for_artifact_get) | **GET** /api/2.0/mlflow/mlfoundry-artifacts/artifacts/get-version-aliases | Get Version Aliases For Artifact
 *MlfoundryArtifactsApi* | [**list_artifact_versions_post**](truefoundry/ml/autogen/client/docs/MlfoundryArtifactsApi.md#list_artifact_versions_post) | **POST** /api/2.0/mlflow/mlfoundry-artifacts/artifact-versions/list | List Artifact Versions
 *MlfoundryArtifactsApi* | [**list_artifacts_post**](truefoundry/ml/autogen/client/docs/MlfoundryArtifactsApi.md#list_artifacts_post) | **POST** /api/2.0/mlflow/mlfoundry-artifacts/artifacts/list | List Artifacts
 *MlfoundryArtifactsApi* | [**list_datasets_post**](truefoundry/ml/autogen/client/docs/MlfoundryArtifactsApi.md#list_datasets_post) | **POST** /api/2.0/mlflow/mlfoundry-artifacts/datasets/list | List Datasets
@@ -220,7 +220,7 @@ Class | Method | HTTP request | Description
  - [FileInfoDto](truefoundry/ml/autogen/client/docs/FileInfoDto.md)
  - [FinalizeArtifactVersionRequestDto](truefoundry/ml/autogen/client/docs/FinalizeArtifactVersionRequestDto.md)
  - [Framework](truefoundry/ml/autogen/client/docs/Framework.md)
- - [GetArtifactTagsResponseDto](truefoundry/ml/autogen/client/docs/GetArtifactTagsResponseDto.md)
+ - [GetArtifactVersionAliasesResponseDto](truefoundry/ml/autogen/client/docs/GetArtifactVersionAliasesResponseDto.md)
  - [GetExperimentResponseDto](truefoundry/ml/autogen/client/docs/GetExperimentResponseDto.md)
  - [GetLatestRunLogResponseDto](truefoundry/ml/autogen/client/docs/GetLatestRunLogResponseDto.md)
  - [GetMetricHistoryResponse](truefoundry/ml/autogen/client/docs/GetMetricHistoryResponse.md)

truefoundry/ml/autogen/entities/artifacts.py

@@ -1,6 +1,6 @@
 # generated by datamodel-codegen:
 #   filename:  artifacts.json
-#   timestamp: 2024-12-16T06:57:32+00:00
+#   timestamp: 2025-01-03T09:11:54+00:00
 
 from __future__ import annotations
 
@@ -58,16 +58,11 @@ class BaseArtifactVersion(BaseModel):
         ...,
         description="+label=Metadata\n+docs=Metadata for the artifact or model version\n+usage=Metadata for the artifact or model version\n+uiType=JsonInput",
     )
-    tags: Optional[
-        List[
-            constr(
-                regex=r"^(?!^\d+$)(?!.*[._-]{2,})[a-zA-Z0-9]+([._-][a-zA-Z0-9]+)*$",
-                max_length=128,
-            )
-        ]
+    version_alias: Optional[
+        constr(regex=r"^v[a-zA-Z0-9.-]*([a-zA-Z0-9]+)$", max_length=128)
     ] = Field(
         None,
-        description="+label=Tags\n+usage=Tags for the artifact or model version\n+docs=Tags for the artifact or model version",
+        description="+label=Version Alias\n+usage=The version alias for artifact or model version which should start with 'v' followed by alphanumeric and it can include '.' and '-' in between (e.g. v1.0.0, v-prod, v-dev, etc)\n+docs=The version alias for artifact or model version which should start with 'v' followed by alphanumeric and it can include '.' and '-' in between (e.g. v1.0.0, v-prod, v-dev, etc)\n+message=The version alias should start with 'v' followed by alphanumeric and it can include '.' and '-' in between (e.g. v1.0.0, v-prod, v-dev, etc)",
     )
 
 

truefoundry/ml/clients/servicefoundry_client.py

@@ -1,36 +1,57 @@
-from typing import Optional
+import functools
 
 from truefoundry.common.constants import (
     SERVICEFOUNDRY_CLIENT_MAX_RETRIES,
     VERSION_PREFIX,
 )
+from truefoundry.common.exceptions import HttpRequestException
+from truefoundry.common.request_utils import (
+    http_request,
+    request_handling,
+    requests_retry_session,
+)
 from truefoundry.common.servicefoundry_client import (
     ServiceFoundryServiceClient as BaseServiceFoundryServiceClient,
 )
-from truefoundry.ml.clients.entities import (
-    HostCreds,
-)
-from truefoundry.ml.clients.utils import http_request_safe
 from truefoundry.ml.exceptions import MlFoundryException
 
 
 class ServiceFoundryServiceClient(BaseServiceFoundryServiceClient):
-    # TODO (chiragjn): Rename tracking_uri to tfy_host
-    def __init__(self, tracking_uri: str, token: Optional[str] = None):
-        super().__init__(base_url=tracking_uri)
-        self.host_creds = HostCreds(host=self._api_server_url, token=token)
+    def __init__(self, tfy_host: str, token: str):
+        super().__init__(tfy_host=tfy_host)
+        self._token = token
+
+    @functools.cached_property
+    def _min_cli_version_required(self) -> str:
+        # TODO (chiragjn): read the mlfoundry min cli version from the config?
+        return self.python_sdk_config.truefoundry_cli_min_version
 
     def get_integration_from_id(self, integration_id: str):
         integration_id = integration_id or ""
-        response = http_request_safe(
-            host_creds=self.host_creds,
-            endpoint=f"{VERSION_PREFIX}/provider-accounts/provider-integrations",
-            params={"id": integration_id, "type": "blob-storage"},
+        session = requests_retry_session(retries=SERVICEFOUNDRY_CLIENT_MAX_RETRIES)
+        response = http_request(
             method="get",
+            url=f"{self._api_server_url}/{VERSION_PREFIX}/provider-accounts/provider-integrations",
+            token=self._token,
             timeout=3,
-            max_retries=SERVICEFOUNDRY_CLIENT_MAX_RETRIES,
+            params={"id": integration_id, "type": "blob-storage"},
+            session=session,
         )
-        data = response.json()
+
+        try:
+            data = request_handling(response)
+            assert isinstance(data, dict)
+        except HttpRequestException as he:
+            raise MlFoundryException(
+                f"Failed to get storage integration from id: {integration_id}. Error: {he.message}",
+                status_code=he.status_code,
+            ) from None
+        except Exception as e:
+            raise MlFoundryException(
+                f"Failed to get storage integration from id: {integration_id}. Error: {str(e)}"
+            ) from None
+
+        # TODO (chiragjn): Parse this using Pydantic
         if (
             data.get("providerIntegrations")
             and len(data["providerIntegrations"]) > 0

truefoundry/ml/exceptions.py

@@ -1,8 +1,9 @@
 from typing import Optional
 
 
+# TODO (chiragjn): We need to establish uniform exception handling across codebase
 class MlFoundryException(Exception):
-    def __init__(self, message, status_code: Optional[int] = None):
+    def __init__(self, message: str, status_code: Optional[int] = None):
         self.message = str(message)
         self.status_code = status_code
         super().__init__(message)

truefoundry/ml/log_types/artifacts/artifact.py

@@ -9,6 +9,7 @@ import warnings
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, Dict, List, NamedTuple, Optional, Union
 
+from truefoundry.common.warnings import TrueFoundryDeprecationWarning
 from truefoundry.ml.artifact.truefoundry_artifact_repo import (
     ArtifactIdentifier,
     MlFoundryArtifactsRepository,
@@ -83,7 +84,7 @@ class ArtifactVersion:
         self._deleted = False
         self._description: str = ""
         self._metadata: Dict[str, Any] = {}
-        self._tags: List[str] = []
+        self._version_alias: Optional[str] = None
         self._set_mutable_attrs()
 
     @classmethod
@@ -131,13 +132,13 @@ class ArtifactVersion:
             manifest = self._artifact_version.manifest.actual_instance
             self._description = manifest.description or ""
             self._metadata = copy.deepcopy(manifest.metadata)
-            self._tags = copy.deepcopy(manifest.tags or [])
+            self._version_alias = manifest.version_alias or None
         else:
             self._description = self._artifact_version.description or ""
             self._metadata = copy.deepcopy(
                 self._artifact_version.artifact_metadata or {}
             )
-            self._tags = []
+            self._version_alias = None
 
     def _refetch_artifact_version(self, reset_mutable_attrs: bool = True):
         _artifact_version = (
@@ -210,31 +211,31 @@ class ArtifactVersion:
         self._metadata = copy.deepcopy(value)
 
     @property
-    def tags(self) -> List[str]:
+    def version_alias(self) -> Optional[str]:
         """
-        Get tags for the current model version
+        Get version alias for the current artifact version
         """
         if not self._artifact_version.manifest:
             warnings.warn(
-                message="This model version was created using an older serialization format. tags do not exist, returning empty list",
-                category=DeprecationWarning,
+                message="This artifact version was created using an older serialization format. version alias does not exist",
+                category=TrueFoundryDeprecationWarning,
                 stacklevel=2,
             )
-        return self._tags
+        return self._version_alias
 
-    @tags.setter
-    def tags(self, value: List[str]):
+    @version_alias.setter
+    def version_alias(self, value: Optional[str]):
         """
-        Set the tags for current model version
+        Set the version alias for current artifact version
         """
         if not self._artifact_version.manifest:
             warnings.warn(
-                message="This model version was created using an older serialization format. Tags will not be updated",
-                category=DeprecationWarning,
+                message="This artifact version was created using an older serialization format. version alias will not be updated",
+                category=TrueFoundryDeprecationWarning,
                 stacklevel=2,
             )
             return
-        self._tags = copy.deepcopy(value)
+        self._version_alias = value
 
     @property
     def created_at(self) -> Optional[datetime.datetime]:
@@ -398,7 +399,7 @@ class ArtifactVersion:
             assert isinstance(manifest, ArtifactVersionManifest)
             manifest.description = self.description
             manifest.metadata = self.metadata
-            manifest.tags = self.tags
+            manifest.version_alias = self.version_alias
         else:
             manifest = None
         try:

truefoundry/ml/log_types/artifacts/model.py

@@ -8,8 +8,9 @@ import typing
 import uuid
 import warnings
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, Dict, List, Optional, Union
+from typing import TYPE_CHECKING, Any, Dict, Optional, Union
 
+from truefoundry.common.warnings import TrueFoundryDeprecationWarning
 from truefoundry.ml.artifact.truefoundry_artifact_repo import (
     ArtifactIdentifier,
     MlFoundryArtifactsRepository,
@@ -108,7 +109,7 @@ class ModelVersion:
         self._metadata: Dict[str, Any] = {}
         self._environment: Optional[ModelVersionEnvironment] = None
         self._framework: Optional[ModelFrameworkType] = None
-        self._tags: List[str] = []
+        self._version_alias: Optional[str] = None
         self._set_mutable_attrs()
 
     @classmethod
@@ -159,7 +160,7 @@ class ModelVersion:
                 if manifest.framework
                 else None
             )
-            self._tags = copy.deepcopy(self._model_version.manifest.tags) or []
+            self._version_alias = self._model_version.manifest.version_alias or None
         else:
             self._description = self._model_version.description or ""
             self._metadata = copy.deepcopy(self._model_version.artifact_metadata or {})
@@ -167,7 +168,7 @@ class ModelVersion:
             self._framework = _ModelFramework.to_model_framework_type(
                 self._model_version.model_framework
             )
-            self._tags = []
+            self._version_alias = None
 
     def _refetch_model_version(self, reset_mutable_attrs: bool = True):
         _model_version = self._mlfoundry_artifacts_api.get_model_version_get(
@@ -238,31 +239,31 @@ class ModelVersion:
         self._metadata = copy.deepcopy(value)
 
     @property
-    def tags(self) -> List[str]:
+    def version_alias(self) -> Optional[str]:
         """
-        Get tags for the current artifact version
+        Get version alias for the current model version
         """
         if not self._model_version.manifest:
             warnings.warn(
-                message="This model version was created using an older serialization format. tags do not exist, returning empty list",
-                category=DeprecationWarning,
+                message="This model version was created using an older serialization format. version alias does not exist",
+                category=TrueFoundryDeprecationWarning,
                 stacklevel=2,
             )
-        return self._tags
+        return self._version_alias
 
-    @tags.setter
-    def tags(self, value: List[str]):
+    @version_alias.setter
+    def version_alias(self, value: Optional[str]):
         """
-        Set the tags for current artifact version
+        Set the version alias for current artifact version
         """
         if not self._model_version.manifest:
             warnings.warn(
-                message="This model version was created using an older serialization format. Tags will not be updated",
-                category=DeprecationWarning,
+                message="This model version was created using an older serialization format. version alias will not be updated",
+                category=TrueFoundryDeprecationWarning,
                 stacklevel=2,
             )
             return
-        self._tags = copy.deepcopy(value)
+        self._version_alias = value
 
     @property
     def environment(self) -> Optional[ModelVersionEnvironment]:
@@ -270,7 +271,7 @@ class ModelVersion:
         if not self._model_version.manifest:
             warnings.warn(
                 message="This model version was created using an older serialization format. environment does not exist, returning None",
-                category=DeprecationWarning,
+                category=TrueFoundryDeprecationWarning,
                 stacklevel=2,
             )
         return self._environment
@@ -281,7 +282,7 @@ class ModelVersion:
         if not self._model_version.manifest:
             warnings.warn(
                 message="This model version was created using an older serialization format. Environment will not be updated",
-                category=DeprecationWarning,
+                category=TrueFoundryDeprecationWarning,
                 stacklevel=2,
             )
             return
@@ -300,7 +301,7 @@ class ModelVersion:
         if not self._model_version.manifest:
             warnings.warn(
                 message="This model version was created using an older serialization format. Framework will not be updated",
-                category=DeprecationWarning,
+                category=TrueFoundryDeprecationWarning,
                 stacklevel=2,
             )
             return
@@ -488,7 +489,7 @@ class ModelVersion:
             self._model_version.manifest.framework = (
                 Framework.from_dict(self.framework.dict()) if self.framework else None
             )
-            self._model_version.manifest.tags = self.tags
+            self._model_version.manifest.version_alias = self.version_alias
         try:
             _model_version = self._mlfoundry_artifacts_api.update_model_version_post(
                 update_model_version_request_dto=UpdateModelVersionRequestDto(

truefoundry/ml/log_types/artifacts/utils.py

@@ -3,7 +3,7 @@ import logging
 import os
 import posixpath
 from pathlib import Path, PureWindowsPath
-from typing import Any, Dict, Optional, Sequence, Tuple, Union
+from typing import Any, Dict, List, Optional, Sequence, Tuple, Union
 
 from truefoundry.ml.exceptions import MlFoundryException
 from truefoundry.ml.log_types.artifacts.constants import DESCRIPTION_MAX_LENGTH
@@ -63,7 +63,7 @@ def get_single_file_path_if_only_one_in_directory(path: str) -> Optional[str]:
 
     # If it's a directory, check if it contains a single file
     if is_destination_path_dirlike(path):
-        all_files = []
+        all_files: List[str] = []
         for root, _, files in os.walk(path):
             # Collect all files found in any subdirectory
             all_files.extend(os.path.join(root, f) for f in files)

truefoundry/ml/mlfoundry_api.py

@@ -17,7 +17,7 @@ from typing import (
 
 import coolname
 
-from truefoundry.common.utils import ContextualDirectoryManager, relogin_error_message
+from truefoundry.common.utils import ContextualDirectoryManager
 from truefoundry.ml import constants
 from truefoundry.ml.autogen.client import (  # type: ignore[attr-defined]
     ArtifactDto,
@@ -63,10 +63,8 @@ from truefoundry.ml.log_types.artifacts.model import (
 from truefoundry.ml.logger import logger
 from truefoundry.ml.mlfoundry_run import MlFoundryRun
 from truefoundry.ml.session import (
-    Session,
+    MLFoundrySession,
     _get_api_client,
-    get_active_session,
-    init_session,
 )
 from truefoundry.ml.validation_utils import (
     _validate_ml_repo_description,
@@ -112,13 +110,12 @@ class MlFoundry:
     """MlFoundry."""
 
     # TODO (chiragjn): Don't allow session as None here!
-    def __init__(self, session: Session):
+    def __init__(self, session: MLFoundrySession):
         """__init__
 
         Args:
             session (Optional[Session], optional): Session instance to get auth credentials from
         """
-        self._tracking_uri: str = session.tracking_uri
         self._api_client = _get_api_client(session=session)
         self._experiments_api = ExperimentsApi(api_client=self._api_client)
         self._runs_api = RunsApi(api_client=self._api_client)
@@ -236,16 +233,9 @@ class MlFoundry:
                 raise MlFoundryException(err_msg) from e
             return
 
-        session = get_active_session()
-        if session is None:
-            raise MlFoundryException(
-                relogin_error_message(
-                    "No active session found. Perhaps you are not logged in?",
-                )
-            )
         servicefoundry_client = ServiceFoundryServiceClient(
-            tracking_uri=self.get_tracking_uri(),
-            token=session.token.access_token,
+            tfy_host=self._api_client.tfy_host,
+            token=self._api_client.access_token,
         )
 
         assert existing_ml_repo.storage_integration_id is not None
@@ -604,26 +594,6 @@ class MlFoundry:
             if not runs or page_token is None:
                 done = True
 
-    def get_tracking_uri(self) -> str:
-        """
-        Get the current tracking URI.
-
-        Returns:
-            The tracking URI.
-
-        Examples:
-
-            ```python
-            import tempfile
-            from truefoundry.ml import get_client
-
-            client = get_client()
-            tracking_uri = client.get_tracking_uri()
-            print("Current tracking uri: {}".format(tracking_uri))
-            ```
-        """
-        return self._tracking_uri
-
     def _initialize_model_server(
         self,
         name: str,
@@ -1239,7 +1209,6 @@ class MlFoundry:
             raise MlFoundryException(
                 "artifact_paths cannot be empty, atleast one artifact_path must be passed"
             )
-
         ml_repo_id = self._get_ml_repo_id(ml_repo=ml_repo)
         artifact_version = _log_artifact_version(
             run=None,
@@ -1377,7 +1346,6 @@ class MlFoundry:
 
         """
         ml_repo_id = self._get_ml_repo_id(ml_repo=ml_repo)
-
         model_version = _log_model_version(
             run=None,
             mlfoundry_artifacts_api=self._mlfoundry_artifacts_api,
@@ -1648,5 +1616,5 @@ def get_client() -> MlFoundry:
         client = get_client()
         ```
     """
-    session = init_session()
+    session = MLFoundrySession.new()
     return MlFoundry(session=session)