pytrilogy 0.0.2.48__py3-none-any.whl → 0.0.2.49__py3-none-any.whl

{pytrilogy-0.0.2.48.dist-info → pytrilogy-0.0.2.49.dist-info}/METADATA

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

{pytrilogy-0.0.2.48.dist-info → pytrilogy-0.0.2.49.dist-info}/RECORD

@@ -1,4 +1,4 @@
-trilogy/__init__.py,sha256=rBXQoKLExpvOodgSnjarZ5SG_tlNVQvyadW0PFK1aFs,291
+trilogy/__init__.py,sha256=hG5X0wOuxbm75ZaOS3dSSefwEZ4P5yCHSSmZ1x9LX4I,291
 trilogy/compiler.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/constants.py,sha256=qZ1d0hoKPPV2HHCoFwPYTVB7b6bXjpWvXd3lE-zEhy8,1494
 trilogy/engine.py,sha256=yOPnR7XCjWG82Gym_LLZBkYKKJdLCvqdCyt8zguNcnM,1103
@@ -16,18 +16,18 @@ trilogy/core/exceptions.py,sha256=1c1lQCwSw4_5CQS3q7scOkXU8GQvullJXfPHubprl90,61
 trilogy/core/functions.py,sha256=qpVLwTNU_qHQyIvNish5O2AlbpRMQQOqZWEUiSMnpqE,10721
 trilogy/core/graph_models.py,sha256=mameUTiuCajtihDw_2-W218xyJlvTusOWrEKP1yAWgk,2003
 trilogy/core/internal.py,sha256=-CykZknaWieFh5begaQJ4EgGP9qJccGg4XXdmBirxEc,1074
-trilogy/core/models.py,sha256=UjuDuda6TWk_y5Pq3mx_BVfmLP3U6WH4EHhd88ddp4E,166378
+trilogy/core/models.py,sha256=GLy30_Rhvb9Z1atXPlK-sOSeN4lBzBspyMiqti5wS50,166562
 trilogy/core/optimization.py,sha256=Jy3tVJNeqhpK6VSyTvgIWKCao6y-VCZ7mYA69MIF6L0,7989
-trilogy/core/query_processor.py,sha256=eIRV7WEeEI-3OICEdXjJoQe2DhCimJfyFVW9CI6tU-Q,18845
+trilogy/core/query_processor.py,sha256=keXQMpvM-S4rYU1YhzRAkvB1bVlbcX4CKNFafhVRgiI,18635
 trilogy/core/optimizations/__init__.py,sha256=EBanqTXEzf1ZEYjAneIWoIcxtMDite5-n2dQ5xcfUtg,356
 trilogy/core/optimizations/base_optimization.py,sha256=P4kF-eCXkBxO-5c6tLHhMZ4ODRH1A04hb_6ovkaVyLw,505
 trilogy/core/optimizations/inline_constant.py,sha256=c-YHOg6eAufL4EaCf4-0PbY_D4skBHW0ldR55_phsMA,1277
 trilogy/core/optimizations/inline_datasource.py,sha256=LsngRKBy-LYcx1sfo1-rnDym_ly73YV9WkEngSjpFx8,3943
 trilogy/core/optimizations/predicate_pushdown.py,sha256=XPWEBv8jXnc0OL2JDPNwFvJ5AtOE7dLzJK0LzdmdZMo,9252
 trilogy/core/processing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/core/processing/concept_strategies_v3.py,sha256=tODAJjYyIwR1RII_4GjZ8f0TP18GvOe49aF1x8MxXto,36985
+trilogy/core/processing/concept_strategies_v3.py,sha256=0xN1AMBGPKfl2Bbl0zIIGJYcmaNl9PFl2ESzBniVO24,37104
 trilogy/core/processing/graph_utils.py,sha256=stbYnDxnK-1kbo9L4XNU85FQhWCP-oZYO7LCXhAdC5M,1198
