pydiverse-common 0.2.1__py3-none-any.whl → 0.3.1__py3-none-any.whl

pydiverse/common/__init__.py

@@ -20,10 +20,10 @@ from .dtypes import (
     PandasBackend,
     String,
     Time,
-    Uint8,
-    Uint16,
-    Uint32,
-    Uint64,
+    UInt8,
+    UInt16,
+    UInt32,
+    UInt64,
 )
 
 __all__ = [
@@ -44,10 +44,10 @@ __all__ = [
     "NullType",
     "String",
     "Time",
-    "Uint8",
-    "Uint16",
-    "Uint32",
-    "Uint64",
+    "UInt8",
+    "UInt16",
+    "UInt32",
+    "UInt64",
     "List",
     "PandasBackend",
 ]

pydiverse/common/dtypes.py

@@ -70,6 +70,8 @@ class Dtype:
             return Time()
         if isinstance(sql_type, sqa.DateTime):
             return Datetime()
+        if isinstance(sql_type, sqa.Interval):
+            return Duration()
         if isinstance(sql_type, sqa.ARRAY):
             return List(Dtype.from_sql(sql_type.item_type.from_sql))
         if isinstance(sql_type, sqa.Null):
@@ -102,13 +104,13 @@ class Dtype:
             raise TypeError
         if pd.api.types.is_unsigned_integer_dtype(pandas_type):
             if is_np_dtype(pandas_type, np.uint64):
-                return Uint64()
+                return UInt64()
             elif is_np_dtype(pandas_type, np.uint32):
-                return Uint32()
+                return UInt32()
             elif is_np_dtype(pandas_type, np.uint16):
-                return Uint16()
+                return UInt16()
             elif is_np_dtype(pandas_type, np.uint8):
-                return Uint8()
+                return UInt8()
             raise TypeError
         if pd.api.types.is_float_dtype(pandas_type):
             if is_np_dtype(pandas_type, np.float64):
@@ -123,7 +125,10 @@ class Dtype:
             return Bool()
         if pd.api.types.is_datetime64_any_dtype(pandas_type):
             return Datetime()
-        # we don't know any decimal dtype in pandas if column is not arrow backed
+        if pd.api.types.is_timedelta64_dtype(pandas_type):
+            return Duration()
+        # we don't know any decimal/time dtypes in pandas if column is not
+        # arrow backed
 
         raise TypeError
 
@@ -143,13 +148,13 @@ class Dtype:
             raise TypeError
         if pa.types.is_unsigned_integer(arrow_type):
             if pa.types.is_uint64(arrow_type):
-                return Uint64()
+                return UInt64()
             if pa.types.is_uint32(arrow_type):
-                return Uint32()
+                return UInt32()
             if pa.types.is_uint16(arrow_type):
-                return Uint16()
+                return UInt16()
             if pa.types.is_uint8(arrow_type):
-                return Uint8()
+                return UInt8()
             raise TypeError
         if pa.types.is_floating(arrow_type):
             if pa.types.is_float64(arrow_type):
@@ -172,6 +177,8 @@ class Dtype:
             return Date()
         if pa.types.is_time(arrow_type):
             return Time()
+        if pa.types.is_duration(arrow_type):
+            return Duration()
         raise TypeError
 
     @staticmethod
@@ -186,10 +193,10 @@ class Dtype:
             pl.Int32: Int32(),
             pl.Int16: Int16(),
             pl.Int8: Int8(),
-            pl.UInt64: Uint64(),
-            pl.UInt32: Uint32(),
-            pl.UInt16: Uint16(),
-            pl.UInt8: Uint8(),
+            pl.UInt64: UInt64(),
+            pl.UInt32: UInt32(),
+            pl.UInt16: UInt16(),
+            pl.UInt8: UInt8(),
             pl.Float64: Float64(),
             pl.Float32: Float32(),
             pl.Decimal: Decimal(),
@@ -212,10 +219,10 @@ class Dtype:
             Int16(): sqa.SmallInteger(),
             Int32(): sqa.Integer(),
             Int64(): sqa.BigInteger(),
-            Uint8(): sqa.SmallInteger(),
-            Uint16(): sqa.Integer(),
-            Uint32(): sqa.BigInteger(),
-            Uint64(): sqa.BigInteger(),
+            UInt8(): sqa.SmallInteger(),
+            UInt16(): sqa.Integer(),
+            UInt32(): sqa.BigInteger(),
+            UInt64(): sqa.BigInteger(),
             Float(): sqa.Float(53),  # we default to 64 bit
             Float32(): sqa.Float(24),
             Float64(): sqa.Float(53),
@@ -225,6 +232,7 @@ class Dtype:
             Date(): sqa.Date(),
             Time(): sqa.Time(),
             Datetime(): sqa.DateTime(),
+            Duration(): sqa.Interval(),
             NullType(): sqa.types.NullType(),
         }[self]
 
