pydiverse-common 0.2.1__tar.gz → 0.3.1__tar.gz

{pydiverse_common-0.2.1 → pydiverse_common-0.3.1}/PKG-INFO

@@ -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 → pydiverse_common-0.3.1}/docs/source/changelog.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.3.1 (2025-06-08)
+- fixed some type conversions (mostly Duration)
+
+## 0.3.0 (2025-06-08)
+- rename Uint type to UInt
+
 ## 0.2.1 (2025-06-06)
 - also support to_xxx() for generic Int and Float Dtype classes
 

{pydiverse_common-0.2.1 → pydiverse_common-0.3.1}/docs/source/reference/api.rst

@@ -24,9 +24,9 @@ Public
 .. autoclass:: NullType
 .. autoclass:: String
 .. autoclass:: Time
-.. autoclass:: Uint8
-.. autoclass:: Uint16
-.. autoclass:: Uint32
-.. autoclass:: Uint64
+.. autoclass:: UInt8
+.. autoclass:: UInt16
+.. autoclass:: UInt32
+.. autoclass:: UInt64
 .. autoclass:: List
 .. autoclass:: PandasBackend

{pydiverse_common-0.2.1 → pydiverse_common-0.3.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pydiverse-common"
-version = "0.2.1"
+version = "0.3.1"
 description = "Common functionality shared between pydiverse libraries"
 authors = [
   { name = "QuantCo, Inc." },

{pydiverse_common-0.2.1 → pydiverse_common-0.3.1}/src/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-0.2.1 → pydiverse_common-0.3.1}/src/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 → pydiverse_common-0.3.1}/tests/dtypes/test_dtype_pandas.py

@@ -28,10 +28,10 @@ from pydiverse.common import (
     PandasBackend,
     String,
     Time,
-    Uint8,
-    Uint16,
-    Uint32,
-    Uint64,
+    UInt8,
+    UInt16,
+    UInt32,
+    UInt64,
 )
 
 
@@ -57,10 +57,10 @@ def test_dtype_from_pandas():
     assert_conversion(np.int16, Int16())
     assert_conversion(np.int8, Int8())
 
-    assert_conversion(np.uint64, Uint64())
-    assert_conversion(np.uint32, Uint32())
-    assert_conversion(np.uint16, Uint16())
-    assert_conversion(np.uint8, Uint8())
+    assert_conversion(np.uint64, UInt64())
+    assert_conversion(np.uint32, UInt32())
+    assert_conversion(np.uint16, UInt16())
+    assert_conversion(np.uint8, UInt8())
 
     assert_conversion(np.floating, Float64())
     assert_conversion(np.float64, Float64())
@@ -79,10 +79,10 @@ def test_dtype_from_pandas():
     assert_conversion(pd.Int16Dtype(), Int16())
     assert_conversion(pd.Int8Dtype(), Int8())
 
-    assert_conversion(pd.UInt64Dtype(), Uint64())
-    assert_conversion(pd.UInt32Dtype(), Uint32())
-    assert_conversion(pd.UInt16Dtype(), Uint16())
-    assert_conversion(pd.UInt8Dtype(), Uint8())
+    assert_conversion(pd.UInt64Dtype(), UInt64())
+    assert_conversion(pd.UInt32Dtype(), UInt32())
+    assert_conversion(pd.UInt16Dtype(), UInt16())
+    assert_conversion(pd.UInt8Dtype(), UInt8())
 
     assert_conversion(pd.Float64Dtype(), Float64())
     assert_conversion(pd.Float32Dtype(), Float32())
@@ -101,10 +101,10 @@ def test_dtype_to_pandas_numpy():
     assert_conversion(Int16(), pd.Int16Dtype())
     assert_conversion(Int8(), pd.Int8Dtype())
 
-    assert_conversion(Uint64(), pd.UInt64Dtype())
-    assert_conversion(Uint32(), pd.UInt32Dtype())
-    assert_conversion(Uint16(), pd.UInt16Dtype())
-    assert_conversion(Uint8(), pd.UInt8Dtype())
+    assert_conversion(UInt64(), pd.UInt64Dtype())
+    assert_conversion(UInt32(), pd.UInt32Dtype())
+    assert_conversion(UInt16(), pd.UInt16Dtype())
+    assert_conversion(UInt8(), pd.UInt8Dtype())
 
     assert_conversion(String(), pd.StringDtype())
     assert_conversion(Bool(), pd.BooleanDtype())
@@ -130,10 +130,10 @@ def test_dtype_to_pandas_pyarrow():
     assert_conversion(Int16(), pa.int16())
     assert_conversion(Int8(), pa.int8())
 
-    assert_conversion(Uint64(), pa.uint64())
-    assert_conversion(Uint32(), pa.uint32())
-    assert_conversion(Uint16(), pa.uint16())
-    assert_conversion(Uint8(), pa.uint8())
+    assert_conversion(UInt64(), pa.uint64())
+    assert_conversion(UInt32(), pa.uint32())
+    assert_conversion(UInt16(), pa.uint16())
+    assert_conversion(UInt8(), pa.uint8())
 
     assert_conversion(String(), pd.StringDtype(storage="pyarrow"))
     assert_conversion(Bool(), pa.bool_())

