hafnia 0.5.0__py3-none-any.whl → 0.5.1__py3-none-any.whl

{hafnia-0.5.0.dist-info → hafnia-0.5.1.dist-info}/RECORD

@@ -6,23 +6,23 @@ hafnia/utils.py,sha256=l_awkrb3OttxqSMkPiYcpuP3c_kejkSmiqndSahc1s0,8703
 hafnia/data/__init__.py,sha256=o9QjiGbEcNa6r-qDmwwmxPXf-1UitNl5-WxFNcujqsg,111
 hafnia/data/factory.py,sha256=kHkvOtBUbwaShZBGf1kZzocDJBn_1dHHLrQxnUpJmfY,778
 hafnia/dataset/dataset_details_uploader.py,sha256=H_zz67bBwbgo4StUwBNmH89WlqydIc-tEQbrRnZDwgg,24161
-hafnia/dataset/dataset_helpers.py,sha256=SwQnFy0T0dGVRuBeT7tG_CHsb9WtW8v8mTg9TnQH2k4,4093
-hafnia/dataset/dataset_names.py,sha256=qYbrsqeKiTsu53w7uWDXdw0Y8cHDEHydoalakChKDcY,7413
-hafnia/dataset/hafnia_dataset.py,sha256=YzQjFAY3m5MJvKyHELWdS1mn9UY4xmGmnSRAS8nQRbY,34037
-hafnia/dataset/hafnia_dataset_types.py,sha256=B0yW7wI6Bf0ILw0HS3LeUu_w0NKJyTZhHvKXT_98q_A,21415
+hafnia/dataset/dataset_helpers.py,sha256=N8W_ioDlxP2VvNJXzqXLDbcEqgPKz0WyPNOBakHoBUc,6443
+hafnia/dataset/dataset_names.py,sha256=42_UKrDwcKEW48oTbtBaeyi5qVFVaMAj8vRvDv-mcEI,3616
+hafnia/dataset/hafnia_dataset.py,sha256=OOenIMPm8K23AgxHvmc_y05KCzxIwaZa-gv3uNC50NU,38519
+hafnia/dataset/hafnia_dataset_types.py,sha256=eCLawdjIFoul67AAtQ4xaKjbVSNAFA-mvbJYofiu2Sg,26848
 hafnia/dataset/license_types.py,sha256=b1Jt5e8N89sujIs4T9y39sJEkzpAwCoLDTHDTpkiEOI,2166
-hafnia/dataset/dataset_recipe/dataset_recipe.py,sha256=CkU61k_qaPSu_4Yo-NArr7jHWP417LCmzDKnmzZuDeo,19080
+hafnia/dataset/dataset_recipe/dataset_recipe.py,sha256=Ln49jcpOQ4qzumv-SkWSBCqNgSP1dGQloKSLs7psP90,20991
 hafnia/dataset/dataset_recipe/recipe_transforms.py,sha256=j3Oiytt3LI2rCaJid7Y44oT9MXvlZVqvZanngMebIWg,3088
 hafnia/dataset/dataset_recipe/recipe_types.py,sha256=AcrG6gpRt3Igl-CCJ60uyh-WkfI1NCnQ55M8yClSI9Q,5328
 hafnia/dataset/format_conversions/format_coco.py,sha256=7GjeF016ZBaKxu-VYiqXxuPw8HuuODV1cxc2TbDDZBw,19628
 hafnia/dataset/format_conversions/format_helpers.py,sha256=-lNgn_mrpVM_Xwb3jHH0BlBEPCMKjLqTeYf4PbssbuQ,1144
 hafnia/dataset/format_conversions/format_image_classification_folder.py,sha256=ALVsQfSvBfAkpmUDijznqqd2JBh0Qtnvzq7igxMjMb8,7170
 hafnia/dataset/format_conversions/format_yolo.py,sha256=zvCHo2L_0mPJScMbDtwvZUts9UX2ERKhhYbY31Q6tQA,9912
-hafnia/dataset/format_conversions/torchvision_datasets.py,sha256=1H4AMaOYRe6xAU-Pjv7oB7djpis6W6qmzYdHg_hxwKg,12096
-hafnia/dataset/operations/dataset_s3_storage.py,sha256=kIQBK3yc8AqD1kDjWJi8m-ujOvZ5xvgsT93RHUpuByA,8864
+hafnia/dataset/format_conversions/torchvision_datasets.py,sha256=sC8DgAt10PEaCHFk_Lm-dIzr_0EF-2g24kG9EINYk7c,12096
+hafnia/dataset/operations/dataset_s3_storage.py,sha256=xPC77Og47xTpI0JBFAR1pgb5u7l18byAA6p7IlpnpGE,8971
 hafnia/dataset/operations/dataset_stats.py,sha256=Ltf-V4_o_IB4UXw9WG9bsVoqeX90yGsjivK0CDggriw,11930
 hafnia/dataset/operations/dataset_transformations.py,sha256=qUNno0rAT1A452uzlR-k1WbatyY9VuMp1QJjkMg9GzE,19495
