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

datajunction_server/__about__.py

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

datajunction_server/api/namespaces.py

@@ -432,7 +432,7 @@ async def export_namespace_spec(
                         namespace,
                     )
                     link.join_on = inject_prefixes(link.join_on, namespace)
-                else:
+                else:  # pragma: no cover
                     link.dimension = inject_prefixes(link.dimension, namespace)
         if node_spec.node_type == NodeType.CUBE:
             cube_spec = cast(CubeSpec, node_spec)

datajunction_server/database/deployment.py

@@ -44,11 +44,11 @@ class Deployment(Base):
 
     @property
     def deployment_spec(self) -> DeploymentSpec:
-        return DeploymentSpec(**self.spec)
+        return DeploymentSpec(**self.spec)  # pragma: no cover
 
     @deployment_spec.setter
     def deployment_spec(self, value: DeploymentSpec):
-        self.spec = value.dict()
+        self.spec = value.dict()  # pragma: no cover
 
     @property
     def deployment_results(self) -> list[DeploymentResult]:
@@ -56,4 +56,4 @@ class Deployment(Base):
 
     @deployment_results.setter
     def deployment_results(self, value: list[DeploymentResult]):
-        self.results = [result.dict() for result in value]
+        self.results = [result.dict() for result in value]  # pragma: no cover

datajunction_server/models/deployment.py

@@ -56,8 +56,8 @@ class ColumnSpec(BaseModel):
     partition: PartitionSpec | None = None
 
     def __eq__(self, other: Any) -> bool:
-        # if not isinstance(other, ColumnSpec):
-        #     return False
+        if not isinstance(other, ColumnSpec):
+            return False
 
         return (
             self.name == other.name
@@ -65,7 +65,7 @@ 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
+            and (self.partition == other.partition) or (self.partition is None and other.partition is None)
         )
 
 
@@ -163,18 +163,9 @@ class DimensionReferenceLinkSpec(DimensionLinkSpec):
     def dimension_attribute(self) -> str:
         return self.dimension.rsplit(".", 1)[-1]
 
-    # def __hash__(self) -> int:
-    #     return hash(
-    #         (
-    #             self.rendered_dimension_node,
-    #             self.dimension_attribute,
-    #             self.node_column,
-    #         ),
-    #     )
-
     def __eq__(self, other: Any) -> bool:
-        # if not isinstance(other, DimensionReferenceLinkSpec):
-        #     return False
+        if not isinstance(other, DimensionReferenceLinkSpec):
+            return False
         return (
             super().__eq__(other)
             and self.rendered_dimension_node == other.rendered_dimension_node
@@ -224,10 +215,9 @@ class NodeSpec(BaseModel):
 
     @property
     def rendered_query(self) -> str | None:
-        if hasattr(self, "query"):
+        if hasattr(self, "query") and self.query:
             query = getattr(self, "query")
-            if query:
-                return render_prefixes(query, self.namespace)
+            return render_prefixes(query, self.namespace)
         return None
 
     @property
@@ -242,8 +232,8 @@ class NodeSpec(BaseModel):
         return self._query_ast
 
     def __eq__(self, other: Any) -> bool:
-        # if not isinstance(other, NodeSpec):
-        #     return False
+        if not isinstance(other, NodeSpec):
+            return False
         return (
             self.rendered_name == other.rendered_name
             and self.node_type == other.node_type
@@ -397,11 +387,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
-            and self.unit == other.unit
-            and self.significant_digits == other.significant_digits
-            and self.min_decimal_exponent == other.min_decimal_exponent
-            and self.max_decimal_exponent == other.max_decimal_exponent
+            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)
         )
 
 