-trilogy/core/processing/utility.py,sha256=kwv-eEnFxZTLbZvJxhVxK-IUPBa83VII3gqXmXMBzBM,18709
+trilogy/core/processing/utility.py,sha256=RG0v0hCgyWsxRHzDx2-ME0ENp1LlahLk4zB--Hfrsbc,18717
 trilogy/core/processing/node_generators/__init__.py,sha256=s_YV1OYc336DuS9591259qjI_K_CtOCuhkf4t2aOgYs,733
 trilogy/core/processing/node_generators/basic_node.py,sha256=VqVyb4wXI_B2OmfwtpsypimzcevoPe_pnstlKLU3S5s,2878
 trilogy/core/processing/node_generators/common.py,sha256=kETikLR2fWbrKywPL0TXXj6YY4rpOA8PjsUSyx_mNyE,8907
@@ -36,18 +36,18 @@ trilogy/core/processing/node_generators/group_node.py,sha256=wlj8N4Nd1_8cpmccoe0
 trilogy/core/processing/node_generators/group_to_node.py,sha256=RNvDo0x1TNFCDi97IAZ4taLMEe9Wv0XzNtuCCM9vjvw,2537
 trilogy/core/processing/node_generators/multiselect_node.py,sha256=abS8mWWoTxRXYdjKTgRgdfeLiWcJjZ7qgESYwDv5e_o,6510
 trilogy/core/processing/node_generators/node_merge_node.py,sha256=IYDS5DNF-5_dpgwre_n1Kh7RBnt4srzgYkaUahe_K_o,14001
-trilogy/core/processing/node_generators/rowset_node.py,sha256=C5aPc-KIcedTepv9HyG5kth2fUkMwLs_uQy5YEgZsVo,4584
+trilogy/core/processing/node_generators/rowset_node.py,sha256=kM4N8n20U0zGeHgQBfyXC7PP-ABIdWUHc1q1vnWkfOw,5297
 trilogy/core/processing/node_generators/select_merge_node.py,sha256=JFoBKETwhmd2KdmoNq4wT2SOrd3Jh-GGcO5qMiUh8JE,12691
 trilogy/core/processing/node_generators/select_node.py,sha256=bjTylBa-vYbmzpuSpphmIo_Oi78YZpI8ppHnN9KDYDk,1795
 trilogy/core/processing/node_generators/union_node.py,sha256=MVmLqOZbCEVqZYVZxxWxtDMvyEdSnAg7pU9NzoOXy1I,2517
 trilogy/core/processing/node_generators/unnest_node.py,sha256=MNNjWW7Dp3A_Xv_XGjzdHU1PHQBauZHMBVKRJhqRZJY,2255
 trilogy/core/processing/node_generators/window_node.py,sha256=x4n5NWEouMsOS0V9myyJNmEg2e3kUDPLWXQhq3PyUdY,3510
 trilogy/core/processing/nodes/__init__.py,sha256=WNUmYmZF3uqF2qiJ1L7y0u9qiVD9YnluKds0wA5opJE,4813
-trilogy/core/processing/nodes/base_node.py,sha256=A7Kx_2KlEjE3jcsvvFcwMmvCJiIRFS7jDjePTCpNU9E,15573
+trilogy/core/processing/nodes/base_node.py,sha256=t0SQW6z3OdAMDfyuUUtI8NCbDruJLq2-FgZxPuWZS0Q,16567
 trilogy/core/processing/nodes/filter_node.py,sha256=metDcI7b2QsONOy5l0Mx7by1OhXac0N8yKUDoL_2WWo,2342
