pytrilogy 0.0.3.56__tar.gz → 0.0.3.60__tar.gz

{pytrilogy-0.0.3.56/pytrilogy.egg-info → pytrilogy-0.0.3.60}/PKG-INFO

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

{pytrilogy-0.0.3.56 → pytrilogy-0.0.3.60/pytrilogy.egg-info}/PKG-INFO

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

{pytrilogy-0.0.3.56 → pytrilogy-0.0.3.60}/pytrilogy.egg-info/SOURCES.txt

@@ -143,4 +143,5 @@ trilogy/std/display.preql
 trilogy/std/geography.preql
 trilogy/std/money.preql
 trilogy/std/net.preql
+trilogy/std/ranking.preql
 trilogy/std/report.preql

{pytrilogy-0.0.3.56 → pytrilogy-0.0.3.60}/tests/test_discovery_nodes.py

@@ -51,7 +51,11 @@ def test_group_node_property(test_environment: Environment, test_environment_gra
         for x in group_node.parents[0].output_concepts
         if x not in group_node.parents[0].hidden_concepts
     }
-    assert input_concept_names == {"category_name_length", "category_id"}
+    assert input_concept_names == {
+        "category_name_length",
+        "category_name",
+        "category_id",
+    }
     final = group_node.resolve()
     assert len(final.datasources) == 1
     assert final.datasources[0].group_required is False
@@ -79,7 +83,11 @@ def test_group_node_property_all(test_environment: Environment, test_environment
         for x in group_node.parents[0].output_concepts
         if x not in group_node.parents[0].hidden_concepts
     }
-    assert input_concept_names == {"category_name_length", "category_id"}
+    assert input_concept_names == {
+        "category_name_length",
+        "category_name",
+        "category_id",
+    }
     final = group_node.resolve()
     assert len(final.datasources) == 1
     assert final.datasources[0].group_required is False

{pytrilogy-0.0.3.56 → pytrilogy-0.0.3.60}/tests/test_functions.py

@@ -36,6 +36,23 @@ def test_typing():
     assert x in set([x])
 
 
+def test_negative_float_parsing(test_environment):
+    declarations = """
+
+    const x <- -1.23;
+
+select
+x
+where x >-1.24;
+
+    """
+    env, parsed = parse(declarations, environment=test_environment)
+    select: SelectStatement = parsed[-1]
+
+    for dialect in TEST_DIALECTS:
+        dialect.compile_statement(process_query(test_environment, select, hooks=[]))
+
+
 def test_functions(test_environment):
     declarations = """
 

{pytrilogy-0.0.3.56 → pytrilogy-0.0.3.60}/tests/test_user_functions.py

@@ -208,7 +208,9 @@ auto test <-SUM(CASE WHEN 10 = weekday THEN x ELSE 0 END) +
 def test_user_function_import():
     env = Environment(working_path=Path(__file__).parent)
     x = Dialects.DUCK_DB.default_executor(environment=env)
+    from trilogy.hooks import DebuggingHook
 
+    DebuggingHook()
     results = x.execute_query(
         """
 import test_env_functions as test_env_functions;

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

{pytrilogy-0.0.3.56 → pytrilogy-0.0.3.60}/trilogy/authoring/__init__.py

@@ -43,14 +43,19 @@ from trilogy.core.models.core import (
     MapType,
     StructType,
 )
-from trilogy.core.models.datasource import Datasource, DatasourceMetadata
+from trilogy.core.models.datasource import Address, Datasource, DatasourceMetadata
 from trilogy.core.models.environment import Environment
 from trilogy.core.statements.author import (
     ConceptDeclarationStatement,
     ConceptTransform,
+    CopyStatement,
+    Grain,
+    HasUUID,
+    ImportStatement,
     MultiSelectStatement,
     PersistStatement,
     RawSQLStatement,
+    RowsetDerivationStatement,
     SelectItem,
     SelectStatement,
 )