@@ -431,12 +421,25 @@ 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 (
-                    self.columns is None
+                    not self.columns
                     and not any(
                         [attr for attr in col.attributes if attr != "primary_key"]
                         for col in other.columns
@@ -480,7 +483,7 @@ class DeploymentSpec(BaseModel):
                 "metric": MetricSpec,
                 "cube": CubeSpec,
             }
-            if node_type not in mapping:
+            if node_type not in mapping:  # pragma: no cover
                 raise ValueError(f"Unknown node_type: {node_type}")
             deployment_ns = values.get("namespace")
             return mapping[node_type](**value, namespace=deployment_ns)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: datajunction-server
-Version: 0.0.2.dev0
+Version: 0.0.2.dev2
 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.dev0.dist-info → datajunction_server-0.0.2.dev2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-datajunction_server/__about__.py,sha256=35Ts5XaNX5Ex0ZdaT8GTOPfw-qaO0d_arUCBPdNiQ5I,54
+datajunction_server/__about__.py,sha256=kVl_34fkA7KY3Y1J_D8v00tuvI2dTjfSCc1549SHP7g,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
@@ -65,7 +65,7 @@ datajunction_server/api/main.py,sha256=s1gWNs5wGXzCtlqf4faeq-rE6uf_RLn4O7WJnauWr
 datajunction_server/api/materializations.py,sha256=buhYWTUGBbRI0fWvREaK1D1F809y5eSxHDWqTQtBewc,21796
 datajunction_server/api/measures.py,sha256=MdNpB4iNqEcU5-hWno5X4QnMTbijc2ISrprS8nyY2WQ,5729
 datajunction_server/api/metrics.py,sha256=X5By7oNWa9b0l65Qf8Bcz--aClngc30y4G3PMdJhTCs,4917
-datajunction_server/api/namespaces.py,sha256=48LfIa1RDHc0ql9mrLPLBcCAPAbmxd-rZbM3WbOKRZ8,14829
+datajunction_server/api/namespaces.py,sha256=S-j5JNWzwKh52SgML6pTbgF-dbFzPUvn1r9x3oPWIhw,14849
 datajunction_server/api/nodes.py,sha256=0nOPEKD0OQ8Tq5FLElKI2ODnXRZS25jM9yUywURKfsc,43728
 datajunction_server/api/notifications.py,sha256=0jHnWD6leBxazVgZtfTlL1e8-sZ3Y2PmU8FI-TWepkU,5403
 datajunction_server/api/setup_logging.py,sha256=_1LlR2KMqjjBff1gqJ8Kmyvza1dAYjzGGK6kak1GdcU,174
@@ -120,7 +120,7 @@ datajunction_server/database/catalog.py,sha256=44jhu_2RMFMiYwuz87vP9GvOW3oAwEdUt
 datajunction_server/database/collection.py,sha256=i27roD2CL1P7-7WBXgWbt5ReZ6gxPoqJbRFCkJQtLEg,2873
 datajunction_server/database/column.py,sha256=SRN_uz2FwejEMI83mv8-3LXFUUI1-4IqcH9sb5qiFc8,6044
 datajunction_server/database/database.py,sha256=iwfLuVaEs2nlPidBDfJJGJrVGy1eTrcm6_-z1UFQCRI,3650
-datajunction_server/database/deployment.py,sha256=hSXeXZWIRJBhYCw6ORoQN-lQ0AKSOevc8KVXK9JSsNo,2084
+datajunction_server/database/deployment.py,sha256=cSakZPFeF0xrrpVSlfe3Vyd2zjuc2CXRq5fAnyEA9O8,2144
 datajunction_server/database/dimensionlink.py,sha256=cuAMIGsBgZf7CBcNM1D-bV4nOyLkyi7nGUlNU21LH6w,7401
 datajunction_server/database/engine.py,sha256=c4mCfvMKZDNMm1vrSlkRtylx8pynbkTFAvWp5SJT568,1656
 datajunction_server/database/history.py,sha256=hxGRQdvxwKLy8acRAFd1XgS7M-Wl3RpVT1krlC4rhuU,1899
@@ -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=2d6ylqVT_570I6q3oTgFwnQnD7tSZxND-Qf9tgxpu_E,15718
+datajunction_server/models/deployment.py,sha256=AgVd2o1dSYtWzpqR3R61-Hja0OVWk_sExh408Gx4iOo,16631
 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.dev0.dist-info/METADATA,sha256=3pde6UgXgiAsUfKJ_Jru8CU6tdnp9Tww2MflidLeVj4,3769
-datajunction_server-0.0.2.dev0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-datajunction_server-0.0.2.dev0.dist-info/entry_points.txt,sha256=MOInJGdcQ10bDEl-XW4UMokEgx-ypINqBhObeDI8KiQ,74
-datajunction_server-0.0.2.dev0.dist-info/RECORD,,
+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,,