atdata 0.1.1a3__tar.gz → 0.1.2a1__tar.gz

{atdata-0.1.1a3 → atdata-0.1.2a1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: atdata
-Version: 0.1.1a3
+Version: 0.1.2a1
 Summary: A loose federation of distributed, typed datasets
 Author-email: Maxine Levesque <hello@maxine.science>
 License-File: LICENSE

{atdata-0.1.1a3 → atdata-0.1.2a1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "atdata"
-version = "0.1.1a3"
+version = "0.1.2a1"
 description = "A loose federation of distributed, typed datasets"
 readme = "README.md"
 authors = [

{atdata-0.1.1a3 → atdata-0.1.2a1}/src/atdata/__init__.py

@@ -7,6 +7,7 @@ from .dataset import (
     PackableSample,
     SampleBatch,
     Dataset,
+    packable,
 )
 
 

{atdata-0.1.1a3 → atdata-0.1.2a1}/src/atdata/dataset.py

@@ -5,6 +5,7 @@
 
 import webdataset as wds
 
+import functools
 from dataclasses import dataclass
 import uuid
 
@@ -415,4 +416,40 @@ class Dataset( Generic[ST] ):
     #     This default implementation simply creates a list one sample at a time
     #     """
     #     assert cls.batch_class is not None, 'No batch class specified'
-    #     return cls.batch_class( **batch )
+    #     return cls.batch_class( **batch )
+
+
+##
+# Shortcut decorators
+
+# def packable( cls ):
+#     """TODO"""
+
+#     def decorator( cls ):
+#         # Create a new class dynamically
+#         # The new class inherits from the new_parent_class first, then the original cls
+#         new_bases = (PackableSample,) + cls.__bases__
+#         new_cls = type(cls.__name__, new_bases, dict(cls.__dict__))
+
+#         # Optionally, update __module__ and __qualname__ for better introspection
+#         new_cls.__module__ = cls.__module__
+#         new_cls.__qualname__ = cls.__qualname__
+
+#         return new_cls
+#     return decorator
+
+def packable( cls ):
+    """TODO"""
+    
+    ##
+
+    as_dataclass = dataclass( cls )
+
+    class as_packable( as_dataclass, PackableSample ):
+        pass
+    
+    as_packable.__name__ = cls.__name__
+
+    ##
+
+    return as_packable

{atdata-0.1.1a3 → atdata-0.1.2a1}/tests/test_dataset.py

@@ -51,7 +51,7 @@ test_cases = [
     },
     {
         'SampleType': NumpyTestSample,
-        'sample_data': 
+        'sample_data':
         {
             'label': 9_001,
             'image': np.random.randn( 1024, 1024 ),
@@ -89,6 +89,35 @@ def test_create_sample(
 
 #
 
+def test_decorator_syntax():
+    """Test use of decorator syntax for sample types"""
+    
+    @atdata.packable
+    class BasicTestSampleDecorated:
+        name: str
+        position: int
+        value: float
+
+    @atdata.packable
+    class NumpyTestSampleDecorated:
+        label: int
+        image: NDArray
+    
+    ##
+    
+    test_create_sample( BasicTestSampleDecorated, {
+        'name': 'Hello, world!',
+        'position': 42,
+        'value': 1024.768,
+    } )
+
+    test_create_sample( NumpyTestSampleDecorated, {
+        'label': 9_001,
+        'image': np.random.randn( 1024, 1024 ),
+    } )
+
+#
+
 @pytest.mark.parametrize(
     ('SampleType', 'sample_data', 'sample_wds_stem'),
     [ (case['SampleType'], case['sample_data'], case['sample_wds_stem'])