pytrilogy 0.0.3.113__tar.gz → 0.0.3.115__tar.gz

{pytrilogy-0.0.3.113/pytrilogy.egg-info → pytrilogy-0.0.3.115}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytrilogy
-Version: 0.0.3.113
+Version: 0.0.3.115
 Summary: Declarative, typed query language that compiles to SQL.
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3

{pytrilogy-0.0.3.113 → pytrilogy-0.0.3.115/pytrilogy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytrilogy
-Version: 0.0.3.113
+Version: 0.0.3.115
 Summary: Declarative, typed query language that compiles to SQL.
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3

{pytrilogy-0.0.3.113 → pytrilogy-0.0.3.115}/tests/test_parse_engine.py

@@ -121,3 +121,17 @@ def test_alias_error():
     with raises(InvalidSyntaxException) as e:
         env.parse(TEXT2)
     assert ERROR_CODES[201] in str(e.value), e.value
+
+
+def test_semicolon_error():
+    env = Environment()
+    TEXT2 = """
+    const a <- 1;
+
+    select
+        a+2 as fun,
+    
+    """
+    with raises(InvalidSyntaxException) as e:
+        env.parse(TEXT2)
+    assert ERROR_CODES[202] in str(e.value), e.value

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

{pytrilogy-0.0.3.113 → pytrilogy-0.0.3.115}/trilogy/constants.py

@@ -1,7 +1,9 @@
 import random
+from contextlib import contextmanager
 from dataclasses import dataclass, field
 from enum import Enum
 from logging import getLogger
+from typing import Any
 
 logger = getLogger("trilogy")
 
@@ -50,6 +52,32 @@ class Rendering:
     parameters: bool = True
     concise: bool = False
 
+    @contextmanager
+    def temporary(self, **kwargs: Any):
+        """
+        Context manager to temporarily set attributes and revert them afterwards.
+
+        Usage:
+            r = Rendering()
+            with r.temporary(parameters=False, concise=True):
+                # parameters is False, concise is True here
+                do_something()
+            # parameters and concise are back to their original values
+        """
+        # Store original values
+        original_values = {key: getattr(self, key) for key in kwargs}
+
+        # Set new values
+        for key, value in kwargs.items():
+            setattr(self, key, value)
+
+        try:
+            yield self
+        finally:
+            # Restore original values
+            for key, value in original_values.items():
+                setattr(self, key, value)
+
 
 @dataclass
 class Parsing:

{pytrilogy-0.0.3.113 → pytrilogy-0.0.3.115}/trilogy/core/enums.py

@@ -169,6 +169,7 @@ class FunctionType(Enum):
     ARRAY_SORT = "array_sort"
     ARRAY_TRANSFORM = "array_transform"
     ARRAY_TO_STRING = "array_to_string"
+    ARRAY_FILTER = "array_filter"
 
     # MAP
     MAP_KEYS = "map_keys"
@@ -204,6 +205,7 @@ class FunctionType(Enum):
     MIN = "min"
     AVG = "avg"
     ARRAY_AGG = "array_agg"
+    ANY = "any"
 
     # String
     LIKE = "like"
@@ -244,6 +246,7 @@ class FunctionType(Enum):
     DATE_ADD = "date_add"
     DATE_SUB = "date_sub"
     DATE_DIFF = "date_diff"
+    DATE_SPINE = "date_spine"
 
     # UNIX
     UNIX_TO_TIMESTAMP = "unix_to_timestamp"
@@ -263,6 +266,7 @@ class FunctionClass(Enum):
         FunctionType.ARRAY_AGG,
         FunctionType.COUNT,
         FunctionType.COUNT_DISTINCT,
+        FunctionType.ANY,
     ]
     SINGLE_ROW = [
         FunctionType.CONSTANT,
@@ -270,7 +274,7 @@ class FunctionClass(Enum):
         FunctionType.CURRENT_DATETIME,
     ]
 
-    ONE_TO_MANY = [FunctionType.UNNEST]
+    ONE_TO_MANY = [FunctionType.UNNEST, FunctionType.DATE_SPINE]
 
     RECURSIVE = [FunctionType.RECURSE_EDGE]
 

{pytrilogy-0.0.3.113 → pytrilogy-0.0.3.115}/trilogy/core/functions.py

@@ -212,6 +212,14 @@ FUNCTION_REGISTRY: dict[FunctionType, FunctionConfig] = {
         output_type_function=get_unnest_output_type,
         arg_count=1,
     ),
