pytrilogy 0.0.3.53__tar.gz → 0.0.3.55__tar.gz

{pytrilogy-0.0.3.53/pytrilogy.egg-info → pytrilogy-0.0.3.55}/PKG-INFO

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

{pytrilogy-0.0.3.53 → pytrilogy-0.0.3.55/pytrilogy.egg-info}/PKG-INFO

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

{pytrilogy-0.0.3.53 → pytrilogy-0.0.3.55}/pytrilogy.egg-info/SOURCES.txt

@@ -81,6 +81,7 @@ trilogy/core/processing/node_generators/group_node.py
 trilogy/core/processing/node_generators/group_to_node.py
 trilogy/core/processing/node_generators/multiselect_node.py
 trilogy/core/processing/node_generators/node_merge_node.py
+trilogy/core/processing/node_generators/recursive_node.py
 trilogy/core/processing/node_generators/rowset_node.py
 trilogy/core/processing/node_generators/select_merge_node.py
 trilogy/core/processing/node_generators/select_node.py
@@ -95,6 +96,7 @@ trilogy/core/processing/nodes/base_node.py
 trilogy/core/processing/nodes/filter_node.py
 trilogy/core/processing/nodes/group_node.py
 trilogy/core/processing/nodes/merge_node.py
+trilogy/core/processing/nodes/recursive_node.py
 trilogy/core/processing/nodes/select_node_v2.py
 trilogy/core/processing/nodes/union_node.py
 trilogy/core/processing/nodes/unnest_node.py

{pytrilogy-0.0.3.53 → pytrilogy-0.0.3.55}/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.53"
+__version__ = "0.0.3.55"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

{pytrilogy-0.0.3.53 → pytrilogy-0.0.3.55}/trilogy/constants.py

@@ -7,6 +7,8 @@ logger = getLogger("trilogy")
 
 DEFAULT_NAMESPACE = "local"
 
+RECURSIVE_GATING_CONCEPT = "_terminal"
+
 VIRTUAL_CONCEPT_PREFIX = "_virt"
 
 ENV_CACHE_NAME = ".preql_cache.json"

{pytrilogy-0.0.3.53 → pytrilogy-0.0.3.55}/trilogy/core/enums.py

@@ -51,6 +51,7 @@ class Derivation(Enum):
     ROOT = "root"
     ROWSET = "rowset"
     MULTISELECT = "multiselect"
+    RECURSIVE = "recursive"
 
 
 class Granularity(Enum):
@@ -117,6 +118,7 @@ class FunctionType(Enum):
 
     # structural
     UNNEST = "unnest"
+    RECURSE_EDGE = "recurse_edge"
 
     UNION = "union"
 
@@ -233,6 +235,8 @@ class FunctionClass(Enum):
 
     ONE_TO_MANY = [FunctionType.UNNEST]
 
+    RECURSIVE = [FunctionType.RECURSE_EDGE]
+
 
 class Boolean(Enum):
     TRUE = "true"
@@ -333,6 +337,7 @@ class SourceType(Enum):
     MERGE = "merge"
     BASIC = "basic"
     UNION = "union"
+    RECURSIVE = "recursive"
 
 
 class ShowCategory(Enum):

{pytrilogy-0.0.3.53 → pytrilogy-0.0.3.55}/trilogy/core/functions.py

@@ -190,6 +190,9 @@ FUNCTION_REGISTRY: dict[FunctionType, FunctionConfig] = {
         output_type_function=get_unnest_output_type,
         arg_count=1,
     ),