@@ -252,10 +260,10 @@ class Dtype:
             Int16(): pd.Int16Dtype(),
             Int32(): pd.Int32Dtype(),
             Int64(): pd.Int64Dtype(),
-            Uint8(): pd.UInt8Dtype(),
-            Uint16(): pd.UInt16Dtype(),
-            Uint32(): pd.UInt32Dtype(),
-            Uint64(): pd.UInt64Dtype(),
+            UInt8(): pd.UInt8Dtype(),
+            UInt16(): pd.UInt16Dtype(),
+            UInt32(): pd.UInt32Dtype(),
+            UInt64(): pd.UInt64Dtype(),
             Float(): pd.Float64Dtype(),  # we default to 64 bit
             Float32(): pd.Float32Dtype(),
             Float64(): pd.Float64Dtype(),
@@ -263,8 +271,9 @@ class Dtype:
             String(): pd.StringDtype(),
             Bool(): pd.BooleanDtype(),
             Date(): "datetime64[s]",
-            # Time() not supported
             Datetime(): "datetime64[us]",
+            Time(): "timedelta64[us]",
+            Duration(): "timedelta64[us]",
         }[self]
 
     def to_arrow(self):
@@ -276,10 +285,10 @@ class Dtype:
             Int16(): pa.int16(),
             Int32(): pa.int32(),
             Int64(): pa.int64(),
-            Uint8(): pa.uint8(),
-            Uint16(): pa.uint16(),
-            Uint32(): pa.uint32(),
-            Uint64(): pa.uint64(),
+            UInt8(): pa.uint8(),
+            UInt16(): pa.uint16(),
+            UInt32(): pa.uint32(),
+            UInt64(): pa.uint64(),
             Float(): pa.float64(),  # we default to 64 bit
             Float32(): pa.float32(),
             Float64(): pa.float64(),
@@ -289,6 +298,7 @@ class Dtype:
             Date(): pa.date32(),
             Time(): pa.time64("us"),
             Datetime(): pa.timestamp("us"),
+            Duration(): pa.duration("us"),
         }[self]
 
     def to_polars(self: "Dtype"):
@@ -300,10 +310,10 @@ class Dtype:
             Int32(): pl.Int32,
             Int16(): pl.Int16,
             Int8(): pl.Int8,
-            Uint64(): pl.UInt64,
-            Uint32(): pl.UInt32,
-            Uint16(): pl.UInt16,
-            Uint8(): pl.UInt8,
+            UInt64(): pl.UInt64,
+            UInt32(): pl.UInt32,
+            UInt16(): pl.UInt16,
+            UInt8(): pl.UInt8,
             Float(): pl.Float64,  # we default to 64 bit
             Float64(): pl.Float64,
             Float32(): pl.Float32,
@@ -311,8 +321,8 @@ class Dtype:
             String(): pl.Utf8,
             Bool(): pl.Boolean,
             Datetime(): pl.Datetime("us"),
