atdata 0.1.1a3__py3-none-any.whl → 0.1.2a3__py3-none-any.whl

atdata/__init__.py

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

atdata/dataset.py

@@ -5,6 +5,7 @@
 
 import webdataset as wds
 
+import functools
 from dataclasses import dataclass
 import uuid
 
@@ -96,7 +97,8 @@ def _make_packable( x ):
 class PackableSample( ABC ):
     """A sample that can be packed and unpacked with msgpack"""
 
-    def __post_init__( self ):
+    def _ensure_good( self ):
+        """TODO Stupid kludge because of __post_init__ nonsense for wrapped classes"""
 
         # Auto-convert known types when annotated
         for var_name, var_type in vars( self.__class__ )['__annotations__'].items():
@@ -120,12 +122,17 @@ class PackableSample( ABC ):
                 elif isinstance( var_cur_value, bytes ):
                     setattr( self, var_name, eh.bytes_to_array( var_cur_value ) )
 
+    def __post_init__( self ):
+        self._ensure_good()
+
     ##
 
     @classmethod
     def from_data( cls, data: MsgpackRawSample ) -> Self:
         """Create a sample instance from unpacked msgpack data"""
-        return cls( **data )
+        ret = cls( **data )
+        ret._ensure_good()
+        return ret
     
     @classmethod
     def from_bytes( cls, bs: bytes ) -> Self:
@@ -415,4 +422,42 @@ 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( PackableSample, as_dataclass ):
+        def __post_init__( self ):
+            return PackableSample.__post_init__( self )
+    
+    as_packable.__name__ = cls.__name__
+    as_packable.__annotations__ = cls.__annotations__
+
+    ##
+    
+    return as_packable

{atdata-0.1.1a3.dist-info → atdata-0.1.2a3.dist-info}/METADATA

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

atdata-0.1.2a3.dist-info/RECORD

@@ -0,0 +1,8 @@
+atdata/__init__.py,sha256=jPZVd_6UIo0DSbCnXAnYZ2eMwHYzOk--5vtEDTZvwqw,173
+atdata/_helpers.py,sha256=R63JhXewAKZYnZ9Th7R6yZh0IOUPYGBsth3FpRUMD-U,503
+atdata/dataset.py,sha256=HXctGwIbU5kr2pqiQCYDyGP1mkph1gIt-x1_PRtWyew,13372
+atdata-0.1.2a3.dist-info/METADATA,sha256=Jj5vP4NW-HtckIsPRzzpXVQXgcQ8HaFSGehdAu4Vfbo,434
+atdata-0.1.2a3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+atdata-0.1.2a3.dist-info/entry_points.txt,sha256=6-iQr1veSTq-ac94bLyfcyGHprrZWevPEd12BWX37tQ,39
+atdata-0.1.2a3.dist-info/licenses/LICENSE,sha256=Pz2eACSxkhsGfW9_iN60pgy-enjnbGTj8df8O3ebnQQ,16726
+atdata-0.1.2a3.dist-info/RECORD,,

atdata-0.1.1a3.dist-info/RECORD

@@ -1,8 +0,0 @@
-atdata/__init__.py,sha256=VwlLoJkqsXf1XWSzsGGIiuxUluIihR2vHOtYao3w0EY,159
-atdata/_helpers.py,sha256=R63JhXewAKZYnZ9Th7R6yZh0IOUPYGBsth3FpRUMD-U,503
-atdata/dataset.py,sha256=tuph87zUZmSLPIXrHvPxSxdrAknLT_4gKAB4kHTqiZ8,12210
-atdata-0.1.1a3.dist-info/METADATA,sha256=gKjbubI4HoLafCG5p4lsE-1_QMPMaHWZ48TLcIiWKO8,434
-atdata-0.1.1a3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-atdata-0.1.1a3.dist-info/entry_points.txt,sha256=6-iQr1veSTq-ac94bLyfcyGHprrZWevPEd12BWX37tQ,39
-atdata-0.1.1a3.dist-info/licenses/LICENSE,sha256=Pz2eACSxkhsGfW9_iN60pgy-enjnbGTj8df8O3ebnQQ,16726
-atdata-0.1.1a3.dist-info/RECORD,,