{pydiverse_common-0.2.1 → pydiverse_common-0.3.1}/tests/dtypes/test_dtype_polars.py

@@ -17,10 +17,10 @@ from pydiverse.common import (
     Int64,
     String,
     Time,
-    Uint8,
-    Uint16,
-    Uint32,
-    Uint64,
+    UInt8,
+    UInt16,
+    UInt32,
+    UInt64,
 )
 
 pl = pytest.importorskip("polars")
@@ -38,10 +38,10 @@ def test_dtype_from_polars():
     assert_conversion(pl.Int16, Int16())
     assert_conversion(pl.Int8, Int8())
 
-    assert_conversion(pl.UInt64, Uint64())
-    assert_conversion(pl.UInt32, Uint32())
-    assert_conversion(pl.UInt16, Uint16())
-    assert_conversion(pl.UInt8, Uint8())
+    assert_conversion(pl.UInt64, UInt64())
+    assert_conversion(pl.UInt32, UInt32())
+    assert_conversion(pl.UInt16, UInt16())
+    assert_conversion(pl.UInt8, UInt8())
 
     assert_conversion(pl.Float64, Float64())
     assert_conversion(pl.Float32, Float32())
@@ -66,10 +66,10 @@ def test_dtype_to_polars():
     assert_conversion(Int16(), pl.Int16)
     assert_conversion(Int8(), pl.Int8)
 
-    assert_conversion(Uint64(), pl.UInt64)
-    assert_conversion(Uint32(), pl.UInt32)
-    assert_conversion(Uint16(), pl.UInt16)
-    assert_conversion(Uint8(), pl.UInt8)
+    assert_conversion(UInt64(), pl.UInt64)
+    assert_conversion(UInt32(), pl.UInt32)
+    assert_conversion(UInt16(), pl.UInt16)
+    assert_conversion(UInt8(), pl.UInt8)
 
     assert_conversion(Float64(), pl.Float64)
     assert_conversion(Float32(), pl.Float32)

{pydiverse_common-0.2.1 → pydiverse_common-0.3.1}/tests/dtypes/test_dtype_pyarrow.py

@@ -20,10 +20,10 @@ from pydiverse.common import (
     Int64,
     String,
     Time,
-    Uint8,
-    Uint16,
-    Uint32,
-    Uint64,
+    UInt8,
+    UInt16,
+    UInt32,
+    UInt64,
 )
 
 
@@ -37,10 +37,10 @@ def test_dtype_from_pyarrow():
     assert_conversion(pa.int16(), Int16())
     assert_conversion(pa.int8(), Int8())
 
-    assert_conversion(pa.uint64(), Uint64())
-    assert_conversion(pa.uint32(), Uint32())
-    assert_conversion(pa.uint16(), Uint16())
-    assert_conversion(pa.uint8(), Uint8())
+    assert_conversion(pa.uint64(), UInt64())
+    assert_conversion(pa.uint32(), UInt32())
+    assert_conversion(pa.uint16(), UInt16())
+    assert_conversion(pa.uint8(), UInt8())
 
     assert_conversion(pa.float64(), Float64())
     assert_conversion(pa.float32(), Float32())
@@ -73,10 +73,10 @@ def test_dtype_to_pyarrow():
     assert_conversion(Int16(), pa.int16())
     assert_conversion(Int8(), pa.int8())
 
-    assert_conversion(Uint64(), pa.uint64())
-    assert_conversion(Uint32(), pa.uint32())
-    assert_conversion(Uint16(), pa.uint16())
-    assert_conversion(Uint8(), pa.uint8())
+    assert_conversion(UInt64(), pa.uint64())
+    assert_conversion(UInt32(), pa.uint32())
+    assert_conversion(UInt16(), pa.uint16())
+    assert_conversion(UInt8(), pa.uint8())
 
     assert_conversion(Float64(), pa.float64())
     assert_conversion(Float32(), pa.float32())

{pydiverse_common-0.2.1 → pydiverse_common-0.3.1}/tests/dtypes/test_dtype_sqlalchemy.py

@@ -15,10 +15,10 @@ from pydiverse.common import (
     Int64,
     String,
     Time,
-    Uint8,
-    Uint16,
-    Uint32,
-    Uint64,
+    UInt8,
+    UInt16,
+    UInt32,
+    UInt64,
 )
 
 try:
@@ -63,10 +63,10 @@ def test_dtype_to_sqlalchemy():
     assert_conversion(Int16(), sa.SmallInteger)
     assert_conversion(Int8(), sa.SmallInteger)
 
-    assert_conversion(Uint64(), sa.BigInteger)
-    assert_conversion(Uint32(), sa.BigInteger)
-    assert_conversion(Uint16(), sa.Integer)
-    assert_conversion(Uint8(), sa.SmallInteger)
+    assert_conversion(UInt64(), sa.BigInteger)
+    assert_conversion(UInt32(), sa.BigInteger)
+    assert_conversion(UInt16(), sa.Integer)
+    assert_conversion(UInt8(), sa.SmallInteger)
 
     assert_conversion(Float64(), sa.Float)
     assert_conversion(Float32(), sa.Float)