truefoundry 0.11.0__py3-none-any.whl → 0.11.1rc1__py3-none-any.whl

truefoundry/ml/mlfoundry_api.py

@@ -46,7 +46,6 @@ from truefoundry.ml._autogen.client.exceptions import (
     ApiException,
     NotFoundException,
 )
-from truefoundry.ml.clients.servicefoundry_client import ServiceFoundryServiceClient
 from truefoundry.ml.enums import ModelFramework, ViewType
 from truefoundry.ml.exceptions import MlFoundryException
 from truefoundry.ml.internal_namespace import NAMESPACE
@@ -139,7 +138,8 @@ class MlFoundry:
         except (IndexError, NotFoundError):
             err_msg = (
                 f"ML Repo Does Not Exist for name: {ml_repo}. You may either "
-                "create it from the dashboard or using client.create_ml_repo('<ml_repo_name>')"
+                f"create it from the dashboard or using "
+                f"`client.create_ml_repo(ml_repo='{ml_repo}', storage_integration_fqn='<storage_integration_fqn>')`"
             )
             raise MlFoundryException(err_msg) from None
         except ApiError as e:
@@ -191,7 +191,12 @@ class MlFoundry:
 
             client = get_client()
 
-            client.create_ml_repo(ml_repo="my-repo")
+            client.create_ml_repo(
+                ml_repo="my-repo",
+                # This controls which bucket is used.
+                # You can get this from Platform > Integrations > Copy FQN of any Blob Storage type integration.
+                storage_integration_fqn="..."
+            )
             ```
         """
         _validate_ml_repo_name(ml_repo_name=name)
@@ -235,28 +240,11 @@ class MlFoundry:
                 raise MlFoundryException(err_msg) from e
             return
 
-        servicefoundry_client = ServiceFoundryServiceClient(
-            tfy_host=self._api_client.tfy_host,
-            token=self._api_client.access_token,
-        )
-
-        assert existing_ml_repo.storage_integration_id is not None
-        try:
-            existing_storage_integration = (
-                servicefoundry_client.get_integration_from_id(
-                    existing_ml_repo.storage_integration_id
-                )
-            )
-        except Exception as e:
-            raise MlFoundryException(
-                "Error in getting storage integration for ML Repo"
-            ) from e
-
-        if existing_storage_integration["fqn"] != storage_integration_fqn:
+        if existing_ml_repo.manifest.storage_integration_fqn != storage_integration_fqn:
             raise MlFoundryException(
                 f"ML Repo with same name already exists with storage integration:"
-                f"{existing_storage_integration['fqn']}. Cannot update the storage integration to: "
-                f"{storage_integration_fqn}"
+                f"{existing_ml_repo.manifest.storage_integration_fqn!r}. "
+                f"Cannot update the storage integration to: {storage_integration_fqn!r}"
             )
 
     def create_run(
@@ -562,7 +550,8 @@ class MlFoundry:
         except (IndexError, NotFoundError):
             raise MlFoundryException(
                 f"ML Repo with name {ml_repo} does not exist. "
-                "You may either create it from the dashboard or using client.create_ml_repo('<ml_repo_name>')"
+                f"You may either create it from the dashboard or using "
+                f"`client.create_ml_repo(ml_repo='{ml_repo}', storage_integration_fqn='<storage_integration_fqn>')`"
             ) from None
         except ApiError as e:
             raise MlFoundryException(
@@ -1202,7 +1191,12 @@ class MlFoundry:
             client = get_client()
             ml_repo = "sample-repo"
 
-            client.create_ml_repo(ml_repo=ml_repo)
+            client.create_ml_repo(
+                ml_repo=ml_repo,
+                # This controls which bucket is used.
+                # You can get this from Platform > Integrations > Copy FQN of any Blob Storage type integration.
+                storage_integration_fqn="..."
+            )
             client.log_artifact(
                 ml_repo=ml_repo,
                 name="hello-world-file",
@@ -1301,8 +1295,8 @@ class MlFoundry:
             client.create_ml_repo(  # This is only required once
                 ml_repo="my-classification-project",
                 # This controls which bucket is used.
-                # You can get this from Integrations > Blob Storage. `None` picks the default
-                storage_integration_fqn=None
+                # You can get this from Platform > Integrations > Copy FQN of any Blob Storage type integration.
+                storage_integration_fqn="..."
             )
             model_version = client.log_model(
                 ml_repo="my-classification-project",

{truefoundry-0.11.0.dist-info → truefoundry-0.11.1rc1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: truefoundry
-Version: 0.11.0
+Version: 0.11.1rc1
 Summary: TrueFoundry CLI
 Author-email: TrueFoundry Team <abhishek@truefoundry.com>
 Requires-Python: <3.14,>=3.8.1
@@ -30,7 +30,7 @@ Requires-Dist: requirements-parser<0.12.0,>=0.11.0
 Requires-Dist: rich-click<2.0.0,>=1.2.1
 Requires-Dist: rich<14.0.0,>=13.7.1
 Requires-Dist: tqdm<5.0.0,>=4.0.0
-Requires-Dist: truefoundry-sdk<0.2.0,>=0.1.5
+Requires-Dist: truefoundry-sdk<0.2.0,>=0.1.7
 Requires-Dist: typing-extensions>=4.0
 Requires-Dist: urllib3<3,>=1.26.18
 Requires-Dist: yq<4.0.0,>=3.1.0

{truefoundry-0.11.0.dist-info → truefoundry-0.11.1rc1.dist-info}/RECORD

@@ -127,7 +127,7 @@ truefoundry/ml/exceptions.py,sha256=QpDJSWmF7dIsByS0qOQbQZ_jytdNTzkHDDO3BxhTSo0,
 truefoundry/ml/git_info.py,sha256=jvAVm9ilqivnGq8qJdUvYdd8Siv0PLtqurB-PXsS5ho,2023
 truefoundry/ml/internal_namespace.py,sha256=QcqMHp6-C2im2H_02hlhi01EIcr1HhNaZprszs13EMU,1790
 truefoundry/ml/logger.py,sha256=VT-BF3BnBYTWVq87O58F0c8uXMu94gYzsiFlGY3_7Ao,458
-truefoundry/ml/mlfoundry_api.py,sha256=hA6XjaONGEUS4beewZd5HEA0mGRew_wMvUJaQW7CThc,60168
+truefoundry/ml/mlfoundry_api.py,sha256=EZvFs-HiUDV2H0tDrgRdeotplWTZm3T5Uw-0Zq3WuHo,60174
 truefoundry/ml/mlfoundry_run.py,sha256=b0wm08OUAiO1UpzdDNBeJh-Gsm_O5kEdbY86Ugv-26Y,44181
 truefoundry/ml/model_framework.py,sha256=nVbKTtKDRBdLzt7Wrg5_vJKZ-awHbISGvL73s-V9egU,18975
 truefoundry/ml/prompt_utils.py,sha256=8FueyElVTXLnLtC3O6hKsW_snocArr_B8KG3Qv6eFIQ,2651
@@ -355,7 +355,6 @@ truefoundry/ml/cli/commands/__init__.py,sha256=diDUiRUX4l6TtNLI4iF-ZblczkELM7FRV
 truefoundry/ml/cli/commands/download.py,sha256=N9MhsEQ3U24v_OmnMZT8Q4SoAi38Sm7a21unrACOSDw,2573
 truefoundry/ml/cli/commands/model_init.py,sha256=INyUAU6hiFClI8cZqX5hgnrtNbeKxlZxrjFrjzStU18,2664
 truefoundry/ml/clients/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-truefoundry/ml/clients/servicefoundry_client.py,sha256=GiB_SmETI2uo8E0Q43cEsOG6qYb80nB6gM7l3rL7zEs,2422
 truefoundry/ml/log_types/__init__.py,sha256=g4u4D4Jaj0aBK5GtrLV88-qThKZR9pSZ17vFEkN-LmM,125
 truefoundry/ml/log_types/plot.py,sha256=LDh4uy6z2P_a2oPM2lc85c0lt8utVvunohzeMawFjZw,7572
 truefoundry/ml/log_types/pydantic_base.py,sha256=eBlw_AEyAz4iJKDP4zgJOCFWcldwQqpf7FADW1jzIQY,272
@@ -381,7 +380,7 @@ truefoundry/workflow/remote_filesystem/__init__.py,sha256=LQ95ViEjJ7Ts4JcCGOxMPs
 truefoundry/workflow/remote_filesystem/logger.py,sha256=em2l7D6sw7xTLDP0kQSLpgfRRCLpN14Qw85TN7ujQcE,1022
 truefoundry/workflow/remote_filesystem/tfy_signed_url_client.py,sha256=xcT0wQmQlgzcj0nP3tJopyFSVWT1uv3nhiTIuwfXYeg,12342
 truefoundry/workflow/remote_filesystem/tfy_signed_url_fs.py,sha256=nSGPZu0Gyd_jz0KsEE-7w_BmnTD8CVF1S8cUJoxaCbc,13305
-truefoundry-0.11.0.dist-info/METADATA,sha256=nxfBh-eMI7_N9k5Baa3I_H3UwKMNOUH2jWPuE5-l4TE,2505
-truefoundry-0.11.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-truefoundry-0.11.0.dist-info/entry_points.txt,sha256=xVjn7RMN-MW2-9f7YU-bBdlZSvvrwzhpX1zmmRmsNPU,98
-truefoundry-0.11.0.dist-info/RECORD,,
+truefoundry-0.11.1rc1.dist-info/METADATA,sha256=jIzJR7W9qc5D4a-WuEne8Y8BUotdhjnc_CEcz-Bdp78,2508
+truefoundry-0.11.1rc1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+truefoundry-0.11.1rc1.dist-info/entry_points.txt,sha256=xVjn7RMN-MW2-9f7YU-bBdlZSvvrwzhpX1zmmRmsNPU,98
+truefoundry-0.11.1rc1.dist-info/RECORD,,

truefoundry/ml/clients/servicefoundry_client.py

@@ -1,65 +0,0 @@
-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.common.utils import get_user_agent
-from truefoundry.ml.exceptions import MlFoundryException
-
-
-class ServiceFoundryServiceClient(BaseServiceFoundryServiceClient):
-    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 ""
-        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,
-            params={"id": integration_id, "type": "blob-storage"},
-            session=session,
-            headers={
-                "User-Agent": get_user_agent(),
-            },
-        )
-
-        try:
-            result = request_handling(response)
-            assert isinstance(result, 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
-
-        data = result.get("data", result.get("providerAccounts"))
-        # TODO (chiragjn): Parse this using Pydantic
-        if data and len(data) > 0 and data[0]:
-            return data[0]
-        else:
-            raise MlFoundryException(
-                f"Invalid storage integration id: {integration_id}"
-            )