+    FunctionType.DATE_SPINE: FunctionConfig(
+        valid_inputs={
+            DataType.DATE,
+        },
+        output_purpose=Purpose.KEY,
+        output_type=DataType.DATE,
+        arg_count=2,
+    ),
     FunctionType.RECURSE_EDGE: FunctionConfig(
         arg_count=2,
     ),
@@ -318,6 +326,18 @@ FUNCTION_REGISTRY: dict[FunctionType, FunctionConfig] = {
         output_type_function=get_transform_output_type,
         arg_count=3,
     ),
+    FunctionType.ARRAY_FILTER: FunctionConfig(
+        valid_inputs=[
+            {
+                DataType.ARRAY,
+            },
+            {*DataType},
+            {*DataType},
+        ],
+        output_purpose=Purpose.PROPERTY,
+        output_type_function=get_transform_output_type,
+        arg_count=3,
+    ),
     FunctionType.ARRAY_TO_STRING: FunctionConfig(
         valid_inputs={
             DataType.ARRAY,
@@ -887,6 +907,11 @@ FUNCTION_REGISTRY: dict[FunctionType, FunctionConfig] = {
         ),
         arg_count=1,
     ),
+    FunctionType.ANY: FunctionConfig(
+        valid_inputs={*DataType},
+        output_purpose=Purpose.PROPERTY,
+        arg_count=1,
+    ),
     FunctionType.AVG: FunctionConfig(
         valid_inputs={
             DataType.INTEGER,

{pytrilogy-0.0.3.113 → pytrilogy-0.0.3.115}/trilogy/core/models/author.py

@@ -1234,7 +1234,7 @@ class Concept(Addressable, DataTyped, ConceptArgs, Mergeable, Namespaced, BaseMo
         elif (
             lineage
             and isinstance(lineage, (BuildFunction, Function))
-            and lineage.operator == FunctionType.UNNEST
+            and lineage.operator in FunctionClass.ONE_TO_MANY.value
         ):
             return Derivation.UNNEST
         elif (
@@ -1286,7 +1286,8 @@ class Concept(Addressable, DataTyped, ConceptArgs, Mergeable, Namespaced, BaseMo
         elif (
             lineage
             and isinstance(lineage, (Function, BuildFunction))
-            and lineage.operator in (FunctionType.UNNEST, FunctionType.UNION)
+            and lineage.operator
+            in (FunctionType.UNNEST, FunctionType.UNION, FunctionType.DATE_SPINE)
         ):
             return Granularity.MULTI_ROW
         elif lineage and all(

{pytrilogy-0.0.3.113 → pytrilogy-0.0.3.115}/trilogy/core/models/build.py

@@ -134,8 +134,9 @@ def concept_is_relevant(
     if concept.purpose in (Purpose.METRIC,):
         if all([c in others for c in concept.grain.components]):
             return False
+    if concept.derivation in (Derivation.UNNEST,):
+        return True
     if concept.derivation in (Derivation.BASIC,):
-
         return any(concept_is_relevant(c, others) for c in concept.concept_arguments)
     if concept.granularity == Granularity.SINGLE_ROW:
         return False
@@ -1668,7 +1669,6 @@ class Factory:
                     valid_inputs=base.valid_inputs,
                     arg_count=base.arg_count,
                 )
-
         new = BuildFunction(
             operator=base.operator,
             arguments=[self.handle_constant(self.build(c)) for c in raw_args],
@@ -1724,6 +1724,14 @@ class Factory:
         return self._build_concept(base)
 
     def _build_concept(self, base: Concept) -> BuildConcept:
+        try:
+            return self.__build_concept(base)
+        except RecursionError as e:
+            raise RecursionError(
+                f"Recursion error building concept {base.address}. This is likely due to a circular reference."
+            ) from e
+
+    def __build_concept(self, base: Concept) -> BuildConcept:
         # TODO: if we are using parameters, wrap it in a new model and use that in rendering
         if base.address in self.local_concepts:
             return self.local_concepts[base.address]
@@ -2002,6 +2010,13 @@ class Factory:
     def _build_tuple_wrapper(self, base: TupleWrapper) -> TupleWrapper:
         return TupleWrapper(val=[self.build(x) for x in base.val], type=base.type)
 
+    @build.register
+    def _(self, base: ListWrapper) -> ListWrapper:
+        return self._build_list_wrapper(base)
+
+    def _build_list_wrapper(self, base: ListWrapper) -> ListWrapper:
+        return ListWrapper([self.build(x) for x in base], type=base.type)
+
     @build.register
     def _(self, base: FilterItem) -> BuildFilterItem:
         return self._build_filter_item(base)

{pytrilogy-0.0.3.113 → pytrilogy-0.0.3.115}/trilogy/core/processing/concept_strategies_v3.py

@@ -306,7 +306,12 @@ def evaluate_loop_conditions(
 
 
 def check_for_early_exit(
-    complete, partial, missing, context: LoopContext, priority_concept: BuildConcept
+    complete: ValidationResult,
+    found: set[str],
+    partial: set[str],
+    missing: set[str],
+    context: LoopContext,
+    priority_concept: BuildConcept,
 ) -> bool:
     if complete == ValidationResult.INCOMPLETE_CONDITION:
         cond_dict = {str(node): node.preexisting_conditions for node in context.stack}
@@ -331,8 +336,18 @@ def check_for_early_exit(
                 f"{depth_to_prefix(context.depth)}{LOGGER_PREFIX} Breaking as we have attempted all nodes"
             )
             return True
+        elif all(
+            [
+                x.address in found and x.address not in partial
+                for x in context.mandatory_list
+            ]
+        ):
+            logger.info(
+                f"{depth_to_prefix(context.depth)}{LOGGER_PREFIX} Breaking as we have found all mandatory nodes without partials"
+            )
+            return True
         logger.info(
-            f"{depth_to_prefix(context.depth)}{LOGGER_PREFIX} Found complete stack with partials {partial}, continuing search, attempted {context.attempted} all {len(context.mandatory_list)}"
+            f"{depth_to_prefix(context.depth)}{LOGGER_PREFIX} Found complete stack with partials {partial}, continuing search, attempted {context.attempted} of total {len(context.mandatory_list)}."
         )
     else:
         logger.info(
@@ -436,6 +451,7 @@ def generate_loop_completion(context: LoopContext, virtual: set[str]) -> Strateg
             context.original_mandatory,
             context.environment,
             non_virtual_difference_values,
+            depth=context.depth,
         )
 
     return group_if_required_v2(
@@ -443,6 +459,7 @@ def generate_loop_completion(context: LoopContext, virtual: set[str]) -> Strateg
         context.original_mandatory,
         context.environment,
         non_virtual_difference_values,
+        depth=context.depth,
     )
 
 
@@ -466,6 +483,7 @@ def _search_concepts(
         conditions=conditions,
     )
 
+    # if we get a can
     if candidate:
         return candidate
     context = initialize_loop_context(
@@ -477,13 +495,14 @@ def _search_concepts(
         accept_partial=accept_partial,
         conditions=conditions,
     )
-
+    partial: set[str] = set()
     while context.incomplete:
 
         priority_concept = get_priority_concept(
             context.mandatory_list,
             context.attempted,
             found_concepts=context.found,
+            partial_concepts=partial,
             depth=depth,
         )
 
@@ -538,7 +557,7 @@ def _search_concepts(
         # assign
         context.found = found_c
         early_exit = check_for_early_exit(
-            complete, partial, missing_c, context, priority_concept
+            complete, found_c, partial, missing_c, context, priority_concept
         )
         if early_exit:
             break
@@ -608,4 +627,4 @@ def source_query_concepts(
     logger.info(
         f"{depth_to_prefix(0)}{LOGGER_PREFIX} final concepts are {[x.address for x in final]}"
     )
-    return group_if_required_v2(root, output_concepts, environment)
+    return group_if_required_v2(root, output_concepts, environment, depth=0)

{pytrilogy-0.0.3.113 → pytrilogy-0.0.3.115}/trilogy/core/processing/discovery_node_factory.py

@@ -187,7 +187,7 @@ def _generate_aggregate_node(ctx: NodeGenerationContext) -> StrategyNode | None:
 
     logger.info(
         f"{depth_to_prefix(ctx.depth)}{LOGGER_PREFIX} "
-        f"for {ctx.concept.address}, generating aggregate node with {agg_optional}"
+        f"for {ctx.concept.address}, generating aggregate node with optional {agg_optional}"
     )
 
     return gen_group_node(
@@ -441,7 +441,7 @@ def generate_node(
     depth: int,
     source_concepts: SearchConceptsType,
     history: History,
-    accept_partial: bool = False,
+    accept_partial: bool,
     conditions: BuildWhereClause | None = None,
 ) -> StrategyNode | None:
 

{pytrilogy-0.0.3.113 → pytrilogy-0.0.3.115}/trilogy/core/processing/discovery_utility.py

@@ -184,10 +184,14 @@ def group_if_required_v2(
     final: List[BuildConcept],
     environment: BuildEnvironment,
     where_injected: set[str] | None = None,
+    depth: int = 0,
 ):
     where_injected = where_injected or set()
     required = check_if_group_required(
-        downstream_concepts=final, parents=[root.resolve()], environment=environment
+        downstream_concepts=final,
+        parents=[root.resolve()],
+        environment=environment,
+        depth=depth,
     )
     targets = [
         x
@@ -258,6 +262,7 @@ def get_priority_concept(
     all_concepts: List[BuildConcept],
     attempted_addresses: set[str],
     found_concepts: set[str],
+    partial_concepts: set[str],
     depth: int,
 ) -> BuildConcept:
     # optimized search for missing concepts
@@ -265,13 +270,15 @@ def get_priority_concept(
         [
             c
             for c in all_concepts
-            if c.address not in attempted_addresses and c.address not in found_concepts
+            if c.address not in attempted_addresses
+            and (c.address not in found_concepts or c.address in partial_concepts)
         ],
         key=lambda x: x.address,
     )
     # sometimes we need to scan intermediate concepts to get merge keys or filter keys,
     # so do an exhaustive search
-    # pass_two = [c for c in all_concepts+filter_only if c.address not in attempted_addresses]
+    # pass_two = [c for c in all_concepts if c.address not in attempted_addresses]
+
     for remaining_concept in (pass_one,):
         priority = (
             # then multiselects to remove them from scope
@@ -333,5 +340,5 @@ def get_priority_concept(
         if final:
             return final[0]
     raise ValueError(
-        f"Cannot resolve query. No remaining priority concepts, have attempted {attempted_addresses}"
+        f"Cannot resolve query. No remaining priority concepts, have attempted {attempted_addresses} out of {all_concepts} with found {found_concepts}"
     )

{pytrilogy-0.0.3.113 → pytrilogy-0.0.3.115}/trilogy/core/processing/node_generators/filter_node.py

@@ -96,6 +96,8 @@ def build_parent_concepts(
                 continue
         elif global_filter_is_local_filter:
             same_filter_optional.append(x)
+            # also append it to the parent row concepts
+            parent_row_concepts.append(x)
 
     # sometimes, it's okay to include other local optional above the filter
     # in case it is, prep our list
@@ -204,11 +206,16 @@ def gen_filter_node(
             f"{padding(depth)}{LOGGER_PREFIX} filter node row parents {[x.address for x in parent_row_concepts]} could not be found"
         )
         return None
+    else:
+        logger.info(
+            f"{padding(depth)}{LOGGER_PREFIX} filter node has row parents {[x.address for x in parent_row_concepts]} from node with output [{[x.address for x in row_parent.output_concepts]}] partial {row_parent.partial_concepts}"
+        )
     if global_filter_is_local_filter:
         logger.info(
             f"{padding(depth)}{LOGGER_PREFIX} filter node conditions match global conditions adding row parent {row_parent.output_concepts} with condition {where.conditional}"
         )
         row_parent.add_parents(core_parent_nodes)
+        # all local optional will be in the parent already, so we can set outputs
         row_parent.set_output_concepts([concept] + local_optional)
         return row_parent
     if optimized_pushdown:

{pytrilogy-0.0.3.113 → pytrilogy-0.0.3.115}/trilogy/core/processing/node_generators/unnest_node.py

@@ -9,6 +9,7 @@ from trilogy.core.models.build import (
 from trilogy.core.models.build_environment import BuildEnvironment
 from trilogy.core.processing.nodes import (
     History,
+    MergeNode,
     StrategyNode,
     UnnestNode,
     WhereSafetyNode,
@@ -18,6 +19,32 @@ from trilogy.core.processing.utility import padding
 LOGGER_PREFIX = "[GEN_UNNEST_NODE]"
 
 
+def get_pseudonym_parents(
+    concept: BuildConcept,
+    local_optional: List[BuildConcept],
+    source_concepts,
+    environment: BuildEnvironment,
+    g,
+    depth,
+    history,
+    conditions,
+) -> List[StrategyNode]:
+    for x in concept.pseudonyms:
+        attempt = source_concepts(
+            mandatory_list=[environment.alias_origin_lookup[x]] + local_optional,
+            environment=environment,
+            g=g,
+            depth=depth + 1,
+            history=history,
+            conditions=conditions,
+            accept_partial=True,
+        )
+        if not attempt:
+            continue
+        return [attempt]
+    return []
+
+
 def gen_unnest_node(
     concept: BuildConcept,
     local_optional: List[BuildConcept],
@@ -29,14 +56,34 @@ def gen_unnest_node(
     conditions: BuildWhereClause | None = None,
 ) -> StrategyNode | None:
     arguments = []
+    join_nodes: list[StrategyNode] = []
     depth_prefix = "\t" * depth
     if isinstance(concept.lineage, BuildFunction):
         arguments = concept.lineage.concept_arguments
+    search_optional = local_optional
+    if (not arguments) and (local_optional and concept.pseudonyms):
+        logger.info(
+            f"{padding(depth)}{LOGGER_PREFIX} unnest node for {concept} has no parents; creating solo unnest node"
+        )
+        join_nodes += get_pseudonym_parents(
+            concept,
+            local_optional,
+            source_concepts,
+            environment,
+            g,
+            depth,
+            history,
+            conditions,
+        )
+        logger.info(
+            f"{padding(depth)}{LOGGER_PREFIX} unnest node for {concept} got join nodes {join_nodes}"
+        )
+        search_optional = []
 
-    equivalent_optional = [x for x in local_optional if x.lineage == concept.lineage]
+    equivalent_optional = [x for x in search_optional if x.lineage == concept.lineage]
 
     non_equivalent_optional = [
-        x for x in local_optional if x not in equivalent_optional
+        x for x in search_optional if x not in equivalent_optional
     ]
     all_parents = arguments + non_equivalent_optional
     logger.info(
@@ -44,7 +91,8 @@ def gen_unnest_node(
     )
     local_conditions = False
     expected_outputs = [concept] + local_optional
-    if arguments or local_optional:
+    parent: StrategyNode | None = None
+    if arguments or search_optional:
         parent = source_concepts(
             mandatory_list=all_parents,
             environment=environment,
@@ -86,14 +134,37 @@ def gen_unnest_node(
     base = UnnestNode(
         unnest_concepts=[concept] + equivalent_optional,
         input_concepts=arguments + non_equivalent_optional,
-        output_concepts=[concept] + local_optional,
+        output_concepts=[concept] + search_optional,
         environment=environment,
         parents=([parent] if parent else []),
     )
+
+    conditional = conditions.conditional if conditions else None
+    if join_nodes:
+        logger.info(
+            f"{depth_prefix}{LOGGER_PREFIX} unnest node for {concept} needs to merge with join nodes {join_nodes}"
+        )
+        for x in join_nodes:
+            logger.info(
+                f"{depth_prefix}{LOGGER_PREFIX} join node {x} with partial {x.partial_concepts}"
+            )
+            pseudonyms = [
+                environment.alias_origin_lookup[p] for p in concept.pseudonyms
+            ]
+            x.add_partial_concepts(pseudonyms)
+        return MergeNode(
+            input_concepts=base.output_concepts
+            + [j for n in join_nodes for j in n.output_concepts],
+            output_concepts=[concept] + local_optional,
+            environment=environment,
+            parents=[base] + join_nodes,
+            conditions=conditional if local_conditions is True else None,
+            preexisting_conditions=(
+                conditional if conditional and local_conditions is False else None
+            ),
+        )
     # we need to sometimes nest an unnest node,
     # as unnest operations are not valid in all situations
-    # TODO: inline this node when we can detect it's safe
-    conditional = conditions.conditional if conditions else None
     new = WhereSafetyNode(
         input_concepts=base.output_concepts,
         output_concepts=base.output_concepts,

{pytrilogy-0.0.3.113 → pytrilogy-0.0.3.115}/trilogy/core/statements/author.py

@@ -197,7 +197,7 @@ class SelectStatement(HasUUID, SelectTypeMixin, BaseModel):
             for x in self.where_clause.concept_arguments:
                 if isinstance(x, UndefinedConcept):
                     validate = environment.concepts.get(x.address)
-                    if validate:
+                    if validate and self.where_clause:
                         self.where_clause = (
                             self.where_clause.with_reference_replacement(
                                 x.address, validate.reference

{pytrilogy-0.0.3.113 → pytrilogy-0.0.3.115}/trilogy/dialect/base.py

@@ -194,6 +194,13 @@ FUNCTION_MAP = {
     FunctionType.INDEX_ACCESS: lambda x: f"{x[0]}[{x[1]}]",
     FunctionType.MAP_ACCESS: lambda x: f"{x[0]}[{x[1]}]",
     FunctionType.UNNEST: lambda x: f"unnest({x[0]})",
+    FunctionType.DATE_SPINE: lambda x: f"""unnest(
+        generate_series(
+            {x[0]},
+            {x[1]},
+            INTERVAL '1 day'
+        )
+    )""",
     FunctionType.RECURSE_EDGE: lambda x: f"CASE WHEN {x[1]} IS NULL THEN {x[0]} ELSE {x[1]} END",
     FunctionType.ATTR_ACCESS: lambda x: f"""{x[0]}.{x[1].replace("'", "")}""",
     FunctionType.STRUCT: lambda x: f"{{{', '.join(struct_arg(x))}}}",
@@ -213,6 +220,9 @@ FUNCTION_MAP = {
     FunctionType.ARRAY_TO_STRING: lambda args: (
         f"array_to_string({args[0]}, {args[1]})"
     ),
+    FunctionType.ARRAY_FILTER: lambda args: (
+        f"array_filter({args[0]}, {args[1]} -> {args[2]})"
+    ),
     # math
     FunctionType.ADD: lambda x: " + ".join(x),
     FunctionType.ABS: lambda x: f"abs({x[0]})",
@@ -237,6 +247,7 @@ FUNCTION_MAP = {
     FunctionType.AVG: lambda x: f"avg({x[0]})",
     FunctionType.MAX: lambda x: f"max({x[0]})",
     FunctionType.MIN: lambda x: f"min({x[0]})",
+    FunctionType.ANY: lambda x: f"any_value({x[0]})",
     # string types
     FunctionType.LIKE: lambda x: f" {x[0]} like {x[1]} ",
     FunctionType.UPPER: lambda x: f"UPPER({x[0]}) ",
@@ -285,6 +296,7 @@ FUNCTION_GRAIN_MATCH_MAP = {
     FunctionType.AVG: lambda args: f"{args[0]}",
     FunctionType.MAX: lambda args: f"{args[0]}",
     FunctionType.MIN: lambda args: f"{args[0]}",
+    FunctionType.ANY: lambda args: f"{args[0]}",
 }
 
 

{pytrilogy-0.0.3.113 → pytrilogy-0.0.3.115}/trilogy/parsing/common.py

@@ -91,7 +91,7 @@ def process_function_arg(
         # to simplify anonymous function handling
         if (
             arg.operator not in FunctionClass.AGGREGATE_FUNCTIONS.value
-            and arg.operator != FunctionType.UNNEST
+            and arg.operator not in FunctionClass.ONE_TO_MANY.value
         ):
             return arg
         id_hash = string_to_hash(str(arg))
@@ -311,13 +311,18 @@ def concept_is_relevant(
     if concept.purpose in (Purpose.METRIC,):
         if all([c in others for c in concept.grain.components]):
             return False
+    if (
+        concept.derivation in (Derivation.BASIC,)
+        and isinstance(concept.lineage, Function)
+        and concept.lineage.operator == FunctionType.DATE_SPINE
+    ):
+        return True
     if concept.derivation in (Derivation.BASIC,) and isinstance(
         concept.lineage, (Function, CaseWhen)
     ):
         relevant = False
         for arg in concept.lineage.arguments:
             relevant = atom_is_relevant(arg, others, environment) or relevant
-
         return relevant
     if concept.derivation in (Derivation.BASIC,) and isinstance(
         concept.lineage, Parenthetical
@@ -529,7 +534,7 @@ def function_to_concept(
     elif parent.operator == FunctionType.UNION:
         derivation = Derivation.UNION
         granularity = Granularity.MULTI_ROW
-    elif parent.operator == FunctionType.UNNEST:
+    elif parent.operator in FunctionClass.ONE_TO_MANY.value:
         derivation = Derivation.UNNEST
         granularity = Granularity.MULTI_ROW
     elif parent.operator == FunctionType.RECURSE_EDGE: