datamaestro 1.4.0__py3-none-any.whl → 1.4.2__py3-none-any.whl

datamaestro/definitions.py

@@ -102,7 +102,7 @@ class DataDefinition(AbstractData):
             if components[0] == "datamaestro":
                 longest_ix = 0
 
-        return repository, components[(longest_ix + 1) :]
+        return repository, [s.lower() for s in components[(longest_ix + 1) :]]
 
     def ancestors(self):
         ancestors = []
@@ -293,7 +293,11 @@ class DatasetWrapper(AbstractDataset):
 
         # Builds the ID:
         # Removes module_name.config prefix
-        if annotation.id is None or annotation.id == "":
+        if (
+            (annotation.id is None)
+            or (annotation.id == "")
+            or ("." not in annotation.id)
+        ):
             # Computes an ID
             assert (
                 # id is empty string = use the module id
@@ -303,7 +307,15 @@ class DatasetWrapper(AbstractDataset):
                 "A @dataset without `id` should be in the "
                 f".config module (not {t.__module__})"
             )
-            path = ".".join(components[1:-1])
+
+            if annotation.id is None:
+                # There is nothing, use the full path
+                path = ".".join(components[1:])
+            else:
+                # Replace
+                path = ".".join(components[1:-1])
+                if annotation.id != "":
+                    path = f"{path}.{annotation.id}"
 
             self.id = path
         else:
@@ -369,33 +381,36 @@ class DatasetWrapper(AbstractDataset):
         if self.base is self.t:
             self.config = self.base.__create_dataset__(self)
 
-        # Construct the object
-        resources = {key: value.prepare() for key, value in self.resources.items()}
-
-        result = self.t(**resources)
+        else:
+            # Construct the object
+            resources = {key: value.prepare() for key, value in self.resources.items()}
 
-        # Download resources
-        logging.debug("Building with data type %s and dataset %s", self.base, self.t)
-        for hook in self.hooks["pre-use"]:
-            hook(self)
+            result = self.t(**resources)
 
