pytrilogy 0.0.2.40__py3-none-any.whl → 0.0.2.41__py3-none-any.whl

{pytrilogy-0.0.2.40.dist-info → pytrilogy-0.0.2.41.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytrilogy
-Version: 0.0.2.40
+Version: 0.0.2.41
 Summary: Declarative, typed query language that compiles to SQL.
 Home-page: 
 Author: 
@@ -186,7 +186,7 @@ datasource usa_names(
     gender:gender,
     state:state
 )
-address bigquery-public-data.usa_names.usa_1910_2013;
+address `bigquery-public-data.usa_names.usa_1910_2013`;
 
 '''
 )

{pytrilogy-0.0.2.40.dist-info → pytrilogy-0.0.2.41.dist-info}/RECORD

@@ -1,4 +1,4 @@
-trilogy/__init__.py,sha256=2E7nMoyCbDG8XWcPC2wKkOfnlTRrPzFPzBTUxxpk8U4,291
+trilogy/__init__.py,sha256=TkwxYmJ568eljR1wX8-wzP48QWvm0V6gSnZBN5DX-jk,291
 trilogy/compiler.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/constants.py,sha256=UPymm94T2c6a55XdDaXw0aleTe1pOJ6lf6gOWLKZyKg,1430
 trilogy/engine.py,sha256=R5ubIxYyrxRExz07aZCUfrTsoXCHQ8DKFTDsobXdWdA,1102
@@ -16,20 +16,20 @@ trilogy/core/exceptions.py,sha256=NvV_4qLOgKXbpotgRf7c8BANDEvHxlqRPaA53IThQ2o,56
 trilogy/core/functions.py,sha256=IhVpt3n6wEanKHnGu3oA2w6-hKIlxWpEyz7fHN66mpo,10720
 trilogy/core/graph_models.py,sha256=mameUTiuCajtihDw_2-W218xyJlvTusOWrEKP1yAWgk,2003
 trilogy/core/internal.py,sha256=jNGFHKENnbMiMCtAgsnLZYVSENDK4b5ALecXFZpTDzQ,1075
-trilogy/core/models.py,sha256=S_Qq1HpDDTFI1JRrr9Ky-2K2VusiUkpe7rfq44CclBQ,163041
+trilogy/core/models.py,sha256=5pUsZoiEHEFLvZTddpy-_u_2w_lH9tJIPe5lQH5Ru-s,163252
 trilogy/core/optimization.py,sha256=VFSvJLNoCCOraip-PZUKeE4qrlxtXARjQUzJZiW-yRk,7325
 trilogy/core/query_processor.py,sha256=mbcZlgjChrRjDHkdmMbKe-T70UpbBkJhS09MyU5a6UY,17785
 trilogy/core/optimizations/__init__.py,sha256=bWQecbeiwiDx9LJnLsa7dkWxdbl2wcnkcTN69JyP8iI,356
 trilogy/core/optimizations/base_optimization.py,sha256=tWWT-xnTbnEU-mNi_isMNbywm8B9WTRsNFwGpeh3rqE,468
 trilogy/core/optimizations/inline_constant.py,sha256=kHNyc2UoaPVdYfVAPAFwnWuk4sJ_IF5faRtVcDOrBtw,1110
 trilogy/core/optimizations/inline_datasource.py,sha256=NqUOVl0pOXF1R_roELVW8I0qN7or2wPtAsRmDD9QJso,3658
-trilogy/core/optimizations/predicate_pushdown.py,sha256=1l9WnFOSv79e341typG3tTdk0XGl1J_ToQih3LYoGIY,8435
+trilogy/core/optimizations/predicate_pushdown.py,sha256=oJy09U7lb8FMKexWISjg4Ksyf98Nx22bzIxmm9WuXtk,8899
 trilogy/core/processing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/core/processing/concept_strategies_v3.py,sha256=Qy3WHiKaF371dDmbA0DWVQqSMKptH_gK714Uc41wbqc,36132
 trilogy/core/processing/graph_utils.py,sha256=aq-kqk4Iado2HywDxWEejWc-7PGO6Oa-ZQLAM6XWPHw,1199
 trilogy/core/processing/utility.py,sha256=_sWLDuV8WAEWdEIcAPM8-FcXgBai30UV12i4O9u5Mpc,18680
 trilogy/core/processing/node_generators/__init__.py,sha256=-mzYkRsaRNa_dfTckYkKVFSR8h8a3ihEiPJDU_tAmDo,672
-trilogy/core/processing/node_generators/basic_node.py,sha256=WQNgJ1MwrMS_BQ-b3XwGGB6eToDykelAVj_fesJuqe0,2069
+trilogy/core/processing/node_generators/basic_node.py,sha256=qsQ8HegQ2qOSpXFleq7yHJ-rYfF6XQGCC7h2pC-t1kQ,2878
 trilogy/core/processing/node_generators/common.py,sha256=eslHTTPFTkmwHwKIuUsbFn54jxj-Avtt-QScqtNwzdg,8945
 trilogy/core/processing/node_generators/filter_node.py,sha256=Vz9Rb67e1dfZgnliekwwLeDPVkthMbdrnrKRdz7J1ik,7654
 trilogy/core/processing/node_generators/group_node.py,sha256=r54IVEhXW-tzod6uEHIQObrxgQt6aNySk5emWkWyqCU,4938
@@ -40,7 +40,7 @@ trilogy/core/processing/node_generators/rowset_node.py,sha256=KtdN6t2xM8CJxobc4a
 trilogy/core/processing/node_generators/select_merge_node.py,sha256=UF4xra2sJ6dGg9TLJUgqtTX-UxqUaCEfAGo-uq7HlVs,12139
 trilogy/core/processing/node_generators/select_node.py,sha256=nwXHQF6C-aQUIelx9dyxN2pK3muL-4-6RIqnqQqNwtw,1808
 trilogy/core/processing/node_generators/unnest_node.py,sha256=cZ26CN338CBnd6asML1OBUtNcDzmNlFpY0Vnade4yrc,2256
-trilogy/core/processing/node_generators/window_node.py,sha256=jy3FF8uN0VA7yyrBeR40B9CAqR_5qBP4PiS6Gr-f-7w,2590
+trilogy/core/processing/node_generators/window_node.py,sha256=Jfjjdvn8RqFzrQ1gZc6vS0Bsh_iTA5AmRZ0zLlT4574,3155
 trilogy/core/processing/nodes/__init__.py,sha256=qS5EJDRwwIrCEfS7ibCA2ESE0RPzsAIii1UWd_wNsHA,4760
 trilogy/core/processing/nodes/base_node.py,sha256=sc3HrXkWk-xpsAQ7B7ltX1ZejYAkqFiv8Ei8Jg5VGkQ,15579
 trilogy/core/processing/nodes/filter_node.py,sha256=GfZ9eghpFDI-s7iQP2UqTljCmn25LT_T5TAxDlh7PkQ,2343
@@ -50,7 +50,7 @@ trilogy/core/processing/nodes/select_node_v2.py,sha256=7WoFxeGEAzhpS4y4Zw2nH2tt7
 trilogy/core/processing/nodes/unnest_node.py,sha256=mAmFluzm2yeeiQ6NfIB7BU_8atRGh-UJfPf9ROwbhr8,2152
 trilogy/core/processing/nodes/window_node.py,sha256=ro0QfMFi4ZmIn5Q4D0M_vJWfnHH_C0MN7XkVkx8Gygg,1214
 trilogy/dialect/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/dialect/base.py,sha256=ubBrXe-Pb-9LjG1bCvZW7U3M0Nor4R1Ulgu1u6YcULY,34606
+trilogy/dialect/base.py,sha256=bevM9mUGSfwt_F-kJpi0nHmMRmE0pINqqvCteqnu5FM,34880
 trilogy/dialect/bigquery.py,sha256=15KJ-cOpBlk9O7FPviPgmg8xIydJeKx7WfmL3SSsPE8,2953
 trilogy/dialect/common.py,sha256=eqJi_Si1iyb2sV0siTf8g8JOHueWu6RkdtQZtutKazk,3826
 trilogy/dialect/config.py,sha256=tLVEMctaTDhUgARKXUNfHUcIolGaALkQ0RavUvXAY4w,2994
@@ -72,12 +72,12 @@ trilogy/parsing/exceptions.py,sha256=92E5i2frv5hj9wxObJZsZqj5T6bglvPzvdvco_vW1Zk
 trilogy/parsing/helpers.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 trilogy/parsing/parse_engine.py,sha256=KMeHQf8iW-UKd4JstGgcoo6O3OZ14MaQW50g1PMjEEQ,65256
 trilogy/parsing/render.py,sha256=-qqpXQg4yHcv284Vosjnsc_vrPveH6oaYbeCd3ZSvs0,15682
-trilogy/parsing/trilogy.lark,sha256=YOgt-rE_0ZHRex_fTeqZiHvu5a4BX5UBOUu1LAVCyug,12391
+trilogy/parsing/trilogy.lark,sha256=B6NM3-rBHtYB_WSEti0DiS8Z-I8YH3kZU47xNzQvBx4,12389
 trilogy/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/scripts/trilogy.py,sha256=PHxvv6f2ODv0esyyhWxlARgra8dVhqQhYl0lTrSyVNo,3729
-pytrilogy-0.0.2.40.dist-info/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
-pytrilogy-0.0.2.40.dist-info/METADATA,sha256=xgH5_k_JkGbPM1lpHQYkEQvbPizwXPjnZduBAZUrdzs,8424
-pytrilogy-0.0.2.40.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-pytrilogy-0.0.2.40.dist-info/entry_points.txt,sha256=0petKryjvvtEfTlbZC1AuMFumH_WQ9v8A19LvoS6G6c,54
-pytrilogy-0.0.2.40.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
-pytrilogy-0.0.2.40.dist-info/RECORD,,
+pytrilogy-0.0.2.41.dist-info/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
+pytrilogy-0.0.2.41.dist-info/METADATA,sha256=PGYuvWWThHh9Vucj7-eZIWLGu7db7pN7iVyXL9f42-Q,8426
+pytrilogy-0.0.2.41.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+pytrilogy-0.0.2.41.dist-info/entry_points.txt,sha256=0petKryjvvtEfTlbZC1AuMFumH_WQ9v8A19LvoS6G6c,54
+pytrilogy-0.0.2.41.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
+pytrilogy-0.0.2.41.dist-info/RECORD,,

trilogy/__init__.py

@@ -4,6 +4,6 @@ from trilogy.executor import Executor
 from trilogy.parser import parse
 from trilogy.constants import CONFIG
 
-__version__ = "0.0.2.40"
+__version__ = "0.0.2.41"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

trilogy/core/models.py

@@ -1375,6 +1375,9 @@ class WindowItem(Mergeable, Namespaced, SelectContext, BaseModel):
     over: List["Concept"] = Field(default_factory=list)
     index: Optional[int] = None
 
+    def __repr__(self) -> str:
+        return f"{self.type}({self.content} {self.index}, {self.over}, {self.order_by})"
+
     def with_merge(
         self, source: Concept, target: Concept, modifiers: List[Modifier]
     ) -> "WindowItem":
@@ -1383,6 +1386,7 @@ class WindowItem(Mergeable, Namespaced, SelectContext, BaseModel):
             content=self.content.with_merge(source, target, modifiers),
             over=[x.with_merge(source, target, modifiers) for x in self.over],
             order_by=[x.with_merge(source, target, modifiers) for x in self.order_by],
+            index=self.index,
         )
 
     def with_namespace(self, namespace: str) -> "WindowItem":
@@ -1391,6 +1395,7 @@ class WindowItem(Mergeable, Namespaced, SelectContext, BaseModel):
             content=self.content.with_namespace(namespace),
             over=[x.with_namespace(namespace) for x in self.over],
             order_by=[x.with_namespace(namespace) for x in self.order_by],
+            index=self.index,
         )
 
     def with_select_context(
@@ -1410,6 +1415,7 @@ class WindowItem(Mergeable, Namespaced, SelectContext, BaseModel):
                 x.with_select_context(grain, conditional, environment)
                 for x in self.order_by
             ],
+            index=self.index,
         )
 
     @property

trilogy/core/optimizations/predicate_pushdown.py

@@ -6,6 +6,7 @@ from trilogy.core.models import (
     ConceptArgs,
     Comparison,
     Parenthetical,
+    WindowItem,
 )
 from trilogy.core.optimizations.base_optimization import OptimizationRule
 from trilogy.core.processing.utility import is_scalar_condition
@@ -45,7 +46,15 @@ class PredicatePushdown(OptimizationRule):
         all_inputs = {x.address for x in candidate.concept_arguments}
         if is_child_of(candidate, parent_cte.condition):
             return False
-
+        non_materialized = [k for k, v in parent_cte.source_map.items() if v == []]
+        concrete = [
+            x for x in parent_cte.output_columns if x.address in non_materialized
+        ]
+        if any(isinstance(x.lineage, WindowItem) for x in concrete):
+            self.debug(
+                f"CTE {parent_cte.name} has window clause calculation, cannot push up to this without changing results"
+            )
+            return False
         materialized = {k for k, v in parent_cte.source_map.items() if v != []}
         if not row_conditions or not materialized:
             return False
@@ -108,12 +117,12 @@ class PredicatePushdown(OptimizationRule):
 
         if not cte.parent_ctes:
             self.debug(f"No parent CTEs for {cte.name}")
-
             return False
 
         if not cte.condition:
             self.debug(f"No CTE condition for {cte.name}")
             return False
+
         if self.complete.get(cte.name):
             self.debug("Have done this CTE before")
             return False

trilogy/core/processing/node_generators/basic_node.py

@@ -1,7 +1,12 @@
 # directly select out a basic derivation
 from typing import List
 
-from trilogy.core.models import Concept, WhereClause
+from trilogy.core.models import (
+    Concept,
+    WhereClause,
+    Function,
+    FunctionClass,
+)
 from trilogy.core.processing.nodes import StrategyNode, History
 from trilogy.core.processing.node_generators.common import (
     resolve_function_parent_concepts,
@@ -12,6 +17,22 @@ from trilogy.core.enums import SourceType
 LOGGER_PREFIX = "[GEN_BASIC_NODE]"
 
 
+def is_equivalent_basic_function_lineage(
+    x: Concept,
+    y: Concept,
+):
+    if not isinstance(x.lineage, Function) or not isinstance(y.lineage, Function):
+        return False
+    if x.lineage.operator == y.lineage.operator:
+        return True
+    if (
+        y.lineage.operator in FunctionClass.AGGREGATE_FUNCTIONS.value
+        or y.lineage.operator in FunctionClass.ONE_TO_MANY.value
+    ):
+        return False
+    return True
+
+
 def gen_basic_node(
     concept: Concept,
     local_optional: List[Concept],
@@ -32,8 +53,15 @@ def gen_basic_node(
     equivalent_optional = [
         x
         for x in local_optional
-        if x.lineage == concept.lineage and x.address != concept.address
+        if is_equivalent_basic_function_lineage(concept, x)
+        and x.address != concept.address
     ]
+    if equivalent_optional:
+        logger.info(
+            f"{depth_prefix}{LOGGER_PREFIX} basic node for {concept} has equivalent optional {[x.address for x in equivalent_optional]}"
+        )
+    for eo in equivalent_optional:
+        parent_concepts += resolve_function_parent_concepts(eo)
     non_equivalent_optional = [
         x for x in local_optional if x not in equivalent_optional
     ]

trilogy/core/processing/node_generators/window_node.py

@@ -10,16 +10,16 @@ from trilogy.core.processing.utility import padding
 LOGGER_PREFIX = "[GEN_WINDOW_NODE]"
 
 
-def resolve_window_parent_concepts(concept: Concept) -> List[Concept]:
+def resolve_window_parent_concepts(concept: Concept) -> tuple[Concept, List[Concept]]:
     if not isinstance(concept.lineage, WindowItem):
         raise ValueError
-    base = [concept.lineage.content]
+    base = []
     if concept.lineage.over:
         base += concept.lineage.over
     if concept.lineage.order_by:
         for item in concept.lineage.order_by:
             base += [item.expr.output]
-    return unique(base, "address")
+    return concept.lineage.content, unique(base, "address")
 
 
 def gen_window_node(
@@ -32,9 +32,25 @@ def gen_window_node(
     history: History | None = None,
     conditions: WhereClause | None = None,
 ) -> StrategyNode | None:
-    parent_concepts = resolve_window_parent_concepts(concept)
-    parent_node = source_concepts(
-        mandatory_list=parent_concepts + local_optional,
+    base, parent_concepts = resolve_window_parent_concepts(concept)
+    equivalent_optional = [
+        x
+        for x in local_optional
+        if isinstance(x.lineage, WindowItem)
+        and resolve_window_parent_concepts(x)[1] == parent_concepts
+    ]
+
+    non_equivalent_optional = [
+        x for x in local_optional if x.address not in equivalent_optional
+    ]
+    targets = [base]
+    if equivalent_optional:
+        for x in equivalent_optional:
+            assert isinstance(x.lineage, WindowItem)
+            targets.append(x.lineage.content)
+
+    parent_node: StrategyNode = source_concepts(
+        mandatory_list=parent_concepts + targets + non_equivalent_optional,
         environment=environment,
         g=g,
         depth=depth + 1,
@@ -61,7 +77,7 @@ def gen_window_node(
         )
         raise SyntaxError
     _window_node = WindowNode(
-        input_concepts=parent_concepts + local_optional,
+        input_concepts=parent_concepts + targets + non_equivalent_optional,
         output_concepts=[concept] + parent_concepts + local_optional,
         environment=environment,
         g=g,

trilogy/dialect/base.py

@@ -75,7 +75,7 @@ def window_factory(string: str, include_concept: bool = False) -> Callable:
     ) -> str:
         if not include_concept:
             concept = ""
-        if offset:
+        if offset is not None:
             base = f"{string}({concept}, {offset})"
         else:
             base = f"{string}({concept})"
@@ -313,7 +313,10 @@ class BaseDialect:
                     )
                     for x in c.lineage.over
                 ]
-                rval = f"{self.WINDOW_FUNCTION_MAP[c.lineage.type](concept = self.render_concept_sql(c.lineage.content, cte=cte, alias=False, raise_invalid=raise_invalid), window=','.join(rendered_over_components), sort=','.join(rendered_order_components))}"  # noqa: E501
+                rval = f"{self.WINDOW_FUNCTION_MAP[c.lineage.type](concept = self.render_concept_sql(c.lineage.content,
+                                                                                                      cte=cte, alias=False, raise_invalid=raise_invalid), 
+                                                                   window=','.join(rendered_over_components), sort=','.join(rendered_order_components), 
+                                                                   offset=c.lineage.index)}"  # noqa: E501
             elif isinstance(c.lineage, FilterItem):
                 # for cases when we've optimized this
                 if cte.condition == c.lineage.where.conditional:

trilogy/parsing/trilogy.lark

@@ -290,7 +290,7 @@
 
     // base language constructs
     concept_lit: IDENTIFIER
-    IDENTIFIER: /[a-zA-Z\_][a-zA-Z0-9\_\-\.]*/
+    IDENTIFIER: /[a-zA-Z\_][a-zA-Z0-9\_\.]*/
     WILDCARD_IDENTIFIER: /[a-zA-Z\_][a-zA-Z0-9\_\-\.\*]*/
     QUOTED_IDENTIFIER:  /`[a-zA-Z\_][a-zA-Z0-9\_\.\-\*\:\s]*`/
     QUOTED_ADDRESS:  /`[a-zA-Z\_][a-zA-Z0-9\_\.\-\*\:]*`/