@@ -73,6 +78,8 @@ __all__ = [
     "DataType",
     "StructType",
     "ListType",
+    "Grain",
+    "RowsetDerivationStatement",
     "MapType",
     "ListWrapper",
     "FunctionType",
@@ -109,4 +116,8 @@ __all__ = [
     "MultiSelectLineage",
     "RowsetItem",
     "FunctionCallWrapper",
+    "CopyStatement",
+    "HasUUID",
+    "ImportStatement",
+    "Address",
 ]

{pytrilogy-0.0.3.56 → pytrilogy-0.0.3.60}/trilogy/core/constants.py

@@ -2,3 +2,4 @@ CONSTANT_DATASET: str = "preql_internal_constant_dataset"
 ALL_ROWS_CONCEPT = "all_rows"
 INTERNAL_NAMESPACE = "__preql_internal"
 PERSISTED_CONCEPT_PREFIX = "__pre_persist"
+UNNEST_NAME = "_unnest_alias"

{pytrilogy-0.0.3.56 → pytrilogy-0.0.3.60}/trilogy/core/enums.py

@@ -7,6 +7,7 @@ class UnnestMode(Enum):
     DIRECT = "direct"
     CROSS_APPLY = "cross_apply"
     CROSS_JOIN = "cross_join"
+    CROSS_JOIN_UNNEST = "cross_join_unnest"
     CROSS_JOIN_ALIAS = "cross_join_alias"
     SNOWFLAKE = "snowflake"
 

{pytrilogy-0.0.3.56 → pytrilogy-0.0.3.60}/trilogy/core/models/execute.py

@@ -658,18 +658,21 @@ class QueryDatasource(BaseModel):
     @classmethod
     def validate_source_map(cls, v: dict, info: ValidationInfo):
         values = info.data
+        hidden_concepts = values.get("hidden_concepts", set())
         for key in ("input_concepts", "output_concepts"):
             if not values.get(key):
                 continue
             concept: BuildConcept
             for concept in values[key]:
+                if concept.address in hidden_concepts:
+                    continue
                 if (
                     concept.address not in v
                     and not any(x in v for x in concept.pseudonyms)
                     and CONFIG.validate_missing
                 ):
                     raise SyntaxError(
-                        f"On query datasource missing source map for {concept.address} on {key} with pseudonyms {concept.pseudonyms}, have {v}"
+                        f"On query datasource from {values} missing source map entry (map: {v}) for {concept.address} on {key} with pseudonyms {concept.pseudonyms}, have {v}"
                     )
         return v
 

{pytrilogy-0.0.3.56 → pytrilogy-0.0.3.60}/trilogy/core/optimization.py

@@ -141,9 +141,7 @@ def is_direct_return_eligible(cte: CTE | UnionCTE) -> CTE | UnionCTE | None:
     if not output_addresses.issubset(parent_output_addresses):
         return None
     if not direct_parent.grain == cte.grain:
-        logger.info("grain mismatch, cannot early exit")
-        logger.info(direct_parent.grain)
-        logger.info(cte.grain)
+        logger.info("[Direct Return] grain mismatch, cannot early exit")
         return None
 
     assert isinstance(cte, CTE)
@@ -236,6 +234,8 @@ def optimize_ctes(
             complete = not actions_taken
             loops += 1
             input = reorder_ctes(filter_irrelevant_ctes(input, root_cte))
-        logger.info(f"finished checking for {type(rule).__name__} in {loops} loops")
+        logger.info(
+            f"[Optimization] Finished checking for {type(rule).__name__} after {loops} loop(s)"
+        )
 
     return reorder_ctes(filter_irrelevant_ctes(input, root_cte))

{pytrilogy-0.0.3.56 → pytrilogy-0.0.3.60}/trilogy/core/processing/concept_strategies_v3.py

@@ -408,8 +408,9 @@ def generate_loop_completion(context: LoopContext, virtual) -> StrategyNode:
         logger.info(
             f"{depth_to_prefix(context.depth)}{LOGGER_PREFIX} Conditions {context.conditions} were injected, checking if we need a group to restore grain"
         )
+
         result = GroupNode.check_if_required(
-            downstream_concepts=context.original_mandatory,
+            downstream_concepts=output.usable_outputs,
             parents=[output.resolve()],
             environment=context.environment,
             depth=context.depth,
@@ -420,7 +421,7 @@ def generate_loop_completion(context: LoopContext, virtual) -> StrategyNode:
             )
             return GroupNode(
                 output_concepts=context.original_mandatory,
-                input_concepts=context.original_mandatory,
+                input_concepts=output.usable_outputs,
                 environment=context.environment,
                 parents=[output],
                 partial_concepts=output.partial_concepts,
@@ -504,7 +505,7 @@ def _search_concepts(
             conditions=context.conditions,
             accept_partial=accept_partial,
         )
-        # assig
+        # assign
         context.found = found_c
         early_exit = check_for_early_exit(complete, partial, context, priority_concept)
         if early_exit:

{pytrilogy-0.0.3.56 → pytrilogy-0.0.3.60}/trilogy/core/processing/discovery_node_factory.py

@@ -307,12 +307,18 @@ class RootNodeHandler:
     def _resolve_root_concepts(
         self, root_targets: List[BuildConcept]
     ) -> Optional[StrategyNode]:
-
+        synonym_node = self._try_synonym_resolution(root_targets)
+        if synonym_node:
+            logger.info(
+                f"{depth_to_prefix(self.ctx.depth)}{LOGGER_PREFIX} "
+                f"resolved root concepts through synonyms"
+            )
+            return synonym_node
         expanded_node = self._try_merge_expansion(root_targets)
         if expanded_node:
             return expanded_node
 
-        return self._try_synonym_resolution(root_targets)
+        return None
 
     def _try_merge_expansion(
         self, root_targets: List[BuildConcept]
@@ -367,7 +373,7 @@ class RootNodeHandler:
     ) -> Optional[StrategyNode]:
         logger.info(
             f"{depth_to_prefix(self.ctx.depth)}{LOGGER_PREFIX} "
-            f"Could not resolve root concepts, checking for synonyms"
+            f"Could not resolve root concepts, checking for synonyms for {root_targets}"
         )
 
         if not self.ctx.history.check_started(

{pytrilogy-0.0.3.56 → pytrilogy-0.0.3.60}/trilogy/core/processing/node_generators/basic_node.py

@@ -1,7 +1,7 @@
 from typing import List
 
 from trilogy.constants import logger
-from trilogy.core.enums import FunctionClass, SourceType
+from trilogy.core.enums import FunctionClass, FunctionType, SourceType
 from trilogy.core.models.build import BuildConcept, BuildFunction, BuildWhereClause
 from trilogy.core.models.build_environment import BuildEnvironment
 from trilogy.core.processing.node_generators.common import (
@@ -47,13 +47,25 @@ def gen_basic_node(
     logger.info(
         f"{depth_prefix}{LOGGER_PREFIX} basic node for {concept} with lineage {concept.lineage} has parents {[x for x in parent_concepts]}"
     )
-
+    synonyms: list[BuildConcept] = []
+    ignored_optional: set[str] = set()
+    assert isinstance(concept.lineage, BuildFunction)
+    if concept.lineage.operator == FunctionType.ATTR_ACCESS:
+        logger.info(
+            f"{depth_prefix}{LOGGER_PREFIX} checking for synonyms for attribute access"
+        )
+        for x in local_optional:
+            for z in x.pseudonyms:
+                s_concept = environment.alias_origin_lookup[z]
+                if is_equivalent_basic_function_lineage(concept, s_concept):
+                    synonyms.append(s_concept)
+                    ignored_optional.add(x.address)
     equivalent_optional = [
         x
         for x in local_optional
         if is_equivalent_basic_function_lineage(concept, x)
         and x.address != concept.address
-    ]
+    ] + synonyms
 
     if equivalent_optional:
         logger.info(
@@ -66,6 +78,7 @@ def gen_basic_node(
         for x in local_optional
         if x not in equivalent_optional
         and not any(x.address in y.pseudonyms for y in equivalent_optional)
+        and x.address not in ignored_optional
     ]
     all_parents: list[BuildConcept] = unique(
         parent_concepts + non_equivalent_optional, "address"
@@ -73,7 +86,7 @@ def gen_basic_node(
     logger.info(
         f"{depth_prefix}{LOGGER_PREFIX} Fetching parents {[x.address for x in all_parents]}"
     )
-    parent_node: StrategyNode = source_concepts(
+    parent_node: StrategyNode | None = source_concepts(
         mandatory_list=all_parents,
         environment=environment,
         g=g,
@@ -92,14 +105,19 @@ def gen_basic_node(
     parent_node.add_output_concept(concept)
     for x in equivalent_optional:
         parent_node.add_output_concept(x)
-
-    parent_node.remove_output_concepts(
-        [
-            x
-            for x in parent_node.output_concepts
-            if x.address not in [concept] + local_optional
-        ]
+    targets = [concept] + local_optional
+    logger.info(
+        f"{depth_prefix}{LOGGER_PREFIX} Returning basic select for {concept}: output {[x.address for x in parent_node.output_concepts]}"
     )
+    should_hide = [
+        x
+        for x in parent_node.output_concepts
+        if (
+            x.address not in targets
+            and not any(x.address in y.pseudonyms for y in targets)
+        )
+    ]
+    parent_node.hide_output_concepts(should_hide)
 
     logger.info(
         f"{depth_prefix}{LOGGER_PREFIX} Returning basic select for {concept}: output {[x.address for x in parent_node.output_concepts]}"

{pytrilogy-0.0.3.56 → pytrilogy-0.0.3.60}/trilogy/core/processing/node_generators/node_merge_node.py

@@ -88,7 +88,10 @@ def determine_induced_minimal_nodes(
     for node in G.nodes:
         if concepts.get(node):
             lookup: BuildConcept = concepts[node]
-            if lookup.derivation in (Derivation.CONSTANT,):
+            # inclusion of aggregates can create ambiguous node relation chains
+            # there may be a better way to handle this
+            # can be revisited if we need to connect a derived synonym based on an aggregate
+            if lookup.derivation in (Derivation.CONSTANT, Derivation.AGGREGATE):
                 nodes_to_remove.append(node)
             # purge a node if we're already looking for all it's parents
             if filter_downstream and lookup.derivation not in (Derivation.ROOT,):
@@ -112,6 +115,7 @@ def determine_induced_minimal_nodes(
         return None
     H.remove_nodes_from(list(x for x in H.nodes if x not in paths))
     sG: nx.Graph = ax.steinertree.steiner_tree(H, nodelist).copy()
+    logger.debug("Steiner tree found for nodes %s", nodelist)
     final: nx.DiGraph = nx.subgraph(G, sG.nodes).copy()
 
     for edge in G.edges:
@@ -143,7 +147,7 @@ def determine_induced_minimal_nodes(
     if not all([node in final.nodes for node in nodelist]):
         missing = [node for node in nodelist if node not in final.nodes]
         logger.debug(
-            f"Skipping graph for {nodelist} as missing nodes {missing} from {final.nodes}"
+            f"Skipping graph for initial list {nodelist} as missing nodes {missing} from final graph {final.nodes}"
         )
         return None
     logger.debug(f"Found final graph {final.nodes}")
@@ -228,11 +232,14 @@ def resolve_weak_components(
     # to ensure there are not ambiguous discovery paths
     # (if we did not care about raising ambiguity errors, we could just use the first one)
     count = 0
-    node_list = [
-        concept_to_node(c.with_default_grain())
-        for c in all_concepts
-        if "__preql_internal" not in c.address
-    ]
+    node_list = sorted(
+        [
+            concept_to_node(c.with_default_grain())
+            for c in all_concepts
+            if "__preql_internal" not in c.address
+        ]
+    )
+    logger.debug(f"Resolving weak components for {node_list} in {search_graph.nodes}")
     synonyms: set[str] = set()
     for x in all_concepts:
         synonyms = synonyms.union(x.pseudonyms)
@@ -354,7 +361,7 @@ def subgraphs_to_merge_node(
         parents.append(parent)
     input_c = []
     for x in parents:
-        for y in x.output_concepts:
+        for y in x.usable_outputs:
             input_c.append(y)
     if len(parents) == 1 and enable_early_exit:
         logger.info(
@@ -392,6 +399,7 @@ def gen_merge_node(
         )
     else:
         all_search_concepts = all_concepts
+    all_search_concepts = sorted(all_search_concepts, key=lambda x: x.address)
     for filter_downstream in [True, False]:
         weak_resolve = resolve_weak_components(
             all_search_concepts,

{pytrilogy-0.0.3.56 → pytrilogy-0.0.3.60}/trilogy/core/processing/node_generators/synonym_node.py

@@ -29,7 +29,7 @@ def gen_synonym_node(
     conditions: BuildWhereClause | None = None,
     accept_partial: bool = False,
 ) -> StrategyNode | None:
-    local_prefix = f"[GEN_SYNONYM_NODE] {padding(depth)}"
+    local_prefix = f"{padding(depth)}[GEN_SYNONYM_NODE]"
     base_fingerprint = tuple([x.address for x in all_concepts])
     synonyms = defaultdict(list)
     synonym_count = 0
@@ -64,5 +64,6 @@ def gen_synonym_node(
         )
         if attempt:
             logger.info(f"{local_prefix} found inputs with {combo}")
+            print(attempt.output_concepts)
             return attempt
     return None

{pytrilogy-0.0.3.56 → pytrilogy-0.0.3.60}/trilogy/core/processing/node_generators/unnest_node.py

@@ -20,16 +20,22 @@ def gen_unnest_node(
     conditions: BuildWhereClause | None = None,
 ) -> StrategyNode | None:
     arguments = []
+    depth_prefix = "\t" * depth
     if isinstance(concept.lineage, BuildFunction):
         arguments = concept.lineage.concept_arguments
 
     equivalent_optional = [x for x in local_optional if x.lineage == concept.lineage]
+
     non_equivalent_optional = [
         x for x in local_optional if x not in equivalent_optional
     ]
+    all_parents = arguments + non_equivalent_optional
+    logger.info(
+        f"{depth_prefix}{LOGGER_PREFIX} unnest node for {concept} with lineage {concept.lineage} has parents {all_parents} and equivalent optional {equivalent_optional}"
+    )
     if arguments or local_optional:
         parent = source_concepts(
-            mandatory_list=arguments + non_equivalent_optional,
+            mandatory_list=all_parents,
             environment=environment,
             g=g,
             depth=depth + 1,

{pytrilogy-0.0.3.56 → pytrilogy-0.0.3.60}/trilogy/core/processing/nodes/base_node.py

@@ -311,19 +311,6 @@ class StrategyNode:
             self.rebuild_cache()
         return self
 
-    def remove_output_concepts(
-        self, concepts: List[BuildConcept], rebuild: bool = True
-    ):
-        for x in concepts:
-            self.hidden_concepts.add(x.address)
-        addresses = [x.address for x in concepts]
-        self.output_concepts = [
-            x for x in self.output_concepts if x.address not in addresses
-        ]
-        if rebuild:
-            self.rebuild_cache()
-        return self
-
     @property
     def usable_outputs(self) -> list[BuildConcept]:
         return [

{pytrilogy-0.0.3.56 → pytrilogy-0.0.3.60}/trilogy/core/processing/nodes/group_node.py

@@ -105,7 +105,7 @@ class GroupNode(StrategyNode):
         if comp_grain.issubset(target_grain):
 
             logger.info(
-                f"{padding}{LOGGER_PREFIX} Group requirement check: {comp_grain}, {target_grain}, is subset, no grain required"
+                f"{padding}{LOGGER_PREFIX} Group requirement check: {comp_grain}, {target_grain}, grain is subset of target, no group node required"
             )
             return GroupRequiredResponse(target_grain, comp_grain, False)
         # find out what extra is in the comp grain vs target grain

{pytrilogy-0.0.3.56 → pytrilogy-0.0.3.60}/trilogy/core/processing/utility.py

@@ -409,7 +409,7 @@ def get_node_joins(
 
 
 def get_disconnected_components(
-    concept_map: Dict[str, Set[BuildConcept]]
+    concept_map: Dict[str, Set[BuildConcept]],
 ) -> Tuple[int, List]:
     """Find if any of the datasources are not linked"""
     import networkx as nx
@@ -608,8 +608,24 @@ def sort_select_output_processed(
     mapping = {x.address: x for x in cte.output_columns}
 
     new_output: list[BuildConcept] = []
-    for x in output_addresses:
-        new_output.append(mapping[x])
+    for x in query.output_columns:
+        if x.address in mapping:
+            new_output.append(mapping[x.address])
+        for oc in cte.output_columns:
+            if x.address in oc.pseudonyms:
+                # create a wrapper BuildConcept to render the pseudonym under the original name
+                new_output.append(
+                    BuildConcept(
+                        name=x.name,
+                        namespace=x.namespace,
+                        pseudonyms={oc.address},
+                        datatype=oc.datatype,
+                        purpose=oc.purpose,
+                        grain=oc.grain,
+                        build_is_aggregate=oc.build_is_aggregate,
+                    )
+                )
+                break
 
     for oc in cte.output_columns:
         # add hidden back
@@ -637,17 +653,28 @@ def sort_select_output(
     if isinstance(query, ProcessedQuery):
         return sort_select_output_processed(cte, query)
 
-    output_addresses = [
-        c.address
-        for c in query.output_components
-        # if c.address not in query.hidden_components
-    ]
-
     mapping = {x.address: x for x in cte.output_columns}
 
     new_output: list[BuildConcept] = []
-    for x in output_addresses:
-        new_output.append(mapping[x])
+    for x in query.output_components:
+        if x.address in mapping:
+            new_output.append(mapping[x.address])
+        else:
+            for oc in cte.output_columns:
+                if x.address in oc.pseudonyms:
+                    # create a wrapper BuildConcept to render the pseudonym under the original name
+                    new_output.append(
+                        BuildConcept(
+                            name=x.name,
+                            namespace=x.namespace,
+                            pseudonyms={oc.address},
+                            datatype=oc.datatype,
+                            purpose=oc.purpose,
+                            grain=oc.grain,
+                            build_is_aggregate=oc.build_is_aggregate,
+                        )
+                    )
+                    break
     cte.output_columns = new_output
     cte.hidden_concepts = set(
         [

{pytrilogy-0.0.3.56 → pytrilogy-0.0.3.60}/trilogy/core/query_processor.py

@@ -432,7 +432,7 @@ def get_query_node(
             )
         ds = SelectNode(
             output_concepts=build_statement.output_components,
-            input_concepts=ds.output_concepts,
+            input_concepts=ds.usable_outputs,
             parents=[ds],
             environment=ds.environment,
             partial_concepts=ds.partial_concepts,
@@ -553,11 +553,11 @@ def process_query(
     root_cte.hidden_concepts = statement.hidden_components
 
     final_ctes = optimize_ctes(deduped_ctes, root_cte, statement)
-    mapping = {x.address: x for x in cte.output_columns}
+
     return ProcessedQuery(
         order_by=root_cte.order_by,
         limit=statement.limit,
-        output_columns=[mapping[x.address] for x in statement.output_components],
+        output_columns=statement.output_components,
         ctes=final_ctes,
         base=root_cte,
         hidden_columns=set([x for x in statement.hidden_components]),

{pytrilogy-0.0.3.56 → pytrilogy-0.0.3.60}/trilogy/core/statements/author.py

@@ -5,7 +5,7 @@ from typing import Annotated, List, Optional, Union
 from pydantic import BaseModel, Field, computed_field, field_validator
 from pydantic.functional_validators import PlainValidator
 
-from trilogy.constants import CONFIG
+from trilogy.constants import CONFIG, DEFAULT_NAMESPACE
 from trilogy.core.enums import (
     ConceptSource,
     FunctionClass,
@@ -281,7 +281,11 @@ class SelectStatement(HasUUID, SelectTypeMixin, BaseModel):
             # if the concept is a locally derived concept, it cannot ever be partial
             # but if it's a concept pulled in from upstream and we have a where clause, it should be partial
             ColumnAssignment(
-                alias=c.address.replace(".", "_"),
+                alias=(
+                    c.address.replace(".", "_")
+                    if c.namespace != DEFAULT_NAMESPACE
+                    else c.name
+                ),
                 concept=environment.concepts[c.address].reference,
                 modifiers=modifiers if c.address not in self.locally_derived else [],
             )

{pytrilogy-0.0.3.56 → pytrilogy-0.0.3.60}/trilogy/core/statements/execute.py

@@ -3,6 +3,7 @@ from typing import Annotated, List, Optional, Union
 from pydantic import BaseModel, Field
 from pydantic.functional_validators import PlainValidator
 
+from trilogy.core.models.author import ConceptRef
 from trilogy.core.models.build import (
     BuildConcept,
     BuildDatasource,
@@ -14,7 +15,7 @@ from trilogy.core.statements.common import CopyQueryMixin, PersistQueryMixin
 
 
 class ProcessedQuery(BaseModel):
-    output_columns: List[BuildConcept]
+    output_columns: List[ConceptRef]
     ctes: List[CTE | UnionCTE]
     base: CTE | UnionCTE
     hidden_columns: set[str] = Field(default_factory=set)
@@ -38,5 +39,5 @@ class ProcessedRawSQLStatement(BaseModel):
 
 
 class ProcessedShowStatement(BaseModel):
-    output_columns: List[BuildConcept]
+    output_columns: List[ConceptRef]
     output_values: List[Union[BuildConcept, BuildDatasource, ProcessedQuery]]