datajunction-server 0.0.2.dev2__py3-none-any.whl → 0.0.2.dev3__py3-none-any.whl

datajunction_server/__about__.py

@@ -2,4 +2,4 @@
 Version for Hatch
 """
 
-__version__ = "0.0.2.dev2"
+__version__ = "0.0.2.dev3"

datajunction_server/models/deployment.py

@@ -65,7 +65,8 @@ class ColumnSpec(BaseModel):
             and (self.display_name == other.display_name or self.display_name is None)
             and (self.description == other.description or self.description is None)
             and set(self.attributes) == set(other.attributes)
-            and (self.partition == other.partition) or (self.partition is None and other.partition is None)
+            and (self.partition == other.partition)
+            or (self.partition is None and other.partition is None)
         )
 
 
@@ -242,11 +243,7 @@ class NodeSpec(BaseModel):
             and set(self.owners) == set(other.owners)
             and set(self.tags) == set(other.tags)
             and self.mode == other.mode
-            and (
-                self.custom_metadata == other.custom_metadata
-                or self.custom_metadata is None
-                and other.custom_metadata == {}
-            )
+            and eq_or_fallback(self.custom_metadata, other.custom_metadata, {})
         )
 
 
@@ -278,27 +275,19 @@ class LinkableNodeSpec(NodeSpec):
         return value
 
     def __eq__(self, other: Any) -> bool:
+        if not isinstance(other, LinkableNodeSpec):
+            return False
+        dimension_links_equal = sorted(
+            self.dimension_links or [],
+            key=lambda link: link.rendered_dimension_node,
+        ) == sorted(
+            other.dimension_links or [],
+            key=lambda link: link.rendered_dimension_node,
+        )
         return (
             super().__eq__(other)
-            and (
-                (self.columns or []) == (other.columns or [])
-                or (
-                    self.columns is None
-                    and not any(
-                        [attr for attr in col.attributes if attr != "primary_key"]
-                        for col in other.columns
-                    )
-                    and not any(col.partition for col in other.columns)
-                )
-            )
-            and sorted(
-                self.dimension_links or [],
-                key=lambda link: link.rendered_dimension_node,
-            )
-            == sorted(
-                other.dimension_links or [],
-                key=lambda link: link.rendered_dimension_node,
-            )
+            and eq_columns(self.columns, other.columns)
+            and dimension_links_equal
         )
 
 
@@ -368,6 +357,18 @@ class MetricSpec(NodeSpec):
     min_decimal_exponent: int | None
     max_decimal_exponent: int | None
 
+    def __init__(self, **data: Any):
+        unit = data.pop("unit", None)
+        if unit:
+            try:
+                if isinstance(unit, MetricUnit):
+                    data["unit_enum"] = unit
+                else:
+                    data["unit_enum"] = MetricUnit[unit.strip().upper()]
+            except KeyError:
+                raise DJInvalidInputException(f"Invalid metric unit: {unit}")
+        super().__init__(**data)
+
     @property
     def unit(self) -> str | None:
         """Return lowercased unit name for JSON serialization."""
@@ -387,11 +388,11 @@ class MetricSpec(NodeSpec):
             super().__eq__(other)
             and self.query_ast.compare(other.query_ast)
             and (self.required_dimensions or []) == (other.required_dimensions or [])
-            and (self.direction == other.direction) or (self.direction is None and other.direction is None)
-            and (self.unit == other.unit) or (self.unit is None and other.unit is None)
-            and (self.significant_digits == other.significant_digits) or (self.significant_digits is None and other.significant_digits is None)
-            and (self.min_decimal_exponent == other.min_decimal_exponent) or (self.min_decimal_exponent is None and other.min_decimal_exponent is None)
-            and (self.max_decimal_exponent == other.max_decimal_exponent) or (self.max_decimal_exponent is None and other.max_decimal_exponent is None)
+            and eq_or_fallback(self.direction, other.direction, MetricDirection.NEUTRAL)
+            and eq_or_fallback(self.unit, other.unit, MetricUnit.UNKNOWN.value.name)
+            and eq_or_none(self.significant_digits, other.significant_digits)
+            and eq_or_none(self.min_decimal_exponent, other.min_decimal_exponent)
+            and eq_or_none(self.max_decimal_exponent, other.max_decimal_exponent)
         )
 
 
@@ -421,32 +422,9 @@ class CubeSpec(NodeSpec):
         ]
 
     def __eq__(self, other: Any) -> bool:
-        print("!!!Comparing cubes", self.rendered_name, other.rendered_name,
-              "super:", super().__eq__(other),
-                "columns:", (self.columns or []) == (other.columns or []),
-                "othercol", ([
-                        [attr for attr in col.attributes if attr != "primary_key"]
-                        for col in other.columns
-                ],
-                 not any(col.partition for col in other.columns)
-                ),
-                "metrics:", set(self.rendered_metrics) == set(other.rendered_metrics),
-                "dimensions:", set(self.rendered_dimensions) == set(other.rendered_dimensions),
-                "filters:", (self.rendered_filters or []) == (other.rendered_filters or [])
-        )
         return (
             super().__eq__(other)
-            and (
-                (self.columns or []) == (other.columns or [])
-                or (
-                    not self.columns
-                    and not any(
-                        [attr for attr in col.attributes if attr != "primary_key"]
-                        for col in other.columns
-                    )
-                    and not any(col.partition for col in other.columns)
-                )
-            )
+            and eq_columns(self.columns, other.columns)
             and set(self.rendered_metrics) == set(other.rendered_metrics)
             and set(self.rendered_dimensions) == set(other.rendered_dimensions)
             and (self.rendered_filters or []) == (other.rendered_filters or [])
@@ -541,3 +519,31 @@ class DeploymentInfo(BaseModel):
     namespace: str
     status: DeploymentStatus
     results: list[DeploymentResult] = Field(default_factory=list)
+
+
+def eq_or_none(a, b):
+    """
+    Helper to compare two values that may be None
+    """
+    return a == b or (a is None and b is None)
+
+
+def eq_or_fallback(a, b, fallback):
+    """
+    Helper to compare two values that may be None, with a fallback value
+    """
+    return a == b or (a is None and b == fallback)
+
+
+def eq_columns(a, b):
+    """
+    Helper to compare two lists of ColumnSpec that may be None
+    """
+    return (a or []) == (b or []) or (
+        not a
+        and not any(
+            [attr for attr in col.attributes if attr != "primary_key"]
+            for col in b or []
+        )
+        and not any(col.partition for col in b or [])
+    )

{datajunction_server-0.0.2.dev2.dist-info → datajunction_server-0.0.2.dev3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: datajunction-server
-Version: 0.0.2.dev2
+Version: 0.0.2.dev3
 Summary: DataJunction server library for running to a DataJunction server
 Project-URL: Homepage, https://datajunction.io
 Project-URL: Repository, https://github.com/DataJunction/dj

{datajunction_server-0.0.2.dev2.dist-info → datajunction_server-0.0.2.dev3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-datajunction_server/__about__.py,sha256=kVl_34fkA7KY3Y1J_D8v00tuvI2dTjfSCc1549SHP7g,54
+datajunction_server/__about__.py,sha256=u61zJrgdVNsCSa_Quk5oGQi6Kp6IA19UMD8utTcIY_E,54
 datajunction_server/__init__.py,sha256=nN5-uJoSVEwuc8n-wMygqeF0Xhxi_zqqbCgutZvAt3E,384
 datajunction_server/alembic.ini,sha256=mclJ_xx8pHfRyZ69SA9ZPqUwZaaQCTyxZ6wBmbrf1bo,3024
 datajunction_server/config.py,sha256=L1zkaiF82S-ciR-wVeILx7CWKSOPPJ90a9zooXVNHEc,5641
@@ -185,7 +185,7 @@ datajunction_server/models/column.py,sha256=3TCa9dDAb9Q2WEAzpcdqAjKSX3PutbwlS8qG
 datajunction_server/models/cube.py,sha256=p6KmqoOVGlziH5k0wXs6qBvgWWQs984Ho6SGplDbtAQ,4459
 datajunction_server/models/cube_materialization.py,sha256=ydMRepDM95b4BBVay_nOYlRtK7OFG3pCDDTRdHe2awU,15787
 datajunction_server/models/database.py,sha256=xhCllbq5ikFNnrPvzuchxQUC9RWogzh73Eqz7Jj0i38,499
-datajunction_server/models/deployment.py,sha256=AgVd2o1dSYtWzpqR3R61-Hja0OVWk_sExh408Gx4iOo,16631
+datajunction_server/models/deployment.py,sha256=7z7JWfkpunpNLrnHAlP580OjmzsemOmLRU4y-SRXcqU,16003
 datajunction_server/models/dialect.py,sha256=uifriawtKR4vi-GG2rdp4eeQkAkD6iLNuarCLQanTxY,3825
 datajunction_server/models/dimensionlink.py,sha256=WaCarxhawOiQqtH1EVS0RQRu9D8Bx6GFonLsdSVgXSs,1551
 datajunction_server/models/engine.py,sha256=Ebuy4HLkURr7mj0pxTj_Y4fEmF0oDen393rnj9fBnR0,466
@@ -226,7 +226,7 @@ datajunction_server/sql/parsing/backends/grammar/generated/SqlBaseParser.py,sha2
 datajunction_server/sql/parsing/backends/grammar/generated/SqlBaseParser.tokens,sha256=JDrzbaKDwIaimAZPYIUzCgzkOEgq0X5-a6_lz78lqgs,8131
 datajunction_server/sql/parsing/backends/grammar/generated/SqlBaseParserListener.py,sha256=vp8wduYkB-T5Xr6HZCSdzAxTHHPrDI5UJZXRJSVhAGA,102464
 datajunction_server/sql/parsing/backends/grammar/generated/SqlBaseParserVisitor.py,sha256=w3V03LgPIHCiqojNyuekBDYqskjOKlKrd0sczQAB_WQ,60290
-datajunction_server-0.0.2.dev2.dist-info/METADATA,sha256=1nsSX_VKvu5SkHpIuXNFyBudwMZRwU_1mF6AuDaTFhc,3769
-datajunction_server-0.0.2.dev2.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-datajunction_server-0.0.2.dev2.dist-info/entry_points.txt,sha256=MOInJGdcQ10bDEl-XW4UMokEgx-ypINqBhObeDI8KiQ,74
-datajunction_server-0.0.2.dev2.dist-info/RECORD,,
+datajunction_server-0.0.2.dev3.dist-info/METADATA,sha256=LepJfcpcyl_-K2_6_pdLMUTX-PH_jKqaAK8rkdfRYI8,3769
+datajunction_server-0.0.2.dev3.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+datajunction_server-0.0.2.dev3.dist-info/entry_points.txt,sha256=MOInJGdcQ10bDEl-XW4UMokEgx-ypINqBhObeDI8KiQ,74
+datajunction_server-0.0.2.dev3.dist-info/RECORD,,