-trilogy/core/processing/nodes/group_node.py,sha256=j6uiHmAA01ByhZmeJQrAm4ophdvo517b-OibEZSQFLg,7249
-trilogy/core/processing/nodes/merge_node.py,sha256=Nc0nV56C-1DzanTg54llvlkuHyK05A17XMa2ut0OeK0,14921
-trilogy/core/processing/nodes/select_node_v2.py,sha256=Hk_fQnI8NzpDSaPDNu_C-2QWktf3ZORhzbx0TeOK5Q8,8144
+trilogy/core/processing/nodes/group_node.py,sha256=NdIrmBg7DjFy8KwvRoI653cOyAi1xChcWdXZS8tqMW0,7488
+trilogy/core/processing/nodes/merge_node.py,sha256=7lhmTyWLV5e9zT_m_UJnUgXVGBEoyX98lcUABstcf3w,14916
+trilogy/core/processing/nodes/select_node_v2.py,sha256=Xx2zT1RLFJCMmRQ0GaZnrrgRo33aI53Lgw3PqHRSCp4,8284
 trilogy/core/processing/nodes/union_node.py,sha256=WHycDepNr16flkgQdwyZRo1g-kzYKWVUb6CZ7N_U4OA,1402
 trilogy/core/processing/nodes/unnest_node.py,sha256=aR1XKa-bT7f45QYKUOS0EUuc0t4GbvYAEG8ZYFJ67sI,2151
 trilogy/core/processing/nodes/window_node.py,sha256=kXHhOZ9CZ8AQvUbJXCIxUPQ-NF3ooZT7VBgNUyM3VM8,1213
@@ -72,14 +72,14 @@ trilogy/parsing/common.py,sha256=haPZbJrola5Fvwp940A-MJ1o-EhGXKsRFa-Y2e7OsjU,103
 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
-trilogy/parsing/parse_engine.py,sha256=M2CAqqA-JlR6TK17jkPlcOmy4YhPVlH8YByVTDP3cCI,67122
+trilogy/parsing/parse_engine.py,sha256=CrXaK3KDsMt7C6qYIGy5lH4p3-dQNqRn-34VbI8XRRw,67200
 trilogy/parsing/render.py,sha256=Dr0QKIaAUi9uxfZZJVNV-todKoTA-tsWXNXPJ4Ohjn0,15650
 trilogy/parsing/trilogy.lark,sha256=d_d3H8ExBcrVffPLq1TgTcEyWDppPJO2zB6cC6mdq9I,12489
 trilogy/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/scripts/trilogy.py,sha256=DQDW81E5mDMWFP8oPw8q-IyrR2JGxQSDWgUWe2VTSRQ,3731
-pytrilogy-0.0.2.48.dist-info/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
-pytrilogy-0.0.2.48.dist-info/METADATA,sha256=Rcj4LfUCQoMs2K3dtgpBeFRpNOonJ9A0Q7kstGsMKnk,8426
-pytrilogy-0.0.2.48.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-pytrilogy-0.0.2.48.dist-info/entry_points.txt,sha256=0petKryjvvtEfTlbZC1AuMFumH_WQ9v8A19LvoS6G6c,54
-pytrilogy-0.0.2.48.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
-pytrilogy-0.0.2.48.dist-info/RECORD,,
+pytrilogy-0.0.2.49.dist-info/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
+pytrilogy-0.0.2.49.dist-info/METADATA,sha256=dI1KF17Tz1MjU5LMQwL9wLiQwzI3pUNc469_XthJuTQ,8426
+pytrilogy-0.0.2.49.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+pytrilogy-0.0.2.49.dist-info/entry_points.txt,sha256=0petKryjvvtEfTlbZC1AuMFumH_WQ9v8A19LvoS6G6c,54
+pytrilogy-0.0.2.49.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
+pytrilogy-0.0.2.49.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.2.48"
+__version__ = "0.0.2.49"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

trilogy/core/models.py

@@ -467,7 +467,7 @@ class Concept(Mergeable, Namespaced, SelectContext, BaseModel):
         )
 
     def __repr__(self):
-        base = f"{self.namespace}.{self.address}@{self.grain}"
+        base = f"{self.address}@{self.grain}"
         return base
 
     @property
@@ -662,11 +662,24 @@ class Concept(Mergeable, Namespaced, SelectContext, BaseModel):
                 local_concepts=local_concepts, grain=grain, environment=environment
             )
         final_grain = self.grain