-            Duration(): pl.Duration,
-            Time(): pl.Time,
+            Duration(): pl.Duration("us"),
+            Time(): pl.Time,  # Polars uses nanoseconds since midnight
             Date(): pl.Date,
             NullType(): pl.Null,
         }[self]
@@ -351,16 +361,16 @@ class Int16(Int): ...
 class Int8(Int): ...
 
 
-class Uint64(Int): ...
+class UInt64(Int): ...
 
 
-class Uint32(Int): ...
+class UInt32(Int): ...
 
 
-class Uint16(Int): ...
+class UInt16(Int): ...
 
 
-class Uint8(Int): ...
+class UInt8(Int): ...
 
 
 class String(Dtype): ...

{pydiverse_common-0.2.1.dist-info → pydiverse_common-0.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pydiverse-common
-Version: 0.2.1
+Version: 0.3.1
 Summary: Common functionality shared between pydiverse libraries
 Author: QuantCo, Inc.
 Author-email: Martin Trautmann <windiana@users.sf.net>, Finn Rudolph <finn.rudolph@t-online.de>

{pydiverse_common-0.2.1.dist-info → pydiverse_common-0.3.1.dist-info}/RECORD

@@ -1,5 +1,5 @@
-pydiverse/common/__init__.py,sha256=dMbOmWvQjkFv0agRnVGxvShqLzIR3ItAfshmbStoF7M,732
-pydiverse/common/dtypes.py,sha256=f29krHaatqDBfxZMBtyvyDS95LVqkeXhhkSCypQasJk,12074
+pydiverse/common/__init__.py,sha256=2t3wnZGY_KITo5lysb-GAgXizeyd_iZvPjEHKnMsYpA,732
+pydiverse/common/dtypes.py,sha256=OtxOLnA5HIX9OandrrSgKS8bzERnntLRvQF-hSzvlbU,12509
 pydiverse/common/errors/__init__.py,sha256=FNeEfVbUa23b9sHkFsmxHYhY6sRgjaZysPQmlovpJrI,262
 pydiverse/common/util/__init__.py,sha256=fGdKZtLaTVBW7NfCpX7rZhKHwUzmBnsuY2akDOnAnjc,315
 pydiverse/common/util/computation_tracing.py,sha256=HeXRHRUI8vxpzQ27Xcpa0StndSTP63EMT9vj4trPJUY,9697
@@ -9,7 +9,7 @@ pydiverse/common/util/disposable.py,sha256=4XoGz70YRWA9TAqnUBvRCTAdsOGBviFN0gzxU
 pydiverse/common/util/hashing.py,sha256=6x77BKg-w61u59fuTe9di0BtU-kEKH6UTRcKsRoYJ84,1196
 pydiverse/common/util/import_.py,sha256=K7dSgz4YyrqEvqhoOzbwgD7D8HScMoO5XoSWtjbaoUs,4056
 pydiverse/common/util/structlog.py,sha256=g0d8yaXBzAxmGNGZYMnMP9dsSQ__jN44GAY8Mb0ABeI,3487
-pydiverse_common-0.2.1.dist-info/METADATA,sha256=Ax5YkSWgxpZ8tHM_pPAlmC-ZD-x3SIlj0P4xyepi76Y,3357
-pydiverse_common-0.2.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pydiverse_common-0.2.1.dist-info/licenses/LICENSE,sha256=AcE6SDVuAq6v9ZLE_8eOCe_NvSE0rAPR3NR7lSowYh4,1517
-pydiverse_common-0.2.1.dist-info/RECORD,,
+pydiverse_common-0.3.1.dist-info/METADATA,sha256=Ul8A6lt1G9b05z5khak8nhekPdjTcQsaZxmoReueJXU,3357
+pydiverse_common-0.3.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pydiverse_common-0.3.1.dist-info/licenses/LICENSE,sha256=AcE6SDVuAq6v9ZLE_8eOCe_NvSE0rAPR3NR7lSowYh4,1517
+pydiverse_common-0.3.1.dist-info/RECORD,,