truefoundry 0.11.10__py3-none-any.whl → 0.11.11__py3-none-any.whl

truefoundry/common/storage_provider_utils.py

@@ -22,6 +22,23 @@ from truefoundry.pydantic_v1 import BaseModel
 logger = logging.getLogger("truefoundry")
 
 
+def truncate_path_for_progress(
+    path: str, max_length: int, relpath: bool = False
+) -> str:
+    if relpath:
+        path = os.path.relpath(path)
+    if len(path) <= max_length:
+        return path
+    parts = path.split(os.sep)
+    result = parts[-1]  # start with filename
+    i = len(parts) - 2
+    # keep prepending directories until adding more would exceed max_len - 3
+    while i >= 0 and len(result) + len(parts[i]) + 1 <= max_length - 3:
+        result = parts[i] + os.sep + result
+        i -= 1
+    return "..." + os.sep + result
+
+
 class MultiPartUploadStorageProvider(str, Enum):
     S3_COMPATIBLE = "S3_COMPATIBLE"
     AZURE_BLOB = "AZURE_BLOB"
@@ -182,7 +199,7 @@ def _file_part_upload(
                 return response
 
 
-def s3_compatible_multipart_upload(
+def s3_compatible_multipart_upload(  # noqa: C901
     multipart_upload: MultiPartUpload,
     local_file: str,
     multipart_info: _FileMultiPartInfo,
@@ -190,13 +207,15 @@ def s3_compatible_multipart_upload(
     progress_bar: Optional[Progress] = None,
     abort_event: Optional[Event] = None,
     exception_class=HttpRequestException,
-):
+) -> None:
     abort_event = abort_event or Event()
     parts = []
 
-    if progress_bar:
+    if progress_bar is not None:
         multi_part_upload_progress = progress_bar.add_task(
-            f"[green]Uploading {local_file}:", start=True
+            f"[green]⬆ {truncate_path_for_progress(local_file, 64, relpath=True)}",
+            start=True,
+            visible=True,
         )
 
     def upload(part_number: int, seek: int) -> None:
@@ -221,7 +240,7 @@ def s3_compatible_multipart_upload(
             multipart_info.num_parts,
             local_file,
         )
-        if progress_bar:
+        if progress_bar is not None:
             progress_bar.update(
                 multi_part_upload_progress,
                 advance=multipart_info.part_size,
@@ -254,10 +273,12 @@ def s3_compatible_multipart_upload(
         timeout=2 * 60,
     )
     response.raise_for_status()
+    if progress_bar is not None:
+        progress_bar.refresh()
     logger.debug("Multipart upload of %s completed", local_file)
 
 
-def azure_multi_part_upload(
+def azure_multi_part_upload(  # noqa: C901
     multipart_upload: MultiPartUpload,
     local_file: str,
     multipart_info: _FileMultiPartInfo,
@@ -265,12 +286,14 @@ def azure_multi_part_upload(
     progress_bar: Optional[Progress] = None,
     abort_event: Optional[Event] = None,
     exception_class=HttpRequestException,
-):
+) -> None:
     abort_event = abort_event or Event()
 
-    if progress_bar:
+    if progress_bar is not None:
         multi_part_upload_progress = progress_bar.add_task(
-            f"[green]Uploading {local_file}:", start=True
+            f"[green]⬆ {truncate_path_for_progress(local_file, 64, relpath=True)}",
+            start=True,
+            visible=True,
         )
 
     def upload(part_number: int, seek: int):
@@ -289,7 +312,7 @@ def azure_multi_part_upload(
             abort_event=abort_event,
             exception_class=exception_class,
         )
-        if progress_bar:
+        if progress_bar is not None:
             progress_bar.update(
                 multi_part_upload_progress,
                 advance=multipart_info.part_size,
@@ -328,4 +351,6 @@ def azure_multi_part_upload(
             timeout=2 * 60,
         )
         response.raise_for_status()
+    if progress_bar is not None:
+        progress_bar.refresh()
     logger.debug("Multipart upload of %s completed", local_file)

truefoundry/ml/artifact/truefoundry_artifact_repo.py

@@ -40,6 +40,7 @@ from truefoundry.common.storage_provider_utils import (
     azure_multi_part_upload,
     decide_file_parts,
     s3_compatible_multipart_upload,
+    truncate_path_for_progress,
 )
 from truefoundry.ml._autogen.client import (  # type: ignore[attr-defined]
     ApiClient,
@@ -125,14 +126,14 @@ def _signed_url_upload_file(
             augmented_raise_for_status(response, exception_class=MlFoundryException)  # type: ignore
         return
 
-    task_progress_bar = progress_bar.add_task(
-        f"[green]Uploading {local_file}:", start=True
+    task_id = progress_bar.add_task(
+        f"[green]⬆ {truncate_path_for_progress(local_file, 64, relpath=True)}",
+        start=True,
+        visible=True,
     )
 
     def callback(length):
-        progress_bar.update(
-            task_progress_bar, advance=length, total=os.stat(local_file).st_size
-        )
+        progress_bar.update(task_id, advance=length, total=os.stat(local_file).st_size)
         if abort_event and abort_event.is_set():
             raise Exception("aborting upload")
 
@@ -147,6 +148,9 @@ def _signed_url_upload_file(
         ) as response:
             augmented_raise_for_status(response, exception_class=MlFoundryException)  # type: ignore
 
+    if progress_bar is not None:
+        progress_bar.refresh()
+
 
 def _download_file_using_http_uri(
     http_uri,
@@ -167,11 +171,18 @@ def _download_file_using_http_uri(
         exception_class=MlFoundryException,  # type: ignore
     ) as response:
         augmented_raise_for_status(response, exception_class=MlFoundryException)  # type: ignore
-        file_size = int(response.headers.get("Content-Length", 0))
+        file_size = int(response.headers.get("Content-Length", -1))
+        if file_size == 0 and callback:
+            # special case for empty files
+            callback(1, 1)
+        file_size = file_size if file_size > 0 else 0
         with open(download_path, "wb") as output_file:
             for chunk in response.iter_content(chunk_size=chunk_size):
                 if callback:
                     callback(len(chunk), file_size)
+                    print(
+                        f"Sent callback for {download_path} {len(chunk)} / {file_size}"
+                    )
                 if not chunk:
                     break
                 output_file.write(chunk)
@@ -658,15 +669,18 @@ class MlFoundryArtifactsRepository:
             logger.info("Downloading %s to %s", remote_file_path, local_path)
 
         if progress_bar is not None:
-            download_progress_bar = progress_bar.add_task(
-                f"[green]Downloading to {remote_file_path}:", start=True
+            task_id = progress_bar.add_task(
+                f"[green]⬇ {truncate_path_for_progress(remote_file_path, 64)}",
+                start=True,
+                visible=True,
             )
 
-        def callback(chunk, total_file_size):
+        def callback(chunk_size: int, total_file_size: int):
+            nonlocal task_id
             if progress_bar is not None:
                 progress_bar.update(
-                    download_progress_bar,
-                    advance=chunk,
+                    task_id,
+                    advance=chunk_size,
                     total=total_file_size,
                 )
             if abort_event and abort_event.is_set():
@@ -677,6 +691,9 @@ class MlFoundryArtifactsRepository:
             download_path=local_path,
             callback=callback,
         )
+
+        if progress_bar is not None:
+            progress_bar.refresh()
         logger.debug("Downloaded %s to %s", remote_file_path, local_path)
 
     def _download_artifact(

truefoundry/ml/log_types/artifacts/artifact.py

@@ -347,10 +347,11 @@ class ArtifactVersion:
             artifact_version.download(path="<your-desired-download-path>")
             ```
         """
-        download_path = self._download(
+        download_info = self._download(
             path=path, overwrite=overwrite, progress=progress
         )
-        return download_path.download_dir
+        logger.info("Downloaded artifact contents to %s", download_info.download_dir)
+        return download_info.download_dir
 
     def delete(self) -> bool:
         """

truefoundry/ml/log_types/artifacts/model.py

@@ -440,6 +440,7 @@ class ModelVersion:
         download_info = self._download(
             path=path, overwrite=overwrite, progress=progress
         )
+        logger.info("Downloaded model contents to %s", download_info.model_dir)
         return download_info
 
     def delete(self) -> bool:

{truefoundry-0.11.10.dist-info → truefoundry-0.11.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: truefoundry
-Version: 0.11.10
+Version: 0.11.11
 Summary: TrueFoundry CLI
 Author-email: TrueFoundry Team <abhishek@truefoundry.com>
 Requires-Python: <3.14,>=3.8.1

{truefoundry-0.11.10.dist-info → truefoundry-0.11.11.dist-info}/RECORD

@@ -48,7 +48,7 @@ truefoundry/common/exceptions.py,sha256=jkU0N7hV_P-EhXeud4I5vuB9glXXZSWPf8LcH04m
 truefoundry/common/request_utils.py,sha256=e9qrAQ1MutU7JALDKcucmNd0KQEVBqgW3yx0w1zeHIU,5700
 truefoundry/common/servicefoundry_client.py,sha256=2fYhdVPSvLXz5C5tosOq86JD8WM3IRUIy1VO9deDxZI,3340
 truefoundry/common/session.py,sha256=d9l3TEBpqVP4mr4mTGY1qVxc815skzMlNNdw14otg34,2923
-truefoundry/common/storage_provider_utils.py,sha256=yURhMw8k0FLFvaviRHDiifhvc6GnuQwGMC9Qd2uM440,10934
+truefoundry/common/storage_provider_utils.py,sha256=jX9maCtWusZx63324cmPxHiGeIluZZzbDaJ1QYTIhAw,11856
 truefoundry/common/types.py,sha256=BMJFCsR1lPJAw66IQBSvLyV4I6o_x5oj78gVsUa9si8,188
 truefoundry/common/utils.py,sha256=P0FuAadoJGdpieUORLSN-PiFnkyoGO-K2cS4OPITBWg,6714
 truefoundry/common/warnings.py,sha256=xDMhR_-ZGC40Ycaj6nlFb5MYPexn8WbKCHd4FlflTXQ,705
@@ -349,7 +349,7 @@ truefoundry/ml/_autogen/models/schema.py,sha256=a_bp42MMPUbwO3407m0UW2W8EOhnxZXf
 truefoundry/ml/_autogen/models/signature.py,sha256=rBjpxUIsEeWM0sIyYG5uCJB18DKHR4k5yZw8TzuoP48,4987
 truefoundry/ml/_autogen/models/utils.py,sha256=c7RtSLXhOLcP8rjuUtfnMdaKVTZvvbsmw98gPAkAFrs,24371
 truefoundry/ml/artifact/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-truefoundry/ml/artifact/truefoundry_artifact_repo.py,sha256=qZ8p3IZYBiyMQjhMt_ZM46b6O_gHMy0ZUFKU-EylS3o,35685
+truefoundry/ml/artifact/truefoundry_artifact_repo.py,sha256=ITZbhvzwa8NbN66K7V9iufzZHVguuLYn1pHCDSE-P-o,36273
 truefoundry/ml/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 truefoundry/ml/cli/cli.py,sha256=MwpY7z_NEeJE_XIP7XbZELjNeu2vpMmohttHCKDRk54,335
 truefoundry/ml/cli/utils.py,sha256=j6_mZ4Spn114mz3P4QQ8jx0tmorXIuyQnHXVUSDvZi4,1035
@@ -365,11 +365,11 @@ truefoundry/ml/log_types/plot.py,sha256=LDh4uy6z2P_a2oPM2lc85c0lt8utVvunohzeMawF
 truefoundry/ml/log_types/pydantic_base.py,sha256=eBlw_AEyAz4iJKDP4zgJOCFWcldwQqpf7FADW1jzIQY,272
 truefoundry/ml/log_types/utils.py,sha256=xjJ21jdPScvFmw3TbVh5NCzbzJwaqiXJyiiT4xxX1EI,335
 truefoundry/ml/log_types/artifacts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-truefoundry/ml/log_types/artifacts/artifact.py,sha256=JiqdWp6XQe2S_zP96urXCjyfdxFlx6-GNBzH9Te7hTQ,19854
+truefoundry/ml/log_types/artifacts/artifact.py,sha256=OXJDaJZLGE8jA-6A8pdApfpbz1x3O-8rIMWUkG_8hYA,19940
 truefoundry/ml/log_types/artifacts/constants.py,sha256=7blG13UXSkZVZkN8EDFqaH-a_ZonJA6pI0gwJwkIZ-s,1298
 truefoundry/ml/log_types/artifacts/dataset.py,sha256=OgWIoT59AhMw8P01FfvUKbJ3EL6HQf_Xw8X4E3Ff5Sg,13172
 truefoundry/ml/log_types/artifacts/general_artifact.py,sha256=yr-SQ2fhUR_sE1MB5zoHHYpGC8tizH_-t3lhsxCAULU,2747
-truefoundry/ml/log_types/artifacts/model.py,sha256=oRX6bKb5tN4LjDFifeDpjv4z1-vHXf3Ma6-nkp7mN4M,24831
+truefoundry/ml/log_types/artifacts/model.py,sha256=j4Gf0TKpi-JCOBqCdkH40pkpDLwvSk04KgQn2sK5fZI,24911
 truefoundry/ml/log_types/artifacts/utils.py,sha256=INZhhzl6OaD6qFAyxaLJAhXhFd6wKNujMj-lq2v8p4Q,9340
 truefoundry/ml/log_types/image/__init__.py,sha256=fcOq8yQnNj1rkLcPeIjLXBpdA1WIeiPsXOlAAvMxx7M,76
 truefoundry/ml/log_types/image/constants.py,sha256=wLtGEOA4T5fZHSlOXPuNDLX3lpbCtwlvGKPFk_1fah0,255
@@ -387,7 +387,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.10.dist-info/METADATA,sha256=ipgkIpx7Ho9NogRqOTZcBiOCnAMUE-BbOBHhvxE7i50,2761
-truefoundry-0.11.10.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-truefoundry-0.11.10.dist-info/entry_points.txt,sha256=xVjn7RMN-MW2-9f7YU-bBdlZSvvrwzhpX1zmmRmsNPU,98
-truefoundry-0.11.10.dist-info/RECORD,,
+truefoundry-0.11.11.dist-info/METADATA,sha256=KvW4uvzJ44zwy8dOpOK_NfMp3IS2h3Z44gG5OOowTHI,2761
+truefoundry-0.11.11.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+truefoundry-0.11.11.dist-info/entry_points.txt,sha256=xVjn7RMN-MW2-9f7YU-bBdlZSvvrwzhpX1zmmRmsNPU,98
+truefoundry-0.11.11.dist-info/RECORD,,