-
+        keys = (
+            tuple(
+                [
+                    x.with_select_context(local_concepts, grain, environment)
+                    for x in self.keys
+                ]
+            )
+            if self.keys
+            else None
+        )
         if self.is_aggregate and isinstance(new_lineage, Function):
             new_lineage = AggregateWrapper(function=new_lineage, by=grain.components)
             final_grain = grain
-
+            keys = tuple(grain.components)
+        elif (
+            self.is_aggregate and not keys and isinstance(new_lineage, AggregateWrapper)
+        ):
+            keys = tuple(new_lineage.by)
         return self.__class__(
             name=self.name,
             datatype=self.datatype,
@@ -675,16 +688,7 @@ class Concept(Mergeable, Namespaced, SelectContext, BaseModel):
             lineage=new_lineage,
             grain=final_grain,
             namespace=self.namespace,
-            keys=(
-                tuple(
-                    [
-                        x.with_select_context(local_concepts, grain, environment)
-                        for x in self.keys
-                    ]
-                )
-                if self.keys
-                else None
-            ),
+            keys=keys,
             modifiers=self.modifiers,
             # a select needs to always defer to the environment for pseudonyms
             # TODO: evaluate if this should be cached
@@ -2626,7 +2630,7 @@ class QueryDatasource(BaseModel):
                     and CONFIG.validate_missing
                 ):
                     raise SyntaxError(
-                        f"Missing source map for {concept.address} on {key}, have {v}"
+                        f"On query datasource missing source map for {concept.address} on {key}, have {v}"
                     )
         return v
 

trilogy/core/processing/concept_strategies_v3.py

