pytrilogy 0.0.3.27__py3-none-any.whl → 0.0.3.29__py3-none-any.whl

{pytrilogy-0.0.3.27.dist-info → pytrilogy-0.0.3.29.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytrilogy
-Version: 0.0.3.27
+Version: 0.0.3.29
 Summary: Declarative, typed query language that compiles to SQL.
 Home-page: 
 Author: 

{pytrilogy-0.0.3.27.dist-info → pytrilogy-0.0.3.29.dist-info}/RECORD

@@ -1,5 +1,5 @@
-pytrilogy-0.0.3.27.dist-info/licenses/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
-trilogy/__init__.py,sha256=Otvz_T4-Jv07I6Y8l7F5VvvngjcMDwH0r7k9OTkAwL0,303
+pytrilogy-0.0.3.29.dist-info/licenses/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
+trilogy/__init__.py,sha256=MugUSIJN7WulnXDH4AUzXnMBLBfW7C2UYzCxjVJBiQ4,303
 trilogy/compiler.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/constants.py,sha256=5eQxk1A0pv-TQk3CCvgZCFA9_K-6nxrOm7E5Lxd7KIY,1652
 trilogy/engine.py,sha256=OK2RuqCIUId6yZ5hfF8J1nxGP0AJqHRZiafcowmW0xc,1728
@@ -23,7 +23,7 @@ trilogy/core/optimization.py,sha256=xGO8piVsLrpqrx-Aid_Y56_5slSv4eZmlP64hCHRiEc,
 trilogy/core/query_processor.py,sha256=Do8YpdPBdsbKtl9n37hobzk8SORMGqH-e_zNNxd-BE4,19456
 trilogy/core/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/core/models/author.py,sha256=-90COW7QY6w-g8GkjivPZqG2yNitn74e13m5KYgB1IU,73985
-trilogy/core/models/build.py,sha256=2K-dANoFFl36yFdEDf7FDL36zM8FKSzpjLT5K2Na8Kc,57549
+trilogy/core/models/build.py,sha256=tky6ryVPcAECt53Sk9TGzmGCumxdbfY9Uxn0oVi50VA,57854
 trilogy/core/models/build_environment.py,sha256=8UggvlPU708GZWYPJMc_ou2r7M3TY2g69eqGvz03YX0,5528
 trilogy/core/models/core.py,sha256=wx6hJcFECMG-Ij972ADNkr-3nFXkYESr82ObPiC46_U,10875
 trilogy/core/models/datasource.py,sha256=6RjJUd2u4nYmEwFBpJlM9LbHVYDv8iHJxqiBMZqUrwI,9422
@@ -42,17 +42,17 @@ trilogy/core/processing/node_generators/__init__.py,sha256=o8rOFHPSo-s_59hREwXMW
 trilogy/core/processing/node_generators/basic_node.py,sha256=UVsXMn6jTjm_ofVFt218jAS11s4RV4zD781vP4im-GI,3371
 trilogy/core/processing/node_generators/common.py,sha256=ZsDzThjm_mAtdQpKAg8QIJiPVZ4KuUkKyilj4eOhSDs,9439
 trilogy/core/processing/node_generators/filter_node.py,sha256=rlY7TbgjJlGhahYgdCIJpJbaSREAGVJEsyUIGaA38O0,8271
-trilogy/core/processing/node_generators/group_node.py,sha256=3-TXVnRO9_jqE_e1kWLqbgtBShW8WFtKwQk8oOtOULs,5894
+trilogy/core/processing/node_generators/group_node.py,sha256=iB5kq-EaueoaSQkgegULwo4g-fe8PKtRtSDiphNO5_k,5939
 trilogy/core/processing/node_generators/group_to_node.py,sha256=E5bEjovSx422d_MlAUCDFdY4P2WJVp61BmWwltkhzA8,3095
 trilogy/core/processing/node_generators/multiselect_node.py,sha256=GWV5yLmKTe1yyPhN60RG1Rnrn4ktfn9lYYXi_FVU4UI,7061
 trilogy/core/processing/node_generators/node_merge_node.py,sha256=sv55oynfqgpHEpo1OEtVDri-5fywzPhDlR85qaWikvY,16195
-trilogy/core/processing/node_generators/rowset_node.py,sha256=8yeMWiyi9IFnza7qPn9YYC3WpA53weq3AY5WisIui8Y,6705
+trilogy/core/processing/node_generators/rowset_node.py,sha256=tQog2YbG7h2TSVZGdXCFbwjqpq-CKqNewFOOfpZNqh4,6751
 trilogy/core/processing/node_generators/select_merge_node.py,sha256=pIsHfXWA30RkKSMBDKPtDmCriJtHoNKRMJC0THSDxpI,19951
 trilogy/core/processing/node_generators/select_node.py,sha256=Y-zO0AFkTrpi2LyebjpyHU7WWANr7nKZSS9rY7DH4Wo,1888
 trilogy/core/processing/node_generators/synonym_node.py,sha256=9LHK2XHDjbyTLjmDQieskG8fqbiSpRnFOkfrutDnOTE,2258
 trilogy/core/processing/node_generators/union_node.py,sha256=zuMSmgF170vzlp2BBQEhKbqUMjVl2xQDqUB82Dhv-VU,2536
 trilogy/core/processing/node_generators/unnest_node.py,sha256=cOEKnMRzXUW3bwmiOlgn3E1-B38osng0dh2pDykwITY,2410
-trilogy/core/processing/node_generators/window_node.py,sha256=6KoxhmpVOTN3HGWT0FIS96xqlm2Inouw9VL2D_0kSg0,3481
+trilogy/core/processing/node_generators/window_node.py,sha256=MjLmFKUiS-_p-Ak_9mr3becGde9eu5frxmqI7plIETY,5808
 trilogy/core/processing/node_generators/select_helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/core/processing/node_generators/select_helpers/datasource_injection.py,sha256=GMW07bb6hXurhF0hZLYoMAKSIS65tat5hwBjvqqPeSA,6516
 trilogy/core/processing/nodes/__init__.py,sha256=DqPG3Y8vl5-UTeox6hn1EE6iwPIJpsM-XeZALHSgLZQ,5058
@@ -63,7 +63,7 @@ trilogy/core/processing/nodes/merge_node.py,sha256=bEz1QU2o-fl_O-VotE5dN1GmlZPCl
 trilogy/core/processing/nodes/select_node_v2.py,sha256=Xyfq8lU7rP7JTAd8VV0ATDNal64n4xIBgWQsOuMe_Ak,8824
 trilogy/core/processing/nodes/union_node.py,sha256=fDFzLAUh5876X6_NM7nkhoMvHEdGJ_LpvPokpZKOhx4,1425
 trilogy/core/processing/nodes/unnest_node.py,sha256=oLKMMNMx6PLDPlt2V5neFMFrFWxET8r6XZElAhSNkO0,2181
-trilogy/core/processing/nodes/window_node.py,sha256=STvwheVttxSWVHB-yUQUSo-Pyz7Uk8G1txFDAbWMp-s,1380
+trilogy/core/processing/nodes/window_node.py,sha256=JXJ0iVRlSEM2IBr1TANym2RaUf_p5E_l2sNykRzXWDo,1710
 trilogy/core/statements/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/core/statements/author.py,sha256=sPrItQEKXzE7IR3SGOTVN4OBvGHldUCqXCzbcmEpb7I,14575
 trilogy/core/statements/build.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -87,7 +87,7 @@ trilogy/hooks/graph_hook.py,sha256=c-vC-IXoJ_jDmKQjxQyIxyXPOuUcLIURB573gCsAfzQ,2
 trilogy/hooks/query_debugger.py,sha256=1npRjww94sPV5RRBBlLqMJRaFkH9vhEY6o828MeoEcw,5583
 trilogy/metadata/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/parsing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/parsing/common.py,sha256=99tDKrpQTk-SpyTXUqKFtm-lfmhjCOQIn25hxbQvRRg,21459
+trilogy/parsing/common.py,sha256=JN8pPjtoEMyURAtp7fttm-8iFkaAvuinUKyQs05FqoM,21615
 trilogy/parsing/config.py,sha256=Z-DaefdKhPDmSXLgg5V4pebhSB0h590vI0_VtHnlukI,111
 trilogy/parsing/exceptions.py,sha256=92E5i2frv5hj9wxObJZsZqj5T6bglvPzvdvco_vW1Zk,38
 trilogy/parsing/helpers.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
@@ -99,10 +99,10 @@ trilogy/scripts/trilogy.py,sha256=1L0XrH4mVHRt1C9T1HnaDv2_kYEfbWTb5_-cBBke79w,37
 trilogy/std/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/std/dashboard.preql,sha256=eJJTs3xPjYKmp-U5SUxCXAAbp55NlmmC3kECaNg4ya4,128
 trilogy/std/date.preql,sha256=0MHeGLp2mG4QBKtmozcBZ7qVjOAdWOtrliIKn6hz1Pc,95
-trilogy/std/geography.preql,sha256=KavDw4wbTJcgooo30vWF-MYg5WvD7dZYIWuBQtSaPxg,441
+trilogy/std/geography.preql,sha256=-fqAGnBL6tR-UtT8DbSek3iMFg66ECR_B_41pODxv-k,504
 trilogy/std/money.preql,sha256=ZHW-csTX-kYbOLmKSO-TcGGgQ-_DMrUXy0BjfuJSFxM,80
-pytrilogy-0.0.3.27.dist-info/METADATA,sha256=evVL1Vwen5IhOSqahza3hHhSxrPnwZcCqL1z2ism22g,9100
-pytrilogy-0.0.3.27.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-pytrilogy-0.0.3.27.dist-info/entry_points.txt,sha256=ewBPU2vLnVexZVnB-NrVj-p3E-4vukg83Zk8A55Wp2w,56
-pytrilogy-0.0.3.27.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
-pytrilogy-0.0.3.27.dist-info/RECORD,,
+pytrilogy-0.0.3.29.dist-info/METADATA,sha256=3gNW2M-xUoB6bil7WY_1diepCO8i_TXBnATq7QAz8tA,9100
+pytrilogy-0.0.3.29.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+pytrilogy-0.0.3.29.dist-info/entry_points.txt,sha256=ewBPU2vLnVexZVnB-NrVj-p3E-4vukg83Zk8A55Wp2w,56
+pytrilogy-0.0.3.29.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
+pytrilogy-0.0.3.29.dist-info/RECORD,,

trilogy/__init__.py

@@ -4,6 +4,6 @@ from trilogy.dialect.enums import Dialects
 from trilogy.executor import Executor
 from trilogy.parser import parse
 
-__version__ = "0.0.3.27"
+__version__ = "0.0.3.29"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

trilogy/core/models/build.py

@@ -1610,8 +1610,18 @@ class Factory:
 
     @build.register
     def _(self, base: OrderItem) -> BuildOrderItem:
+        from trilogy.parsing.common import arbitrary_to_concept
+
+        bexpr: Any
+        if isinstance(base.expr, AggregateWrapper):
+            bexpr = arbitrary_to_concept(
+                base.expr,
+                environment=self.environment,
+            )
+        else:
+            bexpr = base.expr
         return BuildOrderItem.model_construct(
-            expr=(self.build(base.expr)),
+            expr=(self.build(bexpr)),
             order=base.order,
         )
 

trilogy/core/processing/node_generators/group_node.py

@@ -86,7 +86,7 @@ def gen_group_node(
                     )
                 else:
                     logger.info(
-                        f"{padding(depth)}{LOGGER_PREFIX} cannot include optional agg; mismatched grain {BuildGrain.from_concepts(agg_parents)} vs {BuildGrain.from_concepts(parent_concepts)}"
+                        f"{padding(depth)}{LOGGER_PREFIX} cannot include optional agg {possible_agg.address}; mismatched grain {BuildGrain.from_concepts(agg_parents)} vs {BuildGrain.from_concepts(parent_concepts)}"
                     )
     if parent_concepts:
         logger.info(
@@ -139,7 +139,7 @@ def gen_group_node(
         )
         return group_node
     logger.info(
-        f"{padding(depth)}{LOGGER_PREFIX} group node requires enrichment, missing {missing_optional}"
+        f"{padding(depth)}{LOGGER_PREFIX} group node for {concept.address} requires enrichment, missing {missing_optional}"
     )
     return gen_enrichment_node(
         group_node,

trilogy/core/processing/node_generators/rowset_node.py

@@ -91,7 +91,9 @@ def gen_rowset_node(
         and x.derivation != Derivation.ROWSET
         and not any(z in lineage.rowset.derived_concepts for z in x.pseudonyms)
     ]
-    logger.info(f"{padding(depth)}{LOGGER_PREFIX} hiding {final_hidden}")
+    logger.info(
+        f"{padding(depth)}{LOGGER_PREFIX} hiding {final_hidden} local optional {local_optional}"
+    )
     node.hide_output_concepts(final_hidden)
     assert node.resolution_cache
     # assume grain to be output of select

trilogy/core/processing/node_generators/window_node.py

@@ -1,10 +1,18 @@
 from typing import List
 
 from trilogy.constants import logger
-from trilogy.core.models.build import BuildConcept, BuildWhereClause, BuildWindowItem
+from trilogy.core.models.build import (
+    BuildConcept,
+    BuildGrain,
+    BuildWhereClause,
+    BuildWindowItem,
+)
 from trilogy.core.models.build_environment import BuildEnvironment
+from trilogy.core.processing.node_generators.common import (
+    gen_enrichment_node,
+)
 from trilogy.core.processing.nodes import History, StrategyNode, WindowNode
-from trilogy.core.processing.utility import padding
+from trilogy.core.processing.utility import create_log_lambda, padding
 from trilogy.utility import unique
 
 LOGGER_PREFIX = "[GEN_WINDOW_NODE]"
@@ -24,6 +32,7 @@ def resolve_window_parent_concepts(
     if concept.lineage.order_by:
         for item in concept.lineage.order_by:
             base += item.concept_arguments
+
     return concept.lineage.content, unique(base, "address")
 
 
@@ -34,12 +43,12 @@ def gen_window_node(
     g,
     depth: int,
     source_concepts,
-    history: History | None = None,
+    history: History,
     conditions: BuildWhereClause | None = None,
 ) -> StrategyNode | None:
     base, parent_concepts = resolve_window_parent_concepts(concept, environment)
     logger.info(
-        f"{padding(depth)}{LOGGER_PREFIX} generating window node for {concept} with parents {parent_concepts}"
+        f"{padding(depth)}{LOGGER_PREFIX} generating window node for {concept} with parents {parent_concepts} and optional {local_optional}"
     )
     equivalent_optional = [
         x
@@ -48,17 +57,35 @@ def gen_window_node(
         and resolve_window_parent_concepts(x, environment)[1] == parent_concepts
     ]
 
-    non_equivalent_optional = [
-        x for x in local_optional if x.address not in equivalent_optional
-    ]
     targets = [base]
+    # append in keys to get the right grain
+    if concept.keys:
+        for item in concept.keys:
+            targets.append(environment.concepts[item])
+    additional_outputs = []
     if equivalent_optional:
         for x in equivalent_optional:
             assert isinstance(x.lineage, WINDOW_TYPES)
-            targets.append(x.lineage.content)
+            logger.info(
+                f"{padding(depth)}{LOGGER_PREFIX} found equivalent optional {x} with parents {resolve_window_parent_concepts(x, environment)[1]}"
+            )
+            additional_outputs.append(x)
+
+    grain_equivalents = [
+        x for x in local_optional if x.keys and all([key in targets for key in x.keys])
+    ]
 
+    for x in grain_equivalents:
+        targets.append(x)
+
+    # finally, the ones we'll need to enrich
+    non_equivalent_optional = [x for x in local_optional if x.address not in targets]
+
+    logger.info(
+        f"{padding(depth)}{LOGGER_PREFIX} resolving final parents {parent_concepts + targets}"
+    )
     parent_node: StrategyNode = source_concepts(
-        mandatory_list=parent_concepts + targets + non_equivalent_optional,
+        mandatory_list=parent_concepts + targets,
         environment=environment,
         g=g,
         depth=depth + 1,
@@ -85,21 +112,62 @@ def gen_window_node(
         )
         raise SyntaxError
     _window_node = WindowNode(
-        input_concepts=parent_concepts + targets + non_equivalent_optional,
-        output_concepts=[concept] + parent_concepts + local_optional,
+        input_concepts=parent_concepts + targets,
+        output_concepts=[concept] + additional_outputs + parent_concepts + targets,
         environment=environment,
         parents=[
             parent_node,
         ],
         depth=depth,
+        preexisting_conditions=conditions.conditional if conditions else None,
     )
     _window_node.rebuild_cache()
     _window_node.resolve()
     window_node = StrategyNode(
-        input_concepts=[concept] + local_optional,
-        output_concepts=[concept] + local_optional,
+        input_concepts=[concept] + additional_outputs + parent_concepts + targets,
+        output_concepts=[concept] + additional_outputs + parent_concepts + targets,
         environment=environment,
         parents=[_window_node],
         preexisting_conditions=conditions.conditional if conditions else None,
+        # hidden_concepts=[
+        #     x.address for x in parent_concepts if x.address not in local_optional
+        # ],
+    )
+    if not non_equivalent_optional:
+        logger.info(
+            f"{padding(depth)}{LOGGER_PREFIX} no optional concepts, returning window node"
+        )
+        return window_node
+
+    missing_optional = [
+        x.address
+        for x in local_optional
+        if x.address not in window_node.output_concepts
+    ]
+
+    if not missing_optional:
+        logger.info(
+            f"{padding(depth)}{LOGGER_PREFIX} no extra enrichment needed for window node, has all of {[x.address for x in local_optional]}"
+        )
+        return window_node
+    logger.info(
+        f"{padding(depth)}{LOGGER_PREFIX} window node for {concept.address} requires enrichment, missing {missing_optional}, has {[x.address for x in window_node.output_concepts]}"
+    )
+
+    return gen_enrichment_node(
+        window_node,
+        join_keys=[
+            environment.concepts[c]
+            for c in BuildGrain.from_concepts(
+                concepts=targets, environment=environment
+            ).components
+        ],
+        local_optional=local_optional,
+        environment=environment,
+        g=g,
+        depth=depth,
+        source_concepts=source_concepts,
+        log_lambda=create_log_lambda(LOGGER_PREFIX, depth, logger),
+        history=history,
+        conditions=conditions,
     )
-    return window_node

trilogy/core/processing/nodes/window_node.py

@@ -1,7 +1,13 @@
 from typing import List
 
 from trilogy.core.enums import SourceType
-from trilogy.core.models.build import BuildConcept, BuildOrderBy
+from trilogy.core.models.build import (
+    BuildComparison,
+    BuildConcept,
+    BuildConditional,
+    BuildOrderBy,
+    BuildParenthetical,
+)
 from trilogy.core.models.execute import QueryDatasource
 from trilogy.core.processing.nodes.base_node import StrategyNode
 
@@ -18,6 +24,9 @@ class WindowNode(StrategyNode):
         parents: List["StrategyNode"] | None = None,
         depth: int = 0,
         ordering: BuildOrderBy | None = None,
+        preexisting_conditions: (
+            BuildConditional | BuildComparison | BuildParenthetical | None
+        ) = None,
     ):
         super().__init__(
             input_concepts=input_concepts,
@@ -27,6 +36,7 @@ class WindowNode(StrategyNode):
             parents=parents,
             depth=depth,
             ordering=ordering,
+            preexisting_conditions=preexisting_conditions,
         )
 
     def _resolve(self) -> QueryDatasource:
@@ -42,4 +52,5 @@ class WindowNode(StrategyNode):
             parents=self.parents,
             depth=self.depth,
             ordering=self.ordering,
+            preexisting_conditions=self.preexisting_conditions,
         )

trilogy/parsing/common.py

@@ -417,7 +417,14 @@ def window_item_to_concept(
     bcontent = environment.concepts[parent.content.address]
     if isinstance(bcontent, UndefinedConcept):
         return UndefinedConcept(address=f"{namespace}.{name}", metadata=fmetadata)
-    local_purpose, keys = get_purpose_and_keys(None, (bcontent,), environment)
+
+    if bcontent.purpose == Purpose.METRIC:
+        local_purpose, keys = get_purpose_and_keys(None, (bcontent,), environment)
+    else:
+        local_purpose = Purpose.PROPERTY
+        keys = {
+            bcontent.address,
+        }
 
     if parent.order_by:
         grain_components = parent.over + [bcontent.output]

trilogy/std/geography.preql

@@ -1,10 +1,10 @@
 
 
 ## us types
-type us_state string; # US state abbreviation
-type us_zip_code string; # US ZIP code
-type us_state string; # US state name
+type us_state_short string; # US state abbreviation - ex MA, CA, NY
+type us_state string; # US state name - ex Massachusetts, California, New York
 
+type us_zip_code string; # US ZIP code
 
 ## generic types
 type latitude float; # Latitude in degrees