-hafnia/dataset/operations/table_transformations.py,sha256=odcs6e7L-WmkpzkZcF7aRLXIzaXElQX6raFX8FfyZEk,14397
+hafnia/dataset/operations/table_transformations.py,sha256=mdjUE1lSQ7QyONjQapSHDg1MkYuKaflcoVUq1Y6Lkqc,13606
 hafnia/dataset/primitives/__init__.py,sha256=xFLJ3R7gpbuQnNJuFhuu836L3nicwoaY5aHkqk7Bbr8,927
 hafnia/dataset/primitives/bbox.py,sha256=QJJBebltOd9J3idisp3QdX0gCgz6P5xlIlGbth19fG0,6669
 hafnia/dataset/primitives/bitmask.py,sha256=Q7RiNYvMDlcFPkXAWXDJkCIERjnUTCrHu6VeEPX1jEA,7212
@@ -37,10 +37,10 @@ hafnia/experiment/hafnia_logger.py,sha256=BHIOLAds_3JxT0cev_ikUH0XQVIxBJTkcBSx2Q
 hafnia/platform/__init__.py,sha256=L_Q7CNpsJ0HMNPy_rLlLK5RhmuCU7IF4BchxKv6amYc,782
 hafnia/platform/builder.py,sha256=kUEuj5-qtL1uk5v2tUvOCREn5yV-G4Fr6F31haIAb5E,5808
 hafnia/platform/dataset_recipe.py,sha256=ybfSSHVPG0eFUbzg_1McezPSOtMoDZEg7l6rFYndtb4,3857
-hafnia/platform/datasets.py,sha256=gfFHltZ70BJ3XeqxGvDMn06B1hmfhS-9bO149qtJruA,13079
-hafnia/platform/download.py,sha256=A6McEvRw5KmEAn3kx3nNnjxQm1Z8ZSAhn_NFgrM66_8,5020
+hafnia/platform/datasets.py,sha256=nXHg3I14p3tJeDX2woPH9NMiOxn_54zlIOPJXvXFI_w,9448
+hafnia/platform/download.py,sha256=e73Pm0afwRPTHxBvRy0gUZSFfDuePHPnfasyhaZ-KGQ,5019
 hafnia/platform/experiment.py,sha256=SrEH0nuwwBXf1Iu4diB1BEPqL-TxW3aQkZWBbM1-tY0,1846
-hafnia/platform/s5cmd_utils.py,sha256=clI_niKjya0E5d8Jmgvfj86jiuxMD9uK83znWKN6tYY,5335
+hafnia/platform/s5cmd_utils.py,sha256=hHsGPJ1S9_hFIVfCO-efvTF4qbLYreK1nl3VC5caU1w,9491
 hafnia/platform/trainer_package.py,sha256=w6JC7o-279ujcwtNTbUaQ9AnPcYRPPbD8EACa6XyUHA,2206
 hafnia/visualizations/colors.py,sha256=003eAJVnBal4abaYIIpsrT7erIOIjTUHHYVJ1Tj1CDc,5226
 hafnia/visualizations/image_visualizations.py,sha256=rB7c-KK-qq0BsSdkaFxCAHOOCTXTUQx0VMEhib7ig0k,7509
@@ -48,15 +48,15 @@ hafnia_cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hafnia_cli/__main__.py,sha256=CqD_7RfbfwB6MED3WZ8WxclrFxWcRMtZ5A1Snnst3GM,1761
 hafnia_cli/config.py,sha256=X0dJBYH-7mNAFkHgeZvDbawlQqoyCwoY4C-QhlyYCA0,7695
 hafnia_cli/consts.py,sha256=uCpYX44NCu_Zvte0QwChunxOo-qqhcaJRSYDAIsoJ8A,972
-hafnia_cli/dataset_cmds.py,sha256=gxUgTUMzZYEvwUdEDHTuTGFge7pqQPkXPKg20v4GGNU,1948
+hafnia_cli/dataset_cmds.py,sha256=JfSj7Cei1T2oYUXP1bpz63uQopgL3R_dMMYnPGGcuU8,2072
 hafnia_cli/dataset_recipe_cmds.py,sha256=OYSmpKL0Wxo1ZSxIGfH6w7pEWoI7CjUTmfIELJSZjGQ,2894
 hafnia_cli/experiment_cmds.py,sha256=_KxsMhbjlkIno1PIMXJ0Omw_PSJi8qi9hmtCUqwcj1M,7970
 hafnia_cli/keychain.py,sha256=bNyjjULVQu7kV338wUC65UvbCwmSGOmEjKWPLIQjT0k,2555
 hafnia_cli/profile_cmds.py,sha256=yTyOsPsUssLCzFIxURkxbKrFEhYIVDlUC0G2s5Uks-U,3476