@@ -569,6 +569,8 @@ def validate_stack(
         resolved = node.resolve()
 
         for concept in resolved.output_concepts:
+            if concept in resolved.hidden_concepts:
+                continue
             validate_concept(
                 concept,
                 node,
@@ -836,6 +838,7 @@ def _search_concepts(
                     PurposeLineage.ROWSET,
                     PurposeLineage.BASIC,
                     PurposeLineage.MULTISELECT,
+                    PurposeLineage.UNION,
                 ]:
                     skip.add(priority_concept.address)
                 break

trilogy/core/processing/node_generators/rowset_node.py

@@ -38,7 +38,7 @@ def gen_rowset_node(
     rowset: RowsetDerivationStatement = lineage.rowset
     select: SelectStatement | MultiSelectStatement = lineage.rowset.select
 
-    node = get_query_node(environment, select, graph=g, history=history)
+    node = get_query_node(environment, select)
 
     if not node:
         logger.info(
@@ -94,15 +94,22 @@ def gen_rowset_node(
         logger.info(
             f"{padding(depth)}{LOGGER_PREFIX} no enrichment required for rowset node as all optional found or no optional; exiting early."
         )
-        # node.set_preexisting_conditions(conditions.conditional if conditions else None)
         return node
-
-    possible_joins = concept_to_relevant_joins(node.output_concepts)
+    possible_joins = concept_to_relevant_joins(
+        [x for x in node.output_concepts if x.derivation != PurposeLineage.ROWSET]
+    )
+    logger.info({x.address: x.keys for x in possible_joins})
     if not possible_joins:
         logger.info(
             f"{padding(depth)}{LOGGER_PREFIX} no possible joins for rowset node to get {[x.address for x in local_optional]}; have {[x.address for x in node.output_concepts]}"
         )
         return node
+    if any(x.derivation == PurposeLineage.ROWSET for x in possible_joins):
+        logger.info(
+            f"{padding(depth)}{LOGGER_PREFIX} cannot enrich rowset node with rowset concepts; exiting early"
+        )
+        return node
+    logger.info([x.address for x in possible_joins + local_optional])
     enrich_node: MergeNode = source_concepts(  # this fetches the parent + join keys
         # to then connect to the rest of the query
         mandatory_list=possible_joins + local_optional,
@@ -110,15 +117,28 @@ def gen_rowset_node(
         g=g,
         depth=depth + 1,
         conditions=conditions,
+        history=history,
     )
     if not enrich_node:
         logger.info(
             f"{padding(depth)}{LOGGER_PREFIX} Cannot generate rowset enrichment node for {concept} with optional {local_optional}, returning just rowset node"
         )
         return node
+
+    non_hidden = [
+        x for x in node.output_concepts if x.address not in node.hidden_concepts
+    ]
+    for x in possible_joins:
+        if x.address in node.hidden_concepts:
+            node.unhide_output_concepts([x])
+    non_hidden_enrich = [
+        x
+        for x in enrich_node.output_concepts
+        if x.address not in enrich_node.hidden_concepts
+    ]
     return MergeNode(
-        input_concepts=enrich_node.output_concepts + node.output_concepts,
-        output_concepts=node.output_concepts + local_optional,
+        input_concepts=non_hidden + non_hidden_enrich,
+        output_concepts=non_hidden + local_optional,
         environment=environment,
         g=g,
         depth=depth,
@@ -126,6 +146,6 @@ def gen_rowset_node(
             node,
             enrich_node,
         ],
-        partial_concepts=node.partial_concepts,
+        partial_concepts=node.partial_concepts + enrich_node.partial_concepts,
         preexisting_conditions=conditions.conditional if conditions else None,
     )

trilogy/core/processing/nodes/base_node.py

@@ -211,8 +211,22 @@ class StrategyNode:
                 operator=BooleanOperator.AND,
             )
         self.validate_parents()
+        self.validate_inputs()
         self.log = True
 
+    def validate_inputs(self):
+        if not self.parents:
+            return
+        non_hidden = set()
+        for x in self.parents:
+            for z in x.usable_outputs:
+                non_hidden.add(z.address)
+        if not all([x.address in non_hidden for x in self.input_concepts]):
+            missing = [x for x in self.input_concepts if x.address not in non_hidden]
+            raise ValueError(
+                f"Invalid input concepts; {missing} are missing non-hidden parent nodes"
+            )
+
     def add_parents(self, parents: list["StrategyNode"]):
         self.parents += parents
         self.validate_parents()
@@ -288,6 +302,14 @@ class StrategyNode:
             self.rebuild_cache()
         return self
 
+    def unhide_output_concepts(self, concepts: List[Concept], rebuild: bool = True):
+        self.hidden_concepts = [
+            x for x in self.hidden_concepts if x.address not in concepts
+        ]
+        if rebuild:
+            self.rebuild_cache()
+        return self
+
     def remove_output_concepts(self, concepts: List[Concept], rebuild: bool = True):
         for x in concepts:
             self.hidden_concepts.append(x)
@@ -299,6 +321,12 @@ class StrategyNode:
             self.rebuild_cache()
         return self
 
+    @property
+    def usable_outputs(self) -> list[Concept]:
+        return [
+            x for x in self.output_concepts if x.address not in self.hidden_concepts
+        ]
+
     @property
     def logging_prefix(self) -> str:
         return "\t" * self.depth

trilogy/core/processing/nodes/group_node.py

@@ -105,9 +105,9 @@ class GroupNode(StrategyNode):
                 logger.info(
                     f"{self.logging_prefix}{LOGGER_PREFIX} Parent node"
                     f" {[c.address for c in parent.output_concepts[:2]]}... has"
-                    " grain"
+                    " set node grain"
                     f" {parent.grain}"
-                    f" resolved grain {parent.resolve().grain}"
+                    f" and resolved grain {parent.resolve().grain}"
                     f" {type(parent)}"
                 )
             source_type = SourceType.GROUP
@@ -146,7 +146,13 @@ class GroupNode(StrategyNode):
         # inject an additional CTE
         if self.conditions and not is_scalar_condition(self.conditions):
             base.condition = None
-            base.output_concepts = self.output_concepts + self.conditions.row_arguments
+            base.output_concepts = unique(
+                base.output_concepts + self.conditions.row_arguments, "address"
+            )
+            # re-visible any hidden concepts
+            base.hidden_concepts = [
+                x for x in base.hidden_concepts if x not in base.output_concepts
+            ]
             source_map = resolve_concept_map(
                 [base],
                 targets=self.output_concepts,

trilogy/core/processing/nodes/merge_node.py

@@ -330,8 +330,9 @@ class MergeNode(StrategyNode):
             force_group = None
 
         qd_joins: List[BaseJoin | UnnestJoin] = [*joins]
+
         source_map = resolve_concept_map(
-            list(merged.values()),
+            final_datasets,
             targets=self.output_concepts,
             inherited_inputs=self.input_concepts + self.existence_concepts,
             full_joins=full_join_concepts,
@@ -339,6 +340,7 @@ class MergeNode(StrategyNode):
         nullable_concepts = find_nullable_concepts(
             source_map=source_map, joins=joins, datasources=final_datasets
         )
+
         qds = QueryDatasource(
             input_concepts=unique(self.input_concepts, "address"),
             output_concepts=unique(self.output_concepts, "address"),

trilogy/core/processing/nodes/select_node_v2.py

@@ -67,6 +67,11 @@ class SelectNode(StrategyNode):
         self.accept_partial = accept_partial
         self.datasource = datasource
 
+    def validate_inputs(self):
+        # we do not need to validate inputs for a select node
+        # as it will be a root
+        return
+
     def resolve_from_provided_datasource(
         self,
     ) -> QueryDatasource:

trilogy/core/processing/utility.py

@@ -214,7 +214,7 @@ def concept_to_relevant_joins(concepts: list[Concept]) -> List[Concept]:
             x for x in concepts if x.keys and all([key in addresses for key in x.keys])
         ]
     )
-    final = [c for c in concepts if c not in sub_props]
+    final = [c for c in concepts if c.address not in sub_props]
     return unique(final, "address")
 
 

trilogy/core/query_processor.py

@@ -7,7 +7,6 @@ from trilogy.core.constants import CONSTANT_DATASET
 from trilogy.core.enums import BooleanOperator, SourceType
 from trilogy.core.env_processor import generate_graph
 from trilogy.core.ergonomics import generate_cte_names
-from trilogy.core.graph_models import ReferenceGraph
 from trilogy.core.models import (
     CTE,
     BaseJoin,
@@ -353,13 +352,12 @@ def datasource_to_cte(
 def get_query_node(
     environment: Environment,
     statement: SelectStatement | MultiSelectStatement,
-    graph: Optional[ReferenceGraph] = None,
     history: History | None = None,
 ) -> StrategyNode:
     environment = environment.duplicate()
     for k, v in statement.local_concepts.items():
         environment.concepts[k] = v
-    graph = graph or generate_graph(environment)
+    graph = generate_graph(environment)
     logger.info(
         f"{LOGGER_PREFIX} getting source datasource for query with filtering {statement.where_clause_category} and output {[str(c) for c in statement.output_components]}"
     )
@@ -403,11 +401,10 @@ def get_query_node(
 def get_query_datasources(
     environment: Environment,
     statement: SelectStatement | MultiSelectStatement,
-    graph: Optional[ReferenceGraph] = None,
     hooks: Optional[List[BaseHook]] = None,
 ) -> QueryDatasource:
 
-    ds = get_query_node(environment, statement, graph)
+    ds = get_query_node(environment, statement)
     final_qds = ds.resolve()
     if hooks:
         for hook in hooks:
@@ -479,10 +476,9 @@ def process_query(
     hooks: List[BaseHook] | None = None,
 ) -> ProcessedQuery:
     hooks = hooks or []
-    graph = generate_graph(environment)
 
     root_datasource = get_query_datasources(
-        environment=environment, graph=graph, statement=statement, hooks=hooks
+        environment=environment, statement=statement, hooks=hooks
     )
     for hook in hooks:
         hook.process_root_datasource(root_datasource)

trilogy/parsing/parse_engine.py

@@ -570,6 +570,7 @@ class ParseToObjects(Transformer):
         for new_concept in output.derived_concepts:
             if new_concept.metadata:
                 new_concept.metadata.line_number = meta.line
+            # output.select.local_concepts[new_concept.address] = new_concept
             self.environment.add_concept(new_concept)
 
         return output