pydiverse-common 0.3.10__py3-none-any.whl → 0.3.12__py3-none-any.whl

pydiverse/common/dtypes.py

@@ -23,6 +23,10 @@ class Dtype:
         """Return a string representation of this dtype."""
         return self.__class__.__name__
 
+    def __str__(self):
+        """Return a string representation of this dtype."""
+        return self.__repr__()
+
     @classmethod
     def is_int(cls):
         """Return ``True`` if this dtype is an integer type."""
@@ -71,7 +75,7 @@ class Dtype:
             # otherwise.
             return Float64()
         if isinstance(sql_type, sa.String):
-            return String()
+            return String(sql_type.length)
         if isinstance(sql_type, sa.Boolean):
             return Bool()
         if isinstance(sql_type, sa.Date):
@@ -307,6 +311,15 @@ class Dtype:
 
         if isinstance(self, Enum):
             return pd.CategoricalDtype(self.categories)
+        if isinstance(self, String):
+            return pd.StringDtype()  # max_length not needed for dataframes
+        if isinstance(self, Decimal):
+            # NumericDtype exists but is not used because fixpoint is more common
+            # in SQL than in dataframes.
+            return pd.Float64Dtype()
+        if isinstance(self, List):
+            # we don't want to produce object columns
+            raise TypeError("pandas doesn't have a native list dtype")
 
         return {
             Int(): pd.Int64Dtype(),  # we default to 64 bit
@@ -321,8 +334,6 @@ class Dtype:
             Float(): pd.Float64Dtype(),  # we default to 64 bit
             Float32(): pd.Float32Dtype(),
             Float64(): pd.Float64Dtype(),
-            Decimal(): pd.Float64Dtype(),  # NumericDtype exists but is not used
-            String(): pd.StringDtype(),
             Bool(): pd.BooleanDtype(),
             Date(): "datetime64[s]",
             Datetime(): "datetime64[us]",
@@ -416,6 +427,20 @@ class Decimal(Float):
         self.precision = precision or 31
         self.scale = scale or (self.precision // 3 + 1)
 
+    def __eq__(self, rhs):
+        return (
+            isinstance(rhs, self.__class__)
+            and self.precision == rhs.precision
+            and self.scale == rhs.scale
+        )
+
+    def __hash__(self):
+        return hash((self.__class__.__name__, self.precision, self.scale))
+
+    def __repr__(self):
+        """Return a string representation of this dtype."""
+        return f"{self.__class__.__name__}({self.precision}, {self.scale})"
+
     def to_sql(self):
         import sqlalchemy as sa
 
@@ -480,6 +505,16 @@ class String(Dtype):
         """
         self.max_length = max_length
 
+    def __eq__(self, rhs):
+        return isinstance(rhs, self.__class__) and self.max_length == rhs.max_length
+
+    def __hash__(self):
+        return hash((self.__class__.__name__, self.max_length))
+
+    def __repr__(self):
+        """Return a string representation of this dtype."""
+        return f"{self.__class__.__name__}({self.max_length})"
+
     def to_sql(self):
         """Convert this Dtype to a SQL type."""
         import sqlalchemy as sa
@@ -523,10 +558,11 @@ class List(Dtype):
         return isinstance(rhs, List) and self.inner == rhs.inner
 
     def __hash__(self):
-        return hash((0, hash(self.inner)))
+        return hash((self.__class__.__name__, hash(self.inner)))
 
     def __repr__(self):
-        return f"List[{repr(self.inner)}]"
+        """Return a string representation of this dtype."""
+        return f"{self.__class__.__name__}[{self.inner}]"
 
     def to_sql(self):
         import sqlalchemy as sa
@@ -556,11 +592,13 @@ class Enum(String):
     def __eq__(self, rhs):
         return isinstance(rhs, Enum) and self.categories == rhs.categories
 
-    def __repr__(self) -> str:
-        return f"Enum[{', '.join(repr(c) for c in self.categories)}]"
-
     def __hash__(self):
-        return hash(tuple(self.categories))
+        return hash((self.__class__.__name__, tuple(self.categories)))
+
+    def __repr__(self) -> str:
+        return (
+            f"{self.__class__.__name__}[{', '.join(repr(c) for c in self.categories)}]"
+        )
 
     def to_polars(self):
         import polars as pl

{pydiverse_common-0.3.10.dist-info → pydiverse_common-0.3.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pydiverse-common
-Version: 0.3.10
+Version: 0.3.12
 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.3.10.dist-info → pydiverse_common-0.3.12.dist-info}/RECORD

@@ -1,5 +1,5 @@
 pydiverse/common/__init__.py,sha256=J7b4iStFyaEMYre_jdlZ4l_8dLyrMWCIpQdsMQcB8aI,806
-pydiverse/common/dtypes.py,sha256=ekeH6Ygnfy6sTsMVG4CcEdGHH_C6Z550tkdkaMQNIyY,18782
+pydiverse/common/dtypes.py,sha256=eoPzUCVZ6UG_-jjmr1W-uqIaQJh14d1qTvnxrxi9xq4,20229
 pydiverse/common/testing.py,sha256=FcivI5wn0X3gzJhwnysKvCOgjSTTXaN6FtSFJ72jfSg,341
 pydiverse/common/version.py,sha256=1IU_m4r76_Qq0u-Tyo2_bERZFOkh0ZFueVzDqcCfLO0,336
 pydiverse/common/errors/__init__.py,sha256=FNeEfVbUa23b9sHkFsmxHYhY6sRgjaZysPQmlovpJrI,262
@@ -11,7 +11,7 @@ pydiverse/common/util/disposable.py,sha256=4XoGz70YRWA9TAqnUBvRCTAdsOGBviFN0gzxU
 pydiverse/common/util/hashing.py,sha256=EofnKULVKXv-S9kry0mOqHU5bxPGomCtr6XfYqIhGgc,4650
 pydiverse/common/util/import_.py,sha256=K7dSgz4YyrqEvqhoOzbwgD7D8HScMoO5XoSWtjbaoUs,4056
 pydiverse/common/util/structlog.py,sha256=xxhauxMuyxcKXTVg1MiPTkuvPBj8Zcr4o_v8Bq59Nig,3778
-pydiverse_common-0.3.10.dist-info/METADATA,sha256=8xmLOqUJZbuETqz49ve_W8NNVkHGyaeOwT2exOhk0uY,3400
-pydiverse_common-0.3.10.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pydiverse_common-0.3.10.dist-info/licenses/LICENSE,sha256=AcE6SDVuAq6v9ZLE_8eOCe_NvSE0rAPR3NR7lSowYh4,1517
-pydiverse_common-0.3.10.dist-info/RECORD,,
+pydiverse_common-0.3.12.dist-info/METADATA,sha256=im41Bu6fJ7PTEWoXMoRVasFnObelq_2Su8PFOyvbQPc,3400
+pydiverse_common-0.3.12.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pydiverse_common-0.3.12.dist-info/licenses/LICENSE,sha256=AcE6SDVuAq6v9ZLE_8eOCe_NvSE0rAPR3NR7lSowYh4,1517
+pydiverse_common-0.3.12.dist-info/RECORD,,