-        if result is None:
-            name = self.t.__name__
-            filename = inspect.getfile(self.t)
-            raise Exception(
-                f"The dataset method {name} defined in "
-                f"{filename} returned a null object"
-            )
-
-        if isinstance(result, dict):
-            self.config = self.base(**result)
-        elif isinstance(result, self.base):
-            self.config = result
-        else:
-            raise RuntimeError(
-                f"The dataset method {name} defined in "
-                f"{filename} returned an object of type {type(dict)}"
+            # Download resources
+            logging.debug(
+                "Building with data type %s and dataset %s", self.base, self.t
             )
+            for hook in self.hooks["pre-use"]:
+                hook(self)
+
+            if result is None:
+                name = self.t.__name__
+                filename = inspect.getfile(self.t)
+                raise Exception(
+                    f"The dataset method {name} defined in "
+                    f"{filename} returned a null object"
+                )
+
+            if isinstance(result, dict):
+                self.config = self.base(**result)
+            elif isinstance(result, self.base):
+                self.config = result
+            else:
+                raise RuntimeError(
+                    f"The dataset method {name} defined in "
+                    f"{filename} returned an object of type {type(dict)}"
+                )
 
         # Setup ourself
         self.config.__datamaestro_dataset__ = self
@@ -557,13 +572,15 @@ class dataset:
             timestamp {bool} -- If the dataset evolves, specify its timestamp
             (default: None)
 
-            id {[type]} -- [description] (default: {None})
+            id {[type]} -- [description] (default: {None}) Gives the full ID of
+            the dataset if it contains a ., or just the last component otherwise
 
             url {[type]} -- [description] (default: {None})
 
             size {str} -- The size (should be a parsable format)
 
             doi {str} -- The DOI of the corresponding paper
+
         """
         if hasattr(base, "__datamaestro__") and isinstance(
             base.__datamaestro__, metadataset

datamaestro/record.py

@@ -160,11 +160,20 @@ class Record:
     def __getitem__(self, key: Type[T]) -> T:
         """Get an item given its type"""
         base = key.__get_base__()
-        entry = self.items[base]
+        try:
+            entry = self.items[base]
+        except KeyError:
+            raise KeyError(
+                f"""No entry with type {key}: """
+                f"""{",".join(str(s) for s in self.items.keys())}"""
+            )
 
         # Check if this matches the expected class
         if not isinstance(entry, key):
-            raise KeyError(f"No entry with type {key}")
+            raise KeyError(
+                f"""No entry with type {key}: """
+                f"""{",".join(str(s) for s in self.items.keys())}"""
+            )
         return entry
 
     def update(self, *items: T, target: RecordType = None) -> "Record":

datamaestro/version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.4.0'
-__version_tuple__ = version_tuple = (1, 4, 0)
+__version__ = version = '1.4.2'
+__version_tuple__ = version_tuple = (1, 4, 2)

{datamaestro-1.4.0.dist-info → datamaestro-1.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: datamaestro
-Version: 1.4.0
+Version: 1.4.2
 Summary: "Dataset management command line and API"
 Home-page: https://github.com/experimaestro/datamaestro
 Author: Benjamin Piwowarski

{datamaestro-1.4.0.dist-info → datamaestro-1.4.2.dist-info}/RECORD

@@ -1,14 +1,14 @@
 datamaestro/__init__.py,sha256=LR8nx7H3Fo97O0gJXV2PxQezsmSTDLAg_nQEXB5QAjc,322
 datamaestro/__main__.py,sha256=2p36ZcJcZAL9NZBUkMaYRUhKyqhheVPXMGw6K1KNwhk,9196
 datamaestro/context.py,sha256=KsXYNTt4xX4zEVrnd2hciP7PVCh1StRzjU1Ih6VeCtU,13532
-datamaestro/definitions.py,sha256=HsldRC6QJMyxKp4yKa5_c0zUn5MlYW7S-CrWHmij7t0,18337
-datamaestro/record.py,sha256=m3WGsPcZ1LouQXNJOBUK3QusAIRiuy6T_oqhq09-Ckg,5504
+datamaestro/definitions.py,sha256=BfdIbhm5jhUTLmV4Hz4aJxX3jSRVZt0iwC542-EG0d8,18961
+datamaestro/record.py,sha256=IxxcrSIf99iluohtpnuMBTFkqeHRe5S-T_hWEqBgeME,5812
 datamaestro/registry.py,sha256=M7QJkcWJP_cxAoqIioLQ01ou2Zg9RqGQvW0XGVspYFE,1421
 datamaestro/search.py,sha256=bRT-91-2VJJ2JSfNaS1mzaVfqq_HMVBVs-RBj0w-ypM,2906
 datamaestro/settings.py,sha256=HYSElTUYZ6DZocBb9o3ifm6WW9knRO64XJUwxGIpvwQ,1304
 datamaestro/sphinx.py,sha256=bp7x_2BFoTSwTqcVZDM8R8cWa7G2pz0Zb8GS054lLYM,6996
 datamaestro/utils.py,sha256=9m-AVVww6InAZfGFiGy6XJzfExpYNqH1fhWQEezjafA,6536
-datamaestro/version.py,sha256=rcWNYDlh913lujUvTfOu9iOIPdrTXg64R9wl7ENLjFU,511
+datamaestro/version.py,sha256=Ls_J-pNiuTKX1KU6pZ6tPQXAMcmLAzW_HHHgGVQNEd0,511
 datamaestro/annotations/__init__.py,sha256=jLprrxSBa5QIqc--vqycEcxU4CR9WjVNRaqR5lH0EuE,39
 datamaestro/annotations/agreement.py,sha256=xEH0ddZxdJ_oG_150PoOa-WjY_OaeQja3FzMzY5IB6k,955
 datamaestro/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -40,9 +40,9 @@ datamaestro/test/conftest.py,sha256=it4S5Qq1CA_U8qM0pr4m7v-1dhLj5Y49WjVg5Ee3mpM,
 datamaestro/test/test_annotations.py,sha256=XUjDWb3FJimSD91wcItJ0lLwTBmvN4wVu_EgTKSvV2c,278
 datamaestro/test/test_download_handlers.py,sha256=-Gofr89zqIyeI8C4rZqfYR3JfiZVImdcSz9s6q361zQ,641
 datamaestro/test/test_record.py,sha256=hNZ3uo2i5FZ0VsOHRwvLO1Z6Zce92PdipAF65UptPB8,1156
-datamaestro-1.4.0.dist-info/licenses/LICENSE,sha256=WJ7YI-moTFb-uVrFjnzzhGJrnL9P2iqQe8NuED3hutI,35141
-datamaestro-1.4.0.dist-info/METADATA,sha256=0q8MT6YvMD4WD3j79fpkGGFvHbLey-WgZnAV5VoRzdg,8189
-datamaestro-1.4.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-datamaestro-1.4.0.dist-info/entry_points.txt,sha256=8qMhwSRvFG2iBqtJYVD22Zd4s4c3YkODtcp0Ajw1knw,133
-datamaestro-1.4.0.dist-info/top_level.txt,sha256=XSznaMNAA8jELV7-TOqaAgDsjLzUf9G9MxL7C4helT0,12
-datamaestro-1.4.0.dist-info/RECORD,,
+datamaestro-1.4.2.dist-info/licenses/LICENSE,sha256=WJ7YI-moTFb-uVrFjnzzhGJrnL9P2iqQe8NuED3hutI,35141
+datamaestro-1.4.2.dist-info/METADATA,sha256=hrUkhcdWUHsKQKfHuXvcpdiT8RRRlCP-G0b9k4s5BMo,8189
+datamaestro-1.4.2.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+datamaestro-1.4.2.dist-info/entry_points.txt,sha256=8qMhwSRvFG2iBqtJYVD22Zd4s4c3YkODtcp0Ajw1knw,133
+datamaestro-1.4.2.dist-info/top_level.txt,sha256=XSznaMNAA8jELV7-TOqaAgDsjLzUf9G9MxL7C4helT0,12
+datamaestro-1.4.2.dist-info/RECORD,,

{datamaestro-1.4.0.dist-info → datamaestro-1.4.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (80.4.0)
 Root-Is-Purelib: true
 Tag: py3-none-any