-hafnia_cli/runc_cmds.py,sha256=38SGajsizpAydawCWL6gwza9NtLugtHfCdnldllwWJI,5016
+hafnia_cli/runc_cmds.py,sha256=7P5TjF6KA9K4OKPG1qC_0gteXfLJbXlA858WWrosoGQ,5098
 hafnia_cli/trainer_package_cmds.py,sha256=hUBc6gCMV28fcAA0xQdXKL1z-a3aL9lMWcVqjvHO1Uo,2326
-hafnia-0.5.0.dist-info/METADATA,sha256=VRy-2ThTt7kczs4uPFU_qeKgiuye1JZ2Pv8VoN1H1e4,19272
-hafnia-0.5.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-hafnia-0.5.0.dist-info/entry_points.txt,sha256=j2jsj1pqajLAiSOnF7sq66A3d1SVeHPKVTVyIFzipSA,52
-hafnia-0.5.0.dist-info/licenses/LICENSE,sha256=wLZw1B7_mod_CO1H8LXqQgfqlWD6QceJR8--LJYRZGE,1078
-hafnia-0.5.0.dist-info/RECORD,,
+hafnia-0.5.1.dist-info/METADATA,sha256=QkN31qwV-oFfSrp_s2pXEc5GFRhY0sn5dBVo8r-qOAs,19272
+hafnia-0.5.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+hafnia-0.5.1.dist-info/entry_points.txt,sha256=j2jsj1pqajLAiSOnF7sq66A3d1SVeHPKVTVyIFzipSA,52
+hafnia-0.5.1.dist-info/licenses/LICENSE,sha256=wLZw1B7_mod_CO1H8LXqQgfqlWD6QceJR8--LJYRZGE,1078
+hafnia-0.5.1.dist-info/RECORD,,

hafnia_cli/dataset_cmds.py

@@ -3,8 +3,8 @@ from typing import Optional
 
 import click
 
+import hafnia.dataset.hafnia_dataset
 from hafnia import utils
-from hafnia_cli import consts
 from hafnia_cli.config import Config
 
 
@@ -26,6 +26,13 @@ def cmd_list_datasets(cfg: Config) -> None:
 
 @dataset.command("download")
 @click.argument("dataset_name")
+@click.option(
+    "--version",
+    "-v",
+    default="latest",
+    required=False,
+    help="Dataset version to download e.g. '0.0.1' or '1.0.1'. Defaults to the latest version.",
+)
 @click.option(
     "--destination",
     "-d",
@@ -35,20 +42,18 @@ def cmd_list_datasets(cfg: Config) -> None:
 )
 @click.option("--force", "-f", is_flag=True, default=False, help="Flag to enable force redownload")
 @click.pass_obj
-def cmd_dataset_download(cfg: Config, dataset_name: str, destination: Optional[click.Path], force: bool) -> Path:
+def cmd_dataset_download(
+    cfg: Config, dataset_name: str, version: Optional[str], destination: Optional[click.Path], force: bool
+) -> Path:
     """Download dataset from Hafnia platform"""
 
-    from hafnia.platform import datasets
-
-    try:
-        path_dataset = datasets.download_or_get_dataset_path(
-            dataset_name=dataset_name,
-            cfg=cfg,
-            path_datasets_folder=destination,
-            force_redownload=force,
-        )
-    except Exception:
-        raise click.ClickException(consts.ERROR_GET_RESOURCE)
+    path_dataset = hafnia.dataset.hafnia_dataset.download_or_get_dataset_path(
+        dataset_name=dataset_name,
+        version=version,
+        cfg=cfg,
+        path_datasets_folder=destination,
+        force_redownload=force,
+    )
     return path_dataset
 
 
@@ -67,4 +72,5 @@ def cmd_dataset_delete(cfg: Config, dataset_name: str, interactive: bool) -> Non
     datasets.delete_dataset_completely_by_name(
         dataset_name=dataset_name,
         interactive=interactive,
+        cfg=cfg,
     )

hafnia_cli/runc_cmds.py

@@ -38,7 +38,7 @@ def runc():
 @click.pass_obj
 def launch_local(cfg: Config, exec_cmd: str, dataset: str, image_name: str) -> None:
     """Launch a job within the image."""
-    from hafnia.platform.datasets import download_or_get_dataset_path
+    from hafnia.dataset.hafnia_dataset import download_or_get_dataset_path
 
     is_local_dataset = "/" in dataset
     if is_local_dataset:
@@ -48,7 +48,12 @@ def launch_local(cfg: Config, exec_cmd: str, dataset: str, image_name: str) -> N
             raise click.ClickException(f"Dataset path does not exist: {path_dataset}")
     else:
         click.echo(f"Using Hafnia dataset: {dataset}")
-        path_dataset = download_or_get_dataset_path(dataset_name=dataset, cfg=cfg, force_redownload=False)
+        path_dataset = download_or_get_dataset_path(
+            dataset_name=dataset,
+            version="latest",
+            cfg=cfg,
+            force_redownload=False,
+        )
 
     if image_name is None:
         # Load image name from state.json