+    FunctionType.RECURSE_EDGE: FunctionConfig(
+        arg_count=2,
+    ),
     FunctionType.GROUP: FunctionConfig(
         arg_count=-1,
         output_type_function=lambda args: get_output_type_at_index(args, 0),

{pytrilogy-0.0.3.53 → pytrilogy-0.0.3.55}/trilogy/core/models/author.py

@@ -1164,6 +1164,12 @@ class Concept(Addressable, DataTyped, ConceptArgs, Mergeable, Namespaced, BaseMo
             and lineage.operator == FunctionType.UNNEST
         ):
             return Derivation.UNNEST
+        elif (
+            lineage
+            and isinstance(lineage, (BuildFunction, Function))
+            and lineage.operator == FunctionType.RECURSE_EDGE
+        ):
+            return Derivation.RECURSIVE
         elif (
             lineage
             and isinstance(lineage, (BuildFunction, Function))

{pytrilogy-0.0.3.53 → pytrilogy-0.0.3.55}/trilogy/core/models/execute.py

@@ -12,9 +12,16 @@ from pydantic import (
     model_validator,
 )
 
-from trilogy.constants import CONFIG, logger
+from trilogy.constants import (
+    CONFIG,
+    DEFAULT_NAMESPACE,
+    RECURSIVE_GATING_CONCEPT,
+    MagicConstants,
+    logger,
+)
 from trilogy.core.constants import CONSTANT_DATASET
 from trilogy.core.enums import (
+    ComparisonOperator,
     Derivation,
     FunctionType,
     Granularity,
@@ -24,16 +31,20 @@ from trilogy.core.enums import (
     SourceType,
 )
 from trilogy.core.models.build import (
+    BuildCaseElse,
+    BuildCaseWhen,
     BuildComparison,
     BuildConcept,
     BuildConditional,
     BuildDatasource,
+    BuildExpr,
     BuildFunction,
     BuildGrain,
     BuildOrderBy,
     BuildParamaterizedConceptReference,
     BuildParenthetical,
     BuildRowsetItem,
+    DataType,
     LooseBuildConceptList,
 )
 from trilogy.core.models.datasource import Address
@@ -841,6 +852,195 @@ class QueryDatasource(BaseModel):
         return self.identifier
 
 
+class AliasedExpression(BaseModel):
+    expr: BuildExpr
+    alias: str
+
+
+class RecursiveCTE(CTE):
+
+    def generate_loop_functions(
+        self,
+        recursive_derived: BuildConcept,
+        left_recurse_concept: BuildConcept,
+        right_recurse_concept: BuildConcept,
+    ) -> tuple[BuildConcept, BuildConcept, BuildConcept]:
+
+        join_gate = BuildConcept(
+            name=RECURSIVE_GATING_CONCEPT,
+            namespace=DEFAULT_NAMESPACE,
+            grain=recursive_derived.grain,
+            build_is_aggregate=False,
+            datatype=DataType.BOOL,
+            purpose=Purpose.KEY,
+            derivation=Derivation.BASIC,
+            lineage=BuildFunction(
+                operator=FunctionType.CASE,
+                arguments=[
+                    BuildCaseWhen(
+                        comparison=BuildComparison(
+                            left=right_recurse_concept,
+                            right=MagicConstants.NULL,
+                            operator=ComparisonOperator.IS,
+                        ),
+                        expr=True,
+                    ),
+                    BuildCaseElse(expr=False),
+                ],
+                output_datatype=DataType.BOOL,
+                output_purpose=Purpose.KEY,
+            ),
+        )
+        bottom_join_gate = BuildConcept(
+            name=f"{RECURSIVE_GATING_CONCEPT}_two",
+            namespace=DEFAULT_NAMESPACE,
+            grain=recursive_derived.grain,
+            build_is_aggregate=False,
+            datatype=DataType.BOOL,
+            purpose=Purpose.KEY,
+            derivation=Derivation.BASIC,
+            lineage=BuildFunction(
+                operator=FunctionType.CASE,
+                arguments=[
+                    BuildCaseWhen(
+                        comparison=BuildComparison(
+                            left=right_recurse_concept,
+                            right=MagicConstants.NULL,
+                            operator=ComparisonOperator.IS,
+                        ),
+                        expr=True,
+                    ),
+                    BuildCaseElse(expr=False),
+                ],
+                output_datatype=DataType.BOOL,
+                output_purpose=Purpose.KEY,
+            ),
+        )
+        bottom_derivation = BuildConcept(
+            name=recursive_derived.name + "_bottom",
+            namespace=recursive_derived.namespace,
+            grain=recursive_derived.grain,
+            build_is_aggregate=False,
+            datatype=recursive_derived.datatype,
+            purpose=recursive_derived.purpose,
+            derivation=Derivation.RECURSIVE,
+            lineage=BuildFunction(
+                operator=FunctionType.CASE,
+                arguments=[
+                    BuildCaseWhen(
+                        comparison=BuildComparison(
+                            left=right_recurse_concept,
+                            right=MagicConstants.NULL,
+                            operator=ComparisonOperator.IS,
+                        ),
+                        expr=recursive_derived,
+                    ),
+                    BuildCaseElse(expr=right_recurse_concept),
+                ],
+                output_datatype=recursive_derived.datatype,
+                output_purpose=recursive_derived.purpose,
+            ),
+        )
+        return bottom_derivation, join_gate, bottom_join_gate
+
+    @property
+    def internal_ctes(self) -> List[CTE]:
+        filtered_output = [
+            x for x in self.output_columns if x.name != RECURSIVE_GATING_CONCEPT
+        ]
+        recursive_derived = [
+            x for x in self.output_columns if x.derivation == Derivation.RECURSIVE
+        ][0]
+        if not isinstance(recursive_derived.lineage, BuildFunction):
+            raise SyntaxError(
+                "Recursive CTEs must have a function lineage, found"
+                f" {recursive_derived.lineage}"
+            )
+        left_recurse_concept = recursive_derived.lineage.concept_arguments[0]
+        right_recurse_concept = recursive_derived.lineage.concept_arguments[1]
+        parent_ctes: List[CTE | UnionCTE]
+        if self.parent_ctes:
+            base = self.parent_ctes[0]
+            loop_input_cte = base
+            parent_ctes = [base]
+            parent_identifier = base.identifier
+        else:
+            raise SyntaxError("Recursive CTEs must have a parent CTE currently")
+        bottom_derivation, join_gate, bottom_join_gate = self.generate_loop_functions(
+            recursive_derived, left_recurse_concept, right_recurse_concept
+        )
+        base_output = [*filtered_output, join_gate]
+        bottom_output = []
+        for x in filtered_output:
+            if x.address == recursive_derived.address:
+                bottom_output.append(bottom_derivation)
+            else:
+                bottom_output.append(x)
+
+        bottom_output = [*bottom_output, bottom_join_gate]
+        top = CTE(
+            name=self.name,
+            source=self.source,
+            output_columns=base_output,
+            source_map=self.source_map,
+            grain=self.grain,
+            existence_source_map=self.existence_source_map,
+            parent_ctes=self.parent_ctes,
+            joins=self.joins,
+            condition=self.condition,
+            partial_concepts=self.partial_concepts,
+            hidden_concepts=self.hidden_concepts,
+            nullable_concepts=self.nullable_concepts,
+            join_derived_concepts=self.join_derived_concepts,
+            group_to_grain=self.group_to_grain,
+            order_by=self.order_by,
+            limit=self.limit,
+        )
+        top_cte_array: list[CTE | UnionCTE] = [top]
+        bottom_source_map = {
+            left_recurse_concept.address: [top.identifier],
+            right_recurse_concept.address: [parent_identifier],
+            # recursive_derived.address: self.source_map[recursive_derived.address],
+            join_gate.address: [top.identifier],
+            recursive_derived.address: [top.identifier],
+        }
+        bottom = CTE(
+            name=self.name,
+            source=self.source,
+            output_columns=bottom_output,
+            source_map=bottom_source_map,
+            grain=self.grain,
+            existence_source_map=self.existence_source_map,
+            parent_ctes=top_cte_array + parent_ctes,
+            joins=[
+                Join(
+                    right_cte=loop_input_cte,
+                    jointype=JoinType.INNER,
+                    joinkey_pairs=[
+                        CTEConceptPair(
+                            left=recursive_derived,
+                            right=left_recurse_concept,
+                            existing_datasource=loop_input_cte.source,
+                            modifiers=[],
+                            cte=top,
+                        )
+                    ],
+                    condition=BuildComparison(
+                        left=join_gate, right=True, operator=ComparisonOperator.IS_NOT
+                    ),
+                )
+            ],
+            partial_concepts=self.partial_concepts,
+            hidden_concepts=self.hidden_concepts,
+            nullable_concepts=self.nullable_concepts,
+            join_derived_concepts=self.join_derived_concepts,
+            group_to_grain=self.group_to_grain,
+            order_by=self.order_by,
+            limit=self.limit,
+        )
+        return [top, bottom]
+
+
 class UnionCTE(BaseModel):
     name: str
     source: QueryDatasource
@@ -891,6 +1091,10 @@ class UnionCTE(BaseModel):
     def condition(self, value):
         raise NotImplementedError
 
+    @property
+    def identifier(self) -> str:
+        return self.name
+
     @property
     def safe_identifier(self):
         return self.name
@@ -906,12 +1110,13 @@ class UnionCTE(BaseModel):
 
 
 class Join(BaseModel):
-    right_cte: CTE
+    right_cte: CTE | UnionCTE
     jointype: JoinType
     left_cte: CTE | None = None
     joinkey_pairs: List[CTEConceptPair] | None = None
     inlined_ctes: set[str] = Field(default_factory=set)
     quote: str | None = None
+    condition: BuildConditional | BuildComparison | BuildParenthetical | None = None
 
     def inline_cte(self, cte: CTE):
         self.inlined_ctes.add(cte.name)

{pytrilogy-0.0.3.53 → pytrilogy-0.0.3.55}/trilogy/core/optimization.py

@@ -3,7 +3,7 @@ from trilogy.core.enums import BooleanOperator, Derivation
 from trilogy.core.models.build import (
     BuildConditional,
 )
-from trilogy.core.models.execute import CTE, UnionCTE
+from trilogy.core.models.execute import CTE, RecursiveCTE, UnionCTE
 from trilogy.core.optimizations import (
     InlineDatasource,
     OptimizationRule,
@@ -120,13 +120,20 @@ def gen_inverse_map(input: list[CTE | UnionCTE]) -> dict[str, list[CTE | UnionCT
     return inverse_map
 
 
+SENSITIVE_DERIVATIONS = [
+    Derivation.UNNEST,
+    Derivation.WINDOW,
+    Derivation.RECURSIVE,
+]
+
+
 def is_direct_return_eligible(cte: CTE | UnionCTE) -> CTE | UnionCTE | None:
     # if isinstance(select, (PersistStatement, MultiSelectStatement)):
     #     return False
     if len(cte.parent_ctes) != 1:
         return None
     direct_parent = cte.parent_ctes[0]
-    if isinstance(direct_parent, UnionCTE):
+    if isinstance(direct_parent, (UnionCTE, RecursiveCTE)):
         return None
 
     output_addresses = set([x.address for x in cte.output_columns])
@@ -151,21 +158,31 @@ def is_direct_return_eligible(cte: CTE | UnionCTE) -> CTE | UnionCTE | None:
     ]
     condition_arguments = cte.condition.row_arguments if cte.condition else []
     for x in derived_concepts:
-        if x.derivation == Derivation.WINDOW:
-            return None
-        if x.derivation == Derivation.UNNEST:
-            return None
-        if x.derivation == Derivation.AGGREGATE:
+        if x.derivation in SENSITIVE_DERIVATIONS:
             return None
     for x in parent_derived_concepts:
         if x.address not in condition_arguments:
             continue
-        if x.derivation == Derivation.UNNEST:
-            return None
-        if x.derivation == Derivation.WINDOW:
+        if x.derivation in SENSITIVE_DERIVATIONS:
             return None
+    for x in condition_arguments:
+        # if it's derived in the parent
+        if x.address in parent_derived_concepts:
+            if x.derivation in SENSITIVE_DERIVATIONS:
+                return None
+            # this maybe needs to be recursive if we flatten a ton of derivation
+            # into one CTE
+            if not x.lineage:
+                continue
+            for z in x.lineage.concept_arguments:
+                # if it was preexisting in the parent, it's safe
+                if z.address in direct_parent.source.input_concepts:
+                    continue
+                # otherwise if it's dangerous, play it safe.
+                if z.derivation in SENSITIVE_DERIVATIONS:
+                    return None
     logger.info(
-        f"[Optimization][EarlyReturn] Removing redundant output CTE with derived_concepts {[x.address for x in derived_concepts]}"
+        f"[Optimization][EarlyReturn] Removing redundant output CTE {cte.name} with derived_concepts {[x.address for x in derived_concepts]}"
     )
     return direct_parent
 

{pytrilogy-0.0.3.53 → pytrilogy-0.0.3.55}/trilogy/core/optimizations/inline_datasource.py

@@ -1,13 +1,8 @@
 from collections import defaultdict
 
 from trilogy.constants import CONFIG
-
-# from trilogy.core.models.datasource import Datasource
 from trilogy.core.models.build import BuildDatasource
-from trilogy.core.models.execute import (
-    CTE,
-    UnionCTE,
-)
+from trilogy.core.models.execute import CTE, RecursiveCTE, UnionCTE
 from trilogy.core.optimizations.base_optimization import OptimizationRule
 
 
@@ -24,7 +19,8 @@ class InlineDatasource(OptimizationRule):
             return any(
                 self.optimize(x, inverse_map=inverse_map) for x in cte.internal_ctes
             )
-
+        if isinstance(cte, RecursiveCTE):
+            return False
         if not cte.parent_ctes:
             return False
 
@@ -36,6 +32,8 @@ class InlineDatasource(OptimizationRule):
         for parent_cte in cte.parent_ctes:
             if isinstance(parent_cte, UnionCTE):
                 continue
+            if isinstance(parent_cte, RecursiveCTE):
+                continue
             if not parent_cte.is_root_datasource:
                 self.debug(f"Cannot inline: parent {parent_cte.name} is not root")
                 continue

{pytrilogy-0.0.3.53 → pytrilogy-0.0.3.55}/trilogy/core/processing/concept_strategies_v3.py

@@ -24,6 +24,7 @@ from trilogy.core.processing.node_generators import (
     gen_group_to_node,
     gen_merge_node,
     gen_multiselect_node,
+    gen_recursive_node,
     gen_rowset_node,
     gen_synonym_node,
     gen_union_node,
@@ -150,6 +151,7 @@ def get_priority_concept(
             + [c for c in remaining_concept if c.derivation == Derivation.FILTER]
             # unnests are weird?
             + [c for c in remaining_concept if c.derivation == Derivation.UNNEST]
+            + [c for c in remaining_concept if c.derivation == Derivation.RECURSIVE]
             + [c for c in remaining_concept if c.derivation == Derivation.BASIC]
             # finally our plain selects
             + [
@@ -294,6 +296,20 @@ def generate_node(
             source_concepts=source_concepts,
             conditions=conditions,
         )
+    elif concept.derivation == Derivation.RECURSIVE:
+        logger.info(
+            f"{depth_to_prefix(depth)}{LOGGER_PREFIX} for {concept.address}, generating recursive node with optional {[x.address for x in local_optional]} and condition {conditions}"
+        )
+        return gen_recursive_node(
+            concept,
+            local_optional,
+            history=history,
+            environment=environment,
+            g=g,
+            depth=depth + 1,
+            source_concepts=source_concepts,
+            conditions=conditions,
+        )
     elif concept.derivation == Derivation.UNION:
         logger.info(
             f"{depth_to_prefix(depth)}{LOGGER_PREFIX} for {concept.address}, generating union node with optional {[x.address for x in local_optional]} and condition {conditions}"
@@ -920,6 +936,7 @@ def _search_concepts(
                     Derivation.FILTER,
                     Derivation.WINDOW,
                     Derivation.UNNEST,
+                    Derivation.RECURSIVE,
                     Derivation.ROWSET,
                     Derivation.BASIC,
                     Derivation.MULTISELECT,

{pytrilogy-0.0.3.53 → pytrilogy-0.0.3.55}/trilogy/core/processing/node_generators/__init__.py

@@ -4,6 +4,7 @@ from .group_node import gen_group_node
 from .group_to_node import gen_group_to_node
 from .multiselect_node import gen_multiselect_node
 from .node_merge_node import gen_merge_node
+from .recursive_node import gen_recursive_node
 from .rowset_node import gen_rowset_node
 from .select_node import gen_select_node
 from .synonym_node import gen_synonym_node
@@ -24,4 +25,5 @@ __all__ = [
     "gen_rowset_node",
     "gen_multiselect_node",
     "gen_synonym_node",
+    "gen_recursive_node",
 ]

pytrilogy-0.0.3.55/trilogy/core/processing/node_generators/recursive_node.py

@@ -0,0 +1,87 @@
+from typing import List
+
+from trilogy.constants import DEFAULT_NAMESPACE, RECURSIVE_GATING_CONCEPT, logger
+from trilogy.core.models.build import (
+    BuildComparison,
+    BuildConcept,
+    BuildFunction,
+    BuildGrain,
+    BuildWhereClause,
+    ComparisonOperator,
+    DataType,
+    Derivation,
+    Purpose,
+)
+from trilogy.core.models.build_environment import BuildEnvironment
+from trilogy.core.processing.nodes import History, RecursiveNode, StrategyNode
+from trilogy.core.processing.utility import padding
+
+LOGGER_PREFIX = "[GEN_RECURSIVE_NODE]"
+
+GATING_CONCEPT = BuildConcept(
+    name=RECURSIVE_GATING_CONCEPT,
+    namespace=DEFAULT_NAMESPACE,
+    grain=BuildGrain(),
+    build_is_aggregate=False,
+    datatype=DataType.BOOL,
+    purpose=Purpose.KEY,
+    derivation=Derivation.BASIC,
+)
+
+
+def gen_recursive_node(
+    concept: BuildConcept,
+    local_optional: List[BuildConcept],
+    history: History,
+    environment: BuildEnvironment,
+    g,
+    depth: int,
+    source_concepts,
+    conditions: BuildWhereClause | None = None,
+) -> StrategyNode | None:
+    arguments = []
+    if isinstance(concept.lineage, BuildFunction):
+        arguments = concept.lineage.concept_arguments
+    logger.info(
+        f"{padding(depth)}{LOGGER_PREFIX} Fetching recursive node for {concept.name} with arguments {arguments} and conditions {conditions}"
+    )
+    parent = source_concepts(
+        mandatory_list=arguments,
+        environment=environment,
+        g=g,
+        depth=depth + 1,
+        history=history,
+        # conditions=conditions,
+    )
+    if not parent:
+        logger.info(
+            f"{padding(depth)}{LOGGER_PREFIX} could not find recursive node parents"
+        )
+        return None
+    outputs = (
+        [concept]
+        + arguments
+        + [
+            GATING_CONCEPT,
+        ]
+    )
+    base = RecursiveNode(
+        input_concepts=arguments,
+        output_concepts=outputs,
+        environment=environment,
+        parents=([parent] if (arguments or local_optional) else []),
+        # preexisting_conditions=conditions
+    )
+    # TODO:
+    # recursion will result in a union; group up to our final targets
+    wrapped_base = StrategyNode(
+        input_concepts=outputs,
+        output_concepts=outputs,
+        environment=environment,
+        parents=[base],
+        depth=depth,
+        conditions=BuildComparison(
+            left=GATING_CONCEPT, right=True, operator=ComparisonOperator.IS
+        ),
+    )
+    return wrapped_base

{pytrilogy-0.0.3.53 → pytrilogy-0.0.3.55}/trilogy/core/processing/node_generators/rowset_node.py

@@ -95,9 +95,7 @@ def gen_rowset_node(
         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
-    # but don't include anything hidden(the non-rowset concepts)
+
     node.grain = BuildGrain.from_concepts(
         [
             x

{pytrilogy-0.0.3.53 → pytrilogy-0.0.3.55}/trilogy/core/processing/node_generators/window_node.py

@@ -11,7 +11,12 @@ 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.nodes import (
+    History,
+    StrategyNode,
+    WhereSafetyNode,
+    WindowNode,
+)
 from trilogy.core.processing.utility import create_log_lambda, padding
 from trilogy.utility import unique
 
@@ -71,10 +76,13 @@ def gen_window_node(
     if equivalent_optional:
         for x in equivalent_optional:
             assert isinstance(x.lineage, WINDOW_TYPES)
+            base, parents = resolve_window_parent_concepts(x, environment)
             logger.info(
-                f"{padding(depth)}{LOGGER_PREFIX} found equivalent optional {x} with parents {resolve_window_parent_concepts(x, environment)[1]}"
+                f"{padding(depth)}{LOGGER_PREFIX} found equivalent optional {x} with parents {parents}"
             )
             additional_outputs.append(x)
+            # also append the base concept it's being grouped over
+            targets.append(base)
 
     grain_equivalents = [
         x
@@ -85,7 +93,8 @@ def gen_window_node(
     ]
 
     for x in grain_equivalents:
-        logger.info("Appending grain equivalent %s", x)
+        if x.address in additional_outputs:
+            continue
         targets.append(x)
 
     # finally, the ones we'll need to enrich
@@ -134,7 +143,7 @@ def gen_window_node(
     _window_node.rebuild_cache()
     _window_node.resolve()
 
-    window_node = StrategyNode(
+    window_node = WhereSafetyNode(
         input_concepts=[concept] + additional_outputs + parent_concepts + targets,
         output_concepts=[concept] + additional_outputs + parent_concepts + targets,
         environment=environment,